Commit e6bfaf52 authored by Keerthy's avatar Keerthy Committed by Ben Hutchings

pinctrl: single: Fix pcs_parse_bits_in_pinctrl_entry to use __ffs than ffs

commit 56b367c0 upstream.

pcs_parse_bits_in_pinctrl_entry uses ffs which gives bit indices
ranging from 1 to MAX. This leads to a corner case where we try to request
the pin number = MAX and fails.

bit_pos value is being calculted using ffs. pin_num_from_lsb uses
bit_pos value. pins array is populated with:

pin + pin_num_from_lsb.

The above is 1 more than usual bit indices as bit_pos uses ffs to compute
first set bit. Hence the last of the pins array is populated with the MAX
value and not MAX - 1 which causes error when we call pin_request.

mask_pos is rightly calculated as ((pcs->fmask) << (bit_pos - 1))
Consequently val_pos and submask are correct.

Hence use __ffs which gives (ffs(x) - 1) as the first bit set.

fixes: 4e7e8017 ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 4c6ecde0
...@@ -1329,9 +1329,9 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs, ...@@ -1329,9 +1329,9 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,
/* Parse pins in each row from LSB */ /* Parse pins in each row from LSB */
while (mask) { while (mask) {
bit_pos = ffs(mask); bit_pos = __ffs(mask);
pin_num_from_lsb = bit_pos / pcs->bits_per_pin; pin_num_from_lsb = bit_pos / pcs->bits_per_pin;
mask_pos = ((pcs->fmask) << (bit_pos - 1)); mask_pos = ((pcs->fmask) << bit_pos);
val_pos = val & mask_pos; val_pos = val & mask_pos;
submask = mask & mask_pos; submask = mask & mask_pos;
...@@ -1908,7 +1908,7 @@ static int pcs_probe(struct platform_device *pdev) ...@@ -1908,7 +1908,7 @@ static int pcs_probe(struct platform_device *pdev)
ret = of_property_read_u32(np, "pinctrl-single,function-mask", ret = of_property_read_u32(np, "pinctrl-single,function-mask",
&pcs->fmask); &pcs->fmask);
if (!ret) { if (!ret) {
pcs->fshift = ffs(pcs->fmask) - 1; pcs->fshift = __ffs(pcs->fmask);
pcs->fmax = pcs->fmask >> pcs->fshift; pcs->fmax = pcs->fmask >> pcs->fshift;
} else { } else {
/* If mask property doesn't exist, function mux is invalid. */ /* If mask property doesn't exist, function mux is invalid. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment