History

net/mlx5: Remove spinlock support from mlx5_write64

As there is no user of mlx5_write64 that passes a spinlock to mlx5_write64, remove this functionality and simplify the function.

Maxim Mikityanskiy committed 7 years ago

Commit bbf29f61 parent 38702cc5 files · +13 −26Browse files

Showing the changes to include/linux (2 of 5 files). Show all

Unified · Split

2 files
  1. include/linux/mlx5/cq.h +1 −1
  2. include/linux/mlx5/doorbell.h +9 −22
include/linux/mlx5/cq.h+1−1
@@ -170,7 +170,7 @@ static inline void mlx5_cq_arm(struct mlx5_core_cq *cq, u32 cmd, · 169 unmodified lines
170170 doorbell[0] = cpu_to_be32(sn << 28 | cmd | ci);
171171 doorbell[1] = cpu_to_be32(cq->cqn);
172172
173− mlx5_write64(doorbell, uar_page + MLX5_CQ_DOORBELL, NULL);
173+ mlx5_write64(doorbell, uar_page + MLX5_CQ_DOORBELL);
174174 }
175175
176176 static inline void mlx5_cq_hold(struct mlx5_core_cq *cq)
include/linux/mlx5/doorbell.h+9−22
@@ -36,38 +36,25 @@ · 35 unmodified lines
3636 #define MLX5_BF_OFFSET 0x800
3737 #define MLX5_CQ_DOORBELL 0x20
3838
39−#if BITS_PER_LONG == 64
4039 /* Assume that we can just write a 64-bit doorbell atomically. s390
4140 * actually doesn't have writeq() but S/390 systems don't even have
4241 * 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()
4348 */
4449
45−static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
46− spinlock_t *doorbell_lock)
50+static inline void mlx5_write64(__be32 val[2], void __iomem *dest)
4751 {
52+#if BITS_PER_LONG == 64
4853 __raw_writeq(*(u64 *)val, dest);
49−}
50−
5154 #else
52−
53−/* Just fall back to a spinlock to protect the doorbell if
54− * BITS_PER_LONG is 32 -- there's no portable way to do atomic 64-bit
55− * MMIO writes.
56− */
57−
58−static inline void mlx5_write64(__be32 val[2], void __iomem *dest,
59− spinlock_t *doorbell_lock)
60−{
61− unsigned long flags;
62−
63− if (doorbell_lock)
64− spin_lock_irqsave(doorbell_lock, flags);
6555 __raw_writel((__force u32) val[0], dest);
6656 __raw_writel((__force u32) val[1], dest + 4);
67− if (doorbell_lock)
68− spin_unlock_irqrestore(doorbell_lock, flags);
69−}
70−
7157 #endif
58+}
7259
7360 #endif /* MLX5_DOORBELL_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t