From 117597c94ca5a46a33e2fdaf3b0866241ba7da88 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Sat, 17 Jul 2010 22:42:33 +0000 Subject: Use the BAR value returned by pcidev_init which automatically applies the correct BAR mask for the drkaiser driver. Truncate flash chip addresses to fit into the 128 kB memory window for drkaiser and pick the same window size for gfxnvidia. Uwe tested all operations successfully on a Dr. Kaiser card. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Uwe Hermann git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1089 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- gfxnvidia.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gfxnvidia.c') diff --git a/gfxnvidia.c b/gfxnvidia.c index 962ba1a..29e2910 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -25,6 +25,11 @@ #define PCI_VENDOR_ID_NVIDIA 0x10de +/* Mask to restrict flash accesses to a 128kB memory window. + * FIXME: Is this size a one-fits-all or card dependent? + */ +#define GFXNVIDIA_MEMMAP_MASK ((1 << 17) - 1) + uint8_t *nvidia_bar; const struct pcidev_status gfx_nvidia[] = { @@ -95,10 +100,10 @@ int gfxnvidia_shutdown(void) void gfxnvidia_chip_writeb(uint8_t val, chipaddr addr) { - mmio_writeb(val, nvidia_bar + addr); + mmio_writeb(val, nvidia_bar + (addr & GFXNVIDIA_MEMMAP_MASK)); } uint8_t gfxnvidia_chip_readb(const chipaddr addr) { - return mmio_readb(nvidia_bar + addr); + return mmio_readb(nvidia_bar + (addr & GFXNVIDIA_MEMMAP_MASK)); } -- cgit v1.2.1