pinctrl: pinctrl-single: Fix pcs_request_gpio() when bits_per_mux != 0
Subsystems (3)
PATCH v2 1/1 pinctrl: pinctrl-single: Fix pcs_request_gpio() when bits_per_mux != 0
This fixes pcs_request_gpio() in the pinctrl-single driver when bits_per_mux != 0. It appears this was overlooked when the multiple pins per register feature was added.
---
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.
There was some discussion in v1 about using DIV_ROUND_UP(), etc. macros, but the consensus was to leave it as-is since it matches existing code and that macros can be introduced in another patch.
drivers/pinctrl/pinctrl-single.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-single.c +19 -3
@@ -391,9 +391,25 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev, || pin < frange->offset)continue ; mux_bytes = pcs->width /BITS_PER_BYTE ; - data = pcs->read (pcs->base + pin * mux_bytes) & ~pcs->fmask; - data |= frange->gpiofunc; - pcs->write (data, pcs->base + pin * mux_bytes); + +if (pcs->bits_per_mux) { +int byte_num, offset, pin_shift; + + byte_num = (pcs->bits_per_pin * pin) /BITS_PER_BYTE ; + offset = (byte_num / mux_bytes) * mux_bytes; + pin_shift = pin % (pcs->width / pcs->bits_per_pin) * + pcs->bits_per_pin; + + data = pcs->read (pcs->base + offset); + data &= ~(pcs->fmask << pin_shift); + data |= frange->gpiofunc << pin_shift; + pcs->write (data, pcs->base + offset); + }else { + data = pcs->read (pcs->base + pin * mux_bytes); + data &= ~pcs->fmask; + data |= frange->gpiofunc; + pcs->write (data, pcs->base + pin * mux_bytes); + }break ; }return 0 ;
Signature · 1 line
2.7.4
Quoted 40 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>---
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.There was some discussion in v1 about using
DIV_ROUND_UP(), etc. macros, but the consensus was to leave it as-is since it matches existing code and that macros can be introduced in another patch.drivers/pinctrl/pinctrl-single.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)drivers/pinctrl/pinctrl-single.c +9
-3@@ -391,9 +391,25 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev, || pin < frange->offset)continue ; mux_bytes = pcs->width /BITS_PER_BYTE ; - data = pcs->read (pcs->base + pin * mux_bytes) & ~pcs->fmask; - data |= frange->gpiofunc; - pcs->write (data, pcs->base + pin * mux_bytes); + +if (pcs->bits_per_mux) { +int byte_num, offset, pin_shift; + + byte_num = (pcs->bits_per_pin * pin) /BITS_PER_BYTE ; + offset = (byte_num / mux_bytes) * mux_bytes; + pin_shift = pin % (pcs->width / pcs->bits_per_pin) * + pcs->bits_per_pin; +
drivers/pinctrl/pinctrl-single.c static int pcs_request_gpio(struct pinctrl_dev *pctldev, · line 413
Quoted 10 lines
drivers/pinctrl/pinctrl-single.c +9
-0+ data = pcs->read (pcs->base + offset); + data &= ~(pcs->fmask << pin_shift); + data |= frange->gpiofunc << pin_shift; + pcs->write (data, pcs->base + offset); + }else { + data = pcs->read (pcs->base + pin * mux_bytes); + data &= ~pcs->fmask; + data |= frange->gpiofunc; + pcs->write (data, pcs->base + pin * mux_bytes);
Just an idea, you may leave this almost untouched and do calculate pin_shift and offset in condition, like
if (...) {
pin_shift = ...
offset = ...
} else {
pin_shift = 0;
offset = pin * mux_bytes;
}
data = pcs->read(pcs->base + offset);
data &= ~(pcs->fmask << pin_shift);
data |= frange->gpiofunc << pin_shift;
pcs->write(data, pcs->base + offset);It's also possible to split to two changes, where first introduces that variables and their default values (see 'else' branch) and second one introduces an if branch override.
Quoted 2 lines
drivers/pinctrl/pinctrl-single.c +1
-0+ }break ;
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 63 lines · Andy Shevchenko
Quoted 40 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>---
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.There was some discussion in v1 about using
DIV_ROUND_UP(), etc. macros, but the consensus was to leave it as-is since it matches existing code and that macros can be introduced in another patch.drivers/pinctrl/pinctrl-single.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)drivers/pinctrl/pinctrl-single.c +9
-3@@ -391,9 +391,25 @@ static int pcs_request_gpio(struct pinctrl_dev *pctldev, || pin < frange->offset)continue ; mux_bytes = pcs->width /BITS_PER_BYTE ; - data = pcs->read (pcs->base + pin * mux_bytes) & ~pcs->fmask; - data |= frange->gpiofunc; - pcs->write (data, pcs->base + pin * mux_bytes); + +if (pcs->bits_per_mux) { +int byte_num, offset, pin_shift; + + byte_num = (pcs->bits_per_pin * pin) /BITS_PER_BYTE ; + offset = (byte_num / mux_bytes) * mux_bytes; + pin_shift = pin % (pcs->width / pcs->bits_per_pin) * + pcs->bits_per_pin; +drivers/pinctrl/pinctrl-single.c static int pcs_request_gpio(struct pinctrl_dev *pctldev, · line 413
Quoted 10 lines
drivers/pinctrl/pinctrl-single.c +9
-0+ data = pcs->read (pcs->base + offset); + data &= ~(pcs->fmask << pin_shift); + data |= frange->gpiofunc << pin_shift; + pcs->write (data, pcs->base + offset); + }else { + data = pcs->read (pcs->base + pin * mux_bytes); + data &= ~pcs->fmask; + data |= frange->gpiofunc; + pcs->write (data, pcs->base + pin * mux_bytes);Just an idea, you may leave this almost untouched and do calculate
pin_shiftand offset in condition, likeif (...) {
pin_shift= ...
offset = ...
} else {
pin_shift= 0;
offset = pin *mux_bytes;
}
Quoted 12 lines
data = pcs->read(pcs->base + offset); data &= ~(pcs->fmask << pin_shift); data |= frange->gpiofunc << pin_shift; pcs->write(data, pcs->base + offset);It's also possible to split to two changes, where first introduces that variables and their default values (see 'else' branch) and second one introduces an if branch override.
Quoted 2 lines
drivers/pinctrl/pinctrl-single.c +1
-0+ }break ;
Yes, there are many ways this could be done. However, I would like to just leave it as it is since it matches the patterns used elsewhere in this file.
Quoted 11 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>---
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.
Tony/Haojian: are you OK with this change?
Yours,
Linus Walleij
Tony Lindgren
maintainerQuoted 10 lines · Linus Walleij
Quoted 8 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>---
Quoted 5 lines
Quoted 3 lines
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.Tony/Haojian: are you OK with this change?
No objections from me, would be good if Haojian could test it with his test cases though.
Regards,
Tony
Quoted 11 lines · Tony Lindgren
Quoted 10 lines · Linus Walleij
Quoted 8 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>---
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
v2 changes:
- don't wrap Fixes: line in commit message since it is a special machine- readable line.Tony/Haojian: are you OK with this change?
No objections from me, would be good if Haojian could test it with his test cases though.
I applied it for v4.17 recording this as an ACK :)
If there are problems I bet we will notice in the -rc phase.
Yours,
Linus Walleij
Quoted 6 lines · David Lechner
This fixes
pcs_request_gpio()in the pinctrl-single driver whenbits_per_mux!= 0. It appears this was overlooked when the multiple pins per register feature was added.Fixes 4e7e8017a80e ("pinctrl: pinctrl-single: enhance to configure multiple pins of different modules")Signed-off-by David Lechner <[email protected]>
Patch applied for v4.17 with Tony's ACK.
Yours,
Linus Walleij