From patchwork Tue Dec 18 21:36:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Knut Omang X-Patchwork-Id: 207230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A753B2C0089 for ; Wed, 19 Dec 2012 10:00:10 +1100 (EST) Received: from localhost ([::1]:46751 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl68q-0003Ph-VO for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2012 18:00:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl4q5-0002bQ-Vg for qemu-devel@nongnu.org; Tue, 18 Dec 2012 16:36:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl4q3-0001Py-2U for qemu-devel@nongnu.org; Tue, 18 Dec 2012 16:36:37 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:34781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl4q2-0001Pe-Py for qemu-devel@nongnu.org; Tue, 18 Dec 2012 16:36:35 -0500 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qBILaWLB025635 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Dec 2012 21:36:32 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qBILaV53009206 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 Dec 2012 21:36:31 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qBILaVvb017467; Tue, 18 Dec 2012 15:36:31 -0600 Received: from [10.175.52.124] (/10.175.52.124) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 18 Dec 2012 13:36:31 -0800 Message-ID: <1355866589.8438.6.camel@ori.omang.mine.nu> From: Knut Omang To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2012 22:36:29 +0100 X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) Mime-Version: 1.0 X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 156.151.31.81 X-Mailman-Approved-At: Tue, 18 Dec 2012 17:59:59 -0500 Cc: "Michael S.Tsirkin" Subject: [Qemu-devel] [PATCH] pcie: Fix bug in pcie_ext_cap_set_next 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Upper 16 bits of the PCIe Extended Capability Header was truncated during update, also breaking pcie_add_capability. Signed-off-by: Knut Omang --- hw/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pcie.c b/hw/pcie.c index 7c92f19..fa260af 100644 --- a/hw/pcie.c +++ b/hw/pcie.c @@ -494,7 +494,7 @@ uint16_t pcie_find_capability(PCIDevice *dev, uint16_t cap_id) static void pcie_ext_cap_set_next(PCIDevice *dev, uint16_t pos, uint16_t next) { - uint16_t header = pci_get_long(dev->config + pos); + uint32_t header = pci_get_long(dev->config + pos); assert(!(next & (PCI_EXT_CAP_ALIGN - 1))); header = (header & ~PCI_EXT_CAP_NEXT_MASK) | ((next << PCI_EXT_CAP_NEXT_SHIFT) & PCI_EXT_CAP_NEXT_MASK);