From nobody Fri May 17 00:45:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601384179; cv=none; d=zohomail.com; s=zohoarc; b=SHIr7fY+VEs5O7M0JU90rxFqDiJIKFTB3kjf2ChxEkpPVX15/dffiA5ldTq3l2woLKkOTvh5OffWl2wgfEidOjvMvS2DyXVtqrgDk2jCIIVyxjNuiP3XI+82/PBvhft5f07sQ6Pn9VwDpT9ACDWnQ9Pixkw8DfYfF1wtd/JW3xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601384179; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=iguQs2kfsCnerdjWScTWC7qFlJXZ9V7uhuoxVsh48D8=; b=MPqeoSf5UReOnkWLwgZJ168anQ1CGQ8mAbMvRkE+5SmwveWNCmS3QbAx84u6fMD2kCX/hZ/Rs+E64X0GTneZctuKdKrGcvrBrdCzWoy81H1h3JTGjZWzI323XE7pgV1HLs0vvx8+jI5GcS19vYnPmu8guIepvdYLmEeZMC0N/BI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601384179201801.674596633942; Tue, 29 Sep 2020 05:56:19 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-532-UhQ_SEhbNjm5NIIn1LUE1g-1; Tue, 29 Sep 2020 08:56:13 -0400 Received: by mail-wr1-f72.google.com with SMTP id g6so1735617wrv.3 for ; Tue, 29 Sep 2020 05:56:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id n21sm5387913wmi.21.2020.09.29.05.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 05:56:11 -0700 (PDT) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601384178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iguQs2kfsCnerdjWScTWC7qFlJXZ9V7uhuoxVsh48D8=; b=JavNJtP9bEC7Jj/fIIeOrJW+vFCuthgTFy3l+CpkMM0X4GaAPLLs7ULJJRNHAic03Lryna qbyU/XtOVlxG0fq/wGAXp8qCfHrZwlwEkV5xfXQxVdCvuY2a3c7iiixtVJcf/KAcYFSLkj sXpNw3SuW+bkmbRUTvR5nV0OH3HlZ9k= X-MC-Unique: UhQ_SEhbNjm5NIIn1LUE1g-1 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:mime-version :content-transfer-encoding; bh=iguQs2kfsCnerdjWScTWC7qFlJXZ9V7uhuoxVsh48D8=; b=k8Z2GHBDolnMlYVS1I4HExVFQQSWR2a9Dbs3wLM0G82nGwGoYShUaZo/nL1kOyehLs T6x5VI5U/FspJu9j3su6VHfuK5DSWE5N3UlPcMRtyXLJocpKebOxV9drBJvGZfikUwcJ mzjCRsjQcwAXYcyqLC8pLMVbFaTokea55nw2VWEpuhj6NyNZCkEOmGAy/v0hnRRQ+oAZ tBNDGjNBiYVR6lX8Er3WgdNt0XaoA5HHRH7p2A/w89btlznYNec8/9HbYiseDyTiF3ZG T/ZySvyLkeMG0MFwGnJK130tQAhO7W/Yq6HD4IH0k7FI7MO8fS8egC/AVXcwFj4gXK6v ZA9A== X-Gm-Message-State: AOAM531YvHT5V9Pn1uBTi556Z8WF+sGpeUk1oh7YaZpBPFdxvc2Smzo+ CfufbD4oUbHLs8XTpUM5pnDPkF1+m9CZkke4l7E3+fXygws2FwwR8V+2b7JZy3iWwtcDgE7FOcX wfm8RSXrUoipFmA== X-Received: by 2002:a7b:c453:: with SMTP id l19mr4207283wmi.163.1601384171907; Tue, 29 Sep 2020 05:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY/ljyP/8XkyOUh4y71tr6Dg8Rj3L0vAoEHdBT7mtUKxjn+n3W8h0yq7tjPB/MZPTXoF5uhw== X-Received: by 2002:a7b:c453:: with SMTP id l19mr4207263wmi.163.1601384171691; Tue, 29 Sep 2020 05:56:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Xiang Zheng , Jonathan Cameron , Igor Mammedov , Dongjiu Geng , "Michael S . Tsirkin" Subject: [PATCH] hw/arm: Restrict APEI tables generation to the 'virt' machine Date: Tue, 29 Sep 2020 14:56:09 +0200 Message-Id: <20200929125609.1088330-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) As only the Virt machine uses the RAS Virtualization feature (see commit 2afa8c8519: "hw/arm/virt: Introduce a RAS machine option"), restrict the APEI tables generation code to the virt machine. Fixes: aa16508f1d ("ACPI: Build related register address fields via hardwar= e error fw_cfg blob") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael S. Tsirkin Reviewed-by: Dongjiu Geng --- Cc: Laszlo Ersek Cc: Xiang Zheng Cc: Jonathan Cameron Cc: Igor Mammedov Cc: Dongjiu Geng Cc: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - hw/arm/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 9a94ebd0be..08a32123b4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy CONFIG_SEMIHOSTING=3Dy CONFIG_ALLWINNER_H3=3Dy -CONFIG_ACPI_APEI=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f303c6bead..7d040827af 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -26,6 +26,7 @@ config ARM_VIRT select ACPI_MEMORY_HOTPLUG select ACPI_HW_REDUCED select ACPI_NVDIMM + select ACPI_APEI =20 config CHEETAH bool --=20 2.26.2