]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/mlx5: Accel: fpga tls fix cast to __be64 and incorrect argument types
authorSaeed Mahameed <saeedm@mellanox.com>
Fri, 29 May 2020 01:42:40 +0000 (18:42 -0700)
committerSaeed Mahameed <saeedm@mellanox.com>
Sat, 30 May 2020 04:20:22 +0000 (21:20 -0700)
tls handle and rcd_sn are actually big endian and not in host format.
Fix that.

Fix the following sparse warnings:
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:177:21:
warning: cast to restricted __be64

drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c:178:52:
warning: incorrect type in argument 2 (different base types)
    expected unsigned int [usertype] handle
    got restricted __be32 [usertype] handle

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c
drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c
drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h

index cab708af34223c8a459a66326adcd21ad972d221..cbf3d76c05a881e1969941baea0ab48077e5e8b0 100644 (file)
@@ -56,8 +56,8 @@ void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,
        mlx5_fpga_tls_del_flow(mdev, swid, GFP_KERNEL, direction_sx);
 }
 
-int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
-                            u64 rcd_sn)
+int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,
+                            u32 seq, __be64 rcd_sn)
 {
        return mlx5_fpga_tls_resync_rx(mdev, handle, seq, rcd_sn);
 }
index e09bc3858d574222f8886e1c6bd0a3f52c4f718f..aefea467f7b388eb3a497f6a2e51a0d294aaf713 100644 (file)
@@ -109,8 +109,8 @@ int mlx5_accel_tls_add_flow(struct mlx5_core_dev *mdev, void *flow,
                            bool direction_sx);
 void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,
                             bool direction_sx);
-int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
-                            u64 rcd_sn);
+int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,
+                            u32 seq, __be64 rcd_sn);
 bool mlx5_accel_is_tls_device(struct mlx5_core_dev *mdev);
 u32 mlx5_accel_tls_device_caps(struct mlx5_core_dev *mdev);
 int mlx5_accel_tls_init(struct mlx5_core_dev *mdev);
@@ -125,8 +125,8 @@ mlx5_accel_tls_add_flow(struct mlx5_core_dev *mdev, void *flow,
                        bool direction_sx) { return -ENOTSUPP; }
 static inline void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,
                                           bool direction_sx) { }
-static inline int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle,
-                                          u32 seq, u64 rcd_sn) { return 0; }
+static inline int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,
+                                          u32 seq, __be64 rcd_sn) { return 0; }
 static inline bool mlx5_accel_is_tls_device(struct mlx5_core_dev *mdev)
 {
        return mlx5_accel_is_ktls_device(mdev);
index c27e9a609d5197f4a93c179bf280c0b663e00ffb..1fbb5a90cb3812ed609810b8ce11d49697231673 100644 (file)
@@ -167,7 +167,7 @@ static int mlx5e_tls_resync(struct net_device *netdev, struct sock *sk,
        struct tls_context *tls_ctx = tls_get_ctx(sk);
        struct mlx5e_priv *priv = netdev_priv(netdev);
        struct mlx5e_tls_offload_context_rx *rx_ctx;
-       u64 rcd_sn = *(u64 *)rcd_sn_data;
+       __be64 rcd_sn = *(__be64 *)rcd_sn_data;
 
        if (WARN_ON_ONCE(direction != TLS_OFFLOAD_CTX_DIR_RX))
                return -EINVAL;
index 22a2ef11151441c3abcfc07e7a6e66e292563cae..29b7339ebfa3376c87f7343a99ff187bfa5231e0 100644 (file)
@@ -194,8 +194,8 @@ static void mlx5_fpga_tls_flow_to_cmd(void *flow, void *cmd)
                 MLX5_GET(tls_flow, flow, direction_sx));
 }
 
-int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
-                           u64 rcd_sn)
+int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,
+                           u32 seq, __be64 rcd_sn)
 {
        struct mlx5_fpga_dma_buf *buf;
        int size = sizeof(*buf) + MLX5_TLS_COMMAND_SIZE;
index 3b2e37bf76febd7aaa241386560b2707a1346e78..5714cf391d1b259cfeaceb62859439a2fdb7838f 100644 (file)
@@ -68,7 +68,7 @@ static inline u32 mlx5_fpga_tls_device_caps(struct mlx5_core_dev *mdev)
        return mdev->fpga->tls->caps;
 }
 
-int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,
-                           u64 rcd_sn);
+int mlx5_fpga_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,
+                           u32 seq, __be64 rcd_sn);
 
 #endif /* __MLX5_FPGA_TLS_H__ */