| Message ID | 1419957035-1078-5-git-send-email-vladz@cloudius-systems.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Dec 30, 2014 at 8:30 AM, Vlad Zolotarov <vladz@cloudius-systems.com> wrote: > Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com> > --- > drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 ++ > drivers/net/ethernet/intel/ixgbevf/vf.c | 48 ++++++++++++++++++++++++++++++++ > drivers/net/ethernet/intel/ixgbevf/vf.h | 1 + > 3 files changed, 51 insertions(+) > > diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h > index 3e148a8..9674ac8 100644 > --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h > +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h > @@ -110,6 +110,8 @@ enum ixgbe_pfvf_api_rev { > #define IXGBE_VF_GET_RETA_1 0x0b /* get RETA[12..23] */ > #define IXGBE_VF_GET_RETA_2 0x0c /* get RETA[24..31] */ > > +#define IXGBE_VF_GET_RSS_KEY 0x0d /* get RSS hash key */ > + > /* GET_QUEUES return data indices within the mailbox */ > #define IXGBE_VF_TX_QUEUES 1 /* number of Tx queues supported */ > #define IXGBE_VF_RX_QUEUES 2 /* number of Rx queues supported */ > diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c > index 3ebc882..7987ab0 100644 > --- a/drivers/net/ethernet/intel/ixgbevf/vf.c > +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c > @@ -290,6 +290,54 @@ static inline int _ixgbevf_get_reta(struct ixgbe_hw *hw, u32 *msgbuf, > } > > /** > + * ixgbevf_get_rss_key - get the RSS Random Key > + * @hw: pointer to the HW structure > + * @reta: buffer to fill with RETA contents. > + * > + * The "rss_key" buffer should be big enough to contain 10 registers. > + * > + * Returns: 0 on success. > + * if API doesn't support this operation - (-EPERM). > + */ > +int ixgbevf_get_rss_key(struct ixgbe_hw *hw, u8 *rss_key) > +{ > + int err; > + u32 msgbuf[IXGBE_VFMAILBOX_SIZE]; > + > + /* Return and error if API doesn't support RSS Random Key retrieval */ > + switch (hw->api_version) { > + case ixgbe_mbox_api_12: > + break; > + default: > + return -EPERM; > + } An if statement here as well, instead of a switch statement. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h index 3e148a8..9674ac8 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -110,6 +110,8 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_GET_RETA_1 0x0b /* get RETA[12..23] */ #define IXGBE_VF_GET_RETA_2 0x0c /* get RETA[24..31] */ +#define IXGBE_VF_GET_RSS_KEY 0x0d /* get RSS hash key */ + /* GET_QUEUES return data indices within the mailbox */ #define IXGBE_VF_TX_QUEUES 1 /* number of Tx queues supported */ #define IXGBE_VF_RX_QUEUES 2 /* number of Rx queues supported */ diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index 3ebc882..7987ab0 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -290,6 +290,54 @@ static inline int _ixgbevf_get_reta(struct ixgbe_hw *hw, u32 *msgbuf, } /** + * ixgbevf_get_rss_key - get the RSS Random Key + * @hw: pointer to the HW structure + * @reta: buffer to fill with RETA contents. + * + * The "rss_key" buffer should be big enough to contain 10 registers. + * + * Returns: 0 on success. + * if API doesn't support this operation - (-EPERM). + */ +int ixgbevf_get_rss_key(struct ixgbe_hw *hw, u8 *rss_key) +{ + int err; + u32 msgbuf[IXGBE_VFMAILBOX_SIZE]; + + /* Return and error if API doesn't support RSS Random Key retrieval */ + switch (hw->api_version) { + case ixgbe_mbox_api_12: + break; + default: + return -EPERM; + } + + msgbuf[0] = IXGBE_VF_GET_RSS_KEY; + err = hw->mbx.ops.write_posted(hw, msgbuf, 1); + + if (err) + return err; + + err = hw->mbx.ops.read_posted(hw, msgbuf, 11); + + if (err) + return err; + + msgbuf[0] &= ~IXGBE_VT_MSGTYPE_CTS; + + /* If we didn't get an ACK there must have been + * some sort of mailbox error so we should treat it + * as such. + */ + if (msgbuf[0] != (IXGBE_VF_GET_RSS_KEY | IXGBE_VT_MSGTYPE_ACK)) + return IXGBE_ERR_MBX; + + memcpy(rss_key, msgbuf + 1, 40); + + return 0; +} + +/** * ixgbevf_get_reta - get the RSS redirection table (RETA) contents. * @hw: pointer to the HW structure * @reta: buffer to fill with RETA contents. diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h index 73c1b33..54f53f2b8 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h @@ -209,5 +209,6 @@ int ixgbevf_negotiate_api_version(struct ixgbe_hw *hw, int api); int ixgbevf_get_queues(struct ixgbe_hw *hw, unsigned int *num_tcs, unsigned int *default_tc); int ixgbevf_get_reta(struct ixgbe_hw *hw, u32 *reta); +int ixgbevf_get_rss_key(struct ixgbe_hw *hw, u8 *rss_key); #endif /* __IXGBE_VF_H__ */
Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com> --- drivers/net/ethernet/intel/ixgbevf/mbx.h | 2 ++ drivers/net/ethernet/intel/ixgbevf/vf.c | 48 ++++++++++++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbevf/vf.h | 1 + 3 files changed, 51 insertions(+)