[coreboot-gerrit] Patch set updated for coreboot: x86: make PCI MMIO CFG functions 64bit proof

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Sat Jun 20 02:09:33 CEST 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10577

-gerrit

commit 86b9f8e35562040404543c434202f96d91a3df12
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Wed Jun 17 16:12:17 2015 -0700

    x86: make PCI MMIO CFG functions 64bit proof
    
    Change-Id: Ife94f5324971f4fa03e9139f458b985f6fed9d87
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
    Signed-off-by: Scott Duplichan <scott at notabs.org>
---
 src/arch/x86/include/arch/pci_mmio_cfg.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index fb582dd..eec9d97 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -29,7 +29,7 @@ static inline __attribute__ ((always_inline))
 u8 pcie_read_config8(pci_devfn_t dev, unsigned int where)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | where);
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | where);
 	return read8(addr);
 }
 
@@ -37,7 +37,7 @@ static inline __attribute__ ((always_inline))
 u16 pcie_read_config16(pci_devfn_t dev, unsigned int where)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | (where & ~1));
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~1));
 	return read16(addr);
 }
 
@@ -45,7 +45,7 @@ static inline __attribute__ ((always_inline))
 u32 pcie_read_config32(pci_devfn_t dev, unsigned int where)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | (where & ~3));
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~3));
 	return read32(addr);
 }
 
@@ -53,7 +53,7 @@ static inline __attribute__ ((always_inline))
 void pcie_write_config8(pci_devfn_t dev, unsigned int where, u8 value)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | where);
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | where);
 	write8(addr, value);
 }
 
@@ -61,7 +61,7 @@ static inline __attribute__ ((always_inline))
 void pcie_write_config16(pci_devfn_t dev, unsigned int where, u16 value)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | (where & ~1));
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~1));
 	write16(addr, value);
 }
 
@@ -69,7 +69,7 @@ static inline __attribute__ ((always_inline))
 void pcie_write_config32(pci_devfn_t dev, unsigned int where, u32 value)
 {
 	void *addr;
-	addr = (void *)(DEFAULT_PCIEXBAR | dev | (where & ~3));
+	addr = (void *)(uintptr_t)(DEFAULT_PCIEXBAR | dev | (where & ~3));
 	write32(addr, value);
 }
 



More information about the coreboot-gerrit mailing list