Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace magic numbers with existing symbolic constants. SB600 is heavily

Browse source 
affected. This mostly targets pci_*_config*() calls.

This is part of my quest to make existing code more readable without
looking up the meaning of magic numbers.

Ron pointed out that this enables better kscope usage.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>


git-svn-id: svn://coreboot.org/repository/coreboot-v3@913 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Carl-Daniel Hailfinger 2008-10-09 22:19:53 +00:00
parent a38fe528bd
commit e3abcbefc2
18 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
southbridge/amd/amd8111/ac97.c
View file

@ -30,7 +30,7 @@
static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device) static void lpci_set_subsystem(struct device * dev, unsigned vendor, unsigned device)
{ {
pci_write_config32(dev, 0x2c, pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
((device & 0xffff) << 16) | (vendor & 0xffff)); ((device & 0xffff) << 16) | (vendor & 0xffff));
} }

2
southbridge/amd/amd8111/ide.c
View file

@ -57,7 +57,7 @@ static void ide_init(struct device *dev)
byte = 0x20 ; // Latency: 64-->32 byte = 0x20 ; // Latency: 64-->32
pci_write_config8(dev, 0xd, byte); pci_write_config8(dev, PCI_LATENCY_TIMER, byte);
word = 0x0f; word = 0x0f;
pci_write_config16(dev, 0x42, word); pci_write_config16(dev, 0x42, word);

4
southbridge/amd/amd8111/pci.c
View file

@ -35,10 +35,10 @@ static void pci_init(struct device *dev)
u32 dword; u32 dword;
/* System error enable */ /* System error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1<<8); /* System error enable */ dword |= (1<<8); /* System error enable */
dword |= (7<<28); /* Clear possible errors */ dword |= (7<<28); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
/* System,Parity,timer,and abort error enable */ /* System,Parity,timer,and abort error enable */
dword = pci_read_config32(dev, 0x3c); dword = pci_read_config32(dev, 0x3c);

12
southbridge/amd/amd8132/amd8132_bridge.c
View file

@ -213,16 +213,16 @@ static void amd8132_pcix_init(struct device * dev)
chip_rev = pci_read_config8(dev, PCI_CLASS_REVISION); chip_rev = pci_read_config8(dev, PCI_CLASS_REVISION);
/* Enable memory write and invalidate ??? */ /* Enable memory write and invalidate ??? */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= 0x10; dword |= 0x10;
dword &= ~(1<<6); // PERSP Parity Error Response dword &= ~(1<<6); // PERSP Parity Error Response
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
if (chip_rev == 0x01) { if (chip_rev == 0x01) {
/* Errata #37 */ /* Errata #37 */
byte = pci_read_config8(dev, 0x0c); byte = pci_read_config8(dev, PCI_CACHE_LINE_SIZE);
if(byte == 0x08 ) if(byte == 0x08 )
pci_write_config8(dev, 0x0c, 0x10); pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 0x10);
#if 0 #if 0
/* Errata #59*/ /* Errata #59*/
@ -235,9 +235,9 @@ static void amd8132_pcix_init(struct device * dev)
/* Set up error reporting, enable all */ /* Set up error reporting, enable all */
/* system error enable */ /* system error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1<<8); dword |= (1<<8);
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
/* system and error parity enable */ /* system and error parity enable */
dword = pci_read_config32(dev, 0x3c); dword = pci_read_config32(dev, 0x3c);

8
southbridge/amd/amd8151/amd8151_agp3.c
View file

@ -33,9 +33,9 @@ static void agp3bridge_init(struct device * dev)
/* Enable BM, MEM and IO */ /* Enable BM, MEM and IO */
/* this config32 is arguably wrong but I won't change until we can test. */ /* this config32 is arguably wrong but I won't change until we can test. */
byte = pci_read_config32(dev, 0x04); byte = pci_read_config32(dev, PCI_COMMAND);
byte |= 0x07; byte |= 0x07;
pci_write_config8(dev, 0x04, byte); pci_write_config8(dev, PCI_COMMAND, byte);
return; return;
} }
@ -62,9 +62,9 @@ static void agp3dev_enable(struct device * dev)
pci_write_config32(dev, 0xa8, value); pci_write_config32(dev, 0xa8, value);
/* enable BM and MEM */ /* enable BM and MEM */
value = pci_read_config32(dev, 0x4); value = pci_read_config32(dev, PCI_COMMAND);
value |= 6; value |= 6;
pci_write_config32(dev, 0x4, value); pci_write_config32(dev, PCI_COMMAND, value);
#if 0 #if 0
/* FIXME: should we add agp aperture base and size here ? /* FIXME: should we add agp aperture base and size here ?
* or it is done by AGP drivers */ * or it is done by AGP drivers */

