From patchwork Tue Oct 15 16:06:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 3046491 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67B65BF924 for ; Tue, 15 Oct 2013 16:07:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 16AEF20416 for ; Tue, 15 Oct 2013 16:07:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C76B6201CD for ; Tue, 15 Oct 2013 16:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932228Ab3JOQHJ (ORCPT ); Tue, 15 Oct 2013 12:07:09 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:58519 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759539Ab3JOQHG (ORCPT ); Tue, 15 Oct 2013 12:07:06 -0400 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3czhNT1X5vz4KK7v; Tue, 15 Oct 2013 18:07:05 +0200 (CEST) X-Auth-Info: tFu7mINPXOobE9Ztx5m407qInReI+ZWSYf0ZP6I18hY= Received: from chi.lan (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3czhNS31vPzbbl1; Tue, 15 Oct 2013 18:07:04 +0200 (CEST) From: Marek Vasut To: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Marek Vasut , Bjorn Helgaas , Frank Li , Jingoo Han , Mohit KUMAR , Pratyush Anand , Richard Zhu , Sascha Hauer , Sean Cross , Shawn Guo , Siva Reddy Kallam , Srikanth T Shivanand , Tim Harvey , Troy Kisky , Yinghai Lu Subject: [PATCH 6/6] PCI: designware: Fix DT resource retrieval Date: Tue, 15 Oct 2013 18:06:40 +0200 Message-Id: <1381853200-5534-7-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1381853200-5534-1-git-send-email-marex@denx.de> References: <1381853200-5534-1-git-send-email-marex@denx.de> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The resource retrieval from the DT was not done right. This resulted in bogus values in the IO/MEM window configuration. I re-used the code implementation from pci-tegra.c to do the resource retrieval correctly. This in turn resulted in very strange behavior on two different kinds of setup: Setup #1: ,-------> Intel i210 (igb driver) i.MX6 root port -----> PCIe switch `-------> Empty slot Setup #2: ,-------> Marvell Yukon (sky2 driver) i.MX6 root port -----> PCIe switch `-------> Empty slot Both setups expressed the same behavior. The system booted and the ethernet controllers were properly detected. After the controllers were configured and just after they reported "Ethernet Link Up", the entire system froze. It is now clear this happened because the resources were incorrectly configured, which in turn means the iATU was also not configured correctly. Signed-off-by: Marek Vasut Cc: Bjorn Helgaas Cc: Frank Li Cc: Jingoo Han Cc: Mohit KUMAR Cc: Pratyush Anand Cc: Richard Zhu Cc: Sascha Hauer Cc: Sean Cross Cc: Shawn Guo Cc: Siva Reddy Kallam Cc: Srikanth T Shivanand Cc: Tim Harvey Cc: Troy Kisky Cc: Yinghai Lu --- drivers/pci/host/pcie-designware.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 5d183ae..97c5951 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -370,6 +370,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp) struct device_node *np = pp->dev->of_node; struct of_pci_range range; struct of_pci_range_parser parser; + struct resource res; u32 val; struct irq_domain *irq_domain; @@ -381,28 +382,22 @@ int __init dw_pcie_host_init(struct pcie_port *pp) /* Get the I/O and memory ranges from DT */ for_each_of_pci_range(&parser, &range) { - unsigned long restype = range.flags & IORESOURCE_TYPE_BITS; + of_pci_range_to_resource(&range, np, &res); + unsigned long restype = res.flags & IORESOURCE_TYPE_BITS; if (restype == IORESOURCE_IO) { - of_pci_range_to_resource(&range, np, &pp->io); + memcpy(&pp->io, &res, sizeof(res)); pp->io.name = "I/O"; - pp->io.start = max_t(resource_size_t, - PCIBIOS_MIN_IO, - range.pci_addr + global_io_offset); - pp->io.end = min_t(resource_size_t, - IO_SPACE_LIMIT, - range.pci_addr + range.size - + global_io_offset); pp->config.io_size = resource_size(&pp->io); pp->config.io_bus_addr = range.pci_addr; } if (restype == IORESOURCE_MEM) { - of_pci_range_to_resource(&range, np, &pp->mem); + memcpy(&pp->mem, &res, sizeof(res)); pp->mem.name = "MEM"; pp->config.mem_size = resource_size(&pp->mem); pp->config.mem_bus_addr = range.pci_addr; } if (restype == 0) { - of_pci_range_to_resource(&range, np, &pp->cfg); + memcpy(&pp->cfg, &res, sizeof(res)); pp->config.cfg0_size = resource_size(&pp->cfg)/2; pp->config.cfg1_size = resource_size(&pp->cfg)/2; }