From patchwork Wed Aug 30 13:04:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 9929579 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A1C4603B4 for ; Wed, 30 Aug 2017 13:05:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75C992856B for ; Wed, 30 Aug 2017 13:05:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AE172856C; Wed, 30 Aug 2017 13:05:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E869B2856D for ; Wed, 30 Aug 2017 13:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751410AbdH3NFl (ORCPT ); Wed, 30 Aug 2017 09:05:41 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:58800 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751394AbdH3NEn (ORCPT ); Wed, 30 Aug 2017 09:04:43 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id D172F6075A; Wed, 30 Aug 2017 13:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1504098282; bh=BHERLfxpA4yhCVeJW53/ZGqBBmcKC7NVB/Vtlaa4tTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjOvjR1hMqiumuBEmlkW0zgOO4T7N6NcKCGWdZA9eITWpn0EcxnFQcMdzYbeexy4m l5NGOQRdbw3zGAmgpS/Eb0YgFLVOwFZuXegV/VZj4fOlN+PvGE2RVJsR2G/UqYRndS 8OZwOMZ+enve4g2XkRnmWbgpP1uWCh7ynuer5YjM= Received: from rharjani-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: riteshh@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D3F9D6075B; Wed, 30 Aug 2017 13:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1504098282; bh=BHERLfxpA4yhCVeJW53/ZGqBBmcKC7NVB/Vtlaa4tTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjOvjR1hMqiumuBEmlkW0zgOO4T7N6NcKCGWdZA9eITWpn0EcxnFQcMdzYbeexy4m l5NGOQRdbw3zGAmgpS/Eb0YgFLVOwFZuXegV/VZj4fOlN+PvGE2RVJsR2G/UqYRndS 8OZwOMZ+enve4g2XkRnmWbgpP1uWCh7ynuer5YjM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D3F9D6075B Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=riteshh@codeaurora.org From: Ritesh Harjani To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, stummala@codeaurora.org, asutoshd@codeaurora.org, Ritesh Harjani Subject: [RFC 3/4] mmc: sdhci-msm: Change the desc_sz on cqe_enable/disable. Date: Wed, 30 Aug 2017 18:34:10 +0530 Message-Id: <1504098251-27739-4-git-send-email-riteshh@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504098251-27739-1-git-send-email-riteshh@codeaurora.org> References: <1504098251-27739-1-git-send-email-riteshh@codeaurora.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CMDQ is halted the HW expects descriptor size to be same which is using in CMDQ mode. Thus adjust the desc_sz of sdhci accordingly. Without this patch below command gives ADMA error when CQE is enabled. cat /sys/kernel/debug/mmc0/mmc0:0001/ext_csd Signed-off-by: Ritesh Harjani --- drivers/mmc/host/sdhci-msm.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 346cdfb..baa3409 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1111,9 +1111,29 @@ static u32 sdhci_msm_cqe_irq(struct sdhci_host *host, u32 intmask) return 0; } +void sdhci_msm_cqe_enable(struct mmc_host *mmc) +{ + struct sdhci_host *host = mmc_priv(mmc); + + if (host->flags & SDHCI_USE_64_BIT_DMA) + host->desc_sz = 12; + + sdhci_cqe_enable(mmc); +} + +void sdhci_msm_cqe_disable(struct mmc_host *mmc, bool recovery) +{ + struct sdhci_host *host = mmc_priv(mmc); + + if (host->flags & SDHCI_USE_64_BIT_DMA) + host->desc_sz = 16; + + sdhci_cqe_disable(mmc, recovery); +} + static const struct cqhci_host_ops sdhci_msm_cqhci_ops = { - .enable = sdhci_cqe_enable, - .disable = sdhci_cqe_disable, + .enable = sdhci_msm_cqe_enable, + .disable = sdhci_msm_cqe_disable, }; #ifdef CONFIG_MMC_CQHCI