Commit e2837df6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-drivers-5.9' of... 

Merge tag 'imx-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers

i.MX drivers change for 5.9:

- Update SCU irq code to call pm_system_wakeup() in general MU IRQ
  handler, so that system can be waked up when MU IRQ arrives.
- Move i.MX SCU soc driver into imx firmware folder to get it
  initialized from i.MX SCU firmware driver.
- Clean up soc-imx-scu driver a bit by using devm_kasprintf().
- Correct postfix setting for cm40 power domain in scu-pd driver.
- Add resource management support for IMX_SCU firmware driver.
- Add more cm4 resources to i.MX SCU power domain driver.
- Select ARM_GIC_V3 from SOC_IMX8M for being able to use GICv3 driver
  in AARCH32 mode Linux on AARCH64 hardware.

* tag 'imx-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: select ARM_GIC_V3 for i.MX8M
  firmware: imx: Move i.MX SCU soc driver into imx firmware folder
  firmware: imx: scu-pd: add more cm4 resources
  firmware: imx: add resource management api
  firmware: imx: scu-pd: fix cm40 power domain
  soc: imx: scu: use devm_kasprintf
  firmware: imx: make sure MU irq can wake up system from suspend mode

Link: https://lore.kernel.org/r/20200720085536.24138-1-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9e586c84 d82bcef5

arch/arm64/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -850,7 +850,6 @@ CONFIG_OWL_PM_DOMAINS=y 
CONFIG_RASPBERRYPI_POWER=y

CONFIG_FSL_DPAA=y

CONFIG_FSL_MC_DPIO=y

CONFIG_IMX_SCU_SOC=y

CONFIG_QCOM_AOSS_QMP=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QCOM_RMTFS_MEM=m

drivers/firmware/imx/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_IMX_DSP)		+= imx-dsp.o

obj-$(CONFIG_IMX_SCU)		+= imx-scu.o misc.o imx-scu-irq.o

obj-$(CONFIG_IMX_SCU)		+= imx-scu.o misc.o imx-scu-irq.o rm.o imx-scu-soc.o

obj-$(CONFIG_IMX_SCU_PD)	+= scu-pd.o

drivers/firmware/imx/imx-scu-irq.c

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/firmware/imx/ipc.h>

#include <linux/firmware/imx/sci.h>

#include <linux/mailbox_client.h>

#include <linux/suspend.h>



#define IMX_SC_IRQ_FUNC_ENABLE	1

#define IMX_SC_IRQ_FUNC_STATUS	2
@@ -91,6 +92,7 @@ static void imx_scu_irq_work_handler(struct work_struct *work) 
		if (!irq_status)

			continue;



		pm_system_wakeup();

		imx_scu_irq_notifier_call_chain(irq_status, &i);

	}

}

drivers/soc/imx/soc-imx-scu.c→drivers/firmware/imx/imx-scu-soc.c

+17 −66
Original line number Diff line number Diff line
@@ -10,9 +10,7 @@ 
#include <linux/platform_device.h>

#include <linux/of.h>



#define IMX_SCU_SOC_DRIVER_NAME		"imx-scu-soc"



static struct imx_sc_ipc *soc_ipc_handle;

static struct imx_sc_ipc *imx_sc_soc_ipc_handle;



struct imx_sc_msg_misc_get_soc_id {

	struct imx_sc_rpc_msg hdr;
@@ -44,7 +42,7 @@ static int imx_scu_soc_uid(u64 *soc_uid) 
	hdr->func = IMX_SC_MISC_FUNC_UNIQUE_ID;

