From patchwork Tue May 14 15:33:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 16901 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-fa0-f72.google.com (mail-fa0-f72.google.com [209.85.161.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B7EA025D00 for ; Tue, 14 May 2013 15:34:31 +0000 (UTC) Received: by mail-fa0-f72.google.com with SMTP id v9sf626554fav.11 for ; Tue, 14 May 2013 08:33:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=nJp8XlrWI0UlvioPgUf+mPRwLE62FkWU5OjIabEydFM=; b=PUCqsiGo2Gq4wIFSLi1QhsP8TzOinbWLaNZv30+78+4JTN7xJDLvk3uoRW8F0KImpN CGkLO9CJb9/6KSoGRGJysLVEHp+3hitci+RBMibu8Undh7YEugk+TgoqhrjTFItJF35o W8BzTyE6VK1ncJvXZHP2aYJxxkVtXXKAzPDr8Xt+5XTn+lk4qRKiRYbURnoe2TqF+6ln sD+G7Dq24vvYdXVZbTmI6W1OujExJ2Gky1b7Mp0BwWcvEa0jpJEj9CIt1M5g9JmmMoZj tVwejNwCeFH7D9MSxj5DLyBIZ6WZWD0KclBcShy8BQ3557ip/sMtHnYmJ7eLNI+piqcf vjTA== X-Received: by 10.180.109.166 with SMTP id ht6mr1043160wib.0.1368545635426; Tue, 14 May 2013 08:33:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.78.3 with SMTP id x3ls1213100wiw.26.canary; Tue, 14 May 2013 08:33:55 -0700 (PDT) X-Received: by 10.180.37.109 with SMTP id x13mr7491747wij.20.1368545635221; Tue, 14 May 2013 08:33:55 -0700 (PDT) Received: from mail-ve0-x22c.google.com (mail-ve0-x22c.google.com [2607:f8b0:400c:c01::22c]) by mx.google.com with ESMTPS id o18si5572306wiv.96.2013.05.14.08.33.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 May 2013 08:33:55 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22c; Received: by mail-ve0-f172.google.com with SMTP id b10so802997vea.3 for ; Tue, 14 May 2013 08:33:54 -0700 (PDT) X-Received: by 10.58.48.166 with SMTP id m6mr21698971ven.59.1368545634113; Tue, 14 May 2013 08:33:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.217.15 with SMTP id hk15csp67795vcb; Tue, 14 May 2013 08:33:53 -0700 (PDT) X-Received: by 10.14.93.201 with SMTP id l49mr23364566eef.23.1368545632327; Tue, 14 May 2013 08:33:52 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id z48si25446162een.139.2013.05.14.08.33.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 14 May 2013 08:33:51 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UcHEO-0005or-TV; Tue, 14 May 2013 16:33:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , Arnd Bergmann , "Michael S. Tsirkin" , Will Deacon , Aurelien Jarno , Linus Walleij , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Joss Reeves Subject: [PATCH for-1.5 1/3] Revert "versatile_pci: Put the host bridge PCI device at slot 29" Date: Tue, 14 May 2013 16:33:34 +0100 Message-Id: <1368545616-22344-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1368545616-22344-1-git-send-email-peter.maydell@linaro.org> References: <1368545616-22344-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQk7Z3LptH94O1YLaTobnjIWPpFH5xH6UltV/0KddLbIJM1H1pd4x3IMSoLjsda0eo0m66y+ X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22c is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This reverts commit 5f37ef92b7690423ac6311d3c597e182fc5f8fe6. It turns out that some kernels incorrectly depend on the old QEMU behaviour of not putting the host PCI bridge device where the hardware puts it, because they use a swizzling IRQ mapping which is incorrect but happens to match up with old broken QEMU when the slot number mod 4 is zero. Since we start PCI devices at 11, if we put the host bridge at 29 then the first real PCI device goes at 11 and doesn't work. Not putting the host bridge at 29 means it defaults to 11, so the first real PCI device is at 12 and works. Since continuing with the old behaviour doesn't cause problems for kernels which do work with hardware, the simplest fix for this is to revert the change. Signed-off-by: Peter Maydell --- hw/pci-host/versatile.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index 540daf7..2bb09fa 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.c @@ -331,8 +331,6 @@ static void pci_vpb_init(Object *obj) object_initialize(&s->pci_dev, TYPE_VERSATILE_PCI_HOST); qdev_set_parent_bus(DEVICE(&s->pci_dev), BUS(&s->pci_bus)); - object_property_set_int(OBJECT(&s->pci_dev), PCI_DEVFN(29, 0), "addr", - NULL); /* Window sizes for VersatilePB; realview_pci's init will override */ s->mem_win_size[0] = 0x0c000000;