Received-SPF: pass (google.com: domain of linux-kernel+bounces-161251-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <4427a166-c77a-4e7a-a1a2-0b02f4fbf3d1@intel.com>
Date: Sun, 28 Apr 2024 07:38:20 +0300
User-Agent: Mozilla Thunderbird
Subject: Re: [Intel-wired-lan] [PATCH 1/1] net: e1000e & ixgbe: Remove
 PCI_HEADER_TYPE_MFD duplicates
To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>, "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>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <20240423144100.76522-1-ilpo.jarvinen@linux.intel.com>
Content-Language: en-US
From: Sasha Neftin <sasha.neftin@intel.com>
In-Reply-To: <20240423144100.76522-1-ilpo.jarvinen@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SEY5bDZCWTFFbXJxVjZsT3VVeHNmcTdxZkV3QmdIS0tUWU5ONEhVbnFhQ3Vu?=
 =?utf-8?B?NW94N1NjL29tcys0ajN2R1M3UzVXWGkyaHNTRDhwbHhZYXdoeFVVQjFRNVpr?=
 =?utf-8?B?QklHZnFIZlNYL1p6aDByN01DYkY2M045L0lKU0Z6UmFFV2d3ek5VazdUaGR6?=
 =?utf-8?B?SFlnZnNmbXBMZVZocjM2SWZEUWNGMmxKZVpUMXQreWRJRU91YUdOR1doVWFy?=
 =?utf-8?B?NndiaDBEbkFxRjFCT2JveVdMc1djOUZoUHR2Q2l5NUV6aitsK0p4cEhmT3FV?=
 =?utf-8?B?VnZCTFVNZGh1d3YvNFcyQmZicmR3RVZZUWoyNkxVWHF0dTh6YkRON0lMUE1q?=
 =?utf-8?B?NGhzakp5K254R3g4WmJpSmYrWVpzUElTNGZ0dDFqUy9RQW40TjNuNi9EUldR?=
 =?utf-8?B?SGswbXZLTVdqR2VaQzAxL1IxSDZmUk1vMzFLUlRQZVd2MWg4ZS9MVEtyVUZz?=
 =?utf-8?B?YnQwcG5TN1ZLUjJlUHd5LzJrM3BqR1lZWXFSK1lTYXFRa3V3TllKMVM1bWhS?=
 =?utf-8?B?S1N2OTJIanRzSVhCU1F4UkI1aFRZN0hUVHplNHpYRE9oa2wvVUlRM1hTUXZJ?=
 =?utf-8?B?eEpldDNQZ0s2VUJqV1lHT3dRYlFlNmtZdWRBTUNzdlVYNVZFbUYzRjVmZGV5?=
 =?utf-8?B?SjNxNC90SVMvNFFzYmpyNW00dStkSVd2K2FBakJYRy9WbzlKY1BUV3pvSXhQ?=
 =?utf-8?B?cER1QU5UUWRlVzQ5eVZjanBDQTFteHJjYzNpRjViYVNCSzhTS1N5b1VFdmF3?=
 =?utf-8?B?blJvLzVRc2NwSzd4a0lSUnhNNWt1RFFJMGFXQzRiUmJwSm5aWTBmc00rMkRo?=
 =?utf-8?B?TTN4RzlKellQNG5rUlFBOU5wQ21ETzJncmp4Wm13NGF6VUllUTBYNWlaVitN?=
 =?utf-8?B?YTBPeWZjZG5tRDkvR2k2RkI4cllxYk1jQXRQYk5NN252U1Zkanh0MFRkZEJz?=
 =?utf-8?B?MFlNNnlBSkwxZDFCVmI1NWZYTW5MODJpR0c2bzhQdnV2Tm1ieVhJOHIzalk2?=
 =?utf-8?B?L1Nzc093RUxwdUNaalFwUkNBYnlEdENPajVuT1hoNnBHY3Z0Q0FsNVFMcmdK?=
 =?utf-8?B?aHBoV1h3OUZqNDdOM2dCY2NUTjNCOFFrRFRwbkxxYjJUYjhhRVduYWRYV2lL?=
 =?utf-8?B?dUNnelk3a2FNVkdPdFR3RUFOdEhPRWVXSHllQTBONmlweUY1akZZN2dvR2Zm?=
 =?utf-8?B?TGRtQm83RUJjNEh6SkRPMTVocDl5Q3lCRXVobDRSWmthMkhPZ0llbk90dFdY?=
 =?utf-8?B?ak5uWENjWE40Zy9jcTF3YVNxQVNyWDdrT3czRTMwOHcraVNJb0NnV1EvVXZ4?=
 =?utf-8?B?a3NlRUQybGRZQ2dRQmZRVE5obDFLdEdsZjN1dVlWdHY4YnR0NTlDRlRnN3hy?=
 =?utf-8?B?QXVUd3BlNVBDZVEwOWZ1Nm1RSDJQZXJ3cEFHMm5iaVlyamRSQ0NLZjJNenRR?=
 =?utf-8?B?VE4rYzZ6MUlBakxhdlJpekY1cDlBLyt6d0JCblo3eTBCdng1YmVqaEl2UEFv?=
 =?utf-8?B?L3lOb0Y3T3NRUWYrQ1NOTUd0Vlh6cHNNazdTanllV2xyM01sTkJGc2w2aysv?=
 =?utf-8?B?cVJodG03eGtrOFlxWTV3K3liTEduR2cxT0xRSnYxRmJBWjNEM1dyYlhjWHVP?=
 =?utf-8?B?NEIvVE5sUHJ4WHJXOVhXTCtGOG1nTmRzYVFxWU9KdGppTWVmMnRzR2xXSmJ4?=
 =?utf-8?B?QU9UWFJ0STJWKzZ4cHNPcmRVSVFzcWFReUp2RkI1ekk4TEtBZ3ZSVCtoQVBK?=
 =?utf-8?B?cXFEeTJoaXdqcXErYnhQZ0JlVUZ6OURKMjRUeUJUZWlvK3ZYT2xTK2hQVER0?=
 =?utf-8?B?ZjFmcXNSSzBrbzBGdndLR3RKY3o2dnVpb0VjM1ZGeXJLcXlBaGJhYWJ6TWZG?=
 =?utf-8?B?cnY4RmM5ZXRjaXgzTkZwOE0wL1J5THJsZDBUMlowWGd6Ni9qT0FPYlc5UU9I?=
 =?utf-8?B?QWZqd3pRZW9TQlpVT20yV0dJSmNuVlBrR0hIdmFhV1NDcUNiaTJDNDRKaHlT?=
 =?utf-8?B?T1JuZUF6WndLRllhYmhwSExEcm1TcVdaQ1hNOU1pWGRSbWMvMjMxTVFIR0JP?=
 =?utf-8?B?b21YQTBwZmgwK0xBZmhjY0hRSWVFNUtlOG41Wk02VnpvQTU3WXVrd0RUZmFr?=
 =?utf-8?Q?MIEWJvUW3nmyVzCdMFZBeFo95?=
X-MS-Exchange-CrossTenant-Network-Message-Id: b123811e-eae1-4660-2e38-08dc673d0c4a
X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6738.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2024 04:38:27.9928
 (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: 9Mn0LnetU3lUrSPxZ3n/Fq84KeXNIE4VK7YxdPCaEiac+ZGkBDVJOdDeZJXRZXVqtSBYtkjBNaoxDqCASZlQBQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6610
X-OriginatorOrg: intel.com

On 23/04/2024 17:40, Ilpo Järvinen wrote:
> PCI_HEADER_TYPE_MULTIFUNC is define by e1000e and ixgbe and both are
> unused. There is already PCI_HEADER_TYPE_MFD in pci_regs.h anyway which
> should be used instead so remove the duplicated defines of it.
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---
>   drivers/net/ethernet/intel/e1000e/defines.h   | 2 --
>   drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 -
>   2 files changed, 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h
> index 23a58cada43a..5e2cfa73f889 100644
> --- a/drivers/net/ethernet/intel/e1000e/defines.h
> +++ b/drivers/net/ethernet/intel/e1000e/defines.h
> @@ -679,8 +679,6 @@
>   /* PCI/PCI-X/PCI-EX Config space */
>   #define PCI_HEADER_TYPE_REGISTER     0x0E
>   
> -#define PCI_HEADER_TYPE_MULTIFUNC    0x80
> -
>   #define PHY_REVISION_MASK      0xFFFFFFF0
>   #define MAX_PHY_REG_ADDRESS    0x1F  /* 5 bit address bus (0-0x1F) */
>   #define MAX_PHY_MULTI_PAGE_REG 0xF
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> index ed440dd0c4f9..897fe357b65b 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
> @@ -2179,7 +2179,6 @@ enum {
>   #define IXGBE_PCI_LINK_SPEED_5000 0x2
>   #define IXGBE_PCI_LINK_SPEED_8000 0x3
>   #define IXGBE_PCI_HEADER_TYPE_REGISTER  0x0E
> -#define IXGBE_PCI_HEADER_TYPE_MULTIFUNC 0x80
>   #define IXGBE_PCI_DEVICE_CONTROL2_16ms  0x0005
>   
>   #define IXGBE_PCIDEVCTRL2_TIMEO_MASK	0xf

Acked-by: Sasha Neftin <sasha.neftin@intel.com>