From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08099C2BD09 for ; Fri, 6 Dec 2019 16:56:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C90FB206DF for ; Fri, 6 Dec 2019 16:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575651390; bh=6gNDENZcJSQ67bgbdxuc4p2V01c4z4mpbBlsh9e0gpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LBBZX7SBzvvMy4M2L2giz8CgLY50oQa2zQem6e+sSdcUq8S3KGmLtwXvJhv7UDMmp jNWqZr/EysZIr4oco8k9ZDdeTU19zyE5xtpjTbk679YnrKRorE7enKvUNxdSyMKkzC dS7vG7VBVF6ezblFL9xGn2TxyTlGUtqAfLOHTIjE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726575AbfLFQ4J (ORCPT ); Fri, 6 Dec 2019 11:56:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:50870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726460AbfLFQ4H (ORCPT ); Fri, 6 Dec 2019 11:56:07 -0500 Received: from e123331-lin.cambridge.arm.com (fw-tnat-cam5.arm.com [217.140.106.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D45321835; Fri, 6 Dec 2019 16:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575651366; bh=6gNDENZcJSQ67bgbdxuc4p2V01c4z4mpbBlsh9e0gpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RW2LcMsM49xw3lMKdLuz+3b5IEOpXrl1+aU4tapnfxNmtGZ+XLlBPRzRA2r/HU7cc tKYxyCryQgOfGfe+q8NQlr+S4HiX784JqD3zdeZIStl4krWoBqL2GUE5BMoZ+dJ6ov A7Eq8IV0wXTRjOCa1SQyviRwppvp1W8Ukbl3/F0U= From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Andy Shevchenko , Arvind Sankar , Bhupesh Sharma , Masayoshi Mizuma Subject: [PATCH 3/6] efi/gop: Return EFI_SUCCESS if a usable GOP was found Date: Fri, 6 Dec 2019 16:55:39 +0000 Message-Id: <20191206165542.31469-4-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191206165542.31469-1-ardb@kernel.org> References: <20191206165542.31469-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Arvind Sankar If we've found a usable instance of the Graphics Output Protocol (GOP) with a framebuffer, it is possible that one of the later EFI calls fails while checking if any support console output. In this case status may be an EFI error code even though we found a usable GOP. Fix this by explicitly return EFI_SUCCESS if a usable GOP has been located. Signed-off-by: Arvind Sankar Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/gop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c index 08f3c1a2fb48..69b2b019a1d0 100644 --- a/drivers/firmware/efi/libstub/gop.c +++ b/drivers/firmware/efi/libstub/gop.c @@ -198,7 +198,7 @@ setup_gop32(efi_system_table_t *sys_table_arg, struct screen_info *si, si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS; - return status; + return EFI_SUCCESS; } static efi_status_t @@ -316,7 +316,7 @@ setup_gop64(efi_system_table_t *sys_table_arg, struct screen_info *si, si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS; - return status; + return EFI_SUCCESS; } /* -- 2.17.1