linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Shaik Sajida Bhanu <sbhanu@codeaurora.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 75/98] mmc: sdhci-msm: Update the software timeout value for sdhc
Date: Tue, 24 Aug 2021 12:58:45 -0400	[thread overview]
Message-ID: <20210824165908.709932-76-sashal@kernel.org> (raw)
In-Reply-To: <20210824165908.709932-1-sashal@kernel.org>

From: Shaik Sajida Bhanu <sbhanu@codeaurora.org>

[ Upstream commit 67b13f3e221ed81b46a657e2b499bf8b20162476 ]

Whenever SDHC run at clock rate 50MHZ or below, the hardware data
timeout value will be 21.47secs, which is approx. 22secs and we have
a current software timeout value as 10secs. We have to set software
timeout value more than the hardware data timeout value to avioid seeing
the below register dumps.

[  332.953670] mmc2: Timeout waiting for hardware interrupt.
[  332.959608] mmc2: sdhci: ============ SDHCI REGISTER DUMP ===========
[  332.966450] mmc2: sdhci: Sys addr:  0x00000000 | Version:  0x00007202
[  332.973256] mmc2: sdhci: Blk size:  0x00000200 | Blk cnt:  0x00000001
[  332.980054] mmc2: sdhci: Argument:  0x00000000 | Trn mode: 0x00000027
[  332.986864] mmc2: sdhci: Present:   0x01f801f6 | Host ctl: 0x0000001f
[  332.993671] mmc2: sdhci: Power:     0x00000001 | Blk gap:  0x00000000
[  333.000583] mmc2: sdhci: Wake-up:   0x00000000 | Clock:    0x00000007
[  333.007386] mmc2: sdhci: Timeout:   0x0000000e | Int stat: 0x00000000
[  333.014182] mmc2: sdhci: Int enab:  0x03ff100b | Sig enab: 0x03ff100b
[  333.020976] mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000000
[  333.027771] mmc2: sdhci: Caps:      0x322dc8b2 | Caps_1:   0x0000808f
[  333.034561] mmc2: sdhci: Cmd:       0x0000183a | Max curr: 0x00000000
[  333.041359] mmc2: sdhci: Resp[0]:   0x00000900 | Resp[1]:  0x00000000
[  333.048157] mmc2: sdhci: Resp[2]:   0x00000000 | Resp[3]:  0x00000000
[  333.054945] mmc2: sdhci: Host ctl2: 0x00000000
[  333.059657] mmc2: sdhci: ADMA Err:  0x00000000 | ADMA Ptr:
0x0000000ffffff218
[  333.067178] mmc2: sdhci_msm: ----------- VENDOR REGISTER DUMP
-----------
[  333.074343] mmc2: sdhci_msm: DLL sts: 0x00000000 | DLL cfg:
0x6000642c | DLL cfg2: 0x0020a000
[  333.083417] mmc2: sdhci_msm: DLL cfg3: 0x00000000 | DLL usr ctl:
0x00000000 | DDR cfg: 0x80040873
[  333.092850] mmc2: sdhci_msm: Vndr func: 0x00008a9c | Vndr func2 :
0xf88218a8 Vndr func3: 0x02626040
[  333.102371] mmc2: sdhci: ============================================

So, set software timeout value more than hardware timeout value.

Signed-off-by: Shaik Sajida Bhanu <sbhanu@codeaurora.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/1626435974-14462-1-git-send-email-sbhanu@codeaurora.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/mmc/host/sdhci-msm.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index 3451eb325513..588b9a564117 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -1834,6 +1834,23 @@ static void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery)
 	sdhci_cqe_disable(mmc, recovery);
 }
 
