There is much duplication in the scsi_host_template structure for the
drivers which use libsas.
Similar to how a standard template is used in libata with __ATA_BASE_SHT,
create a standard template in LIBSAS_SHT_BASE.
Don't set a default for max_sectors at SCSI_DEFAULT_MAX_SECTORS, as
scsi_host_alloc() will default to this value automatically.
Even though some drivers don't set proc_name, it won't make much difference
to set as DRV_NAME.
Also add LIBSAS_SHT_BASE_NO_SLAVE_INIT for the hisi_sas drivers which have
custom .slave_alloc and .slave_configure methods.
Signed-off-by: John Garry <[email protected]>
---
include/scsi/libsas.h | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index f5257103fdb6..484cab72e711 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -726,4 +726,34 @@ void sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
void sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,
gfp_t gfp_flags);
+#define __LIBSAS_SHT_BASE \
+ .module = THIS_MODULE, \
+ .name = DRV_NAME, \
+ .proc_name = DRV_NAME, \
+ .queuecommand = sas_queuecommand, \
+ .dma_need_drain = ata_scsi_dma_need_drain, \
+ .target_alloc = sas_target_alloc, \
+ .change_queue_depth = sas_change_queue_depth, \
+ .bios_param = sas_bios_param, \
+ .this_id = -1, \
+ .eh_abort_handler = sas_eh_abort_handler, \
+ .eh_device_reset_handler = sas_eh_device_reset_handler, \
+ .eh_target_reset_handler = sas_eh_target_reset_handler, \
+ .target_destroy = sas_target_destroy, \
+ .ioctl = sas_ioctl, \
+
+#ifdef CONFIG_COMPAT
+#define _LIBSAS_SHT_BASE __LIBSAS_SHT_BASE \
+ .compat_ioctl = sas_ioctl,
+#else
+#define _LIBSAS_SHT_BASE __LIBSAS_SHT_BASE
+#endif
+
+#define LIBSAS_SHT_BASE _LIBSAS_SHT_BASE \
+ .slave_configure = sas_slave_configure, \
+ .slave_alloc = sas_slave_alloc, \
+
+#define LIBSAS_SHT_BASE_NO_SLAVE_INIT _LIBSAS_SHT_BASE
+
+
#endif /* _SASLIB_H_ */
--
2.31.1
On 2024/3/5 20:24, John Garry wrote:
> There is much duplication in the scsi_host_template structure for the
> drivers which use libsas.
>
> Similar to how a standard template is used in libata with __ATA_BASE_SHT,
> create a standard template in LIBSAS_SHT_BASE.
>
> Don't set a default for max_sectors at SCSI_DEFAULT_MAX_SECTORS, as
> scsi_host_alloc() will default to this value automatically.
>
> Even though some drivers don't set proc_name, it won't make much difference
> to set as DRV_NAME.
>
> Also add LIBSAS_SHT_BASE_NO_SLAVE_INIT for the hisi_sas drivers which have
> custom .slave_alloc and .slave_configure methods.
>
> Signed-off-by: John Garry <[email protected]>
> ---
> include/scsi/libsas.h | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
> index f5257103fdb6..484cab72e711 100644
> --- a/include/scsi/libsas.h
> +++ b/include/scsi/libsas.h
> @@ -726,4 +726,34 @@ void sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,
> void sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,
> gfp_t gfp_flags);
>
> +#define __LIBSAS_SHT_BASE \
> + .module = THIS_MODULE, \
> + .name = DRV_NAME, \
> + .proc_name = DRV_NAME, \
> + .queuecommand = sas_queuecommand, \
> + .dma_need_drain = ata_scsi_dma_need_drain, \
> + .target_alloc = sas_target_alloc, \
> + .change_queue_depth = sas_change_queue_depth, \
> + .bios_param = sas_bios_param, \
> + .this_id = -1, \
> + .eh_abort_handler = sas_eh_abort_handler, \
> + .eh_device_reset_handler = sas_eh_device_reset_handler, \
> + .eh_target_reset_handler = sas_eh_target_reset_handler, \
> + .target_destroy = sas_target_destroy, \
> + .ioctl = sas_ioctl, \
> +
> +#ifdef CONFIG_COMPAT
> +#define _LIBSAS_SHT_BASE __LIBSAS_SHT_BASE \
Why two blanks after "define"?
> + .compat_ioctl = sas_ioctl,
> +#else
> +#define _LIBSAS_SHT_BASE __LIBSAS_SHT_BASE
Same as above.
Otherwise looks good to me.
Reviewed-by: Jason Yan <[email protected]>