From patchwork Mon May 10 10:19:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 433113 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2796750jao; Mon, 10 May 2021 05:33:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOeQhUoYBecqab2ogNYaoRph1xEgBQehKOzLf+/dckWDkvwZCZ3drTdWT2QxMaTtVqBxyO X-Received: by 2002:a17:907:2cc1:: with SMTP id hg1mr26100504ejc.453.1620650003825; Mon, 10 May 2021 05:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650003; cv=none; d=google.com; s=arc-20160816; b=GEuhogBLXrbIRjPjonOfFRxr3Un0SMyldLTrtN+1qZw1rMY0zlb6zcq1Dsq7FDH6YD NJ+YRytwVZvfoSjIdglUrnfRYDxPH2EpYzEkKeE+MPHA+sHM7vv4kbEXfqh4sJeBVX8F iHmHfFKGScTffW06ymZ0ZsljWfrdWYcqS2XC7IZ68r7R5P74O+OSfIJms+EiqZKg+1CC 2kpL3HSye6LvbR8CTwM6f68P0LzSjIZ9Gb95RywutDMmFT1KaOo01feHCedcAx+Akm/E zkKg/D373mTUIkkpiMbjLQf7NSBXQiDzDp7YiL6vE5DuC2qDLPZS3lFwRPvxrz02ylay qATg== 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=oD/2oCsG3VTn6NLBDambTcbuNaJoS56htAg83GjS6y5uYGCHt5LqzzL02T9FOdpGoY mSdxEPDg8Teg1AI8oJp7xb+0n7wv7MGLVsUgJlDfMskvoiZDYN5YmHr3tbNsfJYNccpN xxFtvpVnJpWtyHgJ3sDdDp4TZp9AaXxv9JltNAFzeB9jE+5b6mGeQFPhMRjT3k+oQNFN s5XlHEHmibCYm5c66Bra3bMKVbQRMTTxqEU00Dzey75rTBbc3mfVOykm/cC91LK78dqn VC2pCph8UHtWkzcW6Tsb0NUuh0TWbGa/sVojl8ikwGVFltws0OfxHDsdY8PetazQRU/6 Mq3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Yh83f5GT; 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.05.33.23; Mon, 10 May 2021 05:33:23 -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=Yh83f5GT; 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 S234254AbhEJLWg (ORCPT + 12 others); Mon, 10 May 2021 07:22:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:45204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235320AbhEJLKL (ORCPT ); Mon, 10 May 2021 07:10:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 776CF6143B; Mon, 10 May 2021 11:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644727; bh=fh8NTrcVEp7XEynMX0wepwrZy+rJKZt3MliX/P9XDEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yh83f5GTjpH5+6UwLfabM/X02TcbAKP4k8QM+Q+3Kwb4FJD3WRtpmqor81CjtsGf6 CC1X5uBGxndiz+JC99VVi2x4N+QeFlsROnn1ruAp8FGpDQrWNcroc+I6+ryH91wsEz YA/kjaYiBguApb3o19ecLhgnuUhdyaTCLalUJbL0= 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.12 200/384] mmc: sdhci-esdhc-imx: validate pinctrl before use it Date: Mon, 10 May 2021 12:19:49 +0200 Message-Id: <20210510102021.469496439@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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,