From patchwork Mon May 4 14:08:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1282670 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=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=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=ECBdnZPZ; 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 49G41w4kgCz9sTP for ; Mon, 4 May 2020 23:48:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 165E682010; Mon, 4 May 2020 15:46:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.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=nxp.com header.i=@nxp.com header.b="ECBdnZPZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C0AD82003; Mon, 4 May 2020 15:46:36 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::612]) (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 8AB4B81FF3 for ; Mon, 4 May 2020 15:46:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kD36sqI1uDZHUoqqk9urRZjKDpI8p1wDifc09d0eDpLlGbAwbynOV15ditRCunCY7MXlQzxNDMGCMu+zr1CxajJkrz/4x7HzFQHmXTk5+lO3GFjrdTsrBE9/u0dbXFd/7TVkoPXo4PJUUH09R1iMVxSR9XbZKL05XJJMHCR5ELGAkxhSrIftztMJaOxPft45yTwhs0mhvAObCw/ekCTtCKGbvSCPi8mbWmpTy8UCJqnf9meZE6ZP3Kv77TVjulTHd97d7Fm1plnIHOWL5vgY3EibOgBGkkRlmWQa1yMfDU/8xixsYKBCjheAmPezZ7G/Ri4wICphA2DhuGJkc+UMsg== 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=Tak94LdPu393izFtllsdE74WrUc+nzTMK6oKz6iedCo=; b=ksNm5F5hex6Cl302cBphhr3F6hyqSd5KRaa3hK6XJ6EcgUFHhEonIi79Gvg1+tob3c/tg7xHQM5otLAZHszbVOmL9RCCYa1pCxD2/o9gJHCdQPol/oLu+M1f4MWsgOTRIvVn0eiMM0A9uBDkrti+j190ZoYRWmdUrJ9uyhLTFw+B4G7U4YDPjCBHDE0HOJUAQbIDiHvlszmIzsJe8iBcizsGIei1cEjwgSU/Ck2inBOQUj3uQ6CEXd46Tft0ycV9RxxTEly196Vq2Z+OT9d/HZf1MW1lHNZ7zE0ExeYiiDuris8SewKxMdPP9sdZlMttAA6z1qd4ojqPAugUlTLhZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tak94LdPu393izFtllsdE74WrUc+nzTMK6oKz6iedCo=; b=ECBdnZPZcufv3JVPBZh/xpv2ph5gIlCyg2T66GvNz+nnUJh5aKfR1JO/IftSNfuZ5swh1l+555yvausWRIiG6UwgZjnInFYQ4Gt0bBUQYmGQhQyvUHbc8nECDLViYxG7BtdApl+wkSXu76f23lIneHEs+nDMrwEalIeaBVfrAOc= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2837.eurprd04.prod.outlook.com (2603:10a6:4:98::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Mon, 4 May 2020 13:46:31 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871%6]) with mapi id 15.20.2958.029; Mon, 4 May 2020 13:46:31 +0000 From: Peng Fan To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Han Xu , Peng Fan Subject: [PATCH 09/14] mtd: mxs_nand: fix the gf_13/14 definition issue Date: Mon, 4 May 2020 22:08:58 +0800 Message-Id: <20200504140903.23602-10-peng.fan@nxp.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200504140903.23602-1-peng.fan@nxp.com> References: <20200504140903.23602-1-peng.fan@nxp.com> X-ClientProxiedBy: SG2PR06CA0108.apcprd06.prod.outlook.com (2603:1096:3:14::34) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR06CA0108.apcprd06.prod.outlook.com (2603:1096:3:14::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Mon, 4 May 2020 13:46:29 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [119.31.174.71] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 81d4c001-1997-43c8-cd2e-08d7f0318d42 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2837:|DB6PR0402MB2837: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-Forefront-PRVS: 03932714EB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k2uJSsj3Wto1vG2TTB7caEhrUMqLydAE9gDDCMBHEID9pp/AdJ2QHtaNU6M/RhPHXnGO51spoXNVeasguwORPUix9fxxbkuGp8ET/y7LT7lUGHXdn9zuYZ4zu53eFv8KXm2O2pE5PirjWfiuLb2QvDz/ijWY8+HuPlyCySZMauLXimqVNV4oytkwtw82a6o8keiWFJIF3a/CC9uEoZZ9uJWdVn88Mx668UgXoSAfTm5/YnY31tcAipkcnwKxNXCpCOpVOAabjN8qsDn5I2I4E1lo2rxW7xfGpxDDSNkdCDf4P9Vc56+u8HgV9ihf8aGuPsusvfHqhi5T+0kXdU9ddzM6fUJSC/bqkwy9kJXjGOTRE4YLwd2c4xe4LqYuwfXD6pm3icYKVnabWjN0BTHdV/j2V/kqsBetkBwg6LlGTooLtFOxYL+c2cm4FHHH8/Xg X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(396003)(376002)(39860400002)(366004)(136003)(86362001)(6666004)(52116002)(2906002)(8936002)(26005)(186003)(16526019)(6486002)(66476007)(478600001)(54906003)(4326008)(5660300002)(66556008)(66946007)(36756003)(1076003)(44832011)(316002)(8676002)(956004)(2616005)(6506007)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GFvpDiU8f8VUukas/ON+xU04+BFid3oaCWKXpqhCdgWzY2wxR5MtXFQyTku2vA3XGa/7MYbIfN+ALfethT3g2ELPPe/PUbsqNVeZqVVk4J0YhMHJ9RrY2ud9/8dTxIgmTdJwEVIsNTfas0bnfhLWWMg5OBj01Pl/1J1mhcU8J9bk219d4CBRaAxxrlT4aOgdY1udx04dxdOUgLzP+PQDPKpzTWCAgRxTvOGYViuEyJMRXN29gT3iB5yYL4LE4Ir6kxAgeOI5UlhbAZYKNLwrzygEd6LmhpTBSZxKgP9Ujg+FpIbiWqilkTTKgC4y1VZwCo/kfptUTVKnGUk4zlPMh0KOmWawR3+q/YVSty1egUQ9UGJZ4A9c5ORwfEi685fWfB99ifL0kYZSu48d0CIkFBAJOH5kpMVn97+oB5939LDm9UKZHQ+plRj+yh9wkR0P3NopIPxH0CDRL68KAaOeRJ5e1zXx1OhniefP7xo0+MKjczcTw4NthuJKLaEk584MA2czqEcxk32OjR0muHRyz+AdNUtkWt0ywJDO3VJcCTbRacqMhEBAzNUNlEDoRREFTl3K3pfRaXpru/van8ldk6mnj095+2BjEcg2uc8iVBlYAxByG+TBj+Qd2a40ofsIs06Qx+22eGPCntptxUUK5cgx1/WqEDcnsl7o+BdCJWsUu6gcWaMa79e6NtTFOLn+XmHfQz8P2lgrul4GyFnFlLztBwqwZ3FE/E0sxL/2GbETiFYNLPDZe9ogLJSSmGJuZyK+pPelUrKNNVzsS6T4JD39DXsYxvhxLIBzdRR8s44= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81d4c001-1997-43c8-cd2e-08d7f0318d42 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2020 13:46:31.2882 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1+4Uq+4HAhUY/PFcJLiiNH5rn8N+d7kNhNQRuMe/tYx34foMTHjFGbv5PqfUmyysP89JDa3Qn17Kzot0r3mjng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2837 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.2 at phobos.denx.de X-Virus-Status: Clean From: Han Xu gf_13/14 mask was not set correctly in register definition. Signed-off-by: Han Xu Signed-off-by: Peng Fan --- arch/arm/include/asm/mach-imx/regs-bch.h | 8 ++++---- drivers/mtd/nand/raw/mxs_nand.c | 2 ++ include/mxs_nand.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/regs-bch.h b/arch/arm/include/asm/mach-imx/regs-bch.h index 4b99edbb3d..664fb9fd4d 100644 --- a/arch/arm/include/asm/mach-imx/regs-bch.h +++ b/arch/arm/include/asm/mach-imx/regs-bch.h @@ -151,9 +151,9 @@ struct mxs_bch_regs { #define BCH_FLASHLAYOUT0_ECC0_ECC28 (0xe << 12) #define BCH_FLASHLAYOUT0_ECC0_ECC30 (0xf << 12) #define BCH_FLASHLAYOUT0_ECC0_ECC32 (0x10 << 12) -#define BCH_FLASHLAYOUT0_GF13_0_GF14_1 (1 << 10) +#define BCH_FLASHLAYOUT0_GF13_0_GF14_1_MASK BIT(10) #define BCH_FLASHLAYOUT0_GF13_0_GF14_1_OFFSET 10 -#define BCH_FLASHLAYOUT0_DATA0_SIZE_MASK 0xfff +#define BCH_FLASHLAYOUT0_DATA0_SIZE_MASK 0x3ff #define BCH_FLASHLAYOUT0_DATA0_SIZE_OFFSET 0 #define BCH_FLASHLAYOUT1_PAGE_SIZE_MASK (0xffff << 16) @@ -182,9 +182,9 @@ struct mxs_bch_regs { #define BCH_FLASHLAYOUT1_ECCN_ECC28 (0xe << 12) #define BCH_FLASHLAYOUT1_ECCN_ECC30 (0xf << 12) #define BCH_FLASHLAYOUT1_ECCN_ECC32 (0x10 << 12) -#define BCH_FLASHLAYOUT1_GF13_0_GF14_1 (1 << 10) +#define BCH_FLASHLAYOUT1_GF13_0_GF14_1_MASK BIT(10) #define BCH_FLASHLAYOUT1_GF13_0_GF14_1_OFFSET 10 -#define BCH_FLASHLAYOUT1_DATAN_SIZE_MASK 0xfff +#define BCH_FLASHLAYOUT1_DATAN_SIZE_MASK 0x3ff #define BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET 0 #define BCH_DEBUG0_RSVD1_MASK (0x1f << 27) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index facedf92c5..1b66636a4f 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -1474,6 +1474,8 @@ void mxs_nand_get_layout(struct mtd_info *mtd, struct mxs_nand_layout *l) BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET); l->eccn = (tmp & BCH_FLASHLAYOUT1_ECCN_MASK) >> BCH_FLASHLAYOUT1_ECCN_OFFSET; + l->gf_len = (tmp & BCH_FLASHLAYOUT1_GF13_0_GF14_1_MASK) >> + BCH_FLASHLAYOUT1_GF13_0_GF14_1_OFFSET; } /* diff --git a/include/mxs_nand.h b/include/mxs_nand.h index 1ac628d064..21d68a909d 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -88,6 +88,7 @@ struct mxs_nand_layout { u32 ecc0; u32 datan_size; u32 eccn; + u32 gf_len; }; int mxs_nand_init_ctrl(struct mxs_nand_info *nand_info);