Skip to content

Commit

Permalink
Merge branch 'qed-next'
Browse files Browse the repository at this point in the history
Yuval Mintz says:

====================
qed*: Patch series

This series does several things. The bigger changes:

 - Add new notification APIs [& Defaults] for various fields.
The series then utilizes some of those qed <-> qede APIs to bass WoL
support upon.

 - Change the resource allocation scheme to receive the values from
management firmware, instead of equally sharing resources between
functions [that might not need those]. That would, e.g., allow us to
configure additional filters to network interfaces in presence of
storage [PCI] functions from same adapter.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Oct 31, 2016
2 parents 89d9123 + 2edbff8 commit f3a6f59
Show file tree
Hide file tree
Showing 16 changed files with 1,404 additions and 97 deletions.
19 changes: 17 additions & 2 deletions drivers/net/ethernet/qlogic/qed/qed.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ struct qed_qm_iids {
u32 tids;
};

enum QED_RESOURCES {
/* HW / FW resources, output of features supported below, most information
* is received from MFW.
*/
enum qed_resources {
QED_SB,
QED_L2_QUEUE,
QED_VPORT,
Expand All @@ -166,6 +169,7 @@ enum QED_RESOURCES {
QED_RDMA_CNQ_RAM,
QED_ILT,
QED_LL2_QUEUE,
QED_CMDQS_CQS,
QED_RDMA_STATS_QUEUE,
QED_MAX_RESC,
};
Expand All @@ -174,6 +178,7 @@ enum QED_FEATURE {
QED_PF_L2_QUE,
QED_VF,
QED_RDMA_CNQ,
QED_VF_L2_QUE,
QED_MAX_FEATURES,
};

Expand All @@ -195,6 +200,11 @@ enum qed_dev_cap {
QED_DEV_CAP_ROCE,
};

enum qed_wol_support {
QED_WOL_SUPPORT_NONE,
QED_WOL_SUPPORT_PME,
};

struct qed_hw_info {
/* PCI personality */
enum qed_pci_personality personality;
Expand Down Expand Up @@ -226,6 +236,9 @@ struct qed_hw_info {
u32 port_mode;
u32 hw_mode;
unsigned long device_capabilities;
u16 mtu;

enum qed_wol_support b_wol_support;
};

struct qed_hw_cid_data {
Expand Down Expand Up @@ -538,7 +551,9 @@ struct qed_dev {
u8 mcp_rev;
u8 boot_mode;

u8 wol;
/* WoL related configurations */
u8 wol_config;
u8 wol_mac[ETH_ALEN];

u32 int_mode;
enum qed_coalescing_mode int_coalescing_mode;
Expand Down
Loading

0 comments on commit f3a6f59

Please sign in to comment.