evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ghes: add the needed hooks for EDAC error report

Browse source 
In order to allow reporting errors via EDAC, add hooks for:

1) register an EDAC driver;
2) unregister an EDAC driver;
3) report errors via EDAC.

As the EDAC driver will need to access the ghes structure, adds it
as one of the parameters for ghes_do_proc.

Acked-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Mauro Carvalho Chehab 2013-02-15 06:10:39 -03:00
parent 40e0641538
commit 21480547c8
2 changed files with 46 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/acpi/apei/ghes.c
View file

@ -409,7 +409,8 @@ static void ghes_clear_estatus(struct ghes *ghes)
ghes->flags &= ~GHES_TO_CLEAR; ghes->flags &= ~GHES_TO_CLEAR;
} }
static void ghes_do_proc(const struct acpi_hest_generic_status *estatus) static void ghes_do_proc(struct ghes *ghes,
const struct acpi_hest_generic_status *estatus)
{ {
int sev, sec_sev; int sev, sec_sev;
struct acpi_hest_generic_data *gdata; struct acpi_hest_generic_data *gdata;
@ -421,6 +422,8 @@ static void ghes_do_proc(const struct acpi_hest_generic_status *estatus)
CPER_SEC_PLATFORM_MEM)) { CPER_SEC_PLATFORM_MEM)) {
struct cper_sec_mem_err *mem_err; struct cper_sec_mem_err *mem_err;
mem_err = (struct cper_sec_mem_err *)(gdata+1); mem_err = (struct cper_sec_mem_err *)(gdata+1);
ghes_edac_report_mem_error(ghes, sev, mem_err);
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
apei_mce_report_mem_error(sev == GHES_SEV_CORRECTED, apei_mce_report_mem_error(sev == GHES_SEV_CORRECTED,
mem_err); mem_err);
@ -639,7 +642,7 @@ static int ghes_proc(struct ghes *ghes)
if (ghes_print_estatus(NULL, ghes->generic, ghes->estatus)) if (ghes_print_estatus(NULL, ghes->generic, ghes->estatus))
ghes_estatus_cache_add(ghes->generic, ghes->estatus); ghes_estatus_cache_add(ghes->generic, ghes->estatus);
} }
ghes_do_proc(ghes->estatus); ghes_do_proc(ghes, ghes->estatus);
out: out:
ghes_clear_estatus(ghes); ghes_clear_estatus(ghes);
return 0; return 0;
@ -732,7 +735,7 @@ static void ghes_proc_in_irq(struct irq_work *irq_work)
estatus = GHES_ESTATUS_FROM_NODE(estatus_node); estatus = GHES_ESTATUS_FROM_NODE(estatus_node);
len = apei_estatus_len(estatus); len = apei_estatus_len(estatus);
node_len = GHES_ESTATUS_NODE_LEN(len); node_len = GHES_ESTATUS_NODE_LEN(len);
ghes_do_proc(estatus); ghes_do_proc(estatus_node->ghes, estatus);
if (!ghes_estatus_cached(estatus)) { if (!ghes_estatus_cached(estatus)) {
generic = estatus_node->generic; generic = estatus_node->generic;
if (ghes_print_estatus(NULL, generic, estatus)) if (ghes_print_estatus(NULL, generic, estatus))
@ -821,6 +824,7 @@ static int ghes_notify_nmi(unsigned int cmd, struct pt_regs *regs)
estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool, estatus_node = (void *)gen_pool_alloc(ghes_estatus_pool,
node_len); node_len);
if (estatus_node) { if (estatus_node) {
estatus_node->ghes = ghes;
estatus_node->generic = ghes->generic; estatus_node->generic = ghes->generic;
estatus = GHES_ESTATUS_FROM_NODE(estatus_node); estatus = GHES_ESTATUS_FROM_NODE(estatus_node);
memcpy(estatus, ghes->estatus, len); memcpy(estatus, ghes->estatus, len);
@ -899,6 +903,11 @@ static int ghes_probe(struct platform_device *ghes_dev)
ghes = NULL; ghes = NULL;
goto err; goto err;
} }
rc = ghes_edac_register(ghes, &ghes_dev->dev);
if (rc < 0)
goto err;
switch (generic->notify.type) { switch (generic->notify.type) {
case ACPI_HEST_NOTIFY_POLLED: case ACPI_HEST_NOTIFY_POLLED:
ghes->timer.function = ghes_poll_func; ghes->timer.function = ghes_poll_func;
@ -911,13 +920,13 @@ static int ghes_probe(struct platform_device *ghes_dev)
if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) { if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) {
pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n", pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n",
generic->header.source_id); generic->header.source_id);
goto err; goto err_edac_unreg;
} }
if (request_irq(ghes->irq, ghes_irq_func, if (request_irq(ghes->irq, ghes_irq_func,
0, "GHES IRQ", ghes)) { 0, "GHES IRQ", ghes)) {
pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n", pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
generic->header.source_id); generic->header.source_id);
goto err; goto err_edac_unreg;
} }
break; break;
case ACPI_HEST_NOTIFY_SCI: case ACPI_HEST_NOTIFY_SCI:
@ -943,6 +952,8 @@ static int ghes_probe(struct platform_device *ghes_dev)
platform_set_drvdata(ghes_dev, ghes); platform_set_drvdata(ghes_dev, ghes);
return 0; return 0;
err_edac_unreg:
ghes_edac_unregister(ghes);
err: err:
if (ghes) { if (ghes) {
ghes_fini(ghes); ghes_fini(ghes);
@ -995,6 +1006,9 @@ static int ghes_remove(struct platform_device *ghes_dev)
} }
ghes_fini(ghes); ghes_fini(ghes);
ghes_edac_unregister(ghes);
kfree(ghes); kfree(ghes);
platform_set_drvdata(ghes_dev, NULL); platform_set_drvdata(ghes_dev, NULL);

27
include/acpi/ghes.h
View file

@ -27,6 +27,7 @@ struct ghes {
struct ghes_estatus_node { struct ghes_estatus_node {
struct llist_node llnode; struct llist_node llnode;
struct acpi_hest_generic *generic; struct acpi_hest_generic *generic;
struct ghes *ghes;
}; };
struct ghes_estatus_cache { struct ghes_estatus_cache {
@ -43,3 +44,29 @@ enum {
GHES_SEV_RECOVERABLE = 0x2, GHES_SEV_RECOVERABLE = 0x2,
GHES_SEV_PANIC = 0x3, GHES_SEV_PANIC = 0x3,
}; };
/* From drivers/edac/ghes_edac.c */
#ifdef CONFIG_EDAC_GHES
void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
struct cper_sec_mem_err *mem_err);
int ghes_edac_register(struct ghes *ghes, struct device *dev);
void ghes_edac_unregister(struct ghes *ghes);
#else
static inline void ghes_edac_report_mem_error(struct ghes *ghes, int sev,
struct cper_sec_mem_err *mem_err)
{
}
static inline int ghes_edac_register(struct ghes *ghes, struct device *dev)
{
return 0;
}
static inline void ghes_edac_unregister(struct ghes *ghes)
{
}
#endif