4
southbridge/amd/rs690/cmn.c
View file

@ -46,7 +46,7 @@ static void nb_write_index(struct device * dev, u32 index_reg, u32 index, u32 da
u32 pci_ext_read_config32(struct device * nb_dev, struct device * dev, u32 reg) u32 pci_ext_read_config32(struct device * nb_dev, struct device * dev, u32 reg)
{ {
/*get BAR3 base address for nbcfg0x1c */ /*get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c); u32 addr = pci_read_config32(nb_dev, PCI_BASE_ADDRESS_3);
printk(BIOS_DEBUG, "addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary, printk(BIOS_DEBUG, "addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn); dev->path.pci.devfn);
addr |= dev->bus->secondary << 20 | /* bus num */ addr |= dev->bus->secondary << 20 | /* bus num */
@ -59,7 +59,7 @@ void pci_ext_write_config32(struct device * nb_dev, struct device * dev, u32 reg
u32 reg_old, reg; u32 reg_old, reg;
/*get BAR3 base address for nbcfg0x1c */ /*get BAR3 base address for nbcfg0x1c */
u32 addr = pci_read_config32(nb_dev, 0x1c); u32 addr = pci_read_config32(nb_dev, PCI_BASE_ADDRESS_3);
printk(BIOS_DEBUG, "write: addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary, printk(BIOS_DEBUG, "write: addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn); dev->path.pci.devfn);
addr |= dev->bus->secondary << 20 | /* bus num */ addr |= dev->bus->secondary << 20 | /* bus num */

6
southbridge/amd/rs690/gfx.c
View file

@ -39,7 +39,7 @@
static u32 clkind_read(struct device * dev, u32 index) static u32 clkind_read(struct device * dev, u32 index)
{ {
u32 gfx_bar2 = pci_read_config32(dev, 0x18) & ~0xF; u32 gfx_bar2 = pci_read_config32(dev, PCI_BASE_ADDRESS_2) & ~0xF;
*(u32*)(gfx_bar2+CLK_CNTL_INDEX) = index & 0x7F; *(u32*)(gfx_bar2+CLK_CNTL_INDEX) = index & 0x7F;
return *(u32*)(gfx_bar2+CLK_CNTL_DATA); return *(u32*)(gfx_bar2+CLK_CNTL_DATA);
@ -47,7 +47,7 @@ static u32 clkind_read(struct device * dev, u32 index)
static void clkind_write(struct device * dev, u32 index, u32 data) static void clkind_write(struct device * dev, u32 index, u32 data)
{ {
u32 gfx_bar2 = pci_read_config32(dev, 0x18) & ~0xF; u32 gfx_bar2 = pci_read_config32(dev, PCI_BASE_ADDRESS_2) & ~0xF;
/* printk(BIOS_INFO, "gfx bar 2 %02x\n", gfx_bar2); */ /* printk(BIOS_INFO, "gfx bar 2 %02x\n", gfx_bar2); */
*(u32*)(gfx_bar2+CLK_CNTL_INDEX) = index | 1<<7; *(u32*)(gfx_bar2+CLK_CNTL_INDEX) = index | 1<<7;
@ -66,7 +66,7 @@ static void rs690_gfx_read_resources(struct device * dev)
Even if we write 0xFFFFFFFF into it, it will be 0xFFF00000, Even if we write 0xFFFFFFFF into it, it will be 0xFFF00000,
which tells us it is a memory address base. which tells us it is a memory address base.
*/ */
pci_write_config32(dev, 0x24, 0x00000000); pci_write_config32(dev, PCI_BASE_ADDRESS_5, 0x00000000);
/* Get the normal pci resources of this device */ /* Get the normal pci resources of this device */
pci_dev_read_resources(dev); pci_dev_read_resources(dev);

4
southbridge/amd/rs690/ht.c
View file

@ -60,10 +60,10 @@ static void pcie_init(struct device *dev)
printk(BIOS_INFO, "pcie_init in rs690_ht.c\n"); printk(BIOS_INFO, "pcie_init in rs690_ht.c\n");
/* System error enable */ /* System error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1 << 8); /* System error enable */ dword |= (1 << 8); /* System error enable */
dword |= (1 << 30); /* Clear possible errors */ dword |= (1 << 30); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
/* /*
* 1 is APIC enable * 1 is APIC enable

10
southbridge/amd/rs690/pcie.c
View file

@ -112,10 +112,10 @@ static void pcie_init(struct device *dev)
printk(BIOS_DEBUG, "pcie_init in rs690_pcie.c\n"); printk(BIOS_DEBUG, "pcie_init in rs690_pcie.c\n");
/* System error enable */ /* System error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1 << 8); /* System error enable */ dword |= (1 << 8); /* System error enable */
dword |= (1 << 30); /* Clear possible errors */ dword |= (1 << 30); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
} }
@ -171,8 +171,8 @@ void enable_pcie_bar3(struct device * nb_dev)
set_nbcfg_enable_bits(nb_dev, 0x7C, 1 << 30, 1 << 30); /* Enables writes to the BAR3 register. */ set_nbcfg_enable_bits(nb_dev, 0x7C, 1 << 30, 1 << 30); /* Enables writes to the BAR3 register. */
set_nbcfg_enable_bits(nb_dev, 0x84, 7 << 16, 0 << 16); set_nbcfg_enable_bits(nb_dev, 0x84, 7 << 16, 0 << 16);
pci_write_config32(nb_dev, 0x1C, EXT_CONF_BASE_ADDRESS); /* PCIEMiscInit */ pci_write_config32(nb_dev, PCI_BASE_ADDRESS_3, EXT_CONF_BASE_ADDRESS); /* PCIEMiscInit */
pci_write_config32(nb_dev, 0x20, 0x00000000); pci_write_config32(nb_dev, PCI_BASE_ADDRESS_4, 0x00000000);
set_htiu_enable_bits(nb_dev, 0x32, 1 << 28, 1 << 28); /* PCIEMiscInit */ set_htiu_enable_bits(nb_dev, 0x32, 1 << 28, 1 << 28); /* PCIEMiscInit */
ProgK8TempMmioBase(1, EXT_CONF_BASE_ADDRESS, TEMP_MMIO_BASE_ADDRESS); ProgK8TempMmioBase(1, EXT_CONF_BASE_ADDRESS, TEMP_MMIO_BASE_ADDRESS);
} }
@ -185,7 +185,7 @@ void disable_pcie_bar3(struct device * nb_dev)
{ {
printk(BIOS_DEBUG, "disable_pcie_bar3()\n"); printk(BIOS_DEBUG, "disable_pcie_bar3()\n");
set_nbcfg_enable_bits(nb_dev, 0x7C, 1 << 30, 0 << 30); /* Disable writes to the BAR3. */ set_nbcfg_enable_bits(nb_dev, 0x7C, 1 << 30, 0 << 30); /* Disable writes to the BAR3. */
pci_write_config32(nb_dev, 0x1C, 0); /* clear BAR3 address */ pci_write_config32(nb_dev, PCI_BASE_ADDRESS_3, 0); /* clear BAR3 address */
ProgK8TempMmioBase(0, EXT_CONF_BASE_ADDRESS, TEMP_MMIO_BASE_ADDRESS); ProgK8TempMmioBase(0, EXT_CONF_BASE_ADDRESS, TEMP_MMIO_BASE_ADDRESS);
} }

4
southbridge/amd/sb600/ide.c
View file

@ -51,9 +51,9 @@ static void ide_init(struct device *dev)
pci_write_config8(dev, 0x56, byte); pci_write_config8(dev, 0x56, byte);
/* Enable I/O Access&& Bus Master */ /* Enable I/O Access&& Bus Master */
dword = pci_read_config16(dev, 0x4); dword = pci_read_config16(dev, PCI_COMMAND);
dword |= 1 << 2; dword |= 1 << 2;
pci_write_config16(dev, 0x4, dword); pci_write_config16(dev, PCI_COMMAND, dword);
#if CONFIG_PCI_OPTION_ROM_RUN == 1 #if CONFIG_PCI_OPTION_ROM_RUN == 1
pci_dev_init(dev); pci_dev_init(dev);

4
southbridge/amd/sb600/pci.c
View file

@ -62,8 +62,8 @@ static void pci_init(struct device *dev)
pci_write_config8(dev, 0x40, byte); pci_write_config8(dev, 0x40, byte);
/* RPR 4.5 Enables the PCIB to retain ownership of the bus on the Primary side and on the Secondary side when GNT# is deasserted */ /* RPR 4.5 Enables the PCIB to retain ownership of the bus on the Primary side and on the Secondary side when GNT# is deasserted */
pci_write_config8(dev, 0x0D, 0x40); pci_write_config8(dev, PCI_LATENCY_TIMER, 0x40);
pci_write_config8(dev, 0x1B, 0x40); pci_write_config8(dev, PCI_SEC_LATENCY_TIMER, 0x40);
/* RPR 4.6 Enable the command matching checking function on "Memory Read" & "Memory Read Line" commands */ /* RPR 4.6 Enable the command matching checking function on "Memory Read" & "Memory Read Line" commands */
byte = pci_read_config8(dev, 0x4B); byte = pci_read_config8(dev, 0x4B);

37
southbridge/amd/sb600/sata.c
View file

@ -42,15 +42,14 @@ static void sata_init(struct device *dev)
struct device * sm_dev; struct device * sm_dev;
/* SATA SMBus Disable */ /* SATA SMBus Disable */
/* sm_dev = pci_locate_device(PCI_ID(0x1002, 0x4385), 0); */ /* sm_dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_ATI, 0x4385), 0); */
sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
/* Disable SATA SMBUS */ /* Disable SATA SMBUS */
byte = pci_read_config8(sm_dev, 0xad); byte = pci_read_config8(sm_dev, 0xad);
byte |= (1 << 1); byte |= (1 << 1);
/* Enable SATA and power saving */ /* Enable SATA and power saving */
byte = pci_read_config8(sm_dev, 0xad); byte = pci_read_config8(sm_dev, 0xad);
byte |= (1 << 0); byte |= (1 << 0) | (1 << 5);
byte |= (1 << 5);
pci_write_config8(sm_dev, 0xad, byte); pci_write_config8(sm_dev, 0xad, byte);
/* Set the interrupt Mapping to INTG# */ /* Set the interrupt Mapping to INTG# */
byte = pci_read_config8(sm_dev, 0xaf); byte = pci_read_config8(sm_dev, 0xaf);
@ -58,12 +57,12 @@ static void sata_init(struct device *dev)
pci_write_config8(sm_dev, 0xaf, byte); pci_write_config8(sm_dev, 0xaf, byte);
/* get base addresss */ /* get base addresss */
sata_bar5 = (u8 *) (pci_read_config32(dev, 0x24) & ~0x3FF); sata_bar5 = (u8 *) (pci_read_config32(dev, PCI_BASE_ADDRESS_5) & ~0x3FF);
sata_bar0 = pci_read_config16(dev, 0x10) & ~0x7; sata_bar0 = pci_read_config16(dev, PCI_BASE_ADDRESS_0) & ~0x7;
sata_bar1 = pci_read_config16(dev, 0x14) & ~0x7; sata_bar1 = pci_read_config16(dev, PCI_BASE_ADDRESS_1) & ~0x7;
sata_bar2 = pci_read_config16(dev, 0x18) & ~0x7; sata_bar2 = pci_read_config16(dev, PCI_BASE_ADDRESS_2) & ~0x7;
sata_bar3 = pci_read_config16(dev, 0x1C) & ~0x7; sata_bar3 = pci_read_config16(dev, PCI_BASE_ADDRESS_3) & ~0x7;
sata_bar4 = pci_read_config16(dev, 0x20) & ~0x7; sata_bar4 = pci_read_config16(dev, PCI_BASE_ADDRESS_4) & ~0x7;
printk(BIOS_DEBUG, "sata_bar0=%x\n", sata_bar0); /* 3030 */ printk(BIOS_DEBUG, "sata_bar0=%x\n", sata_bar0); /* 3030 */
printk(BIOS_DEBUG, "sata_bar1=%x\n", sata_bar1); /* 3070 */ printk(BIOS_DEBUG, "sata_bar1=%x\n", sata_bar1); /* 3070 */
@ -72,14 +71,15 @@ static void sata_init(struct device *dev)
printk(BIOS_DEBUG, "sata_bar4=%x\n", sata_bar4); /* 3000 */ printk(BIOS_DEBUG, "sata_bar4=%x\n", sata_bar4); /* 3000 */
printk(BIOS_DEBUG, "sata_bar5=%p\n", sata_bar5); /* e0309000 */ printk(BIOS_DEBUG, "sata_bar5=%p\n", sata_bar5); /* e0309000 */
/* Program the 2C to 0x43801002 */ /* Program the subsystem device/vendor to 0x43801002 */
dword = 0x43801002; #warning Subsystem ID setting should be in a separate function
pci_write_config32(dev, 0x2c, dword); dword = (0x4380 << 16) | PCI_VENDOR_ID_ATI;
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID, dword);
/* SERR-Enable */ /* SERR-Enable */
word = pci_read_config16(dev, 0x04); word = pci_read_config16(dev, PCI_COMMAND);
word |= (1 << 8); word |= (1 << 8);
pci_write_config16(dev, 0x04, word); pci_write_config16(dev, PCI_COMMAND, word);
/* Dynamic power saving */ /* Dynamic power saving */
byte = pci_read_config8(dev, 0x40); byte = pci_read_config8(dev, 0x40);
@ -88,12 +88,11 @@ static void sata_init(struct device *dev)
/* Set SATA Operation Mode, Set to IDE mode */ /* Set SATA Operation Mode, Set to IDE mode */
byte = pci_read_config8(dev, 0x40); byte = pci_read_config8(dev, 0x40);
byte |= (1 << 0); byte |= (1 << 0) | (1 << 4);
byte |= (1 << 4);
pci_write_config8(dev, 0x40, byte); pci_write_config8(dev, 0x40, byte);
dword = 0x01018f00; dword = 0x01018f00;
pci_write_config32(dev, 0x8, dword); pci_write_config32(dev, PCI_REVISION_ID, dword);
byte = pci_read_config8(dev, 0x40); byte = pci_read_config8(dev, 0x40);
byte &= ~(1 << 0); byte &= ~(1 << 0);
@ -135,9 +134,9 @@ static void sata_init(struct device *dev)
pci_write_config32(dev, 0x40, dword); pci_write_config32(dev, 0x40, dword);
/* Enable the I/O, MM, BusMaster access for SATA */ /* Enable the I/O, MM, BusMaster access for SATA */
byte = pci_read_config8(dev, 0x4); byte = pci_read_config8(dev, PCI_COMMAND);
byte |= 7 << 0; byte |= 7 << 0;
pci_write_config8(dev, 0x4, byte); pci_write_config8(dev, PCI_COMMAND, byte);
/* RPR6.6 SATA drive detection. Currently we detect Primary Master Device only */ /* RPR6.6 SATA drive detection. Currently we detect Primary Master Device only */
/* Use BAR5+0x1A8,BAR0+0x6 for Primary Slave */ /* Use BAR5+0x1A8,BAR0+0x6 for Primary Slave */

39
southbridge/amd/sb600/stage1.c
View file

@ -23,6 +23,7 @@
#include <msr.h> #include <msr.h>
#include <legacy.h> #include <legacy.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h>
#include <statictree.h> #include <statictree.h>
#include <config.h> #include <config.h>
#include <io.h> #include <io.h>
@ -68,7 +69,7 @@ u8 pm2_ioread(u8 reg)
static u8 get_sb600_revision(void) static u8 get_sb600_revision(void)
{ {
u32 dev; u32 dev;
if (!pci_conf1_find_device(0x1002, 0x4385, &dev)){ if (!pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4385, &dev)){
die("SMBUS controller not found\r\n"); die("SMBUS controller not found\r\n");
} }
return pci_conf1_read_config8(dev, 0x08); return pci_conf1_read_config8(dev, 0x08);
@ -90,12 +91,12 @@ void sb600_lpc_init(void)
u32 dev; u32 dev;
/* Enable lpc controller */ /* Enable lpc controller */
pci_conf1_find_device(0x1002, 0x4385, &dev); /* SMBUS controller */ pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4385, &dev); /* SMBUS controller */
reg32 = pci_conf1_read_config32(dev, 0x64); reg32 = pci_conf1_read_config32(dev, 0x64);
reg32 |= 0x00100000; reg32 |= 0x00100000;
pci_conf1_write_config32(dev, 0x64, reg32); pci_conf1_write_config32(dev, 0x64, reg32);
pci_conf1_find_device(0x1002, 0x438d, &dev); /* LPC Controller */ pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438d, &dev); /* LPC Controller */
/* Serial 0 */ /* Serial 0 */
reg8 = pci_conf1_read_config8(dev, 0x44); reg8 = pci_conf1_read_config8(dev, 0x44);
reg8 |= (1 << 6); reg8 |= (1 << 6);
@ -126,7 +127,7 @@ u32 get_sbdn(u32 bus)
u32 dev; u32 dev;
/* Find the device. */ /* Find the device. */
pci_conf1_find_on_bus(bus, 0x1002, 0x4385, &dev); pci_conf1_find_on_bus(bus, PCI_VENDOR_ID_ATI, 0x4385, &dev);
return (dev >> 15) & 0x1f; return (dev >> 15) & 0x1f;
} }
@ -215,7 +216,7 @@ void sb600_pci_port80(void)
u32 dev; u32 dev;
/* P2P Bridge */ /* P2P Bridge */
pci_conf1_find_device(0x1002, 0x4384, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4384, &dev);
byte = pci_conf1_read_config8(dev, 0x40); byte = pci_conf1_read_config8(dev, 0x40);
byte |= 1 << 5; byte |= 1 << 5;
@ -237,7 +238,7 @@ void sb600_pci_port80(void)
byte |= 1 << 0; byte |= 1 << 0;
pci_conf1_write_config8(dev, 0x04, byte); pci_conf1_write_config8(dev, 0x04, byte);
pci_conf1_find_device(0x1002, 0x438D, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438D, &dev);
byte = pci_conf1_read_config8(dev, 0x4A); byte = pci_conf1_read_config8(dev, 0x4A);
byte &= ~(1 << 5); /* disable lpc port 80 */ byte &= ~(1 << 5); /* disable lpc port 80 */
@ -251,13 +252,13 @@ void sb600_lpc_port80(void)
u32 reg32; u32 reg32;
/* enable lpc controller */ /* enable lpc controller */
pci_conf1_find_device(0x1002, 0x4385, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4385, &dev);
reg32 = pci_conf1_read_config32(dev, 0x64); reg32 = pci_conf1_read_config32(dev, 0x64);
reg32 |= 0x00100000; /* lpcEnable */ reg32 |= 0x00100000; /* lpcEnable */
pci_conf1_write_config32(dev, 0x64, reg32); pci_conf1_write_config32(dev, 0x64, reg32);
/* enable prot80 LPC decode in pci function 3 configuration space. */ /* enable prot80 LPC decode in pci function 3 configuration space. */
pci_conf1_find_device(0x1002, 0x438d, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438d, &dev);
byte = pci_conf1_read_config8(dev, 0x4a); byte = pci_conf1_read_config8(dev, 0x4a);
byte |= 1 << 5; /* enable port 80 */ byte |= 1 << 5; /* enable port 80 */
pci_conf1_write_config8(dev, 0x4a, byte); pci_conf1_write_config8(dev, 0x4a, byte);
@ -277,7 +278,7 @@ static void sb600_devices_por_init(void)
printk(BIOS_INFO, "sb600_devices_por_init()\n"); printk(BIOS_INFO, "sb600_devices_por_init()\n");
/* SMBus Device, BDF:0-20-0 */ /* SMBus Device, BDF:0-20-0 */
printk(BIOS_INFO, "sb600_devices_por_init(): SMBus Device, BDF:0-20-0\n"); printk(BIOS_INFO, "sb600_devices_por_init(): SMBus Device, BDF:0-20-0\n");
if (!pci_conf1_find_device(0x1002, 0x4385, &dev)){ if (!pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4385, &dev)){
die("SMBUS controller not found\r\n"); die("SMBUS controller not found\r\n");
} }
printk(BIOS_INFO, "SMBus controller enabled, sb revision is 0x%x\r\n", printk(BIOS_INFO, "SMBus controller enabled, sb revision is 0x%x\r\n",
@ -360,7 +361,7 @@ static void sb600_devices_por_init(void)
/* IDE Device, BDF:0-20-1 */ /* IDE Device, BDF:0-20-1 */
printk(BIOS_INFO, "sb600_devices_por_init(): IDE Device, BDF:0-20-1\n"); printk(BIOS_INFO, "sb600_devices_por_init(): IDE Device, BDF:0-20-1\n");
pci_conf1_find_device(0x1002, 0x438C, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438C, &dev);
/* Disable prefetch */ /* Disable prefetch */
byte = pci_conf1_read_config8(dev, 0x63); byte = pci_conf1_read_config8(dev, 0x63);
byte |= 0x1; byte |= 0x1;
@ -368,7 +369,7 @@ static void sb600_devices_por_init(void)
/* LPC Device, BDF:0-20-3 */ /* LPC Device, BDF:0-20-3 */
printk(BIOS_INFO, "sb600_devices_por_init(): LPC Device, BDF:0-20-3\n"); printk(BIOS_INFO, "sb600_devices_por_init(): LPC Device, BDF:0-20-3\n");
pci_conf1_find_device(0x1002, 0x438D, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438D, &dev);
/* DMA enable */ /* DMA enable */
pci_conf1_write_config8(dev, 0x40, 0x04); pci_conf1_write_config8(dev, 0x40, 0x04);
@ -405,7 +406,7 @@ static void sb600_devices_por_init(void)
/* P2P Bridge, BDF:0-20-4, the configuration of the registers in this dev are copied from CIM, /* P2P Bridge, BDF:0-20-4, the configuration of the registers in this dev are copied from CIM,
* TODO: I don't know what are their mean? */ * TODO: I don't know what are their mean? */
printk(BIOS_INFO, "sb600_devices_por_init(): P2P Bridge, BDF:0-20-4\n"); printk(BIOS_INFO, "sb600_devices_por_init(): P2P Bridge, BDF:0-20-4\n");
pci_conf1_find_device(0x1002, 0x4384, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4384, &dev);
/* I don't know why CIM tried to write into a read-only reg! */ /* I don't know why CIM tried to write into a read-only reg! */
/*pci_conf1_write_config8(dev, 0x0c, 0x20) */ ; /*pci_conf1_write_config8(dev, 0x0c, 0x20) */ ;
@ -436,7 +437,7 @@ static void sb600_devices_por_init(void)
/* SATA Device, BDF:0-18-0, Non-Raid-5 SATA controller */ /* SATA Device, BDF:0-18-0, Non-Raid-5 SATA controller */
printk(BIOS_INFO, "sb600_devices_por_init(): SATA Device, BDF:0-18-0\n"); printk(BIOS_INFO, "sb600_devices_por_init(): SATA Device, BDF:0-18-0\n");
pci_conf1_find_device(0x1002, 0x4380, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4380, &dev);
/*PHY Global Control, we are using A14. /*PHY Global Control, we are using A14.
* default: 0x2c40 for ASIC revision A12 and below * default: 0x2c40 for ASIC revision A12 and below
@ -555,7 +556,7 @@ static void sb600_pci_cfg(void)
u8 byte; u8 byte;
/* SMBus Device, BDF:0-20-0 */ /* SMBus Device, BDF:0-20-0 */
pci_conf1_find_device(0x1002, 0x4385, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4385, &dev);
/* Eable the hidden revision ID, available after A13. */ /* Eable the hidden revision ID, available after A13. */
byte = pci_conf1_read_config8(dev, 0x70); byte = pci_conf1_read_config8(dev, 0x70);
byte |= (1 << 8); byte |= (1 << 8);
@ -588,14 +589,14 @@ static void sb600_pci_cfg(void)
} }
/* IDE Device, BDF:0-20-1 */ /* IDE Device, BDF:0-20-1 */
pci_conf1_find_device(0x1002, 0x438C, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438C, &dev);
/* Enable IDE Explicit prefetch, 0x63[0] clear */ /* Enable IDE Explicit prefetch, 0x63[0] clear */
byte = pci_conf1_read_config8(dev, 0x63); byte = pci_conf1_read_config8(dev, 0x63);
byte &= 0xfe; byte &= 0xfe;
pci_conf1_write_config8(dev, 0x63, byte); pci_conf1_write_config8(dev, 0x63, byte);
/* LPC Device, BDF:0-20-3 */ /* LPC Device, BDF:0-20-3 */
pci_conf1_find_device(0x1002, 0x438D, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x438D, &dev);
/* rpr7.2 Enabling LPC DMA function. */ /* rpr7.2 Enabling LPC DMA function. */
byte = pci_conf1_read_config8(dev, 0x40); byte = pci_conf1_read_config8(dev, 0x40);
byte |= (1 << 2); byte |= (1 << 2);
@ -610,7 +611,7 @@ static void sb600_pci_cfg(void)
pci_conf1_write_config8(dev, 0x78, byte); pci_conf1_write_config8(dev, 0x78, byte);
/* SATA Device, BDF:0-18-0, Non-Raid-5 SATA controller */ /* SATA Device, BDF:0-18-0, Non-Raid-5 SATA controller */
pci_conf1_find_device(0x1002, 0x4380, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4380, &dev);
/* rpr6.8 Disabling SATA MSI Capability, for A13 and above, 0x42[7]. */ /* rpr6.8 Disabling SATA MSI Capability, for A13 and above, 0x42[7]. */
if (0x12 < get_sb600_revision()) { if (0x12 < get_sb600_revision()) {
u32 reg32; u32 reg32;
@ -620,14 +621,14 @@ static void sb600_pci_cfg(void)
} }
/* EHCI Device, BDF:0-19-5, ehci usb controller */ /* EHCI Device, BDF:0-19-5, ehci usb controller */
pci_conf1_find_device(0x1002, 0x4386, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4386, &dev);
/* rpr5.10 Disabling USB EHCI MSI Capability. 0x50[6]. */ /* rpr5.10 Disabling USB EHCI MSI Capability. 0x50[6]. */
byte = pci_conf1_read_config8(dev, 0x50); byte = pci_conf1_read_config8(dev, 0x50);
byte |= (1 << 6); byte |= (1 << 6);
pci_conf1_write_config8(dev, 0x50, byte); pci_conf1_write_config8(dev, 0x50, byte);
/* OHCI0 Device, BDF:0-19-0, ohci usb controller #0 */ /* OHCI0 Device, BDF:0-19-0, ohci usb controller #0 */
pci_conf1_find_device(0x1002, 0x4387, &dev); pci_conf1_find_device(PCI_VENDOR_ID_ATI, 0x4387, &dev);
/* rpr5.11 Disabling USB OHCI MSI Capability. 0x40[12:8]=0x1f. */ /* rpr5.11 Disabling USB OHCI MSI Capability. 0x40[12:8]=0x1f. */
byte = pci_conf1_read_config8(dev, 0x41); byte = pci_conf1_read_config8(dev, 0x41);
byte |= 0x1f; byte |= 0x1f;

