From nobody Sun May 19 16:27:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1601569334; cv=none; d=zohomail.com; s=zohoarc; b=O1Irp4WnIToz3pbY052+mShkZvaFg8NzydaSdCHl9BqRzdJDBrxLmrC6FAUK2CW2hYLXEvwNTLE/POYWYpPFxVzXfIGqjOFDSCrJwrNy/G2pDlj82wrbim+/X7bM8e/qlbuKGjpGVjHzOQNNTIVxNjxFx1kEdSL7PNu3SAz/WAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601569334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=ILVY5aeJqy2jKuyV4vgyIfzjSo6AsLHrLCtthdQdX2U=; b=coJePDLq4oIph15LjaalVNmjb6jhw2ScSDMhWCvPCqAj9zpg2W5o3FVqEsqkJ8ZHJvlDNKFznZPM/HB3vnXEeHokYH6kkIwiNiyzODf5J6FK0Rwiy9TV+c9BzCIuUbFF1LYhUeJpmtWqI5sEvhtmZ0CLE5C+mlSCfaHY0DCJYk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601569334738783.5137825598486; Thu, 1 Oct 2020 09:22:14 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-89-UXBC_GumNZ6P2nrd9qhZ5Q-1; Thu, 01 Oct 2020 12:22:11 -0400 Received: by mail-wr1-f71.google.com with SMTP id a2so2249073wrp.8 for ; Thu, 01 Oct 2020 09:22:11 -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 i14sm10626735wro.96.2020.10.01.09.22.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 09:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601569333; 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=ILVY5aeJqy2jKuyV4vgyIfzjSo6AsLHrLCtthdQdX2U=; b=Iw0N4N8k/KqdToSLs1Fl1mJC8xqLwZqoFwbXzmby5hWrSm69v8wVKIYlQpbcdwmyqZJ9w7 JnN5HsuhPdUWipQh/7fGrh6oUrm1veVTaSsH/twSuIFmLBqAeOHSBHlQBaU6k6Q7AqceLp 8/IggqV6XrfhcFseXAJhHlBbhVkwVx0= X-MC-Unique: UXBC_GumNZ6P2nrd9qhZ5Q-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=ILVY5aeJqy2jKuyV4vgyIfzjSo6AsLHrLCtthdQdX2U=; b=VgZQM3LU4wpZfojHWYEsjcN49NrGt+QkyXhiM8J0O5+qUCckn62UEakFSKolC788Pb dHwyY38avqSfeP7E4NLUUb8aFiEIVBCoLsfKL8IfchAjRyUJyyORe1Lvl7ayPvTJ6jJW 8raeEgC639jB2T9OT5y95eIYP0QOw9MJpLMwBbYVWTJV0ZUCOR+rKDCMOm5aR8qBCKXV 3sNH9H9vPsA4bR8VN8Eq96l4kV/urS7T/oAI5s7AwHPojCLCMFSuL3MtdwXwJEw3fLYK NJKbAvJ14Wt1AB7xIDlfMgqyhTlgRkSVESfdtHzBr2U1cC2OLywXUC1p3xZSGONc7AXe JhSQ== X-Gm-Message-State: AOAM532KsvVd4NfByDQWOYFw6ndQ3AYsm2bFzjKcXqfnN3tF6bK3rEJ1 wdAl2EYdAeYHJURqXws44JKciW/nSSpKu/jfDf0poPralxKNHr9W6HVoOHfj9TKDPwPb7oCRGr2 mN0feQICJBGhF9A== X-Received: by 2002:a1c:59c3:: with SMTP id n186mr861073wmb.32.1601569330289; Thu, 01 Oct 2020 09:22:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFf+s9RlRrvChBS5D4yNrEsCEQpsSEQmQXCB8opbptFHAq11ZSYTGGTW4JFFsYRGnyhkN2cA== X-Received: by 2002:a1c:59c3:: with SMTP id n186mr861057wmb.32.1601569330047; Thu, 01 Oct 2020 09:22:10 -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?= , "Michael S . Tsirkin" , Dongjiu Geng , Laszlo Ersek , Xiang Zheng , Jonathan Cameron , Igor Mammedov Subject: [PATCH v2] hw/arm: Restrict APEI tables generation to the 'virt' machine Date: Thu, 1 Oct 2020 18:22:07 +0200 Message-Id: <20201001162207.1566127-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) While APEI is a generic ACPI feature (usable by X86 and ARM64), only the 'virt' machine uses it, by enabling the RAS Virtualization. See commit 2afa8c8519: "hw/arm/virt: Introduce a RAS machine option"). Restrict the APEI tables generation code to the single user: the virt machine. If another machine wants to use it, it simply has to 'select ACPI_APEI' in its Kconfig. Fixes: aa16508f1d ("ACPI: Build related register address fields via hardwar= e error fw_cfg blob") Acked-by: Michael S. Tsirkin Reviewed-by: Dongjiu Geng Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Laszlo Ersek Reviewed-by: Igor Mammedov --- v2: Reworded Cc: Laszlo Ersek Cc: Xiang Zheng Cc: Jonathan Cameron Cc: Igor Mammedov --- 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