PCI: dwc: remove useless dw_pcie_ops

PATCH Applied Jisheng Zhang 2 participants 4 messages Jan 28, 2021

Subsystems (4)

PCI PCI native host bridge and endpoint drivers PCI driver for synopsys DesignWare PCIe driver for amazon annapurna labs

lore

Share & tools

lore

Jisheng Zhang

author

2021-01-28 06:45 UTC #0 lore raw

v3 cover PCI: dwc: remove useless dw_pcie_ops

Some designware based device driver especially host only driver may work well with the default read_dbi/write_dbi/link_up implementation in pcie-designware.c, thus remove the assumption to simplify those drivers.

Since v2:
- rebase to the latest pci/dwc
- add Acked-by tag

Since v1:
- rebase to the latest dwc-next

Jisheng Zhang (2):
PCI: dwc: Don't assume the ops in dw_pcie always exists
PCI: dwc: al: Remove useless dw_pcie_ops

 drivers/pci/controller/dwc/pcie-al.c              |  4 ----
 drivers/pci/controller/dwc/pcie-designware-ep.c   |  8 +++-----
 drivers/pci/controller/dwc/pcie-designware-host.c |  2 +-
 drivers/pci/controller/dwc/pcie-designware.c      | 14 +++++++-------
 4 files changed, 11 insertions(+), 17 deletions(-)

Signature · 1 line

2.30.0

Jisheng Zhang

author

2021-01-28 06:44 UTC #1 lore raw

PATCH v3 1/2 PCI: dwc: Don't assume the ops in dw_pcie always exists

Signed-off-by Jisheng Zhang <[email protected]>

---
 drivers/pci/controller/dwc/pcie-designware-ep.c   |  8 +++-----
 drivers/pci/controller/dwc/pcie-designware-host.c |  2 +-
 drivers/pci/controller/dwc/pcie-designware.c      | 14 +++++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

drivers/pci/controller/dwc/pcie-designware-ep.c +3 -5

index bcd1cd9ba8c8..1c25d8337151 100644
@@ -434,10 +434,8 @@ static void dw_pcie_ep_stop(struct pci_epc *epc)
 	struct dw_pcie_ep *ep = epc_get_drvdata(epc);
 	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
 
-	if (!pci->ops->stop_link)
-		return;
-
-	pci->ops->stop_link(pci);
+	if (pci->ops && pci->ops->stop_link)
+		pci->ops->stop_link(pci);
 }
 
 static int dw_pcie_ep_start(struct pci_epc *epc)

@@ -445,7 +443,7 @@ static int dw_pcie_ep_start(struct pci_epc *epc)
 	struct dw_pcie_ep *ep = epc_get_drvdata(epc);
 	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
 
-	if (!pci->ops->start_link)
+	if (!pci->ops || !pci->ops->start_link)
 		return -EINVAL;
 
 	return pci->ops->start_link(pci);

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

index bcb5bd7ec5ef..0f0d8f477596 100644
@@ -404,7 +404,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
 	dw_pcie_setup_rc(pp);
 	dw_pcie_msi_init(pp);
 
