On Sat, Nov 17, 2012 at 06:16:11PM +0300, Dan Carpenter wrote:
> This is a static checker fix. The problem is that we store the bits
> from "uv_apicid_hibits" into "apicid" (the high 16 bits) but then we
> shift it 16 bit to the left. "apicid" is an int so it wraps and we lose
> them.
Is this the complete patch? phys_apicid is an int, but gets
cast as unsigned long. Doesn't phys_apicid also have to be
changed to unsigned long? And why ulong instead of uint (on x86_64)?
I agree with changing signed to unsigned where appropriate, but
this looks like a partial fix. Am I missing something?
Thanks.
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> ---
> This is for an SGI product, and I can't test it.
>
> diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
> index 21f7385..f3a0f91 100644
> --- a/arch/x86/include/asm/uv/uv_hub.h
> +++ b/arch/x86/include/asm/uv/uv_hub.h
> @@ -573,7 +573,7 @@ static inline void uv_set_cpu_scir_bits(int cpu, unsigned char value)
> }
>
> extern unsigned int uv_apicid_hibits;
> -static unsigned long uv_hub_ipi_value(int apicid, int vector, int mode)
> +static unsigned long uv_hub_ipi_value(ulong apicid, ulong vector, ulong mode)
> {
> apicid |= uv_apicid_hibits;
> return (1UL << UVH_IPI_INT_SEND_SHFT) |
> diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
> index 8cfade9..6d93b2f 100644
> --- a/arch/x86/kernel/apic/x2apic_uv_x.c
> +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
> @@ -194,13 +194,13 @@ static int __cpuinit uv_wakeup_secondary(int phys_apicid, unsigned long start_ri
> pnode = uv_apicid_to_pnode(phys_apicid);
> phys_apicid |= uv_apicid_hibits;
> val = (1UL << UVH_IPI_INT_SEND_SHFT) |
> - (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
> + ((unsigned long)phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
> ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
> APIC_DM_INIT;
> uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
>
> val = (1UL << UVH_IPI_INT_SEND_SHFT) |
> - (phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
> + ((unsigned long)phys_apicid << UVH_IPI_INT_APIC_ID_SHFT) |
> ((start_rip << UVH_IPI_INT_VECTOR_SHFT) >> 12) |
> APIC_DM_STARTUP;
> uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
--
Russ Anderson, OS RAS/Partitioning Project Lead
SGI - Silicon Graphics Inc rja@xxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
