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: 713762 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: 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: 713761 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: 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: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: 713760 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: 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: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: 713759 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: 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: 713758 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: 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;