From patchwork Thu Jan 14 07:27:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426319 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=JsjCyHWf; 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 4DGk6v0s5kz9sVt for ; Thu, 14 Jan 2021 23:25:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 26D1B8271C; Thu, 14 Jan 2021 13:25:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="JsjCyHWf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D12D8271A; Thu, 14 Jan 2021 07:59:09 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::60b]) (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 2B633826F5 for ; Thu, 14 Jan 2021 07:59:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/ffcONq9lPwExSihooUV1LbwH8Pa3gzu47CWOrkn97CTO1Q9aBxD4BXDK/eEjSIOqDlerxiRovOUgOtTFCwEpAsC/MMAPrBmqpLux9dWLTkTb6VKYHuglvsj/XtNeKqDErfTAuFE2QWShTWBoPLajzNq4HjKBdJ6vnBEGpB2l2qGPGSou3YJ3qkNEC3efg7Q8BU+22thcYMSexcNkGfuA+roMFHsqVBRYScNjtMXL2FtkWiCWuaGpiBcM2zjdMbyBK62f3wrbOlHxyirm7QH73YVJtP9jSKXMe62DiwvlwUS7FagFPIqHdBw8pPlaA4N2NXeU2XHkZWRyNz0k92Jg== 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=5/l97LVeFZSELvy55SjZwXvP3aVUYukzeUoVVGS1VSY=; b=Kus4qGqWVeP/tEalvkvO4ipRDaCOdCRpgqpfXmny1H7XfTNBemMXjZDA9I9/J9SsPKuYppiHUNyJn9P+wtsP9jrNCVUZ1ix3jI746kWE+sgVftDBA3JjK1+onDyGnlo2mZQwNJWgA0GEC5RGvRrYvfoBj2vn72WYsynO/8Y/8rEvxwNVwpIu2JorPSmQgoWMHA/No7qCobA4kV+ud5EpWl9Wy85FPD1EJtCA6djdLCPfK2MCpUXdxVTi38dlpCryxYH/DeoJ5uuRFoHXmNlW9I3Hd+hwTmiPNMhrCY8bXxtziZTjFf42DKUJRJT723B/11Ps8hDCv59A89AZRmVdvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5/l97LVeFZSELvy55SjZwXvP3aVUYukzeUoVVGS1VSY=; b=JsjCyHWfcZmTVHSthLPFVoJmTpNvUj002/uni1UF5PPZ1e155OhnXSnZyn76xCCi7SAOnL1MlI2a9+YsLhZc70KE328JdrWk6Uag3encKL5uhyGI+WyL/i2fIarsB7eHjG56m9OVf6Jvlls3zNGD4Pld0Dlid8FgrjTCD4uzNnk= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:03 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:03 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Peng Fan Subject: [PATCH 01/13] imx: lowlevel: implement armv8_el2_to_aarch32 Date: Thu, 14 Jan 2021 15:27:58 +0800 Message-Id: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8b7ccbec-20e5-4be4-9b2f-08d8b859e08e X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:389; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v1PginEEjg+fpKSfK0hphvsmAJWdF878WpeAp6BFmT+5q+ja5YcvpPsg5YJwB67MURyrrOshkWl0MyFNCzi+u1LCnnzFqRjfYOdcmZKiMHGdGufLnuQZQ5Y7IBeh6Ao9w8U3FbV1h9UGCSt4UgsUXZ6N0oi7JAkO/yqXR3q0oOnQInZEwNNlwHRrDZlcojap63nLOTdZvo1YQDp82auh9b6f36T9Uukijg/BFytWvC4TMUZ+CRM3Z4XwmhnLtMExFWgTsQDoScysnl4LJSsAMoPk8/uY1AXSUFT3gM5AT3xn8aOGTqr12UZyotqw+KyVz4Gg4c4wG5SiXGlaYTiZ2rba+hIH8+YKCnpVB/lma2zdSylZ5KHvhWRYntK+884unBIBrFBAn6AaFZ1r9t1jxQ== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YwokVbtDOxlhgSJF/OglAy77zbuYcFQxDJuYxiQ5h8LsyijnkRqMz9KmgKVlx4fB7fk5zByWib2yfgKkDDj78QIbLVjO3YbVuq79vkT84LeTshbs1gTiIrpUbrJSZWc35dJhbFS9XdwOOXSAf3tKje2Q2QLCUK4HAYro6NKnJ5lN7CdQ9FVz8H4AbiQ0RSvw/xgV4QsHiGtesAneDa47CWR79BEYB5EubdHT1xxcyfNz9ueLTG3MSRz3MnNM4ZczZxe5HkMzT26pQEcDhdzoyJv4NxycpyoEDK2c4eLbnxN/vN0WNYJHeZXyQpoGSkJcpRrBF5+2aCAockZ9ZAhaOFozqYEH+ELUFYfUUeCKFkTRphkS8ZdgvDdiTE+WvZGsy4Zy3uzEP+sxEgf4y2tWvCUogu8NPHtwtZHmyEMSk7uFcsrA7I2vbzxSDetS5ELsWaiTx222n8Zwm1HjTlMBEf1pCwtRuQ5GxXmKPHkuL/HMsV/atpLfyoqpUDn17E0Lw5mLMehiG15KrO/oxpxvR/Lwt8cY9tCV8+OuHZUwf3QTEj7vCK2CkCUcpxsiMlUBx+MBylyD+EPMcDYhi3b/enhbUaZ0xa+Jy2VEFLT6IXBmSzV+WZ4gnG+DIOd3fd+XL5E6sWSMa3Or4OGpaSHSXX6wpjBfS8psqff/rTjmi1DHJ2RfHsPKNOB4Geus+pHnzuBSoAdoSNio5exxmnweiaCEaVyNSwWeXboulgQ7oA71e2fUJQYe84eASAt3j1I/g11TzAju3rq9vtNqGb3O1fwXo95u5rq/4s2HGE3f6T0NCt++PyqyDoKat5d4fA0UHk2ELT0yZ5VXT5dYqffQuSVY96zNf30QnlLgNi9kG+oj/OXeSJUSTVw+kRc6GbZSkU8ZBqfxTLcsrOJILrRToHjK9szCTRjYIx0b0YcZD5SOf5TUug6stuwPwibXKq/xnye7gsR9qqWWp2zLlEV63YBS/LLjSGnmKJkiySyMOpb1e4YFU5RGoMQy5gnvCYu+ X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:03.0398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 8b7ccbec-20e5-4be4-9b2f-08d8b859e08e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qeSXcPOPCICDCwBl844bHQSzZTol32Z4wrN7SWqRBVivhNSrSIXxUMCLBrwXjYsowylAXI2TBdSpXyMX91BTwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Implement armv8_el2_to_aarch32 for aarch64 U-Boot booting aarch32 SMP linux. It will trap to ATF to let ATF handle the mode switching. Signed-off-by: Peng Fan --- arch/arm/mach-imx/lowlevel.S | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/mach-imx/lowlevel.S b/arch/arm/mach-imx/lowlevel.S index 158fdb7d87..c500aa8123 100644 --- a/arch/arm/mach-imx/lowlevel.S +++ b/arch/arm/mach-imx/lowlevel.S @@ -20,3 +20,26 @@ ENTRY(lowlevel_init) isb ret ENDPROC(lowlevel_init) + +/* + * Switch from AArch64 EL2 to AArch32 EL2 + * @param inputs: + * x0: argument, zero + * x1: machine nr + * x2: fdt address + * x3: input argument + * x4: kernel entry point + * @param outputs for secure firmware: + * x0: function id + * x1: kernel entry point + * x2: machine nr + * x3: fdt address +*/ +.global armv8_el2_to_aarch32 +armv8_el2_to_aarch32: + mov x3, x2 + mov x2, x1 + mov x1, x4 + ldr x0, =0xc20000fd + smc #0 + ret From patchwork Thu Jan 14 07:27:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426322 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=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=KP1+xfYP; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DGk7L5KHXz9sVX for ; Thu, 14 Jan 2021 23:26:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0A82382751; Thu, 14 Jan 2021 13:25:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="KP1+xfYP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F19C8271A; Thu, 14 Jan 2021 07:59:14 +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=-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-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::602]) (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 7449A82701 for ; Thu, 14 Jan 2021 07:59:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gBQLgph0YfCuxxBmo8ZhfRgRl7C2Tu1blvQV7K4wAvdNEbr45ylXt6V/srVuVhBAPI1oCIZYChqtX88m6Ml00nnIfhrvfva+qkcF/Z1O+Zuh+4YUqJDX2yWkB9dUrgt+k7nxjhYc7DILnZXU+5D9jOkPvzzqdaM4BRpkqDzqRcvQzplE8ijPMqzux9z6FMqWZOcWwen8RKZRLscW/2GnKTO+g2ztqn+v6KtcYuzLxQWLg5NZQ47IK+cnntdieqTx0+aDjffU+dfgUkZxcLsGY5Q0POaOpuIjEYBPQh9UZsSgMfBZOBz7QJpxmYDTbTOBayO3dPlp/lcOd1FITtOfLA== 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=JhqWCGOsIBPmP4l2ETjbhRViD6g/YKcrpexyHHv/DxY=; b=Uc7eThp9EqBBB8jb6uYy1enQ9fNylGAIcPvPOn+DrPOwjjbgBEVSttbt1UujZfMApicQGYIxMSp8yhUEOU4vCceNWSTg+Qok5N/cDaMeiuk/GqC16Vz0dEZHQv1QywUWqPkO9W/2yp5R5aAC/1AZFkt0GxelL9deEI162FwUR+ND/qAw0Wkkacnm2hLvUqx3FU98tB+mKYcvHIQHRk+YxKGKiIFjFA+hx+Go63/vdVYYOHwXaXrgEw0/2RhVcf42XMoWh7O65kvrIJSSQEXcg7bYKV87SVTCKQGTwljcbNvlOZ7MlYAdSJAMiT5uQGuhPmCpolBc6mARWDE5DsRo6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JhqWCGOsIBPmP4l2ETjbhRViD6g/YKcrpexyHHv/DxY=; b=KP1+xfYPc7hLo5Cu5AAGV84wmkXMYE+zFT3nKIZ+4+UbbeP1XqWgs2ESXNaxf09z2/wqC7/K64cdQU0aepmum0JFv09+2H8JDGkMC2lCFnpEovVXJRziZj3VFvZ1fsV/choisfnDMLHEDnWDL5re74BDJx17i1yVsT7dqxVCh2I= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:06 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:06 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 02/13] nandbcb: Fix uninitialized variable Date: Thu, 14 Jan 2021 15:27:59 +0800 Message-Id: <20210114072810.11873-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9e4615f8-34f8-4ade-eb00-08d8b859e285 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:207; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YWeX04VA+/a1Bg3cqL/RrM27o0VAKzYaWalCaMewD6DAKeeQ7v5oKGybiPvyPaCMtjHI+VpdV4IkxFnOpnMV9tmWWBaKIUZdmdv4+avGda76DTA1yC4GCg9HihmXyIvjXJ6XF7vRYTPa7/uNEmyobpM9SfaloBIdLCn0aPcKzaQZ+QCYVYNNFCliBBRnqCXIuvfj2mWnBnRMJ1NsEIktG/UPtW3w9wbVd8n+kthRUCsQb8uv/EQIypXWM+4SdAnkM3TgQ0IHA+03GBe8UraPP2HIGzxmC7LcIIHQv33iFqqBPm9S66EXo2/IVcK145empH6Ws+DlINaw7Y3ONu04AqJqERhjKe2QYUggFs3p47JpxRSNPE6SIMoLUMsI4psDTKD0WwruaxPA1GObOm42uQ== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(4744005)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: CPIN7H9NWGuOI/y46RpxB8woSEG4Qv9BhSPXsa6AvjItWIgYnH+cbfpY2Q0C2OVX+DxFvP/9vwjV4CuqmsP2Rdtxd4BX7cOBVs5sdEvGuZ50CPN/7jAZ4S9n7KabW5Zu4NkYVCSSzV3fDm6w8W63BhNBv72UuWhbDR0ZEdCQBTEWVKIZ9IGURUsvoT1za7TuAKBFAvlyoiMWTYQSTeqoRxZt7kmmIahPlJBmNXh5M0Z9SXsOfQ9ocUV4JZyHH+CVSCQ1IjiYpVZClzeD9ypD0Q6hcrhFs+3XLEjflXOkxJOtGq6MuYGUBPfh1ZpLxrEykL8yDHQeE6jcbDYN5LH2h5btxVCWOFHpUUlCHYasO3EeEWJyMkiz3Y0a7kak4u5uzVCRPdBcXO/r7terfwu2jMRT5tOB1qDfDKMnHG7WjKWqU5yd45fHM5HfZXSrbBWszEYtu4Won/xG3e8k1Lgav2W9RJw8N8CzmoVb0KRD6uC1uGZVdxin8gY7Si9P73TRhHIRIA+sv68z22b+/KPNpPRMCaGyIkUVArq9ibDePN92qDogZWuUjvi0Ql9q2Z45qe3PzYaYp0SY3ZL/p3hiNTtTVshxPxV34BdtN48IuZqo0inDQgSWfAnCyYgV0+fFzlwtILBcmG8zBvnuICKSUQBAjVR0SzcU33/5cw1w0XUrccCmLmuBR4w6thNRsfFsKIdsG4oR1sn4qjNzQE61Eo2iEhePp6+JVfy6yragpdFMRtQGN7yUBeFLIAZW5URjEdqjh910MsBTev6+Izgw+fCx+ddmktyi7ghHl0CuhTdU6x7oJb9eQnzb13DUsH67NChO/EOTpaiupYznZ012utNV8W2u10DRD3PDkGSh1b69si7flhlWUgX0ps65N+LWCjjhmLu5USKKv7OmZ1ZcSrTdnofRGaVQVk9daBNAMnmM/4JPQTk19IwDdELw7HxV8/bRWakklpCU89Yh2OVpkwquiaGPDx3ICEa8g9lYRbRdTZyz9BMgKnI0AdguX8OT X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:06.3413 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 9e4615f8-34f8-4ade-eb00-08d8b859e285 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zJgVwE0yOuY1MOQo04SMAzjxan2U1FsPR1S7qs/0RGVQ6B3++hFLeLNMVyttLt1ozM+e2dTOqvMfWnmyzTN98Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Fix Coverity Issue 9006654. In write_fcb, use of an uninitialized variable "ret". Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 44fc37695d..c01f6aea73 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -563,7 +563,7 @@ static int write_fcb(struct boot_config *boot_cfg, struct fcb_block *fcb) { struct mtd_info *mtd; void *fcb_raw_page = NULL; - int i, ret; + int i, ret = 0; loff_t off; size_t size; From patchwork Thu Jan 14 07:28:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426321 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=B1y0GXcj; 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 4DGk746rbyz9sVX for ; Thu, 14 Jan 2021 23:25:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82FE282749; Thu, 14 Jan 2021 13:25:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="B1y0GXcj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8EBD18271A; Thu, 14 Jan 2021 07:59:13 +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=-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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62f]) (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 02653826F5 for ; Thu, 14 Jan 2021 07:59:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VzaeAyROH1SXBJ1dIH4A+ALZmYO8eqecdXj8kTDn/FRgegW63SrVVolivVm/YZhBu2UAEkny0NmS2ZlOdQpEup0r4hH18zWuUhpQCZi3m3EBO9klohvgHedsn/O6Qz+oqJiaGow4rgEXmrN0RCXzPA8KN7tGO0o70CsLN478eNHo2KqytYTjM62qUHQtczjyMGJnDutGGKlxinyXk716VEabNga2A82/lFk2Ex8nD0IFRS3dQBHHeg3nv1z6rTYRxwYnVQIul6Db+o1p6o7ACqfzB5o3mL7JqO9MaGf+KNDb4HUF6af9sKvB5jKKpUowa0bdvACAiV6/GVR6zGagOA== 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=Vyrf7l8no7qlxeWDYXLskB02PUR0MdziOjCo8lL2Wmc=; b=mlmsuMeWc6BLaGBcWpzPlVIyUofByrlEyOb+negseu6BaKqUy/lOOr/1y1nMHS2qOPd4x+wCm5pMzQu3RVljUZmId/HviYr2oIIODXUsFE//GujP4BNySrQScshiHnHEhjV8ljF9dKC+y9Rd+9mE6ZTxbfc+D5Ho/fvu1AfBBpVLCsjncg0sb1Pd5S6EOgdfws7fJs1ibNoHQtU2Vd/lBVkT0LyK4nZXRad6RbW0EEg4jw9bEPh4VFlVRn0myWF2pURhv9b3XSD7v1nCFUV0xDSRKLk4Ryg7YLgLtRiAgsbi4VyuoP3Pg2cpmogE6t/gvTcNttqTD5iZBO9kCzHLzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vyrf7l8no7qlxeWDYXLskB02PUR0MdziOjCo8lL2Wmc=; b=B1y0GXcjVBFOizIGlYLbJI2Bt5mfdT19fpPywlIN7iYLwsCVtuzV0Ca6i9X4t/rofvxzjdJT30H15mORXJFUEnA1REKcFH3E2YC8zJHGJT/WpXJssvHDhoKlB8OXV91TfDLmRSgJiExnW9btLfQaiqnxAHdxF3Bzm7gIF879Ces= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:09 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:09 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 03/13] imx: nandbcb: Fix resource leak Date: Thu, 14 Jan 2021 15:28:00 +0800 Message-Id: <20210114072810.11873-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 62ae1ec3-1d12-4734-3478-08d8b859e442 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ee0TpHhi3+3xycul8IIv6Sltuc9K6iqd3CHTBaPg7OeeKQAscAWhQBhkqEIcHT87C7+i9RPe5MvDLszqXdg/+rl6eLiAAXR62QavxsoYj3MWEassU0evREWThkqhUvzUUzYFNV2uYu6t3dMBDIkCxzFRIealkoxq2ylE7Aicvz72bmfnHpaqsqE/B/U4GCO8pGeQwvgR87bRAQtDfLbfAtojDnxPDtZZom/JM5CLyahyxLryW+r31DN42TIzdXMVapNCIGl28zmRjrqc5co5LcYLcDAhhVwwXZ/F5u4Fr9jQQT5kMCbdJRp+wgKAHE0N5Dq8yncGcxoj6w3FbrnXisT0hJPWnbCldOgWlwRY4P4qMb/Vu3trj9tS8sBmKWQpY+Dr8g1nDhvscBB19OIofw== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(4744005)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: EWJVLc2qJEkGZ+DD+kRkNeR1pttMA83gv2yQdrxLpa2OX4vTi480lqeaEd3BhwLvNq84q6/wkMUnKAO+S0nzDCTAhb9WZVA2ke5q7YywZKbOWbyvKGwNyUFiIVmZ9aZUDBvQ+MUUtYP3ddSYmQdtocLkda98MMZO12H23Z3BpwnE4K8boX/PYkFSKptei2aA1Ux5fjhz9VH9Wj+DMFDkAFF137Viy2mzLaVzwvp58HzDylO0lgl0tDgTWqjS0cipFc24i+teogk7szgix1TeWyAWq5ABDl530eBMdmzGifLBXxnUG9WATG7Xqd4MaInR/vBH9B4lXV44W0YTEFfLLSCSMB6ZxA59Demuq8Spsi0M4DEnqUFJMMEcGQmXGFHnOMnr/eYWNJqnKA6V4LBzeOLZTPMpuOqAj7iD2ktEgv6QrAJkN3jHnS6bweqv7iYXE19cTaWMEtS3iETdvHBh/RkRzHSl55S41Xp6o77YiEUofPs8HIaVC1COjwBsGgJJLWbyorJvifrsw9oSspL3ElET19PAIkPpzh6qMjfZGgjsnjbRuFj3Ts3tQ7hvt7BgvpGfVDGR7b/7jlSoacS1LhyFdSWZd8/VSg+L9Nbdku4UXC2SNAT3l55qJFPZ8PdFM/QiMMhVCypPjoBLG4DNsIUHM/ds/srOwZX21788v+kCZ9RuKZ2KAuYQ89qy+JDjzEjSqwcPPtfXPAb2a9ec7O7cZ+eSDXfTd8ULdcff5KJO8naqFQAVtaoykQTAvOkAfd+dUgvKMdYPw0Ia5XCQHGCqJUdutX88aT+c3GO9388aEqSawidLlUxd/aR6xEzbXoebDRqe0D0ihk5JR5eg8/68PwGws70RwSP8yudlY05buZtuj4NZbB/x1sCY9eO/Ccp/vX+cWqVjhAQGxBubNTip3OqqHvJsO7QYv68A1S+liabDitDJq9lbQ4elf2veJ187PVNaZi8L8tgmzur01URE3raZQuEXo0PCZq9rtrNW4//QLPXc6QQPhL8clKfz X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:09.3169 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 62ae1ec3-1d12-4734-3478-08d8b859e442 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ztwKH5eKryubIOrSIONNJIJeM1GlMq5ILKyEJGTCHHVNZjN2n3Gm/ylD/5PBvKjoy4GqwFhLeZCXVtl70ChPCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Fix Coverity Issue 9006655. In write_fcb, leak of memory to resource "fcb_raw_page". Since we have initialized the "ret" to 0, should return the value of ret. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index c01f6aea73..6e50471164 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -653,8 +653,6 @@ static int write_fcb(struct boot_config *boot_cfg, struct fcb_block *fcb) off += g_boot_search_stride; } - return 0; - fcb_raw_page_err: kfree(fcb_raw_page); From patchwork Thu Jan 14 07:28:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426323 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=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=ChT2fESz; 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 4DGk7W5S6Qz9sVX for ; Thu, 14 Jan 2021 23:26:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AF6482764; Thu, 14 Jan 2021 13:25:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ChT2fESz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EE658271F; Thu, 14 Jan 2021 07:59:16 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::60d]) (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 AF4CE826F5 for ; Thu, 14 Jan 2021 07:59:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WM07NB9cZH9U7VoeN8Bm73PiQUC2cWqDFQ0mufd/ty1BB620BJBs3bXxEeFskfEVzMvDYp88APuue1kC+SfGUT0154Le9xZbRn4aesNUbc2In5ABU0U6spAN1cJ4FVk9KsZjbiU7u8Lm7YrwL3AbjBBAwJHhcOQUz7EOA8QAB1V1AHaMA7eGWdloQsZHvxtRgpiOHm4GwU8xqVkE7l0OZLTiZCYZqt+pxbaxpRrLYZOact5p/NU+VdcOgVf7WIXpuC00fPKzRxwEy7UBcWz3BAPMqls0N0qBEYfvfFbghyKM+sPiPw/H5ZHqwcupI/YApYNDnaAqGf6r1pSIb8hWOQ== 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=jAyMgWeBvlTp8Mx54jBLqj84ph1H8SzZe12EFE44Ao0=; b=A6wGJOj8zb0mOGW5Dq2AaMt3Rofi3xYt07dYraUU7sz7rHAQM7zkAniO7fdkvMb7WwHrlpMSTgks8qkwwo84D/+6uxoZ0Vzbox7we++cpSRhRM/yY2s8WiyGFc3XFfRQHPxddLXWLaWU3y2s/oDuEGUHlY8viRbvOi6/QNegalAQJz2ZwRizEOtQTzpFApjvYmZEHwAG06P2BrOI1HHkmcpSC6lpO+fTzppPoHYFTtLYmP37y3lM2PhkxImo/CuQW3b5pJ8xnhDqNeCOIlTaEln1cUi5cBmLWMVKjl9JHzIj59bKCqELkVlP2XBhg52LN+UWNwJfVPoJVPcbohbCyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jAyMgWeBvlTp8Mx54jBLqj84ph1H8SzZe12EFE44Ao0=; b=ChT2fESzLszxrSno3gopbIoi7GcOIdCsoIzfqRdCrPi2zg4X6nXlTPbmNrxeV0VPsjNCOi18Ja/AVFDR6hTEiUgDi5hPX2j13rp8r5iIcU0rpL6TCqYVJEqYYBbJEYqmZTtLbQG4bTstHdT6hB8oRChvG02z8GPCqn3UmHszc1I= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:12 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:12 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 04/13] imx: nandbcb: Fix resource leak in read_fcb Date: Thu, 14 Jan 2021 15:28:01 +0800 Message-Id: <20210114072810.11873-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c677bbdf-dd18-416d-6079-08d8b859e5e8 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gGdl82DlOg+G0yO4QFssAJbA/sJhtFbD8GmeJuQHjXngku3GUYS3OhGSxc0MBDi1Ouu7a7ygPGO6BB/nNoXX/2IeUOY5SNyR9VG0y6hMKv+kNYCtiIRDhTXNlXhZ4kw4SNk9k0vhMupZXkiLEfYIsAAw+Y6Y1Urr7D0v19JK7mfHZXy4TMXQVcvzt0ZeT4EjMu9h+lfc+zru0ulWqJg145UipIgtoxsXm5Y9YssSGKoKCEkYXy5UUBOLP9txjWvPPLnAddiMWxEv40+oC2AmsTf2gdEbPxWzArkZDdmbFlXf1jRL0VQP6W53+2BiVI0/StcCEzNSYylgqhWFXRPQt9uF2fQsbAP5eyN+Rz7UQ88y2OrJjE9PpSM7LX/MqJodJjUhE86R33y+v5/YO+yktA== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: j8z9yMbELopJgTJQYVjystTRizSKLDR7kzGpsFe+a4V2YRC5CEneS2E67q1G7zh2DdjUvugZ4WKCW/nCJvqzPR1rflpiB3n1GtJ+n8CJnZ+qeewI21FuUGEM8bPftW8MNP/9Vb+JPxNPOmztwl0QamAxbLoRnzoJaQY03ShbrM51Poyhl74aguj2rjZZV+QGr6bAM0mg3S/2fG6R+dGOfsCwlRIzaChsq43IJi/rZSFyvu4dSJUD83fLQCOmT1FgUTsxC4bghHZxDQL1Tn+8fRm679EJIaW8SUuTey5p7Cg08NBskWORPicYo2WDAzli69Yg3yWH0T8mFxa5IrSMbXgo+sWj5UQuK/nWYo/OfiPUQlWs/GMlKZGLUl87m+LG9kcfV+lAjgiM0AFTLyu8P5fUWoJ1saNZK5mGLqJOx6QJH2YSJO6h6ysLiXzDwDEYse6+pUOCtftiGXmXoImmMizGHJzgLy3toaVbKwEApPcOTsJnkJKGggqnw0iP4xnJwH2DFmZHSnRIQBSijSRC1krSimFrfxiFa+pCWzLDc8DqSrRPwflOkj9+se2gerSNOtEasDCTgUjd+qoZS+A4oD//ovgmMwg9YIQ8flpJKAiIO9yJL37siDNrVKh13/JfDPnivr1628lgRpm3nF46PZlXzPsyGM438jKTCEDuaIukXX1vP02pnWKKNw5wrQ/e79L0iKa1O4fCTrwtY92NIFdUHiW7Dlb9h0Z+9u+Gi2oZuv3gnC0SOchzZpVCcdHdib6/LDAzgnAHVRz/MzsNfj3IeLfajHVkVrYoaM6PbmFbIRaUaGFzUoMkUGZyKMIZ9qevcmT2VmwxdMC/054Kmtd2o+lzN+AoxShdBtxoHhVLZDVdfQwFIC0dZWNOdBZMFCu8IduxDEA1AZQDrxvydx5/A666CkEpeeITVwvKEup4EPbzEs6W3g8ttv7+ve5lpVvJqlKsN9bjfuPUGRZiVCCv6gyc0dHwur0g+pXhyjMHYQkSVnkFXpHMnYHCvETd X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:12.0787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: c677bbdf-dd18-416d-6079-08d8b859e5e8 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1dD8WUrUHst7iibSMQdrRYPXeu2zrEnOYwxU34ovtyGX1rY4Z2F1hssm6Nv1n7t5O0lQcAZwD3NAewgOPNn+RQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Fix Coverity Issue 9006657. In read_fcb, leak of memory to system resource "fcb_raw_page". Adjust the sequence to check the mtd bad block prior than allocation of "fcb_raw_page", also check the NULL return of allocation. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 6e50471164..836981c895 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -503,13 +503,18 @@ static int read_fcb(struct boot_config *boot_cfg, struct fcb_block *fcb, int ret = 0; mtd = boot_cfg->mtd; - fcb_raw_page = kzalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL); - if (mtd_block_isbad(mtd, off)) { printf("Block %d is bad, skipped\n", (int)CONV_TO_BLOCKS(off)); return 1; } + fcb_raw_page = kzalloc(mtd->writesize + mtd->oobsize, GFP_KERNEL); + if (!fcb_raw_page) { + debug("failed to allocate fcb_raw_page\n"); + ret = -ENOMEM; + return ret; + } + /* * User BCH hardware to decode ECC for FCB */ From patchwork Thu Jan 14 07:28:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426324 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=FYmFvUJQ; 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 4DGk7l1yRNz9sVr for ; Thu, 14 Jan 2021 23:26:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0B7482778; Thu, 14 Jan 2021 13:25:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="FYmFvUJQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A236826F5; Thu, 14 Jan 2021 07:59:19 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61a]) (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 AA6DB826F5 for ; Thu, 14 Jan 2021 07:59:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gdC1wVqtYbodBEEGEtJYLcrr/ixNF2vtQdwpVHKFH36tKhYHeE5hXV98Zu3UDRlvr3H1ww7itxugfPWU4plDCPFJBm1p+oGKZtk2CcMjR1ov1pIy/Wmg1S1CBb4WDZ5A2SJPGrRp/5edPBj5kPBcBDtyobs5mvMuxOjBuGbKQsjSKZz9YX5iAlvAGPunK4sZOEjGSZoNbi8YtKe8QG1BqOZP9xT+7ihNdCCNciLg5wAuKfZbndMTNr/+bVbpyH3g7YeLqpiRAg25FTE8ctqX8UIGhe/qs71585AT76rQjxDY99bIzc6fBKOW355HDKJqtrfZifOLeeY/J4Wd4dHf2A== 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=QJ3B0kyf8lgO/HUMrnLmpoL156PLm5TWqQKHfcN+SqQ=; b=NlFcZZ4PbphkXm24Vo84eyvzlAzMcuiSQ+HYZJh0xb8niJSx7/+kd69kUa8opY7POPToHWdCJ9+XDZSISBNnJTr91XpwbpR786SyLmQAJg5xpo1wyc1mn95BkIQV7wdX2O50b0cvfXn5Ep4IBQhmHYDd7H24xWw2zwPakPMssyI7Ln2+gXezIHC73MnaQLOUWgE5jaec40uQytRW9F2ZjhQxCTyhedAWIJeC1UFrJgV4p2pJJRLDxZyqc0TIVG+vN86XI2MmaUObz7RWYIzlU8sCaKZGb881Gl5/d/ajelsIGqOF4eKFAaBKAYMDlPQcYJyea40xfHa2/xhOiH5CEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QJ3B0kyf8lgO/HUMrnLmpoL156PLm5TWqQKHfcN+SqQ=; b=FYmFvUJQ3nIn22v7vAv4VErf3GnmXWLjiD2ajQQETNsCMkZW1aMuWg0LpGw/bgJudPD0vPt3TdZGfMTCWGrZFxcby/wKuUD5ILqZv8oK/CxUDI1LyoxbxIdSz4b9vUgpWXfP2VPSgW2kFVSrJd79I6xRPcrqYB6e5YVd0MvJRa8= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:15 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:15 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 05/13] imx: nandbcb: Fix potential overflow in fill_dbbt_data Date: Thu, 14 Jan 2021 15:28:02 +0800 Message-Id: <20210114072810.11873-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: bcf355c9-7681-403a-eb23-08d8b859e7a1 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9uAF8TXeHZRAxV1HxK/xpJSZEOz08m2YCBcWZHUa4+lKGhynBfn2FLdGJAwtcu6ye+ojGkIG8eVJa9sXr+Vlp1t6ndJFCx1cM1oZx8ES+44QQ1aYMQnky8BPo/3KIUkkSsf8FeLBaCm80HdJmmrtMGs/qORb4i9yhUd1YzwA///0ktZFWf16qvA5TR6OJtNOgyi6kAJaTlWWBQQz/9es9mQBhRiL1CPhkc2PdDPC0/fDq+R+rweSEkjxdd+vHeDub17X0eJxE73l8Vc9dx6II956EoNbhGiBCXYnm1bxOA/jdn1uFDmFz3KD7tbXoZfZu1Sc1HLuZPTcZs8h/7sVeLlvXIBGUnrhQn5X0i7eA/YWQNZ2osWhxTlIRzXHV/k58M5crBnLVVcx8H/f3l/SKg== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(4744005)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fZXMXFsEp5X/LTudEXx5wNDlk6m3lGtdNvyi0jioDV1/5fGSzP0c/QqsS//5qzcuJumQCAor1GohfsG+TsGGsOfpYKyGl/LhaxwIS7Io0ur+PbLiMP9FRb+w/kLms86EkohoZaTTkQQxPmYl2xSw40Z2lQqQ0GNK4axrBlFaO+mWEAGObyCg+rT+WyUAopxyF9oECQO00xBSBNsjmpZ+aDylNTbFVTOVYtqyEpSdtZVMV6Uh15NC3Rwrp85iajimvXSHOhFLeyALlWkhJ9hlX5hddA+8g2+zESIPSBWRZn/x21nTWYbC1uNkWtIVJtIhw8W+TFZvUZpSNMdjLBRptugEhOjB+uVUjDG6VmUeLttO2G2V6K7QCxvdHu5riEbTQs915KleoM6osbYMUdn5a5WssJrmHiVaBzpG3gAygk3PKeP4LXKz4kNbNjKRhL0VCBBnfo6qsvZEUWPPfsGJ0ZXp2AdOlO5UvhMQmE/iDw1VKD7RaogwgvQdEyDmybGIqci2m1stWEnfrnJsYxDtvzqEYIVt++3v3jIT0sLiWRckdBCw8BS0HWBUykXMdcHBMvjUjAsOhijFEup7+qofXc7v8G6vdBxJHvASWrPABAWXHayKkn1nWnC3NKWh7bbO097b2S/pS8WGnT1qiUmDWKG7CGVJOtyGgsc224zS6UHkEj7el62u6BGw3a0eVJ0wFR7T86xI6ntWAV6M1Lc/xPCWEEDwsLPO/YGbPpIpsQoE6wHdQtDBAORwC4sV/ATZd+HIP+wkA1zJ9RbroisxOrGECdmJ3PhVQnRrQvlM5h5euyz9sGSUaIeeFMaIGky2Iom0AlFTpN41+n0itfdBap2LPXgQw3ncpcp4hYJkr2l3zI1rqG6TKGnIAmefElMJpF5pBdVe+Ix5IJ+PdBW17IamTa5ttTnLWVLA3Ksc26DuJnk2gaYhwlvyhWYgocpqW90BoYUFeyKQPDpvotDRznfQa9EcsH1eyz4DFCC8ywmapd9Nqny+PKmpoht6Red3 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:14.9304 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: bcf355c9-7681-403a-eb23-08d8b859e7a1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sXcVCOycOccTj4pvVT9JBp9+1np3GBweE7c1NMA5yrEUgbBP2Xlgmoos5oaUvvaikMTL4pyR1C93OqyR0xsXNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Fix Coverity Issue 9006658. In fill_dbbt_data, an integer overflow occurs, with the result converted to a wider integer type Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 836981c895..ea4e147da8 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -476,7 +476,7 @@ static int fill_dbbt_data(struct mtd_info *mtd, void *buf, int num_blocks) u32 *n_bad_blocksp = buf + 0x4; for (n = 0; n < num_blocks; n++) { - loff_t offset = n * mtd->erasesize; + loff_t offset = (loff_t)n * mtd->erasesize; if (mtd_block_isbad(mtd, offset)) { n_bad_blocks++; *bb = n; From patchwork Thu Jan 14 07:28:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426325 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=WPysY7pi; 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 4DGk7z2GyDz9sVX for ; Thu, 14 Jan 2021 23:26:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1526B8276C; Thu, 14 Jan 2021 13:25:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="WPysY7pi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13D2D826F5; Thu, 14 Jan 2021 07:59:22 +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=-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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0603.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::603]) (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 8048182701 for ; Thu, 14 Jan 2021 07:59:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=McqU2uvzsDNFrtZnSL16ZPopG47cufLLruJLWDuifi03cPmiC6bAJmQIdib9TDZDQAtoGbbchrzKRcGkEPexh6i4GAehTa8vzxI2Kh6eaEOVecImjUKQZXBRLZoSDo7AvUoIQU7XL/rvp+8KveL8n0UEuX/t/byi1WoY31K/tev4gpWHv5DR3MSX8dIGpxcX+qL24ylv+/Z7EeanPc5vNMPnp1shdqLyzQGmYHLUddYF2iqOvwypb+hpF2LC2bI1X7qaMHcaflkN/CBJ3ILc868ul+ias6YD8JHC042+FQ4ldVBAHfxh5ouTF7kOnJGifkHfEQmblUfLe4qO0yN5vA== 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=FHzmlZHUqpaLLWhx4lBnZMXs2N39a44CSEH0flRNjws=; b=T8MjO4MdCyNCb28XbWaCywHlHV2d2wYG1Ocy/sT0+YDDyDQXsJSWgfWma0WVO/38wy5+mOn9GDEYIg5LpJCA3SZrT7dBahoPhQe7cRmWld4OY1l8XSjwEku0orimWOtoTyKUGpgZ42wvHDjaUX/miiOJFL8Cot/KLMXjw88fT8iOPmmedJFxbqm0u1hFsd3JeLQj9Fcvcr4Nt7EmXNYKp8lyFJakNV0boeHQMI7dnxlAb0LfR7IpahN82++PZQxVqE98X8uq/IafLYTxt8pLQUuLsXvA+tIKMGE+Gw8n2Ont0fpufId+6Nw5LPrxDxu8/uZlhO8++NVgKbH12Cfchg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FHzmlZHUqpaLLWhx4lBnZMXs2N39a44CSEH0flRNjws=; b=WPysY7pi0KPTR5hBeLNKWoxhLDms81aEjDlPHHmzq3Z0fdf5iw5kyvnwYt4zAl7jQYhfMajiOkc0x4iC61r0TDRlkw7DhNxf1JK38DrHtZ2Q5xGLu95BaMzaQ6VfH8Z0AUN9n8SuZSOT6lx6P3xYJiVAWPcAAGGwcu5+aVwymr0= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:17 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:17 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 06/13] imx: nandbcb: Fix potential overflow in nandbcb_set_boot_config Date: Thu, 14 Jan 2021 15:28:03 +0800 Message-Id: <20210114072810.11873-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: be816dbb-8c72-412a-699d-08d8b859e946 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2qnFx22PIQKV2QPoBw3rcidQc3HNN1awx6evEPn8E9TifGbMsvxWE3AsmvCTh9vFOsgJK/OyYhYKvGdAFj//Zvho5LN9UxNKRUoTDRTS8iIJCc8gPmMtu97DjmJAehvMGb9bD0VYNNV9PfEofo9GetniPhVQ00nKEagHfHIzu4rKFbngIRB3C1hlM8yFIuvUjA2kN2oJyTE2EFNUykoKNlEQMlwfb6JtEt2txmeefPQqYQ9YN/2RNz+nDAVHl3jZRAzmDqJbX0w59WwuYPnbMZuLQGsObsntE1BmpPfFY6AdOmpUEqWMU9tmrYfJqvznaB/IG0l1x/23s0d9HTtCFW7y9WFjLOHz96TMHqyjX1EmUGZlqiox3WtY0Mb+mhKtWXxdakijNu+oj2P4H0LrlQ== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(4744005)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PG0hLzxPeHJhSqlBpDf+kTZu1R9OH3TMSZaJ8A5Q2zAGG2HmjCpzIlYx4IL6Y9jvUIOgpspuUjJUT6Gz5EswCKxLJej9GB0ah+NlkiMBih7ajmYF11LYIRC40VW6qoI8pIWZ34Fxz6Zu29sJv8Ifr/woS04XYHltRAgneNe6XfNUgVypIdqbtT6qWam0DtobO/upqymr9CsNKhYoHdJGrzmcjPgmQvPa5mEZr7Wsty54yERx/92PmPxWw8wV4E87ddWrluzVxJUXhX9ZVD5q1rNtTbyFd1zAn8f3ncG4h5/WSgvJTLCS9ec3OmyP8eF+emZdK9Hkr3ygIEjaZdss3WjWQpclVkyV20TTIyr6Mrj2eGno06F267AX/KxODoWrjBM2byhEV0PFTfD8vZUcAUgx3nsQX2P6tnocz/WUjmPTlU/Eu2hdxzrpMQpoHiXKvgnavHuuCcn/sMJvL8GtwcyFnIRvoY8EHs+xYnRK39bkb9G+/w6f5KIP4pEoGISgoM/rOEWEgyV+GWMNaWcn5RUqcmJHhYmXD4FSPRRuOpE1su1WABvgl6HtD9sSBX3NtUh2VP6nduzmWEuWFB4iUVUmF9wHB68/jNZpljlsJCPLPAGSFM2FjHjGM9jY0boctDgvq09W2rKa6YezGkGK7Nni+XAhc/EcjgEQTGkqgei8/qfXxh26+WS5z7fCdfPMcP5/Yn+uHyXhZDs/94XQNiQdiypnUcNYuEiD2iihJPytl1TIxk0SWzEqd8aNza835iA8ZMrc2Ft7eZSUf8RaVheDGgkLZZGiwpaekaER7mgGZ3KRI9FrRS6CZuP0u0NzY3ZYf0JzWi1xvLMYevvkxRbLdUBZtbvEDxccw2E+8bbfjj4MyheXkThoJnWoqKF6RwKWxyIRrNUO2qQqXGl3kpyU1HUPTP48aQ4dm5KQidNazdTex5j6nN1O6jb6pNOC9LJRqfCndu5aSxd9wokN2Drbp2vghFNbPyeaGHvebPDKbMxEtA42rrhxLZgspDVv X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:17.7271 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: be816dbb-8c72-412a-699d-08d8b859e946 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mdubOvRCboN4bCg9kjrqrgllmmw0S27ic7R4PczNXGSYYBBB9nCaTDh+dpfbHcJgtV7W4lg2D5wBYosSh6/KxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Fix Coverity Issue 9006656. In nandbcb_set_boot_config, an integer overflow occurs, with the result converted to a wider integer type. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index ea4e147da8..028b7c4835 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -275,7 +275,8 @@ static int nandbcb_set_boot_config(int argc, char * const argv[], boot_stream1_address); if (boot_cfg->secondary_boot_stream_off_in_MB) - boot_stream2_address = boot_cfg->secondary_boot_stream_off_in_MB * 1024 * 1024; + boot_stream2_address = + (loff_t)boot_cfg->secondary_boot_stream_off_in_MB * 1024 * 1024; max_boot_stream_size = boot_stream2_address - boot_stream1_address; From patchwork Thu Jan 14 07:28:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426326 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=Uibvq83/; 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 4DGk8C0tnzz9sVr for ; Thu, 14 Jan 2021 23:26:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56B0782781; Thu, 14 Jan 2021 13:25:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="Uibvq83/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3099F8272E; Thu, 14 Jan 2021 07:59:25 +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=-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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0600.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::600]) (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 720678268C for ; Thu, 14 Jan 2021 07:59:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jkz5SuwmGtnsfZzoOdu/h/ARlyCwJJynpWE9zX9R4pBlrwQfEN6xdCX21Wjn/su6ZOMDaCDNt3l0jnlVSlyGcRiq2P2rmXK4AtmBZwTg3Sy6cHwnkEtwILBdcMHUrSOiB9yO0VQvI1jOd78f7uY95zwy9rFm13bmyzTUysAI9vnaYZHNJvB9ZkRF4KADFEYZyhn2QyjTd8oU9ap1rX/JXYuduU6nbnMjbiz/wSE+zgYPRHruNxwwrk7/31FjNkgT0//4bwlUsF5nFYn+ieruTNC8/1GCwRRexdaBaIeHXYf2jshbOuMpYlCz/msuyMTJDT1AEKkAJrGFuCwILYfOTg== 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=ebA7y3ZdZxxPHP5l11jo/OgD0Y0TNV6j6L5PqJx/ym4=; b=NrrAJSnZRPz2cLLVTJ11Kl5Tm251AKFEBtvPVBkGlzhuDyIyPehkmBD1UTzOiRTmmgNS4GJEymMjFeZm+0dXrylwlaAFvCMMXTlFAGmx7wu8HmrEgWS0opC5W/a1g50zFFIOFKYoUn5UT4LvYtpohU+FI14ib6JmjYHj9QlB5qYTAOkeyWh0eqR4TW5lp/H73xwzq92wPKOBCj2Blkd5lxOgLe0KnlV8VL2AmnIJIh2lfKU9kkSE0s+Z/A43w30dvjaUTOEw2doKR1nS16zB9updRn8c4+N2R1MS58lN0diK744aN4+iv45/n7aV7IKnpaX26ZHPwEXNVhBkyFR4xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ebA7y3ZdZxxPHP5l11jo/OgD0Y0TNV6j6L5PqJx/ym4=; b=Uibvq83/7sV00eP+M176Fj+WfMDpTDVBYAMxux7AyUsyhX/qjITAXINt1KUsKL+RQ+K9UiU59ZTGI544F9I91rLfVdNJ/vuLJd1vEp5xtYQe0Gt8/mjcGJys80gKY7f3SoQlHrAqjv7+EC2zujATCfNxvakglDSQuBGoIdLuoGk= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB7179.eurprd04.prod.outlook.com (2603:10a6:10:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 14 Jan 2021 06:59:20 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:20 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Han Xu , Ye Li , Peng Fan Subject: [PATCH 07/13] nandbcb: nand support for i.MX8MP Date: Thu, 14 Jan 2021 15:28:04 +0800 Message-Id: <20210114072810.11873-7-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 248087dc-3ebe-417c-bef0-08d8b859eb20 X-MS-TrafficTypeDiagnostic: DB8PR04MB7179: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pn2J2hPcJP4HlAGsTz4YSvSKZyMKxmwviANChEB8xefEQL0PbR4kS24uU1Cm60Ybiuucppkivzy3bp1mj5PNg0G9ubNQaADesSE25YjDfMzxN1YhWhy6082eM0Y0edAcQkHhIfo3W8c8a6Fa4JgIX9WMDsdRqHiZEZ9flMMA2TgfPny31q8CsFwi0OrmFY4gmFD9vr+PazfI3H6Mt2AF1a8qbJ+OA6vqmKZ7bNfXsJ0+SLwmqlwEtys0pIJohTijM+M8cg0ud8bt+wdbIf6VnQMePZPwJJ5I5aCC1ZFqgkZQedFi7j8taZVPz+6q5+DgqVKNJub8nIj0nkbTsuKBieqLlSv+WVjwZgkUkNhi2Por4UduBpqBDR+18RDWjJE4JQ0xTm38YBh3Mrz3/tnEsw== 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; SFS:(4636009)(396003)(39860400002)(376002)(366004)(346002)(136003)(86362001)(4326008)(6512007)(186003)(8676002)(66476007)(52116002)(956004)(54906003)(6506007)(478600001)(6666004)(6486002)(16526019)(26005)(316002)(2906002)(66946007)(8936002)(66556008)(5660300002)(1076003)(2616005)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: xFiY19cQTwhBbcBbXVceQWv8nZijDdG/ev9TlK6nBCICImvsbb0BNZD6x2SL0yNd+Oiz8gqu59MiThVYlRG7D870Lu5dagQgtmqNQ3qGFYkL5GIvfZ2ES17NDoerrsuFlDcGexYSWuZ8KG/aRkX9OyXwiI9Fj4So9ktJ63SG4OG0mi1svqcE5mUrE6zDPhJtTEv//Aj/viNL3vWddl+lwixOih9n5EfEb+58EPY7xGz5npWtAfx1cv+oPMm7KxPWgFWIlQ7cOFaIGxuxkW8cYkf6ygrhiV8O+YOAn6rl8iQR8WAI+UVChrYDiXZ+i3S+PzL7nPgFWANg1dacxBjPsrnt0aWru+SXpuQMEh1L/MfyFa5SK4+eF53BSCY7UgS0xf4ng4oLkXJY0nrwZJHK6NmZzfdN+xINEqNMWgS0VrlcRshu96alnYzam3E4dEUDgbQQyntHLkyq5Iw8ff4r8euUaQ/d+h9aoFMayDIzqqknNMwe3P+AgnbfW5H8mYoH6RC2SmhYX3bvc2BzeBrT6CkNJzn4AfjlbE5mvE41xXsSBfDblXxbQEmemR1kcZDoM1ez/s58mC7Z0sayDA4icyFL0uUi3R29kqlgqaobrP3vO5ifk2yv8jSfwO8gdlvSOEmfbm3KYJwgS3nbYIlk7jvJsDT+IUa3oe73vMHhn2pGskXMTfvckW1sMeUN+PW/5iSsJJUSz5Lk7HcK1TEynzjLRAyXSlNC205ebSf4MO5UJIthU/USS4i9IBz/bW1P9vcxv70vJdhStafr+MOpOXFyk/9+O4R6R8wzW7qXCkEIcxYLbLzb0k7HGU65c1FDKHyBAZ1f92M/jXop1IjJkepUByp4HgCrukq07izCGmP7X+wOl28RmtSweWxUzarELlFeb+cMLj1zMWley4Ffkquc+NCszbyxRWQ6uHmNOabNFWXpVIkB9hGq4RjnsQGakYn/8oV4sW8sFKNnyUP5h1Jtmsdbt36YQRwT/03YJgHYGhI0j+SFCM/Cx/VWvAIj X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:20.7667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 248087dc-3ebe-417c-bef0-08d8b859eb20 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bis6I1LAnNX6HzBgcpR5RO3RZOdSe23YTb1BSx+nYkv2Islu2lc9RZrUsoSw2ziSom8PfQQrNOI3SHFDvAdyOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7179 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Han Xu Add NAND boot support for i.MX8MP by adding i.MX8MP in nandbcb support list, reading boot_search_count from fuse. i.MX8MN NAND boot is same as i.MX8MP, fix some issues as well. Signed-off-by: Han Xu Reviewed-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/cmd_nandbcb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c index 028b7c4835..7157c9e979 100644 --- a/arch/arm/mach-imx/cmd_nandbcb.c +++ b/arch/arm/mach-imx/cmd_nandbcb.c @@ -1487,7 +1487,7 @@ static int do_nandbcb(struct cmd_tbl *cmdtp, int flag, int argc, plat_config = imx8mq_plat_config; } else if (is_imx8mm()) { plat_config = imx8mm_plat_config; - } else if (is_imx8mn()) { + } else if (is_imx8mn() || is_imx8mp()) { plat_config = imx8mn_plat_config; } else if (is_imx8qm() || is_imx8qxp()) { plat_config = imx8q_plat_config; @@ -1496,13 +1496,13 @@ static int do_nandbcb(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } - if (plat_config.misc_flags & BT_SEARCH_CNT_FROM_FUSE) { - if (is_imx8qxp()) { - g_boot_search_count = fuse_to_search_count(0, 720, - 0xc0, 6); - printf("search count set to %d from fuse\n", - g_boot_search_count); - } + if ((plat_config.misc_flags) & BT_SEARCH_CNT_FROM_FUSE) { + if (is_imx8qxp()) + g_boot_search_count = fuse_to_search_count(0, 720, 0xc0, 6); + if (is_imx8mn() || is_imx8mp()) + g_boot_search_count = fuse_to_search_count(2, 2, 0x6000, 13); + printf("search count set to %d from fuse\n", + g_boot_search_count); } cmd = argv[1]; From patchwork Thu Jan 14 07:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426327 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=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=OUo/hmoR; 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 4DGk8R2857z9sVX for ; Thu, 14 Jan 2021 23:27:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DB1C8278F; Thu, 14 Jan 2021 13:25:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="OUo/hmoR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8C1B826F5; Thu, 14 Jan 2021 07:59:27 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::622]) (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 137D78270F for ; Thu, 14 Jan 2021 07:59:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZU4aOypvBtS+7xt42dyRhvr0npzyD1oanArZQt1CW7ZYB1QjnEkkoZUSVUv1QiWBTn33e2o9E1DtFYYWio0j9uQVWpLjvzeQF7+nDbTVbkx5mYvUfqPS9aU9HM/g77Zv1Mn/6vrdRwdL1kKpTb1j0mb28gl7JoAW8Q8jwx5vDnCeBc6MAkQ/mPm9wjty+rVefoh5lBqXws+BL2VtT0rZ/SvroXgkYPZUpboAeggs2A8K7dHxlPGrrWvsbvTbb39hlgUXY3o/rTwyH2S+npV7b7Ye7NUIjTaeJ7b814VAzx/1aVYE21bJz4QaeytEnKvBJwG2ftK9gZ4M1SfE78kw/g== 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=xG1sIAbT98xPkFFFnHuoW924w2FY3XTArPUZldj5P9c=; b=Atpkxjp5OxRqUpT7ydTTSaxEhCs/A+dsQxmlbZT791wsmHg3b+r/vcZlxHbhVCcLgEqQXu427NwisRJihfB2nXi7riCwcdh/QaWArSNmwAh2ZIuC3prmSfcr5htNGvPqB/Z18YMmQfG7UA5QyIeIX5mVPZfXsJKnlsoFAQaIxfw153UtTWqN71MjhdJZpZbDdROFywltJ7V/FmMpbF8ee6RBLpBtwIbB5gtkuXeXSNFEz6d7OIDvH7Z8sd2hz/ty9yI1TXGyxaNWwyrrj36MHxLB8BkR45XKs+uJt4B6O8BFo+j5XTKgmcK4mgPinScx8PVL7wBMGxuzAkdt4EKntQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xG1sIAbT98xPkFFFnHuoW924w2FY3XTArPUZldj5P9c=; b=OUo/hmoRT1UJQFtDu0Frmjtmo55t6H2JS0FfDS2N69aGjNzdpsq0IhP04MggPgg3Rt9EmWnhFo4FWkq/bUs4RN1plQj/sKAifSGup4P2VctM+EQBozmftRANyTlNkgYXEnF3uUez9kltMabgePNmfSKXcrCbZSJ4NLc4w/SfrC0= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB7179.eurprd04.prod.outlook.com (2603:10a6:10:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 14 Jan 2021 06:59:23 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:23 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 08/13] imx: Fix market segment fuse offset on iMX8MP Date: Thu, 14 Jan 2021 15:28:05 +0800 Message-Id: <20210114072810.11873-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 68c4de96-d689-4bda-6c98-08d8b859ecd3 X-MS-TrafficTypeDiagnostic: DB8PR04MB7179: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eEDMZGRQzg9nUDu+NReMK4QqmWpjQfAFPoQnT2QjRzlNKAOqIEE0C3o/jwTlRdp/3FmFbjEN3QG2gmNwdT+lAVj915kVFSQBeGEqgr5rpuLWB6O+IfjR4AJaf0XjUa1tCjijTwgR7lMTXHOcADf41ifI9LXET4ZCRy0D1cPhmCFZA3ml1OXDFj447b/YnI313u3wcMT8ghm9rbBczKfhukORyKZaWw0amEysPVE9ZAet0JAZrdmcCRpfB5EEdx8TZd7PqydWxM7nL6bswrKcR14zET7hs7jlPGturvoNfGLrVB88/tYi7bIhefssa33XL3Xhqlm62LHYuKtN0IrBVCROPcwQvh+J7GQ0xbAmc4aSY0/G+DLlWg3DdY20Ea1+l1KYoWsvO95V9bMd38QYmxQtVY+tdd2AoiasJsEUP7i9JiJS8+KyRNpx4tDqVrpf 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; SFS:(4636009)(396003)(39860400002)(376002)(366004)(346002)(136003)(86362001)(4326008)(6512007)(186003)(8676002)(66476007)(52116002)(956004)(54906003)(6506007)(478600001)(6666004)(6486002)(16526019)(26005)(316002)(2906002)(66946007)(8936002)(66556008)(5660300002)(1076003)(2616005)(83380400001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L/urBR9rItpN4RPM0CqIrw29ClV3td9X5IYdK0MKG4CGelWx/lMZygAX4y3FEyZ0sFpBy1/FVUyEgP15QZ55CaFWOZ0iY9ivWJHlZJw9ySX9DTvRLyFGHWYXh08VkS8DKzHvGYVG5EQs5XiHCSJnzKFQxptLB7GXkl0sk4Kej/Q48SsQDeS2UdaGjLxKXKr1p+U+VpdZpFmJ3hhKf8L5arSvhxKPlU2Rk7zCxTyoRS+byPjvH3kZU4UUBhW4KpdVdoHiSMIDQbbA85yuDwDCIJTjyAe2/X9Xgj1frZTAO6Y+SvFdIO9BYyW86h2h4Cwg3Kswk2/Ve4+IIzqXPygcVXUaiqFGEKEJx7Xa/N9s8d0ERHVE0iHldAuLY4jH1bQXpuQSW2efpvdBiIqh+sSt9fiWxDrnxn1ar2ewwZMYVGmtxzg+rjEDjIpnOKAz7iRM1bjkb/yfuJGS19KA+fQzV+X4EY0NxnIDSYmWs1F2Q0D8DPcTlwO4wNwaPS8UZL5a3m4q2tETwkSYre2qWndErtJ0o6Dsbv68O1jtcKJ0xEpgA71xqcTTSzu8TC6XvTl0yWbtqfAj6gD1KAy/yIqs9uqKYbXiT+upxNSOG7SNXeWjpyjyq01sKAmGjQNKayAl4EHTS/J1iDRweaHuV0IT8eH20S9gfqWvlQUwNHnNOwfmwQi9QfY3Mn4MBecS7tfho6MRN6WvFfxjb64E/sWA3LOQ+AOD+Nl7LvMu6LoB+VzgIDxqedTLPlIzh728xmWGlNstttLhOj/SYwvXY5bkth2H+cGC0bEXnS6nu0RNjtYqfY4iIP5srkkcMNEGOPUxEdEb+s0rYuZ0yxbI22L0k5HCw3O+VVOhm53tx/eiYCw2Yg8tSQf2LPMkHI9m2e0lfC91aULYO/9UDL0zpBep+Aa9uVS3agjvEAVvMmppO1wQwHRXkE9mF3Q1TF/+TOYfzPQMq8vvlyRVkaLL5jYmFUaENVseEKhdl+rirRRbIaJIOyDOBqbctWF/orFloREd X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:23.6644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 68c4de96-d689-4bda-6c98-08d8b859ecd3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5XU9LvJ+y3kTUQfn3lqvFRkT1V92gIhRyFFqCdKPhzseegqTueC6ZFO8z9WAHsfWyk1UPzoeR35CitLMnbfHRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7179 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li iMX8MP has shifted market segment fuse one bit from 0x440 [7:6] to [6:5], correct it in imx common codes. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/mach-imx/cpu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index a4d8f101b6..425d0f0327 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -385,6 +385,9 @@ u32 get_cpu_speed_grade_hz(void) */ #define OCOTP_TESTER3_TEMP_SHIFT 6 +/* iMX8MP uses OCOTP_TESTER3[6:5] for Market segment */ +#define IMX8MP_OCOTP_TESTER3_TEMP_SHIFT 5 + u32 get_cpu_temp_grade(int *minc, int *maxc) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; @@ -394,7 +397,10 @@ u32 get_cpu_temp_grade(int *minc, int *maxc) uint32_t val; val = readl(&fuse->tester3); - val >>= OCOTP_TESTER3_TEMP_SHIFT; + if (is_imx8mp()) + val >>= IMX8MP_OCOTP_TESTER3_TEMP_SHIFT; + else + val >>= OCOTP_TESTER3_TEMP_SHIFT; val &= 0x3; if (minc && maxc) { From patchwork Thu Jan 14 07:28:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426328 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=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=D4pFysSx; 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 4DGk8g0x6Xz9sVr for ; Thu, 14 Jan 2021 23:27:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7146382790; Thu, 14 Jan 2021 13:26:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="D4pFysSx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A9AA58270F; Thu, 14 Jan 2021 07:59:32 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60e]) (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 0108C826F5 for ; Thu, 14 Jan 2021 07:59:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uh6/AdtLtBP4w+lbCj8przgDs5gFFL7lD5c4LuFshbnFvZDVdG6NOxSrys1959yb0BiUtNXm82567GRkYhpiz+OyLxMWzhZ3/dQqu9Ho3zG8jAMstS4AGQoSrjxjzgLGo00G8gv0Tnpofsr/zAYTJw4iCZaLrXJ4eKASv1PZyl1bTpr4w0nGGloIBsw3NmaAGwPHQv+BBxSY7wiC53HgEHgy1RO8tqxM/aFuJzLsQtIoyCB4rC2DTPIzcek807lRijzEs61cSRahoXCK9w4GoaCAfgvKTGg1TMk0OnSVCovXtXuu5CMXcKaT1xPGpr5POiW1L4nUJjkuYpvgcq4kMg== 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=Rb0lBIUSDrTmGQmmasyFqaR3PhYsrWj0blEQnjuob08=; b=S9GP7xm9R5tdhVR/f29y5hu3ayvEp99rMyNS/bv+5dbgpjRgHJ8M2i5ySP620OEbjjtRCrdvGsldb6nPqG0YwPnrNp5vasM1ZB1XyubLM3t1r2xnzKkUTlPQ97scJGihNvP58WhhQcQmbZyulfy546Uz7/GBsW7tp1H7e5iL0ZqaK6V1/4zh44hrxFwkc0sjcmgpARQ37g7AnG1oJZ+tYUrMqwtrwHZfzvaLNvkJ8GFmvphuzqWC/6QEacAZQg9qxd0BPb6/iV5oy9YPccg3H0tuHhyqCDFr96o0XgPSsAr7di6pSBj1dDR2Z/xo+0+xG5YcjZZhjQ9dmT1n8/jE0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rb0lBIUSDrTmGQmmasyFqaR3PhYsrWj0blEQnjuob08=; b=D4pFysSxgspmS8uNzAAjaBaVd5XXp03ay6c8HJeM8BN3TtLmM/td+IpzpjOKXMmdYTtpn/QkI1xg1785ad1G7Si0Gr5Ux3JDQpzopXQ0jtXA+tWSdQX5bdZn5as6VuSSZjB29ZFt8izcDbN1/aWEhKqGJYPsjltU4jg2Su8NJss= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:26 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:26 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 09/13] imx6: Remove AHCI device before boot OS Date: Thu, 14 Jan 2021 15:28:06 +0800 Message-Id: <20210114072810.11873-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1f04cf0b-fcfa-490f-690a-08d8b859ee74 X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:758; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qh39jeilqz4wLczwxZ+KVf5oNgNnUvTWoA5vZnjMn1nf1wraM7u1sFUoykPZ2jU7h6uBRBRxFSybCTLYSsprx8EELJcCWkTC06ok2ZFYuYYli/baa8jIRpjq07ji3rg0v2biuP1Jxwp+EaNq3vCoMVjzDtz9h4378auylZPqBJWs7z3k/ivzFHL+j/RDD2EyuCSnhxOU/EshW5Qe2hv6TP2C7D3QDL5FCuaeOwR0mwn8VyVkEs01DYAsSf1VpAO3iIivyy96zhtMkncZ+6tH93shYIEZflY250u7JTluuwtlhFMcFjnWZBWJa3G3cZCT9NN9eQYjm+TiHnESWzdB4ToRtKcT6+h/ILkTsraDoJE5a0D9fEyta00lEn+5Wb0xPv7chmMMTWnNsG3azRs0Dg== 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(54906003)(6512007)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Pfh892S+UXlHoq7iTKWDa5QTXSCsbXLxQ7+vVseGRDWB4PzTeb+kYDBAU8mri952mo8HbmtXolL/fi+LIQiTCiIvvzCXxGWkCzbVjC1lKsU42ONCnn4Xdnkw1fjJA7zQILJDmkDq3CMULdriuYbC1/w9TmasL95//UJpGHYjOSZ+vMcnWxBvmhjpQUFakQdiU5XnLtfdANpnBbDVWlfmztbvQB5xkYvECHgBrGc3p4/WVwz57crTNXCoSDsTqHQxAJABizBCu0qHFCBAMW0xNye6qFi8NhdM0PBhc+x8LvpaYBU/RZRaOqYyd4tV0ADH8DN+pfM3UOWz9W8J1mt9LR7aiIsG4UX663kFAPt1AO3IdMIgjF/lWSJbnzArNHe40T1OE2VzSLQZHxzibOcQvbCBjvEmvD8XX2TYOWdeN9dVoNazIzqyUrPhWBTm+AsTn4gvHovDks8IzkjxLGKIIoAFaYYaXLTHaFHwJ8qXEmyTE3uMScSfZEW39oQout+/T2uAMli2t0VsWF7kQiYlXzwCwSCfTKEhWrzniRkSR++S6Rpn5yI3fq6y4j20UMwP4vKHbhTuJYoRw3Is6y5aQPb1LCENcuVO2F+awtfLnJT9ktPmBQFy2/6aiSxseaKlcN+bapSavUa5OmsyaRXBgmSyN+tKpxRvG8roEil4F/57gaBCpoO9u0ldGv+t12+4RiW4DG9yoDOYr0LX/oR9ZBVGiMyhok10yYfVXyeBUDO6Vwof3Oke9ub/TttzjOuSVOSQq84u+8fNFet49f9AkmETiRjo6CpfohK/GrQpQf8Kn2ZBNBx6rM0Uycfo2p2SO68LBYqZNw3d6aF0C8677kVga/jDbGrP+EZCh1rjqDIMweH0/1ATgaP84ECEobWycORYEyMJZ4UrD1+cCWYvwFqURpH+baqh4VbBqYaBoTsdtiSqnbSiZfHIDjhiITapRA2jCATz1FzaduEveCzOyaOLVGFw/XcNiFqCxs+bGzq7JWOdenYlvXuSNgI7cr+N X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:26.4652 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 1f04cf0b-fcfa-490f-690a-08d8b859ee74 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6sE9QnofwH+QFiLMLveuL6NRpGfwTOn0QD9MPBZTYmWtqC+Gtgp6X8onkzb4vnPpxUMZytNIcCodUNwssv5J/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Since we remove SATA device before boot OS, when AHCI is enabled, update the codes to remove AHCI device. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/cpu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 425d0f0327..af0b7fbf7b 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #ifdef CONFIG_FSL_ESDHC_IMX #include @@ -278,6 +280,20 @@ void arch_preboot_os(void) #if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI) imx_pcie_remove(); #endif + +#if defined(CONFIG_IMX_AHCI) + struct udevice *dev; + int rc; + + rc = uclass_find_device(UCLASS_AHCI, 0, &dev); + if (!rc && dev) { + rc = device_remove(dev, DM_REMOVE_NORMAL); + if (rc) + printf("Cannot remove SATA device '%s' (err=%d)\n", + dev->name, rc); + } +#endif + #if defined(CONFIG_SATA) if (!is_mx6sdl()) { sata_remove(0); From patchwork Thu Jan 14 07:28:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426329 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=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=SWYy5fIf; 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 4DGk8s4QyCz9sVr for ; Thu, 14 Jan 2021 23:27:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63637827A3; Thu, 14 Jan 2021 13:26:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="SWYy5fIf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 698F3826F5; Thu, 14 Jan 2021 07:59:33 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0630.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::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 99BE88268C for ; Thu, 14 Jan 2021 07:59:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SkjDRJr7ysDSHFflJE/wX3JdgJZcR//STAIRHiAu3CZG7KcQb8tm3KIKP1wXSkUxJIqKyjpxwTzLI2ezP/e5q+J2Cw/12gioQjAJefxPTsKOidwm0RBiLAALy3jPYO4N1s/XGKQ1VSY+ZOlXAuC+R0UgkvsiTowXmE6y59woqSJeWf4mw7l1DciS+As8+rSzz9zFjSXnJalakAtZ6lh3YqgNiYMfhTcR3I95kLbl9ZBbCR/H581tcnOiwzR/gaXZHCbPDTu+fMjeOldMDSpis75+EjKxc0V40OEHjLpKrLMcwmRAqdg669MxukWWhRMDu/cxVR06rX7NBclP1eN4sA== 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=DtSZ95K+OQl3W7FIG+7AiTbgy+Zj5SVCj6NXkSqrTns=; b=Lnm+SetDMEKuo8e4G99VyBl7borB3Lbvb2Rk2FYjpC5/CpcaKq826QCalhFqU0H9oOnpzsgxph9wv66CIr+LwEmnYy1BijEXin0Qb7Qp3IPUmZOSDyBWvLd5P3bRKwXSeYICjeW0TISfUzK2jS4xWQSi2lG1gWOn57cIsCTzbQ817OoF3xtecuKc36bGHgb8XnN+xBBX2M/adDczbLTxIbAf0wKCyW/ISCL7eHrl/PDB+YA4ER4dF8m/KeZmKfehYlTA9VhrQQY3u/Tub1oevJBv2naPCmeXm30PwLSt/9KXi/E+dGw6ot8WfOS/1wtne+0vIBrAyaoPYt1DeNexLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DtSZ95K+OQl3W7FIG+7AiTbgy+Zj5SVCj6NXkSqrTns=; b=SWYy5fIfoDz+6N4JPIyUa0CJeXMfi/+8n7DXFRXUfa9m/vtbTuIP83z2xTiD0sJsW8Z5x9cvf8Xp793PRE326pH827SHOW5Ik4KpypNbTfDZDi4rFTpSM4ZmAj1BFIIQNGBdPoJSpjh5CrQLAvnW1/8hfQFhUFqxmUTtfW3KtYQ= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB4634.eurprd04.prod.outlook.com (2603:10a6:5:39::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.12; Thu, 14 Jan 2021 06:59:29 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:29 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Peng Fan Subject: [PATCH 10/13] imx8m: add QSPI boot dev Date: Thu, 14 Jan 2021 15:28:07 +0800 Message-Id: <20210114072810.11873-10-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f0dd2664-fde4-4ea6-b4a8-08d8b859effa X-MS-TrafficTypeDiagnostic: DB7PR04MB4634: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uUiQNokUyh5K5IOVU5erSNP4vMkfQxImZKxwAMvKVlIJRSW20iWJllBGrcCYI4Le61Fskt5Uw2QV+o66Zb01YyoQ0gy83a6azyfBXg2EChm0HEWJ5FSxsB7dXPBZaz9zTbnwmp/Zljs7IyUoZNznqApd7kg0MatSwz9STvEKDuyH1R6lwXcVO/zTS+7N60udY/cIjOUGs5bd8XU9c/P9py6EhJkKt15zITW3Qjg3zik3GxrRO+RTkxE2EwLOCq8oJ/WEin6bvZtfw42XUccyUVxL+C0+GJp3b3EbrsJTGflG0VBI1E9sCFnA0D6wnV72cCtY8S8czybYo0D12CyNCFAsaai94+dksU3cQhe14sRFIOi/23UPR1HNavpxk7iQYyPOr5Dvf4hCGYcs7z+joF8hxi5KcDn1UGpKMB1hIEt1Mga97By4TfgwICydkfvt 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; SFS:(4636009)(366004)(136003)(396003)(39860400002)(376002)(346002)(6506007)(66556008)(86362001)(4326008)(8676002)(2906002)(316002)(6486002)(5660300002)(66476007)(66946007)(8936002)(478600001)(6666004)(83380400001)(52116002)(956004)(16526019)(26005)(1076003)(2616005)(6512007)(186003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GDQS8crztdx5Cp9oAy+M/O1mJ7jDhrA2eCr6yntAVgLklmoG9B+jMQWCor26ufQ8z+vi2n622bhNkVPPSFmC7cnN/sSZYXxRTg5sj9WZq2Ijg/shgb73t/PgrNhgiqVxkWTdSh/l5n5x4aLLHuxuBUxq/B1iNnwg0K3tYwjO8jCsBhel1DmCFZ97RT3HRDadcbI1ay74jZwy4fBCkaNlywxLAvp/CY6huj6W2elwHxaZJm+P6N1W2pJQgvSnE8CteZk3VxyqCfmUGpaEFVT9qaip5S9Jb+F8z8on2kIU2aFfymRxN05t8r62MUwZZeuRrhK7UZcdBc3FeUhWqRMzehqldzNQvDRnMhe6BBweB14QoIXO8D59JACbh+AuP+1NRj5huBLf9MVginhxoSmbf3FX1ObRVcVsd49TANRNnBNNuq8SPBvL9veoNfSVPx4tWzoTjzXkkpI5j0LRKUCJd4/2RMd6XhKurkP2M+UmscuJzkKbSjiskS3AhelMnpUpoUL+C6vYogVWSXh64G2VhoGX+uWp+/QLhPXFj8BJh48N+r3+gAtTCs/dSErzz62nd4sMTVjMTNtYBOmSz+5XJiHIzX3+Ji4JoDEcySRJTelHCxM2+vlV61ZJkiDN64yqMOpPHmuWMiRLm8oOUsHJZuQe+TL2iJngJKDLaBvS2NNY9gGpE9WV8zw5vOhXRSui6tGeSdMBmx5/TtNYnuwzRY5lo5xPe4+PfWq2sn2PH9HazezPpGgzn8nXjDULGdLVd/uHdGlSey7KV+3/XQL7Ccvdo7FFsjkfZ7NFjkVexwsx0jJBxfl3WbeYmep3rcP1Xt9jwL5+8poI5xJAzyU8AsOcZYYWWmhsQE/JDUxE2qyghw1iXdL5M3osCIYlytH7tmLxnMNk8ubuFxMWnoMqTGq/+c7oKyDRVQdYsjiLu51PlOmdignX7d2i/TcQGAavHQU7Pt/7ISbKgf6qJTpKti5+c5CjSabS5pter1zWWqS/OQ4Y1zmatH9w00UJUrip X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:29.0350 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: f0dd2664-fde4-4ea6-b4a8-08d8b859effa X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EtyFYo8PGSr7rkeIW2XKFluK8XMXVO4UuITNBxaZYOlvgeGxHjSxWXAteIcDydm3oJRjwpTzIRtMvesANmLBaA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4634 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan When boot type could not be detected from rom sw info, read sbmr1 to detect, here we only use it to detect FLEXSPI boot, because ROM not update it in rom sw info. Signed-off-by: Peng Fan --- arch/arm/mach-imx/cpu.c | 6 ++++-- arch/arm/mach-imx/spl.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index af0b7fbf7b..38b87ed5c3 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -467,12 +467,14 @@ enum boot_device get_boot_device(void) case BOOT_TYPE_SPINOR: boot_dev = SPI_NOR_BOOT; break; -#ifdef CONFIG_IMX8M case BOOT_TYPE_USB: boot_dev = USB_BOOT; break; -#endif default: +#ifdef CONFIG_IMX8M + if (((readl(SRC_BASE_ADDR + 0x58) & 0x00007FFF) >> 12) == 0x4) + boot_dev = QSPI_BOOT; +#endif break; } diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index aa2686bb92..2d15f62445 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -172,6 +172,8 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NAND; case SPI_NOR_BOOT: return BOOT_DEVICE_SPI; + case QSPI_BOOT: + return BOOT_DEVICE_NOR; case USB_BOOT: return BOOT_DEVICE_USB; default: From patchwork Thu Jan 14 07:28:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426330 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=kY6dxZLL; 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 4DGk9407mFz9sVr for ; Thu, 14 Jan 2021 23:27:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8E17C827A4; Thu, 14 Jan 2021 13:26:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="kY6dxZLL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A8BFF82701; Thu, 14 Jan 2021 07:59:37 +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=-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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60a]) (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 55DD38268C for ; Thu, 14 Jan 2021 07:59:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F57qUSkQ6zRp8i1eBlyALTkDTHS/u7JB1uyCA1kf7fmbIHklYOI3W2hry00/uZoL1ZNGF6b596al6xQCnBU0nK2kQfCrwInUXSah01LqAjcDJZvOrO0cTb8Q/u7Lx93swAyqmSByvBE45ftiOfk5YBh3xoDodQEDPVsteMV2PZv+XoOb7uHt7jjL6wTohSFmiZN62OmP9NLXOKUs/+sdrpG/SGYqXYHIEJ6Kx0sg4hQwNfKQGf/y5227qhvSIH1CQBa+nkekqiAYzWX5NaeS/w/kmJw00SqRNsh/FY032dltAt++O7dRsG0Af4Y88I+bJnTyLQ1GJfmYnn11RzcszA== 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=8YaG/HyBFLk5At3CMJVX8vk3xuw3qTMRvdIo4NA4Nfo=; b=OLi7qiMLC9S5xF5rx/SnmUr5IelAoMX88jbj5LjmmFJWdPQ0zzfHF/3RzhPcT5Q52026wKuFsqqIylK3VoGpmL/63mdaDYdAGGo6+PtZRm0pTe10aYjzWWzWmfiVDOo0aHEkx9/SFYJtp3RSRZWNmyIfQKxyWvU2qGFBQ6uPj5UoQkj+Hsg9H5YFT75BSQivrTldE18DrcIoQ7xZYgBEQrKLcNpA9l2kZu+/MnJq/eI830joegzn2XwYcWdUMLZLSXTE6anehJ1/IsY+6Ze9fwOM+yESdmLRBTwARVpCb9uospJ65wR/roTqHyptbrf9TO9b8Ef2MDqMw5iEFMvrPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8YaG/HyBFLk5At3CMJVX8vk3xuw3qTMRvdIo4NA4Nfo=; b=kY6dxZLL2Zxee4WSXQKX+qb7RJsfhEptlv3EJAx9mXlv/BqrqP8tWA7NEYTuMShQd5PSgttL7ouNGfGly/ktjNgDgTL4BDXwASlA5/Kov5qOP4oBJ5rpjkGJ3fuSKsPvhN791o1slYDknT8SilcPN7HYuBhq4QI+Ysfv45coM2o= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Thu, 14 Jan 2021 06:59:31 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:31 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 11/13] imx: Update runtime SD/MMC boot env device and env variables Date: Thu, 14 Jan 2021 15:28:08 +0800 Message-Id: <20210114072810.11873-11-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d3ec680a-3aab-48e9-ca94-08d8b859f1aa X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: buKhinniTN0NrnvvfWZ83/pXTVJSQuJT8UfO4XhlkAiBd7Qw42z+KbL7RlPnLDqxc1nyK86EpviCtF0e80akry+oEkclb+CkuK/7ocdmxjXJBKS0C3x6O8ejXqit6TIEhiph1xu1i9tE4jZP19xZ9iMNDA5oi7vGUKWlqJX0z0WiUhZe2LosNukf/a6T0RM3BQ/6dmOXiCC1sbO9ViDXiW1Au8Ss0zEolkI1s6pQqCWtUSG+oqh2SUoj3ETrw6lzmZ9YOcB9Wlg5hn22JvEkhPPANPrQ9s5XJR4pbJUlqGpEMPfhEX/46I9lAOEKOU5bGiCdLSl3lCfXgE8F0UDTxS519jamiLTDZ73LZcZr8i34BTn7/WqVggj5Sd91EoB5xNpLsbn81ZFBFJM0ChTqXQ== 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; SFS:(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(6512007)(478600001)(86362001)(186003)(16526019)(66556008)(4326008)(8676002)(5660300002)(83380400001)(52116002)(54906003)(26005)(316002)(2906002)(2616005)(6506007)(8936002)(6666004)(66946007)(956004)(66476007)(1076003)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: InaNIPDkQwV+9xK9cFLKyWCFFW0brBlMk7BBntLIvSrr8HeTtvGi6WNFWkqx5DtjpGnu8XzHmyKuCSw2ZQjEL3PElU3SD8kDU/m7oERagGzH8Fw1nXVnaetIZ3e7McPhffG0ag0KMdTfLxRnPKJsRNg2UV3PQ1QIogGm5PiHIipg0ttI6rMWct9+/eDXUNVPkYutknVnhOL6QtZQ8xJk9XiX7gsWiFO7+TbGolRyL8iuNRAziLvqG3ru6Cp99/I1VPiX5ne76VvX1bhau8qVGKEZZvSCJNnk8ge1yCOqAVsznVTaRsxYHWpeikj+6GEeUCr6GvGV0+yHS9zUpxtk0jlY30eXTMl0+wq7HLtT4ysXS+HOR0v+7jdu1yl9gpfqoUXOcpj3FB8D803o6I5N55oJ2bOU0moLJ/axmtqoK5Nj3n8w7WhLbhuBbh636CInDRTq1BXZPCirhvzc2pdNyCoS51jzVtIrgdrxQENdshJ2TnKdCICnQtq2P8YyppyV0/3yU/hWE50u6wVByvfKeFjl/9HtIKeIU9kVvT2iIzblHWJi+suBG88qnRbfPtfqWRXr/NMsk7Xj2LDy2Nf3DkMH3r11H/RwJz47fC2+5m5jLdLmhBgQHww4v3ALhlbsYD0RH2fy6zhlnXz3PRLHIFDidTlC+vX0sPVzab/u67rblFlBBtQ4sIBF9qzFLqgcBNWFx1k85D2VLlKb5TuG9cemZozhpVdxOkTCxmDYkwHIBve7IJzUAXhseuKk7U+e4a/CSsIRpJ9ImGK0XonCuevm/7jKmNX5L0j8qKjfF2iN8eKn6wKt8CR9/IjrMB58OsbNStyA50+v3n7C4XFKM8F8ybd2bQ733RWH/DiDFI6g3GCq3dyz27N+iZ9EDFK8XWdPHOeBC/PAeIYcY/aaIL6YdG5OiXuBZZQifj1PyY4JYIFKNiIthI2p9RnJx4Q0AIDZH6Rqsz7zVjOGyXg8uHTHxPqja6OJYiB6CNn4lhBMPC/cAawp3mQuKTF9OyGm X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:31.8617 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: d3ec680a-3aab-48e9-ca94-08d8b859f1aa X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: V9/K8KT4UMEJ1YrP0y2g/bg/Zo+2gZRChYu0NX3DZOTZchBCsmi2sLveSj/2UMl+qJIgdGS0BPLOV5OZxGHMjg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Since we enabled MMC alias, the USDHC index in u-boot is the usdhc port. So we don't need to convert them for kernel and u-boot env device. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8/cpu.c | 2 +- arch/arm/mach-imx/mmc_env.c | 2 +- arch/arm/mach-imx/mx6/soc.c | 2 +- arch/arm/mach-imx/mx7ulp/soc.c | 2 +- board/freescale/imx8mm_evk/imx8mm_evk.c | 9 ++++----- board/freescale/imx8mq_evk/imx8mq_evk.c | 9 ++++----- board/freescale/imx8qm_mek/imx8qm_mek.c | 8 +++----- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 9 ++++----- board/freescale/mx6sabreauto/mx6sabreauto.c | 4 ++++ board/freescale/mx6sabresd/mx6sabresd.c | 4 ++++ board/freescale/mx6slevk/mx6slevk.c | 5 ----- 11 files changed, 27 insertions(+), 29 deletions(-) diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 911d6a51d1..bdd4b87192 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -205,7 +205,7 @@ void get_board_serial(struct tag_serialnr *serialnr) #ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev(int devno) { - return CONFIG_SYS_MMC_ENV_DEV; + return devno; } int mmc_get_env_dev(void) diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c index 9c822f721c..9c1d3cdfcb 100644 --- a/arch/arm/mach-imx/mmc_env.c +++ b/arch/arm/mach-imx/mmc_env.c @@ -11,7 +11,7 @@ __weak int board_mmc_get_env_dev(int devno) { - return CONFIG_SYS_MMC_ENV_DEV; + return devno; } int mmc_get_env_dev(void) diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index f43a2460f9..5c6eddef3b 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -492,7 +492,7 @@ int arch_cpu_init(void) #ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev(int devno) { - return CONFIG_SYS_MMC_ENV_DEV; + return devno; } static int mmc_get_boot_dev(void) diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 8dd6b4d40e..6dcb8e736f 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -319,7 +319,7 @@ static char *get_reset_cause(char *ret) #ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev(int devno) { - return CONFIG_SYS_MMC_ENV_DEV; + return devno; } int mmc_get_env_dev(void) diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c index 6af7100696..02dfe5bd22 100644 --- a/board/freescale/imx8mm_evk/imx8mm_evk.c +++ b/board/freescale/imx8mm_evk/imx8mm_evk.c @@ -52,13 +52,12 @@ int board_init(void) return 0; } -int board_mmc_get_env_dev(int devno) -{ - return devno; -} - int board_late_init(void) { +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set("board_name", "EVK"); env_set("board_rev", "iMX8MM"); diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/freescale/imx8mq_evk/imx8mq_evk.c index 1ad670b8cc..a1a77041fa 100644 --- a/board/freescale/imx8mq_evk/imx8mq_evk.c +++ b/board/freescale/imx8mq_evk/imx8mq_evk.c @@ -88,11 +88,6 @@ int board_init(void) return 0; } -int board_mmc_get_env_dev(int devno) -{ - return devno; -} - int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG @@ -100,5 +95,9 @@ int board_late_init(void) env_set("board_rev", "iMX8MQ"); #endif +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + return 0; } diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index fba3baa126..106e7127dc 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -116,11 +116,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif -int board_mmc_get_env_dev(int devno) -{ - return devno; -} - int board_late_init(void) { char *fdt_file; @@ -141,5 +136,8 @@ int board_late_init(void) env_set("fdt_file", "imx8qm-mek.dtb"); } +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif return 0; } diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index da55933e21..6576ee112e 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -140,11 +140,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif -int board_mmc_get_env_dev(int devno) -{ - return devno; -} - int board_late_init(void) { char *fdt_file; @@ -165,5 +160,9 @@ int board_late_init(void) env_set("fdt_file", "imx8qxp-mek.dtb"); } +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + return 0; } diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index c031cf8538..55ff7c607c 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -594,6 +594,10 @@ int board_late_init(void) env_set("board_rev", "MX6DL"); #endif +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + return 0; } diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 9a176f4711..cc336fd8dd 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -572,6 +572,10 @@ int board_late_init(void) env_set("board_rev", "MX6DL"); #endif +#ifdef CONFIG_ENV_IS_IN_MMC + board_late_mmc_env_init(); +#endif + return 0; } diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 5d2f815d23..92ecdb4d3d 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -108,11 +108,6 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } -int board_mmc_get_env_dev(int devno) -{ - return devno; -} - #ifdef CONFIG_DM_PMIC_PFUZE100 int power_init_board(void) { From patchwork Thu Jan 14 07:28:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426331 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=GM7JjS7G; 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 4DGk9J1zNtz9sVr for ; Thu, 14 Jan 2021 23:27:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D260827AB; Thu, 14 Jan 2021 13:26:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="GM7JjS7G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F50182734; Thu, 14 Jan 2021 07:59:39 +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=-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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20611.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::611]) (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 D9469826E9 for ; Thu, 14 Jan 2021 07:59:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WdPkMReGxywiqZt6xVVVIkbaWgHQm5VxktgBdfnbZSDYiKE+Lp4Kw5moyNA0ekNMfzq8vHY/g2SikzgqMxW9kcMIiz39TNPkZYXIg2uUnKO1r/13sYXHNPs0CUl4k6XtLxywgfeVSFiwroMZUmwosrgNV1Xh0U+oMiNn/NTq/SCJHWJJHIjWCED+GvAjV3VfloZvozNRVJOhtauUWBkraiX64DYXvGmILgMWLYxPMa8ud586qGUKT+PLR2uazY/gsdcTIUhjM6dI3Plk/BvYi8txja8LY5KHuIXxUqLIriUDb2XJuFfJmJ/vxjzKuHx64kKpTV6m7qYdo/uASc1UTA== 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=rpcmGt4kejIDgFCTwCIXVv1YSYCUHJ3AqFLG1oktHj0=; b=FWnRPYoqW8jvrPdMCJTgDMatJl26FjBhCNW3K3acnm4+o4Zp+w3KhzR2TFen7HrxjuzjmvMmRzG73nxrmPd9kaTaTrTy8uZ8S9Y/Vf/WXzdnjKvOGZVDFV1BoRnG+NTjmEimwMAsccFtwR8zmvJiVV8REqRYDF0feOpKLlLJTA6lxP4W7ucuE1E2JgLr+YKWCFOq0RHaVnbZuJMxcB21Tm+kYLnPJpK+CUAozMlkJFKEK+JcdxnR/Prvy7gHweHD9ZRMkp0xsZslr+C42PxvIfbZqffXuF8dbXlHE+3bo3AUG1heWAC65bBqEKKV6NnHKXf4ppQmgBUL2ptl2uUdzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rpcmGt4kejIDgFCTwCIXVv1YSYCUHJ3AqFLG1oktHj0=; b=GM7JjS7GR7UvBTFzYuA9rgAzA+wRF3o2QdowiL+jYVjo2AxOE0LjO8Qg6j/5bzuPQ39bFfr/N87cUjBSOP2UXKLxYrjSLNOMa3wfawFmJDMBj6RtEOjyta5QvMM6lBKggCRAGL1/mRtPNny+vjZQtkOIxsRpu2M7wwY5i4jdvek= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Thu, 14 Jan 2021 06:59:34 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:34 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Frank Li , Peng Fan Subject: [PATCH 12/13] imx: support choose emmc device by uuu Date: Thu, 14 Jan 2021 15:28:09 +0800 Message-Id: <20210114072810.11873-12-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a9c92f8e-f18a-4e73-ac2a-08d8b859f360 X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tHiBLG/iFyjBnZBNQGtYWWPNAHQTKo2OfYwvBLE/9qbCcJpZ2g0oc49bSHIqNQFr8nhD0Vzd0JYLYU3d0q5t3FdaCuWoRBw5BCsEotGdEVt8Iazas7jD82zgHkphXewdreE+cV6Pf2Ot/82jvNtP088J0nYhjpOvskrxIAq+JCUzeOvNR3j8fHL6F6umNdTFMvD/0KBwb4gTnkaAR+v8T2rKl15QNoh7z5iAfUpdHLPIvx3Q1PfQGvyXIm+4o/R0KZah6yKwLTyb4ll4T+7pTIJb92FSUDiWTgvy0QlWS9jTkTE0D+X/1AooO3XD0KHzO85ZJknsmr8WB2l4Np9Drx5t39J2UXqUywOEGJAwCcAnL1L1492QMYutKb1DBNmsuZEM/lHSiwMexYTvQn0pZw== 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; SFS:(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(6512007)(478600001)(86362001)(186003)(16526019)(66556008)(4326008)(8676002)(5660300002)(83380400001)(52116002)(54906003)(26005)(316002)(2906002)(2616005)(6506007)(8936002)(6666004)(66946007)(956004)(66476007)(1076003)(4744005)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: gyemCsjWZgKun12TAAelrVZFhVbA2lGumnEz13JJbshkCUe15Tab8AjwkhWYODH5CI2Y0XXWWoHFAM+K+tgCJO4leF43EVyDJd87PjUZWndPkt9Csdnl/8JqK+w3veJO6L9sHmvuxO4v6Ql3XBllhaS8xoRV2hxhsJf9zhepn5X9vOTjCUxFPDSc5bp4sz144VQ4EA6YmtPvJPV1O5ze4UbKu6ki4ejN/t8pf//4jlfI+JFqptIbH8ko7ZcAKWYw4Cv9CiMUBLV/QJnYYXRWiiNvOmWNQhUbgiMhynjVHohE4FkTZQgYMGF4rY9PZRToPvD+s7BdcjNDnu1whySJyJ/nE192M2hfkrPHAC6CrFHgu38619kT6cf3jNd6l9S2MNL9xv3zLRiEUpUyFxb5FUposA3R4BfPwRbunUv6YZz29zW1kOWadT8i9eUnhIocMIVJB52KMtLTtCBF0i7FyxGiDJkhzSe1maH8TUbk70qomK7aI8sSFYZc5++eOLkUC2chXX+dS6rccAf92684ufJ8yJa4UUp6RomUZ4jWSKbmJDIB2zIVzird9OUvD1qmPFwc0cuVjMIJ2FD9AC9dO29eJ1mj/bllhTu056k4abCxDP2DhvELvytxUfl1ZwkfOWecYGHOSEDeOiVenqHeNiue9cCXLeU1ZG0fU8L7AagAUmVh4K9a1AA3nLU9/7dWkSmHxW4AO/7XZgngIv4EHYjEITihXYl+zD1Gaz0xLpvlupBnnxJte4SxpwlUgzEnqToSarG+DpuyZohbeiHncAkXSOPvZv6Yb2dVCifEfO2l4LXTcNNWrr8p5k6xM3P9bYdB4HXVXnxRDlynBDf2Qvc78fcaOhOB2CBxOVVY8ZkxTqdiqT7Rqtb+MMhvxNVek0sbU1SryJjt8yhfbQsSJ28gnJObrme8Y5yahyCg3xAtBMDYTyisRA/siWqyYmCkAX1wDzgZzS/UxL0g7oKVN1D/VLU18ytpwsdpzK/2K+l/tJBEJa8wJjuqgBGWKfGU X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:34.7104 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: a9c92f8e-f18a-4e73-ac2a-08d8b859f360 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8mOj1O8LMUnqm4Z50l204zeQ4cTkUWvZcP2zyXqI65tVAW6i+6jjBlvNe+IgUjqu37LDBDMQ7RBfTFgys2b7bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Frank Li uuu can change emmc device number for fastboot Signed-off-by: Frank Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/mmc_env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/mmc_env.c b/arch/arm/mach-imx/mmc_env.c index 9c1d3cdfcb..22d8daa107 100644 --- a/arch/arm/mach-imx/mmc_env.c +++ b/arch/arm/mach-imx/mmc_env.c @@ -23,7 +23,7 @@ int mmc_get_env_dev(void) /* If not boot from sd/mmc, use default value */ if ((boot_type != BOOT_TYPE_SD) && (boot_type != BOOT_TYPE_MMC)) - return CONFIG_SYS_MMC_ENV_DEV; + return env_get_ulong("mmcdev", 10, CONFIG_SYS_MMC_ENV_DEV); return board_mmc_get_env_dev(devno); } From patchwork Thu Jan 14 07:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1426332 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; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=UYqCOOd/; 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 4DGk9V10NNz9sVX for ; Thu, 14 Jan 2021 23:27:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 870418270F; Thu, 14 Jan 2021 13:26:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="UYqCOOd/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 57551826F5; Thu, 14 Jan 2021 07:59:41 +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=-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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::61b]) (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 9170C8268C for ; Thu, 14 Jan 2021 07:59:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UsWuVPwVvv57MHssFJae8o020pPJtk8voMxWa/V+yFufkGSGntOQ3H9zU7ydDkFVOirR1M8O3vfX3M6NLIt9gP7OcShmZBIUK8A6o6JH7URW6jubv0N+E/1TnMxAhQfVdb8C0KR1vIfsj0MVl+UxE/fIRzT7uXA3ZOO/1HqsmGpkBD/YhLmfxbP5HVAqevuc7xEfu++qZv8oTWIndjNaU/NseE6TBuh8fmzPwfEjkfxH0f9aF8b//JSjKJYO1BiofdJ+ErNCh+L6woFw26xqZ5OvS3RcXmlAevagHsO1Mstn3ITkaV5+35AZY5HCS5J15iF8MhIFAnK+qOd1K5lpZg== 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=AfVjWH3Od+fgOJXGI6PJKR0VWFV8JxUl5v7KW8E/XIQ=; b=UUhCR9HlFPYsO2gu6J8BRCCCVvVSwEvnJrqLwDJdJuDRZrTiv7CJdacxYJq123mtGsdAAXL+vJM7/fTqOG2vvAtU0/r9dD/xULLNDBtSt+hK49TSF7ofVqHRdHyRZQxhFg2bfOv23IF2dQxYhMqFUCYhVrBtZ6SullJ3TAOJnDhs3iB7V3ChAtB6JpTfAk1XbqtlAqnB88nlRwFN0/c8m2VP3HdSv6EVIOFcPFro1ISHzMGS4fYxxPnbSxMD5w+9KJzWobfBiWW1o0jwqCCSheWClIyKcAgfR72oIdInMzirc/UZ0yyy0ZxabJQ+jfiX9fWEdD4bOURrZnPl/VOa3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AfVjWH3Od+fgOJXGI6PJKR0VWFV8JxUl5v7KW8E/XIQ=; b=UYqCOOd/oWnVj8YQrhgy6fYHjJFdraTmr+3wEcBB3Ols+Ej2XDvOx9zt3G1YE+VyJ3e0EY1+s0rlk10ybiH1Uk/a21TtP4EEpTsM/jGj5c/eAoghqviUickmenTMKVnWSwCtBCoGSd1R6HdsnzkQ55ImNS/Pdlf3YC/skNHlkWI= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB7PR04MB5995.eurprd04.prod.outlook.com (2603:10a6:10:8e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Thu, 14 Jan 2021 06:59:37 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:37 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 13/13] imx: timer: Modify GPT timer driver for mx7 Date: Thu, 14 Jan 2021 15:28:10 +0800 Message-Id: <20210114072810.11873-13-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f4d9a665-b647-409e-ff88-08d8b859f4fd X-MS-TrafficTypeDiagnostic: DB7PR04MB5995: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e3J4E+D7xzZ0OHAXzUJY9/z7jhFxhd+GvjUZtQGXvoDvmKSZM/RnUi7ccDLS13bpH+B43V0Ec95w1akR3nrDHkMLvfvTi7GAkO3Bit60uCA08f15czuyhCT3WSQAzNWdAI02WP1BDqhMiHfC1v4Z2THJNubKa6XV6g91RYRGyu2yFjcwsHePsFlXihgYeSIPlaL9vTGD4Ix3+VNsksLGnJjm0fA134ei/guXvGfcowYRQoK2yP4um230HyGPQI+PRpPS/dzGUHb5h36buTy5YILtB9g1kA8rkuf//cB0X4fsA6WTJR8SnPoR/c/03qa4CSOyMH+GcNesRaNNceI/pKNQfryocEuDhBUhzMns/xiyEhFuXdeNRTSnGOtg3+M7REQC1oeOlucl7fqHRekmEQ== 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; SFS:(4636009)(366004)(39860400002)(346002)(396003)(136003)(376002)(6512007)(478600001)(86362001)(186003)(16526019)(66556008)(4326008)(8676002)(5660300002)(83380400001)(52116002)(54906003)(26005)(316002)(2906002)(2616005)(6506007)(8936002)(6666004)(66946007)(956004)(66476007)(1076003)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: HckP+QDSGxcOuYIM6Dm4vXKzrfYDgyJkbYonblfpeL5DiFn/xkaL08Am4x5t17ogGFaSGPp9LJWD9MxrfkV0BOvxYK1bB9xwyQ6HByxGs56YnjwngK31Wld0MHoF6EVap/LloIhLUMOiuefCr7y7CXeF12yUnRgyv4J3YTxzcSKK1XucO8cssRkMbICrH0Gkr8RF9zDR8hRoYIiPq5vE0EUs5l2PMZ4Q6CvcB+8sPWN5Yd4j1GUmmez2BRMnSlh8Q/bEtmlvUpoG1XcWWoU/FVRc5qWVsA13/5eowKHLFBNAqC36hEYS3rmZbgbPO8kUJ+QE2/XpHAbOPi9gqHJ6nfEc01qJiQRHV9fpltvPbMcWTV8CQsTGuPpKo9cpsBS1JDX5iqap0qax6NvWCCF7BXT2JVTupyUOwPXFMWsr16+WDB/pIQgoKSWvS29V3/59tJbJcgKmBLKclSDrKUQTMOSySrGW0zi9jXHZCJ0FKUa2ERWz9y/SqI3NmSV6MNOFhGQrVMPQ32CEdV/KF9k9lGX5xj3Ukhzed8FLXuX1zgO3VVIQzn+FOXAllY1je3KWtcUMp0mWUj5cla1aMe3vdAQ6WP29wFGYFpN/M7xWlwDvhX21rdH96LPd+KCXxZGMP4o0j9zEEF5j/yZnfhOnn39HCa4UTjiB7zTpZwaZ82mo5CXYDcNlIeewuOk9lYIUsU82LefeyN4u3FGCI79CirRPpweRoyHAnX6O82dq5TAhHiwNq1hNOJWXdXYJY/B/BIFTAL6ZmoJD1guSQ4sVXc63nbyYTOalK3yDRT3v2XGAxdCd+zCPtdflVtgenByNjST4u0MSCI+Lm0FVVuvWNWk/TfnVM76SQhM+h2qwFtYreq+1C1iQwXTk7gDk18EOtKn4qTIMM9isA4peSU//mQ6E1pkVWx2RYt/PYiOTJGXbLpNbja1U6RAfKjPKyChl2oAwMgl7dAW7EzVILs0REUGlzzGVyL+eDWJIDfx0CDzcpFAzTqvs5nzOUlM+DLAp X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:37.3782 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: f4d9a665-b647-409e-ff88-08d8b859f4fd X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: blmWkzbQUKw+2YSW/K3KFzYHQWZoLAgnHV7e65jrNH2vmK+3wWgZsqJvUVIUi/aPzvA/Rn0aA9ujSxvB/dgK3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5995 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 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.3 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Modify the GPT common platform driver for mx7 which only use 24Mhz OSC as clock source. Note: at default, the mx7d will use system counter as timer. The GPT is disabled. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/timer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c index fa1941aec4..a3c47889f1 100644 --- a/arch/arm/mach-imx/timer.c +++ b/arch/arm/mach-imx/timer.c @@ -39,18 +39,16 @@ static struct mxc_gpt *cur_gpt = (struct mxc_gpt *)GPT1_BASE_ADDR; #define GPTPR_PRESCALER24M_SHIFT 12 #define GPTPR_PRESCALER24M_MASK (0xF << GPTPR_PRESCALER24M_SHIFT) +DECLARE_GLOBAL_DATA_PTR; + static inline int gpt_has_clk_source_osc(void) { -#if defined(CONFIG_MX6) if (((is_mx6dq()) && (soc_rev() > CHIP_REV_1_0)) || is_mx6dqp() || is_mx6sdl() || is_mx6sx() || is_mx6ul() || - is_mx6ull() || is_mx6sll()) + is_mx6ull() || is_mx6sll() || is_mx7()) return 1; return 0; -#else - return 0; -#endif } static inline ulong gpt_get_clk(void) @@ -73,7 +71,8 @@ int timer_init(void) __raw_writel(GPTCR_SWR, &cur_gpt->control); /* We have no udelay by now */ - __raw_writel(0, &cur_gpt->control); + for (i = 0; i < 100; i++) + __raw_writel(0, &cur_gpt->control); i = __raw_readl(&cur_gpt->control); i &= ~GPTCR_CLKSOURCE_MASK; @@ -87,7 +86,7 @@ int timer_init(void) * Enable bit and prescaler */ if (is_mx6sdl() || is_mx6sx() || is_mx6ul() || is_mx6ull() || - is_mx6sll()) { + is_mx6sll() || is_mx7()) { i |= GPTCR_24MEN; /* Produce 3Mhz clock */ @@ -103,6 +102,9 @@ int timer_init(void) #endif __raw_writel(i, &cur_gpt->control); + gd->arch.tbl = __raw_readl(&cur_gpt->counter); + gd->arch.tbu = 0; + return 0; }