qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: "Michael S . Tsirkin" <mst@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Shiju Jose <shiju.jose@huawei.com>,
	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	Ani Sinha <anisinha@redhat.com>,
	Dongjiu Geng <gengdongjiu1@gmail.com>,
	Igor Mammedov <imammedo@redhat.com>,
	linux-kernel@vger.kernel.org, qemu-arm@nongnu.org,
	qemu-devel@nongnu.org
Subject: [PATCH 02/31] acpi/ghes: simplify acpi_ghes_record_errors() code
Date: Fri,  6 Dec 2024 18:12:24 +0100	[thread overview]
Message-ID: <001a0b01ca89405ba8b7b801ba3c397f1f6e413b.1733504943.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1733504943.git.mchehab+huawei@kernel.org>

Reduce the ident of the function and prepares it for
the next changes.

No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
 hw/acpi/ghes.c | 56 ++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c
index dc217694deb9..e66f3be1502b 100644
--- a/hw/acpi/ghes.c
+++ b/hw/acpi/ghes.c
@@ -402,40 +402,42 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address)
 
     start_addr = le64_to_cpu(ags->ghes_addr_le);
 
-    if (physical_address) {
+    if (!physical_address) {
+        return -1;
+    }
 
-        if (source_id < ACPI_GHES_ERROR_SOURCE_COUNT) {
-            start_addr += source_id * sizeof(uint64_t);
-        }
+    if (source_id < ACPI_GHES_ERROR_SOURCE_COUNT) {
+        start_addr += source_id * sizeof(uint64_t);
+    }
 
-        cpu_physical_memory_read(start_addr, &error_block_addr,
-                                 sizeof(error_block_addr));
+    cpu_physical_memory_read(start_addr, &error_block_addr,
+                             sizeof(error_block_addr));
 
-        error_block_addr = le64_to_cpu(error_block_addr);
+    error_block_addr = le64_to_cpu(error_block_addr);
 
-        read_ack_register_addr = start_addr +
-            ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t);
+    read_ack_register_addr = start_addr +
+                             ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t);
 
-        cpu_physical_memory_read(read_ack_register_addr,
-                                 &read_ack_register, sizeof(read_ack_register));
+    cpu_physical_memory_read(read_ack_register_addr,
+                             &read_ack_register, sizeof(read_ack_register));
 
-        /* zero means OSPM does not acknowledge the error */
-        if (!read_ack_register) {
-            error_report("OSPM does not acknowledge previous error,"
-                " so can not record CPER for current error anymore");
-        } else if (error_block_addr) {
-            read_ack_register = cpu_to_le64(0);
-            /*
-             * Clear the Read Ack Register, OSPM will write it to 1 when
-             * it acknowledges this error.
-             */
-            cpu_physical_memory_write(read_ack_register_addr,
-                &read_ack_register, sizeof(uint64_t));
+    /* zero means OSPM does not acknowledge the error */
+    if (!read_ack_register) {
+        error_report("OSPM does not acknowledge previous error,"
+                     " so can not record CPER for current error anymore");
+    } else if (error_block_addr) {
+        read_ack_register = cpu_to_le64(0);
+        /*
+         * Clear the Read Ack Register, OSPM will write it to 1 when
+         * it acknowledges this error.
+         */
+        cpu_physical_memory_write(read_ack_register_addr,
+                                  &read_ack_register, sizeof(uint64_t));
 
-            ret = acpi_ghes_record_mem_error(error_block_addr,
-                                             physical_address);
-        } else
-            error_report("can not find Generic Error Status Block");
+        ret = acpi_ghes_record_mem_error(error_block_addr,
+                                         physical_address);
+    } else {
+        error_report("can not find Generic Error Status Block");
     }
 
     return ret;
-- 
2.47.1



  parent reply	other threads:[~2024-12-06 17:22 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-06 17:12 [PATCH 00/31] Prepare GHES driver to support error injection Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 01/31] acpi/ghes: get rid of ACPI_HEST_SRC_ID_RESERVED Mauro Carvalho Chehab
2024-12-06 17:12 ` Mauro Carvalho Chehab [this message]
2024-12-06 17:12 ` [PATCH 03/31] acpi/ghes: simplify the per-arch caller to build HEST table Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 04/31] acpi/ghes: better handle source_id and notification Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 05/31] acpi/ghes: Fix acpi_ghes_record_errors() argument Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 06/31] acpi/ghes: Remove a duplicated out of bounds check Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 07/31] acpi/ghes: Change the type for source_id Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 08/31] acpi/ghes: don't check if physical_address is not zero Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 09/31] acpi/ghes: make the GHES record generation more generic Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 10/31] acpi/ghes: better name GHES memory error function Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 11/31] acpi/ghes: don't crash QEMU if ghes GED is not found Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 12/31] acpi/ghes: rename etc/hardware_error file macros Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 13/31] acpi/ghes: better name the offset of the hardware error firmware Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 14/31] acpi/ghes: Prepare to support multiple sources on ghes Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 15/31] acpi/ghes: add a firmware file with HEST address Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 16/31] acpi/ghes: Use HEST table offsets when preparing GHES records Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 17/31] acpi/generic_event_device: Update GHES migration to cover hest addr Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 18/31] acpi/generic_event_device: add logic to detect if HEST addr is available Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 19/31] acpi/ghes: add a notifier to notify when error data is ready Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 20/31] acpi/generic_event_device: add an APEI error device Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 21/31] arm/virt: Wire up a GED error device for ACPI / GHES Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 22/31] qapi/acpi-hest: add an interface to do generic CPER error injection Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 23/31] scripts/ghes_inject: add a script to generate GHES error inject Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 24/31] target/arm: add an experimental mpidr arm cpu property object Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 25/31] scripts/arm_processor_error.py: retrieve mpidr if not filled Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 26/31] acpi/ghes: move offset calculus to a separate function Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 27/31] DEBUG Mauro Carvalho Chehab
2024-12-07  3:38   ` Ani Sinha
2024-12-07  6:16     ` Markus Armbruster
2024-12-07  8:33       ` Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 28/31] acpi/ghes: Change ghes fill logic to work with only one source Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 29/31] HACK: use GPIO as source ID for virt-9.1 machines Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 30/31] docs: acpi_hest_ghes: fix documentation for CPER size Mauro Carvalho Chehab
2024-12-06 17:12 ` [PATCH 31/31] FIXME: acpi/ghes: properly set data record size Mauro Carvalho Chehab
2024-12-07  6:17   ` Markus Armbruster
2024-12-07  8:48     ` Mauro Carvalho Chehab
2024-12-07  6:11 ` [PATCH 00/31] Prepare GHES driver to support error injection Markus Armbruster
2024-12-07  6:15   ` Markus Armbruster
2024-12-07  8:39     ` Mauro Carvalho Chehab
2024-12-07 15:16       ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=001a0b01ca89405ba8b7b801ba3c397f1f6e413b.1733504943.git.mchehab+huawei@kernel.org \
    --to=mchehab+huawei@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=anisinha@redhat.com \
    --cc=gengdongjiu1@gmail.com \
    --cc=imammedo@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=shiju.jose@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).