Received: by 2002:adf:c793:0:0:0:0:0 with SMTP id l19csp921232wrg; Mon, 20 May 2019 20:34:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEmQ/YMeg3wPuoq7F4W8rkDn0cDlruta7/yhtibeAWY3ax7RVEglAXUjawdpAYuBizVo9O X-Received: by 2002:a17:906:7c42:: with SMTP id g2mr21352755ejp.168.1558409653823; Mon, 20 May 2019 20:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558409653; cv=none; d=google.com; s=arc-20160816; b=mOG52hmEVDI/WEpnmwo5d4mW6P0pL1DXdul9cQLU7Zuce9TDcMCAzR/Ip5L13kf3as pP3gY2FSskfqkniKoJr5stcDyaIcEd2OEBbWG9qG68D+cFfOIdXKKjvHoSyIXg8G0Piw PhpzjVKglccMdI5vxC9ndE67hGEUyMnmUX3lIbIoDP8oLTeotmcNt9puCa0QYLhjA9bT 70n/iglY0Lx771tESOKzxFHWr3KUTau0Hhz2lD+mshxTPlv0YxanLcy1C9hltek8B2R4 oqkxu3zwwsnIVKOWzT1US/t6sg5XZpXa4+Ia3Eb9Uc1y6nhL6IGbJBfzcMpkYI8v3qq0 bHMw== 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=CqmxaBfXdAE7a6xBxu9zSuZV7bID4QszY54tu6fsTHE=; b=m/L6aG+lqeSxIKCfItvMD4KYTbZBfbkjs0wZJaCQTb1fvMeTM8wpM/d2ymYqkRJoUb OEmTMUaBR8poND1FAsS6v38MhZg9qzVSX+6tFZ/NCVOmjAhGNG9FW2Fz8lcGeYe5zASi EMPlaC9lahmw6+k4MLs2fqtUAAd4RPIbw6wBd7019Tj2YoBegcdMk+SOYJF42l+aY3iO /t/8gS/6GsL6dUS51ksy8nub4i7aNQyHql2OZmj3zE3eAsIrWJgG+mIzH7l8epD3goRJ r3VHoQIcud5wj8PPKKaiT8MoMYqPCgsa40KRb5D16BsdWOp25AlYriu3uyhWWqXtFtVu nx/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-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. [209.51.188.17]) by mx.google.com with ESMTPS id i40si2862085eda.67.2019.05.20.20.34.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 May 2019 20:34:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([127.0.0.1]:45807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSvXY-0005vO-QB for alex.bennee@linaro.org; Mon, 20 May 2019 23:34:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSvXH-0005ti-8s for qemu-arm@nongnu.org; Mon, 20 May 2019 23:33:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSvXF-0004Kr-6H for qemu-arm@nongnu.org; Mon, 20 May 2019 23:33:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:39825) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hSvXD-0004Jg-JT; Mon, 20 May 2019 23:33:52 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 20:33:50 -0700 X-ExtLoop1: 1 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga006.fm.intel.com with ESMTP; 20 May 2019 20:33:48 -0700 From: Wei Yang To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Tue, 21 May 2019 11:32:49 +0800 Message-Id: <20190521033249.1960-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190521033249.1960-1-richardw.yang@linux.intel.com> References: <20190521033249.1960-1-richardw.yang@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: 134.134.136.24 Subject: [Qemu-arm] [PATCH v5 2/2] acpi: pci: use build_append_foo() API to construct MCFG X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, peter.maydell@linaro.org, thuth@redhat.com, mst@redhat.com, shannon.zhaosl@gmail.com, Wei Yang , marcel.apfelbaum@gmail.com, imammedo@redhat.com, philmd@redhat.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 3P2lo5+9R14f build_append_foo() API doesn't need explicit endianness conversions which eliminates a source of errors and it makes build_mcfg() look like declarative definition of MCFG table in ACPI spec, which makes it easy to review. Signed-off-by: Wei Yang Suggested-by: Igor Mammedov Reviewed-by: Igor Mammedov --- v5: * miss the reserved[8] of MCFG in last version, add it back * drop SOBs and make sure bios-tables-test all OK --- hw/acpi/pci.c | 35 +++++++++++++++++++++++------------ include/hw/acpi/acpi-defs.h | 18 ------------------ 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c index fa0fa30bb9..49df7b7d54 100644 --- a/hw/acpi/pci.c +++ b/hw/acpi/pci.c @@ -30,17 +30,28 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) { - AcpiTableMcfg *mcfg; - int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); - - mcfg = acpi_data_push(table_data, len); - mcfg->allocation[0].address = cpu_to_le64(info->base); - - /* Only a single allocation so no need to play with segments */ - mcfg->allocation[0].pci_segment = cpu_to_le16(0); - mcfg->allocation[0].start_bus_number = 0; - mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1); - - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL); + int mcfg_start = table_data->len; + + acpi_data_push(table_data, sizeof(AcpiTableHeader)); + + /* + * PCI Firmware Specification, Revision 3.0 + * 4.1.2 MCFG Table Description. + */ + /* Reserved */ + build_append_int_noprefix(table_data, 0, 8); + /* Base address, processor-relative */ + build_append_int_noprefix(table_data, info->base, 8); + /* PCI segment group number */ + build_append_int_noprefix(table_data, 0, 2); + /* Starting PCI Bus number */ + build_append_int_noprefix(table_data, 0, 1); + /* Final PCI Bus number */ + build_append_int_noprefix(table_data, PCIE_MMCFG_BUS(info->size - 1), 1); + /* Reserved */ + build_append_int_noprefix(table_data, 0, 4); + + build_header(linker, table_data, (void *)(table_data->data + mcfg_start), + "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); } diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index f9aa4bd398..57a3f58b0c 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -449,24 +449,6 @@ struct AcpiSratProcessorGiccAffinity { typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity; -/* PCI fw r3.0 MCFG table. */ -/* Subtable */ -struct AcpiMcfgAllocation { - uint64_t address; /* Base address, processor-relative */ - uint16_t pci_segment; /* PCI segment group number */ - uint8_t start_bus_number; /* Starting PCI Bus number */ - uint8_t end_bus_number; /* Final PCI Bus number */ - uint32_t reserved; -} QEMU_PACKED; -typedef struct AcpiMcfgAllocation AcpiMcfgAllocation; - -struct AcpiTableMcfg { - ACPI_TABLE_HEADER_DEF; - uint8_t reserved[8]; - AcpiMcfgAllocation allocation[0]; -} QEMU_PACKED; -typedef struct AcpiTableMcfg AcpiTableMcfg; - /* * TCPA Description Table * -- 2.19.1