From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 21 Aug 2025 08:18:46 +0000 (+0200)
Subject: Merge tag 'mlx5-next-vhca-id' of git://git.kernel.org/pub/scm/linux/kernel/git/mellan... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=38dad812bb500648dc14a0733b293d5b778750e6;p=users%2Fwilly%2Fxarray.git

Merge tag 'mlx5-next-vhca-id' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Saeed Mahameed says:

====================
mlx5-next-vhca-id

A preparation patchset for adjacent function vports.

Adjacent functions can delegate their SR-IOV VFs to sibling PFs,
allowing for more flexible and scalable management in multi-host and
ECPF-to-host scenarios. Adjacent vports can be managed by the management
PF via their unique vhca id and can't be managed by function index as the
index can conflict with the local vports/vfs.

This series provides:

- Use the cached vcha id instead of querying it every time from fw
- Query hca cap using vhca id instead of function id when FW supports it
- Add HW capabilities and required definitions for adjacent function vports

* tag 'mlx5-next-vhca-id' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
  {rdma,net}/mlx5: export mlx5_vport_get_vhca_id
  net/mlx5: E-Switch, Set/Query hca cap via vhca id
  net/mlx5: E-Switch, Cache vport vhca id on first cap query
  net/mlx5: mlx5_ifc, Add hardware definitions needed for adjacent vports
====================

Link: https://patch.msgid.link/20250815194901.298689-1-saeed@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

38dad812bb500648dc14a0733b293d5b778750e6
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index 6c72080ac2a1,f47389629c62..83d4b32656ef
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@@ -968,11 -975,12 +977,18 @@@ static inline bool mlx5_eswitch_block_i
  
  static inline void mlx5_eswitch_unblock_ipsec(struct mlx5_core_dev *dev) {}
  
 +static inline bool
 +mlx5_esw_host_functions_enabled(const struct mlx5_core_dev *dev)
 +{
 +	return true;
 +}
++
+ static inline bool
+ mlx5_esw_vport_vhca_id(struct mlx5_eswitch *esw, u16 vportn, u16 *vhca_id)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ 
  #endif /* CONFIG_MLX5_ESWITCH */
  
  #endif /* __MLX5_ESWITCH_H__ */