[PATCH] pinctrl: imx: Fix imx_dt_node_to_map handling of IMX_NO_PAD_CTL

[Leonard Crestez <leonard.crestez@xxxxxxx>]

After changes for SCU support the IMX_NO_PAD_CTL flag is not longer
handled correctly in imx_dt_node_to_map. Pins with this flag are no
longer skipped and the new_map array can overflow and corrupt memory.

This fixes imx6-sabreauto boards failing to boot.

Fixes: b96eea718bf6 ("pinctrl: fsl: add scu based pinctrl support")
Signed-off-by: Leonard Crestez <leonard.crestez@xxxxxxx>

---
 drivers/pinctrl/freescale/pinctrl-imx.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

A different was posted earlier: https://lore.kernel.org/patchwork/patch/1009504/

I don't think that's correct because it assumes num_configs is
zero-initialized but new_map comes from kmalloc_array.

Code is clearer if SCU and MMIO paths are separate.

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 78d33dfb4d2d..51312e81eff7 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -106,29 +106,31 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 	/* create config map */
 	new_map++;
 	for (i = j = 0; i < grp->num_pins; i++) {
 		pin = &((struct imx_pin *)(grp->data))[i];
-		new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
-		new_map[j].data.configs.group_or_pin =
-					pin_get_name(pctldev, pin->pin);
-
 		if (info->flags & IMX_USE_SCU) {
 			/*
 			 * For SCU case, we set mux and conf together
 			 * in one IPC call
 			 */
+			new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
+			new_map[j].data.configs.group_or_pin =
+					pin_get_name(pctldev, pin->pin);
 			new_map[j].data.configs.configs =
 					(unsigned long *)&pin->conf.scu;
 			new_map[j].data.configs.num_configs = 2;
+			++j;
 		} else if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL)) {
+			new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
+			new_map[j].data.configs.group_or_pin =
+					pin_get_name(pctldev, pin->pin);
 			new_map[j].data.configs.configs =
 					&pin->conf.mmio.config;
 			new_map[j].data.configs.num_configs = 1;
+			++j;
 		}
-
-		j++;
 	}
 
 	dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
 		(*map)->data.mux.function, (*map)->data.mux.group, map_num);
 
-- 
2.17.1