Skip to content

Commit 9fb9ae8

Browse files
arndbarndb
committed
Merge tag 'imx-drivers-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/drivers
i.MX drivers update for 6.6: - A series from NXP i.MX developers (Peng Fan, etc.) to update imx-scu and imx-scu-irq firmware drivers. - Add dedicated lockdep class for nested genpd locks to fix a lockdep warning in imx93-blk-ctrl driver. - A change from Rob to explicitly include correct DT headers for i.MX SoC drivers. - Use devm_platform_ioremap_resource() in imx-weim bus driver. * tag 'imx-drivers-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: firmware: imx: scu-irq: support identifying SCU wakeup source from sysfs firmware: imx: scu-irq: enlarge the IMX_SC_IRQ_NUM_GROUP firmware: imx: scu-irq: add imx_scu_irq_get_status firmware: imx: scu-irq: fix RCU complaint after M4 partition reset firmware: imx: scu: use EOPNOTSUPP firmware: imx: scu: use soc name for soc_id firmware: imx: scu: increase RPC timeout firmware: imx: scu: change init level to subsys_initcall_sync soc: imx: Explicitly include correct DT includes bus: imx-weim: use devm_platform_ioremap_resource soc: imx: imx93-blk-ctrl: Add dedicated lockdep class for nested genpd locks Link: https://lore.kernel.org/r/20230813133354.847010-1-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a90d34a + c081197 commit 9fb9ae8

File tree

10 files changed

+158
-33
lines changed

10 files changed

+158
-33
lines changed

‎drivers/bus/imx-weim.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ static int weim_probe(struct platform_device *pdev)
273273
return -ENOMEM;
274274

275275
/* get the resource */
276-
base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
276+
base = devm_platform_ioremap_resource(pdev, 0);
277277
if (IS_ERR(base))
278278
return PTR_ERR(base);
279279

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

Lines changed: 101 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0+
22
/*
3-
* Copyright 2019 NXP
3+
* Copyright 2019,2023 NXP
44
*
55
* Implementation of the SCU IRQ functions using MU.
66
*
@@ -9,12 +9,14 @@
99
#include <dt-bindings/firmware/imx/rsrc.h>
1010
#include <linux/firmware/imx/ipc.h>
1111
#include <linux/firmware/imx/sci.h>
12+
#include <linux/kobject.h>
1213
#include <linux/mailbox_client.h>
1314
#include <linux/suspend.h>
15+
#include <linux/sysfs.h>
1416

1517
#define IMX_SC_IRQ_FUNC_ENABLE 1
1618
#define IMX_SC_IRQ_FUNC_STATUS 2
17-
#define IMX_SC_IRQ_NUM_GROUP 4
19+
#define IMX_SC_IRQ_NUM_GROUP 9
1820

1921
static u32 mu_resource_id;
2022

@@ -40,63 +42,102 @@ struct imx_sc_msg_irq_enable {
4042
u8 enable;
4143
} __packed;
4244

45+
struct scu_wakeup {
46+
u32 mask;
47+
u32 wakeup_src;
48+
bool valid;
49+
};
50+
51+
/* Sysfs functions */
52+
static struct kobject *wakeup_obj;
53+
static ssize_t wakeup_source_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf);
54+
static struct kobj_attribute wakeup_source_attr =
55+
__ATTR(wakeup_src, 0660, wakeup_source_show, NULL);
56+
57+
static struct scu_wakeup scu_irq_wakeup[IMX_SC_IRQ_NUM_GROUP];
58+
4359
static struct imx_sc_ipc *imx_sc_irq_ipc_handle;
4460
static struct work_struct imx_sc_irq_work;
45-
static ATOMIC_NOTIFIER_HEAD(imx_scu_irq_notifier_chain);
61+
static BLOCKING_NOTIFIER_HEAD(imx_scu_irq_notifier_chain);
4662

