net: hbl_cn: use port common cfg lock instead of asic specific

Replace the port's cfg lock from port specific into port's
common code. This change is further to the common cfg lock
function change.

Signed-off-by: Tal Cohen <tal5.cohen@intel.com>

Author: tal-co

drivers/net/ethernet/intel/hbl_cn/common/hbl_cn.c

@@ -1667,30 +1667,20 @@ void hbl_cn_hard_reset_prepare(struct hbl_aux_dev *cn_aux_dev, bool fw_reset, bo
 }
 
 void hbl_cn_cfg_lock(struct hbl_cn_port *cn_port)
+	__acquires(&cn_port->cfg_lock)
 {
-	struct hbl_cn_device *hdev = cn_port->hdev;
-	struct hbl_cn_asic_port_funcs *port_funcs;
-
-	port_funcs = hdev->asic_funcs->port_funcs;
-	port_funcs->cfg_lock(cn_port);
+	mutex_lock(&cn_port->cfg_lock);
 }
 
 void hbl_cn_cfg_unlock(struct hbl_cn_port *cn_port)
+	__releases(&cn_port->cfg_lock)
 {
-	struct hbl_cn_device *hdev = cn_port->hdev;
-	struct hbl_cn_asic_port_funcs *port_funcs;
-
-	port_funcs = hdev->asic_funcs->port_funcs;
-	port_funcs->cfg_unlock(cn_port);
+	mutex_unlock(&cn_port->cfg_lock);
 }
 
 bool hbl_cn_cfg_is_locked(struct hbl_cn_port *cn_port)
 {
-	struct hbl_cn_device *hdev = cn_port->hdev;
-	struct hbl_cn_asic_port_funcs *port_funcs;
-
-	port_funcs = hdev->asic_funcs->port_funcs;
-	return port_funcs->cfg_is_locked(cn_port);
+	return mutex_is_locked(&cn_port->cfg_lock);
 }
 
 int hbl_cn_send_port_cpucp_status(struct hbl_aux_dev *aux_dev, u32 port, u8 cmd, u8 period)
@@ -4740,6 +4730,7 @@ static int cn_port_sw_init(struct hbl_cn_port *cn_port)
 
 	mutex_init(&cn_port->control_lock);
 	mutex_init(&cn_port->cnt_lock);
+	mutex_init(&cn_port->cfg_lock);
 
 	xa_init_flags(&cn_port->qp_ids, XA_FLAGS_ALLOC);
 	xa_init_flags(&cn_port->db_fifo_ids, XA_FLAGS_ALLOC);
@@ -4768,6 +4759,7 @@ static int cn_port_sw_init(struct hbl_cn_port *cn_port)
 	xa_destroy(&cn_port->db_fifo_ids);
 	xa_destroy(&cn_port->qp_ids);
 
+	mutex_destroy(&cn_port->cfg_lock);
 	mutex_destroy(&cn_port->cnt_lock);
 	mutex_destroy(&cn_port->control_lock);
 

drivers/net/ethernet/intel/hbl_cn/common/hbl_cn.h

