Commit 86c12c73 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/print_chip into irq/irqchip-next 



* irq/print_chip:
  : .
  : Convert irqchip drivers that use the .name field as a topology
  : description to the .irq_print_chip callback, which allows the
  : name to be made dymanic. The irq_chip structures are then made
  : 'const' in order to prevent further abuse.
  : .
  irqchip/versatile-fpga: Switch to dynamic chip name output
  irqchip/ts4800: Switch to dynamic chip name output
  irqchip/mvebu-pic: Switch to dynamic chip name output
  irqchip/lpc32xx: Switch to dynamic chip name output
  irqchip/gic: Switch to dynamic chip name output
  genirq/debugfs: Use irq_print_chip() when provided by irqchip
  genirq: Allow irq_chip registration functions to take a const irq_chip
  irqdomain: Let irq_domain_set_{info,hwirq_and_chip} take a const irq_chip

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents add679d2 3fb212a0

drivers/irqchip/irq-ftintc010.c

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/irq.h>

#include <linux/io.h>

#include <linux/irqchip.h>

#include <linux/irqchip/versatile-fpga.h>

#include <linux/irqdomain.h>

#include <linux/module.h>

#include <linux/of.h>

drivers/irqchip/irq-gic.c

+54 −48
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/irqdomain.h>

#include <linux/interrupt.h>

#include <linux/percpu.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/irqchip.h>

#include <linux/irqchip/chained_irq.h>
@@ -66,7 +67,6 @@ union gic_base { 
};



struct gic_chip_data {

	struct irq_chip chip;

	union gic_base dist_base;

	union gic_base cpu_base;

	void __iomem *raw_dist_base;
@@ -397,18 +397,15 @@ static void gic_handle_cascade_irq(struct irq_desc *desc) 
	chained_irq_exit(chip, desc);

}



static const struct irq_chip gic_chip = {

	.irq_mask		= gic_mask_irq,

	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoi_irq,

	.irq_set_type		= gic_set_type,

	.irq_retrigger          = gic_retrigger,

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

	.flags			= IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_MASK_ON_SUSPEND,

};

static void gic_irq_print_chip(struct irq_data *d, struct seq_file *p)

{

	struct gic_chip_data *gic = irq_data_get_irq_chip_data(d);



	if (gic->domain->dev)

		seq_printf(p, gic->domain->dev->of_node->name);

	else

		seq_printf(p, "GIC-%d", (int)(gic - &gic_data[0]));

}



void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)

{
@@ -799,8 +796,12 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
			    bool force)