4763
int imx_scu_irq_register_notifier(struct notifier_block *nb)
4864
{
49-
return atomic_notifier_chain_register(
65+
return blocking_notifier_chain_register(
5066
&imx_scu_irq_notifier_chain, nb);
5167
}
5268
EXPORT_SYMBOL(imx_scu_irq_register_notifier);
5369

5470
int imx_scu_irq_unregister_notifier(struct notifier_block *nb)
5571
{
56-
return atomic_notifier_chain_unregister(
72+
return blocking_notifier_chain_unregister(
5773
&imx_scu_irq_notifier_chain, nb);
5874
}
5975
EXPORT_SYMBOL(imx_scu_irq_unregister_notifier);
6076

6177
static int imx_scu_irq_notifier_call_chain(unsigned long status, u8 *group)
6278
{
63-
return atomic_notifier_call_chain(&imx_scu_irq_notifier_chain,
79+
return blocking_notifier_call_chain(&imx_scu_irq_notifier_chain,
6480
status, (void *)group);
6581
}
6682

6783
static void imx_scu_irq_work_handler(struct work_struct *work)
6884
{
69-
struct imx_sc_msg_irq_get_status msg;
70-
struct imx_sc_rpc_msg *hdr = &msg.hdr;
7185
u32 irq_status;
7286
int ret;
7387
u8 i;
7488

7589
for (i = 0; i < IMX_SC_IRQ_NUM_GROUP; i++) {
76-
hdr->ver = IMX_SC_RPC_VERSION;
77-
hdr->svc = IMX_SC_RPC_SVC_IRQ;
78-
hdr->func = IMX_SC_IRQ_FUNC_STATUS;
79-
hdr->size = 2;
80-
81-
msg.data.req.resource = mu_resource_id;
82-
msg.data.req.group = i;
90+
if (scu_irq_wakeup[i].mask) {
91+
scu_irq_wakeup[i].valid = false;
92+
scu_irq_wakeup[i].wakeup_src = 0;
93+
}
8394

84-
ret = imx_scu_call_rpc(imx_sc_irq_ipc_handle, &msg, true);
95+
ret = imx_scu_irq_get_status(i, &irq_status);
8596
if (ret) {
8697
pr_err("get irq group %d status failed, ret %d\n",
8798
i, ret);
8899
return;
89100
}
90101

91-
irq_status = msg.data.resp.status;
92102
if (!irq_status)
93103
continue;
104+
if (scu_irq_wakeup[i].mask & irq_status) {
105+
scu_irq_wakeup[i].valid = true;
106+
scu_irq_wakeup[i].wakeup_src = irq_status & scu_irq_wakeup[i].mask;
107+
} else {
108+
scu_irq_wakeup[i].wakeup_src = irq_status;
109+
}
94110

95111
pm_system_wakeup();
96112
imx_scu_irq_notifier_call_chain(irq_status, &i);
97113
}
98114
}
99115

116+
int imx_scu_irq_get_status(u8 group, u32 *irq_status)
117+
{
118+
struct imx_sc_msg_irq_get_status msg;
119+
struct imx_sc_rpc_msg *hdr = &msg.hdr;
120+
int ret;
121+
122+
hdr->ver = IMX_SC_RPC_VERSION;
123+
hdr->svc = IMX_SC_RPC_SVC_IRQ;
124+
hdr->func = IMX_SC_IRQ_FUNC_STATUS;
125+
hdr->size = 2;
126+
127+
msg.data.req.resource = mu_resource_id;
128+
msg.data.req.group = group;
129+
130+
ret = imx_scu_call_rpc(imx_sc_irq_ipc_handle, &msg, true);
131+
if (ret)
132+
return ret;
133+
134+
if (irq_status)
135+
*irq_status = msg.data.resp.status;
136+
137+
return 0;
138+
}
139+
EXPORT_SYMBOL(imx_scu_irq_get_status);
140+
100141
int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable)
101142
{
102143
struct imx_sc_msg_irq_enable msg;
@@ -121,6 +162,11 @@ int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable)
121162
pr_err("enable irq failed, group %d, mask %d, ret %d\n",
122163
group, mask, ret);
123164

165+
if (enable)
166+
scu_irq_wakeup[group].mask |= mask;
167+
else
168+
scu_irq_wakeup[group].mask &= ~mask;
169+
124170
return ret;
125171
}
126172
EXPORT_SYMBOL(imx_scu_irq_group_enable);
@@ -130,6 +176,25 @@ static void imx_scu_irq_callback(struct mbox_client *c, void *msg)
130176
schedule_work(&imx_sc_irq_work);
131177
}
132178

