From patchwork Wed Jun 18 19:21:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897899 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.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 CC9B03085C7 for ; Wed, 18 Jun 2025 18:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272969; cv=none; b=rjktGbe5PTFq9w8nXQuHUYnhqu3SNKoinOyh6ja2ocG774aWZM5BvBFXX6tJM5nR6shQ25f27A+HGlQH+N0VyhXYezDFhcOxqAzdfyGtfefZEy7iTIvrCmk9KDaPHY0WKBVvAnY/g7syd2QPHsU/z4KE99zTf/Q5fOOrXxYTbSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272969; c=relaxed/simple; bh=ClSmxWPMwnoXNRBCVfYtGk32oeYun9qO5pz2jYHHGKc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fuDp7slsk0L82hIKDp6990HFn3P7JE7ApzdUAtTxFB0X55bcXljzMgnxdp60A2YV0N1cHWC7hb9Qr3UOmfg3KIAxJqoSVxuud038UoKDXLILl/gfhIswo0TxKVvO+16U3nPCdL3mKVEsu+NUp1MI5+0W1DKEYCVNXKmcwDLLlAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Lzaf8WQn; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Lzaf8WQn" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-748d982e92cso1340198b3a.1 for ; Wed, 18 Jun 2025 11:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272967; x=1750877767; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d7wMqzLtAQ/D3AvrhGBANGvTV+XOH7rvyvWnciP+vS0=; b=Lzaf8WQnJdhra/BJ5bsvqiZeXx4L0PMyrBAvnM8wA3MMfh72yMaz8vpg5LV9kEhEeU /7kPKRT3MVGCQaXc5LxyEFqwcPmnhIlBxzuWeyRfn8F0z4qUCGRyXrL1i7W4PfVkyamo O09EY7imv8Q/LSOYv6lgoW/Chbb5m4sv5l1SyiUtdWo0w/MCq0uigcUwLRQ4Eu+EK/kA K71yY4beTLB0HBpzSlFLNhgicaotYt3xzFP49sj4AhZP3FwQEliy7zrc4eKsQ+CGe/fZ j+xlkHGjfXb5n82K4/Ol7qSVl1deM+kCsn8k/x9IxauPLGvBPObpZCTza3yCRIzKo2HL ltLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272967; x=1750877767; h=content-transfer-encoding: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=d7wMqzLtAQ/D3AvrhGBANGvTV+XOH7rvyvWnciP+vS0=; b=TPTh7A2H+8MiMJCieXjkdHDAKOHHYlc8xfXjqIrzXFtCt2tD9oE4krX2PYCTPQNDsz DuJ0sEtCHPKp+BYAa+D5eKRKAjguX+ymWIdwSW7VvTx9IEg5JhFX7ae2CbRxzUWXlmpH GS43Vbne7vXc5y9eCcQt7YRqfi41NhltOblgoTrQW2SK9GsMZoohQrRTqTWy1ylwXYBH I2XNlhvW91Rq8FCPMYJ1bJvaGO3+RiD8RSTo/BXe8Y6APv0/mI0T2BuQ5CKCsTq5CNYs 7mOe3XimAhP3jFQKUoRJqxo9Qm10ZhW5PKOBLKjjIaNlNF7pkEuSD0c+1EpPYev04WTr gQcg== X-Gm-Message-State: AOJu0YzLyWiVMTyJbJ0xVAG+P5b4kFRVjID4PV/OL8ROJyEroZz5TRJE JBl22YsaH8o3OcqzNg36f/aJMqxtoDjWj40yDuRPwr9QKNnM5pKQoubJwlSZQg== X-Gm-Gg: ASbGnct1/y1VzB1bIMIDn0A7fPwI9A6QOtzxM2BOTUMf7GPUpDdoH08nHjxGNmWTTw2 tus2RvCPPLYiwNM/jTfMkkxWpBV1cs4LazlmKRchijGhzr24ERVpSnv6g6vr7zlVufOTzXam9GN dJClcpjJhCd0B32BVLANHQoyVxCh1atXVEJ4gIsNqjYAYHvRaiRMC4WK2PV+0l991FexZriKWIk lUHLeqmO83XmOHPcIqImTjJ6SeYgcXi7wUnFPxXWaWExgWubHXI/m0J0hbT4Ty69SNu+IrnPZAM +V1jo+8NE+DNt8Vi3th2SIdN824yqHVEmyKFJgmPbEYqaJ+fmbRNd9c1BArvHueEu7fkuPr8mTn QG3m6iQgEuW/ajGj/+3n5CnNVKmoZ97bQ+U6Auv7dvNY1x1g= X-Google-Smtp-Source: AGHT+IFY2UYxnGKfw6I8zrXDHH+35bK7p+4d0HfrgxOI10KhrTuJLTK5M9DI7EAoPy+A1qFiBFNjdA== X-Received: by 2002:a05:6a00:1989:b0:736:4e67:d631 with SMTP id d2e1a72fcca58-7489cfddacdmr24686959b3a.23.1750272967075; Wed, 18 Jun 2025 11:56:07 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:06 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 02/13] lpfc: Update debugfs trace ring initialization messages Date: Wed, 18 Jun 2025 12:21:27 -0700 Message-Id: <20250618192138.124116-3-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Initialization parameters for trace rings used in debugfs are sometimes automatically adjusted. This patch corrects and updates the corresponding log messages. Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_debugfs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 3fd1aa5cc78c..061a5e4e525d 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c @@ -6227,8 +6227,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_slow_ring_trc = (1 << i); - pr_err("lpfc_debugfs_max_disc_trc changed to " - "%d\n", lpfc_debugfs_max_disc_trc); + pr_info("lpfc_debugfs_max_slow_ring_trc " + "changed to %d\n", + lpfc_debugfs_max_slow_ring_trc); } } @@ -6260,7 +6261,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) atomic_set(&phba->nvmeio_trc_cnt, 0); if (lpfc_debugfs_max_nvmeio_trc) { num = lpfc_debugfs_max_nvmeio_trc - 1; - if (num & lpfc_debugfs_max_disc_trc) { + if (num & lpfc_debugfs_max_nvmeio_trc) { /* Change to be a power of 2 */ num = lpfc_debugfs_max_nvmeio_trc; i = 0; @@ -6269,10 +6270,9 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_nvmeio_trc = (1 << i); - lpfc_printf_log(phba, KERN_ERR, LOG_INIT, - "0575 lpfc_debugfs_max_nvmeio_trc " - "changed to %d\n", - lpfc_debugfs_max_nvmeio_trc); + pr_info("lpfc_debugfs_max_nvmeio_trc changed " + "to %d\n", + lpfc_debugfs_max_nvmeio_trc); } phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc; @@ -6317,8 +6317,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) i++; } lpfc_debugfs_max_disc_trc = (1 << i); - pr_err("lpfc_debugfs_max_disc_trc changed to %d\n", - lpfc_debugfs_max_disc_trc); + pr_info("lpfc_debugfs_max_disc_trc changed to %d\n", + lpfc_debugfs_max_disc_trc); } } From patchwork Wed Jun 18 19:21:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897898 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 CACF72F547F for ; Wed, 18 Jun 2025 18:56:11 +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=1750272973; cv=none; b=hsNSHlw2MrQAcBPWRGs3UQyd4MWgUkCDCFRTRErDDPOoELa+5LN0gwrPMGlhBafc0uPAbr4izmFNNP0c989o07AQYxWRQABl1hVyxcaN+ep+w+jwIjFeKfA0CEo5u/eWCrVKkOyBnddFaBF8i4n7SatcV59KHLRPWr8SwzuSGrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272973; c=relaxed/simple; bh=bV+4o2bU6DJMjg0vmp3iadxgbx4V3hLGKcNgTvsouXA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G+F6qKOd8dLCIxTPRY4OYdDD+bNgAvgBlOi04ut3jVqdBY5wEQ0yh377YXcLZ3iGbJJ6RtEvyhL2CBGyIV0MkrcAShK41rdxDYMQlAEDsQ32fDNi529itm5cyMDfCHnQ9ZitYDXcQGpEAlrisx8NXUo2GPN+r/i7NPHSUG7v4aY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OPRSTwbm; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OPRSTwbm" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso7793567b3a.2 for ; Wed, 18 Jun 2025 11:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272971; x=1750877771; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UwuUKYYST8VwsmQcvm50vhpuu2t9Kf7/tp9whRrZdeE=; b=OPRSTwbmI9E6U10d5IbkkTUXUEI3EQ1dvZfoknPlBJ7K6VB69w5rg1szPswGdB4YLD jY19MQEtTJ8SIaYKrot9EGWnziryJrWQm86k66eGEV2FQ369X6j/87oIcfg2YgtUs8tr cuUiGPvu61+Vx6VpWWpnJhg5DZssbRGWydJ64b+s1quYSWo20m+IwF/n3mLSMHvVUEA6 LZEqHWyS5gQ9s5rfGiov/GE9UEjmNjH/gGRKSzxlqnqgipqlb6HtKWbvF8Qnbtnvbhom YkL/4HbKofg6ySyEW6PRElnCU/ftG+etlAkWghiQ9WWFcOedeTZYJMc2jifJexc8WpRW SigA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272971; x=1750877771; h=content-transfer-encoding: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=UwuUKYYST8VwsmQcvm50vhpuu2t9Kf7/tp9whRrZdeE=; b=SGvcS/eaN+Bc9Sctz/Ys7OxGq7F6+6fAy5YxGfiZG0JaQHLT2KRknAC4aOH3I7yZyL BmmAsKE5xXCD0kguMUXlKvK5NvUurDvC8cZBcOqmdi7AqA63A2P7bd1XA+nr5r0WDFPx P+gNXcFjaX4yaiPcyuZMSRX6stxiP730NHI9AN4wRR9f1vjBYtFmdJ7F32lv/57g5au6 48xm19MctZqVTwH4s3Q91Z5Z+iooXFjG1r8fsXnpgph2yQ+myBok04Lxj1OKs9xf+To+ 4nw9McXPebA0Kd2e2MoPlxFf2GCNWfI8pRcOlwv86rVYrbRu3vDOIpaCMhUZxPNeQ4q3 WW3w== X-Gm-Message-State: AOJu0YwjD3Gd4lK0wObY/8T0yrBbVXTQGtpXVsesOUExIFJTz8lY8DP6 I8ldOEIytydSzx3qHN8UtNkrVMEcOeoCqf+xc3wQ66Viv/mtn7odJnuKG4eh/Q== X-Gm-Gg: ASbGnculamX2T2MIkFCIm+NQ6b0h9mgoSNkJOxGDOSPVLdMo2ydT/AnYqnp+rC8hG59 gV44NJFVql7e9vCPG6beNz6K1dZGb0DBZdHwdS4rQBIMacSCFDqcHWhuxdyPHO88vZ9V1kFB5Kv 0OVFy2KwrLbpwLlDNOfErCuQcADxFKHIBnuPQAS3qehWIrRXuEDqjiBXo0KRVW3RpwSuaMkI1QY ip5UAcTpb+paaP6FeNJR8zuANZzFnmKP057objw2bNWHzATbTQ8CaZWEflrLBXFIn4y972bpUnE zU6mEbyXZV0ib6EsYJV+1CCMztJQ4m3H/joJSQAwyebFz55bTPWTZJkGTk8jB2wdv3jfmqZZmY6 uNAUpWa6Pj9AVQAGgpZJq8eV2FDTBN+Vu44ystApIaQmPWGo= X-Google-Smtp-Source: AGHT+IHRfNBC+cz4yA2crzcmuuaaeYR3ZT7oB8apqrNCM8MxnMEZPcwKi2IKkEWiPSGsYtjcIehujA== X-Received: by 2002:a05:6a00:3999:b0:736:31cf:2590 with SMTP id d2e1a72fcca58-7489d1730cbmr28603236b3a.16.1750272970826; Wed, 18 Jun 2025 11:56:10 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:10 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 04/13] lpfc: Skip RSCN processing when FC_UNLOADING flag is set Date: Wed, 18 Jun 2025 12:21:29 -0700 Message-Id: <20250618192138.124116-5-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 During rmmod, all ndlp objects are cleaned up and marked with the NLP_DROPPED flag indicating that an ndlp object is currently being released. Thus, if an RSCN is received during driver unload, then walking the fc_nodes list to process the RSCN is unnecessary because the ndlp objects are very shortly going to be released. In the lpfc_rscn_recovery_check routine, early return if the driver is in the middle of unloading by checking for the FC_UNLOADING flag. Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_els.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index b1a61eca8295..f7ed245aece5 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -7861,6 +7861,13 @@ lpfc_rscn_recovery_check(struct lpfc_vport *vport) /* Move all affected nodes by pending RSCNs to NPR state. */ list_for_each_entry_safe(ndlp, n, &vport->fc_nodes, nlp_listp) { + if (test_bit(FC_UNLOADING, &vport->load_flag)) { + lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, + "1000 %s Unloading set\n", + __func__); + return 0; + } + if ((ndlp->nlp_state == NLP_STE_UNUSED_NODE) || !lpfc_rscn_payload_check(vport, ndlp->nlp_DID)) continue; From patchwork Wed Jun 18 19:21:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897897 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) (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 B5B772F5470 for ; Wed, 18 Jun 2025 18:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272976; cv=none; b=Rv+clMFdDL8M6Z0J3jMzJcBn+rLEnVhbmgkA3A7sUehvTtGR75XKNqHiwWNrzucL9IlF1JKjx06/KAm6VbAjsyvjldRmP5G9ZCOrWpTGfbj4m/UyrFYVPXHodECXUCK5S7zApvW0/xNSU1RfXEYHDdxChXnX4FHwoK2ks8avbow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272976; c=relaxed/simple; bh=MmJWZTWRELZWKicHxIRGCDwFh0pdtdn81+esg7RM8II=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Wq0yvdx8RqWOJNLE9kG1e6APSnNiR89c7uwsUy6i5P/D2d9uTRDifhYiibxePhc1ASt5wnneaSDhbu5fli16v4Yu15reXzo6PISlx4475elBSwqnPZFm0HXUOa2Ho4dFSPjAQL2ti3Op4UctZQ094ObsfBqN0o3FGeMYHV3PqxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P02oSv4V; arc=none smtp.client-ip=209.85.215.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P02oSv4V" Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-b271f3ae786so21803a12.3 for ; Wed, 18 Jun 2025 11:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272974; x=1750877774; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/4pJ2/TYr66pKWSvZFpcVFC2nhS2o71CRUOiJqjuq4Y=; b=P02oSv4VIAZQ3R2cr0qd3RtT8qLIicgotOCROPNzjC/sx07oVn9CtPBEwL4Q5RRujB 1XTaJ+JMQh3tsmAvJ4FHnM7VIL/+r+xcqnJIk+hW1o+rAzg3Yw5J6O4MeLQF2Yur5cTE piKD0rccZUkwu4X4f1QVqdYnc0NZRL6SUuuqrwalTsQ3tH2HE+XIZTo3cq0454E7U5+s WmxyQ5tqDjveSgWEdSxgLfz0kh7DeWtnmh22vizPjU5wFWc/ZH7L3CnsQLXbaZoY9J5I liV6+ajxW6C8BFhlxzwQL7T6MJnrGcuvIM+XjcQao3g+BQgEyPHLDrr5ZO5tTmHQpwex OE3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272974; x=1750877774; h=content-transfer-encoding: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=/4pJ2/TYr66pKWSvZFpcVFC2nhS2o71CRUOiJqjuq4Y=; b=B6Ja1V+XuzWKuZhUNpeKCXZF6EvHMQ7alEuqi1HXTdeAYOkoSyPC6nk2uHvsQFxBtx 7ZU4ZR/QF3dtOyNoVwpFz/BuTCvfOQLW0AJYRVR8vXaDnyWaQsAy/qtjEFUtJTjaHye9 Tt4/j4FKLnuHKzoXg5kb29kr50D6EPktbNQ2/ZnL45uqspiqCDN0phcY7XvP0r3B5CVt UOkGleawR+PRkIua6UScLzIOcT/khh8VYRofqZy5p3I2Qj+wbtbIwSafANjIU09JsUdu KJKbBLWBaM9PFikeIVMUNtZHUyxsOUqSewkYBvpnrlgIWrYFZYCgboN09K9MqG02AhP8 J/+Q== X-Gm-Message-State: AOJu0YxUxtAL+a2Ci/ROquAs/GkJMBh+65NZngJbDsm91t5iQRi30VYR D48giTumZ7uErlveuKs83UUE48tlSGge/gnU1s00A1/Gic/Isylz1E8RAYpBXw== X-Gm-Gg: ASbGncuJtkf2sqBuCQJ3/BG2ptuS44JYBQd1TVuyGVXYVdDSW2DwqJPfWek5rJ9ZPFX VSgYxAluSmx2HkX0MW4CI1ePbGDjyqHOXrwFMm+fvyjtUC5kEAHroxuz+UHMhtkNsDGoDJJbMbZ YtcdmNccB6AdPi/hZRBWNEsPfqMYtSLcvtZ0NSuin7vK1R/ob9UqRFrNEqS2YuVWxPpBesnrOoa WMJW4/zAEpKJRew3dwFe2tm/XqYzFJkZtA7hMa1Als89Cu8UlZ/4pbTFEOUzB0QFdiUsuhEiug1 PMtmObgRGhJwYccKmeyf46KOpDv/An4Xiqh1/J65fiZktPJDOYP8FRx4861g0Xev1NKbR9zs9KQ 1UCMZsqhkGIqdzePfBx/min96ZNjb+zJuxNZA1umh06IEtNo= X-Google-Smtp-Source: AGHT+IFMyXttJTlhcStF7GWf/HrVeFy7DJ+zR2Q5eVCBv/Iu2Km12WrgmGs0a4+qCx6d6xPmlx0SzQ== X-Received: by 2002:a05:6a20:9f8b:b0:21c:e488:29fa with SMTP id adf61e73a8af0-21fbd57d7bfmr27196631637.29.1750272973825; Wed, 18 Jun 2025 11:56:13 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:13 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 06/13] lpfc: Simplify error handling for failed lpfc_get_sli4_parameters cmd Date: Wed, 18 Jun 2025 12:21:31 -0700 Message-Id: <20250618192138.124116-7-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are unnecessary checks on an HBA's interface type and family before erroring out a failed lpfc_get_sli4_parameters mailbox command. Simplify the error handling by logging a message and proceeding to memory free labels. Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_init.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 20fa450def03..7695a815de7a 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -7919,8 +7919,6 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) int longs; int extra; uint64_t wwn; - u32 if_type; - u32 if_fam; phba->sli4_hba.num_present_cpu = lpfc_present_cpu; phba->sli4_hba.num_possible_cpu = cpumask_last(cpu_possible_mask) + 1; @@ -8180,28 +8178,11 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) */ rc = lpfc_get_sli4_parameters(phba, mboxq); if (rc) { - if_type = bf_get(lpfc_sli_intf_if_type, - &phba->sli4_hba.sli_intf); - if_fam = bf_get(lpfc_sli_intf_sli_family, - &phba->sli4_hba.sli_intf); - if (phba->sli4_hba.extents_in_use && - phba->sli4_hba.rpi_hdrs_in_use) { - lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT, - "2999 Unsupported SLI4 Parameters " - "Extents and RPI headers enabled.\n"); - if (if_type == LPFC_SLI_INTF_IF_TYPE_0 && - if_fam == LPFC_SLI_INTF_FAMILY_BE2) { - mempool_free(mboxq, phba->mbox_mem_pool); - rc = -EIO; - goto out_free_bsmbx; - } - } - if (!(if_type == LPFC_SLI_INTF_IF_TYPE_0 && - if_fam == LPFC_SLI_INTF_FAMILY_BE2)) { - mempool_free(mboxq, phba->mbox_mem_pool); - rc = -EIO; - goto out_free_bsmbx; - } + lpfc_log_msg(phba, KERN_WARNING, LOG_INIT, + "2999 Could not get SLI4 parameters\n"); + rc = -EIO; + mempool_free(mboxq, phba->mbox_mem_pool); + goto out_free_bsmbx; } /* From patchwork Wed Jun 18 19:21:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897896 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 DD74E2F49E0 for ; Wed, 18 Jun 2025 18:56:17 +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=1750272979; cv=none; b=BlSzJemKdl5yeIVooVGp/WHXDRp4BGJgH1x2I0yOGxzJO9mNMpurxl5c1mTwka8bd9h4f4OskMvy6xKI1mAnwKFkba0R4fJLuekJpz+eU4PpzLeasNlQ2y5Cf2BCoHRvrC6V2IS62EpW5MfdMj5eJgg2sKtgg8ApowlhhRqc1zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272979; c=relaxed/simple; bh=qp7KMOau7kGF80BRLGd3EohmPTaw/QvLr1B3RCr3NRY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SJNy8l8/Yvukqc4wvrYHqT5+InXCIU+r1L8N9pq6GoyLuxW/VruBCP+c88BP5c75N7ICLbCXWnWsPRr8xFDKtjdoKUpKGjOIuNMpjV+1/w2NqC9u+LS3eqXOkQZAksey40ptwfCXNpi8Wv/hMdKJ5+1mA3mkxy5JeoQNTBUz3Dw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZclsGKML; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZclsGKML" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-748ece799bdso664125b3a.1 for ; Wed, 18 Jun 2025 11:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272977; x=1750877777; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6YIn7X84N8cSUQmw7RBHHc/WUtmQqOjdeVD1JX/uvIo=; b=ZclsGKMLfJbjZhVwMJ28GKYw7GygngBnz5yaVagqRyWePhUesT7Z8vS9jnNHON4LiN g0TJeTQ3xFgUzcHgi/sAUXNikpt5Mkj+6M+CVfJezr9qZ6a7KqyZxYvTaTr+aQRH6BtD PogKi5dI59xgthsfb3yY7LBv2almtTmdKi1RVrzckrKr1/ixSAzKbzDnlmOjvLild/WZ DlxL8rayRXsRiOSNI5X0rFsz2b9mQmRGIx9goP3pvwx3zbkASMrqyFTuImto0d/EPl/x LkKmczZ6Kiv8zYZKvUHR4Q+Qxn3GgmMJP7f0uKhvTqT5dp3Z2kOh+YHqtW9ndf1SAJIk 2TPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272977; x=1750877777; h=content-transfer-encoding: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=6YIn7X84N8cSUQmw7RBHHc/WUtmQqOjdeVD1JX/uvIo=; b=A67obuvpc3vlaRWXJ999g0SmdjRuIoU+L4tMU6YkczazmEEYtT4+if2vCJYsJI+IoQ 2HJhLZ0q5r43EVj8tvZps8OmMKvoNxqGSmtF1IrbEs93OGAoTGcIxDhgmReOK9Kg3Wy0 wL3SfCqAOU5C8blA+3jVYHlO/VpX1QeL31VcGBe/O9T7pZdYqK20j6sqq7DUwy7OF74y vuhL4QCaU6AmGK28IuY7Vh4eVbjFNifpTZHXy7ekGsIA+gDWqib1ygigQ0KAeeTcmK+g +OWvlk+kS/TabwQaS609BQNqXWmadpBX1914imfMZoInxO+qsZ68QSbM0znsTlxgfBKb TJNA== X-Gm-Message-State: AOJu0YxdX55CE4wKydv7aYez16TppEpRbMpzTgSWNcyD6EmzFNb2dFzh xhy12ppnI6L2ZuYtG1XuKj8BmUiJooHhzIjevioUuV8CbvViAev4NHpS9cdP0w== X-Gm-Gg: ASbGncstw99nmlT0ApVS05gkLvRp5/6mDo8qkioXUrkfGdl7o6m5Kxt6t/lmERGOhjp ++BSGOxqw06jTT6SDr8gS2dXVEzlUG84ILclOQeNVZ92qxppP8qTWlSfi+b3AhDCHQ3fnbEMzS+ eB3hwBro39W5ihP0falVKQOl+oyiUCF2wMm4XzeM1hhgkMEvEBmrEPsVijoChaTgGfcb1+dlzcj xFTf0R5VdzIHIKT8J7PMHOeXZFA2n/VP7+hwWkwB7NGjhvqL4WkVbmgCtJeijSrfLAtRsRO5bmh F3Hj2va9vM8owE7j+H315ljAGfHehcnwBx8xyQvtU/I/57l0yyqns1w0Ft0tN8MSky6Qf+g3+nr 2BIkAJdY8MQzSwGq6ro4g/90uCUBT6x2c3VCrWshjBSa7uEihGFQh4ijqEQ== X-Google-Smtp-Source: AGHT+IFYR9J3oACOrLzi8Tkp5U1DxhZHaaa8lpryWqi5YfY0o5RxtQIvOjm96RU43PmpjzqgjLTDkQ== X-Received: by 2002:a05:6a00:3d0c:b0:73e:1e24:5a4e with SMTP id d2e1a72fcca58-7489cff1acbmr28542821b3a.24.1750272977039; Wed, 18 Jun 2025 11:56:17 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:16 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 08/13] lpfc: Ensure HBA_SETUP flag is used only for SLI4 in dev_loss_tmo_callbk Date: Wed, 18 Jun 2025 12:21:33 -0700 Message-Id: <20250618192138.124116-9-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 For SLI3, the HBA_SETUP flag is never set so the lpfc_dev_loss_tmo_callbk always early returns. Add a phba->sli_rev check for SLI4 mode so that the SLI3 path can flow through the original dev_loss_tmo worker thread design to lpfc_dev_loss_tmo_handler instead of early return. Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_hbadisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 690eacc5f739..43d246c5c049 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -183,7 +183,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) /* Don't schedule a worker thread event if the vport is going down. */ if (test_bit(FC_UNLOADING, &vport->load_flag) || - !test_bit(HBA_SETUP, &phba->hba_flag)) { + (phba->sli_rev == LPFC_SLI_REV4 && + !test_bit(HBA_SETUP, &phba->hba_flag))) { spin_lock_irqsave(&ndlp->lock, iflags); ndlp->rport = NULL; From patchwork Wed Jun 18 19:21:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897895 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 CAB5A2F4A1B for ; Wed, 18 Jun 2025 18:56:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272982; cv=none; b=GHVqQE5kFyWgKx7qVKRQ92/tWbUGCpbi3LhTnMEd/yrOU2HX00py5L0EizdkdcnhW6EQbl4om15qmfRbFFuwUrD8HBRBnVPKQM65fnHq8Csa5Su1nfk+hOEuEiFaAEpwJVwDv1vAKvFyOx6VEmTK0Yf7f35x32UqF8yArwxhjVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272982; c=relaxed/simple; bh=b6upBSWil8TlqPqaEUQFivfjO1JqUtUF2BBt4NtaVA8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Frv9vuoCc1AcBxVUVpm/353HvxB3PFm4tMbx+vbpDDvUQnc5zAduPLz9y5dQ0zLBjTlmN93+HxjeVUGhpeig2jhFsKy9+HmRSpXLc9fPDi/OpJkSFVVQ+VrusWVlNaOlQrRr5VfQChhM+O82YseqWNoJ1FOMAcOMO/u2bdl4iXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JgjAsGhy; arc=none smtp.client-ip=209.85.215.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JgjAsGhy" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b31d592bbe8so17504a12.2 for ; Wed, 18 Jun 2025 11:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272980; x=1750877780; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gfe8HMGDOV0pUwlOj8Fg6C2oGtQvtYruI6/AOBsOHzE=; b=JgjAsGhytTfk64RyaOP0K3wQScbbs1XkTfYQRaue98i1k6VKEw9My5TYyJZ4Q56IF9 6T3zYXHq7Swvut3C/BmzKR3NefnVmjGoqvgrSBK0GKPTXIx28nKE+aPS3DF3fSF6+iG4 2/s4aY68zpc4q3R7fyiaWT8dQ1hh90639VtfNLWAPc2M7nOaYLv0hQ2+Wz3cNxIiNAsM 0PTCUq/y0Y45Q52FsEqulonvBE37uqkAfL4VgPxi0JVDWXv6FPCgqozc5VzW63yhaXOi mjRXNQtVoBd1hcIoxKPK4XgEQQJX7EcklHbxXPCFlyx8ZZ6Ya0eZdbiId6GIYNhp4X4P Xf4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272980; x=1750877780; h=content-transfer-encoding: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=Gfe8HMGDOV0pUwlOj8Fg6C2oGtQvtYruI6/AOBsOHzE=; b=e5Ly0o/so+jKc5bedSjae9FxGvpOZOSBrAg+czfW1aV3vBe/dO+Rzmz2z0EfcI7Phc hiIMysPGngPOMHrudYxAdFr7DSbLkXVWw6DvrSNUlrDJz2/Fzmdb0yaiiXdLueHxYIFG OZSFeQ7iJyaqZTiTlS3ob8ViNqBdY5q4a78r4jKSpLEOw03LqztnQb1X32+49SMJ7aWI ke55TQT9fy6k22E6EUs1TM4LGrPx4sx4pFSdQR/ltzirgUs2NU1zEf/jwLoSwK2lvNdA XoIlbiAMif8UMOuMBycCcH0YW2BaOgqBhu+gB65um384V97oh+rnOWqJJGBRv6+IBTuG pdTw== X-Gm-Message-State: AOJu0Yy5ZiZW4seWYxESp1FMrgU3OZ3RAgzHBO48LiEFPJxwN7RIxt/6 fo/gawjTHKI69DDMPUFga8MAQ+Jn9q+bA5Lofk7mVBBP9YsrVos60A/LD0gCyg== X-Gm-Gg: ASbGncsVBOAQfdZ9VzueMqVkYQQqCzoHCmKejQPGsL2vJR+Bua5YLYDHNfwwVO4fiF7 s5N3ZljM0BAAG0yi+WU6tKzZNlME+uMT01WTiSDZJOzRnMDrZP1EqpvHnYVpdMf8NpaUkHNRMFl 2+WJhM2d9+buYp2F+ROo3OBa3o8eG7mPV/oSAm95AaHoi0/FplzRGaSQf3QXx8n+rZr8OerNDLQ pAd127MT/5kQPrErt+zjXPtl+zOXb7le2MRkIBIUARu6KJ4U3rv0RJzOuu2ZwpsU1QSn3aEjaYW ttY0E/cKrHnEIFLiD3SGeJwQfkXp0s29IbCGRBvqCUWWYn84UsSfK2X+xaT01hoqqLX/ulEryQi 3Tsy2/S3yxItZS1V6WcsJlkm4uhTgpVOzkWiEDaDeDDFz5lc= X-Google-Smtp-Source: AGHT+IF+fkiFWmlD5sH5hhLaKngNO5Hpv2J8xPp2lcv1S29nWSp28SBzMXO+vMv4L0z/dWLpfKnYlQ== X-Received: by 2002:a05:6a21:348b:b0:21f:39c9:2122 with SMTP id adf61e73a8af0-21fbd505f8cmr33818463637.2.1750272979967; Wed, 18 Jun 2025 11:56:19 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:19 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 10/13] lpfc: Revise CQ_CREATE_SET mailbox bitfield definitions Date: Wed, 18 Jun 2025 12:21:35 -0700 Message-Id: <20250618192138.124116-11-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The CQ_CREATE_SET mailbox command's bitfields are updated. Rename the cqe_cnt and separate high/low bitfield names to help resolve confusion between two similar bitfield definitions. Corresponding usages of the newly defined bitfields are updated as well. Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_hw4.h | 18 ++++++++++++------ drivers/scsi/lpfc/lpfc_sli.c | 12 ++++++------ drivers/scsi/lpfc/lpfc_sli4.h | 2 ++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index 2dedb273b091..dd9f170fbdc8 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -1328,6 +1328,9 @@ struct cq_context { #define LPFC_CQ_CNT_512 0x1 #define LPFC_CQ_CNT_1024 0x2 #define LPFC_CQ_CNT_WORD7 0x3 +#define lpfc_cq_context_cqe_sz_SHIFT 25 +#define lpfc_cq_context_cqe_sz_MASK 0x00000003 +#define lpfc_cq_context_cqe_sz_WORD word0 #define lpfc_cq_context_autovalid_SHIFT 15 #define lpfc_cq_context_autovalid_MASK 0x00000001 #define lpfc_cq_context_autovalid_WORD word0 @@ -1383,9 +1386,9 @@ struct lpfc_mbx_cq_create_set { #define lpfc_mbx_cq_create_set_valid_SHIFT 29 #define lpfc_mbx_cq_create_set_valid_MASK 0x00000001 #define lpfc_mbx_cq_create_set_valid_WORD word1 -#define lpfc_mbx_cq_create_set_cqe_cnt_SHIFT 27 -#define lpfc_mbx_cq_create_set_cqe_cnt_MASK 0x00000003 -#define lpfc_mbx_cq_create_set_cqe_cnt_WORD word1 +#define lpfc_mbx_cq_create_set_cqecnt_SHIFT 27 +#define lpfc_mbx_cq_create_set_cqecnt_MASK 0x00000003 +#define lpfc_mbx_cq_create_set_cqecnt_WORD word1 #define lpfc_mbx_cq_create_set_cqe_size_SHIFT 25 #define lpfc_mbx_cq_create_set_cqe_size_MASK 0x00000003 #define lpfc_mbx_cq_create_set_cqe_size_WORD word1 @@ -1398,13 +1401,16 @@ struct lpfc_mbx_cq_create_set { #define lpfc_mbx_cq_create_set_clswm_SHIFT 12 #define lpfc_mbx_cq_create_set_clswm_MASK 0x00000003 #define lpfc_mbx_cq_create_set_clswm_WORD word1 +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_SHIFT 0 +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_MASK 0x0000001F +#define lpfc_mbx_cq_create_set_cqe_cnt_hi_WORD word1 uint32_t word2; #define lpfc_mbx_cq_create_set_arm_SHIFT 31 #define lpfc_mbx_cq_create_set_arm_MASK 0x00000001 #define lpfc_mbx_cq_create_set_arm_WORD word2 -#define lpfc_mbx_cq_create_set_cq_cnt_SHIFT 16 -#define lpfc_mbx_cq_create_set_cq_cnt_MASK 0x00007FFF -#define lpfc_mbx_cq_create_set_cq_cnt_WORD word2 +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_SHIFT 16 +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_MASK 0x00007FFF +#define lpfc_mbx_cq_create_set_cqe_cnt_lo_WORD word2 #define lpfc_mbx_cq_create_set_num_cq_SHIFT 0 #define lpfc_mbx_cq_create_set_num_cq_MASK 0x0000FFFF #define lpfc_mbx_cq_create_set_num_cq_WORD word2 diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index 372907debbe0..a8fbdf7119d8 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -16477,10 +16477,10 @@ lpfc_cq_create_set(struct lpfc_hba *phba, struct lpfc_queue **cqp, case 4096: if (phba->sli4_hba.pc_sli4_params.cqv == LPFC_Q_CREATE_VERSION_2) { - bf_set(lpfc_mbx_cq_create_set_cqe_cnt, + bf_set(lpfc_mbx_cq_create_set_cqe_cnt_lo, &cq_set->u.request, - cq->entry_count); - bf_set(lpfc_mbx_cq_create_set_cqe_cnt, + cq->entry_count); + bf_set(lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request, LPFC_CQ_CNT_WORD7); break; @@ -16496,15 +16496,15 @@ lpfc_cq_create_set(struct lpfc_hba *phba, struct lpfc_queue **cqp, } fallthrough; /* otherwise default to smallest */ case 256: - bf_set(lpfc_mbx_cq_create_set_cqe_cnt, + bf_set(lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request, LPFC_CQ_CNT_256); break; case 512: - bf_set(lpfc_mbx_cq_create_set_cqe_cnt, + bf_set(lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request, LPFC_CQ_CNT_512); break; case 1024: - bf_set(lpfc_mbx_cq_create_set_cqe_cnt, + bf_set(lpfc_mbx_cq_create_set_cqecnt, &cq_set->u.request, LPFC_CQ_CNT_1024); break; } diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h index 9be3da91c923..e42b44fcc7f6 100644 --- a/drivers/scsi/lpfc/lpfc_sli4.h +++ b/drivers/scsi/lpfc/lpfc_sli4.h @@ -575,8 +575,10 @@ struct lpfc_pc_sli4_params { #define LPFC_CQ_4K_PAGE_SZ 0x1 #define LPFC_CQ_16K_PAGE_SZ 0x4 +#define LPFC_CQ_32K_PAGE_SZ 0x8 #define LPFC_WQ_4K_PAGE_SZ 0x1 #define LPFC_WQ_16K_PAGE_SZ 0x4 +#define LPFC_WQ_32K_PAGE_SZ 0x8 struct lpfc_iov { uint32_t pf_number; From patchwork Wed Jun 18 19:21:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Tee X-Patchwork-Id: 897894 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 85BA32F4A1B for ; Wed, 18 Jun 2025 18:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272984; cv=none; b=HUbNYgFEJiNF70fab4Z2OpBmBuIMuSDDcDlP+jnsQ+wA1oKxQIJJN6KUJUCn2FLVb4BNUDybjlI/4DbOy9B+mxuC4fI8G8cPBs1Jv0cOA6iT9vMEzRmBPL77piOYKIbnoHJQtCkzZ1F4qMXEEmOx3phcJwXNCXgZTi1jLMYSpUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750272984; c=relaxed/simple; bh=/lwpENf0lZZn3HSxdOSB1sPiCRSJTrihGFvEnZUqGNQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dAKOGwSUxvckzrHuTQVAgIjL+SGWTMTOo2gbmlbStOM9bmxko4WBEhZXebE3rx9RRtRGUn2z4AsW279fQl1DdMltcCy0KHxZEIv5mVmDlvwJOZC+Asweo3q7y8s0Bk6iFEsNLZmsV08ijYdbp5zSGKRKr95wb+Iv5oM3B8OzO1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JEUwnJZV; arc=none smtp.client-ip=209.85.215.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JEUwnJZV" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-b31cd61b2a9so19820a12.3 for ; Wed, 18 Jun 2025 11:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750272983; x=1750877783; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4FFBkcUumdQn84qWHCiunsr4YAO8uWs92poa32xh1KA=; b=JEUwnJZVIkq41lnIHHP2OegHlITplCB+Kz0j4pfcjPZ86JjbCwXwMecMibUExeCDhr x/1WGk4bGgi7Lg6uXzpYB22yL6siSJyED1ZRq2tb2GEqscl9yj2RG5De0s+hAnx8CBOo EB9HkbjPn+4wDPHo74+G6cn0DUiXeRF17C3m7FZT1YwNMsZX7t7CeJqwcEk3ZOT6tt8L JJ1/qVtHagYxg5uphLmec8mKlhpaVnrFRvsRUZCHTAiEWJfU1vIuxWAovBo2R+RugBlx njPYliJogaaQS+zfFCKRY2RihUBHKuu1bwfsgg9ecALAuxU3XvW3tIEdACf/IKXONa/N vO3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750272983; x=1750877783; h=content-transfer-encoding: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=4FFBkcUumdQn84qWHCiunsr4YAO8uWs92poa32xh1KA=; b=Bi6EHPS+qJnLl7XmVNZ3DRgpoLf/33WUJ9nQmNS5SVYmIV9h5mQR0kkDctoDr+eALI FPkvQmjarQx+pLN2fHOKR/bCvOUww86QCFVUJYVENEbbTvM+2Zyzv22rE0YlFwi28lK6 qLRuBi567CyZV/1SXpj7rgo7CRCce40xmbT4cpfIA1pebvk3nrxYYkaclmUR8rlnEFG2 FsihIXHls7ckkMwElBrhn2hA3JMQdZg9S0iDJFz+LRN6rS5qzHbZ5DcBidXNBvQqQi82 +qSEtcNOZZFbNkNuxiFXZjv0BRYvY/zxXcAWSP32zl9zSuuCfCfw7ExVCeR9tMkDlkLw DJbg== X-Gm-Message-State: AOJu0YzPTPLCKNw0N+Oz7tkQ+zzQd9OBFVZdAGfKIIt7ZASniA6sItii mHuXMoPv4SYMDVB7RflY0r/Ijr0ceCbBhj6XsXLTBcVniZEz4INM1jIgoS+trQ== X-Gm-Gg: ASbGncu/rN3wqx7XSvYWYFZxtdj0N9Iz6mDh2VohxWDTMSMtWhaS/H1bPSg0Gnu9f1R cOWDt63vyNH0nEmnlFx5okWVv2NGuBORFxq4ZZGhLPuxohl37PeWnMgA+gHRO6lBlBa2uCHECIS 4UHjwoqKqvWCHb9R1Is2xliH1D8kk63Ow22iqEsAwYXoye3gGWIdY19bl4hShbtZ9N1DF0tKp9T 41YaYBQdKghPVPMJgcPgLo68T4TjqMbxUxNJbgxSouNlyT/YW2mJTZLfR9/eLQTH9iWKczDPC8R s1CNhAc2DDR7ybJvUi+ys8xpIVA733531qnf5Xn//dAqlSqBP/Fb5LW3tVFVnzi6DI8idEWBF4e nI19+GxRStAK75ibZXVPo3e5nnASi3yaXVsqxJIQ67/ncnDM= X-Google-Smtp-Source: AGHT+IFV8d0ZerJScyzMpJ/HSOsG01Vpnmm02UKnVoHZ+WElFzEbUSjpLg90TXBQDmMPQMYYzIAuAw== X-Received: by 2002:a05:6a21:790:b0:20a:bde0:beb9 with SMTP id adf61e73a8af0-21fbd494fccmr27918566637.1.1750272982777; Wed, 18 Jun 2025 11:56:22 -0700 (PDT) Received: from dhcp-10-231-55-133.dhcp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900b75a8sm11798834b3a.133.2025.06.18.11.56.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2025 11:56:22 -0700 (PDT) From: Justin Tee To: linux-scsi@vger.kernel.org Cc: jsmart2021@gmail.com, justin.tee@broadcom.com, Justin Tee Subject: [PATCH 12/13] lpfc: Update lpfc version to 14.4.0.10 Date: Wed, 18 Jun 2025 12:21:37 -0700 Message-Id: <20250618192138.124116-13-justintee8345@gmail.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20250618192138.124116-1-justintee8345@gmail.com> References: <20250618192138.124116-1-justintee8345@gmail.com> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update lpfc version to 14.4.0.10 Signed-off-by: Justin Tee --- drivers/scsi/lpfc/lpfc_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h index 749688aa8a82..9ee3a3a4ec4d 100644 --- a/drivers/scsi/lpfc/lpfc_version.h +++ b/drivers/scsi/lpfc/lpfc_version.h @@ -20,7 +20,7 @@ * included with this package. * *******************************************************************/ -#define LPFC_DRIVER_VERSION "14.4.0.9" +#define LPFC_DRIVER_VERSION "14.4.0.10" #define LPFC_DRIVER_NAME "lpfc" /* Used for SLI 2/3 */