From patchwork Tue Jan 26 23:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Jui X-Patchwork-Id: 8128231 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 75CB7BEEE5 for ; Tue, 26 Jan 2016 23:31:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7A132026C for ; Tue, 26 Jan 2016 23:31:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEA2620265 for ; Tue, 26 Jan 2016 23:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbcAZXbj (ORCPT ); Tue, 26 Jan 2016 18:31:39 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:4767 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbcAZXbe (ORCPT ); Tue, 26 Jan 2016 18:31:34 -0500 X-IronPort-AV: E=Sophos;i="5.22,352,1449561600"; d="scan'208";a="86536331" Received: from irvexchcas07.broadcom.com (HELO IRVEXCHCAS07.corp.ad.broadcom.com) ([10.9.208.55]) by mail-gw1-out.broadcom.com with ESMTP; 26 Jan 2016 18:17:37 -0800 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS07.corp.ad.broadcom.com (10.9.208.55) with Microsoft SMTP Server (TLS) id 14.3.235.1; Tue, 26 Jan 2016 15:31:33 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.235.1; Tue, 26 Jan 2016 15:31:33 -0800 Received: from mail.broadcom.com (unknown [10.136.8.49]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 5E14640FE5; Tue, 26 Jan 2016 15:27:39 -0800 (PST) From: Ray Jui To: Bjorn Helgaas CC: Bjorn Helgaas , Rafal Milecki , Hante Meuleman , Hauke Mehrtens , , , , Ray Jui Subject: [PATCH v2] PCI: iproc: Fix BCMA PCIe bus scanning regression Date: Tue, 26 Jan 2016 15:31:40 -0800 Message-ID: <1453851100-15196-1-git-send-email-rjui@broadcom.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Commit 943ebae781f5 ("PCI: iproc: Add PAXC interface support") causes regression on EP device detection on BCMA based platforms. This patch fixes the issue by allowing multiple devices to be configured on the same bus, for all PAXB based child buses. In addition, this patch also adds check to prevent non-zero function from being used on bus 0 (root bus). Function 'iproc_pcie_device_is_valid' is now removed with checks folding into 'iproc_pcie_map_cfg_bus' to make them more clear and less error-prone Reported-by: Rafal Milecki Fixes: 943ebae781f5 ("PCI: iproc: Add PAXC interface support") Signed-off-by: Ray Jui --- drivers/pci/host/pcie-iproc.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index 5816bce..67396ab 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -170,20 +170,6 @@ static inline void iproc_pcie_ob_write(struct iproc_pcie *pcie, writel(val, pcie->base + offset + (window * 8)); } -static inline bool iproc_pcie_device_is_valid(struct iproc_pcie *pcie, - unsigned int slot, - unsigned int fn) -{ - if (slot > 0) - return false; - - /* PAXC can only support limited number of functions */ - if (pcie->type == IPROC_PCIE_PAXC && fn >= MAX_NUM_PAXC_PF) - return false; - - return true; -} - /** * Note access to the configuration registers are protected at the higher layer * by 'pci_lock' in drivers/pci/access.c @@ -199,11 +185,11 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus, u32 val; u16 offset; - if (!iproc_pcie_device_is_valid(pcie, slot, fn)) - return NULL; - /* root complex access */ if (busno == 0) { + if (slot > 0 || fn > 0) + return NULL; + iproc_pcie_write_reg(pcie, IPROC_PCIE_CFG_IND_ADDR, where & CFG_IND_ADDR_MASK); offset = iproc_pcie_reg_offset(pcie, IPROC_PCIE_CFG_IND_DATA); @@ -213,6 +199,14 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus, return (pcie->base + offset); } + /* + * PAXC is connected to internally emulated EP within the SoC. It + * allows only one device and supports limited number of functions + */ + if (pcie->type == IPROC_PCIE_PAXC) + if (slot > 0 || fn >= MAX_NUM_PAXC_PF) + return NULL; + /* EP device access */ val = (busno << CFG_ADDR_BUS_NUM_SHIFT) | (slot << CFG_ADDR_DEV_NUM_SHIFT) |