From patchwork Mon Nov 12 15:25:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 996505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="vdw3rt9D"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42tvjF6x39z9s1x for ; Tue, 13 Nov 2018 02:25:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726981AbeKMBTf (ORCPT ); Mon, 12 Nov 2018 20:19:35 -0500 Received: from mail-eopbgr20069.outbound.protection.outlook.com ([40.107.2.69]:9905 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726385AbeKMBTf (ORCPT ); Mon, 12 Nov 2018 20:19:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9AoqIlWBKTH9wJeEh/8iRmm/oFPH9gyeLRN+y77zSjU=; b=vdw3rt9D0waufsvNc3KxlymmOGYtWUJ4BkoPdumRW5bgP5qG/Glr8FZGlETJoSQOu3iS9c/HIIGXYZkv0vNsOQrlXYOdjxhyI1KEmLwH8Ja9IR+TQf6G0uUDM8dhZ8hfB/Kbyxahdu47/inbtsZYLCP9yvFQaMIIcjh1Jyg4s20= Received: from AM0PR04MB4211.eurprd04.prod.outlook.com (52.134.126.21) by AM0PR04MB4370.eurprd04.prod.outlook.com (52.135.148.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.21; Mon, 12 Nov 2018 15:25:48 +0000 Received: from AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::797a:f972:9281:6d10]) by AM0PR04MB4211.eurprd04.prod.outlook.com ([fe80::797a:f972:9281:6d10%2]) with mapi id 15.20.1294.044; Mon, 12 Nov 2018 15:25:48 +0000 From: "A.s. Dong" To: "linux-gpio@vger.kernel.org" CC: "linus.walleij@linaro.org" , "linux-arm-kernel@lists.infradead.org" , "dongas86@gmail.com" , "kernel@pengutronix.de" , "shawnguo@kernel.org" , Fabio Estevam , "martin@kaiser.cx" , Leonard Crestez , "stefan@agner.ch" , dl-linux-imx , "A.s. Dong" Subject: [PATCH 1/1] pinctrl: imx: fix NO_PAD_CTL setting for MMIO pads Thread-Topic: [PATCH 1/1] pinctrl: imx: fix NO_PAD_CTL setting for MMIO pads Thread-Index: AQHUepv8E7PcCN2r40aScfEzOB5TzQ== Date: Mon, 12 Nov 2018 15:25:48 +0000 Message-ID: <1542036051-23840-1-git-send-email-aisheng.dong@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0P153CA0028.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::16) To AM0PR04MB4211.eurprd04.prod.outlook.com (2603:10a6:208:66::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=aisheng.dong@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR04MB4370; 6:q//Z6SiioKoIEvMU7eN5pcKveNfYFWDFfrmSks34uU9kDjVf/KNCUhf84CdB4H2ZvZDEiC21Lf1dQHEc456xcQ55zC+kj61m1kn7DT5nyL+6XiQt6Rc1jKdtHNbaIVbDEPnOSlE+kpJ86NGJv/FDYaAFdHSO1oVyKpARrgtEYtEI7HJkAdHixDw7PvPsunIdiCGmRzb6XwEuWXXetmRJkOP4P0brIW7JHaCRaSwso4v8ZoaoRfszT1+qqZwt8PHEA43TtNsPqOolzEuHZbp9j16mIbE/AtvbZ5+8vw8M67IxRqT1dcBe5wZkqOBHBOiQnATBZ8HR7cEVPMpcwXvtfHUfR2tyGMfeqvnJ1L4rXIVdVilefJCrfS1wTARKQhcF0Lx02pUONpnOfIRevW/YvBbYMietoU0uyCVHrDcASjw/5TXP88quqAaxE102v92kT5BWpZQN4ykn3dBkKbPcDw==; 5:QlScFiiIY5h10wGWmfTLOft+c4GPjvs+Qrkh7fcmHwvWPKPJ3p+xgJKfwHoT4S+ykw8ag+i384seDNop4JnMJKEhzW0HDxODukHi0zOfH7NAGgl9F1a0alxhqfjIASI1uHbiyQUB9CI+NMcZGZNyLH1Tb6uX30flaBapQJG+QQ8=; 7:JIZm4p7jmQtRftw4Fc8rTiS6MLc+Las/oaB9vibRY/7xtGh/zHT44zDabiZwJCzJR2L18LZUMK6cdSdcLi8dUncw+QH9IAzJTgWMSSQABdbn8mF+KImCrqP52SssVfBuve71ICLJb/uP0hYwkTiFFQ== x-ms-office365-filtering-correlation-id: 81069b75-e9f9-448b-0bb4-08d648b31f09 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390040)(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR04MB4370; x-ms-traffictypediagnostic: AM0PR04MB4370: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231402)(944501410)(52105112)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(201708071742011)(7699051)(76991095); SRVR:AM0PR04MB4370; BCL:0; PCL:0; RULEID:; SRVR:AM0PR04MB4370; x-forefront-prvs: 0854128AF0 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(366004)(396003)(346002)(39860400002)(189003)(199004)(6506007)(186003)(386003)(26005)(86362001)(52116002)(2501003)(14454004)(5640700003)(305945005)(7736002)(99286004)(6486002)(66066001)(6512007)(71200400001)(102836004)(53936002)(39060400002)(71190400001)(316002)(256004)(68736007)(14444005)(476003)(106356001)(105586002)(2906002)(97736004)(81156014)(6916009)(81166006)(478600001)(8676002)(2900100001)(54906003)(6436002)(486006)(8936002)(5660300001)(36756003)(50226002)(25786009)(6116002)(4326008)(2351001)(3846002)(2616005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4370; H:AM0PR04MB4211.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: Sv4ae41gg+aG5oeIeflNUyxmNOgLKGGuZ1dTNmQ2kfgYKnFDm9jyzfnGldODb5CY8sRug6UV3NhZZFlN4rpUe/R5wyF2k4HZxsdeNIF6xALudC5kmYFdVV3HJYhnht3wBLuBoPcKD9Y3tfiCDMlUTtcdrNnZ4BbCU+21QmpeN0h5iCsS7UQ+MnOnMWFAfXyGRIc5aUD1wFmpwoG+gixAPKIvcAu4qijTyL6S1fmYTBgSHus8rDDBdgk52Jno9gBKsf+rXwGMrBBjUQfMw8EcTSxToMhZJWzE+PnxDx9PW7t9pBOjYlDoomLJVfvpF61pc66vZAB4Nj8FOBoOH3dR0VpIG6v9+90hG8wd9230o4s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81069b75-e9f9-448b-0bb4-08d648b31f09 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Nov 2018 15:25:48.4471 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4370 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org After patch b96eea718bf6 ("pinctrl: fsl: add scu based pinctrl support"), NO_PAD_CTL pads map are not skipped anymore which results in a possible memory corruption. As we actually only need to create config maps for SCU pads and MMIO pads which are not using the default config (a.k.a IMX_NO_PAD_CTL), so let's add a proper check before creating the config maps. And during MMIO pads parsing, we also need update the list_p point as SCU case to ensure the pin data next parsed is correct. Cc: Linus Walleij Fixes: b96eea718bf6 ("pinctrl: fsl: add scu based pinctrl support") Reported-by: Martin Kaiser Suggested-by: Leonard Crestez Signed-off-by: Dong Aisheng Reviewed-by: Martin Kaiser Tested-by: Leonard Crestez Tested-by: Kevin Hilman --- drivers/pinctrl/freescale/pinctrl-imx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c index 78d33df..188001b 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -108,6 +108,15 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, new_map++; for (i = j = 0; i < grp->num_pins; i++) { pin = &((struct imx_pin *)(grp->data))[i]; + + /* + * We only create config maps for SCU pads or MMIO pads that + * are not using the default config(a.k.a IMX_NO_PAD_CTL) + */ + if (!(info->flags & IMX_USE_SCU) && + (pin->conf.mmio.config & IMX_NO_PAD_CTL)) + continue; + new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN; new_map[j].data.configs.group_or_pin = pin_get_name(pctldev, pin->pin); @@ -120,7 +129,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, new_map[j].data.configs.configs = (unsigned long *)&pin->conf.scu; new_map[j].data.configs.num_configs = 2; - } else if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL)) { + } else { new_map[j].data.configs.configs = &pin->conf.mmio.config; new_map[j].data.configs.num_configs = 1; @@ -549,6 +558,8 @@ static void imx_pinctrl_parse_pin_mmio(struct imx_pinctrl *ipctl, pin_mmio->config = config & ~IMX_PAD_SION; } + *list_p = list; + dev_dbg(ipctl->dev, "%s: 0x%x 0x%08lx", info->pins[*pin_id].name, pin_mmio->mux_mode, pin_mmio->config); }