Prev: [PATCH 05/20] xen: identity map gsi->irqs
Next: [PATCH 16/20] x86: Introduce x86_msi_ops
From: Konrad Rzeszutek Wilk on 4 Aug 2010 14:30
From: Alex Nixon <alex.nixon(a)citrix.com>

Separate out x86 cache_line_size initialisation code into its own
function (so it can be shared by Xen later in this patch series)

[ Impact: cleanup ]

Signed-off-by: Alex Nixon <alex.nixon(a)citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge(a)citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com>
Reviewed-by: "H. Peter Anvin" <hpa(a)zytor.com>
Reviewed-by: Matthew Wilcox <willy(a)linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes(a)virtuousgeek.org>
Cc: x86(a)kernel.org
---
arch/x86/include/asm/pci_x86.h | 1 +
arch/x86/pci/common.c | 17 ++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index cd2a31d..69abe01 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -46,6 +46,7 @@ enum pci_bf_sort_state {
extern unsigned int pcibios_max_latency;

void pcibios_resource_survey(void);
+void pcibios_set_cache_line_size(void);

/* pci-pc.c */

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 215a27a..d4214ac 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -404,16 +404,10 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)

return bus;
}
-
-int __init pcibios_init(void)
+void __init pcibios_set_cache_line_size(void)
{
struct cpuinfo_x86 *c = &boot_cpu_data;

- if (!raw_pci_ops) {
- printk(KERN_WARNING "PCI: System does not support PCI\n");
- return 0;
- }
-
/*
* Set PCI cacheline size to that of the CPU if the CPU has reported it.
* (For older CPUs that don't support cpuid, we se it to 32 bytes
@@ -428,7 +422,16 @@ int __init pcibios_init(void)
pci_dfl_cache_line_size = 32 >> 2;
printk(KERN_DEBUG "PCI: Unknown cacheline size. Setting to 32 bytes\n");
}
+}
+
+int __init pcibios_init(void)
+{
+ if (!raw_pci_ops) {
+ printk(KERN_WARNING "PCI: System does not support PCI\n");
+ return 0;
+ }

+ pcibios_set_cache_line_size();
pcibios_resource_survey();

if (pci_bf_sort >= pci_force_bf)
--
1.7.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 05/20] xen: identity map gsi->irqs
Next: [PATCH 16/20] x86: Introduce x86_msi_ops