X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=payloads%2Fcoreinfo%2Fpci_module.c;h=6af3a74156ba1d04351a874f3dea268c7099f1b9;hb=cd913bdf5c995fb3768aaaaeec364e7f5527e4e9;hp=49523f55bc3c7aa7df7e3bbf1b4d9106d3a5c1d8;hpb=ab5b3e0d985cdfb0d882f52b73a77c6f551918f3;p=coreboot.git

diff --git a/payloads/coreinfo/pci_module.c b/payloads/coreinfo/pci_module.c
index 49523f55b..6af3a7415 100644
--- a/payloads/coreinfo/pci_module.c
+++ b/payloads/coreinfo/pci_module.c
@@ -18,29 +18,21 @@
  */
 
 #include <arch/io.h>
+#include <pci.h>
+#include <libpayload.h>
 #include "coreinfo.h"
 
 #ifdef CONFIG_MODULE_PCI
 
 struct pci_devices {
-	unsigned short device;
+	pcidev_t device;
 	unsigned int id;
 };
 
-static struct pci_devices devices[64];
+#define MAX_PCI_DEVICES 64
+static struct pci_devices devices[MAX_PCI_DEVICES];
 static int devices_index;
 
-#define REG_VENDOR_ID   0x00
-#define REG_HEADER_TYPE 0x0e
-#define REG_PRIMARY_BUS 0x18
-
-#define HEADER_TYPE_NORMAL  0
-#define HEADER_TYPE_BRIDGE  1
-#define HEADER_TYPE_CARDBUS 2
-
-#define PCI_ADDR(_bus, _dev, _reg) \
-	(0x80000000 | (_bus << 16) | (_dev << 8) | (_reg & ~3))
-
 /* Number of entries to show in the list */
 #define MENU_VISIBLE 16
 
@@ -94,33 +86,18 @@ static void quicksort(struct pci_devices *list, int len)
 	quicksort(&(list[index]), len - index);
 }
 
