From patchwork Tue Feb 18 01:25:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 1239706 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=p30bhbDQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48M3942N06z9sRf for ; Tue, 18 Feb 2020 12:26:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 280BD8122A; Tue, 18 Feb 2020 02:26:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="p30bhbDQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4D62081224; Tue, 18 Feb 2020 02:25:56 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D5EEB8120E for ; Tue, 18 Feb 2020 02:25:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jh80.chung@samsung.com Received: from epcas1p4.samsung.com (unknown [182.195.41.48]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20200218012548epoutp01ea05792f717284b04cd0453a8d66da51~0Wr_t7uqL2959929599epoutp01e for ; Tue, 18 Feb 2020 01:25:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20200218012548epoutp01ea05792f717284b04cd0453a8d66da51~0Wr_t7uqL2959929599epoutp01e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1581989148; bh=urUIUaQxkCQTJ3UUXPZ++mXrC6tHhTiMCiWy71HeDwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p30bhbDQc/SziTK4y1jZZ0pUTmR7hRKhTPHk7gCT4a8uiNnam0Y/cMCIOpvyaFhYJ qdwUu3zLGIa6VeZLu0b/EyWLv6ztVALfYjgoGHD+R+dZDcqhaTt/XUVFiKwM+7VmZN Y/QmdtTekkwma1MfEQs7yirg9ZVOWAzVIW9ZGuh8= Received: from epsnrtp1.localdomain (unknown [182.195.42.162]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20200218012548epcas1p465f312408d276d8d8d5f51cec637a2e3~0Wr_dmnDw0845508455epcas1p4J; Tue, 18 Feb 2020 01:25:48 +0000 (GMT) Received: from epsmges1p3.samsung.com (unknown [182.195.40.154]) by epsnrtp1.localdomain (Postfix) with ESMTP id 48M3893XgWzMqYm7; Tue, 18 Feb 2020 01:25:45 +0000 (GMT) Received: from epcas1p2.samsung.com ( [182.195.41.46]) by epsmges1p3.samsung.com (Symantec Messaging Gateway) with SMTP id EB.79.52419.41D3B4E5; Tue, 18 Feb 2020 10:25:40 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas1p3.samsung.com (KnoxPortal) with ESMTPA id 20200218012540epcas1p3e96c12da31122f752a73f312053948aa~0Wr3bFT4k2722327223epcas1p35; Tue, 18 Feb 2020 01:25:40 +0000 (GMT) Received: from epsmgms1p2new.samsung.com (unknown [182.195.42.42]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200218012540epsmtrp1a0088f666cdb7cf5f3fde2130f0cb62f~0Wr3aZYdK2064220642epsmtrp1D; Tue, 18 Feb 2020 01:25:40 +0000 (GMT) X-AuditID: b6c32a37-59fff7000001ccc3-8b-5e4b3d14e39e Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 47.23.06569.41D3B4E5; Tue, 18 Feb 2020 10:25:40 +0900 (KST) Received: from jaehoon-DeskTop.10.32.193.11 (unknown [10.113.113.235]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200218012540epsmtip2c968b85930a88a5cbb95574970f9b13e~0Wr3TWdFi1956719567epsmtip2j; Tue, 18 Feb 2020 01:25:40 +0000 (GMT) From: Jaehoon Chung To: u-boot@lists.denx.de Cc: peng.fan@nxp.com, mbrugger@suse.com, m.szyprowski@samsung.com, Jaehoon Chung Subject: [PATCH v2 1/3] mmc: sdhci: use phys2bus macro when dma address is accessed Date: Tue, 18 Feb 2020 10:25:44 +0900 Message-Id: <20200218012546.15858-2-jh80.chung@samsung.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200218012546.15858-1-jh80.chung@samsung.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkk+LIzCtJLcpLzFFi42LZdlhTT1fE1jvO4Ppya4sbv9pYLdYeuctu sWDyE1aLH6u+sFq83dvJ7sDqcfbODkaPje92MHn0bVnF6LF+y1WWAJaobJuM1MSU1CKF1Lzk /JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoMVKCmWJOaVAoYDE4mIlfTub ovzSklSFjPziElul1IKUnALLAr3ixNzi0rx0veT8XCtDAwMjU6DChOyMvk/z2QvaeCpufH/M 2MD4nbOLkZNDQsBEYuq9SYxdjFwcQgI7GCXe/2hjhXA+MUq0z2thgXC+MUoceTiRrYuRA6xl 4owwiPheRom59w8xQzi/GSUezr3MAjKXTUBHYvu340wgtoiAhMSv/quMIM3MAtkSn94XgoSF BUIlOh/PYAIJswioSvz9rQ4S5hWwlmhtesgMcZ28xOzG02BrOQVsJO7/FYEoEZQ4OfMJ2CJm oJLmrbPBLpAQWMAm0b7mMwtEr4vEn9Nf2SBsYYlXx7ewQ9hSEi/726DsaoldzWegmjsYJW5t a2KCSBhL7F86mQniZE2J9bv0IcKKEjt/z2WEWMwn8e5rDyskSHglOtqEIEpUJC69fskEs+ru k/+sELaHxO/l69khIdXPKLHtTBPTBEaFWUj+mYXkn1kImxcwMq9iFEstKM5NTy02LDBGjt9N jOBkqGW+g3HDOZ9DjAIcjEo8vAF9XnFCrIllxZW5hxglOJiVRHi9xYFCvCmJlVWpRfnxRaU5 qcWHGE2BAT+RWUo0OR+YqPNK4g1NjYyNjS1MDM1MDQ2VxHkfRmrGCQmkJ5akZqemFqQWwfQx cXBKNTBavfwg+KJSxPCHFQ/jXgerMg7Faf4iZXZlH1o/qOsfSPS6Vqr1a0tG4JRXvvkLKrfH rOtzOzJFbUf+RZ/ywP6Qt0+jjr35wj3188K9nAntfLv3xeskrf7kPCX0h2GcWI3jaqaXfX8S Q6yln63/l3fsZ/sFu9vZpVM3PrjplH1LSlh059TEOxuVWIozEg21mIuKEwEk9TH9nAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrALMWRmVeSWpSXmKPExsWy7bCSvK6IrXecQd9NRYsbv9pYLdYeuctu sWDyE1aLH6u+sFq83dvJ7sDqcfbODkaPje92MHn0bVnF6LF+y1WWAJYoLpuU1JzMstQifbsE roy+T/PZC9p4Km58f8zYwPids4uRg0NCwERi4oywLkZODiGB3YwSh46xgdgSAlISn59OZYMo EZY4fLgYouQno8TVnxIgNpuAjsT2b8eZQGwRAQmJX/1XGUFsZoF8iccr37KD2MICwRJd6zcx gYxhEVCV+PtbHSTMK2At0dr0kBlik7zE7MbTYJs4BWwk7v8VgdhkLbFiXRMzRLmgxMmZT1gg pstLNG+dzTyBUWAWktQsJKkFjEyrGCVTC4pz03OLDQuM8lLL9YoTc4tL89L1kvNzNzGCw1VL awfjiRPxhxgFOBiVeHhXTPCKE2JNLCuuzD3EKMHBrCTC6y0OFOJNSaysSi3Kjy8qzUktPsQo zcGiJM4rn38sUkggPbEkNTs1tSC1CCbLxMEp1cBooFs4/9BWUeWpRTnWQZ/mvGzO/CjCXOl4 v5p9vaZ1vnW0jbHr5YgWk2suDVZ3zk98Ll/J2xqVqvWIc/Fq09qY6RNDam6kPG9T37HyIf/s LKtdD5gio7xVNZc6PGRo1bkQaCfrHKEqbzP9yRYhp3y+onlPTaWmW6mnlIt9mR60MnjOIl/5 BiWW4oxEQy3mouJEACW/gv5TAgAA X-CMS-MailID: 20200218012540epcas1p3e96c12da31122f752a73f312053948aa X-Msg-Generator: CA X-Sendblock-Type: SVC_REQ_APPROVE CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20200218012540epcas1p3e96c12da31122f752a73f312053948aa References: <20200218012546.15858-1-jh80.chung@samsung.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.1 at phobos.denx.de X-Virus-Status: Clean Use phys2bus macro when dma address is accessed. Some targets need to use pyhs2bus macro. (e.g, RPI4) After applied it, SDMA mode can be used. Signed-off-by: Jaehoon Chung Reviewed-by: Peng Fan Reviewed-by: Minkyu Kang --- Changelog on V2 - None drivers/mmc/sdhci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 01fa5a9d4d..93c9049c5d 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -15,6 +15,7 @@ #include #include #include +#include #if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER) void *aligned_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER; @@ -164,7 +165,8 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data, if (data->flags != MMC_DATA_READ) memcpy(aligned_buffer, data->src, trans_bytes); #endif - sdhci_writel(host, host->start_addr, SDHCI_DMA_ADDRESS); + sdhci_writel(host, phys_to_bus((ulong)host->start_addr), + SDHCI_DMA_ADDRESS); } else if (host->flags & (USE_ADMA | USE_ADMA64)) { sdhci_prepare_adma_table(host, data); @@ -220,7 +222,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data) start_addr &= ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1); start_addr += SDHCI_DEFAULT_BOUNDARY_SIZE; - sdhci_writel(host, start_addr, + sdhci_writel(host, phys_to_bus((ulong)start_addr), SDHCI_DMA_ADDRESS); } }