From patchwork Tue Oct 9 11:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 981154 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JQ49WBW0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42Tvzr6DNbz9s7T for ; Tue, 9 Oct 2018 22:25:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1D990C21D72; Tue, 9 Oct 2018 11:24:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 01848C21F35; Tue, 9 Oct 2018 11:24:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B4BBFC21E76; Tue, 9 Oct 2018 11:23:57 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id D60E4C21E76 for ; Tue, 9 Oct 2018 11:23:56 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id w5-v6so1405776wrt.2 for ; Tue, 09 Oct 2018 04:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=N+Nnw1nHtTOaU3BGUSERLiMYveh22hfN8jqrEAA+jOg=; b=JQ49WBW0ShW0dypaLSdK2ATgvYA8mw5sbTYZdmd5wMq63AbdNo7a/QAn6BPet7GqHD LsD5c35gXFlZ+WbK90lqPp5kO6UpgLLmp+Xad0CfSp79WCcv8AgvmUE3UiTjnTNDOTKE G7023nSRM5LM3z5eXPIb8ROVUPT6v3ba0KRxbOa24kSAp9vUrfWQ8X/4AGvoWdymHQ/W ovwjsC8f1mJjoEHRaconXsohcmUwOXLjnDMlywNVgvUAnDU3JTK9fd0nn489CQXxUqP3 YEInTAn5acx4CondTeGWRERuIiPK9UruqfcVmMCejYMACeDiosdkKcDky0tz7xF+jkPZ cZVQ== 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; bh=N+Nnw1nHtTOaU3BGUSERLiMYveh22hfN8jqrEAA+jOg=; b=TSbkm7DUVmqTH48YlN07n9FaBkEXlmwJfMz1/8iweBxEAoF88Uc7TEOvvcD2fCkRC+ /ksLquDjOt9GBqS8MPbtq8I5F+ZhjjNy3nEtn3XYKhgTg4kHY67CIy4e/lX62BJjH10o UmBychX0kw5gzQqHWu/QrNdY35O6cKP6Q64TRrOcFNYlFxmnOF4rPuHwpR9lBBvwp/gz 4RIotIKuJITnmyKYODSeVLjV1W1vKZjO0v1ATK2w6E6IbPDX1EvxI4N+tK8WnJo228Ts ELP9a3f0ufldOjQlRhNVfweYFjt3UueLe3OV0OjEaL9WXEh8eu6wu+1T/PKUhRgz/cKK 61WQ== X-Gm-Message-State: ABuFfohisHC5eCHWvLnhBXMAsAmv/dsintdPZntfSTG3/OQmN4Qds0Z2 nFiLVcK7M9cci+D+8cjRbZBdKlSo X-Google-Smtp-Source: ACcGV60TmliAl7LVfMxz77RpGxgq+6eC2x5xXq7TQTDXMppmZA3SOWwxQUig1HEMktiF7BB5SRLrVg== X-Received: by 2002:adf:8022:: with SMTP id 31-v6mr20842183wrk.16.1539084236184; Tue, 09 Oct 2018 04:23:56 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-30-92.net.upcbroadband.cz. [86.49.30.92]) by smtp.gmail.com with ESMTPSA id q17-v6sm12353935wrw.19.2018.10.09.04.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 04:23:54 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 9 Oct 2018 13:23:50 +0200 Message-Id: <20181009112351.17256-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 Cc: Marek Vasut Subject: [U-Boot] [PATCH 1/2] mmc: tmio: Pass full address to tmio_sd_addr_is_dmaable() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Pass the entire source data pointer to tmio_sd_addr_is_dmaable() so we don't have to apply casts throughout the code. Signed-off-by: Marek Vasut Cc: Masahiro Yamada --- drivers/mmc/tmio-common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index b311b80be8..6b21941991 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -372,8 +372,10 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) } /* check if the address is DMA'able */ -static bool tmio_sd_addr_is_dmaable(unsigned long addr) +static bool tmio_sd_addr_is_dmaable(const char *src) { + uintptr_t addr = (uintptr_t)src; + if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN)) return false; @@ -486,7 +488,7 @@ int tmio_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, if (data) { /* use DMA if the HW supports it and the buffer is aligned */ if (priv->caps & TMIO_SD_CAP_DMA_INTERNAL && - tmio_sd_addr_is_dmaable((long)data->src)) + tmio_sd_addr_is_dmaable(data->src)) ret = tmio_sd_dma_xfer(dev, data); else ret = tmio_sd_pio_xfer(dev, data); From patchwork Tue Oct 9 11:23:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 981153 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FA2hnJ10"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42TvzT23KYz9s7T for ; Tue, 9 Oct 2018 22:25:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C1CF9C21F7D; Tue, 9 Oct 2018 11:25:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2D5A8C21F90; Tue, 9 Oct 2018 11:25:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 27BFFC21F4F; Tue, 9 Oct 2018 11:24:01 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 16CFAC21F85 for ; Tue, 9 Oct 2018 11:23:58 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e4-v6so1419959wrs.0 for ; Tue, 09 Oct 2018 04:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9foxYUNsK9lpD8dU4Qx0psmWWC3l3SzZH3LKB8LEihs=; b=FA2hnJ10HAsXA/2tokpZ0MTTMoBWGiD54JNJKGKScdUgr9jdIx1L6+sgtklLhp63UG lOdqc2/5kfVm2Wnw0KXNe6oQ5k061Bfh9qonJ5q3K/uH9VTfGDKyjzyNAJyX1FzBLiyj AYQ0JZs6vy7GtKJP3Y/eMEdglnJLIBZhGt+AQGX0eGa8ZKqI4CxnZrkxDSho743CBAi8 ndZty82h7H4IReMtnbxDjtNPFPbcyXx985lLB7kgAd+XS9xISB5b9bjYIyMTmatwTFKr tQIb2WuRHHBLQsrc5isUPjFsdz/MxnDjqYiUIQYcBCfjQe9bO8N2HIAPTeTn73lwMuLo bLEA== 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=9foxYUNsK9lpD8dU4Qx0psmWWC3l3SzZH3LKB8LEihs=; b=icQgsV8j6XQBFjR9R2SnvLx12h6uimHHjQlpu2SBIwqoKi7hzB+gURhI0BhKt3ecfw 9ZvQr+TnKyq6yqzpxh6Tj5FHe2qz0/Es7S18hS03rubieVPGP8TR5laRUbyr/oRR6zSM JJWaSf5s11WJmB954aHB3xA4d/afw4vx/vKCj3+K3RlsxssaeLlGUzYk3pw6yc30W5uM sr8BAqDJrfwhI9AlJonAVtWnuspVe4MHWye4U/5JvTZIU2fjPM3d+NVy5/N6aam0a5zN eQGEyX2nxWHWUkPy54WwBwY7KFWLyEaY58rUV5iXzLXdKNnasUl+eEUh6JZcigJGPhx+ GX0A== X-Gm-Message-State: ABuFfohyxst2XyBweYfTsgys1g4XMhJDjGlvej139bpdInAR0KE/tD+Y 4LQCKry8HrPpUH8kO9btVz9p59TI X-Google-Smtp-Source: ACcGV60Dj4kofx08lAH9ViOCSz+rrkvZLiVrJCp+g2e+4PvSMNY84ta7jqau32JigOZw32ktCnI7/w== X-Received: by 2002:adf:9e8f:: with SMTP id a15-v6mr18738958wrf.70.1539084237491; Tue, 09 Oct 2018 04:23:57 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-30-92.net.upcbroadband.cz. [86.49.30.92]) by smtp.gmail.com with ESMTPSA id q17-v6sm12353935wrw.19.2018.10.09.04.23.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 04:23:56 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Tue, 9 Oct 2018 13:23:51 +0200 Message-Id: <20181009112351.17256-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181009112351.17256-1-marek.vasut+renesas@gmail.com> References: <20181009112351.17256-1-marek.vasut+renesas@gmail.com> Cc: Marek Vasut Subject: [U-Boot] [PATCH 2/2] mmc: tmio: Limit DMA to 32bit on R-Car Gen3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The internal DMAC on Gen3 is 32bit only, limit the DMA address range to 32bit. Signed-off-by: Marek Vasut Cc: Masahiro Yamada --- drivers/mmc/tmio-common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index 6b21941991..138de59470 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -379,6 +379,12 @@ static bool tmio_sd_addr_is_dmaable(const char *src) if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN)) return false; +#if defined(CONFIG_RCAR_GEN3) + /* Gen3 DMA has 32bit limit */ + if (addr >> 32) + return false; +#endif + #if defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARM64) && \ defined(CONFIG_SPL_BUILD) /*