Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jul 2023 19:35:18 +0000 (12:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jul 2023 19:35:18 +0000 (12:35 -0700)
Pull more SCSI updates from James Bottomley:
 "A few late arriving patches that missed the initial pull request. It's
  mostly bug fixes (the dt-bindings is a fix for the initial pull)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ufs: core: Remove unused function declaration
  scsi: target: docs: Remove tcm_mod_builder.py
  scsi: target: iblock: Quiet bool conversion warning with pr_preempt use
  scsi: dt-bindings: ufs: qcom: Fix ICE phandle
  scsi: core: Simplify scsi_cdl_check_cmd()
  scsi: isci: Fix comment typo
  scsi: smartpqi: Replace one-element arrays with flexible-array members
  scsi: target: tcmu: Replace strlcpy() with strscpy()
  scsi: ncr53c8xx: Replace strlcpy() with strscpy()
  scsi: lpfc: Fix lpfc_name struct packing

12 files changed:
Documentation/devicetree/bindings/ufs/qcom,ufs.yaml
Documentation/target/scripts.rst
Documentation/target/tcm_mod_builder.py [deleted file]
drivers/scsi/isci/scu_task_context.h
drivers/scsi/lpfc/lpfc_hw.h
drivers/scsi/ncr53c8xx.c
drivers/scsi/scsi.c
drivers/scsi/smartpqi/smartpqi.h
drivers/scsi/smartpqi/smartpqi_init.c
drivers/target/target_core_iblock.c
drivers/target/target_core_user.c
drivers/ufs/core/ufshcd-priv.h

index 943dafb..bdfa86a 100644 (file)
@@ -194,9 +194,8 @@ allOf:
     # TODO: define clock bindings for qcom,msm8994-ufshc
 
   - if:
-      properties:
-        qcom,ice:
-          maxItems: 1
+      required:
+        - qcom,ice
     then:
       properties:
         reg:
@@ -207,10 +206,10 @@ allOf:
     else:
       properties:
         reg:
-          minItems: 2
+          minItems: 1
           maxItems: 2
         clocks:
-          minItems: 9
+          minItems: 8
           maxItems: 11
 
 unevaluatedProperties: false
index 172d42b..aa7b9c6 100644 (file)
@@ -1,9 +1,3 @@
-TCM mod builder script
-----------------------
-
-.. literalinclude:: tcm_mod_builder.py
-    :language: perl
-
 Target export device script
 ---------------------------
 
diff --git a/Documentation/target/tcm_mod_builder.py b/Documentation/target/tcm_mod_builder.py
deleted file mode 100755 (executable)
index 54492aa..0000000
+++ /dev/null
@@ -1,656 +0,0 @@
-#!/usr/bin/env python
-# The TCM v4 multi-protocol fabric module generation script for drivers/target/$NEW_MOD
-#
-# Copyright (c) 2010 Rising Tide Systems
-# Copyright (c) 2010 Linux-iSCSI.org
-#
-# Author: nab@kernel.org
-#
-import os, sys
-import subprocess as sub
-import string
-import re
-import optparse
-
-tcm_dir = ""
-
-fabric_ops = []
-fabric_mod_dir = ""
-fabric_mod_port = ""
-fabric_mod_init_port = ""
-
-def tcm_mod_err(msg):
-       print msg
-       sys.exit(1)
-
-def tcm_mod_create_module_subdir(fabric_mod_dir_var):
-
-       if os.path.isdir(fabric_mod_dir_var) == True:
-               return 1
-
-       print "Creating fabric_mod_dir: " + fabric_mod_dir_var
-       ret = os.mkdir(fabric_mod_dir_var)
-       if ret:
-               tcm_mod_err("Unable to mkdir " + fabric_mod_dir_var)
-
-       return
-
-def tcm_mod_build_FC_include(fabric_mod_dir_var, fabric_mod_name):
-       global fabric_mod_port
-       global fabric_mod_init_port
-       buf = ""
-
-       f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-       print "Writing file: " + f
-
-       p = open(f, 'w');
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       buf = "#define " + fabric_mod_name.upper() + "_VERSION  \"v0.1\"\n"
-       buf += "#define " + fabric_mod_name.upper() + "_NAMELEN 32\n"
-       buf += "\n"
-       buf += "struct " + fabric_mod_name + "_tpg {\n"
-       buf += "        /* FC lport target portal group tag for TCM */\n"
-       buf += "        u16 lport_tpgt;\n"
-       buf += "        /* Pointer back to " + fabric_mod_name + "_lport */\n"
-       buf += "        struct " + fabric_mod_name + "_lport *lport;\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_tpg() */\n"
-       buf += "        struct se_portal_group se_tpg;\n"
-       buf += "};\n"
-       buf += "\n"
-       buf += "struct " + fabric_mod_name + "_lport {\n"
-       buf += "        /* Binary World Wide unique Port Name for FC Target Lport */\n"
-       buf += "        u64 lport_wwpn;\n"
-       buf += "        /* ASCII formatted WWPN for FC Target Lport */\n"
-       buf += "        char lport_name[" + fabric_mod_name.upper() + "_NAMELEN];\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_lport() */\n"
-       buf += "        struct se_wwn lport_wwn;\n"
-       buf += "};\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-
-       fabric_mod_port = "lport"
-       fabric_mod_init_port = "nport"
-
-       return
-
-def tcm_mod_build_SAS_include(fabric_mod_dir_var, fabric_mod_name):
-       global fabric_mod_port
-       global fabric_mod_init_port
-       buf = ""
-
-       f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-       print "Writing file: " + f
-
-       p = open(f, 'w');
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       buf = "#define " + fabric_mod_name.upper() + "_VERSION  \"v0.1\"\n"
-       buf += "#define " + fabric_mod_name.upper() + "_NAMELEN 32\n"
-       buf += "\n"
-       buf += "struct " + fabric_mod_name + "_tpg {\n"
-       buf += "        /* SAS port target portal group tag for TCM */\n"
-       buf += "        u16 tport_tpgt;\n"
-       buf += "        /* Pointer back to " + fabric_mod_name + "_tport */\n"
-       buf += "        struct " + fabric_mod_name + "_tport *tport;\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_tpg() */\n"
-       buf += "        struct se_portal_group se_tpg;\n"
-       buf += "};\n\n"
-       buf += "struct " + fabric_mod_name + "_tport {\n"
-       buf += "        /* Binary World Wide unique Port Name for SAS Target port */\n"
-       buf += "        u64 tport_wwpn;\n"
-       buf += "        /* ASCII formatted WWPN for SAS Target port */\n"
-       buf += "        char tport_name[" + fabric_mod_name.upper() + "_NAMELEN];\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_tport() */\n"
-       buf += "        struct se_wwn tport_wwn;\n"
-       buf += "};\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-
-       fabric_mod_port = "tport"
-       fabric_mod_init_port = "iport"
-
-       return
-
-def tcm_mod_build_iSCSI_include(fabric_mod_dir_var, fabric_mod_name):
-       global fabric_mod_port
-       global fabric_mod_init_port
-       buf = ""
-
-       f = fabric_mod_dir_var + "/" + fabric_mod_name + "_base.h"
-       print "Writing file: " + f
-
-       p = open(f, 'w');
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       buf = "#define " + fabric_mod_name.upper() + "_VERSION  \"v0.1\"\n"
-       buf += "#define " + fabric_mod_name.upper() + "_NAMELEN 32\n"
-       buf += "\n"
-       buf += "struct " + fabric_mod_name + "_tpg {\n"
-       buf += "        /* iSCSI target portal group tag for TCM */\n"
-       buf += "        u16 tport_tpgt;\n"
-       buf += "        /* Pointer back to " + fabric_mod_name + "_tport */\n"
-       buf += "        struct " + fabric_mod_name + "_tport *tport;\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_tpg() */\n"
-       buf += "        struct se_portal_group se_tpg;\n"
-       buf += "};\n\n"
-       buf += "struct " + fabric_mod_name + "_tport {\n"
-       buf += "        /* ASCII formatted TargetName for IQN */\n"
-       buf += "        char tport_name[" + fabric_mod_name.upper() + "_NAMELEN];\n"
-       buf += "        /* Returned by " + fabric_mod_name + "_make_tport() */\n"
-       buf += "        struct se_wwn tport_wwn;\n"
-       buf += "};\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-
-       fabric_mod_port = "tport"
-       fabric_mod_init_port = "iport"
-
-       return
-
-def tcm_mod_build_base_includes(proto_ident, fabric_mod_dir_val, fabric_mod_name):
-
-       if proto_ident == "FC":
-               tcm_mod_build_FC_include(fabric_mod_dir_val, fabric_mod_name)
-       elif proto_ident == "SAS":
-               tcm_mod_build_SAS_include(fabric_mod_dir_val, fabric_mod_name)
-       elif proto_ident == "iSCSI":
-               tcm_mod_build_iSCSI_include(fabric_mod_dir_val, fabric_mod_name)
-       else:
-               print "Unsupported proto_ident: " + proto_ident
-               sys.exit(1)
-
-       return
-
-def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name):
-       buf = ""
-
-       f = fabric_mod_dir_var + "/" + fabric_mod_name + "_configfs.c"
-       print "Writing file: " + f
-
-        p = open(f, 'w');
-        if not p:
-                tcm_mod_err("Unable to open file: " + f)
-
-       buf = "#include <linux/module.h>\n"
-       buf += "#include <linux/moduleparam.h>\n"
-       buf += "#include <linux/version.h>\n"
-       buf += "#include <generated/utsrelease.h>\n"
-       buf += "#include <linux/utsname.h>\n"
-       buf += "#include <linux/init.h>\n"
-       buf += "#include <linux/slab.h>\n"
-       buf += "#include <linux/kthread.h>\n"
-       buf += "#include <linux/types.h>\n"
-       buf += "#include <linux/string.h>\n"
-       buf += "#include <linux/configfs.h>\n"
-       buf += "#include <linux/ctype.h>\n"
-       buf += "#include <asm/unaligned.h>\n"
-       buf += "#include <scsi/scsi_proto.h>\n\n"
-       buf += "#include <target/target_core_base.h>\n"
-       buf += "#include <target/target_core_fabric.h>\n"
-       buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
-       buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
-
-       buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops;\n\n"
-
-       buf += "static struct se_portal_group *" + fabric_mod_name + "_make_tpg(\n"
-       buf += "        struct se_wwn *wwn,\n"
-       buf += "        struct config_group *group,\n"
-       buf += "        const char *name)\n"
-       buf += "{\n"
-       buf += "        struct " + fabric_mod_name + "_" + fabric_mod_port + "*" + fabric_mod_port + " = container_of(wwn,\n"
-       buf += "                        struct " + fabric_mod_name + "_" + fabric_mod_port + ", " + fabric_mod_port + "_wwn);\n\n"
-       buf += "        struct " + fabric_mod_name + "_tpg *tpg;\n"
-       buf += "        unsigned long tpgt;\n"
-       buf += "        int ret;\n\n"
-       buf += "        if (strstr(name, \"tpgt_\") != name)\n"
-       buf += "                return ERR_PTR(-EINVAL);\n"
-       buf += "        if (kstrtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n"
-       buf += "                return ERR_PTR(-EINVAL);\n\n"
-       buf += "        tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"
-       buf += "        if (!tpg) {\n"
-       buf += "                printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_tpg\");\n"
-       buf += "                return ERR_PTR(-ENOMEM);\n"
-       buf += "        }\n"
-       buf += "        tpg->" + fabric_mod_port + " = " + fabric_mod_port + ";\n"
-       buf += "        tpg->" + fabric_mod_port + "_tpgt = tpgt;\n\n"
-
-       if proto_ident == "FC":
-               buf += "        ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_FCP);\n"
-       elif proto_ident == "SAS":
-               buf += "        ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_SAS);\n"
-       elif proto_ident == "iSCSI":
-               buf += "        ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_ISCSI);\n"
-
-       buf += "        if (ret < 0) {\n"
-       buf += "                kfree(tpg);\n"
-       buf += "                return NULL;\n"
-       buf += "        }\n"
-       buf += "        return &tpg->se_tpg;\n"
-       buf += "}\n\n"
-       buf += "static void " + fabric_mod_name + "_drop_tpg(struct se_portal_group *se_tpg)\n"
-       buf += "{\n"
-       buf += "        struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"
-       buf += "                                struct " + fabric_mod_name + "_tpg, se_tpg);\n\n"
-       buf += "        core_tpg_deregister(se_tpg);\n"
-       buf += "        kfree(tpg);\n"
-       buf += "}\n\n"
-
-       buf += "static struct se_wwn *" + fabric_mod_name + "_make_" + fabric_mod_port + "(\n"
-       buf += "        struct target_fabric_configfs *tf,\n"
-       buf += "        struct config_group *group,\n"
-       buf += "        const char *name)\n"
-       buf += "{\n"
-       buf += "        struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + ";\n"
-
-       if proto_ident == "FC" or proto_ident == "SAS":
-               buf += "        u64 wwpn = 0;\n\n"
-
-       buf += "        /* if (" + fabric_mod_name + "_parse_wwn(name, &wwpn, 1) < 0)\n"
-       buf += "                return ERR_PTR(-EINVAL); */\n\n"
-       buf += "        " + fabric_mod_port + " = kzalloc(sizeof(struct " + fabric_mod_name + "_" + fabric_mod_port + "), GFP_KERNEL);\n"
-       buf += "        if (!" + fabric_mod_port + ") {\n"
-       buf += "                printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_" + fabric_mod_port + "\");\n"
-       buf += "                return ERR_PTR(-ENOMEM);\n"
-       buf += "        }\n"
-
-       if proto_ident == "FC" or proto_ident == "SAS":
-               buf += "        " + fabric_mod_port + "->" + fabric_mod_port + "_wwpn = wwpn;\n"
-
-       buf += "        /* " + fabric_mod_name + "_format_wwn(&" + fabric_mod_port + "->" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "_NAMELEN, wwpn); */\n\n"
-       buf += "        return &" + fabric_mod_port + "->" + fabric_mod_port + "_wwn;\n"
-       buf += "}\n\n"
-       buf += "static void " + fabric_mod_name + "_drop_" + fabric_mod_port + "(struct se_wwn *wwn)\n"
-       buf += "{\n"
-       buf += "        struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = container_of(wwn,\n"
-       buf += "                                struct " + fabric_mod_name + "_" + fabric_mod_port + ", " + fabric_mod_port + "_wwn);\n"
-       buf += "        kfree(" + fabric_mod_port + ");\n"
-       buf += "}\n\n"
-
-       buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n"
-       buf += "        .module                         = THIS_MODULE,\n"
-       buf += "        .name                           = \"" + fabric_mod_name + "\",\n"
-       buf += "        .get_fabric_name                = " + fabric_mod_name + "_get_fabric_name,\n"
-       buf += "        .tpg_get_wwn                    = " + fabric_mod_name + "_get_fabric_wwn,\n"
-       buf += "        .tpg_get_tag                    = " + fabric_mod_name + "_get_tag,\n"
-       buf += "        .tpg_check_demo_mode            = " + fabric_mod_name + "_check_false,\n"
-       buf += "        .tpg_check_demo_mode_cache      = " + fabric_mod_name + "_check_true,\n"
-       buf += "        .tpg_check_demo_mode_write_protect = " + fabric_mod_name + "_check_true,\n"
-       buf += "        .tpg_check_prod_mode_write_protect = " + fabric_mod_name + "_check_false,\n"
-       buf += "        .tpg_get_inst_index             = " + fabric_mod_name + "_tpg_get_inst_index,\n"
-       buf += "        .release_cmd                    = " + fabric_mod_name + "_release_cmd,\n"
-       buf += "        .sess_get_index                 = " + fabric_mod_name + "_sess_get_index,\n"
-       buf += "        .sess_get_initiator_sid         = NULL,\n"
-       buf += "        .write_pending                  = " + fabric_mod_name + "_write_pending,\n"
-       buf += "        .set_default_node_attributes    = " + fabric_mod_name + "_set_default_node_attrs,\n"
-       buf += "        .get_cmd_state                  = " + fabric_mod_name + "_get_cmd_state,\n"
-       buf += "        .queue_data_in                  = " + fabric_mod_name + "_queue_data_in,\n"
-       buf += "        .queue_status                   = " + fabric_mod_name + "_queue_status,\n"
-       buf += "        .queue_tm_rsp                   = " + fabric_mod_name + "_queue_tm_rsp,\n"
-       buf += "        .aborted_task                   = " + fabric_mod_name + "_aborted_task,\n"
-       buf += "        /*\n"
-       buf += "         * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
-       buf += "         */\n"
-       buf += "        .fabric_make_wwn                = " + fabric_mod_name + "_make_" + fabric_mod_port + ",\n"
-       buf += "        .fabric_drop_wwn                = " + fabric_mod_name + "_drop_" + fabric_mod_port + ",\n"
-       buf += "        .fabric_make_tpg                = " + fabric_mod_name + "_make_tpg,\n"
-       buf += "        .fabric_drop_tpg                = " + fabric_mod_name + "_drop_tpg,\n"
-       buf += "};\n\n"
-
-       buf += "static int __init " + fabric_mod_name + "_init(void)\n"
-       buf += "{\n"
-       buf += "        return target_register_template(&" + fabric_mod_name + "_ops);\n"
-       buf += "};\n\n"
-
-       buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"
-       buf += "{\n"
-       buf += "        target_unregister_template(&" + fabric_mod_name + "_ops);\n"
-       buf += "};\n\n"
-
-       buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"
-       buf += "MODULE_LICENSE(\"GPL\");\n"
-       buf += "module_init(" + fabric_mod_name + "_init);\n"
-       buf += "module_exit(" + fabric_mod_name + "_exit);\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-
-       return
-
-def tcm_mod_scan_fabric_ops(tcm_dir):
-
-       fabric_ops_api = tcm_dir + "include/target/target_core_fabric.h"
-
-       print "Using tcm_mod_scan_fabric_ops: " + fabric_ops_api
-       process_fo = 0;
-
-       p = open(fabric_ops_api, 'r')
-
-       line = p.readline()
-       while line:
-               if process_fo == 0 and re.search('struct target_core_fabric_ops {', line):
-                       line = p.readline()
-                       continue
-
-               if process_fo == 0:
-                       process_fo = 1;
-                       line = p.readline()
-                       # Search for function pointer
-                       if not re.search('\(\*', line):
-                               continue
-
-                       fabric_ops.append(line.rstrip())
-                       continue
-
-               line = p.readline()
-               # Search for function pointer
-               if not re.search('\(\*', line):
-                       continue
-
-               fabric_ops.append(line.rstrip())
-
-       p.close()
-       return
-
-def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name):
-       buf = ""
-       bufi = ""
-
-       f = fabric_mod_dir_var + "/" + fabric_mod_name + "_fabric.c"
-       print "Writing file: " + f
-
-       p = open(f, 'w')
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       fi = fabric_mod_dir_var + "/" + fabric_mod_name + "_fabric.h"
-       print "Writing file: " + fi
-
-       pi = open(fi, 'w')
-       if not pi:
-               tcm_mod_err("Unable to open file: " + fi)
-
-       buf = "#include <linux/slab.h>\n"
-       buf += "#include <linux/kthread.h>\n"
-       buf += "#include <linux/types.h>\n"
-       buf += "#include <linux/list.h>\n"
-       buf += "#include <linux/types.h>\n"
-       buf += "#include <linux/string.h>\n"
-       buf += "#include <linux/ctype.h>\n"
-       buf += "#include <asm/unaligned.h>\n"
-       buf += "#include <scsi/scsi_common.h>\n"
-       buf += "#include <scsi/scsi_proto.h>\n"
-       buf += "#include <target/target_core_base.h>\n"
-       buf += "#include <target/target_core_fabric.h>\n"
-       buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
-       buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
-
-       buf += "int " + fabric_mod_name + "_check_true(struct se_portal_group *se_tpg)\n"
-       buf += "{\n"
-       buf += "        return 1;\n"
-       buf += "}\n\n"
-       bufi += "int " + fabric_mod_name + "_check_true(struct se_portal_group *);\n"
-
-       buf += "int " + fabric_mod_name + "_check_false(struct se_portal_group *se_tpg)\n"
-       buf += "{\n"
-       buf += "        return 0;\n"
-       buf += "}\n\n"
-       bufi += "int " + fabric_mod_name + "_check_false(struct se_portal_group *);\n"
-
-       total_fabric_ops = len(fabric_ops)
-       i = 0
-
-       while i < total_fabric_ops:
-               fo = fabric_ops[i]
-               i += 1
-#              print "fabric_ops: " + fo
-
-               if re.search('get_fabric_name', fo):
-                       buf += "char *" + fabric_mod_name + "_get_fabric_name(void)\n"
-                       buf += "{\n"
-                       buf += "        return \"" + fabric_mod_name + "\";\n"
-                       buf += "}\n\n"
-                       bufi += "char *" + fabric_mod_name + "_get_fabric_name(void);\n"
-                       continue
-
-               if re.search('get_wwn', fo):
-                       buf += "char *" + fabric_mod_name + "_get_fabric_wwn(struct se_portal_group *se_tpg)\n"
-                       buf += "{\n"
-                       buf += "        struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"
-                       buf += "                                struct " + fabric_mod_name + "_tpg, se_tpg);\n"
-                       buf += "        struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = tpg->" + fabric_mod_port + ";\n\n"
-                       buf += "        return &" + fabric_mod_port + "->" + fabric_mod_port + "_name[0];\n"
-                       buf += "}\n\n"
-                       bufi += "char *" + fabric_mod_name + "_get_fabric_wwn(struct se_portal_group *);\n"
-
-               if re.search('get_tag', fo):
-                       buf += "u16 " + fabric_mod_name + "_get_tag(struct se_portal_group *se_tpg)\n"
-                       buf += "{\n"
-                       buf += "        struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"
-                       buf += "                                struct " + fabric_mod_name + "_tpg, se_tpg);\n"
-                       buf += "        return tpg->" + fabric_mod_port + "_tpgt;\n"
-                       buf += "}\n\n"
-                       bufi += "u16 " + fabric_mod_name + "_get_tag(struct se_portal_group *);\n"
-
-               if re.search('tpg_get_inst_index\)\(', fo):
-                       buf += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *se_tpg)\n"
-                       buf += "{\n"
-                       buf += "        return 1;\n"
-                       buf += "}\n\n"
-                       bufi += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *);\n"
-
-               if re.search('\*release_cmd\)\(', fo):
-                       buf += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return;\n"
-                       buf += "}\n\n"
-                       bufi += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *);\n"
-
-               if re.search('sess_get_index\)\(', fo):
-                       buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\n"
-                       buf += "{\n"
-                       buf += "        return 0;\n"
-                       buf += "}\n\n"
-                       bufi += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *);\n"
-
-               if re.search('write_pending\)\(', fo):
-                       buf += "int " + fabric_mod_name + "_write_pending(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return 0;\n"
-                       buf += "}\n\n"
-                       bufi += "int " + fabric_mod_name + "_write_pending(struct se_cmd *);\n"
-
-               if re.search('set_default_node_attributes\)\(', fo):
-                       buf += "void " + fabric_mod_name + "_set_default_node_attrs(struct se_node_acl *nacl)\n"
-                       buf += "{\n"
-                       buf += "        return;\n"
-                       buf += "}\n\n"
-                       bufi += "void " + fabric_mod_name + "_set_default_node_attrs(struct se_node_acl *);\n"
-
-               if re.search('get_cmd_state\)\(', fo):
-                       buf += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return 0;\n"
-                       buf += "}\n\n"
-                       bufi += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *);\n"
-
-               if re.search('queue_data_in\)\(', fo):
-                       buf += "int " + fabric_mod_name + "_queue_data_in(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return 0;\n"
-                       buf += "}\n\n"
-                       bufi += "int " + fabric_mod_name + "_queue_data_in(struct se_cmd *);\n"
-
-               if re.search('queue_status\)\(', fo):
-                       buf += "int " + fabric_mod_name + "_queue_status(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return 0;\n"
-                       buf += "}\n\n"
-                       bufi += "int " + fabric_mod_name + "_queue_status(struct se_cmd *);\n"
-
-               if re.search('queue_tm_rsp\)\(', fo):
-                       buf += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return;\n"
-                       buf += "}\n\n"
-                       bufi += "void " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"
-
-               if re.search('aborted_task\)\(', fo):
-                       buf += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *se_cmd)\n"
-                       buf += "{\n"
-                       buf += "        return;\n"
-                       buf += "}\n\n"
-                       bufi += "void " + fabric_mod_name + "_aborted_task(struct se_cmd *);\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-
-       ret = pi.write(bufi)
-       if ret:
-               tcm_mod_err("Unable to write fi: " + fi)
-
-       pi.close()
-       return
-
-def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):
-
-       buf = ""
-       f = fabric_mod_dir_var + "/Makefile"
-       print "Writing file: " + f
-
-       p = open(f, 'w')
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       buf += fabric_mod_name + "-objs                 := " + fabric_mod_name + "_fabric.o \\\n"
-       buf += "                                           " + fabric_mod_name + "_configfs.o\n"
-       buf += "obj-$(CONFIG_" + fabric_mod_name.upper() + ")           += " + fabric_mod_name + ".o\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-       return
-
-def tcm_mod_build_kconfig(fabric_mod_dir_var, fabric_mod_name):
-
-       buf = ""
-       f = fabric_mod_dir_var + "/Kconfig"
-       print "Writing file: " + f
-
-       p = open(f, 'w')
-       if not p:
-               tcm_mod_err("Unable to open file: " + f)
-
-       buf = "config " + fabric_mod_name.upper() + "\n"
-       buf += "        tristate \"" + fabric_mod_name.upper() + " fabric module\"\n"
-       buf += "        depends on TARGET_CORE && CONFIGFS_FS\n"
-       buf += "        default n\n"
-       buf += "        help\n"
-       buf += "          Say Y here to enable the " + fabric_mod_name.upper() + " fabric module\n"
-
-       ret = p.write(buf)
-       if ret:
-               tcm_mod_err("Unable to write f: " + f)
-
-       p.close()
-       return
-
-def tcm_mod_add_kbuild(tcm_dir, fabric_mod_name):
-       buf = "obj-$(CONFIG_" + fabric_mod_name.upper() + ")    += " + fabric_mod_name.lower() + "/\n"
-       kbuild = tcm_dir + "/drivers/target/Makefile"
-
-       f = open(kbuild, 'a')
-       f.write(buf)
-       f.close()
-       return
-
-def tcm_mod_add_kconfig(tcm_dir, fabric_mod_name):
-       buf = "source \"drivers/target/" + fabric_mod_name.lower() + "/Kconfig\"\n"
-       kconfig = tcm_dir + "/drivers/target/Kconfig"
-
-       f = open(kconfig, 'a')
-       f.write(buf)
-       f.close()
-       return
-
-def main(modname, proto_ident):
-#      proto_ident = "FC"
-#      proto_ident = "SAS"
-#      proto_ident = "iSCSI"
-
-       tcm_dir = os.getcwd();
-       tcm_dir += "/../../"
-       print "tcm_dir: " + tcm_dir
-       fabric_mod_name = modname
-       fabric_mod_dir = tcm_dir + "drivers/target/" + fabric_mod_name
-       print "Set fabric_mod_name: " + fabric_mod_name
-       print "Set fabric_mod_dir: " + fabric_mod_dir
-       print "Using proto_ident: " + proto_ident
-
-       if proto_ident != "FC" and proto_ident != "SAS" and proto_ident != "iSCSI":
-               print "Unsupported proto_ident: " + proto_ident
-               sys.exit(1)
-
-       ret = tcm_mod_create_module_subdir(fabric_mod_dir)
-       if ret:
-               print "tcm_mod_create_module_subdir() failed because module already exists!"
-               sys.exit(1)
-
-       tcm_mod_build_base_includes(proto_ident, fabric_mod_dir, fabric_mod_name)
-       tcm_mod_scan_fabric_ops(tcm_dir)
-       tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir, fabric_mod_name)
-       tcm_mod_build_configfs(proto_ident, fabric_mod_dir, fabric_mod_name)
-       tcm_mod_build_kbuild(fabric_mod_dir, fabric_mod_name)
-       tcm_mod_build_kconfig(fabric_mod_dir, fabric_mod_name)
-
-       input = raw_input("Would you like to add " + fabric_mod_name + " to drivers/target/Makefile..? [yes,no]: ")
-       if input == "yes" or input == "y":
-               tcm_mod_add_kbuild(tcm_dir, fabric_mod_name)
-
-       input = raw_input("Would you like to add " + fabric_mod_name + " to drivers/target/Kconfig..? [yes,no]: ")
-       if input == "yes" or input == "y":
-               tcm_mod_add_kconfig(tcm_dir, fabric_mod_name)
-
-       return
-
-parser = optparse.OptionParser()
-parser.add_option('-m', '--modulename', help='Module name', dest='modname',
-               action='store', nargs=1, type='string')
-parser.add_option('-p', '--protoident', help='Protocol Ident', dest='protoident',
-               action='store', nargs=1, type='string')
-
-(opts, args) = parser.parse_args()
-
-mandatories = ['modname', 'protoident']
-for m in mandatories:
-       if not opts.__dict__[m]:
-               print "mandatory option is missing\n"
-               parser.print_help()
-               exit(-1)
-
-if __name__ == "__main__":
-
-       main(str(opts.modname), opts.protoident)
index 869a979..582d22d 100644 (file)
@@ -845,7 +845,7 @@ struct scu_task_context {
 
        /**
         * This field is used by the SCU TL to determine when to take a snapshot when
-        * tranmitting read data frames.
+        * transmitting read data frames.
         *    - 0x00 The entire IO
         *    - 0x01 32k
         *    - 0x02 64k
index 6637558..aaea3e3 100644 (file)
@@ -365,7 +365,7 @@ struct lpfc_name {
                        uint8_t IEEE[6];        /* FC IEEE address */
                } s;
                uint8_t wwn[8];
