Skip to content

Commit f966c02

Browse files
mindachen1987bjorn-helgaas
mindachen1987
authored and
bjorn-helgaas
committed
PCI: microchip: Rename interrupt related functions
Rename mc_* to plda_* for IRQ functions and related IRQ domain ops data instances. MSI, INTx interrupt code and IRQ init code can all be re-used. Link: https://lore.kernel.org/linux-pci/[email protected] Signed-off-by: Minda Chen <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Conor Dooley <[email protected]>
1 parent 39bd5f8 commit f966c02

File tree

1 file changed

+57
-52
lines changed

1 file changed

+57
-52
lines changed

‎drivers/pci/controller/plda/pcie-microchip-host.c

Lines changed: 57 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static void mc_pcie_enable_msi(struct mc_pcie *port, void __iomem *ecam)
318318
ecam + MC_MSI_CAP_CTRL_OFFSET + PCI_MSI_ADDRESS_HI);
319319
}
320320

321-
static void mc_handle_msi(struct irq_desc *desc)
321+
static void plda_handle_msi(struct irq_desc *desc)
322322
{
323323
struct plda_pcie_rp *port = irq_desc_get_handler_data(desc);
324324
struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -346,7 +346,7 @@ static void mc_handle_msi(struct irq_desc *desc)
346346
chained_irq_exit(chip, desc);
347347
}
348348

349-
static void mc_msi_bottom_irq_ack(struct irq_data *data)
349+
static void plda_msi_bottom_irq_ack(struct irq_data *data)
350350
{
351351
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(data);
352352
void __iomem *bridge_base_addr = port->bridge_addr;
@@ -355,7 +355,7 @@ static void mc_msi_bottom_irq_ack(struct irq_data *data)
355355
writel_relaxed(BIT(bitpos), bridge_base_addr + ISTATUS_MSI);
356356
}
357357

358-
static void mc_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
358+
static void plda_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
359359
{
360360
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(data);
361361
phys_addr_t addr = port->msi.vector_phy;
@@ -368,21 +368,23 @@ static void mc_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
368368
(int)data->hwirq, msg->address_hi, msg->address_lo);
369369
}
370370

371-
static int mc_msi_set_affinity(struct irq_data *irq_data,
372-
const struct cpumask *mask, bool force)
371+
static int plda_msi_set_affinity(struct irq_data *irq_data,
372+
const struct cpumask *mask, bool force)
373373
{
374374
return -EINVAL;
375375
}
376376

