From patchwork Fri Nov 5 17:39:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1551506 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: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=pAJWoYI2; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hm79316c9z9sCD for ; Sat, 6 Nov 2021 04:41:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AF79F83750; Fri, 5 Nov 2021 18:40:37 +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="pAJWoYI2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4549683725; Fri, 5 Nov 2021 18:40:17 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 B85808372C for ; Fri, 5 Nov 2021 18:40:09 +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=Nebf/iGOOlcvKHu7ILIISnrGhKrJJrp5etM8E/yVdiviPv9LzBYWzQUK7sfrQOagJ+Apbj+E8DVJK/+zcz4Fcrf+LC7hmhojIBuTb47MybZsrShdfBYPk5k60WK2tue1JrPTabrPL7k3m1DdpeBS/zTBIHHDn5nIp7thrKELwzXTBmehtJn49l+DIjCsrbs5uTszVfHRnXGt7qioNieW9zDYdLXhUREcqgGKFZUhXD7ofxLWXf+PGt+63ia7AJNsm2kUMUeBOTYizvhzA/vSU9R5nz084TZqxya0ZNWkedB+Zh+Hxkj1mklYZzjrByy36XQbgYFgIl0UNAHojXQLsQ== 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=8mg3URAg6EpcDI/4t8dFYbNq0RVOzJAMkzXiuMj3lhs=; b=PqoSsx+2FDbKg59YJup7euB+bK4EYSvIyq+KaLRW04gNk8GU33MFR0ACIEtab4x9rC+NB5REV9dNZcSNY+waNf5qej/FrNaBiD+aVhdt/3AI6vM6m77pRgJC5nIWPi5S+Xemlk+bn9qNYSmYNvs0BhJJBg+SWCyd81W+6aQJmWd5zBK/mXLdFpZprfaTt2ojq4A8o4oubcq9NHjkKTZsafT5k8arlCiu6Pimaa5RQaRabkHnzU3alsMyIvLFVhTTivOKj233eSTdXyOU9DbrxlpADpZEsM7yYSkXkUi2ImKp5rI7yXf8dBtodUhhmridBFu2DqKmJqfDz4mVRMkOHg== 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=8mg3URAg6EpcDI/4t8dFYbNq0RVOzJAMkzXiuMj3lhs=; b=pAJWoYI227qRtFaSeL/9Xbi2md7PIzc53+sJNuirABfwn7CeNr/NF2llZ6udK5JWABdI9BPti6mex8GZSHhfFiXVffAcsJvwjIPM6rrfaKyWLVTWWWg8vyJv47TW+pDY9mNqZBmRzYD6nlfYUhHKVEBb21Weh17A03XzmCLX1Pk= 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 DB7PR03MB3804.eurprd03.prod.outlook.com (2603:10a6:5:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.19; Fri, 5 Nov 2021 17:40:08 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a9aa:f363:66e:fadf%6]) with mapi id 15.20.4649.021; Fri, 5 Nov 2021 17:40:07 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Peng Fan , Jaehoon Chung Cc: Haibo Chen , Yangbo Lu , Fabio Estevam , Michael Walle , Sean Anderson Subject: [PATCH 07/11] mmc: fsl_esdhc_imx: simplify 64bit check for SDMA transfers Date: Fri, 5 Nov 2021 13:39:40 -0400 Message-Id: <20211105173945.92446-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105173945.92446-1-sean.anderson@seco.com> References: <20211105173945.92446-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR17CA0012.namprd17.prod.outlook.com (2603:10b6:208:15e::25) 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 MN2PR17CA0012.namprd17.prod.outlook.com (2603:10b6:208:15e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 17:40:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73670bb1-6f62-43af-84f5-08d9a0834f0d X-MS-TrafficTypeDiagnostic: DB7PR03MB3804: 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: +TZjQqPqRa2JPeQ53bZkLoJ3AVPcxZ2YSDiuPT7D+Wz5secNu1sEKFzye7IbuFVc6mEpXqDd3ZDsaXjFDVQOJSFphqeg6QTmDAZz90GKyjXf/xlAiHkzNDKMwRbn5yD57iC9wbSMzv4WzdBMNJc1iZM9Zjpk2ltg64faNshbCdtnK1ugqUqV0GS0QZCokCsMaj5DphNEJhIV1DqrSupBmAJuLqqY932D7ANTDWeeLlvTTuIJbYUH8lWR8dmpskfrWh/GGPp8yEDhSyUZtiPIsavdyJNhenbbFOgrRiAAaYsrYfU8McfvHuGjfE2EodtztVr7LdCvvtVrO9oN+D7Kk/cIKWc8KTYTiLDatJqeTArnX6ORIO+pGsaMmznlJlP5wtc+Gmmq7or9jawtXMP+KuXYJtdFipiiNCwRflJ3Yqb/3nUSWPvbcRq+3KtPFVt40VxsM1UnLYEEcmv3MR/JEfOBmwkO9ERHRZyq41R6BHQI8hWPSJY0hxKD273sS39NPtblldVXubkBCfZuBhXc25aHqj9pj8gBZKDtH/o/vgF41hAehqD/cMjg8+heiP+AyvMwYeuEa3qJ6oodKL7Cpvmd4WLjYEY/iXVxe1hQimZ5tRqZbJUZMHVHn7L1Uqm8QmZZoQLvwx50ycsiHV+yrtaBPYXs3+PlN636z6Tfpy7e6RAs4AyG3aIBhv17dT3PjNUjiMg2tEi9iCHEWE5c6A== 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)(2906002)(52116002)(66476007)(6512007)(83380400001)(6666004)(5660300002)(66556008)(54906003)(66946007)(2616005)(316002)(110136005)(38350700002)(38100700002)(8676002)(6506007)(8936002)(44832011)(86362001)(956004)(1076003)(186003)(6486002)(36756003)(508600001)(107886003)(4326008)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TOZ2wosfP/hPavkvRGtkX8hhGp9jMI0eJZY5+q95kPFx6xXUbslF8bkY0XcVgwPQiiGNSWC1uC7H37oA5RVwtsWUWwjudhoFkhOiog9LgHRJUPMjG1Iq3YtaBGRoJjJtbGBuG0gH0g+ElvKxcH1WZSiLWRtNvRjF0p9lkRwzp6YzITkdnjK9gW2vmRfhF035eK1cIc6rrQ6cvrpWOBhe9bQgJNUNIZQYo5rfRUUK2+HN6vGQ+SjiUGcpfRmfEykIoBYknCzHf015TnRxrSMORsmPFYTH0z+U3BI1ox6sY9HYPuuhRzLeekcdRbx4y8Gn3A0sCOtZ0L/3jFf9JVpglqzIs974QCyoF9xPb1grd0JWSIVXvVeAfH7guWB47BklCQKipZSbCdB1A2WDpJD0lIrq8bD0Eekju54ZV84owhf5MzgYp/6Oe8TIXpYEfd1f8dZrGE9ms/pwXfnxqWxGgiDuaYZ8XIwkQHGKXINQKz5tpifMCRRLTuNmoOfnVRT/nzT6DV0TZAs4Fl2KdMs+LCWc3nXj2q5UzPnDP/RG5cpc+iL6HVVIYnEwGPPdLPy4u6WZENopr3UnKERKCfhIxjHcVE0iw8jhwXCJbo6YXsbsMAPIBD//CvFiGDQ+BfaJpwtl25MOe/3H+xOpoI3NiNQ8K0idhMSVbjhjORgXxQ4wO064X6noYd5lp0Z2Anim5eJcYtWuxa0hODWHkcQK6tTQBTT4rtZAet05L/WQr+OG/sASPce3IpLmGY6NbEjAk6MiISaYeJ22SLY3agHWpDYR/R4vZody8b4OFAifF5YccI5uQo3kAZU01uKE65jdkZkm6tc5SXtdmLTGl/APDo1JZFyYSDwx4CrRyayTpIu3/zmofKaXut6pGU9UIxnfbym5raxS3JZ8SODurUDpfZG7EjDs9GNH7Kf4JuOncKGGMRH6cFdCtGWtIXSdCiOrDLj2NT6moJ+JF1jzCsq6I+TibQ3BEkW8jOYF6aabcChCVmg37ARaXPIkgV7qyRk/HnpDB4BEkIhvRZCZgZhTt2Y7sTjVLelL9tkbANWen9iiVojG94T+pG6WrH/Uz10Nar0UYnOtRGwli5X/wjIaDIQdHzJfkRl3yUVJoNT5nPweiIblCuoyzGvfOQPL1/UWRAP1yerp5vehiwDmpmQk0XxvpA2HrjRJWmCFZaF3llTlkwK8v75suPUk80oIjbnrbDrf7Xfn4UtV32ZUDjUMzUMuk36RLP/51u4y88ne0o1cMyaFbrKktzl0y6PsrYCypXUwdql6IHd6Ivjw8isB0fkJe3k5rLWB2xoWf8Ta/BW8M0Fyq68bJdbuPrhXV3x0GbsmrgjPqyMA5ufqes8YB+gqE97+YoG2GY+/O0vA8KvemNDSlun1RAhyV5GHCS9Yb/v9jBGmC8FoLQCeLdFEq/x4zpY7HBMzuctgGFSoslMEtB4AipJ56v3952i+NNFzDTWkhBUdQ+/qr8xqDhSRX4azYgQRDiawI83a4QDqAVrhTIoo+mwvabmy/2Zt7NzISn8s64WngVC9GPm2/MuwNuzEgGH8thYKYXwu7NPdBeb8I5W0BotlfbJmng/kDOeW5PlAIoKARrxYsLkLiopcJ5tNTuHZ0JvGgtdKOuGBsd0= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73670bb1-6f62-43af-84f5-08d9a0834f0d X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 17:40:07.8301 (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: JQ69e+AjZmUh1L3tH+UOnzD6ky6AOpN10eIHQWij3g8F1gm5RtXq4iIKJ2XsYHd+k/v+KlAtfbOBethbl2On/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR03MB3804 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 From: Michael Walle [ 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 --- 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 dc71e39f8e..7c070ed1c2 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); }