Skip to contentSkip to conversation

pinctrl: pinmux: Don't free pins requested by other devices in pinmux_disable_setting.

PATCH Superseded Sonic Zhang 2 participants 2 messages Aug 13, 2013 Pin control

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 pinctrl: pinmux: Don't free pins requested by other devices in pinmux_disable_setting.

From: Sonic Zhang <[email protected]>

One peripheral may share part of its pins with the 2nd peripheral and the other pins with the 3rd. If it requests all pins when part of them has already be requested and owned by the 2nd peripheral, this request fails and pinmux_disable_setting() is called. The pinmux_disable_setting() frees all pins of the first peripheral without checking if the pin is owned by itself or the 2nd, which results in the malfunction of the 2nd peripheral driver.

---
 drivers/pinctrl/pinmux.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/pinctrl/pinmux.c +7 -5
index 88cc509..ab41552 100644
@@ -480,15 +480,17 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
 			dev_warn(pctldev->dev,
 				 "could not get pin desc for pin %d\n",
 				 pins[i]);
+			/* And release the pin */
+			pin_free(pctldev, pins[i], NULL);
 			continue;
 		}
-		desc->mux_setting = NULL;
+		if (desc->mux_setting == &(setting->data.mux)) {
+			desc->mux_setting = NULL;
+			/* And release the pin */
+			pin_free(pctldev, pins[i], NULL);
+		}
 	}
 
-	/* And release the pins */
-	for (i = 0; i < num_pins; i++)
-		pin_free(pctldev, pins[i], NULL);
-
 	if (ops->disable)
 		ops->disable(pctldev, setting->data.mux.func, setting->data.mux.group);
 }
Signature · 1 line
1.8.2.3
#1 lore raw
Quoted 13 lines · Sonic Zhang

From: Sonic Zhang <[email protected]>

One peripheral may share part of its pins with the 2nd peripheral and the other pins with the 3rd. If it requests all pins when part of them has already be requested and owned by the 2nd peripheral, this request fails and pinmux_disable_setting() is called. The pinmux_disable_setting() frees all pins of the first peripheral without checking if the pin is owned by itself or the 2nd, which results in the malfunction of the 2nd peripheral driver.

drivers/pinctrl/pinmux.c void pinmux_disable_setting(struct pinctrl_setting const *setting) · line 484

Quoted 5 lines
drivers/pinctrl/pinmux.c +2 -0
@@ -480,15 +480,17 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
 			dev_warn(pctldev->dev,
 				 "could not get pin desc for pin %d\n",
 				 pins[i]);
+			/* And release the pin */
+			pin_free(pctldev, pins[i], NULL);

This change doesn't seem useful. The 2 lines right above the patch context are:

		desc = pin_desc_get(pctldev, pins[i]);
                if (desc == NULL) {

... and the first thing pin_free() does it call pin_desc_get() again. So, pin_free() is simply going to fail and print another error.

The rest of the patch looks good.