From patchwork Mon Apr 19 13:54:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jose Marinho X-Patchwork-Id: 1467946 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=YhZe/hVo; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=YhZe/hVo; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FP7ck1Wr2z9vFX for ; Mon, 19 Apr 2021 23:55:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 98DD181F0F; Mon, 19 Apr 2021 15:55:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.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=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="YhZe/hVo"; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="YhZe/hVo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C061D82015; Mon, 19 Apr 2021 15:55:25 +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,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20604.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::604]) (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 2DC4180C67 for ; Mon, 19 Apr 2021 15:55:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Jose.Marinho@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r0wSCesv50E+293c1tEzSNcbOYiQ/Mykj+zkwyt+KzY=; b=YhZe/hVojbbXBclZtOi3jRoY0seracbWSGh3ffKFLn5ESdVpK166PIrJrBKRCR4TvnRPLa/F9TuiaeExKaTJ1iIVBCIEEBnvI4eWKt9SLQO+dN/Xx5jJJUC7Tba0zHEUDuNOfVcfohqAW5VrrHp3byhqWcOa1uQKDvLDUWWc1TA= Received: from AS8PR04CA0201.eurprd04.prod.outlook.com (2603:10a6:20b:2f3::26) by PA4PR08MB5901.eurprd08.prod.outlook.com (2603:10a6:102:ed::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.18; Mon, 19 Apr 2021 13:55:14 +0000 Received: from AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f3:cafe::1e) by AS8PR04CA0201.outlook.office365.com (2603:10a6:20b:2f3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Mon, 19 Apr 2021 13:55:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; lists.denx.de; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;lists.denx.de; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT041.mail.protection.outlook.com (10.152.17.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Mon, 19 Apr 2021 13:55:13 +0000 Received: ("Tessian outbound 4ee49f77c636:v90"); Mon, 19 Apr 2021 13:55:12 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 53ae6f6d4d096913 X-CR-MTA-TID: 64aa7808 Received: from 272e67466dc3.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A2FDC894-8DF1-4823-8367-A567580E7478.1; Mon, 19 Apr 2021 13:54:59 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 272e67466dc3.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 19 Apr 2021 13:54:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bla708wv7T+on73tw+Uo6l8cm0rOEhtukV3E+QI+bT0XgsLw4XjeuHwBGKCEcOe3V0/cWdcY4ufu5RJZ1a0kvpwISxNF7ydQrCvGKy26dJc4ZRrppOTle8jduDcE565T/rkt5i3cLQM4nXPzABntaHlwnCthlB7sCNKSSHYgkFh+RAbMecbExfb+lNzJAaGvxnR20Z0CnfMSaEjC6cSlZt3obi1hwgY38VsRDGqPipNGyyeakXwcBpkT4rj86CNLrv2nlg7reEleYOn8UVzP6rHN36qTfzELXYsFxKn8tZA2RXfGGLCdqYlu5AruhddcEOZgHM/FN0dU3WH3imOaQw== 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-SenderADCheck; bh=r0wSCesv50E+293c1tEzSNcbOYiQ/Mykj+zkwyt+KzY=; b=Qym7iawBDKIX6fpwNCmLpiU+HQCPxGwvIXQj4w2Xpj6lFIwSnFEhATeXEW6JDzqc7Dnu7lb2OLGVVAXjNNXjoh8X6AFnqMquXRHXZ47G2J1KPDYGwTwKtf6ZOGjlZu/wRvkqKmGGoQAY+nSQkRtAh/GBZIH0HBegColYa/sgphFvx+5Mpi8W3V5tUWtocW33Ye1D58pM/XR9RwjIAy75k42yue/XRWFef55jZpRRCNUxR29/wgIvfVrjJ7Nysbaghl2horIGFQSvyA5JgtfA5VCls8Mnk4oZ+2L/IFbCZFojL235Sc656/4WrCw5fLdtVpATUkDgDfof7/C7mhiTZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r0wSCesv50E+293c1tEzSNcbOYiQ/Mykj+zkwyt+KzY=; b=YhZe/hVojbbXBclZtOi3jRoY0seracbWSGh3ffKFLn5ESdVpK166PIrJrBKRCR4TvnRPLa/F9TuiaeExKaTJ1iIVBCIEEBnvI4eWKt9SLQO+dN/Xx5jJJUC7Tba0zHEUDuNOfVcfohqAW5VrrHp3byhqWcOa1uQKDvLDUWWc1TA= Authentication-Results-Original: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=arm.com; Received: from DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) by DB7PR08MB3753.eurprd08.prod.outlook.com (2603:10a6:10:7e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.19; Mon, 19 Apr 2021 13:54:57 +0000 Received: from DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::508e:a8ba:3aa5:c71c]) by DBBPR08MB6012.eurprd08.prod.outlook.com ([fe80::508e:a8ba:3aa5:c71c%3]) with mapi id 15.20.4042.024; Mon, 19 Apr 2021 13:54:56 +0000 From: Jose Marinho To: u-boot@lists.denx.de Cc: Jose Marinho , Heinrich Schuchardt , Sughosh Ganu , AKASHI Takahiro , Tom Rini , Andre Przywara , nd@arm.com Subject: [PATCH] efi: Fix ESRT refresh after Capsule update Date: Mon, 19 Apr 2021 14:54:33 +0100 Message-Id: <20210419135434.9164-1-jose.marinho@arm.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.55] X-ClientProxiedBy: LO2P123CA0033.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::21) To DBBPR08MB6012.eurprd08.prod.outlook.com (2603:10a6:10:205::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from josmar02Desktop.cambridge.arm.com (217.140.106.55) by LO2P123CA0033.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.21 via Frontend Transport; Mon, 19 Apr 2021 13:54:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6833eb2a-7a4d-4b95-3eb0-08d9033ac134 X-MS-TrafficTypeDiagnostic: DB7PR08MB3753:|PA4PR08MB5901: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:419;OLM:419; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: A4xIyS1qAouv51bVEVwr57f6/tis5rgI2exbhy8cK0mE1uYqjfdY36q5owL9RFc0jtFV3RLFTNgZsqeecsJc9R+nyzX4cFRPCz1VRbrErcTmvzgDw7xfu0B6PFpyDA6htXEjYg5YDg4WnATat1Usfj/rO5Y3JpUhGdQD4KfZDjbsFOgboLpfu+9BQYcjG2o+yvX3L+KIIjPrDDZdGXFG+Dj9mdoUOaldwcdiK/mUHAGz7VqVjyor/KaMKTVl1MISwOkOobrTGMHl2JgwK56Jl2/VpEGc7qfGWm5TsU3wV9z7WXa3/hieLSB8C3rC8D83XEg+UO6/4AqjnEQdHCtH8at5mGRXtxhGH2bgUTPRAA4ILTFWFGQBHAL0Kc0swTZ7K4p/KwnTtn3yL2PqpOLtOIfIPR/YXuVGgK/zv0zjdvM2Dl/At8GGd5aHBdo4YE/YMSpzunNTEqjosHpI7NcU2W0M/pqsMz8h1dssCO2wC2ElY8gL6W5rIG1mEQ8sxUrP5RACc1kdHWcA3w9wkPDbHYEf5rjbiqKI2+zuXLgSUVKFL6HiGX2IWA9a7fdj494pocf9QCkqqB0AOnE2emx+ADLvsIBCOytv9yX2vA8EzbyZhXa7M8C+JI7EmVfaUOqcJMppHY5vNQL9/VFZEEU0KUjUNpbu+mRr3m9GGO/HyEg= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB6012.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(396003)(39860400002)(366004)(376002)(346002)(83380400001)(66946007)(66556008)(66476007)(86362001)(2906002)(38100700002)(6666004)(1076003)(38350700002)(16526019)(5660300002)(6486002)(4326008)(52116002)(478600001)(26005)(8676002)(6916009)(2616005)(7696005)(316002)(44832011)(15650500001)(956004)(186003)(36756003)(54906003)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 77iUKqfZz0Zd/1LrLOFEzfy5Pg+64QkOV9rr+LdRZSQljpzUAc5mHW80dVO4HNRBCq5uEFgnYrbeboDKNEzVmo/+L5XAtHNSNbrdko+F6qWv1GafoonZhN+UNj9W4GMlZZzxcNYG6lp7XFTX9pWXc1Ut70g3ApvYsjGx8QJfhHHmHFAewo0YPPsS83zeEBiylhugcy6rqRUGX3GL6f3/0FIJIwmG8scvSbjJ0awGXfsgpz4YZhXQPnOT2dNFn+LI6JDgpcqmbeShmL9sKV8rcymOWsuLxa5b8xDOnJ6PZkljJaG5HC4V1VuNEGEtlxTId+CPD7omQruNvC47yNgqT1cnOOY+TSsoBrekdrolLY4j//2oChRN9g74vF4AqM/6oE+yqH8h2M8fSHQv5MQu6D2wFhkn09wLgAKSW1rl/W4R+vtJ3mCrEfV6KbPEL86KjZrCIxkaERui8Vepya47HQxjDzytQlFm/iLV3j2/USRsYzqAz4QszHzFYYgjDMjsePxcHhCJ3+v+yiSVJ8pTM6yTG5rZvtefjxdjvfDRTfbB2x+EvsD7JFYvPKSowsD706mlaD1b2BLrVVelD1/eWPDMhqstPBv1S+e93kjzFa7bhBGXMiNseC/yYb7z/UyeKVsfl3OKKva4NenWmTw1id4XlpPfboKKrdmYeGO5e6o8IxpoAz+z+bqvvBIv7auZW98mb83cqdS8nkCKNFoTkZEITg2wTxEtcWeu9wGyUY93PYRe72XrDlaEOSU5J1+PtN9oBPYtFVWscxSobS2dpwbHA4AWXx+zB+Cd7RBjkpsXJfLQjNjJYZVW45fAAQ2eATC93voCj3ZsY6uLfb1/2N8dRxb7W9qHON+ftUd8oBD/HPXFR0J4IYxq5XdicjYNI58GMiT1Vif3ir2CgPb2aiiNsvsWvZsiGoBNIdpGAQdcKaDwfgneZtrNBbi0XuVcWixtlMG7rocnvvy+1EMZIQNGRGD6pkLPLbkqmZ6LOxTXU4+pc0hsbvMVidqqPSbAb8iCa78i1oYEe1UUF2GENhks+PWIOxttKXwFmqDqKfmKngCKIWsonhfztKO5FsSkSuq42tDCOwe1xZDC8LrP2lileNuJhnrcq/BascuFU3ZGbVShwY6HZB0Q49c1+d0APvc8ZeCDhjn33KYNjTUoQjomSPDY1NYQLzbMa7WAfzuNrs9KH4V+n7zUerDcDjHH2Qs2ZXO7nTinYoDcErKOwP2gMc4Gr6eJv76JPzBoI3V1qqOMXJjD88s6yd5cPA0E/MXQr0jVTFvWXRgJrPiv3BFTGWw+z4Xr9rL5MiP39TpSTfkhgdF17o+Ac6l/SBGY X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3753 Original-Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none; lists.denx.de; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 27550c75-5339-49aa-cf5a-08d9033ab6b1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F0NaF1qgGb21u5ET3YGWBSZdywllQexQhETx1zm89ny8UZB0rNoCMWBUxP6v/ZF1BdlG1V7s9DJfQY/wS4AT9OLrtRN2x2AGX1g/iHnuCC3ylLqQms0OgPHMNljsPbKzGrFUvPYPnTOcVgTaJ2BFJwrHKtmumdLGAkYIiOsWn0bXiK0fEqP27B5jVEKtiHBpQA8335Ec4s7BuODOjWGC2tjD2efIWTNvWAMyuFurdYCdSFLn9+IUjW/X0QwANtN9RrlNOJ3e+l26ZB2KGuRFscDYZZn5sMGwlVhbTaSKh4C+p1jPLiIAF+aOLbf5iR7YAScuyfVw3EelKEzm3olLuwirGZZ9yKvT/8Mc/zaoAEqM9cfAVO6SzFaoXMKUR4b9RNQ3bL9qRX/yYOLNic7obxgRrBTnJRHI018xqNjK1+w8h+jBZSeRCckypzzXtxddj4EILMZlC0csM3tYk9/mGowhyTVDKHuBrSgeu1Nu/O3CHc4PygqFdRbqOZq/e7mCrgl4WikeT6ylFaTGa2F0bOuo8HHUqzjMk8lb7EUtyFQ5eXadomdmpnHbgp0zuytCum94SVRTtGy0bLmiOWhVKyXmQTMoCX8A3kYQkjgrJoEF9xgpRkEzJf3JkLBXdBPvXWHTJQubrVOZ0sQlWaX3F+TYg2j9DSJiPnM0K8gwrWg= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(136003)(39860400002)(396003)(376002)(346002)(36840700001)(46966006)(82310400003)(6666004)(82740400003)(36756003)(1076003)(70206006)(36860700001)(8676002)(478600001)(70586007)(54906003)(83380400001)(2906002)(956004)(2616005)(316002)(44832011)(15650500001)(356005)(26005)(6486002)(186003)(47076005)(86362001)(16526019)(7696005)(81166007)(6916009)(8936002)(4326008)(5660300002)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2021 13:55:13.3479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6833eb2a-7a4d-4b95-3eb0-08d9033ac134 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5901 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean Indicated by Coverity Scan CID 331147 The ESRT was being refreshed in situations where the UpdateCapsule procedure failed. In that scenario: 1) the ESRT refresh was superfluous. 2) a failed ESRT refresh return code overwrites the UpdateCapsule error return code. This commit ensures that the ESRT is only refreshed when the UpdateCapsule performs successfully. CC: Heinrich Schuchardt CC: Sughosh Ganu CC: AKASHI Takahiro CC: Tom Rini CC: Andre Przywara CC: nd@arm.com Signed-off-by: Jose Marinho Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_capsule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 691eda5e0d..a984c347e1 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -481,7 +481,6 @@ efi_status_t EFIAPI efi_update_capsule( if (ret != EFI_SUCCESS) goto out; } -out: if (IS_ENABLED(CONFIG_EFI_ESRT)) { /* Rebuild the ESRT to reflect any updated FW images. */ @@ -489,6 +488,7 @@ out: if (ret != EFI_SUCCESS) log_warning("EFI Capsule: failed to update ESRT\n"); } +out: return EFI_EXIT(ret); }