Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp1165643imm; Tue, 2 Oct 2018 04:00:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV615zJSdFHg4ZWc8SLJiE+Skt3AHlUvQRrvU6WyNYQt9OPwvClUJYUf3fFwsUbWkKDLMPd4L X-Received: by 2002:a17:902:7283:: with SMTP id d3-v6mr16053752pll.326.1538478019131; Tue, 02 Oct 2018 04:00:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538478019; cv=none; d=google.com; s=arc-20160816; b=SjUeADIE7al944QUSHJ2dguw8D/lgAFZ7Dw7CS90ndPGdjWNOJTNq6kQsIVatBdpWW Em+GLCWqqnk+oFNUunZysyF0rdaR7iH0c27Rm49VWTwruvYM/ruae19zuERuG7g25Pfj gpIbLw/hraXbhkC6zgbSyND1vwJH1EzrcaAakzIYTM2bLv03WCN+dFvq8Uh0m44jtAH6 WHosUdqJmJOMB0+h7L98qKnmMAH6NmEvHf8HBywifvfDEpy2bh9JSir5u8MxfIHj63oQ 8OO3NXT6xZ8HDmSBNxX3YI8SCg4YuJ7gTfyJdDg24hvxH61CpByX/u9VHwndXWHNmDvC RdFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=/hyEHD70R7IgbjtaOa2q9Nw6HkD4CNN/dqBDkwsJY00=; b=jNTJjfWrZ4fAgD10nzwmWcWruZaOXONEv/2wwNOWIdtu9U+PLYG30OnTrYsQA1RQDH rQFKRhAI30KdKSroBrUF/yG1tDdk9tdZrxkbr5XK103qJx6EP78iotxo5IRMGFF8U8M2 CLcb50Zg2KkKG5sGOSg1VOof374bxsUznn/IyrJI5aj8ZeC8pbGtGQfWzq9CdEpaIlcM 0Zu3zJ6n2wfkfS5OMW2wfIT81S1lZK6zxApWRfdI+yTOyUffYENPDWk6zLj7i7D9IsNT T+oj5O/6NKf4XEB24e/KsS6nH0/qzv0tEG3ACvpJ1XYnpzJZt7bVxJHDldcOPgY7CB5T zaHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n27-v6si14007527pgb.628.2018.10.02.04.00.03; Tue, 02 Oct 2018 04:00:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727388AbeJBRmg (ORCPT + 99 others); Tue, 2 Oct 2018 13:42:36 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:34434 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726244AbeJBRmf (ORCPT ); Tue, 2 Oct 2018 13:42:35 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4F8AE7A9; Tue, 2 Oct 2018 03:59:53 -0700 (PDT) Received: from e107981-ln.cambridge.arm.com (e107981-ln.Emea.Arm.com [10.4.13.117]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 88C2E3F5B7; Tue, 2 Oct 2018 03:59:50 -0700 (PDT) Date: Tue, 2 Oct 2018 11:59:45 +0100 From: Lorenzo Pieralisi To: honghui.zhang@mediatek.com Cc: bhelgaas@google.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ryder.lee@mediatek.com, ulf.hansson@linaro.org, marc.zyngier@arm.com, matthias.bgg@gmail.com, devicetree@vger.kernel.org, yingjoe.chen@mediatek.com, eddie.huang@mediatek.com, youlin.pei@mediatek.com, yt.shen@mediatek.com, sean.wang@mediatek.com Subject: Re: [PATCH v5 1/9] PCI: mediatek: Using slot's devfn for compare to fix mtk_pcie_find_port logic Message-ID: <20181002105945.GA27736@e107981-ln.cambridge.arm.com> References: <1538129080-8206-1-git-send-email-honghui.zhang@mediatek.com> <1538129080-8206-2-git-send-email-honghui.zhang@mediatek.com> <20181001143641.GB13049@red-moon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181001143641.GB13049@red-moon> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 01, 2018 at 03:36:41PM +0100, Lorenzo Pieralisi wrote: > On Fri, Sep 28, 2018 at 06:04:32PM +0800, honghui.zhang@mediatek.com wrote: > > From: Honghui Zhang > > > > The Mediatek's host controller has two slots, each with it's own control > > registers. The host driver need to identify which slot was connected > > in order to access the device's configuration space. There's problem > > for current host driver to find out which slot was connected to for > > a given EP device. > > > > Assuming each slot have connect with one EP device as below: > > > > host bridge > > bus 0 --> __________|_______ > > | | > > | | > > slot 0 slot 1 > > bus 1 -->| bus 2 --> | > > | | > > EP 0 EP 1 > > > > During PCI enumeration, system software will scan all the PCI device > > starting from devfn 0. So it will get the proper port for slot0 and > > slot1 device when using PCI_SLOT(devfn) for match. But it will get > > the wrong slot for EP1: The devfn will be start from 0 when scanning > > EP1 behind slot1, it will get port0 since the PCI_SLOT(EP1) is match > > for port0's slot value. So the host driver should not using EP's devfn > > but the slot's devfn(the slot which EP was connected to) for match. > > > > This patch fix the mtk_pcie_find_port's logic by using the slot's > > devfn for match if finding device connected to the subordinate bus. > > > > Signed-off-by: Honghui Zhang > > --- > > drivers/pci/controller/pcie-mediatek.c | 17 ++++++++++++++++- > > 1 file changed, 16 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > > index 9999dae..264e03f 100644 > > --- a/drivers/pci/controller/pcie-mediatek.c > > +++ b/drivers/pci/controller/pcie-mediatek.c > > @@ -337,10 +337,25 @@ static struct mtk_pcie_port *mtk_pcie_find_port(struct pci_bus *bus, > > { > > struct mtk_pcie *pcie = bus->sysdata; > > struct mtk_pcie_port *port; > > + struct pci_dev *dev = NULL; > > + > > + /* > > + * Walk the bus hierarchy to get the devfn value > > + * of the port in the root bus. > > + */ > > + while (bus && bus->number) { > > + dev = bus->self; > > + bus = dev->bus; > > If you add: > > devfn = dev->devfn; > > here > > > + } > > + > > + list_for_each_entry(port, &pcie->ports, list) { > > + /* Using slot's devfn to compare for subordinary bus. */ > > + if (dev) > > + devfn = dev->devfn; > > You can remove this ugly hunk altogether (and dev initialization > to NULL). Hi Honghui, if you can make this change I would merge this series, it has been been in the mailing lists for a while, I can make that change too just let me know please. Thanks, Lorenzo