From patchwork Thu Jun 3 17:12:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 453306 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp450549jao; Thu, 3 Jun 2021 10:16:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZN4gbUo1Ql73etMLrKdJQp8wlL2oE+rd+rySm3Hf6opmB/z/4od28ZcXOWQQAxgD00+OV X-Received: by 2002:a05:6102:32d1:: with SMTP id o17mr314496vss.38.1622740574482; Thu, 03 Jun 2021 10:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622740574; cv=none; d=google.com; s=arc-20160816; b=eiBROPq/IKtAjNudjZySgjFPWYoFMZLgx7sQy7j1FLt/mL4/+fvdTYxv/zc4+dQvcS YikqKd40+oRyeYWP/U64NNvcsDrWOiM2pWWD8PxnoABaEULR2Fxhobs6wc726ZNz++xq NufPVrUl9oVTXcDPlqGWAlCV9VCvRfVxudJX7GukQewHUD+pNBHsx4eUeNdyaDVbSIUk 2X9WcCTlIyuuwf3zZ6/FyAoSg1J9xlJVszD7Su+zCfaHmSED8pSVaq8h5BcTxfDWT63y NY1c/8Fy2Db5WhWsKbjoQpqNgUH7XyYylLUbbFEjN2UOqBO8nFRSIorEPOlc/qZGVujF D6Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=HH81j5I+nn0sGSIPvlymA5OV7omrfdBZUURJAJAqCcY=; b=eSHIXwjGPoLrJFujzs1M1CF5hibaFqzZEj9bFnTi4pyphHOUw+9DFsjuFQyk4er0yE 7DluBmgo5njtP5PinIQtVVQmas8e+FJtvLHukBMg50N6iScUQmZBW2aGIGL3KpIOjnwG WTeN5dTtdmOyPWcsGdvf8KUN8VY77awM2z/uNrXQUtfuReCWnmV3Amca1sYHkRgioPJb De5XbPYScRh5NYT2OEGbMh5V7BTHHtmaK9TzlWwKWQXC3ThX9iRJBAXvIchc/TRY4Sa+ hAVp0UDXMaS5GB+kJrSlTIT39XGOAG4akFkkVU9VbzVU2Q8CLBITXnTghSPAA7+dLMP2 WjEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oW8xtR9V; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w13si1885307uad.121.2021.06.03.10.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jun 2021 10:16:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oW8xtR9V; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loqx3-0007w0-VS for patch@linaro.org; Thu, 03 Jun 2021 13:16:13 -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) 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-Received: by 2002:a5d:47ce:: with SMTP id o14mr13659wrc.273.1622740383960; 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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- target/arm/kvm64.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Dongjiu Geng 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 = qdev_get_machine(); - VirtMachineState *vms = VIRT_MACHINE(obj); - bool acpi_enabled = virt_is_acpi_enabled(vms); assert(code == BUS_MCEERR_AR || code == BUS_MCEERR_AO); - if (acpi_enabled && addr && - object_property_get_bool(obj, "ras", NULL)) { + if (acpi_ghes_present() && addr) { ram_addr = qemu_ram_addr_from_host(addr); if (ram_addr != RAM_ADDR_INVALID && kvm_physical_memory_addr_from_host(c->kvm_state, addr, &paddr)) {