Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp287016pxa; Tue, 11 Aug 2020 03:03:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaFbsDhsuotqMZcN8wh7jud24Xq0uXpW602yOMmC+Uh76vUPl9bP3fXu5Grn5+fB5RlYSk X-Received: by 2002:a17:906:3c59:: with SMTP id i25mr24999728ejg.202.1597140193929; Tue, 11 Aug 2020 03:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597140193; cv=none; d=google.com; s=arc-20160816; b=tFLMgrvrkYqpgxRC2Zi41Tjn54llNRfaFKnuK+XPY598PhowzOd6albVU5KQARDZ+W s0sY2GVdT0Bqxz9EfrFRboDGIV4/qUq2kJjZ/ErEMLXJV1XKTJ+SN0T3AV5MYJdqESF/ ePz8N4u+Osm/MoUUXsO7H3TaHtobLhbvXsEtt5bF0f9magUvuSlwZALaNqLqLxigkqy6 ZNCn9Wg/3TSKwaY6sjwgMDNLvkoOB/AeZYqKPe+AXm7ZTSFjDE4BAtFrKTLhcLoYBGR2 9DVA78oqFDPePi1+pocWi5kncabXhNR+VDf4MsKB2Gj/gJATsSIFOXoq1Sv9GZVUqQZF Y6Hg== 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=hKZDNWR2KTiF+WhKpJC55OFDYgJllfV3DOBd4zN4jZE=; b=e9aCmPpS/jI0LpG+QoXkjo6LogYMb+Lg3EX4XAF8h1vSyOyH8IlfKfx9LNiI+RwYYt nfUZHjiBYjRQesxbKxgDZ1PB0sQ2ZK6yU75as15XgPggg094ircp8yn1VHFPvfpiHjqS 2r4KvAPjK6MjmLjOplfdVcs+xpY/xF8f+o9iAeyjAMHODQpWoSr63GgtjzN7NpD92o0z f4PmSCjnZToBimApIaXnvp01sK4H99ddQh12NB849FeODRyKKM9l2h5yCEs9GcW3Hc70 QOAO5zMn+hXJhjUlBa1O6BZ8xGPYpwDt84vk6akK7hpguX9hZk+urwB4a6izwwQE1ge1 b6RQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id c12si14732449edx.494.2020.08.11.03.02.50; Tue, 11 Aug 2020 03:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1728520AbgHKKCO (ORCPT + 99 others); Tue, 11 Aug 2020 06:02:14 -0400 Received: from inva021.nxp.com ([92.121.34.21]:41854 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728451AbgHKKCK (ORCPT ); Tue, 11 Aug 2020 06:02:10 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 7B269201F1B; Tue, 11 Aug 2020 12:02:08 +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 3E93C201EF8; Tue, 11 Aug 2020 12:02:01 +0200 (CEST) Received: from localhost.localdomain (mega.ap.freescale.net [10.192.208.232]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 20FD3402DF; Tue, 11 Aug 2020 12:01:49 +0200 (CEST) From: Zhiqiang Hou To: 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, robh+dt@kernel.org, bhelgaas@google.com, lorenzo.pieralisi@arm.com, shawnguo@kernel.org, leoyang.li@nxp.com, kishon@ti.com, gustavo.pimentel@synopsys.com, roy.zang@nxp.com, jingoohan1@gmail.com, andrew.murray@arm.com Cc: mingkai.hu@nxp.com, minghuan.Lian@nxp.com, Xiaowei Bao , Hou Zhiqiang Subject: [PATCHv7 03/12] PCI: designware-ep: Move the function of getting MSI capability forward Date: Tue, 11 Aug 2020 17:54:32 +0800 Message-Id: <20200811095441.7636-4-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200811095441.7636-1-Zhiqiang.Hou@nxp.com> References: <20200811095441.7636-1-Zhiqiang.Hou@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 From: Xiaowei Bao 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 Reviewed-by: Andrew Murray Signed-off-by: Hou Zhiqiang --- V7: - Rebase the patch without functionality change. drivers/pci/controller/dwc/pcie-designware-ep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c index e76b504ed465..56bd1cd71f16 100644 --- a/drivers/pci/controller/dwc/pcie-designware-ep.c +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c @@ -574,10 +574,6 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) return -EIO; } - ep->msi_cap = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI); - - ep->msix_cap = dw_pcie_find_capability(pci, PCI_CAP_ID_MSIX); - offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR); if (offset) { reg = dw_pcie_readl_dbi(pci, offset + PCI_REBAR_CTRL); @@ -664,6 +660,10 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) if (ret < 0) epc->max_functions = 1; + ep->msi_cap = dw_pcie_find_capability(pci, PCI_CAP_ID_MSI); + + ep->msix_cap = dw_pcie_find_capability(pci, PCI_CAP_ID_MSIX); + if (ep->ops->ep_init) ep->ops->ep_init(ep); -- 2.17.1