From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9DFEC433F5 for ; Tue, 23 Nov 2021 20:05:27 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2289783709; Tue, 23 Nov 2021 21:04:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.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=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="EwQqP3SC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5DA0A83718; Tue, 23 Nov 2021 21:04:26 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7BE7F836AC for ; Tue, 23 Nov 2021 21:04:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G7U/xtYlowpctbApecaM8mkhwKSuZ/okIbyGqQuqob7P7hiFL+74SxMgB2lVi5zUFbeZneFyreRrwJl74eWm5gpoEX3ip+0mHkch37rAlaEluqBDoe7FPqGP0kUI4sT7hgdCQTv58lneQ5vRlABWBTEmFYIJ8x1/YYhM1wpfSjZhBn8D2L/ynWF4w2aPLptqDmnE/Jbcs/sTTX2wXwGSzaSgfH6LkI9bBEBf/CAj3U8dZRg57s5xLZuzWqYNxkXhX3xtrAqrKJcoa6jUYeVf3DXvXyNXojspU/pd66Wu+k1UPjRVaopJ7JqzVkQLngB6UFe+kkymdMwmBzad4fo3jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=x0YorrnGkYOx66JqEhwPW4hyy+G8Zm/AjzrwunJOqFc=; b=NDDTgTD7F3F73nVEiw0MhxZp2FH/EMlqYwYFzG3LY5r6l657uOuspbGEL0caVzSlU8qWmuSFLMA1USV6K7HUM60VOmJkqgUFgG2JZtrXy6WigwQmLtwR+DIFKPjHgLoQ26UNu8F8Ivo5zeRN93nJqMT9JJ1GSJKIhG1645C6HJU1FJCnZjKYuf8XMvVddAV46hTJx/vbEnljVRXrv/NoPxRiIykKc87zCrAq2k//GY281upp9SzJtn5lMPZAAEMGpJyt5DY2b5PaVN81ZcdBjpo7NmTIfTKub6ReETNJR7NvNJFadTq0mjNHOoLOgEKAtN/lKRwdfpm96zIKR2RhCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x0YorrnGkYOx66JqEhwPW4hyy+G8Zm/AjzrwunJOqFc=; b=EwQqP3SCeGfTv+SaXp+6Slc33t8u206MxnwMJCo+DrsQCsnaTsv1XYK4h8zWkiRqi7bAXF3MYnJC3qYu+ehDDwiS6w+QXISaT4ikjIH6SXaV3fmkwQG+ywFInZnsXXY+LV4c6WtnZ9sXLfAzmrlIVbJNE/S3Phbh435UEfM3gCg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DBBPR03MB7097.eurprd03.prod.outlook.com (2603:10a6:10:1f5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.24; Tue, 23 Nov 2021 20:04:16 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9093:a60b:46b7:32ee%4]) with mapi id 15.20.4713.025; Tue, 23 Nov 2021 20:04:16 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Fabio Estevam , Yangbo Lu , Michael Walle , Sean Anderson Subject: [PATCH v3 07/12] mmc: fsl_esdhc_imx: simplify 64bit check for SDMA transfers Date: Tue, 23 Nov 2021 15:03:42 -0500 Message-Id: <20211123200347.3772343-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123200347.3772343-1-sean.anderson@seco.com> References: <20211123200347.3772343-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 Received: from plantagenet.inhand.com (50.195.82.171) by MN2PR06CA0022.namprd06.prod.outlook.com (2603:10b6:208:23d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.19 via Frontend Transport; Tue, 23 Nov 2021 20:04:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41900cad-a1c2-4a3a-442f-08d9aebc6d8c X-MS-TrafficTypeDiagnostic: DBBPR03MB7097: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2RBffbAhwaH2xu7Vx9U2LEGZp70MtF3UNAsF9puK27FmGcqA8sroTU9M4xp5pQqPP1AReYCWvcJfpvejn70/3AY0u3Jfx9WOOyvVY2FTlOsnSq33OAgUpWBVGEtph1nBn3kruiDDdnOQPTjFHgdWrCPfX7IN3XH7F/g3TeIe1nWACJ1TP5Yz24rZzvaJAr31PTNjGTC257f1r/Rcst/j23uITtwj3suQNWzj5XQkFvlSlOtR4ytavWHxHXOT7gvkRbjU0SgwDCBwbpNazR9KxBae8yfgYJ7jnCGFYOVGb2Twom+1M2cUpV4VHbrv2+WQ+iqhpHiSqVhm9c6PgLYrgTHd5aMXAugVO9s9op5d94G7yorZJ+tKlWip+1IlPci2YYnqPScN8nZYzlDTaOClwpBYZqIlH7fzAic+4oCLRoOySC5uwTnpGHHNBb34xYqKe98yUmpZ53J984k64czul1ofjcNKcERz4kZSU/GYu8GH/QozlobTOsiSDemnhlYgrdBUNjJ94NOFP/1IwsGxS84v2DFWPwfTn6aXn4rFgT0fR1g3mLvB7KCF81srOMTWqvY0VgeKcm6ZttgG21ku85fCJMEgSJduEa7hbx+8vytQl/dsmQ7HYrh0U2+cuRyHLXnkC4IaA6s2+Zrj4DSgWkNoIxkkyfIID1A29gP/p1ZY3sNRL3UPQ71I+FSFyzC9cc8AGAE1tuxsfQtIng/w4w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(26005)(8676002)(4326008)(107886003)(186003)(8936002)(38350700002)(38100700002)(6506007)(86362001)(1076003)(2906002)(52116002)(5660300002)(6666004)(54906003)(6486002)(110136005)(316002)(2616005)(83380400001)(66476007)(6512007)(44832011)(956004)(36756003)(66946007)(66556008)(508600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jOnXAuqYTzjspnQBSqdXkacrxprIDoOkRCiQHRH8XVPLXt+GJ//n1v2m4ivo?= =?us-ascii?Q?jWuvZ9eKSDLmga0yXKLPvxMw7E9/dwUF7i2jxLtSsg9WnX0i2FkhN1BpHALr?= =?us-ascii?Q?IOvnq3nfoKgd+ScXun/DYotqFur9XtX61yVWfrRJkiH8mCeQ+5hv2FLNBZBI?= =?us-ascii?Q?+CXLSAE5LDCR3oBkE/V4LCHzVIUfOBPxfCoudcCzM9YXu2OP9SRfGRn4TWW4?= =?us-ascii?Q?DWAZmUOVleijId/J2IgPbLBc+hEGcfvKuqAfWFJlvDlO1OQi6lA8+iO3FRMa?= =?us-ascii?Q?KJOl2LbTT0VocgGfmhYN83eVim73v2NdKHLk/daB7JXVxBdd7FMpFFFFQQr6?= =?us-ascii?Q?pYG6QUsgqnZQmO9wnrEuXI/f4HxrZhzEkcD4VjRKFJEyyo0lPZEZ9LqRvnVF?= =?us-ascii?Q?yx3nnpkpGD1A+RsHlfHHs4r4imTP3hKYh5twusU/9vA8oLwQeRTbTxnLyAHQ?= =?us-ascii?Q?+vnCFD47bIOO9yxUFaeaEymQcFdiKoMLnPk0PNTflDJfom7/7PF+MXg78ZRV?= =?us-ascii?Q?NpNhhJA2crSg2WXFEfWAV8rGN9mJIlMAq96R5MUIWDprNxzzSPuaR0ZeAFg3?= =?us-ascii?Q?QT9afeRPUXGjmIJ1E/t2Bo4P+NAp/Sd5rTdSdBPjvRaL/AObFLShu5C/vTsi?= =?us-ascii?Q?3iRhdrKtogU1TuLBp5HTFt5N8gWgGFEgMr/ZdjB9I+5BDvvNePp9kmJ4vbYT?= =?us-ascii?Q?7WPNWd3GtkI+2flp0iKqg3Qu3LYGX+is35vKODxQ6T19hiMfdQiem0oNizyN?= =?us-ascii?Q?7AkZVnQ92lYvj6/xwPc320hfBdfJXVP/aWiWoYypdX4iHMGXHt6N1Wr/O5pE?= =?us-ascii?Q?LgbvNenoEikVexRm35o4dO6wDlduTF9amTWj3cM/oNEfgir5cD0JZD+PIpMx?= =?us-ascii?Q?YgsEXURC3CeWceJJvmSs09vFsssTTNtfFBTbHfV/CwIAT9S6pI23US7UgJZB?= =?us-ascii?Q?yqRlT9RA3tnit3Yc3+GOhpgR2B6zwOHCcGcd45Yze+sOduY/d7O6MmnpEWM+?= =?us-ascii?Q?lrE1WH9oBHtTW3Y8zB016wyys6vfW6Jz8hVSuyTOrXOY8p7dDD1C9gt+r2dV?= =?us-ascii?Q?k4OaN0Ysj0xnvgWAtN6Tlo7jTzly0kh6RWU9DZKhKCxm0XuOwK2VvOwS9Uga?= =?us-ascii?Q?AT++xK9axZ8dQlKP46JlgD5sW7Mz07G4aL4Uvip6vORUxeQZmGBMSOJStXYG?= =?us-ascii?Q?d9MWdM/uxGT7fHf4m1U+riQQ3X5lA++8/8RpnTdWd8RZ3osqLNj1dCOg+Fl4?= =?us-ascii?Q?CFVHk8gmp+33xF1PB8HIUyle1UV0H09A+k9kNlTeu3sF6PUrGJSnZtIddhAg?= =?us-ascii?Q?RckeSEfdjZqKOGj4AKo3wJQp5SxHgHdSuDSugDZ4JhbHRb+/ubLOAYdakldJ?= =?us-ascii?Q?1yJ+jmU5KbT2SvqJLKVl1+2DJzfM9DPjwsdm+r92L/7rlk/rNtSonfUYi/ri?= =?us-ascii?Q?hTWwbF58J2exIsIHUifVqW8KUdt4z7Sx/RJj08clFV2OyTJOj3xnzWu6IDuJ?= =?us-ascii?Q?yNcSe8b0B5m+iACKfQnBYh1Lefz0HAgs4+xJryTLMN34QRmedHDaWbGmUjc1?= =?us-ascii?Q?tUMoIAxEtzJkZdMWMzxAy8aoGg6AGHu/xIQivgP7Ui1eyXWfT5RnNsZTtKFU?= =?us-ascii?Q?GxAVpnB1PNncZWpcNSLFrGM=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41900cad-a1c2-4a3a-442f-08d9aebc6d8c X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2021 20:04:16.5968 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GWLdS7JmBFL97h5HGqm8Od8KEU7Kz725Vs3gCJ2IyoAnzw/8OoOwbbQ0dFQiP8/7NjY97rEtVL+mj8+yc6F41g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB7097 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.103.2 at phobos.denx.de X-Virus-Status: Clean [ fsl_esdhc commit da86e8cfcb03ed5c1d8e0718bc8bc8583e60ced8 ] SDMA can only do DMA with 32 bit addresses. This is true for all architectures (just doesn't apply to 32 bit ones). Simplify the code and remove unnecessary CONFIG_FSL_LAYERSCAPE. Also make the error message more concise. Signed-off-by: Michael Walle Signed-off-by: Sean Anderson Reviewed-by: Jaehoon Chung --- (no changes since v1) drivers/mmc/fsl_esdhc_imx.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 72f3eec205..84df131c9f 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -282,10 +282,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, { int timeout; struct fsl_esdhc *regs = priv->esdhc_regs; -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) dma_addr_t addr; -#endif uint wml_value; wml_value = data->blocksize/4; @@ -296,16 +293,10 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_RD_WML_MASK, wml_value); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) addr = virt_to_phys((void *)(data->dest)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); -#else - esdhc_write32(®s->dsaddr, (u32)data->dest); -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + esdhc_write32(®s->dsaddr, lower_32_bits(addr)); #endif } else { #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO @@ -334,16 +325,10 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, esdhc_clrsetbits32(®s->wml, WML_WR_WML_MASK, wml_value << 16); #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) addr = virt_to_phys((void *)(data->src)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - esdhc_write32(®s->dsaddr, lower_32_bits(addr)); -#else - esdhc_write32(®s->dsaddr, (u32)data->src); -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + esdhc_write32(®s->dsaddr, lower_32_bits(addr)); #endif } @@ -400,18 +385,12 @@ static void check_and_invalidate_dcache_range unsigned end = 0; unsigned size = roundup(ARCH_DMA_MINALIGN, data->blocks*data->blocksize); -#if defined(CONFIG_S32V234) || defined(CONFIG_IMX8) || defined(CONFIG_IMX8M) || \ - defined(CONFIG_IMX8ULP) dma_addr_t addr; addr = virt_to_phys((void *)(data->dest)); if (upper_32_bits(addr)) - printf("Error found for upper 32 bits\n"); - else - start = lower_32_bits(addr); -#else - start = (unsigned)data->dest; -#endif + printf("Cannot use 64 bit addresses with SDMA\n"); + start = lower_32_bits(addr); end = start + size; invalidate_dcache_range(start, end); } -- 2.25.1