[coreboot] [v2] r4336 - trunk/coreboot-v2/src/southbridge/amd/rs690
svn at coreboot.org
svn at coreboot.org
Thu Jun 4 03:57:03 CEST 2009
Author: zbao
Date: 2009-06-04 03:57:03 +0200 (Thu, 04 Jun 2009)
New Revision: 4336
Modified:
trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c
trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_pcie.c
Log:
This patch is about some noticable bugs which was made by no reason.
1. In rs690_cmn.c, mask the lower 4 bits of the BAR3. No doubt, right?
2. In rs690_pcie.c,
(1) Obviously, the mask should be 0xF, and bit 19 should be set to 1 (in comment).
In rpr 5.10.2, step 2, step 2.1 & step 2.6
(2) The dynamic buffer allocation is enabled by setting bit 11 of PCIEIND: 0x20,
instead of PCIEIND_P: 0x20.
In rpr 5.10.2, step 5. Dynamic Slave CPL Buffer Allocation
Signed-off-by: Zheng Bao <zheng.bao at amd.com>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>
Modified: trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c 2009-06-03 14:19:33 UTC (rev 4335)
+++ trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c 2009-06-04 01:57:03 UTC (rev 4336)
@@ -49,7 +49,7 @@
u32 pci_ext_read_config32(device_t nb_dev, device_t dev, u32 reg)
{
/*get BAR3 base address for nbcfg0x1c */
- u32 addr = pci_read_config32(nb_dev, 0x1c);
+ u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
printk_debug("addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);
addr |= dev->bus->secondary << 20 | /* bus num */
@@ -62,7 +62,7 @@
u32 reg_old, reg;
/*get BAR3 base address for nbcfg0x1c */
- u32 addr = pci_read_config32(nb_dev, 0x1c);
+ u32 addr = pci_read_config32(nb_dev, 0x1c) & ~0xF;
/*printk_debug("write: addr=%x,bus=%x,devfn=%x\n", addr, dev->bus->secondary,
dev->path.pci.devfn);*/
addr |= dev->bus->secondary << 20 | /* bus num */
Modified: trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_pcie.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_pcie.c 2009-06-03 14:19:33 UTC (rev 4335)
+++ trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_pcie.c 2009-06-04 01:57:03 UTC (rev 4336)
@@ -212,8 +212,8 @@
set_pcie_enable_bits(nb_dev, 0x02 | PCIE_CORE_INDEX_GPPSB, 1 << 0, 1 << 0); /* no description in datasheet. */
/* init GPPSB port */
- /* Sets RCB timeout to be 100ms by setting bits[18:16] to 3 b101 and shortens the enumeration timer by setting bit[19] to 0*/
- set_pcie_enable_bits(dev, 0x70, 7 << 16, 0xd << 16);
+ /* Sets RCB timeout to be 100ms by setting bits[18:16] to 3 b101 and shortens the enumeration timer by setting bit[19] to 1*/
+ set_pcie_enable_bits(dev, 0x70, 0xF << 16, 0xd << 16);
/* PCIE initialization 5.10.2: rpr 2.4 */
set_pcie_enable_bits(dev, 0x02, ~0xffffffff, 1 << 14);
/* Do not gate the electrical idle from the PHY and enables the escape from L1L23 */
@@ -240,7 +240,7 @@
}
/* step 5: dynamic slave CPL buffer allocation */
- set_pcie_enable_bits(dev, 0x20, 1 << 11, 1 << 11);
+ set_pcie_enable_bits(nb_dev, 0x20 | PCIE_CORE_INDEX_GPPSB, 1 << 11, 1 << 11);
/* step 5a: Training for GPP devices */
/* init GPP */
More information about the coreboot
mailing list