Skip to contentSkip to conversation

pinctrl: pinctrl-imx: don't use invalid value of conf_reg

PATCH New Uwe Kleine-König 3 participants 6 messages Jan 27, 2015 – Feb 6, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

The right check for conf_reg to be invalid it testing against -1 not 0 as is done in the rest of the driver.

This fixes an oops that can be triggered by:

	cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*
Fixes ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")
---
 drivers/pinctrl/freescale/pinctrl-imx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
index 52f2b9404fe0..448f10986c28 100644
@@ -437,7 +437,7 @@ static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev,
 	const struct imx_pin_reg *pin_reg = &info->pin_regs[pin_id];
 	unsigned long config;
 
-	if (!pin_reg || !pin_reg->conf_reg) {
+	if (!pin_reg || pin_reg->conf_reg == -1) {
 		seq_printf(s, "N/A");
 		return;
 	}
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

Hello,

please disregard the patch here, the email address of Dong Aisheng I used isn't valid any more. I resend with the correct address.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#2 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

In reply to Uwe Kleine-König
Quoted 9 lines · Uwe Kleine-K?nig

The right check for conf_reg to be invalid it testing against -1 not 0 as is done in the rest of the driver.

This fixes an oops that can be triggered by:

        cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*
Fixes ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")

Patch applied.

But...

drivers/pinctrl/freescale/pinctrl-imx.c static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev, · line 440

Quoted 2 lines
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
-       if (!pin_reg || !pin_reg->conf_reg) {
+       if (!pin_reg || pin_reg->conf_reg == -1) {

I can see that the other code checks for -1 in this variable. But where is conf_reg ever set to -1?

freescale]$ git grep "\-1"

pinctrl-imx.c:          if (pin_reg->mux_reg == -1) {
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (!pin_reg || pin_reg->conf_reg == -1) {

Only checked for, never assigned.

Yours,
Linus Walleij

#3 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

Quoted 23 lines · Linus Walleij
Quoted 9 lines · Uwe Kleine-K?nig

The right check for conf_reg to be invalid it testing against -1 not 0 as is done in the rest of the driver.

This fixes an oops that can be triggered by:

        cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*
Fixes ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")

Patch applied.

But...

drivers/pinctrl/freescale/pinctrl-imx.c static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev, · line 440

Quoted 2 lines
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
-       if (!pin_reg || !pin_reg->conf_reg) {
+       if (!pin_reg || pin_reg->conf_reg == -1) {

I can see that the other code checks for -1 in this variable. But where is conf_reg ever set to -1?

Quoted 7 lines

freescale]$ git grep "\-1"

pinctrl-imx.c:          if (pin_reg->mux_reg == -1) {
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (!pin_reg || pin_reg->conf_reg == -1) {

Uah, ugly. This member gets -1 by means of:

	memset(info->pin_regs, 0xff, sizeof(*info->pin_regs) * info->npins);

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#4 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

Quoted 31 lines · Uwe Kleine-K?nig
Quoted 23 lines · Linus Walleij
Quoted 9 lines · Uwe Kleine-K?nig

The right check for conf_reg to be invalid it testing against -1 not 0 as is done in the rest of the driver.

This fixes an oops that can be triggered by:

        cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*
Fixes ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")

Patch applied.

But...

drivers/pinctrl/freescale/pinctrl-imx.c static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev, · line 440

Quoted 2 lines
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
-       if (!pin_reg || !pin_reg->conf_reg) {
+       if (!pin_reg || pin_reg->conf_reg == -1) {

I can see that the other code checks for -1 in this variable. But where is conf_reg ever set to -1?

Quoted 7 lines

freescale]$ git grep "\-1"

pinctrl-imx.c:          if (pin_reg->mux_reg == -1) {
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (!pin_reg || pin_reg->conf_reg == -1) {
Quoted 3 lines

Uah, ugly. This member gets -1 by means of:

        memset(info->pin_regs, 0xff, sizeof(*info->pin_regs) * info->npins);

OMG. Uwe can you make a patch changing that initialization code to something sane? We can't have it like this.

Yours,
Linus Walleij

#5 lore raw

PATCH 1/1 pinctrl: pinctrl-imx: don't use invalid value of conf_reg

Quoted 6 lines · Linus Walleij
Quoted 4 lines · Uwe Kleine-K?nig
Quoted 3 lines · Linus Walleij

On Tue, Jan 27, 2015 at 11:50 PM, Uwe Kleine-K?nig <[email protected]> wrote:

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

The right check for conf_reg to be invalid it testing against -1 not 0 as is done in the rest of the driver.

This fixes an oops that can be triggered by:

        cat /sys/kernel/debug/pinctrl/43fac000.iomuxc/*
Fixes ae75ff814538 ("pinctrl: pinctrl-imx: add imx pinctrl core driver")

This was actually introduce by me in 3dac1918a491 ("pinctrl: imx: detect uninitialized pins").

Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 1 line

Patch applied.

But...

drivers/pinctrl/freescale/pinctrl-imx.c static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev, · line 440

Quoted 2 lines
drivers/pinctrl/freescale/pinctrl-imx.c +1 -1
-       if (!pin_reg || !pin_reg->conf_reg) {
+       if (!pin_reg || pin_reg->conf_reg == -1) {

I can see that the other code checks for -1 in this variable. But where is conf_reg ever set to -1?

freescale]$ git grep "\-1"

pinctrl-imx.c:          if (pin_reg->mux_reg == -1) {
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->mux_reg == -1)
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (pin_reg->conf_reg == -1) {
pinctrl-imx.c:  if (!pin_reg || pin_reg->conf_reg == -1) {
Quoted 6 lines
Quoted 3 lines

Uah, ugly. This member gets -1 by means of:

        memset(info->pin_regs, 0xff, sizeof(*info->pin_regs) * info->npins);

OMG. Uwe can you make a patch changing that initialization code to something sane? We can't have it like this.

Oh sorry, this was actually me, in the commit mentioned above. That's ugly, I agree. I'm wondering how I came to that idea....

Will send a patch for that.

--
Stefan