src/southbridge: Use "foo *bar" instead of "foo* bar"

Change-Id: I72d50615d77b91529810e8f590fa56f3c6f7546c
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27409
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Elyes HAOUAS 2018-07-08 12:41:56 +02:00 committed by Patrick Georgi
parent 39303d5d49
commit 251279c537
17 changed files with 41 additions and 37 deletions

View file

@ -17,7 +17,7 @@
#define AMD_PCI_INT_TYPES_H #define AMD_PCI_INT_TYPES_H
#if IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_BOLTON) || IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON) #if IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_BOLTON) || IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON)
const char * intr_types[] = { const char *intr_types[] = {
[0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t", [0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t",
[0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD", [0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD",
[0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "SD\t\t", "GEC\t", "PerMon\t", [0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "SD\t\t", "GEC\t", "PerMon\t",
@ -27,7 +27,7 @@ const char * intr_types[] = {
[0x50] = "GPPInt0\t", "GPPInt1\t", "GPPInt2\t", "GPPInt3\t" [0x50] = "GPPInt0\t", "GPPInt1\t", "GPPInt2\t", "GPPInt3\t"
}; };
#elif IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE) #elif IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE)
const char * intr_types[] = { const char *intr_types[] = {
[0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t", [0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t",
[0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD", [0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD",
[0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", "SD\t", [0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", "SD\t",

View file

@ -61,9 +61,10 @@ typedef unsigned int AGESA_STATUS;
#define AGESA_CRITICAL ((AGESA_STATUS) 0xC0000002) #define AGESA_CRITICAL ((AGESA_STATUS) 0xC0000002)
#define AGESA_FATAL ((AGESA_STATUS) 0xC0000003) #define AGESA_FATAL ((AGESA_STATUS) 0xC0000003)
typedef AGESA_STATUS (*CALLOUT_ENTRY) (unsigned int Param1, unsigned int Param2, void* ConfigPtr); typedef AGESA_STATUS(*CALLOUT_ENTRY) (unsigned int Param1, unsigned int Param2,
typedef AGESA_STATUS (*IMAGE_ENTRY) (IN OUT void* ConfigPtr); void *ConfigPtr);
typedef AGESA_STATUS (*MODULE_ENTRY) (IN OUT void* ConfigPtr); typedef AGESA_STATUS(*IMAGE_ENTRY) (IN OUT void *ConfigPtr);
typedef AGESA_STATUS(*MODULE_ENTRY) (IN OUT void *ConfigPtr);
///This allocation type is used by the AmdCreateStruct entry point ///This allocation type is used by the AmdCreateStruct entry point
typedef enum { typedef enum {

View file

@ -28,7 +28,7 @@
#define NUM_IMAGE_LOCATION 32 #define NUM_IMAGE_LOCATION 32
//Entry Point Call //Entry Point Call
typedef void (*CIM_IMAGE_ENTRY) (void* pConfig); typedef void (*CIM_IMAGE_ENTRY) (void *pConfig);
//Hook Call //Hook Call

View file

@ -16,7 +16,7 @@
#ifndef AMD_PCI_INT_TYPES_H #ifndef AMD_PCI_INT_TYPES_H
#define AMD_PCI_INT_TYPES_H #define AMD_PCI_INT_TYPES_H
const char * intr_types[] = { const char *intr_types[] = {
[0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t", [0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t",
[0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD", [0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD",
[0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", [0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t",

View file

@ -50,7 +50,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg;
* @param[in] config Southbridge configuration structure pointer. * @param[in] config Southbridge configuration structure pointer.
* *
*/ */
static u32 sb800_callout_entry(u32 func, u32 data, void* config) static u32 sb800_callout_entry(u32 func, u32 data, void *config)
{ {
u32 ret = 0; u32 ret = 0;
printk(BIOS_DEBUG, "SB800 - Late.c - %s - Start.\n", __func__); printk(BIOS_DEBUG, "SB800 - Late.c - %s - Start.\n", __func__);

View file

@ -61,9 +61,10 @@ typedef unsigned int AGESA_STATUS;
#define AGESA_CRITICAL ((AGESA_STATUS) 0xC0000002) #define AGESA_CRITICAL ((AGESA_STATUS) 0xC0000002)
#define AGESA_FATAL ((AGESA_STATUS) 0xC0000003) #define AGESA_FATAL ((AGESA_STATUS) 0xC0000003)
typedef AGESA_STATUS (*CALLOUT_ENTRY) (unsigned int Param1, unsigned int Param2, void* ConfigPtr); typedef AGESA_STATUS(*CALLOUT_ENTRY) (unsigned int Param1, unsigned int Param2,
typedef AGESA_STATUS (*IMAGE_ENTRY) (IN OUT void* ConfigPtr); void *ConfigPtr);
typedef AGESA_STATUS (*MODULE_ENTRY) (IN OUT void* ConfigPtr); typedef AGESA_STATUS(*IMAGE_ENTRY) (IN OUT void *ConfigPtr);
typedef AGESA_STATUS(*MODULE_ENTRY) (IN OUT void *ConfigPtr);
///This allocation type is used by the AmdCreateStruct entry point ///This allocation type is used by the AmdCreateStruct entry point
typedef enum { typedef enum {

View file

@ -28,7 +28,7 @@
#define NUM_IMAGE_LOCATION 32 #define NUM_IMAGE_LOCATION 32
//Entry Point Call //Entry Point Call
typedef void (*CIM_IMAGE_ENTRY) (void* pConfig); typedef void (*CIM_IMAGE_ENTRY) (void *pConfig);
//Hook Call //Hook Call

View file

@ -16,7 +16,7 @@
#ifndef AMD_PCI_INT_TYPES_H #ifndef AMD_PCI_INT_TYPES_H
#define AMD_PCI_INT_TYPES_H #define AMD_PCI_INT_TYPES_H
const char * intr_types[] = { const char *intr_types[] = {
[0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t", [0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t",
[0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD", [0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD",
[0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", [0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t",

View file

@ -45,7 +45,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg;
* @param[in] config Southbridge configuration structure pointer. * @param[in] config Southbridge configuration structure pointer.
* *
*/ */
u32 sb900_callout_entry(u32 func, u32 data, void* config) u32 sb900_callout_entry(u32 func, u32 data, void *config)
{ {
u32 ret = 0; u32 ret = 0;

View file

@ -26,8 +26,8 @@
const struct pirq_struct * pirq_data_ptr = NULL; const struct pirq_struct * pirq_data_ptr = NULL;
u32 pirq_data_size = 0; u32 pirq_data_size = 0;
const u8 * intr_data_ptr = NULL; const u8 *intr_data_ptr = NULL;
const u8 * picr_data_ptr = NULL; const u8 *picr_data_ptr = NULL;
/* /*
* Read the FCH PCI_INTR registers 0xC00/0xC01 at a * Read the FCH PCI_INTR registers 0xC00/0xC01 at a

View file

@ -32,8 +32,8 @@ struct pirq_struct {
extern const struct pirq_struct * pirq_data_ptr; extern const struct pirq_struct * pirq_data_ptr;
extern u32 pirq_data_size; extern u32 pirq_data_size;
extern const u8 * intr_data_ptr; extern const u8 *intr_data_ptr;
extern const u8 * picr_data_ptr; extern const u8 *picr_data_ptr;
u8 read_pci_int_idx(u8 index, int mode); u8 read_pci_int_idx(u8 index, int mode);
void write_pci_int_idx(u8 index, int mode, u8 data); void write_pci_int_idx(u8 index, int mode, u8 data);

View file

@ -16,7 +16,7 @@
#ifndef AMD_PCI_INT_TYPES_H #ifndef AMD_PCI_INT_TYPES_H
#define AMD_PCI_INT_TYPES_H #define AMD_PCI_INT_TYPES_H
const char * intr_types[] = { const char *intr_types[] = {
[0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t", [0x00] = "INTA#\t", "INTB#\t", "INTC#\t", "INTD#\t", "INTE#\t", "INTF#\t", "INTG#\t", "INTH#\t",
[0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD", [0x08] = "Misc\t", "Misc0\t", "Misc1\t", "Misc2\t", "Ser IRQ INTA", "Ser IRQ INTB", "Ser IRQ INTC", "Ser IRQ INTD",
[0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", "SD\t\t", [0x10] = "SCI\t", "SMBUS0\t", "ASF\t", "HDA\t", "FC\t\t", "GEC\t", "PerMon\t", "SD\t\t",

View file

@ -22,7 +22,7 @@ int gpio_get(gpio_t gpio_num)
{ {
uint32_t reg; uint32_t reg;
reg = read32((void*)(uintptr_t)gpio_num); reg = read32((void *)(uintptr_t)gpio_num);
return !!(reg & GPIO_PIN_STS); return !!(reg & GPIO_PIN_STS);
} }

View file

@ -311,9 +311,9 @@ static void poweron_ddi_lanes(struct device *nb_dev)
static void internal_gfx_pci_dev_init(struct device *dev) static void internal_gfx_pci_dev_init(struct device *dev)
{ {
unsigned char * bpointer; unsigned char *bpointer;
volatile u32 * GpuF0MMReg; volatile u32 *GpuF0MMReg;
volatile u32 * pointer; volatile u32 *pointer;
int i; int i;
u16 command; u16 command;
u32 value; u32 value;

View file

@ -187,7 +187,7 @@ static void rs780_nb_gfx_dev_table(struct device *nb_dev, struct device *dev)
{ {
/* NB_InitGFXStraps */ /* NB_InitGFXStraps */
u32 MMIOBase, apc04, apc18, apc24, romstrap2; u32 MMIOBase, apc04, apc18, apc24, romstrap2;
volatile u32 * strap; volatile u32 *strap;
/* Choose a base address that is unused and routed to the RS780. */ /* Choose a base address that is unused and routed to the RS780. */
MMIOBase = 0xFFB00000; MMIOBase = 0xFFB00000;

View file

@ -32,7 +32,8 @@
/* /*
* extern function declaration * extern function declaration
*/ */
struct resource * sr5650_retrieve_cpu_mmio_resource() { struct resource *sr5650_retrieve_cpu_mmio_resource()
{
struct device *domain; struct device *domain;
struct resource *res; struct resource *res;
@ -321,7 +322,7 @@ void detect_and_enable_iommu(struct device *iommu_dev) {
uint32_t dword; uint32_t dword;
uint8_t l1_target; uint8_t l1_target;
unsigned char iommu; unsigned char iommu;
void * mmio_base; void *mmio_base;
iommu = 1; iommu = 1;
get_option(&iommu, "iommu"); get_option(&iommu, "iommu");
@ -336,7 +337,8 @@ void detect_and_enable_iommu(struct device *iommu_dev) {
return; return;
} }
mmio_base = (void*)(pci_read_config32(iommu_dev, 0x44) & 0xffffc000); mmio_base = (void *)(pci_read_config32(iommu_dev, 0x44) &
0xffffc000);
// if (get_nb_rev(nb_dev) == REV_SR5650_A11) { // if (get_nb_rev(nb_dev) == REV_SR5650_A11) {
// dword = pci_read_config32(iommu_dev, 0x6c); // dword = pci_read_config32(iommu_dev, 0x6c);
@ -352,11 +354,11 @@ void detect_and_enable_iommu(struct device *iommu_dev) {
dword |= 0x1; dword |= 0x1;
pci_write_config32(iommu_dev, 0x44, dword); pci_write_config32(iommu_dev, 0x44, dword);
write32((void*)(mmio_base + 0x8), 0x0); write32((void *)(mmio_base + 0x8), 0x0);
write32((void*)(mmio_base + 0xc), 0x08000000); write32((void *)(mmio_base + 0xc), 0x08000000);
write32((void*)(mmio_base + 0x10), 0x0); write32((void *)(mmio_base + 0x10), 0x0);
write32((void*)(mmio_base + 0x2008), 0x0); write32((void *)(mmio_base + 0x2008), 0x0);
write32((void*)(mmio_base + 0x2010), 0x0); write32((void *)(mmio_base + 0x2010), 0x0);
/* IOMMU L1 initialization */ /* IOMMU L1 initialization */
for (l1_target = 0; l1_target < 6; l1_target++) { for (l1_target = 0; l1_target < 6; l1_target++) {
@ -816,7 +818,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current; return current;
} }
static unsigned long acpi_fill_ivrs(acpi_ivrs_t* ivrs, unsigned long current) static unsigned long acpi_fill_ivrs(acpi_ivrs_t *ivrs, unsigned long current)
{ {
uint8_t *p; uint8_t *p;

View file

@ -44,8 +44,8 @@ static void p64h2_ioapic_init(struct device *dev)
uint32_t memoryBase; uint32_t memoryBase;
int apic_index, apic_id; int apic_index, apic_id;
volatile uint32_t* pIndexRegister; /* io apic io memory space command address */ volatile uint32_t *pIndexRegister; /* io apic io memory space command address */
volatile uint32_t* pWindowRegister; /* io apic io memory space data address */ volatile uint32_t *pWindowRegister; /* io apic io memory space data address */
apic_index = num_p64h2_ioapics; apic_index = num_p64h2_ioapics;
num_p64h2_ioapics++; num_p64h2_ioapics++;
@ -71,8 +71,8 @@ static void p64h2_ioapic_init(struct device *dev)
// NOTE: this address was assigned during enumeration of the bus // NOTE: this address was assigned during enumeration of the bus
memoryBase = pci_read_config32(dev, PCI_BASE_ADDRESS_0); memoryBase = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
pIndexRegister = (volatile uint32_t*) memoryBase; pIndexRegister = (volatile uint32_t *) memoryBase;
pWindowRegister = (volatile uint32_t*)(memoryBase + 0x10); pWindowRegister = (volatile uint32_t *)(memoryBase + 0x10);
printk(BIOS_DEBUG, "IOAPIC %d at %02x:%02x.%01x MBAR = %p DataAddr = %p\n", printk(BIOS_DEBUG, "IOAPIC %d at %02x:%02x.%01x MBAR = %p DataAddr = %p\n",
apic_id, dev->bus->secondary, PCI_SLOT(dev->path.pci.devfn), apic_id, dev->bus->secondary, PCI_SLOT(dev->path.pci.devfn),