Unverified Commit 4ebd7cfe authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10995 CVE-2024-42290 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuntao Liu <liuyuntao12@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AIANP2FFJRUBSR3AA6BYVS2S6SHTSJVB/ 
CVE-2024-42290

Shenwei Wang (1):
  irqchip/imx-irqsteer: Handle runtime power management correctly


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAKPOQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/10995

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents a79f967c e66b604b

drivers/irqchip/irq-imx-irqsteer.c

+22 −3
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/spinlock.h>

#include <linux/pm_runtime.h>



#define CTRL_STRIDE_OFF(_t, _r)	(_t * 4 * _r)

#define CHANCTRL		0x0
@@ -34,6 +35,7 @@ struct irqsteer_data { 
	int			channel;

	struct irq_domain	*domain;

	u32			*saved_reg;

	struct device		*dev;

};



static int imx_irqsteer_get_reg_index(struct irqsteer_data *data,
@@ -70,10 +72,26 @@ static void imx_irqsteer_irq_mask(struct irq_data *d) 
	raw_spin_unlock_irqrestore(&data->lock, flags);

}



static void imx_irqsteer_irq_bus_lock(struct irq_data *d)

{

   struct irqsteer_data *data = d->chip_data;



   pm_runtime_get_sync(data->dev);

}



static void imx_irqsteer_irq_bus_sync_unlock(struct irq_data *d)

{

   struct irqsteer_data *data = d->chip_data;



   pm_runtime_put_autosuspend(data->dev);

}



static struct irq_chip imx_irqsteer_irq_chip = {

	.name			= "irqsteer",

	.irq_mask		= imx_irqsteer_irq_mask,

	.irq_unmask		= imx_irqsteer_irq_unmask,

	.irq_bus_lock		= imx_irqsteer_irq_bus_lock,

	.irq_bus_sync_unlock	= imx_irqsteer_irq_bus_sync_unlock,

};



static int imx_irqsteer_irq_map(struct irq_domain *h, unsigned int irq,
@@ -151,6 +169,7 @@ static int imx_irqsteer_probe(struct platform_device *pdev) 
	if (!data)

		return -ENOMEM;



	data->dev = &pdev->dev;

	data->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(data->regs)) {

		dev_err(&pdev->dev, "failed to initialize reg\n");