From patchwork Thu Feb 13 14:41:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183351 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp612098ile; Thu, 13 Feb 2020 06:45:20 -0800 (PST) X-Google-Smtp-Source: APXvYqzCa4LL003HDaDmFS09mY1vSjpmFBpJ8d1pg91qNw+T+vDZwdUKyeLEM2S2wlGaDM8XBDMi X-Received: by 2002:ac8:cb:: with SMTP id d11mr24559235qtg.22.1581605119837; Thu, 13 Feb 2020 06:45:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581605119; cv=none; d=google.com; s=arc-20160816; b=DbM3UPYNx6eSzd3ICRuASLJfdBwMvQ8KjJjVbFGR9PhlqeqItgJb7fz3Nzjc9fWD3u F1j6up1LmG8ez8EyKGu2V2i5XGOSqhmhFaBg/auJww5EkCdu1pc7R4Opjc9TNfXIkwdM hQS020yKA/5+LxhcTJPw1GOwkdHk6elSTyNj1vEoKyYQ5E0HTWTsY7WKkUlImoN31Tz2 pQg1XnmC2ttBIsZ1y7nvir9fJJTS50jJY3OGozGslsl2poBEac94nc1BwrjcbA50XL7T M0F0RZhfo4iiVAHcY/UwAEYSmpdt4e4NfaRDdlUlWsr473vCfghVaWnw900xiyWKdlBj zMuA== 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=hsa2S0sFIOl02Bh0pvhS4b/KPw5mItrIiArWOu9Dh0U=; b=g3b2OyfVPj/YGqmlZesH0sVr5NaaFvx5nAYRxvM9IM48RO1ztLG2RvFSZeDIz+f1LK Ehwe+DwkZBmCdifAPH8pd36KWKCxnBBg4ocWZDw3Eb/IyPNqjzJbff8Fcqph1joAOaLt aBVsHOLAmQO5CggmdN5Sfe2khPwCNX1HC49sR6+VOso0DCuFCOmIDt9A5NiYuWwYwzGC CGe0CjCLywdDyFX3BNmex9Yp0cVOMbwXjmmP4zKuuSBCY16OnzfFkpvfN/eLUf8j4Ox6 cFsL/ak3+CgUMTsmdfuFkBRNnBWku0Qb8ju0kdQzUCKFiFrYgyRBrR1hPaWM3nPP/wo8 lqsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GpIzEyeS; 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 g26si1292795qtv.230.2020.02.13.06.45.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 06:45:19 -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=GpIzEyeS; 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]:53756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fjz-0007gc-C2 for patch@linaro.org; Thu, 13 Feb 2020 09:45:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60133) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fgk-0004Ba-LD 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 1j2Fgj-0001VW-Ek for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:41:58 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:54377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fgj-0001TY-89 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:41:57 -0500 Received: by mail-wm1-x32a.google.com with SMTP id g1so6528281wmh.4 for ; Thu, 13 Feb 2020 06:41:57 -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=hsa2S0sFIOl02Bh0pvhS4b/KPw5mItrIiArWOu9Dh0U=; b=GpIzEyeSHAE10eNpET5ddNljibe5bJ2nZUvIBXk1pNTcf1Kwu4bmY/armpmhrf683g OWiabVQbK32qSDOdrEuNoJlKCn9qYzJFmBB1/6bQGp3IKk6lQIonJ+cMVwLFTIPHXG+N dti4kjGp5U6R98O2vm7iL+UGri9i6BHN0bBG5eYixiapvVfwCQVqBCwv3eSKduz03bKX jSt7R9ekOTNNWb6FZ+IQwp+8CMlZ+11ZYFIgLHHBPnVbXhsp6cXI7j37JL9MAJ3j+hUJ Pi8NQ1zFOdcxy3D5LaWey5z2d8mY69xSkvmpP1U1Tkb9iwi1+4+6fbdf0bf/Yd0yHBXR dYuQ== 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=hsa2S0sFIOl02Bh0pvhS4b/KPw5mItrIiArWOu9Dh0U=; b=jNYCmIMnbYrWWKviyhDDsd8XpI3CbpE3gCKoz4DV5Re1i3xMpKGM97ujsyT1crfRv/ 9sMDmUfyOAPFV1BZPP2rQt/wAXgqcyXQH9z5xnQukeeyk50k8git0g+NDYcHaYJCjole i//em3zgFFkndL/TwR0FT6H7By8awUXpIiVD+SAVLCYNl90EOnCrj20p5nKgJ/EVXNCp hEuzFrPb0AXDlPDIGF8oTWluZ91wVVxcFmk0F+t5DFQ1a8TCQpUfcsrnqeFPOjAUUy21 P419H8zP38xA6NY7te4avX8LfdsjoRlL9PtK95WXQmxhCbqQMNXFkjtm9BgTINaV/cd8 vtgg== X-Gm-Message-State: APjAAAWufEowgpQSWnNkLgP/SeFXnPUlWQlajeKhUR4In4R2ausQ2w11 JDT0fZ+9aFKmpbQZeJojHigE/CvXaGM= X-Received: by 2002:a1c:7317:: with SMTP id d23mr6370674wmb.165.1581604915973; 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.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:41:55 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/46] arm/acpi: fix duplicated _UID of PCI interrupt link devices Date: Thu, 13 Feb 2020 14:41:06 +0000 Message-Id: <20200213144145.818-8-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::32a 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 Using _UID of 0 for all PCI interrupt link devices absolutely violates the spec. Simply increase one by one. Signed-off-by: Heyi Guo Reviewed-by: Michael S. Tsirkin Message-id: 20200204014325.16279-6-guoheyi@huawei.com Signed-off-by: Peter Maydell --- hw/arm/virt-acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 5d157a9dd5e..f3e340b1729 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -189,7 +189,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap, uint32_t irqs = irq + i; Aml *dev_gsi = aml_device("GSI%d", i); aml_append(dev_gsi, aml_name_decl("_HID", aml_string("PNP0C0F"))); - aml_append(dev_gsi, aml_name_decl("_UID", aml_int(0))); + aml_append(dev_gsi, aml_name_decl("_UID", aml_int(i))); crs = aml_resource_template(); aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,