2
southbridge/amd/sb600/usb.c
View file

@ -101,7 +101,7 @@ static void usb_init2(struct device *dev)
/* dword |= 40; */ /* dword |= 40; */
/* pci_write_config32(dev, 0xf8, dword); */ /* pci_write_config32(dev, 0xf8, dword); */
usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF); usb2_bar0 = (u8 *) (pci_read_config32(dev, PCI_BASE_ADDRESS_0) & ~0xFF);
printk(BIOS_INFO, "usb2_bar0=%x\n", usb2_bar0); printk(BIOS_INFO, "usb2_bar0=%x\n", usb2_bar0);
/* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */ /* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */

6
southbridge/intel/i82371eb/i82371eb.c
View file

@ -54,9 +54,9 @@ static void i82371eb_ide_init(struct device *dev)
pci_write_config16(dev, 0x42, c); pci_write_config16(dev, 0x42, c);
printk(BIOS_INFO, "Enabling Legacy IDE\n"); printk(BIOS_INFO, "Enabling Legacy IDE\n");
c = pci_read_config16(dev, 4); c = pci_read_config16(dev, PCI_COMMAND);
c |= 1; c |= 1;
pci_write_config16(dev, 4, c); pci_write_config16(dev, PCI_COMMAND, c);
} }
static void i82371eb_acpi_init(struct device *dev) static void i82371eb_acpi_init(struct device *dev)
@ -71,7 +71,7 @@ static void i82371eb_acpi_init(struct device *dev)
/* smbus enable */ /* smbus enable */
pci_write_config8(dev, 0xd2, (0x4 << 1) | 1); pci_write_config8(dev, 0xd2, (0x4 << 1) | 1);
/* iospace enable */ /* iospace enable */
pci_write_config16(dev, 0x4, 1); pci_write_config16(dev, PCI_COMMAND, 1);
printk(BIOS_DEBUG, "Enable Power Management Functions\n"); printk(BIOS_DEBUG, "Enable Power Management Functions\n");
pm_io = 0xFF80; pm_io = 0xFF80;

