diff options
| author | Michal Swiatkowski <michal.swiatkowski@linux.intel.com> | 2025-08-12 06:23:29 +0200 |
|---|---|---|
| committer | Tony Nguyen <anthony.l.nguyen@intel.com> | 2025-09-11 12:10:07 -0700 |
| commit | 360c46582e88acf57c935e76015f9fc894ab6599 (patch) | |
| tree | 399cfc483a630c28d210fdfdbb1692f41bc4b429 | |
| parent | dc898f7edd9bd2ce53115ce9fc12ad8dbbf20fd5 (diff) | |
ice: check for PF number outside the fwlog code
Fwlog can be supported only on PF 0. Check this before calling
init/deinit functions.
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_common.c | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_debugfs.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_fwlog.c | 8 |
3 files changed, 8 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index 16765c2da4bd..e73585d90eaa 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -1002,6 +1002,10 @@ static int __fwlog_init(struct ice_hw *hw) }; int err; + /* only support fw log commands on PF 0 */ + if (hw->bus.func) + return -EINVAL; + err = ice_debugfs_pf_init(pf); if (err) return err; @@ -1186,6 +1190,10 @@ err_unroll_cqinit: static void __fwlog_deinit(struct ice_hw *hw) { + /* only support fw log commands on PF 0 */ + if (hw->bus.func) + return; + ice_debugfs_pf_deinit(hw->back); ice_fwlog_deinit(hw, &hw->fwlog); } diff --git a/drivers/net/ethernet/intel/ice/ice_debugfs.c b/drivers/net/ethernet/intel/ice/ice_debugfs.c index b9849d1ef928..ca1e74082d57 100644 --- a/drivers/net/ethernet/intel/ice/ice_debugfs.c +++ b/drivers/net/ethernet/intel/ice/ice_debugfs.c @@ -588,10 +588,6 @@ void ice_debugfs_fwlog_init(struct ice_pf *pf) struct dentry **fw_modules; int i; - /* only support fw log commands on PF 0 */ - if (pf->hw.bus.func) - return; - /* allocate space for this first because if it fails then we don't * need to unwind */ diff --git a/drivers/net/ethernet/intel/ice/ice_fwlog.c b/drivers/net/ethernet/intel/ice/ice_fwlog.c index f7dbcb5e11aa..2ed631e933b2 100644 --- a/drivers/net/ethernet/intel/ice/ice_fwlog.c +++ b/drivers/net/ethernet/intel/ice/ice_fwlog.c @@ -242,10 +242,6 @@ static void ice_fwlog_set_supported(struct ice_fwlog *fwlog) int ice_fwlog_init(struct ice_hw *hw, struct ice_fwlog *fwlog, struct ice_fwlog_api *api) { - /* only support fw log commands on PF 0 */ - if (hw->bus.func) - return -EINVAL; - fwlog->api = *api; ice_fwlog_set_supported(fwlog); @@ -296,10 +292,6 @@ void ice_fwlog_deinit(struct ice_hw *hw, struct ice_fwlog *fwlog) struct ice_pf *pf = hw->back; int status; - /* only support fw log commands on PF 0 */ - if (hw->bus.func) - return; - /* make sure FW logging is disabled to not put the FW in a weird state * for the next driver load */ |