From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:a111:0:0:0:0:0 with SMTP id o17-v6csp2031446wro; Sun, 4 Nov 2018 17:45:13 -0800 (PST) X-Google-Smtp-Source: AJdET5ezz7nSD2DNrzaKwgwhDv9QX4pZg1TRtAvD6WVggfzahHl0rXjkW1E9JR+zDmqBrlkSiL/q X-Received: by 2002:ac8:6892:: with SMTP id m18mr18816278qtq.157.1541382313837; Sun, 04 Nov 2018 17:45:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541382313; cv=none; d=google.com; s=arc-20160816; b=fuoaI1puPWCr7KfI/QDziiyOy92hihxSxfaLfc/UQSnUDKjzxdCTwnwKeRlRzZAayi 9dVd+CZKdZsAqUkg9FgHQAxVJGFavLnxAuzChRIDHKj8FEtP5u/79lZf2ZC83tFR8RKA YOwOUYHJWAjNhv4MNVpHN9smhn1dowYupZIDMYHlnS5FqoM5mvw/lBfTrGHYEwiZCy9o d8lYK1Az1PbV4YIgI0VHIDnijnt1SF12MB88XN10PoGAVhU8lIZrRz4ZwfdY3q7E35U1 3AkFCTCJtkmyNwHIi8OBbKg8GrSW/vQNtOplS9FgId+FB06QefzyzGcQ5FPEpwIyZx2S b6Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=QhVQd36IXCIyu/Km2aCnjkIju/vHi3m89bdbgcSfgkA=; b=KD32YNkxaeCEOm62Ps5qc6iIIykH8CudYYaoQq4emT+/BZ8G4RCZEZdrI7OZ68TrPO Wy/1bF0cP60Whj2K1hjrX54zKF1IFscMCMVDrI4yHOSbJDH+cGp3IrBYhRtsWEKOyiQM ShQbBSf2/v8A4fZoUYM1jSuK2ZU2wkRrZx+mJGUTeUNIxS5+O3dwaOPkHU43O4SKZ5vV 4Sg2hBEbxIHb7wDLc1KgnD0Ba5PqFX5hIEm9DJFCi22AcsO2LLVFsoFk2BeqSTsKPy0x 5eMuxl+7lMqzxv85eKD4j00bj4Z6TMA89+HcTh85J5t8Fgne72sVSy5ieMyWkj0CfHZ5 ahyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g10si4221575qkm.38.2018.11.04.17.45.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 04 Nov 2018 17:45:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([::1]:60856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTx3-0001Jg-9Q for alex.bennee@linaro.org; Sun, 04 Nov 2018 20:45:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTuf-0007Lp-Ab for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTua-0002kY-Ci for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:45 -0500 Received: from mga04.intel.com ([192.55.52.120]:9699) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJTuW-0002YD-9u; Sun, 04 Nov 2018 20:42:37 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 17:42:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,466,1534834800"; d="scan'208";a="277074352" Received: from emurphy1-mobl1.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.26.250]) by fmsmga005.fm.intel.com with ESMTP; 04 Nov 2018 17:42:25 -0800 From: Samuel Ortiz To: qemu-devel@nongnu.org Date: Mon, 5 Nov 2018 02:40:33 +0100 Message-Id: <20181105014047.26447-11-sameo@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.120 Subject: [Qemu-devel] [PATCH v5 10/24] hw: acpi: Export the PCI host and holes getters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: oSquUQDO3bGv This is going to be needed by the hardware reduced implementation, so let's export it. Once the ACPI builder methods and getters will be implemented, the acpi_get_pci_host() implementation will become hardware agnostic. Signed-off-by: Samuel Ortiz --- include/hw/acpi/aml-build.h | 2 ++ hw/acpi/aml-build.c | 43 +++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 47 ++----------------------------------- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index c27c0935ae..fde2785b9a 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -400,6 +400,8 @@ build_header(BIOSLinker *linker, GArray *table_data, const char *oem_id, const char *oem_table_id); void *acpi_data_push(GArray *table_data, unsigned size); unsigned acpi_data_len(GArray *table); +Object *acpi_get_pci_host(void); +void acpi_get_pci_holes(Range *hole, Range *hole64); /* Align AML blob size to a multiple of 'align' */ void acpi_align_size(GArray *blob, unsigned align); void acpi_add_table(GArray *table_offsets, GArray *table_data); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 2b9a636e75..b8e32f15f7 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1601,6 +1601,49 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) g_array_free(tables->vmgenid, mfre); } +/* + * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. + */ +Object *acpi_get_pci_host(void) +{ + PCIHostState *host; + + host = OBJECT_CHECK(PCIHostState, + object_resolve_path("/machine/i440fx", NULL), + TYPE_PCI_HOST_BRIDGE); + if (!host) { + host = OBJECT_CHECK(PCIHostState, + object_resolve_path("/machine/q35", NULL), + TYPE_PCI_HOST_BRIDGE); + } + + return OBJECT(host); +} + + +void acpi_get_pci_holes(Range *hole, Range *hole64) +{ + Object *pci_host; + + pci_host = acpi_get_pci_host(); + g_assert(pci_host); + + range_set_bounds1(hole, + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE_START, + NULL), + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE_END, + NULL)); + range_set_bounds1(hole64, + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE64_START, + NULL), + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE64_END, + NULL)); +} + static void crs_range_insert(GPtrArray *ranges, uint64_t base, uint64_t limit) { CrsRangeEntry *entry; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index bd147a6bd2..a5f5f83500 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -232,49 +232,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info) info->applesmc_io_base = applesmc_port(); } -/* - * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. - * On i386 arch we only have two pci hosts, so we can look only for them. - */ -static Object *acpi_get_i386_pci_host(void) -{ - PCIHostState *host; - - host = OBJECT_CHECK(PCIHostState, - object_resolve_path("/machine/i440fx", NULL), - TYPE_PCI_HOST_BRIDGE); - if (!host) { - host = OBJECT_CHECK(PCIHostState, - object_resolve_path("/machine/q35", NULL), - TYPE_PCI_HOST_BRIDGE); - } - - return OBJECT(host); -} - -static void acpi_get_pci_holes(Range *hole, Range *hole64) -{ - Object *pci_host; - - pci_host = acpi_get_i386_pci_host(); - g_assert(pci_host); - - range_set_bounds1(hole, - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE_START, - NULL), - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE_END, - NULL)); - range_set_bounds1(hole64, - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE64_START, - NULL), - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE64_END, - NULL)); -} - /* FACS */ static void build_facs(GArray *table_data, BIOSLinker *linker) @@ -1634,7 +1591,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Object *pci_host; PCIBus *bus = NULL; - pci_host = acpi_get_i386_pci_host(); + pci_host = acpi_get_pci_host(); if (pci_host) { bus = PCI_HOST_BRIDGE(pci_host)->bus; } @@ -2008,7 +1965,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) Object *pci_host; QObject *o; - pci_host = acpi_get_i386_pci_host(); + pci_host = acpi_get_pci_host(); g_assert(pci_host); o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, NULL); -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Subject: [PATCH v5 10/24] hw: acpi: Export the PCI host and holes getters Date: Mon, 5 Nov 2018 02:40:33 +0100 Message-ID: <20181105014047.26447-11-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gJTuS-0003o3-Gd for xen-devel@lists.xenproject.org; Mon, 05 Nov 2018 01:42:32 +0000 In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Stabellini , Eduardo Habkost , "Michael S. Tsirkin" , Shannon Zhao , Igor Mammedov , qemu-arm@nongnu.org, Marcel Apfelbaum , Paolo Bonzini , Anthony Perard , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org VGhpcyBpcyBnb2luZyB0byBiZSBuZWVkZWQgYnkgdGhlIGhhcmR3YXJlIHJlZHVjZWQgaW1wbGVt ZW50YXRpb24sIHNvCmxldCdzIGV4cG9ydCBpdC4KT25jZSB0aGUgQUNQSSBidWlsZGVyIG1ldGhv ZHMgYW5kIGdldHRlcnMgd2lsbCBiZSBpbXBsZW1lbnRlZCwgdGhlCmFjcGlfZ2V0X3BjaV9ob3N0 KCkgaW1wbGVtZW50YXRpb24gd2lsbCBiZWNvbWUgaGFyZHdhcmUgYWdub3N0aWMuCgpTaWduZWQt b2ZmLWJ5OiBTYW11ZWwgT3J0aXogPHNhbWVvQGxpbnV4LmludGVsLmNvbT4KLS0tCiBpbmNsdWRl L2h3L2FjcGkvYW1sLWJ1aWxkLmggfCAgMiArKwogaHcvYWNwaS9hbWwtYnVpbGQuYyAgICAgICAg IHwgNDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBody9pMzg2L2FjcGktYnVp bGQuYyAgICAgICAgfCA0NyArKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAz IGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDQ1IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2luY2x1ZGUvaHcvYWNwaS9hbWwtYnVpbGQuaCBiL2luY2x1ZGUvaHcvYWNwaS9hbWwt YnVpbGQuaAppbmRleCBjMjdjMDkzNWFlLi5mZGUyNzg1YjlhIDEwMDY0NAotLS0gYS9pbmNsdWRl L2h3L2FjcGkvYW1sLWJ1aWxkLmgKKysrIGIvaW5jbHVkZS9ody9hY3BpL2FtbC1idWlsZC5oCkBA IC00MDAsNiArNDAwLDggQEAgYnVpbGRfaGVhZGVyKEJJT1NMaW5rZXIgKmxpbmtlciwgR0FycmF5 ICp0YWJsZV9kYXRhLAogICAgICAgICAgICAgIGNvbnN0IGNoYXIgKm9lbV9pZCwgY29uc3QgY2hh ciAqb2VtX3RhYmxlX2lkKTsKIHZvaWQgKmFjcGlfZGF0YV9wdXNoKEdBcnJheSAqdGFibGVfZGF0 YSwgdW5zaWduZWQgc2l6ZSk7CiB1bnNpZ25lZCBhY3BpX2RhdGFfbGVuKEdBcnJheSAqdGFibGUp OworT2JqZWN0ICphY3BpX2dldF9wY2lfaG9zdCh2b2lkKTsKK3ZvaWQgYWNwaV9nZXRfcGNpX2hv bGVzKFJhbmdlICpob2xlLCBSYW5nZSAqaG9sZTY0KTsKIC8qIEFsaWduIEFNTCBibG9iIHNpemUg dG8gYSBtdWx0aXBsZSBvZiAnYWxpZ24nICovCiB2b2lkIGFjcGlfYWxpZ25fc2l6ZShHQXJyYXkg KmJsb2IsIHVuc2lnbmVkIGFsaWduKTsKIHZvaWQgYWNwaV9hZGRfdGFibGUoR0FycmF5ICp0YWJs ZV9vZmZzZXRzLCBHQXJyYXkgKnRhYmxlX2RhdGEpOwpkaWZmIC0tZ2l0IGEvaHcvYWNwaS9hbWwt YnVpbGQuYyBiL2h3L2FjcGkvYW1sLWJ1aWxkLmMKaW5kZXggMmI5YTYzNmU3NS4uYjhlMzJmMTVm NyAxMDA2NDQKLS0tIGEvaHcvYWNwaS9hbWwtYnVpbGQuYworKysgYi9ody9hY3BpL2FtbC1idWls ZC5jCkBAIC0xNjAxLDYgKzE2MDEsNDkgQEAgdm9pZCBhY3BpX2J1aWxkX3RhYmxlc19jbGVhbnVw KEFjcGlCdWlsZFRhYmxlcyAqdGFibGVzLCBib29sIG1mcmUpCiAgICAgZ19hcnJheV9mcmVlKHRh Ymxlcy0+dm1nZW5pZCwgbWZyZSk7CiB9CiAKKy8qCisgKiBCZWNhdXNlIG9mIHRoZSBQWEIgaG9z dHMgd2UgY2Fubm90IHNpbXBseSBxdWVyeSBUWVBFX1BDSV9IT1NUX0JSSURHRS4KKyAqLworT2Jq ZWN0ICphY3BpX2dldF9wY2lfaG9zdCh2b2lkKQoreworICAgIFBDSUhvc3RTdGF0ZSAqaG9zdDsK KworICAgIGhvc3QgPSBPQkpFQ1RfQ0hFQ0soUENJSG9zdFN0YXRlLAorICAgICAgICAgICAgICAg ICAgICAgICAgb2JqZWN0X3Jlc29sdmVfcGF0aCgiL21hY2hpbmUvaTQ0MGZ4IiwgTlVMTCksCisg ICAgICAgICAgICAgICAgICAgICAgICBUWVBFX1BDSV9IT1NUX0JSSURHRSk7CisgICAgaWYgKCFo b3N0KSB7CisgICAgICAgIGhvc3QgPSBPQkpFQ1RfQ0hFQ0soUENJSG9zdFN0YXRlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG9iamVjdF9yZXNvbHZlX3BhdGgoIi9tYWNoaW5lL3EzNSIs IE5VTEwpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRZUEVfUENJX0hPU1RfQlJJREdF KTsKKyAgICB9CisKKyAgICByZXR1cm4gT0JKRUNUKGhvc3QpOworfQorCisKK3ZvaWQgYWNwaV9n ZXRfcGNpX2hvbGVzKFJhbmdlICpob2xlLCBSYW5nZSAqaG9sZTY0KQoreworICAgIE9iamVjdCAq cGNpX2hvc3Q7CisKKyAgICBwY2lfaG9zdCA9IGFjcGlfZ2V0X3BjaV9ob3N0KCk7CisgICAgZ19h c3NlcnQocGNpX2hvc3QpOworCisgICAgcmFuZ2Vfc2V0X2JvdW5kczEoaG9sZSwKKyAgICAgICAg ICAgICAgICAgICAgICBvYmplY3RfcHJvcGVydHlfZ2V0X3VpbnQocGNpX2hvc3QsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBDSV9IT1NUX1BST1BfUENJ X0hPTEVfU1RBUlQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIE5VTEwpLAorICAgICAgICAgICAgICAgICAgICAgIG9iamVjdF9wcm9wZXJ0eV9nZXRfdWlu dChwY2lfaG9zdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgUENJX0hPU1RfUFJPUF9QQ0lfSE9MRV9FTkQsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE5VTEwpKTsKKyAgICByYW5nZV9zZXRfYm91bmRzMShob2xl NjQsCisgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0X3Byb3BlcnR5X2dldF91aW50KHBjaV9o b3N0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lf SE9TVF9QUk9QX1BDSV9IT0xFNjRfU1RBUlQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIE5VTEwpLAorICAgICAgICAgICAgICAgICAgICAgIG9iamVjdF9w cm9wZXJ0eV9nZXRfdWludChwY2lfaG9zdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgUENJX0hPU1RfUFJPUF9QQ0lfSE9MRTY0X0VORCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCkpOworfQorCiBzdGF0 aWMgdm9pZCBjcnNfcmFuZ2VfaW5zZXJ0KEdQdHJBcnJheSAqcmFuZ2VzLCB1aW50NjRfdCBiYXNl LCB1aW50NjRfdCBsaW1pdCkKIHsKICAgICBDcnNSYW5nZUVudHJ5ICplbnRyeTsKZGlmZiAtLWdp dCBhL2h3L2kzODYvYWNwaS1idWlsZC5jIGIvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKaW5kZXggYmQx NDdhNmJkMi4uYTVmNWY4MzUwMCAxMDA2NDQKLS0tIGEvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKKysr IGIvaHcvaTM4Ni9hY3BpLWJ1aWxkLmMKQEAgLTIzMiw0OSArMjMyLDYgQEAgc3RhdGljIHZvaWQg YWNwaV9nZXRfbWlzY19pbmZvKEFjcGlNaXNjSW5mbyAqaW5mbykKICAgICBpbmZvLT5hcHBsZXNt Y19pb19iYXNlID0gYXBwbGVzbWNfcG9ydCgpOwogfQogCi0vKgotICogQmVjYXVzZSBvZiB0aGUg UFhCIGhvc3RzIHdlIGNhbm5vdCBzaW1wbHkgcXVlcnkgVFlQRV9QQ0lfSE9TVF9CUklER0UuCi0g KiBPbiBpMzg2IGFyY2ggd2Ugb25seSBoYXZlIHR3byBwY2kgaG9zdHMsIHNvIHdlIGNhbiBsb29r IG9ubHkgZm9yIHRoZW0uCi0gKi8KLXN0YXRpYyBPYmplY3QgKmFjcGlfZ2V0X2kzODZfcGNpX2hv c3Qodm9pZCkKLXsKLSAgICBQQ0lIb3N0U3RhdGUgKmhvc3Q7Ci0KLSAgICBob3N0ID0gT0JKRUNU X0NIRUNLKFBDSUhvc3RTdGF0ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdF9yZXNv bHZlX3BhdGgoIi9tYWNoaW5lL2k0NDBmeCIsIE5VTEwpLAotICAgICAgICAgICAgICAgICAgICAg ICAgVFlQRV9QQ0lfSE9TVF9CUklER0UpOwotICAgIGlmICghaG9zdCkgewotICAgICAgICBob3N0 ID0gT0JKRUNUX0NIRUNLKFBDSUhvc3RTdGF0ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBvYmplY3RfcmVzb2x2ZV9wYXRoKCIvbWFjaGluZS9xMzUiLCBOVUxMKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBUWVBFX1BDSV9IT1NUX0JSSURHRSk7Ci0gICAgfQotCi0gICAgcmV0 dXJuIE9CSkVDVChob3N0KTsKLX0KLQotc3RhdGljIHZvaWQgYWNwaV9nZXRfcGNpX2hvbGVzKFJh bmdlICpob2xlLCBSYW5nZSAqaG9sZTY0KQotewotICAgIE9iamVjdCAqcGNpX2hvc3Q7Ci0KLSAg ICBwY2lfaG9zdCA9IGFjcGlfZ2V0X2kzODZfcGNpX2hvc3QoKTsKLSAgICBnX2Fzc2VydChwY2lf aG9zdCk7Ci0KLSAgICByYW5nZV9zZXRfYm91bmRzMShob2xlLAotICAgICAgICAgICAgICAgICAg ICAgIG9iamVjdF9wcm9wZXJ0eV9nZXRfdWludChwY2lfaG9zdCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUENJX0hPU1RfUFJPUF9QQ0lfSE9MRV9TVEFS VCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCks Ci0gICAgICAgICAgICAgICAgICAgICAgb2JqZWN0X3Byb3BlcnR5X2dldF91aW50KHBjaV9ob3N0 LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lfSE9T VF9QUk9QX1BDSV9IT0xFX0VORCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgTlVMTCkpOwotICAgIHJhbmdlX3NldF9ib3VuZHMxKGhvbGU2NCwKLSAgICAg ICAgICAgICAgICAgICAgICBvYmplY3RfcHJvcGVydHlfZ2V0X3VpbnQocGNpX2hvc3QsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBDSV9IT1NUX1BST1Bf UENJX0hPTEU2NF9TVEFSVCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgTlVMTCksCi0gICAgICAgICAgICAgICAgICAgICAgb2JqZWN0X3Byb3BlcnR5X2dl dF91aW50KHBjaV9ob3N0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBQQ0lfSE9TVF9QUk9QX1BDSV9IT0xFNjRfRU5ELAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKSk7Ci19Ci0KIC8qIEZBQ1MgKi8KIHN0 YXRpYyB2b2lkCiBidWlsZF9mYWNzKEdBcnJheSAqdGFibGVfZGF0YSwgQklPU0xpbmtlciAqbGlu a2VyKQpAQCAtMTYzNCw3ICsxNTkxLDcgQEAgYnVpbGRfZHNkdChHQXJyYXkgKnRhYmxlX2RhdGEs IEJJT1NMaW5rZXIgKmxpbmtlciwKICAgICAgICAgT2JqZWN0ICpwY2lfaG9zdDsKICAgICAgICAg UENJQnVzICpidXMgPSBOVUxMOwogCi0gICAgICAgIHBjaV9ob3N0ID0gYWNwaV9nZXRfaTM4Nl9w Y2lfaG9zdCgpOworICAgICAgICBwY2lfaG9zdCA9IGFjcGlfZ2V0X3BjaV9ob3N0KCk7CiAgICAg ICAgIGlmIChwY2lfaG9zdCkgewogICAgICAgICAgICAgYnVzID0gUENJX0hPU1RfQlJJREdFKHBj aV9ob3N0KS0+YnVzOwogICAgICAgICB9CkBAIC0yMDA4LDcgKzE5NjUsNyBAQCBzdGF0aWMgYm9v bCBhY3BpX2dldF9tY2ZnKEFjcGlNY2ZnSW5mbyAqbWNmZykKICAgICBPYmplY3QgKnBjaV9ob3N0 OwogICAgIFFPYmplY3QgKm87CiAKLSAgICBwY2lfaG9zdCA9IGFjcGlfZ2V0X2kzODZfcGNpX2hv c3QoKTsKKyAgICBwY2lfaG9zdCA9IGFjcGlfZ2V0X3BjaV9ob3N0KCk7CiAgICAgZ19hc3NlcnQo cGNpX2hvc3QpOwogCiAgICAgbyA9IG9iamVjdF9wcm9wZXJ0eV9nZXRfcW9iamVjdChwY2lfaG9z dCwgUENJRV9IT1NUX01DRkdfQkFTRSwgTlVMTCk7Ci0tIAoyLjE5LjEKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0 Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qu b3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJTuf-0007Lp-Ab for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJTua-0002kY-Ci for qemu-devel@nongnu.org; Sun, 04 Nov 2018 20:42:45 -0500 From: Samuel Ortiz Date: Mon, 5 Nov 2018 02:40:33 +0100 Message-Id: <20181105014047.26447-11-sameo@linux.intel.com> In-Reply-To: <20181105014047.26447-1-sameo@linux.intel.com> References: <20181105014047.26447-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v5 10/24] hw: acpi: Export the PCI host and holes getters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Shannon Zhao , Stefano Stabellini , Anthony Perard , Richard Henderson , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , qemu-arm@nongnu.org, Peter Maydell , Eduardo Habkost This is going to be needed by the hardware reduced implementation, so let's export it. Once the ACPI builder methods and getters will be implemented, the acpi_get_pci_host() implementation will become hardware agnostic. Signed-off-by: Samuel Ortiz --- include/hw/acpi/aml-build.h | 2 ++ hw/acpi/aml-build.c | 43 +++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 47 ++----------------------------------- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index c27c0935ae..fde2785b9a 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -400,6 +400,8 @@ build_header(BIOSLinker *linker, GArray *table_data, const char *oem_id, const char *oem_table_id); void *acpi_data_push(GArray *table_data, unsigned size); unsigned acpi_data_len(GArray *table); +Object *acpi_get_pci_host(void); +void acpi_get_pci_holes(Range *hole, Range *hole64); /* Align AML blob size to a multiple of 'align' */ void acpi_align_size(GArray *blob, unsigned align); void acpi_add_table(GArray *table_offsets, GArray *table_data); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 2b9a636e75..b8e32f15f7 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1601,6 +1601,49 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre) g_array_free(tables->vmgenid, mfre); } +/* + * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. + */ +Object *acpi_get_pci_host(void) +{ + PCIHostState *host; + + host = OBJECT_CHECK(PCIHostState, + object_resolve_path("/machine/i440fx", NULL), + TYPE_PCI_HOST_BRIDGE); + if (!host) { + host = OBJECT_CHECK(PCIHostState, + object_resolve_path("/machine/q35", NULL), + TYPE_PCI_HOST_BRIDGE); + } + + return OBJECT(host); +} + + +void acpi_get_pci_holes(Range *hole, Range *hole64) +{ + Object *pci_host; + + pci_host = acpi_get_pci_host(); + g_assert(pci_host); + + range_set_bounds1(hole, + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE_START, + NULL), + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE_END, + NULL)); + range_set_bounds1(hole64, + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE64_START, + NULL), + object_property_get_uint(pci_host, + PCI_HOST_PROP_PCI_HOLE64_END, + NULL)); +} + static void crs_range_insert(GPtrArray *ranges, uint64_t base, uint64_t limit) { CrsRangeEntry *entry; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index bd147a6bd2..a5f5f83500 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -232,49 +232,6 @@ static void acpi_get_misc_info(AcpiMiscInfo *info) info->applesmc_io_base = applesmc_port(); } -/* - * Because of the PXB hosts we cannot simply query TYPE_PCI_HOST_BRIDGE. - * On i386 arch we only have two pci hosts, so we can look only for them. - */ -static Object *acpi_get_i386_pci_host(void) -{ - PCIHostState *host; - - host = OBJECT_CHECK(PCIHostState, - object_resolve_path("/machine/i440fx", NULL), - TYPE_PCI_HOST_BRIDGE); - if (!host) { - host = OBJECT_CHECK(PCIHostState, - object_resolve_path("/machine/q35", NULL), - TYPE_PCI_HOST_BRIDGE); - } - - return OBJECT(host); -} - -static void acpi_get_pci_holes(Range *hole, Range *hole64) -{ - Object *pci_host; - - pci_host = acpi_get_i386_pci_host(); - g_assert(pci_host); - - range_set_bounds1(hole, - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE_START, - NULL), - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE_END, - NULL)); - range_set_bounds1(hole64, - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE64_START, - NULL), - object_property_get_uint(pci_host, - PCI_HOST_PROP_PCI_HOLE64_END, - NULL)); -} - /* FACS */ static void build_facs(GArray *table_data, BIOSLinker *linker) @@ -1634,7 +1591,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, Object *pci_host; PCIBus *bus = NULL; - pci_host = acpi_get_i386_pci_host(); + pci_host = acpi_get_pci_host(); if (pci_host) { bus = PCI_HOST_BRIDGE(pci_host)->bus; } @@ -2008,7 +1965,7 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) Object *pci_host; QObject *o; - pci_host = acpi_get_i386_pci_host(); + pci_host = acpi_get_pci_host(); g_assert(pci_host); o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, NULL); -- 2.19.1