Commit a501ab3f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Nguyen, Anthony L says:

====================
iwl-next Intel Wired LAN Driver Updates 2022-02-07

Dave adds support for ice driver to provide DSCP QoS mappings to irdma
driver.

[1] https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/

* 'iwl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux:
  ice: add support for DSCP QoS for IDC
====================

Link: https://lore.kernel.org/r/20220207235921.1303522-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c3e676b9 b794eecb

drivers/net/ethernet/intel/ice/ice_idc.c

+5 −0
Original line number Diff line number Diff line
@@ -227,6 +227,11 @@ void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos) 


	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)

		qos->tc_info[i].rel_bw = dcbx_cfg->etscfg.tcbwtable[i];



	qos->pfc_mode = dcbx_cfg->pfc_mode;

	if (qos->pfc_mode == IIDC_DSCP_PFC_MODE)

		for (i = 0; i < IIDC_MAX_DSCP_MAPPING; i++)

			qos->dscp_map[i] = dcbx_cfg->dscp_map[i];

}

EXPORT_SYMBOL_GPL(ice_get_qos_params);

include/linux/net/intel/iidc.h

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ enum iidc_rdma_protocol { 
};



#define IIDC_MAX_USER_PRIORITY		8

#define IIDC_MAX_DSCP_MAPPING		64

#define IIDC_DSCP_PFC_MODE		0x1



/* Struct to hold per RDMA Qset info */

struct iidc_rdma_qset_params {
@@ -60,6 +62,8 @@ struct iidc_qos_params { 
	u8 vport_relative_bw;

	u8 vport_priority_type;

	u8 num_tc;

	u8 pfc_mode;

	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];

};



struct iidc_event {