Commit 21508c8c authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

Merge branch 'for-next' of... 

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux into wip/leon-for-next

Tony Nguyen says:

====================
Prepare for Intel IPU E2000 (GEN3)

This is the first part in introducing RDMA support for idpf.

----------------------------------------------------------------
Tatyana Nikolova says:

To align with review comments, the patch series introducing RDMA
RoCEv2 support for the Intel Infrastructure Processing Unit (IPU)
E2000 line of products is going to be submitted in three parts:

1. Modify ice to use specific and common IIDC definitions and
   pass a core device info to irdma.

2. Add RDMA support to idpf and modify idpf to use specific and
   common IIDC definitions and pass a core device info to irdma.

3. Add RDMA RoCEv2 support for the E2000 products, referred to as
   GEN3 to irdma.

This first part is a 5 patch series based on the original
"iidc/ice/irdma: Update IDC to support multiple consumers" patch
to allow for multiple CORE PCI drivers, using the auxbus.

Patches:
1) Move header file to new name for clarity and replace ice
   specific DSCP define with a kernel equivalent one in irdma
2) Unify naming convention
3) Separate header file into common and driver specific info
4) Replace ice specific DSCP define with a kernel equivalent
   one in ice
5) Implement core device info struct and update drivers to use it
----------------------------------------------------------------

v1: https://lore.kernel.org/20250505212037.2092288-1-anthony.l.nguyen@intel.com

IWL reviews:
[v5] https://lore.kernel.org/20250416021549.606-1-tatyana.e.nikolova@intel.com
[v4] https://lore.kernel.org/20250225050428.2166-1-tatyana.e.nikolova@intel.com
[v3] https://lore.kernel.org/20250207194931.1569-1-tatyana.e.nikolova@intel.com
[v2] https://lore.kernel.org/20240824031924.421-1-tatyana.e.nikolova@intel.com
[v1] https://lore.kernel.org/20240724233917.704-1-tatyana.e.nikolova@intel.com

* 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux:
  iidc/ice/irdma: Update IDC to support multiple consumers
  ice: Replace ice specific DSCP mapping num with a kernel define
  iidc/ice/irdma: Break iidc.h into two headers
  iidc/ice/irdma: Rename to iidc_* convention
  iidc/ice/irdma: Rename IDC header file

====================
Link: https://patch.msgid.link/20250509200712.2911060-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parents 6883b680 c24a65b6

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -11890,7 +11890,7 @@ F: Documentation/networking/device_drivers/ethernet/intel/ 
F:	drivers/net/ethernet/intel/

F:	drivers/net/ethernet/intel/*/

F:	include/linux/avf/virtchnl.h

F:	include/linux/net/intel/iidc.h

F:	include/linux/net/intel/*/









INTEL ETHERNET PROTOCOL DRIVER FOR RDMA









M:	Mustafa Ismail <mustafa.ismail@intel.com>
































drivers/infiniband/hw/irdma/main.c



+66
−59






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB









/* Copyright (c) 2015 - 2021 Intel Corporation */









#include "main.h"









#include "../../../net/ethernet/intel/ice/ice.h"



















MODULE_ALIAS("i40iw");









MODULE_AUTHOR("Intel Corporation, <e1000-rdma@lists.sourceforge.net>");









MODULE_DESCRIPTION("Intel(R) Ethernet Protocol Driver for RDMA");









MODULE_LICENSE("Dual BSD/GPL");


















@@ -61,7 +59,7 @@ static void irdma_log_invalid_mtu(u16 mtu, struct irdma_sc_dev *dev)







}



















static void irdma_fill_qos_info(struct irdma_l2params *l2params,









				struct iidc_qos_params *qos_info)









				struct iidc_rdma_qos_params *qos_info)









{









	int i;


















@@ -85,12 +83,13 @@ static void irdma_fill_qos_info(struct irdma_l2params *l2params,







	}









}



















static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event)