-static void pci_read_dword(unsigned int bus, unsigned int devfn,
-			   unsigned int reg, unsigned int *val)
-{
-	outl(PCI_ADDR(bus, devfn, reg), 0xcf8);
-	*val = inl(0xcfc);
-}
-
-static void pci_read_byte(unsigned int bus, unsigned int devfn,
-			  unsigned int reg, unsigned char *val)
-{
-	outl(PCI_ADDR(bus, devfn, reg), 0xcf8);
-	*val = inb(0xcfc + (reg & 3));
-}
-
 static void show_config_space(WINDOW *win, int row, int col, int index)
 {
-	unsigned char cspace[64];
-	int bus, devfn;
+	unsigned char cspace[256];
+	pcidev_t dev;
 	int i, x, y;
 
-	bus = (devices[index].device >> 8) & 0xff;
-	devfn = devices[index].device & 0xff;
+	dev = devices[index].device;
 
-	for (i = 0; i < 64; i += 4)
-		pci_read_dword(bus, devfn, i, ((unsigned int *)&cspace[i]));
+	for (i = 0; i < 256; i ++)
+		cspace[i] = pci_read_config8(dev, i);
 
-	for (y = 0; y < 4; y++) {
+	for (y = 0; y < 16; y++) {
 		for (x = 0; x < 16; x++)
 			mvwprintw(win, row + y, col + (x * 3), "%2.2X ",
 				  cspace[(y * 16) + x]);
@@ -129,7 +106,7 @@ static void show_config_space(WINDOW *win, int row, int col, int index)
 
 static int pci_module_redraw(WINDOW *win)
 {
-	unsigned int bus, devfn, func;
+	unsigned int bus, slot, func;
 	int i, last;
 
 	print_module_title(win, "PCI Device List");
@@ -149,9 +126,9 @@ static int pci_module_redraw(WINDOW *win)
 			continue;
 		}
 
-		bus = (devices[item].device >> 8) & 0xff;
-		devfn = (devices[item].device & 0xff) / 8;
-		func = (devices[item].device & 0xff) % 8;
+		bus = PCI_BUS(devices[item].device);
+		slot = PCI_SLOT(devices[item].device);
+		func = PCI_FUNC(devices[item].device);
 
 		if (item == menu_selected)
 			wattrset(win, COLOR_PAIR(3) | A_BOLD);
@@ -159,7 +136,7 @@ static int pci_module_redraw(WINDOW *win)
 			wattrset(win, COLOR_PAIR(2));
 
 		mvwprintw(win, 2 + i, 1, "%X:%2.2X.%2.2X %04X:%04X  ",
-			  bus, devfn, func,
+			  bus, slot, func,
 			  devices[item].id & 0xffff,
 			  (devices[item].id >> 16) & 0xffff);
 
@@ -167,11 +144,11 @@ static int pci_module_redraw(WINDOW *win)
 
 		if (i == 0) {
 			if (item != 0)
-				mvwprintw(win, 2 + i, 19, "\30");
+				mvwaddch(win, 2 + i, 19, ACS_UARROW);
 		}
 		if (i == MENU_VISIBLE - 1) {
 			if ((item + 1) < devices_index)
-				mvwprintw(win, 2 + i, 19, "\31");
+				mvwaddch(win, 2 + i, 19, ACS_DARROW);
 		}
 	}
 
@@ -183,12 +160,12 @@ static int pci_module_redraw(WINDOW *win)
 	wmove(win, 3, 25);
 
 	for (i = 0; i < 48; i++)
-		waddch(win, (i == 0) ? '\332' : '\304');
+		waddch(win, (i == 0) ? ACS_ULCORNER : ACS_HLINE);
 
-	for (i = 0; i < 4; i++) {
+	for (i = 0; i < 16; i++) {
 		mvwprintw(win, 4 + i, 23, "%2.2X", i * 16);
 		wmove(win, 4 + i, 25);
-		waddch(win, '\263');
+		waddch(win, ACS_VLINE);
 	}
 
 	show_config_space(win, 4, 26, menu_selected);
@@ -198,13 +175,15 @@ static int pci_module_redraw(WINDOW *win)
 
 static void pci_scan_bus(int bus)
 {
-	int devfn, func;
+	int slot, func;
 	unsigned int val;
 	unsigned char hdr;
 
-	for (devfn = 0; devfn < 0x100;) {
-		for (func = 0; func < 8; func++, devfn++) {
-			pci_read_dword(bus, devfn, REG_VENDOR_ID, &val);
+	for (slot = 0; slot < 0x20; slot++) {
+		for (func = 0; func < 8; func++) {
+			pcidev_t dev = PCI_DEV(bus, slot, func);
+
+			val = pci_read_config32(dev, REG_VENDOR_ID);
 
 			/* Nobody home. */
 			if (val == 0xffffffff || val == 0x00000000 ||
@@ -212,23 +191,22 @@ static void pci_scan_bus(int bus)
 				continue;
 
 			/* FIXME: Remove this arbitrary limitation. */
-			if (devices_index >= 64)
+			if (devices_index >= MAX_PCI_DEVICES)
 				return;
 
 			devices[devices_index].device =
-			    ((bus & 0xff) << 8) | (devfn & 0xff);
+			    PCI_DEV(bus, slot, func);
 
 			devices[devices_index++].id = val;
 
 			/* If this is a bridge, then follow it. */
-			pci_read_byte(bus, devfn, REG_HEADER_TYPE, &hdr);
+			hdr = pci_read_config8(dev, REG_HEADER_TYPE);
 			hdr &= 0x7f;
 			if (hdr == HEADER_TYPE_BRIDGE ||
 			    hdr == HEADER_TYPE_CARDBUS) {
 				unsigned int busses;
 
-				pci_read_dword(bus, devfn, REG_PRIMARY_BUS,
-					       &busses);
+				busses = pci_read_config32(dev, REG_PRIMARY_BUS);
 
 				pci_scan_bus((busses >> 8) & 0xff);