From patchwork Thu Feb 13 14:41:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183358 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp617954ile; Thu, 13 Feb 2020 06:51:12 -0800 (PST) X-Google-Smtp-Source: APXvYqyz0mbEq44ZiOE5Kyryl+OANcouxB4cw5HVpXq0GPoaJoRNVhBV9dPidQNRZbWTPeR/KWwI X-Received: by 2002:ad4:4f8f:: with SMTP id em15mr23187347qvb.169.1581605472126; Thu, 13 Feb 2020 06:51:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581605472; cv=none; d=google.com; s=arc-20160816; b=TzkpzcIbigG/0kl5yJue3Xj159slRQ84r74mx+n5sJ6DIwvKhCG9u1ubadxyjMvZV/ X87TvnqUgOxRl00lHn4btNgNxIcPdmWRHOgiS8WudQx+5dWUwpKB4tYeKsiOQDOxroO5 Ub2NjZqtssAZEo0kprd0UrrthAvWlubBzgztSxK4DSN9V2z5Dvs+NhY/ZXAlbtGD7NDh n5D9LfZVJTFmZ1sNKoLutz/yFzs6nzomuN11woUJ4HuV5s38E2K8P88KEWGe69t8Oihw Km+9MlsnlpOfQEHMFLV37YzgA95dsLGx0RI/8+2CxLgrLHwnQBsYYoaqBy2md5APNXE6 qNwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bLlb0z2duQkI+Q2aALcxB/tkS6BOKIX9RgY26xXMpws=; b=XiFtp7BedQ5tfbagx4RyEtayoayTvKnqbVjd8gd8B8y+HfwQJE+Ug4wux6bepVdZt6 jZO79SIsiIj74JYdKywD6GMW5fQ4dkyPflCkAflVpIBjIXTFUfznYSDO9e9JwUXL18B6 +Xcx1vUytGws9qbGOrIQRscoX07h003lUNCkwjqKj+El4f71/JZpKIcdN423s4pa2lVH CFEmPtemTwHjxU2jb/PT2ySAaqW9eyD5AJNGoJF6QIenPT85v0WSrG5rye5hKvz0pyfW WUF4xUdfHKWt9MLi2CgI6gbBGonEjMpIweVemjtd5fOypGur6Bg4ttkJ0YlKd31BQv/y 24vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jL6r7CiK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g11si1313395qkl.340.2020.02.13.06.51.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 06:51:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jL6r7CiK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fpf-00075Y-Lt for patch@linaro.org; Thu, 13 Feb 2020 09:51:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60121) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fgk-0004BI-1M for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:41:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fgi-0001Tg-JS for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:41:57 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51713) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fgi-0001R6-Bm for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:41:56 -0500 Received: by mail-wm1-x343.google.com with SMTP id t23so6543098wmi.1 for ; Thu, 13 Feb 2020 06:41:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bLlb0z2duQkI+Q2aALcxB/tkS6BOKIX9RgY26xXMpws=; b=jL6r7CiKawvDxqjJJJMzLEQoA6d1ZfruWlifdKSFpIxxVmSFuThM0T3F5xq0sT8Nqc rufPIc5Pwo6/tEY85SRJ81m3brtWxUSbJpci43oD04fMSDl9b1LmMxuvZD7wt5HNBFaA 2FhjCULbGBtaDFkUW3iN4gH9wfSnbx3WefoTLCTEX2fTIuVn/xSBSl52dxh0iB1A5e6U l3I2RMSoQKiOyC8W2sNpxrDCdZeQYbBVl1xcjTRHMGYP+fLVVlMS9OsX65NesamQW3pG 60DohEAvOJtiyCozUiYrukp3jXYWndi1woERSlBQ8Y/UBxIUyPTKsYfHyUfiuNfdeOE3 s/+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bLlb0z2duQkI+Q2aALcxB/tkS6BOKIX9RgY26xXMpws=; b=JpB+A5m2pQk3FVeNLiq4G+A3AH5/vxYdZJ7EKfg34UC8eXFZi9VCQ1IDil1O8NEkES KNoQvNwmkcr1FKbl+VF5aX2VQnG7UtHLNnGaKm8XfvjZrO9EzfxAQWpyC3hShKEA1WHP ryEnW57f/+q+d5wOlNt79dKs2dgg4stvPcW7wYtvmpkGHZGvjCy2YP1G79invSltOH7K jKtw8LPsSWUmhLBCWt/sbVNeiqRbOIw6gHRGgkXoSlXlfOiM7PhDVKVfu24CByD9GW/E ZtFCpiRQWPpioPm6mJRHEOT6e+zhPYjVqpnkxD9I0/sq6qmJqGoXv+rvqL8BlMLpbaFT DtFA== X-Gm-Message-State: APjAAAX9aTAgvoxAd72mzpJE9mKBNiQzrLi+e3b6H1HB/piGOt6npGYt yYYo5WQHE5i0rnd6Du3B+LAIRYTM3lY= X-Received: by 2002:a1c:9854:: with SMTP id a81mr6006141wme.1.1581604915018; Thu, 13 Feb 2020 06:41:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.41.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:41:54 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/46] arm/acpi: fix PCI _PRT definition Date: Thu, 13 Feb 2020 14:41:05 +0000 Message-Id: <20200213144145.818-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" From: Heyi Guo The address field in each _PRT mapping package should be constructed with high word for device# and low word for function#, so it is wrong to use bus_no as the high word. The existing code adds a bunch useless entries with device #s above 31. Enumerate all possible slots (i.e. PCI_SLOT_MAX) instead. Signed-off-by: Heyi Guo Reviewed-by: Michael S. Tsirkin Message-id: 20200204014325.16279-5-guoheyi@huawei.com Signed-off-by: Peter Maydell --- hw/arm/virt-acpi-build.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index be752c0ad8e..5d157a9dd5e 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -151,7 +151,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, { int ecam_id = VIRT_ECAM_ID(highmem_ecam); Aml *method, *crs, *ifctx, *UUID, *ifctx1, *elsectx, *buf; - int i, bus_no; + int i, slot_no; hwaddr base_mmio = memmap[VIRT_PCIE_MMIO].base; hwaddr size_mmio = memmap[VIRT_PCIE_MMIO].size; hwaddr base_pio = memmap[VIRT_PCIE_PIO].base; @@ -170,12 +170,12 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, aml_append(dev, aml_name_decl("_CCA", aml_int(1))); /* Declare the PCI Routing Table. */ - Aml *rt_pkg = aml_varpackage(nr_pcie_buses * PCI_NUM_PINS); - for (bus_no = 0; bus_no < nr_pcie_buses; bus_no++) { + Aml *rt_pkg = aml_varpackage(PCI_SLOT_MAX * PCI_NUM_PINS); + for (slot_no = 0; slot_no < PCI_SLOT_MAX; slot_no++) { for (i = 0; i < PCI_NUM_PINS; i++) { - int gsi = (i + bus_no) % PCI_NUM_PINS; + int gsi = (i + slot_no) % PCI_NUM_PINS; Aml *pkg = aml_package(4); - aml_append(pkg, aml_int((bus_no << 16) | 0xFFFF)); + aml_append(pkg, aml_int((slot_no << 16) | 0xFFFF)); aml_append(pkg, aml_int(i)); aml_append(pkg, aml_name("GSI%d", gsi)); aml_append(pkg, aml_int(0));