From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B79CEC10F11 for ; Sat, 13 Apr 2019 15:44:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8961D214D8 for ; Sat, 13 Apr 2019 15:44:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rKdERKQL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="kPOMWg0i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8961D214D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bisWDMecplv1mEZXKNRU/6qmCgFicI4E9/xuftH7mIY=; b=rKdERKQL48iQjU ZrkS0XS3yFUvi+ZIGO7+DIQdM60tzqEveMob8szfNMdON9qj57YGfv5NDIy/V9L440VdGrW8rf/tM 9aqUZaoJ24Uqni4ncNI6D0e/kWlXhoJTGbfakJC73RIs/SkebA6oOvXzMjTRe4Y+JGA9olZ5bu5No 7GvGWUckr7iPOW9WdhpUcdjWs7EK1txoPX60a4hsgGdPNAIe39iwowkB6Nvqu+D87rwxhJ5mvwJBV wEr2yFYfZHt9fxiTJ2uOibz3j02LvKW8qSgneW6YiGtHnjR3BPH8BlYcWWUA99e2UwxRv9o8eIlS5 B37AjccDWi5NzBmhlQ+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hFKpe-0001op-RF; Sat, 13 Apr 2019 15:44:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hFKpc-0001oO-Ae for linux-arm-kernel@lists.infradead.org; Sat, 13 Apr 2019 15:44:41 +0000 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D3F7214D8; Sat, 13 Apr 2019 15:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555170280; bh=M0cC4PjgFnIKBfAPn9xubHpEuRhva+tnS31LyAoiiWg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=kPOMWg0i+shPWMTgNPqGDHL/Brs+hgUiHtfZ3ZPtMXe9aXijlnXiCVUwLzBNQmWWG QBjmIcXIsiknukTAV2X1tKH8aECkUzarDSp37olRkiXjdUhKI/Xcnk+5nIyHwKlYyv Jl6Q6gd4t+DNH0BHThP3RWVpfQJLfhSJ060qEqIU= Date: Sat, 13 Apr 2019 10:44:37 -0500 From: Bjorn Helgaas To: Kishon Vijay Abraham I Subject: Re: [PATCH v3 20/26] PCI: dwc: Fix dw_pcie_ep_find_capability to return correct capability offset Message-ID: <20190413154437.GG126710@google.com> References: <20190325093947.32633-1-kishon@ti.com> <20190325093947.32633-21-kishon@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190325093947.32633-21-kishon@ti.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190413_084440_404840_EDD307DC X-CRM114-Status: GOOD ( 19.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jesper Nilsson , Lorenzo Pieralisi , Arnd Bergmann , Greg Kroah-Hartman , Gustavo Pimentel , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Minghuan Lian , Murali Karicheri , linux-arm-kernel@axis.com, Jingoo Han , Mingkai Hu , linux-omap@vger.kernel.org, Roy Zang , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 25, 2019 at 03:09:41PM +0530, Kishon Vijay Abraham I wrote: > commit beb4641a787df79a ("PCI: dwc: Add MSI-X callbacks handler") while > adding MSI-X callback handler, introduced dw_pcie_ep_find_capability and > __dw_pcie_ep_find_next_cap for finding the MSI and MSIX capability. > > However if MSI or MSIX capability is the last capability (i.e there are > no additional items in the capabilities list and the Next Capability > Pointer is set to '0'), __dw_pcie_ep_find_next_cap will return '0' > even though MSI or MSIX capability may be present. This is because of > incorrect ordering of "next_cap_ptr" check. Fix it here. Nice fix. It looks like dw_pcie_ep_find_capability() is currently only used for MSI and MSI-X, but IIUC, it *could* be used for any capability, so this commit message seems a little too specific. It would be slightly less confusing if beb4641a787d ("PCI: dwc: Add MSI-X callbacks handler") had been split into a commit that added the general-purpose dw_pcie_ep_find_capability() and a commit that used it for MSI and MSI-X, but obviously we can't change history. > Fixes: beb4641a787df79a142 ("PCI: dwc: Add MSI-X callbacks handler") These commit references are longer than necessary (and different - 19-char SHA1 here and 16 chars above). I typically use 12 chars via gsr is aliased to `git --no-pager show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n"' > Signed-off-by: Kishon Vijay Abraham I > --- > drivers/pci/controller/dwc/pcie-designware-ep.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c > index dc6a4bbd3ace..74477ad7467f 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-ep.c > +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c > @@ -46,16 +46,19 @@ static u8 __dw_pcie_ep_find_next_cap(struct dw_pcie *pci, u8 cap_ptr, > u8 cap_id, next_cap_ptr; > u16 reg; > > + if (!cap_ptr) > + return 0; > + > reg = dw_pcie_readw_dbi(pci, cap_ptr); > - next_cap_ptr = (reg & 0xff00) >> 8; > cap_id = (reg & 0x00ff); > > - if (!next_cap_ptr || cap_id > PCI_CAP_ID_MAX) > + if (cap_id > PCI_CAP_ID_MAX) > return 0; > > if (cap_id == cap) > return cap_ptr; > > + next_cap_ptr = (reg & 0xff00) >> 8; > return __dw_pcie_ep_find_next_cap(pci, next_cap_ptr, cap); > } > > @@ -67,9 +70,6 @@ static u8 dw_pcie_ep_find_capability(struct dw_pcie *pci, u8 cap) > reg = dw_pcie_readw_dbi(pci, PCI_CAPABILITY_LIST); > next_cap_ptr = (reg & 0x00ff); > > - if (!next_cap_ptr) > - return 0; > - > return __dw_pcie_ep_find_next_cap(pci, next_cap_ptr, cap); > } > > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel