From patchwork Wed Aug 24 11:23:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1669753 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=4IoPgRRC; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MCNyd37DPz1yhJ for ; Wed, 24 Aug 2022 21:23:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0860B8423A; Wed, 24 Aug 2022 13:23:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.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=amd.com header.i=@amd.com header.b="4IoPgRRC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 296F784194; Wed, 24 Aug 2022 13:23:39 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2055.outbound.protection.outlook.com [40.107.244.55]) (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 9D0F484314 for ; Wed, 24 Aug 2022 13:23:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=michal.simek@amd.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R0Rto+zXxZB8QokblEBz9HRNSuYm0vOhnnEeDfzpHjywJcq76ZTn8tLCyINwC+1MXNJkhr6yG2BB3qjIwECagO+cA8dIyoJ7s+oEhnJkgqMrWCXNkk7dJiDeVHM2tR7XyRiNuPcBUpEuuQAFClDkqRNdcKSxvf2nbYkYXkYzCb2tqkInOcKeKUv4USRxyfLdGIk6PJxyD0Va3cvkN5oSzHKO1RHQtwQvUhlOKoWoKkQeDvs3SwHkWaaJLrfBxQtObVNrSkYrEPyi22cjIyy9sfFVEq+4MuBSO3tTFECQ2IQrTPb5fZNKWqeAaWy4qRAhoJMfM/Xlhj3FtV80HE5BQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Pn9KqJT8033AYiPowIdQP8d8lejEUmnzPd/Ajp3d5jU=; b=bULjwBwfzLbFgVmnbK14jiOae6bQp4Yc8+yJAh5SJcRBl3O54G15AXcXXGuajiwQPRZW+sVFktjKr3arpXgRKuQmnAYMTkygYkWtzGQ8ySu/OlnOV0f/EUxBSgVTkYLKMkHMkgM7A434/qzBww/jx2rrVZj5YcReOlFIiCffDFJSVqyjhoWGoJRapRsSTRipKS6wICuQqG9sfu4L6WaR5hwLxXYNyIDswrJvqaN+rRBv9ZfnPu6LYLqd16T+aABYGV1cUDSIc+1RKFLFGejTNJLRXHQu4XZe6iiGTKVNKOQzNoxdQiu/0ikRXXxuJmBFOyzUWt6QTaCaLfAHm8iqVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.denx.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Pn9KqJT8033AYiPowIdQP8d8lejEUmnzPd/Ajp3d5jU=; b=4IoPgRRCJooMUTrkcrErDW/vbeEEtx9NJxRcl2RG7e9V7+hS2WxN34jvHgRJLXU5Iz1/hvMv8jOK6MoLSW2/Zn79dS/X7EXajV5NYBSxDliCCXyFkHpmP57/jmF0oSV5kTlKo5DUcKLvGXg2VlhW07h/tF5I9TRAFPxBgRDCK/k= Received: from DM5PR07CA0069.namprd07.prod.outlook.com (2603:10b6:4:ad::34) by BN6PR12MB1730.namprd12.prod.outlook.com (2603:10b6:404:ff::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Wed, 24 Aug 2022 11:23:32 +0000 Received: from DM6NAM11FT063.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ad:cafe::a4) by DM5PR07CA0069.outlook.office365.com (2603:10b6:4:ad::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Wed, 24 Aug 2022 11:23:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT063.mail.protection.outlook.com (10.13.172.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5566.15 via Frontend Transport; Wed, 24 Aug 2022 11:23:31 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Wed, 24 Aug 2022 06:23:29 -0500 From: Michal Simek To: , CC: T Karthik Reddy , Joe Hershberger , Wolfgang Denk Subject: [PATCH] xilinx: Add env redund offset Date: Wed, 24 Aug 2022 13:23:26 +0200 Message-ID: <92656dc08f0f5a749d62b71ca6e77fe1be72e9e0.1661340204.git.michal.simek@amd.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77302f95-dee9-4ef8-ff69-08da85c3135a X-MS-TrafficTypeDiagnostic: BN6PR12MB1730:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NuKf7ZVThRAXe0zlszw3s74PC64736WBYMgmNa/GybFW93I4hX716ZL56WOhuS7lBpN2MSbrJC0QBTIXV88yWNk7revg5GKCA54+yXZSvBM9gWRbnW6EEY/Rg1NKZGcvLdFH3G3ZqZEi1ugzn3iT+YOqDuz8RMCz1CTrDXmEF8I+Omr5LztEdU/TXoLDgkQiEfwNo0Bohe+svaNLhbVjxHWBiNxPLw3wuW+8ysIiM8ArRcrwOzinVyCI4TtfIp9XZMY2zNYQOpfIvE3128UCcHKkEOlmKKyC3uo3zG9td1cxzcJ6XKFhUfcVazQuCfk/6QiXBwUuAP8QwB5a0sPEzerHBpNjua+kPG+iZ0GhyWv6uaK4giKOUZd0DBpJNfO0nEdFQ36r2WU/pYR7rYJOfD3Flz3cOTBosOeE+IGaXjjsrWScq/tJOvV5SGeVB5iAIJBgncbAsKMCHKu6uEEyqw/i/legcfjmOXy8cmVuBAZjMhRBORJAG03+yefCxXdY732lXjBMpwIrqiQYmRkL4UvJh9Vz+1OGf9hlkHRsCr9bxstNCXcjLX3gmIWyAAF9Wia75mFnGw597ZC59ph53qjFUOgIEauii8h3Hi5x1YLryyW67lTF1amZ14r8I61+hPymA5xH9f2sOm1dSMUdBn0tEhYTyeHiTVOZQ9V2sbLbB2qjtC/30xv9209hymSHNB5wP8aXK5mRGl+U9JwoWofFCrRLCnRgAtVYXjjoZOUSNHsK0I/pwlg0MoHzlWtyEk66OE0eKvXIGi8Un7UM/EJmwt8UVbgiAt7yFxuqr+I= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(396003)(346002)(136003)(376002)(39860400002)(36840700001)(40470700004)(46966006)(81166007)(8676002)(82740400003)(2616005)(70206006)(4326008)(70586007)(5660300002)(8936002)(44832011)(86362001)(356005)(40480700001)(26005)(6666004)(83380400001)(47076005)(41300700001)(426003)(478600001)(316002)(110136005)(54906003)(40460700003)(36860700001)(16526019)(82310400005)(336012)(186003)(36756003)(2906002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 11:23:31.5100 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 77302f95-dee9-4ef8-ff69-08da85c3135a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT063.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1730 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: T Karthik Reddy ENV_OFFSET_REDUND config is by default set to 0 for flashes. Saving the env variables is overwriting data at 0 offset, which is wrong. So add default redund env offset for Zynq, ZynqMP, Versal and microblaze platforms. Configured ENV_OFFSET_REDUND offsets by ENV_OFFSET + (2 * ENV_SIZE). In case of versal, we configured ENV_OFFSET_REDUND at 0x7F00000 instead of 0x7F80000. As BOOT_SCRIPT_OFFSET is already configured at 0x7F80000. Added ENV_OFFSET_REDUND in Kconfig for microblaze due to dependency of ENV_IS_IN_SPI_FLASH config. Below table specifies platform specific env and env redund offsets. PLAT ENV_OFFSET ENV_OFFSET_REDUND ---- ---------- ----------------- ZYNQ 0xE0000 0xE40000 ZYNQMP 0x1E00000 0x1E80000 VERSAL 0x7F40000 0x7F00000 MICROBLAZE 0x1080000 0x10C0000 Signed-off-by: T Karthik Reddy Signed-off-by: Michal Simek --- configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + env/Kconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index ffd8bea81c36..7b96c4fbd999 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" CONFIG_SYS_PROMPT="Versal> " +CONFIG_ENV_OFFSET_REDUND=0x7F00000 CONFIG_CMD_FRU=y CONFIG_DEFINE_TCM_OCM_MMAP=y CONFIG_SYS_LOAD_ADDR=0x8000000 diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index e6f8e221a5d5..b8e16cab6e8b 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706" CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL=y +CONFIG_ENV_OFFSET_REDUND=0xE40000 CONFIG_CMD_FRU=y CONFIG_CMD_ZYNQ_AES=y CONFIG_SYS_LOAD_ADDR=0x0 diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index e5ac26e0381f..e242884d3f6f 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_SPL_SIZE_LIMIT=0x2a000 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x0 CONFIG_SPL=y +CONFIG_ENV_OFFSET_REDUND=0x1E80000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_ZYNQ_MAC_IN_EEPROM=y diff --git a/env/Kconfig b/env/Kconfig index 238e4c70cf05..5329f7585be5 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -570,6 +570,7 @@ config ENV_OFFSET_REDUND hex "Redundant environment offset" depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT + default 0x10C0000 if MICROBLAZE default 0 help Offset from the start of the device (or partition) of the redundant