hw/i386/acpi-build: Move build_append_pci_bus_devices/pcihp_slots to pcihp
We intend to reuse build_append_pci_bus_devices and build_append_pcihp_slots on ARM. So let's move them to hw/acpi/pcihp.c as well as all static helpers they use. No functional change intended. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Gustavo Romero <gustavo.romero@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Message-Id: <20250714080639.2525563-15-eric.auger@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eric Auger
Michael S. Tsirkin
parent
d962f199c7
commit
e87ab64e8f
4 changed files with 175 additions and 173 deletions
173
hw/acpi/pcihp.c
173
hw/acpi/pcihp.c
|
|
@ -27,6 +27,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "hw/acpi/pcihp.h"
|
||||
#include "hw/acpi/aml-build.h"
|
||||
#include "hw/acpi/acpi_aml_interface.h"
|
||||
#include "hw/pci-host/i440fx.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "hw/pci/pci_bridge.h"
|
||||
|
|
@ -761,6 +762,178 @@ bool build_append_notification_callback(Aml *parent_scope, const PCIBus *bus)
|
|||
return !!nr_notifiers;
|
||||
}
|
||||
|
||||
static Aml *aml_pci_device_dsm(void)
|
||||
{
|
||||
Aml *method;
|
||||
|
||||
method = aml_method("_DSM", 4, AML_SERIALIZED);
|
||||
{
|
||||
Aml *params = aml_local(0);
|
||||
Aml *pkg = aml_package(2);
|
||||
aml_append(pkg, aml_int(0));
|
||||
aml_append(pkg, aml_int(0));
|
||||
aml_append(method, aml_store(pkg, params));
|
||||
aml_append(method,
|
||||
aml_store(aml_name("BSEL"), aml_index(params, aml_int(0))));
|
||||
aml_append(method,
|
||||
aml_store(aml_name("ASUN"), aml_index(params, aml_int(1))));
|
||||
aml_append(method,
|
||||
aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
|
||||
aml_arg(2), aml_arg(3), params))
|
||||
);
|
||||
}
|
||||
return method;
|
||||
}
|
||||
|
||||
static Aml *aml_pci_static_endpoint_dsm(PCIDevice *pdev)
|
||||
{
|
||||
Aml *method;
|
||||
|
||||
g_assert(pdev->acpi_index != 0);
|
||||
method = aml_method("_DSM", 4, AML_SERIALIZED);
|
||||
{
|
||||
Aml *params = aml_local(0);
|
||||
Aml *pkg = aml_package(1);
|
||||
aml_append(pkg, aml_int(pdev->acpi_index));
|
||||
aml_append(method, aml_store(pkg, params));
|
||||
aml_append(method,
|
||||
aml_return(aml_call5("EDSM", aml_arg(0), aml_arg(1),
|
||||
aml_arg(2), aml_arg(3), params))
|
||||
);
|
||||
}
|
||||
return method;
|
||||
}
|
||||
|
||||
static void build_append_pcihp_notify_entry(Aml *method, int slot)
|
||||
{
|
||||
Aml *if_ctx;
|
||||
int32_t devfn = PCI_DEVFN(slot, 0);
|
||||
|
||||
if_ctx = aml_if(aml_and(aml_arg(0), aml_int(0x1U << slot), NULL));
|
||||
aml_append(if_ctx, aml_notify(aml_name("S%.02X", devfn), aml_arg(1)));
|
||||
aml_append(method, if_ctx);
|
||||
}
|
||||
|
||||
static bool is_devfn_ignored_generic(const int devfn, const PCIBus *bus)
|
||||
{
|
||||
const PCIDevice *pdev = bus->devices[devfn];
|
||||
|
||||
if (PCI_FUNC(devfn)) {
|
||||
if (IS_PCI_BRIDGE(pdev)) {
|
||||
/*
|
||||
* Ignore only hotplugged PCI bridges on !0 functions, but
|
||||
* allow describing cold plugged bridges on all functions
|
||||
*/
|
||||
if (DEVICE(pdev)->hotplugged) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool is_devfn_ignored_hotplug(const int devfn, const PCIBus *bus)
|
||||
{
|
||||
PCIDevice *pdev = bus->devices[devfn];
|
||||
if (pdev) {
|
||||
return is_devfn_ignored_generic(devfn, bus) ||
|
||||
!DEVICE_GET_CLASS(pdev)->hotpluggable ||
|
||||
/* Cold plugged bridges aren't themselves hot-pluggable */
|
||||
(IS_PCI_BRIDGE(pdev) && !DEVICE(pdev)->hotplugged);
|
||||
} else { /* non populated slots */
|
||||
/*
|
||||
* hotplug is supported only for non-multifunction device
|
||||
* so generate device description only for function 0
|
||||
*/
|
||||
if (PCI_FUNC(devfn) ||
|
||||
(pci_bus_is_express(bus) && PCI_SLOT(devfn) > 0)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void build_append_pcihp_slots(Aml *parent_scope, PCIBus *bus)
|
||||
{
|
||||
int devfn;
|
||||
Aml *dev, *notify_method = NULL, *method;
|
||||
QObject *bsel = object_property_get_qobject(OBJECT(bus),
|
||||
ACPI_PCIHP_PROP_BSEL, NULL);
|
||||
uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel));
|
||||
qobject_unref(bsel);
|
||||
|
||||
aml_append(parent_scope, aml_name_decl("BSEL", aml_int(bsel_val)));
|
||||
notify_method = aml_method("DVNT", 2, AML_NOTSERIALIZED);
|
||||
|
||||
for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) {
|
||||
int slot = PCI_SLOT(devfn);
|
||||
int adr = slot << 16 | PCI_FUNC(devfn);
|
||||
|
||||
if (is_devfn_ignored_hotplug(devfn, bus)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bus->devices[devfn]) {
|
||||
dev = aml_scope("S%.02X", devfn);
|
||||
} else {
|
||||
dev = aml_device("S%.02X", devfn);
|
||||
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
|
||||
}
|
||||
|
||||
/*
|
||||
* Can't declare _SUN here for every device as it changes 'slot'
|
||||
* enumeration order in linux kernel, so use another variable for it
|
||||
*/
|
||||
aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
|
||||
aml_append(dev, aml_pci_device_dsm());
|
||||
|
||||
aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
|
||||
/* add _EJ0 to make slot hotpluggable */
|
||||
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
|
||||
aml_append(method,
|
||||
aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
|
||||
);
|
||||
aml_append(dev, method);
|
||||
|
||||
build_append_pcihp_notify_entry(notify_method, slot);
|
||||
|
||||
/* device descriptor has been composed, add it into parent context */
|
||||
aml_append(parent_scope, dev);
|
||||
}
|
||||
aml_append(parent_scope, notify_method);
|
||||
}
|
||||
|
||||
void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus)
|
||||
{
|
||||
int devfn;
|
||||
Aml *dev;
|
||||
|
||||
for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) {
|
||||
/* ACPI spec: 1.0b: Table 6-2 _ADR Object Bus Types, PCI type */
|
||||
int adr = PCI_SLOT(devfn) << 16 | PCI_FUNC(devfn);
|
||||
PCIDevice *pdev = bus->devices[devfn];
|
||||
|
||||
if (!pdev || is_devfn_ignored_generic(devfn, bus)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* start to compose PCI device descriptor */
|
||||
dev = aml_device("S%.02X", devfn);
|
||||
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
|
||||
|
||||
call_dev_aml_func(DEVICE(bus->devices[devfn]), dev);
|
||||
/* add _DSM if device has acpi-index set */
|
||||
if (pdev->acpi_index &&
|
||||
!object_property_get_bool(OBJECT(pdev), "hotpluggable",
|
||||
&error_abort)) {
|
||||
aml_append(dev, aml_pci_static_endpoint_dsm(pdev));
|
||||
}
|
||||
|
||||
/* device descriptor has been composed, add it into parent context */
|
||||
aml_append(parent_scope, dev);
|
||||
}
|
||||
}
|
||||
|
||||
const VMStateDescription vmstate_acpi_pcihp_pci_status = {
|
||||
.name = "acpi_pcihp_pci_status",
|
||||
.version_id = 1,
|
||||
|
|
|
|||
|
|
@ -338,29 +338,6 @@ build_facs(GArray *table_data)
|
|||
g_array_append_vals(table_data, reserved, 40); /* Reserved */
|
||||
}
|
||||
|
||||
static Aml *aml_pci_device_dsm(void)
|
||||
{
|
||||
Aml *method;
|
||||
|
||||
method = aml_method("_DSM", 4, AML_SERIALIZED);
|
||||
{
|
||||
Aml *params = aml_local(0);
|
||||
Aml *pkg = aml_package(2);
|
||||
aml_append(pkg, aml_int(0));
|
||||
aml_append(pkg, aml_int(0));
|
||||
aml_append(method, aml_store(pkg, params));
|
||||
aml_append(method,
|
||||
aml_store(aml_name("BSEL"), aml_index(params, aml_int(0))));
|
||||
aml_append(method,
|
||||
aml_store(aml_name("ASUN"), aml_index(params, aml_int(1))));
|
||||
aml_append(method,
|
||||
aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
|
||||
aml_arg(2), aml_arg(3), params))
|
||||
);
|
||||
}
|
||||
return method;
|
||||
}
|
||||
|
||||
static Aml *aml_pci_edsm(void)
|
||||
{
|
||||
Aml *method, *ifctx;
|
||||
|
|
@ -414,155 +391,6 @@ static Aml *aml_pci_edsm(void)
|
|||
return method;
|
||||
}
|
||||
|
||||
static Aml *aml_pci_static_endpoint_dsm(PCIDevice *pdev)
|
||||
{
|
||||
Aml *method;
|
||||
|
||||
g_assert(pdev->acpi_index != 0);
|
||||
method = aml_method("_DSM", 4, AML_SERIALIZED);
|
||||
{
|
||||
Aml *params = aml_local(0);
|
||||
Aml *pkg = aml_package(1);
|
||||
aml_append(pkg, aml_int(pdev->acpi_index));
|
||||
aml_append(method, aml_store(pkg, params));
|
||||
aml_append(method,
|
||||
aml_return(aml_call5("EDSM", aml_arg(0), aml_arg(1),
|
||||
aml_arg(2), aml_arg(3), params))
|
||||
);
|
||||
}
|
||||
return method;
|
||||
}
|
||||
|
||||
static void build_append_pcihp_notify_entry(Aml *method, int slot)
|
||||
{
|
||||
Aml *if_ctx;
|
||||
int32_t devfn = PCI_DEVFN(slot, 0);
|
||||
|
||||
if_ctx = aml_if(aml_and(aml_arg(0), aml_int(0x1U << slot), NULL));
|
||||
aml_append(if_ctx, aml_notify(aml_name("S%.02X", devfn), aml_arg(1)));
|
||||
aml_append(method, if_ctx);
|
||||
}
|
||||
|
||||
static bool is_devfn_ignored_generic(const int devfn, const PCIBus *bus)
|
||||
{
|
||||
const PCIDevice *pdev = bus->devices[devfn];
|
||||
|
||||
if (PCI_FUNC(devfn)) {
|
||||
if (IS_PCI_BRIDGE(pdev)) {
|
||||
/*
|
||||
* Ignore only hotplugged PCI bridges on !0 functions, but
|
||||
* allow describing cold plugged bridges on all functions
|
||||
*/
|
||||
if (DEVICE(pdev)->hotplugged) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool is_devfn_ignored_hotplug(const int devfn, const PCIBus *bus)
|
||||
{
|
||||
PCIDevice *pdev = bus->devices[devfn];
|
||||
if (pdev) {
|
||||
return is_devfn_ignored_generic(devfn, bus) ||
|
||||
!DEVICE_GET_CLASS(pdev)->hotpluggable ||
|
||||
/* Cold plugged bridges aren't themselves hot-pluggable */
|
||||
(IS_PCI_BRIDGE(pdev) && !DEVICE(pdev)->hotplugged);
|
||||
} else { /* non populated slots */
|
||||
/*
|
||||
* hotplug is supported only for non-multifunction device
|
||||
* so generate device description only for function 0
|
||||
*/
|
||||
if (PCI_FUNC(devfn) ||
|
||||
(pci_bus_is_express(bus) && PCI_SLOT(devfn) > 0)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void build_append_pcihp_slots(Aml *parent_scope, PCIBus *bus)
|
||||
{
|
||||
int devfn;
|
||||
Aml *dev, *notify_method = NULL, *method;
|
||||
QObject *bsel = object_property_get_qobject(OBJECT(bus),
|
||||
ACPI_PCIHP_PROP_BSEL, NULL);
|
||||
uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel));
|
||||
qobject_unref(bsel);
|
||||
|
||||
aml_append(parent_scope, aml_name_decl("BSEL", aml_int(bsel_val)));
|
||||
notify_method = aml_method("DVNT", 2, AML_NOTSERIALIZED);
|
||||
|
||||
for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) {
|
||||
int slot = PCI_SLOT(devfn);
|
||||
int adr = slot << 16 | PCI_FUNC(devfn);
|
||||
|
||||
if (is_devfn_ignored_hotplug(devfn, bus)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bus->devices[devfn]) {
|
||||
dev = aml_scope("S%.02X", devfn);
|
||||
} else {
|
||||
dev = aml_device("S%.02X", devfn);
|
||||
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
|
||||
}
|
||||
|
||||
/*
|
||||
* Can't declare _SUN here for every device as it changes 'slot'
|
||||
* enumeration order in linux kernel, so use another variable for it
|
||||
*/
|
||||
aml_append(dev, aml_name_decl("ASUN", aml_int(slot)));
|
||||
aml_append(dev, aml_pci_device_dsm());
|
||||
|
||||
aml_append(dev, aml_name_decl("_SUN", aml_int(slot)));
|
||||
/* add _EJ0 to make slot hotpluggable */
|
||||
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
|
||||
aml_append(method,
|
||||
aml_call2("PCEJ", aml_name("BSEL"), aml_name("_SUN"))
|
||||
);
|
||||
aml_append(dev, method);
|
||||
|
||||
build_append_pcihp_notify_entry(notify_method, slot);
|
||||
|
||||
/* device descriptor has been composed, add it into parent context */
|
||||
aml_append(parent_scope, dev);
|
||||
}
|
||||
aml_append(parent_scope, notify_method);
|
||||
}
|
||||
|
||||
void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus)
|
||||
{
|
||||
int devfn;
|
||||
Aml *dev;
|
||||
|
||||
for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) {
|
||||
/* ACPI spec: 1.0b: Table 6-2 _ADR Object Bus Types, PCI type */
|
||||
int adr = PCI_SLOT(devfn) << 16 | PCI_FUNC(devfn);
|
||||
PCIDevice *pdev = bus->devices[devfn];
|
||||
|
||||
if (!pdev || is_devfn_ignored_generic(devfn, bus)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* start to compose PCI device descriptor */
|
||||
dev = aml_device("S%.02X", devfn);
|
||||
aml_append(dev, aml_name_decl("_ADR", aml_int(adr)));
|
||||
|
||||
call_dev_aml_func(DEVICE(bus->devices[devfn]), dev);
|
||||
/* add _DSM if device has acpi-index set */
|
||||
if (pdev->acpi_index &&
|
||||
!object_property_get_bool(OBJECT(pdev), "hotpluggable",
|
||||
&error_abort)) {
|
||||
aml_append(dev, aml_pci_static_endpoint_dsm(pdev));
|
||||
}
|
||||
|
||||
/* device descriptor has been composed, add it into parent context */
|
||||
aml_append(parent_scope, dev);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* build_prt - Define interrupt routing rules
|
||||
*
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ typedef struct AcpiMcfgInfo {
|
|||
void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info,
|
||||
const char *oem_id, const char *oem_table_id);
|
||||
|
||||
void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus);
|
||||
void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope);
|
||||
|
||||
void build_srat_generic_affinity_structures(GArray *table_data);
|
||||
|
|
|
|||
|
|
@ -80,6 +80,8 @@ void build_append_pcihp_resources(Aml *table,
|
|||
uint64_t io_addr, uint64_t io_len);
|
||||
bool build_append_notification_callback(Aml *parent_scope, const PCIBus *bus);
|
||||
|
||||
void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus);
|
||||
|
||||
/* Called on reset */
|
||||
void acpi_pcihp_reset(AcpiPciHpState *s);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue