git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/i40e: fix Rx data segment buffer length
[dpdk.git]
/
drivers
/
net
/
i40e
/
base
/
i40e_adminq.h
diff --git
a/drivers/net/i40e/base/i40e_adminq.h
b/drivers/net/i40e/base/i40e_adminq.h
index
410d07e
..
182e40b
100644
(file)
--- a/
drivers/net/i40e/base/i40e_adminq.h
+++ b/
drivers/net/i40e/base/i40e_adminq.h
@@
-76,6
+76,7
@@
struct i40e_asq_cmd_details {
u16 flags_dis;
bool async;
bool postpone;
u16 flags_dis;
bool async;
bool postpone;
+ struct i40e_aq_desc *wb_desc;
};
#define I40E_ADMINQ_DETAILS(R, i) \
};
#define I40E_ADMINQ_DETAILS(R, i) \
@@
-103,7
+104,6
@@
struct i40e_adminq_info {
u32 fw_build; /* firmware build number */
u16 api_maj_ver; /* api major version */
u16 api_min_ver; /* api minor version */
u32 fw_build; /* firmware build number */
u16 api_maj_ver; /* api major version */
u16 api_min_ver; /* api minor version */
- bool nvm_release_on_done;
struct i40e_spinlock asq_spinlock; /* Send queue spinlock */
struct i40e_spinlock arq_spinlock; /* Receive queue spinlock */
struct i40e_spinlock asq_spinlock; /* Send queue spinlock */
struct i40e_spinlock arq_spinlock; /* Receive queue spinlock */
@@
-115,9
+115,10
@@
struct i40e_adminq_info {
/**
* i40e_aq_rc_to_posix - convert errors to user-land codes
/**
* i40e_aq_rc_to_posix - convert errors to user-land codes
- * aq_rc: AdminQ error code to convert
+ * aq_ret: AdminQ handler error code can override aq_rc
+ * aq_rc: AdminQ firmware error code to convert
**/
**/
-STATIC
inline int i40e_aq_rc_to_posix(int aq_ret, u16
aq_rc)
+STATIC
INLINE int i40e_aq_rc_to_posix(int aq_ret, int
aq_rc)
{
int aq_to_posix[] = {
0, /* I40E_AQ_RC_OK */
{
int aq_to_posix[] = {
0, /* I40E_AQ_RC_OK */
@@
-149,14
+150,18
@@
STATIC inline int i40e_aq_rc_to_posix(int aq_ret, u16 aq_rc)
if (aq_ret == I40E_ERR_ADMIN_QUEUE_TIMEOUT)
return -EAGAIN;
if (aq_ret == I40E_ERR_ADMIN_QUEUE_TIMEOUT)
return -EAGAIN;
- if (
aq_rc >= (sizeof(aq_to_posix) / sizeof((aq_to_posix)[0]
)))
+ if (
!((u32)aq_rc < (sizeof(aq_to_posix) / sizeof((aq_to_posix)[0])
)))
return -ERANGE;
return -ERANGE;
+
return aq_to_posix[aq_rc];
}
/* general information */
return aq_to_posix[aq_rc];
}
/* general information */
-#define I40E_AQ_LARGE_BUF 512
-#define I40E_ASQ_CMD_TIMEOUT 250 /* msecs */
+#define I40E_AQ_LARGE_BUF 512
+#define I40E_ASQ_CMD_TIMEOUT 250000 /* usecs */
+#ifdef I40E_ESS_SUPPORT
+#define I40E_ASQ_CMD_TIMEOUT_ESS 50000000 /* usecs */
+#endif
void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
u16 opcode);
void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
u16 opcode);