From 38815448906690b93ab3a288bc237cdaaa45d57f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 29 Sep 2021 03:23:38 +0000 Subject: [PATCH] qla2x00t-32gbit: Change the default mode back to FCP Commit 6432df87e6e8 ("qla2x00t-32gbit: initialize fc4_type_priority") sets the port mode to FCP or NVMe according to the NVRAM configuration. That results in the following logs on my test setup: qla2xxx [0000:00:09.0]-ffff:9: FC4 priority set to NVMe qla2xxx [0000:00:0a.0]-ffff:10: FC4 priority set to NVMe Since only FCP is supported in the SCST project, ignore the NVRAM configuration. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9580 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qla2x00t-32gbit/qla_init.c b/qla2x00t-32gbit/qla_init.c index 5efd5a6c4..3a819cee9 100644 --- a/qla2x00t-32gbit/qla_init.c +++ b/qla2x00t-32gbit/qla_init.c @@ -2399,6 +2399,9 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha) ha->fc4_type_priority != FC4_PRIORITY_NVME) ha->fc4_type_priority = FC4_PRIORITY_FCP; + /* BVA: Ignore the NVRAM configuration and force the default to FCP. */ + ha->fc4_type_priority = FC4_PRIORITY_FCP; + ql_log(ql_log_info, vha, 0xffff, "FC4 priority set to %s\n", ha->fc4_type_priority == FC4_PRIORITY_FCP ? "FCP" : "NVMe");