drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165 (fwd)

PATCH New Julia Lawall 3 participants 3 messages Oct 8, 2018 – Oct 9, 2018 Arm i.MX and Layerscape

lore

Share & tools

lore

Julia Lawall

author

2018-10-08 08:33 UTC #0 lore raw

PATCH 9/10 drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165 (fwd)

Hello,

It looks like an unlock is needed before line 180.

julia

---------- Forwarded message ----------
Date: Mon, 8 Oct 2018 15:25:21 +0800
From: kbuild test robot <[email protected]>
To: kbuild at 01.org
Cc: Julia Lawall <[email protected]>
Subject: [shawnguo:imx/drivers 9/10] drivers/firmware/imx/imx-scu.c:180:3-9:
preceding lock on line 165

CC: kbuild-all at 01.org
CC: linux-arm-kernel at lists.infradead.org
TO: Dong Aisheng <[email protected]>
CC: Shawn Guo <[email protected]>
CC: Sascha Hauer <[email protected]>

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx/drivers
head:   a8b96789a795af1127f722c3b1cd243ea16270ae
commit: d41a5a155f7b716941583cab7db703a2e4c6172c [9/10] firmware: imx: add SCU firmware driver support

:::::: branch date: 8 days ago
:::::: commit date: 8 days ago

Quoted 1 line

Quoted 1 line
drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165

# https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git/commit/?id=d41a5a155f7b716941583cab7db703a2e4c6172c
git remote add shawnguo https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
git remote update shawnguo
git checkout d41a5a155f7b716941583cab7db703a2e4c6172c
vim +180 drivers/firmware/imx/imx-scu.c

d41a5a15 Dong Aisheng 2018-09-30  153
d41a5a15 Dong Aisheng 2018-09-30  154  /*
d41a5a15 Dong Aisheng 2018-09-30  155   * RPC command/response
d41a5a15 Dong Aisheng 2018-09-30  156   */
d41a5a15 Dong Aisheng 2018-09-30  157  int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
d41a5a15 Dong Aisheng 2018-09-30  158  {
d41a5a15 Dong Aisheng 2018-09-30  159  	struct imx_sc_rpc_msg *hdr;
d41a5a15 Dong Aisheng 2018-09-30  160  	int ret;
d41a5a15 Dong Aisheng 2018-09-30  161
d41a5a15 Dong Aisheng 2018-09-30  162  	if (WARN_ON(!sc_ipc || !msg))
d41a5a15 Dong Aisheng 2018-09-30  163  		return -EINVAL;
d41a5a15 Dong Aisheng 2018-09-30  164
d41a5a15 Dong Aisheng 2018-09-30 @165  	mutex_lock(&sc_ipc->lock);
d41a5a15 Dong Aisheng 2018-09-30  166  	reinit_completion(&sc_ipc->done);
d41a5a15 Dong Aisheng 2018-09-30  167
d41a5a15 Dong Aisheng 2018-09-30  168  	sc_ipc->msg = msg;
d41a5a15 Dong Aisheng 2018-09-30  169  	sc_ipc->count = 0;
d41a5a15 Dong Aisheng 2018-09-30  170  	ret = imx_scu_ipc_write(sc_ipc, msg);
d41a5a15 Dong Aisheng 2018-09-30  171  	if (ret < 0) {
d41a5a15 Dong Aisheng 2018-09-30  172  		dev_err(sc_ipc->dev, "RPC send msg failed: %d\n", ret);
d41a5a15 Dong Aisheng 2018-09-30  173  		goto out;
d41a5a15 Dong Aisheng 2018-09-30  174  	}
d41a5a15 Dong Aisheng 2018-09-30  175
d41a5a15 Dong Aisheng 2018-09-30  176  	if (have_resp) {
d41a5a15 Dong Aisheng 2018-09-30  177  		if (!wait_for_completion_timeout(&sc_ipc->done,
d41a5a15 Dong Aisheng 2018-09-30  178  						 MAX_RX_TIMEOUT)) {
d41a5a15 Dong Aisheng 2018-09-30  179  			dev_err(sc_ipc->dev, "RPC send msg timeout\n");
d41a5a15 Dong Aisheng 2018-09-30 @180  			return -ETIMEDOUT;
d41a5a15 Dong Aisheng 2018-09-30  181  		}
d41a5a15 Dong Aisheng 2018-09-30  182
d41a5a15 Dong Aisheng 2018-09-30  183  		/* response status is stored in hdr->func field */
d41a5a15 Dong Aisheng 2018-09-30  184  		hdr = msg;
d41a5a15 Dong Aisheng 2018-09-30  185  		ret = hdr->func;
d41a5a15 Dong Aisheng 2018-09-30  186  	}
d41a5a15 Dong Aisheng 2018-09-30  187
d41a5a15 Dong Aisheng 2018-09-30  188  out:
d41a5a15 Dong Aisheng 2018-09-30  189  	mutex_unlock(&sc_ipc->lock);
d41a5a15 Dong Aisheng 2018-09-30  190
d41a5a15 Dong Aisheng 2018-09-30  191  	dev_dbg(sc_ipc->dev, "RPC SVC done\n");
d41a5a15 Dong Aisheng 2018-09-30  192
d41a5a15 Dong Aisheng 2018-09-30  193  	return imx_sc_to_linux_errno(ret);
d41a5a15 Dong Aisheng 2018-09-30  194  }
d41a5a15 Dong Aisheng 2018-09-30  195  EXPORT_SYMBOL(imx_scu_call_rpc);
d41a5a15 Dong Aisheng 2018-09-30  196

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