{

	void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + gic_irq(d);

	struct gic_chip_data *gic = irq_data_get_irq_chip_data(d);

	unsigned int cpu;



	if (unlikely(gic != &gic_data[0]))

		return -EINVAL;



	if (!force)

		cpu = cpumask_any_and(mask_val, cpu_online_mask);

	else
@@ -880,6 +881,39 @@ static __init void gic_smp_init(void) 
#define gic_ipi_send_mask	NULL

#endif



static const struct irq_chip gic_chip = {

	.irq_mask		= gic_mask_irq,

	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoi_irq,

	.irq_set_type		= gic_set_type,

	.irq_retrigger          = gic_retrigger,

	.irq_set_affinity	= gic_set_affinity,

	.ipi_send_mask		= gic_ipi_send_mask,

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

	.irq_print_chip		= gic_irq_print_chip,

	.flags			= IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_MASK_ON_SUSPEND,

};



static const struct irq_chip gic_chip_mode1 = {

	.name			= "GICv2",

	.irq_mask		= gic_eoimode1_mask_irq,

	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoimode1_eoi_irq,

	.irq_set_type		= gic_set_type,

	.irq_retrigger          = gic_retrigger,

	.irq_set_affinity	= gic_set_affinity,

	.ipi_send_mask		= gic_ipi_send_mask,

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

	.irq_set_vcpu_affinity	= gic_irq_set_vcpu_affinity,

	.flags			= IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_MASK_ON_SUSPEND,

};



#ifdef CONFIG_BL_SWITCHER

/*

 * gic_send_sgi - send a SGI directly to given CPU interface number
@@ -1024,15 +1058,19 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, 
{

	struct gic_chip_data *gic = d->host_data;

	struct irq_data *irqd = irq_desc_get_irq_data(irq_to_desc(irq));

	const struct irq_chip *chip;



	chip = (static_branch_likely(&supports_deactivate_key) &&

		gic == &gic_data[0]) ? &gic_chip_mode1 : &gic_chip;



	switch (hw) {

	case 0 ... 31:

		irq_set_percpu_devid(irq);

		irq_domain_set_info(d, irq, hw, &gic->chip, d->host_data,

		irq_domain_set_info(d, irq, hw, chip, d->host_data,

				    handle_percpu_devid_irq, NULL, NULL);

		break;

	default:

		irq_domain_set_info(d, irq, hw, &gic->chip, d->host_data,

		irq_domain_set_info(d, irq, hw, chip, d->host_data,

				    handle_fasteoi_irq, NULL, NULL);

		irq_set_probe(irq);

		irqd_set_single_target(irqd);
@@ -1127,25 +1165,6 @@ static const struct irq_domain_ops gic_irq_domain_ops = { 
	.unmap = gic_irq_domain_unmap,

};



static void gic_init_chip(struct gic_chip_data *gic, const char *name,

			  bool use_eoimode1)

{

	/* Initialize irq_chip */

	gic->chip = gic_chip;

	gic->chip.name = name;



	if (use_eoimode1) {

		gic->chip.irq_mask = gic_eoimode1_mask_irq;

		gic->chip.irq_eoi = gic_eoimode1_eoi_irq;

		gic->chip.irq_set_vcpu_affinity = gic_irq_set_vcpu_affinity;

	}



	if (gic == &gic_data[0]) {

		gic->chip.irq_set_affinity = gic_set_affinity;

		gic->chip.ipi_send_mask = gic_ipi_send_mask;

	}

}



static int gic_init_bases(struct gic_chip_data *gic,

			  struct fwnode_handle *handle)

