|
@@ -89,14 +89,14 @@ bool ghes_disable;
|
|
module_param_named(disable, ghes_disable, bool, 0);
|
|
module_param_named(disable, ghes_disable, bool, 0);
|
|
|
|
|
|
/*
|
|
/*
|
|
- * All error sources notified with SCI shares one notifier function,
|
|
|
|
- * so they need to be linked and checked one by one. This is applied
|
|
|
|
- * to NMI too.
|
|
|
|
|
|
+ * All error sources notified with HED (Hardware Error Device) share a
|
|
|
|
+ * single notifier callback, so they need to be linked and checked one
|
|
|
|
+ * by one. This holds true for NMI too.
|
|
*
|
|
*
|
|
* RCU is used for these lists, so ghes_list_mutex is only used for
|
|
* RCU is used for these lists, so ghes_list_mutex is only used for
|
|
* list changing, not for traversing.
|
|
* list changing, not for traversing.
|
|
*/
|
|
*/
|
|
-static LIST_HEAD(ghes_sci);
|
|
|
|
|
|
+static LIST_HEAD(ghes_hed);
|
|
static DEFINE_MUTEX(ghes_list_mutex);
|
|
static DEFINE_MUTEX(ghes_list_mutex);
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -702,14 +702,14 @@ static irqreturn_t ghes_irq_func(int irq, void *data)
|
|
return IRQ_HANDLED;
|
|
return IRQ_HANDLED;
|
|
}
|
|
}
|
|
|
|
|
|
-static int ghes_notify_sci(struct notifier_block *this,
|
|
|
|
- unsigned long event, void *data)
|
|
|
|
|
|
+static int ghes_notify_hed(struct notifier_block *this, unsigned long event,
|
|
|
|
+ void *data)
|
|
{
|
|
{
|
|
struct ghes *ghes;
|
|
struct ghes *ghes;
|
|
int ret = NOTIFY_DONE;
|
|
int ret = NOTIFY_DONE;
|
|
|
|
|
|
rcu_read_lock();
|
|
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))
|
|
if (!ghes_proc(ghes))
|
|
ret = NOTIFY_OK;
|
|
ret = NOTIFY_OK;
|
|
}
|
|
}
|
|
@@ -718,8 +718,8 @@ static int ghes_notify_sci(struct notifier_block *this,
|
|
return ret;
|
|
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
|
|
#ifdef CONFIG_HAVE_ACPI_APEI_NMI
|
|
@@ -966,7 +966,10 @@ static int ghes_probe(struct platform_device *ghes_dev)
|
|
case ACPI_HEST_NOTIFY_POLLED:
|
|
case ACPI_HEST_NOTIFY_POLLED:
|
|
case ACPI_HEST_NOTIFY_EXTERNAL:
|
|
case ACPI_HEST_NOTIFY_EXTERNAL:
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GSIV:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GPIO:
|
|
break;
|
|
break;
|
|
|
|
+
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
if (!IS_ENABLED(CONFIG_HAVE_ACPI_APEI_NMI)) {
|
|
if (!IS_ENABLED(CONFIG_HAVE_ACPI_APEI_NMI)) {
|
|
pr_warn(GHES_PFX "Generic hardware error source: %d notified via NMI interrupt is not supported!\n",
|
|
pr_warn(GHES_PFX "Generic hardware error source: %d notified via NMI interrupt is not supported!\n",
|
|
@@ -1024,13 +1027,17 @@ static int ghes_probe(struct platform_device *ghes_dev)
|
|
goto err_edac_unreg;
|
|
goto err_edac_unreg;
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
+
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GSIV:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GPIO:
|
|
mutex_lock(&ghes_list_mutex);
|
|
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);
|
|
mutex_unlock(&ghes_list_mutex);
|
|
break;
|
|
break;
|
|
|
|
+
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
ghes_nmi_add(ghes);
|
|
ghes_nmi_add(ghes);
|
|
break;
|
|
break;
|
|
@@ -1066,14 +1073,18 @@ static int ghes_remove(struct platform_device *ghes_dev)
|
|
case ACPI_HEST_NOTIFY_EXTERNAL:
|
|
case ACPI_HEST_NOTIFY_EXTERNAL:
|
|
free_irq(ghes->irq, ghes);
|
|
free_irq(ghes->irq, ghes);
|
|
break;
|
|
break;
|
|
|
|
+
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
case ACPI_HEST_NOTIFY_SCI:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GSIV:
|
|
|
|
+ case ACPI_HEST_NOTIFY_GPIO:
|
|
mutex_lock(&ghes_list_mutex);
|
|
mutex_lock(&ghes_list_mutex);
|
|
list_del_rcu(&ghes->list);
|
|
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);
|
|
mutex_unlock(&ghes_list_mutex);
|
|
synchronize_rcu();
|
|
synchronize_rcu();
|
|
break;
|
|
break;
|
|
|
|
+
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
case ACPI_HEST_NOTIFY_NMI:
|
|
ghes_nmi_remove(ghes);
|
|
ghes_nmi_remove(ghes);
|
|
break;
|
|
break;
|