Commit 331e9bce authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarJingoo 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
parent 7f170d35

drivers/pci/controller/dwc/pcie-designware-host.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -365,23 +365,12 @@ int dw_pcie_host_init(struct pcie_port *pp) 
		pci->link_gen = of_pci_get_max_link_speed(np);

		pci->link_gen = of_pci_get_max_link_speed(np);





	if (pci_msi_enabled()) {

	if (pci_msi_enabled()) {

		/*

		if (!pp->num_vectors) {

		 * 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) {

			pp->num_vectors = MSI_DEF_NUM_VECTORS;

			pp->num_vectors = MSI_DEF_NUM_VECTORS;

		} else {

		} else if (pp->num_vectors > MAX_MSI_IRQS) {

			pp->ops->set_num_vectors(pp);

			dev_err(dev, "Invalid number of vectors\n");



			if (pp->num_vectors > MAX_MSI_IRQS ||

			    pp->num_vectors == 0) {

				dev_err(dev,

					"Invalid number of vectors\n");

			return -EINVAL;

			return -EINVAL;

		}

		}

		}





		if (!pp->ops->msi_host_init) {

		if (!pp->ops->msi_host_init) {

			pp->msi_irq_chip = &dw_pci_msi_bottom_irq_chip;

			pp->msi_irq_chip = &dw_pci_msi_bottom_irq_chip;

drivers/pci/controller/dwc/pcie-designware-plat.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -44,14 +44,8 @@ static int dw_plat_pcie_host_init(struct pcie_port *pp) 
	return 0;

	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 = {

static const struct dw_pcie_host_ops dw_plat_pcie_host_ops = {

	.host_init = dw_plat_pcie_host_init,

	.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)

static int dw_plat_pcie_establish_link(struct dw_pcie *pci)
@@ -128,6 +122,7 @@ static int dw_plat_add_pcie_port(struct dw_plat_pcie *dw_plat_pcie, 
			return pp->msi_irq;

			return pp->msi_irq;

	}

	}





	pp->num_vectors = MAX_MSI_IRQS;

	pp->ops = &dw_plat_pcie_host_ops;

	pp->ops = &dw_plat_pcie_host_ops;





	ret = dw_pcie_host_init(pp);

	ret = dw_pcie_host_init(pp);

drivers/pci/controller/dwc/pcie-designware.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,6 @@ enum dw_pcie_device_mode { 




struct dw_pcie_host_ops {

struct dw_pcie_host_ops {

	int (*host_init)(struct pcie_port *pp);

	int (*host_init)(struct pcie_port *pp);

	void (*set_num_vectors)(struct pcie_port *pp);

	int (*msi_host_init)(struct pcie_port *pp);

	int (*msi_host_init)(struct pcie_port *pp);

};

};

drivers/pci/controller/dwc/pcie-tegra194.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -990,11 +990,6 @@ static int tegra_pcie_dw_link_up(struct dw_pcie *pci) 
	return !!(val & PCI_EXP_LNKSTA_DLLLA);

	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)

static int tegra_pcie_dw_start_link(struct dw_pcie *pci)

{

{

	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);

	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
@@ -1019,7 +1014,6 @@ static const struct dw_pcie_ops tegra_dw_pcie_ops = { 




static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {

static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {

	.host_init = tegra_pcie_dw_host_init,

	.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)

static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie)
@@ -1995,6 +1989,7 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) 
	pci->n_fts[1] = FTS_VAL;

	pci->n_fts[1] = FTS_VAL;





	pp = &pci->pp;

	pp = &pci->pp;

	pp->num_vectors = MAX_MSI_IRQS;

	pcie->dev = &pdev->dev;

	pcie->dev = &pdev->dev;

	pcie->mode = (enum dw_pcie_device_mode)data->mode;

	pcie->mode = (enum dw_pcie_device_mode)data->mode;