x86: flatten hierarchy

It never made sense to have bootblock_* in init, but
pirq_routing.c in boot, and some ld scripts on the main
level while others live in subdirectories.

This patch flattens the directory hierarchy and makes
x86 more similar to the other architectures.

Change-Id: I4056038fe7813e4d3d3042c441e7ab6076a36384
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10901
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

1 files changed, 71 insertions, 0 deletions

diff --git a/src/arch/x86/pci_ops_conf1.c b/src/arch/x86/pci_ops_conf1.c
new file mode 100644
index 0000000000..77df4b314f
--- /dev/null
+++ b/src/arch/x86/pci_ops_conf1.c
@@ -0,0 +1,71 @@
+#include <console/console.h>
+#include <arch/io.h>
+#include <arch/pciconf.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <device/pci_ops.h>
+/*
+ * Functions for accessing PCI configuration space with type 1 accesses
+ */
+
+#if !CONFIG_PCI_IO_CFG_EXT
+#define CONFIG_CMD(bus,devfn, where)	(0x80000000 | (bus << 16) | \
+										(devfn << 8) | (where & ~3))
+#else
+#define CONFIG_CMD(bus,devfn, where)	(0x80000000 | (bus << 16) | \
+										(devfn << 8) | ((where & 0xff) & ~3) |\
+										((where & 0xf00)<<16))
+#endif
+
+static uint8_t pci_conf1_read_config8(struct bus *pbus, int bus, int devfn,
+				      int where)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	return inb(0xCFC + (where & 3));
+}
+
+static uint16_t pci_conf1_read_config16(struct bus *pbus, int bus, int devfn,
+					int where)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	return inw(0xCFC + (where & 2));
+}
+
+static uint32_t pci_conf1_read_config32(struct bus *pbus, int bus, int devfn,
+					int where)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	return inl(0xCFC);
+}
+
+static void pci_conf1_write_config8(struct bus *pbus, int bus, int devfn,
+				    int where, uint8_t value)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	outb(value, 0xCFC + (where & 3));
+}
+
+static void pci_conf1_write_config16(struct bus *pbus, int bus, int devfn,
+				     int where, uint16_t value)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	outw(value, 0xCFC + (where & 2));
+}
+
+static void pci_conf1_write_config32(struct bus *pbus, int bus, int devfn,
+				     int where, uint32_t value)
+{
+	outl(CONFIG_CMD(bus, devfn, where), 0xCF8);
+	outl(value, 0xCFC);
+}
+
+#undef CONFIG_CMD
+
+const struct pci_bus_operations pci_cf8_conf1 = {
+	.read8 = pci_conf1_read_config8,
+	.read16 = pci_conf1_read_config16,
+	.read32 = pci_conf1_read_config32,
+	.write8 = pci_conf1_write_config8,
+	.write16 = pci_conf1_write_config16,
+	.write32 = pci_conf1_write_config32,
+};