Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2546712pxj; Mon, 10 May 2021 05:39:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxe3KAjMAYAuCnvePmnEpHGAmzjK0jIQgspKQWyBc9iQXJlMfJZXVApT52Is1JzMik16hC8 X-Received: by 2002:a05:6402:35c4:: with SMTP id z4mr28657312edc.362.1620650344356; Mon, 10 May 2021 05:39:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650344; cv=none; d=google.com; s=arc-20160816; b=IPqZrE4m2bKYUhSdVuXJuQdsF/gpmtQ6opWijGse3fbCPypCsUbaemxauGbGNnNu3v u+X3X9pO11YCNJiIlW80eFvmJ0/GTiljoCmnIxo+WNOZ/pyQY8D5//xaSxYiFYTJXr9i KjkKohZgl4hl4/KW/SCYYVhcQduZBoolJZUFHepcJjt0y6+Wu2cu+XKNIWwvFrvRO9mk BP0um9BHQigvPF7Ts7MOuJFz0ei2u8Egw7V/Y1Bp9tkk2YbPT02CXA7MdoY8a0DlugXG zUxBUrkmKr0qjOh3WNrLSK1lj7YvolYMjKxh++kfV7i3Vk2zxzMoli82j1o/1WbnLboy A3Aw== 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=LY/9Vwm8aZtsaAmDXHWKyBBYFwGTSmwE5x3LeaGXzMVZvPI/i4DnxTOuwvtRMCFReG VcKfpmkJ/XZyluLRQZSt47FxFVz/lRdu9fYcqkp4XeSPQEZnjO8mwASRtzxvE/mPYyOS WJH4XjnC53C7xrUgTzcgBhAuBxK8pG5Yn0Pv4DtIrDQJ+ZRwSpsD1ndHAg8iWoezZvf0 gz+vwik8uJyke/GDV2NucTK5IinftMGv2FuuR1+7dxioZMC37E9noXXfG5JJJwfxe8Y2 +YWD9iOknBsIODP/vC6LwXA6QoviDodPibPlkqhRf5IISengzQRhqEl/M8C+ouqehF0v 92Vw== 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 linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 a6si9746109ejg.52.2021.05.10.05.38.40; Mon, 10 May 2021 05:39:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1346260AbhEJMaf (ORCPT + 99 others); Mon, 10 May 2021 08:30:35 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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, -- 2.30.2