From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C6ACCC83F1B for ; Mon, 14 Jul 2025 23:27:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ubSIX-0003ty-RI; Mon, 14 Jul 2025 19:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubSHz-0001Tl-Dz for qemu-devel@nongnu.org; Mon, 14 Jul 2025 19:08:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ubSHx-0005ly-Dm for qemu-devel@nongnu.org; Mon, 14 Jul 2025 19:08:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752534528; 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: in-reply-to:in-reply-to:references:references; bh=oaEFUE2mka6LHI4AQxwW+l8PzMzmqDvUtE2e2aSDVcM=; b=EVHyjmzpGQy1wTQLwJ3rE0QP+vVvCi3N58C4yftn9DAwWkUQlXRVsiEY7jTlXARLuvXbo/ ZHSO4Ac6n4MYua79Vc5q61q/xfjihcfk4lyGZDRj+9/PKGeZHttHvtWr6IIS/cjYnnkBrZ tm5cPhM/hefqvE6kCermksc3jXcS8nk= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-42-AdN5v0zUOW2xdNtuOcFXBg-1; Mon, 14 Jul 2025 19:08:47 -0400 X-MC-Unique: AdN5v0zUOW2xdNtuOcFXBg-1 X-Mimecast-MFC-AGG-ID: AdN5v0zUOW2xdNtuOcFXBg_1752534526 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a4f65a705dso3143509f8f.2 for ; Mon, 14 Jul 2025 16:08:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752534526; x=1753139326; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oaEFUE2mka6LHI4AQxwW+l8PzMzmqDvUtE2e2aSDVcM=; b=fDtGjAK+JmbDBtK5yCUvPIPLntWakIOhPSfDXWP0cuj+sTXSCWnYYg2ENAtRG2dn9c 8JESn4/6E5gF7HYtk1MRazTgsRj5FVCtx92kDA87Ga7moDyvlmstEANRtuqIq4Q5BIT6 JhJQyXQRSBPK3ej1IgrfPEN7Pujpvu+xUrrWI+Li/Xoq+jmTHxaSxDdn0j+7UjduOICK me3M/8W60Wa1jXvJRe1TxjyFOoVn7CppMahyMQwHxQeZQ0MtRxdjdlfkI/+b3dI+hvB/ eEejqA6ihpfCqrQt2wF8VBp5431AXrajrM/Ki461XNc6Ymqqret+3XtX+hCzQKSTGvsX bfRw== X-Gm-Message-State: AOJu0YxHfU6g99lveuANZFYsZKlx3kc2FRs0E99bcZrtDMld7xdZQO2A RCQg5Ew2JlUpPi0NgJJjVvpFUGCjkFihCs9WCzpdAdWVpINnHI1WXsKd6U6RPRM/KQje5j04Odg JkgXLi5p5zFL8LDHqvKkK5lXx5HBPNAL7DuDit+NOWIlYISNMhfRHTdTsQg+IN1DaXVglsns2nU 3aYcyTbeVYaBlM4gnzN267eOdtr2+3GGRaZA== X-Gm-Gg: ASbGncthl/ECkQKELdEHU+Peeg/n8B3xqtPHMcB08LtqJL15RaAyEtia+EFIyMtunTa CFypoD4XKI75757EbSba9FF+4DCPVf0Iby7RvMKm/rdO29XgCoKdnZFyBRGBhbxYYxEF5Oo1mRq c3FLs/94klyXl3d2hgp08kbjGZtHJm3rsu8scdzOI5fiZWcNQAgB5xV9WJSAln1zWtzD3BIgkYO B6jdWzT4peOoC67s81B3HCdHs9POcqdtZThOjUjP5YvUHqrNEF3C4ikHPjPE2Wnbghs8Gynkbl+ tkgivRppDoWFuIeJJjPHggz4HkZriPGo X-Received: by 2002:a05:6000:2888:b0:3b4:9721:2b1c with SMTP id ffacd0b85a97d-3b5f2dac589mr11611223f8f.6.1752534526097; Mon, 14 Jul 2025 16:08:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEr6tVbwbokSAEJ1/PsF1/MwVQvm5kePqBKDME2NEcwobtAYdk+c4PfYm4ImyHrjfp7ZRvf8Q== X-Received: by 2002:a05:6000:2888:b0:3b4:9721:2b1c with SMTP id ffacd0b85a97d-3b5f2dac589mr11611195f8f.6.1752534525652; Mon, 14 Jul 2025 16:08:45 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:150d:fc00:de3:4725:47c6:6809]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8dc23cfsm13793432f8f.37.2025.07.14.16.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 16:08:44 -0700 (PDT) Date: Mon, 14 Jul 2025 19:08:42 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Eric Auger , Gustavo Romero , Igor Mammedov , Jonathan Cameron , Ani Sinha , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PULL 58/97] hw/acpi/pcihp: Add an AmlRegionSpace arg to build_acpi_pci_hotplug Message-ID: <96a6a9f5e00f2d44a8d51fe5b95f538058171122.1752534227.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Eric Auger On ARM we will put the operation regions in AML_SYSTEM_MEMORY. So let's allow this configuration. Signed-off-by: Eric Auger Reviewed-by: Gustavo Romero Reviewed-by: Igor Mammedov Reviewed-by: Jonathan Cameron Message-Id: <20250714080639.2525563-13-eric.auger@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/pcihp.h | 3 ++- hw/acpi/pcihp.c | 8 ++++---- hw/i386/acpi-build.c | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index 8a46a414cc..253ac6e483 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -28,6 +28,7 @@ #define HW_ACPI_PCIHP_H #include "hw/acpi/acpi.h" +#include "hw/acpi/aml-build.h" #include "hw/hotplug.h" #define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base" @@ -73,7 +74,7 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, DeviceState *dev, Error **errp); -void build_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr); +void build_acpi_pci_hotplug(Aml *table, AmlRegionSpace rs, uint64_t pcihp_addr); void build_append_pci_dsm_func0_common(Aml *ctx, Aml *retvar); void build_append_pcihp_resources(Aml *table, uint64_t io_addr, uint64_t io_len); diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 5ca36c8619..afa3ec5f4d 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -629,7 +629,7 @@ static Aml *aml_pci_pdsm(void) return method; } -void build_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr) +void build_acpi_pci_hotplug(Aml *table, AmlRegionSpace rs, uint64_t pcihp_addr) { Aml *scope; Aml *field; @@ -638,21 +638,21 @@ void build_acpi_pci_hotplug(Aml *table, uint64_t pcihp_addr) scope = aml_scope("_SB.PCI0"); aml_append(scope, - aml_operation_region("PCST", AML_SYSTEM_IO, aml_int(pcihp_addr), 0x08)); + aml_operation_region("PCST", rs, aml_int(pcihp_addr), 0x08)); field = aml_field("PCST", AML_DWORD_ACC, AML_NOLOCK, AML_WRITE_AS_ZEROS); aml_append(field, aml_named_field("PCIU", 32)); aml_append(field, aml_named_field("PCID", 32)); aml_append(scope, field); aml_append(scope, - aml_operation_region("SEJ", AML_SYSTEM_IO, + aml_operation_region("SEJ", rs, aml_int(pcihp_addr + ACPI_PCIHP_SEJ_BASE), 0x04)); field = aml_field("SEJ", AML_DWORD_ACC, AML_NOLOCK, AML_WRITE_AS_ZEROS); aml_append(field, aml_named_field("B0EJ", 32)); aml_append(scope, field); aml_append(scope, - aml_operation_region("BNMR", AML_SYSTEM_IO, + aml_operation_region("BNMR", rs, aml_int(pcihp_addr + ACPI_PCIHP_BNMR_BASE), 0x08)); field = aml_field("BNMR", AML_DWORD_ACC, AML_NOLOCK, AML_WRITE_AS_ZEROS); aml_append(field, aml_named_field("BNUM", 32)); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 52cef834ed..6ca2b34ef8 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1172,7 +1172,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, sb_scope); if (pm->pcihp_bridge_en || pm->pcihp_root_en) { - build_acpi_pci_hotplug(dsdt, pm->pcihp_io_base); + build_acpi_pci_hotplug(dsdt, AML_SYSTEM_IO, pm->pcihp_io_base); } build_piix4_pci0_int(dsdt); } else if (q35) { @@ -1216,7 +1216,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, sb_scope); if (pm->pcihp_bridge_en) { - build_acpi_pci_hotplug(dsdt, pm->pcihp_io_base); + build_acpi_pci_hotplug(dsdt, AML_SYSTEM_IO, pm->pcihp_io_base); } build_q35_pci0_int(dsdt); } -- MST