[v2,037/148] net/ice/base: fix NVM feature check

Message ID d8391090af88ac37f2b18ae189492b8a934bcdf1.1718204528.git.anatoly.burakov@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Bruce Richardson
Headers
Series Update net/ice base driver to latest upstream snapshot |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Anatoly Burakov June 12, 2024, 3 p.m. UTC
From: Ian Stokes <ian.stokes@intel.com>

Add defines required by NVM feature check. Although not directly used in this
patch this change is required in order to better match upstream.

Signed-off-by: Ian Stokes <ian.stokes@intel.com>
---
 drivers/net/ice/base/ice_adminq_cmd.h | 2 ++
 1 file changed, 2 insertions(+)
  

Comments

Bruce Richardson June 20, 2024, 10:28 a.m. UTC | #1
On Wed, Jun 12, 2024 at 04:00:31PM +0100, Anatoly Burakov wrote:
> From: Ian Stokes <ian.stokes@intel.com>
> 
> Add defines required by NVM feature check. Although not directly used in this
> patch this change is required in order to better match upstream.
> 
> Signed-off-by: Ian Stokes <ian.stokes@intel.com>
> ---
>  drivers/net/ice/base/ice_adminq_cmd.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
> index 6add57d797..89f565d09f 100644
> --- a/drivers/net/ice/base/ice_adminq_cmd.h
> +++ b/drivers/net/ice/base/ice_adminq_cmd.h
> @@ -131,6 +131,8 @@ struct ice_aqc_list_caps_elem {
>  #define ICE_AQC_CAPS_NAC_TOPOLOGY			0x0087
>  #define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE		0x0090
>  #define ICE_AQC_CAPS_ROCEV2_LAG				0x0092
> +#define ICE_AQC_BIT_ROCEV2_LAG				0x01
> +#define ICE_AQC_BIT_SRIOV_LAG				0x02
>  
For defines like this that are just for alignment with the base code, I'd
merge to a single patch, or into other patches that add other defines.
Similar defines are in patch 40 here, so at minimum those can be merged.

/Bruce
  

Patch

diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
index 6add57d797..89f565d09f 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -131,6 +131,8 @@  struct ice_aqc_list_caps_elem {
 #define ICE_AQC_CAPS_NAC_TOPOLOGY			0x0087
 #define ICE_AQC_CAPS_OROM_RECOVERY_UPDATE		0x0090
 #define ICE_AQC_CAPS_ROCEV2_LAG				0x0092
+#define ICE_AQC_BIT_ROCEV2_LAG				0x01
+#define ICE_AQC_BIT_SRIOV_LAG				0x02
 
 	u8 major_ver;
 	u8 minor_ver;