Commit 455a6526 authored by Tobias Schumacher's avatar Tobias Schumacher Committed by Heiko Carstens
Browse files

genirq: Change hwirq parameter to irq_hw_number_t 



The irqdomain implementation internally represents hardware IRQs as
irq_hw_number_t, which is defined as unsigned long int. When providing
an irq_hw_number_t to the generic_handle_domain() functions that expect
and unsigned int hwirq, this can lead to a loss of information. Change
the hwirq parameter to irq_hw_number_t to support the full range of
hwirqs.

Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarFarhan Ali <alifm@linux.ibm.com>
Signed-off-by: default avatarTobias Schumacher <ts@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent eb9780a1

include/linux/irqdesc.h

+3 −3
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ int generic_handle_irq_safe(unsigned int irq); 
 * and handle the result interrupt number. Return -EINVAL if

 * conversion failed.

 */

int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwirq);

int generic_handle_domain_irq_safe(struct irq_domain *domain, unsigned int hwirq);

int generic_handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq);

int generic_handle_domain_irq(struct irq_domain *domain, irq_hw_number_t hwirq);

int generic_handle_domain_irq_safe(struct irq_domain *domain, irq_hw_number_t hwirq);

int generic_handle_domain_nmi(struct irq_domain *domain, irq_hw_number_t hwirq);

#endif



/* Test to see if a driver has successfully requested an irq */

kernel/irq/irqdesc.c

+3 −3
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ EXPORT_SYMBOL_GPL(generic_handle_irq_safe); 
 * 		This function must be called from an IRQ context with irq regs

 * 		initialized.

 */

int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwirq)

int generic_handle_domain_irq(struct irq_domain *domain, irq_hw_number_t hwirq)

{

	return handle_irq_desc(irq_resolve_mapping(domain, hwirq));

}
@@ -738,7 +738,7 @@ EXPORT_SYMBOL_GPL(generic_handle_domain_irq); 
 * context). If the interrupt is marked as 'enforce IRQ-context only' then

 * the function must be invoked from hard interrupt context.

 */

int generic_handle_domain_irq_safe(struct irq_domain *domain, unsigned int hwirq)

int generic_handle_domain_irq_safe(struct irq_domain *domain, irq_hw_number_t hwirq)

{

	unsigned long flags;

	int ret;
@@ -761,7 +761,7 @@ EXPORT_SYMBOL_GPL(generic_handle_domain_irq_safe); 
 * 		This function must be called from an NMI context with irq regs

 * 		initialized.

 **/

int generic_handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq)

int generic_handle_domain_nmi(struct irq_domain *domain, irq_hw_number_t hwirq)

{

	WARN_ON_ONCE(!in_nmi());

	return handle_irq_desc(irq_resolve_mapping(domain, hwirq));