From nobody Sun May 5 01:43:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1622740477; cv=none; d=zohomail.com; s=zohoarc; b=f74dYvtYCZzeo9OCK+CnycMrhyBPSMzY4oC/OMTFCcA6VikXwCU1ENRTD98ejxU5+/c2nHQlH5u3xPaCSxdyQiKALZY/JgKNejLeC/qui3V8ZtfVeKc8eMB/QrLdNhDFoUKbKNWgE2WsKGGb6+hk4Rl3OjowdVuUW1RIBQkGcEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622740477; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T5utTavgkp5XUgjC2Nw+5xAxnWI2T3w58+Vqg3JiwKg=; b=HhHcSh380Si54iJAca48jrGmP8gwj1cYh285VydpKHeHA1Z3Ev25sJ0FdhwbBbBpLTnXuBnslnmSKBWktLZPZFwHr5RSARGsU9YVz+zFKxwZvQmu4bjqHyiBOzPLYp3Q1nSRQ4aDJWYE/BeH5CSLBG2yesFFze8tFqGtsoWZLKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622740477840845.9036012490407; Thu, 3 Jun 2021 10:14:37 -0700 (PDT) Received: from localhost ([::1]:42624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loqvU-00059J-Mq for importer@patchew.org; Thu, 03 Jun 2021 13:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loqu2-0002Cr-Fn for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:06 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loqtz-0005Qj-Ka for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:06 -0400 Received: by mail-wr1-x435.google.com with SMTP id a20so6664150wrc.0 for ; Thu, 03 Jun 2021 10:13:03 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m5sm6190319wmq.6.2021.06.03.10.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 10:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T5utTavgkp5XUgjC2Nw+5xAxnWI2T3w58+Vqg3JiwKg=; b=I811LdHo1ma4E4wT9cIT+n27QkxysNMTcgUuUy5yqpacEX/En63EqpH0oB4J4Jj0dS HUgz/Wbr3TQTlW02Fe8657irJRZ17T+u7iAc/DD9gwAPDUEdrtsHlIKN1zpGHiW18r75 N0QdXOt/Z9XhzB+55JnmhbynTVAAmSFy0ZUcIYSbITYBc/wGdR3PDdZnLe0/oddO3ry0 w9eJng8RDFbEil0gaZA2wyahCM9oG9+MRuX2NLqnAhw5hpLylP+6ip8ddoGV62+2Ne2v Iw0awxTkrZeLKvR7Ye2YwD7XCwRWKPdHnch3+dI46KFv/Cy6q1J4cFHpcujoIJun899r PO/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T5utTavgkp5XUgjC2Nw+5xAxnWI2T3w58+Vqg3JiwKg=; b=AgvJFsRAPfoz+br99TZOliFbGwBQKJTnThbDKctY/hg2r7uOVD2SLuIvcwzJdnuVSB HCrJC/10gMWPhoo63ChLPwxhMt3H5DrM1xFaPm3TZLdkJlYHyFmD5I0cgeQsff2+kbok uCXko4MDvC1dx5Q4Xlm1VItEzdpcKU0dhnQJDZjIpqlHyItqp7SC3i0SWtE9ruvXcf1/ 2si3fuCYrilzfEx2ko7Nxkwf31nnlDv6NG/DSaP9YjjZ7QK8XFxG8y1XnumY5fsHqqSC RajoPh5yZFBIESgWrZlnXUpaJHkjLC2p4MJZsWQIXk3vSnoHuZ6guii/AVF/6NxrJr+f SBHA== X-Gm-Message-State: AOAM530MMLJAWylOfPo4drlzh5bc4i+4PuUEFWpMzs7ErdYXScC3kiy7 mlIoNf8ea+qoubbF7Cec5OJBOQ== X-Google-Smtp-Source: ABdhPJx7RokBRTt7bEXH9G74UsUDYHiorpx07mqPWj/7gR+D50pJGigGk5FuFzNNhUc/stt7PBzVJQ== X-Received: by 2002:adf:e487:: with SMTP id i7mr43416wrm.348.1622740382214; Thu, 03 Jun 2021 10:13:02 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/acpi: Provide stub version of acpi_ghes_record_errors() Date: Thu, 3 Jun 2021 18:12:57 +0100 Message-Id: <20210603171259.27962-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210603171259.27962-1-peter.maydell@linaro.org> References: <20210603171259.27962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Dongjiu Geng , Swetha , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Generic code in target/arm wants to call acpi_ghes_record_errors(); provide a stub version so that we don't fail to link when CONFIG_ACPI_APEI is not set. This requires us to add a new ghes-stub.c file to contain it and the meson.build mechanics to use it when appropriate. Signed-off-by: Peter Maydell Reviewed-by: Dongjiu Geng Reviewed-by: Richard Henderson --- hw/acpi/ghes-stub.c | 17 +++++++++++++++++ hw/acpi/meson.build | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 hw/acpi/ghes-stub.c diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c new file mode 100644 index 00000000000..9faba043b85 --- /dev/null +++ b/hw/acpi/ghes-stub.c @@ -0,0 +1,17 @@ +/* + * Support for generating APEI tables and recording CPER for Guests: + * stub functions. + * + * Copyright (c) 2021 Linaro, Ltd + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/acpi/ghes.h" + +int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) +{ + return -1; +} diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index dd69577212a..03ea43f8627 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -13,13 +13,13 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pc= i.c')) acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c')) acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_= device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) -acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) +acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false:(= 'ghes-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', '= pcihp.c'), if_false: files('acpi-stub.c')) acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files= ('ipmi-stub.c')) acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c')) -softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-bu= ild-stub.c')) +softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-bu= ild-stub.c', 'ghes-stub.c')) softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-buil= d-stub.c', - 'acpi-x86-stub.c', 'ipmi= -stub.c')) + 'acpi-x86-stub.c', 'ipmi= -stub.c', 'ghes-stub.c')) --=20 2.20.1 From nobody Sun May 5 01:43:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1622740477; cv=none; d=zohomail.com; s=zohoarc; b=Oh9EjgZlYQFl/nBFYwchGmKPlMiigwcNa61E4pgm/OJ6GuM0LsrkyOoCZTMLcBmjRE+/xy/ewVRjr7n7tNIvntUv+hfowiwcT7W01twjxhJKvY1QH2onrDSRwCxOg8rEHgpyy8PHFZDwW+vurRzJ4iVG7Hr5c+lVMnwZlsbN98M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622740477; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HOYJkr4GhaglKvXMUgqS2H3+raKjJM8WQVTi0Xzd4rQ=; b=DRhrVHTVec4lzAbIdcms5G+AMMpX2S7Q63YIqD83S5AQfZE/lYnVx74LtNiKTpCHpGtfFeBIliRw5Fv+tRdlUqr5P3cjz9zETSggQHsEntA2kaHzvyPTbMxVl1SKkbntvPtoUkfwdKNCkjJ9LVWSgpOVHNl86LsYuXa1gydNaak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16227404776867.655068913304262; Thu, 3 Jun 2021 10:14:37 -0700 (PDT) Received: from localhost ([::1]:42616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loqvU-00058x-Ht for importer@patchew.org; Thu, 03 Jun 2021 13:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loqu2-0002Ch-EL for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:06 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loqu0-0005R6-Sz for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:06 -0400 Received: by mail-wr1-x435.google.com with SMTP id h8so6582306wrz.8 for ; Thu, 03 Jun 2021 10:13:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m5sm6190319wmq.6.2021.06.03.10.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 10:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HOYJkr4GhaglKvXMUgqS2H3+raKjJM8WQVTi0Xzd4rQ=; b=LToVOLFrdHQZznBHEf4jArdvlaVTud5D7fUeyUiAArgUPkPwMu2aPC0GWvzL92cviu 2FAftuB5vgctSfnJ2VdRM/f2U4nWR54+Vghy8CKbW4PH2gjbIk9QOT7WJeGxewICWu3J EN6wac2U1UT2IK85VkCHpnBsY1nRw+ytxNMBCjWKshJwvOXcd8MC3RWU2aV0jmlPqnmu Mjk45tfsmtWrlB5gatgjZ7Ek7AQp7Kn+9FRz1WwldERSDIN6zrfntYD/fZhFMCP6TbGQ gnCmYFQrDhpWNZh9cdoCgkpDjUr/O5JQpMc9W6GUlRfYHLBeXt2G+pLnM7qUNDMjGW1X f1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HOYJkr4GhaglKvXMUgqS2H3+raKjJM8WQVTi0Xzd4rQ=; b=S1mLnRrnTNAFiTUm43jl5KlovD8vBeO2ofOuEuYipZYLuw2doyuSl+MDWyCbuQd0yw P+TfJ6a79nKp+MA+3ZJGz+MaNJMlt3kGd2LGFeTSu9VX+v6yrNryAmt1iz5q48It1J3j f4vBH40AoyTMkp7zlrvANyEAzxc/J5786iBGypHAof6EnCbg2EU4WVzNdaUYGrOudaJp 3XbMW86h9tHREc+oKbCZ5ORTAsGEO9wUNwNN/srze2zHDRaZOtKOcOnVnG0X91MA61TQ I2IHeJbhm7FVD1ZUd0UAAmv9BksgvTRLIAUjEuMOlKwYog5DJ+1hdcFTjqpsAeU7opq5 c8sg== X-Gm-Message-State: AOAM531YFkqgs0VBBzpEXGg16Rm4GEWhRzX49+BhVDACfweKfPzJJw0P HJk2X+MsNehCIj2KS4gjoWCen0vFjxo/mARn X-Google-Smtp-Source: ABdhPJzTIDwMYN0X4ZJNpE9nx9tB15/DeCB1JADqBVt8FXO7pd8kHjLAh+LB46nR2lgDqDINZWm/Rg== X-Received: by 2002:a5d:5251:: with SMTP id k17mr24285wrc.153.1622740383129; Thu, 03 Jun 2021 10:13:03 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/acpi: Provide function acpi_ghes_present() Date: Thu, 3 Jun 2021 18:12:58 +0100 Message-Id: <20210603171259.27962-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210603171259.27962-1-peter.maydell@linaro.org> References: <20210603171259.27962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Dongjiu Geng , Swetha , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Allow code elsewhere in the system to check whether the ACPI GHES table is present, so it can determine whether it is OK to try to record an error by calling acpi_ghes_record_errors(). (We don't need to migrate the new 'present' field in AcpiGhesState, because it is set once at system initialization and doesn't change.) Signed-off-by: Peter Maydell Reviewed-by: Dongjiu Geng Reviewed-by: Richard Henderson --- include/hw/acpi/ghes.h | 9 +++++++++ hw/acpi/ghes-stub.c | 5 +++++ hw/acpi/ghes.c | 17 +++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/include/hw/acpi/ghes.h b/include/hw/acpi/ghes.h index 2ae8bc1ded3..674f6958e90 100644 --- a/include/hw/acpi/ghes.h +++ b/include/hw/acpi/ghes.h @@ -64,6 +64,7 @@ enum { =20 typedef struct AcpiGhesState { uint64_t ghes_addr_le; + bool present; /* True if GHES is present at all on this board */ } AcpiGhesState; =20 void build_ghes_error_table(GArray *hardware_errors, BIOSLinker *linker); @@ -72,4 +73,12 @@ void acpi_build_hest(GArray *table_data, BIOSLinker *lin= ker, void acpi_ghes_add_fw_cfg(AcpiGhesState *vms, FWCfgState *s, GArray *hardware_errors); int acpi_ghes_record_errors(uint8_t notify, uint64_t error_physical_addr); + +/** + * acpi_ghes_present: Report whether ACPI GHES table is present + * + * Returns: true if the system has an ACPI GHES table and it is + * safe to call acpi_ghes_record_errors() to record a memory error. + */ +bool acpi_ghes_present(void); #endif diff --git a/hw/acpi/ghes-stub.c b/hw/acpi/ghes-stub.c index 9faba043b85..c315de1802d 100644 --- a/hw/acpi/ghes-stub.c +++ b/hw/acpi/ghes-stub.c @@ -15,3 +15,8 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_t p= hysical_address) { return -1; } + +bool acpi_ghes_present(void) +{ + return false; +} diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index a4dac6bf15e..a749b84d624 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -386,6 +386,8 @@ void acpi_ghes_add_fw_cfg(AcpiGhesState *ags, FWCfgStat= e *s, /* 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, NULL, &(ags->ghes_addr_le), sizeof(ags->ghes_addr_le), false); + + ags->present =3D true; } =20 int acpi_ghes_record_errors(uint8_t source_id, uint64_t physical_address) @@ -443,3 +445,18 @@ int acpi_ghes_record_errors(uint8_t source_id, uint64_= t physical_address) =20 return ret; } + +bool acpi_ghes_present(void) +{ + AcpiGedState *acpi_ged_state; + AcpiGhesState *ags; + + acpi_ged_state =3D ACPI_GED(object_resolve_path_type("", TYPE_ACPI_GED, + NULL)); + + if (!acpi_ged_state) { + return false; + } + ags =3D &acpi_ged_state->ghes_state; + return ags->present; +} --=20 2.20.1 From nobody Sun May 5 01:43:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1622740608; cv=none; d=zohomail.com; s=zohoarc; b=M774x8zVhSprdbB7q8SvGuXmyZ4ojAG2UTCV+qLVS832XQnbv5hXmeF2BDhGNITrLEBXYfgqSdrCRSatOECgLQ7I/fnud+V2c+Q99LDDyLXXQJl905oXiVcCGBEA+5OqxM6JFZ0vdxsj+VNKl/9idh7nEiemCATtFzQuL5pQypU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622740608; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HH81j5I+nn0sGSIPvlymA5OV7omrfdBZUURJAJAqCcY=; b=JKPgJCNRGdIR3IMrrbBn11Hl598N9B++tLjiFTa6bxzgdg+IMccdAa6HSRAVnaFmrunXl9ge7U6OFFBYu43CWzvbsDQSYIHXiaVAyLgNH9z2JC9amxLhRlwq0WhpEu+sm5TdSaDebGVhOMffAqvBktAgElNJLlLRu8gPDEQ0g1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622740608800612.5292796846696; Thu, 3 Jun 2021 10:16:48 -0700 (PDT) Received: from localhost ([::1]:48112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loqxb-0000jW-Ln for importer@patchew.org; Thu, 03 Jun 2021 13:16:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loqu3-0002FT-82 for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:07 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:42821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loqu1-0005Rt-8l for qemu-devel@nongnu.org; Thu, 03 Jun 2021 13:13:07 -0400 Received: by mail-wr1-x436.google.com with SMTP id c5so6583616wrq.9 for ; Thu, 03 Jun 2021 10:13:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m5sm6190319wmq.6.2021.06.03.10.13.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 10:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HH81j5I+nn0sGSIPvlymA5OV7omrfdBZUURJAJAqCcY=; b=oW8xtR9VBrPztk/cTN4LLXbGDhSGom+DFMne+lBwg8QM2t2FcjXYYd6VL4VDMUV4Mu MFuRHBirPPf0FvRCUzxtJQOUeNs3NK5imQxEhXap5oO/iUrNZM2bqcvxSDzIIFdi1FDp 5WSCB+zd+AJgKcNBFfrjErlmxkYpjU/iU93uN5dGB5UFdPFGN0198yabRA6dKjJ7wwn8 Zno0cyTVj6+U65yBefbZPfAzj3sAWgK8grT6XBeMkk6eKRnWL3mhZnjX7OQ6rhXi/Yuq BxhPoOzq9mmfQ+ojK8vt+OVPaFoZzgmrOjkSzegZvBKYaNAafTzQVk9XY3M31NWwciUl krBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HH81j5I+nn0sGSIPvlymA5OV7omrfdBZUURJAJAqCcY=; b=JPMbxvV8yhJZUiibhfRj3HHdBThNnNd8xjJ74hNcdrTiaogtgWWjsJEoaEcdGH9nSw NsEEmtReAYGI64pSeDt3nHy1h0YaBvFjGuL/w7WmTfJGONpcwZn9wxoVr0cERoCTO0xb qX8zV3TbSsajPfBA7RzHWJXTAqxY+KMUKB7cFFRVyMc3irGy+7Q8Q0C1ir4P9A7kjtSu DJExsg73Tq1FhLLu7i3urXa1wQb1FV28L1G8DW5Yy/S+mm4J/T9JVCL4WVELFvg4Ek2N LTzt8d9LqDDyMipHh6oiC/K68wEkd9EqfnhX2Oh6Bpz7lqs8J/acyRBlmM+mxeE+oTL5 jGwQ== X-Gm-Message-State: AOAM531GbyK/Q/Q4IlGqjDehXUUG2zIo6hgbGYHsqr3lJNBQ0BPiqxYn YuyY4SGIBeT4OJPeAcxJKXU5fg== X-Google-Smtp-Source: ABdhPJxWbFuvb4Kh+lqfoDKTWo9zfD3cjep+B0m9KfNmD276cuTtlLerEppQCfyXF/zjxpbLi4/yhg== X-Received: by 2002:a5d:47ce:: with SMTP id o14mr13659wrc.273.1622740383960; Thu, 03 Jun 2021 10:13:03 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/3] target/arm: Use acpi_ghes_present() to see if we report ACPI memory errors Date: Thu, 3 Jun 2021 18:12:59 +0100 Message-Id: <20210603171259.27962-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210603171259.27962-1-peter.maydell@linaro.org> References: <20210603171259.27962-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , Dongjiu Geng , Swetha , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The virt_is_acpi_enabled() function is specific to the virt board, as is the check for its 'ras' property. Use the new acpi_ghes_present() function to check whether we should report memory errors via acpi_ghes_record_errors(). This avoids a link error if QEMU was built without support for the virt board, and provides a mechanism that can be used by any future board models that want to add ACPI memory error reporting support (they only need to call acpi_ghes_add_fw_cfg()). Signed-off-by: Peter Maydell Reviewed-by: Dongjiu Geng Reviewed-by: Richard Henderson --- target/arm/kvm64.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 37ceadd9a9d..59982d470d3 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -1410,14 +1410,10 @@ void kvm_arch_on_sigbus_vcpu(CPUState *c, int code,= void *addr) { ram_addr_t ram_addr; hwaddr paddr; - Object *obj =3D qdev_get_machine(); - VirtMachineState *vms =3D VIRT_MACHINE(obj); - bool acpi_enabled =3D virt_is_acpi_enabled(vms); =20 assert(code =3D=3D BUS_MCEERR_AR || code =3D=3D BUS_MCEERR_AO); =20 - if (acpi_enabled && addr && - object_property_get_bool(obj, "ras", NULL)) { + if (acpi_ghes_present() && addr) { ram_addr =3D qemu_ram_addr_from_host(addr); if (ram_addr !=3D RAM_ADDR_INVALID && kvm_physical_memory_addr_from_host(c->kvm_state, addr, &paddr)= ) { --=20 2.20.1