drop extra pci access functions. these are exact copies of romcc_io.h.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



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

2 files changed, 23 insertions, 214 deletions

diff --git a/src/northbridge/via/vx800/pci_rawops.h b/src/northbridge/via/vx800/pci_rawops.h
index 7fabc3e105..4894f22b2b 100644
--- a/src/northbridge/via/vx800/pci_rawops.h
+++ b/src/northbridge/via/vx800/pci_rawops.h
@@ -2,11 +2,11 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2009 One Laptop per Child, Association, Inc.
+ * Copyright (C) 2010 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,14 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef ARCH_I386_PCI_RAWOPS_H
-# define ARCH_I386_PCI_RAWOPS_H 1
-#include <stdint.h>
+#ifndef NORTHBRIDGE_VIA_VX800_PCI_RAWOPS_H
+#define NORTHBRIDGE_VIA_VX800_PCI_RAWOPS_H
 
-#define PCI_RAWDEV(SEGBUS, DEV, FN) ( \
-        (((SEGBUS) & 0xFFF) << 20) | \
-        (((DEV) & 0x1F) << 15) | \
-        (((FN)  & 0x07) << 12))
+#include <stdint.h>
+#include <arch/romcc_io.h>
 
 struct VIA_PCI_REG_INIT_TABLE {
 	u8 ChipRevisionStart;
@@ -38,219 +35,31 @@ struct VIA_PCI_REG_INIT_TABLE {
 	u8 Value;
 };
 
-typedef unsigned device_t_raw;	/* pci and pci_mmio need to have different ways to have dev */
-
-#warning "FIXME: get rid of this extra copy of pci access functions."
-
-/* FIXME: We need to make the coreboot to run at 64bit mode, So when read/write memory above 4G,
- * We don't need to set %fs, and %gs anymore
- * Before that We need to use %gs, and leave %fs to other RAM access
- */
-static u8 pci_io_rawread_config8(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);	//seg == 0
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	return inb(0xCFC + (addr & 3));
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static u8 pci_mmio_rawread_config8(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-	addr = dev | where;
-	return read8x(addr);
-}
-#endif
-static u8 pci_rawread_config8(device_t_raw dev, unsigned where)
-{
-#if CONFIG_MMCONF_SUPPORT
-	return pci_mmio_rawread_config8(dev, where);
-#else
-	return pci_io_rawread_config8(dev, where);
-#endif
-}
-
-static u16 pci_io_rawread_config16(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	return inw(0xCFC + (addr & 2));
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static u16 pci_mmio_rawread_config16(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-	addr = dev | where;
-	return read16x(addr);
-}
-#endif
-
-static u16 pci_rawread_config16(device_t_raw dev, unsigned where)
-{
-#if CONFIG_MMCONF_SUPPORT
-	return pci_mmio_rawread_config16(dev, where);
-#else
-	return pci_io_rawread_config16(dev, where);
-#endif
-}
-
-static u32 pci_io_rawread_config32(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	return inl(0xCFC);
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static u32 pci_mmio_rawread_config32(device_t_raw dev, unsigned where)
-{
-	unsigned addr;
-	addr = dev | where;
-	return read32x(addr);
-}
-#endif
-
-static u32 pci_rawread_config32(device_t_raw dev, unsigned where)
-{
-#if CONFIG_MMCONF_SUPPORT
-	return pci_mmio_rawread_config32(dev, where);
-#else
-	return pci_io_rawread_config32(dev, where);
-#endif
-}
-
-static void pci_io_rawwrite_config8(device_t_raw dev, unsigned where, u8 value)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	outb(value, 0xCFC + (addr & 3));
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static void pci_mmio_rawwrite_config8(device_t_raw dev, unsigned where, u8 value)
-{
-	unsigned addr;
-	addr = dev | where;
-	write8x(addr, value);
-}
-#endif
-
-static void pci_rawwrite_config8(device_t_raw dev, unsigned where, u8 value)
-{
-#if CONFIG_MMCONF_SUPPORT
-	pci_mmio_rawwrite_config8(dev, where, value);
-#else
-	pci_io_rawwrite_config8(dev, where, value);
-#endif
-}
-
-static void pci_io_rawwrite_config16(device_t_raw dev, unsigned where, u16 value)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	outw(value, 0xCFC + (addr & 2));
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static void pci_mmio_rawwrite_config16(device_t_raw dev, unsigned where,
-				u16 value)
-{
-	unsigned addr;
-	addr = dev | where;
-	write16x(addr, value);
-}
-#endif
-
-static void pci_rawwrite_config16(device_t_raw dev, unsigned where, u16 value)
-{
-#if CONFIG_MMCONF_SUPPORT
-	pci_mmio_rawwrite_config16(dev, where, value);
-#else
-	pci_io_rawwrite_config16(dev, where, value);
-#endif
-}
-
-static void pci_io_rawwrite_config32(device_t_raw dev, unsigned where, u32 value)
-{
-	unsigned addr;
-#if CONFIG_PCI_IO_CFG_EXT == 0
-	addr = (dev >> 4) | where;
-#else
-	addr = (dev >> 4) | (where & 0xff) | ((where & 0xf00) << 16);
-#endif
-	outl(0x80000000 | (addr & ~3), 0xCF8);
-	outl(value, 0xCFC);
-}
-
-#if CONFIG_MMCONF_SUPPORT
-static void pci_mmio_rawwrite_config32(device_t_raw dev, unsigned where, u32 value)
-{
-	unsigned addr;
-	addr = dev | where;
-	write32x(addr, value);
-}
-#endif
-
-static void pci_rawwrite_config32(device_t_raw dev, unsigned where, u32 value)
-{
-#if CONFIG_MMCONF_SUPPORT
-	pci_mmio_rawwrite_config32(dev, where, value);
-#else
-	pci_io_rawwrite_config32(dev, where, value);
-#endif
-}
-
-static void pci_rawmodify_config8(device_t_raw dev, unsigned where, u8 orval, u8 mask)
+static void pci_modify_config8(device_t dev, unsigned where, u8 orval, u8 mask)
 {
-	u8 data = pci_rawread_config8(dev, where);
+	u8 data = pci_read_config8(dev, where);
 	data &= (~mask);
 	data |= orval;
-	pci_rawwrite_config8(dev, where, data);
+	pci_write_config8(dev, where, data);
 }
 
-static void pci_rawmodify_config16(device_t_raw dev, unsigned where, u16 orval, u16 mask)
+static void pci_modify_config16(device_t dev, unsigned where, u16 orval, u16 mask)
 {
-	u16 data = pci_rawread_config16(dev, where);
+	u16 data = pci_read_config16(dev, where);
 	data &= (~mask);
 	data |= orval;
-	pci_rawwrite_config16(dev, where, data);
+	pci_write_config16(dev, where, data);
 }
 
-static void pci_rawmodify_config32(device_t_raw dev, unsigned where, u32 orval, u32 mask)
+static void pci_modify_config32(device_t dev, unsigned where, u32 orval, u32 mask)
 {
-	u32 data = pci_rawread_config32(dev, where);
+	u32 data = pci_read_config32(dev, where);
 	data &= (~mask);
 	data |= orval;
-	pci_rawwrite_config32(dev, where, data);
+	pci_write_config32(dev, where, data);
 }
 
-static void io_rawmodify_config8(u16 where, u8 orval, u8 mask)
+static void io_modify_config8(u16 where, u8 orval, u8 mask)
 {
 	u8 data = inb(where);
 	data &= (~mask);
@@ -262,7 +71,7 @@ static void via_pci_inittable(u8 chipversion,
 		       const struct VIA_PCI_REG_INIT_TABLE *initdata)
 {
 	u8 i = 0;
-	device_t_raw devbxdxfx;
+	device_t devbxdxfx;
 	for (i = 0;; i++) {
 		if ((initdata[i].Mask == 0) && (initdata[i].Value == 0)
 		    && (initdata[i].Bus == 0)
@@ -275,9 +84,9 @@ static void via_pci_inittable(u8 chipversion,
 		if ((chipversion >= initdata[i].ChipRevisionStart)
 		    && (chipversion <= initdata[i].ChipRevisionEnd)) {
 			devbxdxfx =
-			    PCI_RAWDEV(initdata[i].Bus, initdata[i].Device,
+			    PCI_DEV(initdata[i].Bus, initdata[i].Device,
 				       initdata[i].Function);
-			pci_rawmodify_config8(devbxdxfx,
+			pci_modify_config8(devbxdxfx,
 					      initdata[i].Register,
 					      initdata[i].Value,
 					      initdata[i].Mask);
diff --git a/src/northbridge/via/vx800/uma_ram_setting.c b/src/northbridge/via/vx800/uma_ram_setting.c
index 6fe8194922..d03d25f605 100644
--- a/src/northbridge/via/vx800/uma_ram_setting.c
+++ b/src/northbridge/via/vx800/uma_ram_setting.c
@@ -172,11 +172,11 @@ void SetUMARam(void)
 	Tmp = VIACONFIG_VGA_PCI_14;
 	pci_write_config32(vga_dev, 0x14, Tmp);
 
-//enable direct cpu frame buffer access
-	i = pci_rawread_config8(PCI_RAWDEV(0, 0, 3), 0xa1);
+	//enable direct cpu frame buffer access
+	i = pci_read_config8(PCI_DEV(0, 0, 3), 0xa1);
 	i = (i & 0xf0) | (VIACONFIG_VGA_PCI_10 >> 28);
-	pci_rawwrite_config8(PCI_RAWDEV(0, 0, 3), 0xa1, i);
-	pci_rawwrite_config8(PCI_RAWDEV(0, 0, 3), 0xa0, 0x01);
+	pci_write_config8(PCI_DEV(0, 0, 3), 0xa1, i);
+	pci_write_config8(PCI_DEV(0, 0, 3), 0xa0, 0x01);
 
 	//enable GFx memory space access control for S.L and mmio
 	ByteVal = pci_read_config8(d0f0_dev, 0xD4);