@@ -1107,6 +1107,7 @@ struct hbl_cn_macro {
  * @control_lock: protects from a race between port open/close and other stuff that might run in
  *                parallel (such as event handling).
  * @cnt_lock: protects the counters from concurrent reading. Needed for SPMU and XPCS91 counters.
+ * @cfg_lock: serializes the port configuration
  * @qp_ids: xarray to hold all QP IDs.
  * @db_fifo_ids: Allocated doorbell fifo IDs.
  * @cq_ids: xarray to hold all CQ IDs.
@@ -1171,6 +1172,8 @@ struct hbl_cn_port {
 	struct mutex control_lock;
 	/* protects the counters from concurrent reading */
 	struct mutex cnt_lock;
+	/* serializes the port configuration */
+	struct mutex cfg_lock;
 	struct xarray qp_ids;
 	struct xarray db_fifo_ids;
 	struct xarray cq_ids;

drivers/net/ethernet/intel/hbl_cn/gaudi2/gaudi2_cn.c

@@ -755,7 +755,6 @@ static void gaudi2_cn_port_sw_fini(struct hbl_cn_port *cn_port)
 	struct gaudi2_cn_port *gaudi2_port = cn_port->cn_specific;
 
 	mutex_destroy(&gaudi2_port->qp_destroy_lock);
-	mutex_destroy(&gaudi2_port->cfg_lock);
 
 	hbl_cn_eq_dispatcher_fini(cn_port);
 	gaudi2_cn_free_rings_resources(gaudi2_port);
@@ -795,7 +794,6 @@ static int gaudi2_cn_port_sw_init(struct hbl_cn_port *cn_port)
 
 	hbl_cn_eq_dispatcher_init(gaudi2_port->cn_port);
 
-	mutex_init(&gaudi2_port->cfg_lock);
 	mutex_init(&gaudi2_port->qp_destroy_lock);
 
 	/* Userspace might not be notified immediately of link event from HW.
@@ -5091,11 +5089,11 @@ static void gaudi2_qp_sanity_work(struct work_struct *work)
 
 	gaudi2_port->qp_timeout_cnt = timeout_cnt;
 
-	mutex_lock(&gaudi2_port->cfg_lock);
+	hbl_cn_cfg_lock(cn_port);
 	xa_for_each(&cn_port->qp_ids, qp_id, qp)
 		if (qp && qp->is_req)
 			__qpc_sanity_check(gaudi2_port, qp_id);
-	mutex_unlock(&gaudi2_port->cfg_lock);
+	hbl_cn_cfg_unlock(cn_port);
 
 done:
 	queue_delayed_work(gaudi2_port->qp_sanity_wq, &gaudi2_port->qp_sanity_work,
@@ -5270,29 +5268,6 @@ static void gaudi2_cn_get_status(struct hbl_cn_port *cn_port, struct hbl_cn_cpuc
 	status->high_ber_cnt = high_ber_cnt;
 }
 
-static void gaudi2_cn_cfg_lock(struct hbl_cn_port *cn_port)
-	__acquires(&gaudi2_port->cfg_lock)
-{
-	struct gaudi2_cn_port *gaudi2_port = cn_port->cn_specific;
-
-	mutex_lock(&gaudi2_port->cfg_lock);
-}
-
-static void gaudi2_cn_cfg_unlock(struct hbl_cn_port *cn_port)
-	__releases(&gaudi2_port->cfg_lock)
-{
-	struct gaudi2_cn_port *gaudi2_port = cn_port->cn_specific;
-
-	mutex_unlock(&gaudi2_port->cfg_lock);
-}
-
-static bool gaudi2_cn_cfg_is_locked(struct hbl_cn_port *cn_port)
-{
-	struct gaudi2_cn_port *gaudi2_port = cn_port->cn_specific;
-
-	return mutex_is_locked(&gaudi2_port->cfg_lock);
-}
-
 static u32 gaudi2_cn_get_max_msg_sz(struct hbl_cn_device *hdev)
 {
 	return SZ_1G;
@@ -5594,9 +5569,6 @@ static struct hbl_cn_asic_port_funcs gaudi2_cn_port_funcs = {
 	.collect_fec_stats = gaudi2_cn_debugfs_collect_fec_stats,
 	.disable_wqe_index_checker = gaudi2_cn_disable_wqe_index_checker,
 	.get_status = gaudi2_cn_get_status,
-	.cfg_lock = gaudi2_cn_cfg_lock,
-	.cfg_unlock = gaudi2_cn_cfg_unlock,
-	.cfg_is_locked = gaudi2_cn_cfg_is_locked,
 	.qp_pre_destroy = gaudi2_cn_qp_pre_destroy,
 	.qp_post_destroy = gaudi2_cn_qp_post_destroy,
 	.set_port_status = gaudi2_cn_set_port_status,

drivers/net/ethernet/intel/hbl_cn/gaudi2/gaudi2_cn.h

@@ -305,7 +305,6 @@ struct gaudi2_cn_port;
  * @eq_work: EQ work for processing events (e.g Tx completion).
  * @qp_sanity_work: QPC sanity check worker.
  * @qp_sanity_wq: QPC sanity worker thread.
- * @cfg_lock: Serializes the port configuration.
  * @qp_destroy_lock: protects the MAC loopback switching for QP destroy flow.
  * @pcs_link_stady_state_ts: the timestamp to move to the pcs link steady state.
  * @pcs_link_state: the current pcs link state.
@@ -332,8 +331,6 @@ struct gaudi2_cn_port {
 	struct delayed_work eq_work;
 	struct delayed_work qp_sanity_work;
 	struct workqueue_struct *qp_sanity_wq;
-	/* Serializes the port configuration */
-	struct mutex cfg_lock;
 	/* protects the MAC loopback switching for QP destroy flow */
 	struct mutex qp_destroy_lock;
 	ktime_t pcs_link_stady_state_ts;