tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'powerpc-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Madhavan Srinivasan:

- Fix to handle NULL pointer dereference at irq domain teardown

- Fix for handling extraction of struct xive_irq_data

- Fix to skip parameter area allocation when fadump disabled

Thanks to Ganesh Goudar, Hari Bathini, Nam Cao, Ritesh Harjani (IBM),
Sourabh Jain, and Venkat Rao Bagalkote,

* tag 'powerpc-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/fadump: skip parameter area allocation when fadump is disabled
powerpc, ocxl: Fix extraction of struct xive_irq_data
powerpc/pseries/msi: Fix NULL pointer dereference at irq domain teardown

Linus Torvalds 0e622c4b 959f018f

+11 -13
+3
arch/powerpc/kernel/fadump.c
··· 1747 1747 { 1748 1748 phys_addr_t range_start, range_end; 1749 1749 1750 + if (!fw_dump.fadump_enabled) 1751 + return; 1752 + 1750 1753 if (!fw_dump.param_area_supported || fw_dump.dump_active) 1751 1754 return; 1752 1755
+4 -8
arch/powerpc/kvm/book3s_xive.c
··· 916 916 * it fires once. 917 917 */ 918 918 if (single_escalation) { 919 - struct irq_data *d = irq_get_irq_data(xc->esc_virq[prio]); 920 - struct xive_irq_data *xd = irq_data_get_irq_handler_data(d); 919 + struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[prio]); 921 920 922 921 xive_vm_esb_load(xd, XIVE_ESB_SET_PQ_01); 923 922 vcpu->arch.xive_esc_raddr = xd->eoi_page; ··· 1611 1612 1612 1613 /* Grab info about irq */ 1613 1614 state->pt_number = hw_irq; 1614 - state->pt_data = irq_data_get_irq_handler_data(host_data); 1615 + state->pt_data = irq_data_get_irq_chip_data(host_data); 1615 1616 1616 1617 /* 1617 1618 * Configure the IRQ to match the existing configuration of ··· 1786 1787 */ 1787 1788 void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu, int irq) 1788 1789 { 1789 - struct irq_data *d = irq_get_irq_data(irq); 1790 - struct xive_irq_data *xd = irq_data_get_irq_handler_data(d); 1790 + struct xive_irq_data *xd = irq_get_chip_data(irq); 1791 1791 1792 1792 /* 1793 1793 * This slightly odd sequence gives the right result ··· 2825 2827 i0, i1); 2826 2828 } 2827 2829 if (xc->esc_virq[i]) { 2828 - struct irq_data *d = irq_get_irq_data(xc->esc_virq[i]); 2829 - struct xive_irq_data *xd = 2830 - irq_data_get_irq_handler_data(d); 2830 + struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[i]); 2831 2831 u64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET); 2832 2832 2833 2833 seq_printf(m, " ESC %d %c%c EOI @%llx",
+1 -1
arch/powerpc/platforms/powernv/vas.c
··· 121 121 return -EINVAL; 122 122 } 123 123 124 - xd = irq_get_handler_data(vinst->virq); 124 + xd = irq_get_chip_data(vinst->virq); 125 125 if (!xd) { 126 126 pr_err("Inst%d: Invalid virq %d\n", 127 127 vinst->vas_id, vinst->virq);
+1 -2
arch/powerpc/platforms/pseries/msi.c
··· 443 443 */ 444 444 static void pseries_msi_ops_teardown(struct irq_domain *domain, msi_alloc_info_t *arg) 445 445 { 446 - struct msi_desc *desc = arg->desc; 447 - struct pci_dev *pdev = msi_desc_to_pci_dev(desc); 446 + struct pci_dev *pdev = to_pci_dev(domain->dev); 448 447 449 448 rtas_disable_msi(pdev); 450 449 }
+1 -1
arch/powerpc/sysdev/xive/common.c
··· 1580 1580 cpu, irq); 1581 1581 #endif 1582 1582 raw_spin_lock(&desc->lock); 1583 - xd = irq_desc_get_handler_data(desc); 1583 + xd = irq_desc_get_chip_data(desc); 1584 1584 1585 1585 /* 1586 1586 * Clear saved_p to indicate that it's no longer pending
+1 -1
drivers/misc/ocxl/afu_irq.c
··· 203 203 mutex_lock(&ctx->irq_lock); 204 204 irq = idr_find(&ctx->irq_idr, irq_id); 205 205 if (irq) { 206 - xd = irq_get_handler_data(irq->virq); 206 + xd = irq_get_chip_data(irq->virq); 207 207 addr = xd ? xd->trig_page : 0; 208 208 } 209 209 mutex_unlock(&ctx->irq_lock);