From patchwork Mon Aug 27 08:21:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 10576619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B1B617DB for ; Mon, 27 Aug 2018 08:24:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 451B929798 for ; Mon, 27 Aug 2018 08:24:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 383EC29807; Mon, 27 Aug 2018 08:24:48 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 0F63C29798 for ; Mon, 27 Aug 2018 08:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726918AbeH0MKX (ORCPT ); Mon, 27 Aug 2018 08:10:23 -0400 Received: from mail-sn1nam02on0067.outbound.protection.outlook.com ([104.47.36.67]:23753 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726802AbeH0MKW (ORCPT ); Mon, 27 Aug 2018 08:10:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yvprez3azRSi1qUZTkuWZTzIjc29OUayx4JB5SrF0mI=; b=qsSTXArLzFiEQMs8TXi6Be+X3lm6XVc+9b49vWK7o91k9JXjg94w1qbDOYRFx2fW+14havvtz0t+zWj6E5dLhJKg0DCw3/Ywcp7AgyItVXaOeefLHpTHBa6dKYYYUtJbTvShXCm1rAKenvnHhuwzvvfkTtbwuXt70eSPNtP1CSA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by BY2PR0301MB1576.namprd03.prod.outlook.com (2a01:111:e400:526e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 08:24:38 +0000 Date: Mon, 27 Aug 2018 16:21:35 +0800 From: Jisheng Zhang To: Adrian Hunter , Ulf Hansson Cc: , , Subject: [PATCH v5 1/3] mmc: sdhci: add adma_table_cnt member to struct sdhci_host Message-ID: <20180827162135.46285a72@xhacker.debian> In-Reply-To: <20180827162026.3901de27@xhacker.debian> References: <20180827162026.3901de27@xhacker.debian> X-Mailer: Claws Mail 3.17.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY2PR0101CA0012.apcprd01.prod.exchangelabs.com (2603:1096:404:92::24) To BY2PR0301MB1576.namprd03.prod.outlook.com (2a01:111:e400:526e::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e0d59fb-6936-4f9b-7aa3-08d60bf6886d X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:BY2PR0301MB1576; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1576;3:vbQn9cG/t1Ibfkup3B+bLEK7XvWPA0uHATLw7BlYtfs8JUnx66g2aGkg4SkLANG6zaIjU26/NR2GOSwUt2iN0ALNUm6gojP8tCE+Ti6cYpImRggfQcZJp/PDnC72AnFDg6tG+D3heHkw6nO7qZ3CbD79yf/wN7TRZ0yn9StnfH3BRUNQsq1Ll+pAaK3p2NuqDcSWo72xpJ3dcWBBtFxYM4BfSXrwTE/f27qvkaQvbvnoBLepbW9Lul+u1X/hN3nk;25:eRihxTRPRoF/F4/x+e53O1j+EuO+BroIFZgfddD+auTz1s8A6uG+wGMzVpkRd4XzMdN0c6VTZVRJqJzMirHLtYW/n9tfnTt2hj3vgVz3mC9kj2Vi3kyokebtxp1trDVTEK/RNKb3C+MuQYpDK0MlZlmmBQAlq/xWtdZgjvhvVQ4Yq140sKbLSbwWZAnB/zT+DeB1cwOd3ku3hDKsbNrWuXgVdtiV9NkOBxpuXUSpUomec77G63WOQrHOgiTVDNznDgtmjHqUdKShQEa2WFW/cTcb39P9Yd1hEfW5cWoii9IjKh3cU33w9SN4QahP9Suz9E35RtajmSplmOaTFaZsmg==;31:4uDgECUJSyyjqvBc6LMeBuUSmluilGs3fFDyDj89n0Zkt1h2gumpeNtGVTKnQNuN+Jr9/PLaRrsTa/yLtCj6Q7wJmzX6tYz0KULCWcCs+E5/SCJSJSTNfqpG7ct9SAo0JwBfD/HnDIVxKfxtJf6odVAwKgDw/ZEzZ+UHQnc/1NelKhIhqXtYv7MhME6KbYzPZ9r+qM0KHY/VGVj8WUAuOLeYy4H/P2JEoP+nmcuzldk= X-MS-TrafficTypeDiagnostic: BY2PR0301MB1576: X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1576;20:/l/ZD4bmYOdLehqnj0jSedE1nqKh1W8gGwD+ejwswndJT7++djXTS4Go8lhMWao+ljzIEnYu9rIqtxTOHeyDuxp0Yr3XZEpV07YZZRQC7aWrj5q9rEbrS0FpINiypclgd5U9dyPA0pmq0hVTuAxiqK/fVqif9FcLFqY8wXzRFUu62oYyQfnYwcTA1E3aDLuLwKkQtR5Xu+uFLwmkMufMxchhY8U77YFC6t7NDKvs1mp7ffJG3UsCfQ1Oa6SpzDDRxTzJgwAN+FcOZtWnnddQAYPXchl/LLI1zyi7kEr1BGSifz57jMEV4rl5tRrou/aARDHac3xTbldM9Hs1OAWVTf5vRIMtyFKSUr1ADTLCEXcyh+JKjRWnJmWZ9fyHNx0ntaJ5zjAnY7EKUKHxIt9PvfNTgM1pocHJ3wIxdIl4G4tUcneF2jIiu3ic1uH/kTZ9t1Apl2yTQKd/kOuakrx95M3LdTgW8Lum0nalP7D7SLdbXQjeNlbYRPgKlzPJIxkS;4:HCQl7JCpaVYYG28pppDrtrrm/1Vz4SbFP+FbaYU3ZfpQU3GU22Zw3a6J2aiExM9x2sVX0+ppCgEWpZlTH6kqQK+0LsDLhQ5xb/8kToj2c10G1ObMb6SA5/MOnhaEvPYow8HSy/E8epZ0PfcK0sd3sbKjlQLajI58HcJG3TBsBNGEVhd6v1GTK04uxjuMb5IxQ4Ee/TM+WqghTVNvrZ0YNGr7FPZAEdr0R66vk5Iai5RxB6x9O847XAjjvWxjJF5DYn/ppBsbuDUbTCESUPFLSnRlJ+khBG0+lHR84FA3itzCNs1EkksQDs5zP5kom9fx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:BY2PR0301MB1576;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB1576; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(346002)(39860400002)(376002)(396003)(366004)(136003)(199004)(189003)(956004)(50226002)(8936002)(66066001)(476003)(11346002)(446003)(76176011)(5660300001)(6506007)(386003)(33896004)(7736002)(305945005)(81166006)(81156014)(8676002)(575784001)(26005)(7696005)(52116002)(2906002)(68736007)(16526019)(186003)(86362001)(23726003)(1076002)(230700001)(3846002)(6116002)(4326008)(25786009)(6666003)(110136005)(72206003)(54906003)(55016002)(50466002)(53936002)(486006)(47776003)(9686003)(478600001)(97736004)(105586002)(106356001)(316002)(39210200001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR0301MB1576;H:xhacker.debian;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1576;23:6bZFRffa1HNdiz+Bt6VXBtmM11MaE+7HvJfnMAk3H6jlfDMxUIRsSRmXCITz1jHEg9YubRY4wuzwR6QzAcCuKLjfZixgXVBa1wMYFJ6CLKBMv6IHWrz8Eyn7laV6QYAhgifUMEha6xroTEH/UJx2zB+x6mIa8uQTif/nsV5zWXHnxq+/JXxvP7ydHEqWELb/Px53BmMdktQ+0g3iYCRZxwFM4pA/z9Ghg8uWHx5ae8NUv5PBh1Oo9RnAEoSMebN2OQjwpLyilGdctMC/yFEiwleHZPRtgfLMRbVBCVLSj2/AvjGBmKAswWNkjbPod4SgfbYokwWNdL+0Ah1lOIndG2hQBelynfLTg0Z25xLpInCBb8uVqVdXYJbW26Ro3Kft2Ks01xNDJIbW+e2k5W+rYNmMaNX72ReSXpByHnjSoYBgw3EJA0gBFBxmvax5RXEzp9XqRuo71jdpiMUMtFUaR/W24hEhnoETZ8/T7VrsHjcwPKeeXd629SJZ/6e/ZtDN6IsBNceiFZqFCyqh3iQ0+86JUzqW7VaYYJ2g3fQPX582KLXtIteWs6S/Xs4KoYz+77ggN57G4+qHxgEW/hJq62CxXUgLn1eY4DvmWexoFgJR3ol1c7D/jvlohT64baU03f30X5colNla0OFGgqw2cqXFjZqu2wgo8NPvrIAUUjIvD5fafdcox6zewpkaEJOhiTPj7RfNg8nM+grvKx0k2PL6V3SM6DnD9inx/rJvJCsQjqIIudzDG3gim7bba1EQNmEdhgpYzNoFma0umdxh5lID3uAu12ITA6ltjhMudOLhJb4WRVetut+HYznWTHv57Pvhn1C8XQqqYVXAYF9h7dWbSHVTykWbCS/eZ5EOAeZkIhqgfS+asrVAIdqUU+aqEOUMtThMvODVc2rrnxSk0fFdYHx4idh0nd3HZ5XB5IONweLzat3qrwkUxVOE7/GbOBfjGX0tWILXMXe/1pCew/qyya/WSofh/uVtCs78yquUsIXFgM1tAB3fFS58VFRCzQNL1kBEvWPzsROpoDwtZ5F1eZgRbkULA54EiZsWCiujk9M841yasR3IYdegfjCMtPgXOQuGeT8pbK+nyoC3or/kklnXdIV7DK39lyUoj9CO/Cf4vI9ybxrHmVaxFdD7oWiRQ0dmytrD0VDxc8fgDF28CXvL9vk01+/1ZiyMvqq7YWHDZXrdHatyWMRGhp0Jjbc3AJWyXRFkbyQ6Dq1Vip8N41KDGTWI9k62lbP6d/4AUq4P/+Wov7Z/kA8Anenh X-Microsoft-Antispam-Message-Info: nMfYY467iNs6h8FfE9mrgrZDJjHV8m9asNH2oUZifUz+wd9h0heHapTAzQZqUMzl9JrZKuYrlwqRkHNQMnr6X7ZA7flC5T+wpQnaM1cqtzh0T10GDj6TRaUQFDC7yAJg+jB/T8CeME4ev8MV0KMj66fodGQoiSSR7mYUnsey1akyA5EWv/OZnulU+qVcaPUFhvd2/Xq3HYVf82YuQkktl+lIvgNByjC00HG4aSA/W0QE3eUYqXFMJ1XwzNyJTsFvMEoOUjx620wHZDFkjPkdarx/tJTz0Ec2Y5/fqjqV2G/usyriwctVgIO2vVsc8p8o/i/6T4cML0RqDoXRqUhyhvXOzKAStDV9LTIog+a4+As= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0301MB1576;6:ji/YnkC5tOP9vVhkmxF0L7X4KH7rSZ7WY7KA46gZPKsH+TwjvL0wuNifM0Qy8k3T+6ZMtCNzG2QlVfbXkmfrOOMe2bV3KXb+WpJmJFvcDbn3EZYtCiuCaHZZ+6KYQ868TVKRVCkwf+LrHVZHnBqKy/lHhyCa04NVZ75uSuuBy+xWfFcX1+VnBPj+8kGTXghkYHDxlQXLeDv6PF0zvxUbJZvHcWCMbXbtDaL9d2KuNEUr+QVkkLzdcTgsqEMRUUu9ckXknLreME7ZSX8Za8xUIgEHyYwHr81iGjP9UPSyimMFc7bL+FbBSNYSyQQfuPwUavGOiPVuLIVQ2HN0ULe64QvojUnTNqUPG8PziL60b3gdxdWdTQzRuJFZyxgpmlo7SUu6SnJEEvGygSznQYd+pDBP3LNyRW9yhWv4uX0KNqe+YOQPCDV1nMJtxm9rhQ2WYJhR8qmKveKCy/ZAIYx8Ew==;5:wRfAOp9Hj88L+Ixi+sqf2HGkHfih/gKoSmfLg1eNgFIqG2yr/XS2QMVdw+mdKjB+yZ537++zVivIZz//ZEjoUSoQj1MF5ZfWy34DHuRvzQkS8hngIWuLXgcuydmij2hvyON3CqIauZctmmGM5GnOsmeF+jTuytHgjM3Uti/dalc=;7:QvkPqZecM4koT3ouTbPjgngJdVdhOWsMPJIJ9++y+Kn2v8XycRX/WUCMdPxSx7SVMeWJvl2rbXy77P2otQx55kynFY5DjyGpwZXqxVPeg8+9yzM1ygluRO1Eg3UP5fw8Y7Ax11fOMnz6k4wWeaiF4ztmYQM5rcG+KopBFIpi7E8LcSKYFqbvxcrDr64R96mKlODk/LRDjB/1Tkc0wpeQUracYutxZfz+YVaJzh0AUEgn47CsB7cEWglkaCqmiVeU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 08:24:38.1347 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e0d59fb-6936-4f9b-7aa3-08d60bf6886d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB1576 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 This patch adds adma_table_cnt member to struct sdhci_host to give more flexibility to drivers to control the ADMA table count. Default value of adma_table_cnt is set to (SDHCI_MAX_SEGS * 2 + 1). Signed-off-by: Jisheng Zhang Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci.c | 17 +++++++++-------- drivers/mmc/host/sdhci.h | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1b3fbd9bd5c5..52ccf4644384 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3322,6 +3322,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG; + /* + * The DMA table descriptor count is calculated as the maximum + * number of segments times 2, to allow for an alignment + * descriptor for each segment, plus 1 for a nop end descriptor. + */ + host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1; + return host; } @@ -3567,18 +3574,12 @@ int sdhci_setup_host(struct sdhci_host *host) dma_addr_t dma; void *buf; - /* - * The DMA descriptor table size is calculated as the maximum - * number of segments times 2, to allow for an alignment - * descriptor for each segment, plus 1 for a nop end descriptor, - * all multipled by the descriptor size. - */ if (host->flags & SDHCI_USE_64_BIT_DMA) { - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * + host->adma_table_sz = host->adma_table_cnt * SDHCI_ADMA2_64_DESC_SZ; host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; } else { - host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * + host->adma_table_sz = host->adma_table_cnt * SDHCI_ADMA2_32_DESC_SZ; host->desc_sz = SDHCI_ADMA2_32_DESC_SZ; } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index f0bd36ce3817..25bddd21de31 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -563,6 +563,9 @@ struct sdhci_host { /* Host SDMA buffer boundary. */ u32 sdma_boundary; + /* Host ADMA table count */ + u32 adma_table_cnt; + u64 data_timeout; unsigned long private[0] ____cacheline_aligned; From patchwork Mon Aug 27 08:22:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 10576623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BD9017DB for ; Mon, 27 Aug 2018 08:25:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8598E29798 for ; Mon, 27 Aug 2018 08:25:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79BAE29906; Mon, 27 Aug 2018 08:25:47 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 C6CEA29798 for ; Mon, 27 Aug 2018 08:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbeH0MLX (ORCPT ); Mon, 27 Aug 2018 08:11:23 -0400 Received: from mail-eopbgr720059.outbound.protection.outlook.com ([40.107.72.59]:34272 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726802AbeH0MLX (ORCPT ); Mon, 27 Aug 2018 08:11:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t34Jq3WRCfdlEWi8ntOQHsyGNkAU8Rm7d/6CzQM9b18=; b=VfNm+M5sf+2QB1l8kBWsoVbkmqnTFhdHKCJoOGUYSmazpXBoL8H9alPLhHTjObQJ3aiZABg2kJt90qY1rJVrfvkt/UNxp9BYoEzmcQXT4hcMIkIGORRiDpVsx9hFiWKAzKMQHZllxQ9CBE/zR8sD3gN92HzweA3p6A/FAt+yEtA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by CY1PR0301MB1578.namprd03.prod.outlook.com (2a01:111:e400:529c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Mon, 27 Aug 2018 08:25:41 +0000 Date: Mon, 27 Aug 2018 16:22:42 +0800 From: Jisheng Zhang To: Adrian Hunter , Ulf Hansson Cc: , , Subject: [PATCH v5 2/3] mmc: sdhci: introduce adma_write_desc() hook to struct sdhci_ops Message-ID: <20180827162242.0fc59e00@xhacker.debian> In-Reply-To: <20180827162026.3901de27@xhacker.debian> References: <20180827162026.3901de27@xhacker.debian> X-Mailer: Claws Mail 3.17.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY1PR01CA0193.jpnprd01.prod.outlook.com (2603:1096:403::23) To CY1PR0301MB1578.namprd03.prod.outlook.com (2a01:111:e400:529c::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1fddc7e4-caf1-4060-19c4-08d60bf6adc6 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:CY1PR0301MB1578; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1578;3:7tbD/BihYe0ssK7GQWsdDD4abLoy+/6jmkk6MiiWQK9U3qKys6xtTeCFnGVo2HHRHKNydK0BtuvujNKTWYBfuVBLQiiJZRaqShVY6v/O5ltQYS/WtMbYIjQcc4deeQIuyn82q6/zu/zIyH3YHl04xin1bW0gmy3mUTgLds6DrUTHoBqkid/ixf7TwWs8M3rY5Mu4RJlqMXXO694e7qUQS/HvwkWO+CkPec/BH16XZVxLDnSyJbzgEn+149fEqWqs;25:8bqzlSa+BE4X12J4w080RBjGpOGTuuSlB/R6BYDunCDB6ow1dQsG0BEKeARl7HybWBrNhz/PNzSldFVDcCJFMekYKGcpq8zTjdxgis9989j6O3ggBagJgImo46OF3WhoefK6c1HR9/uxX+VGvnEa57PcKUPikRIPEhsxpOuopBRyZo0z5oBoHiYK/h9aPCHZM1YPkdUc9H5rawtJFW/bj9fxn5bMdck7km+rjq8756mcHr99R5x9iKRE2yH9GvYt8OA8PoOjOeFd9682E2svdUafu8iEbB2xRJs+OlgT7BI4YwaKfq/xFLzo16TsDHYwYBbLlVUAfk7fbbq/SjEt/A==;31:X9Bcg7HK/T6phUz/6LC/DoDLEBeYnhZoKRa5Ri3ga/qLuDs+jHeIiZDXsil4E7KcsfDo24IgmFiXhlUxgTZ4mCaLEUJcUMDlaoXhMLacHHP6Hk3035NW1f8+n6AavsBQi2FMbm1UCdAp1f48d2OjCdSDq7liZ66ilP3dlyXAdakqv1I8fzVavvFL5IhYRexpEjmyTOrBYVj8Fe9vvjqpmju1aiu1km6z+eALwtix5vA= X-MS-TrafficTypeDiagnostic: CY1PR0301MB1578: X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1578;20:JwkvusBj384BkY9KexcacW/igD6eWLb532uQHzpJje/yh9klznlFO56N/H9X2LOlloZCvvsdQvAZADR1XYtW5MUHq+FTOmfyeJN9rxZBz6Xf+jAh1XYsanO2oXo/b5AP73DLUA0d0q03cVzHwxa3XknmPb3mlsD1ogg32tOrBSMbMrvsOi5Av26kTgHi29Va3YV2b8FialSS5PxofcXDadGstRcjyJ5QtLus4RfS6DCm8HmfuW74r13TqSNfuSI7hQoKsO6YX9G0QuxfFuhUs+5+kAZCzNkb4MAvBQxEmk9jjQOXoIUh8jeyt1kiQUkJ6lDwDwx7cGmQiiigb0hBHODoijpkiwBkyADkuqXSSvuGuORMSWXm0jhjYekiUAcZkU3Urx+QFg0BElhIWVR1197f1GMGghUaBlTlwvB38HKuEp+T/nfp+r+jmj/uQONDfXpcjplfKbrzMN0yfBgmHJBXmHgutXecepxNU6rR/WvBQwOpEipHB1L8RYc9ZuIw;4:ZkxR94yds9GLfVdG/OuW4vSgwqu5/Vpv4FA5JROp4w5i5AVe6QGo80CBW/pSg8J/f1wYWFAmjwCMHitGQF79uAoXXO0jbRwXghXx0/1sWjnJtlmXUC6Jy31BX3TGLs+Onu9aur99rana/Sl6OuCxM5v8WQ3/DgRxHnEfioRKApXHv3Mq7PYVj4EQcJM3cpXNkhpbkY/K6BTDLWqyFTFJxyRvP89Gk5rJ/8v/0cVlsnC15PE2klcf2Vzg81hlCmVHfTxoyTtoFKVoG0GhXmbP8KjrIgR7m2IRCYXxs0uYH+NBCh48r4E8qYGMbeScgt1X X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:CY1PR0301MB1578;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1578; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(39850400004)(346002)(366004)(136003)(396003)(376002)(199004)(189003)(23726003)(6116002)(3846002)(478600001)(230700001)(4326008)(47776003)(72206003)(956004)(476003)(11346002)(54906003)(316002)(53936002)(446003)(110136005)(50226002)(9686003)(8676002)(5660300001)(66066001)(81156014)(81166006)(105586002)(76176011)(186003)(16526019)(25786009)(2906002)(97736004)(7736002)(106356001)(8936002)(33896004)(55016002)(50466002)(26005)(68736007)(6506007)(305945005)(86362001)(1076002)(7696005)(52116002)(486006)(386003)(14444005)(39210200001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1578;H:xhacker.debian;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1578;23:bzsBDuueZTYAcEEtmfWKQ/seUugu9hI3SVZbGsTzxXHTvij3SVp5THF6YX01BPWLk6+hyq/KXtyRE2hIzS92N+Gk3OaT0uG4RDMwfWrDl3Ad9y6ZP7DCIUbgxza7t28i01ulNzJbd4t4wPzl1n2m7dnp/xf8oQk39yqLGuwIRD03CAe0DaVh2CG1COOSXKc1uJCm1djgwVteFRLFcCv8WNdtQ4mHFPmDszXySc0VgmnVrgcgulFNY6phTuO57DVXLa+knokzqm5zMPzYixJdfI8A9m9m+RIODfF4FvVrnY5w7C5OJ3pF58nToJ2D9iSHTdd9U2d6uX97HcVlPjMEtZGKSPJNG0yfl2TUgStc8pQamL9jPtCo8ExctXaK0a8gla7AmjcnsuqkraA9ILeIfetdwAWFQvfOtBqi1mfNZUtLzMibXAZS0XUXzfVWSFNOJZSLSgujLyGLB+4a7igvcb5P/etDJa4lGsJO+znJrWS0UXed3ihpjBqCL8RiRBnoHQM2xzRf4fIuwxc1R0ZWt/jwkyAm8a92BpF/x88feMk1oGDLUJVWAgSYRpyMbWdv+VatTrpUwpCoTIKPgAfbEqW5lm18ldQtBb1kfXYddC7a1Rg01VIEKFRnzxPuUhY9Vb9OJBABZei+sX8ZKwh/XvO3jLn6i/kfB4xQAk9fjTdxKmi+nlXnoRMQ5Jvhj16MRdy3jrgqakMp1BfdPlaEN0ELCT/smg3pmqORfr0Kaqxm+OqngtSFvp3wXa3qYXX+EICrokL7Al4Wkb+v1Xt1nquBkVyCuv6Iw1+EKHg0GsOLyVardZaXiNKa5d7/zgZVj4OCt3gwwq50cYhtcHZ6+SofGs54UwZM/0WF2N81E4Pa6HGOkoWUV34nu8Gi8jBoll4Wj1zKCBM5KP1ojAz4GbB9oQFJdSkJhRbrCyh0Md5hei7mhOWvM+NUVcXN1esTuNSN/Cv244haPchqK4fuJznv7Rd3HdKKynW+5lUFApvVVwenrQt6MV3+C60qCk/fp9sNKMCj13gFdzwDgewcka9s1ubAHKDZkkFnLXkDGyQoXKmNR1Wa0QtDyiOXyJ/YgEo8kSeFJE2QydCvoxfpuzMqAtiOETt3RnVP8nPI5pynYbWmWWSnnmm8gLIVKhD7fQE2KmwKK0nXOASQMN8JsJOZJirFmVKgamsfNDafjBDJtX4mQHecJk5MsSgqA8Bq27oijDzpzeRSQFcIMQ3lzRo0fZ0rw4I/aLNLdZq1Rb0= X-Microsoft-Antispam-Message-Info: T2WzvWnyVcVvp7M3D/r1hYQsu2r0mQXepxXm5iAaMwSSEpIfJuzpEQj0Vr4Iy5hYdDRN2Qi4lx6uXYwBQXLVhnUACsG4TvTMCBM1Xr+h6bzXUCHUBxcSH4lVKwVVmzj0I3GAygsWcnTJ/ojwh3dAC01IehU13Di1oh+Q5Ji5rLKQmpAX/ndkyxSzrwZh2XDz4Sdh/SnqZhfj/IyqtSboNsC1XT6xRtgVhBxHKoxTjLT6o2hVAZ7AtR6mVn1v/fWtyZmMKBtjeXStAM34M1Z3ZlOXbxVa5Io6WHGrY9ui5VNbuaMeR8SfY3mg57vVR1t/ql3bn8+RQUgS0CCXmMaoQO2GcIsbIq+4vUSrEFQ93Ag= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1578;6:h+WXq2lEjBNOjncwzMZXlqa8zs+hLpG7zuvs17+Qukoge9llEdafe2XjNqKg+CwYlWPFbZovr8K3wBHKpba0RjoNjSS7XzxnqvpmX7LfAegA958yjNOkuFWRh/+0eudKqXA5+2PwLIDcblPDjLdixAucLYKrsZvgKHNFB8ORbfHstiWlbvCdSqQtwWfnqC0ejPoBJ37lyF1DTxYUB7lo48gEzsWjdWrkm5+0y2bMrd5U0HTJH8oUfqj2cUajSVgChx2kQjDmOY8ILVNIcC522f9DqyV1OSeQdnrJsw3uTvNJ6T6/HWn76tzrsw4yFAubUpYFhbIu16zWziuBN9kDm4Rkaardjvj/pdc8fxWG6f6IhDhNjPS0QOUdDL4eeikpY+kBN8gOSE/tnGiEMCMGMGAyE/NlzSGdqLBDVSytkzMqfamvHxvGE1C9jVRu2oiaePSYS7Ixr6GyyLzSe9Xx+g==;5:SN47ULbc2d880ukblMv3IhNjYplQZo3jKil4qFivHcN0Qg2AzgfdVe4xhmJdXwXyCUNQ+Rb6KNWNnbzHTx1XqpBZC+geifnZk8+hlgM1zq6dpfHoIVE530xO3j0HbzdmmohuYaLUvC0P7BmYYWXAwg3bu+PljMHCE7JuRDhz96o=;7:PErXM+V6OpBaC8lAcg1vWH3tE6DO7228aSCH+IsIyPLXkB8W4GQmbvquksKhu8uCTGA+CLvsZtZNcr8bBhAIPB0qlG/LUMLPutxYbRqkEjQLFR1bj5DHDFOKOguQ+5EGLbp0Y+W+FyT9unC9My3BMI3Ica30C1iz1+B+6MTxBd/XtZy4+rRYStxIw2mNNdD/E74srG5ak60n2CWLbp7sS0t2YvLqODBvTzJKgsFyz1rU2mjUX3nYuk/fztkNP9h8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 08:25:41.0273 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fddc7e4-caf1-4060-19c4-08d60bf6adc6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1578 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 Add this hook so that it can be overridden with driver specific implementations. We also let the original sdhci_adma_write_desc() accept &desc so that the function can set its new value. Then export the function so that it could be reused by driver's specific implementations. Signed-off-by: Jisheng Zhang Acked-by: Adrian Hunter --- drivers/mmc/host/sdhci.c | 37 +++++++++++++++++++++++-------------- drivers/mmc/host/sdhci.h | 4 ++++ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 52ccf4644384..eb21d2db7f05 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -554,10 +554,10 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags) local_irq_restore(*flags); } -static void sdhci_adma_write_desc(struct sdhci_host *host, void *desc, - dma_addr_t addr, int len, unsigned cmd) +void sdhci_adma_write_desc(struct sdhci_host *host, void **desc, + dma_addr_t addr, int len, unsigned int cmd) { - struct sdhci_adma2_64_desc *dma_desc = desc; + struct sdhci_adma2_64_desc *dma_desc = *desc; /* 32-bit and 64-bit descriptors have these members in same position */ dma_desc->cmd = cpu_to_le16(cmd); @@ -566,6 +566,19 @@ static void sdhci_adma_write_desc(struct sdhci_host *host, void *desc, if (host->flags & SDHCI_USE_64_BIT_DMA) dma_desc->addr_hi = cpu_to_le32((u64)addr >> 32); + + *desc += host->desc_sz; +} +EXPORT_SYMBOL_GPL(sdhci_adma_write_desc); + +static inline void __sdhci_adma_write_desc(struct sdhci_host *host, + void **desc, dma_addr_t addr, + int len, unsigned int cmd) +{ + if (host->ops->adma_write_desc) + host->ops->adma_write_desc(host, desc, addr, len, cmd); + + sdhci_adma_write_desc(host, desc, addr, len, cmd); } static void sdhci_adma_mark_end(void *desc) @@ -618,28 +631,24 @@ static void sdhci_adma_table_pre(struct sdhci_host *host, } /* tran, valid */ - sdhci_adma_write_desc(host, desc, align_addr, offset, - ADMA2_TRAN_VALID); + __sdhci_adma_write_desc(host, &desc, align_addr, + offset, ADMA2_TRAN_VALID); BUG_ON(offset > 65536); align += SDHCI_ADMA2_ALIGN; align_addr += SDHCI_ADMA2_ALIGN; - desc += host->desc_sz; - addr += offset; len -= offset; } BUG_ON(len > 65536); - if (len) { - /* tran, valid */ - sdhci_adma_write_desc(host, desc, addr, len, - ADMA2_TRAN_VALID); - desc += host->desc_sz; - } + /* tran, valid */ + if (len) + __sdhci_adma_write_desc(host, &desc, addr, len, + ADMA2_TRAN_VALID); /* * If this triggers then we have a calculation bug @@ -656,7 +665,7 @@ static void sdhci_adma_table_pre(struct sdhci_host *host, } } else { /* Add a terminating entry - nop, end, valid */ - sdhci_adma_write_desc(host, desc, 0, 0, ADMA2_NOP_END_VALID); + __sdhci_adma_write_desc(host, &desc, 0, 0, ADMA2_NOP_END_VALID); } } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 25bddd21de31..2115416f973a 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -606,6 +606,8 @@ struct sdhci_ops { void (*adma_workaround)(struct sdhci_host *host, u32 intmask); void (*card_event)(struct sdhci_host *host); void (*voltage_switch)(struct sdhci_host *host); + void (*adma_write_desc)(struct sdhci_host *host, void **desc, + dma_addr_t addr, int len, unsigned int cmd); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS @@ -736,6 +738,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios); int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios); void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable); +void sdhci_adma_write_desc(struct sdhci_host *host, void **desc, + dma_addr_t addr, int len, unsigned int cmd); #ifdef CONFIG_PM int sdhci_suspend_host(struct sdhci_host *host); From patchwork Mon Aug 27 08:24:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 10576627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C103F1390 for ; Mon, 27 Aug 2018 08:27:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9B6C297FE for ; Mon, 27 Aug 2018 08:27:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9AF3E298D5; Mon, 27 Aug 2018 08:27:25 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 00471297FE for ; Mon, 27 Aug 2018 08:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbeH0MNC (ORCPT ); Mon, 27 Aug 2018 08:13:02 -0400 Received: from mail-by2nam03on0080.outbound.protection.outlook.com ([104.47.42.80]:26496 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726802AbeH0MNB (ORCPT ); Mon, 27 Aug 2018 08:13:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Synaptics.onmicrosoft.com; s=selector1-synaptics-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N9RRjbOvBHjb8Mm5unulNA3GXdei0drLuVJUXzZw4R4=; b=p7+2+IIjN/xaJIbEyB7/s5fEDFCBQMPY9DfDobiODs1bEcXwfGaOAAuMHW/pIzh+xP6Kpv5x4MQWxcqMCd+yTkdp2qXHnsqj02kqVoTTV0JpAX4I+qw7dpdy80Sw1phjw67/qsHR4eLOsciH45Y9rmY+0WledEPRAuML/V5AcWE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jisheng.Zhang@synaptics.com; Received: from xhacker.debian (124.74.246.114) by CY1PR0301MB1580.namprd03.prod.outlook.com (2a01:111:e400:529c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.14; Mon, 27 Aug 2018 08:27:18 +0000 Date: Mon, 27 Aug 2018 16:24:19 +0800 From: Jisheng Zhang To: Adrian Hunter , Ulf Hansson Cc: , , Subject: [PATCH v5 3/3] mmc: sdhci-of-dwcmshc: solve 128MB DMA boundary limitation Message-ID: <20180827162419.61afe238@xhacker.debian> In-Reply-To: <20180827162026.3901de27@xhacker.debian> References: <20180827162026.3901de27@xhacker.debian> X-Mailer: Claws Mail 3.17.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Originating-IP: [124.74.246.114] X-ClientProxiedBy: TY1PR01CA0185.jpnprd01.prod.outlook.com (2603:1096:403::15) To CY1PR0301MB1580.namprd03.prod.outlook.com (2a01:111:e400:529c::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2da08f8f-342c-4e77-ac78-08d60bf6e7c1 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020);SRVR:CY1PR0301MB1580; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1580;3:OQLlM4zE4bsPMkNCHJSlksYe0nPAl2tm4O0N3nAluJeRqkHTTD984FGYLQR5Xpht3cSa0+yy8YVw+PjPQnGV8Zzww4Iz5jMs15QLuRXAVGdKQMl5vBo3Wcbn0O5EdrUMGH6dTS8tT3/uLg9o5FKzG4a8G025l5QJIowh8rVXFAUMHnaemsLHXqT57s8vLJ5V7HFPOUhwG4973cEHaM2miJQS6YlaTRunkQWtPb3xA40gTTiwFi0iw402gOQ/FmmT;25:oGXd4NEqEaFMo3dplCPTDplmHLcYYW+Ne7YF94rf8IwP/Amw4zKDtL7IbRKMXG5NErkvHJtmoro3axEP0SVa+pkUdZ4KMdSFo9WAJFjiTWaQIWdKE7FhUThhAx8jAElYRc7CzLRb9Qm3i/9o3viua1XUaRuJtiQauyjcN+d/mMas6RxBFeQQppAAijw4O/+5HCVNpLY/vlfFEa9c6PppRj5DYlvSI1bjDB3yP303NV2hdF4XiA07ZcZjZSZn9KvK7c6ARSIl9LdcZBshHDDJSye2Qdf3cRvBSwNSckgnwAMpONqqbeaZNttfHuIiO0BO3kof1nfoADdWPnZ07Dsa6Q==;31:S0Ms9aNFbHterslk+6K+M40FRTWBddwErJnAyEeYh4059ivJO2MQ1BIIueh+KFAy1OD/ZR6I+tXYiyehF7AONbc+M5YT9x8CBE2TYP/H0givvi6gqRph4bVO5YiqcO2pSC2sUgwy5EGXSuhN5GNA7fXCkGQcqW3l7WTh33/Bw32XtoUt1N1yjb4lk8l4iayU+slCqT2U1cJ6ghKgGlrL9bHenrzs+oBUV3sD/qMwtuI= X-MS-TrafficTypeDiagnostic: CY1PR0301MB1580: X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1580;20:yqGof6uqJZcK4t65TwBYcOcumHPqx8bsJRExsZy8rwOpDdK5vFDXQIaEzXYCslomc9VzIpPS4Q8UPbGNTu8usFBZicimdEOtxlnYMWXFOe81/cMW8sryJOUxpGjI9N0SXvg2X21st46GTEpe9ktcpoPzRsmfPA1KM4cAS/dZR3QQ6qKYtPHRNbPxRcfRAawAwnHqfC0OdZkHjko9fsdC7DacZ1zjrdzZREGU42g+YW353SuVjeYZ5ZQheqku2Q0bKK9hQ2aNxTcwyMnu1kx5jLDud1X8QdhUiHhvhpXVTj1vaBA9Cabea/cJ2tWxZAMMLmN5iYH6JfgdINf3qEryyfcQ5TBQ4Rb1eaHn2y2mRO8qR1hJGwT/m2j4yhbVroOxCs5xG2nlGfVFzDWpAO4ycffnQ16pyD0F1+p/oAkvPkx1WyKN404n0kPrZOFKxLFKN+ojDsVTsYq/A+VVl/WIWXIp9fx72o2bGgLDSXWP9+8NqdSwXjBwuf0IH/QXBxEb;4:2YfO3l9s6U/gql6+rNcdoEHo1SOjt0luz8NSL75psTMKmHDpGyuKDZm23qT2IMvUOiaObNNaFsgI3YRfF9v9HgUtLn/MtYUYJFVbOAs53LNEuI5OHwlquEAmwppwS7E6Ji4Z6Y6tCc7Rni0yW88m34uPgFhgqNwkGBRYn5UdiXC5ECTMkz7C/VUuU5Afgn/HwkrTQhZz4oWXPgbqhFPE8+mwjj4MSFTCEr7jIRhfptPUzTqalcTtbk9iGK5JdEVlTFAPlg3ev+ccWjqvh75/qg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040522)(2401047)(5005006)(8121501046)(3231311)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016);SRVR:CY1PR0301MB1580;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1580; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(366004)(376002)(346002)(136003)(39850400004)(396003)(199004)(189003)(2906002)(6506007)(446003)(14444005)(66066001)(50226002)(8676002)(8936002)(86362001)(11346002)(72206003)(478600001)(68736007)(386003)(47776003)(26005)(476003)(316002)(54906003)(110136005)(53936002)(186003)(76176011)(1076002)(81166006)(81156014)(55016002)(9686003)(486006)(16526019)(97736004)(106356001)(5660300001)(230700001)(105586002)(3846002)(7736002)(33896004)(6116002)(25786009)(50466002)(4326008)(305945005)(23726003)(7696005)(956004)(52116002)(133343001)(39210200001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1580;H:xhacker.debian;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: synaptics.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1580;23:cKU/3ACjFHLdOqzFLY1c0xXQK9STfYvt5gk1VKtuzXJUfZxVqIaXR0q03GDo3b/vWY5XAytHFZkRMN3H2s9Jx3Cu8I5auWhvXi2tS2p1fyu9I0HKT3VglK7UcNou+/baSY778xkIyP9fLT40lcga8WaJK0OSgW5Ln1abIgaoGXUZ3CNMW+Om3UtDLwmvU31cr+er2vgHJwkPBh9g4m62+c1q01WHgtsWNSAmXvpFWmuBj0RWC+UGyKC3S/iM1iKO8jMMg5lRI9t+Vme+L7m4IMhuMj4qIdCNpSjzZilaqvqkhYBkC3vhFHZCJejw0wB3VnClppli86HNfqQEZFpXXo+ZewHr37IVYA3TXVSUT6cHwO7uglpF+ic7Vwx6+/3FcJWOFNM4yNgaoVpJAMYqOgfxO2hbhugs3Yxo6uolTnJrMV3l5ZmAZ4O4QfhSUjynnh+I3VHOdzSghbtXUMHZ1p1fPqoAURWIU+Vi+SXf1PZ/NJiHoE5FdJGg+deGl9EW5stX8UME2+C2L/lPmybGMkCQ+wX6mLhcIaJEu8QvB91ElaNa5vhzX+O4g+If1Pn7ol9XG7D+OiVcvtqgmy9dUZ+dct9jwnYcCmdTAN54WEt4ApEdTXlQDY7+ZZA851ogOWvjdX00tAohF8DSxNIooWJNqo+LAekTaB0nqSuj30ndY1z+a0+RO1AzjF3DaS/1TY+uGxWN+WYN3gzwJHXKH2midz28ePP+WQzx+3gRlzKMdMGhpCzW2MpGYfTZizpm6+4ijHs+vh/UTqZxJN43OWyZVFWKmqvsYqf+Q0Y2PNkA/Ip24jxc/7wyUzm5F9xZxHxC10jP7YdHsVX3ydY+2kVjhGkQakWAlpfXCGoTEPAPaK2u3pyPPPNA5n4XLqk2IN36KpkeFg5hQox2sYC8p4XUEqKJazS/kZbRllHPFRZQSymYjpM2VIdboWRJ5VkvxgjhEN951g4SKV3ZWbS9vrt5vR7zUeP2mYquht4YUN7sPiRa78nsGY+OENUT2X0OjXYx+/OWMbZvump7CD4Emjlg91c/upbrY7MIPmqKLeiwKlG5YDrEyoT/htwAMPuk5V2Ai3H9Zf4LUxjxIi+4wo63/L5BZ5eSPQ/QjOp0HXfQU3IYzTpMMezVF9CSIVCLhREWENeTd00+oehq87UgzPHBvSc15Aq7aTZcXniEkSQYBbNWCxNy7g2x2Mp3hUdzk5CYvYrHpaW1PijfV6ZtHEI+Am5Z+KmhtiS8CUdjJujiLRM2vs14RM2EsuQPPFLo X-Microsoft-Antispam-Message-Info: WAsi4u/tMiOvhqL2idAkuUkcOtLAweLNrZJHcbzCc1YKxfcUyNxEN2LIazeyvPg5xkAKr+IFpPRia6ILPWXWtlWgAdHLzZRIpAL2lD0Sezu4j78/Pynj/o1sqgNIcga/82x/YsFm0OCrCbERT5/ecKNqw1oSTJGsUykaUTvunjZAzjaQjmOeadsiMYXYk59DqqoGFVMs+4Lo4LxQe6BxvKZ5dTi+ttdxra3BpyWT32yRJk43XMWvQpr8uMi5gxx0Ed8zVl9PkNd3iGRzZBESzw46wOl1e1iKW1dX7gRgBErr+l0yWHtky+sRvhb3S30QuxXQr2OFMPDFwqbrnd8tjIh+BZ9J1BoCHCz0AfQp6+k= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1580;6:Tj/Tz7GBZYHsxDPr57meWiU3HC7IkJb+aNx11JbiU1Byirkhvnp7hBv/ii7j+31+XsGH0b/WjlQw0xdf9TOrW+I+dyQK0kbJ1JBewLjETKsmN7HKWbyHiIn7BYG4MPZ/AD7DViS8q0JZIfobo2d+aJz9kNC1pIcqjyHijc9KvzV3rYkAzmIpmyhpBjOTyRK4+Oml6/nCJwkejJa/ESyN+vWnFdYNHRqUR0BoutPYRm0e3DdCNT/87HwS4DuGTOMtVpZJd/RppfVIxcXwlOlMKiTn/xcCUE8jVaUDUlEtgaauAf8CpP4tQR7MB+nqk2zqrN5a/myuuVDpBS+N4GB7wvC8E98UOM53Z1FQqIDwB0SvKrsx+rcJbVuDG7EMbWZJHZ34wzJXJzAmCVC3uWJvOm9214fGwGEha2jCH5sTH9n+jbraMwrQ2Yp2RHoGGlKDoDp+JxxccBiwzqE4TW30YA==;5:Ew8p1sRQa+ak9mJAo3Lz3vuA2sd5xKZvbxbQrJMetsf8VRzWkCZUx7lxrXgHF5DpxrkedUlNrq4bjg8uQKrGoQvxjq18MOHlrB4dG3JskUae8DpaA9vSOy3Ihnar4bCFMWC2zu+orMRh0H5e+liFJ/lWq1mvLcywXWpwvOZJd/Q=;7:ISH74r7aQBqIgmdjxydA00BP0GWXRM+yIODyqIBpQlsUNGI5twdq9mzd+UVr+escejvg/jvsjacEo97eQlWBw51sxBOyQAOqcqUgIOXRjMI/aq/4XYiAjdNbkO6MSdaBSUCg8yQQH5tKurKNxhM8spyYrrzuPd70sY6NEL/3odQDgs76OoahWpNQptoTYaIkEvkp6VSEfGGrgr0L8NxvcznSWebE6EBUPKF/nGU5JO7wXpjmBucd4SpbIOQ5rprA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: synaptics.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 08:27:18.3242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2da08f8f-342c-4e77-ac78-08d60bf6e7c1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335d1fbc-2124-4173-9863-17e7051a2a0e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1580 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 using DMA, if the DMA addr spans 128MB boundary, we have to split the DMA transfer into two so that each one doesn't exceed the boundary. Signed-off-by: Jisheng Zhang --- drivers/mmc/host/sdhci-of-dwcmshc.c | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/mmc/host/sdhci-of-dwcmshc.c b/drivers/mmc/host/sdhci-of-dwcmshc.c index 1b7cd144fb01..cfbdae8703a1 100644 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c @@ -8,21 +8,50 @@ */ #include +#include #include #include +#include #include "sdhci-pltfm.h" +#define BOUNDARY_OK(addr, len) \ + ((addr | (SZ_128M - 1)) == ((addr + len - 1) | (SZ_128M - 1))) + struct dwcmshc_priv { struct clk *bus_clk; }; +/* + * If DMA addr spans 128MB boundary, we split the DMA transfer into two + * so that each DMA transfer doesn't exceed the boundary. + */ +static void dwcmshc_adma_write_desc(struct sdhci_host *host, void **desc, + dma_addr_t addr, int len, unsigned int cmd) +{ + int tmplen, offset; + + if (likely(!len || BOUNDARY_OK(addr, len))) { + sdhci_adma_write_desc(host, desc, addr, len, cmd); + return; + } + + offset = addr & (SZ_128M - 1); + tmplen = SZ_128M - offset; + sdhci_adma_write_desc(host, desc, addr, tmplen, cmd); + + addr += tmplen; + len -= tmplen; + sdhci_adma_write_desc(host, desc, addr, len, cmd); +} + static const struct sdhci_ops sdhci_dwcmshc_ops = { .set_clock = sdhci_set_clock, .set_bus_width = sdhci_set_bus_width, .set_uhs_signaling = sdhci_set_uhs_signaling, .get_max_clock = sdhci_pltfm_clk_get_max_clock, .reset = sdhci_reset, + .adma_write_desc = dwcmshc_adma_write_desc, }; static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = { @@ -36,12 +65,24 @@ static int dwcmshc_probe(struct platform_device *pdev) struct sdhci_host *host; struct dwcmshc_priv *priv; int err; + u32 extra; host = sdhci_pltfm_init(pdev, &sdhci_dwcmshc_pdata, sizeof(struct dwcmshc_priv)); if (IS_ERR(host)) return PTR_ERR(host); + /* + * The DMA table descriptor count is calculated as the maximum + * number of segments times 2, to allow for an alignment + * descriptor for each segment, plus 1 for a nop end descriptor, + * plus extra number for cross 128M boundary handling. + */ + extra = DIV_ROUND_UP(totalram_pages, SZ_128M / PAGE_SIZE); + if (extra > SDHCI_MAX_SEGS) + extra = SDHCI_MAX_SEGS; + host->adma_table_cnt += extra; + pltfm_host = sdhci_priv(host); priv = sdhci_pltfm_priv(pltfm_host);