Commit a5e72a6b authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

genirq/irqdomain: Remove unused irq_domain_check_msi_remap() code 

After converting the users of irq_domain_check_msi_remap() it and the
helpers are no longer needed.

The new version does not require all the #ifdef helpers and inlines
because CONFIG_GENERIC_MSI_IRQ always requires CONFIG_IRQ_DOMAIN and
IRQ_DOMAIN_HIERARCHY.

Link: https://lore.kernel.org/r/5-v3-3313bb5dd3a3+10f11-secure_msi_jgg@nvidia.com


Tested-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 25fc417f

include/linux/irqdomain.h

+0 −23
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ struct irq_domain *irq_domain_create_legacy(struct fwnode_handle *fwnode, 
					    void *host_data);

extern struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec,

						   enum irq_domain_bus_token bus_token);

extern bool irq_domain_check_msi_remap(void);

extern void irq_set_default_host(struct irq_domain *host);

extern struct irq_domain *irq_get_default_host(void);

extern int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,
@@ -559,13 +558,6 @@ static inline bool irq_domain_is_msi(struct irq_domain *domain) 
	return domain->flags & IRQ_DOMAIN_FLAG_MSI;

}



static inline bool irq_domain_is_msi_remap(struct irq_domain *domain)

{

	return domain->flags & IRQ_DOMAIN_FLAG_MSI_REMAP;

}



extern bool irq_domain_hierarchical_is_msi_remap(struct irq_domain *domain);



static inline bool irq_domain_is_msi_parent(struct irq_domain *domain)

{

	return domain->flags & IRQ_DOMAIN_FLAG_MSI_PARENT;
@@ -611,17 +603,6 @@ static inline bool irq_domain_is_msi(struct irq_domain *domain) 
	return false;

}



static inline bool irq_domain_is_msi_remap(struct irq_domain *domain)

{

	return false;

}



static inline bool

irq_domain_hierarchical_is_msi_remap(struct irq_domain *domain)

{

	return false;

}



static inline bool irq_domain_is_msi_parent(struct irq_domain *domain)

{

	return false;
@@ -641,10 +622,6 @@ static inline struct irq_domain *irq_find_matching_fwnode( 
{

	return NULL;

}

static inline bool irq_domain_check_msi_remap(void)

{

	return false;

}

#endif /* !CONFIG_IRQ_DOMAIN */



#endif /* _LINUX_IRQDOMAIN_H */

kernel/irq/irqdomain.c

+0 −39
Original line number Diff line number Diff line
@@ -436,31 +436,6 @@ struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec, 
}

EXPORT_SYMBOL_GPL(irq_find_matching_fwspec);



/**

 * irq_domain_check_msi_remap - Check whether all MSI irq domains implement

 * IRQ remapping

 *

 * Return: false if any MSI irq domain does not support IRQ remapping,

 * true otherwise (including if there is no MSI irq domain)

 */

bool irq_domain_check_msi_remap(void)

{

	struct irq_domain *h;

	bool ret = true;



	mutex_lock(&irq_domain_mutex);

	list_for_each_entry(h, &irq_domain_list, link) {

		if (irq_domain_is_msi(h) &&

		    !irq_domain_hierarchical_is_msi_remap(h)) {

			ret = false;

			break;

		}

	}

	mutex_unlock(&irq_domain_mutex);

	return ret;

}

EXPORT_SYMBOL_GPL(irq_domain_check_msi_remap);



/**

 * irq_set_default_host() - Set a "default" irq domain

 * @domain: default domain pointer
@@ -1815,20 +1790,6 @@ static void irq_domain_check_hierarchy(struct irq_domain *domain) 
	if (domain->ops->alloc)

		domain->flags |= IRQ_DOMAIN_FLAG_HIERARCHY;

}



/**

 * irq_domain_hierarchical_is_msi_remap - Check if the domain or any

 * parent has MSI remapping support

 * @domain: domain pointer

 */

bool irq_domain_hierarchical_is_msi_remap(struct irq_domain *domain)

{

	for (; domain; domain = domain->parent) {

		if (irq_domain_is_msi_remap(domain))

			return true;

	}

	return false;

}

#else	/* CONFIG_IRQ_DOMAIN_HIERARCHY */

/**

 * irq_domain_get_irq_data - Get irq_data associated with @virq and @domain