x86/apic for v2.6.33
Subsystems (5)
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-apic-for-linus
The changes are pretty much all over the place.
out-of-topic modifications in x86-apic-for-linus:
-------------------------------------------------drivers/misc/sgi-xp/xpc_uv.c # 6c2c502: x86: SGI UV: Fix irq affinity for
Thanks,
Ingo
------------------>
Andreas Herrmann (1):
x86, apic: Clear APIC Timer Initial Count Register on shutdown
Cyrill Gorcunov (10):
x86, apic: Introduce the NOOP apic driver
x86, apic: Use apic noop driver
x86, apic: Limit apic dumping, introduce new show_lapic= setup option x86, apic: Explain show_lapic= in kernel parameters list
x86: apic: Allow noop operations to be called almost at any time x86, apic: Use PAGE_SIZE instead of numbers
x86, ioapic: Use snrpintf while set names for IO-APIC resourses x86, apic: Get rid of apicid_to_cpu_present assign on 64-bit
x86: apic: Do not use stacked physid_mask_t
x86: io-apic: IO-APIC MMIO should not fail on resource insertion
Dimitri Sivanich (3):
x86: SGI UV: Fix irq affinity for hub based interrupts x86, apic: Move SGI UV functionality out of generic IO-APIC code
x86: Remove asm/apicnum.h
Ingo Molnar (1):
x86, apic: Fix prototype in hw_irq.h
Jack Steiner (1):
x86: SGI UV: Map low MMR ranges
Maciej W. Rozycki (1):
x86, io-apic: Move the effort of clearing remoteIRR explicitly before migrating the irq
Mikael Pettersson (1):
x86, apic: Enable lapic nmi watchdog on AMD Family 11h
Suresh Siddha (9):
x86: Unify fixup_irqs() for 32-bit and 64-bit kernels
x86, intr-remap: Avoid irq_chip mask/unmask in fixup_irqs() for intr-remapping
x86: Remove move_cleanup_count from irq_cfg
x86: Force irq complete move during cpu offline
x86: Use EOI register in io-apic on intel platforms
x86: Remove local_irq_enable()/local_irq_disable() in fixup_irqs() x86, ioapic: Fix the EOI register detection mechanism
x86, ioapic: Document another case when level irq is seen as an edge
x86: Remove unnecessary mdelay() from cpu_disable_common()
Yinghai Lu (3):
x86: apic: Remove not needed #ifdef
x86: Re-get cfg_new in case reuse/move irq_desc
x86: apic: Print out SRAT table APIC id in hex
Documentation/kernel-parameters.txt | 9 + arch/x86/include/asm/apic.h | 21 +- arch/x86/include/asm/apicdef.h | 6 + arch/x86/include/asm/apicnum.h | 12 - arch/x86/include/asm/hw_irq.h | 30 ++- arch/x86/include/asm/irq.h | 1 + arch/x86/include/asm/mpspec.h | 16 +- arch/x86/include/asm/uv/uv_irq.h | 14 +- arch/x86/kernel/apic/Makefile | 2 +- arch/x86/kernel/apic/apic.c | 34 +--- arch/x86/kernel/apic/apic_noop.c | 200 +++++++++++++++++ arch/x86/kernel/apic/bigsmp_32.c | 13 +- arch/x86/kernel/apic/es7000_32.c | 16 +- arch/x86/kernel/apic/io_apic.c | 364 +++++++++++++++----------------- arch/x86/kernel/apic/numaq_32.c | 13 +- arch/x86/kernel/apic/probe_32.c | 2 +- arch/x86/kernel/apic/summit_32.c | 10 +- arch/x86/kernel/apic/x2apic_uv_x.c | 8 + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- arch/x86/kernel/irq.c | 90 ++++++++ arch/x86/kernel/irq_32.c | 45 ---- arch/x86/kernel/irq_64.c | 58 ----- arch/x86/kernel/smpboot.c | 9 - arch/x86/kernel/uv_irq.c | 239 ++++++++++++++++++++- arch/x86/kernel/visws_quirks.c | 2 +- arch/x86/mm/srat_64.c | 4 +- drivers/misc/sgi-xp/xpc_uv.c | 5 +- 27 files changed, 808 insertions(+), 417 deletions(-) delete mode 100644 arch/x86/include/asm/apicnum.h create mode 100644 arch/x86/kernel/apic/apic_noop.c
Documentation/kernel-parameters.txt +9 -0
@@ -345,6 +345,15 @@ and is between 256 and 4096 characters. It is defined in the file Change the amount of debugging information output when initialising the APIC and IO-APIC components. + show_lapic= [APIC,X86] Advanced Programmable Interrupt Controller + Limit apic dumping. The parameter defines the maximal + number of local apics being dumped. Also it is possible + to set it to "all" by meaning -- no limit here. + Format: { 1 (default) | 2 | ... | all }. + The parameter valid if only apic=debug or + apic=verbose is specified. + Example: apic=debug show_lapic=all + apm= [APM] Advanced Power Management See header of arch/x86/kernel/apm_32.c.
arch/x86/include/asm/apic.h +9 -12
@@ -297,20 +297,20 @@ struct apic {int disable_esr;int dest_logical; -unsigned long (*check_apicid_used)(physid_mask_t bitmap,int apicid); +unsigned long (*check_apicid_used)(physid_mask_t *map,int apicid);unsigned long (*check_apicid_present)(int apicid);void (*vector_allocation_domain)(int cpu,struct cpumask *retmask);void (*init_apic_ldr)(void ); -physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map); +void (*ioapic_phys_id_map)(physid_mask_t *phys_map,physid_mask_t *retmap);void (*setup_apic_routing)(void );int (*multi_timer_check)(int apic,int irq);int (*apicid_to_node)(int logical_apicid);int (*cpu_to_logical_apicid)(int cpu);int (*cpu_present_to_apicid)(int mps_cpu); -physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); +void (*apicid_to_cpu_present)(int phys_apicid,physid_mask_t *retmap);void (*setup_portio_remap)(void );int (*check_phys_apicid_present)(int phys_apicid);void (*enable_apic_mode)(void );
@@ -488,6 +488,8 @@ static inline unsigned int read_apic_id(void)extern void default_setup_apic_routing (void ); +extern struct apic apic_noop; +#ifdef CONFIG_X86_32 extern struct apic apic_default;
@@ -532,9 +534,9 @@ default_cpu_mask_to_apicid_and(const struct cpumask *cpumask,return (unsigned int )(mask1 & mask2 & mask3); } -static inline unsigned long default_check_apicid_used (physid_mask_t bitmap,int apicid) +static inline unsigned long default_check_apicid_used (physid_mask_t *map,int apicid) { -return physid_isset (apicid, bitmap); +return physid_isset (apicid, *map); }static inline unsigned long default_check_apicid_present (int bit)
@@ -542,9 +544,9 @@ static inline unsigned long default_check_apicid_present(int bit)return physid_isset (bit, phys_cpu_present_map); } -static inline physid_mask_t default_ioapic_phys_id_map (physid_mask_t phys_map) +static inline void default_ioapic_phys_id_map (physid_mask_t *phys_map,physid_mask_t *retmap) { -return phys_map; + *retmap = *phys_map; }/* Mapping from cpu number to logical apicid */
@@ -583,11 +585,6 @@ extern int default_cpu_present_to_apicid(int mps_cpu);extern int default_check_phys_apicid_present (int phys_apicid);#endif -static inline physid_mask_t default_apicid_to_cpu_present (int phys_apicid) -{ -return physid_mask_of_physid (phys_apicid); -} -#endif /* CONFIG_X86_LOCAL_APIC */ #ifdef CONFIG_X86_32
arch/x86/include/asm/apicdef.h +6 -0
@@ -11,6 +11,12 @@#define IO_APIC_DEFAULT_PHYS_BASE 0xfec00000#define APIC_DEFAULT_PHYS_BASE 0xfee00000 +/* +* This is the IO-APIC register space as specified +* by Intel docs: +*/ +#define IO_APIC_SLOT_SIZE 1024 +#define APIC_ID 0x20#define APIC_LVR 0x30
arch/x86/include/asm/apicnum.h deleted +0 -12
@@ -1,12 +0,0 @@ -#ifndef _ASM_X86_APICNUM_H -#define _ASM_X86_APICNUM_H - -/* define MAX_IO_APICS */ -#ifdef CONFIG_X86_32 -# define MAX_IO_APICS 64 -#else -# define MAX_IO_APICS 128 -# define MAX_LOCAL_APIC 32768 -#endif - -#endif /* _ASM_X86_APICNUM_H */
arch/x86/include/asm/hw_irq.h +24 -6
@@ -79,14 +79,32 @@ static inline void set_io_apic_irq_attr(struct io_apic_irq_attr *irq_attr, int ioapic, int ioapic_pin, int trigger, int polarity) { - irq_attr->ioapic = ioapic; - irq_attr->ioapic_pin = ioapic_pin; - irq_attr->trigger = trigger; - irq_attr->polarity = polarity; + irq_attr->ioapic = ioapic; + irq_attr->ioapic_pin = ioapic_pin; + irq_attr->trigger = trigger; + irq_attr->polarity = polarity; } -extern int IO_APIC_get_PCI_irq_vector (int bus,int devfn,int pin, -struct io_apic_irq_attr *irq_attr); +/* +* This is performance-critical, we want to do it O(1) +* +* Most irqs are mapped 1:1 with pins. +*/ +struct irq_cfg { +struct irq_pin_list *irq_2_pin; +cpumask_var_t domain; +cpumask_var_t old_domain; +u8 vector; +u8 move_in_progress :1 ; +}; + +extern struct irq_cfg *irq_cfg (unsigned int ); +extern int assign_irq_vector (int ,struct irq_cfg *,const struct cpumask *); +extern void send_cleanup_vector (struct irq_cfg *); + +struct irq_desc ; +extern unsigned int set_desc_affinity (struct irq_desc *,const struct cpumask *); +extern int IO_APIC_get_PCI_irq_vector (int bus,int devfn,int pin,struct io_apic_irq_attr *irq_attr);extern void setup_ioapic_dest (void );extern void enable_IO_APIC (void );
arch/x86/include/asm/irq.h +1 -0
@@ -34,6 +34,7 @@ static inline int irq_canonicalize(int irq)#ifdef CONFIG_HOTPLUG_CPU #include <linux/cpumask.h> extern void fixup_irqs (void ); +extern void irq_force_complete_move (int );#endif extern void (*generic_interrupt_extension)(void );
arch/x86/include/asm/mpspec.h +9 -7
@@ -163,14 +163,16 @@ typedef struct physid_mask physid_mask_t;#define physids_shift_left (d, s, n) \ bitmap_shift_left((d).mask, (s).mask, n, MAX_APICS) -#define physids_coerce (map) ((map).mask[0]) +static inline unsigned long physids_coerce (physid_mask_t *map) +{ +return map->mask[0 ]; +} -#define physids_promote (physids) \ - ({ \ - physid_mask_t __physid_mask = PHYSID_MASK_NONE; \ - __physid_mask.mask[0] = physids; \ - __physid_mask; \ - }) +static inline void physids_promote (unsigned long physids,physid_mask_t *map) +{ +physids_clear (*map); + map->mask[0 ] = physids; +}/* Note: will create very large stack frames if physid_mask_t is big */ #define physid_mask_of_physid (physid) \
arch/x86/include/asm/uv/uv_irq.h +8 -6
@@ -25,12 +25,14 @@ struct uv_IO_APIC_route_entry { dest : 32; }; -extern struct irq_chip uv_irq_chip; - -extern int arch_enable_uv_irq (char *,unsigned int ,int ,int ,unsigned long ); -extern void arch_disable_uv_irq (int ,unsigned long ); +enum { +UV_AFFINITY_ALL , +UV_AFFINITY_NODE , +UV_AFFINITY_CPU +}; -extern int uv_setup_irq (char *,int ,int ,unsigned long ); -extern void uv_teardown_irq (unsigned int ,int ,unsigned long ); +extern int uv_irq_2_mmr_info (int ,unsigned long *,int *); +extern int uv_setup_irq (char *,int ,int ,unsigned long ,int ); +extern void uv_teardown_irq (unsigned int );#endif /* _ASM_X86_UV_UV_IRQ_H */
arch/x86/kernel/apic/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for local APIC drivers and for the IO-APIC code # -obj-$(CONFIG_X86_LOCAL_APIC) += apic.o probe_$(BITS).o ipi.o nmi.o +obj-$(CONFIG_X86_LOCAL_APIC) += apic.o apic_noop.o probe_$(BITS).o ipi.o nmi.o obj-$(CONFIG_X86_IO_APIC) += io_apic.o obj-$(CONFIG_SMP) += ipi.o
arch/x86/kernel/apic/apic.c +8 -26
@@ -241,28 +241,13 @@ static int modern_apic(void) }/* -* bare function to substitute write operation -* and it's _that_ fast :) -*/ -static void native_apic_write_dummy (u32 reg,u32 v) -{ -WARN_ON_ONCE ((cpu_has_apic || !disable_apic)); -} - -static u32 native_apic_read_dummy (u32 reg) -{ -WARN_ON_ONCE ((cpu_has_apic && !disable_apic)); -return 0 ; -} - -/* -* right after this call apic->write/read doesn't do anything -* note that there is no restore operation it works one way +* right after this call apic become NOOP driven +* so apic->write/read doesn't do anything */ void apic_disable (void ) { - apic->read = native_apic_read_dummy; - apic->write = native_apic_write_dummy; +pr_info ("APIC: switched to apic NOOP\n" ); + apic = &apic_noop; }void native_apic_wait_icr_idle (void )
@@ -459,7 +444,7 @@ static void lapic_timer_setup(enum clock_event_mode mode, v =apic_read (APIC_LVTT ); v |= (APIC_LVT_MASKED |LOCAL_TIMER_VECTOR );apic_write (APIC_LVTT , v); -apic_write (APIC_TMICT ,0xffffffff ); +apic_write (APIC_TMICT ,0 );break ;case CLOCK_EVT_MODE_RESUME :/* Nothing to do here */
@@ -1392,14 +1377,11 @@ void __init enable_IR_x2apic(void)unsigned long flags;struct IO_APIC_route_entry **ioapic_entries =NULL ;int ret, x2apic_enabled =0 ; -int dmar_table_init_ret =0 ; +int dmar_table_init_ret; -#ifdef CONFIG_INTR_REMAP dmar_table_init_ret =dmar_table_init (); -if (dmar_table_init_ret) -pr_debug ("dmar_table_init() failed with %d:\n" , - dmar_table_init_ret); -#endif +if (dmar_table_init_ret && !x2apic_supported ()) +return ; ioapic_entries =alloc_ioapic_entries ();if (!ioapic_entries) {
arch/x86/kernel/apic/apic_noop.c new file +200 -0
200 lines not on this page · raw message
arch/x86/kernel/apic/bigsmp_32.c +4 -9
@@ -35,7 +35,7 @@ static const struct cpumask *bigsmp_target_cpus(void)#endif } -static unsigned long bigsmp_check_apicid_used (physid_mask_t bitmap,int apicid) +static unsigned long bigsmp_check_apicid_used (physid_mask_t *map,int apicid) {return 0 ; }
@@ -93,11 +93,6 @@ static int bigsmp_cpu_present_to_apicid(int mps_cpu)return BAD_APICID ; } -static physid_mask_t bigsmp_apicid_to_cpu_present (int phys_apicid) -{ -return physid_mask_of_physid (phys_apicid); -} -/* Mapping from cpu number to logical apicid */ static inline int bigsmp_cpu_to_logical_apicid (int cpu) {
@@ -106,10 +101,10 @@ static inline int bigsmp_cpu_to_logical_apicid(int cpu)return cpu_physical_id (cpu); } -static physid_mask_t bigsmp_ioapic_phys_id_map (physid_mask_t phys_map) +static void bigsmp_ioapic_phys_id_map (physid_mask_t *phys_map,physid_mask_t *retmap) {/* For clustered we don't have a good way to do this yet - hack */ -return physids_promote (0xFFL ); +physids_promote (0xFFL , retmap); }static int bigsmp_check_phys_apicid_present (int phys_apicid)
@@ -230,7 +225,7 @@ struct apic apic_bigsmp = { .apicid_to_node = bigsmp_apicid_to_node, .cpu_to_logical_apicid = bigsmp_cpu_to_logical_apicid, .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, - .apicid_to_cpu_present = bigsmp_apicid_to_cpu_present, + .apicid_to_cpu_present = physid_set_mask_of_physid, .setup_portio_remap = NULL, .check_phys_apicid_present = bigsmp_check_phys_apicid_present, .enable_apic_mode = NULL,
arch/x86/kernel/apic/es7000_32.c +6 -10
@@ -466,11 +466,11 @@ static const struct cpumask *es7000_target_cpus(void)return cpumask_of (smp_processor_id ()); } -static unsigned long -es7000_check_apicid_used (physid_mask_t bitmap,int apicid) +static unsigned long es7000_check_apicid_used (physid_mask_t *map,int apicid) {return 0 ; } +static unsigned long es7000_check_apicid_present (int bit) {return physid_isset (bit, phys_cpu_present_map);
@@ -539,14 +539,10 @@ static int es7000_cpu_present_to_apicid(int mps_cpu)static int cpu_id; -static physid_mask_t es7000_apicid_to_cpu_present (int phys_apicid) +static void es7000_apicid_to_cpu_present (int phys_apicid,physid_mask_t *retmap) { -physid_mask_t mask; - - mask =physid_mask_of_physid (cpu_id); +physid_set_mask_of_physid (cpu_id, retmap); ++cpu_id; - -return mask; }/* Mapping from cpu number to logical apicid */
@@ -561,10 +557,10 @@ static int es7000_cpu_to_logical_apicid(int cpu)#endif } -static physid_mask_t es7000_ioapic_phys_id_map (physid_mask_t phys_map) +static void es7000_ioapic_phys_id_map (physid_mask_t *phys_map,physid_mask_t *retmap) {/* For clustered we don't have a good way to do this yet - hack */ -return physids_promote (0xff ); +physids_promote (0xFFL , retmap); }static int es7000_check_phys_apicid_present (int cpu_physical_apicid)
arch/x86/kernel/apic/io_apic.c +175 -189
622 lines not on this page · raw message
arch/x86/kernel/apic/numaq_32.c +6 -7
@@ -334,10 +334,9 @@ static inline const struct cpumask *numaq_target_cpus(void)return cpu_all_mask; } -static inline unsigned long -numaq_check_apicid_used (physid_mask_t bitmap,int apicid) +static unsigned long numaq_check_apicid_used (physid_mask_t *map,int apicid) { -return physid_isset (apicid, bitmap); +return physid_isset (apicid, *map); }static inline unsigned long numaq_check_apicid_present (int bit)
@@ -371,10 +370,10 @@ static inline int numaq_multi_timer_check(int apic, int irq)return apic !=0 && irq ==0 ; } -static inline physid_mask_t numaq_ioapic_phys_id_map (physid_mask_t phys_map) +static inline void numaq_ioapic_phys_id_map (physid_mask_t *phys_map,physid_mask_t *retmap) {/* We don't have a good way to do this yet - hack */ -return physids_promote (0xFUL ); +return physids_promote (0xFUL , retmap); }static inline int numaq_cpu_to_logical_apicid (int cpu)
@@ -402,12 +401,12 @@ static inline int numaq_apicid_to_node(int logical_apicid)return logical_apicid >>4 ; } -static inline physid_mask_t numaq_apicid_to_cpu_present (int logical_apicid) +static void numaq_apicid_to_cpu_present (int logical_apicid,physid_mask_t *retmap) {int node =numaq_apicid_to_node (logical_apicid);int cpu =__ffs (logical_apicid &0xf ); -return physid_mask_of_physid (cpu +4 *node); +physid_set_mask_of_physid (cpu +4 *node, retmap); }/* Where the IO area was mapped on multiquad, always 0 otherwise */
arch/x86/kernel/apic/probe_32.c +1 -1
@@ -108,7 +108,7 @@ struct apic apic_default = { .apicid_to_node = default_apicid_to_node, .cpu_to_logical_apicid = default_cpu_to_logical_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid, - .apicid_to_cpu_present = default_apicid_to_cpu_present, + .apicid_to_cpu_present = physid_set_mask_of_physid, .setup_portio_remap = NULL, .check_phys_apicid_present = default_check_phys_apicid_present, .enable_apic_mode = NULL,
arch/x86/kernel/apic/summit_32.c +5 -5
@@ -183,7 +183,7 @@ static const struct cpumask *summit_target_cpus(void)return cpumask_of (0 ); } -static unsigned long summit_check_apicid_used (physid_mask_t bitmap,int apicid) +static unsigned long summit_check_apicid_used (physid_mask_t *map,int apicid) {return 0 ; }
@@ -261,15 +261,15 @@ static int summit_cpu_present_to_apicid(int mps_cpu)return BAD_APICID ; } -static physid_mask_t summit_ioapic_phys_id_map (physid_mask_t phys_id_map) +static void summit_ioapic_phys_id_map (physid_mask_t *phys_id_map,physid_mask_t *retmap) {/* For clustered we don't have a good way to do this yet - hack */ -return physids_promote (0x0F ); +physids_promote (0x0FL , retmap); } -static physid_mask_t summit_apicid_to_cpu_present (int apicid) +static void summit_apicid_to_cpu_present (int apicid,physid_mask_t *retmap) { -return physid_mask_of_physid (0 ); +physid_set_mask_of_physid (0 , retmap); }static int summit_check_phys_apicid_present (int physical_apicid)
arch/x86/kernel/apic/x2apic_uv_x.c +8 -0
@@ -409,6 +409,12 @@ static __init void map_mmioh_high(int max_pnode)map_high ("MMIOH" , mmioh.s.base, shift, max_pnode, map_uc); } +static __init void map_low_mmrs (void ) +{ +init_extra_mapping_uc (UV_GLOBAL_MMR32_BASE ,UV_GLOBAL_MMR32_SIZE ); +init_extra_mapping_uc (UV_LOCAL_MMR_BASE ,UV_LOCAL_MMR_SIZE ); +} +static __init void uv_rtc_init (void ) {long status;
@@ -550,6 +556,8 @@ void __init uv_system_init(void)unsigned long mmr_base, present, paddr;unsigned short pnode_mask; +map_low_mmrs (); + m_n_config.v =uv_read_local_mmr (UVH_SI_ADDR_MAP_CONFIG ); m_val = m_n_config.s.m_skt; n_val = m_n_config.s.n_skt;
arch/x86/kernel/cpu/perfctr-watchdog.c +1 -1
@@ -712,7 +712,7 @@ static void probe_nmi_watchdog(void)switch (boot_cpu_data.x86_vendor) {case X86_VENDOR_AMD :if (boot_cpu_data.x86 !=6 && boot_cpu_data.x86 !=15 && - boot_cpu_data.x86 !=16 ) + boot_cpu_data.x86 !=16 && boot_cpu_data.x86 !=17 )return ; wd_ops = &k7_wd_ops;break ;
arch/x86/kernel/irq.c +90 -0
93 lines not on this page · raw message
arch/x86/kernel/irq_32.c +0 -45
48 lines not on this page · raw message
arch/x86/kernel/irq_64.c +0 -58
64 lines not on this page · raw message
arch/x86/kernel/smpboot.c +0 -9
@@ -1250,16 +1250,7 @@ static void __ref remove_cpu_from_maps(int cpu)void cpu_disable_common (void ) {int cpu =smp_processor_id (); -/* -* HACK: -* Allow any queued timer interrupts to get serviced -* This is only a temporary solution until we cleanup -* fixup_irqs as we do for IA64. -*/ -local_irq_enable (); -mdelay (1 ); -local_irq_disable ();remove_siblinginfo (cpu);/* It's now safe to remove this processor from the online map */
arch/x86/kernel/uv_irq.c +231 -8
275 lines not on this page · raw message
arch/x86/kernel/visws_quirks.c +1 -1
@@ -183,7 +183,7 @@ static void __init MP_processor_info(struct mpc_cpu *m)return ; } - apic_cpus = apic->apicid_to_cpu_present (m->apicid); + apic->apicid_to_cpu_present (m->apicid, &apic_cpus);physids_or (phys_cpu_present_map, phys_cpu_present_map, apic_cpus);/* * Validate version
arch/x86/mm/srat_64.c +2 -2
@@ -136,7 +136,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) apicid_to_node[apic_id] = node;node_set (node, cpu_nodes_parsed); acpi_numa =1 ; -printk (KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n" , +printk (KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n" , pxm, apic_id, node); }
@@ -170,7 +170,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) apicid_to_node[apic_id] = node;node_set (node, cpu_nodes_parsed); acpi_numa =1 ; -printk (KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n" , +printk (KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n" , pxm, apic_id, node); }
drivers/misc/sgi-xp/xpc_uv.c +3 -2
@@ -106,7 +106,8 @@ xpc_get_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq, int cpu, char *irq_name)int mmr_pnode =uv_blade_to_pnode (mq->mmr_blade);#if definedCONFIG_X86_64 - mq->irq =uv_setup_irq (irq_name, cpu, mq->mmr_blade, mq->mmr_offset); + mq->irq =uv_setup_irq (irq_name, cpu, mq->mmr_blade, mq->mmr_offset, +UV_AFFINITY_CPU );if (mq->irq <0 ) {dev_err (xpc_part,"uv_setup_irq() returned error=%d\n" , -mq->irq);
@@ -136,7 +137,7 @@ static void xpc_release_gru_mq_irq_uv(struct xpc_gru_mq_uv *mq) {#if definedCONFIG_X86_64 -uv_teardown_irq (mq->irq, mq->mmr_blade, mq->mmr_offset); +uv_teardown_irq (mq->irq);#elif definedCONFIG_IA64_GENERIC || definedCONFIG_IA64_SGI_UV int mmr_pnode;