[coreboot] r943 - in coreboot-v3: mainboard/amd/serengeti northbridge/amd/k8
svn at coreboot.org
svn at coreboot.org
Wed Oct 22 20:55:55 CEST 2008
Author: myles
Date: 2008-10-22 20:55:55 +0200 (Wed, 22 Oct 2008)
New Revision: 943
Modified:
coreboot-v3/mainboard/amd/serengeti/initram.c
coreboot-v3/mainboard/amd/serengeti/mainboard.c
coreboot-v3/northbridge/amd/k8/util.c
Log:
This patch cleans up the showallroutes utility:
1. fix if->in in comments
2. change width of output for different types
3. make all masks 0x so that it's easy to tell a mask
It also changes the invocations to do function 1 instead of 0.
I think we should consider a name that makes it clear that this is only good
for AMD K8+ processors function 1. We might need a similar utility for other
functions later.
Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>
Modified: coreboot-v3/mainboard/amd/serengeti/initram.c
===================================================================
--- coreboot-v3/mainboard/amd/serengeti/initram.c 2008-10-22 18:31:42 UTC (rev 942)
+++ coreboot-v3/mainboard/amd/serengeti/initram.c 2008-10-22 18:55:55 UTC (rev 943)
@@ -250,7 +250,7 @@
dump_pci_device_index_wait(PCI_DEV(0, 0x19, 2), 0x98);
#endif
- showallroutes(BIOS_DEBUG, PCI_BDF(0,0x18, 0));
+ showallroutes(BIOS_DEBUG, PCI_BDF(0,0x18, 1));
printk(BIOS_DEBUG, "stage1 returns\n");
return 0;
Modified: coreboot-v3/mainboard/amd/serengeti/mainboard.c
===================================================================
--- coreboot-v3/mainboard/amd/serengeti/mainboard.c 2008-10-22 18:31:42 UTC (rev 942)
+++ coreboot-v3/mainboard/amd/serengeti/mainboard.c 2008-10-22 18:55:55 UTC (rev 943)
@@ -35,14 +35,14 @@
static void show(struct device *dev)
{
- showallroutes(BIOS_DEBUG, PCI_BDF(0,0x18, 0));
+ showallroutes(BIOS_DEBUG, PCI_BDF(0,0x18, 1));
}
struct device_operations serengeti = {
.id = {.type = DEVICE_ID_PCI,
{.pci = {.vendor = PCI_VENDOR_ID_AMD,
- .device = 1}}},
- .constructor = default_device_constructor,
+ .device = 1}}},
+ .constructor = default_device_constructor,
.phase6_init = show,
};
Modified: coreboot-v3/northbridge/amd/k8/util.c
===================================================================
--- coreboot-v3/northbridge/amd/k8/util.c 2008-10-22 18:31:42 UTC (rev 942)
+++ coreboot-v3/northbridge/amd/k8/util.c 2008-10-22 18:55:55 UTC (rev 943)
@@ -79,7 +79,7 @@
*/
static int node(u32 reg)
{
- return BITS(reg, 0, 7);
+ return BITS(reg, 0, 0x7);
}
/**
@@ -88,7 +88,7 @@
*/
static int link(u32 reg)
{
- return BITS(reg, 4, 3);
+ return BITS(reg, 4, 0x3);
}
@@ -103,9 +103,9 @@
*/
void showdram(int level, u8 which, u32 base, u32 lim)
{
- printk(level, "DRAM(%02x)%08x-%08x, ->(%d), %s, %s, %s, %d\n",
- which, ((base&0xfff0000)<<8),
- ((lim&0xffff0000<<8))+0xffffff,
+ printk(level, "DRAM(%02x)%010llx-%010llx, ->(%d), %s, %s, %s, %d\n",
+ which, (((u64)base&0xffff0000)<<8),
+ (((u64)lim&0xffff0000)<<8)+0xffffff,
node(lim), re(base), we(base),
ileave(base), (lim>>8)&3);
}
@@ -121,10 +121,10 @@
void showconfig(int level, u8 which, u32 reg)
{
/* don't use node() and link() here */
- printk(level, "CONFIG(%02x)%08x-%08x ->(%d,%d),%s %s CE %d\n",
+ printk(level, "CONFIG(%02x)%02x-%02x ->(%d,%d),%s %s CE %d\n",
which, BITS(reg, 24, 0xff), BITS(reg, 16, 0xff),
- BITS(reg, 4, 7), BITS(reg, 8, 3),
- re(reg), we(reg), BITS(reg, 0, 4));
+ BITS(reg, 4, 0x7), BITS(reg, 8, 0x3),
+ re(reg), we(reg), BITS(reg, 2, 0x1));
}
/**
@@ -138,15 +138,16 @@
*/
void showpciio(int level, u8 which, u32 base, u32 lim)
{
- printk(level, "PCIIO(%02x)%08x-%08x, ->(%d,%d), %s, %s,VGA %d ISA %d\n",
- which, BITS(base, 12, 0x3fff), BITS(lim, 12, 0x3fff),
+ printk(level, "PCIIO(%02x)%07x-%07x, ->(%d,%d), %s, %s,VGA %d ISA %d\n",
+ which, BITS(base, 12, 0x3fff)<<12,
+ (BITS(lim, 12, 0x3fff)<<12) + 0xfff,
node(lim), link(lim),
re(base), we(base),
- BITS(base, 4, 1), BITS(base, 5, 1));
+ BITS(base, 4, 0x1), BITS(base, 5, 0x1));
}
/**
- * Print the pciio routing info for one base/limit pair.
+ * Print the mmio routing info for one base/limit pair.
* Show base, limit, dest node, dest link on that node, read and write enable, and
* CPU Disable, Lock, and Non-posted.
* @param level printing level
@@ -156,19 +157,19 @@
*/
void showmmio(int level, u8 which, u32 base, u32 lim)
{
- printk(level, "MMIO(%02x)%08x-%08x, ->(%d,%d), %s, %s, CPU disable %d, Lock %d, Non posted %d\n",
- which, BITS(base, 0, 0xffffff00)<<8,
- (BITS(lim, 0, 0xffffff00)<<8)+0xffff,
+ printk(level, "MMIO(%02x)%010llx-%010llx, ->(%d,%d), %s, %s, CPU disable %d, Lock %d, Non posted %d\n",
+ which, ((u64)BITS(base, 0, 0xffffff00))<<8,
+ (((u64)BITS(lim, 0, 0xffffff00))<<8)+0xffff,
node(lim), link(lim), re(base), we(base),
- BITS(base, 4, 1),
- BITS(base, 7, 1), BITS(lim, 7, 1));
+ BITS(base, 4, 0x1),
+ BITS(base, 7, 0x1), BITS(lim, 7, 0x1));
}
/**
* Show all dram routing registers. This function is callable at any time.
* @param level The debug level
- * @param dev 32-bit number if the standard bus/dev/fn format which is used raw config space
+ * @param dev 32-bit number in the standard bus/dev/fn format which is used raw config space
*/
void showalldram(int level, u32 dev)
{
@@ -183,7 +184,7 @@
/**
* Show all mmio routing registers. This function is callable at any time.
* @param level The debug level
- * @param dev 32-bit number if the standard bus/dev/fn format which is used raw config space
+ * @param dev 32-bit number in the standard bus/dev/fn format which is used raw config space
*/
void showallmmio(int level, u32 dev)
{
@@ -198,7 +199,7 @@
/**
* Show all pciio routing registers. This function is callable at any time.
* @param level The debug level
- * @param dev 32-bit number if the standard bus/dev/fn format which is used raw config space
+ * @param dev 32-bit number in the standard bus/dev/fn format which is used raw config space
*/
void showallpciio(int level, u32 dev)
{
@@ -213,7 +214,7 @@
/**
* Show all config routing registers. This function is callable at any time.
* @param level The debug level
- * @param dev 32-bit number if the standard bus/dev/fn format which is used raw config space
+ * @param dev 32-bit number in the standard bus/dev/fn format which is used raw config space
*/
void showallconfig(int level, u32 dev)
{
@@ -227,7 +228,7 @@
/**
* Show all routing registers. This function is callable at any time.
* @param level The debug level
- * @param dev 32-bit number if the standard bus/dev/fn format which is used raw config space
+ * @param dev 32-bit number in the standard bus/dev/fn format which is used raw config space
*/
void showallroutes(int level, u32 dev)
{
More information about the coreboot
mailing list