forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/ethernet/mellanox/mlx4/cmd.c
....@@ -281,7 +281,6 @@
281281 val = param | (cmd << 16) | (priv->cmd.comm_toggle << 31);
282282 __raw_writel((__force u32) cpu_to_be32(val),
283283 &priv->mfunc.comm->slave_write);
284
- mmiowb();
285284 mutex_unlock(&dev->persist->device_state_mutex);
286285 return 0;
287286 }
....@@ -495,12 +494,6 @@
495494 (event ? (1 << HCR_E_BIT) : 0) |
496495 (op_modifier << HCR_OPMOD_SHIFT) |
497496 op), hcr + 6);
498
-
499
- /*
500
- * Make sure that our HCR writes don't get mixed in with
501
- * writes from another CPU starting a FW command.
502
- */
503
- mmiowb();
504497
505498 cmd->toggle = cmd->toggle ^ 1;
506499
....@@ -2206,7 +2199,6 @@
22062199 }
22072200 __raw_writel((__force u32) cpu_to_be32(reply),
22082201 &priv->mfunc.comm[slave].slave_read);
2209
- mmiowb();
22102202
22112203 return;
22122204
....@@ -2410,7 +2402,6 @@
24102402 &priv->mfunc.comm[i].slave_write);
24112403 __raw_writel((__force u32) 0,
24122404 &priv->mfunc.comm[i].slave_read);
2413
- mmiowb();
24142405 for (port = 1; port <= MLX4_MAX_PORTS; port++) {
24152406 struct mlx4_vport_state *admin_vport;
24162407 struct mlx4_vport_state *oper_vport;
....@@ -2576,10 +2567,6 @@
25762567 slave_read |= (u32)COMM_CHAN_EVENT_INTERNAL_ERR;
25772568 __raw_writel((__force u32)cpu_to_be32(slave_read),
25782569 &priv->mfunc.comm[slave].slave_read);
2579
- /* Make sure that our comm channel write doesn't
2580
- * get mixed in with writes from another CPU.
2581
- */
2582
- mmiowb();
25832570 }
25842571 }
25852572
....@@ -3283,7 +3270,7 @@
32833270 mlx4_warn(dev, "unknown value for link_state %02x on slave %d port %d\n",
32843271 link_state, slave, port);
32853272 return -EINVAL;
3286
- };
3273
+ }
32873274 s_info = &priv->mfunc.master.vf_admin[slave].vport[port];
32883275 s_info->link_state = link_state;
32893276