Skip to content

Commit e663ab6

Browse files
committed
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
2 parents 4714de0 + f199bf5 commit e663ab6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5112,8 +5112,6 @@ static int __init its_probe_one(struct its_node *its)
51125112
}
51135113
its->cmd_base = (void *)page_address(page);
51145114
its->cmd_write = its->cmd_base;
5115-
its->get_msi_base = its_irq_get_msi_base;
5116-
its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;
51175115

51185116
err = its_alloc_tables(its);
51195117
if (err)
@@ -5362,6 +5360,8 @@ static struct its_node __init *its_node_init(struct resource *res,
53625360
its->typer = gic_read_typer(its_base + GITS_TYPER);
53635361
its->base = its_base;
53645362
its->phys_base = res->start;
5363+
its->get_msi_base = its_irq_get_msi_base;
5364+
its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI;
53655365

53665366
its->numa_node = numa_node;
53675367
its->fwnode_handle = handle;

0 commit comments

Comments
 (0)