From patchwork Tue Aug 15 11:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FFF6C04E69 for ; Tue, 15 Aug 2023 11:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236924AbjHOLw4 (ORCPT ); Tue, 15 Aug 2023 07:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236905AbjHOLwk (ORCPT ); Tue, 15 Aug 2023 07:52:40 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADD301986; Tue, 15 Aug 2023 04:52:39 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FB9WkY015043; Tue, 15 Aug 2023 11:52:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=xbT93WWdjQkJI0eqdnHzjbzboxrJye3HeyrBrtTAxNM=; b=Xu1S3H81+T//0im41xg2V5TbfSD1mTgIR9lG8ourrhyVnD9W4su6fqeVqiIqwFGJMX5S ylaKpd+v2NECw1TJW0FyWJnlL7a/5n7hc82u/RL5tErlSDsYbY5F7i8oaCRHqfzAsgAc XXFjXIoYelkhR70bEQI8zZQLc+vL6ELwz0+UHTJ6CnoFGlN5IGv+qy2V7F35wQurY5eJ TY/HP7fU8N2G+JjFOm0LY6n6ZL0lo4CgLjAZQ7eHjlJ0DKnbFNBSAbD8XmUSzXwgTwf+ VZWSGn9rgHHiDPeD+lowYNv+0WrEZMVdc2vk8f8SIDwfcpjuOSElnPKdb26o01LEqGux 2Q== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2xwmgk1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:23 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37FB3YhJ027683; Tue, 15 Aug 2023 11:52:22 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey1rytun-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GYv+B209Oz6RzkFJvLljXjt6Pjw28W5OEfc9oYQjExFK6jUJmF8s9WTIhEWTYGlk5gFv7a/p+UqKWvM8IqLB3LrD5PZhiyeSOXzrLOhmhmcMy4Qxq/PnoUxln/jDLZlekrF8m88yLiXb4kv92nLdipaLeXs39KJS9zoS89nELkIbV/eZtbiOEk2JVK5FB8fi5M2MQlWSWJvj64u2ZgrDaXJrAg4oiTnWT/Ww+ZIuI5NfTdV0xfnOKiAk0X9d6af4C4f3/FsTC+gCRTjU27rwEWx9IGeOe7Mb9J5Xf7gRFUpMRl42pH24S9O7lec86eItTVLv7evKXCyManPNMdbyFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xbT93WWdjQkJI0eqdnHzjbzboxrJye3HeyrBrtTAxNM=; b=QsRZVRtcVi38NwU+ffuLeW16GE6KGKO2O95NGoNSTCRJ/w80suhQQHoxr8VbpBUMeTvo19KY//QGZTr6XSwPOEVifbQZGEmHQDE2/cRig4RSUj89IbjgOIcjVDNXd9pV73vfY/XVjfkFJrSqd15UaQnqpaHbApT8/n5rhQRDmgYCRJ3cpPItcteN0ni9tiaoAC/mzTUE88xvFyvoW+s6u3KrQqCjV1oCLna8+uB6jx4b9lxmQgHOTssBq+SwPR0V6gp6pXdkJXq9q2Gk67JTnIc40ElX3IZv9nMVX4ylGmCO1cP6+3p0t0NpWlorWVOncSaI1dmc/AYldepLdoK6yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xbT93WWdjQkJI0eqdnHzjbzboxrJye3HeyrBrtTAxNM=; b=bOLDdIfpCrnZclAiPtasA3GviTZuq2xEi4AA0XweKPwQjX3oFV42AsJ72Ch1Yp9pvLRy5JDYxtYI91YK9bQfr87cW+743DQ7iu/iJOvVzunP6RYIuR5T06DFMw5ag1Uoxolx4cMuDHUtA4IKNtEDBwzWg7/NqHyDJGB1XvNiUYc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4488.namprd10.prod.outlook.com (2603:10b6:510:35::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 11:52:20 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:20 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 01/10] scsi: libsas: Delete sas_ha_struct.lldd_module Date: Tue, 15 Aug 2023 11:51:47 +0000 Message-Id: <20230815115156.343535-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA1P222CA0110.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::22) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH0PR10MB4488:EE_ X-MS-Office365-Filtering-Correlation-Id: ce0fdd4a-e37a-4bfd-c14d-08db9d8614be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ql2jbp3K/r7Pm2QHBgpZ5PMchSu+GAv8mn4avEfmeScUa8snxOmdMkw7e/vZqGEoansS5HRIUlWueOub8iu0y957azlYuFWx171OtO4f3n8lXmYOzGme83XpjAMmwm3lViW4C2PPEkN84lLzAasMZpzHuR7q+VPGr6rJxrvVGMLtTiHC/F/YRtM0ujH2mqxepTYNjBJ4w8b78aOmPrK0/l280ziZg5X7sgSvqv9Z5nHgF5upE088TCThcvHFcHdc7qnwnOcGH1efWzS03iCCAmdlwIYWO9/N8TZMiQ8hqUghgPPW4AJSzJbqXdE3c8sVljKAdMDqh1Ns0awgC0DH6SadSOFF/Xb5yu+OpVuCe56FL3BayPwFaF/t4TDbp++4E3fhRStVDrTQx7BdyukqOVT+vAgLxepz4yC6Hkw4cKAQj7zmsdz+xY/hL2l50D5yhWzQsGIFnkcmY30fa9St8hfxpaKM4gQYGvYyzF236nVtBbCS25AmZpstBj6xG8lT+pijorpYoW1+OPDGSwgshIyV2Fl9OfqD97k3ipm/4yX+QTefX/TpofGWtubYQ4kO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(39860400002)(136003)(366004)(346002)(376002)(396003)(1800799009)(186009)(451199023)(6506007)(107886003)(26005)(1076003)(2616005)(6512007)(86362001)(8676002)(478600001)(4326008)(41300700001)(38100700002)(66946007)(316002)(83380400001)(66476007)(5660300002)(103116003)(6486002)(36756003)(8936002)(66556008)(6666004)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N6PVTVieKiDH3vDY7AmmE8GN9xJo1MRKyeIWcWYPCx3MUw3hM/fhPy5cAfWa01thmislMqtWO1uIQ8WM9Yda7b8xdEqY35iE/xaOqeL5+CTv1Af0IW2Ks6bW14qQJlvzIqKoXL0nXUriiIEkQsQX5fn73OfvgIpw9pBz/pSTFfqHPQVOHiTfHuqp6rYAKgE7VpY1ZN7Fe/7wJUz7dqGUMDNkh4I6LLAHV95VkDuucDqQM/WaBkb29yr6C4aZP35LovBsAktDNjDueoX5bzS8OUOnqlxwJESwk1GGQoX1SwtaAEuNas0TUuFq01GvPuvNSnlxC4Nyy5mHebvFhGASIw2gnboTqdYfpDKyWQaU5rs8i6ATz8Y3/kYOVUVRAGhUNwwmaxCHyx2+t0myKxjxkJbviIgjRXPTrzQ/6ZUUvwBRlvoNlSv+IACxfPYdbzwD3VnqhAjCa8KDyCSCp0D4sJkEIrrF0CedWxJHkN21J9MRST60KnLqycDPZG2b4K0rqLbDUVRK+0+uA0d+ez8sDU+tPgzeMTVdGvBXcchlUu0yELtwXLfDNfBJ5iZPCcr5N4EUk4+MHJpcatWtU7jqtsGmtLhgLIlbyRUHbvIlWYDVIKlHYclPiD64ftS2Inkr05CZCeog7GYn2k5PyhqGZZfEO1TEdZQXfq/BKHMgApKti9G5i1pEP1+0GLY0kmykkes+jdSoCmhYXhcDOw4s/BPAR9huEFPhgwJQWD6dVEilXHVKGlDNHw47qJiVLNU/N7am9BKSCm0HYxjVjlWjsPoWtFFQUSEsiu7HdTe2LUWwuu7D0ViioEX2deKvpRtPVBHOauV8HxyH/MkEzIOMC5pPND5FHbfkd4QrGJj/mowQWtWpmw6MdG0aDIkSr609Ur/HHuheESf+nC5OcrVaETqpFTwTC8vJublVZNakUcYYwBXg9ntDqy81dlMzrlqOs0HlvJyTpkjLOH+ofN5PGkeTQ3wJZ7bxNemIjmxILROT1WK3+EH3Lwy1JDENb0y7MXuTvH8IwwF+KxuRcg3HiiH3tS8XrU04ZbaNT++Y0v08qDowDSBfpkeDfAcOq8C0DqwXzOH4h8w2cQ3Yt9mmQTZTxjIOinxu6Yse/+5y2eomOaY3hXW0J92bbwZeF7kKIIpRxWYsqMQ9hmxbX+dqpn7dQ90jj+SOmjCcqlJLeuTq/vIeupsRgf2KxOUs1k8xI57IE/pqk5IMYbukpOCHY39/ifX6YgJ9Qu40rt8X2NjzgJxoJyVxyfzn43oPccE/jWi4zeZjWiTwNKHNzbuRFZ1Z+/X4TR01GuqP4HdA98Mi8lpxmtj8fsefSWeH7ztlTpFU02FZ7q9+HFEmehMQKCDEEncR9xDMlHVOT2r/U8xieYsFJBGnqxNyXnTx+xI77GKBHFaTMNZj+vC/luEnAji2/Cfzg9NnGDPRBMPgLP3eNl7xreJfrr6lyT3RJnX3Bi4VIUUkBSW4xy8GA7M6t7fQNwKBI5g7H7xdpCw1h7mO8XMfJWrLv9z2A1VYK9ws+ZWcQlQcfmKt7FUqXMOdpvpSJ4D62gg9C1G68X59j2IKtEJpM1YZLiVAhEIZGPu3z68utkev5VAgp8X4toKItw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DlCEjEl2GG71QIi3hjLN+adDUPIT2xpxl9JUlG4d2oa21o6fTjIU1Tte10bCghFr2va5qLLRK7B+o1CGitvlSnO6RJPph4a0ZhqOK5tv4xDXGAnTLgt23MMv++BdGwGyVQEFOgohNmCN3tFfHrrt+g1jm6rymfLo0vXBke2dvzw0+qKZ89ro1rDiks4B+TjZ+2Ajz4o5emCm9laBhLx7f1ngCm1qbCDVPq/dHaSvu1h+ZPL7ZszvwO3Z6M0AEhnwFmL6wMnBHvzZjhGlcHQ38hA4ENviIr8WeeE/7I3qkqwONyYi+WwX6GVehkHWNcy6L21AlEWESXcjNkD4fEDnOpLqwP6Y5h+eo7DzciiP2PCokYP0yyjhA2/f77gP9cG+SG1szYFJggyWXVYdSuBx4BQML8Ky0rOVYZtxTOYjHr/4/tckf163nZN5NYov5c+oc+rZoO5pYet5d3qPN3xo9Hp7wwEQOhYWUYKZLbhbUF9k/UGTQaWvbjrVa1tH6DcPbglEz+ufXWow7LPUjH23zkxgq+2sXt4262sNddkrBL7TAmfOBKDN51ly9gkFOEkXyc/CtrrFK3m/cUFWDCDW2Ne7BUFVWage9kaiENLmSwkXnPUpcsfMAI4K1gRdtrPmoOgIRdhLwNi419c2dKecxihht1a/8FUUBzzjl59oXhFISTBHIaC2PeEoM9SqbDzNYNo8IMAS3mLGfXNj2tG6GPhDwy8xkum8HptpTSh/7uGd+uUreZ/UgNCJWhlvSOaIITxcH5Pdr/AyVOdOwJ4SRR6aveU6rtDL7NG3s18nkgtht9+VFB1stCs7GnG3Va8l7g5ebDCXnipppH4DceIjNC/TBmP8TNa3UXryktUSdPQqEEzYkZlF5pZyqW80beE/23MSzURc+cxr/dr+umIkR51GKqiyGAVTrEw36XAL3A9zYH+dl8RZyKyjFB6wkYgo8HlGdd2Io5m1ifQzBaAUgw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce0fdd4a-e37a-4bfd-c14d-08db9d8614be X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:20.3451 (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: 17ZMh32nyWz+LP2a5wyqTzhEnCKBDSeMwTA34SPjGQAvUstzXSX9Sep5KeQt3JveRfzl1KrLShoKru6L9zcUEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4488 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: rxrMNTkQ0j5OK2PIgUFZIlIb3HQeYSG5 X-Proofpoint-GUID: rxrMNTkQ0j5OK2PIgUFZIlIb3HQeYSG5 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ha_struct.lldd_module has only ever been set, so remove it. Struct scsi_host_template already has a reference to the LLD driver module as to stop the driver being removed unexpectedly. Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_init.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 - drivers/scsi/isci/init.c | 1 - drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/pm8001/pm8001_init.c | 1 - include/scsi/libsas.h | 1 - 7 files changed, 7 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index f7f81f6c3fbf..6603e91cee8a 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -667,7 +667,6 @@ static int asd_register_sas_ha(struct asd_ha_struct *asd_ha) } asd_ha->sas_ha.sas_ha_name = (char *) asd_ha->name; - asd_ha->sas_ha.lldd_module = THIS_MODULE; asd_ha->sas_ha.sas_addr = &asd_ha->hw_prof.sas_addr[0]; for (i = 0; i < ASD_MAX_PHYS; i++) { diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 7a62590f8730..9585f1ed8ae5 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2514,7 +2514,6 @@ int hisi_sas_probe(struct platform_device *pdev, sha->sas_ha_name = DRV_NAME; sha->dev = hisi_hba->dev; - sha->lldd_module = THIS_MODULE; sha->sas_addr = &hisi_hba->sas_addr[0]; sha->num_phys = hisi_hba->n_phy; sha->core.shost = hisi_hba->shost; diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index a676558b096b..7b40f0eed703 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -4973,7 +4973,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) sha->sas_ha_name = DRV_NAME; sha->dev = dev; - sha->lldd_module = THIS_MODULE; sha->sas_addr = &hisi_hba->sas_addr[0]; sha->num_phys = hisi_hba->n_phy; diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index ac1e04b86d8f..c3704208511b 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -250,7 +250,6 @@ static int isci_register_sas_ha(struct isci_host *isci_host) return -ENOMEM; sas_ha->sas_ha_name = DRV_NAME; - sas_ha->lldd_module = THIS_MODULE; sas_ha->sas_addr = &isci_host->phys[0].sas_addr[0]; for (i = 0; i < SCI_MAX_PHYS; i++) { diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 49e2a5e7ce54..aea70ec308f9 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -458,7 +458,6 @@ static void mvs_post_sas_ha_init(struct Scsi_Host *shost, sha->sas_ha_name = DRV_NAME; sha->dev = mvi->dev; - sha->lldd_module = THIS_MODULE; sha->sas_addr = &mvi->sas_addr[0]; sha->num_phys = nr_core * chip_info->n_phy; diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 2e886c1d867d..1e0154d08393 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -654,7 +654,6 @@ static void pm8001_post_sas_ha_init(struct Scsi_Host *shost, sha->sas_ha_name = DRV_NAME; sha->dev = pm8001_ha->dev; sha->strict_wide_ports = 1; - sha->lldd_module = THIS_MODULE; sha->sas_addr = &pm8001_ha->sas_addr[0]; sha->num_phys = chip_info->n_phy; sha->core.shost = shost; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 159823e0afbf..ccaf8f6b1055 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -376,7 +376,6 @@ struct sas_ha_struct { /* public: */ char *sas_ha_name; struct device *dev; /* should be set */ - struct module *lldd_module; /* should be set */ struct workqueue_struct *event_q; struct workqueue_struct *disco_q; From patchwork Tue Aug 15 11:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74ADEC04A6A for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236934AbjHOLx1 (ORCPT ); Tue, 15 Aug 2023 07:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236896AbjHOLww (ORCPT ); Tue, 15 Aug 2023 07:52:52 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38F13C9; Tue, 15 Aug 2023 04:52:51 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37F4sn8O029299; Tue, 15 Aug 2023 11:52:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=HRtKHmGkbpYpx07JeQ7y9ju/rnssIVtZGASOaKBdnjI=; b=aGThKn2zL99jJ7WJnnWT7dXccBXpOu2tBkl46PFMxkdzrrO6/R7iTNNnD0izGGII/vMh /Fnffq9RBVpHBSP4LGIkihXCl18ZDPdLH2QBYo2F3lyH3Fq6mwD4gpueRysUlO6/TVuv Ta46rAV8tnvqxDJFMc/oIfHO7m2Gx+dZQsGgLPZ7PJS/0SnR6N+fJzhlbQnVNAJqLbhs 1A88RysMwGdCkznNAUZjvh4idNxVBQ534biMEwJstIIQlB0XY1UF6XE6LEFwNaRfbG3p EbJcwk5xsQthEy2g25P4pU9cbQdA4TeIHONuFBP4KUoVeqpjCyFRsQgY1WtoIapqgMAR ng== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfmg47-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:25 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9BhJw019848; Tue, 15 Aug 2023 11:52:25 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey3v7tfh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EveKS6gUcDWGO7QFyvXSEa81Xhiy/1o+6+dogNfsNV4UR88nSEvMvogG8pbMgElVk2eZNobRT4tJjjt/0vHxb6S705c3qsfoSngAuEwGEocIJ1dchDzxbM1lX9L27e58t5bK8VLdU5cJHtjRnCML+oBjyRvQRGuVPWaBTIPEd3kxSe9RWA0w78nyx4b2/dnEX+Otub1fbDWoomQryv+NDMZtBfj+2WdVORIcfTs2VZvZ5DMB2NBHlTA2Gyuc/QUjWSAAO6NlWcjWfnVeZgVrvC/fTlMDIxgkjooh6Doikf7DfNDy6C3u84IWJK1WIvgtp8xOib0RfMKlPoS/SnLRww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HRtKHmGkbpYpx07JeQ7y9ju/rnssIVtZGASOaKBdnjI=; b=eGum5CAYtLeyZkCgA5Ib0hqbGA7POeo7/krCztWzZw2U5j4pouw5gsbPzZWwDBCXzJTKKue0fgvWrPemBKST41svxoUoHjCqIsvz9syBkctRO+pZkVodzxUYdD2zaoSl9cfD3zaTz7LHn2q8HWQWjjbSLtZUbE6LOlZo1r5lFD6QyNUBhMoAHn6tTdF2Eracnd3g2Vg1hI8MPUaC36Fm92QAcHUjmrFv+N6XQN7mGFd8yrOun8F+3r97gUq+6UInsqtKkDjZ8bbuQi2VYh4xL3euCN5MUYipsxEBu9zP+pJypmBuhfAtyE3xtU9aaPliS6eOmUA8/7O177eRZCL1Jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HRtKHmGkbpYpx07JeQ7y9ju/rnssIVtZGASOaKBdnjI=; b=X/AVCw+lBu1VDm1KRzn/dqMdU3smETT9IjR2ktimru4Fu4+JXsBbQzftGXnL1tRX8NY0cMUjdpc4e6c+DP/kJHK3YENN6c7ylCEJBH2wYTR3CPgPD+6pPFv53wB6EE9SBKIDWVygymkSe72JUbjG799sAunR/HBDRddCRZvagTE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4488.namprd10.prod.outlook.com (2603:10b6:510:35::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 11:52:22 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:22 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 02/10] scsi: libsas: Delete enum sas_class Date: Tue, 15 Aug 2023 11:51:48 +0000 Message-Id: <20230815115156.343535-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA0PR11CA0175.namprd11.prod.outlook.com (2603:10b6:806:1bb::30) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH0PR10MB4488:EE_ X-MS-Office365-Filtering-Correlation-Id: bb630045-e908-4ecf-1e78-08db9d8615cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LymqsBY9OfV8pArlkhyBozTZetgKSL52Y2IblaAnD5iA3NWqvQwhk3uoa6yKt7mJ4SgYaTPF2XssJeQ7JkdnG6AxPMTZanV34QrgVnUhye0VttC9XaGg46J0GJ1K8yD7J/yJoL/0R5/HJvaahB5POQ97HxVfb3x8a8Z2C/zelsF/d0WsSPU5nY+llpuxYNPWLMH81zmpKiFTVFxkfOnOG2jL3FlPrElTNcHEYSCGt4PTnfXGkXiUzHOBfTddKtxuy4lojRPI45rgGatbly0Mj8cE/fazMXyrhq9uxIbmhl3mP2Dx1TS3BXdXQmyyCT54jCSa17aaL9IdAJBOBQdjFNJaty5AjEHc8dNP3X3oFNtO8lcJMe6l3bacglPHDDp9pL6UWqpvc5Pz4xgvcjDCekJUa79sFmxm7TVtX/a6NlQDmwZFjEhrxQJC7IjU7BhbtMatkTBkJ/AYWpG86kRa5nrX9e5mp7mEIG0LOWXbmiejh3mRWwtlVsYPtfD/07P8/lie6Qt3zk3mA+R4S0HmDnp3iCvQVAGc2DrGSeJz8SFkQQqMdlI9O7Uzr7T2MF95 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(39860400002)(136003)(366004)(346002)(376002)(396003)(1800799009)(186009)(451199023)(6506007)(107886003)(26005)(1076003)(2616005)(6512007)(86362001)(8676002)(478600001)(4326008)(41300700001)(38100700002)(66946007)(316002)(83380400001)(66476007)(5660300002)(103116003)(6486002)(36756003)(8936002)(66556008)(6666004)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DSkojoplS6Sy3YzkyWDOgYbwshPV4uKkimQPeeg7ARpNSTRbRCV9FXCrHA66c5QP8EuLsvN6v9N8xR4uBB9HEAljlFrr/6MK05mrrVQPNP67yUTF+8lAk5fyKSAQjTLoFWvdrxVStBqdkSEVs6m53ID6K9+rBBbNx5IpYTp2AvFBUYtg2OzNzS/h7/8NJTxnvoUnLZ0ZXK4q+dzYosvAJQV/IMlXMrDEUJGYjYDVvtutJHYvJt5smetvGN8mmCQtVm9mkczN3UvhUlkv75EVkboez9nrOghJvz0py7yE3pe36ltuK+vP78WyF08UG/4Y66zM7cTu4k+p9Uzgv+c0b+dcWWbYdlx9WqZdOZx8sG1PzngMaUFr0WDTkwAyJJ2NWMwXt0Uvhdf+JrNHpiDQQsGF6tpH4P8PWtinstOzLf4+CPLCdyJ/aULPkfF2/R9x03Ghl2yMOJ9d/sT1QiRvdZC3g/nSI4t7T0+D4v5tx+M4NJ7axE31yQGpuMHKGd13WtfZL5HccnYztElaWi0a5sWEqrUAwRs3TB91kYJt76wVXIywT9pv2kI2ceB1lrhQEFga56VqdknH3NYg8LDiMNBeQcvX7U2DKQA0n7U4w+e1s/nt93HjSIzV0ynFP83dH/ryegQ9VUQtC890+w2Dh4QdpDq/fHwwtV3gCvoEl/SRxxMsSE2YFWq4sMHRdP0ugslVrD/7lNkiS1QzcEZBkwjft3DFUYKpd5Qvl/xdL7eX0BO4lvy6RGOSvK4mcvVE8ia/mKS/sZ6ZFDrd34jOzQ9VxGKXMs+9+ciF6IOh/eVXwvrOrgJei4KH7FCyF0orm63jjs3bUnJ/DZZE05McPh7glpQbIqj418A+YKPRdJwbGOrw0fgdUc0NueVfsSJeD+tA6nkscblO4QBtIjnELLEQPLDGEshD/O9Oh9qGohr52DbA7iZYEfuUNeIkZOtxTPbQeufT5V0jOyFAdPrQ43bPdpkf2Ffjk9hAef8SkNIbpxvwcBWDEKEfLE26vLMzFwmHvvlfQb4hVAIbVlMj0IAwDU5/Uc4OGeLfXnoo/+XoQtqaCTO5mBTS+KtBrLFT5AlgFOWdwCihv5Xn3QTsdjlQE/ErZRcZ4+awJ4MiJPH43vFOK2xfP3TetHAMfoT43+sNnr594ny/VPGjjVLfttbMjktd53vTcO4TxeMOTY833oDm6oTzbZy/sLXG5+oLISjIEYVcVjcxfYAXKHdPLa6IMwdQYeoHAdF1il5gAi+os1W7ymrr+cMi8WXvpg77e/WIMeBuIuMbj9V/932agyFgWr92GjS4O7zbOEJWSkK7O3F0HUO8cSSOm3Zdsg789WvgWOsBwme6kuu6XEdp5680QFGrwwfHSTel/qk46FbL/BdXyGHvKYfJ9FKcaqMh7w5uCYRji07cNyEStv3ug1NvaZhclbIOsMb+Yp3ckh7PthIxZ/OUlLz/JVZLC6BN2sRFi4C6MqmV87ameGY2oiHLoDxtnp4yWjd7usug0Gtg2YQOIANQxX6s4d2AsQthDpZiCYsZmxPuZHP2/p1SklHug0N51Zv1JWxEIMSCwPiejFosIFKicm/itpQHKZYq3Pf9a52TNbQIcUek1STWew== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Z3bdg8mRmQsokGZ6/Rztt/8FpzH+XyAYd+p7foJ9JXCxP6ZMBFJqq2zubEA+aKc6ZhNyM9ZK0CE7OS7LXeHktc2CsPFxyqhQBEd6dRZnI3frYuuuQ1hPLqH28YdaC1SjdamDv5ywAuAzRh1hvao5beeaXyw/+IYKeOzib/KyyoPYA5/fi4ekm7GTOQDNcClwC32E9F8nsZhcEpIOZ5dK1Rvqez1MbsSlLItgMnSHkMDqUOXTQeRPiyCS85CJMweckuPsKhMxHpyLYntpXpnjI5MtqATxztTK/mC7MdKJBYbK9JnpE/2fKJCEUDfltWlXnsIuT5S1glmNqBK+KdXYZbFTFh8YpCxgtPpXqs3zwQTMHgZ2V2klXvJLonwDxmhsDnUBvJfaufTEwpVlGC0d74fnnc59wXj3N5/sOXCK14NAVfELc521+vW1CiS52SUJiv5jE4TXNKusd7XdGvoylowq90phqSyKrn3bkOIgrwEw1ndmKZVg9iJ8KusfEI/jCwq+pmHoT3U2Punsusjp69roAhqEJGhNwWjJz+rkTwEvyfhglEaWZxhmkoSiQVb7OEsbTK2R8zwrB+xX0zqoJQsFmyz/oXnRDmX9SU4bVx6tHytiOuz3YJa9MPbJ0lVP4E5COj3lH4jJ7eS9qG63oAqDbpymqSinyenKlX2P3XfEODxzdNR20gM3jF6SiPyrYCOwfPHCyQCyNClYlDO0I276asUAxtBK4ZcVWzVPav5tuWdhmC7PHj2nGK0q0TNVvY+HTIt8f4sP4tmmetCR2qKG6QEyX7OQrmij3ufQ+nRO7rkr64C2M36DMF+MZIu+yx2Lox3WHCZMg94wZcnDlWPSw00ZnJ10LGO1LX00UDFmwr4BLQl9liNim7FpScRTrvAMZWNmJwHwTZn7JlcuzgiTMfxy/B8oL1+LOGCclVhYxQjAMe3iQe9IPsVXuD3sn52AdTHqwegiXbag5Ir4tA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bb630045-e908-4ecf-1e78-08db9d8615cc X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:22.1078 (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: Cbd9v4NTWHQ5MRiwkATcyqP5pNb3hnH6fKhFftOYlnt3LpTqf5Dw58hXD+ijPYUXV1yBgQwKrW5SrSvhMXPQQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4488 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: vkuzwXMzB9EFt_XunKLNobSQt4Vtf6Y8 X-Proofpoint-GUID: vkuzwXMzB9EFt_XunKLNobSQt4Vtf6Y8 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org enum sas_class prob would have been useful if function sas_show_class() was ever implemented, which it wasn't. enum sas_class is used as asd_sas_port.class and asd_sas_phy.class, which are only ever set, so delete these members and the enum. Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_hwi.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - drivers/scsi/isci/phy.c | 1 - drivers/scsi/libsas/sas_internal.h | 1 - drivers/scsi/libsas/sas_port.c | 2 -- drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/pm8001/pm8001_init.c | 1 - include/scsi/libsas.h | 7 ------- 8 files changed, 15 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index 3dd110143471..d8f56e528877 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c @@ -72,7 +72,6 @@ static int asd_init_phy(struct asd_phy *phy) struct asd_sas_phy *sas_phy = &phy->sas_phy; sas_phy->enabled = 1; - sas_phy->class = SAS; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; sas_phy->type = PHY_TYPE_PHYSICAL; diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 9585f1ed8ae5..1172065c1d7d 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1018,7 +1018,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS; phy->maximum_linkrate = hisi_hba->hw->phy_get_max_linkrate(); sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0; - sas_phy->class = SAS; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; sas_phy->type = PHY_TYPE_PHYSICAL; diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c index aa8787343e83..ea2e339f5b1a 100644 --- a/drivers/scsi/isci/phy.c +++ b/drivers/scsi/isci/phy.c @@ -1404,7 +1404,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index) iphy->sas_phy.ha = &ihost->sas_ha; iphy->sas_phy.lldd_phy = iphy; iphy->sas_phy.enabled = 1; - iphy->sas_phy.class = SAS; iphy->sas_phy.iproto = SAS_PROTOCOL_ALL; iphy->sas_phy.tproto = 0; iphy->sas_phy.type = PHY_TYPE_PHYSICAL; diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index 6f593fa69b58..c06ecbcf1254 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -41,7 +41,6 @@ struct sas_phy_data { void sas_scsi_recover_host(struct Scsi_Host *shost); -int sas_show_class(enum sas_class class, char *buf); int sas_show_proto(enum sas_protocol proto, char *buf); int sas_show_linkrate(enum sas_linkrate linkrate, char *buf); int sas_show_oob_mode(enum sas_oob_mode oob_mode, char *buf); diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c index 11599c0e3fc3..7893c462169a 100644 --- a/drivers/scsi/libsas/sas_port.c +++ b/drivers/scsi/libsas/sas_port.c @@ -83,7 +83,6 @@ static void sas_form_port_add_phy(struct asd_sas_port *port, memcpy(port->sas_addr, phy->sas_addr, SAS_ADDR_SIZE); if (*(u64 *)port->attached_sas_addr == 0) { - port->class = phy->class; memcpy(port->attached_sas_addr, phy->attached_sas_addr, SAS_ADDR_SIZE); port->iproto = phy->iproto; @@ -249,7 +248,6 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone) INIT_LIST_HEAD(&port->phy_list); memset(port->sas_addr, 0, SAS_ADDR_SIZE); memset(port->attached_sas_addr, 0, SAS_ADDR_SIZE); - port->class = 0; port->iproto = 0; port->tproto = 0; port->oob_mode = 0; diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index aea70ec308f9..408113bf506d 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -84,7 +84,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id) phy->port = NULL; timer_setup(&phy->timer, NULL, 0); sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0; - sas_phy->class = SAS; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; sas_phy->type = PHY_TYPE_PHYSICAL; diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 1e0154d08393..e5d794a97b14 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -162,7 +162,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id) phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS; phy->maximum_linkrate = SAS_LINK_RATE_6_0_GBPS; sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0; - sas_phy->class = SAS; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; sas_phy->type = PHY_TYPE_PHYSICAL; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index ccaf8f6b1055..3048660ff107 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -23,11 +23,6 @@ struct block_device; -enum sas_class { - SAS, - EXPANDER -}; - enum sas_phy_role { PHY_ROLE_NONE = 0, PHY_ROLE_TARGET = 0x40, @@ -258,7 +253,6 @@ struct asd_sas_port { /* public: */ int id; - enum sas_class class; u8 sas_addr[SAS_ADDR_SIZE]; u8 attached_sas_addr[SAS_ADDR_SIZE]; enum sas_protocol iproto; @@ -319,7 +313,6 @@ struct asd_sas_phy { int enabled; /* must be set */ int id; /* must be set */ - enum sas_class class; enum sas_protocol iproto; enum sas_protocol tproto; From patchwork Tue Aug 15 11:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C1FBC04A94 for ; Tue, 15 Aug 2023 11:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236914AbjHOLwy (ORCPT ); Tue, 15 Aug 2023 07:52:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236906AbjHOLwn (ORCPT ); Tue, 15 Aug 2023 07:52:43 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E2D410CF; Tue, 15 Aug 2023 04:52:42 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FAx9El015335; Tue, 15 Aug 2023 11:52:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=dL+jHhl/KyfGKRbeuJfecQOM+wtq15mR/pKt0RNK5NY=; b=I2dpcMp+Vfs2mC4BLdNXcBe775iiU1wOkppjKtDrNQ9lNh3mmhLhTxS++I1beJD4KrxA UxfhMps+x3/bdjbXYzZsUzc/7jRIIXWoNz38iZvROle/6qEdEcrMpcWCR3HwXWD41a7v ZJ7GN+cAi+LC2E51gEvtpbynUcO+EbE74qetkwxjIRHyQKvBI3AaSkbN+sHDl/6umD24 wZ0lXIWdugSLkOY6mYwKx+Jim7qzC+2lQlfjlFEMGmqPioyAyRXl4ym7lY0xvyyVmKad d0RTHO0EgmH8JUq++2Qy7fiaA+GPMsZDpxpqIw5iuBYz+shovERi8RpX/0O8NFhwrP0A tg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2xwmgk6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:28 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9TlxD040111; Tue, 15 Aug 2023 11:52:26 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2048.outbound.protection.outlook.com [104.47.66.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0qquv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SRco0d2EVafmuSVaGuBH1iy5/ZNqvON9nWes8ICixCQbL1A8H7MYCeA6377OPNtPS9AJOhkwLUGA3Zle1v58l91btvY0Mytig7nrfJlrbNYcVBqGh8DM2xI34kApY3UTNi3ckFWfOKgV7CWumlrB9jRjkcNN7fJDvbnfLmFCamwKX4HMwM52bBxpkEegVR0KU+Fe3kEDNXlQSJc2of9ClTdP7hNGadJafkhis1VwTW9vr5qDN8Z6im7K27/2olIRNQRR2xjn1SBMIIrt/UjtcGdoH+RjAll96k2b3KBxLIDscZTHCgZtZMQ33RliW2+bb4tM5mYICF8GATg92H7+dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dL+jHhl/KyfGKRbeuJfecQOM+wtq15mR/pKt0RNK5NY=; b=dXQp60AvB7/4/3tcZLVqsN7kFs96AE9oCLWHoKhAMcLQx8mqjNWUfhl7EyCmIQ0KnOu/2WO1HfMOz3pD87KEk37Y0mU1ioEaa27YEpEm+ZzOCZ/GX/VzugLFXkx55s2ZA6Y+s1xYQW5jsjhc9Ile7Aw0YGkNM3s2Jy/8IDVy0gMeTAuqoCWQ4fz38AHfaF5PAlTXegMdxnbrmeGjdyUfl1pNOoyDgLRZ45k8qHhIkECmaVnc/iDNUMKhzrn4vzbb/OWUhSzrisc+mqztSPtVr8tLxzJ/VPGOPOlgR6G1UFf0gsv+MpRqJwD4vjYZqXBeIWIZHBL9Xq9Y5jSfixj4rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dL+jHhl/KyfGKRbeuJfecQOM+wtq15mR/pKt0RNK5NY=; b=LggHzPDUqvY49CZg69OjjM6D5bXo8HPZl31hxNO+rdWLsTCUrh1az8gdfdtLOrK65Aj4SR0zWy4ii2DDe16ckw07AN6bhlPyt0TPqrGo8OiuKU97q5c9mQai3oXQNQlo8FHnKRxtKuwvrelxO4A+faVbWDIjZwKAvF5E6wS/2HU= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:24 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:23 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 03/10] scsi: libsas: Delete enum sas_phy_type Date: Tue, 15 Aug 2023 11:51:49 +0000 Message-Id: <20230815115156.343535-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA0PR11CA0159.namprd11.prod.outlook.com (2603:10b6:806:1bb::14) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: 28d3718d-194b-4156-7b86-08db9d8616d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q9vf1zULLzbyP6kadnRG+5L5Am2AY+XkmWH96QtJGOqOe9Nsu2kl3pMK/VcM5L9ATwU/TiivhJe06ErJYVmwrUkkA00N+NLSScNTYpFYmHVztFZfDQw+0C4RnffSCdcDgdTZ5b8WQ1HNuYsOHXRKAyafz5yHSHhfTsSqCqQrtQPCqal2qs88oejEDnZNBGejf5Hf/rfm28v/j8LI7KmEidD9aK3D5Zww7Ekf9M9gh+NWOqZLDyi5GVL5yFXWweFSIjTpC+WgmcjnzLNsdQ/8AGmXAR1RKPeCeTk8v2Mrenchz6G1uKsERnIl8duT2qlPvX6A41cTGfQBtt/RIXfAXKwg+JM7RHNElMJNjJL+Qe9RNHR2f34Bd/jFclYowDhi445BfmzokInltNzZCvkTI/kLKIRVm2CYlOC3AjB1cwj9FV8iCcmC5keYqaT+luILVfiuVaNnsQGqlagxcj3Wpbz4JIjUum8p/A4oITH5g4AIWj3g0DNcuLLcdlpYlEcbYYGnebmJI7txSxRvsGwYr1mPJlLbnwkRN1mZYR608r/VbcCmx3PVkEnfUcxDv8BE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hW/dO4KaozCpdNAmh0VuoOBK3PNznm4qKEpharJJY4u3ja3jBqJU8sTZ9UhciC2J5tLinWgQkgTyNHaqxmH8wgokzDQ8ZLDiwxdzOeShYCBEY2dkM1veH16WLvuEkpbXN+bEfSXf7/K4uqNUpsvJ+PVdMpqBgm2td++ilxX14Infs1gLE49hACHIm9TcRvm/x6ckFa1pOggW7MxoKN5eK6zWolO73zHrqQOZWHUqL6P6K7CCoaDn2Dx9SUe+AiwPdn46fT7NOWJco4lexRVSK4W1nK3lIkzY0jjKsh+dDfsZkZVHorQj8ampl6dQ4EowQGv9bT/7ef9wivrcUtonTDlkRS/Iufrw8M3AZWDlGuLAzyZSjy7CR0+xbPjoFLuydT2bkK64I1gTVLggXU1rpVOQbr3p5vcQWc/mKqvYB0fq49T8ecccyoIG670rBmC6m8LnZwT1YrtB1TaLKWcJfb7fyc+t0Cqyxu1zxIpF3TqWazvLakgb1oHcUpYbyWdOnWKwCqkVQWAQVH6YowT92LsbbW1UgE3H9ZLzcpSZlj3WLWrejrhMXQC58aM/uxSPPfWaGUn+Bw+GGjD8rxHD5iDg7IDSzMQhZdTLvNGmQg83FNSZUaOG8EZBAzpNDSzwjoJCtv35rMWyl3dOMXDaEGj3CEwYUmR88Su0IynVeucqdCcINKJO9BbOwaK/eqvK9zanGYu0v1Yzn7duGJWWFAxhYapo10IeixuqVX5TrPVbJEpNhdjOkxn9kumlnBmhKmDjJqxnNZrHldrjHbwQW1dmAsSsgINy/zLZBv9TI0iMacIodnij3elrxl59xqoGKc83f/u6SbNK5TeS984Frf0qwMaevmVF/Tk3Y8OGSsziTSguL27nipo9nsTfdzVzyDKKylzi3F0u5y2W9dMMbiw25Gkp+K+Fovj2/WDKe8gDnZxyAp9M7DUZ4d0+XdUWE0hSQSrqrMX6cCxiOPcFmGZd5eUeCclcYzaTYu0uD91Qn+kvoH5SQUvjn7ynnHbEWAaRVMDVs/MYgBpstm2pySPn7LGF8dle2IKAO7g9ChGOL3/1tz6HicKZp+XxJChdwZlrIivLJd5b4GBfRy/V4nRJFyWWTNjxN7sk98DZbz/zybwj76pVanhZmuz0YzeyKuGzmY9oHpg1XfCX+bGuvt9xiw4WGrD2x3Q0yDYRdPoY7oK8Ye39lSmKLIeBgU9X25gP3RDXXq2YEwPdSoum8f1kwxzUXPnJkOiCuTW3KOi70oovXv08RbGTvi+pUdSGfdlQnKt4IWjonjzJUEH/qrgJ0PHnXAeu5UigQbyqSTPS5sN0r1RcXogZxqRXsOQv9lt12AQTE48kjwT2UA/+2ekjHOjYupykcRlc/8R9n4EDTwdIqMQGE3kI69s2/aDn8fJc7p93i10vpoTkvYy2fnrq05Kzhpe2arzUPuUSmiBapPRpUopWOl2gQcfugSOspBK45Ck25qFcSX1n2azFJtaFDEUCSRZZ5g/qYB4vvvFTvL2xsd7iSHW+7GRZhcn8Cu+UP2V1FEKEA+U7r6V2lUtkXbnJtpdkYFxSMxriYybq0XoNiczZJnEbVU7SvjRWyN15lhv2bRi8KIIVWAQwng== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5ac8rmnTc6l+N90dx2Ss6tlWY9csya7oc1OWTuLGOva5Kg2U/at+HE6bcNUdN0OYJXIVnhsHpRJyH+dBy6sDXIlXEVdmM930Zfd/8trRZiN4R/CQTgh5shSWksIdaoteKVTVEpxxwS64e0q5E7Fr5TyxnAFspB2OzAmIICZIgpowFSseWK7WA0Sp7r7rDr43Nt41/IClwISEyiexVEVF8n+ZxN2W/NC0OkftTA/wSAq2suSUHrfnR+qG2EMfmmz1JEd1/PvkKuRRDSWNgtLJFyZnkBRSqfQrPbK4nsbGZ4h/fiL3FPJSsh9H3aH3MhX3Zv3Mv5BNdlTqi4lu628x3RNLiYQgdJum0RIphNnJY1SFCBm8n95iwvwe24/Isd6x7omy8Bbxr6gDU83wVBqkMzSjiU7ZuwjecigQaWglGzZC/Zs5rDmOdwBEwqDai8NJa8sYVt6ZdcigBLa1LtFHdeAZpM8ig/g3RwJBpWg0HAsnJML8q13lxLr/HYmnuLLrV2lQeiIHpJV2/12xdk3wSLPQAiCjPKCLuRvSqM4nbdGab0QCohvUVCcA9bx77HrP2SXgsN+/7CQ4kd3JO09VPVThJrNN7e79UY7TKfIdJRJNxzlB3fWfRHynz05t54JKgF5lm4DiQ5I8PNN8B1qPMaFbjRWgkS424wNe0gMpRHjEk9+8jQ9Eo+NZVmuLFoC5ObZlv4azUg6VgVDTQFHvjEWnAYc5yCTEp/t73GgzpZ1ZfEzki5E2BlurVQVk+op2kp3zpLsYfrTh3np1XspdfW8BDWAMDpX/CEWn7H1A6td2BSFiBnh2yu3zMEsUceSGdGdS5UQ767WGOolmD1T1G5UbI8EvCn/SdZ4F/nMBjWLA5d+reIH/wMT4ZHjYx+TPix9giBF9vk5IZnIGWWRt83y9sEhLlNb3b0FOnoaSv1/vCh1oxL+0z6HPFsYP1OXOHyAGp3naj0IOWqf/RVOo9Q== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28d3718d-194b-4156-7b86-08db9d8616d9 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:23.9046 (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: SghYu1enE9Bvrzggir2HcPPmfrRHozek/a8x7AUbPWbqpA75/M6/rSYixAl0gdhz+5cqK2w8V+S7WOlBOf2GlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: J2FV_DXv_RJ-d_xwNDK4Wwqg3CMuB0E3 X-Proofpoint-GUID: J2FV_DXv_RJ-d_xwNDK4Wwqg3CMuB0E3 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org enum sas_phy_type is used for asd_sas_phy.type, which is only ever set, so delete this member and the enum. Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_hwi.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 1 - drivers/scsi/isci/phy.c | 1 - drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/pm8001/pm8001_init.c | 1 - include/scsi/libsas.h | 6 ------ 6 files changed, 11 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index d8f56e528877..75848de13818 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c @@ -74,7 +74,6 @@ static int asd_init_phy(struct asd_phy *phy) sas_phy->enabled = 1; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; - sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->role = PHY_ROLE_INITIATOR; sas_phy->oob_mode = OOB_NOT_CONNECTED; sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN; diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 1172065c1d7d..72dd5e3ad9da 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1020,7 +1020,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; - sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->role = PHY_ROLE_INITIATOR; sas_phy->oob_mode = OOB_NOT_CONNECTED; sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN; diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c index ea2e339f5b1a..743a3c64b0da 100644 --- a/drivers/scsi/isci/phy.c +++ b/drivers/scsi/isci/phy.c @@ -1406,7 +1406,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index) iphy->sas_phy.enabled = 1; iphy->sas_phy.iproto = SAS_PROTOCOL_ALL; iphy->sas_phy.tproto = 0; - iphy->sas_phy.type = PHY_TYPE_PHYSICAL; iphy->sas_phy.role = PHY_ROLE_INITIATOR; iphy->sas_phy.oob_mode = OOB_NOT_CONNECTED; iphy->sas_phy.linkrate = SAS_LINK_RATE_UNKNOWN; diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index 408113bf506d..d5cf563e9094 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -86,7 +86,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id) sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; - sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->role = PHY_ROLE_INITIATOR; sas_phy->oob_mode = OOB_NOT_CONNECTED; sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN; diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index e5d794a97b14..0ffde0bcd737 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -164,7 +164,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id) sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0; sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->tproto = 0; - sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->role = PHY_ROLE_INITIATOR; sas_phy->oob_mode = OOB_NOT_CONNECTED; sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 3048660ff107..e54bcdc1ecd1 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -29,11 +29,6 @@ enum sas_phy_role { PHY_ROLE_INITIATOR = 0x80, }; -enum sas_phy_type { - PHY_TYPE_PHYSICAL, - PHY_TYPE_VIRTUAL -}; - /* The events are mnemonically described in sas_dump.c * so when updating/adding events here, please also * update the other file too. @@ -316,7 +311,6 @@ struct asd_sas_phy { enum sas_protocol iproto; enum sas_protocol tproto; - enum sas_phy_type type; enum sas_phy_role role; enum sas_oob_mode oob_mode; enum sas_linkrate linkrate; From patchwork Tue Aug 15 11:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97F0BC001E0 for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236944AbjHOLx3 (ORCPT ); Tue, 15 Aug 2023 07:53:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236892AbjHOLwv (ORCPT ); Tue, 15 Aug 2023 07:52:51 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39F3B171F; Tue, 15 Aug 2023 04:52:49 -0700 (PDT) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FBIncS031592; Tue, 15 Aug 2023 11:52:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=OsoCx4Z98xrJAy88rcibq7toaR6ABEBRs72gWn5tbcQ=; b=3kQqFjrcW80tKVX75O0+FjFvlJajTDYBj0k7m1plmsgOkgmmWS45NAB/7yEwCGKqT6xy Un2G+2cAtPdMz4STx/f+02GMDceCi0QlSzQ3U6sCfestS0bx0/Otb5BP9whUAYU32Vpp yjLB/TOyNXHUGFJb8Hr9Jh0NA3JpYxhSdeu+U5JvFg4T25ngE2qFNnuHeJS08iGV1xXW /cJbtCi4i4zp+IpzQ3dAtJj5KBb1FJZ9I/HkP9FbP/xTi20BcRkIhzi69g/F2M+M3Hjb a5rc1LlvI8a7UQufh2RgiEzWW2vWtIhuFX4DBJeO8slfyl2n3lTmxc/4jF+8bp66mw9+ WA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se3144g8q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:29 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37FAs7YH040345; Tue, 15 Aug 2023 11:52:28 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0qquvp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B6BetqVVwTwO3oUSr4wWXzGMwrK4T8buyJDiRyhsMlXgDYc9WoHsKOs66eDsNK+EBjOw3uWCv7kfdJY/BrAZkOCTdrN/ST4ANRuwtof00mK9Xf2oAyRUJeOdFaXc9ZvJhhFg09bIHtKpY5WVm27WVXHmMvyos7vp42fp5HIrRyM2v63Zo2V/VWyNdmX4oCn+9ETDjnljPABGXjYVfkTnB+Tfh1PKlkDj1Lnp3mJTkOMvE+J24z3bA3cbqYExL7Xt80fILSi9U28T/eIKU38O4z1/TEcRifJKOdiS1O0bDwHD/CwFRXr/nxTjYU48Jhxucz8pWUn5U1lrPLV+WgrvDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OsoCx4Z98xrJAy88rcibq7toaR6ABEBRs72gWn5tbcQ=; b=mGQ0lb/yeoR1HLUZywhwwk3sWJ1Eivg9LLu/xVL7vItBefcphI126Ey4EQjYs1REBMyKe0lyQsIFHM5aVGrBmHMONyR3Ys2ygGddWijyK7gTUUXEBxhpv3LsVZTMxi0aL3EYf+p3bNeKz+vk9yDVSP8lhCHzjQwxsOqsDdNDbq0MiS+hLbt/qMwG3JpNRU+ie5fOgZd0bvLeD6/YKO+4ZarJvtuIP4vK3UftW6NEGDrJ3snt76YtRsp2yDpZEiuaDBWP84IkKMIng1dEPTouYqkahGgkXCjWvm5GYJTfzyVz6woh0rGTwC5tdHux0qZ8DEAlF7Lcy8XV3PYOVgRIRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OsoCx4Z98xrJAy88rcibq7toaR6ABEBRs72gWn5tbcQ=; b=UMn56fjUYV0IJ3Q5268cENdVoQpCk8EFXuyTpJ3JemHFVuUuFTTbpP8eQDzYS9E92FZEU/HplHZ1fmlazXgN+ldrZq1VSYVLAtoaoTOyzI+Bvdf1wd0FnXNJAAGFQO0kOtRPrudZ3oVQJvALnAOXsKUb7ALb1L2fYcPpUndGc3c= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:25 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:25 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 04/10] scsi: libsas: Delete struct scsi_core Date: Tue, 15 Aug 2023 11:51:50 +0000 Message-Id: <20230815115156.343535-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SN6PR04CA0075.namprd04.prod.outlook.com (2603:10b6:805:f2::16) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: ec25a2b1-2055-4c37-9d25-08db9d8617eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Psrn3qsN1uNW7ZJMGZ2rWuuznVVihVANhpPrxziu80gCDe+SDxpXCXhUg/N+mK52nUiiHSI7AYHYsAGCKOQLt5iwtF0zjSD5u4nBn+/ApsLbm7eGJivKldG4Ts3NMajIja2mqm8gqVbMYczUyqmNghBxZBtWjL6OyYVLvqwFjVIArklSW5lWzrGdpustoU5fbgZbY2zWg+Xt5Cs75NJSX/EDTLRDPdiQ0NhYSZ+N8h1bx1MBaMYRRxUxe9nc2xi7nK47IQduUHWyKrQbx3aScHN1rK3vXUNzr3/kr2mb1J6vN2bVWPLkrU/v4O6vWc4qWelakcUMfvaE65BVPDWVloQlbJyOdAY2Dp1kyYgYixDR1LQyIsWifN0OvhT9QO1yKiR1bmdUMKV28w21FlY8osFJsnr9wDPodbUm8tP2QNPxwHvBRLsl2LM+V9tjKtNbsc/k5a1GU8S/J0M1/jNIbLuAuvkbTLO4ItDxHuNG+bWv6v1m/zke6/2yFkUm6n54nXpcPn+C3bl09/y+y/Qi+ty4/RfVGKLwZfTHFQpsF4Wv3teZpaJjtDvfdNFtFBuN X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(30864003)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w3TSHyncCRM/bNUrzmJcs2v0ecKkuohaQBWMZ4vHg+946FD7j3xrJzMpE56FL7YD1R5H74sRXbO4J4jWaSL7oz4DXKlFXyEW3RklZ1GLqp9gTiv9wJ3T2afK/I3BXnajsZRunUNPMM6w5Y4pJYmu1nnsEGOn0OPSbbfNZiw/NsCn/LdFrxdCJx6XEg/1xtlL9MP7OE07y/JcYfTwduKKh1OUmVjY6Coa0FNRjb9cq2KyA5gvRn4LbCq+Gy5UXfd+Otf/in7JH90x67VwSssDW+NLErU5b3c9RpLSy7WW3DZOBJyqmO5q8sGMbnl+StD84KJA8sxpV5/uz3TDUolk+g973aI1nN7FIHyHLJbA+x2+exV8VPAOuKjAskX5nbgzKQYly0Iz2gFoZb9Jo/mm9P6PrEtwugKRu8cT43CJyYu1HG2BPe0OxhXFA+rwp7eEqz8+h7T2zRohsyv3xwjZK85nN6X7+tcdwVSZu5grM4Rl7qEXC8iv1PNYQQIArydxZtGTZLGK4AgWxKiI4gbXoNUXBgYbENZZAGHfqQt2lswd5OTcGpdnIglSRdWm/Ri+op9xEMQ2jk1pehNkH+KuOU1zUslhu4wH15OokGFg79bM9lUweq85Qq/E4Ov+t731zwgSYLuOwTSclxuSLaLeC9EeorCTwsdIUopkvWwjnqSw3zKRPk4Z9u/qyrbDzSbIhS6zoeNPED7itRFU4tRKiNB8JnjurJrjYEVC6tbAfdluYTqjU2CZ8OdwcrefHJt2Ng8JYlGGFMVHuW3yWeLYDDWyY4gr2OGz9l0OvmZf9yB5qUS5m6+5wY873vEnSklwD2t0iO7PdacjOO4fCchgakZDnNsqjKvqZdOUl459Ajw/Apsz4Y6tECgTfs3idnQQOw8TJwyB0jLhCyvMfm8TcLuBdQtKhR0vwpfwYaHVKgkoI5DqXaRQVcvbKo+UV8ytgAdKeKU5JT5Hy7DIRRx6B9+wZLaI4NhQJFrQ/BVd8RFy4ZKwKW2k4ktFw9eT2xv1ywwKalXBStjz3KMaVxY1XReMAjs9wm8fRfdsFHyAmqy8PR/YSKUmRFeO+kZOwA91OxPycSFiNPacYwtfbiFXGXlKJzT8II1YJqUQy2ZPKmpoQhBWEVNpErq0X11RRxWOVtXmVZKzucotsrSry8dugvJlOHcEHz8QEml0Q46AcyiuL0NMBbXYSshVKdw9d7b1kApMmM917hD75AZGk2IFzEew3ItVJHVeS9qAcFjvq69BqOeD5qlUJKIY4jLu4nzum8ZqThIOh4Q7H0PXMtM+GCLDIHeZDC/+O/YpJhvcL3CiiQs4G7Zhkc/wlddW+xN8ap9ysxXQPBxTJOfzV7MccFq8+YW8bPRIS1NX0eHINRw+gks7kRgcv+iP12if0xJ2Hkly51ZrEtvwx3d7mVZegg2nOjCuTbR0JLeabvN0u6ISXBc0na+pmR0NmCDwp9Q5DUh1vof9fv/387+uhqzHrTK8xvNNz5RTR9pMCA6KnlTEOtkHna7SWPva0z0oWGThfjeQEcbgryAeT0uLio1YdHfWi294n0+7ZGhIjnVj1N/j9qdb3bqC8NKfWEsCXZdHaEbHfrk1BvICGw0+RgPW0g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: To7Kqu0cPb9Mpf8oW5RGGkhVc3wgJwMzUPQaLVc03TCcD3fcku16S1LTVnWk0oBlGJHJI6Fu0U3n+n+089R9mJrUIR8YwK9J/enFH530I6m7+KSJe2+ahCgQDpAh5TZc3E7yLsoWktPe0BAEf7KaC1dx+fJE1G5iGDkbqGVGC/Xur+sHrvQFlfz/rV/yTyWZaKQsUYnjNVofWm8SgWoR11FrfgzIUPnZZmi0d1uppdEjPoJztYnPh0xCqshQUY7rgq+rUEaky+bmnHRzCFTgpkOeTNleGRqBpo0LSl6AJ3eH16l5NCnqaufgx/UbRm+fgBEoJAkwK+58QOMmhAooyefDn3+fnM1SrSP7TcQp6goAIxIS4uz0KSJfQ+GUkL8hwkIK+gw3cg9hxC2XyuofNzhoOpQYcxunqoYUJgS/5zaIBYRKOQvgMfvyZ2tUq1NMAtUuoq302Yt2PT1EnpQ4KmgTfJEXJ/lghN2S8CEg5SdgdZdOHoBrlrUgPuVAsQzNfAndIvOQusbHEHGQhkoP39qArRQE1He6uJcOSbShEgO6z1qiKx7ogqZjnr1BOPqB93H2zqHQtaKleOqnOges93uUx+auo9S+5BLvvnWDya7MBjf4EohCg3RveR19dcqX5iYGRXranC4wQzVXb9g2qr2kM6q8meAbGHZP4hk9Ln45U3eYFiAM+WZLfroBC8WMQvyCNC1cYPBvnSoqFJ8eLT8aRTp97Y20By+AMkFfj46jKakEp0x3QZeCJgdyODSKqQVO0OboUO+iVYZ9Zt2zRDPMu9uqw1Zw8i9KrUyMzp+qLXH83coG0CO/nuPcKVHcM0VJQXmSypTsARglCmMjtleNX263cWUcUxmkyEgyRuF7IzyEA3/JUjfM2UrurMoC2aP+CJ4rd7JSAccqEFLrli7UVfc2N8UpQftykzHM1QLJ6mMNY4GO15VxPeNMPwNWlV0OxFKaI4Yk/r45vzdN0g== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec25a2b1-2055-4c37-9d25-08db9d8617eb X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:25.7228 (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: 5lVnE03lQ9Op4guPZyLACJlPIqvcZ70BhPbugJingxYfVJmbigrj65v3eUx4s/9nA/+sxlqu00lH+ZPBd+DCRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-GUID: sZGaxaFNihd2Yz9InItPcH8ER8_syfZJ X-Proofpoint-ORIG-GUID: sZGaxaFNihd2Yz9InItPcH8ER8_syfZJ Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since commit 79855d178557 ("libsas: remove task_collector mode"), struct scsi_core only contains a reference to the shost. struct scsi_core is only used in sas_ha_struct.core, so delete scsi_core and replace with a reference to the shost there. Signed-off-by: John Garry Reviewed-by: Jason Yan Reviewed-by: Damien Le Moal --- drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- drivers/scsi/aic94xx/aic94xx_init.c | 6 +++--- drivers/scsi/hisi_sas/hisi_sas_main.c | 6 +++--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 +++--- drivers/scsi/isci/host.h | 2 +- drivers/scsi/isci/init.c | 4 ++-- drivers/scsi/libsas/sas_ata.c | 8 ++++---- drivers/scsi/libsas/sas_discover.c | 8 ++++---- drivers/scsi/libsas/sas_expander.c | 2 +- drivers/scsi/libsas/sas_host_smp.c | 4 ++-- drivers/scsi/libsas/sas_init.c | 16 ++++++++-------- drivers/scsi/libsas/sas_phy.c | 8 ++++---- drivers/scsi/libsas/sas_port.c | 6 +++--- drivers/scsi/libsas/sas_scsi_host.c | 14 +++++++------- drivers/scsi/mvsas/mv_init.c | 4 ++-- drivers/scsi/pm8001/pm8001_init.c | 2 +- include/scsi/libsas.h | 7 +------ 17 files changed, 50 insertions(+), 55 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index 75848de13818..9dda296c0152 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c @@ -28,7 +28,7 @@ static int asd_get_user_sas_addr(struct asd_ha_struct *asd_ha) if (asd_ha->hw_prof.sas_addr[0]) return 0; - return sas_request_addr(asd_ha->sas_ha.core.shost, + return sas_request_addr(asd_ha->sas_ha.shost, asd_ha->hw_prof.sas_addr); } diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 6603e91cee8a..8a3340d8d7ad 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -687,8 +687,8 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) err = sas_unregister_ha(&asd_ha->sas_ha); - sas_remove_host(asd_ha->sas_ha.core.shost); - scsi_host_put(asd_ha->sas_ha.core.shost); + sas_remove_host(asd_ha->sas_ha.shost); + scsi_host_put(asd_ha->sas_ha.shost); kfree(asd_ha->sas_ha.sas_phy); kfree(asd_ha->sas_ha.sas_port); @@ -738,7 +738,7 @@ static int asd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) asd_printk("found %s, device %s\n", asd_ha->name, pci_name(dev)); SHOST_TO_SAS_HA(shost) = &asd_ha->sas_ha; - asd_ha->sas_ha.core.shost = shost; + asd_ha->sas_ha.shost = shost; shost->transportt = aic94xx_transport_template; shost->max_id = ~0; shost->max_lun = ~0; diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 72dd5e3ad9da..bd5f39de83d1 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -2514,7 +2514,7 @@ int hisi_sas_probe(struct platform_device *pdev, sha->dev = hisi_hba->dev; sha->sas_addr = &hisi_hba->sas_addr[0]; sha->num_phys = hisi_hba->n_phy; - sha->core.shost = hisi_hba->shost; + sha->shost = hisi_hba->shost; for (i = 0; i < hisi_hba->n_phy; i++) { sha->sas_phy[i] = &hisi_hba->phy[i].sas_phy; @@ -2556,12 +2556,12 @@ void hisi_sas_remove(struct platform_device *pdev) { struct sas_ha_struct *sha = platform_get_drvdata(pdev); struct hisi_hba *hisi_hba = sha->lldd_ha; - struct Scsi_Host *shost = sha->core.shost; + struct Scsi_Host *shost = sha->shost; del_timer_sync(&hisi_hba->timer); sas_unregister_ha(sha); - sas_remove_host(sha->core.shost); + sas_remove_host(shost); hisi_sas_free(hisi_hba); scsi_host_put(shost); diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 7b40f0eed703..813807a24ae1 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -4956,7 +4956,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) sha->sas_phy = arr_phy; sha->sas_port = arr_port; - sha->core.shost = shost; + sha->shost = shost; sha->lldd_ha = hisi_hba; shost->transportt = hisi_sas_stt; @@ -5060,14 +5060,14 @@ static void hisi_sas_v3_remove(struct pci_dev *pdev) struct device *dev = &pdev->dev; struct sas_ha_struct *sha = dev_get_drvdata(dev); struct hisi_hba *hisi_hba = sha->lldd_ha; - struct Scsi_Host *shost = sha->core.shost; + struct Scsi_Host *shost = sha->shost; pm_runtime_get_noresume(dev); del_timer_sync(&hisi_hba->timer); sas_unregister_ha(sha); flush_workqueue(hisi_hba->wq); - sas_remove_host(sha->core.shost); + sas_remove_host(shost); hisi_sas_v3_destroy_irqs(pdev, hisi_hba); hisi_sas_free(hisi_hba); diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 6bc3f022630a..52388374cf31 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -306,7 +306,7 @@ static inline struct isci_pci_info *to_pci_info(struct pci_dev *pdev) static inline struct Scsi_Host *to_shost(struct isci_host *ihost) { - return ihost->sas_ha.core.shost; + return ihost->sas_ha.shost; } #define for_each_isci_host(id, ihost, pdev) \ diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index c3704208511b..db4784cc976a 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -574,7 +574,7 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id) goto err_shost; SHOST_TO_SAS_HA(shost) = &ihost->sas_ha; - ihost->sas_ha.core.shost = shost; + ihost->sas_ha.shost = shost; shost->transportt = isci_transport_template; shost->max_id = ~0; @@ -729,7 +729,7 @@ static int isci_resume(struct device *dev) sas_prep_resume_ha(&ihost->sas_ha); isci_host_init(ihost); - isci_host_start(ihost->sas_ha.core.shost); + isci_host_start(ihost->sas_ha.shost); wait_for_start(ihost); sas_resume_ha(&ihost->sas_ha); diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 77714a495cbb..2d29154ca8ef 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -162,7 +162,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) struct ata_port *ap = qc->ap; struct domain_device *dev = ap->private_data; struct sas_ha_struct *sas_ha = dev->port->ha; - struct Scsi_Host *host = sas_ha->core.shost; + struct Scsi_Host *host = sas_ha->shost; struct sas_internal *i = to_sas_internal(host->transportt); /* TODO: we should try to remove that unlock */ @@ -235,7 +235,7 @@ static void sas_ata_qc_fill_rtf(struct ata_queued_cmd *qc) static struct sas_internal *dev_to_sas_internal(struct domain_device *dev) { - return to_sas_internal(dev->port->ha->core.shost->transportt); + return to_sas_internal(dev->port->ha->shost->transportt); } static int sas_get_ata_command_set(struct domain_device *dev) @@ -584,7 +584,7 @@ static struct ata_port_info sata_port_info = { int sas_ata_init(struct domain_device *found_dev) { struct sas_ha_struct *ha = found_dev->port->ha; - struct Scsi_Host *shost = ha->core.shost; + struct Scsi_Host *shost = ha->shost; struct ata_host *ata_host; struct ata_port *ap; int rc; @@ -822,7 +822,7 @@ static void async_sas_ata_eh(void *data, async_cookie_t cookie) struct sas_ha_struct *ha = dev->port->ha; sas_ata_printk(KERN_DEBUG, dev, "dev error handler\n"); - ata_scsi_port_error_handler(ha->core.shost, ap); + ata_scsi_port_error_handler(ha->shost, ap); sas_put_device(dev); } diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index 8c6afe724944..15cb9965faa2 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -170,7 +170,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev) { int res = 0; struct sas_ha_struct *sas_ha = dev->port->ha; - struct Scsi_Host *shost = sas_ha->core.shost; + struct Scsi_Host *shost = sas_ha->shost; struct sas_internal *i = to_sas_internal(shost->transportt); if (!i->dft->lldd_dev_found) @@ -192,7 +192,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev) void sas_notify_lldd_dev_gone(struct domain_device *dev) { struct sas_ha_struct *sas_ha = dev->port->ha; - struct Scsi_Host *shost = sas_ha->core.shost; + struct Scsi_Host *shost = sas_ha->shost; struct sas_internal *i = to_sas_internal(shost->transportt); if (!i->dft->lldd_dev_gone) @@ -234,7 +234,7 @@ static void sas_suspend_devices(struct work_struct *work) struct domain_device *dev; struct sas_discovery_event *ev = to_sas_discovery_event(work); struct asd_sas_port *port = ev->port; - struct Scsi_Host *shost = port->ha->core.shost; + struct Scsi_Host *shost = port->ha->shost; struct sas_internal *si = to_sas_internal(shost->transportt); clear_bit(DISCE_SUSPEND, &port->disc.pending); @@ -373,7 +373,7 @@ static bool sas_abort_cmd(struct request *req, void *data) static void sas_abort_device_scsi_cmds(struct domain_device *dev) { struct sas_ha_struct *sas_ha = dev->port->ha; - struct Scsi_Host *shost = sas_ha->core.shost; + struct Scsi_Host *shost = sas_ha->shost; if (dev_is_expander(dev->dev_type)) return; diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index adcac57aaee6..a2204674b680 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -37,7 +37,7 @@ static int smp_execute_task_sg(struct domain_device *dev, int res, retry; struct sas_task *task = NULL; struct sas_internal *i = - to_sas_internal(dev->port->ha->core.shost->transportt); + to_sas_internal(dev->port->ha->shost->transportt); struct sas_ha_struct *ha = dev->port->ha; pm_runtime_get_sync(ha->dev); diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c index 32cdc969b736..2ecb8535634c 100644 --- a/drivers/scsi/libsas/sas_host_smp.c +++ b/drivers/scsi/libsas/sas_host_smp.c @@ -114,7 +114,7 @@ static int sas_host_smp_write_gpio(struct sas_ha_struct *sas_ha, u8 *resp_data, u8 reg_type, u8 reg_index, u8 reg_count, u8 *req_data) { - struct sas_internal *i = to_sas_internal(sas_ha->core.shost->transportt); + struct sas_internal *i = to_sas_internal(sas_ha->shost->transportt); int written; if (i->dft->lldd_write_gpio == NULL) { @@ -182,7 +182,7 @@ static void sas_phy_control(struct sas_ha_struct *sas_ha, u8 phy_id, enum sas_linkrate max, u8 *resp_data) { struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); struct sas_phy_linkrates rates; struct asd_sas_phy *asd_phy; diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index f2c05ebeb72f..8586dc79f2a0 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -183,7 +183,7 @@ static int sas_get_linkerrors(struct sas_phy *phy) struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number]; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); return i->dft->lldd_control_phy(asd_phy, PHY_FUNC_GET_EVENTS, NULL); } @@ -232,7 +232,7 @@ static int transport_sas_phy_reset(struct sas_phy *phy, int hard_reset) struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number]; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); if (!hard_reset && sas_try_ata_reset(asd_phy) == 0) return 0; @@ -266,7 +266,7 @@ int sas_phy_enable(struct sas_phy *phy, int enable) struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number]; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); if (enable) ret = transport_sas_phy_reset(phy, 0); @@ -303,7 +303,7 @@ int sas_phy_reset(struct sas_phy *phy, int hard_reset) struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number]; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); ret = i->dft->lldd_control_phy(asd_phy, reset_type, NULL); } else { @@ -339,7 +339,7 @@ int sas_set_phy_speed(struct sas_phy *phy, struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost); struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number]; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); ret = i->dft->lldd_control_phy(asd_phy, PHY_FUNC_SET_LINK_RATE, rates); @@ -438,7 +438,7 @@ static void _sas_resume_ha(struct sas_ha_struct *ha, bool drain) /* all phys are back up or timed out, turn on i/o so we can * flush out disks that did not return */ - scsi_unblock_requests(ha->core.shost); + scsi_unblock_requests(ha->shost); if (drain) sas_drain_work(ha); clear_bit(SAS_HA_RESUMING, &ha->state); @@ -468,7 +468,7 @@ void sas_suspend_ha(struct sas_ha_struct *ha) int i; sas_disable_events(ha); - scsi_block_requests(ha->core.shost); + scsi_block_requests(ha->shost); for (i = 0; i < ha->num_phys; i++) { struct asd_sas_port *port = ha->sas_port[i]; @@ -641,7 +641,7 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, struct asd_sas_event *event; struct sas_ha_struct *sas_ha = phy->ha; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); event = kmem_cache_zalloc(sas_event_cache, gfp_flags); if (!event) diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c index a0d592d11dfb..57494ac97076 100644 --- a/drivers/scsi/libsas/sas_phy.c +++ b/drivers/scsi/libsas/sas_phy.c @@ -38,7 +38,7 @@ static void sas_phye_oob_error(struct work_struct *work) struct sas_ha_struct *sas_ha = phy->ha; struct asd_sas_port *port = phy->port; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); sas_deform_port(phy, 1); @@ -66,7 +66,7 @@ static void sas_phye_spinup_hold(struct work_struct *work) struct asd_sas_phy *phy = ev->phy; struct sas_ha_struct *sas_ha = phy->ha; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); phy->error = 0; i->dft->lldd_control_phy(phy, PHY_FUNC_RELEASE_SPINUP_HOLD, NULL); @@ -95,7 +95,7 @@ static void sas_phye_shutdown(struct work_struct *work) struct asd_sas_phy *phy = ev->phy; struct sas_ha_struct *sas_ha = phy->ha; struct sas_internal *i = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); if (phy->enabled) { int ret; @@ -131,7 +131,7 @@ int sas_register_phys(struct sas_ha_struct *sas_ha) spin_lock_init(&phy->sas_prim_lock); phy->frame_rcvd_size = 0; - phy->phy = sas_phy_alloc(&sas_ha->core.shost->shost_gendev, i); + phy->phy = sas_phy_alloc(&sas_ha->shost->shost_gendev, i); if (!phy->phy) return -ENOMEM; diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c index 7893c462169a..e3f2ed913419 100644 --- a/drivers/scsi/libsas/sas_port.c +++ b/drivers/scsi/libsas/sas_port.c @@ -28,7 +28,7 @@ static void sas_resume_port(struct asd_sas_phy *phy) struct domain_device *dev, *n; struct asd_sas_port *port = phy->port; struct sas_ha_struct *sas_ha = phy->ha; - struct sas_internal *si = to_sas_internal(sas_ha->core.shost->transportt); + struct sas_internal *si = to_sas_internal(sas_ha->shost->transportt); if (si->dft->lldd_port_formed) si->dft->lldd_port_formed(phy); @@ -108,7 +108,7 @@ static void sas_form_port(struct asd_sas_phy *phy) struct asd_sas_port *port = phy->port; struct domain_device *port_dev = NULL; struct sas_internal *si = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); unsigned long flags; if (port) { @@ -211,7 +211,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone) struct sas_ha_struct *sas_ha = phy->ha; struct asd_sas_port *port = phy->port; struct sas_internal *si = - to_sas_internal(sas_ha->core.shost->transportt); + to_sas_internal(sas_ha->shost->transportt); struct domain_device *dev; unsigned long flags; diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 94c5f14f3c16..86b5d6b87282 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -279,7 +279,7 @@ static enum task_disposition sas_scsi_find_task(struct sas_task *task) unsigned long flags; int i, res; struct sas_internal *si = - to_sas_internal(task->dev->port->ha->core.shost->transportt); + to_sas_internal(task->dev->port->ha->shost->transportt); for (i = 0; i < 5; i++) { pr_notice("%s: aborting task 0x%p\n", __func__, task); @@ -327,7 +327,7 @@ static int sas_recover_lu(struct domain_device *dev, struct scsi_cmnd *cmd) int res = TMF_RESP_FUNC_FAILED; struct scsi_lun lun; struct sas_internal *i = - to_sas_internal(dev->port->ha->core.shost->transportt); + to_sas_internal(dev->port->ha->shost->transportt); int_to_scsilun(cmd->device->lun, &lun); @@ -355,7 +355,7 @@ static int sas_recover_I_T(struct domain_device *dev) { int res = TMF_RESP_FUNC_FAILED; struct sas_internal *i = - to_sas_internal(dev->port->ha->core.shost->transportt); + to_sas_internal(dev->port->ha->shost->transportt); pr_notice("I_T nexus reset for dev %016llx\n", SAS_ADDR(dev->sas_addr)); @@ -410,7 +410,7 @@ static void sas_wait_eh(struct domain_device *dev) spin_unlock_irq(&ha->lock); /* make sure SCSI EH is complete */ - if (scsi_host_in_recovery(ha->core.shost)) { + if (scsi_host_in_recovery(ha->shost)) { msleep(10); goto retry; } @@ -440,7 +440,7 @@ static int sas_queue_reset(struct domain_device *dev, int reset_type, set_bit(SAS_DEV_EH_PENDING, &dev->state); set_bit(reset_type, &dev->state); int_to_scsilun(lun, &dev->ssp_dev.reset_lun); - scsi_schedule_eh(ha->core.shost); + scsi_schedule_eh(ha->shost); } spin_unlock_irq(&ha->lock); @@ -925,7 +925,7 @@ static int sas_execute_internal_abort(struct domain_device *device, unsigned int qid, void *data) { struct sas_ha_struct *ha = device->port->ha; - struct sas_internal *i = to_sas_internal(ha->core.shost->transportt); + struct sas_internal *i = to_sas_internal(ha->shost->transportt); struct sas_task *task = NULL; int res, retry; @@ -1015,7 +1015,7 @@ int sas_execute_tmf(struct domain_device *device, void *parameter, { struct sas_task *task; struct sas_internal *i = - to_sas_internal(device->port->ha->core.shost->transportt); + to_sas_internal(device->port->ha->shost->transportt); int res, retry; for (retry = 0; retry < TASK_RETRY; retry++) { diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index d5cf563e9094..43ebb331e216 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -414,7 +414,7 @@ static int mvs_prep_sas_ha_init(struct Scsi_Host *shost, sha->sas_phy = arr_phy; sha->sas_port = arr_port; - sha->core.shost = shost; + sha->shost = shost; sha->lldd_ha = kzalloc(sizeof(struct mvs_prv_info), GFP_KERNEL); if (!sha->lldd_ha) @@ -470,7 +470,7 @@ static void mvs_post_sas_ha_init(struct Scsi_Host *shost, shost->sg_tablesize = min_t(u16, SG_ALL, MVS_MAX_SG); shost->can_queue = can_queue; mvi->shost->cmd_per_lun = MVS_QUEUE_SIZE; - sha->core.shost = mvi->shost; + sha->shost = mvi->shost; } static void mvs_init_sas_add(struct mvs_info *mvi) diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 0ffde0bcd737..8ed3bb1f698a 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -654,7 +654,7 @@ static void pm8001_post_sas_ha_init(struct Scsi_Host *shost, sha->strict_wide_ports = 1; sha->sas_addr = &pm8001_ha->sas_addr[0]; sha->num_phys = chip_info->n_phy; - sha->core.shost = shost; + sha->shost = shost; } /** diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index e54bcdc1ecd1..d42bfdff7812 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -333,11 +333,6 @@ struct asd_sas_phy { void *lldd_phy; /* not touched by the sas_class_code */ }; -struct scsi_core { - struct Scsi_Host *shost; - -}; - enum sas_ha_state { SAS_HA_REGISTERED, SAS_HA_DRAINING, @@ -358,7 +353,7 @@ struct sas_ha_struct { struct mutex disco_mutex; - struct scsi_core core; + struct Scsi_Host *shost; /* public: */ char *sas_ha_name; From patchwork Tue Aug 15 11:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353744 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEE11C04A6A for ; Tue, 15 Aug 2023 11:53:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236886AbjHOLwv (ORCPT ); Tue, 15 Aug 2023 07:52:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236907AbjHOLwo (ORCPT ); Tue, 15 Aug 2023 07:52:44 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C8A1C9; Tue, 15 Aug 2023 04:52:43 -0700 (PDT) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FAbNG2022039; Tue, 15 Aug 2023 11:52:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=PTSSjSgdanlQ2BRLdGmnjGmOraXs/HieJrziVIdEdNM=; b=WmE0LiSxJEfO+oOd6dp1O7Zi2TYxIPS3+H8IBgXWUTNSlh2AcLuJmXa8dRXRf7ynqVhO 5gN+hYaROA8K+wZKp5wdOrqlDpHW/bcsr6XiYkQZcn2TyeYXDdKONyE9pkv7f3b82pHF 4fsnCcj1zFAAGnKwvgDLFwaRkW995Ms9f6mNk5/psJkeYg16mfnMbCjpDxI7H+BFVjJ2 RUS9u4YXZxwRWtxQhV/7h0UPmzHvw9PfN/PsfMbjihIaSXOe3B5QyLjDe2YsGohZas2M 1Fvd2ViE/gPy0DCz2jxvOqUqRTXxgc1uv1XJGSXSr3NHjOuUdoQQCObFvPoXK5gVl0CL oQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se30svgre-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:30 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37FAs7YI040345; Tue, 15 Aug 2023 11:52:29 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2104.outbound.protection.outlook.com [104.47.55.104]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0qquvp-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UnJfS6+gAMGV+aZspNu/fkzFdy7vh+LzdNFX4shwTv2O3m22+i9krFsX7/q4QQRGaAwDH1GFUFapLej/5vEjf8CIpVySxWfjzKJRzslzcg23mF7afknP2NloOP9f6fQsOYTWtLQrHxJc2Wk/ad8T5GoJWiYL/nLbYkaB3kQBdnbyrNVLmYPlFMbSs2xLsCCoLBzO3Q9rDFbutPoriPFWlCR6Mzckwx6vQ1PXtBGcSTXc9eKc+l1AQ54AWNdQHcYXXQp5VJ61jQzKINkEWGqkLRSsJieeobhFej9k5h+lTwXgEGtFiuYQAddOlgzCYN+OyloBQCJv6fDN4kOyfG792A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PTSSjSgdanlQ2BRLdGmnjGmOraXs/HieJrziVIdEdNM=; b=GcB00X36sCNlTmSVaUsYWq79DLeONrr4GcjJcWPEZollBRT68NinJBMJ61ZjsNZi5H+2qkakrhwzu+1XoI8nJNBHnyvJb6Hfi2tQfwebIZRoQrK3qdk8RMwPLXUrKCKxno4Bh0es2bUf3bAmJFvbYJbv3VUfO3lBFHmjku/H5x4d/q6r9cyLN7vZLEGjPvV7hLDo0m6A2m7vDL/NZXmRLZPtScO2BnEyTLZBhVhySIlfzqiefhv8K9Q04BlXkFi2Dh60bfQ8/lzHo3mMsxcqF5LUePVX83CihphSL6lfo9R32SLEKzlji/mzmmQNP3EuF6kjVtAtpgRZY8LYttGfng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PTSSjSgdanlQ2BRLdGmnjGmOraXs/HieJrziVIdEdNM=; b=yhukldPuC7LUBQgH4yilAswDxow0Quhiiy/rEezw2d5moOUXD4x/XaQLaw2WFCG4mp9cYaK7O3p1asdEVIJirXUtTzHRlwHNVwOWb0KD6BStWv5BAICHf/q7kKHV5+VwQ+fqWGuNrus2ftlkzSHsZfyZU5KXMYpIC1zjXRye18U= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:27 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:27 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 05/10] scsi: libsas: Delete sas_ssp_task.retry_count Date: Tue, 15 Aug 2023 11:51:51 +0000 Message-Id: <20230815115156.343535-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA1P222CA0067.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2c1::17) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: 804f001d-886f-4131-2111-08db9d861900 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JO8rYtTsBCw0mJxqSRctSh0eZIT80/NYHzxn7Y2rkzM0FVEICUcwRhwFKXIthpTURaWeDzQJBKpw/Mr+Xd3uwmgw7Bqs81imeCX5Y4R5A+HZCHi21f/2PcJswuqIx88S+TLpfI0vYOh/OJ/tm+kRoUnERMN6nrx9esuhFiyuVnbnjcMSyH0rJD3npq1plZ4WaFFIZ9O2WMjghtjya57a3yuCG1LseWg7eyKUumHnr1SNbJb8RzNsK8V2AIjBVUCnQlOtuRILR8lRnlAVIrMf8nHS/TbamDYclVUc9f3LCoMiR++R+PMLPTSvi3toshrPu4Ol4SzLRZhZm9FgpZ9Oqn0I8HfluKFk4Zkf9btzWWbyjS6Icefxi6LjmN8ubD6EAO9LeoT/z6LvFEqHWwmcsfL8DgiXjVJnynhaVCqmUqYY+Md9T5ncjwFmN5tg/RoldpjrUU9nARhTCY41vz3vvQUd5AGuGa1weVflvlbw0G2TXVq5ulqAVZP3+Ci/heQ+0SLEO1POK+ewWULLkC6qzYOLOSlaAH/fHUdSII1hmhgm+yAzNj4hNndop2uu0FZK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hNhyjdhpbB9Wymf38jlmnHc73XXog/+oUka+Pm5oa+py8Xm3/Pc1/Y5P9zdm8vuQNTQD1m3k+eT5a7ss2oMgxN7ILVP9I4w0yXX79VhKYr8HuSDDTtjv2wR40mMoMe669v/EDtdXBYX4rB0oJ5SxJNT9qu0TivEBIfHNjrAof0t2VsrdkNki6NMUsucoPI8UbA92AfCQ+bmAQzyXi5xzIEUoDHAmg1oamAscYixM0ulqFedZu5Jz4PPmyX7B0a0TSBGl7aZ8HjLL+3NP+y54iS1ibRSQEjt3j3MuMf3hlOeEI8WDLBwqUA3lHp3F/+nqwHq8W3Dbzj6uZcrSIzmKaq5UJgyNV83CwW8MTpBHtuHOOuKPSMpulSWlV0Geq/Tj1WQKLb45i4y5I3pFW9/hs2GxlosnKkkluVFaxvaY+CseZRDS4wYeRiXXxUQ3rtQeNhpCjnY8DUr1qswuGx9W/bk+kEZWTrwwJ51WYKf6vg5/z4QS4zODbhLRZZZYqy5VOhbwuhXEsS5RC1i5/xL++4YRByMnt8nCbtAMMHdhebniSd+CjjUGiz1XjxEAT9baTL8qwGFgTSA78K3ySk70axqZwqi7lISdUv8EEoVEhj3oPGJoy5apdNoR2SgY8oJAxn3BtDWKQWIAm7JpeqChiNOt6RU2XoxLq5YOtPV3xWs/qjzf3IoRMs1HmR85r7KYLCmaHuVhUgX9GvDm77HHXn0VIVVVix2R8nK/i0wQlQXEa7UDWF/aMtafrtfYhioPwQ8AdtrsYcXyD3B/KA3Otrr4ZXZbdQUUt3AEPWrRCtrtg126CQrZRstL2DW4mO6lLtNFuEOIfYbAGdIUk4XWMYUuH5ARm4wA0IN8NnHADOMzMQmXOtMnA9jHY4IK6+n5IqpucBhDvDToOQK95tWtAeR9rE/6pdDzrT8e5r+XjuOFoeAdm+fQ5lc/yztgvL+K/spHTFAKbM9InB1wa9gEIBsbluDa6ec1NLHXzoCxAGg1TFBvDzDNBzfuqQOB9pbo1GG3tcLbeVQVqlNXZwsNCPh0M5wcrJkMK4na9IbZ+Z+6ULVxAOdBWlKBlqpYiZ0ciWycq6FOsASw0p/MMgasQ5/9OMsJTvuNpJiPpsQ0dS/tLI79Ti6rfbqK8eFH1pX+wKQs3HwVkDronspyvgUJE1E3ftekhHkK7878EI02k3sudFsTrHV+N+fuz9NFw18yTPtxWagHGe+WYuOhX5Gqp2ME/EMK2uKx+2E9d+Jo95O727qnyyAZhf7rJm8Lzj3kRP6eid0CGI+5cqyfuBbEwSKGU4xyzhhfpZ2IF9aS0+auJu5qD0Jc6RmskMBiOeoZhh1K5Bbw7VAZm9uyTF5B8fDANYBI+EaSBh/aE2R6uwLDA7Wb3+LDyHSjOMMHUHDMTb3c5xjG1xYoh7+WHlFj+v+YRiL5azV2Qj7DCIWNmlNvh9tqOixUHuifVb1TVp7NVuLiDpS/ccyQwshMZrAFgXTSw9IY7bKL7ssycmcKZlYUpLrZddCiZyv+PuJSESk2PQy57fjNt4OAL2ygW6rTEsLAqF22ylELcGOap2aSiWk68MZkO9/3XapgizIZiVMR1KMn9l5yoUHoEVDhwfFR3A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mm5zFuHqUsQuRWNZSbZW8zX6zdNOQFq7MTTMV8UkaKtRRndwSq5mE+9LfVYLckNQ8+e1jpj4lpq1O3X2ELDWJQS4tReB+6ucEgG08A5z6M2aezL++Vea/2iTu2dZ57Ny2d/aRB3csyhVcEkfJ8430ShT6Ckm9q0742my++j1BpDYynLF/cdKmWJvBKrKr0doD3rGHL4YpW9t8ZspyZvCJiKmVNDe+pF2g0Ni+Hk+FSIY0ZR908laNwuPW5EhX6QZowOMIe3Z1LBlPVzPbzpTqZwsni81cM0fQolSAyIhiF2AzD83kCy7wnuH2jl2TJ4CqYrh/AtY28pAWSJm/2smceh8nYk97OuhDG8PW+jOrgoHSyiOmzLQZ1yqmUmxNxU3f5kaYjtHP+95ZhCgZb0JEaGQTIEqDqn4zJOu5l3uQHOsgf5cy30NAir361dxkWz1XE3pBxkRh2QV/JJmvPsdXQDueoNx3Sxjm6Pb/IjCnMjEy+eBfUvPo0jTm8RhrCf+fUTrS33IXERgg+qDuf/aWTrjXYrf7qR1VA0mfpR0wqWKH9VBKldXDwj0hNVo7vDc4A9p0gu2YEVsuqKkGDUBTQmAjtPBSmyd/IE+fhQNPUCBoZHfXuvCwxdxXHAQPYPOBU9NMoXENe3H8txLXky07ODggzBC3nUGwVtZebGITe2vD1YLkAcB6BkvShCB4QrTPoKU88xPJfn59bRKCBICnrdydnvA1lH3eEiIvbSC+1uSEZ2LE/By4KIRkX09dKcb1VcXUs33A4jHpAzO6XElUPSxwYFesyuKBPZr72zCdGJumfdI05NWZViR6+wxtTVl+87Sdhh8IvfRJ/pyBoMXZB/A6l/+D9BPrXsqN+5wB5gT9r4RNJLAXsvPI+Xxgezvc6UUSToHMkWt1z8EruU08Ng/TJB4x5e7WlP3IU+gv+84ROCeTcZZB/nxUym2h0QAZUwCpGrNYeZ6yAX9d9+5iQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 804f001d-886f-4131-2111-08db9d861900 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:27.5023 (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: zRnb+CcpnMhpdUHBZE2r9SeYcYx3kmvJZP07JokZME+X3VRPuDLdse9KR+CtA1TLh/oelJK2fLlxwtifVj6KiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-GUID: wrsA0_ZDIIE2ri4QLEZKjpuedy3lvwpp X-Proofpoint-ORIG-GUID: wrsA0_ZDIIE2ri4QLEZKjpuedy3lvwpp Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ssp_task.retry_count is only ever set, so delete it. The aic94xx driver also had its own retry_count definition in struct scb sub-structs, which may have caused a mix-up. Signed-off-by: John Garry Reviewed-by: Jason Yan Reviewed-by: Damien Le Moal --- drivers/scsi/libsas/sas_ata.c | 1 - drivers/scsi/libsas/sas_scsi_host.c | 1 - include/scsi/libsas.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 2d29154ca8ef..ed9af2b401ef 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -201,7 +201,6 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) task->data_dir = qc->dma_dir; } task->scatter = qc->sg; - task->ata_task.retry_count = 1; qc->lldd_task = task; task->ata_task.use_ncq = ata_is_ncq(qc->tf.protocol); diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 86b5d6b87282..0c103f4523b8 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -142,7 +142,6 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, task->dev = dev; task->task_proto = task->dev->tproto; /* BUG_ON(!SSP) */ - task->ssp_task.retry_count = 1; int_to_scsilun(cmd->device->lun, &lun); memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8); task->ssp_task.task_attr = TASK_ATTR_SIMPLE; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index d42bfdff7812..d8222c442640 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -563,8 +563,6 @@ enum task_attribute { }; struct sas_ssp_task { - u8 retry_count; /* hardware retry, should be > 0 */ - u8 LUN[8]; u8 enable_first_burst:1; enum task_attribute task_attr; From patchwork Tue Aug 15 11:51:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353752 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBCFDC04FE0 for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236985AbjHOLxe (ORCPT ); Tue, 15 Aug 2023 07:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236926AbjHOLw4 (ORCPT ); Tue, 15 Aug 2023 07:52:56 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04D2EC9; Tue, 15 Aug 2023 04:52:54 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37F4pcVu024651; Tue, 15 Aug 2023 11:52:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=qfJomhwqcZ2tSlEKHB3KFaex2MigG/i5X5eY9iK4upA=; b=sO+F33hB9DIPvIv4aA9mq1RxWvbjNlPC1s8TaYKQYveNShVyrT2PAr3tTQQ0TcxCMQ3V 1l28TEwZ8Ui/4UWByMG0YuPeFuuxxlMYX/G8PvhYopCnHTGhh9xVQVW2fs1/NMf5ki2H 7LuoUxlMizMXcyOQeGKqvW7ux+MWBf46iyK6TvkE+93BxwfEWzABD7g+xZYo6rzGsy59 b5IBnusjipBgWqRR/MVOtmo4lyk6FkjfuoBk/lTWoqCU/rVHd/XjgBqo3W9dwqAIFQVJ b1JaUaMB6O/Y2q6PemPCgrikFjKsNc4cHNPGvF0KBE8zFMky6eSGp/WRkvShoHI73FTb Zw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfmg49-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:32 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9MGWJ027586; Tue, 15 Aug 2023 11:52:31 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey1rytxn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AMf3YR4uL3DUaYTRuOfoWBvZ8h41lgJvDarHAGi9mHj3cGxWgQMaDjZISVvRyq5yX/Ugrt6Wt5x4kkWzk54KHlR+CIrU6xZt12bQxvIcdqQ98QiF5utl3r+6OWDqHzPjIlYj2aPW7HKTf48fkiYI4zv4K5EY9u1SLqL5irEvuM2G5yVyiv381oQp9wIFemm6HeBLCxIVMuZsI9oJJpikGYj2Ze+R9z53Ju8yAWYhKYuZfjHQQPLHU4szMiG8zKV7fqfhfA8JEyW/7HxsK2/59KUW47EXLsgeVomdiC2zLfrt0Doy7RRu1EXJBUHRdyYqM5fBt0s8AzgTewwzXUuA7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qfJomhwqcZ2tSlEKHB3KFaex2MigG/i5X5eY9iK4upA=; b=nhYO9B54I44ZwcAhjhwetZkxMqL5t+ZALoyyk9peCe6nmv9HxdjkJweJXrOKoCAwj2ODnYzHN7qLMCDbAhp36kp7ptv0foV+8Gl9PMkq7gITqkwqKuKLwjMec9IX5tyxx5odvycXhwwf2aKbBvrF03jJ4L3I2QJ14Wd+a2wjnJb7dqgZyGLBGYLQSf9iJIH8jbCJ59uMsIn3CfbBCFgCbqj7FrYIBG6BwqTN1BcufkF3zuWbiGi8fkjGPjCmuwfk7xqRpXZiQlE9B+1uebUiTEeaQ2vIYlCpBfAFCmnxtLJjgqPNxnoIFOXy7otlzOoe0JKJMP7XU/15iRd3RUevrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qfJomhwqcZ2tSlEKHB3KFaex2MigG/i5X5eY9iK4upA=; b=PoC6lVMDs4kIhijjoziZWiHIhnGZolqEhW6MnpgxwhNJyW3HIbgdcJEL2YlymVMMEkxS/pmtnfpkfcsnwF33gwRi01PGH4KOGR+hUUCuuyhWz09vAI+tu15CLp288A1P8WFtkDplYVRtOpzU6OvZY2lQuwqCl7UeNn0Ms8QmOFA= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:29 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:29 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 06/10] scsi: libsas: Delete sas_ssp_task.enable_first_burst Date: Tue, 15 Aug 2023 11:51:52 +0000 Message-Id: <20230815115156.343535-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA1P222CA0061.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2c1::14) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: ca62df22-9bec-4026-6c34-08db9d8619fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XTESEXqgi013wS+MXRBKY+yQ6DN5AARnzhSkFvcCUQVXq3S09EhoQYiK2WXoxhcMftVWVPKS1ki88KJFPLv+TxvGW+K/kG3ayESTeQ1/d+5JmVsVOTqMufar4fvgZJsPGGnlMalzXkEWnS+JtyxgR0/1PY1+cW2B/mZM+ekd6UuWwEo8PL5GNtQIO7RORxFtZT3GXzTs4k3PtqykyWkr6OUrRmVBdjJle+0d+xlvsalP2vrCjPzLqdheloSnHgmStLhG1BxfQQzCME0ENzZlhcJj7NZ/D4dY7XEFr1Nc1e09bgTdhCsWRJvowC4rcG0xik40EY21AMO/SMbXCUQWKCnr31pO7Q5NYJ1ZrPmqxQe7JA/duMIAUpD9ry5OcvQZeIF/q24lfCwCysuDMhpUQI3TcnxuA2egWjQ7h7XDkDEZkuZsuSJMYf84xO90X2jlMYSLtKnvgeoLU5yw2K5+3zLdevQztoOLUeb7t+0aeR58u2tUJQaWy8SlI/Gqyku8mdPV3T2kBZ2rOI7G2fD2hdhZYDf5RNVcpbkFj6fDfUQOY6pKTYNRCDvp+mjlH5jzUycrpevJsgWQBwpFhPzAIDrkzjwfu+YAGqDAj2bLfQPiTAiUHF7feiO3PdQSUJXM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UU7+ifz79LcZOKjpCVJ8eaQw180kVkhLBGbLKI40jSRgQMYmKfxQat63e7zXSJtOPUEa/OafZqc6ifusoCZULnT9b1TudlfVENmGUnPPh/XsaFJwcSQh/4V0cPDwW4ErDVOhBAuCkD/853fih2wrGCEM98LKj6KnwtVJdTPZPuxxazl2/cH88vzlhggOdpyxaU/juFM2J8XTWJ5P2f4pnCsmz3aROH4hKZYUt0gynHV7nrSSuuiHTOoR/vD4QumvFNQwPoG/hy/q3uC/z4hIa9jhunfZQvHep8bV08Xs5+KcTaIxo1V53TA8Y9afC+ZiJGNfjJSSGfzq8wOX5CIxbs2YmwTNyifcGVpLml6l87UpJBu1w0iX3vYheVXEKB3OabTByIQ2nv2PR7TymBL2wvA/Sm63N5gG6AGbJS/6i+YWDQWcaUBv4OZ6p7zxWySPb89xVZMFMja6tEHp8qtXz5yjH0Q5vQr5SUFhwYTFI0qBZCdRsWtndttCs/GHONnmeYaBdimW5AI6xsYQTcmWIV+U0AJwPcnaPGrl1NUnZ3X1Q30p7KjkMGcdHJGgzJ7+ZALltz+q19Jj9gyJ55QoPK1AgPb2iRr1eMh+Ori6H6ZorFrHwuxmpkSr/GNhvKwZ50BBMQq8bj3WX276Z1a67aozbs3OA4pO8S7Qh/pkYQxTw1kBLfXKcsCE+oTGOctgOR21X3WB+OJ+kg1r7egaMdb6uXrqpw6NZBXcAPotcxSORy/Jf0X72eHvz/JZ1GQFQ9/nFobIOeL4qmkyKa5yW4XlbZsNTRcl3nYAUi8TCs5mN+kEg2Px09CfcTH5yNug2/2Ax7y/1Hun0+IlQotlbKuQbYiSfiUUbJmVY/iRYaVYDhT5mW+2htlyxwF1T+4+5sIl6GERngh5i4UEatJAV/hZkdN6UUvKt12wkjO0Y7DtM2mwiZKJOw4A/o0dQnsvKyMHbDi3B2ndDJed7U7qigKwH0JYSxoadqEMZSXQibChIhqX4OrWdDZbDxqDWCl5qL+Tpv7Xx7ntoNbtDipCdODnF/ohYpHg+GZOcugIPLPtzZqqXnVyiBlbhW8tKjHsue/2RwxMpUbTmaY23qb79O1YBJjqhJ7V4AeaSZWRavDQMLT8nED8YZ4BZ3Le6oDFZ69bDralNc+m4AIp6qMWLGbZ7ANygsJE+H44QDYDREx+WfJWF/4Av1rF8pDFrFWOZPffPi1nmQ+XgaETSHiHMKyTcfHz+eoaH32+3ViFD20u0Ihck2gR6Zg+nBDW4CJLj9OQi9DSHIptCJeRKbt7y+DR+lXA6b6zp1L8Ye46+pIn5L1xGiZSzvnXFUmM61oTvAUR7AshtguJh2OiiQTIz/hbAavWUI3k4a5GaPLnMn66Z8j7D0dYFXgHDwSFcQSh0Pq34PT3eoX32MceR4N43/RNIPsmoy0SdtXpJw0ZYMpgm4c/k/L/CcjHmbhKnLJ432EJY+zVUZqwm/xDqEV1dQvYFlGG8Sm6bwn7SaSH4BVvmIO7ZuFfalCfZSZZeV2NEEqj28A82YlsBIzrIl0I+CUhHQe5NrdE23HZVqbXiYOIt+Gr9xBy2mVikRL3HeoRAjFgml+Tq9BntMmK4uocjw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: K1snnWzKhXHjuodyW8wY3EFwSZ3eW2LNxJ1Hb6HI/5+PLA/c12RcacnkP/OJqSlaaZ2VdejxJK7JfHAzbZZb0osGJs/jIOTnc1PAk527Nvj5phBJowRHi/7L732mCOChT/B2t2ESXAXBYoc51QmgXMc2STxc6wbT7aE/AAKbKMo2HrI2cKbqOA06RqfgmPxZpD1HLI9S+DX2S8w5AQgRvljdvhERvn+MEBxS7HHGFf0gXqmuVC806ceCbjkdcTOQHxQgxbaZ/xMbc4OOLoEONTfS8j5yrKAQa0qltYgOfeVW/8xtLwr+9FtbBUZEWqcPfY6xnf3Em/z8wfx/mhLRjNDC1yZzNO4h8fScl1TAmh5hipY/DnMyveiSpSuy/uaZW3uxvLI4oXPkmwbrkDhObQgoFUEnV1naW/DZeX5p8FQWqI0JgVCGIc+FKuBSY/VZZ62E4nMVag3fROFJu6LEpxjx/OAWW8d4qPYr8CV/KrXPg4SXvsjIiIibg/WpYtJS7Y60PteK6Ct+ktyRb3YU0JK8q415gY+L+4dVievdPwIpP/q6+WOjoWiWUFlmANbAvHxo2agcpM0yHAFBEYJU9AZcNzyyi3xhsgzou8p/eiohMUT5qR9ffLPvagfEVFffJpl9IwYDw3+B3MBDF3QxThXAGzbUVY/mhuoCW1Jub173CE9aHL27kYJJeHNrD8MKwsk5a1IFBFwOnlIIwkyh7mserVenSWnvDGaFvfobxXni321955f3jzQtt3je0yJuBwD1xaShmvwVg8Ap/I2gPRIi7wojLcezIX9JiemirD/vpbpAj3bTHC9VWker0lpRZypxDtpbGoWnPZNiFiHA/r1nX+9azqXVTV/hxd9q+AbUY38aoIEq8RL1wMAQeHwg4EbOq24OyQ0RcjQ++p46EUh3BH27zlwHYbbfYxQF+08acUBevE5X/i4cUFuueE4UWIVL68L4bhD/bkW8m+nCfA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca62df22-9bec-4026-6c34-08db9d8619fa X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:29.1238 (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: hX68sha2KJ8QcZj2ULc+wjcuJIWSWCsu2yP61gR/zzmpyAKYwwBJqZUqXUJqNsGa+q9zcuXoEniO4aq/K9cqNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: hTfhqbS55sOwSK47O2HbjkAoBfy9swbB X-Proofpoint-GUID: hTfhqbS55sOwSK47O2HbjkAoBfy9swbB Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ssp_task.enable_first_burst is never set, so delete it and any references. Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_task.c | 2 -- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 8 ++------ drivers/scsi/mvsas/mv_sas.c | 8 ++------ drivers/scsi/pm8001/pm8001_hwi.c | 2 -- drivers/scsi/pm8001/pm80xx_hwi.c | 2 -- include/scsi/libsas.h | 1 - 6 files changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index 7f0208300110..1ac4d3afc1a1 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c @@ -485,8 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task, scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF); memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8); - if (task->ssp_task.enable_first_burst) - scb->ssp_task.ssp_cmd.efb_prio_attr |= EFB_MASK; scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3); scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd, diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index 94fbbceddc2e..d4e3c3a058e0 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -960,7 +960,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, struct scsi_cmnd *scsi_cmnd = ssp_task->cmd; struct sas_tmf_task *tmf = slot->tmf; int has_data = 0, priority = !!tmf; - u8 *buf_cmd, fburst = 0; + u8 *buf_cmd; u32 dw1, dw2; /* create header */ @@ -1018,15 +1018,11 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, buf_cmd = hisi_sas_cmd_hdr_addr_mem(slot) + sizeof(struct ssp_frame_hdr); - if (task->ssp_task.enable_first_burst) { - fburst = (1 << 7); - dw2 |= 1 << CMD_HDR_FIRST_BURST_OFF; - } hdr->dw2 = cpu_to_le32(dw2); memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (!tmf) { - buf_cmd[9] = fburst | task->ssp_task.task_attr | + buf_cmd[9] = task->ssp_task.task_attr | (task->ssp_task.task_prio << 3); memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 9978c424214c..165f46320bd2 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -564,7 +564,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, void *buf_prd; struct ssp_frame_hdr *ssp_hdr; void *buf_tmp; - u8 *buf_cmd, *buf_oaf, fburst = 0; + u8 *buf_cmd, *buf_oaf; dma_addr_t buf_tmp_dma; u32 flags; u32 resp_len, req_len, i, tag = tei->tag; @@ -582,10 +582,6 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, (phy_mask << TXQ_PHY_SHIFT)); flags = MCH_RETRY; - if (task->ssp_task.enable_first_burst) { - flags |= MCH_FBURST; - fburst = (1 << 7); - } if (is_tmf) flags |= (MCH_SSP_FR_TASK << MCH_SSP_FR_TYPE_SHIFT); else @@ -667,7 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (ssp_hdr->frame_type != SSP_TASK) { - buf_cmd[9] = fburst | task->ssp_task.task_attr | + buf_cmd[9] = task->ssp_task.task_attr | (task->ssp_task.task_prio << 3); memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 73cd25f30ca5..18070e0e06d5 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -4053,8 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len); ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id); ssp_cmd.tag = cpu_to_le32(tag); - if (task->ssp_task.enable_first_burst) - ssp_cmd.ssp_iu.efb_prio_attr |= 0x80; ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3); ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd, diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 39a12ee94a72..ad5a73b86415 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -4316,8 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len); ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id); ssp_cmd.tag = cpu_to_le32(tag); - if (task->ssp_task.enable_first_burst) - ssp_cmd.ssp_iu.efb_prio_attr = 0x80; ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3); ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd, diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index d8222c442640..d77db53cbd8d 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -564,7 +564,6 @@ enum task_attribute { struct sas_ssp_task { u8 LUN[8]; - u8 enable_first_burst:1; enum task_attribute task_attr; u8 task_prio; struct scsi_cmnd *cmd; From patchwork Tue Aug 15 11:51:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0969AC001E0 for ; Tue, 15 Aug 2023 11:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236903AbjHOLwx (ORCPT ); Tue, 15 Aug 2023 07:52:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236909AbjHOLwt (ORCPT ); Tue, 15 Aug 2023 07:52:49 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DA9DC9; Tue, 15 Aug 2023 04:52:48 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FB9Wka015043; Tue, 15 Aug 2023 11:52:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=lO2O8osdsKvir5+74DM8NQgNLYt4d1FN4qQDFHSBH/s=; b=ZAgzT5iaLMIBW1XsDvLcz/1h7s4m+FenSrk3zk6edUZi6jDSYTIylGf9yztzPCMSSTgC gAzhdio4LwfxK1Bp17SawUv3AfSezKnsp3ZXK079w1znt/rdPt03XR9tcSybCoSwz+zA KdH3EJ62EKUlmMxmqlP87e/h1dmF7X225DaCvn6+v0MGyr3+w9RgIkUUG7EQKfMROgrH bcz2Ume0AoW2SGeqzcRNqswrIE/kmsfptoL3Yktvj9Lthw4WDMixfXCQxej0RkQwp8fo TQEq6S48w+lTZdnogvkvZTzkBc2+SaQwLn0mBp1iHhsTTRx5s/X4MD25UMf6Y8OVUhpl DA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2xwmgka-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:33 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9MGWL027586; Tue, 15 Aug 2023 11:52:32 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2102.outbound.protection.outlook.com [104.47.55.102]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey1rytxn-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L/L1V5XRMGmikLiOZzCVtJO8vwAwYUOa4RfDWZtgW+N9UoWRTReI2/2hOQXJ8OGH0qsq0/V392RAQV03BrdHgDuR5z/TVQlLU5CO4tzmwtldtA9bq+9qpO/a1xo28/1x72V+FSU2JHHcNH1Ds4g11PEggsVW+SDe9W1jIc6oXSVQvxSthNmEl2NldwhwKoFmk4KolSCk4wuTU8lSl1omEWoA0YkM9eqLUfEfDm3rD5ZzkPdFmqJsunFFcjY2neCYws7Ak4/dj3FpuGf98WPxAQQR+0r23DzFwNZXPCsT3fbLWBdFMnrsBd9ppKGd8gGkxkhqZULSgJBxJ39REySp9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lO2O8osdsKvir5+74DM8NQgNLYt4d1FN4qQDFHSBH/s=; b=Ly/rOh2g5yX2un6TKSgh9pS9btZLBgu3fyHy8nCTM7mLLiwQwBngM2h9EAuHliF8BtxwMEEY1/jRV7K4byuJhkCl9yHIR3GIMrWfF3/YTx6XNx9I0iBbWwxn7wj9zFSrK5ap3siqA229GbdjEUzdPdw66QSgayBeIesU0xkuKqcJU0UcAks3Fc0KSZRP7CmF1IXglNhfdKLoohbM3Qo7hL+CNzUTnl5aH6UpjLPVzm85Hg6AYQup5ZmD3PsT12RD8bqacZTYfXe5c3q3fGtVd6NWCsWvPm0eqjfgXPPScv/44eGtOmTKDVq4kJ8oK8KlxwaCRWmk1UGy4W7Xr5JtMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lO2O8osdsKvir5+74DM8NQgNLYt4d1FN4qQDFHSBH/s=; b=QFMTG9fXbTUM/yF9Yy3i+WhyZh+zRXybg6tf0sW3V7+fE7gLchTVT67QoA/6JDnyvkcef9s1avGxJsvCKGiiHInfo/XhmhyndMEEznpTFxewT0xrPNJWegKiPr8g1gTS83e6fXgKLjJ/tksrkTjgur6rB67MHQdjRamT3+h2wSo= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:30 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:30 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 07/10] scsi: libsas: Delete sas_ssp_task.task_prio Date: Tue, 15 Aug 2023 11:51:53 +0000 Message-Id: <20230815115156.343535-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA1P222CA0078.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2c1::25) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: e25ad4e2-3752-4086-07b8-08db9d861ae4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: urBWE+OAW/lqwxWSqoHoHVU1OfgKf7gdLMpHXgPYhGRh8cGeAe9y+znbe0jB8bWJj4u6YqzXUJVrHHl77GbRnWBGPnvN4lTn/kZUu2DVw3anjVxymXrpeLCgwea7w+rFUXBxrwgIBwvxheHufQ3l2CpwSjZbvMcz6nceT/D9UskR8PXbUPsrqCVWI+Rx3miRhKvbMB3NTgb57JfjhFD8I0AYtXkXrz3r4vrQ+Ukde5HjCCAB9CJB6qhl0k0IFAA4WJxKjCPB1p7LobToszj/P/4Xp5O1MsrOwEDu3YsfQ7whK1fdkyJvcy/88wRHAkNZUOUz76WLSFb0xuQgfSjD8crJM06lhkJtgzWkSyyQyzyhYh84LdzPJZDWXBIy49xMVSKYkaqnsG6u7NV86rgvojE3FQvU7MVEB+9MXhOjGq/BiqD0lUt9p437hnn/mN+kZmgMBRa122HjzG+tTI7tTQZ05rY+7VWcBbXk4hskVchKm0f4cFHoF3lZmqBk7SJDRpckPfZt/e4nLMFNTBdaj7oCLi9veYjBad29k5RAWUU7YzddoRKHqkZqwuuxn+hw X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xKLJkeYeTxPf0GGwGBqy/ANF1gUvYW/7acPMV2SFsRx8Y3318mVNNEmpZg2PmbkazACfNpZ0nrN8XR/qdKMUk9P3ZEnXpyWb8CtqZ3SUWSq7hW2OnTmNkPDWtwUa8uFqCAlewarb62urgmiqJ64lsfLNfOT+0gEQX7JVKg1dKO0DRi7Y68FgcOjtz6yAsHH9jtoMU8EZeO1prBlRUwE64Z2qKhu3AvfOimMUXIKYTn6cm9deTqUGdJksPgVdzwqKzBub5aKpVeywVsnYIYKYwtGU33+h/mnXRJ1ei2NT4cm7tFC9dNf6MLdOs82kJH4hKqbCpY4gcJL9v9M6IoLGIg5hTykZIHEIF7/cJvlt7aOi76S1Eyxn2DeAusS01Gt06JbCboRdDGxaOs7IfmavMzoAn1mSI6buKOSgtyBskMfGVXn9+mU+jCeiLkyGrcehFXv+aJUivyIPZ9aQxyvEm6EheoMUdyNzflaoM57PfFYfZr3yxvbg03qeZQ5/qIsiQcZBXUUSPQHXMZTeMFwCkWWf8W6avK9j2jGJGTwu863ojF8WDEY1Vodh50At1tAFoh/+SCUHj5ISXuJ+sGuBvNnLECqWwWZkM1T6FkAzHP+aTd5Mcda8jBaOfnjBEZUMEHkxXi9uPmA/e925rJITxEp8pD7VJqAMlamDmRLwMfIwYr94AmOWFffs3FBLml/aWsvv+eZ5FmV9P+FvBERebYXlL7vQradMFuk3/OkplBxCNJ6QX7YTmn9OKUPiJhqqxi4gwQL3u2QzhcOCnE+4GSmQPUBcwRKYj6flYZsg+YFLbOE8Wf/qkW6LDUxQzrljfUqkhDLq9bxEwNK+EnOlUIoMWV1tQlU0JXYbl2k49+4wTDB7NihOor/6Ghitk8c7K6yjuvkiRZpElXKVfxhEP6NTWGUonfKsSeGIr5Pq5dLg+mQ+xfOmsD5QtfEd2P+vSZAmJeuOwRMzsn3Lt88xgo6YVtRvy95yIlZH+bN4/d+WjxAuOaYkXo5Scc0XhtbCbcG/FRosb1KDvFKND8hAAKZtEEfuC2V3n1enMqbhYCHNw8EMmx42BZ7gRH1XnWzGZ3zR2GRXXUUUmBtiuc/tKN2bIeocNa94odpzIp294BQxc3IiidH/58kXuwPmjJ953pOaysM2XJ5iWSOxwCP1MGRLenInJk/41CLXOoHdKlEAwMZOs4yeMBRYMxUF/zWPB8q0tqRsaGb8zLeZinKFtEuSWG8hmPTwzgkDKRhj5HbubcIMk4ph9nXZ45YnfW9Nnnn7KnwTt9hgXiD15qQa8n2dGw7q+iBkD/cpbPoMCreOXQMMzJ0c1RC+6zOoMUwplOXXJDkSB5BeDtEq1G3IiE5r9qbDcba6XqMh4eYIDzxfIH+xlyEMJvybQwRfK0K9MCxLBoJNNngjf074cosWo7x6Bz94xuyeR5oBHro9LNbC+uvLm7WDN/EsrFDpFwwUkAjZ89MdhW6gh+ZVOekyTOCXby0zXj8RstdsGwDg6PD+xil4pFbVTfiZ+78MLWi/NQTy5hlmBJNwSV+osgE/mMvzMeiwsMpegcX8YxAIuF6WhdVAvOvfQ6itgd4FwHGxyUBVR0+DcMCMZQYY8sdgKw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BBLBNBXZg7Kk/7fCm0HZQnkMFTyWD20+l+aMFL5p0haF67YvmSBK/Kc2lygsQ2OqwPiWeicsLkQZ1iltiNp3qoVQPC7RUFwgnRiDwNUKurKn7GM9IoFAjHgt/uKP2j+8hbo0dh1xTjJamv/mhn9ncNLwq8G0aFsLfcFBHTE+OIp5Zs/PSLN9FRo/2QTzVATSbE0UrXGWigjD/IZ8ib64nlTarr9EkUg+amrAizh/yNiHGgLsGH0FJ/FLvLwTUQaf7xzuF9P91kVNrEM0crEVSUeTG+/HLrCtSwvzu3eBskwe/X1d2qVVrJOVklvFvmoZMBsNdhM3JjcWFjdSTuZSLNuxyLpuy9+1jYbUFLVxjCT1mGcJ4Xnm1HZb/1AgfjH3PlelO5R9tZ1rNxTT+hdhGtoGljY+UfjpWszfizMUAxXrftNpsUBv+OH32gO+r5SOTOTutiRqjdRQiJZTsF36ct9kTquzGDp+74rtY1G4nfk0Cmwd2oVeInR4IlIQTpWqlV7+Fqmy84H0GpDfNGVqv5qMklRRlnqkLFxLdGvg+oYrKVMJGZ/3ZlYXqL9FFrh/yGtBkft39YfA64DmdFwt5qdluWx4AJ4xAotrN3GtI/4eGPMBN8NGjiN8BRgKQ1wB972xh0luX8aZH1Ts7d6JGwRD8RWaHSN6UchHj2rXTL+P3D6fsJ2m4hjLWfR/kuQSF8v0FjmrPz/lsLcOJZiEemrtIQiBNrmCar/KNSKweerdqXlrkIJS4AqscPWjEjyWnl5KtVUmXO/p2dqlklLO6NsOIzZ5Is21PtMA+g7itcup4nWC3nb53Su6F6jbjBRPhz9yGc8ixGw/uzYgKsiTTnfEjVUmaq6qJNmr/UUb+Hu98CU6eLC4vsIPePmUquV4mHwdkvMe0iIaL3Wv5/4lvv3G0qcxQlZrgjCp/qcBHN04rIBydungMRIn+qEgUpUpa3xVp7bAmDCVupsWo1b8RA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e25ad4e2-3752-4086-07b8-08db9d861ae4 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:30.6381 (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: g0+cAnD9U4IotCubdRR2gqXH94IWNgvgN9LXqyFRj1QQO0UHaimRES9liGIZDwf/1tGwz8Jnwe2PHmbrMUU/PQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: 3uk2RaOkR-eb4ZhSrw8eO917AnSp7F1k X-Proofpoint-GUID: 3uk2RaOkR-eb4ZhSrw8eO917AnSp7F1k Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ssp_task.task_prio is never set, so delete it and any references which depend on it being set (all of them). Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_task.c | 1 - drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 +-- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 +-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/isci/request.c | 2 +- drivers/scsi/mvsas/mv_sas.c | 3 +-- drivers/scsi/pm8001/pm8001_hwi.c | 1 - drivers/scsi/pm8001/pm80xx_hwi.c | 1 - include/scsi/libsas.h | 1 - 9 files changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index 1ac4d3afc1a1..f67983e8b262 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c @@ -485,7 +485,6 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task, scb->ssp_task.ssp_frame.tptt = cpu_to_be16(0xFFFF); memcpy(scb->ssp_task.ssp_cmd.lun, task->ssp_task.LUN, 8); - scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3); scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index d4e3c3a058e0..3c555579f9a1 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -1022,8 +1022,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba, memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (!tmf) { - buf_cmd[9] = task->ssp_task.task_attr | - (task->ssp_task.task_prio << 3); + buf_cmd[9] = task->ssp_task.task_attr; memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); } else { diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 404aa7e179cb..73b378837da7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -1798,8 +1798,7 @@ static void prep_ssp_v2_hw(struct hisi_hba *hisi_hba, memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (!tmf) { - buf_cmd[9] = task->ssp_task.task_attr | - (task->ssp_task.task_prio << 3); + buf_cmd[9] = task->ssp_task.task_attr; memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); } else { diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 813807a24ae1..bbb64ee6afd7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -1326,7 +1326,7 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba, memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (!tmf) { - buf_cmd[9] = ssp_task->task_attr | (ssp_task->task_prio << 3); + buf_cmd[9] = ssp_task->task_attr; memcpy(buf_cmd + 12, scsi_cmnd->cmnd, scsi_cmnd->cmd_len); } else { buf_cmd[10] = tmf->tmf; diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 6370cdbfba08..a7b3243b471d 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c @@ -180,7 +180,7 @@ static void sci_io_request_build_ssp_command_iu(struct isci_request *ireq) cmd_iu->_r_a = 0; cmd_iu->_r_b = 0; cmd_iu->en_fburst = 0; /* unsupported */ - cmd_iu->task_prio = task->ssp_task.task_prio; + cmd_iu->task_prio = 0; cmd_iu->task_attr = task->ssp_task.task_attr; cmd_iu->_r_c = 0; diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index 165f46320bd2..1444b1f1c4c8 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -663,8 +663,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, memcpy(buf_cmd, &task->ssp_task.LUN, 8); if (ssp_hdr->frame_type != SSP_TASK) { - buf_cmd[9] = task->ssp_task.task_attr | - (task->ssp_task.task_prio << 3); + buf_cmd[9] = task->ssp_task.task_attr; memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); } else{ diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 18070e0e06d5..35797b56ea0a 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -4053,7 +4053,6 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len); ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id); ssp_cmd.tag = cpu_to_le32(tag); - ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3); ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index ad5a73b86415..1c092ee37bdd 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -4316,7 +4316,6 @@ static int pm80xx_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, ssp_cmd.data_len = cpu_to_le32(task->total_xfer_len); ssp_cmd.device_id = cpu_to_le32(pm8001_dev->device_id); ssp_cmd.tag = cpu_to_le32(tag); - ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3); ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7); memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd, task->ssp_task.cmd->cmd_len); diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index d77db53cbd8d..5b2e6932c564 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -565,7 +565,6 @@ enum task_attribute { struct sas_ssp_task { u8 LUN[8]; enum task_attribute task_attr; - u8 task_prio; struct scsi_cmnd *cmd; }; From patchwork Tue Aug 15 11:51:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD537C04E69 for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236952AbjHOLxc (ORCPT ); Tue, 15 Aug 2023 07:53:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236910AbjHOLwy (ORCPT ); Tue, 15 Aug 2023 07:52:54 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7100B199B; Tue, 15 Aug 2023 04:52:52 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FBGvto021641; Tue, 15 Aug 2023 11:52:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=ykPB68bYYMAcPh3Hv4PYv7nXPX20eqlID0e4oK1Bp5E=; b=keduJAN/CdNgIA37LgelVq5Hw0CDm8NSak6DK55Jme10hAtPmsAsRz+I+IuGrUl8gxG1 aLZv1bG8PWB0k8Q7Ggseq8rQbz/znq2XEXhXDit0CuMjbSKnJjoj8F9pQcnNwYq6yv6N m7bT/uyMCOf8vuMEsQ73v5BsB/E186xXk7BFuGBAiuJ/BmJPg3lQcb2PscHQAEd4UgD1 F/RXGpIkJ/FRGMNw0uqaIYQ5nOhWzYirG9Sa4PrDmx8OSgeBIg5pBDrz5wNLvu3MkpVs eIJajlM0efjeN87hVUYvlZ1uw5f8fX6OI/x6nIcviVQj5PvZBw0Anzbo4f+hIHw8wxQf 9Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfmg4c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:35 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9LOGC040286; Tue, 15 Aug 2023 11:52:34 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0qquxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJNCq4FPPY7uUs6NugVkNOE+A/wFGGw8kxQ9o3C+2+cETplUWEOJ1gHl+s7jDQ4zupFpOJl/SVJcn7zfdDpnoC9c+dOMuNV/dPFMnTZ7MVySGldTorhzmVrO8j6T6PfqXENZwwPjQWXXC3uqI++0in/RyZ9yM60ecfy7OQXYXDZ+t/HzvaD3iAaqEMoAwHxMsuiMAirUBYEHiKUNJZpI6Tb8coFDFS3Eap0ad+a20hO2zRRh/C/QUXgcu2/lcX+tChs30cgZzQ7mrG5UWDgZgImQCE1CKUxrg2+u6lfqEDdSKlcWTYCZsV13+vizPuiHNCLv1hon0gtq9zASOlmj3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ykPB68bYYMAcPh3Hv4PYv7nXPX20eqlID0e4oK1Bp5E=; b=hakm8AcsRThQciXinGYAfLMREW+hyZcnsvZ1alq2J0gRMSQRE6zJZeRWaZNGXlmJ1U9fRV3y2d7bXzD5RAock1gNoh0LwbsmCLDSaFNSpIALPf11MnEMGB9uZ7WCx0SMUc86nUKysJZIWGdESIueo9oZClkUADATnriTsXIs1Oskaa0EJ6NlAQyY7WLywZCQdu5Ee77zIBGEGUcjCENI8QygzB02VFntByhJpSNnpGkbljzPOUKZYtV3GGwWJ+paCw7QpArXS3MEzeiPNuMdmjJOTfvE3WyauPVUS4DeLuC0E5qGZG7kbz81nCvpiV45iBFKyRUdj4eDhGvymed96g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ykPB68bYYMAcPh3Hv4PYv7nXPX20eqlID0e4oK1Bp5E=; b=r/DrSL7dxvN6EguOXlUB50m7GXAWnZjVasjQQv2/qmxQAwQ6VJgR8Bz6ySXfHOZuuwJqhg5Wew9SKx3dsniwLtn0FGMZzWikCYNrK3YsiDeZGxxzLHVcz7ltmu5SlBnOovo/V4bGq6BmoIl++Sv/baMdBeSLCMHM5XPmJPqap+4= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:32 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:32 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 08/10] scsi: libsas: Delete sas_ata_task.set_affil_pol Date: Tue, 15 Aug 2023 11:51:54 +0000 Message-Id: <20230815115156.343535-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA0PR11CA0125.namprd11.prod.outlook.com (2603:10b6:806:131::10) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: 7747baa4-4131-465e-1763-08db9d861be3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J8OX6/d2/G+Ym8Ai0RJeoYgyyrUyfRumoRESK6F1xGpCHtx2DoSnF3pCkaNbqLAS00c/SXPsTCf/UeMNYNlBnodOI9osPQwDAGnwbJTqyb/8ww+8dG4X4O9mmXmMfmBR6s5ve5N2GqCdfdmQYZrmRRifoVu+7W+jiYG0HzWmM8hZ2XZUOtmIEjl9+imi42s18kjbIuGRGXa88By74rWDKfq/+I1Ar2gpx9S7gxcwlYT//D7fMd5BO1fRWbLDHDe8t9NsS98n/we73DHBrXn8UdE+OKN+6M3q5MscnLorBAvsk0u+WYGkMHdjs6YL1TqCMUADPqCmtzPo/qRoihYriCJL5VDuk/ZNl4jWZn5lH+a6eU39UwI++gXyCqtnptp47x8onMBdJV+aUstP7lc/r9vyk8hmGa4tt2+KtQrrrXc+rRBNUjcwffXjyUYJlBKOZcmiGuhNPlXjHTpxLEFjN9tvSlSlRO4pPrCplLSjZllBTLoMGPLpzNBCFjhlPaOJZeiBdZ7ymnG5Bnh2lEiSdmXhSphMZnYGCC5ruCNakeQ7iUYBBFiMxqaCIbyjb3VT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FZyLOQ4OEHI9hp7PnU82S6oDf+jTXdmKmmTGcd2FYyUFoCrsJqfUjAgoXXvC5kOP91xdd7S0GHuaJpNSgwj+43ySgu9D6c5uOZHX/LGX2A06g3mX9VMEIOp7jcsBYD2NaL3qpHYX/XQ0jvYNYfV7pIrZdXQb85llfRFt8BXq6qDmNsdpWta5Qmj/IWUIbwI56R7LAUTmeM8gob+ZLdfyP3Lq86wYw/GYBR/E78OauH5i/ADypEDDxihLSENdWNjpTWs5fg3jhq+xm9vlRHbofo0SUvmNUcZ4XuZVjm8NYw12h11fddutDf5fqtYLyr3TvOv92yATg9T2u3rrsCadANy0RvOJYVKwALfYwcWNhF5muaZKkXVdZlxLgXddE8w+Dr/xwePc7kuU19Jy+71waAbl7G7fH6ef1//kV8v10MvRRrrWlC5vlOpGbHZwGeZzhYMOY3UMxnc4s338nw4a0tMCjGdAwxvyqFNkwoz+ZUkCKE4OzC6fsicr7gnbWTM+J4Ts0fkleeHD4Yi9CfRvhKY83os2C0w6nl3Vd6+dFfwSAYxB24GlTSnS9nadi+pDOoA6h1kXgAhRPK9vA6xUGmFAgPZ0QxkMbnFA/qXRhCx0/TRobe0IiT3FuG4O2x5kfQNZ7Vwp08EW1FECz9JS53PMdi3EodXegFHL3Vd/XpwRuUo44h9FLviOG4TS81jcpC1d6dPgJGTwkYxcr0WoUfqtRrexJwIVMJ2I6nli72b3kqwHt6KvPnSdDONpnNQt10awKyhqXky69oJQ6MvIojYPerD4G6BzaZcVR2MzjniC0bO2m31e3b30domlqk73DktIavnzs8tVPqLuUcUUsb9MkuAGebXYUTENwe7gXlRrZxLTUo4rLbeevcKieoXmaqDES/fYH+U05m6R8tkJ77LSQzVuzBgGAYBlpmHFVcZffNghtnUE/IzBBEt/pxorVBF2Nhr3PObSJC34pg1TfZstFy8UcNyrgG/vx3/ncB0Ncu+J71lfL/BN+PE4q3Pdxqs1gK8LD5Cdo/CgAb1qzi15jKbAPOaFsLw+CBscVDexFY/rVATyHVC6P0GC3W4Zy4kfyGJbtXCsrgaMCF5egxB8x/YlmDcUdnEwjKaM2W2JDlOfSOREvZ7tOY3TNnKAS2KzRpGGmgmE3zZ6gqKRqtQUz3Ntj187T3MpmwEdedmgqsET80z3MF0iVhNK1dGUqsdeNgcFHwZkYpghnBF1E4ov22Q2QiGhksEFiZhSu/yfudifFb1DL7ipmC/OGmg2gJ6j6f+debYDIG0B8FTx+JzaqUethkey/vsSP+n6ierrxG+Wc1+wqiRN+SGRnLEGNAXJqVj9vLeKC0w0vKEwqRZAhL2BwatDegW3eMpiS68brFtBHY36YPOeJaQ78QHULwHk1q/FGRMLjBIXouuBGaaveiYTmeAoCcxbCX2jXEeHZHTUXrg8Lr6PlXkF2lz9WIfLgkGpWEefgKQ0ZYHpK9V2ITkGKafbMzehkKiesy1VWB2U+2fXulEbBLe60QDygSAW5Hru2mCY9dlP9qWyhsQjcciL+buuIFBMdYklcIVUhaSqQoYU0T/X+Y423xYjh9FKxw5HrN5bNQ6giFO/MQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T2JKUwmJSqUwvh/amQI52tCVDRjwy7FU/mi7JFKZjMQXU6g9JG+XcWgEemz/MhL6xde4VKzyHw9DLSN5AUyfX0OiKFQr4iM/IDYyxSyYXUODhZElK4RC+ij9ms3755C+EVrcxQYtckAetXIQCv5XB9UXeEANC1riU0LssRvfeOzyYQRpYIP46rj2VUKWCoby7Zr//Ntfz4qJMP5Uu6/UlBxv/ZOIAJ912qWF89i8+4oRPF63bArsxTFkPpfmDttsGMuxiEyZ4snEychKjz4TxPz1rBNF8IVFrjRZv5AYmLpTmzPRYJ+GFP+kSTE2/JZSB7y6OaemzArFIhr7az2aGYy4Zqsw+ucO7GNDHRy93nJntfmyCqSejse94Uqe7CYi4KYl/GupQJoketDqBsIkMbxdDdi2nQOEahQOU1qTOgt4RIezfekeKCD2mQtoWS/schVHSeXH2SfdU23uu+LXkCANo7RCJOl47/7WEvkrJZy9UP4QEFvbnFy1nuQnRUx1EU3366XkT8WgqnOBdIpBH4mW0g5JgJNf5Gsghu/U2x3evYE4/cM5gj4FqNHfumJyNy0iU1BF95phIUns5Po2r9GQGygV+eggzj0NKF4wHjZYcPrZ/uw1MYb0Qsx8iclxq89sczanTahX5AzNPGujg4O9jmgzcj5HZ1t19RGQSZ6MhlsvmIbHr40ft6BHQcQvCjyBOH1K3LE8ZbIEfKoQx8WMsEDZiVcd95w8Z0hJDp3PDZMN5LTznrBRsZKAn+y0cycL9crYOee0kaJuJPl+ntr+BE5VIlvDcjr4UH/bQ1tZjACXZARraDV1cBXJmgS9o/1q1QnbBiCvqsWMrX3SaVNx2IulC5pcIjr2Ttu8aH5/Bjn2kyVqrXJCUNGt4hWZVcqu4GVBVPa7NB1/Ve5Pm5SCpgUurtPRxxVQPD/nkOZF/MINBgWvVoKCzb3TsQ5v1rJoglPnWSz3dSORvgH6AA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7747baa4-4131-465e-1763-08db9d861be3 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:32.3591 (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: GS0xrmd+TFrPLlva8fGkRKPkUeHWJ/3hOt4esDfRfifqwBE/M1WcQh0HhTBo6CBSCAaLxdvx8fv/bFM8P0A8eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: HP3fuyENS2vTaNpUN_3-CoeI_2ulvkxL X-Proofpoint-GUID: HP3fuyENS2vTaNpUN_3-CoeI_2ulvkxL Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ata_task.set_affil_pol is never set, so delete it and the reference in asd_build_ata_ascb(). Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_task.c | 7 +++---- include/scsi/libsas.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index f67983e8b262..ca435811c310 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c @@ -390,11 +390,10 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task, scb->ata_task.retry_count = task->ata_task.retry_count; - flags = 0; - if (task->ata_task.set_affil_pol) - flags |= SET_AFFIL_POLICY; if (task->ata_task.stp_affil_pol) - flags |= STP_AFFIL_POLICY; + flags = STP_AFFIL_POLICY; + else + flags = 0; scb->ata_task.flags = flags; } ascb->tasklet_complete = asd_task_tasklet_complete; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 5b2e6932c564..3a52094090a1 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -529,7 +529,6 @@ struct sas_ata_task { u8 dma_xfer:1; /* PIO:0 or DMA:1 */ u8 use_ncq:1; - u8 set_affil_pol:1; u8 stp_affil_pol:1; u8 device_control_reg_update:1; From patchwork Tue Aug 15 11:51:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 183BFC001B0 for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236898AbjHOLxY (ORCPT ); Tue, 15 Aug 2023 07:53:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234375AbjHOLwu (ORCPT ); Tue, 15 Aug 2023 07:52:50 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25AFB10CF; Tue, 15 Aug 2023 04:52:49 -0700 (PDT) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FBGvtp021641; Tue, 15 Aug 2023 11:52:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=9rkNVAXQ9TIaoMIXM6CLKENhq80E9mKmUm/e3qP47wE=; b=g3hNsGy1q9/zxh92Yfpp5IFWH40SRZ+L03axCUhi3P+1BS83NIVFIGoTuhmhIfDzqG7C hIXFQCh9HP93HUdZ57n8+VF4jefYs5Lw0A7Ym+HVto89PYIMj8Nc/CIcWSG0TYtqmzZc Uuq6nlgrUv08QIv2JXewlivwUkS2P/uvJOqdnOXnXvq5DtFxMwIR2k9LuRgBgOzJhLws LdzUo+RCeHju8NppDMbpRVZEsiEXoXS8oeCdP1Z8NyyczJd5qyENIRZSwr6zwCxWG7V+ fA+bCu5qkvm+UeUC59vzNz+xcOlx1TgIiZc1XvhRKsSUszbpNnyVcWW5rRp9XS3oxEgc /w== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfmg4e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:36 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F8kk5F003975; Tue, 15 Aug 2023 11:52:36 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2042.outbound.protection.outlook.com [104.47.66.42]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sexyhr8ga-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HmjNcP64hgTOy1QoNupZ0eF4n4HWHxOk/CdKvipIWcjIqKofaFCR6SNbaxhPHG6pkIFATrsO63dDpfuwdb6UDXWDXGoX809fBGGTsz1SYMjSy/Q+OD4RxO4Z3AA9DkqrlSXdMja8rTY3rmR7+pxITd1RndiSMzlSGGq0EKzdrOUUcjq31tIwaZgqxnP7ckijXN9lOmITI3ymb6vzNv9ySajSircMMJbD2Ctmggpy7MpSE7WicWZoid99W6w9QkdEns5rAqwyVJmErZwE3LHv8heDfetheBg0X3GZKZ6xAWiAp77AMyj/ez+RfODL0yZ58DyG6lQ+hk7ZHx2rwmMuIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9rkNVAXQ9TIaoMIXM6CLKENhq80E9mKmUm/e3qP47wE=; b=VlCIrtKqBeADFtu1gxeACs9KUCLgaiRpUna4sh6GlnRUlCuKt4FUcORdfoNpZ6wJZmZQ+AIPf+nRmjPOSqrQJtYCF/XspcnQ7VM1WjWkgDCZyDC2aK444W9OeFDgv5PrYXi9wUgukkqyggQ6nKeAvGVLUWgY53Mvl7dpjs0lJlzo/HUHgvxF3BS9+usVBMmQ5SnA6Kl8QXK3eRDWiZRg0G2u7qtsTT/y5gELVW99SfwtQ9+JqUbzp53xB/4xduMnIdbHJAA59OzjFu/cQLN/iP5VWedOy5FJrqKk3sTg4qSxGZf1j9/IdpVR98tALSwQDwi/RfZNA6M34GyFiiXUrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9rkNVAXQ9TIaoMIXM6CLKENhq80E9mKmUm/e3qP47wE=; b=NMWlbDACfqW7auez4gqUusvQw8BRr6sph+eWMILnT3SLR8m5yV5INStAUHMmA+6ah79+BPMOlve5G3Vqcex3QYXsCC7/p8QoVkrMCcM843eNFtUUVjQuOJYPOXDxCf8/H+3WHpyaXeP+YO65yvBzPxQ3jckOxT+k9smEeovnoUs= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:33 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:33 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 09/10] scsi: libsas: Delete sas_ata_task.stp_affil_pol Date: Tue, 15 Aug 2023 11:51:55 +0000 Message-Id: <20230815115156.343535-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SN6PR05CA0009.namprd05.prod.outlook.com (2603:10b6:805:de::22) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: 665d3988-d730-4c03-1586-08db9d861ccf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PsqyQRz90p/BNOiHXxd/RHFw49Pgi587q3Rlkyp/MK2zvosKiDC+qw5Va8jKLDCQipcgFHcJYyMpgBqgoYTBY+1F9cDyxQM1r0aKWWrc/DXkqyNWTibi+L5fKg6xhfQ4gNDuctgDf6zir/BMSisSQ0WKSZCp9euPF9owbkq/+5XSGjxXpI5II0OdvPQPXr6lj6ewyCN+A9Ydk43fPte55rWb175QfASokYXP/IBijmpOTXIGbcAI8qJQsXlBBSfN4QeJXTz4+JoTZZf9tKGVehoODelVzW4H70Tc/7/rn9n5RXNpo/Q2gEVJ4skmXwdRaR5EStaWEyTpvklARNp3duu7pu/d/KGziar+TXjwaJpomTxIVCYHEggGPWbEUU/zwQ5y9pJ1ztFPeQJ+0mJVuyhClGyeFF+HuSxs0nvUGyzDKx9Po2PWhTxQGcLlfPEEB84K+g3LQtATX9gDNMFw4EuPx+FxbRPWcb07pc+f74E1NpBAMYIJ8iuTaYVwJuxaAQJzMCiV2taZG/QPsfKHMn9jCWmQfmG22ZD5djLP5y2uYyaJ+sJsX09nHuQOJaxM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O9YhOGmUil9XeBR4cDj+UNXJW5AHrrX35HhT7MutOUHOgfLqJTxNnIEVPBx1Yehg/D3VmIYCVUixBEzAZwP0HrCtNJWvScbbzINyWl04II5E2ODhVOo2ID/VmSSt6nVcCCm/MwaU0dkNoLj8TZ+DqfmHklNYR3cH/Yk+jJjdOrga3tRIo9bX0UcKGjGU9thhl3OgHdtyvPamtpX7YP2U2s7btQQHNYGjJH4Jq4xvTJkLca7/sQQwTeU6jlkfHvbhvhZBfbbdDDO/bveI22Y47/qeXYWx22Xeux6DxMZApDG7D9Mzwy9ndV3Nsf9S6AzYhIrfQcHaNiHRtL/ti3Eht0VJsH5emd74sjnPurfeE1dN0o8vWcFT6MKRfT9ydB4hMN/IR4hQ4qHDT7E/aIW8OgIUt13xRyXQ6dfMKgQlzNqXSDrPAInujJo0kO6LdumP8vtYacs2b4B4veTi3eK2wUr3fZeZWf1enKc6cdnDaTsQ/dVFLkCK5ABD42zeBjB0YObjlfLum9uNmdtsO+JIZU9v0HUDEjLrGz0qwvwfWZLdDpcmfgooMgV28ArCQxCe4ZqOWuzn1jePaF/t2J8BI46hZa5Ha7h6j86mILVB45WIoiMUUfyUp/3Gv3u9oNN8QDSU6/QdEMqdleKzl8KdN4yV5AgV0ArOvan5PwE5ldxnWRkQd3q7MMoGtcIgoFeEz7h8fo0VFXenxaTF62o6NVdOHdF6sNwrX3ZSjrvJz3bl6bmmNaZ70qqNI/sik+Y6kZcLWLXwKQ+ql6Lcq72t7yPpAYTi8WUGxRcA2J2F26vgKrPH9mKOvY+OZ2ielMod5Xt6oP0aS7b+RqQiX7IIIbe56sv/5zoiyo3QDx7qG3V65FW3xol8Ev6cnr6Va8D+37c3p7I46IUdcIk1/wgk5c14CpjA87JxMgklD4TVB3V180aDxXBZfVERbBpQ+UahN0rtRsBwGkUZoRsoT5fnXU9HVNxBMu56RVvSTAS+XqrFAbMB7RycdlCTpVbKjP4OStR0UOxuMlr1Wrp5y4fRaiKcrn6StycnrVn4wqx518AsBBBIoRXRw9PdkFf6QtZWNKf/S9sAzZ8loIB52Pla5O54j2cWZl7Pd0WOH4QEME4WPg6hJXwi6FiT77F8NjjUcXi4ZloQz9IcP7/E/AO6Fy8sGy7v4mUkQT/vpnHVsRhlffL/MgdlRckL1HmTFNKruo+fGd6Y6JbQvMYqyjB2TlHpeQ0uUjgPcMTji7oPR137hfbEfYB7KLWjVUiDdFlHl7OI5u+yvUXC2i+4SHW/2KfGtjSLlfdmXQDgpJy6QPmYd7zYa3esddJWlPKj1doERqX7p/Eyz2V4W3ANA5ERwlae8GVohO7FIqXkReU+7GZRc1jZWGWmfrE3vWjeMY+/6ChHsHiPtrFYLaPCtOxB6OKItbHnB/XN/X7TkDv5ACrxc6Z6FOQNuZgBTUX291RYccKmuIbM0OAdppMLEw23YOEQI8eFJvKrORXEyoZJWj6MFfy8wAUVmhGYW0Gg5phpJUgmiKvNHmgYBJLjZKXRVa4b5TKCEUAL3Lg2kTh5XIksfZm7DoDLihQUAtamo2jZO7PlZ/CHwf55D/uMmzwThw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: pcY/+O7sLlvVmGXimFV6Gq+ZIHG6Y9XZ/R8N/6COROwd8XTT2jMLm5wS6t74HeSnJNsJpqtaLZb4be5I3eE8jnrnpuEGYqeziz1Wt4HzBncx36roIMGjTGtKXaFs5AL/EaQdZ9qFdrkDo5g9CbYUYwsZZ5nN0Bl4KXqgbFfdG6xpc/0T5lFa2VwU1Dg6ky6ymyt9KTNpDEJ89kIyjk8ZFr1WGJ+kfPZu5FZJuHr7seGREvXfob9KVLUjYVilIAG8hmmX/rH+YWjwXa4aQwW6vFFJMuJ5wHCUjhWeh9O6Xg7UaKupKmLfOhKnSKW3zvaGTFckXdUjGRvWLhpWAxpXIpN3UaI4C5jejox7geruWlrA+zEBLmPBqGw2iDyA+aK/5cru93I8vA9uEQDsDy8Xf/wDsOa5Ib8keK7KeqZJuuUDm6m6qzlgmcYlGB4LNWo6EwaiFivBSXqJ3aL1mxQy90Nkat4VSXFRRcUbU6RYfex6L6M7MsY/W4acxQuJzIqKEv0x46Z357NMBDbVA1iStq+iIFbMm1jLQ/ur8JChdv87raykbfyQ4MZx5KCNqiiB0Au3jMubZ77thJCP3ip626R4HMTGQDpujHBa/8Zp99pw2cdwJVxLUwUBax94Uki7W45pOgbH9YRHv6bBsHwxCgL+4ys3/ilP2fc+oRhuq4Vqd+W1bVuiWyUkan9baYmBaMhkDWKuUzniprp+kToR15cgHgtLl3eBJhGR5qNizhh7dj5fgVCCFBbnSURpK4OvZPA4fHOFqyeq6c7b0y8i4pilCHGyQ7k/3dn3LXYv27pIu/2G3R65xlZIac7CVuXp8xeWkY3FrykNhuw8SPPsRM5w651uxB/8drvaPZZZb2pqXiTkGYQZcNTZ4Mu3kvdrdA8Kt64j+N3iCIhSMfZ4m9s9V1MRAHzu0WQkqdlGglESnkFQf49fR1FtCEqvDJ0d1CcqA82prgUh6mGWsC2Ciw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 665d3988-d730-4c03-1586-08db9d861ccf X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:33.8603 (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: ORYvaOT62t5ivZFbiIJSY2MKDsxPsn5jls2Z9UWvmbsEDL6JcdsGzO7VR6ep96j4SvH4tOINlJs2nVvsz02iXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-ORIG-GUID: H1qH4yevsR_bYY6phDYL2JCcaNx6IQUF X-Proofpoint-GUID: H1qH4yevsR_bYY6phDYL2JCcaNx6IQUF Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ata_task.stp_affil_pol is never set, so delete it and the reference in asd_build_ata_ascb(). Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_task.c | 6 +----- include/scsi/libsas.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index ca435811c310..21b69e592664 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c @@ -390,11 +390,7 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task, scb->ata_task.retry_count = task->ata_task.retry_count; - if (task->ata_task.stp_affil_pol) - flags = STP_AFFIL_POLICY; - else - flags = 0; - scb->ata_task.flags = flags; + scb->ata_task.flags = 0; } ascb->tasklet_complete = asd_task_tasklet_complete; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 3a52094090a1..a65c16643315 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -529,7 +529,6 @@ struct sas_ata_task { u8 dma_xfer:1; /* PIO:0 or DMA:1 */ u8 use_ncq:1; - u8 stp_affil_pol:1; u8 device_control_reg_update:1; From patchwork Tue Aug 15 11:51:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13353754 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCC62C04FDF for ; Tue, 15 Aug 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236988AbjHOLxg (ORCPT ); Tue, 15 Aug 2023 07:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236984AbjHOLxG (ORCPT ); Tue, 15 Aug 2023 07:53:06 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C3AD173C; Tue, 15 Aug 2023 04:53:03 -0700 (PDT) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FAg0ZT004807; Tue, 15 Aug 2023 11:52:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=7E0uXqGclzM/1d//wdrT4WexD6JOcU4jHvfMywnhYGg=; b=QA7oSOkGtVMgwISn9nFfA8U/f2f1PYEF1WIq/Xu0h9qUClNkwkrByjLOfZHblZkHml62 eKMfmorOk/+j5mTtMqYRDCtDBI/iLE9HgOirAjFubWCSZiwDeRWuPaMnFNGm5U4EzMdq tEO8CKmg8e1Xha97Jkifd7prhWrgyqnC1Gwe5M+K4JEo/CAdy/ChAfqvFwD+cMclK7iK rubEQZT5m5U3dHl1Q8UbjnK+bY0JCVIn52OpAO2E3+1RnKVniqxzmbDgtrdTyhscLKPK dSPTLfy0Fuvq7F3Bx9f2LkWW/0JghJ34GoYFwCAlVD2CTf86q0RGWv6ept+n0EPgEl5x Bg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se349cgk3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:48 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37F9Vaxa019924; Tue, 15 Aug 2023 11:52:48 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2108.outbound.protection.outlook.com [104.47.55.108]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey3v7tnp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Aug 2023 11:52:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l+REnMujas5pnfcWSUwT9TKGufh6RNHkKAioRaiZEat2W5AfM2GUFHUJtw9J/EmqLZ1CVAMVhnPe9uL9zB/99A9PG8fwrVJyZ/dOT4H582lH3l+ZYJXQ798U/75vXnguLXc5zHqfymihNYZtqX6Jdb7++8TpuPEY5rg2GY4j3qYQs4LjSddWzpIq4hAsprtxtsd56o3PESjraXCxdf9RQJpembnKhPt0t22sKAehgP4h8aKnue9Kaa99afJAOG1lAVTvLABT5ONVC8jlUItUlXO8Pie3Hk2Gv43hc6kDtPMKvcT/aS50Py4vrHtj73bQpgK8ErP2ZgoV2pHFl31LfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7E0uXqGclzM/1d//wdrT4WexD6JOcU4jHvfMywnhYGg=; b=YSl0AuXq34aVTBkt0n8th1eOT8lqTudkY4dqFppotUgHCnrpl65QFrdBO3spUJVaTfUVAO7F9g1IRNG4BWru24Z15ydUI1Wb0J3c5/Ryx+XN+Uax6zXo54QsVTvDLlGIdiLsLYC7LQJfuLcUELxJqibuzyFmdcVkFNkLy9n+h5TMeSX/GJI3huPWr7Gb87+4zGKQB5P8dU2H5a8dVqG+sCfhBiIcLk44wd76OOdmP17P+nZAnAOReCjKWFmdQNu+/kCWvmr0dG8LgLQALdSMDWVoIZ19lK0TEXzaCw3mxLjyw4dYY/p6/18G3Y67Lk075opVLt0TpE1MGAzBoMB/jA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7E0uXqGclzM/1d//wdrT4WexD6JOcU4jHvfMywnhYGg=; b=qntWYvu1Uw8sQZc2R9nqEVyd8eLPqwLmpvPKgT0ikMk+5pvdfbF0y8+q+kILODLjZ8fzn16G8OFxhl8wFAqStOQtLkEhq3Q8auyNW1GBEfaNZjYUI4wipDTbbHRr2tIElwXMSMPdFdg6+VO7sqK61DNhDmpM6ZIhcKyVIxbG26g= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by IA1PR10MB6710.namprd10.prod.outlook.com (2603:10b6:208:419::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Tue, 15 Aug 2023 11:52:45 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::ebfd:c49c:6b8:6fce%7]) with mapi id 15.20.6678.022; Tue, 15 Aug 2023 11:52:45 +0000 From: John Garry To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com, yanaijie@huawei.com, jinpu.wang@cloud.ionos.com, dlemoal@kernel.org Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry Subject: [PATCH v2 10/10] scsi: libsas: Delete sas_ata_task.retry_count Date: Tue, 15 Aug 2023 11:51:56 +0000 Message-Id: <20230815115156.343535-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230815115156.343535-1-john.g.garry@oracle.com> References: <20230815115156.343535-1-john.g.garry@oracle.com> X-ClientProxiedBy: SA9PR13CA0117.namprd13.prod.outlook.com (2603:10b6:806:24::32) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|IA1PR10MB6710:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c6eb8c6-13d8-465e-f9f6-08db9d8623be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ryRsVNceQx6kfcNJH8+GSMmcJOPl5sKOSRe35IhU3/vYGjSoKagbdY8QrWyEp8xx6ynT9hNxSDJtdDRbs/27sv7jLtajaDysqR7wYCIjT439jv9JaZZtbeFnNtEWDuLKrDSwOAPte5QKnSKkJrBgB4rDaLke4j8M5IwDzWHl/ksRNfDZUuyf81PMyJvhPedvUjVjccK8SyUZNw2KEG7ObtVVl3RxOTd4rCSO5Sgkip6jMzzfTZd2cT1Ui4Zym0mni76+iTSuz76oJS7VaboX0VTwZ1WoiUEL6iR6ypjbfmHgLeHfBkDcAvFaqkENA84pt3om3n7IyZ0SRDGJBrGMr8ftIjEzzGINQSIk3iHJ5l/VKQfeGXQHRU3rctfLQQpKUbLQ+I6Pb260k3RtrISNJP3A1yS5oQiJyu/tlvBGphhtc+MKNKXf7Qjm4y7O2I/hL5gb7Fg0ZDh9H7SOBTckT2YVtKbmYvSh65iWMCM1+L5V/xv7H+iOPfSZVesPmeoCecevqVnjIcL00EDlduOFX+pAoG6fVY21PkGsS/0YhEt0TimcsJ9DwnZIQ9Xz131V X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230030)(366004)(346002)(396003)(376002)(39860400002)(136003)(1800799009)(186009)(451199023)(38100700002)(41300700001)(107886003)(6512007)(2616005)(5660300002)(103116003)(2906002)(36756003)(4326008)(316002)(66946007)(66476007)(6666004)(83380400001)(478600001)(8936002)(66556008)(26005)(1076003)(86362001)(8676002)(6486002)(6506007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zwx/q7l3TlUPi35GRJzWGrTvaZKP9ytHcF2qRbedQXs9N7Gd6f7Ts3cJYTvtKoZ+oTYguVj284D/p4IjiPe5EkNc2EC6w9Z9R7JTGiKnFpFWRbHXJCgc9FP6tuBtlVpX0ohzUetIa3mkT7k0FF8lbaiGGkiC1hMp5xZ9DIgYORum1pyiYE1JLhp7OLXlFJ2zmcP6IJYP2i7HgDv8hia64YtudTKn70Etb5DFFrDLqcoyyrizCZhWxo6fOhTef59YhP/pGB5nEiyBFcRi6TyMGf5u9ubam3PFuLaaKOjHvD8aGiSK8qP/mA2ZUJqsQP0bV4T31cJ8WaAs5Whmfh2kriAPokSKSiGlR8WYyr0d2dWSqPdvNsV91fDJ2fpxzKo1AjM1R2x4d06UBXiU6fWSGADvAWsELvnpj3V0fx8pcuiPLqj3hJ7nR5E4RJWBsRZVtdgFBvftKRiU7hS3sJvSZoaFHECltpk97PqxwiIPHcmV8VXuSM0CzGU7Iebz2dXAxeLqFxaqd4sl17W2eU50Xx14EMSS++6NYE4dsW66ORzcahTWMdDqt6+WZiXfKo/jWLsot8NbZ8wnuet6aZvzlp08ROLQsNbMIQM+UzC+6oQ/jPKmUO1rd10OvCWzmCebswDLSS60hvunSdcXLe7FMoJQ+gTVuVYFiJhICxjakM97UIRZcIp4RxJ/uPcOIxZr3l981ibbrz9rBfvrQUaPBfJL5AnL4Kg6LF1Vt7O6H3qT1E2+ZhmcVPIRq/2yKxHQpiKRN5I/BnbfgJ1md51jkxwaeecGSZHxEpDRocrSyTPmZQn8BpUzqHfrkZLxerZ4xdYl8gkv0zrRmRlg6+HCYlYDJTBYB3BxeEhYbzuO++LsM1FAW+43oBuxMrbrUt82J9FL8ixiOvrgMXNG3bTnX19KgEatCoC+azgAfrFiaei0XxeuDg+sEX10nQknM9SJph3yg0ez7ZV2MhjKPYhZD55Xapz2FoObzYz6yuyJijsH6ZueB3ydpdQdu28pf3LZCoEE+W39hbBpRGgVi1cf2x+bq0sdXQXNClfbnEJ+SbIJ+i2Dvt/1viN9Al2PdUAitJxDMwtbCUq+1az/PDoDWPJEziyl8cl9UvqRFlkOO3PjFqkywNXpPg5fIwrS0RyrRLJ1qtPdtIXS+i/DFdaFdV62Z1PmS12pg4i8ToV/OqlEF6vd5yv4VYqZEg+fE7ZEPzFC7Pp1HLJzS0OC13Xil7zCvffQ6MqlQT/JwYxOSYs99iPyxh4HLobxiybsowz2ALFq1veXuCWH6zV7sh3uK1vMRl5u5poEgtvjgZVA1nsLzA40dVm8MzZsUxlSX5IPVgeMC6Scpl7n/5fuBY9RtpioSJCDgY1AOaSNhSCe1snqAvUsqQYNNG2S/g7YvahDD8ZZIqHn/rj/j+jFpK018zsUwNLrAuS7BOnBI5JIkeNZpqBCbNx+K1P4tqamu8PzADtYOXHe6sIZ7jCuS4ujv1+Eal99YvrmOgCH7k9tgsD6a9AAeCDxytJAX9+VAVVAYo1CSurzSP+SifVHkSU3+35yE7yko3qOiWDJqMbLxbLnu4yOScaj0O7TbP77WK4f0qqE5+ACXNgfNrAxHgFkQw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PY9oA//1nDuOZs/aubH6scI7HEVlOZ9HS/RPka7sbvEx0asRs0/hGKcpycAlOlEdqXB9Kf8kBdxefiiI0vVOFnQssBd0Hws9ik9DmYBw3ws41/koNh9MopSHTvteoyjLy2iMQi/FaQxLLMU73WKGMJM1ov4PHzDHE9rnb121mD365AW8xjfbivELnrT3DpLoU3c7If5TWdMP7yRgq6TIpl++9c7d2OmRk0ho4enafh9jp5eTf94oRCBYWp5q0XPztdaR4/xLVEvHrYja+9bESxmBkIVB8fBJOZ0JeRfBBTyg2pIr/tng0qLVc0weX2sOKlgdYkdj2LzAAaOnOHJSuKZObnw3ZKNGfSKggPX4Qe6m8SmSReGhsyOpHVluE5mxsyFodkdCltsJ5ErqFUBPDJwYCmMUVybvT+A2fe8Jd3YhHjYlRfec44180yKlsnhPueqPkpQxPL9UYFaERJGNRA8GcYpd/Ram5KtWW23s7NBaJrgXZoJIDBzdhw8IfemOzvgcKqfJDFXEWpbhVMqYxGLYP6LmzL+opRO3vkecAychQF1MSwUyGUJdcsb3JsfPC0g8Ea6HjK6XPA4ldCaiF/i2OvuhL7rKrDSn9+LVal/xYfA8bdsGYjyXPLqm/YLPFd5323t1IAb52oaaonzSaQL+XCvWCtOJYE/RU5LEs5E6DWHhc2wDykU6hyF6vd+21vjbF0pAMDk00SBnqA56Eb46lrzFwzvrC8QmoQrcv+SF/TnZ2yK1VnMxOU0bYg9BsE6aR9QxxqOZt00k2yQS019CA6OWK6gE1sa8+zJg2CPeDUOn/XtRFOJQjYdAilW0xFao1bsr4QBKurnOYI09upWG2I9gh5r9Us6y8zzmb/JZmvOAm/EyZmr8zUmJXg6jh2+uLd1DKymYev4A2CEfZHC6HqXiWgEwchCuROkIGwHZfrykvbL8Onkv64gmYWYSqclxxGW52nZcsxGJzSpIKQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c6eb8c6-13d8-465e-f9f6-08db9d8623be X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 11:52:45.5965 (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: dI1+hKWOeE+d3teDAPw+HMvmEoRnWcFrJ7kN30BY8cvGoY9MOf49a3OImmukIJHUzaBuSO6WwFjNb0cHd20Flw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6710 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-15_10,2023-08-15_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150106 X-Proofpoint-GUID: LmaKw13GmYBHo0sbG9VTBZUAbNhvtspu X-Proofpoint-ORIG-GUID: LmaKw13GmYBHo0sbG9VTBZUAbNhvtspu Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new driver"), sas_ata_task.retry_count is never set, so delete it and the reference in asd_build_ata_ascb(). Signed-off-by: John Garry Reviewed-by: Damien Le Moal Reviewed-by: Jason Yan --- drivers/scsi/aic94xx/aic94xx_task.c | 2 +- include/scsi/libsas.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index 21b69e592664..4bfd03724ad6 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c @@ -388,7 +388,7 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task, flags |= data_dir_flags[task->data_dir]; scb->ata_task.ata_flags = flags; - scb->ata_task.retry_count = task->ata_task.retry_count; + scb->ata_task.retry_count = 0; scb->ata_task.flags = 0; } diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index a65c16643315..2601f5775a99 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -525,8 +525,6 @@ struct sas_ata_task { struct host_to_dev_fis fis; u8 atapi_packet[16]; /* 0 if not ATAPI task */ - u8 retry_count; /* hardware retry, should be > 0 */ - u8 dma_xfer:1; /* PIO:0 or DMA:1 */ u8 use_ncq:1;