Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7a3d627 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A set of small fixes for the irq subsystem:

   - Cure a data ordering problem with chained interrupts

   - Three small fixlets for the mbigen irq chip"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Fix chained interrupt data ordering
  irqchip/mbigen: Fix the clear register offset calculation
  irqchip/mbigen: Fix potential NULL dereferencing
  irqchip/mbigen: Fix memory mapping code
parents 56f410cf 2c4569ca

drivers/irqchip/irq-mbigen.c

+10 −7
Original line number Diff line number Diff line
@@ -106,10 +106,7 @@ static inline void get_mbigen_type_reg(irq_hw_number_t hwirq, 
static inline void get_mbigen_clear_reg(irq_hw_number_t hwirq,

					u32 *mask, u32 *addr)

{

	unsigned int ofst;



	hwirq -= RESERVED_IRQ_PER_MBIGEN_CHIP;

	ofst = hwirq / 32 * 4;

	unsigned int ofst = (hwirq / 32) * 4;



	*mask = 1 << (hwirq % 32);

	*addr = ofst + REG_MBIGEN_CLEAR_OFFSET;
@@ -337,9 +334,15 @@ static int mbigen_device_probe(struct platform_device *pdev) 
	mgn_chip->pdev = pdev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mgn_chip->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(mgn_chip->base))

		return PTR_ERR(mgn_chip->base);

	if (!res)

		return -EINVAL;



	mgn_chip->base = devm_ioremap(&pdev->dev, res->start,

				      resource_size(res));

	if (!mgn_chip->base) {

		dev_err(&pdev->dev, "failed to ioremap %pR\n", res);

		return -ENOMEM;

	}



	if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)

		err = mbigen_of_create_domain(pdev, mgn_chip);

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -880,8 +880,8 @@ irq_set_chained_handler_and_data(unsigned int irq, irq_flow_handler_t handle, 
	if (!desc)

		return;



	__irq_do_set_handler(desc, handle, 1, NULL);

	desc->irq_common_data.handler_data = data;

	__irq_do_set_handler(desc, handle, 1, NULL);



	irq_put_desc_busunlock(desc, flags);

}