From patchwork Tue Dec 17 14:39:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 181890 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp5788362och; Tue, 17 Dec 2019 06:40:02 -0800 (PST) X-Google-Smtp-Source: APXvYqwVBKlMCVV705eEorUvhyDtoVvxElCCIAJqqNULn+Jt7iJTrF1VQrx6rS43SmFAsDiSDkEi X-Received: by 2002:a9d:6d10:: with SMTP id o16mr39120469otp.28.1576593602201; Tue, 17 Dec 2019 06:40:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576593602; cv=none; d=google.com; s=arc-20160816; b=fb9TYWS+f28aso8RnQ5RdORq/C7IuoVOBBU2R+UtMH4djOmENwM/Ts77Iun8KDDU24 4zdKrFYuqQ+7fa3AV9IILD0AvzeEMl+N7zqQkRXA3KInpV57/GB5aI3oGDmRX5Vg/nd/ Euu0BO4KiqRtOKFc6BdXSke03B85zkPhiTQGRu4wQdi6yWAj7VIWAMzP1hlyzII6Xj47 mhXdqEUXFuYScdXq7tWUuXsv3A48N9t8KOSGtbWvosVcmQ+oTejIQbaJVVPcy36BMkot TBqE/GTZteVJQMAa5YSBmhXr1J4bEn36c7mlT6Z05XqNptq03UMbInmJCoHMf3e3kLXl 2WdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1KyboZVczbZkFRd705yq3dgOyBQsxNCJbVqgt9jNNLM=; b=gW8VbtmuCEdK4WV+1zxpsztzr2NwsjHf51lUz3AN+7k04mzFqbxRsBYkvVssqus44I g3ZcWmI7WhPTa4Va1/855QljEvCaz5zTbc/5nJ/raJkkmLUXx352xn9EE2onGbKTkZaK /N6JAVmPXnUIGDWlxrvicwVXR6QOvWoQWEUXvkOUqq6CWGJ0zBt3pnStjHoYykHwk+Iw KZVC+Co/qD3X2BiV9roZbSN/pOp32lN8bwh0KU/PlBsShCzpL1ExnsC+5v7aHQ5GWJ9b bqzEswz75XhUoKBkP40o5RF8p+IaPn3FBmt1DuSQMhMCE3kXWSeg9pP0rgBZuxreOWbI Qthw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hmGLWyIb; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 v13si11998253oth.280.2019.12.17.06.40.02; Tue, 17 Dec 2019 06:40:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-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=hmGLWyIb; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 S1728608AbfLQOkB (ORCPT + 5 others); Tue, 17 Dec 2019 09:40:01 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:34674 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728612AbfLQOj7 (ORCPT ); Tue, 17 Dec 2019 09:39:59 -0500 Received: by mail-lf1-f67.google.com with SMTP id l18so7153073lfc.1 for ; Tue, 17 Dec 2019 06:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1KyboZVczbZkFRd705yq3dgOyBQsxNCJbVqgt9jNNLM=; b=hmGLWyIbYsK70ZSRxw6laKC4on4vXGii/TYiQFHUU0mvKYc7+QCsPtseO6qixwN/96 D6hgpQ2BkBPHI3+qwYOkjwB3SaTJpKLfcJ8Qk1NEEeSc0vtwj5rC+3ik2v6CdXowmNHh q3gIDx4y+Eki/aCCbfXvHE9f1LUrrfeOl8vnGKYBlwdsUiDYZ7p8EVKO0ZELpVMnSbiG iK9EcKNj5LgzZ/oT0lO+aGxF8oPEi7/xV9zT1emLvpTbwoWFjnotXa3Cjqo/gm8PdtF8 p3T8kXFA+z9v3TrKtR7OSP7amSaTzYTDsbKJ7dp2sulsZ7HSJY8qjgqnXT008d2Vp2iH A7Bg== 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:mime-version :content-transfer-encoding; bh=1KyboZVczbZkFRd705yq3dgOyBQsxNCJbVqgt9jNNLM=; b=Oj8hrih03A4owhykAjC7OeEcXnonG0qbSO8ePQ7DIvCys4vTxS69xOUJGkzjMHboUg M9fhePBDozKk5leLY+AkvV4kh4iOZjKSREC63udn1sPJaDt5z2uqvNVVfos/PdpgwEeE WVs4kRYC5B9Mfl5HgXzB4gyoiBWjN/UJAOe1eSuE0r/PtElanOXmW0niv/KE1mLETYE6 9p/h4zEt4cVw9yYVnOU3QEk1NwGLZoCIg2mVrZsN6Wxj2f5kmX0k/0i6EFaVJRnlZNoa 1R1P/vZj50jBCRocmlbJPP/XoEWRqFiy3toI1ZQv6/KIxR+ko0v4TBpjJJwyRr66tcjF B1uw== X-Gm-Message-State: APjAAAXSM70wDNj26z51adBtL//CV1I4CR73hr4E6IYFe8T5wkhj8sI6 D5dcYCYG6CiLLfOvx1ea0Ew5nnClfVpB1g== X-Received: by 2002:ac2:4a89:: with SMTP id l9mr2891990lfp.121.1576593596205; Tue, 17 Dec 2019 06:39:56 -0800 (PST) Received: from localhost.bredbandsbolaget (c-21cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.33]) by smtp.gmail.com with ESMTPSA id a11sm12748942ljp.50.2019.12.17.06.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2019 06:39:54 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Ludovic Barre , Brian Masney , Stephan Gerhold , Niklas Cassel , Russell King , Srinivas Kandagatla Subject: [PATCH v6] mmc: mmci: Support odd block sizes for ux500v2 and qcom variant Date: Tue, 17 Dec 2019 15:39:52 +0100 Message-Id: <20191217143952.2885-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org For the ux500v2 variant of the PL18x block, odd block sizes are supported. This is necessary to support some SDIO transfers. This also affects the QCOM MMCI variant and the ST micro variant. For Ux500 an additional quirk only allowing DMA on blocks that are a power of two is needed. This might be a bug in the DMA engine (DMA40) or the MMCI or in the interconnect, but the most likely is the MMCI, as transfers of these sizes work fine for other devices using the same DMA engine. DMA works fine also with SDIO as long as the blocksize is a power of 2. This patch has proven necessary for enabling SDIO for WLAN on PostmarketOS-based Ux500 platforms. What we managed to test in practice is Broadcom WiFi over SDIO on the Ux500 based Samsung GT-I8190 and GT-S7710. This WiFi chip, BCM4334 works fine after the patch. Before this patch: brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4334-sdio for chip BCM4334/3 mmci-pl18x 80118000.sdi1_per2: unsupported block size (60 bytes) brcmfmac: brcmf_sdiod_ramrw: membytes transfer failed brcmfmac: brcmf_sdio_download_code_file: error -22 on writing 434236 membytes at 0x00000000 brcmfmac: brcmf_sdio_download_firmware: dongle image file download failed After this patch: brcmfmac: brcmf_c_preinit_dcmds: Firmware: BCM4334/3 wl0: Nov 21 2012 00:21:28 version 6.10.58.813 (B2) FWID 01-0 Bringing up networks, discovering networks with "iw dev wlan0 scan" and connecting works fine from this point. This patch is inspired by Ulf Hansson's patch http://www.spinics.net/lists/linux-mmc/msg12160.html As the DMA engines on these platforms may now get block sizes they were not used to before, make sure to also respect if the DMA engine says "no" to a transfer. Make a drive-by fix for datactrl_blocksz, misspelled. Cc: Ludovic Barre Cc: Brian Masney Cc: Stephan Gerhold Cc: Niklas Cassel Cc: Russell King Signed-off-by: Ulf Hansson Signed-off-by: Srinivas Kandagatla Signed-off-by: Linus Walleij --- ChangeLog v5->v6: - Actually commit the changes I have in my tree and resend... We now have the config members datactrl_any_blocksz and dma_power_of_2 as intended. ChangeLog v4->v5: - Rename variant members as Ulf want them. ChangeLog v3->v4: - Rewrite the patch to accept odd packages but only let power of two packages pass on to the DMA. - Drop the patches disallowing DMA not divisible by 4: this doesn't work. Instead just push the whole power of two criteria down to the DMA submission phase. - Drop the patch handling odd sglist offsets and passing of page boundaries in SG buffers when using PIO: it just doesn't happen in practice, we don't know why, but likely because all packets are small. ChangeLog v2->v3: - Repost with the inclusion of other patches. ChangeLog v1->v2: - Specify odd blocksize field to 1 bit (:1) - Specify that STMMC supports odd block sizes - Collect Stephan's test tag --- drivers/mmc/host/mmci.c | 34 ++++++++++++++++++++++++++++++---- drivers/mmc/host/mmci.h | 8 +++++++- 2 files changed, 37 insertions(+), 5 deletions(-) -- 2.21.0 Tested-by: Stephan Gerhold diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c37e70dbe250..7e4bc9124efd 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -168,6 +168,8 @@ static struct variant_data variant_ux500 = { .cmdreg_srsp = MCI_CPSM_RESPONSE, .datalength_bits = 24, .datactrl_blocksz = 11, + .datactrl_any_blocksz = true, + .dma_power_of_2 = true, .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, .st_sdio = true, .st_clkdiv = true, @@ -201,6 +203,8 @@ static struct variant_data variant_ux500v2 = { .datactrl_mask_ddrmode = MCI_DPSM_ST_DDRMODE, .datalength_bits = 24, .datactrl_blocksz = 11, + .datactrl_any_blocksz = true, + .dma_power_of_2 = true, .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, .st_sdio = true, .st_clkdiv = true, @@ -260,6 +264,7 @@ static struct variant_data variant_stm32_sdmmc = { .datacnt_useless = true, .datalength_bits = 25, .datactrl_blocksz = 14, + .datactrl_any_blocksz = true, .stm32_idmabsize_mask = GENMASK(12, 5), .init = sdmmc_variant_init, }; @@ -279,6 +284,7 @@ static struct variant_data variant_qcom = { .data_cmd_enable = MCI_CPSM_QCOM_DATCMD, .datalength_bits = 24, .datactrl_blocksz = 11, + .datactrl_any_blocksz = true, .pwrreg_powerup = MCI_PWR_UP, .f_max = 208000000, .explicit_mclk_control = true, @@ -447,10 +453,11 @@ void mmci_dma_setup(struct mmci_host *host) static int mmci_validate_data(struct mmci_host *host, struct mmc_data *data) { + struct variant_data *variant = host->variant; + if (!data) return 0; - - if (!is_power_of_2(data->blksz)) { + if (!is_power_of_2(data->blksz) && !variant->datactrl_any_blocksz) { dev_err(mmc_dev(host->mmc), "unsupported block size (%d bytes)\n", data->blksz); return -EINVAL; @@ -515,7 +522,9 @@ int mmci_dma_start(struct mmci_host *host, unsigned int datactrl) "Submit MMCI DMA job, sglen %d blksz %04x blks %04x flags %08x\n", data->sg_len, data->blksz, data->blocks, data->flags); - host->ops->dma_start(host, &datactrl); + ret = host->ops->dma_start(host, &datactrl); + if (ret) + return ret; /* Trigger the DMA transfer */ mmci_write_datactrlreg(host, datactrl); @@ -822,6 +831,18 @@ static int _mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data, if (data->blksz * data->blocks <= variant->fifosize) return -EINVAL; + /* + * This is necessary to get SDIO working on the Ux500. We do not yet + * know if this is a bug in: + * - The Ux500 DMA controller (DMA40) + * - The MMCI DMA interface on the Ux500 + * some power of two blocks (such as 64 bytes) are sent regularly + * during SDIO traffic and those work fine so for these we enable DMA + * transfers. + */ + if (host->variant->dma_power_of_2 && !is_power_of_2(data->blksz)) + return -EINVAL; + device = chan->device; nr_sg = dma_map_sg(device->dev, data->sg, data->sg_len, mmc_get_dma_dir(data)); @@ -872,9 +893,14 @@ int mmci_dmae_prep_data(struct mmci_host *host, int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl) { struct mmci_dmae_priv *dmae = host->dma_priv; + int ret; host->dma_in_progress = true; - dmaengine_submit(dmae->desc_current); + ret = dma_submit_error(dmaengine_submit(dmae->desc_current)); + if (ret < 0) { + host->dma_in_progress = false; + return ret; + } dma_async_issue_pending(dmae->cur); *datactrl |= MCI_DPSM_DMAENABLE; diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h index 833236ecb31e..89ab73343cf3 100644 --- a/drivers/mmc/host/mmci.h +++ b/drivers/mmc/host/mmci.h @@ -278,7 +278,11 @@ struct mmci_host; * @stm32_clkdiv: true if using a STM32-specific clock divider algorithm * @datactrl_mask_ddrmode: ddr mode mask in datactrl register. * @datactrl_mask_sdio: SDIO enable mask in datactrl register - * @datactrl_blksz: block size in power of two + * @datactrl_blocksz: block size in power of two + * @datactrl_any_blocksz: true if block any block sizes are accepted by + * hardware, such as with some SDIO traffic that send + * odd packets. + * @dma_power_of_2: DMA only works with blocks that are a power of 2. * @datactrl_first: true if data must be setup before send command * @datacnt_useless: true if you could not use datacnt register to read * remaining data @@ -323,6 +327,8 @@ struct variant_data { unsigned int datactrl_mask_ddrmode; unsigned int datactrl_mask_sdio; unsigned int datactrl_blocksz; + u8 datactrl_any_blocksz:1; + u8 dma_power_of_2:1; u8 datactrl_first:1; u8 datacnt_useless:1; u8 st_sdio:1;