[PATCH v2 093/148] net/ice/base: allow different FW API versions based on MAC type

[Bruce Richardson]

On Wed, Jun 12, 2024 at 04:01:27PM +0100, Anatoly Burakov wrote:
> From: Ian Stokes <ian.stokes at intel.com>
> 
> Allow the driver to be compatible with different FW API versions based
> on the device's MAC type. Currently, E810 is only compatible with one
> FW API version. Now the driver can be compatible with different FW API
> versions for both E810 and E830.
> 
> Signed-off-by: Dan Nowlin <dan.nowlin at intel.com>
> Signed-off-by: Ian Stokes <ian.stokes at intel.com>
> ---
>  drivers/net/ice/base/ice_controlq.c | 17 ++++++++++-------
>  drivers/net/ice/base/ice_controlq.h | 22 +++++++++++++++++++---
>  2 files changed, 29 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c
> index c2cf747b65..edc068481e 100644
> --- a/drivers/net/ice/base/ice_controlq.c
> +++ b/drivers/net/ice/base/ice_controlq.c
> @@ -479,24 +479,27 @@ ice_shutdown_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)
>   */
>  static bool ice_aq_ver_check(struct ice_hw *hw)
>  {
> -	if (hw->api_maj_ver > EXP_FW_API_VER_MAJOR) {
> +	u8 exp_fw_api_ver_major = EXP_FW_API_VER_MAJOR_BY_MAC(hw);
> +	u8 exp_fw_api_ver_minor = EXP_FW_API_VER_MINOR_BY_MAC(hw);
> +
> +if (hw->api_maj_ver > exp_fw_api_ver_major) {

Let's fix the indentation on this line.