On Fri, 2020-08-21 at 16:13 -0700, Randy Dunlap wrote:
> On 8/21/20 3:50 PM, Nathan Chancellor wrote:
> > Clang warns several times when building for 32-bit ARM along the lines
> > of:

The defines are quite horrible to read.
Maybe:
---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 61 +++++++++++++++++++++++++++-----
-------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c 
b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 9df69d5efe8c..62b6eec713b2 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -15,24 +15,49 @@
 
 #define to_mvdev(__vdev) container_of((__vdev), struct mlx5_vdpa_dev, vdev)
 
-#define VALID_FEATURES_MASK                                                    
                    \
-       (BIT(VIRTIO_NET_F_CSUM) | BIT(VIRTIO_NET_F_GUEST_CSUM) |                
                   \
-        BIT(VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) | BIT(VIRTIO_NET_F_MTU) | 
BIT(VIRTIO_NET_F_MAC) |   \
-        BIT(VIRTIO_NET_F_GUEST_TSO4) | BIT(VIRTIO_NET_F_GUEST_TSO6) |          
                   \
-        BIT(VIRTIO_NET_F_GUEST_ECN) | BIT(VIRTIO_NET_F_GUEST_UFO) | 
BIT(VIRTIO_NET_F_HOST_TSO4) | \
-        BIT(VIRTIO_NET_F_HOST_TSO6) | BIT(VIRTIO_NET_F_HOST_ECN) | 
BIT(VIRTIO_NET_F_HOST_UFO) |   \
-        BIT(VIRTIO_NET_F_MRG_RXBUF) | BIT(VIRTIO_NET_F_STATUS) | 
BIT(VIRTIO_NET_F_CTRL_VQ) |      \
-        BIT(VIRTIO_NET_F_CTRL_RX) | BIT(VIRTIO_NET_F_CTRL_VLAN) |              
                   \
-        BIT(VIRTIO_NET_F_CTRL_RX_EXTRA) | BIT(VIRTIO_NET_F_GUEST_ANNOUNCE) |   
                   \
-        BIT(VIRTIO_NET_F_MQ) | BIT(VIRTIO_NET_F_CTRL_MAC_ADDR) | 
BIT(VIRTIO_NET_F_HASH_REPORT) |  \
-        BIT(VIRTIO_NET_F_RSS) | BIT(VIRTIO_NET_F_RSC_EXT) | 
BIT(VIRTIO_NET_F_STANDBY) |           \
-        BIT(VIRTIO_NET_F_SPEED_DUPLEX) | BIT(VIRTIO_F_NOTIFY_ON_EMPTY) |       
                   \
-        BIT(VIRTIO_F_ANY_LAYOUT) | BIT(VIRTIO_F_VERSION_1) | 
BIT(VIRTIO_F_ACCESS_PLATFORM) |      \
-        BIT(VIRTIO_F_RING_PACKED) | BIT(VIRTIO_F_ORDER_PLATFORM) | 
BIT(VIRTIO_F_SR_IOV))
-
-#define VALID_STATUS_MASK                                                      
                    \
-       (VIRTIO_CONFIG_S_ACKNOWLEDGE | VIRTIO_CONFIG_S_DRIVER | 
VIRTIO_CONFIG_S_DRIVER_OK |        \
-        VIRTIO_CONFIG_S_FEATURES_OK | VIRTIO_CONFIG_S_NEEDS_RESET | 
VIRTIO_CONFIG_S_FAILED)
+#define VALID_FEATURES_MASK                                            \
+       (BIT_ULL(VIRTIO_NET_F_CSUM) |                                   \
+        BIT_ULL(VIRTIO_NET_F_GUEST_CSUM) |                             \
+        BIT_ULL(VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) |                    \
+        BIT_ULL(VIRTIO_NET_F_MTU) |                                    \
+        BIT_ULL(VIRTIO_NET_F_MAC) |                                    \
+        BIT_ULL(VIRTIO_NET_F_GUEST_TSO4) |                             \
+        BIT_ULL(VIRTIO_NET_F_GUEST_TSO6) |                             \
+        BIT_ULL(VIRTIO_NET_F_GUEST_ECN) |                              \
+        BIT_ULL(VIRTIO_NET_F_GUEST_UFO) |                              \
+        BIT_ULL(VIRTIO_NET_F_HOST_TSO4) |                              \
+        BIT_ULL(VIRTIO_NET_F_HOST_TSO6) |                              \
+        BIT_ULL(VIRTIO_NET_F_HOST_ECN) |                               \
+        BIT_ULL(VIRTIO_NET_F_HOST_UFO) |                               \
+        BIT_ULL(VIRTIO_NET_F_MRG_RXBUF) |                              \
+        BIT_ULL(VIRTIO_NET_F_STATUS) |                                 \
+        BIT_ULL(VIRTIO_NET_F_CTRL_VQ) |                                \
+        BIT_ULL(VIRTIO_NET_F_CTRL_RX) |                                \
+        BIT_ULL(VIRTIO_NET_F_CTRL_VLAN) |                              \
+        BIT_ULL(VIRTIO_NET_F_CTRL_RX_EXTRA) |                          \
+        BIT_ULL(VIRTIO_NET_F_GUEST_ANNOUNCE) |                         \
+        BIT_ULL(VIRTIO_NET_F_MQ) |                                     \
+        BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) |                          \
+        BIT_ULL(VIRTIO_NET_F_HASH_REPORT) |                            \
+        BIT_ULL(VIRTIO_NET_F_RSS) |                                    \
+        BIT_ULL(VIRTIO_NET_F_RSC_EXT) |                                \
+        BIT_ULL(VIRTIO_NET_F_STANDBY) |                                \
+        BIT_ULL(VIRTIO_NET_F_SPEED_DUPLEX) |                           \
+        BIT_ULL(VIRTIO_F_NOTIFY_ON_EMPTY) |                            \
+        BIT_ULL(VIRTIO_F_ANY_LAYOUT) |                                 \
+        BIT_ULL(VIRTIO_F_VERSION_1) |                                  \
+        BIT_ULL(VIRTIO_F_ACCESS_PLATFORM) |                            \
+        BIT_ULL(VIRTIO_F_RING_PACKED) |                                \
+        BIT_ULL(VIRTIO_F_ORDER_PLATFORM) |                             \
+        BIT_ULL(VIRTIO_F_SR_IOV))
+
+#define VALID_STATUS_MASK                                              \
+       (VIRTIO_CONFIG_S_ACKNOWLEDGE |                                  \
+        VIRTIO_CONFIG_S_DRIVER |                                       \
+        VIRTIO_CONFIG_S_DRIVER_OK |                                    \
+        VIRTIO_CONFIG_S_FEATURES_OK |                                  \
+        VIRTIO_CONFIG_S_NEEDS_RESET |                                  \
+        VIRTIO_CONFIG_S_FAILED)
 
 struct mlx5_vdpa_net_resources {
        u32 tisn;


_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to