Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (77 commits)
  [SCSI] fix crash in scsi_dispatch_cmd()
  [SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
  [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
  [SCSI] bfa: Update the driver version to 3.0.2.1
  [SCSI] bfa: Driver and BSG enhancements.
  [SCSI] bfa: Added support to query PHY.
  [SCSI] bfa: Added HBA diagnostics support.
  [SCSI] bfa: Added support for flash configuration
  [SCSI] bfa: Added support to obtain SFP info.
  [SCSI] bfa: Added support for CEE info and stats query.
  [SCSI] bfa: Extend BSG interface.
  [SCSI] bfa: FCS bug fixes.
  [SCSI] bfa: DMA memory allocation enhancement.
  [SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
  [SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
  [SCSI] bfa: Added Fabric Assigned Address(FAA) support
  [SCSI] bfa: IOC bug fixes.
  [SCSI] bfa: Enable ASIC block configuration and query.
  [SCSI] bnx2i: Updated copyright and bump version
  [SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
  ...

Fix up some trivial conflicts in:
 - drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
	Crazy broadcom version number conflicts
 - drivers/target/tcm_fc/tfc_cmd.c
	Just trivial cleanups done on adjacent lines

1 files changed, 135 insertions, 18 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 6973413e91ec..1a947f1b9729 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -1,6 +1,6 @@
 /* bnx2i.c: Broadcom NetXtreme II iSCSI driver.
  *
- * Copyright (c) 2006 - 2010 Broadcom Corporation
+ * Copyright (c) 2006 - 2011 Broadcom Corporation
  * Copyright (c) 2007, 2008 Red Hat, Inc.  All rights reserved.
  * Copyright (c) 2007, 2008 Mike Christie
  *
@@ -18,8 +18,8 @@ static struct list_head adapter_list = LIST_HEAD_INIT(adapter_list);
 static u32 adapter_count;
 
 #define DRV_MODULE_NAME         "bnx2i"
-#define DRV_MODULE_VERSION      "2.6.2.3"
-#define DRV_MODULE_RELDATE      "Dec 31, 2010"
+#define DRV_MODULE_VERSION      "2.7.0.3"
+#define DRV_MODULE_RELDATE      "Jun 15, 2011"
 
 static char version[] __devinitdata =
                 "Broadcom NetXtreme II iSCSI Driver " DRV_MODULE_NAME \
@@ -40,7 +40,7 @@ unsigned int event_coal_min = 24;
 module_param(event_coal_min, int, 0664);
 MODULE_PARM_DESC(event_coal_min, "Event Coalescing Minimum Commands");
 
-unsigned int event_coal_div = 1;
+unsigned int event_coal_div = 2;
 module_param(event_coal_div, int, 0664);
 MODULE_PARM_DESC(event_coal_div, "Event Coalescing Divide Factor");
 
@@ -66,6 +66,15 @@ MODULE_PARM_DESC(rq_size, "Configure RQ size");
 
 u64 iscsi_error_mask = 0x00;
 
+DEFINE_PER_CPU(struct bnx2i_percpu_s, bnx2i_percpu);
+
+static int bnx2i_cpu_callback(struct notifier_block *nfb,
+                              unsigned long action, void *hcpu);
+/* notification function for CPU hotplug events */
+static struct notifier_block bnx2i_cpu_notifier = {
+        .notifier_call = bnx2i_cpu_callback,
+};
+
 
 /**
  * bnx2i_identify_device - identifies NetXtreme II device type
@@ -172,21 +181,14 @@ void bnx2i_start(void *handle)
         struct bnx2i_hba *hba = handle;
         int i = HZ;
 
-        if (!hba->cnic->max_iscsi_conn) {
-                printk(KERN_ALERT "bnx2i: dev %s does not support "
-                        "iSCSI\n", hba->netdev->name);
+        /*
+         * We should never register devices that don't support iSCSI
+         * (see bnx2i_init_one), so something is wrong if we try to
+         * start a iSCSI adapter on hardware with 0 supported iSCSI
+         * connections
+         */
+        BUG_ON(!hba->cnic->max_iscsi_conn);
 
-                if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) {
-                        mutex_lock(&bnx2i_dev_lock);
-                        list_del_init(&hba->link);
-                        adapter_count--;
-                        hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI);
-                        clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic);
-                        mutex_unlock(&bnx2i_dev_lock);
-                        bnx2i_free_hba(hba);
-                }
-                return;
-        }
         bnx2i_send_fw_iscsi_init_msg(hba);
         while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) && i--)
                 msleep(BNX2I_INIT_POLL_TIME);
@@ -290,6 +292,13 @@ static int bnx2i_init_one(struct bnx2i_hba *hba, struct cnic_dev *cnic)
         int rc;
 
         mutex_lock(&bnx2i_dev_lock);