	hdr->size = 1;



	ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true);

	ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);

	if (ret) {

		pr_err("%s: get soc uid failed, ret %d\n", __func__, ret);

		return ret;
@@ -71,7 +69,7 @@ static int imx_scu_soc_id(void) 
	msg.data.req.control = IMX_SC_C_ID;

	msg.data.req.resource = IMX_SC_R_SYSTEM;



	ret = imx_scu_call_rpc(soc_ipc_handle, &msg, true);

	ret = imx_scu_call_rpc(imx_sc_soc_ipc_handle, &msg, true);

	if (ret) {

		pr_err("%s: get soc info failed, ret %d\n", __func__, ret);

		return ret;
@@ -80,7 +78,7 @@ static int imx_scu_soc_id(void) 
	return msg.data.resp.id;

}



static int imx_scu_soc_probe(struct platform_device *pdev)

int imx_scu_soc_init(struct device *dev)

{

	struct soc_device_attribute *soc_dev_attr;

	struct soc_device *soc_dev;
@@ -88,11 +86,11 @@ static int imx_scu_soc_probe(struct platform_device *pdev) 
	u64 uid = 0;

	u32 val;



	ret = imx_scu_get_handle(&soc_ipc_handle);

	ret = imx_scu_get_handle(&imx_sc_soc_ipc_handle);

	if (ret)

		return ret;



	soc_dev_attr = devm_kzalloc(&pdev->dev, sizeof(*soc_dev_attr),

	soc_dev_attr = devm_kzalloc(dev, sizeof(*soc_dev_attr),

				    GFP_KERNEL);

	if (!soc_dev_attr)

		return -ENOMEM;
@@ -115,73 +113,26 @@ static int imx_scu_soc_probe(struct platform_device *pdev) 


	/* format soc_id value passed from SCU firmware */

	val = id & 0x1f;

	soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "0x%x", val);

	soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "0x%x", val);

	if (!soc_dev_attr->soc_id)

		return -ENOMEM;



	/* format revision value passed from SCU firmware */

	val = (id >> 5) & 0xf;

	val = (((val >> 2) + 1) << 4) | (val & 0x3);

	soc_dev_attr->revision = kasprintf(GFP_KERNEL,

					   "%d.%d",

					   (val >> 4) & 0xf,

					   val & 0xf);

	if (!soc_dev_attr->revision) {

		ret = -ENOMEM;

		goto free_soc_id;

	}

	soc_dev_attr->revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",

						(val >> 4) & 0xf, val & 0xf);

	if (!soc_dev_attr->revision)

		return -ENOMEM;



	soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", uid);

	if (!soc_dev_attr->serial_number) {

		ret = -ENOMEM;

		goto free_revision;

	}

	soc_dev_attr->serial_number = devm_kasprintf(dev, GFP_KERNEL,

						     "%016llX", uid);

	if (!soc_dev_attr->serial_number)

		return -ENOMEM;



	soc_dev = soc_device_register(soc_dev_attr);

	if (IS_ERR(soc_dev)) {

		ret = PTR_ERR(soc_dev);

		goto free_serial_number;

	}

	if (IS_ERR(soc_dev))

		return PTR_ERR(soc_dev);



	return 0;



free_serial_number:

	kfree(soc_dev_attr->serial_number);

free_revision:

	kfree(soc_dev_attr->revision);

free_soc_id:

	kfree(soc_dev_attr->soc_id);

	return ret;

}



static struct platform_driver imx_scu_soc_driver = {

	.driver = {

		.name = IMX_SCU_SOC_DRIVER_NAME,

	},

	.probe = imx_scu_soc_probe,

};



static int __init imx_scu_soc_init(void)

{

	struct platform_device *pdev;

	struct device_node *np;

	int ret;



	np = of_find_compatible_node(NULL, NULL, "fsl,imx-scu");

	if (!np)

		return -ENODEV;



	of_node_put(np);



	ret = platform_driver_register(&imx_scu_soc_driver);

	if (ret)

		return ret;



	pdev = platform_device_register_simple(IMX_SCU_SOC_DRIVER_NAME,

					       -1, NULL, 0);

	if (IS_ERR(pdev))

		platform_driver_unregister(&imx_scu_soc_driver);



	return PTR_ERR_OR_ZERO(pdev);

}
 
device_initcall(imx_scu_soc_init);

drivers/firmware/imx/imx-scu.c

+4 −0
Original line number Diff line number Diff line
@@ -328,6 +328,10 @@ static int imx_scu_probe(struct platform_device *pdev) 


	imx_sc_ipc_handle = sc_ipc;



	ret = imx_scu_soc_init(dev);

	if (ret)

		dev_warn(dev, "failed to initialize SoC info: %d\n", ret);



	ret = imx_scu_enable_general_irq_channel(dev);

	if (ret)

		dev_warn(dev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE