From patchwork Fri Mar 15 11:39:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10854859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DFE717EF for ; Fri, 15 Mar 2019 14:19:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83E412A167 for ; Fri, 15 Mar 2019 14:19:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 754732A1C7; Fri, 15 Mar 2019 14:19:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1CBEA2A167 for ; Fri, 15 Mar 2019 14:19:19 +0000 (UTC) Received: from localhost ([127.0.0.1]:55944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4ng6-0006ps-9D for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Mar 2019 10:19:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4n3m-0006uL-Rb for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:39:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4mqM-0002Q6-7P for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:25:51 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44133) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4mqK-0002OJ-DZ for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:25:50 -0400 Received: by mail-wr1-x432.google.com with SMTP id w2so9548674wrt.11 for ; Fri, 15 Mar 2019 06:25:45 -0700 (PDT) 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=ownHFGPtrrAZqvHDzJAaTVGLepb3OwX5RKodC2UTv5I=; b=cksjd6zPhrV0D25ctVnFuv/rMmMxR+sMqC8rvCSP31qf/ehw39RfTU1PK39LAsslhN E091g15Z43VJ5xXPG0WDRGuEueq+1dmi2GAAXrKnuiwclJGtD8NyNOA4J9IWz0wXaBxB ugxVOa4iqeFNcEi3xSZhA8z5ddvVlQYxtYOlC1HWys8f0DyROu5X55+JW89hktxXA5m8 ZZfD6+BE9q31bgiVBfWpdHydOS3L6QlY++q/bwm0hAZqCE4IkbJX5pT6N5FunU6axfab IzpmrenRAMiVGX9uiJ6ao/zKqaoRz+mv/3/v4LOpF589DNgs++tvc/pRmeWtIDs0SOrk ja6A== 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=ownHFGPtrrAZqvHDzJAaTVGLepb3OwX5RKodC2UTv5I=; b=HtfmevCh4XWuwD/2QQgCjMVKgqzvLUcVQRPJ8efxDiQTnImXmiNeLaO1G9LSw/dV7G xGB51q9ZXlN2zvz6MhOrA6sjzKSXyEBy8XrEAMWO6Jd70lFpW1TuT0suxMvhxZHYQB2N 1GMC5KsRsRQ/etKIBwc/d9hWAigAILktLvjZs9VPqb2Omju7i76KtAKw3nbtdv3IwQ/s mFMz0torrn/fMWzfjydDx7Xhu7VF9/Rj5RkhDP2dt5L9fTQ3H1idUS/NYks5vd2mfQsn 0ky9RI/NZsYM1WW8WZ1EMaylDZfllY64doiGHN6mUKrJuOzy+Xxu5QqwwaJK6n5Exf4J j9XQ== X-Gm-Message-State: APjAAAW+HLQW4mmN2AWg7PcP8/h4LMgwmRuIxCFbs93XMCFqZLJ6Zh7k aKoLZqLiOHGLP/pP6YzbLbywYdZIu20= X-Google-Smtp-Source: APXvYqyONs7b7n0GMOU5Z2zdCsLi33VmG6sCt5ZvtwPKsd+jNHG43t8RKKoSAecPgCdJ5ZcDxs8VgQ== X-Received: by 2002:a5d:528e:: with SMTP id c14mr2210955wrv.304.1552649954096; Fri, 15 Mar 2019 04:39:14 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id s3sm2604497wrt.81.2019.03.15.04.39.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 04:39:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2019 11:39:05 +0000 Message-Id: <20190315113906.6585-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190315113906.6585-1-peter.maydell@linaro.org> References: <20190315113906.6585-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::432 Subject: [Qemu-devel] [PULL 4/5] hw/arm/virt-acpi-build: use PCIE_MMCFG_BUS to retrieve end_bus_number 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yang This is more proper to use PCIE_MMCFG_BUS to retrieve end_bus_number. Signed-off-by: Wei Yang Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Message-id: 20190312074953.16671-1-richardw.yang@linux.intel.com Signed-off-by: Peter Maydell --- hw/arm/virt-acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index aa02d8d74ec..bf9c0bc2f49 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -560,8 +560,8 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) /* 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 = (memmap[ecam_id].size - / PCIE_MMCFG_SIZE_MIN) - 1; + mcfg->allocation[0].end_bus_number = + PCIE_MMCFG_BUS(memmap[ecam_id].size - 1); build_header(linker, table_data, (void *)(table_data->data + mcfg_start), "MCFG", table_data->len - mcfg_start, 1, NULL, NULL);