diff mbox series

[5.4,16/57] mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY

Message ID	20200504165457.816146383@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=p9ou=6S=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 5.4 16/57] mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY Date: Mon, 4 May 2020 19:57:20 +0200 Message-Id: <20200504165457.816146383@linuxfoundation.org> In-Reply-To: <20200504165456.783676004@linuxfoundation.org> References: <20200504165456.783676004@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,02/57] drm/edid: Fix off-by-one in DispID DTD pixel clock [5.4,03/57] drm/amd/display: Fix green screen issue after suspend [5.4,04/57] drm/qxl: qxl_release leak in qxl_draw_dirty_fb() [5.4,07/57] NFSv4.1: fix handling of backchannel binding in BIND_CONN_TO_SESSION [5.4,09/57] btrfs: fix block group leak when removing fails [5.4,10/57] btrfs: fix partial loss of prealloc extent past i_size after fsync [5.4,12/57] mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop [5.4,14/57] mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers [5.4,16/57] mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY [5.4,18/57] crypto: caam - fix the address of the last entry of S/G [5.4,22/57] ALSA: line6: Fix POD HD500 audio playback [5.4,23/57] ALSA: pcm: oss: Place the plugin buffer overflow checks correctly [5.4,29/57] PM: hibernate: Freeze kernel threads in software_resume() [5.4,30/57] dm verity fec: fix hash block number in verity_fec_decode [5.4,31/57] dm writecache: fix data corruption when reloading the target [5.4,34/57] scsi: qla2xxx: set UNLOADING before waiting for session deletion [5.4,35/57] scsi: qla2xxx: check UNLOADING before posting async work [5.4,37/57] RDMA/mlx4: Initialize ib_spec on the stack [5.4,38/57] RDMA/siw: Fix potential siw_mem refcnt leak in siw_fastreg_mr() [5.4,39/57] RDMA/core: Prevent mixed use of FDs between shared ufiles [5.4,44/57] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages [5.4,45/57] vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() [5.4,46/57] iommu/qcom: Fix local_base status check [5.4,49/57] i2c: aspeed: Avoid i2c interrupt status clear race condition. [5.4,52/57] nvme: prevent double free in nvme_alloc_ns() error handling [5.4,53/57] nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl [5.4,54/57] dmaengine: dmatest: Fix iteration non-stop logic

Commit Message

Greg Kroah-Hartman May 4, 2020, 5:57 p.m. UTC

From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

commit e53b868b3cf5beeaa2f851ec6740112bf4d6a8cb upstream.

The Meson SDIO controller uses the DAT0 lane for hardware busy
detection. Set MMC_CAP_WAIT_WHILE_BUSY accordingly. This fixes
the following error observed with Linux 5.7 (pre-rc-1):
  mmc1: Card stuck being busy! __mmc_poll_for_busy
  blk_update_request: I/O error, dev mmcblk1, sector 17111080 op
   0x3:(DISCARD) flags 0x0 phys_seg 1 prio class 0

Fixes: ed80a13bb4c4c9 ("mmc: meson-mx-sdio: Add a driver for the Amlogic Meson8 and Meson8b SoCs")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200416183513.993763-2-martin.blumenstingl@googlemail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/mmc/host/meson-mx-sdio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/mmc/host/meson-mx-sdio.c
+++ b/drivers/mmc/host/meson-mx-sdio.c
@@ -570,7 +570,7 @@  static int meson_mx_mmc_add_host(struct
 	mmc->f_max = clk_round_rate(host->cfg_div_clk,
 				    clk_get_rate(host->parent_clk));
 
-	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;
+	mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23 | MMC_CAP_WAIT_WHILE_BUSY;
 	mmc->ops = &meson_mx_mmc_ops;
 
 	ret = mmc_of_parse(mmc);