From patchwork Mon Jan 5 14:46:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 425345 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 C5F88140081 for ; Tue, 6 Jan 2015 01:47:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754016AbbAEOrA (ORCPT ); Mon, 5 Jan 2015 09:47:00 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:59260 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753804AbbAEOq6 (ORCPT ); Mon, 5 Jan 2015 09:46:58 -0500 Received: by mail-we0-f175.google.com with SMTP id k11so7994676wes.20 for ; Mon, 05 Jan 2015 06:46:57 -0800 (PST) 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=BFG0SqC0e1TdGppsh6fLlHDY4aFn2tSi+gCwvdyRfKU=; b=axUE2H9k1DsMg6DnGOZiV5+gNQATHzKe2QildaY70f9S4kKLecPRtec4SZIA7i5T4q vnnSYGdAs6iNq8rIxDuX2RrRjxaWdBWC3qDlN2DRnFgGNCDZyO2E4Db6HhyW1O0Hzhhi CWsZuit3HoYyok+FwyD5EyfitY9+3RQyplaatavl/h3J21vbgyy4rpW6cEoHbc2aYmmr xCIAhIkTw5GG0pTQkfrfQ/BEM2UESWS2qqEdUxNZCc4NjpEnJ2Fk+0BuGfwVO5bUGnTJ OnL4j144q7Beg1s3NWH2g5l3DYYC1ovWQI8Nm3S7hoiCHRJO8azb+iDgJ+VaIkFx+0fs XCWg== X-Gm-Message-State: ALoCoQlU/QDQvVB3Q2jKvq6g32okgYGaxFha4XfZeiAgDa5+tq+jHC4Q+SJgeJ8PrZ2dlyWppTXY X-Received: by 10.194.81.1 with SMTP id v1mr182303051wjx.50.1420469216468; Mon, 05 Jan 2015 06:46:56 -0800 (PST) Received: from vladz-laptop.cloudius-systems.com. (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id hn2sm75697066wjc.5.2015.01.05.06.46.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Jan 2015 06:46:55 -0800 (PST) From: Vlad Zolotarov To: netdev@vger.kernel.org Cc: gleb@cloudius-systems.com, avi@cloudius-systems.com, jeffrey.t.kirsher@intel.com, Vlad Zolotarov Subject: [PATCH net-next v4 4/5] ixgbevf: Add RSS Key query code Date: Mon, 5 Jan 2015 16:46:41 +0200 Message-Id: <1420469202-1847-5-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1420469202-1847-1-git-send-email-vladz@cloudius-systems.com> References: <1420469202-1847-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 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 | 44 ++++++++++++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbevf/vf.h | 1 + 3 files changed, 47 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h index 951a506..f79432e 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -118,6 +118,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 cb5a4cf..f42a67d 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -292,6 +292,50 @@ 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 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__ */