From patchwork Tue Apr 15 00:27:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881800 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1B5283CC7; Tue, 15 Apr 2025 00:28:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676935; cv=none; b=IZKhaI4Jvhf3jaGlf2q2soSx24iSRtTNbLHVG2trwg9Jb2I3WLKcs8uJy04rJBjuyVEAmVcOPFOytZ1XspoPbZpEVqqB2buYT5XBXGhPhVbzl4dMxhYokRZ3Ta/k8PjBTgB+/KjoG2TwQk9ipc4hnzuB+rufkNtI3D+6yuUcGRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676935; c=relaxed/simple; bh=Uttts7JdIDrS240v6la2tV+Xo9cNQsrjszR7r06AUcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mDDEFQUFT0hrFx+VqQ5y7o+SskVSP2t0sqtCBiVVSvOH+YjMPyhmbBSefuDqAO6Wu6caotgf1UkJclpK2BYJuSXA1Hs9noz0LGBqH9/QXMsvmSxLTDWMAYxsnLBy03tYzzJh3sOCpeclV/8NwC4LXokFPs1KGygWauidjeIHZBw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=MLlRtVRl; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="MLlRtVRl" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=PJJjmrX1+5lAxe602v8oNDShkEnAk+8W379Gwb8stBI=; b=MLlRtVRlFHDggqcX YmnLzvN/jpEnkHqVH1qtlrlyXPHT3CXuJRvJDM8kZzlnahA/7FlVFjOuw+UB4tG6Jk/uqpMJzNoR0 eQHsz0BSXve6Tz01TFZ4wnJDsNh0YoaHNxcAxqTa6xJlOfRKz7pvpFO6ZhFmrYOI4u6RZHczrDFev HV1QOGm0Qv/KO0L6io0ssU8Bhb6fGeXuPAgbOUtELJVgQuJ38Nrm1gtHuCvpyHMyaR77pC79amJPH PruqSrgwtVWVgwjKEGk/yq8RkG9kR3a3G7bLAO0cR2+5bBdrUrBol6G5KBlq2eJnayPTyJ++YusyL dNiAY32opTPAMPVHuw==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9l-00BSPG-0p; Tue, 15 Apr 2025 00:28:05 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 1/8] scsi: qla2xxx: Remove unused qlt_free_qfull_cmds Date: Tue, 15 Apr 2025 01:27:56 +0100 Message-ID: <20250415002803.135909-2-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qlt_free_qfull_cmds() was added in 2014 as part of commit 33e799775593 ("qla2xxx: Add support for QFull throttling and Term Exchange retry") but has remained unused. Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_target.c | 75 ------------------------------- drivers/scsi/qla2xxx/qla_target.h | 1 - 2 files changed, 76 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 11eadb3bd36e..8a892ac95417 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -5539,81 +5539,6 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha, spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags); } -int -qlt_free_qfull_cmds(struct qla_qpair *qpair) -{ - struct scsi_qla_host *vha = qpair->vha; - struct qla_hw_data *ha = vha->hw; - unsigned long flags; - struct qla_tgt_cmd *cmd, *tcmd; - struct list_head free_list, q_full_list; - int rc = 0; - - if (list_empty(&ha->tgt.q_full_list)) - return 0; - - INIT_LIST_HEAD(&free_list); - INIT_LIST_HEAD(&q_full_list); - - spin_lock_irqsave(&vha->hw->tgt.q_full_lock, flags); - if (list_empty(&ha->tgt.q_full_list)) { - spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags); - return 0; - } - - list_splice_init(&vha->hw->tgt.q_full_list, &q_full_list); - spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags); - - spin_lock_irqsave(qpair->qp_lock_ptr, flags); - list_for_each_entry_safe(cmd, tcmd, &q_full_list, cmd_list) { - if (cmd->q_full) - /* cmd->state is a borrowed field to hold status */ - rc = __qlt_send_busy(qpair, &cmd->atio, cmd->state); - else if (cmd->term_exchg) - rc = __qlt_send_term_exchange(qpair, NULL, &cmd->atio); - - if (rc == -ENOMEM) - break; - - if (cmd->q_full) - ql_dbg(ql_dbg_io, vha, 0x3006, - "%s: busy sent for ox_id[%04x]\n", __func__, - be16_to_cpu(cmd->atio.u.isp24.fcp_hdr.ox_id)); - else if (cmd->term_exchg) - ql_dbg(ql_dbg_io, vha, 0x3007, - "%s: Term exchg sent for ox_id[%04x]\n", __func__, - be16_to_cpu(cmd->atio.u.isp24.fcp_hdr.ox_id)); - else - ql_dbg(ql_dbg_io, vha, 0x3008, - "%s: Unexpected cmd in QFull list %p\n", __func__, - cmd); - - list_move_tail(&cmd->cmd_list, &free_list); - - /* piggy back on hardware_lock for protection */ - vha->hw->tgt.num_qfull_cmds_alloc--; - } - spin_unlock_irqrestore(qpair->qp_lock_ptr, flags); - - cmd = NULL; - - list_for_each_entry_safe(cmd, tcmd, &free_list, cmd_list) { - list_del(&cmd->cmd_list); - /* This cmd was never sent to TCM. There is no need - * to schedule free or call free_cmd - */ - qlt_free_cmd(cmd); - } - - if (!list_empty(&q_full_list)) { - spin_lock_irqsave(&vha->hw->tgt.q_full_lock, flags); - list_splice(&q_full_list, &vha->hw->tgt.q_full_list); - spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags); - } - - return rc; -} - static void qlt_send_busy(struct qla_qpair *qpair, struct atio_from_isp *atio, uint16_t status) diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 354fca2e7feb..71cf0236ea7d 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -1083,7 +1083,6 @@ extern int qlt_stop_phase1(struct qla_tgt *); extern void qlt_stop_phase2(struct qla_tgt *); extern irqreturn_t qla83xx_msix_atio_q(int, void *); extern void qlt_83xx_iospace_config(struct qla_hw_data *); -extern int qlt_free_qfull_cmds(struct qla_qpair *); extern void qlt_logo_completion_handler(fc_port_t *, int); extern void qlt_do_generation_tick(struct scsi_qla_host *, int *); From patchwork Tue Apr 15 00:27:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881802 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23E84199947; Tue, 15 Apr 2025 00:28:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676902; cv=none; b=Evs0FJ0dNYkahM4Hpsmibh254AH/H90vnI2bzKtsgTY4q67O+cBkbFdoOWFVHu1eaHPDq6auRDVggq5SmbXs79oIBL+754GYUh/e1kinduPF0HDin0kno0eILLAemdYU3S2YS5FDgVLelfAypZOObM+16BeF4AK4GugGqBKMG9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676902; c=relaxed/simple; bh=LSGfBItVUsOl4mKKrLJfO5mRhDJ5Ta0Er/mWO0L1HdA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d/6HjTYQErbNSL+yMia1BgSubqMvbGW6DCSrVOY79T3sAlt4gLOE7O/nMrrXweQUNVVBlthchaHdq2wlpzEGrI1FruKyAWeAvLG6/K4KBZfAIuc8IsRhMJiGr1ePaZN2R+bgp8k5zdZdDVpgOVBZQ7F6lRJrCrVhS3+i0KVTAjs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=Pprjfvtw; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="Pprjfvtw" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=FvtDWiii0omRy58Xa7RJOR4M+Fmc8WqjWn2efxe+CUY=; b=PprjfvtwMOk/co1w FXCFNOhT1A1y4EF/dw/wbITRtN9lq2WElmPH5bJd9g4qPHHb8XXbzn6CVucO0qB19T5NDx+EtaViQ vdKE3SJhN0I9nADdyGvVvDeuS8wVMWtfIEXCHk7CJF0J7xUDGqWvOyWavxUq5XumK3bCh/VfYjxoQ PmKruQDQ2/HvCt5OrvGhuHi+puSp/yLmR8QBaAXI0mCgRMIqtxEinW3uzhAwxrywDaRQEUjKrSEpm tKFqykNc63uCnMEn++WLm4i6oyzKzj6fyZnARXyKoCIt5IYjGXVkXUJsB95HLxYBoXhsxmrQ5sWVi pjGtGIpU39JsdejqBg==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9l-00BSPG-2V; Tue, 15 Apr 2025 00:28:05 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 2/8] scsi: qla2xxx: Remove unused qlt_fc_port_deleted Date: Tue, 15 Apr 2025 01:27:57 +0100 Message-ID: <20250415002803.135909-3-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qlt_fc_port_deleted() has been unused since the last use was removed by 2017's commit 726b85487067 ("qla2xxx: Add framework for async fabric discovery") Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_target.c | 44 ------------------------------- drivers/scsi/qla2xxx/qla_target.h | 1 - 2 files changed, 45 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 8a892ac95417..15c6d95cc4f2 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1454,50 +1454,6 @@ static struct fc_port *qlt_create_sess( return sess; } -/* - * max_gen - specifies maximum session generation - * at which this deletion requestion is still valid - */ -void -qlt_fc_port_deleted(struct scsi_qla_host *vha, fc_port_t *fcport, int max_gen) -{ - struct qla_tgt *tgt = vha->vha_tgt.qla_tgt; - struct fc_port *sess = fcport; - unsigned long flags; - - if (!vha->hw->tgt.tgt_ops) - return; - - if (!tgt) - return; - - spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags); - if (tgt->tgt_stop) { - spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); - return; - } - if (!sess->se_sess) { - spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); - return; - } - - if (max_gen - sess->generation < 0) { - spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); - ql_dbg(ql_dbg_tgt_mgt, vha, 0xf092, - "Ignoring stale deletion request for se_sess %p / sess %p" - " for port %8phC, req_gen %d, sess_gen %d\n", - sess->se_sess, sess, sess->port_name, max_gen, - sess->generation); - return; - } - - ql_dbg(ql_dbg_tgt_mgt, vha, 0xf008, "qla_tgt_fc_port_deleted %p", sess); - - sess->local = 1; - spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags); - qlt_schedule_sess_for_deletion(sess); -} - static inline int test_tgt_sess_count(struct qla_tgt *tgt) { struct qla_hw_data *ha = tgt->ha; diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 71cf0236ea7d..453eb2f6a7c9 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -1014,7 +1014,6 @@ extern int qlt_lport_register(void *, u64, u64, u64, extern void qlt_lport_deregister(struct scsi_qla_host *); extern void qlt_unreg_sess(struct fc_port *); extern void qlt_fc_port_added(struct scsi_qla_host *, fc_port_t *); -extern void qlt_fc_port_deleted(struct scsi_qla_host *, fc_port_t *, int); extern int __init qlt_init(void); extern void qlt_exit(void); extern void qlt_free_session_done(struct work_struct *); From patchwork Tue Apr 15 00:27:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881801 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C5E583CC7; Tue, 15 Apr 2025 00:28:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676917; cv=none; b=SEsGLXUXSMtdPRnV2aTt9CpwRCKsjZnixp8MPnEWCr3F5Bd9gkrU4fWo3kvTugr34CKBvPOiI1d/JgOfyJ/LnFBR27Vw/f9ujdSD/z9Y3MfppsctruNeaaNjfi7XHfFbDEy8uYgWRB71iXJksV4+Rcf0X+eIAVXf69tSBGSfNmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676917; c=relaxed/simple; bh=cUM7w7CMmY2L7uQggLG8LGEM3LoeApasBUuGHN8H67Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hj7I4iOSCt4XDYYO6cNzOGPmfZr20HpZz4qHI6aepypJSedtleZa7gh4XzoR1IZwXCVZ5A6N0AL5uYxF7DlvlZVc6fNjhtNdG0FXEYfBCz9eAyDPvD+8QNVPGdUMcjiWdYp/e2ISGZ0yj2CIVf6y4hUiWQ1sKxon8Bx2YMqNzmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=QejLMfQZ; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="QejLMfQZ" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=OOb3h6FIS4LbALKGJGSOHoeQra9ClF6JGitm4dyi1Gw=; b=QejLMfQZeF/HZZdJ PyHlCBwK0mNB9JIERYYlC7O7brtRouuAgWa+Mix0GjtAqHrj+e+uzLf5soyJn7eHTkyBdrwPWX5sL ZZ1pl5wtt9H73jgW2HBTASJI6eiQIG6e6kr7aooUA+/q31qKAWlQYCRcxtJf2fjEzh1EOFjcrfGoa s1AC6OjslpYXk0rU030gZJyLdAey0JfAww9wBDNwbilZRr3hvrBsYq1Ep0Hy/oBA5i2rfShs28cJI C26D6lOcHJmWctgNo8lo777ZpjRMtOiR21gkH1JTq0w++z91hnP8u3kZ6HV4/fUrfIsKiWAUTyQ2n TLovSgF68GQsvf/vKA==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9m-00BSPG-0t; Tue, 15 Apr 2025 00:28:06 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 3/8] scsi: qla2xxx: Remove unused qlt_83xx_iospace_config Date: Tue, 15 Apr 2025 01:27:58 +0100 Message-ID: <20250415002803.135909-4-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qlt_83xx_iospace_config() has been unused since the last use was removed by 2017's commit f54f2cb540b5 ("scsi: qla2xxx: Cleaned up queue configuration code.") Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_target.c | 10 ---------- drivers/scsi/qla2xxx/qla_target.h | 1 - 2 files changed, 11 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 15c6d95cc4f2..1e81582085e3 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -6971,16 +6971,6 @@ qlt_81xx_config_nvram_stage2(struct scsi_qla_host *vha, } } -void -qlt_83xx_iospace_config(struct qla_hw_data *ha) -{ - if (!QLA_TGT_MODE_ENABLED()) - return; - - ha->msix_count += 1; /* For ATIO Q */ -} - - void qlt_modify_vp_config(struct scsi_qla_host *vha, struct vp_config_entry_24xx *vpmod) diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 453eb2f6a7c9..15a59c125c53 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -1081,7 +1081,6 @@ extern void qlt_mem_free(struct qla_hw_data *); extern int qlt_stop_phase1(struct qla_tgt *); extern void qlt_stop_phase2(struct qla_tgt *); extern irqreturn_t qla83xx_msix_atio_q(int, void *); -extern void qlt_83xx_iospace_config(struct qla_hw_data *); extern void qlt_logo_completion_handler(fc_port_t *, int); extern void qlt_do_generation_tick(struct scsi_qla_host *, int *); From patchwork Tue Apr 15 00:27:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881614 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E87C83CC7; Tue, 15 Apr 2025 00:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676927; cv=none; b=FH+xTznBwWIjCOdJGQajuMMVTPzSyhUh0QuGLUAIoqCfkdGtRHSAZDdLKV96i3U5oVgp4zcRACB7nsL2Lk5B6J2ocfe4iFNAgDRxpHI5JY2lrYZ/7bVUdCfXBcGj7HfdW11ENayxJlV1kcn1LNvzS8GOzCEi2mH4aC31Kjbaad8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676927; c=relaxed/simple; bh=43ci30IL/3d5OAqA6P7HEpDAL6J/3SN52Y02vIoTNZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sdlvt0AN2fV7LLCVqfihJHPVIREOs0F5dFEm3OdB361j72OEe7W9prL43hmw133RTrdPukGRwHI/w4SoRY4d/YsXkX1kiWBEfx+swdVcOT9TJ64JvynIB7Ddk3M84IKIEUfKUhyK3Yq296wzfk4iBJcAub4ym/aYZhJkZ+xR2gU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=m0hR3P2k; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="m0hR3P2k" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=6Bto6bxa+eDsKRAjWbdTd9DlRt6aCeBtgQvfcG8fj+o=; b=m0hR3P2kZI2e7CGx dvJBF8cndjjv/qzIB/zEgGncuDAKv5llpJdwwDGqgFAuhDIGI0TK//UjHSzBbaV2xgLqcKMg+V+Er cZcuOiU5g27pK0B8WqtanBopeNvsxCsnst0qVEcx6rBbpmCUHJtJWDH7Tulu4O0zOiHiYwG2JV6tr NFieLtUnkVEnS9dxW3nDQjR0+wm61YgzQfrJUfnF0r8GLhcDBPBRAPYCGgIvWy4IA1LXk6gvfhhGM /b+0PttEIiCucRxo1Id+5sL8nOo811wCHuBgD+OjHsZFLCMd/do1CtZ3OdYA3Na0CzBLXiziuguvC zgrOz+2idaagCcVAQw==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9m-00BSPG-2M; Tue, 15 Apr 2025 00:28:06 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 4/8] scsi: qla2xxx: Remove unused qla82xx_pci_region_offset Date: Tue, 15 Apr 2025 01:27:59 +0100 Message-ID: <20250415002803.135909-5-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qla82xx_pci_region_offset() has been unused since the last use was removed by 2010's commit 3711333dfbee ("[SCSI] qla2xxx: Updates for ISP82xx.") Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_gbl.h | 1 - drivers/scsi/qla2xxx/qla_nx.c | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index e556f57c91af..ad76cf8e123d 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -822,7 +822,6 @@ extern int qlafx00_rescan_isp(scsi_qla_host_t *); /* PCI related functions */ extern int qla82xx_pci_config(struct scsi_qla_host *); extern int qla82xx_pci_mem_read_2M(struct qla_hw_data *, u64, void *, int); -extern int qla82xx_pci_region_offset(struct pci_dev *, int); extern int qla82xx_iospace_config(struct qla_hw_data *); /* Initialization related functions */ diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 6dfb70edb9a6..1da954f446f6 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -1595,25 +1595,6 @@ qla82xx_get_fw_offs(struct qla_hw_data *ha) return (u8 *)&ha->hablob->fw->data[offset]; } -/* PCI related functions */ -int qla82xx_pci_region_offset(struct pci_dev *pdev, int region) -{ - unsigned long val = 0; - u32 control; - - switch (region) { - case 0: - val = 0; - break; - case 1: - pci_read_config_dword(pdev, QLA82XX_PCI_REG_MSIX_TBL, &control); - val = control + QLA82XX_MSIX_TBL_SPACE; - break; - } - return val; -} - - int qla82xx_iospace_config(struct qla_hw_data *ha) { From patchwork Tue Apr 15 00:28:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881804 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DC1C14A09E; Tue, 15 Apr 2025 00:28:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676895; cv=none; b=a4KrjPe/fm4BN98MqHgZoAdhi2tdbZNGmoHHwEmC4RQI3kOh6jmXnLjbM5tjI3RNv3Yi7bDnVxt/u8gy9mWIgwZ7hLOjaPIvdZzbEek7wT75vqMxBQx1i24VqPyc5KKC9hQgXYJG2rHYrs8roAFOcIwXMm47hcWEBhhgiKdvMCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676895; c=relaxed/simple; bh=ZeShHr8tVZKPg71XR95ertYuyXkqDwJ50Bc+xq/6+a4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YSjHzzRuYZk9PJJQ8TtcQFq3GilvsCwlsxLL6v7Uc1hyB9urF5V4mvYvUFS2y/agIt/R4qn35rrnxA5kppuMEsSGOUhXNYF7eJhC4N2k+HDp1X4v7lhJVY+6hDwogkmX34FPWjiJ9qZqfInfnvySYkjJmb2V7Rs7bXiVhYmgNIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=Tl8h7MzY; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="Tl8h7MzY" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=8/ZZbVr4lqL8Td/j0X5Tyoi0ONfVB87bZftpxp57CzE=; b=Tl8h7MzYtPLLvM3M gnLp62tlxE4vCVNQypKuesMBumgG8EJTfeJTu094h6UXeXUZNzKDvwgfoy+XazPAhuTt3980Y17Hp tbeQ0UWMAER5+j3QlxHafErb6kiv1XeYAFe10nUXJ1hqXyhl+eouVlsIiae+Pm45OcwwUZfvsdk+A If7in+BD/DgyLJdzd/y7ShYUlovP76Frs0Q2qQXyPT52SZ1I3s5lWFX63h8eIhb1AcNxBbvX6N+lV YaeGb/m5T5eHPCuNNsFerOSaCDeAt1KfyqgWstOGe+wCg2ZGz6eybI6S63JXJ1BDbfa5hHooNxnLw lHJhqsKlguSzjwJQzA==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9n-00BSPG-0b; Tue, 15 Apr 2025 00:28:07 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 5/8] scsi: qla2xxx: Remove unused qla82xx_wait_for_state_change Date: Tue, 15 Apr 2025 01:28:00 +0100 Message-ID: <20250415002803.135909-6-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qla82xx_wait_for_state_change() was added in 2010 as part of commit 579d12b58abb ("[SCSI] qla2xxx: Added support for quiescence mode for ISP82xx.") but has remained unused. Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_gbl.h | 1 - drivers/scsi/qla2xxx/qla_nx.c | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index ad76cf8e123d..73bccd514791 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -865,7 +865,6 @@ extern int qla82xx_rd_32(struct qla_hw_data *, ulong); /* ISP 8021 IDC */ extern void qla82xx_clear_drv_active(struct qla_hw_data *); -extern uint32_t qla82xx_wait_for_state_change(scsi_qla_host_t *, uint32_t); extern int qla82xx_idc_lock(struct qla_hw_data *); extern void qla82xx_idc_unlock(struct qla_hw_data *); extern int qla82xx_device_state_handler(scsi_qla_host_t *); diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c index 1da954f446f6..78725bda3714 100644 --- a/drivers/scsi/qla2xxx/qla_nx.c +++ b/drivers/scsi/qla2xxx/qla_nx.c @@ -2915,32 +2915,6 @@ qla82xx_need_qsnt_handler(scsi_qla_host_t *vha) } } -/* -* qla82xx_wait_for_state_change -* Wait for device state to change from given current state -* -* Note: -* IDC lock must not be held upon entry -* -* Return: -* Changed device state. -*/ -uint32_t -qla82xx_wait_for_state_change(scsi_qla_host_t *vha, uint32_t curr_state) -{ - struct qla_hw_data *ha = vha->hw; - uint32_t dev_state; - - do { - msleep(1000); - qla82xx_idc_lock(ha); - dev_state = qla82xx_rd_32(ha, QLA82XX_CRB_DEV_STATE); - qla82xx_idc_unlock(ha); - } while (dev_state == curr_state); - - return dev_state; -} - void qla8xxx_dev_failed_handler(scsi_qla_host_t *vha) { From patchwork Tue Apr 15 00:28:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881616 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83A0F158535; Tue, 15 Apr 2025 00:28:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676898; cv=none; b=PnTxwdrsTJPP294uoOLcygjxCd/qVjUfKlN/eYObUX6bGIVkA3h4epAEfSuMEfnzHxLMRlpXZJ/AMAVz7xgO3tdNL4ap9hjAex9eAJgD5KBpHhF7ODDQg3e+eRP80EWmHcUIFu3v9HhgemNnCuYkLwGjyx/XPpPIEL0G/JByytQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676898; c=relaxed/simple; bh=uwwyvOUW/QnJKlbJSloTLLrbNbLZvfCq7w/19JpgapA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SoKS8jBmwlQe9H2NZyapR7yXv17whXkgBpDtP+h2JePXHgahfk0TzthFYRCzB0MRxvhh3dJihAEbO1Ndea1mtd9XFXNVFpWCaOn5yQfakjiVz5VVwDSns63weNRNlwfBbT3uCK8PKbQkhdyYj3ZsPa/Qn+UaWhIy0JdDTG2IURk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=KdkXj/i8; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="KdkXj/i8" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=EeR6PlpJ6PblJomDo7Q/40ybKoYSkZf5bhbmbd/ljwo=; b=KdkXj/i8Y0E69s7a ioXBTWByznvaHYZym2LboYAxN1GgHMvJ741oSS3Hxj6kCtabHm05f4RzglU+rfvcC59VkZCbg+mAw udlebSgNmCTo9XOa7w1v0PdwBfd9XBUjhobM/OKHPxcip/809Hl8OGcg5llH9dXmHKwRJnBu74A3E I8Ea5lqCdqYaSoZEIu5pyYEbJY1c09hfK8oDw+40ORbLENkcCfDXepNmr0z+8LKRqD0lZIynQfKu3 tF72AeHQOxw3pIL/7Xf9t3gpWSO5cRz2YJHXBJgHSwEWJoNLVBF+sU75nLcaHHaAdvUMAaVGgkd5v HnM9Evg5vJ1b3T3d+Q==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9n-00BSPG-21; Tue, 15 Apr 2025 00:28:07 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 6/8] scsi: qla2xxx: Remove unused ql_log_qp Date: Tue, 15 Apr 2025 01:28:01 +0100 Message-ID: <20250415002803.135909-7-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" ql_log_qp() was added in 2017 as part of commit 22d84726e3b8 ("scsi: qla2xxx: Add debug logging routine for qpair") but has remained unused. Remove it. (That patch also added ql_dbg_qp but that is still used so is left in). Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_dbg.c | 53 ---------------------------------- drivers/scsi/qla2xxx/qla_dbg.h | 3 -- 2 files changed, 56 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 691ef827a5ab..5136549005e7 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -2705,59 +2705,6 @@ ql_dump_buffer(uint level, scsi_qla_host_t *vha, uint id, const void *buf, } } -/* - * This function is for formatting and logging log messages. - * It is to be used when vha is available. It formats the message - * and logs it to the messages file. All the messages will be logged - * irrespective of value of ql2xextended_error_logging. - * parameters: - * level: The level of the log messages to be printed in the - * messages file. - * vha: Pointer to the scsi_qla_host_t - * id: This is a unique id for the level. It identifies the - * part of the code from where the message originated. - * msg: The message to be displayed. - */ -void -ql_log_qp(uint32_t level, struct qla_qpair *qpair, int32_t id, - const char *fmt, ...) -{ - va_list va; - struct va_format vaf; - char pbuf[128]; - - if (level > ql_errlev) - return; - - ql_ktrace(0, level, pbuf, NULL, qpair ? qpair->vha : NULL, id, fmt); - - if (!pbuf[0]) /* set by ql_ktrace */ - ql_dbg_prefix(pbuf, ARRAY_SIZE(pbuf), NULL, - qpair ? qpair->vha : NULL, id); - - va_start(va, fmt); - - vaf.fmt = fmt; - vaf.va = &va; - - switch (level) { - case ql_log_fatal: /* FATAL LOG */ - pr_crit("%s%pV", pbuf, &vaf); - break; - case ql_log_warn: - pr_err("%s%pV", pbuf, &vaf); - break; - case ql_log_info: - pr_warn("%s%pV", pbuf, &vaf); - break; - default: - pr_info("%s%pV", pbuf, &vaf); - break; - } - - va_end(va); -} - /* * This function is for formatting and logging debug information. * It is to be used when vha is available. It formats the message diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h index 54f0a412226f..5f4a8c9ae6ba 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.h +++ b/drivers/scsi/qla2xxx/qla_dbg.h @@ -334,9 +334,6 @@ ql_log(uint, scsi_qla_host_t *vha, uint, const char *fmt, ...); void __attribute__((format (printf, 4, 5))) ql_log_pci(uint, struct pci_dev *pdev, uint, const char *fmt, ...); -void __attribute__((format (printf, 4, 5))) -ql_log_qp(uint32_t, struct qla_qpair *, int32_t, const char *fmt, ...); - /* Debug Levels */ /* The 0x40000000 is the max value any debug level can have * as ql2xextended_error_logging is of type signed int From patchwork Tue Apr 15 00:28:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881615 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA94D14A0B7; Tue, 15 Apr 2025 00:28:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676903; cv=none; b=pgxMKY+BbO83j0kiWPsM4zcL5xv7+nXYjV2ahq8e4CnIZS7Wk0j2uctM0IhR2IzBwOeww7VdjtdapyPGtkAEdrOAxsjKQjooHKNEIhVO2OVOObJlS+F7KUZzJJMn42ECdPzjBrZQEULrG7APcJ0EpFF4jM5+RU9GCjM4yvUMKDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676903; c=relaxed/simple; bh=S9WqlAPk15FLu4y+RDpz3a2PdBz0FRyegL/qDVKFPeA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L5QAf5jV6UCQnnrxjMDaI7uPSDxjNRGWJQ0O0l6oUXwxuxdBj5c6lP6Ht/Ut9FhAMbMa/5FliakakXFJh+rgOJw/wXIUb7NmwAx10Esx5YmVGmXR5SmNV6hB82B77+i3HICsngzQ/U2HT+1e2P0tdiSSc+uGvQQqTe+4o/J2QCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=JTayQbEM; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="JTayQbEM" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=SL0phU/G9T3j0VI5/RLTYm6D8TJuMcZGybgtCw8AavE=; b=JTayQbEMskaTOjng MYlOpUDrlwNHWw5aMB9hSUwsrnE/ioanYzB5ckZE1Q0n6HDz1+gg3jBzeqC+6OmkBok0vRWJNwpi2 ZhZcvNeLsguRJ2P6/Wi/KTlBfPNydVRsorPiBC/m5ssQNwWTHEg7RNACIZPfldYsvRa82/Ii4Q0EM KN9dQdCKDmXkU3mPr7rHM3jRq7dDQl2r7NobQ3aVqrkUbhPezZA+wF+2xj5Dl5vlYQcfvzxpVYdwt Qyp9le0v9PJxZu9t6Qpa/OcyIJyExgL8bhiadovxcjNv8r6qBNDOB+3sTyjOknYnJSNN6Fe6opB5r EM57eDxe3KWMnZoUHA==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9o-00BSPG-0K; Tue, 15 Apr 2025 00:28:08 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 7/8] scsi: qla2xxx: Remove unused qla2x00_gpsc Date: Tue, 15 Apr 2025 01:28:02 +0100 Message-ID: <20250415002803.135909-8-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" qla2x00_gpsc() was added in 2017 as part of commit 726b85487067 ("qla2xxx: Add framework for async fabric discovery") but has remained unused. Remove it. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_gbl.h | 1 - drivers/scsi/qla2xxx/qla_gs.c | 90 ---------------------------------- 2 files changed, 91 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 73bccd514791..a8c3a4f7862b 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -720,7 +720,6 @@ extern void *qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t); extern void *qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *, uint32_t, uint32_t); extern int qla2x00_fdmi_register(scsi_qla_host_t *); extern int qla2x00_gfpn_id(scsi_qla_host_t *, sw_info_t *); -extern int qla2x00_gpsc(scsi_qla_host_t *, sw_info_t *); extern size_t qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t); extern int qla2x00_chk_ms_status(scsi_qla_host_t *, ms_iocb_entry_t *, struct ct_sns_rsp *, const char *); diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index d2bddca7045a..51c7cea71f90 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -2625,96 +2625,6 @@ qla2x00_port_speed_capability(uint16_t speed) } } -/** - * qla2x00_gpsc() - FCS Get Port Speed Capabilities (GPSC) query. - * @vha: HA context - * @list: switch info entries to populate - * - * Returns 0 on success. - */ -int -qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list) -{ - int rval; - uint16_t i; - struct qla_hw_data *ha = vha->hw; - ms_iocb_entry_t *ms_pkt; - struct ct_sns_req *ct_req; - struct ct_sns_rsp *ct_rsp; - struct ct_arg arg; - - if (!IS_IIDMA_CAPABLE(ha)) - return QLA_FUNCTION_FAILED; - if (!ha->flags.gpsc_supported) - return QLA_FUNCTION_FAILED; - - rval = qla2x00_mgmt_svr_login(vha); - if (rval) - return rval; - - arg.iocb = ha->ms_iocb; - arg.req_dma = ha->ct_sns_dma; - arg.rsp_dma = ha->ct_sns_dma; - arg.req_size = GPSC_REQ_SIZE; - arg.rsp_size = GPSC_RSP_SIZE; - arg.nport_handle = vha->mgmt_svr_loop_id; - - for (i = 0; i < ha->max_fibre_devices; i++) { - /* Issue GFPN_ID */ - /* Prepare common MS IOCB */ - ms_pkt = qla24xx_prep_ms_iocb(vha, &arg); - - /* Prepare CT request */ - ct_req = qla24xx_prep_ct_fm_req(ha->ct_sns, GPSC_CMD, - GPSC_RSP_SIZE); - ct_rsp = &ha->ct_sns->p.rsp; - - /* Prepare CT arguments -- port_name */ - memcpy(ct_req->req.gpsc.port_name, list[i].fabric_port_name, - WWN_SIZE); - - /* Execute MS IOCB */ - rval = qla2x00_issue_iocb(vha, ha->ms_iocb, ha->ms_iocb_dma, - sizeof(ms_iocb_entry_t)); - if (rval != QLA_SUCCESS) { - /*EMPTY*/ - ql_dbg(ql_dbg_disc, vha, 0x2059, - "GPSC issue IOCB failed (%d).\n", rval); - } else if ((rval = qla2x00_chk_ms_status(vha, ms_pkt, ct_rsp, - "GPSC")) != QLA_SUCCESS) { - /* FM command unsupported? */ - if (rval == QLA_INVALID_COMMAND && - (ct_rsp->header.reason_code == - CT_REASON_INVALID_COMMAND_CODE || - ct_rsp->header.reason_code == - CT_REASON_COMMAND_UNSUPPORTED)) { - ql_dbg(ql_dbg_disc, vha, 0x205a, - "GPSC command unsupported, disabling " - "query.\n"); - ha->flags.gpsc_supported = 0; - rval = QLA_FUNCTION_FAILED; - break; - } - rval = QLA_FUNCTION_FAILED; - } else { - list->fp_speed = qla2x00_port_speed_capability( - be16_to_cpu(ct_rsp->rsp.gpsc.speed)); - ql_dbg(ql_dbg_disc, vha, 0x205b, - "GPSC ext entry - fpn " - "%8phN speeds=%04x speed=%04x.\n", - list[i].fabric_port_name, - be16_to_cpu(ct_rsp->rsp.gpsc.speeds), - be16_to_cpu(ct_rsp->rsp.gpsc.speed)); - } - - /* Last device exit. */ - if (list[i].d_id.b.rsvd_1 != 0) - break; - } - - return (rval); -} - /** * qla2x00_gff_id() - SNS Get FC-4 Features (GFF_ID) query. * From patchwork Tue Apr 15 00:28:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 881803 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE64014A0B7; Tue, 15 Apr 2025 00:28:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.229.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676896; cv=none; b=pWRqWitqDa8Df/tY0fAgg2nvcKt20swpZv5gIXOKi7UvBCahEaJb2ot26ScOINlFncbkxfg3mjuHQYSQppoahUdTWTqP1Vyl7bxN8ov5ppmKZkrwvRklxT2dHlRT0il8pDAgzHaiWCcjf/z+m55qBlV/RA52QoEEA2o0iI54600= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744676896; c=relaxed/simple; bh=qwaxSBetUIhRLPxOt/cgCP1NfTtf16xbc2pJqLhbwag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u28s5GorNALZDvoK4chfFnlcNFyhYkmiYWWRNkKuZs/gBVL0RzXhaoo+oDPSzbJsPKKC1+2WazzwuwdCDXKQPorNymlxlYJ/QfZocZu8l9QLCKMVljbyFNg/048gCh949pHiZT85TEeliM2yQtWlUVOU2LNJBw1xLZhGl5QyXSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org; spf=pass smtp.mailfrom=treblig.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b=ZDGRUQv6; arc=none smtp.client-ip=46.235.229.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=treblig.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=treblig.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=treblig.org header.i=@treblig.org header.b="ZDGRUQv6" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=YNqTtyjORl/J0JOZ+pr1t42gGSPduiUhfhplrenIS+0=; b=ZDGRUQv6R5/cjhaz XA9ji3wVNWtXpnVC1fbePmqpaJr5J87NM4roAKJwzG30NutO9h0RIkJXXBeZs4b4zPuV1tL0imqxb lfFuZXMWBMcl8FB+Ay0BAqW84iWU0mfu5T8k9IYSy5dURynjOBubzLu0AZb0cOQbVjbzfDalS4KNN 9O8NeaprQ9J8g0T6uDNa5MAXyoVKCqpJP7fGdwAh4fhGuTAnsguxV+ACV71O1pcSmpyA/8jH2Fuxg hjK4Qdm4ZovwvsdyeS2xL9s7ZRH4I69ravoi21YtAK4mb6XLGo0emJ5r2KG96kEREZkZz0AtKtwsK M+53LNNHfq9xcbnPVQ==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1u4U9o-00BSPG-1p; Tue, 15 Apr 2025 00:28:08 +0000 From: linux@treblig.org To: njavali@marvell.com, GR-QLogic-Storage-Upstream@marvell.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH 8/8] scsi: qla2xxx: Remove unused module parameters Date: Tue, 15 Apr 2025 01:28:03 +0100 Message-ID: <20250415002803.135909-9-linux@treblig.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415002803.135909-1-linux@treblig.org> References: <20250415002803.135909-1-linux@treblig.org> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Dr. David Alan Gilbert" ql2xetsenable last use was removed in 2020 by commit 37efd51f75f3 ("scsi: qla2xxx: Use FC generic update firmware options routine for ISP27xx") ql2xiidmaenable last use was removed in 2017 by commit 726b85487067 ("qla2xxx: Add framework for async fabric discovery") Remove them. Signed-off-by: Dr. David Alan Gilbert --- drivers/scsi/qla2xxx/qla_gbl.h | 2 -- drivers/scsi/qla2xxx/qla_os.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index a8c3a4f7862b..03e50e8fc08d 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -164,10 +164,8 @@ extern int ql2xsmartsan; extern int ql2xallocfwdump; extern int ql2xextended_error_logging; extern int ql2xextended_error_logging_ktrace; -extern int ql2xiidmaenable; extern int ql2xmqsupport; extern int ql2xfwloadbin; -extern int ql2xetsenable; extern int ql2xshiftctondsd; extern int ql2xdbwr; extern int ql2xasynctmfenable; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index b44d134e7105..288ce04fc2b1 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -176,12 +176,6 @@ MODULE_PARM_DESC(ql2xenablehba_err_chk, " 1 -- Error isolation enabled only for DIX Type 0\n" " 2 -- Error isolation enabled for all Types\n"); -int ql2xiidmaenable = 1; -module_param(ql2xiidmaenable, int, S_IRUGO); -MODULE_PARM_DESC(ql2xiidmaenable, - "Enables iIDMA settings " - "Default is 1 - perform iIDMA. 0 - no iIDMA."); - int ql2xmqsupport = 1; module_param(ql2xmqsupport, int, S_IRUGO); MODULE_PARM_DESC(ql2xmqsupport, @@ -199,12 +193,6 @@ MODULE_PARM_DESC(ql2xfwloadbin, " 1 -- load firmware from flash.\n" " 0 -- use default semantics.\n"); -int ql2xetsenable; -module_param(ql2xetsenable, int, S_IRUGO); -MODULE_PARM_DESC(ql2xetsenable, - "Enables firmware ETS burst." - "Default is 0 - skip ETS enablement."); - int ql2xdbwr = 1; module_param(ql2xdbwr, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(ql2xdbwr,