Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Message-ID: <1551303b-1936-4e87-9444-d991bf3474a1@intel.com>
Date:   Wed, 25 Oct 2023 12:44:42 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH iwl-next 2/2] i40e: Move inline helpers to
 i40e_prototype.h
Content-Language: en-US
To:     Ivan Vecera <ivecera@redhat.com>, <netdev@vger.kernel.org>
CC:     Jesse Brandeburg <jesse.brandeburg@intel.com>,
        Tony Nguyen <anthony.l.nguyen@intel.com>,
        "David S. Miller" <davem@davemloft.net>,
        "Eric Dumazet" <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        <intel-wired-lan@lists.osuosl.org>, <linux-kernel@vger.kernel.org>,
        Jacob Keller <jacob.e.keller@intel.com>
References: <20231025103315.1149589-1-ivecera@redhat.com>
 <20231025103315.1149589-3-ivecera@redhat.com>
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <20231025103315.1149589-3-ivecera@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UGZVNEt6QTFWSlg3cXN0M2pJRnRlUjBEc3NIRFVIT0xUdkozYy96VzArOVE4?=
 =?utf-8?B?VTdBclVjcFJxV1ZRQkpIWkRlZWpmZ3RzVEdiOU9zeXNsYW5kS1htNFppczZz?=
 =?utf-8?B?YjZjV1VJbHpQU1V6eWlFVlovZGJPTllrTXdhR0I0OXplS3NUMEdkR2xNUzU0?=
 =?utf-8?B?YUhPU1JLYVpURmJzUGRtRFQwNEdzd0lQSDR5akZTeGNUaGdQQ3RLRDlRM29q?=
 =?utf-8?B?ZGNHNzBlbVd1N0h4K0hvRzlYUXRQYWxwUVdCczk5MVZlV1Q4U0ZrczkzMUoz?=
 =?utf-8?B?S3RuS3dMbkF1U2lvZUsreURITWwxQ1kzZ09CRkRNc2owZnM3VFMyeGJlZytx?=
 =?utf-8?B?UVlaZ2w2VjI4dmgwbXpkRG5Xdk1QaHdDSGpvNk9LNE56VVY5STc0aDNLZW1r?=
 =?utf-8?B?RGpPeDUxL0sxZ2tMYVJJOWE0Q1VLUm1ic3UxckdoVkcrQzFWOGI3VE9NVDVv?=
 =?utf-8?B?ZzRCY1FqN3lzWTg2Tlo5YUlYL21vZ3A5bjFUYkVJM28vQXQ2ZnQrd0xiWVh1?=
 =?utf-8?B?bFZMWjkxaGhXeDcwYjhHcHN4MEtWRjkxemk3QmZzZ0dNbVg2d0JzMnpWaXF6?=
 =?utf-8?B?VTJEelE2OHVaQXR5NGNicGxmc2owdng0TVVpS0tHcmNRY2pUQTBwVnBaSldO?=
 =?utf-8?B?OFhJOW93eUxrUmtVS0E5NW1EREVVTkxyME91eDU5ckc5LzJGN0RSczI0QnhM?=
 =?utf-8?B?V2tBSUhsZ0V0d3h2c1RVN0ZrWE5zcndCNmpkVXltOEhtZ1B3QVF3N1VwcE1M?=
 =?utf-8?B?Rm9JdnZNVmg5aGF4MHJHQ2YwSmQ3eXNSY29IRDVYZk5GUnhNMlhlKzNtS3JZ?=
 =?utf-8?B?MDByOWRUVVBDc1h2QWU5K3h3WStuKzFpNGtRRGVYUndNeVlTNEJYRFVNTTl3?=
 =?utf-8?B?aWliUVlmMTBCRUFoN3g4Rjc0bGkxbXAzQng2VW5XOE1XM2RPbU1HNGRyV3M1?=
 =?utf-8?B?dDdsOThmUVZkb1VidmplbFZIN2pxQjZ3MUlDd2pGUEtqTDl1MU1ZeVFkekl4?=
 =?utf-8?B?Wkd2TzlRNUczV1RMQzJ3T20wQUVlSDdtdnZlL0xlL3RIV0dUT3oyREt6V05N?=
 =?utf-8?B?NkI1SmZjc1lKQkVESDhtb3R0UUNhV2dRT1hrQmFTQ0ZzTXpFd3ZCUDBUenk5?=
 =?utf-8?B?SUdlVmNrVTZJSE9FNkh3azZrS3ZEZzYyWFc3ZGJxWXNncEtCMkg3Qm1SWTlN?=
 =?utf-8?B?ZWNZb2xyVlcyWXorTGQvR3dveWpzZnJUQVJpZDg0aWk2WGFBQnB6NzZXWERS?=
 =?utf-8?B?dFBROTJ4ODdad3RCbDZZZVEyMkpIMzExcEdrRFJ1VHJPT1FJVlN0eEd6R2Fj?=
 =?utf-8?B?dHlvTXRGeWFOYzMrLzY0dU5WMTNnS1NhdXhieXNYcXY3NEhLY2pKZHNqbkRz?=
 =?utf-8?B?ZTFJNkRJVDNIeUpjdHFEUXJYRXdRdDBvYWk3V0NYSHNUd0gwZEdCZGorNlpS?=
 =?utf-8?B?M1FFbUcwS2I1V1ZIYklYSGRGT2JVdjd3MDVnZE4xcTZYc2xFL1FGKytqbHlB?=
 =?utf-8?B?WFlnb1Q3SVpLQmh3WElJM3EyTVlWRVRYRUxLdzJpQmNPMEU5ci9OcHR5RWFQ?=
 =?utf-8?B?RngvaDFWbEpQcERaRlpjNzRlTis3azRSWk1Yd25KejY4aDhENE9WVC80NDUz?=
 =?utf-8?B?K09yd3AzS0FYc1Z1M0puQU5Vd1V0QUxJckxyR3lXYjEvYXpBRUJ6ZVBwS2Zo?=
 =?utf-8?B?b1NGOXZKdEVYUDBXSWkzb0FsS2JNenVUdVhYWG1jQlRObmxidnVSTGQrUDUz?=
 =?utf-8?B?eDhOYjRSaUp0dU9Nc01LOUdOZTJuUUNwUVVMNmxJTXc3cmJiZXdScFNzQ0pu?=
 =?utf-8?B?dENreEplS3MzdU9ldXQzUUQ3aEZ5TlBoWDl4Mms3TTNjMDBLNzkxMmY1c2VB?=
 =?utf-8?B?UmV2b2x0V0N1MjNwamdSZVpIS0JrMk82a1htYWU3YVIxM1h3SkhTUGJXY0x3?=
 =?utf-8?B?TFRENmxhU1VIUGVMMmw0dkVmNnZmSUtXbTVlZGpyNXZhT0JVYlVVWG9nVzNr?=
 =?utf-8?B?d0grV2h2dVMzS0dNNVlXbksrVmhiMGNuck4rZmROZytleUQybzFiZ3RUb0Rn?=
 =?utf-8?B?STU3QlBXSTZOVUVkbmpvQjltM0ZSMkNVVG5yejBxQyt3UnJFTkVRekUrZmcz?=
 =?utf-8?B?ZW80UW12VVg3QnpKZFozR1VHeEJWSTdweFo2SFJUMDB3Z3NNajdYc3hmM3pI?=
 =?utf-8?B?Z1E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 09c1af40-86e6-451a-1742-08dbd54768a6
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 10:44:48.0717
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: b33NngN1fz9gcmI8///o53BlAx9gfXi8Iyzu4ByiBENsIqhvQw/Emf7gAxp9wyn/Tt+4VdQPYYeX/HBF6uZLCMOAB5Ei9jKd9QbthhQIEZg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5829
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 25 Oct 2023 03:45:26 -0700 (PDT)