179+
static ssize_t wakeup_source_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
180+
{
181+
int i;
182+
183+
for (i = 0; i < IMX_SC_IRQ_NUM_GROUP; i++) {
184+
if (!scu_irq_wakeup[i].wakeup_src)
185+
continue;
186+
187+
if (scu_irq_wakeup[i].valid)
188+
sprintf(buf, "Wakeup source group = %d, irq = 0x%x\n",
189+
i, scu_irq_wakeup[i].wakeup_src);
190+
else
191+
sprintf(buf, "Spurious SCU wakeup, group = %d, irq = 0x%x\n",
192+
i, scu_irq_wakeup[i].wakeup_src);
193+
}
194+
195+
return strlen(buf);
196+
}
197+
133198
int imx_scu_enable_general_irq_channel(struct device *dev)
134199
{
135200
struct of_phandle_args spec;
@@ -169,6 +234,25 @@ int imx_scu_enable_general_irq_channel(struct device *dev)
169234

170235
mu_resource_id = IMX_SC_R_MU_0A + i;
171236

237+
/* Create directory under /sysfs/firmware */
238+
wakeup_obj = kobject_create_and_add("scu_wakeup_source", firmware_kobj);
239+
if (!wakeup_obj) {
240+
ret = -ENOMEM;
241+
goto free_ch;
242+
}
243+
244+
ret = sysfs_create_file(wakeup_obj, &wakeup_source_attr.attr);
245+
if (ret) {
246+
dev_err(dev, "Cannot create wakeup source src file......\n");
247+
kobject_put(wakeup_obj);
248+
goto free_ch;
249+
}
250+
251+
return 0;
252+
253+
free_ch:
254+
mbox_free_channel(ch);
255+
172256
return ret;
173257
}
174258
EXPORT_SYMBOL(imx_scu_enable_general_irq_channel);

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,22 @@ static int imx_scu_soc_id(void)
7878
return msg.data.resp.id;
7979
}
8080

81+
static const char *imx_scu_soc_name(u32 id)
82+
{
83+
switch (id) {
84+
case 0x1:
85+
return "i.MX8QM";
86+
case 0x2:
87+
return "i.MX8QXP";
88+
case 0xe:
89+
return "i.MX8DXL";
90+
default:
91+
break;
92+
}
93+
94+
return "NULL";
95+
}
96+
8197
int imx_scu_soc_init(struct device *dev)
8298
{
8399
struct soc_device_attribute *soc_dev_attr;
@@ -113,9 +129,7 @@ int imx_scu_soc_init(struct device *dev)
113129

114130
/* format soc_id value passed from SCU firmware */
115131
val = id & 0x1f;
116-
soc_dev_attr->soc_id = devm_kasprintf(dev, GFP_KERNEL, "0x%x", val);
117-
if (!soc_dev_attr->soc_id)
118-
return -ENOMEM;
132+
soc_dev_attr->soc_id = imx_scu_soc_name(val);
119133

120134
/* format revision value passed from SCU firmware */
121135
val = (id >> 5) & 0xf;

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/platform_device.h>
2121

2222
#define SCU_MU_CHAN_NUM 8
23-
#define MAX_RX_TIMEOUT (msecs_to_jiffies(30))
23+
#define MAX_RX_TIMEOUT (msecs_to_jiffies(3000))
2424

2525
struct imx_sc_chan {
2626
struct imx_sc_ipc *sc_ipc;
@@ -353,7 +353,12 @@ static struct platform_driver imx_scu_driver = {
353353
},
354354
.probe = imx_scu_probe,
355355
};
356-
builtin_platform_driver(imx_scu_driver);
356+
357+
static int __init imx_scu_driver_init(void)
358+
{
359+
return platform_driver_register(&imx_scu_driver);
360+
}
361+
subsys_initcall_sync(imx_scu_driver_init);
357362

358363
MODULE_AUTHOR("Dong Aisheng <aisheng.dong@nxp.com>");
359364
MODULE_DESCRIPTION("IMX SCU firmware protocol driver");

‎drivers/genpd/imx/gpcv2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
#include <linux/clk.h>
12-
#include <linux/of_device.h>
12+
#include <linux/of.h>
1313
#include <linux/platform_device.h>
1414
#include <linux/pm_domain.h>
1515
#include <linux/pm_runtime.h>

‎drivers/genpd/imx/imx8m-blk-ctrl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
#include <linux/device.h>
99
#include <linux/interconnect.h>
1010
#include <linux/module.h>
11-
#include <linux/of_device.h>
11+
#include <linux/of.h>
12+
#include <linux/of_platform.h>
1213
#include <linux/platform_device.h>
1314
#include <linux/pm_domain.h>
1415
#include <linux/pm_runtime.h>

‎drivers/genpd/imx/imx8mp-blk-ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <linux/device.h>
1111
#include <linux/interconnect.h>
1212
#include <linux/module.h>
13-
#include <linux/of_device.h>
13+
#include <linux/of.h>
1414
#include <linux/platform_device.h>
1515
#include <linux/pm_domain.h>
1616
#include <linux/pm_runtime.h>

‎drivers/genpd/imx/imx93-blk-ctrl.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <linux/clk.h>
77
#include <linux/device.h>
88
#include <linux/module.h>
9-
#include <linux/of_device.h>
9+
#include <linux/of.h>
1010
#include <linux/platform_device.h>
1111
#include <linux/pm_domain.h>
1212
#include <linux/pm_runtime.h>
@@ -187,6 +187,8 @@ static int imx93_blk_ctrl_power_off(struct generic_pm_domain *genpd)
187187
return 0;
188188
}
189189

