Commit 6ed54e17 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/misc-6.2 into irq/irqchip-next 



* irq/misc-6.2:
  : .
  : Random minor fixes and improvments:
  :
  : - More Loongson fixes after the Loongarch merge
  :
  : - Error handling fixes for wpcm450, GIC...
  :
  : - BE detection for a FSL controller
  :
  : - Declare the Sifive PLIC as wake-up agnostic
  :
  : - Simplify fishing out the device data for the ST irqchip
  :
  : - Mark some data structures as __initconst in the apple-aic driver
  :
  : - Switch over from strtobool to kstrtobool
  :
  : - COMPILET_TEST fixes
  :
  : - and the mandatory "repeated word" commit...
  : .
  irqchip/ls-extirq: Fix endianness detection
  irqchip/gic: Use kstrtobool() instead of strtobool()
  irqchip/sifive-plic: Support wake IRQs
  irqchip/loongson-liointc: Fix improper error handling in liointc_init()
  irqchip/sl28cpld: Replace irqchip mask_invert with unmask_base
  irqchip/wpcm450: Fix memory leak in wpcm450_aic_of_init()
  irqchip/st: Use device_get_match_data() to simplify the code
  irqchip/al-fic: Drop obsolete dependency on COMPILE_TEST
  irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe()
  irqchip/mips-gic: Drop repeated word in comment
  irqchip/apple-aic: Mark aic_info structs __initconst

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 4363c852 3ae977d0

drivers/irqchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ config ALPINE_MSI 


config AL_FIC

	bool "Amazon's Annapurna Labs Fabric Interrupt Controller"

	depends on OF || COMPILE_TEST

	depends on OF

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	help

drivers/irqchip/irq-apple-aic.c

+3 −3
Original line number Diff line number Diff line
@@ -248,14 +248,14 @@ struct aic_info { 
	bool fast_ipi;

};



static const struct aic_info aic1_info = {

static const struct aic_info aic1_info __initconst = {

	.version	= 1,



	.event		= AIC_EVENT,

	.target_cpu	= AIC_TARGET_CPU,

};



static const struct aic_info aic1_fipi_info = {

static const struct aic_info aic1_fipi_info __initconst = {

	.version	= 1,



	.event		= AIC_EVENT,
@@ -264,7 +264,7 @@ static const struct aic_info aic1_fipi_info = { 
	.fast_ipi	= true,

};



static const struct aic_info aic2_info = {

static const struct aic_info aic2_info __initconst = {

	.version	= 2,



	.irq_cfg	= AIC2_IRQ_CFG,

drivers/irqchip/irq-gic-pm.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int gic_probe(struct platform_device *pdev) 


	pm_runtime_enable(dev);



	ret = pm_runtime_get_sync(dev);

	ret = pm_runtime_resume_and_get(dev);

	if (ret < 0)

		goto rpm_disable;

drivers/irqchip/irq-gic-v3.c

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/irqdomain.h>

#include <linux/kstrtox.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>
@@ -1171,7 +1172,7 @@ static bool gicv3_nolpi; 


static int __init gicv3_nolpi_cfg(char *buf)

{

	return strtobool(buf, &gicv3_nolpi);

	return kstrtobool(buf, &gicv3_nolpi);

}

early_param("irqchip.gicv3_nolpi", gicv3_nolpi_cfg);

drivers/irqchip/irq-gic.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/kstrtox.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/list.h>
@@ -1332,7 +1333,7 @@ static bool gicv2_force_probe; 


static int __init gicv2_force_probe_cfg(char *buf)

{

	return strtobool(buf, &gicv2_force_probe);

	return kstrtobool(buf, &gicv2_force_probe);

}

early_param("irqchip.gicv2_force_probe", gicv2_force_probe_cfg);