On 25.10.2023 12:33, Ivan Vecera wrote:
> Move version check helper functions from i40e_type.h to
> i40e_prototype.h as per discussion [1].
> 
> [1] https://lore.kernel.org/all/cdcd6b97-1138-4cd7-854f-b3faa1f475f8@intel.com/#t
> 
> Cc: Wojciech Drewek <wojciech.drewek@intel.com>
> Cc: Jacob Keller <jacob.e.keller@intel.com>
> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
> ---

Thanks Ivan!
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>

>  .../net/ethernet/intel/i40e/i40e_prototype.h  | 70 +++++++++++++++++++
>  drivers/net/ethernet/intel/i40e/i40e_type.h   | 68 ------------------
>  2 files changed, 70 insertions(+), 68 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> index 001162042050..af4269330581 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> @@ -501,4 +501,74 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
>  /* i40e_ddp */
>  int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);
>  
> +/* Firmware and AdminQ version check helpers */
> +
> +/**
> + * i40e_is_aq_api_ver_ge
> + * @hw: pointer to i40e_hw structure
> + * @maj: API major value to compare
> + * @min: API minor value to compare
> + *
> + * Assert whether current HW API version is greater/equal than provided.
> + **/
> +static inline bool i40e_is_aq_api_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
> +{
> +	return (hw->aq.api_maj_ver > maj ||
> +		(hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min));
> +}
> +
> +/**
> + * i40e_is_aq_api_ver_lt
> + * @hw: pointer to i40e_hw structure
> + * @maj: API major value to compare
> + * @min: API minor value to compare
> + *
> + * Assert whether current HW API version is less than provided.
> + **/
> +static inline bool i40e_is_aq_api_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
> +{
> +	return !i40e_is_aq_api_ver_ge(hw, maj, min);
> +}
> +
> +/**
> + * i40e_is_fw_ver_ge
> + * @hw: pointer to i40e_hw structure
> + * @maj: API major value to compare
> + * @min: API minor value to compare
> + *
> + * Assert whether current firmware version is greater/equal than provided.
> + **/
> +static inline bool i40e_is_fw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
> +{
> +	return (hw->aq.fw_maj_ver > maj ||
> +		(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver >= min));
> +}
> +
> +/**
> + * i40e_is_fw_ver_lt
> + * @hw: pointer to i40e_hw structure
> + * @maj: API major value to compare
> + * @min: API minor value to compare
> + *
> + * Assert whether current firmware version is less than provided.
> + **/
> +static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
> +{
> +	return !i40e_is_fw_ver_ge(hw, maj, min);
> +}
> +
> +/**
> + * i40e_is_fw_ver_eq
> + * @hw: pointer to i40e_hw structure
> + * @maj: API major value to compare
> + * @min: API minor value to compare
> + *
> + * Assert whether current firmware version is equal to provided.
> + **/
> +static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min)
> +{
> +	return (hw->aq.fw_maj_ver > maj ||
> +		(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min));
> +}
> +
>  #endif /* _I40E_PROTOTYPE_H_ */
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
> index 7eaf8b013125..e3d40630f689 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
> @@ -586,74 +586,6 @@ struct i40e_hw {
>  	char err_str[16];
>  };
>  
> -/**
> - * i40e_is_aq_api_ver_ge
> - * @hw: pointer to i40e_hw structure
> - * @maj: API major value to compare
> - * @min: API minor value to compare
> - *
> - * Assert whether current HW API version is greater/equal than provided.
> - **/
> -static inline bool i40e_is_aq_api_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
> -{
> -	return (hw->aq.api_maj_ver > maj ||
> -		(hw->aq.api_maj_ver == maj && hw->aq.api_min_ver >= min));
> -}
> -
> -/**
> - * i40e_is_aq_api_ver_lt
> - * @hw: pointer to i40e_hw structure
> - * @maj: API major value to compare
> - * @min: API minor value to compare
> - *
> - * Assert whether current HW API version is less than provided.
> - **/
> -static inline bool i40e_is_aq_api_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
> -{
> -	return !i40e_is_aq_api_ver_ge(hw, maj, min);
> -}
> -
> -/**
> - * i40e_is_fw_ver_ge
> - * @hw: pointer to i40e_hw structure
> - * @maj: API major value to compare
> - * @min: API minor value to compare
> - *
> - * Assert whether current firmware version is greater/equal than provided.
> - **/
> -static inline bool i40e_is_fw_ver_ge(struct i40e_hw *hw, u16 maj, u16 min)
> -{
> -	return (hw->aq.fw_maj_ver > maj ||
> -		(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver >= min));
> -}
> -
> -/**
> - * i40e_is_fw_ver_lt
> - * @hw: pointer to i40e_hw structure
> - * @maj: API major value to compare
> - * @min: API minor value to compare
> - *
> - * Assert whether current firmware version is less than provided.
> - **/
> -static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min)
> -{
> -	return !i40e_is_fw_ver_ge(hw, maj, min);
> -}
> -
> -/**
> - * i40e_is_fw_ver_eq
> - * @hw: pointer to i40e_hw structure
> - * @maj: API major value to compare
> - * @min: API minor value to compare
> - *
> - * Assert whether current firmware version is equal to provided.
> - **/
> -static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min)
> -{
> -	return (hw->aq.fw_maj_ver > maj ||
> -		(hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min));
> -}
> -
>  struct i40e_driver_version {
>  	u8 major_version;
>  	u8 minor_version;