Commit 60b3c27f authored by Serge Semin's avatar Serge Semin Committed by Bjorn Helgaas
Browse files

PCI: dwc: Rename struct pcie_port to dw_pcie_rp 

All of the DW PCIe core driver entities except the pcie_port struct have
names with the "dw_" prefix to distinguish local and common PCIe name
spaces, and endpoint-related entities have an "_ep" suffix.

Rename struct pcie_port to dw_pcie_rp to make it more consistent with other
names.

[bhelgaas: commit log]
Link: https://lore.kernel.org/r/20220624143428.8334-16-Sergey.Semin@baikalelectronics.ru


Signed-off-by: default avatarSerge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent d6bdbcd8

drivers/pci/controller/dwc/pci-dra7xx.c

+6 −6
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx) 
	dra7xx_pcie_enable_msi_interrupts(dra7xx);

}



static int dra7xx_pcie_host_init(struct pcie_port *pp)

static int dra7xx_pcie_host_init(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
@@ -202,7 +202,7 @@ static const struct irq_domain_ops intx_domain_ops = { 
	.xlate = pci_irqd_intx_xlate,

};



static int dra7xx_pcie_handle_msi(struct pcie_port *pp, int index)

static int dra7xx_pcie_handle_msi(struct dw_pcie_rp *pp, int index)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	unsigned long val;
@@ -224,7 +224,7 @@ static int dra7xx_pcie_handle_msi(struct pcie_port *pp, int index) 
	return 1;

}



static void dra7xx_pcie_handle_msi_irq(struct pcie_port *pp)

static void dra7xx_pcie_handle_msi_irq(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	int ret, i, count, num_ctrls;
@@ -255,8 +255,8 @@ static void dra7xx_pcie_msi_irq_handler(struct irq_desc *desc) 
{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct dra7xx_pcie *dra7xx;

	struct dw_pcie_rp *pp;

	struct dw_pcie *pci;

	struct pcie_port *pp;

	unsigned long reg;

	u32 bit;
@@ -344,7 +344,7 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg) 
	return IRQ_HANDLED;

}



static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)

static int dra7xx_pcie_init_irq_domain(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct device *dev = pci->dev;
@@ -475,7 +475,7 @@ static int dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
{

	int ret;

	struct dw_pcie *pci = dra7xx->pci;

	struct pcie_port *pp = &pci->pp;

	struct dw_pcie_rp *pp = &pci->pp;

	struct device *dev = pci->dev;



	pp->irq = platform_get_irq(pdev, 1);

drivers/pci/controller/dwc/pci-exynos.c

+3 −3
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int exynos_pcie_link_up(struct dw_pcie *pci) 
	return (val & PCIE_ELBI_XMLH_LINKUP);

}



static int exynos_pcie_host_init(struct pcie_port *pp)

static int exynos_pcie_host_init(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct exynos_pcie *ep = to_exynos_pcie(pci);
@@ -276,7 +276,7 @@ static int exynos_add_pcie_port(struct exynos_pcie *ep, 
				       struct platform_device *pdev)

{

	struct dw_pcie *pci = &ep->pci;

	struct pcie_port *pp = &pci->pp;

	struct dw_pcie_rp *pp = &pci->pp;

	struct device *dev = &pdev->dev;

	int ret;
@@ -406,7 +406,7 @@ static int __maybe_unused exynos_pcie_resume_noirq(struct device *dev) 
{

	struct exynos_pcie *ep = dev_get_drvdata(dev);

	struct dw_pcie *pci = &ep->pci;

	struct pcie_port *pp = &pci->pp;

	struct dw_pcie_rp *pp = &pci->pp;

	int ret;



	ret = regulator_bulk_enable(ARRAY_SIZE(ep->supplies), ep->supplies);

drivers/pci/controller/dwc/pci-imx6.c

+3 −3
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) 
	return ret;

}



static int imx6_pcie_host_init(struct pcie_port *pp)

static int imx6_pcie_host_init(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
@@ -992,7 +992,7 @@ static int imx6_pcie_resume_noirq(struct device *dev) 
{

	int ret;

	struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);

	struct pcie_port *pp = &imx6_pcie->pci->pp;

	struct dw_pcie_rp *pp = &imx6_pcie->pci->pp;



	if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND))

		return 0;
@@ -1291,7 +1291,7 @@ static struct platform_driver imx6_pcie_driver = { 
static void imx6_pcie_quirk(struct pci_dev *dev)

{

	struct pci_bus *bus = dev->bus;

	struct pcie_port *pp = bus->sysdata;

	struct dw_pcie_rp *pp = bus->sysdata;



	/* Bus parent is the PCI bridge, its parent is this platform driver */

	if (!bus->dev.parent || !bus->dev.parent->parent)

drivers/pci/controller/dwc/pci-keystone.c

+10 −10
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void ks_pcie_app_writel(struct keystone_pcie *ks_pcie, u32 offset, 


static void ks_pcie_msi_irq_ack(struct irq_data *data)

{

	struct pcie_port *pp  = irq_data_get_irq_chip_data(data);

	struct dw_pcie_rp *pp  = irq_data_get_irq_chip_data(data);

	struct keystone_pcie *ks_pcie;

	u32 irq = data->hwirq;

	struct dw_pcie *pci;
@@ -167,7 +167,7 @@ static void ks_pcie_msi_irq_ack(struct irq_data *data) 


static void ks_pcie_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)

{

	struct pcie_port *pp = irq_data_get_irq_chip_data(data);

	struct dw_pcie_rp *pp = irq_data_get_irq_chip_data(data);

	struct keystone_pcie *ks_pcie;

	struct dw_pcie *pci;

	u64 msi_target;
@@ -192,7 +192,7 @@ static int ks_pcie_msi_set_affinity(struct irq_data *irq_data, 


static void ks_pcie_msi_mask(struct irq_data *data)

{

	struct pcie_port *pp = irq_data_get_irq_chip_data(data);

	struct dw_pcie_rp *pp = irq_data_get_irq_chip_data(data);

	struct keystone_pcie *ks_pcie;

	u32 irq = data->hwirq;

	struct dw_pcie *pci;
@@ -216,7 +216,7 @@ static void ks_pcie_msi_mask(struct irq_data *data) 


static void ks_pcie_msi_unmask(struct irq_data *data)

{

	struct pcie_port *pp = irq_data_get_irq_chip_data(data);

	struct dw_pcie_rp *pp = irq_data_get_irq_chip_data(data);

	struct keystone_pcie *ks_pcie;

	u32 irq = data->hwirq;

	struct dw_pcie *pci;
@@ -247,7 +247,7 @@ static struct irq_chip ks_pcie_msi_irq_chip = { 
	.irq_unmask = ks_pcie_msi_unmask,

};



static int ks_pcie_msi_host_init(struct pcie_port *pp)

static int ks_pcie_msi_host_init(struct dw_pcie_rp *pp)

{

	pp->msi_irq_chip = &ks_pcie_msi_irq_chip;

	return dw_pcie_allocate_domains(pp);
@@ -390,7 +390,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) 
	u32 val;

	u32 num_viewport = ks_pcie->num_viewport;

	struct dw_pcie *pci = ks_pcie->pci;

	struct pcie_port *pp = &pci->pp;

	struct dw_pcie_rp *pp = &pci->pp;

	u64 start, end;

	struct resource *mem;

	int i;
@@ -428,7 +428,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) 
static void __iomem *ks_pcie_other_map_bus(struct pci_bus *bus,

					   unsigned int devfn, int where)

{

	struct pcie_port *pp = bus->sysdata;

	struct dw_pcie_rp *pp = bus->sysdata;

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);

	u32 reg;
@@ -456,7 +456,7 @@ static struct pci_ops ks_child_pcie_ops = { 
 */

static int ks_pcie_v3_65_add_bus(struct pci_bus *bus)

{

	struct pcie_port *pp = bus->sysdata;

	struct dw_pcie_rp *pp = bus->sysdata;

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
@@ -574,7 +574,7 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc) 
	struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);

	u32 offset = irq - ks_pcie->msi_host_irq;

	struct dw_pcie *pci = ks_pcie->pci;

	struct pcie_port *pp = &pci->pp;

	struct dw_pcie_rp *pp = &pci->pp;

	struct device *dev = pci->dev;

	struct irq_chip *chip = irq_desc_get_chip(desc);

	u32 vector, reg, pos;
@@ -799,7 +799,7 @@ static int __init ks_pcie_init_id(struct keystone_pcie *ks_pcie) 
	return 0;

}



static int __init ks_pcie_host_init(struct pcie_port *pp)

static int __init ks_pcie_host_init(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);

drivers/pci/controller/dwc/pci-layerscape.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void ls_pcie_fix_error_response(struct ls_pcie *pcie) 
	iowrite32(PCIE_ABSERR_SETTING, pci->dbi_base + PCIE_ABSERR);

}



static int ls_pcie_host_init(struct pcie_port *pp)

static int ls_pcie_host_init(struct dw_pcie_rp *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct ls_pcie *pcie = to_ls_pcie(pci);