From patchwork Wed Mar 13 10:07:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780462 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 5F760125CF for ; Wed, 13 Mar 2024 10:10:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324629; cv=none; b=SYrbQiCCvAF4VXjDUbWBTjUsqlWWoi2/Hnh/+hlA4HTzr+/s/ThFEceKMmJSxUuUDRv+rT0skD+L2c7IUn6BewKMXnri6kvEavJpvw69tEuKDUbKWk5sbfSjPChpACjacmpyR3dXMEmJGYNNNqllR20km2IzflQm2VxTAufP0Qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324629; c=relaxed/simple; bh=v5pEK2tlG1N+Spdq6ueyxLlHOzKg96Ga5+re19ZQ8x4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=UG9iYjEf40bvm1QIRq9j3hAgRZAGSlTlg8iVk2W1GzIgAlvfKVGA0j0IX9LXw1DSrZI6O6ZwwpFN9qI01rJovnjZEeyuq64Pjmv29u0DECUCg2E6UUkdEwlUASupJhO3Q1En+ITMZd3h0VpqQQw2fJQ7WvYL79NiQHsQQxdNpVA= 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=QWqRRfA7; arc=none smtp.client-ip=209.85.210.174 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="QWqRRfA7" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e6adf257fdso1356103b3a.0 for ; Wed, 13 Mar 2024 03:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324626; x=1710929426; 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=sCJmMNSq9HH/dOQ4h4/2xFRtDqp9JhaV38tysWIaTTs=; b=QWqRRfA7n3yIqVhfUbUOWqXJk/ryVky0Psjq1gseb6nqiOvpJnwgOF78xtCzuX8wt8 4KitqauTE9gPp2xSaHmtj+SZ5ipn5q0dNyH+UZFRjYzEOe6yJnGZkyP03K2kocGLfre/ GaTjSEdp7QAOQA//BoO/DJiruasjZm3ibWwrc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324626; x=1710929426; 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=sCJmMNSq9HH/dOQ4h4/2xFRtDqp9JhaV38tysWIaTTs=; b=ILftT3sBZ65EpkhTI9iS5IaVKC9q+aUZc86+eYcQ4VLZcLL72/2rVBW1to1yI6IETh O9b9Tai0NthSjvqvjv9Yu4tsTMikRNDrXGLH3+IoMTHLktN2WwrsFGYXjyFGMPQ4E4dS C4VxyjGYUIsVuDt1aFnv52JSwX5ClmaPb32TEVt3JvCnK+0QLRGLgrufaPgeamR77d3Q UJo7EtLAzATTMHAC34KkEIk+0IDCGw3fN0AUJY6WYl3Lcx7TdMdwpD16P7LHUWJG5kys tEqy2zFA2SYHO/sOhPl5JGLtz9Iz/pC8wi8JNXZn5HMWxrfRAH4UBcAbVU+AYK6rbUgX pmtQ== X-Gm-Message-State: AOJu0YxNy5faIlHueDKzz9paDbKE+tcol/Xi15No4Te6YCLkCumAJC2A 99H7XIlcPz10uonLkYfUzybxYr3Wep0mFyEjL2h/JiEqJQ9WvlBX9fZuCnpPP4R5lABKXQ9p9Wv lv1uLIeXk0FwRvxdQxAk47Q8v4NThNqxBgA39e/F/N7EqI9e/pnyALG9UbgNkemfJ+Dt8IvX7/5 Cw0Zmb0/rhs4GEG6S8U2BLdQ3fFHeMU4Sv6vjApo4O+KG9QQ== X-Google-Smtp-Source: AGHT+IGimHPEC87SwFHdriTB/Vner6yu4b0jVY5RXsXN0uRI1bvoz7NON3/Q8IYLFrsE4LyYtGcwhQ== X-Received: by 2002:a05:6a00:23d2:b0:6e6:9ff1:31b7 with SMTP id g18-20020a056a0023d200b006e69ff131b7mr2039260pfc.16.1710324623733; Wed, 13 Mar 2024 03:10:23 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10:22 -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 v4 1/7] mpi3mr: Block devices are not removed from OS even vd's are offlined Date: Wed, 13 Mar 2024 15:37:40 +0530 Message-Id: <20240313100746.128951-2-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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 Wed Mar 13 10:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780264 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 1785338DF7 for ; Wed, 13 Mar 2024 10:10:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324630; cv=none; b=PqMSIFXLp10s5Na9qyEQjVA7ZVb7VwLc6ocnhwuX3ZpVCQM10ZxHmO+d3wiA4t0pH+YXvtDpoyLvIb5/1PWUV4cis6BuDRgVJagIAPzIFMFNWJKPB91Mt99kPHG3fNPNjjpia0Cg5M9YMfeQ1bLDNobUMvp60ENy9cX8c+GKyMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324630; c=relaxed/simple; bh=kh9qI8eVJ9Vs7+4whIFJ49yLWf2soIJX6MOYReyZjWs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=EfGA0ng9FMDSRPeF1+U9e0CNTQbkdpPRMXzSQAawXIv3j36DMN/XPY7k2tNC6rz4Ut+AFLxpk4KhCKKskQaZtt5MViLcrFsg860nXL2Y/oUXqQ3HOyMEU1QADIG/mnMzsXwczcH0FTuTX/bPXiXi+B1cir7x5jf0MZKmvCLHKI8= 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=Qo5v5rFC; arc=none smtp.client-ip=209.85.210.181 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="Qo5v5rFC" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6e6ac00616cso1453742b3a.0 for ; Wed, 13 Mar 2024 03:10:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324627; x=1710929427; 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=iqo+fuiBl8+PAzATKqlt/myteFBZkewLztQbgAP4k/E=; b=Qo5v5rFCM5YMbqTblSdynfMEUNXd3AhpSVXGp8zSC9c8p1/FbNmiZS2vW95LtSQBFx /n/EoP5ikpBtcQMW0dZF5RsLRUajxo6ZpzxLkSDRxr7sCcaPfiLmqvf5mTM5QfeJpuOZ xh+VTIFCHvJHIJolsijJNJuMxBErVY1PoMhMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324627; x=1710929427; 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=iqo+fuiBl8+PAzATKqlt/myteFBZkewLztQbgAP4k/E=; b=LueLSjaBUx4aY1llkNtqLoAp2avlcj8eNB6wm5rMb5iHbyBFt4Msz3/cbgBWh37Z9P PK0trmcLKgwZIJzkyIfyUjmYX6cZWX4ChMD3ldKSGOIPj91ol1FkH9GnWqTXRO35mo2/ asErou/l7PxnOIXvhp9rd7r1GefPYBBkSDL8nik72N5YlLk5nEq4BbhPlcTIlCRYfWMd Lg90nxId42/PUv6mC0IKfXNRBfZxCjswrv/t5ZeE9HE326kekOQej3pqKo7k2EsUFBgO yxDskAv9IgTsey9P50nFzVcgp15g+2AlAZW5VkZjpDk9T9k0RYMBQBHwNTJaLB1un9dQ wMiA== X-Gm-Message-State: AOJu0YyWq1dy290IQ+YFXOW4KNzada7Xbrk9qB4znhjhL21CVP06qBJ8 Nyefc9WY7taf+b/5KYfjgDoKAFzBfO5BWERoq5gDgvC0/hVghoQfwdgtfmvPMbMOZPO+VZHq7cf s9G12zeS+o9iLaqlHT3va3gkksd3Gs16ju5MReTH/MSnfuU/SWwg3mCCLEZ8nVXMdjfpUzmbDyu 9ukF1HFyYe6OJOQ02jwGZJsxLD6s5w434J3C1ozcO2X68JaA== X-Google-Smtp-Source: AGHT+IET2uxNtxuqTFgo88d0Yd2D/9JE8G+yyP4/VJOtfFZnHziVU7NIIpR2Ak2mfMO+0zsE0Z9XFQ== X-Received: by 2002:a05:6a21:789e:b0:1a1:85b2:44e2 with SMTP id bf30-20020a056a21789e00b001a185b244e2mr10953193pzc.11.1710324627379; Wed, 13 Mar 2024 03:10:27 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10:26 -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 v4 2/7] mpi3mr: Set MPI request flags appropriately Date: Wed, 13 Mar 2024 15:37:41 +0530 Message-Id: <20240313100746.128951-3-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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 Wed Mar 13 10:07:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780461 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 F41302E822 for ; Wed, 13 Mar 2024 10:10:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324634; cv=none; b=KDriNbCNhvPYDkMTkSLOqYdfh0rTk6KAVNuY1XC4tmPvY6PHNVZNm1WW4J6W7lnuFKrYq/j0TBjnTJTuAjxPkJyjaOi/GFWbJxyMU6lUX3KHPZM6G4WoCBfDooiXePycW8ca2l9HQa9yUk+puC0eV9aDby1kwDKRS8wCWr7gQPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324634; c=relaxed/simple; bh=XH9xnMp2m0XMTIXDbhOKzh5h2zCAxww3jc9IALakUQ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=td9tP0PluQtXaXxAecI5IW6aowwUOMF37JpyYb51it9LR/BOEfBRYftMDpWRCVr2v4e74+hojnfjT/5Q7f0j0dciS+riskN1rt4SkhZ4iFoMxgUs29kzhkKo98407GRIUXg/af6EMPRtgREN1pQ2GIp7W8nrhIIjwkfH9QL9cYM= 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=T6P83pHT; arc=none smtp.client-ip=209.85.210.50 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="T6P83pHT" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6e5343b915fso308617a34.1 for ; Wed, 13 Mar 2024 03:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324631; x=1710929431; 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=OJqkGgFx5csZdfxBsGNdIp6T3E5gVrw75eqlGoSQtCc=; b=T6P83pHTjkROMjwTjKgtPwxBk+epBQYqKLwXk+QMZpBFCRn67OTvx9jfONm6vVgiEI lrSjCqyWKq3biunQylGtwOJGEJZr0t8i/RiJ6rASXi9yenRXfbny1OoC1R0VA9BtCC4G ApDLxxHca0PgCtSaDkdGU9ajGbK488dCBk8zY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324631; x=1710929431; 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=OJqkGgFx5csZdfxBsGNdIp6T3E5gVrw75eqlGoSQtCc=; b=Zx0znKUeXFmUFSWZ8sIFRqk4afORB6J0AM1VZLd9u0XPySb2lLvq+EU9AX96M5tOju 6U4RHMWNQZRRO2yky7si40nu5PMCgIVZjEw7jpSX18nfxJL1o2ZrGgd10EcxPV+zeT2a pjHtk2rlT79oSJxIDNLWIUm6AI2haW5a0k8qEUpfPOrCXlrrNdFfHUkKe1yduxk+e9ZP 7pfkm6c6TmAq/jEPmaiywfWc4oH+o7vR5iX8Oo8wQLW8b+FUX2sXKm45GbSzQPFv6v7H TtODwJgwvjJqS2vUCuUNol0Gtow2DCNolpbYeFLPmjjJsvEspuAjEpjUSA9yKu8pSEHh 62TQ== X-Gm-Message-State: AOJu0YwlBg4UXZeyrPg2zJWA0DugK0kD9TMrVtpQQQZsHZboqhmLWaAz T+cunXnMiDBTr6RrFkJexyq9aC6Dfk7IaP7OVJkLeAgz11jQAKd6Z0jN4GzosO0eG3DXdo+RJgW MFK5cWpeDnESi2CnhRpKuwcwQo1DVgK0Mxa8VAouagBVKfZl/CIDMqd1Q3PYCRB/wXwmTab4VKM unE+gTmWVd7/JJlnA7hsXpuWA5nF1p72zzvpvye0Hce1piQQ== X-Google-Smtp-Source: AGHT+IEU5NRhxFMxoxnjs2xW0B8xvX29HFOMiXBexsCIAle/Vt24MR0AQ7RH7v4PNgRsXGXxzTQzaA== X-Received: by 2002:a05:6870:a2cd:b0:220:c50e:9133 with SMTP id w13-20020a056870a2cd00b00220c50e9133mr6066094oak.45.1710324630886; Wed, 13 Mar 2024 03:10:30 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10:30 -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 v4 3/7] mpi3mr: Clear controller-wide flag that is used to block IOCTLS for the unresponsive controller Date: Wed, 13 Mar 2024 15:37:42 +0530 Message-Id: <20240313100746.128951-4-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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 Wed Mar 13 10:07:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780263 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 BA33639852 for ; Wed, 13 Mar 2024 10:10:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324637; cv=none; b=Oz1evBSavE8HlcKC/L7RUoPc4imTRXNItnhvgZI1FZQf3XkMXMr5/vJCZSSKhdJwe51fpsEdY9BMR6Yu7zWKUJ6nZTQL9qqILpWAhhQMqNp+ITVBWmx2BfXr9IAFpTaAKq5As5wq8jaErtm68OACp0dexomw6bggMokL6b0sFuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324637; c=relaxed/simple; bh=7FtlTpo7AlnGXAc/0e7puLHutyeSinEkcAv4qN8/hI4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=ZrC2kmBBr/sxEo8+OUs+zcEznhuxmbrUmDfugzUkEecGK3PXVqNLK1E1jdJHud1LkCI/WxQbtn1nJyJck3fFXaIL6fmwmX8NMJ4VNkDcJavjPLm+aIA1jl38HpcpBzGpp4qgFjqNo0LPy10x1BiG8mofTVJFDKeXcth9oTgDEak= 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=cm4E5hnJ; arc=none smtp.client-ip=209.85.210.174 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="cm4E5hnJ" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e649a2548cso4538574b3a.3 for ; Wed, 13 Mar 2024 03:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324635; x=1710929435; 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=oY+lSWH84MMz8yUW4hYja/GRAZ4UVCdFbjZpT8K0aTU=; b=cm4E5hnJyiKhKj99UvTiMX+4ZIXBDEJ1Amvwmj0gh69TdgWzl8GNzBINRtGHjDPS/W giQ0tLrCsNBjGutuYldiIphkK9HHfjaHS8tZtwFTZrlK/idRrqbaQ9IaGxXEVnCyNBAs P/dpESbE6IAwOS6CLZhw6FUNGrOAAqGj+U/No= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324635; x=1710929435; 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=oY+lSWH84MMz8yUW4hYja/GRAZ4UVCdFbjZpT8K0aTU=; b=rSW39mZQWLXztG9HDHOCOTIAJEXtaWFkm4Zz1axYpeVItDPhLd6QxIrqPOIHTyG3UI hB+GCR3VHl42L4quIHLfCg/Ad1LAENvrUVqeLKIxg/gQniPixtcklkmQz72Mds/PmBWD gTKYrtQLRtTv6PajCPUCQBp8TXoQC37EC5e5spl5Hcxoom5ON2f5VtCNfKbc9PGVUBgN bsMXasJd/gRrqfnsIZhnEc5JAPFyUj+8VLttufn0K9XfxMopEy4YZMuM9k6SaxgFy0t9 5wBx/DA5rODWbpDrzPBRPWYMNskxLA68So5dXolpvOFAnsB1o/CGSMSIgLk7GkfbqOvD XCOg== X-Gm-Message-State: AOJu0Yx1BtGOgauLy2r/ubOO4+Mk/WjnqEJycJfpjvZWSCxqmFiSzN1b 1cq+UF1FerIi0IzhUcd/0lMvA8UDEeCz5CKbxaWghbolUctIsVlgvyrYpvW9ARFVEgg+4o5ZHGg Qgh4FbWyMeKELXCI6wtsUXfFZVO2JcAt2fSVuorGRMWfRItzrcldlOR8ZkLfQ4WznvrVym3i4KC mvHgPT61VpRy0YqUJLHqH/s0zdA2iZOv5ctCJjFMgNndypRw== X-Google-Smtp-Source: AGHT+IG3+GwJnOWKE6oT3KdKlXr41bFNEtkSSYiWoy1n1Q1hWxW6hFQ5XJt9KpRPeohkMtJj446r+w== X-Received: by 2002:a05:6a21:2d06:b0:1a2:f4fd:b1fd with SMTP id tw6-20020a056a212d0600b001a2f4fdb1fdmr2947090pzb.39.1710324634506; Wed, 13 Mar 2024 03:10:34 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10:33 -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 v4 4/7] mpi3mr: Set the WriteSame Divert Capability in the IOCInit MPI Request Date: Wed, 13 Mar 2024 15:37:43 +0530 Message-Id: <20240313100746.128951-5-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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..ae0e2c6cd2af 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 Wed Mar 13 10:07:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780460 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 09B9C38DDA for ; Wed, 13 Mar 2024 10:10:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324641; cv=none; b=OWuXEGcHimHXV+/I3w5w8GqeAnYGgLnAOvjbegPSxet9COqJ6bzhUs1Km5DJplVp99eK+wCOFJoYtISCq5Fa8pBeRctRuTZrr3k0gi1dr1Agh0H+OoHw9ZftgwY3CVJepdAvC8vRnDDSpCFwp8GMSDkYQuShTcDfRPn1rxI5PDY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324641; c=relaxed/simple; bh=3vSbQHeuOTke+XGsLCMXq//JZatseVKnTr2eUY2H2zE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=F1mXQCaXsoTi2JSwrkIu/o5RoTNNs+fut0jLZMxJ2ze6um/c6Nbk78yUBcB6QC7AT9lNNggnPEKl6O+LRoKkMpIQPij+2n5ryp7AihzPj1xM95kqQvOb2aZco0X414PcI5FV6EumyiV89OnJyRuWvUfCk1a41e16rTM34JVeRI8= 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=EQpCK9JF; arc=none smtp.client-ip=209.85.210.178 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="EQpCK9JF" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6e6ac741ff7so1209051b3a.0 for ; Wed, 13 Mar 2024 03:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324638; x=1710929438; 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=wSXJ1AVHK7hlHS78VsfBkKCEa9VZ8J9Ksa9DuPSZqpw=; b=EQpCK9JFKHsN1fsltvBgQOctyWtSrRtvM80vK+07hgs0X8ABcvJWj4nAmuPgJTgnJP q8tql9Nm43cfRwvOFwLszD2uA65BDsKCfu89xB34sNdDb1pHD4ke+jzmcxuuODT5qoON BirKYgz4ZqVi1XcrG6NnLpoh6RVny6VmLsubE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324638; x=1710929438; 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=wSXJ1AVHK7hlHS78VsfBkKCEa9VZ8J9Ksa9DuPSZqpw=; b=sru/v1ZhmHUEsSUQAa03zsqs3Bg3N/5eP1TFlPp8+q0pVjxQk53eNjmljLH9m+hBPO XddSIaybvc7mF4qkjz7XvnWMFWhckH/SOaLSNJ5I0kcXVDJJl16iTiEE6H3Wgz7BWWep /wU8lRMiPqCOqRQFPb8yiclvpTAQ+WfQr//rCieenVVJ2wmJcrOQUCj2wve4jOT136yx kBC/k/YP8oqkYwTqk4TmLHP4lCRV9NZ1/MshQU84sH2UMirnq31vOrVbTAaCJ8MqDDWL ttPV0Fov2pSDJXpAF7JluGj59ITdeh58ezGS6ldyrCVGj1mYUheTAkwPw2/ZEp8lyFH0 X4ww== X-Gm-Message-State: AOJu0Yyuo6iZ+b6p+WDqyz28jYAfN2C5OL7zswn5fjzNaEYoS1gfyhoi NC1rTX7u33frLz7RIkiaBMi7se6uEZUWt0KAPNaKuaa2ieh85nj80l2rpqpIa0vvX4V8/zgyEhs /Ae2jMvZB2DTLmlZW8hQQwE1qOdOBx+9GF5OQGZMe3khL1kb4/bVo7kfMvmbPAs8yldt3YKze8s FFgl0r2b6gr3UGaiTY+k8LXvywR4Yf2jX36RT5JBu9/kwnpA== X-Google-Smtp-Source: AGHT+IH9xXKlX3+ymxKFkLKAMsIcerkK/E3RR2Wow/Swm+9EZyxT8fKNeHPsX1PFdYG8aweVYHwIxw== X-Received: by 2002:a05:6a00:3d0b:b0:6e6:4946:985f with SMTP id lo11-20020a056a003d0b00b006e64946985fmr1922906pfb.11.1710324638214; Wed, 13 Mar 2024 03:10:38 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10:37 -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 v4 5/7] mpi3mr: Debug ability improvements Date: Wed, 13 Mar 2024 15:37:44 +0530 Message-Id: <20240313100746.128951-6-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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 ae0e2c6cd2af..fe5ed1a2b9a3 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 Wed Mar 13 10:07:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780262 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 23042125CF for ; Wed, 13 Mar 2024 10:10:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324644; cv=none; b=G5KUfqWDWk49IQvqjxSuwE334gJAs7Ah4r/8mMg11TWLooaaQzxZubKoQnEKYVrysxBBRAypZv9RQsgoDawetvldOeInFxVyMi/8gVaer5BTY7wIu9a6wo2zWci/485M/qcQUnTwN/EZaK4ewwokJyyvzDC40yRKxHiXDUTovrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324644; c=relaxed/simple; bh=PFZxX43/l3FoK4ucjRoK/zB6DugmY3219TsRxokw1Mo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=bC5SywHhYBwApSHJwPIT7v4ceSHoeqpcAP79Ckv2G+vTeK1wXMdCn2u39m5iCKMrIWOrgBcpXKtnRyYgCG+pSAg36BJ1IHJ9m8uMOim+YXl+hjl2cWMEGKmKFg0mH+fTfjOHTBX5anzHJCyEKBAAT+qFwGbcJTKx6Fc4WnRwHuI= 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=CH3tA1eB; arc=none smtp.client-ip=209.85.210.174 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="CH3tA1eB" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6e5dddd3b95so524091b3a.1 for ; Wed, 13 Mar 2024 03:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324642; x=1710929442; 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=sqbeZIRkbwJLN4faaloi+8DWFIXMq/f2gPp+1oSZiBY=; b=CH3tA1eBeb5/WyQ4GJJTnr3IS83riOTWiLN0gh0JqMGp/SmBzwHPXwrs2Xhkyi3p1R gMCNENyJN5pU62/t3I6XU1fYPFqCysrtqIVEKFkALzfQxvbeUzks6scr1AX+tFSvapER ntZ1yi6xmed9+8vL13EffG3q2r7i+IpE26SRs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324642; x=1710929442; 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=sqbeZIRkbwJLN4faaloi+8DWFIXMq/f2gPp+1oSZiBY=; b=h+FfZDnjWk/3xln+QEmtec/6ml8WWYFTuAXvBXbE+7MZDBZ1MzL4woonHGYPRxYhZu po6S4EgDKr0ZWJPOGS4yk8NuNcW1MZ/fzvhbJHgF6PZKMGvLq7E/IiFJKAsIeH9fPyb7 U+1M6lMSIfx2lphhmHWwDyF2PQDYVNPy9NijVqMEl7G7fMsuH1nmk6VWHsnZVHIiPkhB r7vc9w0/SAc89/ALbaaut5z2yG47AWlesGExMzbOo/ZAed6Va6Moafznp+QoNa3kEDQe YDN89XZi3qI9qXZdtn965mjmgS0/gArWEYElmjp/211rNapzvj+H47LdvFzh0VFChwm8 JMDA== X-Gm-Message-State: AOJu0Yw+XpTklwJGxNH3elZ58J2WlXgipZ+TcI1clgh7sErwVEWjgZEE sitkhwEuYxvtjZdbiv5VQqpeKdOyFhhkcKAaD6D1SpFR+ahiRAUHQ6YEzkJWFVX2CCnQ7t70gvL WYTFYsNy4ExCttZxdhRsVJQS+FZ8L8s63+JGGOo95S7cCONc3719Pem+DVG3+kSfR7S+MV9W8UX yT6p3p0lEoyX2gv9eyCPXvh9EvtaMpau8wJF73e+Xyr7Q+AQ== X-Google-Smtp-Source: AGHT+IGWzRSuMNHk1Gd+n+wyiPU4bjL5BD9ikJXtlt431gNhvqW87tuQpF1FukuLK0Gi07mWGwNu0w== X-Received: by 2002:a05:6a21:182:b0:1a1:8bd6:af65 with SMTP id le2-20020a056a21018200b001a18bd6af65mr3094754pzb.20.1710324641894; Wed, 13 Mar 2024 03:10:41 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10: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 v4 6/7] mpi3mr: Update MPI Headers to revision 31 Date: Wed, 13 Mar 2024 15:37:45 +0530 Message-Id: <20240313100746.128951-7-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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 fe5ed1a2b9a3..53e0192e165d 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 Wed Mar 13 10:07:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ranjan Kumar X-Patchwork-Id: 780459 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 1908739857 for ; Wed, 13 Mar 2024 10:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324648; cv=none; b=rBw1ZwbZdKmLax/afDWTAmce4IauHiqfeWXkdMG2DGNhyDoj1Zsh/l99e/b2ZBZosB4zqQycxQx2laDFJY0gb5z+m5AyU6EMBI8Buz/o08skarboEXFNqoZu3Ha+rRr6tYAlUXiYofWClRh8v1XNCSwNY8qoExPwug6yRSNAvL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710324648; c=relaxed/simple; bh=FRFVEaUUjCBechblAML7uVNRvG3rvmqtNAwmiogVcJE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=KFKkAnbno68x1yIR842ne51c5vVMjWDOSWRZR5Gh6VLek4sKLrHYVER5J1cKvE2H1cmb0fO1+mmsZpjz56F6p7g6yAOQxTtrWOREdYP4A3f2oDtvbo7R4NsrBCVbive8Or+T2K70ZgwanyDFyJkGueWSdslSKZyMKpS9LLVn/f4= 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=PRNW0wqK; arc=none smtp.client-ip=209.85.210.173 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="PRNW0wqK" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6e6bee809b8so226823b3a.1 for ; Wed, 13 Mar 2024 03:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1710324645; x=1710929445; 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=Q4CviYfLMoVV2fVSw8vwL+glIaqTmAOqPgkm7Sih7QY=; b=PRNW0wqKWJrYlDMfO/qNBnORWBLVSl5NV1OFMRp8vEtLc2Li9CMpfL299abZ/kLaDi 2kqKcmHkJpkr2SimtbvlLZYfhIrgxu85bWFwojVrOiwE9XlKKLNQYoUKSJDJU+cK/gqK nH51RZ1AMrPSmDmGNGPsdgKF6xbxO+04vxTb8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710324645; x=1710929445; 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=Q4CviYfLMoVV2fVSw8vwL+glIaqTmAOqPgkm7Sih7QY=; b=EvOJoz+aNKHjvfkqw9+oCa5+ayo074GTLw/YBEuobxWeIB+zBQ6bP+NpggaTYQ04yh lE2IkuFFmaOn1WyBxNwGLYKj6O8ftkFXGjvHYZU1EEwxoxAAVyzSImoKP4F1r2Ygdtn8 Lz5OIeVQzkj5KaS/Xnhuq0HaYOaictFXvuReRKFglLYaooQOakydi4vuFiMAmnMA+qG4 2+7Jqm0yvkMhnOS01Ftj9Di0btfF8y32AJGkT/U3nIM9ERNQyvQ8fGGMSADIKWVls2nk WffLPNyJgTf8xkgBM/waTGa92o1KSW/il/q6RZkAL819mej1E/aD5ZRgA58h1TCeM3hU nMrg== X-Gm-Message-State: AOJu0Yw7KJ/0AuK5wJXnR2427LBsFrK//nQMtkhUiGoc+C2ndn/NqxgY s3CfGOFTVONuFA0Wr3TdVQyqp6YV1qgEDxPSujfMK5CoVK0LHhYiNy7bC3C32ykox6+ozddNQ8v rI99QyJzd/AV2lLk+aqmf/X3H/XT9D4gczLQ5MYB97LkAExEmGggrKJST4x5qsHIcpD2W7HxEO+ TjB294AhaiTcnDVKcD+ifLCd3z1dFio+uAYqI84RNK681Fgg== X-Google-Smtp-Source: AGHT+IFUiRgG+BIper+eADv+zqBi8hlWNJqFZn/9ltqVa37WmGw9UQDk45KDt0b7Vm3JDJV82PSlGw== X-Received: by 2002:a05:6a00:4fcb:b0:6e6:98c2:aa5f with SMTP id le11-20020a056a004fcb00b006e698c2aa5fmr2115103pfb.10.1710324645402; Wed, 13 Mar 2024 03:10:45 -0700 (PDT) Received: from localhost.localdomain ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id j18-20020a056a00175200b006e5af565b1dsm7570337pfc.201.2024.03.13.03.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:10: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 v4 7/7] mpi3mr: driver version upgrade to 8.8.1.0.50 Date: Wed, 13 Mar 2024 15:37:46 +0530 Message-Id: <20240313100746.128951-8-ranjan.kumar@broadcom.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240313100746.128951-1-ranjan.kumar@broadcom.com> References: <20240313100746.128951-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"