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

Merge tag 'irq-urgent-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Ingo Molnar:
 "Restore unintentionally lost quirk settings in the GIC irqchip driver,
  which broke certain devices"

* tag 'irq-urgent-2023-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/gic-v3-its: Don't override quirk settings with default values
parents 4714de03 f199bf5b

drivers/irqchip/irq-gic-v3-its.c

+2 −2
Original line number Diff line number Diff line
@@ -5112,8 +5112,6 @@ static int __init its_probe_one(struct its_node *its) 
	}

	its->cmd_base = (void *)page_address(page);

	its->cmd_write = its->cmd_base;

	its->get_msi_base = its_irq_get_msi_base;

	its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	err = its_alloc_tables(its);

	if (err)
@@ -5362,6 +5360,8 @@ static struct its_node __init *its_node_init(struct resource *res, 
	its->typer = gic_read_typer(its_base + GITS_TYPER);

	its->base = its_base;

	its->phys_base = res->start;

	its->get_msi_base = its_irq_get_msi_base;

	its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	its->numa_node = numa_node;

	its->fwnode_handle = handle;