* [PATCH 1/5] bnx2fc: Enable cached tasks to improve performance
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
@ 2013-03-08 21:28 ` Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 2/5] bnx2fc: Include chip number in the symbolic name Bhanu Prakash Gollapudi
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 21:28 UTC (permalink / raw)
To: JBottomley, linux-scsi; +Cc: Bhanu Prakash Gollapudi
Set perf_config to 3 during firmware initialization to enable both
cached connections as well as cached tasks.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 85ea98a..c1fa69e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -126,7 +126,11 @@ int bnx2fc_send_fw_fcoe_init_msg(struct bnx2fc_hba *hba)
fcoe_init3.error_bit_map_lo = 0xffffffff;
fcoe_init3.error_bit_map_hi = 0xffffffff;
- fcoe_init3.perf_config = 1;
+ /*
+ * enable both cached connection and cached tasks
+ * 0 = none, 1 = cached connection, 2 = cached tasks, 3 = both
+ */
+ fcoe_init3.perf_config = 3;
kwqe_arr[0] = (struct kwqe *) &fcoe_init1;
kwqe_arr[1] = (struct kwqe *) &fcoe_init2;
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/5] bnx2fc: Include chip number in the symbolic name
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 1/5] bnx2fc: Enable cached tasks to improve performance Bhanu Prakash Gollapudi
@ 2013-03-08 21:28 ` Bhanu Prakash Gollapudi
2013-05-02 0:39 ` James Bottomley
2013-03-08 21:28 ` [PATCH 3/5] bnx2fc: Fix race condition between IO completion and abort Bhanu Prakash Gollapudi
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 21:28 UTC (permalink / raw)
To: JBottomley, linux-scsi; +Cc: Bhanu Prakash Gollapudi
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 53 +++++++++++++++++++++++++++++++++++++
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 51 +++++++++++++++++++++++++++++++----
2 files changed, 98 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 50fcd01..2f118e3 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -68,6 +68,57 @@
#define PFX "bnx2fc: "
+#define BCM_CHIP_LEN 16
+
+#ifndef PCI_DEVICE_ID_NX2_57710
+#define PCI_DEVICE_ID_NX2_57710 0x164e
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57711
+#define PCI_DEVICE_ID_NX2_57711 0x164f
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57712
+#define PCI_DEVICE_ID_NX2_57712 0x1662
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57712_MF
+#define PCI_DEVICE_ID_NX2_57712_MF 0x1663
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57712_VF
+#define PCI_DEVICE_ID_NX2_57712_VF 0x166f
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57800
+#define PCI_DEVICE_ID_NX2_57800 0x168a
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57800_MF
+#define PCI_DEVICE_ID_NX2_57800_MF 0x16a5
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57800_VF
+#define PCI_DEVICE_ID_NX2_57800_VF 0x16a9
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57810
+#define PCI_DEVICE_ID_NX2_57810 0x168e
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57810_MF
+#define PCI_DEVICE_ID_NX2_57810_MF 0x16ae
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57810_VF
+#define PCI_DEVICE_ID_NX2_57810_VF 0x16af
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840
+#define PCI_DEVICE_ID_NX2_57840 0x168d
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_MF
+#define PCI_DEVICE_ID_NX2_57840_MF 0x16a4
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_VF
+#define PCI_DEVICE_ID_NX2_57840_VF 0x16ad
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_2_20
+#define PCI_DEVICE_ID_NX2_57840_2_20 0x16a2
+#endif
+#ifndef PCI_DEVICE_ID_NX2_57840_4_10
+#define PCI_DEVICE_ID_NX2_57840_4_10 0x16a1
+#endif
+
#define BNX2X_DOORBELL_PCI_BAR 2
#define BNX2FC_MAX_BD_LEN 0xffff
@@ -243,6 +294,8 @@ struct bnx2fc_hba {
int wait_for_link_down;
int num_ofld_sess;
struct list_head vports;
+
+ char chip_num[BCM_CHIP_LEN];
};
struct bnx2fc_interface {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 2daf4b0..dd2c5c9 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -679,6 +679,7 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
{
struct fcoe_port *port = lport_priv(lport);
struct bnx2fc_interface *interface = port->priv;
+ struct bnx2fc_hba *hba = interface->hba;
struct Scsi_Host *shost = lport->host;
int rc = 0;
@@ -699,8 +700,9 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
}
if (!lport->vport)
fc_host_max_npiv_vports(lport->host) = USHRT_MAX;
- sprintf(fc_host_symbolic_name(lport->host), "%s v%s over %s",
- BNX2FC_NAME, BNX2FC_VERSION,
+ snprintf(fc_host_symbolic_name(lport->host), 256,
+ "%s (Broadcom %s) v%s over %s",
+ BNX2FC_NAME, hba->chip_num, BNX2FC_VERSION,
interface->netdev->name);
return 0;
@@ -1649,23 +1651,60 @@ mem_err:
static int bnx2fc_bind_pcidev(struct bnx2fc_hba *hba)
{
struct cnic_dev *cnic;
+ struct pci_dev *pdev;
if (!hba->cnic) {
printk(KERN_ERR PFX "cnic is NULL\n");
return -ENODEV;
}
cnic = hba->cnic;
- hba->pcidev = cnic->pcidev;
- if (hba->pcidev)
- pci_dev_get(hba->pcidev);
+ pdev = hba->pcidev = cnic->pcidev;
+ if (!hba->pcidev)
+ return -ENODEV;
+ switch (pdev->device) {
+ case PCI_DEVICE_ID_NX2_57710:
+ strncpy(hba->chip_num, "BCM57710", BCM_CHIP_LEN);
+ break;
+ case PCI_DEVICE_ID_NX2_57711:
+ strncpy(hba->chip_num, "BCM57711", BCM_CHIP_LEN);
+ break;
+ case PCI_DEVICE_ID_NX2_57712:
+ case PCI_DEVICE_ID_NX2_57712_MF:
+ case PCI_DEVICE_ID_NX2_57712_VF:
+ strncpy(hba->chip_num, "BCM57712", BCM_CHIP_LEN);
+ break;
+ case PCI_DEVICE_ID_NX2_57800:
+ case PCI_DEVICE_ID_NX2_57800_MF:
+ case PCI_DEVICE_ID_NX2_57800_VF:
+ strncpy(hba->chip_num, "BCM57800", BCM_CHIP_LEN);
+ break;
+ case PCI_DEVICE_ID_NX2_57810:
+ case PCI_DEVICE_ID_NX2_57810_MF:
+ case PCI_DEVICE_ID_NX2_57810_VF:
+ strncpy(hba->chip_num, "BCM57810", BCM_CHIP_LEN);
+ break;
+ case PCI_DEVICE_ID_NX2_57840:
+ case PCI_DEVICE_ID_NX2_57840_MF:
+ case PCI_DEVICE_ID_NX2_57840_VF:
+ case PCI_DEVICE_ID_NX2_57840_2_20:
+ case PCI_DEVICE_ID_NX2_57840_4_10:
+ strncpy(hba->chip_num, "BCM57840", BCM_CHIP_LEN);
+ break;
+ default:
+ pr_err(PFX "Unknown device id 0x%x\n", pdev->device);
+ break;
+ }
+ pci_dev_get(hba->pcidev);
return 0;
}
static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba)
{
- if (hba->pcidev)
+ if (hba->pcidev) {
+ hba->chip_num[0] = '\0';
pci_dev_put(hba->pcidev);
+ }
hba->pcidev = NULL;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/5] bnx2fc: Include chip number in the symbolic name
2013-03-08 21:28 ` [PATCH 2/5] bnx2fc: Include chip number in the symbolic name Bhanu Prakash Gollapudi
@ 2013-05-02 0:39 ` James Bottomley
2013-05-02 0:42 ` Bhanu Prakash Gollapudi
0 siblings, 1 reply; 12+ messages in thread
From: James Bottomley @ 2013-05-02 0:39 UTC (permalink / raw)
To: Bhanu Prakash Gollapudi; +Cc: linux-scsi
On Fri, 2013-03-08 at 13:28 -0800, Bhanu Prakash Gollapudi wrote:
> +#ifndef PCI_DEVICE_ID_NX2_57710
> +#define PCI_DEVICE_ID_NX2_57710 0x164e
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57711
> +#define PCI_DEVICE_ID_NX2_57711 0x164f
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57712
> +#define PCI_DEVICE_ID_NX2_57712 0x1662
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57712_MF
> +#define PCI_DEVICE_ID_NX2_57712_MF 0x1663
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57712_VF
> +#define PCI_DEVICE_ID_NX2_57712_VF 0x166f
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57800
> +#define PCI_DEVICE_ID_NX2_57800 0x168a
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57800_MF
> +#define PCI_DEVICE_ID_NX2_57800_MF 0x16a5
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57800_VF
> +#define PCI_DEVICE_ID_NX2_57800_VF 0x16a9
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57810
> +#define PCI_DEVICE_ID_NX2_57810 0x168e
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57810_MF
> +#define PCI_DEVICE_ID_NX2_57810_MF 0x16ae
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57810_VF
> +#define PCI_DEVICE_ID_NX2_57810_VF 0x16af
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57840
> +#define PCI_DEVICE_ID_NX2_57840 0x168d
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57840_MF
> +#define PCI_DEVICE_ID_NX2_57840_MF 0x16a4
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57840_VF
> +#define PCI_DEVICE_ID_NX2_57840_VF 0x16ad
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57840_2_20
> +#define PCI_DEVICE_ID_NX2_57840_2_20 0x16a2
> +#endif
> +#ifndef PCI_DEVICE_ID_NX2_57840_4_10
> +#define PCI_DEVICE_ID_NX2_57840_4_10 0x16a1
> +#endif
This doesn't belong in your header file. Most of the IDs are already in
pci_ids.h; I added the few which weren't.
James
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] bnx2fc: Include chip number in the symbolic name
2013-05-02 0:39 ` James Bottomley
@ 2013-05-02 0:42 ` Bhanu Prakash Gollapudi
0 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-05-02 0:42 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-scsi
On 05/01/2013 05:39 PM, James Bottomley wrote:
> On Fri, 2013-03-08 at 13:28 -0800, Bhanu Prakash Gollapudi wrote:
>> +#ifndef PCI_DEVICE_ID_NX2_57710
>> +#define PCI_DEVICE_ID_NX2_57710 0x164e
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57711
>> +#define PCI_DEVICE_ID_NX2_57711 0x164f
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57712
>> +#define PCI_DEVICE_ID_NX2_57712 0x1662
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57712_MF
>> +#define PCI_DEVICE_ID_NX2_57712_MF 0x1663
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57712_VF
>> +#define PCI_DEVICE_ID_NX2_57712_VF 0x166f
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57800
>> +#define PCI_DEVICE_ID_NX2_57800 0x168a
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57800_MF
>> +#define PCI_DEVICE_ID_NX2_57800_MF 0x16a5
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57800_VF
>> +#define PCI_DEVICE_ID_NX2_57800_VF 0x16a9
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57810
>> +#define PCI_DEVICE_ID_NX2_57810 0x168e
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57810_MF
>> +#define PCI_DEVICE_ID_NX2_57810_MF 0x16ae
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57810_VF
>> +#define PCI_DEVICE_ID_NX2_57810_VF 0x16af
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57840
>> +#define PCI_DEVICE_ID_NX2_57840 0x168d
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57840_MF
>> +#define PCI_DEVICE_ID_NX2_57840_MF 0x16a4
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57840_VF
>> +#define PCI_DEVICE_ID_NX2_57840_VF 0x16ad
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57840_2_20
>> +#define PCI_DEVICE_ID_NX2_57840_2_20 0x16a2
>> +#endif
>> +#ifndef PCI_DEVICE_ID_NX2_57840_4_10
>> +#define PCI_DEVICE_ID_NX2_57840_4_10 0x16a1
>> +#endif
> This doesn't belong in your header file. Most of the IDs are already in
> pci_ids.h; I added the few which weren't.
I had to add these since some of them were not there in pci_ids.h yet.
If you have retained a few that are not in pci_ids.h file, it fine with me.
Thanks,
Bhanu
>
> James
>
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] bnx2fc: Fix race condition between IO completion and abort
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 1/5] bnx2fc: Enable cached tasks to improve performance Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 2/5] bnx2fc: Include chip number in the symbolic name Bhanu Prakash Gollapudi
@ 2013-03-08 21:28 ` Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 4/5] bnx2fc: Update copyright information Bhanu Prakash Gollapudi
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 21:28 UTC (permalink / raw)
To: JBottomley, linux-scsi; +Cc: Bhanu Prakash Gollapudi
When IO is successfully completed while an abort is pending, eh_abort
incorrectly assumes that abort failed and performes recovery by issuing
cleanup. Howerver, cleanup timesout as the firmware has no clue about
this IO. Fix this by checking if the IO has already completed.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc_io.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 60798e8..539b95b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1269,8 +1269,11 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
spin_lock_bh(&tgt->tgt_lock);
io_req->wait_for_comp = 0;
- if (!(test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
- &io_req->req_flags))) {
+ if (test_bit(BNX2FC_FLAG_IO_COMPL, &io_req->req_flags)) {
+ BNX2FC_IO_DBG(io_req, "IO completed in a different context\n");
+ rc = SUCCESS;
+ } else if (!(test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
+ &io_req->req_flags))) {
/* Let the scsi-ml try to recover this command */
printk(KERN_ERR PFX "abort failed, xid = 0x%x\n",
io_req->xid);
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/5] bnx2fc: Update copyright information
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
` (2 preceding siblings ...)
2013-03-08 21:28 ` [PATCH 3/5] bnx2fc: Fix race condition between IO completion and abort Bhanu Prakash Gollapudi
@ 2013-03-08 21:28 ` Bhanu Prakash Gollapudi
2013-03-08 21:28 ` [PATCH 5/5] bnx2fc: Bumped version to 1.0.14 Bhanu Prakash Gollapudi
2013-04-18 21:47 ` [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
5 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 21:28 UTC (permalink / raw)
To: JBottomley, linux-scsi; +Cc: Bhanu Prakash Gollapudi
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 2f118e3..676dba3 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -2,7 +2,7 @@
#define _BNX2FC_H_
/* bnx2fc.h: Broadcom NetXtreme II Linux FCoE offload driver.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index bdbbb13..b1c9a4f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -3,7 +3,7 @@
* This file contains helper routines that handle ELS requests
* and responses.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index dd2c5c9..1e852d6 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -3,7 +3,7 @@
* cnic modules to create FCoE instances, send/receive non-offloaded
* FIP/FCoE packets, listen to link events etc.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index c1fa69e..b3ee916 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -2,7 +2,7 @@
* This file contains the code that low level functions that interact
* with 57712 FCoE firmware.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 539b95b..9701d6f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1,7 +1,7 @@
/* bnx2fc_io.c: Broadcom NetXtreme II Linux FCoE offload driver.
* IO manager and SCSI IO processing.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index c57a3bb..4d93177 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -2,7 +2,7 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2011 Broadcom Corporation
+ * Copyright (c) 2008 - 2013 Broadcom Corporation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/5] bnx2fc: Bumped version to 1.0.14
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
` (3 preceding siblings ...)
2013-03-08 21:28 ` [PATCH 4/5] bnx2fc: Update copyright information Bhanu Prakash Gollapudi
@ 2013-03-08 21:28 ` Bhanu Prakash Gollapudi
2013-03-08 23:53 ` Bhanu Prakash Gollapudi
2013-04-18 21:47 ` [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
5 siblings, 1 reply; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 21:28 UTC (permalink / raw)
To: JBottomley, linux-scsi; +Cc: Bhanu Prakash Gollapudi
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 676dba3..1ece6e9 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -64,7 +64,7 @@
#include "bnx2fc_constants.h"
#define BNX2FC_NAME "bnx2fc"
-#define BNX2FC_VERSION "1.0.13"
+#define BNX2FC_VERSION "1.0.14"
#define PFX "bnx2fc: "
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 1e852d6..9ab62da 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
#define DRV_MODULE_NAME "bnx2fc"
#define DRV_MODULE_VERSION BNX2FC_VERSION
-#define DRV_MODULE_RELDATE "Dec 21, 2012"
+#define DRV_MODULE_RELDATE "Mar 08, 2012"
static char version[] =
--
1.7.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 5/5] bnx2fc: Bumped version to 1.0.14
2013-03-08 21:28 ` [PATCH 5/5] bnx2fc: Bumped version to 1.0.14 Bhanu Prakash Gollapudi
@ 2013-03-08 23:53 ` Bhanu Prakash Gollapudi
2013-05-02 1:05 ` James Bottomley
0 siblings, 1 reply; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-03-08 23:53 UTC (permalink / raw)
To: Bhanu Prakash Gollapudi; +Cc: JBottomley, linux-scsi
On 03/08/2013 01:28 PM, Bhanu Prakash Gollapudi wrote:
> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
> index 676dba3..1ece6e9 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc.h
> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
> @@ -64,7 +64,7 @@
> #include "bnx2fc_constants.h"
>
> #define BNX2FC_NAME "bnx2fc"
> -#define BNX2FC_VERSION "1.0.13"
> +#define BNX2FC_VERSION "1.0.14"
>
> #define PFX "bnx2fc: "
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> index 1e852d6..9ab62da 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> @@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
>
> #define DRV_MODULE_NAME "bnx2fc"
> #define DRV_MODULE_VERSION BNX2FC_VERSION
> -#define DRV_MODULE_RELDATE "Dec 21, 2012"
> +#define DRV_MODULE_RELDATE "Mar 08, 2012"
James, I realized there was a typo in the date - 2012 instead of 2013.
Please apply this patch instead. Sorry for the inconvenience.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 676dba3..1ece6e9 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -64,7 +64,7 @@
#include "bnx2fc_constants.h"
#define BNX2FC_NAME "bnx2fc"
-#define BNX2FC_VERSION "1.0.13"
+#define BNX2FC_VERSION "1.0.14"
#define PFX "bnx2fc: "
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 1e852d6..9ab62da 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
#define DRV_MODULE_NAME "bnx2fc"
#define DRV_MODULE_VERSION BNX2FC_VERSION
-#define DRV_MODULE_RELDATE "Dec 21, 2012"
+#define DRV_MODULE_RELDATE "Mar 08, 2013"
static char version[] =
--
1.7.1
thanks,
Bhanu
>
>
> static char version[] =
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] bnx2fc: Bumped version to 1.0.14
2013-03-08 23:53 ` Bhanu Prakash Gollapudi
@ 2013-05-02 1:05 ` James Bottomley
2013-05-02 3:05 ` Bhanu Prakash Gollapudi
0 siblings, 1 reply; 12+ messages in thread
From: James Bottomley @ 2013-05-02 1:05 UTC (permalink / raw)
To: Bhanu Prakash Gollapudi; +Cc: linux-scsi
On Fri, 2013-03-08 at 15:53 -0800, Bhanu Prakash Gollapudi wrote:
> On 03/08/2013 01:28 PM, Bhanu Prakash Gollapudi wrote:
> > Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
> > ---
> > drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> > drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
> > index 676dba3..1ece6e9 100644
> > --- a/drivers/scsi/bnx2fc/bnx2fc.h
> > +++ b/drivers/scsi/bnx2fc/bnx2fc.h
> > @@ -64,7 +64,7 @@
> > #include "bnx2fc_constants.h"
> >
> > #define BNX2FC_NAME "bnx2fc"
> > -#define BNX2FC_VERSION "1.0.13"
> > +#define BNX2FC_VERSION "1.0.14"
> >
> > #define PFX "bnx2fc: "
> >
> > diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> > index 1e852d6..9ab62da 100644
> > --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> > +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> > @@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
> >
> > #define DRV_MODULE_NAME "bnx2fc"
> > #define DRV_MODULE_VERSION BNX2FC_VERSION
> > -#define DRV_MODULE_RELDATE "Dec 21, 2012"
> > +#define DRV_MODULE_RELDATE "Mar 08, 2012"
> James, I realized there was a typo in the date - 2012 instead of 2013.
>
> Please apply this patch instead. Sorry for the inconvenience.
>
>
> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
> index 676dba3..1ece6e9 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc.h
> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
> @@ -64,7 +64,7 @@
> #include "bnx2fc_constants.h"
>
> #define BNX2FC_NAME "bnx2fc"
> -#define BNX2FC_VERSION "1.0.13"
> +#define BNX2FC_VERSION "1.0.14"
>
> #define PFX "bnx2fc: "
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> index 1e852d6..9ab62da 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
> @@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
>
> #define DRV_MODULE_NAME "bnx2fc"
> #define DRV_MODULE_VERSION BNX2FC_VERSION
> -#define DRV_MODULE_RELDATE "Dec 21, 2012"
> +#define DRV_MODULE_RELDATE "Mar 08, 2013"
This doesn't actually apply ... your mailer has converted tabs to
spaces. Since it's only a couple of lines, I fixed it up by hand this
time ...
James
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] bnx2fc: Bumped version to 1.0.14
2013-05-02 1:05 ` James Bottomley
@ 2013-05-02 3:05 ` Bhanu Prakash Gollapudi
0 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-05-02 3:05 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-scsi
On 05/01/2013 06:05 PM, James Bottomley wrote:
> On Fri, 2013-03-08 at 15:53 -0800, Bhanu Prakash Gollapudi wrote:
>> On 03/08/2013 01:28 PM, Bhanu Prakash Gollapudi wrote:
>>> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
>>> ---
>>> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
>>> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
>>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
>>> index 676dba3..1ece6e9 100644
>>> --- a/drivers/scsi/bnx2fc/bnx2fc.h
>>> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
>>> @@ -64,7 +64,7 @@
>>> #include "bnx2fc_constants.h"
>>>
>>> #define BNX2FC_NAME "bnx2fc"
>>> -#define BNX2FC_VERSION "1.0.13"
>>> +#define BNX2FC_VERSION "1.0.14"
>>>
>>> #define PFX "bnx2fc: "
>>>
>>> diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>>> index 1e852d6..9ab62da 100644
>>> --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>>> +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>>> @@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
>>>
>>> #define DRV_MODULE_NAME "bnx2fc"
>>> #define DRV_MODULE_VERSION BNX2FC_VERSION
>>> -#define DRV_MODULE_RELDATE "Dec 21, 2012"
>>> +#define DRV_MODULE_RELDATE "Mar 08, 2012"
>> James, I realized there was a typo in the date - 2012 instead of 2013.
>>
>> Please apply this patch instead. Sorry for the inconvenience.
>>
>>
>> Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
>> ---
>> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
>> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
>> index 676dba3..1ece6e9 100644
>> --- a/drivers/scsi/bnx2fc/bnx2fc.h
>> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
>> @@ -64,7 +64,7 @@
>> #include "bnx2fc_constants.h"
>>
>> #define BNX2FC_NAME "bnx2fc"
>> -#define BNX2FC_VERSION "1.0.13"
>> +#define BNX2FC_VERSION "1.0.14"
>>
>> #define PFX "bnx2fc: "
>>
>> diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>> b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>> index 1e852d6..9ab62da 100644
>> --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>> +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
>> @@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
>>
>> #define DRV_MODULE_NAME "bnx2fc"
>> #define DRV_MODULE_VERSION BNX2FC_VERSION
>> -#define DRV_MODULE_RELDATE "Dec 21, 2012"
>> +#define DRV_MODULE_RELDATE "Mar 08, 2013"
> This doesn't actually apply ... your mailer has converted tabs to
> spaces. Since it's only a couple of lines, I fixed it up by hand this
> time ...
>
> James
>
>
>
Thanks for taking care of this, James.
Bhanu
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/5] bnx2fc version 1.0.14
2013-03-08 21:28 [PATCH 0/5] bnx2fc version 1.0.14 Bhanu Prakash Gollapudi
` (4 preceding siblings ...)
2013-03-08 21:28 ` [PATCH 5/5] bnx2fc: Bumped version to 1.0.14 Bhanu Prakash Gollapudi
@ 2013-04-18 21:47 ` Bhanu Prakash Gollapudi
5 siblings, 0 replies; 12+ messages in thread
From: Bhanu Prakash Gollapudi @ 2013-04-18 21:47 UTC (permalink / raw)
To: Bhanu Prakash Gollapudi; +Cc: JBottomley, linux-scsi
On 03/08/2013 01:28 PM, Bhanu Prakash Gollapudi wrote:
> Hi James,
>
> Please consider including the following patches for 3.9+ merge window.
>
> Thanks,
> Bhanu
>
> Bhanu Prakash Gollapudi (5):
> bnx2fc: Enable cached tasks to improve performance
> bnx2fc: Include chip number in the symbolic name
> bnx2fc: Fix race condition between IO completion and abort
> bnx2fc: Update copyright information
> bnx2fc: Bumped version to 1.0.14
>
> drivers/scsi/bnx2fc/bnx2fc.h | 57 +++++++++++++++++++++++++++++++++++-
> drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 55 ++++++++++++++++++++++++++++++-----
> drivers/scsi/bnx2fc/bnx2fc_hwi.c | 8 ++++-
> drivers/scsi/bnx2fc/bnx2fc_io.c | 9 ++++--
> drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +-
> 6 files changed, 116 insertions(+), 17 deletions(-)
>
Hi James,
I see that these patches were not picked up by you yet. Please let me
know if you're waiting for any information.
thanks,
Bhanu
^ permalink raw reply [flat|nested] 12+ messages in thread