diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2025-07-31 16:12:13 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-07-31 16:12:13 -0500 |
commit | 4441df6adcb355d5ce6e1a94e31ea3296059d53f (patch) | |
tree | 2987750484cea2a9193763b92f12394b6c8af0b3 /drivers | |
parent | dc6061ed6becae8baabc5c6fd1c4cbf1f8ffa41f (diff) | |
parent | f28413fe0899591492d8ca3cdf5fd35558d9c05d (diff) |
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 | ||||
-rw-r--r-- | drivers/pci/controller/cadence/pcie-cadence.h | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c index 8ab6cf70c18eb..77c5a19b2ab1c 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c @@ -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); } diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/controller/cadence/pcie-cadence.h index a149845d341ae..1d81c4bf6c6db 100644 --- a/drivers/pci/controller/cadence/pcie-cadence.h +++ b/drivers/pci/controller/cadence/pcie-cadence.h @@ -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); |