trivial warning fixes, mostly for ACPI code

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5251 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-03-17 04:40:15 +00:00 committed by Stefan Reinauer
parent dfd29aa413
commit 50776fab1c
25 changed files with 34 additions and 37 deletions

View File

@ -21,6 +21,7 @@
#include "../../../northbridge/amd/amdk8/amdk8.h" #include "../../../northbridge/amd/amdk8/amdk8.h"
#include <cpu/amd/model_fxx_rev.h> #include <cpu/amd/model_fxx_rev.h>
#include <cpu/amd/microcode.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
@ -462,8 +463,6 @@ static inline void k8_errata(void)
} }
extern void model_fxx_update_microcode(unsigned cpu_deviceid);
#if CONFIG_USBDEBUG_DIRECT #if CONFIG_USBDEBUG_DIRECT
static unsigned ehci_debug_addr; static unsigned ehci_debug_addr;
#endif #endif

View File

@ -2,5 +2,6 @@
#define CPU_AMD_MICORCODE_H #define CPU_AMD_MICORCODE_H
void amd_update_microcode(void *microcode_updates, unsigned processor_rev_id); void amd_update_microcode(void *microcode_updates, unsigned processor_rev_id);
void model_fxx_update_microcode(unsigned cpu_deviceid);
#endif /* CPU_AMD_MICROCODE_H */ #endif /* CPU_AMD_MICROCODE_H */

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -93,7 +93,7 @@ extern void get_bus_conf(void);
extern void update_ssdt(void *ssdt); extern void update_ssdt(void *ssdt);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
u8 *PCI; u8 *PCI;
u8 *HCIN; u8 *HCIN;
@ -251,7 +251,7 @@ unsigned long write_acpi_tables(unsigned long start)
current += ((acpi_header_t *)AmlCode)->length; current += ((acpi_header_t *)AmlCode)->length;
memcpy((void *)dsdt,(void *)AmlCode, \ memcpy((void *)dsdt,(void *)AmlCode, \
((acpi_header_t *)AmlCode)->length); ((acpi_header_t *)AmlCode)->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
/* FACS */ // it needs 64 bit alignment /* FACS */ // it needs 64 bit alignment
current = ( current + 0x07) & -0x08; current = ( current + 0x07) & -0x08;

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -156,7 +156,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;
@ -200,8 +200,6 @@ unsigned long write_acpi_tables(unsigned long start)
acpi_header_t *ssdtx; acpi_header_t *ssdtx;
unsigned char *p; unsigned char *p;
unsigned char *AmlCode_ssdtx[HC_POSSIBLE_NUM];
int i; int i;
get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
@ -313,7 +311,7 @@ unsigned long write_acpi_tables(unsigned long start)
current += ((acpi_header_t *)AmlCode)->length; current += ((acpi_header_t *)AmlCode)->length;
memcpy((void *)dsdt,(void *)AmlCode, \ memcpy((void *)dsdt,(void *)AmlCode, \
((acpi_header_t *)AmlCode)->length); ((acpi_header_t *)AmlCode)->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
/* FDAT */ /* FDAT */
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -165,7 +165,7 @@ extern void get_bus_conf(void);
extern void update_ssdt(void *ssdt); extern void update_ssdt(void *ssdt);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
u8 *PCI; u8 *PCI;
u8 *HCIN; u8 *HCIN;
@ -323,7 +323,7 @@ unsigned long write_acpi_tables(unsigned long start)
current += ((acpi_header_t *)AmlCode)->length; current += ((acpi_header_t *)AmlCode)->length;
memcpy((void *)dsdt,(void *)AmlCode, \ memcpy((void *)dsdt,(void *)AmlCode, \
((acpi_header_t *)AmlCode)->length); ((acpi_header_t *)AmlCode)->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
/* FACS */ // it needs 64 bit alignment /* FACS */ // it needs 64 bit alignment
current = ( current + 0x07) & -0x08; current = ( current + 0x07) & -0x08;

View File

@ -123,7 +123,7 @@ unsigned long write_acpi_tables(unsigned long start)
((acpi_header_t *) AmlCode)->length); ((acpi_header_t *) AmlCode)->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = 0; /* Don't trust iasl to get this right. */
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length); dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -138,7 +138,7 @@ unsigned long write_acpi_tables(unsigned long start)
((acpi_header_t *) AmlCode)->length); ((acpi_header_t *) AmlCode)->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = 0; /* Don't trust iasl to get this right. */
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length); dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -148,7 +148,7 @@ unsigned long write_acpi_tables(unsigned long start)
((acpi_header_t *) AmlCode)->length); ((acpi_header_t *) AmlCode)->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = 0; /* Don't trust iasl to get this right. */
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length); dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -99,7 +99,7 @@ unsigned long acpi_fill_madt(unsigned long current)
int j = 0; int j = 0;
for(i=1; i< sysconf.hc_possible_num; i++) { for(i=1; i< sysconf.hc_possible_num; i++) {
unsigned d; unsigned d = 0;
if(!(sysconf.pci1234[i] & 0x1) ) continue; if(!(sysconf.pci1234[i] & 0x1) ) continue;
// 8131 need to use +4 // 8131 need to use +4
@ -159,7 +159,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;
@ -203,8 +203,6 @@ unsigned long write_acpi_tables(unsigned long start)
acpi_header_t *ssdtx; acpi_header_t *ssdtx;
unsigned char *p; unsigned char *p;
unsigned char *AmlCode_ssdtx[HC_POSSIBLE_NUM];
int i; int i;
get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
@ -318,7 +316,7 @@ unsigned long write_acpi_tables(unsigned long start)
current += ((acpi_header_t *)AmlCode)->length; current += ((acpi_header_t *)AmlCode)->length;
memcpy((void *)dsdt,(void *)AmlCode, \ memcpy((void *)dsdt,(void *)AmlCode, \
((acpi_header_t *)AmlCode)->length); ((acpi_header_t *)AmlCode)->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
/* FDAT */ /* FDAT */
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -58,7 +58,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
addr &= ~15; addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ /* This table must be betweeen 0xf0000 & 0x100000 */
printk_info("Writing IRQ routing tables to 0x%x...", addr); printk_info("Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); pirq = (void *)(addr);
v = (uint8_t *)(addr); v = (uint8_t *)(addr);

View File

@ -12,7 +12,7 @@
extern void get_bus_conf(void); extern void get_bus_conf(void);
void *smp_write_config_table(void *v) static void *smp_write_config_table(void *v)
{ {
static const char sig[4] = "PCMP"; static const char sig[4] = "PCMP";
static const char oem[8] = "IWILL "; static const char oem[8] = "IWILL ";

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -152,7 +152,7 @@ unsigned long write_acpi_tables(unsigned long start)
((acpi_header_t *) AmlCode)->length); ((acpi_header_t *) AmlCode)->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = 0; /* Don't trust iasl to get this right. */
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length); dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -101,7 +101,7 @@ unsigned long acpi_fill_madt(unsigned long current)
extern void get_bus_conf(void); extern void get_bus_conf(void);
void update_ssdtx(void *ssdtx, int i) static void update_ssdtx(void *ssdtx, int i)
{ {
uint8_t *PCI; uint8_t *PCI;
uint8_t *HCIN; uint8_t *HCIN;

View File

@ -79,7 +79,7 @@ unsigned long write_acpi_tables(unsigned long start)
memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length); memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt,dsdt->length); dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");
fadt = (acpi_fadt_t *) current; fadt = (acpi_fadt_t *) current;

View File

@ -163,7 +163,7 @@ unsigned long write_acpi_tables(unsigned long start)
((acpi_header_t *) AmlCode_dsdt)->length); ((acpi_header_t *) AmlCode_dsdt)->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */ dsdt->checksum = 0; /* Don't trust iasl to get this right. */
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");
fadt = (acpi_fadt_t *) current; fadt = (acpi_fadt_t *) current;

View File

@ -165,7 +165,7 @@ unsigned long write_acpi_tables(unsigned long start)
memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length); memcpy((void *)dsdt,(void *)AmlCode, ((acpi_header_t *)AmlCode)->length);
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt,dsdt->length); dsdt->checksum = acpi_checksum(dsdt,dsdt->length);
printk_debug("ACPI: * DSDT @ %08x Length %x\n",dsdt,dsdt->length); printk_debug("ACPI: * DSDT @ %p Length %x\n",dsdt,dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");
fadt = (acpi_fadt_t *) current; fadt = (acpi_fadt_t *) current;

View File

@ -187,7 +187,7 @@ unsigned long write_acpi_tables(unsigned long start)
dsdt->checksum = 0; // don't trust intel iasl compiler to get this right dsdt->checksum = 0; // don't trust intel iasl compiler to get this right
dsdt->checksum = acpi_checksum(dsdt, dsdt->length); dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
#endif #endif
printk_debug("ACPI: * DSDT @ %08x Length %x\n", dsdt, printk_debug("ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length); dsdt->length);
printk_debug("ACPI: * FADT\n"); printk_debug("ACPI: * FADT\n");

View File

@ -73,12 +73,12 @@ unsigned pm_base;
static void acpi_init(struct device *dev) static void acpi_init(struct device *dev)
{ {
uint8_t byte; uint8_t byte;
uint16_t word;
uint16_t pm10_bar; uint16_t pm10_bar;
uint32_t dword; uint32_t dword;
int on; int on;
#if 0 #if 0
uint16_t word;
printk_debug("ACPI: disabling NMI watchdog.. "); printk_debug("ACPI: disabling NMI watchdog.. ");
byte = pci_read_config8(dev, 0x49); byte = pci_read_config8(dev, 0x49);
pci_write_config8(dev, 0x49, byte | (1<<2)); pci_write_config8(dev, 0x49, byte | (1<<2));
@ -98,9 +98,8 @@ static void acpi_init(struct device *dev)
word = pci_read_config16(dev, 0x46); word = pci_read_config16(dev, 0x46);
pci_write_config16(dev, 0x46, word | (1<<9)); pci_write_config16(dev, 0x46, word | (1<<9));
printk_debug("done.\n"); printk_debug("done.\n");
#endif #endif
/* To enable the register 0xcf9 in the IO space /* To enable the register 0xcf9 in the IO space
* bit [D5] is set in the amd8111 configuration register. * bit [D5] is set in the amd8111 configuration register.
* The config. reg. is devBx41. Register 0xcf9 allows * The config. reg. is devBx41. Register 0xcf9 allows

View File

@ -54,12 +54,12 @@ static void nic_init(struct device *dev)
/* Hard Reset PHY */ /* Hard Reset PHY */
printk_debug("Reseting PHY... "); printk_debug("Reseting PHY... ");
if (conf->phy_lowreset) { if (conf->phy_lowreset) {
write32((void *)(mmio + CMD3), VAL0 | PHY_RST_POL | RESET_PHY); write32((mmio + CMD3), VAL0 | PHY_RST_POL | RESET_PHY);
} else { } else {
write32((void *)(mmio + CMD3), VAL0 | RESET_PHY); write32((mmio + CMD3), VAL0 | RESET_PHY);
} }
mdelay(15); mdelay(15);
write32((void *)(mmio + CMD3), RESET_PHY); write32((mmio + CMD3), RESET_PHY);
printk_debug("Done\n"); printk_debug("Done\n");
} }

View File

@ -57,6 +57,7 @@ static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
return inb(port_base + 1); return inb(port_base + 1);
} }
#if CONFIG_EXPERT
static void w83627hf_16_bit_addr_qual(device_t dev) static void w83627hf_16_bit_addr_qual(device_t dev)
{ {
int port = dev->path.pnp.port >> 8; int port = dev->path.pnp.port >> 8;
@ -66,6 +67,7 @@ static void w83627hf_16_bit_addr_qual(device_t dev)
outb(inb(port + 1) | 0x80, port + 1); outb(inb(port + 1) | 0x80, port + 1);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
} }
#endif
static void enable_hwm_smbus(device_t dev) static void enable_hwm_smbus(device_t dev)
{ {