From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Marcin Szycik <marcin.szycik@linux.intel.com>
Cc: netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
mateusz.polchlopek@intel.com
Subject: Re: [Intel-wired-lan] [PATCH iwl-net 1/2] ice: Fix entering Safe Mode
Date: Fri, 20 Sep 2024 14:03:06 +0200 [thread overview]
Message-ID: <Zu1kelo0Wd20pyjf@boxer> (raw)
In-Reply-To: <20240920115508.3168-3-marcin.szycik@linux.intel.com>
On Fri, Sep 20, 2024 at 01:55:09PM +0200, Marcin Szycik wrote:
> If DDP package is missing or corrupted, the driver should enter Safe Mode.
> Instead, an error is returned and probe fails.
>
> Don't check return value of ice_init_ddp_config() to fix this.
no one else checks the retval after your fix so adjust it to return void.
>
> Repro:
> * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg)
> * Load ice
>
> Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology")
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_main.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index 0f5c9d347806..7b6725d652e1 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf)
>
> ice_init_feature_support(pf);
>
> - err = ice_init_ddp_config(hw, pf);
> - if (err)
> - return err;
> + ice_init_ddp_config(hw, pf);
>
> /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be
> * set in pf->state, which will cause ice_is_safe_mode to return
> --
> 2.45.0
>
>
WARNING: multiple messages have this Message-ID (diff)
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Marcin Szycik <marcin.szycik@linux.intel.com>
Cc: <intel-wired-lan@lists.osuosl.org>, <netdev@vger.kernel.org>,
<mateusz.polchlopek@intel.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>
Subject: Re: [PATCH iwl-net 1/2] ice: Fix entering Safe Mode
Date: Fri, 20 Sep 2024 14:03:06 +0200 [thread overview]
Message-ID: <Zu1kelo0Wd20pyjf@boxer> (raw)
In-Reply-To: <20240920115508.3168-3-marcin.szycik@linux.intel.com>
On Fri, Sep 20, 2024 at 01:55:09PM +0200, Marcin Szycik wrote:
> If DDP package is missing or corrupted, the driver should enter Safe Mode.
> Instead, an error is returned and probe fails.
>
> Don't check return value of ice_init_ddp_config() to fix this.
no one else checks the retval after your fix so adjust it to return void.
>
> Repro:
> * Remove or rename DDP package (/lib/firmware/intel/ice/ddp/ice.pkg)
> * Load ice
>
> Fixes: cc5776fe1832 ("ice: Enable switching default Tx scheduler topology")
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
> Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice_main.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index 0f5c9d347806..7b6725d652e1 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -4748,9 +4748,7 @@ int ice_init_dev(struct ice_pf *pf)
>
> ice_init_feature_support(pf);
>
> - err = ice_init_ddp_config(hw, pf);
> - if (err)
> - return err;
> + ice_init_ddp_config(hw, pf);
>
> /* if ice_init_ddp_config fails, ICE_FLAG_ADV_FEATURES bit won't be
> * set in pf->state, which will cause ice_is_safe_mode to return
> --
> 2.45.0
>
>
next prev parent reply other threads:[~2024-09-20 12:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-20 11:55 [Intel-wired-lan] [PATCH iwl-net 1/2] ice: Fix entering Safe Mode Marcin Szycik
2024-09-20 11:55 ` Marcin Szycik
2024-09-20 11:55 ` [Intel-wired-lan] [PATCH iwl-net 2/2] ice: Fix netif_is_ice() in " Marcin Szycik
2024-09-20 11:55 ` Marcin Szycik
2024-09-20 12:03 ` Maciej Fijalkowski [this message]
2024-09-20 12:03 ` [PATCH iwl-net 1/2] ice: Fix entering " Maciej Fijalkowski
2024-09-20 13:24 ` [Intel-wired-lan] " Marcin Szycik
2024-09-20 13:24 ` Marcin Szycik
2024-09-20 17:07 ` Brett Creeley
2024-09-20 17:07 ` Brett Creeley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zu1kelo0Wd20pyjf@boxer \
--to=maciej.fijalkowski@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=marcin.szycik@linux.intel.com \
--cc=mateusz.polchlopek@intel.com \
--cc=netdev@vger.kernel.org \
--cc=przemyslaw.kitszel@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.