static void irdma_iidc_event_handler(struct iidc_rdma_core_dev_info *cdev_info,









				     struct iidc_rdma_event *event)









{









	struct irdma_device *iwdev = dev_get_drvdata(&pf->adev->dev);









	struct irdma_device *iwdev = dev_get_drvdata(&cdev_info->adev->dev);









	struct irdma_l2params l2params = {};



















	if (*event->type & BIT(IIDC_EVENT_AFTER_MTU_CHANGE)) {









	if (*event->type & BIT(IIDC_RDMA_EVENT_AFTER_MTU_CHANGE)) {









		ibdev_dbg(&iwdev->ibdev, "CLNT: new MTU = %d\n", iwdev->netdev->mtu);









		if (iwdev->vsi.mtu != iwdev->netdev->mtu) {









			l2params.mtu = iwdev->netdev->mtu;








@@ -98,25 +97,26 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event







			irdma_log_invalid_mtu(l2params.mtu, &iwdev->rf->sc_dev);









			irdma_change_l2params(&iwdev->vsi, &l2params);









		}









	} else if (*event->type & BIT(IIDC_EVENT_BEFORE_TC_CHANGE)) {









	} else if (*event->type & BIT(IIDC_RDMA_EVENT_BEFORE_TC_CHANGE)) {









		if (iwdev->vsi.tc_change_pending)









			return;



















		irdma_prep_tc_change(iwdev);









	} else if (*event->type & BIT(IIDC_EVENT_AFTER_TC_CHANGE)) {









		struct iidc_qos_params qos_info = {};









	} else if (*event->type & BIT(IIDC_RDMA_EVENT_AFTER_TC_CHANGE)) {









		struct iidc_rdma_priv_dev_info *iidc_priv = cdev_info->iidc_priv;



















		if (!iwdev->vsi.tc_change_pending)









			return;



















		l2params.tc_changed = true;









		ibdev_dbg(&iwdev->ibdev, "CLNT: TC Change\n");









		ice_get_qos_params(pf, &qos_info);









		irdma_fill_qos_info(&l2params, &qos_info);



















		irdma_fill_qos_info(&l2params, &iidc_priv->qos_info);









		if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)









			iwdev->dcb_vlan_mode = qos_info.num_tc > 1 && !l2params.dscp_mode;









			iwdev->dcb_vlan_mode =









				l2params.num_tc > 1 && !l2params.dscp_mode;









		irdma_change_l2params(&iwdev->vsi, &l2params);









	} else if (*event->type & BIT(IIDC_EVENT_CRIT_ERR)) {









	} else if (*event->type & BIT(IIDC_RDMA_EVENT_CRIT_ERR)) {









		ibdev_warn(&iwdev->ibdev, "ICE OICR event notification: oicr = 0x%08x\n",









			   event->reg);









		if (event->reg & IRDMAPFINT_OICR_PE_CRITERR_M) {








@@ -151,10 +151,8 @@ static void irdma_iidc_event_handler(struct ice_pf *pf, struct iidc_event *event







 */









static void irdma_request_reset(struct irdma_pci_f *rf)









{









	struct ice_pf *pf = rf->cdev;



















	ibdev_warn(&rf->iwdev->ibdev, "Requesting a reset\n");









	ice_rdma_request_reset(pf, IIDC_PFR);









	ice_rdma_request_reset(rf->cdev, IIDC_FUNC_RESET);









}



















/**








@@ -166,14 +164,15 @@ static int irdma_lan_register_qset(struct irdma_sc_vsi *vsi,







				   struct irdma_ws_node *tc_node)









{









	struct irdma_device *iwdev = vsi->back_vsi;









	struct ice_pf *pf = iwdev->rf->cdev;









	struct iidc_rdma_core_dev_info *cdev_info;









	struct iidc_rdma_qset_params qset = {};









	int ret;



















	cdev_info = iwdev->rf->cdev;









	qset.qs_handle = tc_node->qs_handle;









	qset.tc = tc_node->traffic_class;









	qset.vport_id = vsi->vsi_idx;









	ret = ice_add_rdma_qset(pf, &qset);









	ret = ice_add_rdma_qset(cdev_info, &qset);









	if (ret) {









		ibdev_dbg(&iwdev->ibdev, "WS: LAN alloc_res for rdma qset failed.\n");









		return ret;








@@ -194,19 +193,20 @@ static void irdma_lan_unregister_qset(struct irdma_sc_vsi *vsi,







				      struct irdma_ws_node *tc_node)









{









	struct irdma_device *iwdev = vsi->back_vsi;









	struct ice_pf *pf = iwdev->rf->cdev;









	struct iidc_rdma_core_dev_info *cdev_info;









	struct iidc_rdma_qset_params qset = {};



















	cdev_info = iwdev->rf->cdev;









	qset.qs_handle = tc_node->qs_handle;









	qset.tc = tc_node->traffic_class;









	qset.vport_id = vsi->vsi_idx;









	qset.teid = tc_node->l2_sched_node_id;



















	if (ice_del_rdma_qset(pf, &qset))









	if (ice_del_rdma_qset(cdev_info, &qset))









		ibdev_dbg(&iwdev->ibdev, "WS: LAN free_res for rdma qset failed.\n");









}



















static int irdma_init_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)









static int irdma_init_interrupts(struct irdma_pci_f *rf, struct iidc_rdma_core_dev_info *cdev)









{









	int i;


















@@ -217,12 +217,12 @@ static int irdma_init_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)







		return -ENOMEM;



















	for (i = 0; i < rf->msix_count; i++)









		if (ice_alloc_rdma_qvector(pf, &rf->msix_entries[i]))









		if (ice_alloc_rdma_qvector(cdev, &rf->msix_entries[i]))









			break;



















	if (i < IRDMA_MIN_MSIX) {









		for (; i > 0; i--)









			ice_free_rdma_qvector(pf, &rf->msix_entries[i]);









			ice_free_rdma_qvector(cdev, &rf->msix_entries[i]);



















		kfree(rf->msix_entries);









		return -ENOMEM;








@@ -233,44 +233,51 @@ static int irdma_init_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)







	return 0;









}



















static void irdma_deinit_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf)









static void irdma_deinit_interrupts(struct irdma_pci_f *rf, struct iidc_rdma_core_dev_info *cdev)









{









	int i;



















	for (i = 0; i < rf->msix_count; i++)









		ice_free_rdma_qvector(pf, &rf->msix_entries[i]);









		ice_free_rdma_qvector(cdev, &rf->msix_entries[i]);



















	kfree(rf->msix_entries);









}



















static void irdma_remove(struct auxiliary_device *aux_dev)









{









	struct iidc_auxiliary_dev *iidc_adev = container_of(aux_dev,









							    struct iidc_auxiliary_dev,









							    adev);









	struct ice_pf *pf = iidc_adev->pf;









	struct irdma_device *iwdev = auxiliary_get_drvdata(aux_dev);









	struct iidc_rdma_core_auxiliary_dev *iidc_adev;









	struct iidc_rdma_core_dev_info *cdev_info;



















	iidc_adev = container_of(aux_dev, struct iidc_rdma_core_auxiliary_dev, adev);









	cdev_info = iidc_adev->cdev_info;



















	ice_rdma_update_vsi_filter(cdev_info, iwdev->vsi_num, false);









	irdma_ib_unregister_device(iwdev);









	ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, false);









	irdma_deinit_interrupts(iwdev->rf, pf);









	irdma_deinit_interrupts(iwdev->rf, cdev_info);



















	pr_debug("INIT: Gen2 PF[%d] device remove success\n", PCI_FUNC(pf->pdev->devfn));









	pr_debug("INIT: Gen2 PF[%d] device remove success\n", PCI_FUNC(cdev_info->pdev->devfn));









}



















static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf,









				   struct ice_vsi *vsi)









static void irdma_fill_device_info(struct irdma_device *iwdev,









				   struct iidc_rdma_core_dev_info *cdev_info)









{









	struct iidc_rdma_priv_dev_info *iidc_priv = cdev_info->iidc_priv;









	struct irdma_pci_f *rf = iwdev->rf;



















	rf->cdev = pf;









	rf->sc_dev.hw = &rf->hw;









	rf->iwdev = iwdev;









	rf->cdev = cdev_info;









	rf->hw.hw_addr = iidc_priv->hw_addr;









	rf->pcidev = cdev_info->pdev;









	rf->hw.device = &rf->pcidev->dev;









	rf->pf_id = iidc_priv->pf_id;









	rf->gen_ops.register_qset = irdma_lan_register_qset;









	rf->gen_ops.unregister_qset = irdma_lan_unregister_qset;









	rf->hw.hw_addr = pf->hw.hw_addr;









	rf->pcidev = pf->pdev;









	rf->pf_id = pf->hw.pf_id;









	rf->default_vsi.vsi_idx = vsi->vsi_num;









	rf->protocol_used = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ?



















	rf->default_vsi.vsi_idx = iidc_priv->vport_id;









	rf->protocol_used =









		cdev_info->rdma_protocol == IIDC_RDMA_PROTOCOL_ROCEV2 ?









		IRDMA_ROCE_PROTOCOL_ONLY : IRDMA_IWARP_PROTOCOL_ONLY;









	rf->rdma_ver = IRDMA_GEN_2;









	rf->rsrc_profile = IRDMA_HMC_PROFILE_DEFAULT;








@@ -278,9 +285,11 @@ static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf







	rf->gen_ops.request_reset = irdma_request_reset;









	rf->limits_sel = 7;









	rf->iwdev = iwdev;



















	mutex_init(&iwdev->ah_tbl_lock);









	iwdev->netdev = vsi->netdev;









	iwdev->vsi_num = vsi->vsi_num;



















	iwdev->netdev = iidc_priv->netdev;









	iwdev->vsi_num = iidc_priv->vport_id;









	iwdev->init_state = INITIAL_STATE;









	iwdev->roce_cwnd = IRDMA_ROCE_CWND_DEFAULT;









	iwdev->roce_ackcreds = IRDMA_ROCE_ACKCREDS_DEFAULT;








@@ -292,19 +301,18 @@ static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf

















static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_device_id *id)









{









	struct iidc_auxiliary_dev *iidc_adev = container_of(aux_dev,









							    struct iidc_auxiliary_dev,









							    adev);









	struct ice_pf *pf = iidc_adev->pf;









	struct ice_vsi *vsi = ice_get_main_vsi(pf);









	struct iidc_qos_params qos_info = {};









	struct iidc_rdma_core_auxiliary_dev *iidc_adev;









	struct iidc_rdma_core_dev_info *cdev_info;









	struct iidc_rdma_priv_dev_info *iidc_priv;









	struct irdma_l2params l2params = {};









	struct irdma_device *iwdev;









	struct irdma_pci_f *rf;









	struct irdma_l2params l2params = {};









	int err;



















	if (!vsi)









		return -EIO;









	iidc_adev = container_of(aux_dev, struct iidc_rdma_core_auxiliary_dev, adev);









	cdev_info = iidc_adev->cdev_info;









	iidc_priv = cdev_info->iidc_priv;



















	iwdev = ib_alloc_device(irdma_device, ibdev);









	if (!iwdev)









		return -ENOMEM;








@@ -314,10 +322,10 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_







		return -ENOMEM;









	}



















	irdma_fill_device_info(iwdev, pf, vsi);









	irdma_fill_device_info(iwdev, cdev_info);









	rf = iwdev->rf;



















	err = irdma_init_interrupts(rf, pf);









	err = irdma_init_interrupts(rf, cdev_info);









	if (err)









		goto err_init_interrupts;


















@@ -326,8 +334,7 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_







		goto err_ctrl_init;



















	l2params.mtu = iwdev->netdev->mtu;









	ice_get_qos_params(pf, &qos_info);









	irdma_fill_qos_info(&l2params, &qos_info);









	irdma_fill_qos_info(&l2params, &iidc_priv->qos_info);









	if (iwdev->rf->protocol_used != IRDMA_IWARP_PROTOCOL_ONLY)









		iwdev->dcb_vlan_mode = l2params.num_tc > 1 && !l2params.dscp_mode;


















@@ -339,7 +346,7 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_







	if (err)









		goto err_ibreg;



















	ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, true);









	ice_rdma_update_vsi_filter(cdev_info, iwdev->vsi_num, true);



















	ibdev_dbg(&iwdev->ibdev, "INIT: Gen2 PF[%d] device probe success\n", PCI_FUNC(rf->pcidev->devfn));









	auxiliary_set_drvdata(aux_dev, iwdev);








@@ -351,7 +358,7 @@ static int irdma_probe(struct auxiliary_device *aux_dev, const struct auxiliary_







err_rt_init:









	irdma_ctrl_deinit_hw(rf);









err_ctrl_init:









	irdma_deinit_interrupts(rf, pf);









	irdma_deinit_interrupts(rf, cdev_info);









err_init_interrupts:









	kfree(iwdev->rf);









	ib_dealloc_device(&iwdev->ibdev);








@@ -367,7 +374,7 @@ static const struct auxiliary_device_id irdma_auxiliary_id_table[] = {

















MODULE_DEVICE_TABLE(auxiliary, irdma_auxiliary_id_table);



















static struct iidc_auxiliary_drv irdma_auxiliary_drv = {









static struct iidc_rdma_core_auxiliary_drv irdma_auxiliary_drv = {









	.adrv = {









	    .id_table = irdma_auxiliary_id_table,









	    .probe = irdma_probe,
































drivers/infiniband/hw/irdma/main.h



+2
−1






























Original line number
Diff line number
Diff line







@@ -29,7 +29,8 @@







#include <linux/io-64-nonatomic-lo-hi.h>









#endif









#include <linux/auxiliary_bus.h>









#include <linux/net/intel/iidc.h>









#include <linux/net/intel/iidc_rdma.h>









#include <linux/net/intel/iidc_rdma_ice.h>









#include <rdma/ib_smi.h>









#include <rdma/ib_verbs.h>









#include <rdma/ib_pack.h>
































drivers/infiniband/hw/irdma/osdep.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -5,8 +5,8 @@

















#include <linux/pci.h>









#include <linux/bitfield.h>









#include <linux/net/intel/iidc.h>









#include <rdma/ib_verbs.h>









#include <net/dscp.h>



















#define STATS_TIMER_DELAY	60000










































drivers/infiniband/hw/irdma/type.h



+2
−2






























Original line number
Diff line number
Diff line







@@ -567,7 +567,7 @@ struct irdma_sc_vsi {







	u8 qos_rel_bw;









	u8 qos_prio_type;









	u8 stats_idx;









	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];









	u8 dscp_map[DSCP_MAX];









	struct irdma_qos qos[IRDMA_MAX_USER_PRIORITY];









	u64 hw_stats_regs[IRDMA_HW_STAT_INDEX_MAX_GEN_1];









	bool dscp_mode:1;








@@ -695,7 +695,7 @@ struct irdma_l2params {







	u16 qs_handle_list[IRDMA_MAX_USER_PRIORITY];









	u16 mtu;









	u8 up2tc[IRDMA_MAX_USER_PRIORITY];









	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];









	u8 dscp_map[DSCP_MAX];









	u8 num_tc;









	u8 vsi_rel_bw;









	u8 vsi_prio_type;