377-
static struct irq_chip mc_msi_bottom_irq_chip = {
378-
.name = "Microchip MSI",
379-
.irq_ack = mc_msi_bottom_irq_ack,
380-
.irq_compose_msi_msg = mc_compose_msi_msg,
381-
.irq_set_affinity = mc_msi_set_affinity,
377+
static struct irq_chip plda_msi_bottom_irq_chip = {
378+
.name = "PLDA MSI",
379+
.irq_ack = plda_msi_bottom_irq_ack,
380+
.irq_compose_msi_msg = plda_compose_msi_msg,
381+
.irq_set_affinity = plda_msi_set_affinity,
382382
};
383383

384-
static int mc_irq_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,
385-
unsigned int nr_irqs, void *args)
384+
static int plda_irq_msi_domain_alloc(struct irq_domain *domain,
385+
unsigned int virq,
386+
unsigned int nr_irqs,
387+
void *args)
386388
{
387389
struct plda_pcie_rp *port = domain->host_data;
388390
struct plda_msi *msi = &port->msi;
@@ -397,16 +399,17 @@ static int mc_irq_msi_domain_alloc(struct irq_domain *domain, unsigned int virq,
397399

398400
set_bit(bit, msi->used);
399401

400-
irq_domain_set_info(domain, virq, bit, &mc_msi_bottom_irq_chip,
402+
irq_domain_set_info(domain, virq, bit, &plda_msi_bottom_irq_chip,
401403
domain->host_data, handle_edge_irq, NULL, NULL);
402404

403405
mutex_unlock(&msi->lock);
404406

405407
return 0;
406408
}
407409

408-
static void mc_irq_msi_domain_free(struct irq_domain *domain, unsigned int virq,
409-
unsigned int nr_irqs)
410+
static void plda_irq_msi_domain_free(struct irq_domain *domain,
411+
unsigned int virq,
412+
unsigned int nr_irqs)
410413
{
411414
struct irq_data *d = irq_domain_get_irq_data(domain, virq);
412415
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(d);
@@ -423,24 +426,24 @@ static void mc_irq_msi_domain_free(struct irq_domain *domain, unsigned int virq,
423426
}
424427

425428
static const struct irq_domain_ops msi_domain_ops = {
426-
.alloc = mc_irq_msi_domain_alloc,
427-
.free = mc_irq_msi_domain_free,
429+
.alloc = plda_irq_msi_domain_alloc,
430+
.free = plda_irq_msi_domain_free,
428431
};
429432

430-
static struct irq_chip mc_msi_irq_chip = {
431-
.name = "Microchip PCIe MSI",
433+
static struct irq_chip plda_msi_irq_chip = {
434+
.name = "PLDA PCIe MSI",
432435
.irq_ack = irq_chip_ack_parent,
433436
.irq_mask = pci_msi_mask_irq,
434437
.irq_unmask = pci_msi_unmask_irq,
435438
};
436439

437-
static struct msi_domain_info mc_msi_domain_info = {
440+
static struct msi_domain_info plda_msi_domain_info = {
438441
.flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
439442
MSI_FLAG_PCI_MSIX),
440-
.chip = &mc_msi_irq_chip,
443+
.chip = &plda_msi_irq_chip,
441444
};
442445

443-
static int mc_allocate_msi_domains(struct plda_pcie_rp *port)
446+
static int plda_allocate_msi_domains(struct plda_pcie_rp *port)
444447
{
445448
struct device *dev = port->dev;
446449
struct fwnode_handle *fwnode = of_node_to_fwnode(dev->of_node);
@@ -455,7 +458,8 @@ static int mc_allocate_msi_domains(struct plda_pcie_rp *port)
455458
return -ENOMEM;
456459
}
457460

458-
msi->msi_domain = pci_msi_create_irq_domain(fwnode, &mc_msi_domain_info,
461+
msi->msi_domain = pci_msi_create_irq_domain(fwnode,
462+
&plda_msi_domain_info,
459463
msi->dev_domain);
460464
if (!msi->msi_domain) {
461465
dev_err(dev, "failed to create MSI domain\n");
@@ -466,7 +470,7 @@ static int mc_allocate_msi_domains(struct plda_pcie_rp *port)
466470
return 0;
467471
}
468472

469-
static void mc_handle_intx(struct irq_desc *desc)
473+
static void plda_handle_intx(struct irq_desc *desc)
470474
{
471475
struct plda_pcie_rp *port = irq_desc_get_handler_data(desc);
472476
struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -493,7 +497,7 @@ static void mc_handle_intx(struct irq_desc *desc)
493497
chained_irq_exit(chip, desc);
494498
}
495499

496-
static void mc_ack_intx_irq(struct irq_data *data)
500+
static void plda_ack_intx_irq(struct irq_data *data)
497501
{
498502
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(data);
499503
void __iomem *bridge_base_addr = port->bridge_addr;
@@ -502,7 +506,7 @@ static void mc_ack_intx_irq(struct irq_data *data)
502506
writel_relaxed(mask, bridge_base_addr + ISTATUS_LOCAL);
503507
}
504508

505-
static void mc_mask_intx_irq(struct irq_data *data)
509+
static void plda_mask_intx_irq(struct irq_data *data)
506510
{
507511
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(data);
508512
void __iomem *bridge_base_addr = port->bridge_addr;
@@ -517,7 +521,7 @@ static void mc_mask_intx_irq(struct irq_data *data)
517521
raw_spin_unlock_irqrestore(&port->lock, flags);
518522
}
519523

520-
static void mc_unmask_intx_irq(struct irq_data *data)
524+
static void plda_unmask_intx_irq(struct irq_data *data)
521525
{
522526
struct plda_pcie_rp *port = irq_data_get_irq_chip_data(data);
523527
void __iomem *bridge_base_addr = port->bridge_addr;
@@ -532,24 +536,24 @@ static void mc_unmask_intx_irq(struct irq_data *data)
532536
raw_spin_unlock_irqrestore(&port->lock, flags);
533537
}
534538

535-
static struct irq_chip mc_intx_irq_chip = {
536-
.name = "Microchip PCIe INTx",
537-
.irq_ack = mc_ack_intx_irq,
538-
.irq_mask = mc_mask_intx_irq,
539-
.irq_unmask = mc_unmask_intx_irq,
539+
static struct irq_chip plda_intx_irq_chip = {
540+
.name = "PLDA PCIe INTx",
541+
.irq_ack = plda_ack_intx_irq,
542+
.irq_mask = plda_mask_intx_irq,
543+
.irq_unmask = plda_unmask_intx_irq,
540544
};
541545

542-
static int mc_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
543-
irq_hw_number_t hwirq)
546+
static int plda_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
547+
irq_hw_number_t hwirq)
544548
{
545-
irq_set_chip_and_handler(irq, &mc_intx_irq_chip, handle_level_irq);
549+
irq_set_chip_and_handler(irq, &plda_intx_irq_chip, handle_level_irq);
546550
irq_set_chip_data(irq, domain->host_data);
547551

548552
return 0;
549553
}
550554

551555
static const struct irq_domain_ops intx_domain_ops = {
552-
.map = mc_pcie_intx_map,
556+
.map = plda_pcie_intx_map,
553557
};
554558

555559
static inline u32 reg_to_event(u32 reg, struct event_map field)
@@ -609,7 +613,7 @@ static u32 local_events(struct mc_pcie *port)
609613
return val;
610614
}
611615

612-
static u32 get_events(struct plda_pcie_rp *port)
616+
static u32 mc_get_events(struct plda_pcie_rp *port)
613617
{
614618
struct mc_pcie *mc_port = container_of(port, struct mc_pcie, plda);
615619
u32 events = 0;
@@ -638,7 +642,7 @@ static irqreturn_t mc_event_handler(int irq, void *dev_id)
638642
return IRQ_HANDLED;
639643
}
640644

641-
static void mc_handle_event(struct irq_desc *desc)
645+
static void plda_handle_event(struct irq_desc *desc)
642646
{
643647
struct plda_pcie_rp *port = irq_desc_get_handler_data(desc);
644648
unsigned long events;
@@ -647,7 +651,7 @@ static void mc_handle_event(struct irq_desc *desc)
647651

648652
chained_irq_enter(chip, desc);
649653

650-
events = get_events(port);
654+
events = mc_get_events(port);
651655

652656
for_each_set_bit(bit, &events, NUM_EVENTS)
653657
generic_handle_domain_irq(port->event_domain, bit);
@@ -741,17 +745,17 @@ static struct irq_chip mc_event_irq_chip = {
741745
.irq_unmask = mc_unmask_event_irq,
742746
};
743747

744-
static int mc_pcie_event_map(struct irq_domain *domain, unsigned int irq,
745-
irq_hw_number_t hwirq)
748+
static int plda_pcie_event_map(struct irq_domain *domain, unsigned int irq,
749+
irq_hw_number_t hwirq)
746750
{
747751
irq_set_chip_and_handler(irq, &mc_event_irq_chip, handle_level_irq);
748752
irq_set_chip_data(irq, domain->host_data);
749753

750754
return 0;
751755
}
752756

753-
static const struct irq_domain_ops event_domain_ops = {
754-
.map = mc_pcie_event_map,
757+
static const struct irq_domain_ops plda_event_domain_ops = {
758+
.map = plda_pcie_event_map,
755759
};
756760

757761
static inline void mc_pcie_deinit_clk(void *data)
@@ -799,7 +803,7 @@ static int mc_pcie_init_clks(struct device *dev)
799803
return 0;
800804
}
801805

802-
static int mc_pcie_init_irq_domains(struct plda_pcie_rp *port)
806+
static int plda_pcie_init_irq_domains(struct plda_pcie_rp *port)
803807
{
804808
struct device *dev = port->dev;
805809
struct device_node *node = dev->of_node;
@@ -813,7 +817,8 @@ static int mc_pcie_init_irq_domains(struct plda_pcie_rp *port)
813817
}
814818

815819
port->event_domain = irq_domain_add_linear(pcie_intc_node, NUM_EVENTS,
816-
&event_domain_ops, port);
820+
&plda_event_domain_ops,
821+
port);
817822
if (!port->event_domain) {
818823
dev_err(dev, "failed to get event domain\n");
819824
of_node_put(pcie_intc_node);
@@ -835,7 +840,7 @@ static int mc_pcie_init_irq_domains(struct plda_pcie_rp *port)
835840
of_node_put(pcie_intc_node);
836841
raw_spin_lock_init(&port->lock);
837842

838-
return mc_allocate_msi_domains(port);
843+
return plda_allocate_msi_domains(port);
839844
}
840845

841846
static inline void mc_clear_secs(struct mc_pcie *port)
@@ -898,14 +903,14 @@ static void mc_disable_interrupts(struct mc_pcie *port)
898903
writel_relaxed(GENMASK(31, 0), bridge_base_addr + ISTATUS_HOST);
899904
}
900905

901-
static int mc_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp *port)
906+
static int plda_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp *port)
902907
{
903908
struct device *dev = &pdev->dev;
904909
int irq;
905910
int i, intx_irq, msi_irq, event_irq;
906911
int ret;
907912

908-
ret = mc_pcie_init_irq_domains(port);
913+
ret = plda_pcie_init_irq_domains(port);
909914
if (ret) {
910915
dev_err(dev, "failed creating IRQ domains\n");
911916
return ret;
@@ -938,18 +943,18 @@ static int mc_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp
938943
}
939944

940945
/* Plug the INTx chained handler */
941-
irq_set_chained_handler_and_data(intx_irq, mc_handle_intx, port);
946+
irq_set_chained_handler_and_data(intx_irq, plda_handle_intx, port);
942947

943948
msi_irq = irq_create_mapping(port->event_domain,
944949
EVENT_LOCAL_PM_MSI_INT_MSI);
945950
if (!msi_irq)
946951
return -ENXIO;
947952

948953
/* Plug the MSI chained handler */
949-
irq_set_chained_handler_and_data(msi_irq, mc_handle_msi, port);
954+
irq_set_chained_handler_and_data(msi_irq, plda_handle_msi, port);
950955

951956
/* Plug the main event chained handler */
952-
irq_set_chained_handler_and_data(irq, mc_handle_event, port);
957+
irq_set_chained_handler_and_data(irq, plda_handle_event, port);
953958

954959
return 0;
955960
}
@@ -976,7 +981,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
976981
return ret;
977982

978983
/* Address translation is up; safe to enable interrupts */
979-
ret = mc_init_interrupts(pdev, &port->plda);
984+
ret = plda_init_interrupts(pdev, &port->plda);
980985
if (ret)
981986
return ret;
982987

0 commit comments

Comments
 (0)