From patchwork Tue Sep 25 20:59:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mjr@cs.wisc.edu X-Patchwork-Id: 186891 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 CCEC72C0092 for ; Wed, 26 Sep 2012 07:01:45 +1000 (EST) Received: from localhost ([::1]:47385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGcGF-0000ck-Fh for incoming@patchwork.ozlabs.org; Tue, 25 Sep 2012 17:01:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGcG7-0000cC-VD for qemu-devel@nongnu.org; Tue, 25 Sep 2012 17:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGcG7-0004Jw-0e for qemu-devel@nongnu.org; Tue, 25 Sep 2012 17:01:35 -0400 Received: from sabe.cs.wisc.edu ([128.105.6.20]:39788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGcG6-00047S-R6 for qemu-devel@nongnu.org; Tue, 25 Sep 2012 17:01:34 -0400 Received: from localhost.localdomain (cpe-184-58-210-31.wi.res.rr.com [184.58.210.31]) (authenticated bits=0) by sabe.cs.wisc.edu (8.14.1/8.14.1) with ESMTP id q8PL1LiP002090 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 25 Sep 2012 16:01:26 -0500 From: mjr@cs.wisc.edu To: qemu-devel@nongnu.org Date: Tue, 25 Sep 2012 15:59:21 -0500 Message-Id: <1348606761-44739-1-git-send-email-mjr@cs.wisc.edu> X-Mailer: git-send-email 1.7.5.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 128.105.6.20 Subject: [Qemu-devel] [PATCH] Align PCI capabilities in pci_find_space 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 From: Matt Renzelmann The current implementation of pci_find_space does not properly align PCI capabilities in the PCI configuration space. This patch fixes this issue. Signed-off-by: Matt Renzelmann --- This is my first patch to QEMU so I hope I'm not screwing up too much. The purpose of this patch is to mask off the low-order two bits--Linux masks these while scanning the PCI configuration space, for example, so we need to make sure QEMU's behavior matches the standard. No current QEMU hardware is likely using this but it may be important later. hw/pci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index e149305..8771b7e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1571,11 +1571,17 @@ static int pci_find_space(PCIDevice *pdev, uint8_t size) int config_size = pci_config_size(pdev); int offset = PCI_CONFIG_HEADER_SIZE; int i; - for (i = PCI_CONFIG_HEADER_SIZE; i < config_size; ++i) - if (pdev->used[i]) - offset = i + 1; - else if (i - offset + 1 == size) + int masked; + + for (i = PCI_CONFIG_HEADER_SIZE; i < config_size; ++i) { + masked = i & (~3); + if (pdev->used[i]) { + offset = masked + 4; + } else if (i - offset + 1 == size) { return offset; + } + } + return 0; }