On 4/28/2025 9:15 AM, Simon Horman wrote:
> On Thu, Apr 24, 2025 at 01:32:24PM +0200, Larysa Zaremba wrote:
>> From: Victor Raj <victor.raj@xxxxxxxxx>
>>
>> Move intel specific header files into new folder
>> include/linux/intel.
>>
>> Suggested-by: Alexander Lobakin <aleksander.lobakin@xxxxxxxxx>
>> Reviewed-by: Sridhar Samudrala <sridhar.samudrala@xxxxxxxxx>
>> Signed-off-by: Victor Raj <victor.raj@xxxxxxxxx>
>> Signed-off-by: Larysa Zaremba <larysa.zaremba@xxxxxxxxx>
>> ---
>> MAINTAINERS | 6 +++---
>> drivers/infiniband/hw/irdma/i40iw_if.c | 2 +-
>> drivers/infiniband/hw/irdma/main.h | 2 +-
>> drivers/infiniband/hw/irdma/osdep.h | 2 +-
>> drivers/net/ethernet/intel/i40e/i40e.h | 4 ++--
>> drivers/net/ethernet/intel/i40e/i40e_client.c | 2 +-
>> drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +-
>> drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +-
>> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
>> drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf.h | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf_prototype.h | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +-
>> drivers/net/ethernet/intel/iavf/iavf_types.h | 4 +---
>> drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 +-
>> drivers/net/ethernet/intel/ice/ice.h | 2 +-
>> drivers/net/ethernet/intel/ice/ice_common.h | 2 +-
>> drivers/net/ethernet/intel/ice/ice_idc_int.h | 2 +-
>> drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +-
>> drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +-
>> drivers/net/ethernet/intel/ice/ice_virtchnl.h | 2 +-
>> drivers/net/ethernet/intel/idpf/idpf.h | 2 +-
>> drivers/net/ethernet/intel/idpf/idpf_txrx.h | 2 +-
>> drivers/net/ethernet/intel/libie/rx.c | 2 +-
>> include/linux/{net => }/intel/i40e_client.h | 0
>> include/linux/{net => }/intel/iidc.h | 0
>> include/linux/{net => }/intel/libie/rx.h | 0
>> include/linux/{avf => intel}/virtchnl.h | 0
>> .../ethernet/intel/idpf => include/linux/intel}/virtchnl2.h | 0
>> .../intel/idpf => include/linux/intel}/virtchnl2_lan_desc.h | 0
>> 32 files changed, 29 insertions(+), 31 deletions(-)
>> rename include/linux/{net => }/intel/i40e_client.h (100%)
>> rename include/linux/{net => }/intel/iidc.h (100%)
>> rename include/linux/{net => }/intel/libie/rx.h (100%)
>> rename include/linux/{avf => intel}/virtchnl.h (100%)
>> rename {drivers/net/ethernet/intel/idpf => include/linux/intel}/virtchnl2.h (100%)
>> rename {drivers/net/ethernet/intel/idpf => include/linux/intel}/virtchnl2_lan_desc.h (100%)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 657a67f9031e..2e2a57dfea8f 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -11884,8 +11884,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git
>> F: Documentation/networking/device_drivers/ethernet/intel/
>> F: drivers/net/ethernet/intel/
>> F: drivers/net/ethernet/intel/*/
>> -F: include/linux/avf/virtchnl.h
>> -F: include/linux/net/intel/iidc.h
>> +F: include/linux/intel/iidc.h
>> +F: include/linux/intel/virtchnl.h
>
> I'm not sure that I understand the motivation for moving files out of
> include/linux/net, but I guess the answer is that my suggestion, which
> would be to move files into include/linux/net, is somehow less good.
>
> But if file are moving out of include/linux/net then I think it would
> make sense to make a corresponding update to NETWORKING DRIVERS.
>
> Also, include/linux/intel, does feel a bit too general. These files
> seem to relate to NICs (of some sort of flavour or another). But Intel
> does a lot more than make NICs.
>
'include/linux/net/intel' seems fine to me. I agree with moving
virtchnl.h there since it is quite clear that any historical ambitions
about AVF being vendor agnostic are long dead, so having it in its own
'non-intel' folder is silly.
Strictly speaking, I think the goal of moving the files is due to the
fact that a lot of the core ixd code is not really network layer but
instead PCI layer.
