Add a full set of pci access functions.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3479 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 17 insertions, 12 deletions

diff --git a/payloads/libpayload/include/pci.h b/payloads/libpayload/include/pci.h
index df88e098ab..bcc333ce9e 100644
--- a/payloads/libpayload/include/pci.h
+++ b/payloads/libpayload/include/pci.h
@@ -2,6 +2,7 @@
  * This file is part of the libpayload project.
  *
  * Copyright (C) 2008 Advanced Micro Devices, Inc.
+ * Copyright (C) 2008 coresystems GmbH
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,7 +31,8 @@
 #ifndef _PCI_H
 #define _PCI_H
 
-typedef unsigned short pcidev_t;
+#include <arch/types.h>
+typedef u32 pcidev_t;
 
 #define REG_VENDOR_ID   0x00
 #define REG_DEVICE_ID   0x04
@@ -41,21 +43,24 @@ typedef unsigned short pcidev_t;
 #define HEADER_TYPE_BRIDGE  1
 #define HEADER_TYPE_CARDBUS 2
 
-#define PCIDEV(_b, _d) ((((_b) & 0xFF) << 8) | ((_d) & 0xFF))
+#define PCI_ADDR(_bus, _dev, _fn, _reg) \
+(0x80000000 | (_bus << 16) | (_dev << 11) | (_fn << 8) | (_reg & ~3))
 
-#define PCIDEV_BUS(_d) (((_d) >> 8) & 0xFF)
-#define PCIDEV_DEVFN(_d) ((_d) & 0xFF)
+#define PCI_DEV(_bus, _dev, _fn) \
+(0x80000000 | (_bus << 16) | (_dev << 11) | (_fn << 8))
 
-#define PCI_ADDR(_bus, _dev, _reg) \
-(0x80000000 | (_bus << 16) | (_dev << 8) | (_reg & ~3))
+#define PCI_SLOT(_d) ((_d >> 11) & 0x1f)
+#define PCI_FUNC(_d) ((_d >> 8) & 0x7)
 
-void pci_read_dword(unsigned int bus, unsigned int devfn,
-		    unsigned int reg, unsigned int *val);
+u8 pci_read_config8(u32 device, u16 reg);
+u16 pci_read_config16(u32 device, u16 reg);
+u32 pci_read_config32(u32 device, u16 reg);
 
-void pci_read_byte(unsigned int bus, unsigned int devfn,
-		   unsigned int reg, unsigned char *val);
+void pci_write_config8(u32 device, u16 reg, u8 val);
+void pci_write_config16(u32 device, u16 reg, u16 val);
+void pci_write_config32(u32 device, u16 reg, u32 val);
 
-int pci_find_device(unsigned short vid, unsigned short did, pcidev_t *dev);
-unsigned int pci_read_resource(pcidev_t dev, int bar);
+int pci_find_device(u16 vid, u16 did, pcidev_t *dev);
+u32 pci_read_resource(pcidev_t dev, int bar);
 
 #endif