mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
121 lines
3.9 KiB
Diff
121 lines
3.9 KiB
Diff
From 80b960829a85e555b96bfd4e31f31b3db3e8f5da Mon Sep 17 00:00:00 2001
|
|
From: Rob Herring <robh@kernel.org>
|
|
Date: Thu, 5 Nov 2020 15:11:50 -0600
|
|
Subject: [PATCH 1/5] PCI: dwc: Drop the .set_num_vectors() host op
|
|
|
|
There's no reason for the .set_num_vectors() host op. Drivers needing a
|
|
non-default value can just initialize pcie_port.num_vectors directly.
|
|
|
|
Link: https://lore.kernel.org/r/20201105211159.1814485-8-robh@kernel.org
|
|
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Signed-off-by: Rob Herring <robh@kernel.org>
|
|
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
Acked-by: Jingoo Han <jingoohan1@gmail.com>
|
|
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
|
|
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
Cc: Bjorn Helgaas <bhelgaas@google.com>
|
|
Cc: Thierry Reding <thierry.reding@gmail.com>
|
|
Cc: Jonathan Hunter <jonathanh@nvidia.com>
|
|
Cc: linux-tegra@vger.kernel.org
|
|
---
|
|
.../pci/controller/dwc/pcie-designware-host.c | 19 ++++---------------
|
|
.../pci/controller/dwc/pcie-designware-plat.c | 7 +------
|
|
drivers/pci/controller/dwc/pcie-designware.h | 1 -
|
|
drivers/pci/controller/dwc/pcie-tegra194.c | 7 +------
|
|
4 files changed, 6 insertions(+), 28 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
|
|
@@ -358,22 +358,11 @@ int dw_pcie_host_init(struct pcie_port *
|
|
pci->link_gen = of_pci_get_max_link_speed(np);
|
|
|
|
if (pci_msi_enabled()) {
|
|
- /*
|
|
- * If a specific SoC driver needs to change the
|
|
- * default number of vectors, it needs to implement
|
|
- * the set_num_vectors callback.
|
|
- */
|
|
- if (!pp->ops->set_num_vectors) {
|
|
+ if (!pp->num_vectors) {
|
|
pp->num_vectors = MSI_DEF_NUM_VECTORS;
|
|
- } else {
|
|
- pp->ops->set_num_vectors(pp);
|
|
-
|
|
- if (pp->num_vectors > MAX_MSI_IRQS ||
|
|
- pp->num_vectors == 0) {
|
|
- dev_err(dev,
|
|
- "Invalid number of vectors\n");
|
|
- return -EINVAL;
|
|
- }
|
|
+ } else if (pp->num_vectors > MAX_MSI_IRQS) {
|
|
+ dev_err(dev, "Invalid number of vectors\n");
|
|
+ return -EINVAL;
|
|
}
|
|
|
|
if (!pp->ops->msi_host_init) {
|
|
--- a/drivers/pci/controller/dwc/pcie-designware-plat.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-designware-plat.c
|
|
@@ -44,14 +44,8 @@ static int dw_plat_pcie_host_init(struct
|
|
return 0;
|
|
}
|
|
|
|
-static void dw_plat_set_num_vectors(struct pcie_port *pp)
|
|
-{
|
|
- pp->num_vectors = MAX_MSI_IRQS;
|
|
-}
|
|
-
|
|
static const struct dw_pcie_host_ops dw_plat_pcie_host_ops = {
|
|
.host_init = dw_plat_pcie_host_init,
|
|
- .set_num_vectors = dw_plat_set_num_vectors,
|
|
};
|
|
|
|
static int dw_plat_pcie_establish_link(struct dw_pcie *pci)
|
|
@@ -128,6 +122,7 @@ static int dw_plat_add_pcie_port(struct
|
|
return pp->msi_irq;
|
|
}
|
|
|
|
+ pp->num_vectors = MAX_MSI_IRQS;
|
|
pp->ops = &dw_plat_pcie_host_ops;
|
|
|
|
ret = dw_pcie_host_init(pp);
|
|
--- a/drivers/pci/controller/dwc/pcie-designware.h
|
|
+++ b/drivers/pci/controller/dwc/pcie-designware.h
|
|
@@ -174,7 +174,6 @@ enum dw_pcie_device_mode {
|
|
|
|
struct dw_pcie_host_ops {
|
|
int (*host_init)(struct pcie_port *pp);
|
|
- void (*set_num_vectors)(struct pcie_port *pp);
|
|
int (*msi_host_init)(struct pcie_port *pp);
|
|
};
|
|
|
|
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
|
@@ -996,11 +996,6 @@ static int tegra_pcie_dw_link_up(struct
|
|
return !!(val & PCI_EXP_LNKSTA_DLLLA);
|
|
}
|
|
|
|
-static void tegra_pcie_set_msi_vec_num(struct pcie_port *pp)
|
|
-{
|
|
- pp->num_vectors = MAX_MSI_IRQS;
|
|
-}
|
|
-
|
|
static int tegra_pcie_dw_start_link(struct dw_pcie *pci)
|
|
{
|
|
struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
|
|
@@ -1025,7 +1020,6 @@ static const struct dw_pcie_ops tegra_dw
|
|
|
|
static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
|
|
.host_init = tegra_pcie_dw_host_init,
|
|
- .set_num_vectors = tegra_pcie_set_msi_vec_num,
|
|
};
|
|
|
|
static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie)
|
|
@@ -2010,6 +2004,7 @@ static int tegra_pcie_dw_probe(struct pl
|
|
pci->n_fts[1] = FTS_VAL;
|
|
|
|
pp = &pci->pp;
|
|
+ pp->num_vectors = MAX_MSI_IRQS;
|
|
pcie->dev = &pdev->dev;
|
|
pcie->mode = (enum dw_pcie_device_mode)data->mode;
|
|
|