-               uint64_t name;
+               uint64_t name __packed __aligned(4);
        } u;
 };
 
@@ -850,7 +850,7 @@ typedef struct _ADISC {             /* Structure is in Big Endian format */
        struct lpfc_name portName;
        struct lpfc_name nodeName;
        uint32_t DID;
-} __packed ADISC;
+} ADISC;
 
 typedef struct _FARP {         /* Structure is in Big Endian format */
        uint32_t Mflags:8;
@@ -880,7 +880,7 @@ typedef struct _FAN {               /* Structure is in Big Endian format */
        uint32_t Fdid;
        struct lpfc_name FportName;
        struct lpfc_name FnodeName;
-} __packed FAN;
+} FAN;
 
 typedef struct _SCR {          /* Structure is in Big Endian format */
        uint8_t resvd1;
@@ -924,7 +924,7 @@ typedef struct _RNID {              /* Structure is in Big Endian format */
        union {
                RNID_TOP_DISC topologyDisc;     /* topology disc (0xdf) */
        } un;
-} __packed RNID;
+} RNID;
 
 struct RLS {                   /* Structure is in Big Endian format */
        uint32_t rls;
@@ -1514,7 +1514,7 @@ struct lpfc_fdmi_hba_ident {
 struct lpfc_fdmi_reg_port_list {
        __be32 EntryCnt;
        struct lpfc_fdmi_port_entry pe;
-} __packed;
+};
 
 /*
  * Register HBA(RHBA)
index 4458449..35869b4 100644 (file)
@@ -4555,7 +4555,7 @@ static void ncr_detach(struct ncb *np)
        char inst_name[16];
 
        /* Local copy so we don't access np after freeing it! */
-       strlcpy(inst_name, ncr_name(np), sizeof(inst_name));
+       strscpy(inst_name, ncr_name(np), sizeof(inst_name));
 
        printk("%s: releasing host resources\n", ncr_name(np));
 
index c4bf99a..d0911bc 100644 (file)
@@ -586,31 +586,22 @@ static bool scsi_cdl_check_cmd(struct scsi_device *sdev, u8 opcode, u16 sa,
        if ((buf[1] & 0x03) != 0x03)
                return false;
 
-       /* See SPC-6, one command format of REPORT SUPPORTED OPERATION CODES */
+       /*
+        * See SPC-6, One_command parameter data format for
+        * REPORT SUPPORTED OPERATION CODES. We have the following cases
+        * depending on rwcdlp (buf[0] & 0x01) value:
+        *  - rwcdlp == 0: then cdlp indicates support for the A mode page when
+        *                 it is equal to 1 and for the B mode page when it is
+        *                 equal to 2.
+        *  - rwcdlp == 1: then cdlp indicates support for the T2A mode page
+        *                 when it is equal to 1 and for the T2B mode page when
+        *                 it is equal to 2.
+        * Overall, to detect support for command duration limits, we only need
+        * to check that cdlp is 1 or 2.
+        */
        cdlp = (buf[1] & 0x18) >> 3;
-       if (buf[0] & 0x01) {
-               /* rwcdlp == 1 */
-               switch (cdlp) {
-               case 0x01:
-                       /* T2A page */
-                       return true;
-               case 0x02:
-                       /* T2B page */
-                       return true;
-               }
-       } else {
-               /* rwcdlp == 0 */
-               switch (cdlp) {
-               case 0x01:
-                       /* A page */
-                       return true;
-               case 0x02:
-                       /* B page */
-                       return true;
-               }
-       }
 
-       return false;
+       return cdlp == 0x01 || cdlp == 0x02;
 }
 
 /**
index f960b50..e392eaf 100644 (file)
@@ -982,12 +982,12 @@ struct report_phys_lun_16byte_wwid {
 
 struct report_phys_lun_8byte_wwid_list {
        struct report_lun_header header;
-       struct report_phys_lun_8byte_wwid lun_entries[1];
+       struct report_phys_lun_8byte_wwid lun_entries[];
 };
 
 struct report_phys_lun_16byte_wwid_list {
        struct report_lun_header header;
-       struct report_phys_lun_16byte_wwid lun_entries[1];
+       struct report_phys_lun_16byte_wwid lun_entries[];
 };
 
 struct raid_map_disk_data {
index 19af36e..6aaaa7e 100644 (file)
@@ -1203,7 +1203,6 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b
        unsigned int i;
        u8 rpl_response_format;
        u32 num_physicals;
-       size_t rpl_16byte_wwid_list_length;
        void *rpl_list;
        struct report_lun_header *rpl_header;
        struct report_phys_lun_8byte_wwid_list *rpl_8byte_wwid_list;
@@ -1232,9 +1231,9 @@ static inline int pqi_report_phys_luns(struct pqi_ctrl_info *ctrl_info, void **b
 
        rpl_8byte_wwid_list = rpl_list;
        num_physicals = get_unaligned_be32(&rpl_8byte_wwid_list->header.list_length) / sizeof(rpl_8byte_wwid_list->lun_entries[0]);
-       rpl_16byte_wwid_list_length = sizeof(struct report_lun_header) + (num_physicals * sizeof(struct report_phys_lun_16byte_wwid));
 
-       rpl_16byte_wwid_list = kmalloc(rpl_16byte_wwid_list_length, GFP_KERNEL);
+       rpl_16byte_wwid_list = kmalloc(struct_size(rpl_16byte_wwid_list, lun_entries,
+                                                  num_physicals), GFP_KERNEL);
        if (!rpl_16byte_wwid_list)
                return -ENOMEM;
 
index a3c5f35..3d1b511 100644 (file)
@@ -888,7 +888,7 @@ static sense_reason_t iblock_execute_pr_out(struct se_cmd *cmd, u8 sa, u64 key,
 
                ret = ops->pr_preempt(bdev, key, sa_key,
                                      scsi_pr_type_to_block(type),
-                                     sa == PRO_PREEMPT ? false : true);
+                                     sa == PRO_PREEMPT_AND_ABORT);
                break;
        case PRO_RELEASE:
                if (!ops->pr_clear) {
index 15ffc8d..22cc6ca 100644 (file)
@@ -2820,14 +2820,14 @@ static ssize_t tcmu_dev_config_store(struct config_item *item, const char *page,
                        pr_err("Unable to reconfigure device\n");
                        return ret;
                }
-               strlcpy(udev->dev_config, page, TCMU_CONFIG_LEN);
+               strscpy(udev->dev_config, page, TCMU_CONFIG_LEN);
 
                ret = tcmu_update_uio_info(udev);
                if (ret)
                        return ret;
                return count;
        }
-       strlcpy(udev->dev_config, page, TCMU_CONFIG_LEN);
+       strscpy(udev->dev_config, page, TCMU_CONFIG_LEN);
 
        return count;
 }
index 9566a95..0f3bd94 100644 (file)
@@ -68,7 +68,6 @@ int ufshcd_mcq_decide_queue_depth(struct ufs_hba *hba);
 int ufshcd_mcq_memory_alloc(struct ufs_hba *hba);
 void ufshcd_mcq_make_queues_operational(struct ufs_hba *hba);
 void ufshcd_mcq_config_mac(struct ufs_hba *hba, u32 max_active_cmds);
-void ufshcd_mcq_select_mcq_mode(struct ufs_hba *hba);
 u32 ufshcd_mcq_read_cqis(struct ufs_hba *hba, int i);
 void ufshcd_mcq_write_cqis(struct ufs_hba *hba, u32 val, int i);
 struct ufs_hw_queue *ufshcd_mcq_req_to_hwq(struct ufs_hba *hba,