AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/include/linux/mlx5/doorbell.h
..
..
@@ -36,46 +36,25 @@
36
36
 #define MLX5_BF_OFFSET	      0x800
37
37
 #define MLX5_CQ_DOORBELL      0x20
38
38
 
39
-#if BITS_PER_LONG == 64
40
39
 /* Assume that we can just write a 64-bit doorbell atomically.  s390
41
40
  * actually doesn't have writeq() but S/390 systems don't even have
42
41
  * PCI so we won't worry about it.
42
+ *
43
+ * Note that the write is not atomic on 32-bit systems! In contrast to 64-bit
44
+ * ones, it requires proper locking. mlx5_write64 doesn't do any locking, so use
45
+ * it at your own discretion, protected by some kind of lock on 32 bits.
46
+ *
47
+ * TODO: use write{q,l}_relaxed()
43
48
  */
44
49
 
45
-#define MLX5_DECLARE_DOORBELL_LOCK(name)
46
-#define MLX5_INIT_DOORBELL_LOCK(ptr)    do { } while (0)
47
-#define MLX5_GET_DOORBELL_LOCK(ptr)      (NULL)
48
-
49
-static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
50
-				spinlock_t *doorbell_lock)
50
+static inline void mlx5_write64(__be32 val[2], void __iomem *dest)
51
51
 {
52
+#if BITS_PER_LONG == 64
52
53
 	__raw_writeq(*(u64 *)val, dest);
53
-}
54
-
55
54
 #else
56
-
57
-/* Just fall back to a spinlock to protect the doorbell if
58
- * BITS_PER_LONG is 32 -- there's no portable way to do atomic 64-bit
59
- * MMIO writes.
60
- */
61
-
62
-#define MLX5_DECLARE_DOORBELL_LOCK(name) spinlock_t name;
63
-#define MLX5_INIT_DOORBELL_LOCK(ptr)     spin_lock_init(ptr)
64
-#define MLX5_GET_DOORBELL_LOCK(ptr)      (ptr)
65
-
66
-static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
67
-				spinlock_t *doorbell_lock)
68
-{
69
-	unsigned long flags;
70
-
71
-	if (doorbell_lock)
72
-		spin_lock_irqsave(doorbell_lock, flags);
73
55
 	__raw_writel((__force u32) val[0], dest);
74
56
 	__raw_writel((__force u32) val[1], dest + 4);
75
-	if (doorbell_lock)
76
-		spin_unlock_irqrestore(doorbell_lock, flags);
77
-}
78
-
79
57
 #endif
58
+}
80
59
 
81
60
 #endif /* MLX5_DOORBELL_H */