From patchwork Wed Mar 31 17:09:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1460654 X-Patchwork-Delegate: sbabic@denx.de 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: 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=nhWQK+Jh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4F9XrF61kfz9sVq for ; Thu, 1 Apr 2021 04:10:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0433E81FBA; Wed, 31 Mar 2021 19:10:12 +0200 (CEST) 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="nhWQK+Jh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C03882898; Wed, 31 Mar 2021 19:10:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0630.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::630]) (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 240BC80462 for ; Wed, 31 Mar 2021 19:10:07 +0200 (CEST) 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=US0Ai3lIvOmhL3qx6FWXiehcDaKDuXxorTW+gZuH3DFMJwmAuIbtS0S2Ho/KRnWZoNrD0798SDBO0TPqy/Rh8eNXZ3L/toHqvKwS+ROhnvkqZXYlS2wy/5rZSjaN8uStyfwVJYwUDDc21rVo5sVzot3GsHuGH2J/EFy4awdwdD3mmkHF7ZkaBxamxI7uDgIz5JZPRDJxkiZIXqURbZfD14MG1DTCwwyeIJ45o/rQWTj+XfR2zV9i7xGYqGw1rodFiEAdwHU8YnOQvK9dHAc2XE95mjcFbxvyUa12D/DLPbDhUEe0Gl277xAHLT3Fk622RcjTE9+I4z8x0cDPqmVCnA== 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-SenderADCheck; bh=HwonBR7T+IT+yAfXFBFqq2t1wu5+/5ODo5N3UPqyfN4=; b=AXJbP6Pdrx8bawUvNJmCHpldWpfXT6HMG94VU8f7fAZPbrn17S7Sy4YLsjhP8Relwvlb0elmlsuPruu3SbZc+9BuOinnxopxmDGH9MbSZNC2HHqueK69q4umyPY9wI2EMNodoXQpSIorMicM//9gjEWGdl0sRphh62n9c5o669cDs7cJcUkcS04Vt86RVxmTjvoUNflXZn/U+rxz2Rd8y3z61YeqJmZ2omBBelxy4cDtB/YrCth/nd7bPcZPi1f1j+frIqipnLIPvL6nfhSrCaDXblcVHiRmvj1mNGLnIn1C7HiLatyuaLfbMUROH+eMKSDC2uGjMtT+858waHr5cw== 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=HwonBR7T+IT+yAfXFBFqq2t1wu5+/5ODo5N3UPqyfN4=; b=nhWQK+JhKSJW9oWzo3m4RYRiU0JoqtAQ+Slv51KkYm9i/aLILZ9crIA0Sq4+IDJZO+dfDcKtLe/lTBV45TuNzgVcAFsWhWotR7ojS8L8FkQ2JltC/zzVfW9LEEzr/RB7jFhzUzGb5IS4+bdeuFx8w9xLleSIA7o9I4eWC445Qm8= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0301MB2182.eurprd03.prod.outlook.com (2603:10a6:4:49::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.32; Wed, 31 Mar 2021 17:10:03 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::a102:77c6:a933:8922%7]) with mapi id 15.20.3999.027; Wed, 31 Mar 2021 17:10:03 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Stefano Babic Cc: Peng Fan , Fabio Estevam , Sean Anderson , "NXP i.MX U-Boot Team" Subject: [PATCH] imx: spl: Use FIELD_GET for bitfield access Date: Wed, 31 Mar 2021 13:09:49 -0400 Message-Id: <20210331170949.2096645-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BLAPR03CA0116.namprd03.prod.outlook.com (2603:10b6:208:32a::31) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BLAPR03CA0116.namprd03.prod.outlook.com (2603:10b6:208:32a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29 via Frontend Transport; Wed, 31 Mar 2021 17:10:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db353943-18d0-487d-824a-08d8f467d327 X-MS-TrafficTypeDiagnostic: DB6PR0301MB2182: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:419; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tqAYQd2MD4gP+wwhc+28C+VNwSG+syDZAoUpToqPFkxLKqVkDg8pIW6Kukdabvj4wm9FT4jYEh9OfFc99N4khv6l/Pj6wUt07iv82BMgVctvKZW6I+XcqKMdmvXgleJ4H11901Nx4lnxQ0c59Ofjyrza6grhhmJGZSF3G8sGlwkhTMZruag5Akz0gQ4k+suPz4edXC5tuRN5r5mmMJ8KxGsyDsClyDcP2yJAekJ2Nw4ljekPymxt3p8pBG/toDRgDmXx1cDqK2XoCDSzHZfu3akA/VFpz4OjMv09XoL0tNocJkCbjM0vktBOvKO892t9/RKzPkC/WxBtH3Pf2VrOK+p7Y0IeRtbAMle1m0+TiJ1Uy1JCPmwaXks/STvUPYenBpn1jGAwPrz1kOYDMWMn7aUcEBZ2tNrzkd+B3aJq498YEb2p47oyI9vXz8OGs6AKlJX9Y2EX36id2YX2Yc8xPeagIndhq4HpXBBowy5aOYGl1dTwQeN29CNAm670MLXTnpHQID45To7ZsoEYyG0X5ZXHD9YTOJMQSq20brT4hWaLPygorP6BIYZSpkXovYqJCv3fLksMuhtz5lhzE+xIGn2KzkOaLp+UXiLa0N8bkLqtw0C3vaHKUsGsQc4P67vXpbQpg4Hh156zLbNXJ4Lh4Q== 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)(6506007)(5660300002)(8936002)(83380400001)(66946007)(6512007)(2906002)(4326008)(6666004)(498600001)(86362001)(66556008)(16526019)(26005)(52116002)(1076003)(186003)(66476007)(44832011)(8676002)(2616005)(6486002)(38100700001)(956004)(54906003)(36756003)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YrxvurXcFezo88XZjIce/N8kgBpbVORH7ZZ+cBmz/Gj+J6RKb4/XsmTLCyD6uqzPka+Uc0yQqXPvI+KrF3PH1fIEuZWnsqKmSxZ7CnSjUMTS6xalkrVIt6gwjR/I8uefyEhqJoixDn7P+jDKN6LLMoYNBqZ9AmZ62mp971jJ3mN88wiWsxNMnhMYiyB/O0tv+iOmEzRrpdTUIZ7bpwXTMXnUoyP/z63U8tyGOBUG3kZ+W1G3xc4fGZszw2QstuF/iQ9ZAPY80TAhz2NaQ3lsAlWjf8WTO3EvfI3ixj7sIi4xrO7ztcYifpdLC40vn43WvuSjcyM0bt0XMiCB/SRGSvHslZnVGGIFIkexQi82ND4RBPadeYsUa1hNXnQHpGpf0215IQLQe5Yy05CYfcFDqcETzZRlI+nWb2KVgUzfqfO7VVFGZqCUkiA4AWqNYidoOhIdyED2imtT4dhWOGSUBDGBRoys29OVxdWvY22pekjMZxFP2/nJWJ3NNdbzwKnEVeqo0DtqkrushttfqTrja+5lAtND5uKmARxqpmj/bhmUuiV+h8OnLUvKLDvGFyZzUms/u8E0K5xkj3jmaEApAc6P1MRsg0z6U4mmwlcfFUKlKqjj2UlvAVECsdsjIXLaMDXwchmA1tqPnFW+MY/2pOZAmhfPebce1glc0GcDzocCCg/9ZvKpX128fM0hTk1LiWFPJoPHUORcGnL7jTJdc8QqAXaCLNRpXmHnHJH8LH2a1epUAMoUQgA8i5F8STU1TmY7Ji1pqto80UtTnwAKzp05I3clAWO+AlBsSGIzWil43pd4KaM9YUQtxSoiNMvp328qWQb9CJkm/G0XFMNsJnwqTjODHK7PUeeQMQjZUXidWIZx/O+ndOEg/NfH0qd2Z2UPmUhu+BJiL7hd+p0gAyNAaO6joUNP6Q8w0cGz0eTEh4thrjkoSQOt55B/I1HWnq0xLqRmDG762yNeb3bicVvy7YXdO/XQzGcPBokIhG2eCO2LJUYhJZNP2shJ5u4HHqDDTQ6LrRIA0BYjfzvZinSwWKL5BaCcjYNoLhAnF2/2jaSRochqCd3CeI0T7ZRKj2d0gb5VXQ3Ig9EE6VmTXN4fOILQzanETrxoCDhvxyGlI6zXr3GwqcREeGT3KgZuqRoxap9YxKjRsSYwSssKQuk+u+l+Ccy6OuXXkMT6qU8+FdZqfPlvsVt9ujJHDG6MBTHkNl5298KXDlgcOCEUL546LIQB6c9jo58CLefHwqyfinJA2Iq8A6D9ut0kJgdAh0zXU7Ta9xbkZJWQdwxgGq0RKs78HUQeaE0hFnI2ICH1Np7UzxiKbNzHDdtm1rf0 X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: db353943-18d0-487d-824a-08d8f467d327 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2021 17:10:03.6074 (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: +kZ7TG3SwambwiP4dlxgITBgPIvdoyG+m76LWuHYckPz4vxGottCPd8STriR/P9YfIgvQhs/Nru3sZ8G6MBZWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0301MB2182 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.102.4 at phobos.denx.de X-Virus-Status: Clean This macro clarifies accesses, and eliminates the need to have a separate shift define. Signed-off-by: Sean Anderson Reviewed-by: Fabio Estevam --- arch/arm/include/asm/mach-imx/sys_proto.h | 5 +---- arch/arm/mach-imx/spl.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 43eae6d796..796c0f8b52 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -78,12 +78,9 @@ struct bd_info; #define IMX6_SRC_GPR10_BMODE BIT(28) #define IMX6_SRC_GPR10_PERSIST_SECONDARY_BOOT BIT(30) -#define IMX6_BMODE_MASK GENMASK(7, 0) -#define IMX6_BMODE_SHIFT 4 +#define IMX6_BMODE_MASK GENMASK(7, 4) #define IMX6_BMODE_EMI_MASK BIT(3) -#define IMX6_BMODE_EMI_SHIFT 3 #define IMX6_BMODE_SERIAL_ROM_MASK GENMASK(26, 24) -#define IMX6_BMODE_SERIAL_ROM_SHIFT 24 enum imx6_bmode_serial_rom { IMX6_BMODE_ECSPI1, diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 36033d611c..2f3c1afbb9 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -55,11 +56,11 @@ u32 spl_boot_device(void) return BOOT_DEVICE_BOARD; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ - switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_MASK, reg)) { /* EIM: See 8.5.1, Table 8-9 */ case IMX6_BMODE_EMI: /* BOOT_CFG1[3]: NOR/OneNAND Selection */ - switch ((reg & IMX6_BMODE_EMI_MASK) >> IMX6_BMODE_EMI_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_EMI_MASK, reg)) { case IMX6_BMODE_ONENAND: return BOOT_DEVICE_ONENAND; case IMX6_BMODE_NOR: @@ -77,8 +78,7 @@ u32 spl_boot_device(void) /* Serial ROM: See 8.5.5.1, Table 8-22 */ case IMX6_BMODE_SERIAL_ROM: /* BOOT_CFG4[2:0] */ - switch ((reg & IMX6_BMODE_SERIAL_ROM_MASK) >> - IMX6_BMODE_SERIAL_ROM_SHIFT) { + switch (FIELD_GET(IMX6_BMODE_SERIAL_ROM_MASK, reg)) { case IMX6_BMODE_ECSPI1: case IMX6_BMODE_ECSPI2: case IMX6_BMODE_ECSPI3: