From patchwork Wed Apr 19 09:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1770622 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=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=1ShrqVLj; 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 4Q1Zcz2fPnz1ybC for ; Wed, 19 Apr 2023 19:05:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A4B186246; Wed, 19 Apr 2023 11:04:57 +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="1ShrqVLj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B823186231; Wed, 19 Apr 2023 11:04:44 +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 E14708623F 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=IV3pRdI+656fzy8ebfsrsCVmYmp+nA+Wmcd8gm95CXQRARcwfQO5NqSO+JYBwCJD2DJDgybyeW7iIVQODCszuJUpk+lB7JXzaD4+7POpUcW0dN7S875Jwkr4mverMxbgKjpxbk/nVdPuGRHTzNR08cm4NHOt9WqyEoPUy8mKNCAjHU5eY6ONORjd9BPr1JQWeHYu4GOjC8dNZtIWQGXLJifdeXHEGyI1Z/ClpJCGMfgNHApXzEWkaWrKWCEMmoyvl47NWfd1gkf1yWmjXPWIy+it53Xdb0N+KZS6zO+shfw2ac/zKUMcpLAiLiaDcRg5hcCCgtGPqdzGzDe4wu3ZKQ== 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=UZUuqOetzPF5JQo4XXcYH+qEmnC38FWZzC21VkgQtm0=; b=hTJZE0favsn9hXBIGIYxS0ddGnyGDMlcO0dJrdLtXBZK6t2tX9FTp+HDcKx5Kw4ldFLVLP+Hx95j6qedBuRQZ1gMLEZTrK7e9yJZEsvqu4eDL+C44UxPNK/jbb5b3ImUZ4VsqzajpxlJgbCVOkmDGpA3YVNDGO3TQx2AH2jBGvFj5GO9GDw7RcwQhn5ecxvf7lrkg0oKpQBI0+RKZTiSu8ROa+cuPJHTebcCEa0vqbJ50hQqUWsQxphKUwgWQe9B8M76fQI6y6DpoX7aJM+hM961mPU3teFNN+6LM4E1WH2ommN/1Olgi3L+JRfe1t0GOoDu19Xab9s95yjM1nyYCA== 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=UZUuqOetzPF5JQo4XXcYH+qEmnC38FWZzC21VkgQtm0=; b=1ShrqVLju5PEZ+AtFnC0i3ESdehZHCF2xUzd9xZzQag/3WlAvJdHXDds6bn/POtt3hj+hMwTQ9j7rZ5Lklb+0Hcvc1LS1cvLAUMR4TWP21SI1ExcKFUfnLJHvs8BlT86u7zbrCVT3H+XW4456On22rGAqHqbEHj6Xsd3/hjaG90= 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:38 +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:38 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Ashok Reddy Soma , Jay Buddhabhatti , Michal Simek Subject: [PATCH v2 3/3] firmware: zynqmp: Remove extraordinary return value Date: Wed, 19 Apr 2023 11:04:17 +0200 Message-Id: <20230419090417.26496-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230419090417.26496-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20230419090417.26496-1-stefan.herbrechtsmeier-oss@weidmueller.com> 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: b892ffe8-af3d-460d-dca9-08db40b51a8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p189w/I6R7rgxtojLT9PhOpbnF5y3ViiwcG/zoyfRhl3LFAz0RKPUZbwU3+75qtSQbZ0YDsIbWdHLQIZwM/Eu/UAUVwYckXWbCmwD78YDQW2sAU2InOWas7VG/7UtXlFPAC2/928te3G/h5oBen6vUYoB08yc75USU4YLSAxDZEUfOCrVNT/LCg1h7SuDf9o1DuZDsHJFG+dkGr6f27WNPG2b8vuaHP7v+zMRjo5jspXqRZyy804mqpjka9kNqG/ehHXnIexylHs4BmBBTXx36g6+TOi1RK5+siM32wy8DtPP1YanNhnGisg7WqHKcCvKtqXy4rAsGI/QKkHlb0LoUsfkszBLKBEbr9mq3NhRE8FjMO9xBilvNMkj3cUP3zkb4stACx3LzmM8cR/sObAx48DL7XuFhw2OUuD+Mmfyo5VMZiKkmKXVXJw6/hiBr6mJ1YtnUBpnqOk/2trJUVCvpBCRbO9gudf9Ezfq2FywWiCTB3vw7Jqzhlj9Tv61dbdh4M4gjQApe8G2RRDK/VC7UDUViXu1rJKtGPAHm/I8tm8RjbolqWtQLxvR0kUxIIXbj5ukg6EBhCrU33AFWzNvuUf7zEDRtQSKvo9w/bKyH8= 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: 0LEBYDBsesIo8uEvw4AmlDf61p5X93YVzJjF149QH9Y2dzDeVTTW9Bh7K88OLP/ssiRRhHOK1PvvG2jlmx+MWuZBKiHkRbwdxuvxIxLWwD3UGGB9ALKF4eAjKxN0hpDwW5ob+kVmz1UmhMudTsizPpBiYuCk/AnaC2mxO9C3uO6+eu2ZeFvkmDHzT3sEqg5pdtNQWVi1B9o2QzTwLJsJsI3A6ic3F7RXyLoLazjBNTjhWiV9wzUG+oCNLORMfuPnAAjuzGIB8eaDlED0ANr+/B5JIkqu/zDL6Ju/SBAc/Gc27sWDaz73NP6NleoirVhZ7dAoIH31wqrRVGYtWOZncJGYcSR1ItS0MAvKgvv5Ek5JeQ1ISXCKNRRbpPiLqhotNsPcCEvoDAUzKlgSinFlnYt5zLlWI1JuZS78vqa4YaL84o33h5UvOr7xzUab1j9/kF1mUZbraRnGpqw1rhf/FgYVZHMM9FDv8vWHSogmTvcfevbs7AJsPhVi/uWWjgWoWDeT7+B1cRmPU6PAjULWaMm+513sqQxTQzo02iJWdLqSVaLJ2bD0ZTIxPzOknV8E5p0jOozkoMgYmYPWAL09JLznttFTQ1MDHv/7znR/ot/ekuHarw+kyBtFQ3pIZp5J3cJcbxmOcyL/Ip/EQp03OEzVkCNElEY/DovrOxT4ijqJXqgRWox+mLOOqY7xgrx4wToLNnMboUOG6Mo/i/Qxv1DCIhqJLpiQpxjTQcwn2pH+5lCNJiBjLq1rD6jzOK47HYzmRUqq8CTOj0K++gsWH2Ztie3/XSLmDc7sFqYDWMmKU0m0ii6+tqVTLVlLNRBo2eVoNB4I4FGj0i2dcorP3yvIt2YawKqSW65i7U9Ef8/pN74An+4lX7i5sPQS+J4r4RMHExDd33lrWTK0zo0mlKAxi8moCaC9bFfSUfNlQjEjfyhn6efaUN+AqBvz3/pUUC4YeMs6gTzSKlfLb7Bo7oyztFo95JaunLaHlS1/bFEFkLB1szi0t0kg5heE7d9ymgioCr+Y+lvsXQNjxqHCAz9EpcO+HnbviLeZ+Qi1G5++vBq9o/h2f3CkhtX7lUafxJS8iYd13Y4DObJW/zIapoa5u0qX4kEew3qwooSTijCTfOe07VvubfK2QbjpCeGGd7PfI8wCK5OtLnCP8KLEP7ZR4qwbUjF0fp0LqBsBkiDAMvgvQtRYcEoBSdL1j6vy4TMsvQmZKiac5aSNTIgoEcUe85rt/625Dc0oCfUdhL6qrX8lLmVHFZT8yXqoKPKYUWEpF8iAPu3fPw7vt8QkFfnw5+yFY+3fRK8mya74q251BlqH0/xpKZcC0C5fNSNh2nZqpoBgSjpHeawj3ChZQf9+DPsnNSdGR+AwE1/TbuZOiQeHJaEHInErCSP4lv4EFtV4pTM/27G+LDOAelVLEbbIesIXPpnA1j92H86eMFab4xvDvEM0MVos9OcYpWofZa+OC+kEDpAdjDSVBNjIctSrIOk9m+lR0Yyv6mA54PFgHNrW/Q86YJr3c9tOHYq0oIHxjZIB+YwFtTQEq4IFqEgghRk8q0kBxQCVG3gLcRZUxPwaH1cE33kkBRgJCXRi82xgXoqD5sTX5DbiDtrhYw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b892ffe8-af3d-460d-dca9-08db40b51a8d 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:38.3731 (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: em4mW6pEk3dN9DQ7eW1mUf5Yh1JFg+SzVJGn5tj+rtUY0S7yKuWpiUlwNNiuR+1/lWstKiOr8Tqe3a7B30FDSg== 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 Return a common -EACCES error value instead of a positive private error value XST_PM_NO_ACCESS (2002) in zynqmp_pmufw_load_config_object function if the config object is not loadable to simplify the error checking. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Use macro for node id drivers/firmware/firmware-zynqmp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index e763c639f7..7be4420a23 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -83,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 == PMUFW_CFG_OBJ_SUPPORT_NODE) + if (ret == -EACCES && id == PMUFW_CFG_OBJ_SUPPORT_NODE) skip_config = true; return 0; @@ -236,8 +236,7 @@ int zynqmp_pm_is_function_supported(const u32 api_id, const u32 id) * * @cfg_obj: Pointer to the configuration object * @size: Size of @cfg_obj in bytes - * Return: 0 on success otherwise negative errno. If the config object - * is not loadable returns positive errno XST_PM_NO_ACCESS(2002) + * Return: 0 on success otherwise negative errno. */ int zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size) { @@ -254,10 +253,8 @@ int zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size) if (err == XST_PM_NO_ACCESS) { u32 id = ((u32 *)cfg_obj)[NODE_ID_LOCATION]; - if (id != PMUFW_CFG_OBJ_SUPPORT_NODE) { + if (id != PMUFW_CFG_OBJ_SUPPORT_NODE) printf("PMUFW: No permission to change config object\n"); - return err; - } return -EACCES; }