As there is no user of mlx5_write64 that passes a spinlock to mlx5_write64, remove this functionality and simplify the function.
Showing the changes to include/linux (2 of 5 files). Show all
Unified · Split
| @@ -170,7 +170,7 @@ static inline void mlx5_cq_arm(struct mlx5_core_cq *cq, u32 cmd, · 169 unmodified lines | |||
| 170 | doorbell[0] = cpu_to_be32(sn << 28 | cmd | ci); | 170 | doorbell[0] = cpu_to_be32(sn << 28 | cmd | ci); |
| 171 | doorbell[1] = cpu_to_be32(cq->cqn); | 171 | doorbell[1] = cpu_to_be32(cq->cqn); |
| 172 | 172 | ||
| 173 | mlx5_write64(doorbell, uar_page + MLX5_CQ_DOORBELL, NULL); | 173 | mlx5_write64(doorbell, uar_page + MLX5_CQ_DOORBELL); |
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | static inline void mlx5_cq_hold(struct mlx5_core_cq *cq) | 176 | static inline void mlx5_cq_hold(struct mlx5_core_cq *cq) |
| @@ -36,38 +36,25 @@ · 35 unmodified lines | |||
| 36 | #define MLX5_BF_OFFSET 0x800 | 36 | #define MLX5_BF_OFFSET 0x800 |
| 37 | #define MLX5_CQ_DOORBELL 0x20 | 37 | #define MLX5_CQ_DOORBELL 0x20 |
| 38 | 38 | ||
| 39 | #if BITS_PER_LONG == 64 | ||
| 40 | /* Assume that we can just write a 64-bit doorbell atomically. s390 | 39 | /* Assume that we can just write a 64-bit doorbell atomically. s390 |
| 41 | * actually doesn't have writeq() but S/390 systems don't even have | 40 | * actually doesn't have writeq() but S/390 systems don't even have |
| 42 | * PCI so we won't worry about it. | 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 | static inline void mlx5_write64(__be32 val[2], void __iomem *dest, | 50 | static inline void mlx5_write64(__be32 val[2], void __iomem *dest) |
| 46 | spinlock_t *doorbell_lock) | ||
| 47 | { | 51 | { |
| 52 | #if BITS_PER_LONG == 64 | ||
| 48 | __raw_writeq(*(u64 *)val, dest); | 53 | __raw_writeq(*(u64 *)val, dest); |
| 49 | } | ||
| 50 | |||
| 51 | #else | 54 | #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); | ||
| 65 | __raw_writel((__force u32) val[0], dest); | 55 | __raw_writel((__force u32) val[0], dest); |
| 66 | __raw_writel((__force u32) val[1], dest + 4); | 56 | __raw_writel((__force u32) val[1], dest + 4); |
| 67 | if (doorbell_lock) | ||
| 68 | spin_unlock_irqrestore(doorbell_lock, flags); | ||
| 69 | } | ||
| 70 | |||
| 71 | #endif | 57 | #endif |
| 58 | } | ||
| 72 | 59 | ||
| 73 | #endif /* MLX5_DOORBELL_H */ | 60 | #endif /* MLX5_DOORBELL_H */ |