+static void sdhci_msm_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+{
+	u32 count, start = 15;
+
+	__sdhci_set_timeout(host, cmd);
+	count = sdhci_readb(host, SDHCI_TIMEOUT_CONTROL);
+	/*
+	 * Update software timeout value if its value is less than hardware data
+	 * timeout value. Qcom SoC hardware data timeout value was calculated
+	 * using 4 * MCLK * 2^(count + 13). where MCLK = 1 / host->clock.
+	 */
+	if (cmd && cmd->data && host->clock > 400000 &&
+	    host->clock <= 50000000 &&
+	    ((1 << (count + start)) > (10 * host->clock)))
+		host->data_timeout = 22LL * NSEC_PER_SEC;
+}
+
 static const struct cqhci_host_ops sdhci_msm_cqhci_ops = {
 	.enable		= sdhci_cqe_enable,
 	.disable	= sdhci_msm_cqe_disable,
@@ -2184,6 +2201,7 @@ static const struct sdhci_ops sdhci_msm_ops = {
 	.irq	= sdhci_msm_cqe_irq,
 	.dump_vendor_regs = sdhci_msm_dump_vendor_regs,
 	.set_power = sdhci_set_power_noreg,
+	.set_timeout = sdhci_msm_set_timeout,
 };
 
 static const struct sdhci_pltfm_data sdhci_msm_pdata = {
-- 
2.30.2


  parent reply	other threads:[~2021-08-24 17:11 UTC|newest]

Thread overview: 114+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24 16:57 [PATCH 5.10 00/98] 5.10.61-rc1 review Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 01/98] ath: Use safer key clearing with key cache entries Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 02/98] ath9k: Clear key cache explicitly on disabling hardware Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 03/98] ath: Export ath_hw_keysetmac() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 04/98] ath: Modify ath_key_delete() to not need full key entry Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 05/98] ath9k: Postpone key cache entry deletion for TXQ frames reference it Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 06/98] mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 07/98] media: zr364xx: propagate errors from zr364xx_start_readpipe() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 08/98] media: zr364xx: fix memory leaks in probe() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 09/98] vdpa: Extend routine to accept vdpa device name Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 10/98] vdpa: Define vdpa mgmt device, ops and a netlink interface Sasha Levin
2021-08-24 18:54   ` Pavel Machek
2021-08-25  1:16     ` Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 11/98] media: drivers/media/usb: fix memory leak in zr364xx_probe Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 12/98] KVM: x86: Factor out x86 instruction emulation with decoding Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 13/98] KVM: X86: Fix warning caused by stale emulation context Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 14/98] USB: core: Avoid WARNings for 0-length descriptor requests Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 15/98] USB: core: Fix incorrect pipe calculation in do_proc_control() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 16/98] dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers Sasha Levin
2021-08-25  8:04   ` Pavel Machek
2021-08-24 16:57 ` [PATCH 5.10 17/98] dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 18/98] spi: spi-mux: Add module info needed for autoloading Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 19/98] net: xfrm: Fix end of loop tests for list_for_each_entry Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 20/98] ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 21/98] dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 22/98] scsi: pm80xx: Fix TMF task completion race condition Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 23/98] scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 24/98] scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach() Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 25/98] scsi: core: Avoid printing an error if target_alloc() returns -ENXIO Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 26/98] scsi: core: Fix capacity set to zero after offlinining device Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 27/98] drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 28/98] qede: fix crash in rmmod qede while automatic debug collection Sasha Levin
2021-08-24 16:57 ` [PATCH 5.10 29/98] ARM: dts: nomadik: Fix up interrupt controller node names Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 30/98] net: usb: pegasus: Check the return value of get_geristers() and friends; Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 31/98] net: usb: lan78xx: don't modify phy_device state concurrently Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 32/98] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 33/98] drm/amd/display: workaround for hard hang on HPD on native DP Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 34/98] Bluetooth: hidp: use correct wait queue when removing ctrl_wait Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 35/98] arm64: dts: qcom: c630: fix correct powerdown pin for WSA881x Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 36/98] arm64: dts: qcom: msm8992-bullhead: Remove PSCI Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 37/98] iommu: Check if group is NULL before remove device Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 38/98] cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 39/98] dccp: add do-while-0 stubs for dccp_pr_debug macros Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 40/98] virtio: Protect vqs list access Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 41/98] vhost-vdpa: Fix integer overflow in vhost_vdpa_process_iotlb_update() Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 42/98] bus: ti-sysc: Fix error handling for sysc_check_active_timer() Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 43/98] vhost: Fix the calculation in vhost_overflow() Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 44/98] vdpa/mlx5: Avoid destroying MR on empty iotlb Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 45/98] soc / drm: mediatek: Move DDP component defines into mtk-mmsys.h Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 46/98] drm/mediatek: Fix aal size config Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 47/98] drm/mediatek: Add AAL output size configuration Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 48/98] bpf: Clear zext_dst of dead insns Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 49/98] bnxt: don't lock the tx queue from napi poll Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 50/98] bnxt: disable napi before canceling DIM Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 51/98] bnxt: make sure xmit_more + errors does not miss doorbells Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 52/98] bnxt: count Tx drops Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 53/98] net: 6pack: fix slab-out-of-bounds in decode_data Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 54/98] ptp_pch: Restore dependency on PCI Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 55/98] bnxt_en: Disable aRFS if running on 212 firmware Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 56/98] bnxt_en: Add missing DMA memory barriers Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 57/98] vrf: Reset skb conntrack connection on VRF rcv Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 58/98] virtio-net: support XDP when not more queues Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 59/98] virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 60/98] net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 61/98] ixgbe, xsk: clean up the resources in ixgbe_xsk_pool_enable error path Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 62/98] sch_cake: fix srchost/dsthost hashing mode Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 63/98] net: mdio-mux: Don't ignore memory allocation errors Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 64/98] net: mdio-mux: Handle -EPROBE_DEFER correctly Sasha Levin
2021-08-24 19:00   ` Pavel Machek
2021-08-24 19:34     ` Saravana Kannan
2021-08-25  5:05       ` Pavel Machek
2021-08-24 16:58 ` [PATCH 5.10 65/98] ovs: clear skb->tstamp in forwarding path Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 66/98] iommu/vt-d: Consolidate duplicate cache invaliation code Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 67/98] iommu/vt-d: Fix incomplete cache flush in intel_pasid_tear_down_entry() Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 68/98] pipe: avoid unnecessary EPOLLET wakeups under normal loads Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 69/98] r8152: fix writing USB_BP2_EN Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 70/98] i40e: Fix ATR queue selection Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 71/98] iavf: Fix ping is lost after untrusted VF had tried to change MAC Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 72/98] Revert "flow_offload: action should not be NULL when it is referenced" Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 73/98] mmc: dw_mmc: Fix hang on data CRC error Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 74/98] mmc: mmci: stm32: Check when the voltage switch procedure should be done Sasha Levin
2021-08-24 16:58 ` Sasha Levin [this message]
2021-08-24 16:58 ` [PATCH 5.10 76/98] clk: imx6q: fix uart earlycon unwork Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 77/98] clk: qcom: gdsc: Ensure regulator init state matches GDSC state Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 78/98] ALSA: hda - fix the 'Capture Switch' value change notifications Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 79/98] tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 80/98] slimbus: messaging: start transaction ids from 1 instead of zero Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 81/98] slimbus: messaging: check for valid transaction id Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 82/98] slimbus: ngd: reset dma setup during runtime pm Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 83/98] ipack: tpci200: fix many double free issues in tpci200_pci_probe Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 84/98] ipack: tpci200: fix memory leak in the tpci200_register Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 85/98] ALSA: hda/realtek: Enable 4-speaker output for Dell XPS 15 9510 laptop Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 86/98] mmc: sdhci-iproc: Cap min clock frequency on BCM2711 Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 87/98] mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN " Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 88/98] btrfs: prevent rename2 from exchanging a subvol with a directory from different parents Sasha Levin
2021-08-24 16:58 ` [PATCH 5.10 89/98] ALSA: hda/via: Apply runtime PM workaround for ASUS B23E Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 90/98] s390/pci: fix use after free of zpci_dev Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 91/98] PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 92/98] ALSA: hda/realtek: Limit mic boost on HP ProBook 445 G8 Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 93/98] ASoC: intel: atom: Fix breakage for PCM buffer address setup Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 94/98] mm: memcontrol: fix occasional OOMs due to proportional memory.low reclaim Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 95/98] fs: warn about impending deprecation of mandatory locks Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 96/98] io_uring: fix xa_alloc_cycle() error return value check Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 97/98] io_uring: only assign io_uring_enter() SQPOLL error in actual error case Sasha Levin
2021-08-24 16:59 ` [PATCH 5.10 98/98] Linux 5.10.61-rc1 Sasha Levin
2021-08-25  7:35 ` [PATCH 5.10 00/98] 5.10.61-rc1 review Pavel Machek
2021-08-26 12:53   ` Sasha Levin
2021-08-25 13:12 ` Sudip Mukherjee
2021-08-26 12:53   ` Sasha Levin
2021-08-25 17:50 ` Daniel Díaz
2021-08-25 20:24 ` Guenter Roeck
2021-08-25 22:35 ` Shuah Khan
2021-08-26  1:00 ` Samuel Zou
2021-08-26 12:54   ` Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210824165908.709932-76-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sbhanu@codeaurora.org \
    --cc=stable@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).