Shawn Guo

2018-10-08 14:03 UTC #1 lore raw

PATCH 9/10 drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165 (fwd)

Hi Julia,

Quoted 3 lines · Julia Lawall

Hello,
It looks like an unlock is needed before line 180.

Ah, yes. I just appended the following change to the original commit.

Thanks for the report.

Shawn

drivers/firmware/imx/imx-scu.c +1 -0

index 06c9b8e01a8c..2bb1a19c413f 100644
@@ -176,6 +176,7 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
                if (!wait_for_completion_timeout(&sc_ipc->done,
                                                 MAX_RX_TIMEOUT)) {
                        dev_err(sc_ipc->dev, "RPC send msg timeout\n");
+                       mutex_unlock(&sc_ipc->lock);
                        return -ETIMEDOUT;
                }

Quoted 79 lines

julia

CC: kbuild-all at 01.org
CC: linux-arm-kernel at lists.infradead.org
TO: Dong Aisheng <[email protected]>
CC: Shawn Guo <[email protected]>
CC: Sascha Hauer <[email protected]>

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx/drivers
head:   a8b96789a795af1127f722c3b1cd243ea16270ae
commit: d41a5a155f7b716941583cab7db703a2e4c6172c [9/10] firmware: imx: add SCU firmware driver support

:::::: branch date: 8 days ago
:::::: commit date: 8 days ago

Quoted 1 line

Quoted 1 line
drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165

