Commit 3b4b84b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2020-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Ingo Molnar:
 "Fix a recent IRQ affinities regression, add in a missing debugfs
  printout that helps the debugging of IRQ affinity logic bugs, and fix
  a memory leak"

* tag 'irq-urgent-2020-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq/debugfs: Add missing irqchip flags
  genirq/affinity: Make affinity setting if activated opt-in
  irqdomain/treewide: Free firmware node after domain removal
parents 145ff1ec aa251fc5

arch/mips/pci/pci-xtalk-bridge.c

+3 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ err_free_resource: 
	pci_free_resource_list(&host->windows);

err_remove_domain:

	irq_domain_remove(domain);

	irq_domain_free_fwnode(fn);

	return err;

}
@@ -735,8 +736,10 @@ static int bridge_remove(struct platform_device *pdev) 
{

	struct pci_bus *bus = platform_get_drvdata(pdev);

	struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);

	struct fwnode_handle *fn = bc->domain->fwnode;



	irq_domain_remove(bc->domain);

	irq_domain_free_fwnode(fn);

	pci_lock_rescan_remove();

	pci_stop_root_bus(bus);

	pci_remove_root_bus(bus);

arch/x86/kernel/apic/io_apic.c

+5 −0
Original line number Diff line number Diff line
@@ -2335,8 +2335,13 @@ static int mp_irqdomain_create(int ioapic) 


static void ioapic_destroy_irqdomain(int idx)

{

	struct ioapic_domain_cfg *cfg = &ioapics[idx].irqdomain_cfg;

	struct fwnode_handle *fn = ioapics[idx].irqdomain->fwnode;



	if (ioapics[idx].irqdomain) {

		irq_domain_remove(ioapics[idx].irqdomain);

		if (!cfg->dev)

			irq_domain_free_fwnode(fn);

		ioapics[idx].irqdomain = NULL;

	}

}

arch/x86/kernel/apic/vector.c

+4 −0
Original line number Diff line number Diff line
@@ -560,6 +560,10 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, 
		 * as that can corrupt the affinity move state.

		 */

		irqd_set_handle_enforce_irqctx(irqd);



		/* Don't invoke affinity setter on deactivated interrupts */

		irqd_set_affinity_on_activate(irqd);



		/*

		 * Legacy vectors are already assigned when the IOAPIC

		 * takes them over. They stay on the same vector. This is

drivers/iommu/intel/irq_remapping.c

+8 −0
Original line number Diff line number Diff line
@@ -628,13 +628,21 @@ out_free_table: 


static void intel_teardown_irq_remapping(struct intel_iommu *iommu)

{

	struct fwnode_handle *fn;



	if (iommu && iommu->ir_table) {

		if (iommu->ir_msi_domain) {

			fn = iommu->ir_msi_domain->fwnode;



			irq_domain_remove(iommu->ir_msi_domain);

			irq_domain_free_fwnode(fn);

			iommu->ir_msi_domain = NULL;

		}

		if (iommu->ir_domain) {

			fn = iommu->ir_domain->fwnode;



			irq_domain_remove(iommu->ir_domain);

			irq_domain_free_fwnode(fn);

			iommu->ir_domain = NULL;

		}

		free_pages((unsigned long)iommu->ir_table->base,

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

+4 −1
Original line number Diff line number Diff line
@@ -3523,6 +3523,7 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, 
	msi_alloc_info_t *info = args;

	struct its_device *its_dev = info->scratchpad[0].ptr;

	struct its_node *its = its_dev->its;

	struct irq_data *irqd;

	irq_hw_number_t hwirq;

	int err;

	int i;
@@ -3542,7 +3543,9 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, 


		irq_domain_set_hwirq_and_chip(domain, virq + i,

					      hwirq + i, &its_irq_chip, its_dev);

		irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq + i)));

		irqd = irq_get_irq_data(virq + i);

		irqd_set_single_target(irqd);

		irqd_set_affinity_on_activate(irqd);

		pr_debug("ID:%d pID:%d vID:%d\n",

			 (int)(hwirq + i - its_dev->event_map.lpi_base),

			 (int)(hwirq + i), virq + i);

CRA Git | Maintained and supported by SUSTech CRA and CCSE