From nobody Mon May 12 00:15:23 2025
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org
[10.30.226.201])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 822561E9911
for <linux-kernel@vger.kernel.org>; Wed, 15 Jan 2025 12:50:41 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=10.30.226.201
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1736945441; cv=none;
b=lrbQ8KWY0HmY5hWSSN6G817mBc8gY3UvHPHlkNsqZgh5rcXiQQ877cU9eCz1O1sHjFtSIjX2WSPq2fI5tqs6IboJD+sIlgghU4tlQOkCxGo/fKI117w0Wd7VSPQXxEB0Z3847KL931nFgYiD3+PQT0emRH706r3mOiSgmWeyvkc=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1736945441; c=relaxed/simple;
bh=uDihMbAVHajyrPqIm6xCk4kSLNVBW/olOYucuqFWoPc=;
h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version;
b=bI0hrBYzyCRgpwuqWzgYmuPd+S+yRqr8PezZ06Ai8PKHaocR+BhJzU0ah89gDGNkWmfSXhFHmDVwfGrBrddxanxTOkGoe0K01HiFElKrU2feT3LbKWXMdocl3j4JYZzoiszGohVsfdzpMv5wg5xjfZNZLyO0KtxPzt63NpzeTgE=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b=ChM6oWd+; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org
header.b="ChM6oWd+"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ADCAC4CEE5;
Wed, 15 Jan 2025 12:50:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1736945441;
bh=uDihMbAVHajyrPqIm6xCk4kSLNVBW/olOYucuqFWoPc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=ChM6oWd+2lBdH0p72KHlTa0jRZvJm5MVr3igtES/OHo0aJe/ZHtb3vnl3NeiW1wYU
P2/bHB5OSz8PmSnOJmpxMr5F3/gLWvcdZBX8jEY1Z5ii6mLPqT8j9KX8lU+AWQH1oh
LxEykpywWmG8N3EW9fh8iffDnuc74ksl4pRLVFOmkrpQ2wl0dnUfFVsukbhImHYLVI
KScfycpDXLLWtM16FwquaeCPihnYwi/3+1jEc6aw5kTa3tVynMeVQB2sLyZUDG46Ad
tURE+0d3LoDHpXfJbWbjo+Eh4vBuaqROPnlgtZOmgVFLzWfIqlYG7QtZnoFFomtdQd
51pxljRz2XVYQ==
Received: from mchehab by mail.kernel.org with local (Exim 4.98)
(envelope-from <mchehab+huawei@kernel.org>)
id 1tY2r1-00000004yFU-0IGp;
Wed, 15 Jan 2025 13:50:39 +0100
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Igor Mammedov <imammedo@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Shiju Jose <shiju.jose@huawei.com>,
qemu-arm@nongnu.org,
qemu-devel@nongnu.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Ani Sinha <anisinha@redhat.com>,
Dongjiu Geng <gengdongjiu1@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v7 02/16] acpi/ghes: simplify acpi_ghes_record_errors() code
Date: Wed, 15 Jan 2025 13:50:18 +0100
Message-ID:
<19af4188535217213486d169e0501e592bc78a95.1736945236.git.mchehab+huawei@kernel.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <cover.1736945236.git.mchehab+huawei@kernel.org>
References: <cover.1736945236.git.mchehab+huawei@kernel.org>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Content-Type: text/plain; charset="utf-8"
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)
=20
start_addr =3D le64_to_cpu(ags->ghes_addr_le);
=20
- if (physical_address) {
+ if (!physical_address) {
+ return -1;
+ }
=20
- if (source_id < ACPI_GHES_ERROR_SOURCE_COUNT) {
- start_addr +=3D source_id * sizeof(uint64_t);
- }
+ if (source_id < ACPI_GHES_ERROR_SOURCE_COUNT) {
+ start_addr +=3D source_id * sizeof(uint64_t);
+ }
=20
- 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));
=20
- error_block_addr =3D le64_to_cpu(error_block_addr);
+ error_block_addr =3D le64_to_cpu(error_block_addr);
=20
- read_ack_register_addr =3D start_addr +
- ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_t);
+ read_ack_register_addr =3D start_addr +
+ ACPI_GHES_ERROR_SOURCE_COUNT * sizeof(uint64_=
t);
=20
- cpu_physical_memory_read(read_ack_register_addr,
- &read_ack_register, sizeof(read_ack_regis=
ter));
+ cpu_physical_memory_read(read_ack_register_addr,
+ &read_ack_register, sizeof(read_ack_register)=
);
=20
- /* 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 =3D 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 =3D 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));
=20
- ret =3D acpi_ghes_record_mem_error(error_block_addr,
- physical_address);
- } else
- error_report("can not find Generic Error Status Block");
+ ret =3D acpi_ghes_record_mem_error(error_block_addr,
+ physical_address);
+ } else {
+ error_report("can not find Generic Error Status Block");
}
=20
return ret;
--=20
2.47.1