x86/cpu for v2.6.31
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-cpu-for-linus
Thanks,
Ingo
------------------>
Andreas Herrmann (5):
x86: cacheinfo: use L3 cache index disable feature only for CPUs that support it
x86: cacheinfo: correct return value when cache_disable feature is not active
x86: cacheinfo: use cached K8 NB_MISC devices instead of scanning for it
x86: cacheinfo: complete L2/L3 Cache and TLB associativity field definitions
x86: fixup numa_node information for AMD CPU northbridge functions
Jaswinder Singh Rajput (2):
x86: k8 convert node_to_k8_nb_misc() from a macro to an inline function
x86: cpu_debug: Remove model information to reduce encoding-decoding
Mark Langsdorf (3):
x86: cacheinfo: replace sysfs interface for cache_disable feature
x86: cacheinfo: disable L3 ECC scrubbing when L3 cache index is disabled x86/docs: add description for cache_disable sysfs interface
.../ABI/testing/sysfs-devices-cache_disable | 18 + arch/x86/include/asm/cpu_debug.h | 101 +----- arch/x86/include/asm/k8.h | 13 + arch/x86/kernel/cpu/cpu_debug.c | 417 +++++--------------- arch/x86/kernel/cpu/intel_cacheinfo.c | 153 ++++---- arch/x86/kernel/quirks.c | 37 ++ 6 files changed, 237 insertions(+), 502 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable
Documentation/ABI/testing/sysfs-devices-cache_disable new file +18 -0
@@ -0,0 +1,18 @@ +What: /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X +Date: August 2008 +KernelVersion: 2.6.27 +Contact: [email protected] +Description: These files exist in every cpu's cache index directories. + There are currently 2 cache_disable_# files in each + directory. Reading from these files on a supported + processor will return that cache disable index value + for that processor and node. Writing to one of these + files will cause the specificed cache index to be disabled. + + Currently, only AMD Family 10h Processors support cache index + disable, and only for their L3 caches. See the BIOS and + Kernel Developer's Guide at + http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf + for formatting information and other details on the + cache index disable. +Users: [email protected]
arch/x86/include/asm/cpu_debug.h +1 -100
113 lines not on this page · raw message
arch/x86/include/asm/k8.h +13 -0
@@ -12,4 +12,17 @@ extern int cache_k8_northbridges(void);extern void k8_flush_garts (void );extern int k8_scan_nodes (unsigned long start,unsigned long end); +#ifdef CONFIG_K8_NB +static inline struct pci_dev *node_to_k8_nb_misc (int node) +{ +return (node < num_k8_northbridges) ? k8_northbridges[node] :NULL ; +} +#else +static inline struct pci_dev *node_to_k8_nb_misc (int node) +{ +return NULL ; +} +#endif + +#endif /* _ASM_X86_K8_H */
arch/x86/kernel/cpu/cpu_debug.c +96 -321
472 lines not on this page · raw message
arch/x86/kernel/cpu/intel_cacheinfo.c +72 -81
226 lines not on this page · raw message
arch/x86/kernel/quirks.c +37 -0
@@ -491,5 +491,42 @@ void force_hpet_resume(void) break; } } +#endif + +#if defined(CONFIG_PCI ) && defined(CONFIG_NUMA ) +/* Set correct numa_node information for AMD NB functions */ +static void __init quirk_amd_nb_node (struct pci_dev *dev) +{ +struct pci_dev *nb_ht; +unsigned int devfn; +u32 val; + + devfn =PCI_DEVFN (PCI_SLOT (dev->devfn),0 ); + nb_ht =pci_get_slot (dev->bus, devfn); +if (!nb_ht) +return ; + +pci_read_config_dword (nb_ht,0x60 , &val); +set_dev_node (&dev->dev, val &7 ); +pci_dev_put (dev); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB_MEMCTL , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_K8_NB_MISC , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_HT , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_MAP , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_DRAM , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_MISC , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_LINK , + quirk_amd_nb_node);#endif