Commit 48dee9b3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Zeng Heng
Browse files

mfd: intel_soc_pmic_bxtwc: Use IRQ domain for USB Type-C device 

stable inclusion
from stable-v5.10.231
commit 0b648968bfa4f5c9c4983bca9f2de17626ed6fb6
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEDOS
CVE: CVE-2024-56691

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0b648968bfa4f5c9c4983bca9f2de17626ed6fb6



--------------------------------

[ Upstream commit 686fb77712a4bc94b76a0c5ae74c60118b7a0d79 ]

While design wise the idea of converting the driver to use
the hierarchy of the IRQ chips is correct, the implementation
has (inherited) flaws. This was unveiled when platform_get_irq()
had started WARN() on IRQ 0 that is supposed to be a Linux
IRQ number (also known as vIRQ).

Rework the driver to respect IRQ domain when creating each MFD
device separately, as the domain is not the same for all of them.

Fixes: 9c6235c8 ("mfd: intel_soc_pmic_bxtwc: Add bxt_wcove_usbc device")
Fixes: d2061f9c ("usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY")
Fixes: 57129044 ("mfd: intel_soc_pmic_bxtwc: Use chained IRQs for second level IRQ chips")
Reported-by: default avatarZhang Ning <zhangn1985@outlook.com>
Closes: https://lore.kernel.org/r/TY2PR01MB3322FEDCDC048B7D3794F922CDBA2@TY2PR01MB3322.jpnprd01.prod.outlook.com


Tested-by: default avatarZhang Ning <zhangn1985@outlook.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20241005193029.1929139-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLee Jones <lee@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 9be6ae39

drivers/mfd/intel_soc_pmic_bxtwc.c

+40 −21
Original line number Diff line number Diff line
@@ -240,16 +240,6 @@ static struct mfd_cell bxt_wc_dev[] = { 
		.num_resources = ARRAY_SIZE(thermal_resources),

		.resources = thermal_resources,

	},

	{

		.name = "bxt_wcove_usbc",

		.num_resources = ARRAY_SIZE(usbc_resources),

		.resources = usbc_resources,

	},

	{

		.name = "bxt_wcove_ext_charger",

		.num_resources = ARRAY_SIZE(charger_resources),

		.resources = charger_resources,

	},

	{

		.name = "bxt_wcove_bcu",

		.num_resources = ARRAY_SIZE(bcu_resources),
@@ -271,6 +261,19 @@ static struct mfd_cell bxt_wc_dev[] = { 
	},

};



static struct mfd_cell bxt_wc_chgr_dev[] = {

	{

		.name = "bxt_wcove_usbc",

		.num_resources = ARRAY_SIZE(usbc_resources),

		.resources = usbc_resources,

	},

	{

		.name = "bxt_wcove_ext_charger",

		.num_resources = ARRAY_SIZE(charger_resources),

		.resources = charger_resources,

	},

};



static int regmap_ipc_byte_reg_read(void *context, unsigned int reg,

				    unsigned int *val)

{
@@ -421,6 +424,26 @@ static int bxtwc_add_chained_irq_chip(struct intel_soc_pmic *pmic, 
					0, chip, data);

}



static int bxtwc_add_chained_devices(struct intel_soc_pmic *pmic,

				     const struct mfd_cell *cells, int n_devs,

				     struct regmap_irq_chip_data *pdata,

				     int pirq, int irq_flags,

				     const struct regmap_irq_chip *chip,

				     struct regmap_irq_chip_data **data)

{

	struct device *dev = pmic->dev;

	struct irq_domain *domain;

	int ret;



	ret = bxtwc_add_chained_irq_chip(pmic, pdata, pirq, irq_flags, chip, data);

	if (ret)

		return dev_err_probe(dev, ret, "Failed to add %s IRQ chip\n", chip->name);



	domain = regmap_irq_get_domain(*data);



	return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, cells, n_devs, NULL, 0, domain);

}



static int bxtwc_probe(struct platform_device *pdev)

{

	int ret;
@@ -520,18 +543,14 @@ static int bxtwc_probe(struct platform_device *pdev) 
		return ret;

	}



	/* Add chained IRQ handler for CHGR IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,

	ret = bxtwc_add_chained_devices(pmic, bxt_wc_chgr_dev, ARRAY_SIZE(bxt_wc_chgr_dev),

					pmic->irq_chip_data,

					BXTWC_CHGR_LVL1_IRQ,

					IRQF_ONESHOT,

					&bxtwc_regmap_irq_chip_chgr,

					&pmic->irq_chip_data_chgr);





	if (ret) {

		dev_err(&pdev->dev, "Failed to add CHGR IRQ chip\n");

	if (ret)

		return ret;

	}



	/* Add chained IRQ handler for CRIT IRQs */

	ret = bxtwc_add_chained_irq_chip(pmic, pmic->irq_chip_data,

drivers/usb/typec/tcpm/wcove.c

+0 −4
Original line number Diff line number Diff line
@@ -620,10 +620,6 @@ static int wcove_typec_probe(struct platform_device *pdev) 
	if (irq < 0)

		return irq;



	irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr, irq);

	if (irq < 0)

		return irq;



	ret = guid_parse(WCOVE_DSM_UUID, &wcove->guid);

	if (ret)

		return ret;