History

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue

Tony Nguyen says: ==================== 100GbE Intel Wired LAN Driver Updates 2021-11-22 Shiraz Saleem says: Currently E800 devices come up as RoCEv2 devices by default. This series add supports for users to configure iWARP or RoCEv2 functionality per PCI function. devlink parameters is used to realize this and is keyed off similar work in [1]. [1] https://lore.kernel.org/linux-rdma/20210810132424.9129-1-parav@nvidia.com/ ====================

David S. Miller committed 4 years ago

Commit c384cee2 parents 5f11542 774a90c10 files · +180 −6Browse files

Showing the changes to include (2 of 10 files). Show all

Unified · Split

2 files
  1. include/linux/net/intel/iidc.h +5 −2
  2. include/net/devlink.h +4 −0
include/linux/net/intel/iidc.h+5−2
@@ -26,6 +26,11 @@ enum iidc_reset_type { · 25 unmodified lines
2626 IIDC_GLOBR,
2727 };
2828
29+enum iidc_rdma_protocol {
30+ IIDC_RDMA_PROTOCOL_IWARP = BIT(0),
31+ IIDC_RDMA_PROTOCOL_ROCEV2 = BIT(1),
32+};
33+
2934 #define IIDC_MAX_USER_PRIORITY 8
3035
3136 /* Struct to hold per RDMA Qset info */
@@ -70,8 +75,6 @@ int ice_rdma_request_reset(struct ice_pf *pf, enum iidc_reset_type reset_type); · 38 unmodified lines
7075 int ice_rdma_update_vsi_filter(struct ice_pf *pf, u16 vsi_id, bool enable);
7176 void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos);
7277
73−#define IIDC_RDMA_ROCE_NAME "roce"
74−
7578 /* Structure representing auxiliary driver tailored information about the core
7679 * PCI dev, each auxiliary driver using the IIDC interface will have an
7780 * instance of this struct dedicated to it.
include/net/devlink.h+4−0
@@ -485,6 +485,7 @@ enum devlink_param_generic_id { · 484 unmodified lines
485485 DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH,
486486 DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA,
487487 DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET,
488+ DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP,
488489
489490 /* add new param generic ids above here*/
490491 __DEVLINK_PARAM_GENERIC_ID_MAX,
@@ -534,6 +535,9 @@ enum devlink_param_generic_id { · 43 unmodified lines
534535 #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME "enable_vnet"
535536 #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE DEVLINK_PARAM_TYPE_BOOL
536537
538+#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME "enable_iwarp"
539+#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE DEVLINK_PARAM_TYPE_BOOL
540+
537541 #define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \
538542 { \
539543 .id = DEVLINK_PARAM_GENERIC_ID_##_id, \

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