]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pinctrl: renesas: checker: Fix off-by-one bug in drive register check
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 7 Oct 2021 14:38:47 +0000 (16:38 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Nov 2021 10:04:26 +0000 (11:04 +0100)
[ Upstream commit 28e7f8ff90583791a034d43b5d2e3fe394142e13 ]

The GENMASK(h, l) macro creates a contiguous bitmask starting at bit
position @l and ending at position @h, inclusive.

This did not trigger any error checks, as the individual register fields
cover at most 3 of the 4 available bits.

Fixes: 08df16e07ad0a1ec ("pinctrl: sh-pfc: checker: Add drive strength register checks")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/8f82d6147fbe3367d4c83962480e97f58d9c96a2.1633615652.git.geert+renesas@glider.be
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pinctrl/renesas/core.c

index 5ccc49b387f17eb9e4002b2751940b0057c9c81e..77d1dc0f5b9ba34e477d81d6bf9b0e653440fbfd 100644 (file)
@@ -886,7 +886,7 @@ static void __init sh_pfc_check_drive_reg(const struct sh_pfc_soc_info *info,
                if (!field->pin && !field->offset && !field->size)
                        continue;
 
-               mask = GENMASK(field->offset + field->size, field->offset);
+               mask = GENMASK(field->offset + field->size - 1, field->offset);
                if (mask & seen)
                        sh_pfc_err("drive_reg 0x%x: field %u overlap\n",
                                   drive->reg, i);