{
@@ -1245,7 +1264,6 @@ static int gic_init_bases(struct gic_chip_data *gic, 
static int __init __gic_init_bases(struct gic_chip_data *gic,

				   struct fwnode_handle *handle)

{

	char *name;

	int i, ret;



	if (WARN_ON(!gic || gic->domain))
@@ -1265,18 +1283,8 @@ static int __init __gic_init_bases(struct gic_chip_data *gic, 
			pr_info("GIC: Using split EOI/Deactivate mode\n");

	}



	if (static_branch_likely(&supports_deactivate_key) && gic == &gic_data[0]) {

		name = kasprintf(GFP_KERNEL, "GICv2");

		gic_init_chip(gic, name, true);

	} else {

		name = kasprintf(GFP_KERNEL, "GIC-%d", (int)(gic-&gic_data[0]));

		gic_init_chip(gic, name, false);

	}



	ret = gic_init_bases(gic, handle);

	if (ret)

		kfree(name);

	else if (gic == &gic_data[0])

	if (gic == &gic_data[0])

		gic_smp_init();



	return ret;
@@ -1459,8 +1467,6 @@ int gic_of_init_child(struct device *dev, struct gic_chip_data **gic, int irq) 
	if (!*gic)

		return -ENOMEM;



	gic_init_chip(*gic, dev->of_node->name, false);



	ret = gic_of_setup(*gic, dev->of_node);

	if (ret)

		return ret;

drivers/irqchip/irq-lpc32xx.c

+22 −12
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <asm/exception.h>
@@ -25,8 +26,8 @@ 


struct lpc32xx_irq_chip {

	void __iomem *base;

	phys_addr_t addr;

	struct irq_domain *domain;

	struct irq_chip chip;

};



static struct lpc32xx_irq_chip *lpc32xx_mic_irqc;
@@ -118,6 +119,24 @@ static int lpc32xx_irq_set_type(struct irq_data *d, unsigned int type) 
	return 0;

}



static void lpc32xx_irq_print_chip(struct irq_data *d, struct seq_file *p)

{

	struct lpc32xx_irq_chip *ic = irq_data_get_irq_chip_data(d);



	if (ic == lpc32xx_mic_irqc)

		seq_printf(p, "%08x.mic", ic->addr);

	else

		seq_printf(p, "%08x.sic", ic->addr);

}



static const struct irq_chip lpc32xx_chip = {

	.irq_ack	= lpc32xx_irq_ack,

	.irq_mask	= lpc32xx_irq_mask,

	.irq_unmask	= lpc32xx_irq_unmask,

	.irq_set_type	= lpc32xx_irq_set_type,

	.irq_print_chip	= lpc32xx_irq_print_chip,

};



static void __exception_irq_entry lpc32xx_handle_irq(struct pt_regs *regs)

{

	struct lpc32xx_irq_chip *ic = lpc32xx_mic_irqc;
@@ -153,7 +172,7 @@ static int lpc32xx_irq_domain_map(struct irq_domain *id, unsigned int virq, 
	struct lpc32xx_irq_chip *ic = id->host_data;



	irq_set_chip_data(virq, ic);

	irq_set_chip_and_handler(virq, &ic->chip, handle_level_irq);

	irq_set_chip_and_handler(virq, &lpc32xx_chip, handle_level_irq);

	irq_set_status_flags(virq, IRQ_LEVEL);

	irq_set_noprobe(virq);
@@ -183,6 +202,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node, 
	if (!irqc)

		return -ENOMEM;



	irqc->addr = addr;

	irqc->base = of_iomap(node, 0);

	if (!irqc->base) {

		pr_err("%pOF: unable to map registers\n", node);
@@ -190,21 +210,11 @@ static int __init lpc32xx_of_ic_init(struct device_node *node, 
		return -EINVAL;

	}



	irqc->chip.irq_ack = lpc32xx_irq_ack;

	irqc->chip.irq_mask = lpc32xx_irq_mask;

	irqc->chip.irq_unmask = lpc32xx_irq_unmask;

	irqc->chip.irq_set_type = lpc32xx_irq_set_type;

	if (is_mic)

		irqc->chip.name = kasprintf(GFP_KERNEL, "%08x.mic", addr);

	else

		irqc->chip.name = kasprintf(GFP_KERNEL, "%08x.sic", addr);



	irqc->domain = irq_domain_add_linear(node, NR_LPC32XX_IC_IRQS,

					     &lpc32xx_irq_domain_ops, irqc);

	if (!irqc->domain) {

		pr_err("unable to add irq domain\n");

		iounmap(irqc->base);

		kfree(irqc->chip.name);

		kfree(irqc);

		return -ENODEV;

	}

drivers/irqchip/irq-mvebu-pic.c

+18 −10
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/module.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>

#include <linux/seq_file.h>



#define PIC_CAUSE	       0x0

#define PIC_MASK	       0x4
@@ -29,7 +30,7 @@ struct mvebu_pic { 
	void __iomem *base;

	u32 parent_irq;

	struct irq_domain *domain;

	struct irq_chip irq_chip;

	struct platform_device *pdev;

};



static void mvebu_pic_reset(struct mvebu_pic *pic)
@@ -66,6 +67,20 @@ static void mvebu_pic_unmask_irq(struct irq_data *d) 
	writel(reg, pic->base + PIC_MASK);

}



static void mvebu_pic_print_chip(struct irq_data *d, struct seq_file *p)

{

	struct mvebu_pic *pic = irq_data_get_irq_chip_data(d);



	seq_printf(p, dev_name(&pic->pdev->dev));

}



static const struct irq_chip mvebu_pic_chip = {

	.irq_mask	= mvebu_pic_mask_irq,

	.irq_unmask	= mvebu_pic_unmask_irq,

	.irq_eoi	= mvebu_pic_eoi_irq,

	.irq_print_chip	= mvebu_pic_print_chip,

};



static int mvebu_pic_irq_map(struct irq_domain *domain, unsigned int virq,

			     irq_hw_number_t hwirq)

{
@@ -73,8 +88,7 @@ static int mvebu_pic_irq_map(struct irq_domain *domain, unsigned int virq, 


	irq_set_percpu_devid(virq);

	irq_set_chip_data(virq, pic);

	irq_set_chip_and_handler(virq, &pic->irq_chip,

				 handle_percpu_devid_irq);

	irq_set_chip_and_handler(virq, &mvebu_pic_chip, handle_percpu_devid_irq);

	irq_set_status_flags(virq, IRQ_LEVEL);

	irq_set_probe(virq);
@@ -120,22 +134,16 @@ static int mvebu_pic_probe(struct platform_device *pdev) 
{

	struct device_node *node = pdev->dev.of_node;

	struct mvebu_pic *pic;

	struct irq_chip *irq_chip;



	pic = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pic), GFP_KERNEL);

	if (!pic)

		return -ENOMEM;



	pic->pdev = pdev;

	pic->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(pic->base))

		return PTR_ERR(pic->base);



	irq_chip = &pic->irq_chip;

	irq_chip->name = dev_name(&pdev->dev);

	irq_chip->irq_mask = mvebu_pic_mask_irq;

	irq_chip->irq_unmask = mvebu_pic_unmask_irq;

	irq_chip->irq_eoi = mvebu_pic_eoi_irq;



	pic->parent_irq = irq_of_parse_and_map(node, 0);

	if (pic->parent_irq <= 0) {

		dev_err(&pdev->dev, "Failed to parse parent interrupt\n");

drivers/irqchip/irq-ts4800.c

+17 −8
Original line number Diff line number Diff line
@@ -19,14 +19,15 @@ 
#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>

#include <linux/seq_file.h>



#define IRQ_MASK        0x4

#define IRQ_STATUS      0x8



struct ts4800_irq_data {

	void __iomem            *base;

	struct platform_device	*pdev;

	struct irq_domain       *domain;

	struct irq_chip         irq_chip;

};



static void ts4800_irq_mask(struct irq_data *d)
@@ -47,12 +48,25 @@ static void ts4800_irq_unmask(struct irq_data *d) 
	writew(reg & ~mask, data->base + IRQ_MASK);

}



static void ts4800_irq_print_chip(struct irq_data *d, struct seq_file *p)

{

	struct ts4800_irq_data *data = irq_data_get_irq_chip_data(d);



	seq_printf(p, "%s", dev_name(&data->pdev->dev));

}



static const struct irq_chip ts4800_chip = {

	.irq_mask	= ts4800_irq_mask,

	.irq_unmask	= ts4800_irq_unmask,

	.irq_print_chip	= ts4800_irq_print_chip,

};



static int ts4800_irqdomain_map(struct irq_domain *d, unsigned int irq,

				irq_hw_number_t hwirq)

{

	struct ts4800_irq_data *data = d->host_data;



	irq_set_chip_and_handler(irq, &data->irq_chip, handle_simple_irq);

	irq_set_chip_and_handler(irq, &ts4800_chip, handle_simple_irq);

	irq_set_chip_data(irq, data);

	irq_set_noprobe(irq);
@@ -92,13 +106,13 @@ static int ts4800_ic_probe(struct platform_device *pdev) 
{

	struct device_node *node = pdev->dev.of_node;

	struct ts4800_irq_data *data;

	struct irq_chip *irq_chip;

	int parent_irq;



	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	data->pdev = pdev;

	data->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(data->base))

		return PTR_ERR(data->base);
@@ -111,11 +125,6 @@ static int ts4800_ic_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	irq_chip = &data->irq_chip;

	irq_chip->name = dev_name(&pdev->dev);

	irq_chip->irq_mask = ts4800_irq_mask;

	irq_chip->irq_unmask = ts4800_irq_unmask;



	data->domain = irq_domain_add_linear(node, 8, &ts4800_ic_ops, data);

	if (!data->domain) {

		dev_err(&pdev->dev, "cannot add IRQ domain\n");