+        if (!cnic->max_iscsi_conn) {
+                printk(KERN_ALERT "bnx2i: dev %s does not support "
+                        "iSCSI\n", hba->netdev->name);
+                rc = -EOPNOTSUPP;
+                goto out;
+        }
+
         hba->cnic = cnic;
         rc = cnic->register_device(cnic, CNIC_ULP_ISCSI, hba);
         if (!rc) {
@@ -307,6 +316,7 @@ static int bnx2i_init_one(struct bnx2i_hba *hba, struct cnic_dev *cnic)
         else
                 printk(KERN_ERR "bnx2i dev reg, unknown error, %d\n", rc);
 
+out:
         mutex_unlock(&bnx2i_dev_lock);
 
         return rc;
@@ -371,6 +381,91 @@ void bnx2i_ulp_exit(struct cnic_dev *dev)
 
 
 /**
+ * bnx2i_percpu_thread_create - Create a receive thread for an
+ *                              online CPU
+ *
+ * @cpu:        cpu index for the online cpu
+ */
+static void bnx2i_percpu_thread_create(unsigned int cpu)
+{
+        struct bnx2i_percpu_s *p;
+        struct task_struct *thread;
+
+        p = &per_cpu(bnx2i_percpu, cpu);
+
+        thread = kthread_create(bnx2i_percpu_io_thread, (void *)p,
+                                "bnx2i_thread/%d", cpu);
+        /* bind thread to the cpu */
+        if (likely(!IS_ERR(thread))) {
+                kthread_bind(thread, cpu);
+                p->iothread = thread;
+                wake_up_process(thread);
+        }
+}
+
+
+static void bnx2i_percpu_thread_destroy(unsigned int cpu)
+{
+        struct bnx2i_percpu_s *p;
+        struct task_struct *thread;
+        struct bnx2i_work *work, *tmp;
+
+        /* Prevent any new work from being queued for this CPU */
+        p = &per_cpu(bnx2i_percpu, cpu);
+        spin_lock_bh(&p->p_work_lock);
+        thread = p->iothread;
+        p->iothread = NULL;
+
+        /* Free all work in the list */
+        list_for_each_entry_safe(work, tmp, &p->work_list, list) {
+                list_del_init(&work->list);
+                bnx2i_process_scsi_cmd_resp(work->session,
+                                            work->bnx2i_conn, &work->cqe);
+                kfree(work);
+        }
+
+        spin_unlock_bh(&p->p_work_lock);
+        if (thread)
+                kthread_stop(thread);
+}
+
+
+/**
+ * bnx2i_cpu_callback - Handler for CPU hotplug events
+ *
+ * @nfb:        The callback data block
+ * @action:     The event triggering the callback
+ * @hcpu:       The index of the CPU that the event is for
+ *
+ * This creates or destroys per-CPU data for iSCSI
+ *
+ * Returns NOTIFY_OK always.
+ */
+static int bnx2i_cpu_callback(struct notifier_block *nfb,
+                              unsigned long action, void *hcpu)
+{
+        unsigned cpu = (unsigned long)hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
+                printk(KERN_INFO "bnx2i: CPU %x online: Create Rx thread\n",
+                        cpu);
+                bnx2i_percpu_thread_create(cpu);
+                break;
+        case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
+                printk(KERN_INFO "CPU %x offline: Remove Rx thread\n", cpu);
+                bnx2i_percpu_thread_destroy(cpu);
+                break;
+        default:
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+
+/**
  * bnx2i_mod_init - module init entry point
  *
  * initialize any driver wide global data structures such as endpoint pool,
@@ -380,6 +475,8 @@ void bnx2i_ulp_exit(struct cnic_dev *dev)
 static int __init bnx2i_mod_init(void)
 {
         int err;
+        unsigned cpu = 0;
+        struct bnx2i_percpu_s *p;
 
         printk(KERN_INFO "%s", version);
 
@@ -402,6 +499,20 @@ static int __init bnx2i_mod_init(void)
                 goto unreg_xport;
         }
 
+        /* Create percpu kernel threads to handle iSCSI I/O completions */
+        for_each_possible_cpu(cpu) {
+                p = &per_cpu(bnx2i_percpu, cpu);
+                INIT_LIST_HEAD(&p->work_list);
+                spin_lock_init(&p->p_work_lock);
+                p->iothread = NULL;
+        }
+
+        for_each_online_cpu(cpu)
+                bnx2i_percpu_thread_create(cpu);
+
+        /* Initialize per CPU interrupt thread */
+        register_hotcpu_notifier(&bnx2i_cpu_notifier);
+
         return 0;
 
 unreg_xport:
@@ -422,6 +533,7 @@ out:
 static void __exit bnx2i_mod_exit(void)
 {
         struct bnx2i_hba *hba;
+        unsigned cpu = 0;
 
         mutex_lock(&bnx2i_dev_lock);
         while (!list_empty(&adapter_list)) {
@@ -439,6 +551,11 @@ static void __exit bnx2i_mod_exit(void)
         }
         mutex_unlock(&bnx2i_dev_lock);
 
+        unregister_hotcpu_notifier(&bnx2i_cpu_notifier);
+
+        for_each_online_cpu(cpu)
+                bnx2i_percpu_thread_destroy(cpu);
+
         iscsi_unregister_transport(&bnx2i_iscsi_transport);
         cnic_unregister_driver(CNIC_ULP_ISCSI);
 }