Received: by 2002:a17:504:5d2c:b0:1be9:327d:8ee3 with SMTP id et12csp1741367njc; Mon, 16 Jun 2025 02:51:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvgRep9+VSXzqVZ3BPxQjEvjEGnE0emwdhOws5AQDGLsQSiLOyNehYSe1qiq8zAfHv50DVr+MtrlEEMA==@linaro.org X-Google-Smtp-Source: AGHT+IFS4OTH+Bx15tthVYQdo2SYvi3hnzALNqPie3N35Gs2aHQuQfelwWLVuA1uSZMMudg2zrYa X-Received: by 2002:a17:90b:5545:b0:312:e9d:3ffa with SMTP id 98e67ed59e1d1-313f1d250fdmr11996302a91.31.1750067465659; Mon, 16 Jun 2025 02:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750067465; cv=none; d=google.com; s=arc-20240605; b=Qm/qd16iVuLQKJhgEh4bSuwt8x0KVm0o5B+xAlJVCPaL5YZRIa6hIRC+NvjFo10mAN NxvNF0t6xEE75wANZQhbF6v5xcae73j7arklchNzEvOCOAoV8Bo8cx7XrkIG6uEFWJxC JY9Tu/0e24k6N9HhJdVi0tRSaQHTmXRSQAVd270iwkLcaAlmOHq8yaK+h0rTzALWJ9Z3 dzpXfKrC34X9jA0L49PoSHEJOaS55oWltgta6GsNDJQiNq8XJvCMFYRxnylfZdUnpzdF gWJOByay5FWEOlRj9WYO+SnoVTH1lMTBVBu+rYi3+v3aQo3rSHbwAuE/jsDn9Pm98Bzc yW7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=eKVfzSTh8Ujd78GQpzS707xCtiArZdfxW7YffvWNPFo=; fh=3+/pQVIKD31FE8qJaDVh0A7e2m9TMoY7e0VvIw0mRHw=; b=YSR4gEhg+rq3eg/KJTkOZ7fmt94aBecEiWd3FyuYsJvKwiz4aXQWovHJiA2viykaRP 6Vo+s9JBMcJxafTJUNcsWjZmiT/DaDLfkBIXBBI2/ZKhvkUwkTOauFaALNgsh09Fxm+D OJDUCpNfFuDzcr8BcHVhihUGHK7aHvUZfVQCNW9IfT74waxA6tl4tmg4PchimaQZoHnV g8GQEtjtXx3Gt9aFLY7Vx33k0cfWxMjkFV1IoDFw/Wu3zq2e8ZnHC4em7btf+ShhkXcc aV519v5P5nOhJh6uY6Hq7U4iujQpCktoFrSd4Ucq80dWwbxFRBAEDnykXbt8/m9hOJDd 3G6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BiB7VeVa; spf=pass (google.com: domain of eric.auger@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=eric.auger@redhat.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id d9443c01a7336-2365dfcf64fsi96332825ad.487.2025.06.16.02.51.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 02:51:05 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BiB7VeVa; spf=pass (google.com: domain of eric.auger@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=eric.auger@redhat.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750067464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eKVfzSTh8Ujd78GQpzS707xCtiArZdfxW7YffvWNPFo=; b=BiB7VeVaPK/TOiKKlVh0fd58Mzd50paPXD5iw9hC18+eLqF3AUXelsVFvBVYEpIlEK4QDh +93eZ3ylCjMlqnLjuWM0VW2R+mDYvnsmttJheKo/3I410euU8a8paKHHF0deRjZdmEFV0R +sAhh5mWvhyMufUWA/Be2PPR2tIvVyw= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-18-ycDkD-k1MRqDiJyOa6hnBg-1; Mon, 16 Jun 2025 05:51:01 -0400 X-MC-Unique: ycDkD-k1MRqDiJyOa6hnBg-1 X-Mimecast-MFC-AGG-ID: ycDkD-k1MRqDiJyOa6hnBg_1750067459 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AF59F18002E4; Mon, 16 Jun 2025 09:50:59 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.45.224.77]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 056C819560A7; Mon, 16 Jun 2025 09:50:54 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, imammedo@redhat.com, gustavo.romero@linaro.org, anisinha@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com Cc: pbonzini@redhat.com, Jonathan.Cameron@huawei.com, philmd@linaro.org, alex.bennee@linaro.org Subject: [PATCH v3 20/29] hw/acpi/ged: Prepare the device to react to PCI hotplug events Date: Mon, 16 Jun 2025 11:46:49 +0200 Message-ID: <20250616094903.885753-21-eric.auger@redhat.com> In-Reply-To: <20250616094903.885753-1-eric.auger@redhat.com> References: <20250616094903.885753-1-eric.auger@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-TUID: xzDA/EutlrG7 QEMU will notify the OS about PCI hotplug/hotunplug events through GED interrupts. Let the GED device handle a new PCI hotplug event. On its occurrence it calls the \\_SB.PCI0.PCNT method with the BLCK mutex held. The GED device uses a dedicated MMIO region that will be mapped by the machine code. At this point the GED still does not support PCI device hotplug in its TYPE_HOTPLUG_HANDLER implementation. This will come in a subsequent patch. Signed-off-by: Eric Auger --- v2 -> v3: - pcihp_init and reset are put in ged code instead of machine code (Igor) v1 -> v2: - Introduce ACPI_PCIHP_REGION_NAME --- include/hw/acpi/generic_event_device.h | 4 ++++ hw/acpi/generic_event_device.c | 26 ++++++++++++++++++++++++++ hw/acpi/pcihp.c | 1 - 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h index f5ffa67a39..ec8e1abe0a 100644 --- a/include/hw/acpi/generic_event_device.h +++ b/include/hw/acpi/generic_event_device.h @@ -102,6 +102,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED) #define ACPI_GED_PWR_DOWN_EVT 0x2 #define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4 #define ACPI_GED_CPU_HOTPLUG_EVT 0x8 +#define ACPI_GED_PCI_HOTPLUG_EVT 0x10 typedef struct GEDState { MemoryRegion evt; @@ -109,6 +110,8 @@ typedef struct GEDState { uint32_t sel; } GEDState; +#define ACPI_PCIHP_REGION_NAME "pcihp container" + struct AcpiGedState { SysBusDevice parent_obj; MemHotplugState memhp_state; @@ -116,6 +119,7 @@ struct AcpiGedState { CPUHotplugState cpuhp_state; MemoryRegion container_cpuhp; AcpiPciHpState pcihp_state; + MemoryRegion container_pcihp; GEDState ged_state; uint32_t ged_event_bitmap; qemu_irq irq; diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index ef1c1ec51f..b4eefb0106 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/pcihp.h" #include "hw/acpi/generic_event_device.h" #include "hw/pci/pci.h" #include "hw/irq.h" @@ -27,6 +28,7 @@ static const uint32_t ged_supported_events[] = { ACPI_GED_PWR_DOWN_EVT, ACPI_GED_NVDIMM_HOTPLUG_EVT, ACPI_GED_CPU_HOTPLUG_EVT, + ACPI_GED_PCI_HOTPLUG_EVT, }; /* @@ -122,6 +124,12 @@ void build_ged_aml(Aml *table, const char *name, HotplugHandler *hotplug_dev, aml_notify(aml_name("\\_SB.NVDR"), aml_int(0x80))); break; + case ACPI_GED_PCI_HOTPLUG_EVT: + aml_append(if_ctx, + aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF)); + aml_append(if_ctx, aml_call0("\\_SB.PCI0.PCNT")); + aml_append(if_ctx, aml_release(aml_name("\\_SB.PCI0.BLCK"))); + break; default: /* * Please make sure all the events in ged_supported_events[] @@ -300,6 +308,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) sel = ACPI_GED_NVDIMM_HOTPLUG_EVT; } else if (ev & ACPI_CPU_HOTPLUG_STATUS) { sel = ACPI_GED_CPU_HOTPLUG_EVT; + } else if (ev & ACPI_PCI_HOTPLUG_STATUS) { + sel = ACPI_GED_PCI_HOTPLUG_EVT; } else { /* Unknown event. Return without generating interrupt. */ warn_report("GED: Unsupported event %d. No irq injected", ev); @@ -433,6 +443,12 @@ static void acpi_ged_realize(DeviceState *dev, Error **errp) cpu_hotplug_hw_init(&s->container_cpuhp, OBJECT(dev), &s->cpuhp_state, 0); break; + case ACPI_GED_PCI_HOTPLUG_EVT: + memory_region_init(&s->container_pcihp, OBJECT(dev), + ACPI_PCIHP_REGION_NAME, ACPI_PCIHP_SIZE); + sysbus_init_mmio(sbd, &s->container_pcihp); + acpi_pcihp_init(OBJECT(s), &s->pcihp_state, + s->pcihp_state.root, &s->container_pcihp, 0); } ged_events--; } @@ -474,6 +490,15 @@ static void acpi_ged_initfn(Object *obj) sysbus_init_mmio(sbd, &ged_st->regs); } +static void ged_reset(DeviceState *dev) +{ + AcpiGedState *s = ACPI_GED(dev); + + if (s->pcihp_state.use_acpi_hotplug_bridge) { + acpi_pcihp_reset(&s->pcihp_state); + } +} + static void acpi_ged_class_init(ObjectClass *class, const void *data) { DeviceClass *dc = DEVICE_CLASS(class); @@ -488,6 +513,7 @@ static void acpi_ged_class_init(ObjectClass *class, const void *data) hc->plug = acpi_ged_device_plug_cb; hc->unplug_request = acpi_ged_unplug_request_cb; hc->unplug = acpi_ged_unplug_cb; + device_class_set_legacy_reset(dc, ged_reset); adevc->ospm_status = acpi_ged_ospm_status; adevc->send_event = acpi_ged_send_event; diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index e79a24b821..36492aa0d9 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -43,7 +43,6 @@ #include "qobject/qnum.h" #include "trace.h" -#define ACPI_PCIHP_SIZE 0x0018 #define PCI_UP_BASE 0x0000 #define PCI_DOWN_BASE 0x0004 #define PCI_EJ_BASE 0x0008 -- 2.49.0