@@ -310,10 +310,10 @@ static int ghes_read_estatus(struct ghes *ghes,
ghes_copy_tofrom_phys(estatus, *buf_paddr,
sizeof(*estatus), 1, fixmap_idx);
- if (!estatus->block_status)
+ if (!estatus->block_status) {
+ *buf_paddr = 0;
return -ENOENT;
-
- ghes->flags |= GHES_TO_CLEAR;
+ }
rc = -EIO;
len = cper_estatus_len(estatus);
@@ -337,16 +337,14 @@ static int ghes_read_estatus(struct ghes *ghes,
return rc;
}
-static void ghes_clear_estatus(struct ghes *ghes,
- struct acpi_hest_generic_status *estatus,
+static void ghes_clear_estatus(struct acpi_hest_generic_status *estatus,
phys_addr_t buf_paddr, int fixmap_idx)
{
estatus->block_status = 0;
- if (!(ghes->flags & GHES_TO_CLEAR))
- return;
- ghes_copy_tofrom_phys(estatus, buf_paddr,
- sizeof(estatus->block_status), 0, fixmap_idx);
- ghes->flags &= ~GHES_TO_CLEAR;
+ if (buf_paddr)
+ ghes_copy_tofrom_phys(estatus, buf_paddr,
+ sizeof(estatus->block_status), 0,
+ fixmap_idx);
}
static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev)
@@ -720,7 +718,7 @@ static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx)
struct acpi_hest_generic_status *estatus = ghes->estatus;
if (ghes_read_estatus(ghes, estatus, &buf_paddr, fixmap_idx)) {
- ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx);
+ ghes_clear_estatus(estatus, buf_paddr, fixmap_idx);
return -ENOENT;
}
@@ -730,11 +728,11 @@ static int _in_nmi_notify_one(struct ghes *ghes, int fixmap_idx)
__ghes_panic(ghes, estatus);
}
- if (!(ghes->flags & GHES_TO_CLEAR))
+ if (!buf_paddr)
return 0;
__process_error(ghes, estatus);
- ghes_clear_estatus(ghes, estatus, buf_paddr, fixmap_idx);
+ ghes_clear_estatus(estatus, buf_paddr, fixmap_idx);
return 0;
}
@@ -871,7 +869,7 @@ static int ghes_proc(struct ghes *ghes)
ghes_do_proc(ghes, estatus);
out:
- ghes_clear_estatus(ghes, estatus, buf_paddr, FIX_APEI_GHES_IRQ);
+ ghes_clear_estatus(estatus, buf_paddr, FIX_APEI_GHES_IRQ);
if (rc == -ENOENT)
goto unlock;
@@ -13,7 +13,6 @@
* estatus: memory buffer for error status block, allocated during
* HEST parsing.
*/
-#define GHES_TO_CLEAR 0x0001
#define GHES_EXITING 0x0002
struct ghes {
ghes_read_estatus() sets a flag in struct ghes if the buffer of CPER records needs to be cleared once the records have been processed. This global flags value is a problem if a struct ghes can be processed concurrently, as happens at probe time if an NMI arrives for the same error source. The GHES_TO_CLEAR flags was only set at the same time as buffer_paddr, which is now owned by the caller and passed to ghes_clear_estatus(). Use this as the flag. A non-zero buf_paddr returned by ghes_read_estatus() means ghes_clear_estatus() will clear this address. ghes_read_estatus() already checks for a read of error_status_address being zero, so we can never get CPER records written at zero. After this ghes_clear_estatus() no longer needs the struct ghes. Signed-off-by: James Morse <james.morse@arm.com> --- drivers/acpi/apei/ghes.c | 26 ++++++++++++-------------- include/acpi/ghes.h | 1 - 2 files changed, 12 insertions(+), 15 deletions(-)