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

Merge tag 'irq-core-2023-10-29-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq updates from Thomas Gleixner:
 "Core:

   - Exclude managed interrupts in the calculation of interrupts which
     are targeted to a CPU which is about to be offlined to ensure that
     there are enough free vectors on the still online CPUs to migrate
     them over.

     Managed interrupts do not need to be accounted because they are
     either shut down on offline or migrated to an already reserved and
     guaranteed slot on a still online CPU in the interrupts affinity
     mask.

     Including managed interrupts is overaccounting and can result in
     needlessly aborting hibernation on large server machines.

   - The usual set of small improvements

  Drivers:

   - Make the generic interrupt chip implementation handle interrupt
     domains correctly and initialize the name pointers correctly

   - Add interrupt affinity setting support to the Renesas RZG2L chip
     driver.

   - Prevent registering syscore operations multiple times in the SiFive
     PLIC chip driver.

   - Update device tree handling in the NXP Layerscape MSI chip driver"

* tag 'irq-core-2023-10-29-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/sifive-plic: Fix syscore registration for multi-socket systems
  irqchip/ls-scfg-msi: Use device_get_match_data()
  genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware
  genirq/matrix: Exclude managed interrupts in irq_matrix_allocated()
  PCI/MSI: Provide stubs for IMS functions
  irqchip/renesas-rzg2l: Enhance driver to support interrupt affinity setting
  genirq/generic-chip: Fix the irq_chip name for /proc/interrupts
  irqdomain: Annotate struct irq_domain with __counted_by
parents 9cc6fea1 f99b926f

drivers/irqchip/irq-ls-scfg-msi.c

+5 −7
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_pci.h>

#include <linux/of_platform.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/spinlock.h>



#define MSI_IRQS_PER_MSIR	32
@@ -334,20 +335,17 @@ MODULE_DEVICE_TABLE(of, ls_scfg_msi_id); 


static int ls_scfg_msi_probe(struct platform_device *pdev)

{

	const struct of_device_id *match;

	struct ls_scfg_msi *msi_data;

	struct resource *res;

	int i, ret;



	match = of_match_device(ls_scfg_msi_id, &pdev->dev);

	if (!match)

		return -ENODEV;



	msi_data = devm_kzalloc(&pdev->dev, sizeof(*msi_data), GFP_KERNEL);

	if (!msi_data)

		return -ENOMEM;



	msi_data->cfg = (struct ls_scfg_msi_cfg *) match->data;

	msi_data->cfg = (struct ls_scfg_msi_cfg *)device_get_match_data(&pdev->dev);

	if (!msi_data->cfg)

		return -ENODEV;



	msi_data->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(msi_data->regs)) {

drivers/irqchip/irq-renesas-rzg2l.c

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ static const struct irq_chip irqc_chip = { 
	.irq_set_irqchip_state	= irq_chip_set_parent_state,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_set_type		= rzg2l_irqc_set_type,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.flags			= IRQCHIP_MASK_ON_SUSPEND |

				  IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE,

drivers/irqchip/irq-sifive-plic.c

+4 −3
Original line number Diff line number Diff line
@@ -532,17 +532,18 @@ static int __init __plic_init(struct device_node *node, 
	}



	/*

	 * We can have multiple PLIC instances so setup cpuhp state only

	 * when context handler for current/boot CPU is present.

	 * We can have multiple PLIC instances so setup cpuhp state

	 * and register syscore operations only when context handler

	 * for current/boot CPU is present.

	 */

	handler = this_cpu_ptr(&plic_handlers);

	if (handler->present && !plic_cpuhp_setup_done) {

		cpuhp_setup_state(CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,

				  "irqchip/sifive/plic:starting",

				  plic_starting_cpu, plic_dying_cpu);

		register_syscore_ops(&plic_irq_syscore_ops);

		plic_cpuhp_setup_done = true;

	}

	register_syscore_ops(&plic_irq_syscore_ops);



	pr_info("%pOFP: mapped %d interrupts with %d handlers for"

		" %d contexts.\n", node, nr_irqs, nr_handlers, nr_contexts);

include/linux/irqdomain.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ struct irq_domain { 
	irq_hw_number_t			hwirq_max;

	unsigned int			revmap_size;

	struct radix_tree_root		revmap_tree;

	struct irq_data __rcu		*revmap[];

	struct irq_data __rcu		*revmap[] __counted_by(revmap_size);

};



/* Irq domain flags */

include/linux/pci.h

+26 −8
Original line number Diff line number Diff line
@@ -1624,6 +1624,8 @@ struct msix_entry { 
	u16	entry;	/* Driver uses to specify entry, OS writes */

};



struct msi_domain_template;



#ifdef CONFIG_PCI_MSI

int pci_msi_vec_count(struct pci_dev *dev);

void pci_disable_msi(struct pci_dev *dev);
@@ -1656,6 +1658,11 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map); 
void pci_free_irq_vectors(struct pci_dev *dev);

int pci_irq_vector(struct pci_dev *dev, unsigned int nr);

const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);

bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,

			   unsigned int hwsize, void *data);

struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,

				 const struct irq_affinity_desc *affdesc);

void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);



#else

static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
@@ -1719,6 +1726,25 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, 
{

	return cpu_possible_mask;

}



static inline bool pci_create_ims_domain(struct pci_dev *pdev,

					 const struct msi_domain_template *template,

					 unsigned int hwsize, void *data)

{ return false; }



static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,

					       union msi_instance_cookie *icookie,

					       const struct irq_affinity_desc *affdesc)

{

	struct msi_map map = { .index = -ENOSYS, };



	return map;

}



static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)

{

}



#endif



/**
@@ -2616,14 +2642,6 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) 
void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);

#endif



struct msi_domain_template;



bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,

			   unsigned int hwsize, void *data);

struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,

				 const struct irq_affinity_desc *affdesc);

void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);



#include <linux/dma-mapping.h>



#define pci_printk(level, pdev, fmt, arg...) \