From patchwork Mon Jul 23 10:08:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 142560 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5862542ljj; Mon, 23 Jul 2018 03:09:26 -0700 (PDT) X-Google-Smtp-Source: AAOMgpez45G4s7rP1RGIKaGp9YtoPBHP1lqKdjk177bo6kmNHISYFgoC32EhjNigq4b6HxVNWeJc X-Received: by 2002:a17:902:201:: with SMTP id 1-v6mr12478684plc.310.1532340566772; Mon, 23 Jul 2018 03:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532340566; cv=none; d=google.com; s=arc-20160816; b=H4zsWuLrLnjVcr7giz6mNq/+YkxwzHAUBJG6syyBVETzKvoJr78it/N5fXOuiDAIgQ RKeJDjqp+HwT8sjwpZAh1gAseFtLxi07T7/GRQigIXpdGcJmlp9Ca+ktgvQrTugVl0KU R0+uTHICXjXLW9TogQEJXU+uiClBQ5u2Xk0sDnWZEnKjs+5eKro9ytALM1aCYLBtnJPY StGPdiDdEalAMtFL9uxFiwBphgcnkqFyMsfVE8nREtMiM5nWgz0ptm5VNdD6Z0AQ5aZp q4MdHTyeX7EYkrMrIBSnFAEalm7vtuCmlaEmanTBJslRfYbK1NfZ9jmnruTbOnDoHT/J MNig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=pgMbW6Ss8duf9bBSciMwtG6e41E2GSRno97Zc3Vq3KI=; b=VD8i4ef7q5x6CI7kJIqWqIzOo9R4CAY+3nH9a1EqPwC9SM6fFTeC7niJYsphK6vNx9 irOLPZk8QtxcGTCpPtIx76FgMEf8xMBi0VdzYkmwAonLrZNTEndYvhjMHPTgjv88vUsO weN6iOjs1895YOAdzsCm5pWovYyK8O+aKmcGMnM5qFTwMdwFuTIJOvW8bWi150qtNtR2 C/3trFPIgg9+LE7H1jCVRt/kFLBCdkwz2fha0Yn9PH3zY9EA6NOmIxLIqvlX+dpWEuhp NzOE5d7+34Q27s8j9QQGHCR7zlGF6eR/yhvwbu66ke78+UK10pheDXOXqQJjvfLPC3Mj BHcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gdVHd0xA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g11-v6si8316899pgf.386.2018.07.23.03.09.26; Mon, 23 Jul 2018 03:09:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gdVHd0xA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388390AbeGWLJu (ORCPT + 31 others); Mon, 23 Jul 2018 07:09:50 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38720 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388375AbeGWLJu (ORCPT ); Mon, 23 Jul 2018 07:09:50 -0400 Received: by mail-pg1-f195.google.com with SMTP id k3-v6so50640pgq.5 for ; Mon, 23 Jul 2018 03:09:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pgMbW6Ss8duf9bBSciMwtG6e41E2GSRno97Zc3Vq3KI=; b=gdVHd0xA5mzJwbrXBorxwgtSz9aheGhVAti5E+RZ42Vr3oO9RWHJ/lumt+iKt4ZtQr Kf3DRvhfwNuwwLRgoqIhNW1W7zju3l193utHO5EU5puYCFTq7jo6GCUwYN9dOLlporyn +QRpRM4OpAqnMUs8FdA+ryImom2ir6Nq4ADrg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pgMbW6Ss8duf9bBSciMwtG6e41E2GSRno97Zc3Vq3KI=; b=V7pp2BUas1HctT2QMueaCjbaXGsD61I+ZLFsm9mi2cR0nmo5NLf1gGH+810LDNKuhO tDFOoSMfOZM3QS2D24UNhd5H1tH8Ww13CudqF2Yp86rLGhDThoOhwjMtYmWSIhfn2big Si2voZpYqiEQzvRfLzrhKS+mbtzLljR6boU3Ay5v2N0/MRJleSk9fgAIIpykotVdo+yW mQqw6Ef/X/diHzJTQDEZ6RfT0L6fkcc0Vv9Uel5UA2qEVRJQDxH+awTvXCAiDDUqQo7o zApQqmWZPLQGRBjCRZCg6Sere7eF96gl2cJWTbmiCA4BvJB+FvvzuKQjb64pXimaNFoh 0dPw== X-Gm-Message-State: AOUpUlGWLrAiWML9wkqqgcYpRh5vidd2ab7TpB5Ym9kswfNA/DxVZsWr sxi+9EV9wHCPTUCOKw7DRSceJTxCmpePWg== X-Received: by 2002:a63:b213:: with SMTP id x19-v6mr11517985pge.393.1532340562867; Mon, 23 Jul 2018 03:09:22 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id e82-v6sm13470698pfk.87.2018.07.23.03.09.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jul 2018 03:09:21 -0700 (PDT) From: Chunyan Zhang To: Ulf Hansson , Adrian Hunter Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Orson Zhai , Baolin Wang , Billows Wu , Jason Wu , zhang.lyra@gmail.com Subject: [PATCH V4 3/7] mmc: sdhci: add ADMA2 64-bit addressing support for V4 mode Date: Mon, 23 Jul 2018 18:08:24 +0800 Message-Id: <1532340508-8749-4-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532340508-8749-1-git-send-email-zhang.chunyan@linaro.org> References: <1532340508-8749-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ADMA2 64-bit addressing support is divided into V3 mode and V4 mode. So there are two kinds of descriptors for ADMA2 64-bit addressing i.e. 96-bit Descriptor for V3 mode, and 128-bit Descriptor for V4 mode. 128-bit Descriptor is aligned to 8-byte. For V4 mode, ADMA2 64-bit addressing is enabled via Host Control 2 register. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 90 ++++++++++++++++++++++++++++++++++-------------- drivers/mmc/host/sdhci.h | 15 ++++++-- 2 files changed, 78 insertions(+), 27 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9cb17c0..ce71afa 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -271,6 +271,46 @@ static void sdhci_set_default_irqs(struct sdhci_host *host) sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); } +static void sdhci_config_dma(struct sdhci_host *host) +{ + u8 ctrl; + u16 ctrl2; + + if (host->version < SDHCI_SPEC_200) + return; + + ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); + + /* + * Always adjust the DMA selection as some controllers + * (e.g. JMicron) can't do PIO properly when the selection + * is ADMA. + */ + ctrl &= ~SDHCI_CTRL_DMA_MASK; + if ((host->flags & SDHCI_REQ_USE_DMA) && + (host->flags & SDHCI_USE_ADMA)) + ctrl |= SDHCI_CTRL_ADMA32; + + if (host->flags & SDHCI_USE_64_BIT_DMA) { + /* + * If v4 mode, all supported DMA can be 64-bit addressing if + * controller supports 64-bit system address, otherwise only + * ADMA can support 64-bit addressing. + */ + if (host->v4_mode) { + ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); + ctrl2 |= SDHCI_CTRL_64BIT_ADDR; + sdhci_writew(host, ctrl2, SDHCI_HOST_CONTROL2); + } else { + if ((host->flags & SDHCI_REQ_USE_DMA) && + (host->flags & SDHCI_USE_ADMA)) + ctrl |= SDHCI_CTRL_ADMA64; + } + } + + sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); +} + static void sdhci_init(struct sdhci_host *host, int soft) { struct mmc_host *mmc = host->mmc; @@ -916,7 +956,6 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) { - u8 ctrl; struct mmc_data *data = cmd->data; host->data_timeout = 0; @@ -1012,25 +1051,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) } } - /* - * Always adjust the DMA selection as some controllers - * (e.g. JMicron) can't do PIO properly when the selection - * is ADMA. - */ - if (host->version >= SDHCI_SPEC_200) { - ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); - ctrl &= ~SDHCI_CTRL_DMA_MASK; - if ((host->flags & SDHCI_REQ_USE_DMA) && - (host->flags & SDHCI_USE_ADMA)) { - if (host->flags & SDHCI_USE_64_BIT_DMA) - ctrl |= SDHCI_CTRL_ADMA64; - else - ctrl |= SDHCI_CTRL_ADMA32; - } else { - ctrl |= SDHCI_CTRL_SDMA; - } - sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); - } + sdhci_config_dma(host); if (!(host->flags & SDHCI_REQ_USE_DMA)) { int flags; @@ -3503,6 +3524,19 @@ static int sdhci_allocate_bounce_buffer(struct sdhci_host *host) return 0; } +static inline bool sdhci_can_64bit_dma(struct sdhci_host *host) +{ + /* + * According to SD Host Controller spec v4.10, bit[27] added from + * version 4.10 in Capabilities Register is used as 64-bit System + * Address support for V4 mode. + */ + if (host->version >= SDHCI_SPEC_410 && host->v4_mode) + return host->caps & SDHCI_CAN_64BIT_V4; + + return host->caps & SDHCI_CAN_64BIT; +} + int sdhci_setup_host(struct sdhci_host *host) { struct mmc_host *mmc; @@ -3539,7 +3573,7 @@ int sdhci_setup_host(struct sdhci_host *host) override_timeout_clk = host->timeout_clk; - if (host->version > SDHCI_SPEC_300) { + if (host->version > SDHCI_SPEC_420) { pr_err("%s: Unknown controller version (%d). You may experience problems.\n", mmc_hostname(mmc), host->version); } @@ -3574,7 +3608,7 @@ int sdhci_setup_host(struct sdhci_host *host) * SDHCI_QUIRK2_BROKEN_64_BIT_DMA must be left to the drivers to * implement. */ - if (host->caps & SDHCI_CAN_64BIT) + if (sdhci_can_64bit_dma(host)) host->flags |= SDHCI_USE_64_BIT_DMA; if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { @@ -3608,8 +3642,8 @@ int sdhci_setup_host(struct sdhci_host *host) */ if (host->flags & SDHCI_USE_64_BIT_DMA) { host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * - SDHCI_ADMA2_64_DESC_SZ; - host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; + SDHCI_ADMA2_64_DESC_SZ(host); + host->desc_sz = SDHCI_ADMA2_64_DESC_SZ(host); } else { host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * SDHCI_ADMA2_32_DESC_SZ; @@ -3617,7 +3651,13 @@ int sdhci_setup_host(struct sdhci_host *host) } host->align_buffer_sz = SDHCI_MAX_SEGS * SDHCI_ADMA2_ALIGN; - buf = dma_alloc_coherent(mmc_dev(mmc), host->align_buffer_sz + + /* + * Host Controller Version 4.00 or later can support 128-bit + * and 96-bit Descriptor for 64-bit addressing mode. 128-bit + * Descriptor is for v4 mode, and high 32-bit of it is reserved + * according to the specification v4.10. + */ + buf = dma_zalloc_coherent(mmc_dev(mmc), host->align_buffer_sz + host->adma_table_sz, &dma, GFP_KERNEL); if (!buf) { pr_warn("%s: Unable to allocate ADMA buffers - falling back to standard DMA\n", diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 519d939..23318ff 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -185,6 +185,7 @@ #define SDHCI_CTRL_EXEC_TUNING 0x0040 #define SDHCI_CTRL_TUNED_CLK 0x0080 #define SDHCI_CTRL_V4_MODE 0x1000 +#define SDHCI_CTRL_64BIT_ADDR 0x2000 #define SDHCI_CTRL_PRESET_VAL_ENABLE 0x8000 #define SDHCI_CAPABILITIES 0x40 @@ -205,6 +206,7 @@ #define SDHCI_CAN_VDD_330 0x01000000 #define SDHCI_CAN_VDD_300 0x02000000 #define SDHCI_CAN_VDD_180 0x04000000 +#define SDHCI_CAN_64BIT_V4 0x08000000 #define SDHCI_CAN_64BIT 0x10000000 #define SDHCI_SUPPORT_SDR50 0x00000001 @@ -271,6 +273,9 @@ #define SDHCI_SPEC_100 0 #define SDHCI_SPEC_200 1 #define SDHCI_SPEC_300 2 +#define SDHCI_SPEC_400 3 +#define SDHCI_SPEC_410 4 +#define SDHCI_SPEC_420 5 /* * End of controller registers. @@ -306,8 +311,14 @@ struct sdhci_adma2_32_desc { */ #define SDHCI_ADMA2_DESC_ALIGN 8 -/* ADMA2 64-bit DMA descriptor size */ -#define SDHCI_ADMA2_64_DESC_SZ 12 +/* + * ADMA2 64-bit DMA descriptor size + * According to SD Host Controller spec v4.10, there are two kinds of + * descriptors for 64-bit addressing mode: 96-bit Descriptor and 128-bit + * Descriptor, if Host Version 4 Enable is set in the Host Control 2 + * register, 128-bit Descriptor will be selected. + */ +#define SDHCI_ADMA2_64_DESC_SZ(host) ((host)->v4_mode ? 16 : 12) /* * ADMA2 64-bit descriptor. Note 12-byte descriptor can't always be 8-byte