Commit 77d08dbd authored by Niklas Cassel's avatar Niklas Cassel Committed by Lorenzo Pieralisi
Browse files

PCI: endpoint: Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar 



Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar.

This is needed so that epc->ops->clear_bar() can clear the BAR pair,
if the BAR is 64-bits wide.

This also makes it possible for pci_epc_clear_bar() to sanity check
the flags.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarGustavo Pimentel <gustavo.pimentel@synopsys.com>
parent fca83058

drivers/pci/cadence/pcie-cadence-ep.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -145,10 +145,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, 
}

}





static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn,

static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn,

				   enum pci_barno bar)

				   struct pci_epf_bar *epf_bar)

{

{

	struct cdns_pcie_ep *ep = epc_get_drvdata(epc);

	struct cdns_pcie_ep *ep = epc_get_drvdata(epc);

	struct cdns_pcie *pcie = &ep->pcie;

	struct cdns_pcie *pcie = &ep->pcie;

	enum pci_barno bar = epf_bar->barno;

	u32 reg, cfg, b, ctrl;

	u32 reg, cfg, b, ctrl;





	if (bar < BAR_4) {

	if (bar < BAR_4) {

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

+10 −3
Original line number Original line Diff line number Diff line
@@ -19,7 +19,8 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) 
	pci_epc_linkup(epc);

	pci_epc_linkup(epc);

}

}





void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)

static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar,

				   int flags)

{

{

	u32 reg;

	u32 reg;
@@ -30,6 +31,11 @@ void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) 
	dw_pcie_dbi_ro_wr_dis(pci);

	dw_pcie_dbi_ro_wr_dis(pci);

}

}





void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)

{

	__dw_pcie_ep_reset_bar(pci, bar, 0);

}



static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no,

static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no,

				   struct pci_epf_header *hdr)

				   struct pci_epf_header *hdr)

{

{
@@ -104,13 +110,14 @@ static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, phys_addr_t phys_addr, 
}

}





static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no,

static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no,

				 enum pci_barno bar)

				 struct pci_epf_bar *epf_bar)

{

{

	struct dw_pcie_ep *ep = epc_get_drvdata(epc);

	struct dw_pcie_ep *ep = epc_get_drvdata(epc);

	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);

	struct dw_pcie *pci = to_dw_pcie_from_ep(ep);

	enum pci_barno bar = epf_bar->barno;

	u32 atu_index = ep->bar_to_atu[bar];

	u32 atu_index = ep->bar_to_atu[bar];





	dw_pcie_ep_reset_bar(pci, bar);

	__dw_pcie_ep_reset_bar(pci, bar, epf_bar->flags);





	dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND);

	dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND);

	clear_bit(atu_index, ep->ib_window_map);

	clear_bit(atu_index, ep->ib_window_map);

drivers/pci/endpoint/functions/pci-epf-test.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -344,14 +344,17 @@ static void pci_epf_test_unbind(struct pci_epf *epf) 
{

{

	struct pci_epf_test *epf_test = epf_get_drvdata(epf);

	struct pci_epf_test *epf_test = epf_get_drvdata(epf);

	struct pci_epc *epc = epf->epc;

	struct pci_epc *epc = epf->epc;

	struct pci_epf_bar *epf_bar;

	int bar;

	int bar;





	cancel_delayed_work(&epf_test->cmd_handler);

	cancel_delayed_work(&epf_test->cmd_handler);

	pci_epc_stop(epc);

	pci_epc_stop(epc);

	for (bar = BAR_0; bar <= BAR_5; bar++) {

	for (bar = BAR_0; bar <= BAR_5; bar++) {

		epf_bar = &epf->bar[bar];



		if (epf_test->reg[bar]) {

		if (epf_test->reg[bar]) {

			pci_epf_free_space(epf, epf_test->reg[bar], bar);

			pci_epf_free_space(epf, epf_test->reg[bar], bar);

			pci_epc_clear_bar(epc, epf->func_no, bar);

			pci_epc_clear_bar(epc, epf->func_no, epf_bar);

		}

		}

	}

	}

}

}

drivers/pci/endpoint/pci-epc-core.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -276,11 +276,12 @@ EXPORT_SYMBOL_GPL(pci_epc_map_addr); 
 * pci_epc_clear_bar() - reset the BAR

 * pci_epc_clear_bar() - reset the BAR

 * @epc: the EPC device for which the BAR has to be cleared

 * @epc: the EPC device for which the BAR has to be cleared

 * @func_no: the endpoint function number in the EPC device

 * @func_no: the endpoint function number in the EPC device

 * @bar: the BAR number that has to be reset

 * @epf_bar: the struct epf_bar that contains the BAR information

 *

 *

 * Invoke to reset the BAR of the endpoint device.

 * Invoke to reset the BAR of the endpoint device.

 */

 */

void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar)

void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no,

		       struct pci_epf_bar *epf_bar)

{

{

	unsigned long flags;

	unsigned long flags;
@@ -291,7 +292,7 @@ void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar) 
		return;

		return;





	spin_lock_irqsave(&epc->lock, flags);

	spin_lock_irqsave(&epc->lock, flags);

	epc->ops->clear_bar(epc, func_no, bar);

	epc->ops->clear_bar(epc, func_no, epf_bar);

	spin_unlock_irqrestore(&epc->lock, flags);

	spin_unlock_irqrestore(&epc->lock, flags);

}

}

EXPORT_SYMBOL_GPL(pci_epc_clear_bar);

EXPORT_SYMBOL_GPL(pci_epc_clear_bar);

include/linux/pci-epc.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ struct pci_epc_ops { 
	int	(*set_bar)(struct pci_epc *epc, u8 func_no,

	int	(*set_bar)(struct pci_epc *epc, u8 func_no,

			   struct pci_epf_bar *epf_bar);

			   struct pci_epf_bar *epf_bar);

	void	(*clear_bar)(struct pci_epc *epc, u8 func_no,

	void	(*clear_bar)(struct pci_epc *epc, u8 func_no,

			     enum pci_barno bar);

			     struct pci_epf_bar *epf_bar);

	int	(*map_addr)(struct pci_epc *epc, u8 func_no,

	int	(*map_addr)(struct pci_epc *epc, u8 func_no,

			    phys_addr_t addr, u64 pci_addr, size_t size);

			    phys_addr_t addr, u64 pci_addr, size_t size);

	void	(*unmap_addr)(struct pci_epc *epc, u8 func_no,

	void	(*unmap_addr)(struct pci_epc *epc, u8 func_no,
@@ -127,7 +127,8 @@ int pci_epc_write_header(struct pci_epc *epc, u8 func_no, 
			 struct pci_epf_header *hdr);

			 struct pci_epf_header *hdr);

int pci_epc_set_bar(struct pci_epc *epc, u8 func_no,

int pci_epc_set_bar(struct pci_epc *epc, u8 func_no,

		    struct pci_epf_bar *epf_bar);

		    struct pci_epf_bar *epf_bar);

void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar);

void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no,

		       struct pci_epf_bar *epf_bar);

int pci_epc_map_addr(struct pci_epc *epc, u8 func_no,

int pci_epc_map_addr(struct pci_epc *epc, u8 func_no,

		     phys_addr_t phys_addr,

		     phys_addr_t phys_addr,

		     u64 pci_addr, size_t size);

		     u64 pci_addr, size_t size);