-	if (!dw_pcie_link_up(pci) && pci->ops->start_link) {
+	if (!dw_pcie_link_up(pci) && pci->ops && pci->ops->start_link) {
 		ret = pci->ops->start_link(pci);
 		if (ret)
 			goto err_free_msi;

drivers/pci/controller/dwc/pcie-designware.c +7 -7

index 5b72a5448d2e..ea1c07146442 100644
@@ -141,7 +141,7 @@ u32 dw_pcie_read_dbi(struct dw_pcie *pci, u32 reg, size_t size)
 	int ret;
 	u32 val;
 
-	if (pci->ops->read_dbi)
+	if (pci->ops && pci->ops->read_dbi)
 		return pci->ops->read_dbi(pci, pci->dbi_base, reg, size);
 
 	ret = dw_pcie_read(pci->dbi_base + reg, size, &val);

@@ -156,7 +156,7 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val)
 {
 	int ret;
 
-	if (pci->ops->write_dbi) {
+	if (pci->ops && pci->ops->write_dbi) {
 		pci->ops->write_dbi(pci, pci->dbi_base, reg, size, val);
 		return;
 	}

@@ -171,7 +171,7 @@ void dw_pcie_write_dbi2(struct dw_pcie *pci, u32 reg, size_t size, u32 val)
 {
 	int ret;
 
-	if (pci->ops->write_dbi2) {
+	if (pci->ops && pci->ops->write_dbi2) {
 		pci->ops->write_dbi2(pci, pci->dbi_base2, reg, size, val);
 		return;
 	}

@@ -186,7 +186,7 @@ static u32 dw_pcie_readl_atu(struct dw_pcie *pci, u32 reg)
 	int ret;
 	u32 val;
 
-	if (pci->ops->read_dbi)
+	if (pci->ops && pci->ops->read_dbi)
 		return pci->ops->read_dbi(pci, pci->atu_base, reg, 4);
 
 	ret = dw_pcie_read(pci->atu_base + reg, 4, &val);

@@ -200,7 +200,7 @@ static void dw_pcie_writel_atu(struct dw_pcie *pci, u32 reg, u32 val)
 {
 	int ret;
 
-	if (pci->ops->write_dbi) {
+	if (pci->ops && pci->ops->write_dbi) {
 		pci->ops->write_dbi(pci, pci->atu_base, reg, 4, val);
 		return;
 	}

@@ -315,7 +315,7 @@ static void __dw_pcie_prog_outbound_atu(struct dw_pcie *pci, u8 func_no,
 {
 	u32 retries, val;
 
-	if (pci->ops->cpu_addr_fixup)
+	if (pci->ops && pci->ops->cpu_addr_fixup)
 		cpu_addr = pci->ops->cpu_addr_fixup(pci, cpu_addr);
 
 	if (pci->iatu_unroll_enabled) {

@@ -525,7 +525,7 @@ int dw_pcie_link_up(struct dw_pcie *pci)
 {
 	u32 val;
 
-	if (pci->ops->link_up)
+	if (pci->ops && pci->ops->link_up)
 		return pci->ops->link_up(pci);
 
 	val = readl(pci->dbi_base + PCIE_PORT_DEBUG1);

Signature · 1 line

2.30.0

Jisheng Zhang

author

2021-01-28 06:45 UTC #2 lore raw

PATCH v3 2/2 PCI: dwc: al: Remove useless dw_pcie_ops

In reply to Jisheng Zhang

We have removed the dw_pcie_ops always exists assumption in dwc core driver, we can remove the useless dw_pcie_ops now.

Signed-off-by Jisheng Zhang <[email protected]>

Acked-by Jonathan Chocron <[email protected]>

---
 drivers/pci/controller/dwc/pcie-al.c | 4 ----
 1 file changed, 4 deletions(-)

drivers/pci/controller/dwc/pcie-al.c +0 -4

index abf37aa68e51..e8afa50129a8 100644
@@ -314,9 +314,6 @@ static const struct dw_pcie_host_ops al_pcie_host_ops = {
 	.host_init = al_pcie_host_init,
 };
 
-static const struct dw_pcie_ops dw_pcie_ops = {
-};
-
 static int al_pcie_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;

@@ -334,7 +331,6 @@ static int al_pcie_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	pci->dev = dev;
-	pci->ops = &dw_pcie_ops;
 	pci->pp.ops = &al_pcie_host_ops;
 
 	al_pcie->pci = pci;

Signature · 1 line

2.30.0

Lorenzo Pieralisi

Applied

2021-01-28 10:40 UTC #3 lore raw

In reply to Jisheng Zhang

Quoted 10 lines · Jisheng Zhang

Some designware based device driver especially host only driver may work well with the default read_dbi/write_dbi/link_up implementation in pcie-designware.c, thus remove the assumption to simplify those drivers.
Since v2:
- rebase to the latest pci/dwc
- add Acked-by tag
[...]

Applied to pci/dwc, thanks!

[1/2] PCI: dwc: Don't assume the ops in dw_pcie always exists

      https://git.kernel.org/lpieralisi/pci/c/f2213e5f3b
[2/2] PCI: dwc: al: Remove useless dw_pcie_ops
      https://git.kernel.org/lpieralisi/pci/c/05e11f20f5

Thanks,
Lorenzo