From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1148CC433F5 for ; Tue, 18 Jan 2022 03:41:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353878AbiARDlU (ORCPT ); Mon, 17 Jan 2022 22:41:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353881AbiARDEr (ORCPT ); Mon, 17 Jan 2022 22:04:47 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0835BC02198C; Mon, 17 Jan 2022 18:48:15 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7AA4AB811CF; Tue, 18 Jan 2022 02:48:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 423F3C36AE3; Tue, 18 Jan 2022 02:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642474092; bh=bcyqNo0NbCUEzoPj0YJny32qZtQ0miUb3cUF438ngTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q2AyuizxrtEvg5qZ1utb8p0k+oWWPwkazY5TT8h7xYMkocO8vZSO4XMuDzVDZnoQm 8ZLA2hg4IeHl61XlwNUsalmWC/u01lgh9FU/0jxUvJkyVtAXTNpi9WArvCBnVr6ny/ MICTfSm/5NBY/Eosb+ofsItGY9Hbk623Z1Uj+SNsk0ncCc6IPujL++Wglc/4mME15N zkSobVMRDmcg1oIvYB4bH+bDyMOnawj8DHylE9+T+I1qJEGfepXq2i/GAs2kq7hfQd 9MDC3SITfKzkrSIbToJb4IH4+wrTKXlgLtSkKgnVdfAjaYvxuA7TB+KucEu/l6giVv JRcBza3IdawRg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ulf Hansson , "H . Nikolaus Schaller" , Sasha Levin , huyue2@yulong.com, tiantao6@hisilicon.com, kwmad.kim@samsung.com, linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 32/59] mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO Date: Mon, 17 Jan 2022 21:46:33 -0500 Message-Id: <20220118024701.1952911-32-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118024701.1952911-1-sashal@kernel.org> References: <20220118024701.1952911-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Ulf Hansson [ Upstream commit 8c3e5b74b9e2146f564905e50ca716591c76d4f1 ] The mmc core takes a specific path to support initializing of a non-standard SDIO card. This is triggered by looking for the card-quirk, MMC_QUIRK_NONSTD_SDIO. In mmc_sdio_init_card() this gets rather messy, as it causes the code to bail out earlier, compared to the usual path. This leads to that the OCR doesn't get saved properly in card->ocr. Fortunately, only omap_hsmmc has been using the MMC_QUIRK_NONSTD_SDIO and is dealing with the issue, by assigning a hardcoded value (0x80) to card->ocr from an ->init_card() ops. To make the behaviour consistent, let's instead rely on the core to save the OCR in card->ocr during initialization. Reported-by: H. Nikolaus Schaller Signed-off-by: Ulf Hansson Signed-off-by: H. Nikolaus Schaller Link: https://lore.kernel.org/r/e7936cff7fc24d187ef2680d3b4edb0ade58f293.1636564631.git.hns@goldelico.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/sdio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 4e72ad24322f7..5f1ee88aa7615 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -634,6 +634,8 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, if (host->ops->init_card) host->ops->init_card(host, card); + card->ocr = ocr_card; + /* * If the host and card support UHS-I mode request the card * to switch to 1.8V signaling level. No 1.8v signalling if @@ -740,7 +742,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, card = oldcard; } - card->ocr = ocr_card; + mmc_fixup_device(card, sdio_fixup_methods); if (card->type == MMC_TYPE_SD_COMBO) { -- 2.34.1