From patchwork Mon Aug 14 14:10:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352956 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 D354EC41513 for ; Mon, 14 Aug 2023 14:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231902AbjHNOLr (ORCPT ); Mon, 14 Aug 2023 10:11:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231754AbjHNOLO (ORCPT ); Mon, 14 Aug 2023 10:11:14 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DB4A94; Mon, 14 Aug 2023 07:11:13 -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 37ECiTWX015383; Mon, 14 Aug 2023 14:10:53 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=jklFQAOl9tTDQoGuFFQT5JmktCXzpyfFlaUn746imQM=; b=gY8AjMEASjav3USZ1iOppY3olS47kMTfHfLges/pWEXA9/v9EWNP5N/4VV2cYnuLASoW Gpak74065bsAAqbKLobbbxJRCNGDxXV0AeTreLlF/pi2G8UPkqwdkWd5sL6nrzqJ5A3E BtK8o9Nn/K9j9MT27RePRNwfwC6/rzgB4lkNAqf2drg4DeSFf91FuiotMwGrmnnMvLCa Ds7lT+Bjfc0KUdH9w4hKbE3JCXa4slzbeI4gigFNRmZ+zuEk+O+WUe7ogIiDdQBQUn1h h0JOYZp0Ql5fSckDl9Y9antJrM2N8nnYGg8lgIC+CrxypaGM6TVOOQrsfOnXiXs1HmJj Mw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfjqc9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:51 +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 37EDT0II000676; Mon, 14 Aug 2023 14:10:50 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0ppnj3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kl0Hoku3NgZkyHFClHYULBH0wd/NAxocBqvLZ+vv8ynwCN77InduvJJWoTWV1itATeP99qqRNRNB2jbd68W2ijy0wj2Olfhw5NJTxGfTp6cQzEFoNAXJ0fncZQVSpuG2nQVoOXVnL3cdfriiD8G/5s3MGHN94Fbr4m/mMFTCDfjmvrEC4Faruhh6EzXj8f+Xasa+qxH77QAaudbE/Fd+pLWJcAvKzn5AdFv9cDedADUtyMl5Jubu+kS4dB+dkafe8J+XduWe38MXIr+0ykAqjAw4CuN8i+6o+2ryLevBXx/LeoitS56Y7kt2+0MdLHi9N9MkjThVA5w+uR/gm/EGWA== 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=jklFQAOl9tTDQoGuFFQT5JmktCXzpyfFlaUn746imQM=; b=gpe614xOtoWQ51RX/qasd6mpJIhLJMzqm6v2UkBUSGnsvRDphvL+p4DCWLV49RK5kbSV+60+TdlZPNuBEpre04W3xPaYUkSkSqCsWTIGaBcZFlsJz3oXCe92PF3Yy4qk63KZrOfgQFO3M/3TkStk0l6raweXfcUB3UuB/9lTiznqi7YOCrNraAAiKGhX+D1ogFBiPPixnomPkmadnokv8kaVymAzY3GlIT7oGpS3lxoz/SZDs+T0Z3TUkFZZrVgjFOFTap9X+PJQDoBS8acBDlso0Bc6MqVQp1O1vLE2E673/652/HgutRJn5EGC67a74PpQdxD05XiKHrCDkqS9Zw== 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=jklFQAOl9tTDQoGuFFQT5JmktCXzpyfFlaUn746imQM=; b=uUNRxjYc+W+CR0MF/5SjPUqjWamkqp69GCaK/dcCUU7rYuEfl9eroE6Gqbks7qQh9gtAVLK6e5haDClT+GiWlVrSvCWOCX+h5nGM7gEqq4KbJPgxbhHVcRiKgoDlKfeEcrMroaxA49bWrK/+Vs0d3q+AD8X2so4KzMixc6lMHIk= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:10:47 +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; Mon, 14 Aug 2023 14:10:47 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 01/10] scsi: libsas: Delete sas_ha_struct.lldd_module Date: Mon, 14 Aug 2023 14:10:13 +0000 Message-Id: <20230814141022.36875-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0169.namprd03.prod.outlook.com (2603:10b6:5:3b2::24) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: c0dbbe38-4712-4c19-0ab6-08db9cd041d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HEI/t8Dm9FYnQcMbS1dHBHPP0p7cri+lsy2DaMgMEvnmvxhXMVc+KoBhTqvqJcYE4wiEqa84yK/2zMft/toveHAPDPM2oyP9Qs5idqJJwTcR4K/zwuyc2/czfKETqpY/lRo/SNphiSZ2DB864e8OryqxMlhKr9+sJGYXIUXHktWWpk3K2ZCDsmZhkLYOgdysbICm+oIbpNwQPGyvmIARFD1xKS6T9CHKuS4TVdqgfvEDpeR4xX1+/PNDQDI+xhukbHLWMkLtRLIJYpqHeLKa8DzQfUxsz9/+P/N4X7fso5jAsbdxUs39mBDCqDigYaDMqjTjbHKBVcwdUIY1KGTdI1nM/ERiY01vJxILWtX7jsbmdpowlEGSXyPi/iK+ja4JCIn+Cx+m4JzSjbyLntPzkU9DeDkxIMdL3Ka2DH3NdCfCmUF+vleqL+TR6vbFYcNdNt/1nL8ZUPB+UMrUBYpyWur2xorlrvSIIT/HS1p1ulJTykzHA4o6C6gkh0NhD9Km/Jn9kXAlJ3ZIPUWFaAgLtBySI9p/fWo1umHQDDtjx6sommjblwuP9w0vqOSmLc9k 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9OKib1x9EwHyjhJfEIJJVkhG858MARqJm1ww58Gmvq/9MNxuR3yR5zb7mjkNsgtXJoeR55l5eSTuxrhmtSeTB6L5u2snYyk5FDy3H+76zbmFDCVAb1LGXwWnP9L8p72dwOSzHxiOxju4xz54GwnCtS5dVO7scayVjlQUBKRPeWu+jdp6Sak4v1MVLc2oOB98cMbTYs60wNG4Wr1QWavaSxG8tKJx9lFSzxWhgi/ZJLPcexUdwRbjUVj7Z9bJYDO6kxucQxGg0kAjL9ZxNPXdiOeEiPR9t7/iIWc2ebo0LtIlBRg82JSsrTaFwjrtl/67vAut2nw040IWvpo5etnxd01Ial3VLlxEEXosjDhSWD77sr1/lDOjDuZWjE9xjSbuROiZ1gVueTGPUls3W1i8xQb4Hm7lnPI4J/Gx02C2hw8HSxVUOHXtWpipLI3EHzwI6uZ2LGHBhTW1ZuIwyyuIHOkA2ymgaBPfQDVhqE8VwGqd1Vyi+Och4yfYTOvkqvDGJPwZZJ8mBctOh0gLpal6VHnGCk3ygZFijQl8iVZ+v0ylP/kmVdISE4tXwTBdEPpwQOUIxcacWN7cfrI4k43Lbrdo3vGrUtbVCR5vlNRmP3704hjtODuWxetZZZaPSaa7Rx853+d2EtVFQLuSITc41DQQ2RunkrFN9CT7WUSoae/hwqnd00rLqJRCanVypjwNUkBH00NSRqnsL5QIqouaSXQgKEzhE5DbcI8jYSesJsWfpWWhnx1/z2DeTWuK7EW7Cc2wvpnf7dvA2m0Jv4dznx6899xq82pQmHgf5NrdGKugEvy+V89I27cMSLS+/mCIQct252rmrq4jma9nL3SyDtsEJmPsdCM0tMxRyp3CE7JFf14gTX6KXqYgMryIfE7zKyu4/Eru80VPg/jApoGrB0gWwzv6hSs3m6EDH+zR6f079eoKMEexdJCzH/AGUnaIeQCSo3IRuB5eTV8OhXRPyRJXB034JAe9KTlpEEazMU3rVdX1i45P2XwJK5IUJ+TgPyHYBZTwZRBNBhKIXocn+9gEJzvAkoc+4ZmfjivXaapxWSCLxAN33dqnfG0cOm9n+IdJKGNlFtOFAqYXaTNZiKRy5MYHSzbgKtT5Lq6+DNvjjSsHhgKl/CplHkgfqZ7Aal6RtN3J+xCZ4G3SqkmhXm+SlzALmnR11FDjjAktUO5hz4LPnHmcvVQWffLxNx34z6FMfeqpGNnIBiPQL+tLu0SoD606if0c60+A+zx9uDNTOq+4dFUHhO+eCkPK0Y5duRdQwjOeTzfAzMoE/HuI8+kz29ahyYwv9pCkNBn2ahMhsGTpVnbAWvi66V4LU+VTgK1GWYJRO3QRTMe9KG3AR6Jx4jTlpnh5lEv8AN624nJDOQRnWznCQRPBzSU2J87RON0fA5b9E81AQCCXdvMo47q+IaqjuQciZsY72cfEJUmiC5mHENo0JAjgnvV722UOPIOdUMDe1Wf47f+by4zmkaHG1fH8H907z2bHt+45F0g6/jenGomazGQluM8DnZfLyjlT82BzY3tIVYANLU3q+qXgpdUFbCVekgiVlpurSm8YMUJTEllUXAu7khNFgotg+DnvYK1V/uaWAsu0nuWl+g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: FvzrXOJfkLMlYoGnPfW+QK67Xl31I/xcfPmKvp2XM0MsKyT4WoXdxTxql1JUl0XoSZpJ2zrbSl6MxT2JRIdegWPgSOKSu45yeTIQZE3NHDHK+3KKt5MH56wPvaQ3l0KtO73LCvo7jmLbsQt8J7e6I2mOssESWmjucvU+mY9MB0gXug7LkbreO8/bwfjOUVztKg73nFHoK1NDT60bqdS0+g5ux5jT/ETMcv8kwlQt1Qyig6K+OmFJilGR0Quo7uD4J1cQd2i+4qUDVuOavY/qXH5ag4rF/HFo32jtGdp7QSZdowiQi048oNJz8fRJxG+YIop8Hw0YMwC4f3H0L0gjbwahS32ZUB/5Q+XZV71til5LEn+P2+AR0ngD4LMhtZ7qc2DhyQZkUJddh0mWmKS3c9Yuy4hyvVMB3yzAmoHBiug428qFvv/hbilUz5bI158A0w607aNRl1idaokJPkCjyVADEphbKBQ8IUqzZ4FooqG/QOQdmX47BWOCHLQAuUoTEZLsKP30qbqYX47gZQ5ojGnsZHNg0Fk3CL6ab8zw34drhF6LfJnsVJ/iZ+Xds/dqQuByAFC6iDCMj5UiMS9nbnWTz1AQIYZAt0kKrf+W2TVjO6R3mi4wXS3ZnFnYdbjbAiXioVdhf1thNt4KlL7iBcnSRdjmsJOFgtYNvxMmfxYEqzQxwfWZ7D8/nAyhXah/IUkXFN5rBqlkeUTRQodomqvNmRwXAcnv5T6fbFugfg5hVY8fMNZntQ+glQ0VIXtB/yHzEUliEv3CX5s9x564qpFxPPBqh9G//6w0LtWjuOJevpfESw5TyF/BS3q1GMK/n88B3XtgoGmfEz8DZXy17tA7RpL0X/8rmoQMeqpS1HDWDNn7ZFD/FkyoOwSCbMKhllmm6WvT9x7Cd3j2s5dSs9twVuIE/iONVtExwO7yFgxzzQpOSEsbA5mHJuLRvgzg1tJ4vAbkU7SZsf38NN5ufw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c0dbbe38-4712-4c19-0ab6-08db9cd041d4 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:10:47.5370 (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: tV+7JBBMSOs3k4NbPt4+clne4RHET4adb5HYbWPfdxvemqRZvbae4vtcxIdGNtNiNnUOXk8RZT8XpyDoapexCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-ORIG-GUID: gRxQfdXhIxjsCJLPOBabcqBPa9nMPHT4 X-Proofpoint-GUID: gRxQfdXhIxjsCJLPOBabcqBPa9nMPHT4 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352955 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 C5245C04E69 for ; Mon, 14 Aug 2023 14:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231859AbjHNOLq (ORCPT ); Mon, 14 Aug 2023 10:11:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232228AbjHNOLM (ORCPT ); Mon, 14 Aug 2023 10:11:12 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF435E3; Mon, 14 Aug 2023 07:11:11 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37ECiUao017544; Mon, 14 Aug 2023 14:10:57 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=7GPMA82MZkRr5atvM4OSn56YsayHz4XJs3GifAHucxo=; b=VmNBNQxL2ZyB0l5+qFqxH718S3IXfwyBAgwXVMZtBUbohAeIhnM74XtZv9stTd0T/wk6 EWWYxAkTbaTyo5VJh4j1Za3kDBwMcVddU++PBIciJqvSc1zKytZQQkuZC5XQuFrScQUY 78t0mDfUjK4uYHP8nw0Cw1Ykr8CBwcrzc3bizSfvDZn2lUL9F9rTAoJPDVGA275YqdTK iLS60UX3G9gcXbbp2pTdY8Z49XJQIxxlz1JyZIg2l39fGbMorggLMtINH3Benyiq0aOv dhAWSbqAVsg0JLYGI7sjkK34ImC1YMLXji3Y9BzRsarbIGBmNaIcJ5KqFJOgvxg25jhm uA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se61c2kfd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:55 +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 37EDanqK040235; Mon, 14 Aug 2023 14:10:54 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0ppnma-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kh06klHFDyDH4alfS3G6JVAjTqiopIH+FiVy8TOrdMnHAvi87wswCYLT4mO+vLZjNUU4ZWBKxUqZsR63yEACTvshdV2b+RvV+MCN4+CinffIbafKe743yOnUHbt6gynuHTQwEnf76nbRV/KHWPv+MesGnQFy072VO1X6TDAY9yiKik90AXhLCt13TXDg9kg579+j3l2q2gfbSbqg1hSo8VkudPmDFuw1g0m6YWmNlCUcZdf08e2EBB4v8qWOua2TscEq0KUPRNf41YPSAityphiPWq2rMeNyyI+ZNQHHJxEFZzEP1U+V7OOPjIxoLJzUuaAvQRtnNaG2Fa2OWkrVfg== 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=7GPMA82MZkRr5atvM4OSn56YsayHz4XJs3GifAHucxo=; b=b2KGIi3JJkqbpFrrFwdLUz3xoNBAsgOZnbJiUaBlRlRhuZB0Cn4Q6TTKYxj9Hbq5hYxU9z9djvqzZf/XHnREBC6DscEpnLU73YL0vGJSvfmmO8L4ogMwH26q/3hFD/alePPVqUDnvHE3TLglzXR9C3FFTlBj6AdoyJo6umLCZ7zSHfjEb5Z3SKz//zjqKbwrPM6Q9+y8EtYG9Wsz9wkpGBVJfj2ypJp4Qvhd6lS8anXpwrGZzmgTvIykproopJcAMpXrIk/QgHbfFhveHxCsHhEFxXB6qplsB3EmcHJkXpNXxRD6UqiqzixRsWOUhvIHwgibOpbngL+xlY3lPcCJCg== 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=7GPMA82MZkRr5atvM4OSn56YsayHz4XJs3GifAHucxo=; b=UqxyIDxpIbwqfy6X5FVjQ2M3mh6I/kgUXhVKV0MlCVPpbBqLVPFVVb9kjxglCJwHiYOq1YVH+arkqstwp7zlGdlmV6arDkDdLXPtDcmAL2FhCOf3/RKMD5RA2HEl779vLTPofMadBWevxxNZ0Ai0gDG1HX0qza+H4yanavUzMOk= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:10:49 +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; Mon, 14 Aug 2023 14:10:49 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 02/10] scsi: libsas: Delete enum sas_class Date: Mon, 14 Aug 2023 14:10:14 +0000 Message-Id: <20230814141022.36875-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0151.namprd03.prod.outlook.com (2603:10b6:5:3b2::6) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: 66d9ece7-914e-4d61-7705-08db9cd04313 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fbo3vHpLlRDS8vxbFl+gI/TIsrk8tLNJuaIDJRxlWH6lZQC686AfA5UCDdJRy18Zb7Tnuc2gj2iNKhQT1Fzk1/dQh/eAoVu6NK/peum3MeumFfhhht/b2n+B/qrXaCUZ12ByWDDrVuFgrXfb6h7m6HwiWGXEn86GaXLemi8k9dAcrAZt+phy3UtnLP3NZFW/sT1dfua3qmnnz7pSD7bTVzX2rOF2BTA+aWqV5D81nRACk4euc5NtpuRRvh1VuhjMbyogZnWYCwB4lqeU1T97ki0PgvHSZ3BYsV1wSDYcBh7R5wa0MBwyf7eXfUVW6pmYxP+eQN1F1OfyLJmc73ddunJi8gsvZ/ZBIh4FloRrc9+zZLLZleYcgUBLObCUypl7VgSjSZiAxv9QnDeOZA6y8495F2tCl3CBK22//hond3BBPcuv4tyPw9uRYMIJ1dRWgAXi1+SOjF80fv9VG+oENsGBAx5ryVWVLrgXrgVXr8OI+lwtVrGHldMAMDI2S8VM4lw+qPTCXmc7SzU1RWT/31r4WFCAMm7wdzabBgDXFkZ7A/ouAjTlLrXvPSQFAmvW 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sfURODp4jslll6sYpo4e14AuqASQ+k0m4ggMv92VfFfNWTvDUufEChs4ckgjkrG82WNo1WHotR9lrdpa09PgsRUxD6I9ODco37xFiBWAq4TvrEvZFYPWNUPEwwU5fbPFc7g/6/ryHxtenmuMTEULEwtIWtMHFE7Xg2oFXCFVWMlURXdUcl2lnEh6wSLpkzirBIEvCAAbIGrcWUnojmN4e9POpSYzFstYIcRvIcDAvvZwbjb5czT7RHRM/xuYJTnQ2omozSCT69PQq6PGS/0q/4xUXqbvQsrLdW3xn2itk7m4uZG501KoDsJjH1lPBPQA2oA9kcg1/NTrQSXwptRW67ZggdQDF2NwbLk8ekL7yiVFFUfiSS5XARxi6xNspP3bRGeFUQuJlawYFd4k2469Yv+mu4JoQcxMIwwJCWGxWXfZ/i/rae11iBZVWDa/QOfYPlxAonEQspvhpQnCRX75IlJ5/o+9BkP1t87XK3nttVBI/0BBdm9TKwWabUpBl/I6aWb9/TfLcKOmJi1yXCXgnLusBeuDXhwJv4aBc0ClYw8BmLhsFfxErT80KIC6zRNRAyhT38zoiMKz3QcKmCxlCDHONaRcP+ZtlG+P+JYCoa93T69kOrRIE+jlZapUj9MgSg0vbvZKGTQ4TPcijI74z+vfIcnJ8jKymxJM5lgkkyRFTlJF+j32ci8V/NJ8r6fwLiRB9+KCMda3mp6mVf5E+4sLaueJOrwQlNXZtOWPR5gOh/BEXTqBT0JMrA0iGxLHPXUu5/pabMnmNNoHgWsg+0xEDyuaMMZJ4vgqJDLibbZwwu77aPsuZAK1sEsbuU3WP+2UaA7rDzur3Cxdy2Zg6RXjniSW/HezHZ2mB1MQJEmMWHClzwYXdsq+SuYDoLePmONbpAF+mk4WcqEOuxx8+ZFDb5fS94iMLEPxA0VC7TxQLgyxynJVVztlNo8LF2NPnRgE3GxPT5dMu4zbd9qD9FIhApLJSxtmmYzMIaclAD4ddcrflunfU/FgDJKZbPtxV0MtJfiw7NJASciFzLk95oJkB3q7XEHVw5alj7/swE6tUF2c1ZLgw2qB22ALpzAXhEfFFXed4u+8NIIpL7suDWsPQvJBr7bIXiko9/16wzTv3Vw55qLAgvb2R5Jo6bHyRvhIqa3fVi9weiuIMayv9bs2YKCISJmLq+wQzE3hpRM/hGaad9PS+rEkddkuJ7hNgVkPtjChs8QjK3dt+NiW5OXXhmlXzjuOsvt8FXMCJYThadEmpUE4m+Xnvi4wsrbkcPTPl4LtVOM9In7jFfKWYv0oD7PpCI9QvoAlC9/SkhKDi9q2n9ilHgkIQbEGKH8NJIFVnH4OqL2F8rs24xgC0waAYnRcnb689lzGsXg7yzyI4WalA9EbRdnY2GZzdTmCXBaDHwmOnzOKE6fhZujCmiDJCB1zruDaTw38EOE/kKYuqUCIp4BOG6HgW23ktm3SHG5OqF1OgDTCaiOCT9WMsRPr8bkdh/Cok0Hcx+xlSGMeXKVcsrfKOZHsHT/dr5NJavLSNEiaUPhcNjtZSHbBcc202+LnSVyJq5K9aYIl5+RlweBFj6nnvBQtT4Dvm+Kkm4i2dbTJ9UUdj3W6vOVI7Q== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Pp1dHGZdA7dIHWQxUSQ7ViXCV8alez9krqdhmMzqyhQx7f3lH0m5mIk81Lbm9CuzMcNdIMigj7gAtaHU93jjZ6qrTBggiWaIO+1sNMCQlxUaluoylwatuJRUEudSf1/hNrUHH8qCJjUD+i2osMHWJS1xxKpVnA6UlLeRn3MWLF6YDNQVCHRn3/EGG7AQSZfACLvHMNZcQZ5/HZoWl3TzDwL4mDxGZyJc6wcH/mtcA1IvjVoJhQbnmhGqkgppK6I/OcgyViT7V7+NrkAmfo/AiMxoK33c0kZf9W492O1bUFQW6eklWbbTtZuswzk+VZSwOvPBNmHu7E+LKK4DJ+qXOqqQX9vewr3+EdXww5m40MRQzX5idTQg9Fxd4uy0l7Xp15zRPwPUoAjbFjLXriLCLfCnLlKnd78o+IpKyN4auTNfmeDGigfR1bPMlAM36Epm23i8R7Gp52KZGluolQUFxJF0BwYZPdp9O+ZV7boa0V7mVDnZ0nbCugBrIJJyN/7C12b/MtjyitjQDwQ3d+ETse764MznxbdlqiLJHW8cC9E4VDbqwXmZu3zgKhT3ZIyBj1o7+Qzk+o1zQvseZ90a5rKoRM0UF6pEYn2MJtI/xUR8AFlQhQXBBByhiinXQmgLiFHk0REht/fqdbzFaV2gA4piEGf/r5j52m0PsjULh5N1yFPb3mdGrlsoTm603v7f0SwtcOxr065pJVocDgrcUVdNI4KVOxeUrtUImD4LUANniIXCge67CCqmr0Vr/vDbEkEgwgZmjPDlCj+cT6nanbUAmGFvCmGNTzSxB/3XTlGyO0NsEEY1i2Y/OadAtMb/5s0p+vS+meEUe6QReBIntztLLJSmMIwgIsS0VRS6RZaAtMyAMdkrKOTUkaj+ACN4JWvadsiE/crEPramWUq/Y2ICN/ktmeRM8jsWefMW8ukI58PCqZQYE2wii8rDC54a01DSClVqbpXV6SSoxklUmQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66d9ece7-914e-4d61-7705-08db9cd04313 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:10:49.6501 (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: lR0eF0TyAX8OyvvBBCmur4jadvbVSLo2NOiP4RCitttd5FAoezrwo4fo4MjsjHyuIxvTtIgPnNBjq2atCD9hBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-GUID: RL4T0yTOy2LdJYeQuKir_qdSPu47T-2O X-Proofpoint-ORIG-GUID: RL4T0yTOy2LdJYeQuKir_qdSPu47T-2O 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352957 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 E7277C04A94 for ; Mon, 14 Aug 2023 14:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbjHNOLt (ORCPT ); Mon, 14 Aug 2023 10:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbjHNOLP (ORCPT ); Mon, 14 Aug 2023 10:11:15 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6348FB; Mon, 14 Aug 2023 07:11:13 -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 37ECia1v026755; Mon, 14 Aug 2023 14:10:56 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=3WXkvEQKLOgtMgs1SPXN1oJ7XewkcWl2WWbWZAwWh0I=; b=nN2olyAA4F1EEUdddnnCvq1IzGBEd0oti00KOhke+XY+upaoKVAD74TT5w3Kp0+0zBEo ay74ZwrBkb4q9x+XxsYar6gvLUFNE5d92iR/hrnvP6aZDqva5ahEImHU5GU5xp24CzPP wDC7mzUBe45xoPjvkJxJyKcfgvV/KLFfTUKT+h/vVds6xmbUQGnrDiQHX7+f1+EDySA2 iAzP98XLLwkOV5N8sXA+jTfVraR9XjX6DNvNKRNEu0IHWcXRZlRSVUL4eku07f4cWAdP ItZY1eUKunYh3kvKJ+dB0PX5+r4PFPxtMQxp7QO9xygkZu1RUJQif9azV48F0icsms7r Eg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2xwjp97-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:56 +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 37EDPw9B040114; Mon, 14 Aug 2023 14:10:55 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey0ppnna-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:10:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WmJSgIPr0dB/BBJXCVgh4acBNC5kCT90AKxPWiweIRlnQJnoc7xgJSsQJrBRoJoviRZDuGST2s4oyx6xRK8W47pObfBRLxqfcnLUhBvH/XF+wtt/U+rr0XisjwX52G7MFFQYt4DVEkqSuTrEn+WzdGuFbFkRhjGsMAR7FoiHsFxzETvvjI+RtH0RXj2FmGjwB1+GEL2pJLRFGzYsrYDXTbnKCrFRjUKEk1xJgmgOAodjoT/cQAOyZbbnG5dHk/KTnAkwHPr0rI8FCM8yCVsyhqSPGZrlOihfBUveHKgijgKWkxcQKlGRTdm5b8gu97+ofq06kbUjKGz+5QVLw9QHdQ== 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=3WXkvEQKLOgtMgs1SPXN1oJ7XewkcWl2WWbWZAwWh0I=; b=UYTShILQDSu1advIPHBUP07XpcGXFByuNWSUsC9ei2V6ubQlTLmtxUurpnYCXVVHCzy/f3BupqF50CT1R2myYK/3l8Qx/pgqdFLBoaC8zsSufGCqjQL4AVDd2um4yjvZ2qw/9vde/gMCvgpQl47WAN0+eZ3+UF9GRTMOAd/A6vgHoNo2iMH+AjraJhEuZO6MJu24SribsMO8VrH3l4bRhP6ajvBZU70cpWux/NKfSoLe3IqJbtmayvdtQLzvCUUhKhJCqXBH4rGuhGDTc4OH+Aa/oPimYMmb/iWcPiuVmKpdBKCbLiyXrCTs1sKygUvtaxWETHTcWtSNTs8yBau1kQ== 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=3WXkvEQKLOgtMgs1SPXN1oJ7XewkcWl2WWbWZAwWh0I=; b=soucGVQPXaHLpuSOWBDU9PECT6WJBLaXOSHkviRTMxTkUE7QZGq14Ktb38gFSHUX1C4fVnHCv4C+ift/d7QWybyEuOSLkGGiPYpbZd9tA7TK4eDDlUDVDIjenLh4R2AjVTnBd6OJBO6oKHc7JhkKg5kT69I4fc8Hxbo/oFphswk= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:10:52 +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; Mon, 14 Aug 2023 14:10:51 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 03/10] scsi: libsas: Delete enum sas_phy_type Date: Mon, 14 Aug 2023 14:10:15 +0000 Message-Id: <20230814141022.36875-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DM6PR07CA0070.namprd07.prod.outlook.com (2603:10b6:5:74::47) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: 39587792-7c4a-4002-fde6-08db9cd04408 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8bXCwlYWT3+yUh/2VP8tWJ9j+1xGfmOGgDYo0ih+xT3tzBqsZANLxaB04hvF/EVmaF8VtebpOl3HHHcP5t4yEkax2HP4i6TJAq4k9gOqN/bh8M2EMMsbJC2A1RhS+8k6brIX3PMmGOGuZLhChBQh29jtWSx7vdPemMExeAZvWmLpFnB5pAGB7lX9AEojWybaI1xWN8MKn1I+QGY3ARt8+dSl81nrbQhLAdJwu+1UwwAyjzDCJYXhPatdzMlbMfiVu1ZlMTix4m5aCSURy4iB5CMQ31ZEqvewZfkCoA3Zdh2VALYZllTVvjT3/NyNwHD8Km3AHB+O1cOySwgGDNxSufcpi2Tg62xo6X/jYgWPFDrMnXeMZ0jLTIQH9CdV7ONfZELLudaNbwZ3Z+uW2oePBQziXDpP7ndRyGYPr9lkIfsLjFX/tnvSqM0YTlKTXxR7IdlXuUv9v08FvtFfthtrmzA22zJs5B+CKjYeorbE25rJw5I320gjueRHZudCQOpCJ83cu7DZIb4Kg2jSoEBpNu9h0owAmJJS9sx6sqtzK3SAkhVHjIhCz+YRrvujGfz3 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RGFa3pq9ws/DJ0hTrnp20HqoG8/bOfqJp5CT9uGl19S2LcQf8vOPoivRJwDTWPhPNyIqk9WeH8zJwE4/xAvKUY47vj2mN2K3K3sQZXKr8UeKXsUOBiEOkiaFXyzMGlFHl+2PNT5uBk7PBfSIgtxF0mF8wVB+M5pQmUveINywXkXjlEfCBMA7AfN3x1iUCYbGf9g3mrXLL+0uHgwOBnR1ZSeXylmYW9v4bHNSliVENA+I7IaVahflh4WDxt9IcMnXQs5k1FCgtBVidkO2r7cS5OUqbBXa4cGfAiaD2uleTJcVNjkog+CBJVPuMUChqEN03qlQHcucJ4HReWlYoHOQ3bGYOw/ar5UjnkhwsFGw0WCqwV18/5XyDZWo5cUZWfHLEoN0Eu5E1E6gq5Q9q7W4FjeL2cPGlsHZH4DV16aCCNSjFgewz/0Llz7fvc7XYWfg+VA0fMeWp5WORe9G7HwqvHjIck3YXT8K4elwrPSbc5Vz8iOxZwnucEJ3j9P6yF+cd5rk0CvAI3UOUMG9mzdOktpMMWXQdcbUWgAhxp4FwYyi4Q0Xu7OrDSYBNhF2GnFNVB1CLiVxm/2xKt9wSO434qxUFwTgHVO4V51bHx8iTlhE66oL+ZFqLTJHfUtKC3ONEDYTUNo9DsniZLlRLyrhBpP1q0L63+enaYEC8XMrnpU33dqhnrxYmA2zHhg7wJDB624aPPmCRGIIUTMV7hXZDfa1Zjo+B1ZUcnHJeVML0CyfskzbrLmxR1d3f2AOSVIRDzbvQgT8TU6K3j8szqk6pbBIksBNKPlOf4uqCREbf2bAOdrJrSLUJ9q/eHiAVK32rXDoAkr4XoZQgKCRZAEy6nkyyXnwyeugV1NjtZceYeYNqESO1dkQUt7dzSYqAS+/bohtWt3+I/91AOTMPah75BQkrIj9QqgUI2yaoSlZN4H0RlXAU8/j5LsTlVV9+l7O8dg0ndQKI4ePM9Yv1Pwtjf8pnEslJIoKZXKAF0JGD+y9AQaJiJgIc8GsH4D3WdzH9/4Avwn4oCfT1y6lc6txsHOkKh5JRhCJqfuO5SFO5FdsfQdkW1SeINDJn2A2xIqbCiuzncQ2D3XupjSP6oty3IJ+09cDbxTwHeTjBnm1zyVos3xZvKdFg40ySPv7GYU8EE8LvLkISNNEJs1F7Se9QhfgApR3FgP/MBL97vtY5S0OJP8qaOS7JHWxPy659JIv2wFbn/hJ0IpJ1TQK+IS8ofmRJUTaZautHbr5b1/bSctbnGmzJ+ZeGVQIpt+4zKT7WCepMXtf6UcHJQAffHpwkB0peWnwmEIfUOkf1Te6Wj4Ug4sOxaUwwkuf8yylk0DyZP1d/3XvLJIu/sc0c9UCmdT3LprqOnX2wa4qWoKAKbXnBuEoIbvoq24EGma/8Fcag+iqVBBO1jmBDZGClwi9cDcYYkGvRuXIJoU+2BA2CEWIqqvobX0itZ09JPMWO6AHYuidBwsJL+5+hA87VHGFLZ3gr/coB/WrOtnXnho7RSFPiXZ+bVKJCEUJCq0vqupaglu1A93GVJCTcAlJqnpWQUIncCuFg8IK9KfncJJMfT9CHc5KWNZ5f5Ja1ZQHW+kmm8xawLs1JeP4Sbv1xmD33w== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gFFJO2vF3XL9GuCzKtAos1A9K/1YUmoa0Fyp4PVgUZbuy/cFORsRVPhw2otHAUGFffI5uCMIdljxd1GCO3jZBOW8hPYTxivDlQPPdKn687toGb89180V8XZkRkfBM6Nm8YyCDQGr8IyTMnXDpG0iMuUnaMroQ2Ia8h7g5g5wfbRqFqp84ouoTUCcauduyy+OzJAgIvslGQceEiWAqVA6/4anhE9Px6BlxYogZ4UeIJaT5RHpq2Q4A611VZnAD0NlXpv8nq22Zn3vroalAAuIked7FzYwi8nyfZEJ4Ej5QQLbFcslghXW8KLrPuCw4KZn2vEdkVMy4g73fcZes/xQF7Fmyvd1JOZRygy36UQA4l4DbsIu6dr9GX+nswQZRmb1LIYwBo5Tfe4WeUwkncisa0HLSLyi59kaBB6Qxl219BOpjAmohomhFJE2nlQvrnZllFhkFZnpPhXBqAdC8/IO6wQjC9IliHH7uHXm0D/rjHKUZKzGVtcPrf9hbqiOH9GiX6Vlnhr7VNPIvdQbhgzGJi3RxLtEhtte1XEtMd2thKKKNDClHFrwMcydakntMdSsJlJ7/X8sBR5+yyAJCYpHSC6zs27lsmD8sJDn30/rWdPuHWRbBGlLZmz3NX5roGbkwSCrT6dGRJuhH31PVubjNI0iEfNd6h0T95S3cUyqJuVK9CXLel7YTW24Lt75XachfOd8cS8W17fNowU/GR2og+6yLsMsnP05gOIYwKT1VyeacEgNbklZQUfD1KFAqjrOrcKa5XO5Ls/J+cooDIJG7G4rBR00g+Xexf7c/p61vwlHE1QFMvH5lvXcVluQ5nYEt5nvfI3IRStBm025j+sfcYTHtMRE4iHqtcZQecTa8F6P+zum0+Lq44noHFcgNBDKicqTIftkv0daYOjF3r8ViGr1VrONWQF+1/M9i+DGIcFpgTsxTq5hyvWLlw2rzVQA1As7VyN8Fzq5chPXWXelIA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39587792-7c4a-4002-fde6-08db9cd04408 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:10:51.2735 (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: J5TDtilFnYWH7pJhzAdMLfUznF0i8n5GqPY84rLy5jqsIwl8hGOtR+TX7PtVaWwFhIKAixjSjPu6jwrruIA2mg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-ORIG-GUID: Qb71WqwpJLoVFnUzKIamqMw8GpYdyrrR X-Proofpoint-GUID: Qb71WqwpJLoVFnUzKIamqMw8GpYdyrrR 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352964 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 4C48CC07E8A for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231754AbjHNOLw (ORCPT ); Mon, 14 Aug 2023 10:11:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232170AbjHNOLb (ORCPT ); Mon, 14 Aug 2023 10:11:31 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6701722; Mon, 14 Aug 2023 07:11:22 -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 37ECiXhm026716; Mon, 14 Aug 2023 14:11:07 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=lNj9AN1Z894cK/34/aAJy5v+TH7aMAX+Zc5kNg2UhpU=; b=QGXCZ5um/Hks/+keFj3n29sKW/Asv4twzkuFeSZ/eiSWTxk0+Y+GhhPQgQb4rrTR5jq5 iybIytMD9ICdPIzjC4a5K/3CliixYMkEmAGKTJ9/lgXMe7sLH9UwezxboppXeJ/EDTcy BXeWZX+/iHYNJi7G5vHGhIGEB7ZbVA1KkLP4ly+y1Myr7kJWBScIQuDhwtXLBzFsrf51 XA+JKazX9Gxbzke3kNS2NScLDwSVuadl3Zgk6XEeyjbQrMkUbgysF1MyCenCwMTB69x9 RreCxIqOmFZLaCKscnsfBLxFW5rcqZ7XcySPaKaPcNwgfqpQ9rGmLdTXwko5Y+ObSApG 3Q== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2xwjp9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:07 +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 37EDdYtA003759; Mon, 14 Aug 2023 14:11:06 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sexygpue1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IN3fCkjsFDe+jzQNtrQZ/EDqCGit2N6vSVXGDeaXunoCkDocXLPd4mi9G6X2D8ctpqWUpO6ULfJ7X4cbIWv6zQF08izt4sv2NNR+LSRGOiODRuvPfMtiyhZQsBFtcI5yVULigkfnj5DB5EnXTNbFqqLuBSevbc7H4FvLoEqx/bZycNlpx3Lvx43JydIU8p/G35fq2zR+HGvqROTWfrIymti7LXiZafuqtOelAXshoAL1JeHrW0ooGxFpW3uXq6lzVJB/TrNfL0rtSpenVMQtKZlCjJNN23JK7sIzURmJ1yGmsUyE72Z+jofTaYAdmD10W2Q0k2qAFosdlf2TPskHiA== 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=lNj9AN1Z894cK/34/aAJy5v+TH7aMAX+Zc5kNg2UhpU=; b=jX9wMTZ9rb1Fi2PrtT1ADoqYqVRZHyaXsFdZ0q4kHUj89EsiJGfV97Ya0L0W/92TgPTcOwl/1JJbQKSibjX82dpQQkqSoDsTO+reu0/B4bRfyYhCaDPRgKMuFzhlb4EjcVA7SI0p2jwkITun35uwDJJjc8/RwK71lsmsl1JSGbRelFCqWZhVqbmj3K8BSFYIW7Bj/2mhjYEcokxYhJCgqp24/KbVSYuYX+EyuB7fj3THXQVtD2G/C6Zxookr81s/dDUBWO9v8ccZroyWVghjWc0wfiVUy0zgIjc4ir+lZQ/yiVowO9edMphOck8Ol8yyY8eFwXNDHa2NqPCFh9VIYQ== 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=lNj9AN1Z894cK/34/aAJy5v+TH7aMAX+Zc5kNg2UhpU=; b=zM2LV/bI/pAbh0swCn7bJNTOhTaSpj9Km3T3UlW5OVT9lWMdI8sC5qFdZLhwv3uplArtX9ZtMED9Ef0q/KcBgKICk1c9ctWFVNjZqkuBzzR+eF6hI4eJjI6aZf0FUjXCzQOXQ9vhFroppmr5cV0bot5O+bOKaZkUBapGWU1AUQ0= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:11:02 +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; Mon, 14 Aug 2023 14:11:02 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 04/10] scsi: libsas: Delete struct scsi_core Date: Mon, 14 Aug 2023 14:10:16 +0000 Message-Id: <20230814141022.36875-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0173.namprd03.prod.outlook.com (2603:10b6:5:3b2::28) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: 537308e8-76d7-48c4-0d11-08db9cd04ae1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CwGoukucvKQL3djHZAaurfkVNfRLhY6NQrDttISWq5GjY1rBPPmrFXmJVAzVxSoKu4d7LXCNKtQUJg6tKiDc3fQDCC+3gwrGFjzfBbxNlVqpCNyVG/k9h5dHONtOUaV79ouKRV5I2/Ll3/HM0VBfoQiFIGt09EEigN8oa0jAbBccTpl0uTYDO4CQ24iIRuF6sydoCKZKwYU/FjsJnjIq8aKI7nhGYVN3DyRThcVTREoTnyghix6kapCwWkcyf/GFL16ZrL/HRiYecFYymGtwn7CdHG9Pueibu1k9M528jdtNeBGJTAUOjRYCOarKeHyDlO6vo+7/4Jy8fyEEVI3rPeOxXwxutPwOm4ZUIfdDblM3Fbn/iMvCHFAuTIFv2JMyawt6H9y8o2OI4jcXWqMrolPC/UFp3TNNLwE3T/m0b/YfRAwuysEq0AKH2mj1D+SnI44twzjVv4tjPoZLJi3SCvqnHR8NtgY8QBjb/qBzrDqKF+eAxvkHhIT+gtAGJmUxcPMp2a0i7i42KW3Rg4D9Vfcb/E3O2ZUtnjpDjrGpj3znoJIDAR4H1g3vQfoqfws6 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(30864003)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o3Ky6i+seF/tCxjzo/9A+n+KsrPd6/qBvxtRICFFriw4eQbl7H6ZxuGdk5OyT8bnFu1TcnMHjer6LpsLPa3YN0cHvP3u4/rNVq5QDQPwyX2YpQeDDfwVkBKTM9roHlRucBQ/q9qKnVWCGELy4GeHkCttEwzYWF9DsCUThHaZAxR0oowuMBkRVOPcOYAmznFmYCvn0Z0BfJYIYa5gNEDBbHikAUyfU4IVTvS4m+buftYi6crNzKf52JTQwRcVA/vNDDY315ZmpnGQt3OTqBT1K9s4NFaipvIy4w1UJh45aJBnJBlzrtE++e7qsoVDRWt8k6PR+4ZmlDZOZBh2fsL0pl3nxT2IkSXCuGOynWnCVfytwsePBpWXkCkpkhUo+2VB+xQhjRq/A5dWiEdaS4tjxFCyuyiJFTa0U5ONyLTpyyw0iUsBivGLSloqY4bb73GBjabyNW03y613SqnwPdXjGNvzIklZxe19usqh92MLp0CHNe2N+2OV2RL0gZ95lYx+D0wWNIP9R/BkBgFzNdzJqFPUk5W+UtIVwIoN2j201aGSfR5Dkvh622A5yOElw5HOdzLrYQh1ORQLOQE4+fdkRRSWTRJ0WGNIWMn99+MJdNvrC1uUsQmwTQq0BEFg63uHocBDenWE2nhRsznrGC5B1NQ+kGVbcH60w46MwqfqRd3DRJFwkDQ6T4lqc/NqVvZtx2IG/CVAmnL0uGsX/LkribuTgmlNvIPJ/aCZrXojjYeTgLDUpGr1mNyALHCL9E0ZvvFZY4dvE32Wti8YHfBdVqBTJqrmVctzJbmpTXNF2N8TK7CC3BqKDknLeFJWTU3mw+jSo41aW3zVJDUlwzYrwZx3HqOt5yPrbDc7+pM0YluV7JT1aSeXvXIR81r8MxXHe1mYlX7WdChPdj7PukKKYQx0CQEXc3DGpqmv/v+DOKB7Zat4U8uIMdVjrRaav2RgfNf1sDqtC0pJjxxcGyzw1myORYufaBMS+jzBlcTtGHtF8cH5jPENvWJ2hiS9Eq9RwCNwij+rShiGVTvnDS1VjjEaTZcYAv13naRYqCm+8gf+I+LzP11CSpC12gWcKjw36doLEwwZo1smccHpRt6vC/EqYXFwLp/GQ5X4yVXv7Oak1RNBBpNpu08rlB4S7mpak8YzgfqC++zdzzWNYE9o2ZnX9X5+sqeZBuaDPfdHfU2rOLrNb5OFn7F9UYIPimuaY00ktw8bhcD8Sgwc9F3U1QbTbHtJIL6SDiCnvUIsaXyv4G7fSEntjL4LtOTSVTpywIn159b76QYtMI080SNRWqXHE1p40XwmxFgX1+LZSGL6WBFXWwTS4e+Al5Reug8bMVvqAcSqT8yqCExQRm+kpkIUK7VSPGt6nkXuveKwmjyPGqvOwa8Ox2nUgABKF3eSwTNyybmQhgnZU+30pEYnYW1fzXvq0iLznKFwSUTKhvO4hGPzqR5vHqww6nvwtoTHQmGIykadZXPiGTWL7XWrybgK/DXAzPH0oYTfD0f4yehTJxY0yFCbdxoJA7jQOJrU+RNb8M7AQXjg8OpsjwvTuZrjHp0z7jwupriQa1wfrLIRjey+LxoFmYE0hpJDZIwn+kAMZpLrtRTpOWN3sI8ELA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Dmnbx4WndDR1NhVeBgx6yPQvUrn/EKx/SF1bZ16BdD4FpzHPDnMiZSVwSv+kWFyXX6nl5hL+xIgtNa+16XKetHdrHl6xbnUxuPpZi3orpVB+6hfmgP95M4FbyxGmKB14zcXRuCsw1SV661x3q8RnSxb9XhItqAAWl4INDUbDzHq3qlT1QN7briYZjfsw5ksthvP/QXnUJL/ZYC8Cj/Njo7K9uDqbsEKh1Z7lQUlFdXAw98flLofX3khyuvu1/l5st4Ow8u9koFfD0Vpvy9LNI/yd1SnXb6ZillCCuqtGuoz/9xJZQyF6mUw/8vyUNsYRQ5EH58TfjeMVtEKoVT+HyjmAY/t8gJHB5lpSQfhp8bAeVfxLrprV/wMGN/DfPdzm7nCmCnjS6hrd5nECevqNzW6f3wPJ/7NWsbRWG8ZdjkynT7nvtXRjxgYtYhEI8IGdPDfrxqS1FfI4aPQYcvINXWWE07M5IQAJJUBO+IoUsi+wLWVD7QLiArxZNf1MrMuofTFhSBMepTwCaXkOj68nG3cCWOw93kpWbvlC/+UfmBFrCTaskEIZPaEUN4VLZEeTuhcsh9vWruSRJ5UHE6qeKo3/+xthIcZxU63hy3Y5pGeJvom29FyiSkSNSk2QG/dtVdCHiEXV5nVEZUYvrpCIQBxOP1MJMcOMDXw2IM2je9NTU3HNFIGvltmb0/5xTglezblHYuep27qE4SJ1eUUqdqUz1dA1JsUpgWsUaMMotPrXEb5H9BFY39PxRXYWvMlfgjNJV1Z9QpC+aZRS9MyUxZFsOnDA68mFal5Ul0Vhsc4dN9pXPwVjB4gdYJBEJPPQ6OmsJ7a8h8YfOMN5KGhEroz2NWHdA1r7YNwImDINtdmbK+uwIskeHM3Z2nnjt6Sm4mQqw/eBQkqJYIFJVsJ9nBVlH8Ly9zJZxK15d5LxE2tJA/uVBu73aT6XdtMvlr2AxqnpKkB1zwV5+o6CHQpUjg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 537308e8-76d7-48c4-0d11-08db9cd04ae1 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:02.8591 (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: Upb/zHH8rrbyVmmiKF4i9jLJab+04sjTMVc58vcwubISKpuBVk9SHKVAc7mGkVHEFm7+CF+RMGe+X/uQhTEQ3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-ORIG-GUID: nTCo6Geekpk3FxQOY_Yc_OPXTgsWtYhR X-Proofpoint-GUID: nTCo6Geekpk3FxQOY_Yc_OPXTgsWtYhR 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: Damien Le Moal Reviewed-by: Jason Yan Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352958 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 122DDC04FE1 for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232095AbjHNOLu (ORCPT ); Mon, 14 Aug 2023 10:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232159AbjHNOLb (ORCPT ); Mon, 14 Aug 2023 10:11:31 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CACE718E; Mon, 14 Aug 2023 07:11:23 -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 37ECfjYr011034; Mon, 14 Aug 2023 14:11:07 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=2fuH3p/3n/cfA1BIuqfB9Bpg8gENm/NfOHr9YMez4Ks=; b=CIeNAwAZB4RXhZaRk3Ds0H0FSGL3usWCVBDsztc/HhBUlz36B9Poy3ir1ijNBPAA8HYn 2Va694YjkklWcLnGP+lMdMluu0G+zttI8e9LFWJxp56ptlSXz84SqHz/2LbpPuB7VH2a kWymQdz6p6Q6m02v4rYKOGcrU5IHZ7X9nUs+6voB6R7GvZ60zHoi6GUfwggckijXuxet ioDooZkAx2x6wbDBujvIFr51H1iBpik1ur6Kxt71Zn2G6n/jKkMc4PH91DaLxt3AYkJz FYiESqmhvfvzWLdmmECzs4zRj6K/aPM0N8zEd6+O+kMDJBGEKpZ/YR4s0W+hhy8ctSmP Fw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se349aqkr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:07 +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 37EDdYtB003759; Mon, 14 Aug 2023 14:11:06 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sexygpue1-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GqVsJTk8WwDbE9JXNwW3MlBk9BuOuk7B7TSIGYnc2Vmpllhstxx8omP+0zijztFmAZHql32i+beKIlfmfA9/MB7+P9x4b66/L1ePSbPzv/SasrBrLvS0eTZ3UN2vraEF6zibPrnMVryslNv0Wz1m0STfa+aD2awxs7Sk6alnH/T/4yWkETzBzYG2rvER5hHhrdGfwOexjrY7i1KBcR8eVKgZeUr85UsvHrZ9VTWsIzkw8KlCv0j8Lvws7jVwg1DpX9yPt1j06GwYC4PhqCTBz+KAyUeqBgUGVRwu6sQEZwsoAhV3sr3nVwwPTSfEot4wzHoFGlKQb9b1Mvbk+sXtHw== 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=2fuH3p/3n/cfA1BIuqfB9Bpg8gENm/NfOHr9YMez4Ks=; b=XKwuPHO1J6tr36ukp38zI0KyUZRdL8y86ItPff6wmbo8KD4JPHYsjO/Ujwnup+zK3vWo6VX1ybOKS7DrWMdgWEVZtpkRld5QARE/MAPvKhlvv/4Ne+LTKF8DwKLcfayuJEZk25K+u3uk3SOMyvPEsAaPCNKD4BpgEoD8LIU1plliqB5SjfWWIr7ZzMqVgPnCx9Mhbqsm5ikrETe6tosbjjtZc0rDq92TBdFGbj3NhBFD99YIIvb0PcuT1sqGVx0KuWow80WcobuOrLCQXsloh0YX6kN34zjqKgw5PWJtjBfU+GcvMBOAqrbqr+SjqP3t3sUq7qXA2OVM+94tyAN8+w== 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=2fuH3p/3n/cfA1BIuqfB9Bpg8gENm/NfOHr9YMez4Ks=; b=ibW4Z7T/PKmcENQV/9wWP/mXsXD505PT5f7aJIQkgpSwk5HSW/JfBqfsVk1Az7AFDaNWIeM2wKY2YAbi+VYeqEVMPuc1bRnnVcuQSY3o+GObx8fSJ0b/Qexx5n9MXEBzeDn5mkGhIkahLmMiFfFTMD9cltHP7d/Nui++TbAgqHE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:11:04 +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; Mon, 14 Aug 2023 14:11:04 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 05/10] scsi: libsas: Delete sas_ssp_task.retry_count Date: Mon, 14 Aug 2023 14:10:17 +0000 Message-Id: <20230814141022.36875-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DM6PR11CA0065.namprd11.prod.outlook.com (2603:10b6:5:14c::42) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: 295365c2-2650-403e-31a0-08db9cd04bd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IwEFi62t6/PqGhNLSTpwPqQg5d2wei05s1H8a+YIS6Yhr3ie0TpOZ/Y3foiTg0HhnHnSF/4mIkbJKd0aaByXguoybDI993ATGbtfKYfrRLHsKLujzZ/s7muMU0iX3mlDEWfSypmgi40e70IH2U/9AqSBc/YhXaRbhlqIFyOr2ZZ6KfcT7ipDfRC5HIKHc4UHdNFSd0QiFMyazbnVwfeTlXvHWJSOZQ76PxXhw35UBOuzSsctAU1zZ96H737GlH7HeQ4tpjk/sXu+Ic5rQ8a0JlV2a/T7+tD6E5pqfsw3Ggt8bbhweR8a5SRpgNtFkm986t/Iy/8f+d6zppo0kndKQS0pmbB+3ZHyzBVoJ+942QNETLySjLz8FiUmKvp8Y6xPmzPjxUMr8hPnkO4MZNdwe8TjwcvIgxL6bsrkaTdp22bqVjrv7YEtnVpY+1BjrjWqtTuwXFwrJxgM7jl0Bxbficy3+5Gt8wdpTwz985xTdJYoF7o4vlnA07kxTEEa2f4gveqqA+RasE5Rb1qbgw0BQYRhatIj1oT9encvKBKFQcU0rXJXRw0QmvpiZiBo1O5z 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K/Krg3tyTCivyGesIC2Flr6A09oIrpQjl4rg0vwAx8oKvvbbTLomjcA0QuiQtH0ITLk7r040ovHMzlFOxUjzAiGDUIP1LR6DEdiB+48f1mWXVP1J5WVIGNVXiRBVPmKsCOwhWiQx6RcgDt/ZPXpGnbEGZ1+mLbeqy72rqKvI1C6s24FzFtMEohxDM3sLPnd1OKU7NYoxyAdQv/HMDMPcXeeaBc8MY9oZCCvf2f3TqhuEJlTOHeyw1Oq8sFdFQDDLWYthTFAjKEMunBvepvTjpSGQ7DqClPjWwj+gXiyK6VhA+EhTv2sWxfZHNS3YKZMlqLUu2hcUEVNLnChwKf9Z5hIllZU8NlJS+uANTrgsbNUfoBC1pQKQg1vCnb1PQ57sjw4L0bMSZE5sKOavoBpA3swKzq1qnME2QFEFczqrBjA4yc+Cz83xp7UtT0bzoN7GDqEJJQbDuNqvoPmMCoIOmktBtWROQZLpW0NLRsgbClJ33S9fmlO8GLYS9lEBkqtIsbMBofYFQnzjMI9R6og4+d+lIeFAw5PykzMTPW6tR8UgXPBWu0GRV+vQ78G8/Jx+Qa3m5VL5aTT0j/7M1AFTESqk7h5zllOlSKMoy9nO5ZI8DzqZgakfc2MMNipWQmpq7JEXRrlVQ43YHb1TOvdFDZ5bAAWGeH7cJ6i/D4CwpTh0Utw/1HiJHhWVnNGgeuVHtM+fI66ArlgM52snRKdUtXJAOA8O50YE0kGla3NDPyjXglFrX/5ur/9C23AbPdCPBglGdYN7dSGTcD7eWpy0WFOtAWbMxtcuv+AdCZtPLLT/smMyL/ZBIhU7yIoM+LbzvbKiq6JQqy4JP/1YCtnHs14wd7zlEwQULXXLJ2WF9NdKb9ETFG2xZ668L3Vlwd4SXIbk7v9AP4ZsVJw6dGKf9LlELqtSF4Y7LwqyDryAT5os4TX2O2EZc9KgQsOo2aUBs7EJMi7dTM5U0Kb5E5lVOgOVywFe0vCdBjlE1W4xnipS68rMkAHn4Lni4I3EtbE3E6RjksE+d+o9CuLqH7CmqDs1M7fVP2Hv990CPfSQaeEgiHNfgOjt6FdqKa3ivdFyMBsA8QYaTRjhPqNLo4DQcEPTzFvtURc2n0Gvv3jU2GhvsDNaj/fC1zlQRAeX1MopWvILPstyyC+gFbglRHyXO4m23Gav27Xf4jOoVdzRo/gZUvJJLa3DeLXoJlXP+D0O6KGMj2FQ5Dtc1T+vfPhjjvdcyBFShaR4GTV0fNrtjkax3NhCD4LZOrdAKCMbxVZOveLAJiJRVkctgZT4JOONcMgjn2bW7rpKNE6e4Y6CZoCpuQwkaWmflGPssWNLvnxUbHa3JpElMkQ0jGGdoVvohtPHXbUcj4r/Fj2Yg6Ju/kLvkqwTT2mP69qfEMgcC/d8m7gUz12eUv1/ik69D0PbeGhQKJJA9GRZd0DjyAh5uR+blgYOfF/pPw7Qt7pj2Y+KgtutokkWFiDxnj86FHYTOvvSF5/UWSQq9zCV1bUJ5lV2xRgT0vlNDqWTDhZ1fpfvLfD0Mcq/A3+5sAfv87RTyXoyntQxpfyeJ9B0PdIw10VIaTR5nm4oxH/dExtWsNhUSI0k3Sb9IudsArJNutCOng== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ms4pnayBGVZBEU5zcE5m1dBaWxPyJrKMjMGyqETcO8BBzsW+dI7Mz1AGALRgPIe/GLDZdUKeXIDVKp+4OJGErpffp1y4exKRoaBhcRp/GukBjv6/5bAq3psrZy9HvEQFUnTBBPpmr3fAWdZ1+eCQDwsCzl8c4rMJE7XOL1h9umGTmKE1H5MLyssUiKJqAj6YFhgmn6Vnr41ZvV+1CNZgrTKhiB8a5TpoOaFRcZeEHEBDITz5yAEhqMPN8NQ/qHOCyZSEdYhE82iyeoaQ8PoIGy7RTJoj01Knhg+6clBonvOXIFmcRbv/Je0pV4y9hST4gJY2rPMhmCsnN0dbPIkwUgUeCpWEPCFog1TEPajGFFhKmnttFyFst3l3TlKPWC/OcOSsEr7okC8StamPrYVVQmOEDN0nEJxQ2xat8ZrMUBVDozgGErQTb4jYuoS6hTzCsCSfWao2VnXx0H+S9CT2cFBvCmlAvJRJpI+gpER3+fMa6VrIQM7ebd/myOxM5rcQj3xn5u2I76Bj9qT/EmE2uBw9IotljejmYioiKXAI4JEQQooGS4Oedbr0j5QvQKQaQQv32FBGipxTOItql9jAUE8kLR0rIHnVRs0YyZJPV3j/VlnK2qR1HOaDhF6if6Bq70pG8Mp4l4913GzYLPt3HdOUTCiCacGrKgRtEM5ytM+izybaOqyHtcuErT/+GDu/OwaFSUgg4+rLhTLvyMbjgFcfXOajmKBrY8M9g4Z/+KUM6wlOmCm4HDPWr7E34UGH0m9qFPbV33SgR2zxL3m2JVBGwPyTmtpPVg1xICO875vlA+5o+iwXRToSCO+gGYARY7cDVVlsFg1Hah1Btt8xQ7Uij6yYwXyl9kRZYsnX9Y6SaAV+0KEyUqxKuB8rLzu9fXWfWixy0T4ARtYzUh6kwweCDVt4KHI8i3sYF9suMwT2ja9BNAZ8/XYmpI4CyhfLh80TztqaPvo1mpObwSfpJQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 295365c2-2650-403e-31a0-08db9cd04bd4 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:04.3197 (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: MW6KGNQTlbwPBn3kPs0n9FVuXVF6ujDo11EWG4rbDfJN10vZA9ubrUUufG1ufrG9D4o9jNfMHQncf4nvn38ujg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-GUID: -Ubu2piWH9aU9DskbkvgzsOltCqGjRtK X-Proofpoint-ORIG-GUID: -Ubu2piWH9aU9DskbkvgzsOltCqGjRtK 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: Damien Le Moal Reviewed-by: Jason Yan Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352959 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 20B0BC04FE0 for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232226AbjHNOLv (ORCPT ); Mon, 14 Aug 2023 10:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232191AbjHNOLb (ORCPT ); Mon, 14 Aug 2023 10:11:31 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D156172D; Mon, 14 Aug 2023 07:11:26 -0700 (PDT) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37ECiUar017544; Mon, 14 Aug 2023 14:11:09 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=SXL00vZJ65cJMEZiZDLFVAjY4Bbu6xFQVUenk9XEqWc=; b=cEFRIflb7sDv1Mr8Fr56ZxZelnNemciBxxogTYhJYN68+LIAH7YfYR8EhYaqzknSz53z HexC8oDm6Q12Dr+WzGhVJ1PK3e2317AhSLW8dhPsH8c269XkseVEdqlBLW0ZT65YEr0b wjElGJ0IbiFycYLkDyMFoXAn4U+zDNw2U9a9BQtScGsacuULYoAU/1E7Sqyf3Wz3gP48 fDPjSJSgYe3nZ+nJuxfnKwdK3/AnWhUKoi5QOJ2tCGD1y0VK7262Al27VKqS3tvYraat jjM4qHEgWQsrzlhCH2bk4QiFJyd759ahcaZ7FVyGqhEqj/9daO45pLlTNb79Xjk9WoRq vw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se61c2kfy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:08 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37EDYajB007170; Mon, 14 Aug 2023 14:11:07 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2104.outbound.protection.outlook.com [104.47.58.104]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey2bxfj5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kTqbT+9s74NQ6K7CVYiQMaZYJoC+RxkRZ5PIMTKkYe07KuO8pnQgeDm88IjpUygN+xbfGDbpRMTsfRpE/EkVgW/muicCkjgBBeeqAmxLD01YlXhIYd2lbk5mVnbRl1S6l+Jk3/CxcQkpiiExTkO6255Z16OlcWOU1BGoPpnP5Cj/2cBiDkkmuWFPoE+/+9JqpyJqozLFtm7fd3jmp2ppytrSueLFI5o2mjw+un01wzlL5IEjIvSyA8UTia0CuFb3Xy/8CkVcXvx7M9CDbTHESSIxY1QlnYkuRm5crfQ1HALfBbVXbB6nlkMas0DSHSnoOzFwk37LxR+0M8t2AClfwg== 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=SXL00vZJ65cJMEZiZDLFVAjY4Bbu6xFQVUenk9XEqWc=; b=GVeagHpPWgX/RcBx2ib75726+hSbNKi8gwHSguiY89ZLC4gPDfbbUldMzJz+Hh0meyLx3zXzYntYJ75s+rEWuTppOXUjRV2CNG+lIGFybA4afg+1dgpz4iuTStU8a31zl7w8Q+NzdsNwfWGaaOX59T6uSr3w2oBvksEZp5FK7lEV2ptohFysecinefPwTDV1vRZjFR3n+OA2oHxnvXrsA62WVDQgj3ZhOvoKD+71cwARKs88IU/lH+2VI4uzgRR30v0z3hhIFbVb22bWGddEOfE86DX6tjK87phXx+jhlC66bU3frdUK8hQnjzbT2u6u6XT3i0/VbVXET0FxRJak/w== 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=SXL00vZJ65cJMEZiZDLFVAjY4Bbu6xFQVUenk9XEqWc=; b=GLB15qc2z5uewkfk/g/4CtZVifsPmyGSSNkxSF26o38prZ3fw+qAl1Mzd85ay2au6FH4wUOp1/IAbBprwagWtwO4i0NP0cudgOjDx9GobGJJnvsBnCwHm+9vTyW85NFHDDPFl80fSL4QXbbDw1ufnt0wu3R7ANa7QiKAQgPU9YE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:11:05 +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; Mon, 14 Aug 2023 14:11:05 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 06/10] scsi: libsas: Delete sas_ssp_task.enable_first_burst Date: Mon, 14 Aug 2023 14:10:18 +0000 Message-Id: <20230814141022.36875-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DM6PR11CA0062.namprd11.prod.outlook.com (2603:10b6:5:14c::39) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: 0138b009-0170-4f14-d314-08db9cd04c7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7PdWpC0o41cCZ0uU0tGWv8TZuRZFcfrrWtljjY0sfp8z7Qb2sWEw1Pses5MCsfUqJquHgwpDck6sCR+lA5JO++JG6Fml23pQFnQvr380Wu+9T1xgF/QPXS3+z3lQ4xd6ZrgT46Gvi8LlDrNMr1Qnkk0qzkZ9MofVmC2KuYZolLkEU1XPVI7ZX9ie/BeXlktedBZ5QA9zi8YooWU6B+nuRpibAM17ntHRG7Z7HrRxTqP+0I5Dizz5FjroJnSsZO9iIbKONFvbtBjYQqK0shc55PrPGkEvc5jFq6qw1QmE1u/3CsK5my9XIXn+C55PM1QchpoDaKQV7YIbt95zWcesmMsBwz115Mzl6baLxl8Xhleje+kqHGZOIPx1mVK3RPcHEtuq8H8EbG0DDZEz/IjyYgIvNmyNWeOHizflz92GNXOiQ4VBemztJzDN4LTHBEG5qDnKfC989mwFwUz20IuXrd4lpo/jGlqaElNy10sRhBhHS6jpN3EzNoisLh5TcTt28les1B4jnTGGSlkAKRhkHb6eba8Yh+lzzSq/plOhNHGCt28y4F9hki8XeXzxdt8iUCDzncR0w8v0XU8w7l7tDMKD4hhXnMYRpFSR0HpKxxfPDe98usk0JYex+eEm/OJp 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lw+VlDxjuzTg8aClhR1T6N9apzCkEEMHoutnOZAsHKKQG167kLZ89V00ILbX3q8URmyA/wOU0CAzrzdwvkg0CtreHTBgTgu29cvy9kR7ERj+qjH3W4i31hjHEVs3F1eJE8nTRTQh7HOZa90GKDi5meys4tirMqRkbTB+647IPued3QY2rz7RhFky6ePXDPe3dOhHdV5/HK8vELgimkJVo0hRZ9eT4Xdh9EbqO4XwVb/HdjwRx8Mg5chSfuF4tEDkdd50h645aBZCnpPk99qmdAdfnEpwANwqpe26FZZZmCnEVkdCmGGRjXSpadbAaNJMCdUPs6IHX7yHQip44FYOQBLxX4wOBpEOHPZaRyNeBAFPt1lPUtpqmX2aMssbg1x3abImO7PfuVmfEhwqBBrLU8PKV/uRxO3pCG7IFYNGsEMXz0mUiHdYlr1bd8KUj82TmEXbms+XDUHPjXwE6KZmFhSNRTuKCHPbNp2gvJ85vLn5rY5jln6pott8rmJFWvwA3w1OWPXqI/KdIU0gLPoHTNwicmuaT+IyvR3fMockpI9JG0/Ixevrsb5vzjL4XzoUng2HQrZ+ZN94ZGyK+J4oaA0RZGKTmQWmzjhjtzLpcrSrn3ftxVRuthmEBar8Kl+AaL1L3zLCGSjxDWvy++EJv4INuRqtvGr0YQmYpsX0eKiYI1o0kVcCFOK4nT5Vn+YNBvJNl5/8nmngZqRd12yLfruPTO9nA5l00TLtJrXoycIIcUUL+ZchApz9r58JsOy4AP3qZwJbB/Rs5Yv3AmeEIQwk9pBF3he2lmOM16+Q19Feid2GuwOzX1rjhK65D8YjyJ4ZTirB3KzQeNHEBEy/cFLLJtELup4p9q6V9ZZlEhIW3Z+oGdvheuuJBEJurpiWiwoTc06b0OCf2HIEYnE1vzqXAcUSx+CQkBrDLhvu+HtEODHZZr83Li+t9kCjy7n5N/H2ChbsoXCPIXHhDl5osdjOueIXPUMJ5MAdvVo6Kpn90l05zd+60JatfsUMo+KnfGIPqGzxRV1TXmaASPRtbhTcYGW3qUbyBSWIGNU5Y7H+AcnS0FGMZXHZH7hlyGqaw4u57O1Xc8oEP8Mp5VWwG8XuosK43wqyFn7G3c7PlU2op2zWmFCqfkUYFHGo/5AhRWjDj59QEIxcnAiX0d2ZZTim0jCFP8JQTM2HMvB4Y9gY9mPqU43WyKXfRgzDzEH26lW49PYVw5OW1a02sGLoOM95qIh+QSzsp2kNWQBZi2pQFJnaLVzw9OoEogn2udwM5CFAua58oUnoELcUKCB9MsEvMBF4xGCq4QiUvhYLqLIy1iCyMKupzWd+ne6fgU3LKzLFZHcw4pYAGTlA3gpPkGvtyZO2IiuhmabilEbdFXZ4eKsmcbbF4xZU10elswEwhomEtLiV73H/oBM+AuTf/BzqwA7ySjLuGGpJDbgahWkIsRLlxzAqOSkGui+47zBUufI8VPWz1KoD5WV7dDB/csmIYCsaYItGmn75JrQ9UHAPg/cKn/+TKfzU/nTOwizKOshX+bFos0NYEGP51cS4YDkW3conP/1torIW7n8/P2QNoY0G/svNoxKODiM73bqXK1L59DpRkIHfqooLdOgkgQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1hv22XQSBYefmwyNDd9PRxYWykk7CdblNiC7cz9kT5vmS6iCDWt04LTCQLffVCsi8tQjJz7eKRorgbUKd4ujYEaXvZUZtXGRyyK2DwMkCQL8okaVzCqmsx6nVsM8zqutD86j6QCkQi1+DH/dYOYM2D7pniF+7FxvMCOfqDjuj/XNSlus4c9NkyFDL7cbAdjYn25YoHfzA5VlESPIYYqx4mJ8V2TXLYKIO8PpoUg52pu18x1b7cIQasizYhpb+YzEX7wJC1ZT3YxEELi7qUvtn7DYvSBx45N2ITSJuok8NCgCBFnzAHkqtZ9OBwvSGn3VVmUPTPyy/itLOApeJN2hCVvd1akVFNFJQ1bavTca0QVPOOXrddMb+667FfWvbTgbc59EXU6FS23oVSzjZ+PGFjXu/+ElZW7d3k9WstsWnx6VmDiITUpuqUYG4GwDsr+fpwj0kFinD2lcZ3iR0CWIWjnXIBKiggazr5ycjzc7xXsWvcbqCCnjGb0hFpb7G1EkFf7f4NoTsz77dJc6wJI9Rvlo8MO1QaH4r9b2MMqtn3qv8XnnAiiA0BVMvI4YE9IPX1zVoXSj5rJMuZsathBRLfoBMD6LGdksXdzhVVL8exGBh9R1nA+WDLEDppUUfAjSd/Gr1H9Euoa5Q1iuw6g8bWdDWUS8WwvMcx5lTkdGII3PJN2KmLLiY6x0O1lQN85mgnGJFqFKeLPA4bX++47tAuP0xmWfv/VKDQJyFuetjxqwHvPzvjHhrIgEdHairAlV8M/U7GYUUqcew94AxeQUEkEOiEhpPIg5X0BmBYlcygRXp91nMjWxVsjSR2XNwty7Wz0cSkVmPohmDGq4n1lTndiH8lnVsEjNz6OQYqZpPC4ZALnxM91O2PSQwGfWf/7MlfSzcac1HDAobikK+itGVt/3dbUlY4O9MqyLqXVM7dYEQt9CBpuifU4MzZHCv0xiRq9uqFm+UVYgmbuTxVKTeA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0138b009-0170-4f14-d314-08db9cd04c7f X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:05.5151 (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: neJ6S5nwL9HtpoEiWjODpf70cLXlc+TlS4Zch5SLyTuvLZpTsr9nTNcWY+CoQDWZpVpPCAmOOIXibdZa9CJ6IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308140131 X-Proofpoint-GUID: al29xDqfyc7Fr4mWeCaWcJrX6hNdEK-o X-Proofpoint-ORIG-GUID: al29xDqfyc7Fr4mWeCaWcJrX6hNdEK-o 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352962 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 3DFA8C04FE2 for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232253AbjHNOLy (ORCPT ); Mon, 14 Aug 2023 10:11:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232233AbjHNOLc (ORCPT ); Mon, 14 Aug 2023 10:11:32 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCD5173F; Mon, 14 Aug 2023 07:11:29 -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 37ECidfx024708; Mon, 14 Aug 2023 14:11:10 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=/buDIqr2qKnYA8Rh8knn35deNgWe8nw5dXeXqIyfWuw=; b=IWyRTt6iICtSFOdUqHgSQgZAx8+Ioo9HWn9mLQgNbrOXxJKi/G0g5pbfdh0Tbv9XHbAm 7zVD+f9BP2bdnrHqQx5PdT5bBjkWsa4DRRfxPRP0xli76aYsxSNnVJ3HQMy+hgP108Fm HFHWqfSlf/6FvBPDtwC8bvJPz4Mh9cUKUYoU6YyhC0fR0CnEr3wgw3cpta/A5ivTJVzk S8CkgnJnk+PngGQxcDWCcwlRKBpoIowwAc4aFJlRoSlESn4wTe3ElzKZJQfSBtFf7Ore s9ZBibj94RvghyHMpwkYUWckh5trYUFbZs0GJH40KoS7mV1+oE33x+KQ0lhrCvoE1X1+ Iw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se3142pa7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:09 +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 37EDS08I027629; Mon, 14 Aug 2023 14:11:09 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey1qxjbg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZr71wq+/8THMYbs74ypJ/2HZu/SwdW3hKHY+8/vWhU0JZWnO2qsz+OYoMwBlEdlnvAaqK2CjyCa7yWE30U/H1CVfeQZqMm5cWwVsMWQxGTHN/XO0p4+sDZ7R0O3J8SkkgorjxLu7XYVJ2MMGDkqVl1bPqHMxYquhBrc+K0+Z3GvmUzabKvgGfW4o2FWpIO/jDiPnkfpTYBZEfz5Q+VbpSir/6qHLDxHuk1S7YtwJ8/ddZaCMMqQBc9xv07RTFhTIKX1v8YUIsC4rWA5QEKS22BmCiZtqBYLXfFhXP4JoEYjOqpF2oz+xksCA4MIwTbQzHvICYKoTIxGbFatPSqC1g== 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=/buDIqr2qKnYA8Rh8knn35deNgWe8nw5dXeXqIyfWuw=; b=Y8p8ShBBfO/MhiAja0qr2ejprC6J723iyJkHTQ/8Z0BW2pzwFWou88Cvwhl85GR7Rjpce2IFj+PX1QzbwGJrLHbbctBq3xC+5dBMnWY6VeNFHbWtKIHJHBgbSaMnJ8CnNmqHWrOH3JSvwAE2tKtBLRQ9k4W4ZVcKa6i8jps/MlrX5AR6Q5f78rKS+QOSkLworB7vMBzMkpKADBNb1jAePXZApA5LcTmDFwOC9j2dheN8jWVvtzdhpBARnLnqidKzPxXRHmoVIeYb0qMrQ/yh+5xfCaIr8Y0IAHkrYxLdToZApn+Xj9QCiznTP0TXuEBPYyMdDkSit17YDyjUWLls/g== 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=/buDIqr2qKnYA8Rh8knn35deNgWe8nw5dXeXqIyfWuw=; b=ZvYX7ruU5Bah4S9M3Itbp1oDIXNrG/TZocto+phQYUyUWqvNtT0iszQWvwMlU/j4doQcRbkNE+P295nBcIPaDVahRnbJvfSWuQikIApMT/XvNPsroA46aFS2MxxDFhlkPVjqgbvNJjzbVU/lkoaDf5vo7s6Ro++JGMeecZFCcw0= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SJ0PR10MB5629.namprd10.prod.outlook.com (2603:10b6:a03:3e2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:11:06 +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; Mon, 14 Aug 2023 14:11:06 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 07/10] scsi: libsas: Delete sas_ssp_task.task_prio Date: Mon, 14 Aug 2023 14:10:19 +0000 Message-Id: <20230814141022.36875-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0219.namprd03.prod.outlook.com (2603:10b6:5:3ba::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_|SJ0PR10MB5629:EE_ X-MS-Office365-Filtering-Correlation-Id: b13fc41f-25d8-4cad-241b-08db9cd04d3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vrAHTl8pqwKUAAZVxBzDNv6pwj2pWHQ8vt/yZ25cRIyrEnfXNOhS0LnGHnJaL25vpZ+IraDEyrHAoHRhH2c953SAhVbW21pXI8XpwD76rVJUjPYiYKCIGkjnoQfyIjFT4KZC6l7uGq6lvblGcsrM+QWqLUhFbLrp8Menx8xT8BBliW2BW20uAucpUHvueNOn+sq/mdtdXmZZQT3gHGQFEPomfZ+9nekkh310T7+r7I2IJ5e9ESEO0YJuDFh1o2pQr/oBAGVnAKdYxQ+jW7Awun/DkBVymJ57NnibroiYK088eKV1XX5pwjmLpuig1k3So5J51gu4/FwIGTSdGu7jAwep9BUglyxEvj7TpCOSPMEy3SLwRpql6x7uBs6jused4wWNOXc1+fjf9fLtZVKsoRmIEtjL1akx/pIX9EvWQ416U58QZoCS5ja9XCGBL8iVqpl0kG/JHmVt/eZ2ZpuVJ8QTDUDuF53KAdSVK8tBhgUA2KDULkefI9svtZO7P2mVLTa4D+MJ//Gon7cYggPDnwlL30gcy5menGi2W35JCw6czk5eB4KO8qBV5XmyM8q5 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:(13230028)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(6666004)(6486002)(6506007)(478600001)(103116003)(36756003)(86362001)(83380400001)(6512007)(26005)(107886003)(1076003)(66946007)(2616005)(2906002)(38100700002)(316002)(4326008)(66556008)(66476007)(8676002)(5660300002)(8936002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xD3dupzE1089iaN/4ohN2GlDRJdr0Km45ei7QKA3XCRq/1rtxsjCwN/0AW/yzm/ibt6VZ2a9p2fNUG5j0MXv9heScquio2RmECWFlNAFxTIFNWkY7Vn+75z6eo5dZDR7fXzk1emA37wAxf/X83XCluV0MZjfJrdZX0/J/fRfQGHMZlUpGF55iTvX3aud2vpcwxvVWTsvweX7dFYnikjHrOhm7lLfKa0FkOk+2Ik/XUqvcFfG3MZrc/HQntaAlt3jOAZk9ms51My9jo5QAWc1o+NWS5stO6CkeKMM8dRzU7vPqiQ5wvRWkM5yjL3K/vpjwoQXckL+ADaGTpQf+fkq1JJAVuwQZMJYJhssID+c9mI7bOB924Ac9bS1WW2cu7av/T/f06mY0nN3/IIF4htL5zKd4Rc8yrjoHaIaHVDgJ3ftxHTEpqAw9JGXu0vFS2EV8KwO2qoHNh5Rh2+aSVlGei1RbYC2gE0h151mV5hYk7yPoXGZv9f/ZjnmCFkgnl3EvwTDTZR+kLjRHLPe+QMwlqLKbCbRS/HSoMwL2/1gUH4GP6I2U4MYuHIwAT75PJ8OkSELrTJ8bxYkF50dX49Ww07lcLRUcWkaxGALBCEl9hMCl9J0RUYz4BPK7xe64fCPnmgDmNjuk93pdvjCM2ace1RUUZapwm16JrrzfkKXzZT7oF3QyalOnS11paC3yavylWoC+TXQJDH4qKO6FPbHVe5/OBTnedaF0dKzcUas3JTMz60qODyLT+andGU1t/BPUG50DxEQYXXMerslWzKcusiXPQ9GHQkqXrlt38t0yTd0F23I0+ZAp26G4gsSn72YpJZq455cpzDbtewNTxX2Hz4gXqck2M0LC75g1vYw4ok+xlRJikfUEjKUYFst7WYbJk77LXtNqBmYRtFls+XqVniI7BZH1KTeAwrba3lQGR+6wb1uWLdaiEpTpWCzG4+FvYXx3eIG76f4tZeph96x+1qPd8OQx5Y0Izc3FIgkxXYBi6j7PAda3GEa3twypoqyO4uE6gq6qiLG4fzk51/ZdQkse5DM+MDMkdGlE3wpI6XbfApYg8e8GSTZ2UwBPRtGwK++V6crON2Uo1XJ5s1Yhv+fO1yx/4YZOsD3EG84o/WoDfDryiAFks+WWmW/gIaKjM/6uVHJx40RqoHLvQYHX3/dlSGZw2bSHwS0/VIWl9/59gjFxdTrc2U5Ritz74ys3XVoAx18Qa9myQAmjYKq8q5lkLdkfWCGNAU6g8OCh5O5BAmhG685TgmjMqK3nIPGwNhKyAbb5m5oFULzPd6E6NsEseentNiSUfuPnWza6aT7Fb0rCnZdqhfyZSAs1YE30wg3LDAZeXk6xSPXrxQj1SROMcIiQRfhFbk4EivBPp32O9mTEe7Zmke1kjZIi+Rh5jnXOKnz2O2PqPiv58fbR/n3+X0xUp4vIJVKPm8KgBk8FYwXEX8RGNZ+f/6PrxmQlhRlj652vG/cYcN0N+OqlfRx6dwWb4nC9RqxDEsbz0JFMQqZG7zKWOXYROZFgbifVCNBw4l4AvHO/euZxhrURfWp4jTg9QioZULrsls6tBVsbiN5awGevLnwGv/C4Pu3t2N+zrmt0yfSsgjQd3Tk/Q== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: SHQW9P4EmpQMEc7oE8viVlvoaE+jEQcQ3d8k0ktdUqYvrW3mrBnXDUAblXiOfdyTPaIBF1kSpnkukKzWRU5I0io2mesWIOpHMrjj1S7IrAia4Sfblk+yZkQB/gzDh60oebES8bk+/7ELqGy2n5zh9iX6wLHA/Lw/RRmSXCffbJFHVFzFwqMHREYP7PP57iRFOz1Qi6LjGua6975caNLwJwU89T0/LvWwt9sPxH22bgCyEqLsvNmF9RUYZY24Blrlw2P1kipVhKZNvJFsdPyPSTyxPVCkJAk1+XZxIgoa2qYd72K/LezThuwYlhen4OQg0zFgbv2y+A1KrlBCN00Ov+yAXNEaEu/aVl/eEumUWiIY+aZP+xHhtX1EtNz5+oH75f2IwURHnPNtu6S4nqKeFvbnKZn2QdJdRGImxN2dRMjx1fA43RlCykL3bM7ZX8QSRkDASe9/oypI3jJgngzvw5+RmAJr6fWqQV+eVs8OR2KWDbBSc0e3hMi4VKVNlphUe1A0QCJsZgctQDNu4dxez78/F7Gi0Aznd/xhIOzEtqau4ZUY971qVIR36ADOfoJJz0S48JYVsXZOqPcbVdAeFihK0zrFidyWXHXTnvBEVP4ubfs6/tKdxmjjqrRjJEDCk+BgXeYyhRsx9nTzzmHi5JC1GUw82mKHQpRK0Yky4rCWF14nZfy2lslA8hNpUh3yg5W0dOe76r3Bu0OOIs+f7Zfqlm9k7qK+xG4RIEQV0++ZU9OtTySbJZCfSn5oY50L7foht2/Oqxz7yaabGBm1HRTp80DfKqXBlArkLbr4XS1IGS4Yx3deomEr6gMnRtRwi3PKU3CfUKjIROL4+wQCoU8DNGxEeKwn1VKPf+zoIqMdkadAzIHxTo7pyQS0/WEl1FhTHzU0S2cz0/7q8SvSoFaDsFe5BBW6eNxPb7N+nS0+wxxOELqB/4Fl5MX15Kk0iZ6lnJrmSsbhqctCeYiLKw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b13fc41f-25d8-4cad-241b-08db9cd04d3c X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:06.7703 (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: aLx/DcDEW/dhKd2Yb0u+S3rjZhczmKl1IdtpIF4ezqzVn7x0WOEv61wZWk/ASsBR5FCvBfPOpm7O7Ocvt1Z3qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-GUID: kFmkKnSXFPh_Os8OkjiySWSFcYijRbGM X-Proofpoint-ORIG-GUID: kFmkKnSXFPh_Os8OkjiySWSFcYijRbGM 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: Hannes Reinecke --- 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 | 1 - 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, 4 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..fdb8dff2e50c 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c @@ -180,7 +180,6 @@ 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_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 Mon Aug 14 14:10:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352961 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 6ED1EC07E8B for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231845AbjHNOLz (ORCPT ); Mon, 14 Aug 2023 10:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232200AbjHNOLb (ORCPT ); Mon, 14 Aug 2023 10:11:31 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7B941733; Mon, 14 Aug 2023 07:11:27 -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 37ECiLYl019898; Mon, 14 Aug 2023 14:11:12 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=O89KATuYE0Xz6rGVCvGlsHv2ER42sMTFoKma5SIKQBQ=; b=PJGOsStBSPjkgXhQfADj0omnd9yn3J/LSb0z7recMprRU67xlh6U/bT6Az7hAJS9Aed7 vcGDgwA+YQKeNdPaVxTJuF0avRZ0jjPJKoG0/sg0R6N5avEKNOcukBLt/zReJpSa3K9C YpTyLp3h5DgJhXgESAtqgadjtklvtUGKLhZ6A+ux9Vzv0Aqu4Cad5+yreKtYbJSOfRvY zQpvyqZzDVy7F5ec/CalkFc4I5zbAhPFeu4uCeWQSHo08tKR4DhDvKlEaLO6m605E3ax nyfHfQTAes57Po4YFNmCqzRLIBXkAFU/b9s79XQSzp73/h6X/GVGW0MXasRZItynuISA Kg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se30stpq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:11 +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 37EDWinQ027316; Mon, 14 Aug 2023 14:11:11 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2049.outbound.protection.outlook.com [104.47.66.49]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3sey1qxjdj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YWCGEv8PXqPUjqYVkPgwWps20DiiXdF7pP4boU5Myo/Epp1/xGG2T93PxPw5RCrLYQAAN1MnjoQotu1w8jiflDSmnDWGgNEbCD68nFGeO+ekj0TpJzvl2GrNmVdJwmoZPwareTm3i1anbjxI1pYK65swZxx16AAx56E/70xo3EBrfeY3OoNddr5Zetx2FAA1RA9uhNOQak52IoSGUFs7hwuwgRTIY1eppYhJ74dU2JqJS7BnM+oE7ol2ddfO7dhtYNVaRbxRYvs9r0B+2wvPsX10KdP1u88+lcfN5hQCqoNsShhBkGVh2EsZMVUoBVKJgP3Khg1IUoka5lxtKH8i8A== 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=O89KATuYE0Xz6rGVCvGlsHv2ER42sMTFoKma5SIKQBQ=; b=YlhgaSXiSKufJCcuaMYELo2rVCySd3/X7TDBFdPo5SYyzMT/h3SHi95Hj4EWisEbDv3ErfXa+xIFhH8gNGAxTtG0TsGXQYqz445vImu6rg/fiSxXaPwiadduHfLHr5paOixJZRxw3C0lXD/346DMMdgF/EdagQ5gN8JEKD2H6lsjmuPMEC02+31wabU9q+jetvMGzCrqyImrX5mo3Lf5AGkn4fJdnWJ5Riua5SF7eA3VqBgM08+HaphvYQuXd9HAkEvlL3kwJsWMODNzTJTmN8dU1HuPoBsOKogRx9XiEzsbTa0vV6yCj999frIsn1z2YlA6bdvjgsb7VvxhNMii/A== 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=O89KATuYE0Xz6rGVCvGlsHv2ER42sMTFoKma5SIKQBQ=; b=LrmR7P/i2Af26rrky1I9Mjfm5em1w7Q+DirUtywLXAFT0yO+I5V4cxk2gd5hVVoqK64JD537DKvNC/T2/lN8FYm4OQkRDmFxHsUwQvmESfbvU3oVsBYvkDpn4oStzaCcoxr942k3K0Qm5kCH2hG7oKPl/MlgR8oF5KACZSh3aBs= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by MW4PR10MB6417.namprd10.prod.outlook.com (2603:10b6:303:1e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Mon, 14 Aug 2023 14:11:08 +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; Mon, 14 Aug 2023 14:11:08 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 08/10] scsi: libsas: Delete sas_ata_task.set_affil_pol Date: Mon, 14 Aug 2023 14:10:20 +0000 Message-Id: <20230814141022.36875-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0232.namprd03.prod.outlook.com (2603:10b6:5:3ba::27) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|MW4PR10MB6417:EE_ X-MS-Office365-Filtering-Correlation-Id: a0fdac4f-ca5d-47f7-4898-08db9cd04e2f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RVea1sYeE9JYi5BQ/JRgGj4ADB90AziF7Vz9TGtDr/KYLa3tItAhB9Ecdd1Ao63tUKh08fQndmpxh4nA2CMWh1Fu6YvSkvmTRigdoEg+flr0L2Q029x3O+BlnJ8FGV6BANoXPmutfs1K0ij8B8djnyTozW2am4YEOKLIJT9E44dZ23EIhuPD2/uZI4lPfaBOSBc7NeIltSY6HOK+tnt08mJQ++dif3K5CCMllWJptdxGeWJhbbRmIHtT8JjAuqScgcqDSJjGfT0JyOx/Xxm5AgYSoG6IUbiSES7zdMLPHpRZkedy3xQxXqRi63yxx21c8X0gPkiZDdyQYe3KsJeRyRVF5x5vR9qS6qc++Vh4kjxDtGlPvMqai/sh5LBQ6R9pWy+4SlkageBwM1s5OZ3Oj09rU7YlKjqHANYMC2R3mYYTu39JjFPO2JcOC4SLEr4+ZCCNpfPWwtf8A9BI8JY2ZFUBVkZOL2Lrpk1BxquoHizL1Gb6fe6iBM44hjnnuoL5erMO9yIzV9JKqeTDuuYFtpz6SRLOkYStKL/TIcLg1VfBAhati54V6JhUgi/8zEEz 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:(13230028)(366004)(346002)(396003)(136003)(39860400002)(376002)(1800799006)(186006)(451199021)(38100700002)(36756003)(86362001)(103116003)(6512007)(6506007)(6486002)(6666004)(478600001)(2906002)(1076003)(107886003)(2616005)(26005)(83380400001)(316002)(41300700001)(66946007)(66556008)(66476007)(5660300002)(8676002)(8936002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0ChTmqfuIvuO1FH6PObFThDPHnI3B0JGvp/4CSVHkfQB7Uq5doh0G45J8VFwbxKm6on3zTZeKRPLXHEfGYKFgMsM2lAqMtnLJwe9QcwZdrIh6+YtWYkuPE8RTCpG3ryUJdxCMLYGTPcFk2oPbZWwLS+wQWLQR3UGVGeUHhNnWjR2FRIZUlQoXg0MEQ/3FkFZ4nJydDUA5/9HqAnhPz58UpmJsxxZgBwutDCEEO01ymfaho3EnrGS3IYB8wH+hmL+3Q3WPItbbcNzqy3zdBqwtCAQS+oaMCeys8q0DS+yuaHIu4QMnMBxGqArJNXlTLpwOhbi0Orb4mMpbV+ITuJWtFFXsHyjM2OCX8VQWtNlOBFOUT56J0eyBksEu6IWgJ2kfzAHP94ousytXSG2POMUvtSRBZz5yqCdJDKZlg9hkzsZLo7vTur3TEegnWbSngAeP2FATWpcS4QSRBfBD0eqZZe4zWu1dbrUIDkHlvMtAlkTGf7xY9ruYcjtzGmEZhDynZutypDQPajKA1Nw369UJXy1fbuprKBdx0t+KB8Q9IOjH/Lo9i+CFZD5txpW+qsMgNZFGJ1YTkdmcxWSLp016R+UMwAiE8+D5Mwj9rdsltZ/aHy3x5yzLcD7ZyRwdOemGRhVvtCHMAp+v2Q6MGgc91MeIqSJHcLfinVEVX5/BWdkWy09IYNVkNoZW34jCTsGAYNT3kO1k22v6yVaCvsEWTdAZvQWDlpJNoNvRpJt060Qstw/6gbvfFPG7FnOQpyAGWoAfO+qtstWE6yOtapG5c+xPQTqeIIt5SgoNKLy3OGsjTLvex2+ocreDW8ZxdVefEiH38jJrk6Ck046wd3l301FhcClUeYCIQwqZlR71MqOznbNBbD/aCUlgMV4QYP36s+mU4sQCb/kuivF3AisDS81DSGdHDvuCllpau+6ivfbSFgyAvg4uRtBkAVJC/9oIyCGyYStVTPybobUo8Oqk6Bg67HT7HB/Z0lTGPolAb2LzYFeQW3DNbjCIhUoyjnDPQjPPeU3N9TtzrQ2uIS4SKslClnVywGXTjvWi9lw+LmXszL0/J7K7UdPL0PKpoiiiULhLgJPs7yLYvPTHQdboyZBEQiFlHW1cCxA0h/UJQz0OduKYrVDsCmJY+VcwKegVtIs6Paj2fIY4iG2DaVThYPHhye+ZraHJKbXZS7G7Di82IiVbXNOQsYKIMKfVzAtWzjf+LTJ/8rBYJWLMUIcNyfFeglaAHhwQzJG67xPCH4kBIaDaWnBurW3q27KUejKBkK4LY+CFoFmZdr4BggoQMJeGBgwQZyFoZDTuvVrcioVep04zUkIG0Nc1LtmIrJVa3TUjtP5K+76OMgz6LDwCaB1vODAD3Ci+hDz3QKXvgvpfb3xKd1pLLNKph0Af6UmKPBh5AW2fOJo+TNajyroJw2vIrBoHWehmuxnkSpW3LzNwnK6j6PiIFp4R3572he+ig2Lojp+Xtx+ZicbtsK4onG3OYT2/LN1wOIcfiWDJicmEajsibyfSmnS0ZWvsplSuNo64fsbXiooS1qnXePEhG5qii/sXcV8AXJ+MZs3njhuK+/lj/NX/RyFZKhLZJYsOXvPTIdjuV+48gMBfMqnOg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: G8u4gqAR2YRcAq6DeQF20aos1nR6q4k5ESAuvFaA1yDVI49gukE/oBEQPdQpnKcsCxrfQODmNWFM2TOCl4hW602+nSft/hz3u1p2LzTCBUbW9jnnG86FX5pBBTz6tFII7SH+iXY4wzZbwLkQmQLjGixNGFATXCyR2jbg6GMh8USJAD6ewbghpvGl8NvW2UWAT3j+ov/URV5iGlcX0kkkm+N0yxaNN3v548g7vOy5HOiKa4gYT1viuuYj+yFMy1hTRltpLhbb934bJQbNFhOtX+MMxlfntTnMhhXLGYo7xIDw98OL7xhbQfDy5CjWn0CcgBY2/6l0eK4HbdG439OBeD9Qes6eEGDtaQvOhgnO2Qag2tBo1DVNj9JCcehSbC8GcQ8mPIKq+aFlNuKHRHLvjlgD8WdhOXIArHwNgMtBlN4lX27kUZsJHvlhce4OJ68Rt+/CKZix/ZPDoNvjN+PUMYbqCeO3AaqbV/E7QJjOfbbWigb8m5kIrJpO+1KAz/JAomAx8V2+mxaOubY6UVO4Nv/zBMKdCIcsrGYfdI9KU9T9t1nVjj+EJhDpfzTL1z7p5/j9FaJR81PZDgNpjk8Aj6Ouhsp/YUW3agDjBBn5g8qDAYu1yReidGRvXghStO6DREbQguxndeV6pUm+FaaSBpQ5QssQwtKwQbDSntJU2Zt7qPkwVKA7R7WBGFH8U6i05rIdf0or1PcAbNTBabQmNhBYsurCgZfTRcsBiuyatIjwf/ID8kA4Tjak+vp8vOBl557/bo5pWEBz5Ii0YAzdr+w76PZUKJszQogu7mg4RI7729LzJPlP2j23nzli+LH31zX8iEuPKVfLYQu3dITcuIZ8dztb4agclJ8RnUAkjctZhLSU5gYT9J4/r/r0W/ohMYonDYMuhb+g5kL/xZgdtqdzPxtztYmtV3t95mdanyk72qXW90jABS0JZwJ4gkvSTAxVUpgVj5+na3YkmXdrsg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0fdac4f-ca5d-47f7-4898-08db9cd04e2f X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:08.2853 (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: sDtk40jcSd5lGxubZ81KqaP4HHAjGPwOz/Ss30Br4wpm5fG61Yg5ZUENiuo9FzN300gxZP3yz6xsFk3JZStmAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6417 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-GUID: CIFLY7pnptfGaKeG9XDRX-puzvvtbqtv X-Proofpoint-ORIG-GUID: CIFLY7pnptfGaKeG9XDRX-puzvvtbqtv 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352963 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 8C184C07E8C for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232290AbjHNOL4 (ORCPT ); Mon, 14 Aug 2023 10:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232335AbjHNOLl (ORCPT ); Mon, 14 Aug 2023 10:11:41 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF59E1708; Mon, 14 Aug 2023 07:11:38 -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 37ECidUj024711; Mon, 14 Aug 2023 14:11: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=2T28MYMRdv3rmVaG16qWxtN7O7wM8DGdLAvnDDRDJjA=; b=WlneN70MEIY9datt5Q/gdyjNEMkbDKeB6137jKW6LkuSPQuNA2IBW5/uJGhYq0mPUO3e LbdN+yMmdg2av/vs4hTE4MqXBxPw0ungBZ1H7v0lYNYf1LhrhBm7npVr+C8fFLoutobA 6GZRiRFWs97G9B+Bdpentw4eVGSi+k9xNtX3gUB817YLxiiJlJnc2utcniIfVpAYjTES 33JavA4d4Bc5yJCPXpw+eGnmfubcGRu2atnIat5kiHNRFLtVgnhaMcJykGc1U426BCMl PUoxziGhfXbR9LJ3mv+qGpROjnxLlUwueVxuRknJemnRiN8FWHgRuuCvXOMRPk/8cG0m Xw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se3142pb3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:23 +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 37EDMmFP019770; Mon, 14 Aug 2023 14:11:22 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey3u6p8r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MRx3Ptisv3oWVykeT2TKjVKpx66Ze3mH4FD5FFNV+gnrBWqcLH4M8u2w0zhW2Z71NuRWWTvLrZ7iucJY1Lb1H2ZsztkDihcCHblQcphMqusVsBrAzNFLjcf1aGL1tv6qXc94MdPWzk98EizhXYrjfbStyQzt78ofahGnFRVqmT92vfwsVlcUgOjFEf/c+5vay1M8J3HCjTnsTfAm6xfNwJWrbkBBNTt3Tf9XyPzZRvlz8OId+qxAOgchYUqDE93aKYzHrp3Qi8q8P5k1FV+xAG2gXq4MzeOqOilesueUxJT/itRhZ+MLgg1R5dUI03VKuAQNLWRKPslqLS4imMGqBA== 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=2T28MYMRdv3rmVaG16qWxtN7O7wM8DGdLAvnDDRDJjA=; b=Wv8zv25Uuleeeo3pPDCj/ghzPAEKv7kiSB6+1qoaY2tuaZMrfP1js37LVuoNNSGlwLjfIUZzuS1jCErqzQTlK8rTM+lsU0B8fIMhOIuief8xaJ3pmo+deskxIJrTnOKrEBtmK1v+7rGClNx6AZSi/h9ZKZtohFAgz9nvzUrgt2YarE2ut7CTyQKBPAWYdmP+wsYIkP6JuGOHzzEd/eJHBbh9VHhic8MSBC0iYjGeFRnP7CA469ts0n+va+RQhLrl7N7F743wPE5pziay11obcR1Ax99odLduo9i5izAFktbScE4na5/99qoTmSVYhX97dnvihCr5TLG4ODmC5YP6BA== 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=2T28MYMRdv3rmVaG16qWxtN7O7wM8DGdLAvnDDRDJjA=; b=xomndbrXi6RfKAbYhL9lVlJmXT0wvErweZbK2Ts5WRprcUFqGWAo4SRCf8//BRy3/cMMlN64i31O8EK0R6c7h/nrJmGXea/ugaSYHHM/M2jTFHclNe6EvRhIesSLQ7gUqVrpFcpW38qXtGKePxDxPR09LHV1JL8+2ULAuksuFl0= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by MW4PR10MB6417.namprd10.prod.outlook.com (2603:10b6:303:1e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Mon, 14 Aug 2023 14:11:19 +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; Mon, 14 Aug 2023 14:11:19 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 09/10] scsi: libsas: Delete sas_ata_task.stp_affil_pol Date: Mon, 14 Aug 2023 14:10:21 +0000 Message-Id: <20230814141022.36875-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR03CA0240.namprd03.prod.outlook.com (2603:10b6:5:3ba::35) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|MW4PR10MB6417:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f7efe8f-204a-4a91-0768-08db9cd05518 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KBeiJmqBY28ssh8YXl6EieXohvFf75shD4EaIwJawKwkTMxKfHFJbBX8irKxCAJg9agviSlfrEXA7xsldIaALO805gkUHw1u93sERRsxAKlWb4eGBhyJuICXXn+PZlAmpRe1vYF4e4vWx3QcBxvhHPukbpnz+sOLxGlmEkBvXtyvfUOfNUmjrTAelrE0wFwkL4Vxs2FyqX+O83RyRA8vMY3Ks9iO3Red8Rx+42RdnFcyIg4m/GpyPLhcGPlO+ORdMVemfSpGbiFivLvV2inWcObnXsdslOV5N1J67S+Ekh2+7T/V2RSrq/A2coMEGaBq1qmGyx4vrQShcRFvycfew3dY9iAoQzR0wEtZlOLe+FESV1f0Yu7qxQUF/GkopwEMUmdQ1FxMylWO/AoiIgJpeWJB0HOPaHNJGv545Wmb1RfRoFJpURviH4CziEoFZI067nLy8bpeWVrMGLbilUEQFm18Vn4vEVd6z9NeTYYLH3w+woa92AgO8sC3IJYvlPTWt1Q4R1DhHrAFJIT6P9VwNpRZbQNpnty2AjdpFj8MtNgTIm+TxKbGjNvMQ91Yc//y 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:(13230028)(366004)(346002)(396003)(136003)(39860400002)(376002)(1800799006)(186006)(451199021)(38100700002)(36756003)(86362001)(103116003)(6512007)(6506007)(6486002)(6666004)(478600001)(2906002)(1076003)(107886003)(2616005)(26005)(83380400001)(316002)(41300700001)(66946007)(66556008)(66476007)(5660300002)(8676002)(8936002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MCQB24MKQrWDBLOEU2eFUdE7poKOBNSGzwSh2SiccpShqQVCezNSo5+OPQUeUK8LTA1pL5/xRmN9pCnwF2DTQLOc2bhMFRldEdNqz2PItlgjpyvBX/1f2ztUsMOgndYJ3PhCxvbxPm0/GbgHo4yVZMFxdQU1DD2CtdIna4hwdpK2Dq17KZ6rRUVJ06SbTq3HGPy7LA6z6Zqb8G7f0fTwB3lfn4CMh0LAan1BNUUXHVplfav9TujFvAafTIWURCRtiQ2kKDAkkVwJmSG44YiZxElj/7ZWLs3SCw+BelO7eVLARpooA0qkfJAKNBAoofS1H5c8krax9lY+9AgKk5cpClIGyvfie4VtCDYztOLWN1VmuOGXAgWSN5XY5UranSsmcCzOEYAbV4+QJjgs0zItIEd4msJbN8ZB8TtEM8UkVM5XhU1jpMJJo5cjelVSxgvmQ8r4ALPSpNAqQHI6O2IWgkymtFoH9bTtc/I5VxLyU1X1Fm2YikHCcy5tv7CyQUikx0jraVZdwLarC116DknOU6pZcsw89UYiNlqznEHyTb3gUjMg3YZbfNlVY0l92R8/7djVX5l6K+kDW/qOxt6KPH1ufPjgNipMP3FXN6lKjNAqSUDGMGuqWj0MHBcWknfBDAbFq8klcjYe8+RAj5VWZC+qS6JaMhBWyJmsiitVuCYjZtyEkEloAbKF5pJdde6gBR5PZQUTpduIL0hsL5mAWiWnUbLnvhRf74Amo6m3WDelWhSiN3JKHbnvoy6qG/vOMa2RhjXS0dVCLGZ+MyrInh/e2Q7XxdOiCUkG7jLFhXFmJnVJUwgqvvYfdRvOM8UlzPGGXXfwj1PPDT9QakgHzFlsgiuYi08uZ3HJzjpV11VvCCTSnSV5AvIK7Ux5kHo0EGqNcRUtEC7JVW7GpDRDunNLTPkMmP8hjYoccY9WjW4o6rLercZY8HMqzynfrdbTlf8omlIAR28RZCjrftTekVAOnbLSWMbRXRC20BNWuAkoZ6iAr3iRknoDH24q8HExnDIaPRZ+rMaTfOOgYgKkirgbin/5jdkcBe7KKbdDy6sEGxmu2Dk+3xyGWAuB/OGLAxFUky5FXvcVszkzxzk3CO+C3MmJ9dVN6T3AQOa/EPN1Hh3ltAk8hABEeYv8gacSMRBVBJ23HxG+m8pmxm/MmhwhOzBWpSVVJMpZbPiLyAJJVtAQAm3N0YgxekT93YveOiFhCBnjh7KON9T9gr9vHjBKirPeOcT8gEnk6KTtG7x7n5o0Js2WEjOVb/GfrJFKXVMoN0asW/lZCgwyWTIdk9TBJpO1I3UH053x0Em+N+D5vB31j3AOwWSWzWr3ZP7iAq9m/wfXfQMxAFvev7V0spTbqrUhgmqZvAXWao/hK4bp3AG54gTDpQ3lUNWIZm3VK5xvSgRcKzyniIJEIvRpA24OFsUbv/LoWB9nsBU9MzOx9/2nVVk1MduAnK98siWfcKvJKs+jlBbkBMlUV8KwugDjDqmyWLPPD0IOsr2SWNFsPPaQSL4cltCzW8NxUn6qnsVHu4A/WzVsrZSBerUIcZaWqGFyA3eKXlHHrLBLKnEBEXkX8PE7YMxJ7oL3g2zRtNVXzUbMm0OuDg3XaeUjDA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JaSTYKgLQMlCkjy4aPnu3up8OIr8Lb22GO8HgpFXZt6+LgncKLvHGBdzJX1mpmyOP8FjaLWWCs3w0YBHQ3ybM83w6JwA+jKzxdQnY7QH8vqcA8/kQv2HYs+To8JTN9MaZkFWzLq2VuSQaJRMN1/gU75jDpEGi8FTHIOYdeN5Oxsc2CWoZsaWun/Kq0KFEMl1VI4S3aReGKo6Fkeer/6zXfDI0rrJFzBodGASu6A62MKxwdYC1MS4NtumIp8ZuIS4WRpEi8x/Fswy51fjPD0PBFr52tdazMpuGyFmrPrJjk6BZd1EBxBbGC+mJUJj4cTBbObkrtYtKgHgAHt+zT/2i9HF/uWYPtyaZnWanQYaHZCegH8ln+eDzxHGXAT4Q79QH21B7hArE0MmzqVBD7X/RFYjuQXEsZjr93VXo2dgGgOInp+opoFgH0gwYIlclDDHFucipt0hBEetvlD1HCaRpLD4kabWbPXkYbocBnGQc7UnmSrqXLRqqEnU64Ardr8huwyjPpKWzzis4ErASBLDkvGG5zmZW1D1XSVyllt2kxqHYWn3utl5QYNUVVmU0fphV7AUwAt+TgE77a6EknQMx9VFdv7I7WJPk3VZqb7LGVXqw99Smz/lA6esrjNF74LiI4tSCxRnGeXKp+XP/4zW5FGRXLaxwBO66CCU9qaFDQsUq8cajC3IsHzlUeyVs0aNsXOF5HvGdwRPMNsThl5opnu0d0phpMH3e/eqOxoPUS59I54aV7IG8Eqk/r0zHJxRMGOiVrmqsyXgI0p219qvqjNtTSsI1PRXkPZ/bRiSC6h/bRLC+6JNMnc1hF8/Gu6PxSP0KOOnrWdib4AhR/FRaqOg8gpixQOSL128Pz2/Q+dAWktGv4oWXUvMibeeKV5HAWCF5ya+FqC8rIX1GLFY/QuEkG9de2pjRO0K7VJ2x7hRoF00HxH1udugNT4v6l91EXq5bzJUFZzjoeemc7huQg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f7efe8f-204a-4a91-0768-08db9cd05518 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:19.8647 (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: 63KMDyjCiiVspK87lqnSXd64n6ibI0ZWNX/Trps4HaRKG3ICFOxq8gQHkJQi3YJuoaboTExKIk762Tp5YmqZtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6417 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-GUID: 0IR1psQEs9U-LWV6OhBqCV8eaZQkyNzf X-Proofpoint-ORIG-GUID: 0IR1psQEs9U-LWV6OhBqCV8eaZQkyNzf 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 Reviewed-by: Hannes Reinecke --- 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 Mon Aug 14 14:10:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13352960 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 7D628C07E8D for ; Mon, 14 Aug 2023 14:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232304AbjHNOL5 (ORCPT ); Mon, 14 Aug 2023 10:11:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232343AbjHNOLm (ORCPT ); Mon, 14 Aug 2023 10:11:42 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C36471705; Mon, 14 Aug 2023 07:11:38 -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 37ECiS4L015365; Mon, 14 Aug 2023 14:11: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=37Sh5CR7SvPEjCIXRW9X4ynzpCHUEcCXDLQspxCF0hc=; b=TZFllJLYPh4UdPyYbl6YtY8dAzkb8XEZvyZr7kGBHQVgSJdU7ydlWxFXo+TZ63I7rXHU VzmLdaTy+9EYbban6o80283FSIcbyYYBEsYFzj4SLlh5GGLB/rVAS6B+gfGpOb47IcPa ccnQQl0A/eI5yll5W/734+8bEYaJezxTiAcsN5dgG+gxf9TfUHtiPzqEOkkI7rDTdYi6 TJK9nT4o603OD9jol3/FLBN8GSYOQNMleLe24cifayq4cOUGnBu+EPMnnJEfXLCzlz2o Fz8Bp2N0KumF3zM+puFliSyGtTNFFxjsvDFjUt6skAvnyVDrcMTzZzTSR3CX4Y5s12aH 1Q== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfjqd7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11: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 37EDJ2EY019914; Mon, 14 Aug 2023 14:11:24 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2042.outbound.protection.outlook.com [104.47.66.42]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey3u6pa6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Aug 2023 14:11:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JwkOtCdtPawzrYLyrspiD1oNvsX+W0nIXppoxMSP4m9647WQyLKSKaHhqxs/W15oRlc66p5+Qdy9N9A//L8C9+cvv0Va0Qh6NPmm9YHEzky2kshUktNGPLLXqR+YWXrxYwuZGNbsDSqtrNXbz3+6CMz+3pHNisIBZhvqAN7Iug0hDtrr6zhIDdGCdXW5kAuFVAPcFe39QPEfKZD/VTD9UA5O34PyN6oOgb58GNSZdYObA0uteswnBwaRkUtD+fgvaMXhkoGVMi+a2noW3+ZbKroC50FNjnsjX8UPgloN9PTveTiA4xZaolquiv9tA76tOSjlSnrnr0vuYG/1W+4GDA== 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=37Sh5CR7SvPEjCIXRW9X4ynzpCHUEcCXDLQspxCF0hc=; b=Vcf0gzJ3BNSI/tzWbvflmmsLggilMpt6cDsbqexVBLVZ/NG547wglb4tzGxmVzsF5XKlpv78nnvDQ1PGsa7Iclft7msAWyAB90tfOU8CxfFCMRTj3No4rW99dp6dcm9K6tiaSKfAqDff0ilc2IqE/DUXsEn3u/QrEzaBK5XXNmol2LCqKuc6mUADo39uuSnLkXKDknmqLpxzvtXIBerT+4qJtf8S+SOY0qaQsSMAm7rK+IGvBSoMWJH4T6JdAgiUc2Zri6u8SIxvXuYwNpK6c3gjvzQignn755fYK8VbfwZk4/YYgFYLFaPwEmxwy+xua0ubMqsK62EO48ndqZ4mWw== 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=37Sh5CR7SvPEjCIXRW9X4ynzpCHUEcCXDLQspxCF0hc=; b=gUY8+B3xFL0m9Oq3Ln+rD4fNpfYnnqe2HKDolkfblrg5TaUiglKsMDAu42CNGH2h1VbpfB33RYT1TnDBsSbhjQNnQFn2dj0fIbMVQrkBPzw6Weny/NmT805bcvbj9w84pq+XTA12clpt8e4bjR78ubQiE8ellziRgKoa57T6Frk= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by MW4PR10MB6417.namprd10.prod.outlook.com (2603:10b6:303:1e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Mon, 14 Aug 2023 14:11:21 +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; Mon, 14 Aug 2023 14:11:21 +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 Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, dlemoal@kernel.org, John Garry Subject: [PATCH 10/10] scsi: libsas: Delete sas_ata_task.retry_count Date: Mon, 14 Aug 2023 14:10:22 +0000 Message-Id: <20230814141022.36875-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com> References: <20230814141022.36875-1-john.g.garry@oracle.com> X-ClientProxiedBy: DS7PR07CA0009.namprd07.prod.outlook.com (2603:10b6:5:3af::9) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|MW4PR10MB6417:EE_ X-MS-Office365-Filtering-Correlation-Id: a6082cd2-1590-4d6c-7f1c-08db9cd055db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I5LUawi8usiIYmHw5etJbUci/9Avb8IBaeoXIz5CP3hgr9zxBeVhsM63mkwgeMSHn6pQma7sQJSSHKcQjI1T4EM/ncN9LSWUrVOO+0f6rByaYrJZzn0xY96Tr0kcNuNmAOvQnVrM+1aFv+0n+EhDPQ+cqNOrJ6RX340badt/AwYjVU1qONYnJmEV2OuM5Gg6LfjiIM4GQMalL66unlb3naeJFViKQSagHYVquTmbOjQileGMmtcqzCywo1g/81tAZ36K5igB5XtQTLoz37rtvFJmud/bVsI6Qh6ndVD4NGaM2oIY4+D8W3DIKsKQRP6KS774U88NSpm65vkbyOtsfzhpaT1NSvxUmclsBMSJ4WXDc6myR8kXMPj6MUb/qEo0l7OiNNBbQx9dtwSqZP+4yFCiuhQJ4Xzw8KgIu7lU6LKkvMycWlK3vS2NveRdYsT0gfVkjJYwoQjgCYZWyYPMk2r3m7YlrZXbrpcbJrbmBgR/5yNE8u/Q6Y7Kr0m78bPJ9/4gKyBrAPoHlFGlJtaUzAsk1+d/b4htdj0kFCDQKEcOvn6tqT5FdESXSgtStmdG 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:(13230028)(366004)(346002)(396003)(136003)(39860400002)(376002)(1800799006)(186006)(451199021)(38100700002)(36756003)(86362001)(103116003)(6512007)(6506007)(6486002)(478600001)(2906002)(1076003)(107886003)(2616005)(26005)(83380400001)(316002)(41300700001)(66946007)(66556008)(66476007)(5660300002)(8676002)(8936002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jCdpewP7PaHgPdM4zoumseFso1ssAu6VslV9GvP/k8bq6GhRHcKrpbiMRSj5feeZVRlEnLme/eVyAYE8m+gkSQb2i7ouEV/R6Mzq169WwFoyhF7sGZumf2kpKuCGOjYcIRNBgcOLJEDskf9VUPjeFTlIGYgoj8DgmizBD2t/BTgJTYES3YWB7UhtnZSMUpQJijbiQn2GojkrykAi8O/DaNPt2qbHEzIbPi0Znt1LfoBIiwxmUieuwDQgxTK7fZWnRi/X9a287YowOuAE7/PCbeZwZRqw537qBt7YQHewcJx7tVaaQTQZili6ilMNs1NE55dBrKE4NWnBB3DoHGFfcnWJN18hhqB+YO48yHdpJOPlXOlT0ry2yyfDIz2DKBWn/gfilDmQaCg+bQvDHF/ZYM0MNUrdakrkZhyUU2WrlaVcuZmkbixTn7BgYAS+o1hERDF0ab3wXNk08axqDyyRLv3pKP+ILvp0ndWXfTFzne+VjknfWQiqbTPA06y5mLV6oazJRKVkZn89/86zLL9/uWA6UVXMq7VnctB8VbJgHO2mapSiSuVqM3RagXlqcBaB6uuvNgLmjxCOX8nUXA0ABQYFUtSvybBXjw+SPKbhJrWQh5xwOnfXao48W9ntAK1XirwB/xguJp+EgCmw/PqC+AWOV11klDjcd+nAwBoQuv7sZbtITx152x6MXPdkoNNkBDZTpiNhjFfhB4IwB//UnDNSINGxYhjP5gQmBBjbZJmQqHgHgUdo1XVRphm1OAmR/DJlNsbw0K1RmS5YzHplbu5fFipmC8BofPZsyrqdGqcZ4eMsgzy5cdFqtRd2y7PaTFpItx8ik3/cHNtp8+JIyIppCp9UV+TZiqNu5lnmVytfpA1OoRYzOG6coRsO/SH/zEKvzDYwToM4kB1OEJ6uQ0sBPn4PW4XZG+5kR8QkgoljJIhiKbYnrkEp/d6Qs20mZqPA+PyCrqH5hIW8k7AMSaru6RnlMIF6AJpYznvSM6Bb7Io1V3vBT0THjngEHfdOuVk+trP0KTVGHDbWZM7Z8UPBEr/4HKudY59WLpztF7/yZl8/OFL1YKsznUhU7Vl59eD8wNHL7bQQncYMwnzDEZVjsZLuNKxCPjNTlcQ9d0pzA3UBWbU4wOhJbnldHmbf8dFHqkh4ODm6uEoUsiTe1tfUCq5YsiwUN89cLhEMIlrCYWZia9FVyUYXYFF+/Q4mM2BUBRrFfbzX3lb/xQJrnFdOn4rBSRNM6eWfi+oGZpyo78zE0nLCY2MtysxrY5aqBEK3ln9fo93Qe3RrTIqPgv7yFTRZ+xLCdei8UOePPZ3ffB76x9OPw3YVbJAsT2WH780LxW6m8KjqK+L8fwEF5r9JwqaDUem4MvHqNa5TIp6697U8Yz6Ef+QlGa79SQ9f9XjDHTQC6K8StqLTaSmpgE3J2fXwOBo2LWa0g7V56at0dQhJSajVxSXdQqb3unFtms1YTNnGrGcWoD25fDzF27DRuXL/ygpg6Vf4J4O4Pwa585HUoyn36LNFH/pHe9zxDiZDDev7Zz7nATjiYOxQN9T1G0iGGNoeOR6m3nON3N03Hdhz/f4lPdUpbIHQgoDCJ+1UUwmox1zDuQkhztgmiw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mc7dQSJ9C2/aGU3aUyCGJ/+rDWVdmylrYaTaBr6EODSRd2MnTL2mMWiOHbHACve4ZJALHXq2c7FCOIhqEJEeHbTzpc6505NYSQwmItGVJfFZ8YVFib88sxyK2EA03lmff1IYlXCPCYkLzrQs8AfRpKcyTKThpPmn4pge1yBRYq3+7Bc70vZugAhAhK3ArHmTor9H+yVDJXR4m26EVrdfHN7a1afECVeKMXlUWET/jhv2LUlKLkGeZX7YfkpTSLW9sCrXjYV5VACB/oFs+FhjcTSG3E8IGAib8TeEt1945p5T83uv0yfruNMxklLuLf9FdvBZEOvVGdFR+aELFA+AP/EjkzLGkQNWOInLS08yUmt2Kc8Kl3x9s00i3zQDNgdFpXzKgI0nD5eNKv8m1NGIFRCCvP90eyArEMTnjqABqlQxHU92dS2CaO7/fM1xJdL4vM3Y2RtXFm5P4NV1R531YC9k+5wGVpYEeLFtLJJr/8MmWSTDhG1pHcgo8LXELEpc8zxZZmzUY2GYrT4c3GJgskMX8OvUr8d62QxS74F6sVYm589Z+fZ6cY/LVNOtAMkxjUwlYMCKoKXzmB/oSMPzLbx2afqmriB6I0SMpGxR1I+cmyn7nbY3xBcbKMjS39gJQ2XJ37OhPL1OAcmZtGmZaKOlV0teHhc3CEwYlPgnh+FRO6LbfY68FTz0Yoxsg0E2ycXn7N2jLo8qf9LZYhy3TJcBbyvszvhpqErKYUAMGsKUmWGG9UUEAeus5bmePMHUzaGUgVXJuTTEWwrtS+Zaqys2UVe7x7QsaI4gnMG2dOYEzigwrI9vg4IBAOGqnPKwZLuXcVe+i+6hBisZZxtecYrUHiWHpiketJLmpeXo9o0LAeBhvgY3FUIAiOH9Cdpp/LBVhGx++lfF2ykr5N46T5ZudbLLc749ncUX4JeijrqAQFS9+bclRqHRELyNKLh7Bc9i+vwCBIDuKpAaeKUlWA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6082cd2-1590-4d6c-7f1c-08db9cd055db X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:21.1461 (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: F9Ng/g0KGjSdxTrMS6VeZb978EqvcJg3aVAAuJNz2zWIg4UJCsY8NdhAUF6II0zvhLqsxVEzZsgKLfk0sm+sfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6417 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-14_10,2023-08-10_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-2308140131 X-Proofpoint-ORIG-GUID: KVyVJpYM_XscvSmnBjPX-gJ_sGEsGmgZ X-Proofpoint-GUID: KVyVJpYM_XscvSmnBjPX-gJ_sGEsGmgZ 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 Reviewed-by: Hannes Reinecke --- 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;