From patchwork Tue Mar 24 13:05:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 453818 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8D6521400A0 for ; Wed, 25 Mar 2015 00:06:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752490AbbCXNGJ (ORCPT ); Tue, 24 Mar 2015 09:06:09 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:34668 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbbCXNGB (ORCPT ); Tue, 24 Mar 2015 09:06:01 -0400 Received: by wgs2 with SMTP id 2so63725540wgs.1 for ; Tue, 24 Mar 2015 06:06:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GmAVSiwEtMzwW2X/CBMTY0SD1N4fotjCsp0sK75Ywt8=; b=VgOHmrSx9c8Af21jkAmEePMYWL/3SFOwJmiLSbaKBVftVmGVwSSnT3knYCjDcuKiUM WHf5hwUp8rCBUG+yCWfH+/Wc1no17BdKBmbRUTyFf/ljL1BrLp6/WcgyxGfaPI3Mp5QH 1LvzzvN7dzJevLNVosVG2AU7PQ3IRUW7OyOCn8HUh/n//3UTvlDgvCYDIDCz+pRnX8li fb27C/So/Kd4qVviLq+1sEQ97Tvb8y1OHYcA4RjvBLD/+DQ4txjGsnA0EhXNLR2+Wtz9 /Tht89G3TQz4eLvch5PsYZr0pMdr4dKV26KcRRn7j1Isnf/O1IEUwnyz72bt94yzd/nq 8pgg== X-Gm-Message-State: ALoCoQlrmn+KUzvd6HGv1ai1nmMhAfupl41oeKVDegKHXZjwgZEiik7Orc/YvCrMuEg8t42EvwI4 X-Received: by 10.194.87.65 with SMTP id v1mr8060602wjz.2.1427202360595; Tue, 24 Mar 2015 06:06:00 -0700 (PDT) Received: from vladz-laptop.cloudius-systems.com. (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id dj4sm6049570wjc.13.2015.03.24.06.05.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2015 06:05:59 -0700 (PDT) From: Vlad Zolotarov To: netdev@vger.kernel.org Cc: jeffrey.t.kirsher@intel.com, avi@cloudius-systems.com, gleb@cloudius-systems.com, Vlad Zolotarov Subject: [PATCH net-next v7 6/7] ixgbevf: Add RSS Key query code Date: Tue, 24 Mar 2015 15:05:45 +0200 Message-Id: <1427202346-12502-7-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427202346-12502-1-git-send-email-vladz@cloudius-systems.com> References: <1427202346-12502-1-git-send-email-vladz@cloudius-systems.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add the ixgbevf_get_rss_key() function that queries the PF for an RSS Random Key using a new VF-PF channel IXGBE_VF_GET_RSS_KEY command. Signed-off-by: Vlad Zolotarov --- New in v6: - Return a proper return code when an operation is blocked by PF. New in v2: - Added a more detailed patch description. New in v1 (compared to RFC): - Use "if-else" statement instead of a "switch-case" for a single option case (in ixgbevf_get_rss_key()). --- 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 7342554..923bb0f 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -115,6 +115,8 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_RETA_SZ 1 /* Number of RETA DWs to bring */ #define IXGBE_VF_RETA_OFFSET 2 /* Offset in RETA */ +#define IXGBE_VF_GET_RSS_KEY 0x0b /* get RSS hash key */ + /* length of permanent address message returned from PF */ #define IXGBE_VF_PERMADDR_MSG_LEN 4 /* word in permanent address message with the current multicast type */ diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.c b/drivers/net/ethernet/intel/ixgbevf/vf.c index 3e51db6..709cb23 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -299,6 +299,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 */ + if (hw->api_version != ixgbe_mbox_api_12) + 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 the operation has been refused by a PF return -EPERM */ + if (msgbuf[0] == (IXGBE_VF_GET_RETA | IXGBE_VT_MSGTYPE_NACK)) + return -EPERM; + + /* 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 89bc88e..0bdc5ad 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h @@ -211,4 +211,5 @@ 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__ */