mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 17:23:36 +00:00
Three small fixes for interrupt core and drivers:
- The interrupt core fails to honor caller supplied affinity hints for non-managed interrupts and uses the system default affinity on startup instead. Set the missing flag in the descriptor to tell the core to use the provided affinity. - Fix a shift out of bounds error in the Xilinx driver - Handle switching to level trigger correctly in the RISCV APLIC driver. It failed to retrigger the interrupt which causes it to become stale. -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEQp8+kY+LLUocC4bMphj1TA10mKEFAma4vEUTHHRnbHhAbGlu dXRyb25peC5kZQAKCRCmGPVMDXSYoQpoEACcirhCU0x7jfGj7KWJtnx1dko1gG9G AN86+1lZaHa63vBysAvvEPFVhrbC9JI09SLFTNYrhFTWk9lZeTr7HC9ZgvH2U/Yp YrYci/5PMBZow7rHjJUcohGM25xFppskMwtUnp1udNsPbXQvY/cFkzi/p5xwfB7b S4P10UuZTLBiHYDylphIjIQpf2ltQiXDcdxLGeeYnMVdQ4W5sJVqj39YfZmq+Au3 E2IwDuA6SyPIMuEbs+rxKHNl30QmaGhU4CmzOE6A6bgcZ9u4AbvSf1+3maeOrOQf Erq3oMPhKemWXHdeTIZiufOjJZjph2qJfMNSzEoYnOO1edA+I9y5BkirngIwUOKX iAl3Oh5f6GwcNuFeVCAW6xr1jMnRDQ3SJUk89wxfgxtZjTVUTjbbtegm97XirhSf +QXXgVX9zpPYwbAVdwsCoSYi+Ne9XPj+ylixRKBzx6+4McnAdx3OllyfRhH7Hk53 BuXGmSdy9/n+093jyNzhdyQ/5U1lL2XrUXoNh79M/duBp6RI0jpet406Ui/Q96VB mXKXG/0imRd/WCWR9KDzKjjWdNcToRcsfta7ZzeekJtFIab6e2+G65lIPALB3rNp 1vNfFEWWTjpHpzN2pmmaRQBbwRBpLUrr89wc2KENuHs7DnQu75O1u5SZLPGwEMEI VuBxXQUKGxZkTA== =hR0M -----END PGP SIGNATURE----- Merge tag 'irq-urgent-2024-08-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull irq fixes from Thomas Gleixner: "Three small fixes for interrupt core and drivers: - The interrupt core fails to honor caller supplied affinity hints for non-managed interrupts and uses the system default affinity on startup instead. Set the missing flag in the descriptor to tell the core to use the provided affinity. - Fix a shift out of bounds error in the Xilinx driver - Handle switching to level trigger correctly in the RISCV APLIC driver. It failed to retrigger the interrupt which causes it to become stale" * tag 'irq-urgent-2024-08-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/riscv-aplic: Retrigger MSI interrupt on source configuration irqchip/xilinx: Fix shift out of bounds genirq/irqdesc: Honor caller provided affinity in alloc_desc()
This commit is contained in:
commit
56fe0a6a9f
@ -32,15 +32,10 @@ static void aplic_msi_irq_unmask(struct irq_data *d)
|
||||
aplic_irq_unmask(d);
|
||||
}
|
||||
|
||||
static void aplic_msi_irq_eoi(struct irq_data *d)
|
||||
static void aplic_msi_irq_retrigger_level(struct irq_data *d)
|
||||
{
|
||||
struct aplic_priv *priv = irq_data_get_irq_chip_data(d);
|
||||
|
||||
/*
|
||||
* EOI handling is required only for level-triggered interrupts
|
||||
* when APLIC is in MSI mode.
|
||||
*/
|
||||
|
||||
switch (irqd_get_trigger_type(d)) {
|
||||
case IRQ_TYPE_LEVEL_LOW:
|
||||
case IRQ_TYPE_LEVEL_HIGH:
|
||||
@ -59,6 +54,29 @@ static void aplic_msi_irq_eoi(struct irq_data *d)
|
||||
}
|
||||
}
|
||||
|
||||
static void aplic_msi_irq_eoi(struct irq_data *d)
|
||||
{
|
||||
/*
|
||||
* EOI handling is required only for level-triggered interrupts
|
||||
* when APLIC is in MSI mode.
|
||||
*/
|
||||
aplic_msi_irq_retrigger_level(d);
|
||||
}
|
||||
|
||||
static int aplic_msi_irq_set_type(struct irq_data *d, unsigned int type)
|
||||
{
|
||||
int rc = aplic_irq_set_type(d, type);
|
||||
|
||||
if (rc)
|
||||
return rc;
|
||||
/*
|
||||
* Updating sourcecfg register for level-triggered interrupts
|
||||
* requires interrupt retriggering when APLIC is in MSI mode.
|
||||
*/
|
||||
aplic_msi_irq_retrigger_level(d);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void aplic_msi_write_msg(struct irq_data *d, struct msi_msg *msg)
|
||||
{
|
||||
unsigned int group_index, hart_index, guest_index, val;
|
||||
@ -130,7 +148,7 @@ static const struct msi_domain_template aplic_msi_template = {
|
||||
.name = "APLIC-MSI",
|
||||
.irq_mask = aplic_msi_irq_mask,
|
||||
.irq_unmask = aplic_msi_irq_unmask,
|
||||
.irq_set_type = aplic_irq_set_type,
|
||||
.irq_set_type = aplic_msi_irq_set_type,
|
||||
.irq_eoi = aplic_msi_irq_eoi,
|
||||
#ifdef CONFIG_SMP
|
||||
.irq_set_affinity = irq_chip_set_affinity_parent,
|
||||
|
@ -189,7 +189,7 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
|
||||
irqc->intr_mask = 0;
|
||||
}
|
||||
|
||||
if (irqc->intr_mask >> irqc->nr_irq)
|
||||
if ((u64)irqc->intr_mask >> irqc->nr_irq)
|
||||
pr_warn("irq-xilinx: mismatch in kind-of-intr param\n");
|
||||
|
||||
pr_info("irq-xilinx: %pOF: num_irq=%d, edge=0x%x\n",
|
||||
|
@ -530,6 +530,7 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node,
|
||||
flags = IRQD_AFFINITY_MANAGED |
|
||||
IRQD_MANAGED_SHUTDOWN;
|
||||
}
|
||||
flags |= IRQD_AFFINITY_SET;
|
||||
mask = &affinity->mask;
|
||||
node = cpu_to_node(cpumask_first(mask));
|
||||
affinity++;
|
||||
|
Loading…
Reference in New Issue
Block a user