Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp721875imm; Fri, 10 Aug 2018 21:39:24 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwCDjImbea8FM3EDGNC2ROMvtbHj9c3h4LphENq2kvjxVcl//JY8fTDQJN1CrW103iuRA14 X-Received: by 2002:a63:5106:: with SMTP id f6-v6mr8680792pgb.95.1533962364305; Fri, 10 Aug 2018 21:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533962364; cv=none; d=google.com; s=arc-20160816; b=lAERD1jba38PIITeP/Hgu4uB8Tovv6fjiJuM9LpwKypZroAv2jXj5XG6F0rOaPYqzm +mqqkeBAXhCH2GXKwXx1DZ4F6/Bk5rbmEa8kw+YEo6wUkQ6S+KOfE67juDWwx6/kQsvu I1QJzRV0Y64oZ9HWk6rpCbJFZ35Phi4+9YzJ8bGovUDr9vx9iXJGDcUav8/tpTV6fny3 e7zL2L8klZnKmR6UfaP9yzEOTBhrDNBQbE2rIczHj7r19JrmC1Dzm0iuupBDPLh7lmZu 2iyAp4Jm17srkGhbHSZCmlz1d+Q98YRU0wYQhF2b9aV0EWmnNk5Yyug62lFa38g7CxFn ZYUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=fGCWjp9IjSbp+FJ7/5xKVRhuBEMg/Lz19Q578kAl1Jg=; b=pg52XgSri/3+Fly0u5J14StDnzN06qdAroAeNC6sx+PQcVUcbuO+EAe9IfEVdIWK/p G2jyt2TIypNSqFC8moAgCvQHjrFhYR2/dqPA83HjZO1VTd5Hhf1MPLZR8PWsNAPNWgbs HoxQOzB4ZxcDAcA7V13VO94FC4Jf/sJSTsd6evlU6M/qtioAGHldhg8bTV8HySKsEw+Z 03GZxIM1uQD66ZHSMkcSqXrnsAYoozZeBbpXTVQHWY4CpvSxJZUOnYhC3M+Sum37+SUB TxPS2xav4eMuWQvgx44Y1XI0773o1DziMHY8344UzMa4YwqbHF06xnydcnLjKryy5tf/ v5EQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e10-v6si11853722pgm.94.2018.08.10.21.38.43; Fri, 10 Aug 2018 21:39:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727326AbeHKHJ1 (ORCPT + 99 others); Sat, 11 Aug 2018 03:09:27 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:10700 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726858AbeHKHJ0 (ORCPT ); Sat, 11 Aug 2018 03:09:26 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id AFE67C9BD85C3; Sat, 11 Aug 2018 12:36:35 +0800 (CST) Received: from SHA150392835-N.china.huawei.com (10.45.59.148) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.399.0; Sat, 11 Aug 2018 12:36:26 +0800 From: Dongjiu Geng To: , , , , , , , , , , , CC: Tyler Baicar Subject: [PATCH RESEND v3] arm64: clean the additional checks before calling ghes_notify_sea() Date: Sat, 11 Aug 2018 12:35:47 +0800 Message-ID: <20180811043547.560-1-gengdongjiu@huawei.com> X-Mailer: git-send-email 2.11.0.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.45.59.148] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to remove the additional check before calling the ghes_notify_sea(), make stub definition when !CONFIG_ACPI_APEI_SEA. After this cleanup, we can simply call the ghes_notify_sea() to let APEI driver handle the SEA notification. CC: Tyler Baicar CC: James Morse Signed-off-by: Dongjiu Geng Acked-by: Will Deacon Reviewed-by: Tyler Baicar --- This cleanup is ever mentioned by Mark Rutland in [1] [1]: https://lkml.org/lkml/2018/5/31/289 change since v2: 1. Add 'Reviewed-by' of Tyler change since v1: 1. Update the commit messages 2. CC Tyler and James 3. Add 'Acked-by' of Will --- arch/arm64/mm/fault.c | 7 +------ include/acpi/ghes.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index b8eecc7..9ffe01d 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -727,12 +727,7 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) int handle_guest_sea(phys_addr_t addr, unsigned int esr) { - int ret = -ENOENT; - - if (IS_ENABLED(CONFIG_ACPI_APEI_SEA)) - ret = ghes_notify_sea(); - - return ret; + return ghes_notify_sea(); } asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr, diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 1624e2b..82cb4eb 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -118,6 +118,10 @@ static inline void *acpi_hest_get_next(struct acpi_hest_generic_data *gdata) (void *)section - (void *)(estatus + 1) < estatus->data_length; \ section = acpi_hest_get_next(section)) +#ifdef CONFIG_ACPI_APEI_SEA int ghes_notify_sea(void); +#else +static inline int ghes_notify_sea(void) { return -ENOENT; } +#endif #endif /* GHES_H */ -- 1.9.1