| From 45bcc06eaf8545b9c72e75a0e773732ec1f3ca54 Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Fri, 13 Mar 2020 13:31:00 -0700 |
| Subject: [PATCH] scsi: treewide: Consolidate {get,put}_unaligned_[bl]e24() |
| definitions |
| |
| commit a7afff31d56db22647251d76d6af030cd47bd97e upstream. |
| |
| Move the get_unaligned_be24(), get_unaligned_le24() and |
| put_unaligned_le24() definitions from various drivers into |
| include/linux/unaligned/generic.h. Add a put_unaligned_be24() |
| implementation. |
| |
| Link: https://lore.kernel.org/r/20200313203102.16613-4-bvanassche@acm.org |
| Cc: Keith Busch <kbusch@kernel.org> |
| Cc: Sagi Grimberg <sagi@grimberg.me> |
| Cc: Jens Axboe <axboe@fb.com> |
| Cc: Harvey Harrison <harvey.harrison@gmail.com> |
| Cc: Martin K. Petersen <martin.petersen@oracle.com> |
| Cc: Ingo Molnar <mingo@kernel.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: H. Peter Anvin <hpa@zytor.com> |
| Cc: Andrew Morton <akpm@linux-foundation.org> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> # For drivers/usb |
| Reviewed-by: Felipe Balbi <balbi@kernel.org> # For drivers/usb/gadget |
| Signed-off-by: Bart Van Assche <bvanassche@acm.org> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c |
| index bf29524cf347..fe86b2623e51 100644 |
| --- a/drivers/nvme/host/rdma.c |
| +++ b/drivers/nvme/host/rdma.c |
| @@ -142,14 +142,6 @@ static void nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc); |
| static const struct blk_mq_ops nvme_rdma_mq_ops; |
| static const struct blk_mq_ops nvme_rdma_admin_mq_ops; |
| |
| -/* XXX: really should move to a generic header sooner or later.. */ |
| -static inline void put_unaligned_le24(u32 val, u8 *p) |
| -{ |
| - *p++ = val; |
| - *p++ = val >> 8; |
| - *p++ = val >> 16; |
| -} |
| - |
| static inline int nvme_rdma_queue_idx(struct nvme_rdma_queue *queue) |
| { |
| return queue - queue->ctrl->queues; |
| diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c |
| index 36d906a7f70d..dc193526d4da 100644 |
| --- a/drivers/nvme/target/rdma.c |
| +++ b/drivers/nvme/target/rdma.c |
| @@ -143,12 +143,6 @@ static int num_pages(int len) |
| return 1 + (((len - 1) & PAGE_MASK) >> PAGE_SHIFT); |
| } |
| |
| -/* XXX: really should move to a generic header sooner or later.. */ |
| -static inline u32 get_unaligned_le24(const u8 *p) |
| -{ |
| - return (u32)p[0] | (u32)p[1] << 8 | (u32)p[2] << 16; |
| -} |
| - |
| static inline bool nvmet_rdma_need_data_in(struct nvmet_rdma_rsp *rsp) |
| { |
| return nvme_is_write(rsp->req.cmd) && |
| diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c |
| index f2bc8d037067..492f0d70510f 100644 |
| --- a/drivers/usb/gadget/function/f_mass_storage.c |
| +++ b/drivers/usb/gadget/function/f_mass_storage.c |
| @@ -216,6 +216,7 @@ |
| #include <linux/freezer.h> |
| #include <linux/module.h> |
| #include <linux/uaccess.h> |
| +#include <asm/unaligned.h> |
| |
| #include <linux/usb/ch9.h> |
| #include <linux/usb/gadget.h> |
| diff --git a/drivers/usb/gadget/function/storage_common.h b/drivers/usb/gadget/function/storage_common.h |
| index e5e3a2553aaa..bdeb1e233fc9 100644 |
| --- a/drivers/usb/gadget/function/storage_common.h |
| +++ b/drivers/usb/gadget/function/storage_common.h |
| @@ -172,11 +172,6 @@ enum data_direction { |
| DATA_DIR_NONE |
| }; |
| |
| -static inline u32 get_unaligned_be24(u8 *buf) |
| -{ |
| - return 0xffffff & (u32) get_unaligned_be32(buf - 1); |
| -} |
| - |
| static inline struct fsg_lun *fsg_lun_from_dev(struct device *dev) |
| { |
| return container_of(dev, struct fsg_lun, dev); |
| diff --git a/include/linux/unaligned/generic.h b/include/linux/unaligned/generic.h |
| index 57d3114656e5..303289492859 100644 |
| --- a/include/linux/unaligned/generic.h |
| +++ b/include/linux/unaligned/generic.h |
| @@ -2,6 +2,8 @@ |
| #ifndef _LINUX_UNALIGNED_GENERIC_H |
| #define _LINUX_UNALIGNED_GENERIC_H |
| |
| +#include <linux/types.h> |
| + |
| /* |
| * Cause a link-time error if we try an unaligned access other than |
| * 1,2,4 or 8 bytes long |
| @@ -66,4 +68,48 @@ extern void __bad_unaligned_access_size(void); |
| } \ |
| (void)0; }) |
| |
| +static inline u32 __get_unaligned_be24(const u8 *p) |
| +{ |
| + return p[0] << 16 | p[1] << 8 | p[2]; |
| +} |
| + |
| +static inline u32 get_unaligned_be24(const void *p) |
| +{ |
| + return __get_unaligned_be24(p); |
| +} |
| + |
| +static inline u32 __get_unaligned_le24(const u8 *p) |
| +{ |
| + return p[0] | p[1] << 8 | p[2] << 16; |
| +} |
| + |
| +static inline u32 get_unaligned_le24(const void *p) |
| +{ |
| + return __get_unaligned_le24(p); |
| +} |
| + |
| +static inline void __put_unaligned_be24(const u32 val, u8 *p) |
| +{ |
| + *p++ = val >> 16; |
| + *p++ = val >> 8; |
| + *p++ = val; |
| +} |
| + |
| +static inline void put_unaligned_be24(const u32 val, void *p) |
| +{ |
| + __put_unaligned_be24(val, p); |
| +} |
| + |
| +static inline void __put_unaligned_le24(const u32 val, u8 *p) |
| +{ |
| + *p++ = val; |
| + *p++ = val >> 8; |
| + *p++ = val >> 16; |
| +} |
| + |
| +static inline void put_unaligned_le24(const u32 val, void *p) |
| +{ |
| + __put_unaligned_le24(val, p); |
| +} |
| + |
| #endif /* _LINUX_UNALIGNED_GENERIC_H */ |
| diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h |
| index 51b6f50eabee..1b752d8ea529 100644 |
| --- a/include/target/target_core_backend.h |
| +++ b/include/target/target_core_backend.h |
| @@ -116,10 +116,4 @@ static inline bool target_dev_configured(struct se_device *se_dev) |
| return !!(se_dev->dev_flags & DF_CONFIGURED); |
| } |
| |
| -/* Only use get_unaligned_be24() if reading p - 1 is allowed. */ |
| -static inline uint32_t get_unaligned_be24(const uint8_t *const p) |
| -{ |
| - return get_unaligned_be32(p - 1) & 0xffffffU; |
| -} |
| - |
| #endif /* TARGET_CORE_BACKEND_H */ |
| -- |
| 2.27.0 |
| |