From patchwork Fri Jan 7 12:29:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baidu Boy X-Patchwork-Id: 77870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 775F3B7156 for ; Fri, 7 Jan 2011 23:30:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 632D72807E; Fri, 7 Jan 2011 13:30:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nsvK5ef1bTE5; Fri, 7 Jan 2011 13:30:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 369C52807F; Fri, 7 Jan 2011 13:30:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 550AC2807F for ; Fri, 7 Jan 2011 13:30:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lUZ5cD8kTkrS for ; Fri, 7 Jan 2011 13:30:39 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gw0-f44.google.com (mail-gw0-f44.google.com [74.125.83.44]) by theia.denx.de (Postfix) with ESMTP id 074982807E for ; Fri, 7 Jan 2011 13:30:37 +0100 (CET) Received: by gwj17 with SMTP id 17so7295147gwj.3 for ; Fri, 07 Jan 2011 04:30:36 -0800 (PST) Received: by 10.150.51.8 with SMTP id y8mr25296482yby.250.1294403435759; Fri, 07 Jan 2011 04:30:35 -0800 (PST) Received: from LENOVOE5CA6843 ([117.89.239.170]) by mx.google.com with ESMTPS id g78sm15241393yhd.22.2011.01.07.04.30.33 (version=SSLv3 cipher=RC4-MD5); Fri, 07 Jan 2011 04:30:35 -0800 (PST) From: "Baidu Boy" To: Date: Fri, 7 Jan 2011 20:29:55 +0800 Message-ID: <007e01cbae66$ae7017b0$6401a8c0@LENOVOE5CA6843> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: AcuuZpcbFLN7vB77TX2H7cqZtAOHNQ== X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.3350 Subject: [U-Boot] [PATCH] mpc83xx: fix pcie configuration space read/write X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch fix a problem for the pcie enumeration when the mpc83xx pcie controller is connected with switch or we use both of the two pcie controller. Signed-off-by: Baidu Boy --- arch/powerpc/cpu/mpc83xx/pcie.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) u8 devfn = PCI_DEV(dev) << 3 | PCI_FUNC(dev); u32 dev_base = bus << 24 | devfn << 16; @@ -324,6 +326,8 @@ void mpc83xx_pcie_init(int num_buses, struct pci_region **reg) num_buses = ARRAY_SIZE(mpc83xx_pcie_cfg_space); } - for (i = 0; i < num_buses; i++) + for (i = 0; i < num_buses; i++){ + pcie_index = i; mpc83xx_pcie_init_bus(i, reg[i]); + } } diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index 46a706d..2a200b8 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -46,13 +46,15 @@ static struct { #endif }; +static u8 pcie_index =0; + #ifdef CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES static int mpc83xx_pcie_remap_cfg(struct pci_controller *hose, pci_dev_t dev) { int bus = PCI_BUS(dev) - hose->first_busno; immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; - pex83xx_t *pex = &immr->pciexp[bus]; + pex83xx_t *pex = &immr->pciexp[pcie_index]; struct pex_outbound_window *out_win = &pex->bridge.pex_outbound_win[0];