d41a5a15 Dong Aisheng 2018-09-30  153
d41a5a15 Dong Aisheng 2018-09-30  154  /*
d41a5a15 Dong Aisheng 2018-09-30  155   * RPC command/response
d41a5a15 Dong Aisheng 2018-09-30  156   */
d41a5a15 Dong Aisheng 2018-09-30  157  int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
d41a5a15 Dong Aisheng 2018-09-30  158  {
d41a5a15 Dong Aisheng 2018-09-30  159  	struct imx_sc_rpc_msg *hdr;
d41a5a15 Dong Aisheng 2018-09-30  160  	int ret;
d41a5a15 Dong Aisheng 2018-09-30  161
d41a5a15 Dong Aisheng 2018-09-30  162  	if (WARN_ON(!sc_ipc || !msg))
d41a5a15 Dong Aisheng 2018-09-30  163  		return -EINVAL;
d41a5a15 Dong Aisheng 2018-09-30  164
d41a5a15 Dong Aisheng 2018-09-30 @165  	mutex_lock(&sc_ipc->lock);
d41a5a15 Dong Aisheng 2018-09-30  166  	reinit_completion(&sc_ipc->done);
d41a5a15 Dong Aisheng 2018-09-30  167
d41a5a15 Dong Aisheng 2018-09-30  168  	sc_ipc->msg = msg;
d41a5a15 Dong Aisheng 2018-09-30  169  	sc_ipc->count = 0;
d41a5a15 Dong Aisheng 2018-09-30  170  	ret = imx_scu_ipc_write(sc_ipc, msg);
d41a5a15 Dong Aisheng 2018-09-30  171  	if (ret < 0) {
d41a5a15 Dong Aisheng 2018-09-30  172  		dev_err(sc_ipc->dev, "RPC send msg failed: %d\n", ret);
d41a5a15 Dong Aisheng 2018-09-30  173  		goto out;
d41a5a15 Dong Aisheng 2018-09-30  174  	}
d41a5a15 Dong Aisheng 2018-09-30  175
d41a5a15 Dong Aisheng 2018-09-30  176  	if (have_resp) {
d41a5a15 Dong Aisheng 2018-09-30  177  		if (!wait_for_completion_timeout(&sc_ipc->done,
d41a5a15 Dong Aisheng 2018-09-30  178  						 MAX_RX_TIMEOUT)) {
d41a5a15 Dong Aisheng 2018-09-30  179  			dev_err(sc_ipc->dev, "RPC send msg timeout\n");
d41a5a15 Dong Aisheng 2018-09-30 @180  			return -ETIMEDOUT;
d41a5a15 Dong Aisheng 2018-09-30  181  		}
d41a5a15 Dong Aisheng 2018-09-30  182
d41a5a15 Dong Aisheng 2018-09-30  183  		/* response status is stored in hdr->func field */
d41a5a15 Dong Aisheng 2018-09-30  184  		hdr = msg;
d41a5a15 Dong Aisheng 2018-09-30  185  		ret = hdr->func;
d41a5a15 Dong Aisheng 2018-09-30  186  	}
d41a5a15 Dong Aisheng 2018-09-30  187
d41a5a15 Dong Aisheng 2018-09-30  188  out:
d41a5a15 Dong Aisheng 2018-09-30  189  	mutex_unlock(&sc_ipc->lock);
d41a5a15 Dong Aisheng 2018-09-30  190
d41a5a15 Dong Aisheng 2018-09-30  191  	dev_dbg(sc_ipc->dev, "RPC SVC done\n");
d41a5a15 Dong Aisheng 2018-09-30  192
d41a5a15 Dong Aisheng 2018-09-30  193  	return imx_sc_to_linux_errno(ret);
d41a5a15 Dong Aisheng 2018-09-30  194  }
d41a5a15 Dong Aisheng 2018-09-30  195  EXPORT_SYMBOL(imx_scu_call_rpc);
d41a5a15 Dong Aisheng 2018-09-30  196

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

A.s. Dong

2018-10-09 02:38 UTC #2 lore raw

PATCH 9/10 drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165 (fwd)

Quoted 10 lines

-----Original Message-----
From: Shawn Guo [mailto:shawnguo at kernel.org]
Sent: Monday, October 8, 2018 10:04 PM
To: Julia Lawall <[email protected]>
Cc: A.s. Dong <[email protected]>; Sascha Hauer <[email protected]>; linux-arm-kernel at lists.infradead.org; kbuild-all at 01.org
Subject: Re: [shawnguo:imx/drivers 9/10] drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165 (fwd)

Quoted 9 lines

Hi Julia,
Quoted 3 lines · Julia Lawall
Hello,
It looks like an unlock is needed before line 180.
Ah, yes. I just appended the following change to the original commit.

Shawn,
Thanks for the change.

Julia,
Thanks for the report.

Regards
Dong Aisheng

Quoted 156 lines

Thanks for the report.
Shawn
drivers/firmware/imx/imx-scu.c +1 -0
index 06c9b8e01a8c..2bb1a19c413f 100644
@@ -176,6 +176,7 @@ int imx_scu_call_rpc(struct imx_sc_ipc *sc_ipc, void
 *msg, bool have_resp)
                if (!wait_for_completion_timeout(&sc_ipc->done,
                                                 MAX_RX_TIMEOUT))
 {
                        dev_err(sc_ipc->dev, "RPC send msg timeout\n");
+                       mutex_unlock(&sc_ipc->lock);
                        return -ETIMEDOUT;
                }
Quoted 9 lines
julia
---------- Forwarded message ----------
Date: Mon, 8 Oct 2018 15:25:21 +0800
From: kbuild test robot <[email protected]>
To: kbuild at 01.org
Cc: Julia Lawall <[email protected]>
Subject: [shawnguo:imx/drivers 9/10]
drivers/firmware/imx/imx-scu.c:180:3-9:
Quoted 9 lines
preceding lock on line 165
CC: kbuild-all at 01.org
CC: linux-arm-kernel at lists.infradead.org
TO: Dong Aisheng <[email protected]>
CC: Shawn Guo <[email protected]>
CC: Sascha Hauer <[email protected]>
tree:
https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.ke
rnel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fshawnguo%2Flinux.git& amp;data=02%7C01%7Caisheng.dong%40nxp.com%7Cab375197b905451892f e08d62d26ea99%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63 6746042526127632&sdata=TPqf6Nii5H4qap9aq7kAq3dHcU03FFdpISVY NVNl6QU%3D&reserved=0 imx/drivers
Quoted 2 lines
head:   a8b96789a795af1127f722c3b1cd243ea16270ae
commit: d41a5a155f7b716941583cab7db703a2e4c6172c [9/10] firmware:
imx:
Quoted 9 lines
add SCU firmware driver support
:::::: branch date: 8 days ago
:::::: commit date: 8 days ago
Quoted 1 line
Quoted 1 line
drivers/firmware/imx/imx-scu.c:180:3-9: preceding lock on line 165
#
https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit
.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fshawnguo%2Flinux.
git%
Quoted 1 line
2Fcommit%2F%3Fid%3Dd41a5a155f7b716941583cab7db703a2e4c6172c&a mp;data=0
Quoted 1 line
2%7C01%7Caisheng.dong%40nxp.com%7Cab375197b905451892fe08d62d26 ea99%7C6
Quoted 1 line
86ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636746042526137637& amp;sdata
Quoted 4 lines
=A7MgLV5IgT68DrG85ejuPjiXNxhn2ILojs4PXtQOKWQ%3D&reserved=0 git remote add shawnguo
https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit
.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Fshawnguo%2Flinux.
git&
Quoted 1 line
amp;data=02%7C01%7Caisheng.dong%40nxp.com%7Cab375197b905451892f e08d62d
Quoted 1 line
26ea99%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C636746042 526137637
Quoted 1 line
&sdata=hCoJSx3HbDh3FVc4qgE3MTN0AFqgqkAemhn%2FEhMpMJs%3D &reserv
Quoted 5 lines
ed=0
git remote update shawnguo
git checkout d41a5a155f7b716941583cab7db703a2e4c6172c vim +180 drivers/firmware/imx/imx-scu.c
Quoted 11 lines
d41a5a15 Dong Aisheng 2018-09-30  153
d41a5a15 Dong Aisheng 2018-09-30  154  /*
d41a5a15 Dong Aisheng 2018-09-30  155   * RPC command/response
d41a5a15 Dong Aisheng 2018-09-30  156   */
d41a5a15 Dong Aisheng 2018-09-30  157  int imx_scu_call_rpc(struct
imx_sc_ipc *sc_ipc, void *msg, bool have_resp)
d41a5a15 Dong Aisheng 2018-09-30  158  {
d41a5a15 Dong Aisheng 2018-09-30  159  	struct imx_sc_rpc_msg *hdr;
d41a5a15 Dong Aisheng 2018-09-30  160  	int ret;
d41a5a15 Dong Aisheng 2018-09-30  161
d41a5a15 Dong Aisheng 2018-09-30  162  	if (WARN_ON(!sc_ipc
|| !msg))
> d41a5a15 Dong Aisheng 2018-09-30  163  		return -EINVAL;
> d41a5a15 Dong Aisheng 2018-09-30  164
> d41a5a15 Dong Aisheng 2018-09-30 @165  	mutex_lock(&sc_ipc->lock);
> d41a5a15 Dong Aisheng 2018-09-30  166
	reinit_completion(&sc_ipc->done);
Quoted 4 lines
d41a5a15 Dong Aisheng 2018-09-30  167
d41a5a15 Dong Aisheng 2018-09-30  168  	sc_ipc->msg = msg;
d41a5a15 Dong Aisheng 2018-09-30  169  	sc_ipc->count = 0;
d41a5a15 Dong Aisheng 2018-09-30  170  	ret =
imx_scu_ipc_write(sc_ipc, msg);
Quoted 2 lines
d41a5a15 Dong Aisheng 2018-09-30  171  	if (ret < 0) {
d41a5a15 Dong Aisheng 2018-09-30  172  		dev_err(sc_ipc->dev,
"RPC send msg failed: %d\n", ret);
Quoted 5 lines
d41a5a15 Dong Aisheng 2018-09-30  173  		goto out;
d41a5a15 Dong Aisheng 2018-09-30  174  	}
d41a5a15 Dong Aisheng 2018-09-30  175
d41a5a15 Dong Aisheng 2018-09-30  176  	if (have_resp) {
d41a5a15 Dong Aisheng 2018-09-30  177  		if
(!wait_for_completion_timeout(&sc_ipc->done,
Quoted 1 line
d41a5a15 Dong Aisheng 2018-09-30 178
MAX_RX_TIMEOUT)) {
Quoted 1 line
d41a5a15 Dong Aisheng 2018-09-30 179 dev_err(sc_ipc->dev,
"RPC send msg timeout\n");
Quoted 1 line
d41a5a15 Dong Aisheng 2018-09-30 @180 return
-ETIMEDOUT;
Quoted 3 lines
d41a5a15 Dong Aisheng 2018-09-30  181  		}
d41a5a15 Dong Aisheng 2018-09-30  182
d41a5a15 Dong Aisheng 2018-09-30  183  		/* response status is
stored in hdr->func field */
Quoted 6 lines
d41a5a15 Dong Aisheng 2018-09-30  184  		hdr = msg;
d41a5a15 Dong Aisheng 2018-09-30  185  		ret = hdr->func;
d41a5a15 Dong Aisheng 2018-09-30  186  	}
d41a5a15 Dong Aisheng 2018-09-30  187
d41a5a15 Dong Aisheng 2018-09-30  188  out:
d41a5a15 Dong Aisheng 2018-09-30  189
	mutex_unlock(&sc_ipc->lock);
Quoted 2 lines
d41a5a15 Dong Aisheng 2018-09-30 190
d41a5a15 Dong Aisheng 2018-09-30 191 dev_dbg(sc_ipc->dev, "RPC
SVC done\n");
Quoted 2 lines
d41a5a15 Dong Aisheng 2018-09-30 192
d41a5a15 Dong Aisheng 2018-09-30 193 return
imx_sc_to_linux_errno(ret);
Quoted 7 lines
d41a5a15 Dong Aisheng 2018-09-30 194 } d41a5a15 Dong Aisheng 2018-09-30 195 EXPORT_SYMBOL(imx_scu_call_rpc); d41a5a15 Dong Aisheng 2018-09-30 196
---
0-DAY kernel test infrastructure Open Source Technology
Center
Quoted 1 line
https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.0
1.org%2Fpipermail%2Fkbuild-all&data=02%7C01%7Caisheng.dong%40nx p.com%7Cab375197b905451892fe08d62d26ea99%7C686ea1d3bc2b4c6fa92 cd99c5c301635%7C0%7C0%7C636746042526137637&sdata=kFIkXanllJ YfAie3xzsWvMcaylyTAbYpwYvUP23N5jA%3D&reserved=0 Intel Corporation