diff options
| -rw-r--r-- | drivers/acpi/apei/ghes.c | 5 | ||||
| -rw-r--r-- | include/acpi/ghes.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index c20e1d0947b1..af3c10f47f20 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
| @@ -329,8 +329,6 @@ static int ghes_read_estatus(struct ghes *ghes, u64 *buf_paddr) | |||
| 329 | return -ENOENT; | 329 | return -ENOENT; |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | ghes->flags |= GHES_TO_CLEAR; | ||
| 333 | |||
| 334 | rc = -EIO; | 332 | rc = -EIO; |
| 335 | len = cper_estatus_len(ghes->estatus); | 333 | len = cper_estatus_len(ghes->estatus); |
| 336 | if (len < sizeof(*ghes->estatus)) | 334 | if (len < sizeof(*ghes->estatus)) |
| @@ -357,15 +355,12 @@ err_read_block: | |||
| 357 | static void ghes_clear_estatus(struct ghes *ghes, u64 buf_paddr) | 355 | static void ghes_clear_estatus(struct ghes *ghes, u64 buf_paddr) |
| 358 | { | 356 | { |
| 359 | ghes->estatus->block_status = 0; | 357 | ghes->estatus->block_status = 0; |
| 360 | if (!(ghes->flags & GHES_TO_CLEAR)) | ||
| 361 | return; | ||
| 362 | 358 | ||
| 363 | if (!buf_paddr) | 359 | if (!buf_paddr) |
| 364 | return; | 360 | return; |
| 365 | 361 | ||
| 366 | ghes_copy_tofrom_phys(ghes->estatus, buf_paddr, | 362 | ghes_copy_tofrom_phys(ghes->estatus, buf_paddr, |
| 367 | sizeof(ghes->estatus->block_status), 0); | 363 | sizeof(ghes->estatus->block_status), 0); |
| 368 | ghes->flags &= ~GHES_TO_CLEAR; | ||
| 369 | } | 364 | } |
| 370 | 365 | ||
| 371 | static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev) | 366 | static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int sev) |
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index f82f4a7ddd90..e3f1cddb4ac8 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * estatus: memory buffer for error status block, allocated during | 13 | * estatus: memory buffer for error status block, allocated during |
| 14 | * HEST parsing. | 14 | * HEST parsing. |
| 15 | */ | 15 | */ |
| 16 | #define GHES_TO_CLEAR 0x0001 | ||
| 17 | #define GHES_EXITING 0x0002 | 16 | #define GHES_EXITING 0x0002 |
| 18 | 17 | ||
| 19 | struct ghes { | 18 | struct ghes { |
