Commit 4441df6a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/cadence' 

- Use PCIe Message routing types from the PCI core rather than defining
  private ones (Hans Zhang)

* pci/controller/cadence:
  PCI: cadence: Replace private message routing enums with PCI core definitions
parents dc6061ed f28413fe

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

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static void cdns_pcie_ep_assert_intx(struct cdns_pcie_ep *ep, u8 fn, u8 intx, 
	}

	spin_unlock_irqrestore(&ep->lock, flags);



	offset = CDNS_PCIE_NORMAL_MSG_ROUTING(MSG_ROUTING_LOCAL) |

	offset = CDNS_PCIE_NORMAL_MSG_ROUTING(PCIE_MSG_TYPE_R_LOCAL) |

		 CDNS_PCIE_NORMAL_MSG_CODE(msg_code);

	writel(0, ep->irq_cpu_addr + offset);

}

drivers/pci/controller/cadence/pcie-cadence.h

+0 −20
Original line number Diff line number Diff line
@@ -250,26 +250,6 @@ struct cdns_pcie_rp_ib_bar { 


struct cdns_pcie;



enum cdns_pcie_msg_routing {

	/* Route to Root Complex */

	MSG_ROUTING_TO_RC,



	/* Use Address Routing */

	MSG_ROUTING_BY_ADDR,



	/* Use ID Routing */

	MSG_ROUTING_BY_ID,



	/* Route as Broadcast Message from Root Complex */

	MSG_ROUTING_BCAST,



	/* Local message; terminate at receiver (INTx messages) */

	MSG_ROUTING_LOCAL,



	/* Gather & route to Root Complex (PME_TO_Ack message) */

	MSG_ROUTING_GATHER,

};



struct cdns_pcie_ops {

	int	(*start_link)(struct cdns_pcie *pcie);

	void	(*stop_link)(struct cdns_pcie *pcie);