Unverified Commit 9baa8a18 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Krzysztof Wilczyński
Browse files

PCI: dwc: endpoint: Introduce .pre_init() and .deinit() 

Renesas R-Car Gen4 PCIe controllers require vendor-specific
initialization before .init().

To use dw->dbi and dw->num-lanes in the initialization code,
introduce .pre_init() into struct dw_pcie_ep_ops. While at it,
also introduce .deinit() to disable the controller by using
vendor-specific de-initialization.

Note that the ep_init in the struct dw_pcie_ep_ops should be
renamed to init later.

Link: https://lore.kernel.org/linux-pci/20231018085631.1121289-9-yoshihiro.shimoda.uh@renesas.com


Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
parent 303e8453

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

+11 −1
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ void dw_pcie_ep_exit(struct dw_pcie_ep *ep) 
			      epc->mem->window.page_size);



	pci_epc_mem_exit(epc);



	if (ep->ops->deinit)

		ep->ops->deinit(ep);

}

EXPORT_SYMBOL_GPL(dw_pcie_ep_exit);
@@ -740,6 +743,9 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
	ep->phys_base = res->start;

	ep->addr_size = resource_size(res);



	if (ep->ops->pre_init)

		ep->ops->pre_init(ep);



	dw_pcie_version_detect(pci);



	dw_pcie_iatu_detect(pci);
@@ -794,7 +800,7 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
			       ep->page_size);

	if (ret < 0) {

		dev_err(dev, "Failed to initialize address space\n");

		return ret;

		goto err_ep_deinit;

	}



	ep->msi_mem = pci_epc_mem_alloc_addr(epc, &ep->msi_mem_phys,
@@ -831,6 +837,10 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
err_exit_epc_mem:

	pci_epc_mem_exit(epc);



err_ep_deinit:

	if (ep->ops->deinit)

		ep->ops->deinit(ep);



	return ret;

}

EXPORT_SYMBOL_GPL(dw_pcie_ep_init);

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

+2 −0
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ struct dw_pcie_rp { 
};



struct dw_pcie_ep_ops {

	void	(*pre_init)(struct dw_pcie_ep *ep);

	void	(*ep_init)(struct dw_pcie_ep *ep);

	void	(*deinit)(struct dw_pcie_ep *ep);

	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,

			     enum pci_epc_irq_type type, u16 interrupt_num);

	const struct pci_epc_features* (*get_features)(struct dw_pcie_ep *ep);