Skip to content

L
linux
Commit fcc87e74 authored by Matthew R. Ochs's avatar Matthew R. Ochs Committed by Martin K. Petersen
Browse files
Options

scsi: cxlflash: Fix warnings/errors 

As a general cleanup, address all reasonable checkpatch warnings and
errors. These include enforcement of comment styles and including named
identifiers in function prototypes.
Signed-off-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cd41e18d
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 50 deletions
drivers/scsi/cxlflash/common.h
View file @ fcc87e74
...@@ -36,20 +36,19 @@ extern const struct file_operations cxlflash_cxl_fops; ...@@ -36,20 +36,19 @@ extern const struct file_operations cxlflash_cxl_fops;
#define PORTMASK2CHAN(_x) (ilog2((_x))) /* port mask to channel */ #define PORTMASK2CHAN(_x) (ilog2((_x))) /* port mask to channel */
#define PORTNUM2CHAN(_x) ((_x) - 1) /* port number to channel */ #define PORTNUM2CHAN(_x) ((_x) - 1) /* port number to channel */
#define CXLFLASH_BLOCK_SIZE 4096 /* 4K blocks */ #define CXLFLASH_BLOCK_SIZE 4096 /* 4K blocks */
#define CXLFLASH_MAX_XFER_SIZE 16777216 /* 16MB transfer */ #define CXLFLASH_MAX_XFER_SIZE 16777216 /* 16MB transfer */
#define CXLFLASH_MAX_SECTORS (CXLFLASH_MAX_XFER_SIZE/512) /* SCSI wants #define CXLFLASH_MAX_SECTORS (CXLFLASH_MAX_XFER_SIZE/512) /* SCSI wants
max_sectors * max_sectors
in units of * in units of
512 byte * 512 byte
sectors * sectors
*/ */
#define MAX_RHT_PER_CONTEXT (PAGE_SIZE / sizeof(struct sisl_rht_entry)) #define MAX_RHT_PER_CONTEXT (PAGE_SIZE / sizeof(struct sisl_rht_entry))
/* AFU command retry limit */ /* AFU command retry limit */
#define MC_RETRY_CNT 5 /* sufficient for SCSI check and #define MC_RETRY_CNT 5 /* Sufficient for SCSI and certain AFU errors */
certain AFU errors */
/* Command management definitions */ /* Command management definitions */
#define CXLFLASH_MAX_CMDS 256 #define CXLFLASH_MAX_CMDS 256
...@@ -262,14 +261,14 @@ static inline __be64 __iomem *get_fc_port_luns(struct cxlflash_cfg *cfg, int i) ...@@ -262,14 +261,14 @@ static inline __be64 __iomem *get_fc_port_luns(struct cxlflash_cfg *cfg, int i)
return &fcpb->fc_port_luns[CHAN2BANKPORT(i)][0]; return &fcpb->fc_port_luns[CHAN2BANKPORT(i)][0];
} }
int cxlflash_afu_sync(struct afu *, ctx_hndl_t, res_hndl_t, u8); int cxlflash_afu_sync(struct afu *afu, ctx_hndl_t c, res_hndl_t r, u8 mode);
void cxlflash_list_init(void); void cxlflash_list_init(void);
void cxlflash_term_global_luns(void); void cxlflash_term_global_luns(void);
void cxlflash_free_errpage(void); void cxlflash_free_errpage(void);
int cxlflash_ioctl(struct scsi_device *, int, void __user *); int cxlflash_ioctl(struct scsi_device *sdev, int cmd, void __user *arg);
void cxlflash_stop_term_user_contexts(struct cxlflash_cfg *); void cxlflash_stop_term_user_contexts(struct cxlflash_cfg *cfg);
int cxlflash_mark_contexts_error(struct cxlflash_cfg *); int cxlflash_mark_contexts_error(struct cxlflash_cfg *cfg);
void cxlflash_term_local_luns(struct cxlflash_cfg *); void cxlflash_term_local_luns(struct cxlflash_cfg *cfg);
void cxlflash_restore_luntable(struct cxlflash_cfg *); void cxlflash_restore_luntable(struct cxlflash_cfg *cfg);
#endif /* ifndef _CXLFLASH_COMMON_H */ #endif /* ifndef _CXLFLASH_COMMON_H */
drivers/scsi/cxlflash/sislite.h
View file @ fcc87e74
...@@ -90,15 +90,15 @@ struct sisl_rc { ...@@ -90,15 +90,15 @@ struct sisl_rc {
#define SISL_AFU_RC_RHT_UNALIGNED 0x02U /* should never happen */ #define SISL_AFU_RC_RHT_UNALIGNED 0x02U /* should never happen */
#define SISL_AFU_RC_RHT_OUT_OF_BOUNDS 0x03u /* user error */ #define SISL_AFU_RC_RHT_OUT_OF_BOUNDS 0x03u /* user error */
#define SISL_AFU_RC_RHT_DMA_ERR 0x04u /* see afu_extra #define SISL_AFU_RC_RHT_DMA_ERR 0x04u /* see afu_extra
may retry if afu_retry is off * may retry if afu_retry is off
possible on master exit * possible on master exit
*/ */
#define SISL_AFU_RC_RHT_RW_PERM 0x05u /* no RW perms, user error */ #define SISL_AFU_RC_RHT_RW_PERM 0x05u /* no RW perms, user error */
#define SISL_AFU_RC_LXT_UNALIGNED 0x12U /* should never happen */ #define SISL_AFU_RC_LXT_UNALIGNED 0x12U /* should never happen */
#define SISL_AFU_RC_LXT_OUT_OF_BOUNDS 0x13u /* user error */ #define SISL_AFU_RC_LXT_OUT_OF_BOUNDS 0x13u /* user error */
#define SISL_AFU_RC_LXT_DMA_ERR 0x14u /* see afu_extra #define SISL_AFU_RC_LXT_DMA_ERR 0x14u /* see afu_extra
may retry if afu_retry is off * may retry if afu_retry is off
possible on master exit * possible on master exit
*/ */
#define SISL_AFU_RC_LXT_RW_PERM 0x15u /* no RW perms, user error */ #define SISL_AFU_RC_LXT_RW_PERM 0x15u /* no RW perms, user error */
...@@ -111,11 +111,11 @@ struct sisl_rc { ...@@ -111,11 +111,11 @@ struct sisl_rc {
*/ */
#define SISL_AFU_RC_NO_CHANNELS 0x20U /* see afu_extra, may retry */ #define SISL_AFU_RC_NO_CHANNELS 0x20U /* see afu_extra, may retry */
#define SISL_AFU_RC_CAP_VIOLATION 0x21U /* either user error or #define SISL_AFU_RC_CAP_VIOLATION 0x21U /* either user error or
afu reset/master restart * afu reset/master restart
*/ */
#define SISL_AFU_RC_OUT_OF_DATA_BUFS 0x30U /* always retry */ #define SISL_AFU_RC_OUT_OF_DATA_BUFS 0x30U /* always retry */
#define SISL_AFU_RC_DATA_DMA_ERR 0x31U /* see afu_extra #define SISL_AFU_RC_DATA_DMA_ERR 0x31U /* see afu_extra
may retry if afu_retry is off * may retry if afu_retry is off
*/ */
u8 scsi_rc; /* SCSI status byte, retry as appropriate */ u8 scsi_rc; /* SCSI status byte, retry as appropriate */
...@@ -149,8 +149,9 @@ struct sisl_rc { ...@@ -149,8 +149,9 @@ struct sisl_rc {
#define SISL_FC_RC_ABORTFAIL 0x59 /* pending abort completed w/fail */ #define SISL_FC_RC_ABORTFAIL 0x59 /* pending abort completed w/fail */
#define SISL_FC_RC_RESID 0x5A /* ioasa underrun/overrun flags set */ #define SISL_FC_RC_RESID 0x5A /* ioasa underrun/overrun flags set */
#define SISL_FC_RC_RESIDERR 0x5B /* actual data len does not match SCSI #define SISL_FC_RC_RESIDERR 0x5B /* actual data len does not match SCSI
reported len, possibly due to dropped * reported len, possibly due to dropped
frames */ * frames
*/
#define SISL_FC_RC_TGTABORT 0x5C /* command aborted by target */ #define SISL_FC_RC_TGTABORT 0x5C /* command aborted by target */
}; };
...@@ -227,10 +228,10 @@ struct sisl_ioasa { ...@@ -227,10 +228,10 @@ struct sisl_ioasa {
/* per context host transport MMIO */ /* per context host transport MMIO */
struct sisl_host_map { struct sisl_host_map {
__be64 endian_ctrl; /* Per context Endian Control. The AFU will __be64 endian_ctrl; /* Per context Endian Control. The AFU will
* operate on whatever the context is of the * operate on whatever the context is of the
* host application. * host application.
*/ */
__be64 intr_status; /* this sends LISN# programmed in ctx_ctrl. __be64 intr_status; /* this sends LISN# programmed in ctx_ctrl.
* Only recovery in a PERM_ERR is a context * Only recovery in a PERM_ERR is a context
...@@ -435,7 +436,7 @@ struct sisl_global_map { ...@@ -435,7 +436,7 @@ struct sisl_global_map {
* | 64 KB Global | * | 64 KB Global |
* | Trusted Process accessible | * | Trusted Process accessible |
* +-------------------------------+ * +-------------------------------+
*/ */
struct cxlflash_afu_map { struct cxlflash_afu_map {
union { union {
struct sisl_host_map host; struct sisl_host_map host;
......
drivers/scsi/cxlflash/superpipe.h
View file @ fcc87e74
...@@ -24,8 +24,8 @@ extern struct cxlflash_global global; ...@@ -24,8 +24,8 @@ extern struct cxlflash_global global;
*/ */
/* Chunk size parms: note sislite minimum chunk size is /* Chunk size parms: note sislite minimum chunk size is
0x10000 LBAs corresponding to a NMASK or 16. * 0x10000 LBAs corresponding to a NMASK or 16.
*/ */
#define MC_CHUNK_SIZE (1 << MC_RHT_NMASK) /* in LBAs */ #define MC_CHUNK_SIZE (1 << MC_RHT_NMASK) /* in LBAs */
#define CMD_TIMEOUT 30 /* 30 secs */ #define CMD_TIMEOUT 30 /* 30 secs */
...@@ -89,7 +89,8 @@ enum ctx_ctrl { ...@@ -89,7 +89,8 @@ enum ctx_ctrl {
struct ctx_info { struct ctx_info {
struct sisl_ctrl_map __iomem *ctrl_map; /* initialized at startup */ struct sisl_ctrl_map __iomem *ctrl_map; /* initialized at startup */
struct sisl_rht_entry *rht_start; /* 1 page (req'd for alignment), struct sisl_rht_entry *rht_start; /* 1 page (req'd for alignment),
alloc/free on attach/detach */ * alloc/free on attach/detach
*/
u32 rht_out; /* Number of checked out RHT entries */ u32 rht_out; /* Number of checked out RHT entries */
u32 rht_perms; /* User-defined permissions for RHT entries */ u32 rht_perms; /* User-defined permissions for RHT entries */
struct llun_info **rht_lun; /* Mapping of RHT entries to LUNs */ struct llun_info **rht_lun; /* Mapping of RHT entries to LUNs */
...@@ -117,34 +118,40 @@ struct cxlflash_global { ...@@ -117,34 +118,40 @@ struct cxlflash_global {
struct page *err_page; /* One page of all 0xF for error notification */ struct page *err_page; /* One page of all 0xF for error notification */
}; };
int cxlflash_vlun_resize(struct scsi_device *, struct dk_cxlflash_resize *); int cxlflash_vlun_resize(struct scsi_device *sdev,
int _cxlflash_vlun_resize(struct scsi_device *, struct ctx_info *, struct dk_cxlflash_resize *resize);
struct dk_cxlflash_resize *); int _cxlflash_vlun_resize(struct scsi_device *sdev, struct ctx_info *ctxi,
struct dk_cxlflash_resize *resize);
int cxlflash_disk_release(struct scsi_device *, struct dk_cxlflash_release *); int cxlflash_disk_release(struct scsi_device *sdev,
int _cxlflash_disk_release(struct scsi_device *, struct ctx_info *, struct dk_cxlflash_release *release);
struct dk_cxlflash_release *); int _cxlflash_disk_release(struct scsi_device *sdev, struct ctx_info *ctxi,
struct dk_cxlflash_release *release);
int cxlflash_disk_clone(struct scsi_device *, struct dk_cxlflash_clone *); int cxlflash_disk_clone(struct scsi_device *sdev,
struct dk_cxlflash_clone *clone);
int cxlflash_disk_virtual_open(struct scsi_device *, void *); int cxlflash_disk_virtual_open(struct scsi_device *sdev, void *arg);
int cxlflash_lun_attach(struct glun_info *, enum lun_mode, bool); int cxlflash_lun_attach(struct glun_info *gli, enum lun_mode mode, bool locked);
void cxlflash_lun_detach(struct glun_info *); void cxlflash_lun_detach(struct glun_info *gli);
struct ctx_info *get_context(struct cxlflash_cfg *, u64, void *, enum ctx_ctrl); struct ctx_info *get_context(struct cxlflash_cfg *cfg, u64 rctxit, void *arg,
void put_context(struct ctx_info *); enum ctx_ctrl ctrl);
void put_context(struct ctx_info *ctxi);
struct sisl_rht_entry *get_rhte(struct ctx_info *, res_hndl_t, struct sisl_rht_entry *get_rhte(struct ctx_info *ctxi, res_hndl_t rhndl,
struct llun_info *); struct llun_info *lli);
struct sisl_rht_entry *rhte_checkout(struct ctx_info *, struct llun_info *); struct sisl_rht_entry *rhte_checkout(struct ctx_info *ctxi,
void rhte_checkin(struct ctx_info *, struct sisl_rht_entry *); struct llun_info *lli);
void rhte_checkin(struct ctx_info *ctxi, struct sisl_rht_entry *rhte);
void cxlflash_ba_terminate(struct ba_lun *); void cxlflash_ba_terminate(struct ba_lun *ba_lun);
int cxlflash_manage_lun(struct scsi_device *, struct dk_cxlflash_manage_lun *); int cxlflash_manage_lun(struct scsi_device *sdev,
struct dk_cxlflash_manage_lun *manage);
int check_state(struct cxlflash_cfg *); int check_state(struct cxlflash_cfg *cfg);
#endif /* ifndef _CXLFLASH_SUPERPIPE_H */ #endif /* ifndef _CXLFLASH_SUPERPIPE_H */
drivers/scsi/cxlflash/vlun.h
View file @ fcc87e74
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* not stored anywhere. * not stored anywhere.
* *
* The LXT table is re-allocated whenever it needs to cross into another group. * The LXT table is re-allocated whenever it needs to cross into another group.
*/ */
#define LXT_GROUP_SIZE 8 #define LXT_GROUP_SIZE 8
#define LXT_NUM_GROUPS(lxt_cnt) (((lxt_cnt) + 7)/8) /* alloc'ed groups */ #define LXT_NUM_GROUPS(lxt_cnt) (((lxt_cnt) + 7)/8) /* alloc'ed groups */
#define LXT_LUNIDX_SHIFT 8 /* LXT entry, shift for LUN index */ #define LXT_LUNIDX_SHIFT 8 /* LXT entry, shift for LUN index */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7