From patchwork Wed Apr 19 09:04:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1770620 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=85.214.62.61; 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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=LKAh+F6A; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q1ZcQ1wY8z1ybF for ; Wed, 19 Apr 2023 19:04:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3EF8B8622B; Wed, 19 Apr 2023 11:04:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="LKAh+F6A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22DBE8622B; Wed, 19 Apr 2023 11:04:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20618.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::618]) (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 766A3861A4 for ; Wed, 19 Apr 2023 11:04:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kfs1scpHs+dfrlE4clEP5wSQH/6ojpEcgfA411gczrsRXHGy+YrEbqmOvztGzq65vSBcQW8hfxS6dZx/66/93qRfoSy/jXO4YOLlGCsxj7PV8j5HH2SrL78+LNEfMtz7Yc8xPHs1Ok40yvc2ddQLi/0cP7zGrN1SsW7HDhzcRWg7cAGhhqXZpNd9ekpp2NtATOQR9CogeuWSuLTlVEh6Mz01vZIA11uzNGI7PfGQUcHV6nDcifVYxmL+X2PdJVZIBPsvfLW4BghvGyXVgHAlfo5xnCBKsJT0sr3BqYOcpRR5lBp5N8joAzCFyzOIBzaTiJwqMn/2zxw/3I56fBKd1w== 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=Sx35ZC+9U4dyqUuL2Mai1qCfrrucJswmUQpLweNrkjQ=; b=iVL14pJiDDtnWLLOuDo3Esqi86PXbjB+3XDs/nOhaUQRfZB7fp8ZKOUChYDnvvlGfVr0Z120tj+VKAaUjWlukpIkYvhbKspRIBdRDoqnlTMbZqSKaSp5KlXUBmg4c8742tYXWZhPtajCJOxW3QOnJ5rzZMjWMIDlaIj4kiy6omqg5yWIqUFJ+x3fpX5BsyQHWm1xcf6GS5kd1byN5fu1Capp4/mf3m4Imahu32pAZRu11INpFdSRULiImhH5rLeA0BRa30vGcoIlIkTD/9y5tljaI7y7Umu0AtXEZSDl7Tit5ezY3B57lXcRwNO/42+/gw6TKCN6GmCma9zShVZY3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sx35ZC+9U4dyqUuL2Mai1qCfrrucJswmUQpLweNrkjQ=; b=LKAh+F6A5ypG5Wza1Pk4z3KyTMhfaJCxk8FktzjwzBzjSK18VHCwJ7qhby8fbXNPM80pheHKM7YLg+FIMrTbFKxVpD17QKtsa5y8VTeiiLQNHVSiqDOFHE+KG0278cUxUdSOpWA6iJUpUeWsgLi5Ypq0jRwwTnQzvtt575Lg2yU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAVPR08MB9507.eurprd08.prod.outlook.com (2603:10a6:102:313::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Wed, 19 Apr 2023 09:04:37 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::5979:132b:6e3:cfb2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::5979:132b:6e3:cfb2%7]) with mapi id 15.20.6298.045; Wed, 19 Apr 2023 09:04:37 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Ashok Reddy Soma , Jay Buddhabhatti , Michal Simek Subject: [PATCH v2 1/3] firmware: zynqmp: Add config object support macro Date: Wed, 19 Apr 2023 11:04:15 +0200 Message-Id: <20230419090417.26496-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR0P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::14) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|PAVPR08MB9507:EE_ X-MS-Office365-Filtering-Correlation-Id: c228bd86-33be-467a-b1ac-08db40b519f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rNuFjA+T7JguBw1r4lT47Mxuv7MIz8V9ufxhRlUJiW6MzcnGep+zBvyp7P9ue5WZhnEonAzaswIZjvQSogtwtXMty4a9/dqENcFwTv9hZETf1faWiTefhAQK2bF9xQ1qs9sI3QYrrQIN0Hle6Y7Q9u9OM6zFUviiebmjuR04FNn4mOAeyHlwqK8FJeAxMwrlXB5Md1P9ScZlm2V9zyQFVwF3rsKsBrokPnlb3JxcLH3pJ+p5CuGmV/HBgfrr90JtoE/N11m6HQthpnZJ3e7Fn/k+rhhcCgLzSjYoksSWnR96XF/gjj6xUr1p2v4LgO+8mSS9ye+Sv26LJdh2NpXCNM/X8Rmx5t432r/5xh22N2jYKScpKX5xXBMlihIErqY34IJTXFYWEQKXXlgQMd5bzAjGs70fMXZiGiyCPLzIKh5XeULGgBxnt5pTrhJI1sZGkbS4+NhOqH8d+qMMp7apV9OFQdGfWiTZAUHiO/C/XDwQrlmsgeZVs0Mx4q4z6HRWLU0c2GXeRmz9+EzIv74XXQhkr39nYEb9l+fjgEbR4e3rPCF1cyxby2N8Z0MNPQ+fT3z09YgtnFBpVKpzMoYwnsCiHYDYVYP4whPc0+zCHcCA8Z8xA7ycSKIFywXegoHf X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(396003)(366004)(39860400002)(451199021)(5660300002)(52116002)(6486002)(478600001)(66556008)(66476007)(2906002)(4326008)(6916009)(66946007)(36756003)(86362001)(8936002)(41300700001)(6666004)(38350700002)(38100700002)(316002)(8676002)(54906003)(1076003)(26005)(6506007)(6512007)(2616005)(186003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 481DG4ytkEfdwaugjqChKLF1j8q5/f689BZMSVGRPKv6ZJDxigWVdRkpBqKsyE8D5KAAOuUaNBt4i7LEzaUhyC85fR8WeGGWM05In6EjtCWOAygJB/QhInQiGzmXadIhTJ9Wnyo1nfAOVjYbBKQu+sTSwC2oFU18dxfrSnoqA2gRltr9QixPj5FgTSJPBoAhn30x5y0FPdnv2wkNrBc97+2pOEfOQWVL0af88dBXs0rF98sx3gcdelN+mEI7mghvC58pSDAEeXE3jwgw02b543IlSAphYzxCcGUPiwe/4Clr+3YCwzUYeucUWbdXFfwcz0PQnCAN3HYU+vadewcN262S0mpCAe4xDyR0UoxbPRwb0i08kMby6l6T4gyLseelM3M6wMkb/PMy/gO3NeXMkgcSO3SoyNcY7ItUcVOAry5JKkxdriDvSlmylv4o+ak6LJoJunxHsXpkNAYLhLBYWW91zaz2hCWgva/1V1JHFelThVGIrP3gd2h8UPwKuh3hpucRcFG5UOHwzFFPL+35BEJ2wg3ioN514NzRbC01+dtJ4HzAg8k+KgJ/It/lBpSdvAK1eCrXGuNXkjTPLB8FnwmWDM5Basg7JXn2WWLcRPHsyWI+gcqa/Y/VIR92Z1RAY6YlV+kyahAfinsyVF2SktEb5lKN4yj58l51vqPTZqeS4l6ITtJLMYrkL9/1kH5GbGR2I43IrfAQxWrEuQGYftomSUQOmnU1rQQJzQe2HRLBep7mHE5yQzgaKtyp+hLq4+NyN+GoYqWys0bNzZw9sK08ODho1GfezSFKfLijbrKoHcAoOj0wureBJMaxp6p8WjmfvCMIRMApGK/4XA3UAYZ04mQw8G7UngzA6pDkgqcKW5I2C7nby+L8Q3jOSff8AGSX3Qxty0PG7PlzGxhbbiwYJTYqLH+SfeBOBnyYeBKUIZ9gjOJRJbmXVMjL9h65fbQyfJIP6TyUhGUbRezVmC42GA4m/Xxckl7ndSVr/dJwijG4I9BnQGdRWsvpGOFqAYIYcjtE6G2cd7MYep08vU3Kp3i8zjY6YuoHKVoz7Gkc6me1JsxP9HWY/TdWrRYhPaCxAXl/OPdhn9RVCB1FkSTfJPijXic/j82Qq4pAZpbsN8fMH/yO90xaFLjdna6/k7KRp3dXrAV70KR1lmordU0FglCADEB5HwHd0pvFxBOtFgcDEMhM5fEF9D78KBqfgdMQatu149TgQNUE34kBcJKVoHsLjcBM0IDWTugqtvvCxKLmnWyHEcC9PIHIrcPVsQFcCcP2BLkqj6UwjXTtKRGXdcjnnhE9gqgbXlD/KDCwWrzK42MhhSYPrseeByRgXcOlSe4lkUOA8x5FnQq08wvxDBkmAiDhaQReYgyfaAfjTVXTRZdahNOFFIdEbPiroZPlpHjt0nUHv2153ygkfAVHnbrY4owT2XNEL+DuHJnVLmPaqS/za2m/Fjw+GZnP+migXgtFPz0mdYh3kgrdPnz0QARH/MixEPSO4DbyjLVYtYN/GVXsgewH4x9SlXY8zaHE1yPPoskO038DKk/hosDvoEXRZ7fqLHZmnqJfiDs0Al5boMrtMuPl3IsPN4Q8RtvT+cCEVI0o16jiP76+iQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c228bd86-33be-467a-b1ac-08db40b519f7 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2023 09:04:37.3574 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NAOOj04O3cBUkO02WIBCauzjDq8Zvi41UNVcesICioRAVblHtAVZyVOeeXmitniNC16zmJ8fcL33843JDVHeiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR08MB9507 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.8 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier The driver uses a specific node id to detect if the pmufw support config objects. Add a macro for the node id to ensure that it match at different locations. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Michal Simek --- Changes in v2: - Added drivers/firmware/firmware-zynqmp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index dc8e3ad2b9..baf5b0c253 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -19,6 +19,7 @@ #include #define PMUFW_PAYLOAD_ARG_CNT 8 +#define PMUFW_CFG_OBJ_SUPPORT_NODE NODE_OCM_BANK_0 #define XST_PM_NO_ACCESS 2002L #define XST_PM_ALREADY_CONFIGURED 2009L @@ -82,7 +83,7 @@ int zynqmp_pmufw_node(u32 id) ret = zynqmp_pmufw_load_config_object(xpm_configobject, sizeof(xpm_configobject)); - if (ret == XST_PM_NO_ACCESS && id == NODE_OCM_BANK_0) + if (ret == XST_PM_NO_ACCESS && id == PMUFW_CFG_OBJ_SUPPORT_NODE) skip_config = true; return 0; @@ -251,7 +252,9 @@ int zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size) err = xilinx_pm_request(PM_SET_CONFIGURATION, (u32)(u64)cfg_obj, 0, 0, 0, ret_payload); if (err == XST_PM_NO_ACCESS) { - if (((u32 *)cfg_obj)[NODE_ID_LOCATION] == NODE_OCM_BANK_0) { + u32 id = ((u32 *)cfg_obj)[NODE_ID_LOCATION]; + + if (id == PMUFW_CFG_OBJ_SUPPORT_NODE) { printf("PMUFW: No permission to change config object\n"); return err; } @@ -299,7 +302,7 @@ static int zynqmp_power_probe(struct udevice *dev) ret & ZYNQMP_PM_VERSION_MINOR_MASK); if (IS_ENABLED(CONFIG_ARCH_ZYNQMP)) - zynqmp_pmufw_node(NODE_OCM_BANK_0); + zynqmp_pmufw_node(PMUFW_CFG_OBJ_SUPPORT_NODE); return 0; };