From nobody Sun Nov 24 12:54:14 2024 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 165452A1D6 for ; Sun, 25 Aug 2024 03:46:50 +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=1724557611; cv=none; b=lQM1+9L+H+f7Uf9xd9zpwmbkKn9aBFYO/qo++4JcJleQzL5qmHpOUMtglPM5yJs8pjc//nAJlAKWW/0HNQAQCmfWBjbzVBHNDdeSN+1duJ1KCqRzAHubc3xGVMKTuk6NAPs/sY+dvBUENq/t6+LXqSqe6PAIuf2iSjHTYrGZhW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724557611; c=relaxed/simple; bh=IMcNa/Jx7IKi3w4s7sj+SFfeYHLBTpL5ykjORVZs0OY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U/7+C7JRI0VThu11cnzk8zgtX6BPFX9KjZrNE1dn9HWfURxJrKvXUpptPXr36E9KfsrRLS2hltrBxNMPIx9r9QsVm+3gmtHk4BH8hHt2593H+xTHS83siswmYpUCYC/UXA7V1G+mH/SrdbGAnmZITLRCe7OcFGEA29M5WHDoIT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h5TCafEN; 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="h5TCafEN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA871C4AF11; Sun, 25 Aug 2024 03:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724557610; bh=IMcNa/Jx7IKi3w4s7sj+SFfeYHLBTpL5ykjORVZs0OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5TCafENcP/golIfUL6Bf9MwDwukyFCqNoUJfij7v+2YhyoVHhWAQBRVNczgOcl3B lrUZ57tm/Ar7eQCDdaZh5WAzdPUh1nv2n2l6xPr5D6X+dh7CO8ePW8hb/IGdLsmV4f I/d3DXExYqgdOF67L6OLG8RPhnuNHSKt9Q62qq+rNZopjEKBDIA1ucKGP7e/ZtSX6N Y+aMIyWuVZvBYO+2SdHkmlBiCcNqXGZvavPMM0utX7+N+h7BeIMYAuGw7o7q1vIu5j Ooahbw1Lk5CJ6tzkULf+ku8c89znDi2AFeGxSKY6fmLWZavNb4vxz8JbEqMOh6cQLG tY0rHtB+uGSgw== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1si4Ch-00000001RMd-2LeB; Sun, 25 Aug 2024 05:46:11 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , "Michael S. Tsirkin" , Ani Sinha , Dongjiu Geng , Igor Mammedov , linux-kernel@vger.kernel.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v9 03/12] acpi/ghes: rename etc/hardware_error file macros Date: Sun, 25 Aug 2024 05:45:58 +0200 Message-ID: <866a06839420e69fa5a96ea3e0384658abb7e70a.1724556967.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab Content-Type: text/plain; charset="utf-8" Now that we have also have a file to store HEST data location, which is part of GHES, better name the file where CPER records are stored. No functional changes. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Igor Mammedov --- hw/acpi/ghes.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index 965fb1b36587..3190eb954de4 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -28,8 +28,8 @@ #include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" =20 -#define ACPI_GHES_ERRORS_FW_CFG_FILE "etc/hardware_errors" -#define ACPI_GHES_DATA_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" +#define ACPI_HW_ERROR_FW_CFG_FILE "etc/hardware_errors" +#define ACPI_HW_ERROR_ADDR_FW_CFG_FILE "etc/hardware_errors_addr" #define ACPI_HEST_ADDR_FW_CFG_FILE "etc/acpi_table_hest_addr" =20 /* The max size in bytes for one error block */ @@ -255,7 +255,7 @@ static void build_ghes_error_table(GArray *hardware_err= ors, BIOSLinker *linker, ACPI_GHES_MAX_RAW_DATA_LENGTH * num_sources); =20 /* Tell guest firmware to place hardware_errors blob into RAM */ - bios_linker_loader_alloc(linker, ACPI_GHES_ERRORS_FW_CFG_FILE, + bios_linker_loader_alloc(linker, ACPI_HW_ERROR_FW_CFG_FILE, hardware_errors, sizeof(uint64_t), false); =20 for (i =3D 0; i < num_sources; i++) { @@ -264,8 +264,8 @@ static void build_ghes_error_table(GArray *hardware_err= ors, BIOSLinker *linker, * corresponding "Generic Error Status Block" */ bios_linker_loader_add_pointer(linker, - ACPI_GHES_ERRORS_FW_CFG_FILE, sizeof(uint64_t) * i, - sizeof(uint64_t), ACPI_GHES_ERRORS_FW_CFG_FILE, + ACPI_HW_ERROR_FW_CFG_FILE, sizeof(uint64_t) * i, + sizeof(uint64_t), ACPI_HW_ERROR_FW_CFG_FILE, error_status_block_offset + i * ACPI_GHES_MAX_RAW_DATA_LENGTH); } =20 @@ -273,9 +273,9 @@ static void build_ghes_error_table(GArray *hardware_err= ors, BIOSLinker *linker, * tell firmware to write hardware_errors GPA into * hardware_errors_addr fw_cfg, once the former has been initialized. */ - bios_linker_loader_write_pointer(linker, ACPI_GHES_DATA_ADDR_FW_CFG_FI= LE, 0, + bios_linker_loader_write_pointer(linker, ACPI_HW_ERROR_ADDR_FW_CFG_FIL= E, 0, sizeof(uint64_t), - ACPI_GHES_ERRORS_FW_CFG_FILE, 0); + ACPI_HW_ERROR_FW_CFG_FILE, 0); } =20 /* Build Generic Hardware Error Source version 2 (GHESv2) */ @@ -315,7 +315,7 @@ static void build_ghes_v2(GArray *table_data, bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, address_offset + GAS_ADDR_OFFSET, sizeof(uint64_t), - ACPI_GHES_ERRORS_FW_CFG_FILE, + ACPI_HW_ERROR_FW_CFG_FILE, source_id * sizeof(uint64_t)); =20 /* Notification Structure */ @@ -335,7 +335,7 @@ static void build_ghes_v2(GArray *table_data, bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE, address_offset + GAS_ADDR_OFFSET, sizeof(uint64_t), - ACPI_GHES_ERRORS_FW_CFG_FILE, + ACPI_HW_ERROR_FW_CFG_FILE, (num_sources + source_id) * sizeof(uint64_t)); =20 @@ -389,11 +389,11 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgSt= ate *s, GArray *hardware_error) { /* Create a read-only fw_cfg file for GHES */ - fw_cfg_add_file(s, ACPI_GHES_ERRORS_FW_CFG_FILE, hardware_error->data, + fw_cfg_add_file(s, ACPI_HW_ERROR_FW_CFG_FILE, hardware_error->data, hardware_error->len); =20 /* Create a read-write fw_cfg file for Address */ - fw_cfg_add_file_callback(s, ACPI_GHES_DATA_ADDR_FW_CFG_FILE, NULL, NUL= L, + fw_cfg_add_file_callback(s, ACPI_HW_ERROR_ADDR_FW_CFG_FILE, NULL, NULL, NULL, &(ags->ghes_addr_le), sizeof(ags->ghes_addr_le), false); =20 fw_cfg_add_file_callback(s, ACPI_HEST_ADDR_FW_CFG_FILE, NULL, NULL, --=20 2.46.0