Messages in this thread Patch in this message | | | Date | Thu, 21 Aug 2003 15:45:43 -0700 | From | William Lee Irwin III <> | Subject | Re: CPU boot problem on 2.6.0-test3-bk8 |
| |
On Thu, Aug 21, 2003 at 02:33:50PM -0700, William Lee Irwin III wrote: >> cpu_present_to_apicid() needs a similar treatment to dhansen's prior >> bits. diff incoming shortly.
On Thu, Aug 21, 2003 at 03:17:44PM -0700, William Lee Irwin III wrote: > Could one of you two try this out on a Summit machine in addition to > Dave's prior patch (or hook me up to one)?
That broke sparse APIC ID's on several subarches. This is a bit less indiscriminate about who it updates (and should replace the prior patch wrt. sending anything upstream):
-- wli
===== include/asm-i386/mach-bigsmp/mach_apic.h 1.16 vs edited ===== --- 1.16/include/asm-i386/mach-bigsmp/mach_apic.h Wed Aug 20 22:32:06 2003 +++ edited/include/asm-i386/mach-bigsmp/mach_apic.h Thu Aug 21 15:07:42 2003 @@ -86,7 +86,10 @@ static inline int cpu_present_to_apicid(int mps_cpu) { - return (int) bios_cpu_apicid[mps_cpu]; + if (mps_cpu < NR_CPUS) + return (int)bios_cpu_apicid[mps_cpu]; + else + return BAD_APICID; } static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) ===== include/asm-i386/mach-es7000/mach_apic.h 1.3 vs edited ===== --- 1.3/include/asm-i386/mach-es7000/mach_apic.h Wed Aug 20 22:32:06 2003 +++ edited/include/asm-i386/mach-es7000/mach_apic.h Thu Aug 21 15:08:41 2003 @@ -106,8 +106,10 @@ { if (!mps_cpu) return boot_cpu_physical_apicid; - else + else if (mps_cpu < NR_CPUS) return (int) bios_cpu_apicid[mps_cpu]; + else + return BAD_APICID; } static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) ===== include/asm-i386/mach-numaq/mach_apic.h 1.22 vs edited ===== --- 1.22/include/asm-i386/mach-numaq/mach_apic.h Wed Aug 20 22:32:06 2003 +++ edited/include/asm-i386/mach-numaq/mach_apic.h Thu Aug 21 15:10:31 2003 @@ -65,9 +65,17 @@ return (int)cpu_2_logical_apicid[cpu]; } +/* + * Supporting over 60 cpus on NUMA-Q requires a locality-dependent + * cpu to APIC ID relation to properly interact with the intelligent + * mode of the cluster controller. + */ static inline int cpu_present_to_apicid(int mps_cpu) { - return ((mps_cpu >> 2) << 4) | (1 << (mps_cpu & 0x3)); + if (mps_cpu < 60) + return ((mps_cpu >> 2) << 4) | (1 << (mps_cpu & 0x3)); + else + return BAD_APICID; } static inline int generate_logical_apicid(int quad, int phys_apicid) ===== include/asm-i386/mach-summit/mach_apic.h 1.31 vs edited ===== --- 1.31/include/asm-i386/mach-summit/mach_apic.h Wed Aug 20 22:32:06 2003 +++ edited/include/asm-i386/mach-summit/mach_apic.h Thu Aug 21 15:10:57 2003 @@ -87,7 +87,10 @@ static inline int cpu_present_to_apicid(int mps_cpu) { - return (int) bios_cpu_apicid[mps_cpu]; + if (mps_cpu < NR_CPUS) + return (int)bios_cpu_apicid[mps_cpu]; + else + return BAD_APICID; } static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_id_map) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |