* [PATCH] sfc-falcon: Fix missing error code in ef4_reset_up()
@ 2021-06-01 11:06 Jiapeng Chong
2021-06-01 11:22 ` Edward Cree
0 siblings, 1 reply; 2+ messages in thread
From: Jiapeng Chong @ 2021-06-01 11:06 UTC (permalink / raw)
To: ecree.xilinx
Cc: habetsm.xilinx, davem, kuba, netdev, linux-kernel, Jiapeng Chong
The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'rc'.
Eliminate the follow smatch warning:
drivers/net/ethernet/sfc/falcon/efx.c:2389 ef4_reset_up() warn: missing
error code 'rc'.
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
drivers/net/ethernet/sfc/falcon/efx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 5e7a57b..d336c24 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2385,8 +2385,10 @@ int ef4_reset_up(struct ef4_nic *efx, enum reset_type method, bool ok)
goto fail;
}
- if (!ok)
+ if (!ok) {
+ rc = -EINVAL;
goto fail;
+ }
if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&
method != RESET_TYPE_DATAPATH) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sfc-falcon: Fix missing error code in ef4_reset_up()
2021-06-01 11:06 [PATCH] sfc-falcon: Fix missing error code in ef4_reset_up() Jiapeng Chong
@ 2021-06-01 11:22 ` Edward Cree
0 siblings, 0 replies; 2+ messages in thread
From: Edward Cree @ 2021-06-01 11:22 UTC (permalink / raw)
To: Jiapeng Chong; +Cc: habetsm.xilinx, davem, kuba, netdev, linux-kernel
On 01/06/2021 12:06, Jiapeng Chong wrote:
> The error code is missing in this code scenario, add the error code
> '-EINVAL' to the return value 'rc'.
>
> Eliminate the follow smatch warning:
>
> drivers/net/ethernet/sfc/falcon/efx.c:2389 ef4_reset_up() warn: missing
> error code 'rc'.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
> ---
> drivers/net/ethernet/sfc/falcon/efx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
> index 5e7a57b..d336c24 100644
> --- a/drivers/net/ethernet/sfc/falcon/efx.c
> +++ b/drivers/net/ethernet/sfc/falcon/efx.c
> @@ -2385,8 +2385,10 @@ int ef4_reset_up(struct ef4_nic *efx, enum reset_type method, bool ok)
> goto fail;
> }
>
> - if (!ok)
> + if (!ok) {
> + rc = -EINVAL;
> goto fail;
> + }
Not sure this is correct. Without the patch, we return with rc == 0
(set by the efx->type->init() call just above), which seems reasonable
as we successfully finished a RESET_TYPE_DISABLE.
The label name 'fail:' might be misleading; it does seem like this is
intended behaviour.
Have you tested this at all?
Note that the sfc driver (efx_common.c) does much the same thing as the
code here before your patch.
-ed
>
> if (efx->port_initialized && method != RESET_TYPE_INVISIBLE &&
> method != RESET_TYPE_DATAPATH) {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-01 11:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 11:06 [PATCH] sfc-falcon: Fix missing error code in ef4_reset_up() Jiapeng Chong
2021-06-01 11:22 ` Edward Cree
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).