Skip to content

Commit ac6f082

Browse files
keeslinusw
authored andcommitted
pinctrl: airoha: Use unsigned long for bit search
Instead of risking alignment problems and causing (false positive) array bound warnings when casting a u32 to (64-bit) unsigned long, just use a native unsigned long for doing bit searches. Avoids warning with GCC 15's -Warray-bounds -fdiagnostics-details: In file included from ../include/linux/bitmap.h:11, from ../include/linux/cpumask.h:12, from ../arch/x86/include/asm/paravirt.h:21, from ../arch/x86/include/asm/irqflags.h:80, from ../include/linux/irqflags.h:18, from ../include/linux/spinlock.h:59, from ../include/linux/irq.h:14, from ../include/linux/irqchip/chained_irq.h:10, from ../include/linux/gpio/driver.h:8, from ../drivers/pinctrl/mediatek/pinctrl-airoha.c:11: In function 'find_next_bit', inlined from 'airoha_irq_handler' at ../drivers/pinctrl/mediatek/pinctrl-airoha.c:2394:3: ../include/linux/find.h:65:23: error: array subscript 'long unsigned int[0]' is partly outside array bounds of 'u32[1]' {aka 'unsigned int[1]'} [-Werror=array-bounds=] 65 | val = *addr & GENMASK(size - 1, offset); | ^~~~~ ../drivers/pinctrl/mediatek/pinctrl-airoha.c: In function 'airoha_irq_handler': ../drivers/pinctrl/mediatek/pinctrl-airoha.c:2387:21: note: object 'status' of size 4 2387 | u32 status; | ^~~~~~ Signed-off-by: Kees Cook <kees@kernel.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/20241117114534.work.292-kees@kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 7e86490 commit ac6f082

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

drivers/pinctrl/mediatek/pinctrl-airoha.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2384,15 +2384,16 @@ static irqreturn_t airoha_irq_handler(int irq, void *data)
23842384

23852385
for (i = 0; i < ARRAY_SIZE(irq_status_regs); i++) {
23862386
struct gpio_irq_chip *girq = &pinctrl->gpiochip.chip.irq;
2387-
u32 status;
2387+
u32 regmap;
2388+
unsigned long status;
23882389
int irq;
23892390

23902391
if (regmap_read(pinctrl->regmap, pinctrl->gpiochip.status[i],
2391-
&status))
2392+
&regmap))
23922393
continue;
23932394

2394-
for_each_set_bit(irq, (unsigned long *)&status,
2395-
AIROHA_PIN_BANK_SIZE) {
2395+
status = regmap;
2396+
for_each_set_bit(irq, &status, AIROHA_PIN_BANK_SIZE) {
23962397
u32 offset = irq + i * AIROHA_PIN_BANK_SIZE;
23972398

23982399
generic_handle_irq(irq_find_mapping(girq->domain,

0 commit comments

Comments
 (0)