From patchwork Mon May 10 10:19:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433080 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2747878jao; Mon, 10 May 2021 04:31:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgCrIVqWbObnXiRkRGAKqueb2HDNYEF1zGuxlM2uxLn0qpqt/u5XQjXrsJCT7CpPDSA6Ld X-Received: by 2002:a17:906:3e89:: with SMTP id a9mr24528466ejj.405.1620646313217; Mon, 10 May 2021 04:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620646313; cv=none; d=google.com; s=arc-20160816; b=N2Rl0ibo5ICQULxayyT9h+ysGn0KC0EsAUOLx4GHk0vZHahN+pAWyUYwIL5HMZfwN6 oVmmtB5NZMdSwfxQg0rL9UZZZUPtFBaZHx19aHfgm39vQaNygfL8SlCWa4JoCzixktOG /vAFVxdzOiJtsDAcqlv0+H1ctyYt4jVU6qvI/LX/2/wQ9rLDoy9m1OSQOp0ubysOU2m8 zd4GnJ7KrSCIBwROAw8W2q9G+nc+RuSejAOhriORLIqjG1Pfe2Honb6cpOgkSXPrkDpR ZkWhDXlst0u22FYI+e1BYFm8cUqSpkYDBN2pSNn5a/Hylwoki9lR4SmoCp2u9JQ8KfSe W5uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2bvrOe+p3YXBLQHb8QBvBU4jqdKhfjQW/Iu6GYufODQ=; b=vxzfVDM8WkoyZPlx+HQmtk6TsJdMXLrxyyUZPPnmI+euNFLNDhJv7VkRMoMSV+FFVA 0klHc2MJjNRR444RpQQ1ti5FCezDtWPehd1+FDJ6fL0wS8WT6mOWWKqee9z2VCF8S1WK 8+43fqNcVF72D5AJcXBKepXN9aMz4yTEB9xIS1zZFv4ZIFwsYmj9mKtwRX7YlwjQNhRU uhn7ubtVLYjYU9WmTNuYA4E+kOL8wXk85yYDGcHaW9WsNWiDB/yEJxMxFlErUnCH4ua9 gceeJbZIGU7IKh5P6SjuwJubRrT/cQqxGUULcgwlTfNAGAChfmtdpRESIJGVT6hZ3l0Q KWww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KvtC00UJ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.04.31.53; Mon, 10 May 2021 04:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KvtC00UJ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234733AbhEJLFR (ORCPT + 12 others); Mon, 10 May 2021 07:05:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:52794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231830AbhEJK5j (ORCPT ); Mon, 10 May 2021 06:57:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5CFFB619E6; Mon, 10 May 2021 10:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643917; bh=fh8NTrcVEp7XEynMX0wepwrZy+rJKZt3MliX/P9XDEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KvtC00UJ8WtfXQbbVqlo49SBN0BOZLYbcXTQGDst+xARW4rNVuw5EbbMBkKxMZYLa X8o/jGLoUOZDhkQrkW2bsjm2CIxPgQqPS7Xc5YjEw7uTjVUYX3eE+WFc7BfodyM0kc wa3cEJOEbp/EihOD0jmtqsLZ1q8iOEg3zimMAlXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bough Chen , Alice Guo , Peng Fan , Ulf Hansson , Sasha Levin Subject: [PATCH 5.11 178/342] mmc: sdhci-esdhc-imx: validate pinctrl before use it Date: Mon, 10 May 2021 12:19:28 +0200 Message-Id: <20210510102015.987100110@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peng Fan [ Upstream commit f410ee0aa2df050a9505f5c261953e9b18e21206 ] When imx_data->pinctrl is not a valid pointer, pinctrl_lookup_state will trigger kernel panic. When we boot Dual OS on Jailhouse hypervisor, we let the 1st Linux to configure pinmux ready for the 2nd OS, so the 2nd OS not have pinctrl settings. Similar to this commit b62eee9f804e ("mmc: sdhci-esdhc-imx: no fail when no pinctrl available"). Reviewed-by: Bough Chen Reviewed-by: Alice Guo Signed-off-by: Peng Fan Link: https://lore.kernel.org/r/1614222604-27066-6-git-send-email-peng.fan@oss.nxp.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index a20459744d21..94327988da91 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1488,7 +1488,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, mmc_of_parse_voltage(np, &host->ocr_mask); - if (esdhc_is_usdhc(imx_data)) { + if (esdhc_is_usdhc(imx_data) && !IS_ERR(imx_data->pinctrl)) { imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl, ESDHC_PINCTRL_STATE_100MHZ); imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,