On Thursday, March 16, 2017 04:08:17 PM Shiju Jose wrote:
> System Controller Interrupts are received by ACPI's error device,
> which in turn notifies the GHES code. The same is true of
> APEI's GSIV and GPIO notification types.
> Add support for GSIV and GPIO sharing the SCI
> register/unregister/notifier code.Rename the list and notifier
> to show this is no longer just SCI, but anything from the
> Hardware Error Device.
>
> Signed-off-by: Shiju Jose <shiju.jose@xxxxxxxxxx>
> [james.morse@xxxxxxx: rewrote commit log]
> Signed-off-by: James Morse <james.morse@xxxxxxx>
> CC: James Morse <james.morse@xxxxxxx>
> CC: Hanjun Guo <guohanjun@xxxxxxxxxx>
> Reviewed-by: James Morse <james.morse@xxxxxxx>
Boris, Tony, any concerns?
If not, do you want to route this through the RAS tree?
> ---
> drivers/acpi/apei/ghes.c | 28 +++++++++++++++++-----------
> 1 file changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
> index b192b42..fd39929 100644
> --- a/drivers/acpi/apei/ghes.c
> +++ b/drivers/acpi/apei/ghes.c
> @@ -89,14 +89,14 @@
> module_param_named(disable, ghes_disable, bool, 0);
>
> /*
> - * All error sources notified with SCI shares one notifier function,
> + * All error sources notified with HED shares one notifier function,
> * so they need to be linked and checked one by one. This is applied
> * to NMI too.
> *
> * RCU is used for these lists, so ghes_list_mutex is only used for
> * list changing, not for traversing.
> */
> -static LIST_HEAD(ghes_sci);
> +static LIST_HEAD(ghes_hed);
> static DEFINE_MUTEX(ghes_list_mutex);
>
> /*
> @@ -702,14 +702,14 @@ static irqreturn_t ghes_irq_func(int irq, void *data)
> return IRQ_HANDLED;
> }
>
> -static int ghes_notify_sci(struct notifier_block *this,
> +static int ghes_notify_hed(struct notifier_block *this,
> unsigned long event, void *data)
> {
> struct ghes *ghes;
> int ret = NOTIFY_DONE;
>
> rcu_read_lock();
> - list_for_each_entry_rcu(ghes, &ghes_sci, list) {
> + list_for_each_entry_rcu(ghes, &ghes_hed, list) {
> if (!ghes_proc(ghes))
> ret = NOTIFY_OK;
> }
> @@ -718,8 +718,8 @@ static int ghes_notify_sci(struct notifier_block *this,
> return ret;
> }
>
> -static struct notifier_block ghes_notifier_sci = {
> - .notifier_call = ghes_notify_sci,
> +static struct notifier_block ghes_notifier_hed = {
> + .notifier_call = ghes_notify_hed,
> };
>
> #ifdef CONFIG_HAVE_ACPI_APEI_NMI
> @@ -966,6 +966,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
> case ACPI_HEST_NOTIFY_POLLED:
> case ACPI_HEST_NOTIFY_EXTERNAL:
> case ACPI_HEST_NOTIFY_SCI:
> + case ACPI_HEST_NOTIFY_GSIV:
> + case ACPI_HEST_NOTIFY_GPIO:
> break;
> case ACPI_HEST_NOTIFY_NMI:
> if (!IS_ENABLED(CONFIG_HAVE_ACPI_APEI_NMI)) {
> @@ -1026,10 +1028,12 @@ static int ghes_probe(struct platform_device *ghes_dev)
> }
> break;
> case ACPI_HEST_NOTIFY_SCI:
> + case ACPI_HEST_NOTIFY_GSIV:
> + case ACPI_HEST_NOTIFY_GPIO:
> mutex_lock(&ghes_list_mutex);
> - if (list_empty(&ghes_sci))
> - register_acpi_hed_notifier(&ghes_notifier_sci);
> - list_add_rcu(&ghes->list, &ghes_sci);
> + if (list_empty(&ghes_hed))
> + register_acpi_hed_notifier(&ghes_notifier_hed);
> + list_add_rcu(&ghes->list, &ghes_hed);
> mutex_unlock(&ghes_list_mutex);
> break;
> case ACPI_HEST_NOTIFY_NMI:
> @@ -1068,10 +1072,12 @@ static int ghes_remove(struct platform_device *ghes_dev)
> free_irq(ghes->irq, ghes);
> break;
> case ACPI_HEST_NOTIFY_SCI:
> + case ACPI_HEST_NOTIFY_GSIV:
> + case ACPI_HEST_NOTIFY_GPIO:
> mutex_lock(&ghes_list_mutex);
> list_del_rcu(&ghes->list);
> - if (list_empty(&ghes_sci))
> - unregister_acpi_hed_notifier(&ghes_notifier_sci);
> + if (list_empty(&ghes_hed))
> + unregister_acpi_hed_notifier(&ghes_notifier_hed);
> mutex_unlock(&ghes_list_mutex);
> break;
> case ACPI_HEST_NOTIFY_NMI:
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
