From: John Garry <john.g.garry@oracle.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com,
chenxiang66@hisilicon.com, jinpu.wang@cloud.ionos.com,
artur.paszkiewicz@intel.com, yanaijie@huawei.com,
dlemoal@kernel.org, ipylypiv@google.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
John Garry <john.g.garry@oracle.com>
Subject: [PATCH 1/6] scsi: libsas: Add LIBSAS_SHT_BASE
Date: Tue, 5 Mar 2024 12:24:47 +0000 [thread overview]
Message-ID: <20240305122452.340471-2-john.g.garry@oracle.com> (raw)
In-Reply-To: <20240305122452.340471-1-john.g.garry@oracle.com>
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 <john.g.garry@oracle.com>
---
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
next prev parent reply other threads:[~2024-03-05 12:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 12:24 [PATCH 0/6] Add LIBSAS_SHT_BASE for libsas John Garry
2024-03-05 12:24 ` John Garry [this message]
2024-03-05 12:52 ` [PATCH 1/6] scsi: libsas: Add LIBSAS_SHT_BASE Jason Yan
2024-03-05 12:24 ` [PATCH 2/6] scsi: pm8001: Use LIBSAS_SHT_BASE John Garry
2024-03-05 12:52 ` Jason Yan
2024-03-05 13:16 ` Jason Yan
2024-03-05 12:24 ` [PATCH 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT John Garry
2024-03-05 12:54 ` Jason Yan
2024-03-05 13:18 ` Jason Yan
2024-03-05 12:24 ` [PATCH 4/6] scsi: aic94xx: Use LIBSAS_SHT_BASE John Garry
2024-03-05 13:09 ` Jason Yan
2024-03-05 12:24 ` [PATCH 5/6] scsi: mvsas: " John Garry
2024-03-05 13:19 ` Jason Yan
2024-03-05 13:28 ` John Garry
2024-03-05 13:47 ` Jason Yan
2024-03-05 15:26 ` John Garry
2024-03-05 12:24 ` [PATCH 6/6] scsi: isci: " John Garry
2024-03-05 13:21 ` Jason Yan
2024-03-05 13:27 ` John Garry
2024-03-05 13:54 ` Jason Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240305122452.340471-2-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=artur.paszkiewicz@intel.com \
--cc=chenxiang66@hisilicon.com \
--cc=dlemoal@kernel.org \
--cc=ipylypiv@google.com \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox