From patchwork Mon Mar 7 23:48:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 549122 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 1B3FDC4332F for ; Mon, 7 Mar 2022 23:49:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344008AbiCGXuJ (ORCPT ); Mon, 7 Mar 2022 18:50:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344068AbiCGXuC (ORCPT ); Mon, 7 Mar 2022 18:50:02 -0500 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6BB422522 for ; Mon, 7 Mar 2022 15:49:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646696942; x=1678232942; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=zdVLbzhYla2YZaTACujeWEbgVYGpiiXXLA0O0Pmn0YY=; b=dpdpvpzqYqqpFZvBp3Co6Mk+jycw6btaphDcsf0B7xGM8XX/Tj2eb3TI 7OHX967p66fQ2+gpkrvxzaqvJhAu5xj0esfISJK2QTqGp5p5Vq2JzXr5X yNDpgF4kiFHm3xhmj/F0ySbvXr/cRA3r8/XOWSF688WDqCUCye5QW7Z1A 6HXYenXVbc4l8JBH9KFY7prvHfDTSyoX3lYEA/WP1tGTe80kJjro1LSq5 Tj9CGKt+M7eF1cbpAMs5Ulp6tPWzw9hUKwpVqA3m2JOWIhM4pBx4CSZJp 7NIO87mjBlyYzy4r1CyyoAApSBfxXG8f5FS+pJCibHt+gDenOxfZaZyBq w==; X-IronPort-AV: E=Sophos;i="5.90,163,1643644800"; d="scan'208";a="195659150" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2022 07:49:00 +0800 IronPort-SDR: sdUHPychTizfxD3jeRQxPrg1dJz3QyX9q1+U1BjrRQTbNjgEpWNyuPQxunv5O9axBq+S8akPLY QmGFD6BSfNw14PPS9bCIqQg0I5U2qjf4c8nc1YF5e8+Q0AUW4uSAG3n64P/gU0EXWObiAVWJRT iSGEyUtpViJ2zD+8FCDlB9NKt/M3sftyVrrv0PWE2RRoune4C6B4PtFrbBqWsnuD/sLP2ogybB 6BHQP4YYMIj6cxgfvWrMYMPIJWLMcHmIRVXfR8BvuCM3mhnOgpt5bLrrWL0ybnrCSIxO5N/sce 5tQg1Oz6ZacV39edIY/+ayeN Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:21:17 -0800 IronPort-SDR: p6k42R+p6joipXLupwB+aifq8VO8rSIXw9ju9HVGZsZFtxMMDt15dY482l+xrBYt2rCP84tp+U ohIlsUfxNKS4KYjVwwbiZqHTBKzFkQfRl4aLrN7QU2/58fh3y4HZq3cxPp7g0/calzQw8rQA/J 6npUtfyLzvpcGJmxFXPQBjiNt287wlxG9idAK1RK9PJi2YHUmV8Chil7oax1X8Q1AYW9ufsSXZ Om8Ey7K5rUPKkemiU9YBFzYBFMfFLWIu1GDDT7wd4JRlImccsA1ag5NF1heiVTB0OK4X+ELoIH Hyk= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:49:00 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KCFXq4tWDz1SVnx for ; Mon, 7 Mar 2022 15:48:59 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1646696939; x=1649288940; bh=zdVLbzhYla2YZaTACu jeWEbgVYGpiiXXLA0O0Pmn0YY=; b=ay1rr9m9QskWAWNDTbOb8jxgjLd8CJNufU yRZGo/NqLq+2whiPbfvwIEvjgqyuXhRhS3rwndK3qlWHSal9IKXFLi3DRzWGdmWT uzSmsRtYtyt3PgNf7+WcO700CWmyn1+dEU752nuXZLIndknTqgjRAh4LyHyU3u4f fCkaiITOgbx+uywpRyO7LKRL7lAqHufiWHKEsCYi/WPk+5sinAz4wvjbDAD2iNLo YrvDNboM9huCRFhrNbeN0ywYTA4HMjr7EzXMjbo1our6qu/Q3nG78QgZfgUDnAQO hSFHVyJVxvIHKLfbUR43mmB8eBjnsp0grE1xdbV1u1KEunzsssLw== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id bQTOcm5WTAQ9 for ; Mon, 7 Mar 2022 15:48:59 -0800 (PST) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KCFXp25SXz1Rwrw; Mon, 7 Mar 2022 15:48:58 -0800 (PST) From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v3 1/5] scsi: mpt3sas: fix _ctl_set_task_mid() TaskMID check Date: Tue, 8 Mar 2022 08:48:50 +0900 Message-Id: <20220307234854.148145-2-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> References: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The TaskMID field of struct Mpi2SCSITaskManagementRequest_t is a 16-bits little endian value. Fix the search loop in _ctl_set_task_mid() to add a cpu_to_le16() conversion before checking the value of TaskMID to avoid sparse warnings. While at it, simplify the search loop code to remove an unnecessarily complicated if condition. Signed-off-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_ctl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c index d92ca140d298..84c87c2c3e7e 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c @@ -578,7 +578,7 @@ static int _ctl_set_task_mid(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command *karg, Mpi2SCSITaskManagementRequest_t *tm_request) { - u8 found = 0; + bool found = false; u16 smid; u16 handle; struct scsi_cmnd *scmd; @@ -600,6 +600,7 @@ _ctl_set_task_mid(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command *karg, handle = le16_to_cpu(tm_request->DevHandle); for (smid = ioc->scsiio_depth; smid && !found; smid--) { struct scsiio_tracker *st; + __le16 task_mid; scmd = mpt3sas_scsih_scsi_lookup_get(ioc, smid); if (!scmd) @@ -618,10 +619,10 @@ _ctl_set_task_mid(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command *karg, * first outstanding smid will be picked up. Otherwise, * targeted smid will be the one. */ - if (!tm_request->TaskMID || tm_request->TaskMID == st->smid) { - tm_request->TaskMID = cpu_to_le16(st->smid); - found = 1; - } + task_mid = cpu_to_le16(st->smid); + if (!tm_request->TaskMID) + tm_request->TaskMID = task_mid; + found = tm_request->TaskMID == task_mid; } if (!found) { From patchwork Mon Mar 7 23:48:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 549634 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 10266C433EF for ; Mon, 7 Mar 2022 23:49:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344039AbiCGXuI (ORCPT ); Mon, 7 Mar 2022 18:50:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344069AbiCGXuC (ORCPT ); Mon, 7 Mar 2022 18:50:02 -0500 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AED4722B38 for ; Mon, 7 Mar 2022 15:49:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646696943; x=1678232943; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=OFmN811CwEBOyhUbY0uvSQICwH7isycEQM+uR5+NIlc=; b=m6R1BHfxnBMTcz0uwUy6mjYCDoQMzsQgXaexqY1+qyPODQYZzKBHsona mgtXS+ekQRTYJRqRA7Xm0wahwwYIVLO1KY9HpRdmImJarJDgjJgw8QdCi xmriY4uLOzZ8NBDBlZy2y16A1zGBJDyKeouHB05FgB9sAFChsXtqeupoV +lKv157DBctxw/HYNhEog5wpH/5wMBnoiXCk96WJbeWxgv/GFFFU+FFpr t6TyNYdZitkmX87dPJfPSJxesSDt+TmcoN7pb9fVy06X+fLmn7IjBWQqV VLbdBo45bQIBg79EypewUO/EM4RFWdKOrvQYiy0YYkFkYSINE5hvKOVzE w==; X-IronPort-AV: E=Sophos;i="5.90,163,1643644800"; d="scan'208";a="195659152" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2022 07:49:01 +0800 IronPort-SDR: NWECyG3Nn1T+HMa5SS+1eHO27dv5DIzEM8xupbgKgIaijw9JbKfLZlv0N4NLfDFsKOpMSXAv29 24Ks9CR58aEeCeB6ggZSpx8tpJ0KYTKJQHYd3OQ0crUxYsJkDZpnxuay/+X6VE3T9avudvMF4o LQ+WiORbBgu3Cmb7wxEUm20Np7Ss2OE7fFOKkb2e8ZsttBfoKholCF7HKUWKKhjzwuJdCHZr0+ mSryCvUJIuYZloBapuliCa7tkbr5QgOI/DxGLfVUZEsT5pa1cIn5zkFavqUqDXxjIPsn/tPwEk qIjEiXoJ8NE7m0T/6F0aJWAt Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:21:19 -0800 IronPort-SDR: /U82Fxo06NeXyoU397EjndFH6rVVOi/OWreWW/+6+cUWgypo9exJ4vRMXakz+2nZgInRNzdk2p dpttYCucBJW/z0STVx6p1fpOhQC1ADUULEYVm3JxI07OR35P+HSJIof3+4nHd1GdlExCtQcyXM C9IXSPvDeFl13mln5mLIRJAO+VgoCS5jq2EpGBvhHkLt1djtxd7Fnmu4yYe2iXpgIZkbgQJQjY rfADLH9msVviH6J96f7woajPJ2/Su7yMRMVLZjdmmiNFbco0b9bMf5cQZSuPQWoKPA9t3mBIh8 IxI= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:49:02 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KCFXr6lNSz1SVny for ; Mon, 7 Mar 2022 15:49:00 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1646696940; x=1649288941; bh=OFmN811CwEBOyhUbY0 uvSQICwH7isycEQM+uR5+NIlc=; b=FKsbPsoohNBzqFHFLG6Pd8jyKy8TmRChTV Oh7bmu5HE0lAR1vejQtcc/XCZ/wsgdh0/EbNQ4f7lEr/IqP40+FDMMsvpRSyJjmU Xm3pknysVo4ntaCg3OCnFr9NLVe4zc0KdN5d9fNoaDleNB1cjgrWt1Mqb2nNbmUx ObcHszN+kw1xCA9t4X4g9rfaieiKn4UI7+9JU3ZhKLZY1EPBjGIHV2hACCthVEvF YTVeulKYoFPCKL7DzbbeY5E43Os3XQORi6LqYJJ+FTEO6BXwMDQqPPb+nOUcEe6A uJTflUDYpO0KFtkm9QLIbT6u7QgxwGwygRP9NUdjSAYgpVMVlPJQ== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id F8hdbNFL0SLD for ; Mon, 7 Mar 2022 15:49:00 -0800 (PST) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KCFXq3fNsz1Rvlx; Mon, 7 Mar 2022 15:48:59 -0800 (PST) From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v3 2/5] scsi: mpt3sas: Fix writel() use Date: Tue, 8 Mar 2022 08:48:51 +0900 Message-Id: <20220307234854.148145-3-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> References: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org writel() internally execute cpu_to_le32() to convert the vale being wrritten to little endian. The caller should thus not use this conversion function for the value passed to writel(). Remove the cpu_to_le32() calls in _base_put_smid_scsi_io_atomic(), _base_put_smid_fast_path_atomic(), _base_put_smid_hi_priority_atomic() _base_put_smid_default_atomic() amd _base_handshake_req_reply_wait(). Signed-off-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_base.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 511726f92d9a..6ebdfedd84f5 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -4323,7 +4323,7 @@ _base_put_smid_scsi_io_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid, descriptor.MSIxIndex = _base_set_and_get_msix_index(ioc, smid); descriptor.SMID = cpu_to_le16(smid); - writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost); + writel(*request, &ioc->chip->AtomicRequestDescriptorPost); } /** @@ -4345,7 +4345,7 @@ _base_put_smid_fast_path_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid, descriptor.MSIxIndex = _base_set_and_get_msix_index(ioc, smid); descriptor.SMID = cpu_to_le16(smid); - writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost); + writel(*request, &ioc->chip->AtomicRequestDescriptorPost); } /** @@ -4368,7 +4368,7 @@ _base_put_smid_hi_priority_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid, descriptor.MSIxIndex = msix_task; descriptor.SMID = cpu_to_le16(smid); - writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost); + writel(*request, &ioc->chip->AtomicRequestDescriptorPost); } /** @@ -4389,7 +4389,7 @@ _base_put_smid_default_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid) descriptor.MSIxIndex = _base_set_and_get_msix_index(ioc, smid); descriptor.SMID = cpu_to_le16(smid); - writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost); + writel(*request, &ioc->chip->AtomicRequestDescriptorPost); } /** @@ -6906,7 +6906,7 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, /* send message 32-bits at a time */ for (i = 0, failed = 0; i < request_bytes/4 && !failed; i++) { - writel(cpu_to_le32(request[i]), &ioc->chip->Doorbell); + writel(request[i], &ioc->chip->Doorbell); if ((_base_wait_for_doorbell_ack(ioc, 5))) failed = 1; } From patchwork Mon Mar 7 23:48:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 549633 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 730CCC433FE for ; Mon, 7 Mar 2022 23:49:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344025AbiCGXuK (ORCPT ); Mon, 7 Mar 2022 18:50:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344041AbiCGXuC (ORCPT ); Mon, 7 Mar 2022 18:50:02 -0500 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0211E22BF8 for ; Mon, 7 Mar 2022 15:49:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646696943; x=1678232943; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=unaPc+bJDjDEi5zJ5BafAvJLsHIWC/zgKf9goBf7tAQ=; b=GHzfidKTHLg3C4Ct2lttJ5lIQ0ADs14HQWfs4yAHcVpDR8WKIiy+airf SfutWxJsN1XkbfpGdpq7Dn6ZHCaUIzOl7kfmkg131kfv1kdHHcgtYDTOc VTNygXxzbUWNU8egp9N1kIofciZ4buhVCLwMNHB85EiBCKj7bJfoxhKQc OI3SVApuQBIeg+rfo0P2i7eH/ObydlYX0oKvbX6Ys144ymfOeLh0LfMos wE8wN/Bt7owUJZA8C+S0aimR5C0MU8OKB6UTD2l0+X0HawARfuIHRFRYJ wX7pSQsCZFSV/EAAhAU4O+kUzZhznYxArIohmYq3kkdt5gyVMC9uu0wSY w==; X-IronPort-AV: E=Sophos;i="5.90,163,1643644800"; d="scan'208";a="195659154" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2022 07:49:03 +0800 IronPort-SDR: 436NhMwR32QKC5zmQwWADTolJgrcQ/1irYcXlinD69xHS8SQYf7fprmx4sxfRGm2khPlPZ0Hu5 OFHWbcO9q/qF5xwPEEbCHyEgbEr+y9KuH3s+cRKFKA0lafQ36ZIkJEB6t7LN/EqwNY05aTSasy PSJOeXSvhFMXfn+lT4REhdiPk+U7d05U1YELS2F4JDbkLfur/52X9+Zumk5f5WkmhCdLtM52dn Nvgp1l9F5y0JCfyCV7DtrbAa9I0DE5OPLZAjpg/r9Csso/5WwG6QoY9GWfetZq5M0ZrCjGNT1R vWBARh2eT1mL5gdNnns9qD6k Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:21:20 -0800 IronPort-SDR: VvowOAHTATsVmMGeLqOC/q3IbIibIRGqgSy3mc6Rqzb725emr6oCi4c2r8l99xvqJEwrQzT+94 wQjwxYfacuj1ALLpefMVGU+3kRAoQOyeQLHdG4a4dDoVzyfvCw6IUsLLFHZ/kMKeEr7ptDzGhG tt+zlMhxzFPbxb+wzX9jWCJQlcAXG4QBYJkPKT70QZHXZ+i0HzWEUi6WSJ5fCwvjUYZ8hctU+w ZWY/0NLmOz7ssR6WsqnnfB2fTsNJ2RBgxEdxy3I3Xrji7Va17BVjygIbLHDeF/I/X9vuns7BOz ZG8= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:49:03 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KCFXt1pq7z1SVnx for ; Mon, 7 Mar 2022 15:49:02 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1646696941; x=1649288942; bh=unaPc+bJDjDEi5zJ5B afAvJLsHIWC/zgKf9goBf7tAQ=; b=LRXBfdvEbBSn6OSCfA3YwMHnC0wwRZbZ8j Trfha2zXEeD+Av7MPKTHJnLCHKtkEpjlUwY82TXEMVs2w/2RT7V+HTeOyQNIM/Jt SOb++TLRNooHt28VueqYpbCZI+uj1UYydHs/hlRTqYQRKNeVLTYs148cPNx4K2Ll hseMOu7/udCoSoA30kjoxOiNqJyOeZOoWKer46ZY5LGuXAi2sx3nibsc2Lsd4j70 +JHaR+NsCVmnbbDbzKuhlLbvYmT2oWHQ/HCSiyQ8IHGGC8vojED6zSh6btZM8+Hq XfaYudBwiwDJM1JL8i+FukBunbPPV0r+mCT/fFhyXkiCi1b/bbLg== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id C_4KcSShQxCy for ; Mon, 7 Mar 2022 15:49:01 -0800 (PST) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KCFXr5fc3z1Rwrw; Mon, 7 Mar 2022 15:49:00 -0800 (PST) From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v3 3/5] scsi: mpt3sas: fix ioc->base_readl() use Date: Tue, 8 Mar 2022 08:48:52 +0900 Message-Id: <20220307234854.148145-4-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> References: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The functions _base_readl_aero() and _base_readl() used for an adapter base_readl() method are implemented using a regular readl() call which performs internally a conversion to CPU endianness (le32_to_cpu()) of the values read. The users of the ioc base_readl() method should thus not convert again the values read using le16_to_cpu(). Fixing this removes sparse warnings. Signed-off-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_base.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 6ebdfedd84f5..5efe4bd186db 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -6925,16 +6925,16 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, } /* read the first two 16-bits, it gives the total length of the reply */ - reply[0] = le16_to_cpu(ioc->base_readl(&ioc->chip->Doorbell) - & MPI2_DOORBELL_DATA_MASK); + reply[0] = ioc->base_readl(&ioc->chip->Doorbell) + & MPI2_DOORBELL_DATA_MASK; writel(0, &ioc->chip->HostInterruptStatus); if ((_base_wait_for_doorbell_int(ioc, 5))) { ioc_err(ioc, "doorbell handshake int failed (line=%d)\n", __LINE__); return -EFAULT; } - reply[1] = le16_to_cpu(ioc->base_readl(&ioc->chip->Doorbell) - & MPI2_DOORBELL_DATA_MASK); + reply[1] = ioc->base_readl(&ioc->chip->Doorbell) + & MPI2_DOORBELL_DATA_MASK; writel(0, &ioc->chip->HostInterruptStatus); for (i = 2; i < default_reply->MsgLength * 2; i++) { @@ -6946,9 +6946,8 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, if (i >= reply_bytes/2) /* overflow case */ ioc->base_readl(&ioc->chip->Doorbell); else - reply[i] = le16_to_cpu( - ioc->base_readl(&ioc->chip->Doorbell) - & MPI2_DOORBELL_DATA_MASK); + reply[i] = ioc->base_readl(&ioc->chip->Doorbell) + & MPI2_DOORBELL_DATA_MASK; writel(0, &ioc->chip->HostInterruptStatus); } From patchwork Mon Mar 7 23:48:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 549121 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 2E621C433EF for ; Mon, 7 Mar 2022 23:49:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344044AbiCGXuO (ORCPT ); Mon, 7 Mar 2022 18:50:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343986AbiCGXuE (ORCPT ); Mon, 7 Mar 2022 18:50:04 -0500 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B52723BED for ; Mon, 7 Mar 2022 15:49:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646696944; x=1678232944; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=fy482iV7TvYo4Oi9JfCYtzCX6QbrjUioqGVwAf3nVMc=; b=SyKj7jXDFX93IcDlkeVQ9Kko/pqzHOq1UKzcr7FLCxq16lhstWmQuLQT 10L3tEOMjXb0Xr1tOAqVAW8tvP5fnWFey4SCH6QbFwQze9otWUOHyUC+r vyqQNwWieoEsSPkGLLG/MdISP2EDCLJlnK5VrwTnYNSt2ej+iWi5fjapZ wYIXp1cVI1SBFgEZ0EoOG+zuhCya06XCa4/kzWuyGL9LpwcpfhT9E4k5y rptt/JugtgYoG7TCahcab0lonxl2+Z9tAWDLRSix/M7vH6T6kY+VpLzQz P06Hx/XlLTRYuyMlyCOjOSu03JgEJUM9rfnSaYK3s6VmZJYanv/EGOdiQ A==; X-IronPort-AV: E=Sophos;i="5.90,163,1643644800"; d="scan'208";a="195659155" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2022 07:49:04 +0800 IronPort-SDR: 6aUDIQ6/dt8lpbDIKClz0Xgdu2XCUYWe6GknCGAKbbbPGwuF+S+2hFEJJZN6aUArnAOjIb3eGW JjyrheGlHj7+QoeWNOrc8qld0FIs9s+h5BY8Xh6wAqU808f6f1Bu9Q+1yGXYYlSdIm22HrPTEX 21kMUraJ1+TT4olKM3eLoFXmuTLQxHSwQ1F9fwb7MCAl4FWgz2JzBRUrCzKZ5FGFwAQemuOKOT IPRL028ej75AEqu+DTREYH141LM0JTHjxXuWwrsJjLO0lRrQXzvw9gjqj6eoONEb3nljZXj3Hu qTBQRkGdX5XrhLZtBt27ojfo Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:21:21 -0800 IronPort-SDR: XoyLPNzbzdpzsCnRMGZe8LcyqYhQUBU7uA/VmLVyy6vI6rTDbR0QF6qVZrZpNZqzvxuabEgskx VEF0Idcbdt5qYI6gQy9lduogeeZhl9z4STVFytd3XE4YyXV1+h8dKzBdviDBhP4UOaoNErKwHr WMt+ojoMdcvbN9XpM+rHQiKeA0nO4sRELD5t0Vb6DAV9viWzpD+Xg78DB/De4AttOjSsnV9zf8 ZNbgvMp67qC3q88ri4pkC2+jgU58PpqzZ2XYepSlQuhPeUeuQ0XzmgwotuSydyjngIYL1dV7XE O1w= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:49:04 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KCFXv388Kz1SVp3 for ; Mon, 7 Mar 2022 15:49:03 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1646696942; x=1649288943; bh=fy482iV7TvYo4Oi9Jf CYtzCX6QbrjUioqGVwAf3nVMc=; b=DPtf6gHJBiyjJjIRB9pUvQatB0JrTqZb4C IxFnwc8rJRG6OyhlrnFoLZT2XH0VTw2brD1x1RgbuAH/qy5S35NhWDztWwyrEZRL B8bnydaxBzR9E+9v0pewMaCOoaua8bhtGznpg216CTg539wbY30xkaJ/nqcoShKU G8kH3cqQEGme/4x87HivWU0mkHsZaMWP6vck9jVcSbEnnYhrNTKBnzdo2sBx60a1 sfb8bgUHrqAzBnOXWR+lARSyZc1MoDjlS350wfzlwNxiJul3couTt2YG0o+4Hl3S ake9RxP7zWraY3OnR6vhN4av90qlFy+xMMRvOgsZwyovKMcQOhNg== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id xXQ8lFPhnBaj for ; Mon, 7 Mar 2022 15:49:02 -0800 (PST) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KCFXt0Bsnz1Rvlx; Mon, 7 Mar 2022 15:49:01 -0800 (PST) From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v3 4/5] scsi: mpt3sas: fix event callback log_code value handling Date: Tue, 8 Mar 2022 08:48:53 +0900 Message-Id: <20220307234854.148145-5-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> References: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org In mpt3sas_scsih_event_callback(), fix a sparse warning when testing the event log code value by replacing the use of a pointer to the address storing the event log code with a log code local variable . Doing so, le32_to_cpu() is used when the log code value is assigned, avoiding a sparse warning. Signed-off-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 00792767c620..a355bc145577 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -10926,20 +10926,20 @@ mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, case MPI2_EVENT_LOG_ENTRY_ADDED: { Mpi2EventDataLogEntryAdded_t *log_entry; - u32 *log_code; + u32 log_code; if (!ioc->is_warpdrive) break; log_entry = (Mpi2EventDataLogEntryAdded_t *) mpi_reply->EventData; - log_code = (u32 *)log_entry->LogData; + log_code = le32_to_cpu(*(__le32 *)log_entry->LogData); if (le16_to_cpu(log_entry->LogEntryQualifier) != MPT2_WARPDRIVE_LOGENTRY) break; - switch (le32_to_cpu(*log_code)) { + switch (log_code) { case MPT2_WARPDRIVE_LC_SSDT: ioc_warn(ioc, "WarpDrive Warning: IO Throttling has occurred in the WarpDrive subsystem. Check WarpDrive documentation for additional details.\n"); break; From patchwork Mon Mar 7 23:48:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 549632 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 0BDD1C433EF for ; Mon, 7 Mar 2022 23:49:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343955AbiCGXub (ORCPT ); Mon, 7 Mar 2022 18:50:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344034AbiCGXuF (ORCPT ); Mon, 7 Mar 2022 18:50:05 -0500 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87AE322BD9 for ; Mon, 7 Mar 2022 15:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1646696945; x=1678232945; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=T9c8DJXOuUN22JlL9AnlBVb7CGOVIV328Z5IduR5G7M=; b=KJ51+MBgxuBV74xI1/l7RHT+eiSi++syjcmgh6QffIaQr3Vm7HkwATb0 27FRroCG2WJQjuWUKev3ZU0wD6ubN8jhRsCBSQ3/k5VJc+aq+ekmy6H3A ME2OPL7KPQjHdfiHgywlHts4e1AXD2tgGG7CchOhwbpUg9kuLcUXNKGM5 efvlZ5Fd57a0bAUYRTL2zVm2rqI14Fpimeks31+2bdlneb4QfWBZ9RRlU HJ6P0W6aqe27142GWqE+NE5mGD8zXATOmNKNPaSWv7BIYN3+4LSycQIpQ IPMpxwVtUZu5DghndZyl3Glh9qQE4jX8h7B4q2UtuYjvp3zyOFZe82DCR A==; X-IronPort-AV: E=Sophos;i="5.90,163,1643644800"; d="scan'208";a="195659158" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Mar 2022 07:49:05 +0800 IronPort-SDR: HHO8aXWNjZYxGXBPOAq3kSVfMIGmP3/FsbgtOesnGV5rfYXE8uTf4tUYw+qrsxmM9v/aFyEnVz 7+yfpiUsT7DDq2Fng38NH4vH9m3OdrIDv2F7lXQFy529QPX8OTGOFWTkfCTRkFLOprE1M59eKE OzJ8mRgZgmGs5l+4bId2IpHUe4Oa+EN/1uGZcbTWeteTPWOPbfsumH1Z2ezwkNlPDtjSSAIOfF XWItfP8co395wvhDjOVWbxSsaOlDZd57FFD5lm1dXHtSwRQGPMjA/EOQmTA8KFD+bP018IVxw/ 5Cq+5P/AtXTUe71Mr3IDvL5Q Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:21:23 -0800 IronPort-SDR: NGjhklNF7v2QjCjoB2EuLjd63dsWw6csE+3vZGZVTi3Pglmj2xE38RdSJDSWltVbomd8BmdjBb EuAWdJW0KGCfOLKuA0rDe+/Ub6ZuajBnzXG+vy0F1Ux80nzx68qb53w03EwCroCI7W2tV5o9+k DK3k0Y7UYOvvBIy8y4jR9Se265sOqWLSq6AS2YaolmHbjBO95Qcj91I5nF20Enp8QylAUfi/t7 uM23bSLH9gttNN3+P/Z82cx+GWGhVOXxzzWD6evweRql5Vn5oRYCRopdKLedaP03DAR/9r1Rjc u7Q= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 15:49:06 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4KCFXw5881z1SVny for ; Mon, 7 Mar 2022 15:49:04 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1646696944; x=1649288945; bh=T9c8DJXOuUN22JlL9A nlBVb7CGOVIV328Z5IduR5G7M=; b=QVgG2f/46HXk/anpUP0fw75iQPJPEkXOWd LXy50TLK0Yho8edGxKR6DuD55wELgY16Q00u6ACwbBFJs3+0wmlH+YJdMmseBRra kbDGEepS+PJKYwIxpdwjT35rlKC4B4LiHesyrXvhmslrkVBwi3DEl4Qa+Aanmo0y SlRBag0pYXkvaagRexoR7PtnJP3ITIYUt8Vfj9oVLi0Mou2W9HWfzTBtuENADFmP px8O3FipOy4I1XJW7JXuwfNarTi6nefdubQN/4M2WkWRnH5bZEWUssynthXC3049 B9X8N+IzJGSobW8av/sT4hTpv1jj9vBjKiu85cWllX0KdTZg34LA== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id UPZipwywYkm7 for ; Mon, 7 Mar 2022 15:49:04 -0800 (PST) Received: from washi.fujisawa.hgst.com (washi.fujisawa.hgst.com [10.149.53.254]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4KCFXv1pHJz1Rwrw; Mon, 7 Mar 2022 15:49:03 -0800 (PST) From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , Sathya Prakash , Sreekanth Reddy , Suganath Prabu Subramani , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH v3 5/5] scsi: mpt3sas: fix adapter replyPostRegisterIndex declaration Date: Tue, 8 Mar 2022 08:48:54 +0900 Message-Id: <20220307234854.148145-6-damien.lemoal@opensource.wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> References: <20220307234854.148145-1-damien.lemoal@opensource.wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org The replyPostRegisterIndex array of struct MPT3SAS_ADAPTER stores iomem resource addresses. Fix its declaration to annotate it with __iomem to avoid sparse warnings for writel() calls using the stored addresses. Signed-off-by: Damien Le Moal --- drivers/scsi/mpt3sas/mpt3sas_base.c | 9 +++++---- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 5efe4bd186db..fa47f56c046f 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3703,10 +3703,11 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc) } for (i = 0; i < ioc->combined_reply_index_count; i++) { - ioc->replyPostRegisterIndex[i] = (resource_size_t *) - ((u8 __force *)&ioc->chip->Doorbell + - MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET + - (i * MPT3_SUP_REPLY_POST_HOST_INDEX_REG_OFFSET)); + ioc->replyPostRegisterIndex[i] = + (resource_size_t __iomem *) + ((u8 __force *)&ioc->chip->Doorbell + + MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET + + (i * MPT3_SUP_REPLY_POST_HOST_INDEX_REG_OFFSET)); } } diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index 949e98d523e2..209f8680c01d 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -1588,7 +1588,7 @@ struct MPT3SAS_ADAPTER { u8 combined_reply_index_count; u8 smp_affinity_enable; /* reply post register index */ - resource_size_t **replyPostRegisterIndex; + resource_size_t __iomem **replyPostRegisterIndex; struct list_head delayed_tr_list; struct list_head delayed_tr_volume_list;