From patchwork Mon May 10 10:19:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433069 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2716351jao; Mon, 10 May 2021 03:50:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7ITatBoH6HP2S4joAgPLNaAkxKgd8MVfIDzqUuf0yYTO9NyNhZTgaprldLnje47xg7Edk X-Received: by 2002:a05:6402:17:: with SMTP id d23mr28974880edu.63.1620643813829; Mon, 10 May 2021 03:50:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643813; cv=none; d=google.com; s=arc-20160816; b=iSQzMEaKCbnfxRkFk8asSzxFR5Ueh1HcPW3Bc0bNj/mzGOU0+oWz+jXdqflC7qtigT 5rYEI0bhgR8nTwtoG17IjNgawg/ev336OgetE+khVrkHXN9Q45k4TGmWPMyVdksP/91I AHDavGH/sYhzBgbZQFTk5UYh7VXRaZjdoVNTuye0nK6fnSZOaF1yD0/pedUGXoCNlqGT ZMF0SAECH8Rqm+dRceNbNQ2t/eefswI/rUNG5qBJO8wODKdVVvq3FXOwXZYB+cONuSFN xBkgbEWIwAR9bE4hfUioLIeE8DGNFT+F/Fx2owucafZw0CfgEqAWhNp3jicoNbEucWDn YyTA== 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=nqy4nsKCtj0uEjHW/n0ZpEmTnlR+p/4O6J4lBttJv4s=; b=sbWnRD9p28pCJVFjabhaUfJno4C3O3HQhG3w1P/aT+fe5z/cPlbG/+j0XpIe/XZ/cn Lb4PspsjJfVrIeOjaNMYpfQ2S+aZ0Uq0hRgnfkxsh2Kb6Lqp8d61I6xQasoEMGodrqcA vj8aVBhK+FHso+f4nTaX73K5nWlTNPyyZ2ZyLnzoz5iB3ZPweQ6R8y3RKKxOjW0MPUjA bqbPnPlSr5sHu9ipbaDv67xZ53nnAB2VBXBq4qLMy+gfrEpbR6M2qqiD0jQeLRjontih LT3/nQoFGOyOAcG0KvkclKWaPW1RCXTUXbESMF5YHJhNf0vEm0VyqpnpQzVhxrIyXH/L OMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=T53ug5qV; 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 gu21si13494880ejb.12.2021.05.10.03.50.13; Mon, 10 May 2021 03:50:13 -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=T53ug5qV; 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 S231901AbhEJKur (ORCPT + 12 others); Mon, 10 May 2021 06:50:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:59362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232764AbhEJKrM (ORCPT ); Mon, 10 May 2021 06:47:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E352B619AC; Mon, 10 May 2021 10:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643038; bh=c1XL8kzC2yP2Nq+PsuvD7ah+97YXIbGx7cHbBa2zjqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T53ug5qVB1xA/0zfQsj3jmShXjaOTxD74E8eNF9CrHrLWBk4XkKlcTdI3rgGk36G8 DKYVFAYQukDuW9gahojDIh6ZqliT4E98R6m8Y4ZMSl+HBymunyjTgUcEO6hcwL6mRG aUYrh9ijpO5Wwu48VoNKNLZryGk3x7KUQTFeGSno= 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.10 151/299] mmc: sdhci-esdhc-imx: validate pinctrl before use it Date: Mon, 10 May 2021 12:19:08 +0200 Message-Id: <20210510102009.943657449@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@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 5d9b3106d2f7..d28809e47962 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1504,7 +1504,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,