Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp958232ybl; Thu, 22 Aug 2019 07:24:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwdba30epwDTuNjwNT3SUk20IIBQNz5dHtIEZZiGFljxA06bjgr6etUDCtCGs+0qhwas68S X-Received: by 2002:a17:90a:f98e:: with SMTP id cq14mr5810112pjb.52.1566483886908; Thu, 22 Aug 2019 07:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566483886; cv=none; d=google.com; s=arc-20160816; b=wL8e9G4lYGGOTlBlqPOomzQvKRiZ+FsUcSTgWZldCK63b1bcrEAmMuhVSyFarXgy2y Sbpk8V/Sl0Zvw3iOJCDxZ73yE0KcdZ2LpUdiVAJgD0PeJLYi/DV9KTERzu8zD1kxms1q TgHyUmd8Q6feHTNBeNLjL4vODkL7Bu2rhQZMtq86pvRLrepjjlQcZF7hD2OP9qGhthq1 KfSeCJI9O+s49q2dZo3c9rbWXSeOn5Cm4AjPyqYBMp+0DN4aw2mFR8mh/REH4VC0c/fk cqcn44hYc+MWrqBQ7DeHcp4x7cCPSNLSAEjTa1KiUidIS4xj92zPF1qnyKimxVnp3SC6 RM9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=/VUijtqw8IcYVtIh1PuyEKUi3dS40NutV4BMUKiZr0g=; b=DFzhY6Vmxj+C3hGee7tvUypX/xpDRcdkNk2JeV+SLgVAn9d6SR4bNaJnUV5VFamt6E HUsOfLKtOSh1DSMtkmUtBHsdSoUTM3PHHfG7kx0smL/lG4jS27DwEseuVPeom+Pgp3UO CsjUoMW/r/sszFCJ4bkg+C4e83Kpxltny3lEszjQr/6CCIipFVMCLOzI6d9bl32grer/ UeUn1qSSlN81Q3uV0XOEC89qII8wAt0x/u9XyIwrcdD9+JjQaHnzai6zsvKJ8+O94JBa TlMfKWevChiPmeF99zkSDhklK6TFCIVMuEnae+iR5Zo0fx1fvLhg55ZN7ouaecbchIdp 58AA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c4si16846098pgk.257.2019.08.22.07.24.30; Thu, 22 Aug 2019 07:24:46 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388214AbfHVLdB (ORCPT + 99 others); Thu, 22 Aug 2019 07:33:01 -0400 Received: from inva021.nxp.com ([92.121.34.21]:33938 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388182AbfHVLc6 (ORCPT ); Thu, 22 Aug 2019 07:32:58 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id E5DC42005F5; Thu, 22 Aug 2019 13:32:55 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 12095200613; Thu, 22 Aug 2019 13:32:46 +0200 (CEST) Received: from titan.ap.freescale.net (TITAN.ap.freescale.net [10.192.208.233]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id EC4E6402E1; Thu, 22 Aug 2019 19:32:33 +0800 (SGT) From: Xiaowei Bao To: bhelgaas@google.com, robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org, leoyang.li@nxp.com, kishon@ti.com, lorenzo.pieralisi@arm.co, arnd@arndb.de, gregkh@linuxfoundation.org, minghuan.Lian@nxp.com, mingkai.hu@nxp.com, roy.zang@nxp.com, jingoohan1@gmail.com, gustavo.pimentel@synopsys.com, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, andrew.murray@arm.com Cc: Xiaowei Bao Subject: [PATCH v2 03/10] PCI: designware-ep: Move the function of getting MSI capability forward Date: Thu, 22 Aug 2019 19:22:35 +0800 Message-Id: <20190822112242.16309-3-xiaowei.bao@nxp.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190822112242.16309-1-xiaowei.bao@nxp.com> References: <20190822112242.16309-1-xiaowei.bao@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the function of getting MSI capability to the front of init function, because the init function of the EP platform driver will use the return value by the function of getting MSI capability. Signed-off-by: Xiaowei Bao --- v2: - No change. drivers/pci/controller/dwc/pcie-designware-ep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index b8388f8..0a6c199 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -656,6 +656,10 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) if (ret < 0) epc->max_functions = 1; + ep->msi_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSI); + + ep->msix_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSIX); + if (ep->ops->ep_init) ep->ops->ep_init(ep); @@ -672,9 +676,6 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) dev_err(dev, "Failed to reserve memory for MSI/MSI-X\n"); return -ENOMEM; } - ep->msi_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSI); - - ep->msix_cap = dw_pcie_ep_find_capability(pci, PCI_CAP_ID_MSIX); offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR); if (offset) { -- 2.9.5