From patchwork Thu Apr 27 10:31:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1774405 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=qO6N2unI; 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 4Q6X8w55fGz23v8 for ; Thu, 27 Apr 2023 20:31:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BD0CB85659; Thu, 27 Apr 2023 12:31:40 +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="qO6N2unI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BAF2985BD0; Thu, 27 Apr 2023 12:31: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=-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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62e]) (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 8AFC08564D for ; Thu, 27 Apr 2023 12:31:37 +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=NAjRwK4RYkTrAqAWjw29bID+I69gS7O8RzYO4qeZPo1ifkF1/4iLPiqwR5g2Tm2AGlhtWOQVzlDUGnaAgZ4srwa9efJ3vxkif6+9+Mp93P6QeujNBHhHAnG2LRTPJvFzT+80G+UshwF/gKD08ksO5x4wo1MWgoCwcQkCu/1im0YXQuAkIeAw6+/qIP31yjOrnObI7It49huP6bDWtkngknPczVckN1pvxAWHoYNCY0yriLtUCJ7DtAL7wRuJ5cIkzQnmnUu/+SqdionMbTwpN/OXMGBKTNCg+zszk4/njAG8EMG+NYwpiBkCMvE5ClYKrKz192xyYpgHEpXNZFC2vQ== 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=g8CJTYUx/kkHei4I9V2HhqZRHQiHVkOI/G+M6zAypj4=; b=Q8YKBneCCkyZULBJ1eoagNhPtmo2Fne2VE0CH5rcFEMAh6tKrIUu99rPrdFoeg/u08Iw1Y0r6KfPMNp/8Ln+L9EgeBuwXFROo+1WtCvV1qqsqmN6Zj0y7t/B/iZKcN8Y6g8+wJS0ZeolHvsk0EqjDLmbV32nKP/ENm8yYmd8uxu+cIML4rBp/WrsoYALvcOk01LwtIRtWGfbAljRpb+skDkbg9H2+VgnMDbqfseJ5PF6zZSZzpZC+6iKHkG9CuVW56q91Yf+VEoSXr+mtC12rLJDh1v3sZsyxrEQHrKEuurOil5utuc40WNbk8TU4n+Azf8Fgq3YT/7Xk9tYzaogfg== 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=g8CJTYUx/kkHei4I9V2HhqZRHQiHVkOI/G+M6zAypj4=; b=qO6N2unILg8T1rSSsUqHYM+pVfmcfaYIVvSBp+yuBCd1NdV6HJE8MkmdsG2k5yD/sBDcwDZ6Gvz4SOOr6pJOTLhBsbWn7aNjdtJqg+5mtnWImSTgGw2Zn91HZMo2Jti/uKR7qiLjGDeI1GhTQ1xVdArS0vV7UVnyonPhaz59Cdg= 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 AS8PR08MB10270.eurprd08.prod.outlook.com (2603:10a6:20b:63c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.22; Thu, 27 Apr 2023 10:31:35 +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.6340.021; Thu, 27 Apr 2023 10:31:35 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Ashok Reddy Soma , Jay Buddhabhatti , Michal Simek Subject: [PATCH v3 1/2] firmware: zynqmp: Remove extraordinary return value Date: Thu, 27 Apr 2023 12:31:24 +0200 Message-Id: <20230427103125.26719-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR2P281CA0120.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::13) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|AS8PR08MB10270:EE_ X-MS-Office365-Filtering-Correlation-Id: dbc69e3e-1ad7-41a8-beaa-08db470a936b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VeXJRzyC2Sgi4SK/kKBIRUfXv1L4vrI9snP7R/clExC4dk//DOnlr+6cLQ1RmlK0VI1ZzuFD/K+GHr8g+aAWhiuM5CpkRr+wlNmh0WreTkwUkPTe1KU0WvYXQeEVvEqJd1yLeUEBGiUaVwe0HDLnTZ2grc60XPLPtRresz6rlo8SmLdydE9xx4t+Z48JQkLyJ/ud6UrxN2PP1Kpd0AyqSjcKQWYvl5I/fa0CW2DUQyedYYVyHblLwAiS9BRCyAxarHvcdNVpIRYwqXiyQrLwG/fXLKrKJoKtElxPxYs+milXFBERZwB9iKexRUGi4HzryXS7COkeasZPL6xuehdU3fMaT+hmlFWKW53Jl2G0+A8ubx3F8GINuCqC9ljhbuV7JJMswKFEA69CDdDFJG3BVvnX1Zom5e679ZSPJImc65OHESg1ZLKCByyN3u8VfTH8+iLIaYmKQQdez2hk/K9zUeFsBrFVF8NY/zmRvXshLdFj4ZVFCVP3AJKW1c8LMfEK+CUGj8OGhc8Cf/GNTv7P5szVGO1a89Xmq0Wh5f7T6nCm+AlFJGWoB6bzVhAvP/TO5uDaAetkFtZ3nB42lPjMRGK2R9/4CoIHaBszTcnvf8OYGNdMNP+iMo/BTL9TnX0Y 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)(376002)(136003)(366004)(39860400002)(346002)(396003)(451199021)(38350700002)(38100700002)(478600001)(5660300002)(66556008)(66476007)(6916009)(66946007)(4326008)(186003)(6506007)(2616005)(36756003)(6512007)(26005)(316002)(8936002)(83380400001)(1076003)(54906003)(8676002)(41300700001)(86362001)(6666004)(6486002)(52116002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rX71z3/He6Yy9k7YDfPZhjoUn9/vKylccWKjMO3ukgFMeP9VZiLGxTKYYkNgWmuTKy4Xxzzgc3owc+OUBrEZIaT8qgdsy5hom8ApdgZz4dBGjQ1EqJphmDyNuTsTCfXChV1v29Ljv9cwAA6FgFRK7wPJ/XrtAKVbNSrJ2ze1dUGL5s6E6VnzOT0zRYNN4bvUlR66d3oRO7F3WBQGg0cypN1HaUNxJMHrCD6YOGOMDUGmSabOFEJEt2DgZF9nRd6/DHIHQGpT93c2vNu1ba9hib24D/bHgTrjvLNUhlVfTA1jIBv+8qIGM4sH6eiwNS0VzMkHWHJThMv1yaEYC2BeB7HgEeDlI4wZWq8BOehy5hC1rDCYiKd6vrQiLr9UlibJlYorVETYq4rxJM67fQASknEQX/Is8kZKrwuN1jQWDj4EsKOS1XKWFXHRSgQOkh8b/O4PN4QjfPwCEjmjTzL7Qge/6yqTtx568X+sl4jILCzFlr6d/MrdADs09GjiH7dtsW9cPRdE+/rWKZR1zZevR4Qw9cDBYQ8zzSA6TM4wu7cfISSbRFz9TZtyqwQdgECxzT3zm1XZudypGfa0u8qYGxzxzmWcWQ7+hrCPJPJtWUZjcqWJ003V6G7vr3nCyqfkAZAT/JqcTp9U8dJjwpNEZyybBl8+haMhRk3/Ge4wlQH9qH9DghdEGECn1ADZkR6ZmX348JUbE5wsZ6wydpVe6RI0Em3KzN4KE8396Q2GoenNAjw3volNZ0Qe08NJLItm5ZoowoXxLYonvQ8ORfbzs+1fS+tNnqca6JF3gS9x7fobISZkEFuEHHGlLuhgzjMFEQ7xF9kkH7kslwUagfPZPVS+1eTFCVFJzqe0svZP8Tvem5ZtQp9HCR1LgPqzW9xeg+kPMZgc38edk/1d92vqImKzDSBYspgaZTzUTO4JSnSuVN5vgrkjAXNt7h+wFELT41eI5GCnrnBvJXJyAsEoXoao4AGGQYl2lUPoigs4A8FmWQJ79WguwuzcjbvQqJWuJ6eRhhSWzbmIE4cMGLwRJg9+rmO6T/W4BZdNEoor1q1O9RstV2XrtEZPpWDdL5gYRttpFVJ7d0nT6nODqhlWOeSJxYYxGBCxPNwkbZRlRCqIEEB6x3YNe4fxc7xIh1opPvC1Lh3tQ5c57yqEIML2oJMlfDXH4D3pOt0G5tRAfzrBQrc6V77ed0bKcpogvd+aqcOYvd/6QWiT0i35K8ktdhpTBLItcEKYARn56KZNqeRFxEL44njvHjzy2aOjtJttIqJrJbVyhQ96FwSSuNyCWmDkyLcOR4Zac3k65ihc/vcjwrPc92gvtwCzGOuflv4WYFgZy18CGSgtaE3HV2zoDW/QCeOYsgPqd1WLMYYAy3FFsJFdB9D5XMMzEXRDp2D3J4hLGjiIBN6nqwrc9v8h9S9LL64pH8uhc3XNTLE0QJ2RUW3nQfuHac98udTB5djTMMIBoU9kqCGDYgvJcQ5+Bg1lspoYANfvE+WUfeQ67Nxm/F4KWrnaHAzPzu3nv60cGbgyMUelV7H4uJeglnH31gkrEhefdVYk/aK12ol/CuqZKl6wLjBhuj6wN6BytmDrg7t+sN4UN2AcAygkS5y/dw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbc69e3e-1ad7-41a8-beaa-08db470a936b X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2023 10:31:35.3196 (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: 5vR1vqSvp9pwsLAs4P15sQFRStICl8ak0qq05ECsbKl3iqVwqh5u24yizkGlcI17Fj4tY7kjD4f3yfygIdKAVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB10270 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 v3: - Rebase Changes in v2: - Use macro for node id drivers/firmware/firmware-zynqmp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index dc8e3ad2b9..2b1ad5d2c3 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -82,7 +82,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 == -EACCES && id == NODE_OCM_BANK_0) skip_config = true; return 0; @@ -235,8 +235,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) { @@ -251,10 +250,8 @@ 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) { + if (((u32 *)cfg_obj)[NODE_ID_LOCATION] == NODE_OCM_BANK_0) printf("PMUFW: No permission to change config object\n"); - return err; - } return -EACCES; }