From patchwork Mon Mar 11 11:35:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779975 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6991329CEB for ; Mon, 11 Mar 2024 11:37:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157065; cv=none; b=Zsk9UqRF9Giv6zTZ0BsVT3R3FSYAjY1QYwZKZy/p85t5OKG4Finma/x73HSaQ/dUkD9GIpLzuGnN9zUz49/pCZlMmBMRD/j0/TKimD9SOvf4aX93XbOb2dcMl9p3wxogLetCTzavsK5ZjMi6FRLIjmCkkUiNUTxl9Sw3jRZ5bnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157065; c=relaxed/simple; bh=ZgCuepGiEpfP0d0YxICknUfvTQq34RgnwbDfWyb9qMw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=i10aU5lPnWupQEDSJiI9QzM8MoZrQHgrW0awrPUGXvn8ppuSduQMvAUyih9nb4arE8shRCGsCxwb3sXNAF1KneIF+zDv8owguLK/SohSZOfNDEm5ndRRtzsXHhQDneeBS/+hTb8CpxhAlS+taO6hcwIYDTdEpz/6hAnCZzaevnM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=DYHLCprh; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="DYHLCprh" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-29bb5bec0e4so1892070a91.1 for ; Mon, 11 Mar 2024 04:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157062; x=1710761862; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=sjsIAy1QU36zUQILe2Nr75U9vZP/HJuFe3OEsik6Ilw=; b=DYHLCprhbq6BIQqeWecVBfiTri5fjhm2LgUmCFyudy8VL6ekxQdA/89iSdRh4SDnrh Z8tf2dWfGRavt4/P2++MAdM5BgjuEWWXZqT2AGM60pRoCWkU2jCppTuXQ5Oy8b6lcCzB mLra0pYQrpMNTuwbe16elLOrREwHoV6vIi5fU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157062; x=1710761862; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sjsIAy1QU36zUQILe2Nr75U9vZP/HJuFe3OEsik6Ilw=; b=JNdF53G9FUkL1WpOFSstiqWgPkOD3+2rc956HkgTnWHlOJnzKa9fwvU/mhkoiI5I7D 6EtnAwhgEqqYIw0WBtk0X2JYs0Ny0+kqAuIrSqBXDMLRYFG8ZgIan8NzM/ZknIxZEB1Q ML1boHdZHpiB4bYBYVX/YjpB21dV0Rjjo7IIrhzWnZYQ2y5l9McdPb66VjlNmGo9umzx JtHmrSbvRxibOfC7IsoBuVOVtZfOd1lyrshWJoCUxV07jr/PxBLcmVbEUb9z6c8QF7eT ncJafDN99o67fWDAuoGwDelWNktYnsdjO+wJyktiPM8yrIZkot2Iz/C6yKFu9wuFSNXH j0bw== X-Gm-Message-State: AOJu0YwyeG9fwXG4piH4X12WNKyKEn1igvxFdgZD/ra6Rd9u+bo87dpx kpVKejLhKEYzi49LfWtJVmCof1k54pAXACAW9xD4s8Smm6kqNMKN2hutRpKHTmhYZY7JvU5fuFy 2PRk4FmwH3ojC9k5aNqnYc9rSHMAXN5u2Ke3VgsPtwDu0YDIOgOfvbb6l97D1eRIgSaju9e7a5p 4JCIPObdVX8yeeZ6Xjtv4iVGMs8gTI/L85ZP5gj25q8cM7EQ== X-Google-Smtp-Source: AGHT+IE91F0RGvzXBqhEfDz5vqhXiukXcqNO3dga+sGkkRErdURAFeTm8sAYM3dB0ZTZ/hl4TwzSPA== X-Received: by 2002:a17:90a:9a97:b0:299:300c:4c71 with SMTP id e23-20020a17090a9a9700b00299300c4c71mr3550755pjp.28.1710157061688; Mon, 11 Mar 2024 04:37:41 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:40 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 1/7] mpi3mr: Block devices are not removed from OS even vd's are offlined Date: Mon, 11 Mar 2024 17:05:08 +0530 Message-Id: <20240311113514.108795-2-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The driver did not remove the virtual disk that was exposed as hidden and offline after the controller was reset. Drive is removed from OS when firmware sends "device added" event with hidden bit set or access status indicating inability to accept I/Os. Signed-off-by: Ranjan Kumar Signed-off-by: Sathya Prakash --- drivers/scsi/mpi3mr/mpi3mr.h | 2 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 3de1ee05c44e..06359915a48d 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -1348,7 +1348,7 @@ void mpi3mr_wait_for_host_io(struct mpi3mr_ioc *mrioc, u32 timeout); void mpi3mr_cleanup_fwevt_list(struct mpi3mr_ioc *mrioc); void mpi3mr_flush_host_io(struct mpi3mr_ioc *mrioc); void mpi3mr_invalidate_devhandles(struct mpi3mr_ioc *mrioc); -void mpi3mr_rfresh_tgtdevs(struct mpi3mr_ioc *mrioc); +void mpi3mr_refresh_tgtdevs(struct mpi3mr_ioc *mrioc); void mpi3mr_flush_delayed_cmd_lists(struct mpi3mr_ioc *mrioc); void mpi3mr_check_rh_fault_ioc(struct mpi3mr_ioc *mrioc, u32 reason_code); void mpi3mr_print_fault_info(struct mpi3mr_ioc *mrioc); diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 73c831a97d27..bfd32354b662 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -1029,7 +1029,7 @@ mpi3mr_update_sdev(struct scsi_device *sdev, void *data) } /** - * mpi3mr_rfresh_tgtdevs - Refresh target device exposure + * mpi3mr_refresh_tgtdevs - Refresh target device exposure * @mrioc: Adapter instance reference * * This is executed post controller reset to identify any @@ -1039,7 +1039,7 @@ mpi3mr_update_sdev(struct scsi_device *sdev, void *data) * Return: Nothing. */ -void mpi3mr_rfresh_tgtdevs(struct mpi3mr_ioc *mrioc) +void mpi3mr_refresh_tgtdevs(struct mpi3mr_ioc *mrioc) { struct mpi3mr_tgt_dev *tgtdev, *tgtdev_next; struct mpi3mr_stgt_priv_data *tgt_priv; @@ -1047,8 +1047,8 @@ void mpi3mr_rfresh_tgtdevs(struct mpi3mr_ioc *mrioc) dprint_reset(mrioc, "refresh target devices: check for removals\n"); list_for_each_entry_safe(tgtdev, tgtdev_next, &mrioc->tgtdev_list, list) { - if ((tgtdev->dev_handle == MPI3MR_INVALID_DEV_HANDLE) && - tgtdev->is_hidden && + if (((tgtdev->dev_handle == MPI3MR_INVALID_DEV_HANDLE) || + tgtdev->is_hidden) && tgtdev->host_exposed && tgtdev->starget && tgtdev->starget->hostdata) { tgt_priv = tgtdev->starget->hostdata; @@ -2010,7 +2010,7 @@ static void mpi3mr_fwevt_bh(struct mpi3mr_ioc *mrioc, mpi3mr_refresh_sas_ports(mrioc); mpi3mr_refresh_expanders(mrioc); } - mpi3mr_rfresh_tgtdevs(mrioc); + mpi3mr_refresh_tgtdevs(mrioc); ioc_info(mrioc, "scan for non responding and newly added devices after soft reset completed\n"); break; From patchwork Mon Mar 11 11:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779603 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADBDB29CEB for ; Mon, 11 Mar 2024 11:37:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157068; cv=none; b=cu2DNb5Qes+PefmSUbTV1H2wjpCvLjgX8IwuMsgFMvIUJzy37kTq+TylXSnsHn1sZSfXrjuFRe7I3osqDM6HIw+X/Ya5053eIIBGPLhI4qr9JE3yjQgfwIBhX+1WXS12tidX/1C9KK4PQZ4LDFBzZcMiklUzZWJyG4Bnw6AKR0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157068; c=relaxed/simple; bh=02U8Q3XJek6ycG0gD6N1wGOXUaRfQ8RqnHgFifbIxJo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Fla4/R+M1FAqFzXYRQT8Akb1IZ7VBkgh3PJRtJoE/kdu0IEZOs5C+219zS3gdZuydqYmjXjouf/ZGaPunT05opsSM/fgDx26FQQ0Lnmt/DuW7nE2+s//LgwBdOeHfwWrZUU51OxDjbSiv27cfbABwL+K/UzGHvypV2lBZHWLhRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Cffq0Yhc; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Cffq0Yhc" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso3641002a12.3 for ; Mon, 11 Mar 2024 04:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157065; x=1710761865; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5mvJyCFJJenPr+8+xuleQSw0oidJkAbBTx22yar5OiI=; b=Cffq0YhcHLYZe4+zQwyMUouDHgGymDK1IDqvY5SB4x/QuV8G9dn9/SaTx+/YM/3qw8 Ch2dja3SrKqgC/VO1MVev106FodEZMii6ljS09f4aUeNiTg7v35Dylfp3L7aaCSHaWk+ Zcz3lyIgNL71w76oFOQ6HfwsazfiSHTq4VGbo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157065; x=1710761865; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5mvJyCFJJenPr+8+xuleQSw0oidJkAbBTx22yar5OiI=; b=j6r2Us4WY09acOe5Mh/r0vIavQmVQPruWX/M+I/8JeSVDsxiXrrkGJgLj7T1avNrQU odv/jCE4eiRvrPcwYiILyW4q4n9Mu+6cZ1miCuHYAMaPjF8a0DoHWLrmPxr/v6eciKMS Ju83CSKX9Ejq+y1UGFDiPI0UwWPHQqbcKWQIjF9q2yzPjgCbpFtlo+aTeYwyndtUNdn/ N0W5IhgR3vqVQYUv6/bI597grC5OVzwzOAMPXY+ZvWW0JECXtPef52avKfKj1++o9a8I tDF3+zi7DfiuzartO7v1n2zY2ceEYrahEKfWwAWetJygBoEBRlX6UEPYCASSoiaSPWu8 RJew== X-Gm-Message-State: AOJu0YzfnhkXqMgDPvqPVS3SSGy8QizN3cPhjqW7cJTFumuXSzr0FZri 4G6DovRJk+sGKW/Ch942YaRPV3ZLDpLAe2TiM9Uc6ndbsZol0hTJcBXoLSLvw8JxHpTdApyo4z8 OT4lFFKPrW0YcOatLcvv/TRVYDWIPlE9SGBMYH95DwrrkITqSOIacPi8uKb2hhVgPl0AVfh7G8T 0SAgwkF20Uvri9G4vSLbcgT1QyOc6KwlUgxnRni3f7lCBXaQ== X-Google-Smtp-Source: AGHT+IH0+fMQ29HnQfBcDKYRLXz9GPVPwNae3lUWhYbfM/2FmXU5VLV0OAYi+Py4KAREyitlcNDY4A== X-Received: by 2002:a05:6a21:7897:b0:1a1:6803:69a3 with SMTP id bf23-20020a056a21789700b001a1680369a3mr8281398pzc.0.1710157065191; Mon, 11 Mar 2024 04:37:45 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:44 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 2/7] mpi3mr: Set MPI request flags appropriately Date: Mon, 11 Mar 2024 17:05:09 +0530 Message-Id: <20240311113514.108795-3-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 “Flags” inside MPI request is bitfield-based. So ‘Flags’ should be updated with bitwise OR operation. Signed-off-by: Ranjan Kumar Signed-off-by: Sathya Prakash --- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index bfd32354b662..5f975e0db388 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -4895,7 +4895,7 @@ static int mpi3mr_qcmd(struct Scsi_Host *shost, MPI3_SCSIIO_MSGFLAGS_DIVERT_TO_FIRMWARE; scsiio_flags |= MPI3_SCSIIO_FLAGS_DIVERT_REASON_IO_THROTTLING; } - scsiio_req->flags = cpu_to_le32(scsiio_flags); + scsiio_req->flags |= cpu_to_le32(scsiio_flags); if (mpi3mr_op_request_post(mrioc, op_req_q, scmd_priv_data->mpi3mr_scsiio_req)) { From patchwork Mon Mar 11 11:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779974 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78CF53BB36 for ; Mon, 11 Mar 2024 11:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157072; cv=none; b=IIRRYTvkkUUO5LaFjSlWKSIIgdPDSDA0Q+j2MQumTUfgkdwsJwoFsV1dlWUbaCC8s5onnoo4+FF4taNyeonwmG0P9lHZ8pMMZC9iIIa8RUyegUEqzyRAlnW/RzX863OIZw++ocak80zKlvRaOufcLgWFfzRjz9jNCK+UOLQ16eU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157072; c=relaxed/simple; bh=AWPgMt792TcmI2sildivF42ctTFVPJsxEprbyp1JKiA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=mhESi6Lq26lOF8CngUvOb6gdrbuFL0O0S9fV9beO2dLqSm0wub+Hp+BLZPjdBl6nn+flPGxLCWPdOwiTyko63yJKrzY17dZaVwU38yAOtXvEuF+d/3MWnvBNMXYgr2G6fJfaNYnSvunuNsC0C1XTvWzN/ca7lSqSbQfqtKs/k8s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=WA40HCrQ; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WA40HCrQ" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-5d81b08d6f2so2606960a12.0 for ; Mon, 11 Mar 2024 04:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157069; x=1710761869; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=QHpENpt5VKoy5FLn2UOsLHtErVt3CMAhExz94owY8i8=; b=WA40HCrQGTfYVDFOzoyyNNZDLWW+wgDE13PoxG4VUAVw0sAHA3U4PmXKA9lBBUFDv/ uhBe4jcCK/Ck+jRjuNZplRyVyoQkH4BvjrMM8BoJmo8U+0AkfOzN5ELj0RaQt8ejPA6n FDsMl14c7h/WlAXvFjsa2QwM/cEcp8Uea+em4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157069; x=1710761869; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QHpENpt5VKoy5FLn2UOsLHtErVt3CMAhExz94owY8i8=; b=xI2L4nQRpdmCPnikkzzds1nzcphbZsWCEkFXnXmnlyZvmy4h99Pak8tSIQM9vjDBhm iB479aUCfWJPkKO9U2qlLJl2SUrFjKsfUyqTvQGA/8hXjuRLMxG8Kcon873BCWZ3Z/tZ zxYRWMiE8p9OMm2+N/e3EtVXImouRFY36d4qsYEJjMcXSiCcqSfbOpwetAap0a7C5ooW MGLrwzskkA/mn7eo4TQ6XgzBkXbfUcVC9ZxT8CjN4eftu0F9Qxv6GB4EULK2m6Vv394I FCxGCzh1Oysc35Gvg4ReF8gWW9ZabXu8bAVB+yrf+QcSQWVJ6kZbbftJ+R/GXVw34xmU l9dw== X-Gm-Message-State: AOJu0YxZy/29z1tT49PjCBNld/W5jBS5I4Ni7CD+5NwLcveMKLvxgnX9 ZEm85HrtwrGeuFxJTxMlCirIM9a1YB4ujlScSk5aFMfJ+9sP9zyuTDGGG/r/pfyGBiK0qo6a68r jglLJ1sPRRyoIKgtqhnfEt3576ph57nw210awzvoZChuY5fxd53ftfUI2GeumNNe60IvlUZXpFx DggSkSXsEQSa6brAvYv+NqzesIyymYJWfoPQOSenjkAD5s3g== X-Google-Smtp-Source: AGHT+IH9SdOynCrg/9TqXMoZcpLfxuCURN2LiF7Ioy0Wa+4wpAAidLk2EH7H0Ud7DYsBpMyifODm/g== X-Received: by 2002:a17:90a:9d8a:b0:29b:cc7d:6a9 with SMTP id k10-20020a17090a9d8a00b0029bcc7d06a9mr3872087pjp.3.1710157068699; Mon, 11 Mar 2024 04:37:48 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:47 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 3/7] mpi3mr: Clear controller-wide flag that is used to block IOCTLS for the unresponsive controller Date: Mon, 11 Mar 2024 17:05:10 +0530 Message-Id: <20240311113514.108795-4-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Driver uses a controller-wide flag to block IOCTLs when controller reset is in progress. This flag is set before controller reset is initiated and clear after the controller reset is completed. Driver will clear the controller-wide block IOCTLs flag after controller reset is failed and controller is marked unrecoverable. Signed-off-by: Ranjan Kumar Signed-off-by: Sumit Saxena --- drivers/scsi/mpi3mr/mpi3mr_fw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index 528f19f782f2..a21fbff60b59 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -5102,6 +5102,7 @@ int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc, mrioc->device_refresh_on = 0; mrioc->unrecoverable = 1; mrioc->reset_in_progress = 0; + mrioc->stop_bsgs = 0; retval = -1; mpi3mr_flush_cmds_for_unrecovered_controller(mrioc); } From patchwork Mon Mar 11 11:35:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779602 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36B213BBCC for ; Mon, 11 Mar 2024 11:37:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157075; cv=none; b=iaYSMvJ4rb6ibgcBYbLCnfTpxM8YJbmSwe0CFiV4aLcnq6LveW1jhv//1Y1j0XdcH8yw8fayFYsQtjI7Su+qeYEUm1TAkGtwe2TX9AffTUDP2wxLpuymCRexTRtTiQsrgiq0FqSFHAwj0QaFkP54BafAVZ/EVnE8EWbzAiVY6mo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157075; c=relaxed/simple; bh=4aGpEiGH4GDYheB2y3FhjUhDWb4acjzTqXg97OmvRJ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=uv3n8ntMlh4xyZCLvVqRisRW109sGzO7JJgyMKfxHYgQGK4LILT9nLIjvFuoZ0QPnObNBrwp8dKeOidH1b2Qvo33v/oFEMqtKXxXyMxk0xMW9PemA85xUq2OxNTTxlbImotNk72yK1/h2jAJlv6CPu3ayVoFyJTAnduIjp9fwzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=RH37HvAD; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="RH37HvAD" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5cedfc32250so2476346a12.0 for ; Mon, 11 Mar 2024 04:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157072; x=1710761872; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=EO+SGdF5JEz3n1UyVEO64Cw3h3Iw4o56G5P1Q+JtWXE=; b=RH37HvAD+cR/rYS15Zsv2ldhsF3mb3pF+LXVRgk59FmGZHGvRSFrvu5EoLYnfCvZIh NnCx7KMQOWtXxR1ADxS+kj1BDwiOaDtJf4lyFWWwSeEay2s3TAUBUmBxm/SPZH6zRp6V n8rG/6Kpqk1aI1E5DGG9gl46J/fQF1ohEJOeo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157072; x=1710761872; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EO+SGdF5JEz3n1UyVEO64Cw3h3Iw4o56G5P1Q+JtWXE=; b=vVcGXejEnh+SGgol9b+TDl6AWLqNuOpx92WevFbK3Dr0zMbrZfTvKyzCRTdcwgzC7+ c6uFrihDpQFNTIpETIZC+Y/TqVt9Xh88w1o/X8G2HV833aJWaVIWXb2Cr46Nh41Gxv6y c8KRZliaPvvSf7BDP206oPMdEENxWzv//ckEbFZLVebE5BxeB/M7N68mU+goHx33O6ot PZhb8WnqCjLGmPdqqJHkTuEhrHCuNqnRuLqjTWqNdkNDYqTxzWdz/My35WbWb92lvn/2 lmGd4wKP/BROAtVaXIgoOsOXU22qwZBRDkqRNe6Ib78lzscb9AQkcnf7lxnJ24O6ze+m qJ2g== X-Gm-Message-State: AOJu0YzDCEB94NsPcUHhwiRvKuA+U72ULkC3X3cPZItCKN6UVEVDHjUe 8wTihuRKu9h6oWAOILigRZiWqCgVICNt61MQNvyr6O/p7cr/N+dwpVxdrxo/4sh/jvBi4VCTiqX c+kGmoLhGTTeM1Xh+jwLbwWNwkFTvE3k5eoYQC99ImcUY1wL1MnIWRxp76Et0cjwU3mec0iGD8w 3nm7DGwcSuVNHBBpO1gqpF7o1xzeBJAD1H/GC3B7YMuLQpiA== X-Google-Smtp-Source: AGHT+IFusrPVhaI7XDInxHrwajnmEFukSuIgtU2NniuFsm2rwayuVcqTTs3aOxjJsby6JxfbauzplA== X-Received: by 2002:a17:90b:38d1:b0:29b:fd48:f1ab with SMTP id nn17-20020a17090b38d100b0029bfd48f1abmr1964430pjb.29.1710157072218; Mon, 11 Mar 2024 04:37:52 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:51 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 4/7] mpi3mr: Set the WriteSame Divert Capability in the IOCInit MPI Request Date: Mon, 11 Mar 2024 17:05:11 +0530 Message-Id: <20240311113514.108795-5-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Driver is modified to set the Write Same Divert Capability bit in the IOCInit message for the firmware to know that the driver is capable of diverting certain write same commands as defined by the MPI specification. Signed-off-by: Ranjan Kumar Signed-off-by: Sathya Prakash --- drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 2 +- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h b/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h index 0cb24fc03620..85b91583bacf 100644 --- a/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h +++ b/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h @@ -27,7 +27,7 @@ struct mpi3_ioc_init_request { __le64 sense_buffer_free_queue_address; __le64 driver_information_address; }; - +#define MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVERT_SUPPORTED (0x08) #define MPI3_IOCINIT_MSGFLAGS_SCSIIOSTATUSREPLY_SUPPORTED (0x04) #define MPI3_IOCINIT_MSGFLAGS_HOSTMETADATA_MASK (0x03) #define MPI3_IOCINIT_MSGFLAGS_HOSTMETADATA_NOT_USED (0x00) diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index a21fbff60b59..6ce75366dd8a 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -3302,6 +3302,8 @@ static int mpi3mr_issue_iocinit(struct mpi3mr_ioc *mrioc) iocinit_req.msg_flags |= MPI3_IOCINIT_MSGFLAGS_SCSIIOSTATUSREPLY_SUPPORTED; + iocinit_req.msg_flags = + MPI3_IOCINIT_MSGFLAGS_WRITESAMEDIVERT_SUPPORTED; init_completion(&mrioc->init_cmds.done); retval = mpi3mr_admin_request_post(mrioc, &iocinit_req, From patchwork Mon Mar 11 11:35:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779973 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2487F3BBF7 for ; Mon, 11 Mar 2024 11:37:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157078; cv=none; b=rYG99UQmmIBMjLQH7TN+YvC8AegUbPUTiav7o1F+ynkvO6i9gb8MNLAPDEHKiDNkMySyTdaFdpMjOui8UzmE0BBl0LKAIP9Ws6BLKEC11dUfAmrjk40UIYe91PYSyUAm8JXL2iCw+GLocNvrk8Gj3koAw96OLd9Lgtko0agXKXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157078; c=relaxed/simple; bh=oCkjplDMG2OlVTPM2+CjgpJM97K1mwQOmMM4eKT3/To=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=f0Uayyf45hb+xa83+O6z5uHi5Rus1c7mX794+mWm347ad4MEEynV42iei0ayOBou1un8+RaUxRFU99I85XxwnIBngv4h2YK8YA/1vz67bKU5e/2Pibdkdu0ZcHhEMo2oripqj3kLiPdWyGP9TMxv26Hqsxqfzqz067G5AP7L9Jg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=cPjiw9wo; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="cPjiw9wo" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5d8b887bb0cso3643620a12.2 for ; Mon, 11 Mar 2024 04:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157076; x=1710761876; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ocylGidR+I50hkjpDeO8fVMiXO54dEEkqPSh1T2kmXM=; b=cPjiw9woMUKH6N0FqdZX8FQnYa5fEdavq0xw5Kb/hNY2yku71Wmy2LSnOKvW+t4haV gHzeT/fI4YHzspuylUsm4zA2iyVWMfYQvpEYUtocIkIXsNCnBCGzHcne0Ah2Ob0h3JD8 C7P7L92vK2oQzj61Y71v6ElS0RWqLYVW8WLMg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157076; x=1710761876; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ocylGidR+I50hkjpDeO8fVMiXO54dEEkqPSh1T2kmXM=; b=H1Kx0NCr1OHlqruHUoB0zF3fdhuAVxDjHqOZJhkXD297L3x5pdv02IBMrnj04YndmX PiMcBDEpaWnGVQ6X6hVpxSMm3drYv4Dfme6WM6vFvwxxpyy5PztlR4163dEw/tD6ola2 O/J0J0kWyz+fbWfY0HVfVQm8h5DNs4gwUGWFTSyV6NyPDIxw76nUpMt2OJinMi1OsZYP 6gXGdaJYQxwLCnSb3jMIUHVJeJBfMudBAiUkhEyO7RRya0QdyLCZWEa7sJmEiqGxp6lw 2Q+dqIRLQmSST9xRGzQrxKIQQHwiTANDaMljj065yZGkLtGZjvP9TNWRz2GD+M1LnHGk oRZg== X-Gm-Message-State: AOJu0YwYYEO8qnLvDnyonk+AQKu5fIaTUhFHSwIZ4XlJRvgK3Mnri4Ww 1i+mm9kwLNXDHy/PQ1E52ubMjlz82w5T1c1GpRPIhwZu0Va/jyO6N9WbWu7uNsIufZ/iDStrGm5 5O1o29rTHL/dPoI9z7ofMzV03OfbqrtmMbCNiGk5pMFumbWRqBlxE4qbXktzJWE4OR2wqmK+b1K 9apVY0kq2pBvudC3SYybrwLUsUs2MSNYdKztSzhJ/9LdCJhg== X-Google-Smtp-Source: AGHT+IGwrMSmnRUzdIB3VLZokLX6GEs7JKHEw0oEPDlkTZxIrK76MSSr75emOxhTOU+lFLhrPyfchw== X-Received: by 2002:a05:6a21:9989:b0:1a1:4ca5:86cf with SMTP id ve9-20020a056a21998900b001a14ca586cfmr8017984pzb.12.1710157075765; Mon, 11 Mar 2024 04:37:55 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:54 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar , kernel test robot Subject: [PATCH v3 5/7] mpi3mr: Debug ability improvements Date: Mon, 11 Mar 2024 17:05:12 +0530 Message-Id: <20240311113514.108795-6-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Driver updated to include OS type in fault/reset reason code. MPI request sent through IOCTL now automatically dumped on timeout. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202403081903.q3Dq54zZ-lkp@intel.com/ Signed-off-by: Ranjan Kumar Signed-off-by: Sathya Prakash --- drivers/scsi/mpi3mr/mpi3mr.h | 10 +++++++--- drivers/scsi/mpi3mr/mpi3mr_app.c | 21 ++++++++++++++------- drivers/scsi/mpi3mr/mpi3mr_fw.c | 21 ++++++++++++++------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 06359915a48d..dca8390c33ec 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -63,7 +63,7 @@ extern atomic64_t event_counter; #define MPI3MR_DRIVER_AUTHOR "Broadcom Inc. " #define MPI3MR_DRIVER_DESC "MPI3 Storage Controller Device Driver" -#define MPI3MR_NAME_LENGTH 32 +#define MPI3MR_NAME_LENGTH 64 #define IOCNAME "%s: " #define MPI3MR_DEFAULT_MAX_IO_SIZE (1 * 1024 * 1024) @@ -294,6 +294,10 @@ enum mpi3mr_reset_reason { MPI3MR_RESET_FROM_SAS_TRANSPORT_TIMEOUT = 30, }; +#define MPI3MR_RESET_REASON_OSTYPE_LINUX 1 +#define MPI3MR_RESET_REASON_OSTYPE_SHIFT 28 +#define MPI3MR_RESET_REASON_IOCNUM_SHIFT 20 + /* Queue type definitions */ enum queue_type { MPI3MR_DEFAULT_QUEUE = 0, @@ -1142,7 +1146,7 @@ struct mpi3mr_ioc { spinlock_t fwevt_lock; struct list_head fwevt_list; - char watchdog_work_q_name[20]; + char watchdog_work_q_name[50]; struct workqueue_struct *watchdog_work_q; struct delayed_work watchdog_work; spinlock_t watchdog_lock; @@ -1336,7 +1340,7 @@ void mpi3mr_start_watchdog(struct mpi3mr_ioc *mrioc); void mpi3mr_stop_watchdog(struct mpi3mr_ioc *mrioc); int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc, - u32 reset_reason, u8 snapdump); + u16 reset_reason, u8 snapdump); void mpi3mr_ioc_disable_intr(struct mpi3mr_ioc *mrioc); void mpi3mr_ioc_enable_intr(struct mpi3mr_ioc *mrioc); diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c index 0380996b5ad2..38f63bc7ef3b 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_app.c +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c @@ -1598,26 +1598,33 @@ static long mpi3mr_bsg_process_mpt_cmds(struct bsg_job *job) rval = -EAGAIN; if (mrioc->bsg_cmds.state & MPI3MR_CMD_RESET) goto out_unlock; - dprint_bsg_err(mrioc, - "%s: bsg request timedout after %d seconds\n", __func__, - karg->timeout); - if (mrioc->logging_level & MPI3_DEBUG_BSG_ERROR) { - dprint_dump(mpi_req, MPI3MR_ADMIN_REQ_FRAME_SZ, + if (((mpi_header->function != MPI3_FUNCTION_SCSI_IO) && + (mpi_header->function != MPI3_FUNCTION_NVME_ENCAPSULATED)) + || (mrioc->logging_level & MPI3_DEBUG_BSG_ERROR)) { + ioc_info(mrioc, "%s: bsg request timedout after %d seconds\n", + __func__, karg->timeout); + if (!(mrioc->logging_level & MPI3_DEBUG_BSG_INFO)) { + dprint_dump(mpi_req, MPI3MR_ADMIN_REQ_FRAME_SZ, "bsg_mpi3_req"); if (mpi_header->function == - MPI3_BSG_FUNCTION_MGMT_PASSTHROUGH) { + MPI3_FUNCTION_MGMT_PASSTHROUGH) { drv_buf_iter = &drv_bufs[0]; dprint_dump(drv_buf_iter->kern_buf, rmc_size, "mpi3_mgmt_req"); + } } } if ((mpi_header->function == MPI3_BSG_FUNCTION_NVME_ENCAPSULATED) || - (mpi_header->function == MPI3_BSG_FUNCTION_SCSI_IO)) + (mpi_header->function == MPI3_BSG_FUNCTION_SCSI_IO)) { + dprint_bsg_err(mrioc, "%s: bsg request timedout after %d seconds,\n" + "issuing target reset to (0x%04x)\n", __func__, + karg->timeout, mpi_header->function_dependent); mpi3mr_issue_tm(mrioc, MPI3_SCSITASKMGMT_TASKTYPE_TARGET_RESET, mpi_header->function_dependent, 0, MPI3MR_HOSTTAG_BLK_TMS, MPI3MR_RESETTM_TIMEOUT, &mrioc->host_tm_cmds, &resp_code, NULL); + } if (!(mrioc->bsg_cmds.state & MPI3MR_CMD_COMPLETE) && !(mrioc->bsg_cmds.state & MPI3MR_CMD_RESET)) mpi3mr_soft_reset_handler(mrioc, diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index 6ce75366dd8a..07accf01be0f 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -11,7 +11,7 @@ #include static int -mpi3mr_issue_reset(struct mpi3mr_ioc *mrioc, u16 reset_type, u32 reset_reason); +mpi3mr_issue_reset(struct mpi3mr_ioc *mrioc, u16 reset_type, u16 reset_reason); static int mpi3mr_setup_admin_qpair(struct mpi3mr_ioc *mrioc); static void mpi3mr_process_factsdata(struct mpi3mr_ioc *mrioc, struct mpi3_ioc_facts_data *facts_data); @@ -1195,7 +1195,7 @@ static inline void mpi3mr_clear_reset_history(struct mpi3mr_ioc *mrioc) static int mpi3mr_issue_and_process_mur(struct mpi3mr_ioc *mrioc, u32 reset_reason) { - u32 ioc_config, timeout, ioc_status; + u32 ioc_config, timeout, ioc_status, scratch_pad0; int retval = -1; ioc_info(mrioc, "Issuing Message unit Reset(MUR)\n"); @@ -1204,7 +1204,11 @@ static int mpi3mr_issue_and_process_mur(struct mpi3mr_ioc *mrioc, return retval; } mpi3mr_clear_reset_history(mrioc); - writel(reset_reason, &mrioc->sysif_regs->scratchpad[0]); + scratch_pad0 = ((MPI3MR_RESET_REASON_OSTYPE_LINUX << + MPI3MR_RESET_REASON_OSTYPE_SHIFT) | + (mrioc->facts.ioc_num << + MPI3MR_RESET_REASON_IOCNUM_SHIFT) | reset_reason); + writel(scratch_pad0, &mrioc->sysif_regs->scratchpad[0]); ioc_config = readl(&mrioc->sysif_regs->ioc_configuration); ioc_config &= ~MPI3_SYSIF_IOC_CONFIG_ENABLE_IOC; writel(ioc_config, &mrioc->sysif_regs->ioc_configuration); @@ -1520,11 +1524,11 @@ static inline void mpi3mr_set_diagsave(struct mpi3mr_ioc *mrioc) * Return: 0 on success, non-zero on failure. */ static int mpi3mr_issue_reset(struct mpi3mr_ioc *mrioc, u16 reset_type, - u32 reset_reason) + u16 reset_reason) { int retval = -1; u8 unlock_retry_count = 0; - u32 host_diagnostic, ioc_status, ioc_config; + u32 host_diagnostic, ioc_status, ioc_config, scratch_pad0; u32 timeout = MPI3MR_RESET_ACK_TIMEOUT * 10; if ((reset_type != MPI3_SYSIF_HOST_DIAG_RESET_ACTION_SOFT_RESET) && @@ -1576,6 +1580,9 @@ static int mpi3mr_issue_reset(struct mpi3mr_ioc *mrioc, u16 reset_type, unlock_retry_count, host_diagnostic); } while (!(host_diagnostic & MPI3_SYSIF_HOST_DIAG_DIAG_WRITE_ENABLE)); + scratch_pad0 = ((MPI3MR_RESET_REASON_OSTYPE_LINUX << + MPI3MR_RESET_REASON_OSTYPE_SHIFT) | (mrioc->facts.ioc_num << + MPI3MR_RESET_REASON_IOCNUM_SHIFT) | reset_reason); writel(reset_reason, &mrioc->sysif_regs->scratchpad[0]); writel(host_diagnostic | reset_type, &mrioc->sysif_regs->host_diagnostic); @@ -2581,7 +2588,7 @@ static void mpi3mr_watchdog_work(struct work_struct *work) unsigned long flags; enum mpi3mr_iocstate ioc_state; u32 fault, host_diagnostic, ioc_status; - u32 reset_reason = MPI3MR_RESET_FROM_FAULT_WATCH; + u16 reset_reason = MPI3MR_RESET_FROM_FAULT_WATCH; if (mrioc->reset_in_progress) return; @@ -4968,7 +4975,7 @@ void mpi3mr_pel_get_seqnum_complete(struct mpi3mr_ioc *mrioc, * Return: 0 on success, non-zero on failure. */ int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc, - u32 reset_reason, u8 snapdump) + u16 reset_reason, u8 snapdump) { int retval = 0, i; unsigned long flags; From patchwork Mon Mar 11 11:35:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779601 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E93923BBF0 for ; Mon, 11 Mar 2024 11:38:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157082; cv=none; b=hgQ1B2msgB2FGIlakJlKPCvsv/Xj0d13J7K9h0uQA8ZL1TeJqIKuwwhLzCX6wI2gQnnXM9Ec4Xof5DrbXD4V0+OqaSyQCOmwZAnSyGlAwTC9Y0p66Rt2EHoHxvFWW/8lFbajnXzlqtQXRNEUCDqx1Pm2oI9Y93XeMOG7NdKRpOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157082; c=relaxed/simple; bh=ITHy56DWZ0RorXQAH12zpOQQc7OhNS6WEYCjdxSHGPE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=O3H8NGHl7Kkoy/5nfwCVauG4Xt6GnGH+EFpooeNBXW1ZM9nE/f4S5YmVQK4aAObnBELEdZDhaRrpJ4x7MDuFC9hH8oJO1wp+HDO0YMGKguk26cFokSmYdplUZVdVoPiQSCR24C7pBfGsPzcefhe33q1SPGpgLLk4wY1Hi5vkvGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=UcrT0Ola; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="UcrT0Ola" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-29b7b9a4908so1629620a91.1 for ; Mon, 11 Mar 2024 04:38:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157079; x=1710761879; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0eegRfjJHv1whYpDpJR6iOXJMEceoubavlXR5qbSzFw=; b=UcrT0OlaXx+zUYIEOZrnzgY6mHBKs363CPUg32BAEODwMZ08qjfJlxDW4d8pev+IZb MgWEI3w1MGqB/rUUW8K4bzhzpwZlQcAk2gj3USgtq5rsdjNMiPDGhV5Z1gG8kgd6k1ZG KpOqhyIuYymZnSDl1c4H3NHFe/P3XhHkq7vzY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157079; x=1710761879; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0eegRfjJHv1whYpDpJR6iOXJMEceoubavlXR5qbSzFw=; b=OL8A/y6SvalTpl8Wx7VrXy1NO9RTLtsRZqFxyu18mbqVdre7VEECNFVGAFfP8SV9rm YnY5D7/9IEskvwCE8NNq2PXpIVAeakpg3wS1UVTy6xY6OuP1Ye6hxupBdkkUb6K3NIot xby2IcPyGT8p7QL426dfXfDBteVqlfn1Ah9jv+CISAe1TqyipcAc16MBidNy9C86Eyk6 UQFn0Rmv46MlOHWU4ujAYAeNXAAyAj4ZBdPh0oCDSG59VrjQgZt9tK/uD32HOC2kjWRz Zwzox+2eZF8ZSSQ9z8yFjcz9kv6b48cwYTVfXQrViUY7/ZpSHfCPxlS6uwCa3oyHFdaU VpTQ== X-Gm-Message-State: AOJu0Yw0tOkBjmS0Wu61e5p1YdTORmxt0MUR9cdrOeEbRtQlbzMW45qv dsxgz07FalrLAb+cEqhQ2GR/c8zxAp9ENfhUejbDVPKZXW7x+f8SoATgbJhUGm5jE2q7ZOmOqRa w6841jrcvAVpUsK+NB9Q1v3oX6g48dlPXOfboK6DPBzBRobYB6nccxLPzzqVtQ+62VLd0nVdQ1E dMLnqTzCmBMKlsKhUBcv5VupkXuP86NCmSTfiD93hzvkeTNg== X-Google-Smtp-Source: AGHT+IHd6FIz8VWBDVi5lEUDqZDmtWqpaV9lqW2oTMMOWZOKeKJYq1tdRUYIUHLUgmoIW97klEdLpg== X-Received: by 2002:a17:90a:cb09:b0:29b:c402:9d65 with SMTP id z9-20020a17090acb0900b0029bc4029d65mr3877260pjt.5.1710157079208; Mon, 11 Mar 2024 04:37:59 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:37:58 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 6/7] mpi3mr: Update MPI Headers to revision 31 Date: Mon, 11 Mar 2024 17:05:13 +0530 Message-Id: <20240311113514.108795-7-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update MPI Headers to revision 31 Signed-off-by: Ranjan Kumar Signed-off-by: Sathya Prakash --- drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 3 +++ drivers/scsi/mpi3mr/mpi/mpi30_image.h | 20 +++++--------------- drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 18 +++++++++++------- drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- drivers/scsi/mpi3mr/mpi3mr_fw.c | 8 ++++---- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h b/drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h index 35f81af40f51..6a19e17eb1a7 100644 --- a/drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h +++ b/drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h @@ -309,6 +309,7 @@ struct mpi3_man6_gpio_entry { #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_GENERIC (0x00) #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_CABLE_MGMT (0x10) #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_SOURCE_ACTIVE_CABLE_OVERCURRENT (0x20) +#define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_ACK_REQUIRED (0x02) #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_MASK (0x01) #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_EDGE (0x00) #define MPI3_MAN6_GPIO_EXTINT_PARAM1_FLAGS_TRIGGER_LEVEL (0x01) @@ -1315,6 +1316,8 @@ struct mpi3_driver_page0 { __le32 reserved18; }; #define MPI3_DRIVER0_PAGEVERSION (0x00) +#define MPI3_DRIVER0_BSDOPTS_DEVICEEXPOSURE_DISABLE (0x00000020) +#define MPI3_DRIVER0_BSDOPTS_WRITECACHE_DISABLE (0x00000010) #define MPI3_DRIVER0_BSDOPTS_HEADLESS_MODE_ENABLE (0x00000008) #define MPI3_DRIVER0_BSDOPTS_DIS_HII_CONFIG_UTIL (0x00000004) #define MPI3_DRIVER0_BSDOPTS_REGISTRATION_MASK (0x00000003) diff --git a/drivers/scsi/mpi3mr/mpi/mpi30_image.h b/drivers/scsi/mpi3mr/mpi/mpi30_image.h index 47035b811902..7df242190135 100644 --- a/drivers/scsi/mpi3mr/mpi/mpi30_image.h +++ b/drivers/scsi/mpi3mr/mpi/mpi30_image.h @@ -198,16 +198,17 @@ struct mpi3_supported_devices_data { struct mpi3_supported_device supported_device[MPI3_SUPPORTED_DEVICE_MAX]; }; -#ifndef MPI3_ENCRYPTED_HASH_MAX -#define MPI3_ENCRYPTED_HASH_MAX (1) +#ifndef MPI3_PUBLIC_KEY_MAX +#define MPI3_PUBLIC_KEY_MAX (1) #endif struct mpi3_encrypted_hash_entry { u8 hash_image_type; u8 hash_algorithm; u8 encryption_algorithm; u8 reserved03; - __le32 reserved04; - __le32 encrypted_hash[MPI3_ENCRYPTED_HASH_MAX]; + __le16 public_key_size; + __le16 signature_size; + __le32 public_key[MPI3_PUBLIC_KEY_MAX]; }; #define MPI3_HASH_IMAGE_TYPE_KEY_WITH_SIGNATURE (0x03) @@ -228,17 +229,6 @@ struct mpi3_encrypted_hash_entry { #define MPI3_ENCRYPTION_ALGORITHM_RSA2048 (0x04) #define MPI3_ENCRYPTION_ALGORITHM_RSA4096 (0x05) #define MPI3_ENCRYPTION_ALGORITHM_RSA3072 (0x06) -#ifndef MPI3_PUBLIC_KEY_MAX -#define MPI3_PUBLIC_KEY_MAX (1) -#endif -struct mpi3_encrypted_key_with_hash_entry { - u8 hash_image_type; - u8 hash_algorithm; - u8 encryption_algorithm; - u8 reserved03; - __le32 reserved04; - __le32 public_key[MPI3_PUBLIC_KEY_MAX]; -}; #ifndef MPI3_ENCRYPTED_HASH_ENTRY_MAX #define MPI3_ENCRYPTED_HASH_ENTRY_MAX (1) diff --git a/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h b/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h index 85b91583bacf..028784949873 100644 --- a/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h +++ b/drivers/scsi/mpi3mr/mpi/mpi30_ioc.h @@ -101,6 +101,8 @@ struct mpi3_ioc_facts_data { __le16 max_io_throttle_group; __le16 io_throttle_low; __le16 io_throttle_high; + __le32 diag_fdl_size; + __le32 diag_tty_size; }; #define MPI3_IOCFACTS_CAPABILITY_NON_SUPERVISOR_MASK (0x80000000) #define MPI3_IOCFACTS_CAPABILITY_SUPERVISOR_IOC (0x00000000) @@ -108,13 +110,13 @@ struct mpi3_ioc_facts_data { #define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_MASK (0x00000600) #define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_FIXED_THRESHOLD (0x00000000) #define MPI3_IOCFACTS_CAPABILITY_INT_COALESCE_OUTSTANDING_IO (0x00000200) -#define MPI3_IOCFACTS_CAPABILITY_COMPLETE_RESET_CAPABLE (0x00000100) -#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_TRACE_ENABLED (0x00000080) -#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_FW_ENABLED (0x00000040) -#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_DRIVER_ENABLED (0x00000020) -#define MPI3_IOCFACTS_CAPABILITY_ADVANCED_HOST_PD_ENABLED (0x00000010) -#define MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE (0x00000008) -#define MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED (0x00000002) +#define MPI3_IOCFACTS_CAPABILITY_COMPLETE_RESET_SUPPORTED (0x00000100) +#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_TRACE_SUPPORTED (0x00000080) +#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_FW_SUPPORTED (0x00000040) +#define MPI3_IOCFACTS_CAPABILITY_SEG_DIAG_DRIVER_SUPPORTED (0x00000020) +#define MPI3_IOCFACTS_CAPABILITY_ADVANCED_HOST_PD_SUPPORTED (0x00000010) +#define MPI3_IOCFACTS_CAPABILITY_RAID_SUPPORTED (0x00000008) +#define MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED (0x00000002) #define MPI3_IOCFACTS_CAPABILITY_COALESCE_CTRL_SUPPORTED (0x00000001) #define MPI3_IOCFACTS_PID_TYPE_MASK (0xf000) #define MPI3_IOCFACTS_PID_TYPE_SHIFT (12) @@ -159,6 +161,8 @@ struct mpi3_ioc_facts_data { #define MPI3_IOCFACTS_FLAGS_PERSONALITY_RAID_DDR (0x00000002) #define MPI3_IOCFACTS_IO_THROTTLE_DATA_LENGTH_NOT_REQUIRED (0x0000) #define MPI3_IOCFACTS_MAX_IO_THROTTLE_GROUP_NOT_REQUIRED (0x0000) +#define MPI3_IOCFACTS_DIAGFDLSIZE_NOT_SUPPORTED (0x00000000) +#define MPI3_IOCFACTS_DIAGTTYSIZE_NOT_SUPPORTED (0x00000000) struct mpi3_mgmt_passthrough_request { __le16 host_tag; u8 ioc_use_only02; diff --git a/drivers/scsi/mpi3mr/mpi/mpi30_transport.h b/drivers/scsi/mpi3mr/mpi/mpi30_transport.h index 1e0a3dcaf723..fdc3d1968e43 100644 --- a/drivers/scsi/mpi3mr/mpi/mpi30_transport.h +++ b/drivers/scsi/mpi3mr/mpi/mpi30_transport.h @@ -18,7 +18,7 @@ union mpi3_version_union { #define MPI3_VERSION_MAJOR (3) #define MPI3_VERSION_MINOR (0) -#define MPI3_VERSION_UNIT (28) +#define MPI3_VERSION_UNIT (31) #define MPI3_VERSION_DEV (0) #define MPI3_DEVHANDLE_INVALID (0xffff) struct mpi3_sysif_oper_queue_indexes { diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index 07accf01be0f..0f102ba49759 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -1280,7 +1280,7 @@ mpi3mr_revalidate_factsdata(struct mpi3mr_ioc *mrioc) mrioc->shost->max_sectors * 512, mrioc->facts.max_data_length); if ((mrioc->sas_transport_enabled) && (mrioc->facts.ioc_capabilities & - MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED)) + MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED)) ioc_err(mrioc, "critical error: multipath capability is enabled at the\n" "\tcontroller while sas transport support is enabled at the\n" @@ -3677,8 +3677,8 @@ static const struct { u32 capability; char *name; } mpi3mr_capabilities[] = { - { MPI3_IOCFACTS_CAPABILITY_RAID_CAPABLE, "RAID" }, - { MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED, "MultiPath" }, + { MPI3_IOCFACTS_CAPABILITY_RAID_SUPPORTED, "RAID" }, + { MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED, "MultiPath" }, }; /** @@ -3960,7 +3960,7 @@ int mpi3mr_init_ioc(struct mpi3mr_ioc *mrioc) MPI3MR_HOST_IOS_KDUMP); if (!(mrioc->facts.ioc_capabilities & - MPI3_IOCFACTS_CAPABILITY_MULTIPATH_ENABLED)) { + MPI3_IOCFACTS_CAPABILITY_MULTIPATH_SUPPORTED)) { mrioc->sas_transport_enabled = 1; mrioc->scsi_device_channel = 1; mrioc->shost->max_channel = 1; From patchwork Mon Mar 11 11:35:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 779972 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A16E13C489 for ; Mon, 11 Mar 2024 11:38:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157086; cv=none; b=KcS0JSlWtRuTUVwVSRxH5IbdKaPr82h7j5SrL0S+3AvhkX7lCf8aPchLSVMCYLgEh29XOFgUyU5CpsAgzJDK1qJjD9aX7hfBC8sTlkdXmJvLrKnj8hiDBw61br6LOPHGzx9k5/k6eMOlV6wwFZCsYapQYz+gaefa3zjdDixEkJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710157086; c=relaxed/simple; bh=pBr9mUxem8nAjHaCc0BTvsikyluzTduETSBHL9IdvaE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=K9S1m55IIY9wzsR4GX/xs+RAyn6ota0yyjqiX1iLyxFsllFka+YDQaeus5ofA8lVFeDGdmBAvlEx9eej8OhU+dJIeti+Gjplzrf/Dxk2NFfaIOQKwThF735JJF1mEmD1uNKh888Z1+XV/XS7l8EqYwxUXape/sjCk7yeJXOIm5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=YxkEDPaU; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="YxkEDPaU" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-29954bb87b4so1622965a91.2 for ; Mon, 11 Mar 2024 04:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710157083; x=1710761883; darn=vger.kernel.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=epOEUTbgNJwW5ih05kg/nN+cSjllxVhcxQJ/Ike6Dlk=; b=YxkEDPaUi4Iqc3+SSKTxAp62ngBc6f6INU8Yv4AS6wU6GZ7WoWdLhNd+eLx3tQb7ME aRRH+Iu+8YDvS3uyDwfG2yK2a2GDeUNIAOCAC39MffGcX93YGv9f6G1xJB8fUuEhLByW zwFWNrEXNQNPrbqqNFdY6b55zU1fd0mFSssoY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710157083; x=1710761883; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=epOEUTbgNJwW5ih05kg/nN+cSjllxVhcxQJ/Ike6Dlk=; b=N7KcTnhflJUDMawM+XKb/8yWUn8+E4hy+uJJRPTCENwPaLGxmizNB5f8IASqcRYDXf MtTFORR4u6vjByS6DAKw3k4rJd2oJyrbXDvQ/cYDpBLNLCSpIUJwk+GP/+YyZJnh0Yy+ g5PTS4BOnWlmw84oP2aIpNYV+UozmVZngkLaBzdIZXPvvi6iqdoXMx+czkS8KtuZSvK6 S8yhaIFHYSowjSm8sla3MIo4uDZ3Iqfu6iQpaenyS4lhaKbkM54Ak76D4nYh3UY9oShT jrv1o91994puf7uKfsNFX3liWvv/yZ60qrab6bKgnacCaGzWh/pROtiX2ablGsFnAUAA jX5w== X-Gm-Message-State: AOJu0YwSrZ42zgrKl8+xgnYG+pcSZ6TnhyGsqKXECYZQZaW7hHlbFGtp VpK1i/x6m4b2NyrbgnwFHHdZKGI9j3A45HQ2cqzufhdr2IMqNs5rWc0xI1j8ihwSpn5EgdVritZ gyvqI3M4EX2kHjsjjabkUV49kQdKzo0AyFHYRgVZEvuhXSJGWNweOI2oVycNd/wKzbvcawo9mHb 2H+Lc2PwsRXvuVr00gmS806thXN+JYA8b5Fv/rOo2cFPnfYw== X-Google-Smtp-Source: AGHT+IHF0zxwO4Xe0LjAAGZzooC8wHVyQrJSw7UWqhH7pH38aNydWt6h3mTXfF5JoNyGR8n/F/0Dlg== X-Received: by 2002:a17:90a:c798:b0:29b:c4a0:c8bc with SMTP id gn24-20020a17090ac79800b0029bc4a0c8bcmr4370106pjb.34.1710157082940; Mon, 11 Mar 2024 04:38:02 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id ay3-20020a17090b030300b0029ba5f434a8sm3982655pjb.26.2024.03.11.04.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:38:01 -0700 (PDT) From: Ranjan Kumar To: linux-scsi@vger.kernel.org, martin.petersen@oracle.com Cc: rajsekhar.chundru@broadcom.com, sathya.prakash@broadcom.com, sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, prayas.patel@broadcom.com, Ranjan Kumar Subject: [PATCH v3 7/7] mpi3mr: driver version upgrade to 8.8.1.0.50 Date: Mon, 11 Mar 2024 17:05:14 +0530 Message-Id: <20240311113514.108795-8-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240311113514.108795-1-ranjan.kumar@broadcom.com> References: <20240311113514.108795-1-ranjan.kumar@broadcom.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update driver version to 8.8.1.0.50 Signed-off-by: Ranjan Kumar --- drivers/scsi/mpi3mr/mpi3mr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index dca8390c33ec..d1c93978f28a 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -55,8 +55,8 @@ extern struct list_head mrioc_list; extern int prot_mask; extern atomic64_t event_counter; -#define MPI3MR_DRIVER_VERSION "8.5.1.0.0" -#define MPI3MR_DRIVER_RELDATE "5-December-2023" +#define MPI3MR_DRIVER_VERSION "8.8.1.0.50" +#define MPI3MR_DRIVER_RELDATE "5-March-2024" #define MPI3MR_DRIVER_NAME "mpi3mr" #define MPI3MR_DRIVER_LICENSE "GPL"