* [PATCH 0/7] bnx2fc: Update to version 2.9.6.
@ 2015-10-19 19:40 Chad Dupuis
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
` (6 more replies)
0 siblings, 7 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
From: Chad Dupuis <chad.dupuis@qlogic.com>
Hi James,
Please add the following patches to the scsi misc branch at your earliest convenience.
Thanks,
Chad
Chad Dupuis (7):
bnx2fc: Update copyright for 2015.
bnx2fc: Remove 'NetXtreme II' from source files.
bnx2fc: Set ELS transfer length correctly for middle path commands.
bnx2fc: Fix FCP RSP residual parsing.
bnx2fc: Remove explicit logouts.
bnx2fc: Add HZ to task management timeout.
bnx2fc: Update version number to 2.9.6.
drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 6 +-
drivers/scsi/bnx2fc/Kconfig | 5 +-
drivers/scsi/bnx2fc/bnx2fc.h | 11 ++--
drivers/scsi/bnx2fc/bnx2fc_constants.h | 6 +-
drivers/scsi/bnx2fc/bnx2fc_debug.c | 6 +-
drivers/scsi/bnx2fc/bnx2fc_debug.h | 6 +-
drivers/scsi/bnx2fc/bnx2fc_els.c | 10 ++--
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 12 ++--
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 6 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 104 +++++++-------------------------
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 12 +---
11 files changed, 59 insertions(+), 125 deletions(-)
--
1.7.7
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 1/7] bnx2fc: Update copyright for 2015.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:19 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files Chad Dupuis
` (5 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 4 ++--
drivers/scsi/bnx2fc/bnx2fc.h | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_constants.h | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_debug.c | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_debug.h | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_els.c | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_io.c | 4 ++--
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
index fe2106c..66deff1 100644
--- a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
+++ b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
@@ -2,8 +2,8 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 1346e05..4791b29 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -1,7 +1,7 @@
/* bnx2fc.h: QLogic NetXtreme II Linux FCoE offload driver.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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_constants.h b/drivers/scsi/bnx2fc/bnx2fc_constants.h
index e147cc7..52e8297 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_constants.h
+++ b/drivers/scsi/bnx2fc/bnx2fc_constants.h
@@ -2,8 +2,8 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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_debug.c b/drivers/scsi/bnx2fc/bnx2fc_debug.c
index d055df0..e3a7ca4 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_debug.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_debug.c
@@ -2,8 +2,8 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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_debug.h b/drivers/scsi/bnx2fc/bnx2fc_debug.h
index 2b90067..737398f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_debug.h
+++ b/drivers/scsi/bnx2fc/bnx2fc_debug.h
@@ -2,8 +2,8 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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 ef355c1..d8b1651 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -3,8 +3,8 @@
* This file contains helper routines that handle ELS requests
* and responses.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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 231d056..4098c35 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -3,8 +3,8 @@
* cnic modules to create FCoE instances, send/receive non-offloaded
* FIP/FCoE packets, listen to link events etc.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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 c6688d7..3ef3d72 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -2,8 +2,8 @@
* This file contains the code that low level functions that interact
* with 57712 FCoE firmware.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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 9ecca85..890baee 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1,8 +1,8 @@
/* bnx2fc_io.c: QLogic NetXtreme II Linux FCoE offload driver.
* IO manager and SCSI IO processing.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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 c66c708..8bcd229 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -2,8 +2,8 @@
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
- * Copyright (c) 2008 - 2013 Broadcom Corporation
- * Copyright (c) 2014, QLogic Corporation
+ * Copyright (c) 2008-2013 Broadcom Corporation
+ * Copyright (c) 2014-2015 QLogic 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.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:22 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands Chad Dupuis
` (4 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/Kconfig | 5 ++---
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_constants.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_debug.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_debug.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +++---
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +-
11 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
index 66deff1..ac1c0b6 100644
--- a/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
+++ b/drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h
@@ -1,4 +1,4 @@
-/* 57xx_hsi_bnx2fc.h: QLogic NetXtreme II Linux FCoE offload driver.
+/* 57xx_hsi_bnx2fc.h: QLogic Linux FCoE offload driver.
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
diff --git a/drivers/scsi/bnx2fc/Kconfig b/drivers/scsi/bnx2fc/Kconfig
index 0978828..d401a09 100644
--- a/drivers/scsi/bnx2fc/Kconfig
+++ b/drivers/scsi/bnx2fc/Kconfig
@@ -1,5 +1,5 @@
config SCSI_BNX2X_FCOE
- tristate "QLogic NetXtreme II FCoE support"
+ tristate "QLogic FCoE offload support"
depends on PCI
depends on (IPV6 || IPV6=n)
depends on LIBFC
@@ -9,5 +9,4 @@ config SCSI_BNX2X_FCOE
select NET_VENDOR_BROADCOM
select CNIC
---help---
- This driver supports FCoE offload for the QLogic NetXtreme II
- devices.
+ This driver supports FCoE offload for the QLogic devices.
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 4791b29..0e2aa65 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -1,4 +1,4 @@
-/* bnx2fc.h: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc.h: QLogic Linux FCoE offload driver.
*
* Copyright (c) 2008-2013 Broadcom Corporation
* Copyright (c) 2014-2015 QLogic Corporation
diff --git a/drivers/scsi/bnx2fc/bnx2fc_constants.h b/drivers/scsi/bnx2fc/bnx2fc_constants.h
index 52e8297..5b20efb 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_constants.h
+++ b/drivers/scsi/bnx2fc/bnx2fc_constants.h
@@ -1,4 +1,4 @@
-/* bnx2fc_constants.h: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_constants.h: QLogic Linux FCoE offload driver.
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_debug.c b/drivers/scsi/bnx2fc/bnx2fc_debug.c
index e3a7ca4..c9e0bc7 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_debug.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_debug.c
@@ -1,4 +1,4 @@
-/* bnx2fc_debug.c: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_debug.c: QLogic Linux FCoE offload driver.
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_debug.h b/drivers/scsi/bnx2fc/bnx2fc_debug.h
index 737398f..34fda3e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_debug.h
+++ b/drivers/scsi/bnx2fc/bnx2fc_debug.h
@@ -1,4 +1,4 @@
-/* bnx2fc_debug.h: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_debug.h: QLogic Linux FCoE offload driver.
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index d8b1651..49d1e4d 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -1,5 +1,5 @@
/*
- * bnx2fc_els.c: QLogic NetXtreme II Linux FCoE offload driver.
+ * bnx2fc_els.c: QLogic Linux FCoE offload driver.
* This file contains helper routines that handle ELS requests
* and responses.
*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 4098c35..65ad98c 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1,4 +1,4 @@
-/* bnx2fc_fcoe.c: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_fcoe.c: QLogic Linux FCoE offload driver.
* This file contains the code that interacts with libfc, libfcoe,
* cnic modules to create FCoE instances, send/receive non-offloaded
* FIP/FCoE packets, listen to link events etc.
@@ -27,12 +27,12 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
static char version[] =
- "QLogic NetXtreme II FCoE Driver " DRV_MODULE_NAME \
+ "QLogic FCoE Driver " DRV_MODULE_NAME \
" v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Bhanu Prakash Gollapudi <bprakash@broadcom.com>");
-MODULE_DESCRIPTION("QLogic NetXtreme II BCM57710 FCoE Driver");
+MODULE_DESCRIPTION("QLogic FCoE Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index 3ef3d72..28c671b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -1,4 +1,4 @@
-/* bnx2fc_hwi.c: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_hwi.c: QLogic Linux FCoE offload driver.
* This file contains the code that low level functions that interact
* with 57712 FCoE firmware.
*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 890baee..520dabe 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1,4 +1,4 @@
-/* bnx2fc_io.c: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_io.c: QLogic Linux FCoE offload driver.
* IO manager and SCSI IO processing.
*
* Copyright (c) 2008-2013 Broadcom Corporation
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 8bcd229..30a8788 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -1,4 +1,4 @@
-/* bnx2fc_tgt.c: QLogic NetXtreme II Linux FCoE offload driver.
+/* bnx2fc_tgt.c: QLogic Linux FCoE offload driver.
* Handles operations such as session offload/upload etc, and manages
* session resources such as connection id and qp resources.
*
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
2015-10-19 19:40 ` [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:53 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing Chad Dupuis
` (3 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/bnx2fc_els.c | 1 +
drivers/scsi/bnx2fc/bnx2fc_io.c | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index 49d1e4d..0d0ab2e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -707,6 +707,7 @@ static int bnx2fc_initiate_els(struct bnx2fc_rport *tgt, unsigned int op,
els_req->cb_func = cb_func;
cb_arg->io_req = els_req;
els_req->cb_arg = cb_arg;
+ els_req->data_xfer_len = data_len;
mp_req = (struct bnx2fc_mp_req *)&(els_req->mp_req);
rc = bnx2fc_init_mp_req(els_req);
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 520dabe..5d6a81b 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -623,8 +623,12 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
mp_req = (struct bnx2fc_mp_req *)&(io_req->mp_req);
memset(mp_req, 0, sizeof(struct bnx2fc_mp_req));
- mp_req->req_len = sizeof(struct fcp_cmnd);
- io_req->data_xfer_len = mp_req->req_len;
+ if (io_req->cmd_type != BNX2FC_ELS) {
+ mp_req->req_len = sizeof(struct fcp_cmnd);
+ io_req->data_xfer_len = mp_req->req_len;
+ } else
+ mp_req->req_len = io_req->data_xfer_len;
+
mp_req->req_buf = dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
&mp_req->req_buf_dma,
GFP_ATOMIC);
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
` (2 preceding siblings ...)
2015-10-19 19:40 ` [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 5/7] bnx2fc: Remove explicit logouts Chad Dupuis
` (2 subsequent siblings)
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/bnx2fc_io.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 5d6a81b..877a79a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1759,7 +1759,10 @@ static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req,
int fcp_rsp_len = 0;
io_req->fcp_status = FC_GOOD;
- io_req->fcp_resid = fcp_rsp->fcp_resid;
+ io_req->fcp_resid = 0;
+ if (rsp_flags & (FCOE_FCP_RSP_FLAGS_FCP_RESID_OVER |
+ FCOE_FCP_RSP_FLAGS_FCP_RESID_UNDER))
+ io_req->fcp_resid = fcp_rsp->fcp_resid;
io_req->scsi_comp_flags = rsp_flags;
CMD_SCSI_STATUS(sc_cmd) = io_req->cdb_status =
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 5/7] bnx2fc: Remove explicit logouts.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
` (3 preceding siblings ...)
2015-10-19 19:40 ` [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:30 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 6/7] bnx2fc: Add HZ to task management timeout Chad Dupuis
2015-10-19 19:40 ` [PATCH 7/7] bnx2fc: Update version number to 2.9.6 Chad Dupuis
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Explicit logouts from bnx2fc were causing race conditions in either returning
stale SCSI commands or not allowing a target to log back in.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 1 -
drivers/scsi/bnx2fc/bnx2fc_els.c | 3 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 85 ++++---------------------------------
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 6 ---
4 files changed, 11 insertions(+), 84 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 0e2aa65..d46267d 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -303,7 +303,6 @@ struct bnx2fc_rport {
#define BNX2FC_FLAG_OFLD_REQ_CMPL 0x5
#define BNX2FC_FLAG_CTX_ALLOC_FAILURE 0x6
#define BNX2FC_FLAG_UPLD_REQ_COMPL 0x7
-#define BNX2FC_FLAG_EXPL_LOGO 0x8
#define BNX2FC_FLAG_DISABLE_FAILED 0x9
#define BNX2FC_FLAG_ENABLED 0xa
diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
index 0d0ab2e..5beea77 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_els.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
@@ -689,8 +689,7 @@ static int bnx2fc_initiate_els(struct bnx2fc_rport *tgt, unsigned int op,
rc = -EINVAL;
goto els_err;
}
- if (!(test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags)) ||
- (test_bit(BNX2FC_FLAG_EXPL_LOGO, &tgt->flags))) {
+ if (!(test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags))) {
printk(KERN_ERR PFX "els 0x%x: tgt not ready\n", op);
rc = -EINVAL;
goto els_err;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 877a79a..3b4e00a 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -40,11 +40,8 @@ static void bnx2fc_cmd_timeout(struct work_struct *work)
{
struct bnx2fc_cmd *io_req = container_of(work, struct bnx2fc_cmd,
timeout_work.work);
- struct fc_lport *lport;
- struct fc_rport_priv *rdata;
u8 cmd_type = io_req->cmd_type;
struct bnx2fc_rport *tgt = io_req->tgt;
- int logo_issued;
int rc;
BNX2FC_IO_DBG(io_req, "cmd_timeout, cmd_type = %d,"
@@ -80,25 +77,14 @@ static void bnx2fc_cmd_timeout(struct work_struct *work)
io_req->refcount.refcount.counter);
if (!(test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
&io_req->req_flags))) {
-
- lport = io_req->port->lport;
- rdata = io_req->tgt->rdata;
- logo_issued = test_and_set_bit(
- BNX2FC_FLAG_EXPL_LOGO,
- &tgt->flags);
+ /*
+ * Cleanup and return original command to
+ * mid-layer.
+ */
+ bnx2fc_initiate_cleanup(io_req);
kref_put(&io_req->refcount, bnx2fc_cmd_release);
spin_unlock_bh(&tgt->tgt_lock);
- /* Explicitly logo the target */
- if (!logo_issued) {
- BNX2FC_IO_DBG(io_req, "Explicit "
- "logo - tgt flags = 0x%lx\n",
- tgt->flags);
-
- mutex_lock(&lport->disc.disc_mutex);
- lport->tt.rport_logoff(rdata);
- mutex_unlock(&lport->disc.disc_mutex);
- }
return;
}
} else {
@@ -116,28 +102,10 @@ static void bnx2fc_cmd_timeout(struct work_struct *work)
rc = bnx2fc_initiate_abts(io_req);
if (rc == SUCCESS)
goto done;
- /*
- * Explicitly logo the target if
- * abts initiation fails
- */
- lport = io_req->port->lport;
- rdata = io_req->tgt->rdata;
- logo_issued = test_and_set_bit(
- BNX2FC_FLAG_EXPL_LOGO,
- &tgt->flags);
+
kref_put(&io_req->refcount, bnx2fc_cmd_release);
spin_unlock_bh(&tgt->tgt_lock);
- if (!logo_issued) {
- BNX2FC_IO_DBG(io_req, "Explicit "
- "logo - tgt flags = 0x%lx\n",
- tgt->flags);
-
-
- mutex_lock(&lport->disc.disc_mutex);
- lport->tt.rport_logoff(rdata);
- mutex_unlock(&lport->disc.disc_mutex);
- }
return;
} else {
BNX2FC_IO_DBG(io_req, "IO already in "
@@ -152,22 +120,9 @@ static void bnx2fc_cmd_timeout(struct work_struct *work)
if (!test_and_set_bit(BNX2FC_FLAG_ABTS_DONE,
&io_req->req_flags)) {
- lport = io_req->port->lport;
- rdata = io_req->tgt->rdata;
- logo_issued = test_and_set_bit(
- BNX2FC_FLAG_EXPL_LOGO,
- &tgt->flags);
kref_put(&io_req->refcount, bnx2fc_cmd_release);
spin_unlock_bh(&tgt->tgt_lock);
- /* Explicitly logo the target */
- if (!logo_issued) {
- BNX2FC_IO_DBG(io_req, "Explicitly logo"
- "(els)\n");
- mutex_lock(&lport->disc.disc_mutex);
- lport->tt.rport_logoff(rdata);
- mutex_unlock(&lport->disc.disc_mutex);
- }
return;
}
} else {
@@ -1112,18 +1067,11 @@ int bnx2fc_eh_device_reset(struct scsi_cmnd *sc_cmd)
return bnx2fc_initiate_tmf(sc_cmd, FCP_TMF_LUN_RESET);
}
-int bnx2fc_expl_logo(struct fc_lport *lport, struct bnx2fc_cmd *io_req)
+int bnx2fc_abts_cleanup(struct bnx2fc_cmd *io_req)
{
struct bnx2fc_rport *tgt = io_req->tgt;
- struct fc_rport_priv *rdata = tgt->rdata;
- int logo_issued;
int rc = SUCCESS;
- int wait_cnt = 0;
- BNX2FC_IO_DBG(io_req, "Expl logo - tgt flags = 0x%lx\n",
- tgt->flags);
- logo_issued = test_and_set_bit(BNX2FC_FLAG_EXPL_LOGO,
- &tgt->flags);
io_req->wait_for_comp = 1;
bnx2fc_initiate_cleanup(io_req);
@@ -1136,21 +1084,8 @@ int bnx2fc_expl_logo(struct fc_lport *lport, struct bnx2fc_cmd *io_req)
* release the reference taken in eh_abort to allow the
* target to re-login after flushing IOs
*/
- kref_put(&io_req->refcount, bnx2fc_cmd_release);
+ kref_put(&io_req->refcount, bnx2fc_cmd_release);
- if (!logo_issued) {
- clear_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags);
- mutex_lock(&lport->disc.disc_mutex);
- lport->tt.rport_logoff(rdata);
- mutex_unlock(&lport->disc.disc_mutex);
- do {
- msleep(BNX2FC_RELOGIN_WAIT_TIME);
- if (wait_cnt++ > BNX2FC_RELOGIN_WAIT_CNT) {
- rc = FAILED;
- break;
- }
- } while (!test_bit(BNX2FC_FLAG_SESSION_READY, &tgt->flags));
- }
spin_lock_bh(&tgt->tgt_lock);
return rc;
}
@@ -1252,7 +1187,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
if (cancel_delayed_work(&io_req->timeout_work))
kref_put(&io_req->refcount,
bnx2fc_cmd_release); /* drop timer hold */
- rc = bnx2fc_expl_logo(lport, io_req);
+ rc = bnx2fc_abts_cleanup(io_req);
/* This only occurs when an task abort was requested while ABTS
is in progress. Setting the IO_CLEANUP flag will skip the
RRQ process in the case when the fw generated SCSI_CMD cmpl
@@ -1291,7 +1226,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
/* Let the scsi-ml try to recover this command */
printk(KERN_ERR PFX "abort failed, xid = 0x%x\n",
io_req->xid);
- rc = bnx2fc_expl_logo(lport, io_req);
+ rc = bnx2fc_abts_cleanup(io_req);
goto out;
} else {
/*
diff --git a/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index 30a8788..08ec318 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -560,12 +560,6 @@ void bnx2fc_rport_event_handler(struct fc_lport *lport,
(hba->num_ofld_sess == 0)) {
wake_up_interruptible(&hba->shutdown_wait);
}
- if (test_bit(BNX2FC_FLAG_EXPL_LOGO, &tgt->flags)) {
- printk(KERN_ERR PFX "Relogin to the tgt\n");
- mutex_lock(&lport->disc.disc_mutex);
- lport->tt.rport_login(rdata);
- mutex_unlock(&lport->disc.disc_mutex);
- }
mutex_unlock(&hba->hba_mutex);
break;
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 6/7] bnx2fc: Add HZ to task management timeout.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
` (4 preceding siblings ...)
2015-10-19 19:40 ` [PATCH 5/7] bnx2fc: Remove explicit logouts Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-20 11:47 ` Tomas Henzl
2015-10-21 10:30 ` Hannes Reinecke
2015-10-19 19:40 ` [PATCH 7/7] bnx2fc: Update version number to 2.9.6 Chad Dupuis
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index d46267d..d05866d 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -129,7 +129,7 @@
#define BNX2FC_MAX_FCP_TGT 256
#define BNX2FC_MAX_CMD_LEN 16
-#define BNX2FC_TM_TIMEOUT 60 /* secs */
+#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */
#define BNX2FC_IO_TIMEOUT 20000UL /* msecs */
#define BNX2FC_WAIT_CNT 1200
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 7/7] bnx2fc: Update version number to 2.9.6.
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
` (5 preceding siblings ...)
2015-10-19 19:40 ` [PATCH 6/7] bnx2fc: Add HZ to task management timeout Chad Dupuis
@ 2015-10-19 19:40 ` Chad Dupuis
2015-10-21 10:31 ` Hannes Reinecke
2015-10-22 14:55 ` Tomas Henzl
6 siblings, 2 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-19 19:40 UTC (permalink / raw)
To: James.Bottomley; +Cc: giridhar.malavali, linux-scsi
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.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 d05866d..4f3cda2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -65,7 +65,7 @@
#include "bnx2fc_constants.h"
#define BNX2FC_NAME "bnx2fc"
-#define BNX2FC_VERSION "2.4.2"
+#define BNX2FC_VERSION "2.9.6"
#define PFX "bnx2fc: "
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 65ad98c..dd82f66 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -23,7 +23,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 11, 2013"
+#define DRV_MODULE_RELDATE "October 15, 2015"
static char version[] =
--
1.7.7
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] bnx2fc: Add HZ to task management timeout.
2015-10-19 19:40 ` [PATCH 6/7] bnx2fc: Add HZ to task management timeout Chad Dupuis
@ 2015-10-20 11:47 ` Tomas Henzl
2015-10-20 14:17 ` Chad Dupuis
2015-10-21 10:30 ` Hannes Reinecke
1 sibling, 1 reply; 23+ messages in thread
From: Tomas Henzl @ 2015-10-20 11:47 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
> index d46267d..d05866d 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc.h
> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
> @@ -129,7 +129,7 @@
> #define BNX2FC_MAX_FCP_TGT 256
> #define BNX2FC_MAX_CMD_LEN 16
>
> -#define BNX2FC_TM_TIMEOUT 60 /* secs */
> +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */
Hi Chad,
when you add HZ here it should be removed from bnx2fc_initiate_tmf :
rc = wait_for_completion_timeout(&io_req->tm_done,
BNX2FC_TM_TIMEOUT * HZ);
Cheers,
Tomas
> #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */
>
> #define BNX2FC_WAIT_CNT 1200
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] bnx2fc: Add HZ to task management timeout.
2015-10-20 11:47 ` Tomas Henzl
@ 2015-10-20 14:17 ` Chad Dupuis
0 siblings, 0 replies; 23+ messages in thread
From: Chad Dupuis @ 2015-10-20 14:17 UTC (permalink / raw)
To: Tomas Henzl; +Cc: James.Bottomley, giridhar.malavali, linux-scsi
On Tue, 20 Oct 2015, Tomas Henzl wrote:
> On 19.10.2015 21:40, Chad Dupuis wrote:
>> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
>> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
>> ---
>> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
>> index d46267d..d05866d 100644
>> --- a/drivers/scsi/bnx2fc/bnx2fc.h
>> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
>> @@ -129,7 +129,7 @@
>> #define BNX2FC_MAX_FCP_TGT 256
>> #define BNX2FC_MAX_CMD_LEN 16
>>
>> -#define BNX2FC_TM_TIMEOUT 60 /* secs */
>> +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */
>
> Hi Chad,
> when you add HZ here it should be removed from bnx2fc_initiate_tmf :
> rc = wait_for_completion_timeout(&io_req->tm_done,
> BNX2FC_TM_TIMEOUT * HZ);
> Cheers,
> Tomas
Yeah, you're right...no need for this patch then. Self nack on this one.
>
>> #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */
>>
>> #define BNX2FC_WAIT_CNT 1200
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 1/7] bnx2fc: Update copyright for 2015.
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
@ 2015-10-21 10:19 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:19 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc.h | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_constants.h | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_debug.c | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_debug.h | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_els.c | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_hwi.c | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_io.c | 4 ++--
> drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 ++--
> 10 files changed, 20 insertions(+), 20 deletions(-)
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files.
2015-10-19 19:40 ` [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files Chad Dupuis
@ 2015-10-21 10:22 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:22 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/Kconfig | 5 ++---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_constants.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_debug.c | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_debug.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +++---
> drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +-
> 11 files changed, 14 insertions(+), 15 deletions(-)
>
Well; personally I would have given it some name; 'QLogic Linux FCoE
offload driver' feels a bit too generic.
But who am I to argue ...
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands.
2015-10-19 19:40 ` [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands Chad Dupuis
@ 2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:53 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:23 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc_els.c | 1 +
> drivers/scsi/bnx2fc/bnx2fc_io.c | 8 ++++++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_els.c b/drivers/scsi/bnx2fc/bnx2fc_els.c
> index 49d1e4d..0d0ab2e 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_els.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_els.c
> @@ -707,6 +707,7 @@ static int bnx2fc_initiate_els(struct bnx2fc_rport *tgt, unsigned int op,
> els_req->cb_func = cb_func;
> cb_arg->io_req = els_req;
> els_req->cb_arg = cb_arg;
> + els_req->data_xfer_len = data_len;
>
> mp_req = (struct bnx2fc_mp_req *)&(els_req->mp_req);
> rc = bnx2fc_init_mp_req(els_req);
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
> index 520dabe..5d6a81b 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_io.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
> @@ -623,8 +623,12 @@ int bnx2fc_init_mp_req(struct bnx2fc_cmd *io_req)
> mp_req = (struct bnx2fc_mp_req *)&(io_req->mp_req);
> memset(mp_req, 0, sizeof(struct bnx2fc_mp_req));
>
> - mp_req->req_len = sizeof(struct fcp_cmnd);
> - io_req->data_xfer_len = mp_req->req_len;
> + if (io_req->cmd_type != BNX2FC_ELS) {
> + mp_req->req_len = sizeof(struct fcp_cmnd);
> + io_req->data_xfer_len = mp_req->req_len;
> + } else
> + mp_req->req_len = io_req->data_xfer_len;
> +
> mp_req->req_buf = dma_alloc_coherent(&hba->pcidev->dev, CNIC_PAGE_SIZE,
> &mp_req->req_buf_dma,
> GFP_ATOMIC);
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing.
2015-10-19 19:40 ` [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing Chad Dupuis
@ 2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:23 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc_io.c | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
> index 5d6a81b..877a79a 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_io.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
> @@ -1759,7 +1759,10 @@ static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req,
> int fcp_rsp_len = 0;
>
> io_req->fcp_status = FC_GOOD;
> - io_req->fcp_resid = fcp_rsp->fcp_resid;
> + io_req->fcp_resid = 0;
> + if (rsp_flags & (FCOE_FCP_RSP_FLAGS_FCP_RESID_OVER |
> + FCOE_FCP_RSP_FLAGS_FCP_RESID_UNDER))
> + io_req->fcp_resid = fcp_rsp->fcp_resid;
>
> io_req->scsi_comp_flags = rsp_flags;
> CMD_SCSI_STATUS(sc_cmd) = io_req->cdb_status =
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 5/7] bnx2fc: Remove explicit logouts.
2015-10-19 19:40 ` [PATCH 5/7] bnx2fc: Remove explicit logouts Chad Dupuis
@ 2015-10-21 10:30 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:30 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Explicit logouts from bnx2fc were causing race conditions in either returning
> stale SCSI commands or not allowing a target to log back in.
>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 1 -
> drivers/scsi/bnx2fc/bnx2fc_els.c | 3 +-
> drivers/scsi/bnx2fc/bnx2fc_io.c | 85 ++++---------------------------------
> drivers/scsi/bnx2fc/bnx2fc_tgt.c | 6 ---
> 4 files changed, 11 insertions(+), 84 deletions(-)
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 6/7] bnx2fc: Add HZ to task management timeout.
2015-10-19 19:40 ` [PATCH 6/7] bnx2fc: Add HZ to task management timeout Chad Dupuis
2015-10-20 11:47 ` Tomas Henzl
@ 2015-10-21 10:30 ` Hannes Reinecke
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:30 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
> index d46267d..d05866d 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc.h
> +++ b/drivers/scsi/bnx2fc/bnx2fc.h
> @@ -129,7 +129,7 @@
> #define BNX2FC_MAX_FCP_TGT 256
> #define BNX2FC_MAX_CMD_LEN 16
>
> -#define BNX2FC_TM_TIMEOUT 60 /* secs */
> +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */
> #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */
>
> #define BNX2FC_WAIT_CNT 1200
>
Retracted, so no review :-)
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 7/7] bnx2fc: Update version number to 2.9.6.
2015-10-19 19:40 ` [PATCH 7/7] bnx2fc: Update version number to 2.9.6 Chad Dupuis
@ 2015-10-21 10:31 ` Hannes Reinecke
2015-10-22 14:55 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Hannes Reinecke @ 2015-10-21 10:31 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 10/19/2015 09:40 PM, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
> ---
> drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 1/7] bnx2fc: Update copyright for 2015.
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
2015-10-21 10:19 ` Hannes Reinecke
@ 2015-10-22 14:50 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:50 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files.
2015-10-19 19:40 ` [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files Chad Dupuis
2015-10-21 10:22 ` Hannes Reinecke
@ 2015-10-22 14:50 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:50 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands.
2015-10-19 19:40 ` [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
@ 2015-10-22 14:53 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:53 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing.
2015-10-19 19:40 ` [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
@ 2015-10-22 14:54 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:54 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 5/7] bnx2fc: Remove explicit logouts.
2015-10-19 19:40 ` [PATCH 5/7] bnx2fc: Remove explicit logouts Chad Dupuis
2015-10-21 10:30 ` Hannes Reinecke
@ 2015-10-22 14:54 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:54 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Explicit logouts from bnx2fc were causing race conditions in either returning
> stale SCSI commands or not allowing a target to log back in.
>
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 7/7] bnx2fc: Update version number to 2.9.6.
2015-10-19 19:40 ` [PATCH 7/7] bnx2fc: Update version number to 2.9.6 Chad Dupuis
2015-10-21 10:31 ` Hannes Reinecke
@ 2015-10-22 14:55 ` Tomas Henzl
1 sibling, 0 replies; 23+ messages in thread
From: Tomas Henzl @ 2015-10-22 14:55 UTC (permalink / raw)
To: Chad Dupuis, James.Bottomley; +Cc: giridhar.malavali, linux-scsi
On 19.10.2015 21:40, Chad Dupuis wrote:
> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Tomas
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2015-10-22 14:55 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-19 19:40 [PATCH 0/7] bnx2fc: Update to version 2.9.6 Chad Dupuis
2015-10-19 19:40 ` [PATCH 1/7] bnx2fc: Update copyright for 2015 Chad Dupuis
2015-10-21 10:19 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 2/7] bnx2fc: Remove 'NetXtreme II' from source files Chad Dupuis
2015-10-21 10:22 ` Hannes Reinecke
2015-10-22 14:50 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 3/7] bnx2fc: Set ELS transfer length correctly for middle path commands Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:53 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 4/7] bnx2fc: Fix FCP RSP residual parsing Chad Dupuis
2015-10-21 10:23 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 5/7] bnx2fc: Remove explicit logouts Chad Dupuis
2015-10-21 10:30 ` Hannes Reinecke
2015-10-22 14:54 ` Tomas Henzl
2015-10-19 19:40 ` [PATCH 6/7] bnx2fc: Add HZ to task management timeout Chad Dupuis
2015-10-20 11:47 ` Tomas Henzl
2015-10-20 14:17 ` Chad Dupuis
2015-10-21 10:30 ` Hannes Reinecke
2015-10-19 19:40 ` [PATCH 7/7] bnx2fc: Update version number to 2.9.6 Chad Dupuis
2015-10-21 10:31 ` Hannes Reinecke
2015-10-22 14:55 ` Tomas Henzl
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.