diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-07 14:14:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-07 14:14:05 -0500 |
| commit | 23bd51e0f04c94b6416b60e85db67efcc47f1b09 (patch) | |
| tree | 6f66536e6aea5474156bada139a9c1e728e871e3 /include/linux | |
| parent | 4675390a9e7183bf45590e84a183e22e32c485a7 (diff) | |
| parent | 8f16bc97fa2a47e2e46d36f2f682e1215ee172f5 (diff) | |
Merge branch 'qed-fixes'
Manish Chopra says:
====================
qed: Bug fixes
Please consider applying this series to net.
V2:
- Use available helpers for declaring bitmap
and bitmap operations.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/qed/common_hsi.h | 2 | ||||
| -rw-r--r-- | include/linux/qed/qed_chain.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/qed/common_hsi.h b/include/linux/qed/common_hsi.h index 6a4347639c03..1d1ba2c5ee7a 100644 --- a/include/linux/qed/common_hsi.h +++ b/include/linux/qed/common_hsi.h @@ -9,6 +9,8 @@ #ifndef __COMMON_HSI__ #define __COMMON_HSI__ +#define CORE_SPQE_PAGE_SIZE_BYTES 4096 + #define FW_MAJOR_VERSION 8 #define FW_MINOR_VERSION 4 #define FW_REVISION_VERSION 2 diff --git a/include/linux/qed/qed_chain.h b/include/linux/qed/qed_chain.h index b920c3605c46..41b9049b57e2 100644 --- a/include/linux/qed/qed_chain.h +++ b/include/linux/qed/qed_chain.h @@ -111,7 +111,8 @@ static inline u16 qed_chain_get_elem_left(struct qed_chain *p_chain) used = ((u32)0x10000u + (u32)(p_chain->prod_idx)) - (u32)p_chain->cons_idx; if (p_chain->mode == QED_CHAIN_MODE_NEXT_PTR) - used -= (used / p_chain->elem_per_page); + used -= p_chain->prod_idx / p_chain->elem_per_page - + p_chain->cons_idx / p_chain->elem_per_page; return p_chain->capacity - used; } |