| Message ID | 1473691764-29424-6-git-send-email-vladimir.murzin@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 12, 2016 at 03:49:19PM +0100, Vladimir Murzin wrote: > Well, this patch is looking ahead of time, but we'll get following > compiler warnings as soon as we introduce vgic-v3 to 32-bit world > > CC arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.o > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_mmio_read_v3r_typer': > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:184:35: warning: left shift count >= width of type [-Wshift-count-overflow] > value = (mpidr & GENMASK(23, 0)) << 32; > ^ > In file included from ./include/linux/kernel.h:10:0, > from ./include/asm-generic/bug.h:13, > from ./arch/arm/include/asm/bug.h:59, > from ./include/linux/bug.h:4, > from ./include/linux/io.h:23, > from ./arch/arm/include/asm/arch_gicv3.h:23, > from ./include/linux/irqchip/arm-gic-v3.h:411, > from arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:14: > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_v3_dispatch_sgi': > ./include/linux/bitops.h:6:24: warning: left shift count >= width of type [-Wshift-count-overflow] > #define BIT(nr) (1UL << (nr)) > ^ > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:614:20: note: in expansion of macro 'BIT' > broadcast = reg & BIT(ICC_SGI1R_IRQ_ROUTING_MODE_BIT); > ^ > Let's fix them now. > > Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
On 12/09/16 15:49, Vladimir Murzin wrote: > Well, this patch is looking ahead of time, but we'll get following > compiler warnings as soon as we introduce vgic-v3 to 32-bit world > > CC arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.o > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_mmio_read_v3r_typer': > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:184:35: warning: left shift count >= width of type [-Wshift-count-overflow] > value = (mpidr & GENMASK(23, 0)) << 32; > ^ > In file included from ./include/linux/kernel.h:10:0, > from ./include/asm-generic/bug.h:13, > from ./arch/arm/include/asm/bug.h:59, > from ./include/linux/bug.h:4, > from ./include/linux/io.h:23, > from ./arch/arm/include/asm/arch_gicv3.h:23, > from ./include/linux/irqchip/arm-gic-v3.h:411, > from arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:14: > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_v3_dispatch_sgi': > ./include/linux/bitops.h:6:24: warning: left shift count >= width of type [-Wshift-count-overflow] > #define BIT(nr) (1UL << (nr)) > ^ > arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:614:20: note: in expansion of macro 'BIT' > broadcast = reg & BIT(ICC_SGI1R_IRQ_ROUTING_MODE_BIT); > ^ > Let's fix them now. > > Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> > --- > virt/kvm/arm/vgic/vgic-mmio-v3.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Marc Zyngier <marc.zyngier@arm.com> M.
diff --git a/virt/kvm/arm/vgic/vgic-mmio-v3.c b/virt/kvm/arm/vgic/vgic-mmio-v3.c index acbe691..6385ed5 100644 --- a/virt/kvm/arm/vgic/vgic-mmio-v3.c +++ b/virt/kvm/arm/vgic/vgic-mmio-v3.c @@ -181,7 +181,7 @@ static unsigned long vgic_mmio_read_v3r_typer(struct kvm_vcpu *vcpu, int target_vcpu_id = vcpu->vcpu_id; u64 value; - value = (mpidr & GENMASK(23, 0)) << 32; + value = (u64)(mpidr & GENMASK(23, 0)) << 32; value |= ((target_vcpu_id & 0xffff) << 8); if (target_vcpu_id == atomic_read(&vcpu->kvm->online_vcpus) - 1) value |= GICR_TYPER_LAST; @@ -611,7 +611,7 @@ void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg) bool broadcast; sgi = (reg & ICC_SGI1R_SGI_ID_MASK) >> ICC_SGI1R_SGI_ID_SHIFT; - broadcast = reg & BIT(ICC_SGI1R_IRQ_ROUTING_MODE_BIT); + broadcast = reg & BIT_ULL(ICC_SGI1R_IRQ_ROUTING_MODE_BIT); target_cpus = (reg & ICC_SGI1R_TARGET_LIST_MASK) >> ICC_SGI1R_TARGET_LIST_SHIFT; mpidr = SGI_AFFINITY_LEVEL(reg, 3); mpidr |= SGI_AFFINITY_LEVEL(reg, 2);
Well, this patch is looking ahead of time, but we'll get following compiler warnings as soon as we introduce vgic-v3 to 32-bit world CC arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.o arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_mmio_read_v3r_typer': arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:184:35: warning: left shift count >= width of type [-Wshift-count-overflow] value = (mpidr & GENMASK(23, 0)) << 32; ^ In file included from ./include/linux/kernel.h:10:0, from ./include/asm-generic/bug.h:13, from ./arch/arm/include/asm/bug.h:59, from ./include/linux/bug.h:4, from ./include/linux/io.h:23, from ./arch/arm/include/asm/arch_gicv3.h:23, from ./include/linux/irqchip/arm-gic-v3.h:411, from arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:14: arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c: In function 'vgic_v3_dispatch_sgi': ./include/linux/bitops.h:6:24: warning: left shift count >= width of type [-Wshift-count-overflow] #define BIT(nr) (1UL << (nr)) ^ arch/arm/kvm/../../../virt/kvm/arm/vgic/vgic-mmio-v3.c:614:20: note: in expansion of macro 'BIT' broadcast = reg & BIT(ICC_SGI1R_IRQ_ROUTING_MODE_BIT); ^ Let's fix them now. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> --- virt/kvm/arm/vgic/vgic-mmio-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)