summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/amd_bus.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-06-12 20:19:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 07:47:39 +0200
commit3a27dd1ce5de08e21e0266ddf00e6f1f843bfe8b (patch)
treeb72316cfbe10d1f955a0cb9553879fb2bb14344b /arch/x86/pci/amd_bus.c
parent24bfdca7b7da971ef9a483303a096ac6d4b3a02c (diff)
downloadop-kernel-dev-3a27dd1ce5de08e21e0266ddf00e6f1f843bfe8b.zip
op-kernel-dev-3a27dd1ce5de08e21e0266ddf00e6f1f843bfe8b.tar.gz
x86: Move PCI IO ECS code to x86/pci
"Form follows function". Code is now where it belongs to. Signed-off-by: Robert Richter <robert.richter@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/amd_bus.c')
-rw-r--r--arch/x86/pci/amd_bus.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 5c2799c..15f505d 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -1,5 +1,9 @@
#include <linux/init.h>
#include <linux/pci.h>
+#include "pci.h"
+
+#ifdef CONFIG_X86_64
+
#include <asm/pci-direct.h>
#include <asm/mpspec.h>
#include <linux/cpumask.h>
@@ -526,3 +530,31 @@ static int __init early_fill_mp_bus_info(void)
}
postcore_initcall(early_fill_mp_bus_info);
+
+#endif
+
+/* common 32/64 bit code */
+
+#define ENABLE_CF8_EXT_CFG (1ULL << 46)
+
+static void enable_pci_io_ecs_per_cpu(void *unused)
+{
+ u64 reg;
+ rdmsrl(MSR_AMD64_NB_CFG, reg);
+ if (!(reg & ENABLE_CF8_EXT_CFG)) {
+ reg |= ENABLE_CF8_EXT_CFG;
+ wrmsrl(MSR_AMD64_NB_CFG, reg);
+ }
+}
+
+static int __init enable_pci_io_ecs(void)
+{
+ /* assume all cpus from fam10h have IO ECS */
+ if (boot_cpu_data.x86 < 0x10)
+ return 0;
+ on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1, 1);
+ pci_probe |= PCI_HAS_IO_ECS;
+ return 0;
+}
+
+postcore_initcall(enable_pci_io_ecs);
OpenPOWER on IntegriCloud