Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a309ed authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/affinity: Remove the leftovers of the original set support 



Now that the NVME driver is converted over to the calc_set() callback, the
workarounds of the original set support can be removed.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Bjorn Helgaas <helgaas@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: linux-nvme@lists.infradead.org
Cc: linux-pci@vger.kernel.org
Cc: Keith Busch <keith.busch@intel.com>
Cc: Sumit Saxena <sumit.saxena@broadcom.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Shivasharan Srikanteshwara <shivasharan.srikanteshwara@broadcom.com>
Link: https://lkml.kernel.org/r/20190216172228.689834224@linutronix.de
parent 612b7286

kernel/irq/affinity.c

+4 −16
Original line number Diff line number Diff line
@@ -264,19 +264,12 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd) 


	/*

	 * Simple invocations do not provide a calc_sets() callback. Install

	 * the generic one. The check for affd->nr_sets is a temporary

	 * workaround and will be removed after the NVME driver is converted

	 * over.

	 * the generic one.

	 */

	if (!affd->nr_sets && !affd->calc_sets)

	if (!affd->calc_sets)

		affd->calc_sets = default_calc_sets;



	/*

	 * If the device driver provided a calc_sets() callback let it

	 * recalculate the number of sets and their size. The check will go

	 * away once the NVME driver is converted over.

	 */

	if (affd->calc_sets)

	/* Recalculate the sets */

	affd->calc_sets(affd, affvecs);



	if (WARN_ON_ONCE(affd->nr_sets > IRQ_AFFINITY_MAX_SETS))
@@ -344,11 +337,6 @@ unsigned int irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec, 


	if (affd->calc_sets) {

		set_vecs = maxvec - resv;

	} else if (affd->nr_sets) {

		unsigned int i;



		for (i = 0, set_vecs = 0;  i < affd->nr_sets; i++)

			set_vecs += affd->set_size[i];

	} else {

		get_online_cpus();

		set_vecs = cpumask_weight(cpu_possible_mask);