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 <[email protected]>
CC: James Morse <[email protected]>
Signed-off-by: Dongjiu Geng <[email protected]>
Acked-by: Will Deacon <[email protected]>
---
This cleanup is ever mentioned by Mark Rutland in [1]
[1]:
https://lkml.org/lkml/2018/5/31/289
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
CC Borislav
2018-08-08 0:26 GMT+08:00 Dongjiu Geng <[email protected]>:
> 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 <[email protected]>
> CC: James Morse <[email protected]>
> Signed-off-by: Dongjiu Geng <[email protected]>
> Acked-by: Will Deacon <[email protected]>
> ---
> This cleanup is ever mentioned by Mark Rutland in [1]
>
> [1]:
> https://lkml.org/lkml/2018/5/31/289
>
> 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
>
2018-08-10 5:05 GMT+08:00 Tyler Baicar <[email protected]>:
> On Thu, Aug 9, 2018 at 8:32 AM, gengdongjiu <[email protected]> wrote:
>>
>> 2018-08-08 0:26 GMT+08:00 Dongjiu Geng <[email protected]>:
>> > 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 <[email protected]>
>> > CC: James Morse <[email protected]>
>> > Signed-off-by: Dongjiu Geng <[email protected]>
>> > Acked-by: Will Deacon <[email protected]>
>> > ---
>> > This cleanup is ever mentioned by Mark Rutland in [1]
>> >
>> > [1]:
>> > https://lkml.org/lkml/2018/5/31/289
>> >
>
> FWIW - Looks good to me!
Thanks very much for this comments and review,
whether I can get your "Acked-by" or "Reviewed-by"? thanks
>
> Thanks,
> Tyler
On Thu, Aug 9, 2018 at 6:16 PM, gengdongjiu <[email protected]> wrote:
> 2018-08-10 5:05 GMT+08:00 Tyler Baicar <[email protected]>:
>> On Thu, Aug 9, 2018 at 8:32 AM, gengdongjiu <[email protected]> wrote:
>>>
>>> 2018-08-08 0:26 GMT+08:00 Dongjiu Geng <[email protected]>:
>>> > 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 <[email protected]>
>>> > CC: James Morse <[email protected]>
>>> > Signed-off-by: Dongjiu Geng <[email protected]>
>>> > Acked-by: Will Deacon <[email protected]>
>>> > ---
>>> > This cleanup is ever mentioned by Mark Rutland in [1]
>>> >
>>> > [1]:
>>> > https://lkml.org/lkml/2018/5/31/289
>>> >
>>
>> FWIW - Looks good to me!
>
> Thanks very much for this comments and review,
> whether I can get your "Acked-by" or "Reviewed-by"? thanks
>
Sorry, yes!
Reviewed-by: Tyler Baicar <[email protected]>