From patchwork Tue Jun 9 10:34:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Li X-Patchwork-Id: 1305781 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=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=dqFBTvDI; 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 49h62c6lMVz9sSy for ; Tue, 9 Jun 2020 20:35:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8172E81684; Tue, 9 Jun 2020 12:35:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="dqFBTvDI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A6BD81777; Tue, 9 Jun 2020 12:35:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::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 730EB813B7 for ; Tue, 9 Jun 2020 12:35:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d601NhE+Dha1Wv2yBTfPEuRez/EBv8uRiZHsWk3LfR5YtRYpQmzu8JQJC5ihw7aI3DDYFcFnp1tzz/9EsFLfEJkdVRflIzT1LV2Lw1izuXpg0Vbb1k2ImvHdBJM554YPZ1OYpNK7MOX1f+dttZpdFx/9qyHH5yhUQTe4TSnh6bkxmgHcQPWxKlOqJN1r8roTxvgYwB3KesisBZoDs/InCqoVNtO/pYzY8PUJMKQUyZ5k9p4nufzOzlw2Tit9ssTeZ4i2G5zvcHS8YXmU74gUsoOanCPJHLyb1b62Qow/7BZdQQI390ZOIWvwXN2IpS36qBv9GsTurm4ws4YINIwhOg== 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=GGBQoCjA5qz50is7fmnYPAP6TO59I+eHlaClsyFWtcs=; b=EODy9B2okXs2ELb7Zyv+sbL7+X9KW62lsHbtx/IuC8ewl7mRfTuYkExb1pPkmcaPh9Jv6pRJCOELqq87x8iKE3qlRc11rl58JuVpoFCXD6v2IemyAXCsjCnRjCApvL/GFqCDZpi+w2sz6kkOPi3+ZhXVD+Fww+GAOrmO44xnztWn9LHinpRuSCJgDvy6EgcR5+1wrTz5aJ3ZTbuwRUyADR339ft54G1WEkuCea0c4XDZbkeQS8OmN5adpuK/hCOKXKksN6PVmU597qO6wjuL8Hc8LO9O/gVD7mgUAZQ1+ZK85dWCLgsVzOtPC811YBWa78YK7/0AgbpbxR5O6pECsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GGBQoCjA5qz50is7fmnYPAP6TO59I+eHlaClsyFWtcs=; b=dqFBTvDItgAjbDVEM+n22i2RjTz1wTAUCSfOP6sYiFgmTcM71KcPfxOX4VxJmBFNXPbG3udRSzZgzlXTpGd6LP1GpjVWyo36WZdM6eRHL26c5GRvRjohhtWR/16y5NM6iTCKRkrkDxz81q9l+NbOH45VCtvhljQFVFt9pdYocmQ= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4414.eurprd04.prod.outlook.com (2603:10a6:803:69::13) by VI1PR04MB4493.eurprd04.prod.outlook.com (2603:10a6:803:76::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18; Tue, 9 Jun 2020 10:35:04 +0000 Received: from VI1PR04MB4414.eurprd04.prod.outlook.com ([fe80::450f:3c2f:20f2:1bf5]) by VI1PR04MB4414.eurprd04.prod.outlook.com ([fe80::450f:3c2f:20f2:1bf5%6]) with mapi id 15.20.3066.023; Tue, 9 Jun 2020 10:35:04 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: fabio.estevam@nxp.com, peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 2/3] spl: mmc: Move the eMMC boot part index to weak function Date: Tue, 9 Jun 2020 03:34:43 -0700 Message-Id: <1591698884-72174-2-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591698884-72174-1-git-send-email-ye.li@nxp.com> References: <1591698884-72174-1-git-send-email-ye.li@nxp.com> X-ClientProxiedBy: SG2PR02CA0027.apcprd02.prod.outlook.com (2603:1096:3:18::15) To VI1PR04MB4414.eurprd04.prod.outlook.com (2603:10a6:803:69::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ubuntu.localdomain (119.31.174.68) by SG2PR02CA0027.apcprd02.prod.outlook.com (2603:1096:3:18::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3066.20 via Frontend Transport; Tue, 9 Jun 2020 10:35:02 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [119.31.174.68] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5dac1aa6-5479-476d-6caa-08d80c60c588 X-MS-TrafficTypeDiagnostic: VI1PR04MB4493: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 042957ACD7 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6e2R5JD0Eq5SY2nYFaehS/U5uZPulvIvGiz3Y0mLj7zMApXym0zm8Iq6u5LztJqFlqnW9vzrJqGBf29fX2Z2963Hx9+NLj0leu5sPE4jTGCMkmVM4yqQWKvLhOvsXAMQdOW64M4wUshWTGioR9ODKKp6MJSWreDzr0nH7RbAd1o0jPmZfVlmxDA93qGHMcgiut7rAeOMviVaal8G9IhKLB2Q64H4qULikCPvphM/h1PKVdiOSXn79DN0VmtBn3jEH2R9OnfKmfDjC561vmjHdFbD4rt7dWtD2UHXsW6qMvnqKUFOx0+/Q9wxW4FZKNrm3ICDra8xxbTu3bA2eWBhLA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4414.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(396003)(366004)(136003)(39860400002)(2616005)(956004)(478600001)(8936002)(44832011)(316002)(52116002)(6506007)(8676002)(66946007)(86362001)(83380400001)(6512007)(5660300002)(26005)(36756003)(6486002)(66476007)(186003)(2906002)(16526019)(4326008)(66556008)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: N3vqbfK+ZBNpuggcCXWpXO23jkQO/Z0PInOSs2B6X9TQsHc5YuJZxZkp0w3ddeLxWYw8/PgFlMY9owkfRMLCQKJqIU7RQBESiTq1xVoSjU+oG7gK5OXN+YoMJqzoVQYLwjMepV/dY8dILkpKfKH4T2tDXOVqPcW7l42giABTOGZTSsIB9qgRoS8si24jTfpOsAR5EtfYrP8q53G5YGh/VLgzdXFZY2NmE0JKOHrEVZTe/BzR2/DUDz50QZ8RhZfqy8XneEslwnvO5ielIIKguJ7RJ7F+nmlI0AR6nA4thPVyk35neD22jIKKjswWeWYW7e/oQRYkWAnlWIHWzTOr0xvhCXnBgCIGWJxTm/vjleeFiFtaG8QwpzkyMHQvW7VbqipDLYWCsyJLd9GZBtM6A69HG38KaPedA/K74Nn2AFyi53KKjC81NsLe4w/cIL9n2/eRXouSmzDhlMFGUPCtD17Ms3uSzd8EIFz1Kr4eXLw= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dac1aa6-5479-476d-6caa-08d80c60c588 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2020 10:35:04.7638 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kAhWxc+WAwgenAYy9ze/94SI+y02H3kLt5Jk8mgM5PFbKVjmDST2my0nXC1fk7op X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4493 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Move the default eMMC boot partition index used for SPL load to a weak function. So we can override it in iMX8 specified codes. Because on iMX8 when the emmc regular boot is from boot part0/1, ROM will switch to the other boot part for secondary boot. So we can't directly use the boot part index in PARTITION_CONFIG register, but have to check the secondary boot for using correct boot partition. Signed-off-by: Ye Li Reviewed-by: Peng Fan --- common/spl/spl_mmc.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index add2785..f2880cc 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -324,6 +324,27 @@ unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc, return raw_sect; } +int __weak spl_mmc_emmc_boot_partition(struct mmc *mmc) +{ + int part = 0; + +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION + part = CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION; +#else + /* + * We need to check what the partition is configured to. + * 1 and 2 match up to boot0 / boot1 and 7 is user data + * which is the first physical partition (0). + */ + part = (mmc->part_config >> 3) & PART_ACCESS_MASK; + + if (part == 7) + part = 0; +#endif + + return part; +} + int spl_mmc_load(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, const char *filename, @@ -355,19 +376,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL; switch (boot_mode) { case MMCSD_MODE_EMMCBOOT: -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION - part = CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION; -#else - /* - * We need to check what the partition is configured to. - * 1 and 2 match up to boot0 / boot1 and 7 is user data - * which is the first physical partition (0). - */ - part = (mmc->part_config >> 3) & PART_ACCESS_MASK; - - if (part == 7) - part = 0; -#endif + part = spl_mmc_emmc_boot_partition(mmc); if (CONFIG_IS_ENABLED(MMC_TINY)) err = mmc_switch_part(mmc, part);