Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
scsi
/
be2iscsi
/
be_main.h
diff --git
a/kernel/drivers/scsi/be2iscsi/be_main.h
b/kernel/drivers/scsi/be2iscsi/be_main.h
index
e70ea26
..
5c67c07
100644
(file)
--- a/
kernel/drivers/scsi/be2iscsi/be_main.h
+++ b/
kernel/drivers/scsi/be2iscsi/be_main.h
@@
-1,5
+1,5
@@
/**
/**
- * Copyright (C) 2005 - 2015
Avago Technologies
+ * Copyright (C) 2005 - 2015
Emulex
* All rights reserved.
*
* This program is free software; you can redistribute it and/or
* All rights reserved.
*
* This program is free software; you can redistribute it and/or
@@
-12,7
+12,7
@@
* Contact Information:
* linux-drivers@avagotech.com
*
* Contact Information:
* linux-drivers@avagotech.com
*
- *
Avago Technologies
+ *
Emulex
* 3333 Susan Street
* Costa Mesa, CA 92626
*/
* 3333 Susan Street
* Costa Mesa, CA 92626
*/
@@
-36,8
+36,8
@@
#include <scsi/scsi_transport_iscsi.h>
#define DRV_NAME "be2iscsi"
#include <scsi/scsi_transport_iscsi.h>
#define DRV_NAME "be2iscsi"
-#define BUILD_STR "10.
4.114.0
"
-#define BE_NAME "
Avago Technologies
OneConnect" \
+#define BUILD_STR "10.
6.0.1
"
+#define BE_NAME "
Emulex
OneConnect" \
"Open-iSCSI Driver version" BUILD_STR
#define DRV_DESC BE_NAME " " "Driver"
"Open-iSCSI Driver version" BUILD_STR
#define DRV_DESC BE_NAME " " "Driver"
@@
-109,6
+109,9
@@
#define BEISCSI_CLEAN_UNLOAD 0x01
#define BEISCSI_EEH_UNLOAD 0x02
#define BEISCSI_CLEAN_UNLOAD 0x01
#define BEISCSI_EEH_UNLOAD 0x02
+
+#define BE_GET_BOOT_RETRIES 45
+#define BE_GET_BOOT_TO 20
/**
* hardware needs the async PDU buffers to be posted in multiples of 8
* So have atleast 8 of them by default
/**
* hardware needs the async PDU buffers to be posted in multiples of 8
* So have atleast 8 of them by default
@@
-413,6
+416,7
@@
struct beiscsi_hba {
} fw_config;
unsigned int state;
} fw_config;
unsigned int state;
+ int get_boot;
bool fw_timeout;
bool ue_detected;
struct delayed_work beiscsi_hw_check_task;
bool fw_timeout;
bool ue_detected;
struct delayed_work beiscsi_hw_check_task;
@@
-498,6
+502,7
@@
struct beiscsi_io_task {
struct sgl_handle *psgl_handle;
struct beiscsi_conn *conn;
struct scsi_cmnd *scsi_cmnd;
struct sgl_handle *psgl_handle;
struct beiscsi_conn *conn;
struct scsi_cmnd *scsi_cmnd;
+ struct hwi_wrb_context *pwrb_context;
unsigned int cmd_sn;
unsigned int flags;
unsigned short cid;
unsigned int cmd_sn;
unsigned int flags;
unsigned short cid;
@@
-829,7
+834,8
@@
struct amap_iscsi_wrb_v2 {
} __packed;
} __packed;
-struct wrb_handle *alloc_wrb_handle(struct beiscsi_hba *phba, unsigned int cid);
+struct wrb_handle *alloc_wrb_handle(struct beiscsi_hba *phba, unsigned int cid,
+ struct hwi_wrb_context **pcontext);
void
free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle);
void
free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle);
@@
-1040,7
+1046,6
@@
enum hwh_type_enum {
struct wrb_handle {
enum hwh_type_enum type;
unsigned short wrb_index;
struct wrb_handle {
enum hwh_type_enum type;
unsigned short wrb_index;
- unsigned short nxt_wrb_index;
struct iscsi_task *pio_handle;
struct iscsi_wrb *pwrb;
struct iscsi_task *pio_handle;
struct iscsi_wrb *pwrb;