Received-SPF: pass (google.com: domain of linux-kernel+bounces-92359-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
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
Message-Id: <20240305122452.340471-2-john.g.garry@oracle.com>
In-Reply-To: <20240305122452.340471-1-john.g.garry@oracle.com>
References: <20240305122452.340471-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?SkkvqHkn2nvWg0YMDEI8kxY/EZLmLeWYk8pJdR621r4D8Nf9ACixTCbeDban?=
 =?us-ascii?Q?+MvmjQoD475bT+97gttd6C3wg5V0pmBOJZjKlpoynGh11jMqwijYm1MHmkpb?=
 =?us-ascii?Q?xisaE8e+3mx7+hdOaB3nvnDsOKXuICzY9X028x4lYLXpn4zVWTaUQyupEIBv?=
 =?us-ascii?Q?2APkgvTdRIVbLP9hkLSvzh4/Na3kR4jlgz5kjY4MgIoekfYr3v3oyqk/pGZe?=
 =?us-ascii?Q?Oh/lKcdtrs+tXGoJbd5s9g2ETU42Gptw0nVsDjiYf44Sn2NwZqCkUBqmWjO3?=
 =?us-ascii?Q?Za0DCGLd8GkFjfMbUtZbGoX8xxsvbUjImcVK5FViABaafQNz+MnpE6uonP+q?=
 =?us-ascii?Q?Dl9qHVUWKbliYge0Tr0RWINMQObYpCrqcysLf7hNxjLRMESVYIAWPuyVy3Du?=
 =?us-ascii?Q?/pJzOxhlduM69+fiE5Nt/PmmYqX3nZeq5mxzfxLCC5iYH0raf/n9W1kiHTZO?=
 =?us-ascii?Q?42Q2Akq+zQovSN0c7WDFpAtIa35cz5oamFNXuzL0C1A2GUMVvtJtKWcBaK1N?=
 =?us-ascii?Q?pMrlQY5aSyr2/F8VhVdruZvElVBXoz+9mSDn6Khi4WV2vZIMBV39lodkpBG8?=
 =?us-ascii?Q?fXRLQTm679LYFm+Tjsyz8J5PsVigiBm1MeKsw6I84aoyi5BoA0vKtoTL4Y9J?=
 =?us-ascii?Q?T05p0bJmSFNKHbviKNQ0TgXFea+toLkuUphVjTmD5m/p43ShMiC98K4vYTc+?=
 =?us-ascii?Q?u8495NiCJfPuNEIKeTvRibJsVy97GOaZ4sVpN7oQ8fWludHoCB8IMf3mdEHM?=
 =?us-ascii?Q?TdNviIBcD8SJq7UJ/PRxF4F3fVQ/4cS8V3q0f5uKL7K5yZC0B7PFGZ7BiVyO?=
 =?us-ascii?Q?T4IDkXV/jSljHs4KcIm2mr+WBxnEyu2nx96vdH9MMGC1iJKv0TFO0/t5sAAi?=
 =?us-ascii?Q?l2MwvvFvqyTdjrRNOpCL8y9eZQnVqWJSSU6UwK8iW2gzJUiQ3kxXJoOhDcBK?=
 =?us-ascii?Q?Ix2tRyG11anq10olS1aQgrC6al0LM+OMFJxo2w3Lhy9LqdZTJxtDYR0lVGqH?=
 =?us-ascii?Q?cfkW0QLr/FD2vzmdY/PuRnP2yrEFrZlzMvDgIhUk4ndjmSY84Zh6MVS4O5fw?=
 =?us-ascii?Q?cki4QFgfqYE+KCDPYOAMXP10xnIMnDlw6IUErgtpl/IZwHaecY14uCzZTZMM?=
 =?us-ascii?Q?V6Nm3p/YvAvSJiI8i80I3JP0+YTsgiP6FZASBSgqQNkil+a4up2gxToGxeo6?=
 =?us-ascii?Q?/CkZvPUaN9JekRoMBTLc0UrpCC2ZQXWI8hd7G4IhUP1oRbLJaRiaF9qSmdW6?=
 =?us-ascii?Q?JPR8Me2zbEepFHlGk1R7md+XVUoaAqYCYf9nweVP/+HrCe/hBuBHT9xSASp7?=
 =?us-ascii?Q?wckcBMyl+OP3rjjZvMkEhKGc1uJzOOkY7fMl0//EWdj+MO73/tZX82BghwDs?=
 =?us-ascii?Q?RUShpWvjsyi8wQprz+kkmFX0rt2i3Z+o9NdrFQe8Hb3jrboZ1XJIWcajCIpD?=
 =?us-ascii?Q?4L1hdUe15Ixq/GSJsdMGt/zlOL5Qlrzj6hcRdj07V/Z2p3z7uCsh77mNeX8N?=
 =?us-ascii?Q?v5K7A2JmyFUnXV7zpIp3egphK3bSIewu0jOiKhnQPKSpKitZ/7Dh0tVx2TkM?=
 =?us-ascii?Q?3Y5QBH+U7wQ/TGXbqGHBjDvlciSzpdRmRzRdi1+OmIa3u0iEf2iR3vTel8xk?=
 =?us-ascii?Q?dw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	weeV+c61wLWxqyD2XIFLFQCwyyDdab0QQVCLHWWF+S/jYkVUIjSzyRc9IIijrQZ7/P2dAXT+DFQDkzSszMHITdIHy0rWz9FqIKt+sW4uDvyzpX1R95jXa4F/cWWXJXXskAMJ66V8xmNv0d3T7oHGhidixltXFMCt1xAMFz0WWIj50a8RxvBVK0rpslHR4gmQDx0YISC/ygf0Az7q+ej3Mcg/FXEvpa9Kpi1FIjIcdAGhfdpd7+Mk5dpIO05higQBlV5OrAKQLhH76eaR8AAQreCps4ftp7ZiHYOjb7UI1TVJDrnkz/k81+2k3MnbT6hKkdXGgMCBcWNSejGpeeP6KbfXp5uL7A62fSy01FEb1O0nLmojStDlSdYHHooVi0Lx4w/X9FYtnnrDM9eYXzEenvsCIqXpXnsVVQ8+QNiXoCj6wncJsyN4UZfCBJQA6L9/kqudxswN7CiZUgcGFhr8vS5pg2PHtO+XbTnpWjfGv3Ya3QS32niGuhMVT6ubSup11+vUb/6/FpBfUD4tIGlugHjCgENErOIVlS64xTUrCPW6Vp8lKOXx2zpbxiE5eSWotNFPYPig8bp8JtpmvsTTLHGzOsXxNHIMzRiI/70ulAg=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 68ca406c-4705-4b18-9bf8-08dc3d0f4b99
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 12:25:08.4070
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UZMSLIfHtpDFk9735VlzKPt1Mk62/imdqf/lUCnqScc4Lj4P4kXKBap3sTW6bAXjr/pjR5JBPK3lt8N/FCSLhQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5122
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-05_10,2024-03-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999
 spamscore=0 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403050099
X-Proofpoint-ORIG-GUID: 9aH9hmdqXJ9JbuOHDPzLvyzAFVCnN9eU
X-Proofpoint-GUID: 9aH9hmdqXJ9JbuOHDPzLvyzAFVCnN9eU

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