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: <6cb52295-a20c-47ae-b75e-c841f665fdaf@intel.com>
Date:   Wed, 25 Oct 2023 14:27:09 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH iwl-next 1/2] i40e: Remove VF MAC types
Content-Language: en-US
To:     Jiri Pirko <jiri@resnulli.us>
CC:     Ivan Vecera <ivecera@redhat.com>, <netdev@vger.kernel.org>,
        "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-2-ivecera@redhat.com>
 <8a8f54a8-1a18-4797-a592-b57bc6fc45c1@intel.com>
 <ZTkHJ6IP4tj3EmCV@nanopsycho> <ZTkIH68kCzb+4VME@nanopsycho>
From:   Wojciech Drewek <wojciech.drewek@intel.com>
In-Reply-To: <ZTkIH68kCzb+4VME@nanopsycho>
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?VCtycDNxbWdLa0VhSmZqQ2tVSEdoK3hUV0wxaXN3d0FqaW5rbEJCemtyeHdj?=
 =?utf-8?B?ZWdTRkFSTyt6ejBQOE9yNDcrVHlPWmlYWlNhWkdzSVRwdklZenhHNVJndEI0?=
 =?utf-8?B?YVloMFltaTBZWDVzTnBvQ2VZUXUrSmJmVWRuT0ZXNVMzbytBWDRhTFZMN1dh?=
 =?utf-8?B?dzJlSmtrZUZ1VDB6MVlWalFNUVRqZy80WUFhZGZXZFdBeDNJMEFzK3N5ZWFD?=
 =?utf-8?B?OFNRd0crNE9ma1FhK1pCQjNHNlFraVMxcEZWWUFtNU5kVENNN0M2eHpBYjI4?=
 =?utf-8?B?bGdjVUNCQ2hZS2dlMzl1RnNEdXREODdGWmJKbnBrQTdWVEdSQlJsZGd0Uzgv?=
 =?utf-8?B?Vm41MUpjZFdHMXFnUU1QNVVNeHRBczY1YlFsSWljVXA1YmUxTFNkVCtHNm5T?=
 =?utf-8?B?UlFwVHFEaktkUENjVlcyWjNsOEFTVXI3cHJ1ZGtoaU1uanhTVk1MTnlHMVg2?=
 =?utf-8?B?R2ZGY0xtWTFxaFhQQm1HVkNxY2hhc29SN0xTYWZ1NENBRWdyTXFFdUNEeURi?=
 =?utf-8?B?YTZFY3BuOVVaT2hBellGVy9wYU5pVllQRzFCZkZJdTljSlo3Y1Nhb3I3blcz?=
 =?utf-8?B?Mlo0N0paRjE0S1QvSFpDbjErTTJnMWtpS2JaY2FzZjZlSDhRbVp3bU4yaXQ0?=
 =?utf-8?B?cHJjelRVbXFhWHZTSUlwekZHN0pOdkx3ZnRmUXV0MnZzYTRza2IycFR3S215?=
 =?utf-8?B?Z3pUVUg5VXhSTCtDUUIyQks3WlZBVnJhVm5CajRNNGlNVDFJY2xYQm50WDda?=
 =?utf-8?B?NkE1QURtSGM5VHVzTUg4U2JydytwemxxRG5veW1wVG5qVVZEeE82Vm5HdjhU?=
 =?utf-8?B?NGU2Rzh2S2I1cDRYb2VtOTZQOVBrYnVnalJiNGlCU1ZSM2JTMDNVeW0yU2RW?=
 =?utf-8?B?eFFhVHNOdisyenRFV01SSDlNWlJ1bFoxZmsyL3VaZG04WUozZWc0S1A3TFFO?=
 =?utf-8?B?c1BDM2cxL2JOc1ltdVRXbnFDN3I2UzNVOHBNNDgzYUh6ZWRMNHJSbnE2ZG5o?=
 =?utf-8?B?UkdFMjBwVmtldHJNQkRXdHBYdGZ3djFzRXZQL1RjdFhDRW1wWGJLOEdaMjB4?=
 =?utf-8?B?TEtBNHRtVGdMOEkzQXVoZkhaS1VucHd0TlVxbms2K2U3NEFTMTVvVWhTN2FF?=
 =?utf-8?B?M1RLNHBXYkhhcDN0YVBzTm9KL3NBbE5tTW9kV1h2akpjTmkzeFFYcG91aVJv?=
 =?utf-8?B?QkVNUWJLZEE3WG9CbkxzeWdONElTNVFBKzBrVklZOXJwMkwzdzdDUFRWK0I2?=
 =?utf-8?B?eUMxRWNPZ05iZGx6aUNpblRJR1JmMWE4YzhZM2ZPRFlFYkVYTFBLSkVzczJR?=
 =?utf-8?B?clZ2V2R3dW9JVEczMzFUT0lIMW1kMXJsanMrbG1pZHo2aHJTVWg5TFJKaFU2?=
 =?utf-8?B?WTU0dnpvTDhVb0dKN0kralhYTmdjZThlVDZ3V3UzNm1VV0xKMjZyY056MWp5?=
 =?utf-8?B?cG04NlFFdFA1ZUpSd3EreFcxUXJaSEh2S1FDdjhCTUFKeVlPZG1yeW1IdVRJ?=
 =?utf-8?B?elcrYm9ibmhkb1kweTZJZ0Y5b05mZFA0MkgwRDNnZktEbm1TYjFiZEd6b2Rx?=
 =?utf-8?B?K1ZmcG52cnZDZTliM2VTTE1paEMzOXZpNTJMRkVpeDJFOUtBWWpuM0FRYy8z?=
 =?utf-8?B?UlhTZzdobGxTM29FWEJyUVE0NVhQbTd3dWxYMUFXL0tVREI1eWYyeitPMEsr?=
 =?utf-8?B?ZVU5c1p5NFkyVGlyaHV0dEYvZDhLUVlBZ25vUlBSSTJpRDdzUUtYT0J3dFNj?=
 =?utf-8?B?MU01VVBjNVNnQWg1eitsUHFoUnM5aGFLZ1djTm1TS0pzRE5JdWpXSGpnR01W?=
 =?utf-8?B?Q1p4TSszRlQ0Rm85REE3YWtlTzdNU3J6OFA3djZwcmpIZ2dBUFFtRyt5TnhC?=
 =?utf-8?B?R3F1UkdQd0dCWWRhUGNIOHRqaWtZRk9HYzArM3dOM0l6UWZtUkpkVCtVS3lm?=
 =?utf-8?B?dS8xUDBkMS9JV0JZOVR2a1Zlbm45ZHdNVS9CakozS2w2NjNSSXpqZllIVjYy?=
 =?utf-8?B?VkxhQWlOam16SnB5dVVPZERMdnplUjkrT2JSWVd5V1VoN3BEMk1VTVRCTFI1?=
 =?utf-8?B?ekt5bWFLdCtid2htTDQxNDlSbHlLMjhIcTN3QXhJbnVJSmZXTWpUc1B3QWs2?=
 =?utf-8?B?ejA1WWRNV2c0RGxxMEVLZGFKeDk5RFFQa1MybG0vb1RDcXk1MjBTV3BSTEV3?=
 =?utf-8?B?amc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: af7e4051-c4c7-4e6b-010f-08dbd555b8c5
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5776.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 12:27:15.4561
 (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: eYTwZauP8yu6cXAuVkLCBKnf7mNh++Jsm87pKugTCQ1tktH9Z3CINYBoZV/2kusMtoIma8x6/eO5Ob6jbGaqSovBuqQRhFIz0RYTmPDTZeo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7213
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 05:27:35 -0700 (PDT)


On 25.10.2023 14:20, Jiri Pirko wrote:
> Wed, Oct 25, 2023 at 02:16:39PM CEST, jiri@resnulli.us wrote:
>> Wed, Oct 25, 2023 at 12:48:37PM CEST, wojciech.drewek@intel.com wrote:
>>>
>>>
>>> On 25.10.2023 12:33, Ivan Vecera wrote:
>>>> The i40e_hw.mac.type cannot to be equal to I40E_MAC_VF or
>>>> I40E_MAC_X722_VF so remove helper i40e_is_vf(), simplify
>>>> i40e_adminq_init_regs() and remove enums for these VF MAC types.
>>>>
>>>> Signed-off-by: Ivan Vecera <ivecera@redhat.com>
>>>> ---
>>>>  drivers/net/ethernet/intel/i40e/i40e_adminq.c | 33 ++++++-------------
>>>>  drivers/net/ethernet/intel/i40e/i40e_type.h   |  8 -----
>>>>  2 files changed, 10 insertions(+), 31 deletions(-)
>>>>
>>>> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
>>>> index 29fc46abf690..896c43905309 100644
>>>> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
>>>> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
>>>> @@ -17,29 +17,16 @@ static void i40e_resume_aq(struct i40e_hw *hw);
>>>>  static void i40e_adminq_init_regs(struct i40e_hw *hw)
>>>>  {
>>>>  	/* set head and tail registers in our local struct */
>>>> -	if (i40e_is_vf(hw)) {
>>>> -		hw->aq.asq.tail = I40E_VF_ATQT1;
>>>> -		hw->aq.asq.head = I40E_VF_ATQH1;
>>>> -		hw->aq.asq.len  = I40E_VF_ATQLEN1;
>>>> -		hw->aq.asq.bal  = I40E_VF_ATQBAL1;
>>>> -		hw->aq.asq.bah  = I40E_VF_ATQBAH1;
>>>> -		hw->aq.arq.tail = I40E_VF_ARQT1;
>>>> -		hw->aq.arq.head = I40E_VF_ARQH1;
>>>> -		hw->aq.arq.len  = I40E_VF_ARQLEN1;
>>>> -		hw->aq.arq.bal  = I40E_VF_ARQBAL1;
>>>> -		hw->aq.arq.bah  = I40E_VF_ARQBAH1;
>>>
>>> What about removing those I40E_VF_* defines?
>>> This is their only usage here, right?
>>
>> Wait, do you suggest to use the values directly? That would be
>> wild even for i40e :)
> 
> Ah, sec. This is duplicated in
> drivers/net/ethernet/intel/iavf/iavf_register.h. That confused me.

Indeed, in case of i40e they're going be unused after this patch so
there is no point in keeping them, I think.

> 
> 
> 
>>
>>
>>>
>>>> -	} else {
>>>> -		hw->aq.asq.tail = I40E_PF_ATQT;
>>>> -		hw->aq.asq.head = I40E_PF_ATQH;
>>>> -		hw->aq.asq.len  = I40E_PF_ATQLEN;
>>>> -		hw->aq.asq.bal  = I40E_PF_ATQBAL;
>>>> -		hw->aq.asq.bah  = I40E_PF_ATQBAH;
>>>> -		hw->aq.arq.tail = I40E_PF_ARQT;
>>>> -		hw->aq.arq.head = I40E_PF_ARQH;
>>>> -		hw->aq.arq.len  = I40E_PF_ARQLEN;
>>>> -		hw->aq.arq.bal  = I40E_PF_ARQBAL;
>>>> -		hw->aq.arq.bah  = I40E_PF_ARQBAH;
>>>> -	}
>>>> +	hw->aq.asq.tail = I40E_PF_ATQT;
>>>> +	hw->aq.asq.head = I40E_PF_ATQH;
>>>> +	hw->aq.asq.len  = I40E_PF_ATQLEN;
>>>> +	hw->aq.asq.bal  = I40E_PF_ATQBAL;
>>>> +	hw->aq.asq.bah  = I40E_PF_ATQBAH;
>>>> +	hw->aq.arq.tail = I40E_PF_ARQT;
>>>> +	hw->aq.arq.head = I40E_PF_ARQH;
>>>> +	hw->aq.arq.len  = I40E_PF_ARQLEN;
>>>> +	hw->aq.arq.bal  = I40E_PF_ARQBAL;
>>>> +	hw->aq.arq.bah  = I40E_PF_ARQBAH;
>>>>  }
>>>>  
>>>>  /**
>>>> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
>>>> index 9fda0cb6bdbe..7eaf8b013125 100644
>>>> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
>>>> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
>>>> @@ -64,9 +64,7 @@ typedef void (*I40E_ADMINQ_CALLBACK)(struct i40e_hw *, struct i40e_aq_desc *);
>>>>  enum i40e_mac_type {
>>>>  	I40E_MAC_UNKNOWN = 0,
>>>>  	I40E_MAC_XL710,
>>>> -	I40E_MAC_VF,
>>>>  	I40E_MAC_X722,
>>>> -	I40E_MAC_X722_VF,
>>>>  	I40E_MAC_GENERIC,
>>>>  };
>>>>  
>>>> @@ -588,12 +586,6 @@ struct i40e_hw {
>>>>  	char err_str[16];
>>>>  };
>>>>  
>>>> -static inline bool i40e_is_vf(struct i40e_hw *hw)
>>>> -{
>>>> -	return (hw->mac.type == I40E_MAC_VF ||
>>>> -		hw->mac.type == I40E_MAC_X722_VF);
>>>> -}
>>>> -
>>>>  /**
>>>>   * i40e_is_aq_api_ver_ge
>>>>   * @hw: pointer to i40e_hw structure
>>>