From patchwork Wed Apr 15 13:25:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47178 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4276720553 for ; Wed, 15 Apr 2015 13:28:49 +0000 (UTC) Received: by widjs5 with SMTP id js5sf11428095wid.3 for ; Wed, 15 Apr 2015 06:28:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=nC7uGxnKuG9rc6V+qwkW46SbVxnqBKaybS6Pfxm2QAA=; b=L/PeObtx7vDo+WfYM/jNj4+ah+vqovxnjWDMSa83QOdnoeCDdteGgAIXw4dj3h7jYP o+nsNn9QOlfXS3ehkcaUvjQIJ0S3t2fif9PBp/Gwd+USA7X71Uw1HC39QuvdVn/QwTHL ZYws/nJorKC0Y+i9dsCoUYm/V8iC54IliZBVU+u2dDjEDqGbwYZbzW3a0+Cb/AgJFyMX p4hpA4ykYRNt3e4w7lskXkSL38YRe3JSbStG0nlXE7OjEy48vRHJ1sIUJvrQLb/U8/Qj E7LcJYMvyAgVlLLjTQjrMQUqJYK0g7P2MxBCOpiTHXhMQEDGXd8Zy653bAqt9//WSP0e liTQ== X-Gm-Message-State: ALoCoQkCFL+QKnJS394LQp+jHeGmqIRg60wvk6jJSRPdSpAJJa7sTraLfThNHv+rTeWwTIvC7w+3 X-Received: by 10.194.71.227 with SMTP id y3mr5328177wju.3.1429104528550; Wed, 15 Apr 2015 06:28:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.245.43 with SMTP id xl11ls186531lac.21.gmail; Wed, 15 Apr 2015 06:28:48 -0700 (PDT) X-Received: by 10.112.129.132 with SMTP id nw4mr24273331lbb.122.1429104528419; Wed, 15 Apr 2015 06:28:48 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id a9si3914353laa.70.2015.04.15.06.28.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Apr 2015 06:28:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbqq2 with SMTP id qq2so33867515lbb.3 for ; Wed, 15 Apr 2015 06:28:48 -0700 (PDT) X-Received: by 10.112.160.227 with SMTP id xn3mr23446129lbb.112.1429104527997; Wed, 15 Apr 2015 06:28:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp2513462lbt; Wed, 15 Apr 2015 06:28:47 -0700 (PDT) X-Received: by 10.140.144.67 with SMTP id 64mr11426982qhq.40.1429104526512; Wed, 15 Apr 2015 06:28:46 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 4si4611063qgy.56.2015.04.15.06.28.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Apr 2015 06:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:60482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNMz-0008Fs-Jy for patch@linaro.org; Wed, 15 Apr 2015 09:28:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNLO-0006H9-7l for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiNLK-0004uc-T5 for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:06 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:41901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiNLJ-0004rp-Nm for qemu-devel@nongnu.org; Wed, 15 Apr 2015 09:27:02 -0400 Received: from 172.24.2.119 (EHLO szxeml427-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CME19613; Wed, 15 Apr 2015 21:26:43 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.158.1; Wed, 15 Apr 2015 21:26:31 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Wed, 15 Apr 2015 21:25:01 +0800 Message-ID: <1429104309-3844-13-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1429104309-3844-1-git-send-email-zhaoshenglong@huawei.com> References: <1429104309-3844-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Cc: hangaohuai@huawei.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com, zhaoshenglong@huawei.com Subject: [Qemu-devel] [PATCH v5 12/20] hw/arm/virt-acpi-build: Add PCIe info and generate MCFG table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Add PCIe info struct, prepare for building PCIe table. And generate MCFG table. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- hw/arm/virt-acpi-build.c | 21 +++++++++++++++++++++ include/hw/arm/virt-acpi-build.h | 9 +++++++++ 2 files changed, 30 insertions(+) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index aa4acc6..85e8242 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -189,6 +189,24 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) return rsdp_table; } +static void +build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) +{ + AcpiTableMcfg *mcfg; + AcpiPcieInfo *info = guest_info->pcie_info; + int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]); + + mcfg = acpi_data_push(table_data, len); + mcfg->allocation[0].address = cpu_to_le64(info->pcie_ecam.addr); + + /* 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 = info->nr_pcie_buses - 1; + + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1); +} + /* GTDT */ static void build_gtdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) @@ -361,6 +379,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) acpi_add_table(table_offsets, tables_blob); build_gtdt(tables_blob, tables->linker, guest_info); + acpi_add_table(table_offsets, tables_blob); + build_mcfg(tables_blob, tables->linker, guest_info); + /* RSDT is pointed to by RSDP */ rsdt = tables_blob->len; build_rsdt(tables_blob, tables->linker, table_offsets); diff --git a/include/hw/arm/virt-acpi-build.h b/include/hw/arm/virt-acpi-build.h index 8f0b4a7..572864a 100644 --- a/include/hw/arm/virt-acpi-build.h +++ b/include/hw/arm/virt-acpi-build.h @@ -52,6 +52,14 @@ typedef struct AcpiDsdtInfo { const MemMap *flash_memmap; } AcpiDsdtInfo; +typedef struct AcpiPcieInfo { + const int *pcie_irq; + MemMap pcie_mmio; + MemMap pcie_ioport; + MemMap pcie_ecam; + int nr_pcie_buses; +} AcpiPcieInfo; + typedef struct VirtGuestInfo { int smp_cpus; int max_cpus; @@ -59,6 +67,7 @@ typedef struct VirtGuestInfo { AcpiMadtInfo *madt_info; AcpiDsdtInfo *dsdt_info; AcpiGtdtInfo *gtdt_info; + AcpiPcieInfo *pcie_info; } VirtGuestInfo;