From patchwork Tue May 23 12:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1785111 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=cnFXcIbA; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQYrg16F8z2020 for ; Tue, 23 May 2023 22:43:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E16285FF3; Tue, 23 May 2023 14:42:47 +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="cnFXcIbA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 25705801CD; Tue, 23 May 2023 14:42: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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe16::61e]) (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 ED15585FF0 for ; Tue, 23 May 2023 14:42:33 +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=GgurGfFdPqLwTydRkm+P4WV7dKrUFtwRviFvL8LzG9C03d+O2UPr9jFDVk/lDTE7+g8axRpUGUyVCCMmtPnoa1GAO0sE1MOwTW5faaEb4F97kfNxbfUWQ36X9l82PABkhxYhmgk+lf6ycxiUjK4JV0YlP6mTkh1hrO/Fht3Xt+//MMCmncYDvW90cxvoEtfWAlSwHd1nWs8hsC8yDAw7xWoF7cFoXPkeyC18GP6mLNUjtNy/kVtQltDu484JQKpJ7vDGUrvSM6BEv7Bki/h+Pbbmc5o8nQBToy6Ra+Y2WWUEPvHOGiMkqw5bT0LDg/5HSPLU/T+cX83QxkoswgHatA== 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=zJ94O4N7kGl6s4ntEZ3V5Ovv4DB9AXowTjjRVno7/j4=; b=AdNeJForFYy8VyIpdxl51kBRhFeZj1U809f8Pio7p4PnZ4dvRcQWXhu5MJ6yLHuIqru3neTH066AAdp7VxIg2XcvovajbgGwNACGo4RvtoiBo4Tk4NDTuVdY8rhHNUoipRCZUvq6HoAbeEIw+U1WnQO8kDSBZ8R7OXaxhW1b8siLVzmX9AGI3ZG2j3/fsz5M2EGUoqB72W67pLR4gS/Z7YkaaM0vsZF38Dd/aCRXyYoedhx38BlYkxpkl1h1Yl2kcTIBGnsHUgl8tvrhtdV/n5lzapOz7BZ+Zft+lfOjT3XhXxy2LmyBv5H+i9i8BYii2lKy84j5MdY3bmjiTnI8mw== 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=zJ94O4N7kGl6s4ntEZ3V5Ovv4DB9AXowTjjRVno7/j4=; b=cnFXcIbAl0e5L/tCa4nbfvWcONFDhOrCmLVSP9Lkn1WAp+HxU1BJGJe/Uti2DRF2pL6sUhu5VCGdBLL5crTOizp6LInGDh+8PcDyS3oyBD2elGSzP67R2xwooUv6NOXmVzZvMajidHlhij7e/R0ldxEmw1ZosvTBMZ/3KlVp3x8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from AS8PR08MB6964.eurprd08.prod.outlook.com (2603:10a6:20b:349::5) by DU0PR08MB7761.eurprd08.prod.outlook.com (2603:10a6:10:3bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Tue, 23 May 2023 12:42:30 +0000 Received: from AS8PR08MB6964.eurprd08.prod.outlook.com ([fe80::e8f4:c34:a59f:ce35]) by AS8PR08MB6964.eurprd08.prod.outlook.com ([fe80::e8f4:c34:a59f:ce35%7]) with mapi id 15.20.6411.029; Tue, 23 May 2023 12:42:30 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Ashok Reddy Soma , Jay Buddhabhatti , Michal Simek Subject: [PATCH v5 1/5] firmware: zynqmp: Remove extraordinary return value Date: Tue, 23 May 2023 14:42:10 +0200 Message-Id: <20230523124215.30915-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8PR08MB6964.eurprd08.prod.outlook.com (2603:10a6:20b:349::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB6964:EE_|DU0PR08MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c1773be-0d5e-4496-7570-08db5b8b2c36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BjI+P6uv7ebT5IhT8fktoMD8nXMypevhVYsjFQuHOmLAw6nJcRf8P2v9lwnKoMNedELVxxxXSWRDfuZFYgzEFiFkji2amcPf6vLMNN9qpgpYJSoiJH6xsuPmZuKhrdgnSQVjZJkzSFmEbNtfbKfawYVoHngmzRk0uvifvLiHEsYrOy2+ACIiZGW8oiH+zJNeEoA/Xiszssvw1+YfKgCVLyST3lEeRnHDSrAXUzakId2fWkpRX/g3Mt3P4Krk0hcSlVv5A1qgVytIRPw6knXm5R6KuUt0PxPm6pR4pXWttkxTyNU42osOnP3qG7lv/q5EgL+eKgwewsQuNbE6ItSpnyVAM9pB++iioaYuGNoOP5jSrTe3CsbmOC3yv/STPJONiVSUofqUh3o/zH+PwTVjqPnOM7N1fGNQXWh+WMeT3UWPa4KEFtgz8654QNUBrkgZb+T0jASvyCc5dhO+Y1Jf2hi/rcFZoKzO0X4XXXG+tE9XULSM9ZIkte3x67hQrTB5/xCo5I26sYE7PQzqm8bJ9NUr1I5hV0L3/N+7iK7WjHTpEz7ihUpjR5iYL0oW9L3X0EA+WYv3gqMUHKB1G+HQzoYJNWkzxY+Dff7Sqr1Nd1j1sY+7vDKrOUky/pBWzFKe X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR08MB6964.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(376002)(366004)(346002)(396003)(451199021)(186003)(26005)(6512007)(1076003)(6506007)(38350700002)(38100700002)(2906002)(2616005)(36756003)(83380400001)(316002)(6666004)(86362001)(66946007)(66556008)(66476007)(4326008)(6916009)(52116002)(41300700001)(6486002)(54906003)(478600001)(8676002)(8936002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oNrx42J0gVd/oA8lIEDD7rmAmkhOT6N9UfYUaCiLciyBNHFBzXvf4FzIJWjwlZCO2fCSoYHTCLEKrtMUgOo975zn7Pkue5D3PuCYJM0c8c0ORBXyn53rLUKZFLsRmpmkjjJGbcVyP6cfZljQbv7jeAGhxZ0ZnM1wlsvaVjNJZUYqdrWLmA+DROg4BxfLlD4BH7PqJpiEkOCJVGGzUc2sXtyk+yuV8C4Bzg4/BlB5p7OdCSq/0Je4Wd4aLH2btXpRYt1VGfaJLyKhoHZ9yNaxXbVLnJyq5dMv78gc5VCOL8HyuefTUoMHhRAUGaB6gmfEPIqqvaLuvD/9h5rOvEBpUbqpvD7YbVBEAUd3TcUOnUOtLxjc9V03nZE2Cr23keB4T98iYBj9z/rDYGUHc/8CI9x1coIJDRLVZA/z5ZVpAiANV9KHopAGZkS5e4Oo3Rz7X4PlMM4FtfCeJmAhCCB8VN4uxduK1RvY3Zk9Wsxu89QSKzAtiYqbPlLrNeDRvFlRj0tazJHS621aaP9Mgwd+l3aH3r0JvKpb/fkkOMUzdatTs+Otf+Ny3m/TyOK97bFCfyWjxBS8gM3hQXdCSrtkFkRGAwObQl5SoWhu096JunikgvypLidEHCdW24p3uCHhGPOxXSNoBhX3YDNJkvknHTsR+LK7vOCCA5qWL4M7lGdlBniqY2K/6SFgCgjDSkuMy/waetWRLuUF02dFe/7ZlANyFSUAFmh9aeSqqNLcwIMMxXCSJcr3OE9TDXXnQOGSAf1RZbB23O23OPGZEww3RhnsFuYjXTC1c+0xaOtKRFJaVkJVEeutWQjBbYFZWn5OejRgYTZ73cloBFYd3z9zsvFOQ0yyBJtjVV1FZ1+PxEvf4U3C0+dKM407tasNfOwzr0WC+xKK/6gt9HN6FHbe+YnXvLM2LG+tqCCQX5QmUKqD2ROodvyPNQgfTiGGbkXIzLJM06cdWOH3bqRBTsikDyvhlGmH7j5i225QGDwQvM4106p4J/uNn6FVALsjSE7WHMaKzJbPCNTUEkBn8p5dvX0MEHvYRIwptURhuHhm/Ngxlf2LnMIHee/Cl0JcInTBFEc24RmGSMtJ69EL37RpAjVxsVLdqKMR/WRoIcLAPSt+bwEvSPkAu+auX+WwNEplJ5qYRPsZkGi07ZU68/epAuLtTXp1Dx/lcaz3FEm9zMSpZRnOxgXz+w5Lai9d3VcsFUhhwJuubLWWvWAiet+K5/oVyw0sdRdOnvMrq6GfIczIfQkG8p0HFFh2lhmNMsjZSpGCRY7Yvgcnul2HhgMpQOdeZCTEFoyPgcvFuRcLrdbEuJQympPSqAh7dnIYgaEQsy3rU9eUdm3U3ut+05KNUOKQ0T5rNl2hDSAPwNKXE2NKXlLHlftut4fn5tZC+BXXHd7dKV2UU1sn2g8zDI0KTl9ysgXN+nxgvbnvIUDodIa9IA/ubCbzTif8na7cJp8zZU2D9TsAN7CAqzRDdh+6LuKj5RUpuOAXaoPNU8CHaRvvxKybrQlE3oOJUtRUAYVUV9IVWlyPpaLV9+ryPp7BbsA3suJD42sJ5C84eiZYIYh2ZTKwiIgKm7R1xtJxsW0tMcLnDZ8rA5/d0E70nJJpTQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c1773be-0d5e-4496-7570-08db5b8b2c36 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB6964.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2023 12:42:30.5085 (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: INyjoPrQQrZ55r7UYKy/1Kf/bcNOVG7/2Thdt+WPZW9xSOtnis5bBMFtn5jTP8VdktiCOoZiChIntzuus8BS4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7761 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 --- (no changes since v3) 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; }