190+
static struct lock_class_key blk_ctrl_genpd_lock_class;
191+
190192
static int imx93_blk_ctrl_probe(struct platform_device *pdev)
191193
{
192194
struct device *dev = &pdev->dev;
@@ -269,6 +271,19 @@ static int imx93_blk_ctrl_probe(struct platform_device *pdev)
269271
goto cleanup_pds;
270272
}
271273

274+
/*
275+
* We use runtime PM to trigger power on/off of the upstream GPC
276+
* domain, as a strict hierarchical parent/child power domain
277+
* setup doesn't allow us to meet the sequencing requirements.
278+
* This means we have nested locking of genpd locks, without the
279+
* nesting being visible at the genpd level, so we need a
280+
* separate lock class to make lockdep aware of the fact that
281+
* this are separate domain locks that can be nested without a
282+
* self-deadlock.
283+
*/
284+
lockdep_set_class(&domain->genpd.mlock,
285+
&blk_ctrl_genpd_lock_class);
286+
272287
bc->onecell_data.domains[i] = &domain->genpd;
273288
}
274289

‎drivers/genpd/imx/imx93-pd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include <linux/clk.h>
77
#include <linux/delay.h>
8-
#include <linux/of_device.h>
98
#include <linux/iopoll.h>
9+
#include <linux/mod_devicetable.h>
1010
#include <linux/module.h>
1111
#include <linux/platform_device.h>
1212
#include <linux/pm_domain.h>

‎include/linux/firmware/imx/sci.h

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,37 @@ int imx_scu_enable_general_irq_channel(struct device *dev);
2121
int imx_scu_irq_register_notifier(struct notifier_block *nb);
2222
int imx_scu_irq_unregister_notifier(struct notifier_block *nb);
2323
int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable);
24+
int imx_scu_irq_get_status(u8 group, u32 *irq_status);
2425
int imx_scu_soc_init(struct device *dev);
2526
#else
2627
static inline int imx_scu_soc_init(struct device *dev)
2728
{
28-
return -ENOTSUPP;
29+
return -EOPNOTSUPP;
2930
}
3031

3132
static inline int imx_scu_enable_general_irq_channel(struct device *dev)
3233
{
33-
return -ENOTSUPP;
34+
return -EOPNOTSUPP;
3435
}
3536

3637
static inline int imx_scu_irq_register_notifier(struct notifier_block *nb)
3738
{
38-
return -ENOTSUPP;
39+
return -EOPNOTSUPP;
3940
}
4041

4142
static inline int imx_scu_irq_unregister_notifier(struct notifier_block *nb)
4243
{
43-
return -ENOTSUPP;
44+
return -EOPNOTSUPP;
4445
}
4546

4647
static inline int imx_scu_irq_group_enable(u8 group, u32 mask, u8 enable)
4748
{
48-
return -ENOTSUPP;
49+
return -EOPNOTSUPP;
50+
}
51+
52+
static inline int imx_scu_irq_get_status(u8 group, u32 *irq_status)
53+
{
54+
return -EOPNOTSUPP;
4955
}
5056
#endif
5157
#endif /* _SC_SCI_H */

0 commit comments

Comments
 (0)