History

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

Merge mlx5-next shared branched into net-next, From Bodong Wang: 1) Introduction of ECPF (Embedded CPU Physical Function), and low level bits for mlx5 SmartNic capabilities support. 2) Vport enumeration refactoring that affect mlx5_ib and mlx5_core From Aya Levin, 3) Add support for 50Gbps per lane link modes in the Port Type and Speed register (PTYS) 4) Refactor low level query functions for PTYS register 5) Add support for 50Gbps per lane link modes to mlx5_ib Note: due to a change in API in mlx5/core and a later patch from net-next, a fixup was squashed with this merge commit that replaces FDB_UPLINK_VPORT with MLX5_VPORT_UPLINK which exists only in upstream net-next.

Saeed Mahameed committed 7 years ago

Commit 259fae52 parents 50f444a 08e867636 files · +848 −474Browse files

Showing the changes to include/linux (5 of 36 files). Show all

Unified · Split

5 files
  1. include/linux/mlx5/device.h +7 −2
  2. include/linux/mlx5/driver.h +47 −14
  3. include/linux/mlx5/mlx5_ifc.h +65 −11
  4. include/linux/mlx5/port.h +19 −11
  5. include/linux/mlx5/vport.h +17 −4
include/linux/mlx5/device.h+7−2
@@ -67,7 +67,7 @@ · 66 unmodified lines
67#define MLX5_UN_SZ_BYTES(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 8)67#define MLX5_UN_SZ_BYTES(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 8)
68#define MLX5_UN_SZ_DW(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 32)68#define MLX5_UN_SZ_DW(typ) (sizeof(union mlx5_ifc_##typ##_bits) / 32)
69#define MLX5_BYTE_OFF(typ, fld) (__mlx5_bit_off(typ, fld) / 8)69#define MLX5_BYTE_OFF(typ, fld) (__mlx5_bit_off(typ, fld) / 8)
70#define MLX5_ADDR_OF(typ, p, fld) ((char *)(p) + MLX5_BYTE_OFF(typ, fld))70#define MLX5_ADDR_OF(typ, p, fld) ((void *)((uint8_t *)(p) + MLX5_BYTE_OFF(typ, fld)))
71 71
72/* insert a value to a struct */72/* insert a value to a struct */
73#define MLX5_SET(typ, p, fld, v) do { \73#define MLX5_SET(typ, p, fld, v) do { \
@@ -342,6 +342,8 @@ enum mlx5_event { · 268 unmodified lines
342 MLX5_EVENT_TYPE_PAGE_FAULT = 0xc,342 MLX5_EVENT_TYPE_PAGE_FAULT = 0xc,
343 MLX5_EVENT_TYPE_NIC_VPORT_CHANGE = 0xd,343 MLX5_EVENT_TYPE_NIC_VPORT_CHANGE = 0xd,
344 344
345 MLX5_EVENT_TYPE_HOST_PARAMS_CHANGE = 0xe,
346
345 MLX5_EVENT_TYPE_DCT_DRAINED = 0x1c,347 MLX5_EVENT_TYPE_DCT_DRAINED = 0x1c,
346 348
347 MLX5_EVENT_TYPE_FPGA_ERROR = 0x20,349 MLX5_EVENT_TYPE_FPGA_ERROR = 0x20,
@@ -591,7 +593,7 @@ struct mlx5_eqe_cmd { · 243 unmodified lines
591};593};
592 594
593struct mlx5_eqe_page_req {595struct mlx5_eqe_page_req {
594 u8 rsvd0[2];596 __be16 ec_function;
595 __be16 func_id;597 __be16 func_id;
596 __be32 num_pages;598 __be32 num_pages;
597 __be32 rsvd1[5];599 __be32 rsvd1[5];
@@ -1201,6 +1203,9 @@ enum mlx5_qcam_feature_groups { · 603 unmodified lines
1201#define MLX5_CAP_ODP(mdev, cap)\1203#define MLX5_CAP_ODP(mdev, cap)\
1202 MLX5_GET(odp_cap, mdev->caps.hca_cur[MLX5_CAP_ODP], cap)1204 MLX5_GET(odp_cap, mdev->caps.hca_cur[MLX5_CAP_ODP], cap)
1203 1205
1206#define MLX5_CAP_ODP_MAX(mdev, cap)\
1207 MLX5_GET(odp_cap, mdev->caps.hca_max[MLX5_CAP_ODP], cap)
1208
1204#define MLX5_CAP_VECTOR_CALC(mdev, cap) \1209#define MLX5_CAP_VECTOR_CALC(mdev, cap) \
1205 MLX5_GET(vector_calc_cap, \1210 MLX5_GET(vector_calc_cap, \
1206 mdev->caps.hca_cur[MLX5_CAP_VECTOR_CALC], cap)1211 mdev->caps.hca_cur[MLX5_CAP_VECTOR_CALC], cap)
include/linux/mlx5/driver.h+47−14
@@ -522,6 +522,7 @@ struct mlx5_priv { · 521 unmodified lines
522 atomic_t reg_pages;522 atomic_t reg_pages;
523 struct list_head free_list;523 struct list_head free_list;
524 int vfs_pages;524 int vfs_pages;
525 int peer_pf_pages;
525 526
526 struct mlx5_core_health health;527 struct mlx5_core_health health;
527 528
@@ -652,6 +653,7 @@ struct mlx5_core_dev { · 124 unmodified lines
652 u32 mcam[MLX5_ST_SZ_DW(mcam_reg)];653 u32 mcam[MLX5_ST_SZ_DW(mcam_reg)];
653 u32 fpga[MLX5_ST_SZ_DW(fpga_cap)];654 u32 fpga[MLX5_ST_SZ_DW(fpga_cap)];
654 u32 qcam[MLX5_ST_SZ_DW(qcam_reg)];655 u32 qcam[MLX5_ST_SZ_DW(qcam_reg)];
656 u8 embedded_cpu;
655 } caps;657 } caps;
656 u64 sys_image_guid;658 u64 sys_image_guid;
657 phys_addr_t iseg_base;659 phys_addr_t iseg_base;
@@ -850,11 +852,30 @@ void mlx5_cmd_cleanup(struct mlx5_core_dev *dev); · 192 unmodified lines
850void mlx5_cmd_use_events(struct mlx5_core_dev *dev);852void mlx5_cmd_use_events(struct mlx5_core_dev *dev);
851void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);853void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
852 854
855struct mlx5_async_ctx {
856 struct mlx5_core_dev *dev;
857 atomic_t num_inflight;
858 struct wait_queue_head wait;
859};
860
861struct mlx5_async_work;
862
863typedef void (*mlx5_async_cbk_t)(int status, struct mlx5_async_work *context);
864
865struct mlx5_async_work {
866 struct mlx5_async_ctx *ctx;
867 mlx5_async_cbk_t user_callback;
868};
869
870void mlx5_cmd_init_async_ctx(struct mlx5_core_dev *dev,
871 struct mlx5_async_ctx *ctx);
872void mlx5_cmd_cleanup_async_ctx(struct mlx5_async_ctx *ctx);
873int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size,
874 void *out, int out_size, mlx5_async_cbk_t callback,
875 struct mlx5_async_work *work);
876
853int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,877int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
854 int out_size);878 int out_size);
855int mlx5_cmd_exec_cb(struct mlx5_core_dev *dev, void *in, int in_size,
856 void *out, int out_size, mlx5_cmd_cbk_t callback,
857 void *context);
858int mlx5_cmd_exec_polling(struct mlx5_core_dev *dev, void *in, int in_size,879int mlx5_cmd_exec_polling(struct mlx5_core_dev *dev, void *in, int in_size,
859 void *out, int out_size);880 void *out, int out_size);
860void mlx5_cmd_mbox_status(void *out, u8 *status, u32 *syndrome);881void mlx5_cmd_mbox_status(void *out, u8 *status, u32 *syndrome);
@@ -885,9 +906,10 @@ void mlx5_init_mkey_table(struct mlx5_core_dev *dev); · 24 unmodified lines
885void mlx5_cleanup_mkey_table(struct mlx5_core_dev *dev);906void mlx5_cleanup_mkey_table(struct mlx5_core_dev *dev);
886int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,907int mlx5_core_create_mkey_cb(struct mlx5_core_dev *dev,
887 struct mlx5_core_mkey *mkey,908 struct mlx5_core_mkey *mkey,
888 u32 *in, int inlen,909 struct mlx5_async_ctx *async_ctx, u32 *in,
889 u32 *out, int outlen,910 int inlen, u32 *out, int outlen,
890 mlx5_cmd_cbk_t callback, void *context);911 mlx5_async_cbk_t callback,
912 struct mlx5_async_work *context);
891int mlx5_core_create_mkey(struct mlx5_core_dev *dev,913int mlx5_core_create_mkey(struct mlx5_core_dev *dev,
892 struct mlx5_core_mkey *mkey,914 struct mlx5_core_mkey *mkey,
893 u32 *in, int inlen);915 u32 *in, int inlen);
@@ -897,14 +919,12 @@ int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mkey *mkey, · 3 unmodified lines
897 u32 *out, int outlen);919 u32 *out, int outlen);
898int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);920int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);
899int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);921int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);
900int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,
901 u16 opmod, u8 port);
902int mlx5_pagealloc_init(struct mlx5_core_dev *dev);922int mlx5_pagealloc_init(struct mlx5_core_dev *dev);
903void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev);923void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev);
904void mlx5_pagealloc_start(struct mlx5_core_dev *dev);924void mlx5_pagealloc_start(struct mlx5_core_dev *dev);
905void mlx5_pagealloc_stop(struct mlx5_core_dev *dev);925void mlx5_pagealloc_stop(struct mlx5_core_dev *dev);
906void mlx5_core_req_pages_handler(struct mlx5_core_dev *dev, u16 func_id,926void mlx5_core_req_pages_handler(struct mlx5_core_dev *dev, u16 func_id,
907 s32 npages);927 s32 npages, bool ec_function);
908int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot);928int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot);
909int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev);929int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev);
910void mlx5_register_debugfs(void);930void mlx5_register_debugfs(void);
@@ -1058,11 +1078,24 @@ static inline int mlx5_core_is_pf(struct mlx5_core_dev *dev) · 147 unmodified lines
1058 return !(dev->priv.pci_dev_data & MLX5_PCI_DEV_IS_VF);1078 return !(dev->priv.pci_dev_data & MLX5_PCI_DEV_IS_VF);
1059}1079}
1060 1080
1061#define MLX5_TOTAL_VPORTS(mdev) (1 + pci_sriov_get_totalvfs((mdev)->pdev))1081static inline bool mlx5_core_is_ecpf(struct mlx5_core_dev *dev)
1062#define MLX5_VPORT_MANAGER(mdev) \1082{
1063 (MLX5_CAP_GEN(mdev, vport_group_manager) && \1083 return dev->caps.embedded_cpu;
1064 (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && \1084}
1065 mlx5_core_is_pf(mdev))1085
1086static inline bool mlx5_core_is_ecpf_esw_manager(struct mlx5_core_dev *dev)
1087{
1088 return dev->caps.embedded_cpu && MLX5_CAP_GEN(dev, eswitch_manager);
1089}
1090
1091#define MLX5_HOST_PF_MAX_VFS (127u)
1092static inline u16 mlx5_core_max_vfs(struct mlx5_core_dev *dev)
1093{
1094 if (mlx5_core_is_ecpf_esw_manager(dev))
1095 return MLX5_HOST_PF_MAX_VFS;
1096 else
1097 return pci_sriov_get_totalvfs(dev->pdev);
1098}
1066 1099
1067static inline int mlx5_get_gid_table_len(u16 param)1100static inline int mlx5_get_gid_table_len(u16 param)
1068{1101{
include/linux/mlx5/mlx5_ifc.h+65−11
@@ -72,6 +72,7 @@ enum { · 71 unmodified lines
72 72
73enum {73enum {
74 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE = 0x0,74 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE = 0x0,
75 MLX5_SET_HCA_CAP_OP_MOD_ODP = 0x2,
75 MLX5_SET_HCA_CAP_OP_MOD_ATOMIC = 0x3,76 MLX5_SET_HCA_CAP_OP_MOD_ATOMIC = 0x3,
76};77};
77 78
@@ -141,6 +142,7 @@ enum { · 63 unmodified lines
141 MLX5_CMD_OP_QUERY_XRQ_DC_PARAMS_ENTRY = 0x725,142 MLX5_CMD_OP_QUERY_XRQ_DC_PARAMS_ENTRY = 0x725,
142 MLX5_CMD_OP_SET_XRQ_DC_PARAMS_ENTRY = 0x726,143 MLX5_CMD_OP_SET_XRQ_DC_PARAMS_ENTRY = 0x726,
143 MLX5_CMD_OP_QUERY_XRQ_ERROR_PARAMS = 0x727,144 MLX5_CMD_OP_QUERY_XRQ_ERROR_PARAMS = 0x727,
145 MLX5_CMD_OP_QUERY_HOST_PARAMS = 0x740,
144 MLX5_CMD_OP_QUERY_VPORT_STATE = 0x750,146 MLX5_CMD_OP_QUERY_VPORT_STATE = 0x750,
145 MLX5_CMD_OP_MODIFY_VPORT_STATE = 0x751,147 MLX5_CMD_OP_MODIFY_VPORT_STATE = 0x751,
146 MLX5_CMD_OP_QUERY_ESW_VPORT_CONTEXT = 0x752,148 MLX5_CMD_OP_QUERY_ESW_VPORT_CONTEXT = 0x752,
@@ -831,7 +833,9 @@ struct mlx5_ifc_odp_cap_bits { · 684 unmodified lines
831 833
832 struct mlx5_ifc_odp_per_transport_service_cap_bits ud_odp_caps;834 struct mlx5_ifc_odp_per_transport_service_cap_bits ud_odp_caps;
833 835
834 u8 reserved_at_e0[0x720];836 struct mlx5_ifc_odp_per_transport_service_cap_bits xrc_odp_caps;
837
838 u8 reserved_at_100[0x700];
835};839};
836 840
837struct mlx5_ifc_calc_op {841struct mlx5_ifc_calc_op {
@@ -4438,7 +4442,8 @@ struct mlx5_ifc_query_pages_out_bits { · 3600 unmodified lines
4438 4442
4439 u8 syndrome[0x20];4443 u8 syndrome[0x20];
4440 4444
4441 u8 reserved_at_40[0x10];4445 u8 embedded_cpu_function[0x1];
4446 u8 reserved_at_41[0xf];
4442 u8 function_id[0x10];4447 u8 function_id[0x10];
4443 4448
4444 u8 num_pages[0x20];4449 u8 num_pages[0x20];
@@ -4457,7 +4462,8 @@ struct mlx5_ifc_query_pages_in_bits { · 12 unmodified lines
4457 u8 reserved_at_20[0x10];4462 u8 reserved_at_20[0x10];
4458 u8 op_mod[0x10];4463 u8 op_mod[0x10];
4459 4464
4460 u8 reserved_at_40[0x10];4465 u8 embedded_cpu_function[0x1];
4466 u8 reserved_at_41[0xf];
4461 u8 function_id[0x10];4467 u8 function_id[0x10];
4462 4468
4463 u8 reserved_at_60[0x20];4469 u8 reserved_at_60[0x20];
@@ -5877,7 +5883,8 @@ struct mlx5_ifc_manage_pages_in_bits { · 1413 unmodified lines
5877 u8 reserved_at_20[0x10];5883 u8 reserved_at_20[0x10];
5878 u8 op_mod[0x10];5884 u8 op_mod[0x10];
5879 5885
5880 u8 reserved_at_40[0x10];5886 u8 embedded_cpu_function[0x1];
5887 u8 reserved_at_41[0xf];
5881 u8 function_id[0x10];5888 u8 function_id[0x10];
5882 5889
5883 u8 input_num_entries[0x20];5890 u8 input_num_entries[0x20];
@@ -6055,7 +6062,8 @@ struct mlx5_ifc_enable_hca_in_bits { · 171 unmodified lines
6055 u8 reserved_at_20[0x10];6062 u8 reserved_at_20[0x10];
6056 u8 op_mod[0x10];6063 u8 op_mod[0x10];
6057 6064
6058 u8 reserved_at_40[0x10];6065 u8 embedded_cpu_function[0x1];
6066 u8 reserved_at_41[0xf];
6059 u8 function_id[0x10];6067 u8 function_id[0x10];
6060 6068
6061 u8 reserved_at_60[0x20];6069 u8 reserved_at_60[0x20];
@@ -6099,7 +6107,8 @@ struct mlx5_ifc_disable_hca_in_bits { · 37 unmodified lines
6099 u8 reserved_at_20[0x10];6107 u8 reserved_at_20[0x10];
6100 u8 op_mod[0x10];6108 u8 op_mod[0x10];
6101 6109
6102 u8 reserved_at_40[0x10];6110 u8 embedded_cpu_function[0x1];
6111 u8 reserved_at_41[0xf];
6103 u8 function_id[0x10];6112 u8 function_id[0x10];
6104 6113
6105 u8 reserved_at_60[0x20];6114 u8 reserved_at_60[0x20];
@@ -7817,21 +7826,23 @@ struct mlx5_ifc_ptys_reg_bits { · 1711 unmodified lines
7817 u8 proto_mask[0x3];7826 u8 proto_mask[0x3];
7818 7827
7819 u8 an_status[0x4];7828 u8 an_status[0x4];
7820 u8 reserved_at_24[0x3c];7829 u8 reserved_at_24[0x1c];
7830
7831 u8 ext_eth_proto_capability[0x20];
7821 7832
7822 u8 eth_proto_capability[0x20];7833 u8 eth_proto_capability[0x20];
7823 7834
7824 u8 ib_link_width_capability[0x10];7835 u8 ib_link_width_capability[0x10];
7825 u8 ib_proto_capability[0x10];7836 u8 ib_proto_capability[0x10];
7826 7837
7827 u8 reserved_at_a0[0x20];7838 u8 ext_eth_proto_admin[0x20];
7828 7839
7829 u8 eth_proto_admin[0x20];7840 u8 eth_proto_admin[0x20];
7830 7841
7831 u8 ib_link_width_admin[0x10];7842 u8 ib_link_width_admin[0x10];
7832 u8 ib_proto_admin[0x10];7843 u8 ib_proto_admin[0x10];
7833 7844
7834 u8 reserved_at_100[0x20];7845 u8 ext_eth_proto_oper[0x20];
7835 7846
7836 u8 eth_proto_oper[0x20];7847 u8 eth_proto_oper[0x20];
7837 7848
@@ -8280,7 +8291,9 @@ struct mlx5_ifc_mpegc_reg_bits { · 442 unmodified lines
8280struct mlx5_ifc_pcam_enhanced_features_bits {8291struct mlx5_ifc_pcam_enhanced_features_bits {
8281 u8 reserved_at_0[0x6d];8292 u8 reserved_at_0[0x6d];
8282 u8 rx_icrc_encapsulated_counter[0x1];8293 u8 rx_icrc_encapsulated_counter[0x1];
8283 u8 reserved_at_6e[0x8];8294 u8 reserved_at_6e[0x4];
8295 u8 ptys_extended_ethernet[0x1];
8296 u8 reserved_at_73[0x3];
8284 u8 pfcc_mask[0x1];8297 u8 pfcc_mask[0x1];
8285 u8 reserved_at_77[0x3];8298 u8 reserved_at_77[0x3];
8286 u8 per_lane_error_counters[0x1];8299 u8 per_lane_error_counters[0x1];
@@ -8746,7 +8759,8 @@ struct mlx5_ifc_initial_seg_bits { · 459 unmodified lines
8746 u8 initializing[0x1];8759 u8 initializing[0x1];
8747 u8 reserved_at_fe1[0x4];8760 u8 reserved_at_fe1[0x4];
8748 u8 nic_interface_supported[0x3];8761 u8 nic_interface_supported[0x3];
8749 u8 reserved_at_fe8[0x18];8762 u8 embedded_cpu[0x1];
8763 u8 reserved_at_fe9[0x17];
8750 8764
8751 struct mlx5_ifc_health_buffer_bits health_buffer;8765 struct mlx5_ifc_health_buffer_bits health_buffer;
8752 8766
@@ -9513,4 +9527,44 @@ struct mlx5_ifc_mtrc_ctrl_bits { · 760 unmodified lines
9513 u8 reserved_at_80[0x180];9527 u8 reserved_at_80[0x180];
9514};9528};
9515 9529
9530struct mlx5_ifc_host_params_context_bits {
9531 u8 host_number[0x8];
9532 u8 reserved_at_8[0x8];
9533 u8 host_num_of_vfs[0x10];
9534
9535 u8 reserved_at_20[0x10];
9536 u8 host_pci_bus[0x10];
9537
9538 u8 reserved_at_40[0x10];
9539 u8 host_pci_device[0x10];
9540
9541 u8 reserved_at_60[0x10];
9542 u8 host_pci_function[0x10];
9543
9544 u8 reserved_at_80[0x180];
9545};
9546
9547struct mlx5_ifc_query_host_params_in_bits {
9548 u8 opcode[0x10];
9549 u8 reserved_at_10[0x10];
9550
9551 u8 reserved_at_20[0x10];
9552 u8 op_mod[0x10];
9553
9554 u8 reserved_at_40[0x40];
9555};
9556
9557struct mlx5_ifc_query_host_params_out_bits {
9558 u8 status[0x8];
9559 u8 reserved_at_8[0x18];
9560
9561 u8 syndrome[0x20];
9562
9563 u8 reserved_at_40[0x40];
9564
9565 struct mlx5_ifc_host_params_context_bits host_params_context;
9566
9567 u8 reserved_at_280[0x180];
9568};
9569
9516#endif /* MLX5_IFC_H */9570#endif /* MLX5_IFC_H */
include/linux/mlx5/port.h+19−11
@@ -92,6 +92,22 @@ enum mlx5e_link_mode { · 91 unmodified lines
92 MLX5E_LINK_MODES_NUMBER,92 MLX5E_LINK_MODES_NUMBER,
93};93};
94 94
95enum mlx5e_ext_link_mode {
96 MLX5E_SGMII_100M = 0,
97 MLX5E_1000BASE_X_SGMII = 1,
98 MLX5E_5GBASE_R = 3,
99 MLX5E_10GBASE_XFI_XAUI_1 = 4,
100 MLX5E_40GBASE_XLAUI_4_XLPPI_4 = 5,
101 MLX5E_25GAUI_1_25GBASE_CR_KR = 6,
102 MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2 = 7,
103 MLX5E_50GAUI_1_LAUI_1_50GBASE_CR_KR = 8,
104 MLX5E_CAUI_4_100GBASE_CR4_KR4 = 9,
105 MLX5E_100GAUI_2_100GBASE_CR2_KR2 = 10,
106 MLX5E_200GAUI_4_200GBASE_CR4_KR4 = 12,
107 MLX5E_400GAUI_8 = 15,
108 MLX5E_EXT_LINK_MODES_NUMBER,
109};
110
95enum mlx5e_connector_type {111enum mlx5e_connector_type {
96 MLX5E_PORT_UNKNOWN = 0,112 MLX5E_PORT_UNKNOWN = 0,
97 MLX5E_PORT_NONE = 1,113 MLX5E_PORT_NONE = 1,
@@ -106,31 +122,23 @@ enum mlx5e_connector_type { · 8 unmodified lines
106};122};
107 123
108#define MLX5E_PROT_MASK(link_mode) (1 << link_mode)124#define MLX5E_PROT_MASK(link_mode) (1 << link_mode)
125#define MLX5_GET_ETH_PROTO(reg, out, ext, field) \
126 (ext ? MLX5_GET(reg, out, ext_##field) : \
127 MLX5_GET(reg, out, field))
109 128
110int mlx5_set_port_caps(struct mlx5_core_dev *dev, u8 port_num, u32 caps);129int mlx5_set_port_caps(struct mlx5_core_dev *dev, u8 port_num, u32 caps);
111int mlx5_query_port_ptys(struct mlx5_core_dev *dev, u32 *ptys,130int mlx5_query_port_ptys(struct mlx5_core_dev *dev, u32 *ptys,
112 int ptys_size, int proto_mask, u8 local_port);131 int ptys_size, int proto_mask, u8 local_port);
113int mlx5_query_port_proto_cap(struct mlx5_core_dev *dev,
114 u32 *proto_cap, int proto_mask);
115int mlx5_query_port_proto_admin(struct mlx5_core_dev *dev,
116 u32 *proto_admin, int proto_mask);
117int mlx5_query_port_link_width_oper(struct mlx5_core_dev *dev,132int mlx5_query_port_link_width_oper(struct mlx5_core_dev *dev,
118 u8 *link_width_oper, u8 local_port);133 u8 *link_width_oper, u8 local_port);
119int mlx5_query_port_ib_proto_oper(struct mlx5_core_dev *dev,134int mlx5_query_port_ib_proto_oper(struct mlx5_core_dev *dev,
120 u8 *proto_oper, u8 local_port);135 u8 *proto_oper, u8 local_port);
121int mlx5_query_port_eth_proto_oper(struct mlx5_core_dev *dev,
122 u32 *proto_oper, u8 local_port);
123int mlx5_set_port_ptys(struct mlx5_core_dev *dev, bool an_disable,
124 u32 proto_admin, int proto_mask);
125void mlx5_toggle_port_link(struct mlx5_core_dev *dev);136void mlx5_toggle_port_link(struct mlx5_core_dev *dev);
126int mlx5_set_port_admin_status(struct mlx5_core_dev *dev,137int mlx5_set_port_admin_status(struct mlx5_core_dev *dev,
127 enum mlx5_port_status status);138 enum mlx5_port_status status);
128int mlx5_query_port_admin_status(struct mlx5_core_dev *dev,139int mlx5_query_port_admin_status(struct mlx5_core_dev *dev,
129 enum mlx5_port_status *status);140 enum mlx5_port_status *status);
130int mlx5_set_port_beacon(struct mlx5_core_dev *dev, u16 beacon_duration);141int mlx5_set_port_beacon(struct mlx5_core_dev *dev, u16 beacon_duration);
131void mlx5_query_port_autoneg(struct mlx5_core_dev *dev, int proto_mask,
132 u8 *an_status,
133 u8 *an_disable_cap, u8 *an_disable_admin);
134 142
135int mlx5_set_port_mtu(struct mlx5_core_dev *dev, u16 mtu, u8 port);143int mlx5_set_port_mtu(struct mlx5_core_dev *dev, u16 mtu, u8 port);
136void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, u16 *max_mtu, u8 port);144void mlx5_query_port_max_mtu(struct mlx5_core_dev *dev, u16 *max_mtu, u8 port);
include/linux/mlx5/vport.h+17−4
@@ -36,12 +36,25 @@ · 35 unmodified lines
36#include <linux/mlx5/driver.h>36#include <linux/mlx5/driver.h>
37#include <linux/mlx5/device.h>37#include <linux/mlx5/device.h>
38 38
39#define MLX5_VPORT_PF_PLACEHOLDER (1u)
40#define MLX5_SPECIAL_VPORTS (MLX5_VPORT_PF_PLACEHOLDER)
41#define MLX5_TOTAL_VPORTS(mdev) (MLX5_SPECIAL_VPORTS + mlx5_core_max_vfs(mdev))
42
43#define MLX5_VPORT_MANAGER(mdev) \
44 (MLX5_CAP_GEN(mdev, vport_group_manager) && \
45 (MLX5_CAP_GEN(mdev, port_type) == MLX5_CAP_PORT_TYPE_ETH) && \
46 mlx5_core_is_pf(mdev))
47
39enum {48enum {
40 MLX5_CAP_INLINE_MODE_L2,49 MLX5_CAP_INLINE_MODE_L2,
41 MLX5_CAP_INLINE_MODE_VPORT_CONTEXT,50 MLX5_CAP_INLINE_MODE_VPORT_CONTEXT,
42 MLX5_CAP_INLINE_MODE_NOT_REQUIRED,51 MLX5_CAP_INLINE_MODE_NOT_REQUIRED,
43};52};
44 53
54enum {
55 MLX5_VPORT_UPLINK = 0xffff
56};
57
45u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport);58u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport);
46int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,59int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,
47 u16 vport, u8 state);60 u16 vport, u8 state);
@@ -60,7 +73,7 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev, · 12 unmodified lines
60 u64 *system_image_guid);73 u64 *system_image_guid);
61int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);74int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);
62int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,75int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,
63 u32 vport, u64 node_guid);76 u16 vport, u64 node_guid);
64int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,77int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
65 u16 *qkey_viol_cntr);78 u16 *qkey_viol_cntr);
66int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,79int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,
@@ -78,7 +91,7 @@ int mlx5_query_hca_vport_system_image_guid(struct mlx5_core_dev *dev, · 11 unmodified lines
78int mlx5_query_hca_vport_node_guid(struct mlx5_core_dev *dev,91int mlx5_query_hca_vport_node_guid(struct mlx5_core_dev *dev,
79 u64 *node_guid);92 u64 *node_guid);
80int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev,93int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev,
81 u32 vport,94 u16 vport,
82 enum mlx5_list_type list_type,95 enum mlx5_list_type list_type,
83 u8 addr_list[][ETH_ALEN],96 u8 addr_list[][ETH_ALEN],
84 int *list_size);97 int *list_size);
@@ -87,7 +100,7 @@ int mlx5_modify_nic_vport_mac_list(struct mlx5_core_dev *dev, · 2 unmodified lines
87 u8 addr_list[][ETH_ALEN],100 u8 addr_list[][ETH_ALEN],
88 int list_size);101 int list_size);
89int mlx5_query_nic_vport_promisc(struct mlx5_core_dev *mdev,102int mlx5_query_nic_vport_promisc(struct mlx5_core_dev *mdev,
90 u32 vport,103 u16 vport,
91 int *promisc_uc,104 int *promisc_uc,
92 int *promisc_mc,105 int *promisc_mc,
93 int *promisc_all);106 int *promisc_all);
@@ -96,7 +109,7 @@ int mlx5_modify_nic_vport_promisc(struct mlx5_core_dev *mdev, · 2 unmodified lines
96 int promisc_mc,109 int promisc_mc,
97 int promisc_all);110 int promisc_all);
98int mlx5_query_nic_vport_vlans(struct mlx5_core_dev *dev,111int mlx5_query_nic_vport_vlans(struct mlx5_core_dev *dev,
99 u32 vport,112 u16 vport,
100 u16 vlans[],113 u16 vlans[],
101 int *size);114 int *size);
102int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,115int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t