From: Jason Gunthorpe <jgg@mellanox.com>
Date: Wed, 3 Jul 2019 19:43:45 +0000 (-0300)
Subject: Merge mlx5-next into rdma for-next
X-Git-Tag: v5.15~5930^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69ea0582f3ce7a72d312da7305e455801a8dc5a4;p=platform%2Fkernel%2Flinux-starfive.git

Merge mlx5-next into rdma for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Required for dependencies in the next patches.

Resolved the conflicts:
 - esw_destroy_offloads_acl_tables() use the newer mlx5_esw_for_all_vports()
   version
 - esw_offloads_steering_init() drop the cap test
 - esw_offloads_init() drop the extra function arguments

* branch 'mlx5-next': (39 commits)
  net/mlx5: Expose device definitions for object events
  net/mlx5: Report EQE data upon CQ completion
  net/mlx5: Report a CQ error event only when a handler was set
  net/mlx5: mlx5_core_create_cq() enhancements
  net/mlx5: Expose the API to register for ANY event
  net/mlx5: Use event mask based on device capabilities
  net/mlx5: Fix mlx5_core_destroy_cq() error flow
  net/mlx5: E-Switch, Handle UC address change in switchdev mode
  net/mlx5: E-Switch, Consider host PF for inline mode and vlan pop
  net/mlx5: E-Switch, Use iterator for vlan and min-inline setups
  net/mlx5: E-Switch, Reg/unreg function changed event at correct stage
  net/mlx5: E-Switch, Consolidate eswitch function number of VFs
  net/mlx5: E-Switch, Refactor eswitch SR-IOV interface
  net/mlx5: Handle host PF vport mac/guid for ECPF
  net/mlx5: E-Switch, Use correct flags when configuring vlan
  net/mlx5: Reduce dependency on enabled_vfs counter and num_vfs
  net/mlx5: Don't handle VF func change if host PF is disabled
  net/mlx5: Limit scope of mlx5_get_next_phys_dev() to PCI PF devices
  net/mlx5: Move pci status reg access mutex to mlx5_pci_init
  net/mlx5: Rename mlx5_pci_dev_type to mlx5_coredev_type
  ...

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

69ea0582f3ce7a72d312da7305e455801a8dc5a4
diff --cc drivers/infiniband/hw/mlx5/cq.c
index 22230fd,4efbbd2..45f48cd
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@@ -891,7 -891,8 +891,8 @@@ int mlx5_ib_create_cq(struct ib_cq *ibc
  	int entries = attr->cqe;
  	int vector = attr->comp_vector;
  	struct mlx5_ib_dev *dev = to_mdev(ibdev);
 +	struct mlx5_ib_cq *cq = to_mcq(ibcq);
+ 	u32 out[MLX5_ST_SZ_DW(create_cq_out)];
 -	struct mlx5_ib_cq *cq;
  	int uninitialized_var(index);
  	int uninitialized_var(inlen);
  	u32 *cqb = NULL;
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index ea4c8dc,89f5237..c530206
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@@ -1526,7 -1552,8 +1552,8 @@@ static void node_guid_gen_from_mac(u64 
  static void esw_apply_vport_conf(struct mlx5_eswitch *esw,
  				 struct mlx5_vport *vport)
  {
 -	int vport_num = vport->vport;
 +	u16 vport_num = vport->vport;
+ 	int flags;
  
  	if (esw->manager_vport == vport_num)
  		return;
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index c9589f1,f591834..3fe57d0
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@@ -244,19 -253,19 +253,19 @@@ void esw_vport_del_ingress_acl_modify_m
  /* E-Switch API */
  int mlx5_eswitch_init(struct mlx5_core_dev *dev);
  void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw);
- int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode);
- void mlx5_eswitch_disable_sriov(struct mlx5_eswitch *esw);
+ int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int mode);
+ void mlx5_eswitch_disable(struct mlx5_eswitch *esw);
  int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,
 -			       int vport, u8 mac[ETH_ALEN]);
 +			       u16 vport, u8 mac[ETH_ALEN]);
  int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw,
 -				 int vport, int link_state);
 +				 u16 vport, int link_state);
  int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,
 -				int vport, u16 vlan, u8 qos);
 +				u16 vport, u16 vlan, u8 qos);
  int mlx5_eswitch_set_vport_spoofchk(struct mlx5_eswitch *esw,
 -				    int vport, bool spoofchk);
 +				    u16 vport, bool spoofchk);
  int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,
 -				 int vport_num, bool setting);
 -int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, int vport,
 +				 u16 vport_num, bool setting);
 +int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, u16 vport,
  				u32 max_rate, u32 min_rate);
  int mlx5_eswitch_set_vepa(struct mlx5_eswitch *esw, u8 setting);
  int mlx5_eswitch_get_vepa(struct mlx5_eswitch *esw, u8 *setting);