2
southbridge/nvidia/mcp55/ide.c
View file

@ -60,7 +60,7 @@ static void ide_init(struct device *dev)
byte = 0x20 ; // Latency: 64-->32 byte = 0x20 ; // Latency: 64-->32
pci_write_config8(dev, 0xd, byte); pci_write_config8(dev, PCI_LATENCY_TIMER, byte);
dword = pci_read_config32(dev, 0xf8); dword = pci_read_config32(dev, 0xf8);
dword |= 12; dword |= 12;

4
southbridge/nvidia/mcp55/pci.c
View file

@ -43,10 +43,10 @@ static void pci_init(struct device *dev)
#endif #endif
/* System error enable */ /* System error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1<<8); /* System error enable */ dword |= (1<<8); /* System error enable */
dword |= (1<<30); /* Clear possible errors */ dword |= (1<<30); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
#if 1 #if 1
//only need (a01,xx] //only need (a01,xx]

4
southbridge/nvidia/mcp55/pcie.c
View file

@ -39,10 +39,10 @@ static void pcie_init(struct device *dev)
u32 dword; u32 dword;
/* System error enable */ /* System error enable */
dword = pci_read_config32(dev, 0x04); dword = pci_read_config32(dev, PCI_COMMAND);
dword |= (1<<8); /* System error enable */ dword |= (1<<8); /* System error enable */
dword |= (1<<30); /* Clear possible errors */ dword |= (1<<30); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, PCI_COMMAND, dword);
} }