From patchwork Wed Mar 25 17:42:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 454738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 27AB814012C for ; Thu, 26 Mar 2015 05:59:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4FB3A3387E for ; Wed, 25 Mar 2015 18:59:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zzmYC2X+wer4 for ; Wed, 25 Mar 2015 18:59:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 16F95338C4 for ; Wed, 25 Mar 2015 18:59:36 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7342F1BFA7A for ; Wed, 25 Mar 2015 17:48:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 63C58310AE for ; Wed, 25 Mar 2015 17:48:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cKuBkcCCRFac for ; Wed, 25 Mar 2015 17:48:49 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by silver.osuosl.org (Postfix) with ESMTPS id 81FD931215 for ; Wed, 25 Mar 2015 17:48:49 +0000 (UTC) Received: by wgra20 with SMTP id a20so36291481wgr.3 for ; Wed, 25 Mar 2015 10:48:48 -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=to9Qxkad/9p61Rug+XP8OsBK0rwZeD+ebls1TQCeLUs=; b=cMZtURfZaNJ+isjH2Ex2V/OW5xO9BjhtJUb/LlrUQXgGJnH7So08imNco+VrRDW14v qr1dipXpwtU6Ta1r/tehh3wNWIRjyghggDkxE3shDBw3f1sj56PmZPE0VUTCCowbpnXx YKj7UWlnkGwBzrfHmm/yUaxJ3JVs8lNHlw/QvvohEYwc468owBJeSfAJU3kX2xF1Sa2p VVp24C1/x+y4CdiN9hnFH6T/eKz664PQZ7CRoIsaF/061sEjVOfpQcx+STZbWNjvqT3M 00vUka3lUQsKsyWDZxGbV1XD+w5zB4CxFS4Ej24Pwr0jtfhk3WIbiQmU2DDsM11J+8FY KClQ== X-Gm-Message-State: ALoCoQnoArXDl4FultC7L8LUembbmAtTUp3/VXZVv73mBO/Q8XvXJ/NFypb3PypTj8tydzyINpS0 X-Received: by 10.194.57.206 with SMTP id k14mr20571512wjq.1.1427305375259; Wed, 25 Mar 2015 10:42:55 -0700 (PDT) Received: from vladz-laptop.localdomain (bzq-109-65-117-109.red.bezeqint.net. [109.65.117.109]) by mx.google.com with ESMTPSA id na4sm5267653wic.10.2015.03.25.10.42.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 10:42:54 -0700 (PDT) From: Vlad Zolotarov To: netdev@vger.kernel.org Date: Wed, 25 Mar 2015 19:42:39 +0200 Message-Id: <1427305362-23948-5-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427305362-23948-1-git-send-email-vladz@cloudius-systems.com> References: <1427305362-23948-1-git-send-email-vladz@cloudius-systems.com> X-Mailman-Approved-At: Wed, 25 Mar 2015 18:59:34 +0000 Cc: avi@cloudius-systems.com, intel-wired-lan@lists.osuosl.org, gleb@cloudius-systems.com Subject: [Intel-wired-lan] [PATCH net-next v8 4/7] ixgbevf: Add a RETA query code X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" - Added a new API version support. - Added the query implementation in the ixgbevf. Signed-off-by: Vlad Zolotarov --- New in v8: - Protect mailbox with a spinlock. New in v7: - Add ixgbe_mbox_api_12 case in ixgbevf_set_num_queues(). - Properly expand HW RETA into the ethtool buffer. New in v6: - Add a proper return code when an operation is blocked by PF. New in v3: - Adjusted to the new interface IXGBE_VF_GET_RETA command. - Added a proper support for x550 devices. New in v1 (compared to RFC): - Use "if-else" statement instead of a "switch-case" for a single option case (in ixgbevf_get_reta()). --- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 +- drivers/net/ethernet/intel/ixgbevf/mbx.h | 8 ++ drivers/net/ethernet/intel/ixgbevf/vf.c | 124 ++++++++++++++++++++++ drivers/net/ethernet/intel/ixgbevf/vf.h | 2 + 4 files changed, 138 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 4ee15ad..a16d267 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -2030,7 +2030,8 @@ static void ixgbevf_init_last_counter_stats(struct ixgbevf_adapter *adapter) static void ixgbevf_negotiate_api(struct ixgbevf_adapter *adapter) { struct ixgbe_hw *hw = &adapter->hw; - int api[] = { ixgbe_mbox_api_11, + int api[] = { ixgbe_mbox_api_12, + ixgbe_mbox_api_11, ixgbe_mbox_api_10, ixgbe_mbox_api_unknown }; int err = 0, idx = 0; @@ -2332,6 +2333,7 @@ static void ixgbevf_set_num_queues(struct ixgbevf_adapter *adapter) switch (hw->api_version) { case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: adapter->num_rx_queues = rss; adapter->num_tx_queues = rss; default: @@ -3712,6 +3714,7 @@ static int ixgbevf_change_mtu(struct net_device *netdev, int new_mtu) switch (adapter->hw.api_version) { case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: max_possible_frame = IXGBE_MAX_JUMBO_FRAME_SIZE; break; default: diff --git a/drivers/net/ethernet/intel/ixgbevf/mbx.h b/drivers/net/ethernet/intel/ixgbevf/mbx.h index 6253e93..7342554 100644 --- a/drivers/net/ethernet/intel/ixgbevf/mbx.h +++ b/drivers/net/ethernet/intel/ixgbevf/mbx.h @@ -83,6 +83,7 @@ enum ixgbe_pfvf_api_rev { ixgbe_mbox_api_10, /* API version 1.0, linux/freebsd VF driver */ ixgbe_mbox_api_20, /* API version 2.0, solaris Phase1 VF driver */ ixgbe_mbox_api_11, /* API version 1.1, linux/freebsd VF driver */ + ixgbe_mbox_api_12, /* API version 1.2, linux/freebsd VF driver */ /* This value should always be last */ ixgbe_mbox_api_unknown, /* indicates that API version is not known */ }; @@ -107,6 +108,13 @@ enum ixgbe_pfvf_api_rev { #define IXGBE_VF_TRANS_VLAN 3 /* Indication of port VLAN */ #define IXGBE_VF_DEF_QUEUE 4 /* Default queue offset */ +/* mailbox API, version 1.2 VF requests */ +#define IXGBE_VF_GET_RETA 0x0a /* VF request for RETA */ + +/* GET_RETA request data indices within the mailbox */ +#define IXGBE_VF_RETA_SZ 1 /* Number of RETA DWs to bring */ +#define IXGBE_VF_RETA_OFFSET 2 /* Offset in RETA */ + /* 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 2614fd3..2e468a6 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.c +++ b/drivers/net/ethernet/intel/ixgbevf/vf.c @@ -256,6 +256,129 @@ static s32 ixgbevf_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr) return ret_val; } +static inline int _ixgbevf_get_reta_locked(struct ixgbe_hw *hw, u32 *msgbuf, + u32 *reta, u32 reta_offset_dw, + u32 dwords) +{ + int err, i; + u8 *hw_reta = (u8 *)&msgbuf[1]; + + msgbuf[0] = IXGBE_VF_GET_RETA; + msgbuf[IXGBE_VF_RETA_SZ] = dwords; + msgbuf[IXGBE_VF_RETA_OFFSET] = reta_offset_dw; + + err = hw->mbx.ops.write_posted(hw, msgbuf, 3); + + if (err) + return err; + + err = hw->mbx.ops.read_posted(hw, msgbuf, 1 + dwords); + + 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_RETA | IXGBE_VT_MSGTYPE_ACK)) + return IXGBE_ERR_MBX; + + /* HW RETA is an array of u8, while ethtool buffer is an array of u32. + * Therefore we need to "expand" the HW RETA into the ethtool buffer. + */ + for (i = 0; i < dwords * 4; i++) + reta[reta_offset_dw * 4 + i] = hw_reta[i]; + + return 0; +} + +/** + * _ixgbevf_get_reta - read a subsection of a VF's RETA table + * + * @a pointer to a port handle + * @msgbuf mailbox buffer to use + * @reta ethtool output buffer + * @reta_offset_dw HW RETA DWORD index to start from + * @dwords number of HW RETA DWORDs to fetch + * + * This function ensures the atomicy of a mailbox operation using the + * adapter.mbx_lock spinlock. + */ +static inline int _ixgbevf_get_reta(struct ixgbevf_adapter *a, + u32 *msgbuf, u32 *reta, u32 reta_offset_dw, + u32 dwords) +{ + int rc; + + spin_lock_bh(&a->mbx_lock); + rc = _ixgbevf_get_reta_locked(&a->hw, msgbuf, reta, reta_offset_dw, + dwords); + spin_unlock_bh(&a->mbx_lock); + + return rc; +} + +/** + * ixgbevf_get_reta - get the RSS redirection table (RETA) contents. + * @adapter: pointer to the port handle + * @reta: buffer to fill with RETA contents. + * + * The "reta" buffer should be big enough to contain 32 registers. + * + * Returns: 0 on success. + * if API doesn't support this operation - (-EPERM). + */ +int ixgbevf_get_reta(struct ixgbevf_adapter *adapter, u32 *reta) +{ + int err; + u32 msgbuf[IXGBE_VFMAILBOX_SIZE]; + + /* Return an error if API doesn't RETA querying. */ + if (adapter->hw.api_version != ixgbe_mbox_api_12) + return -EPERM; + + /* x550 devices have a separate RETA for each VF: 64 bytes each. + * + * We'll get it in 2 steps due to mailbox size limitation - we can bring + * up to 15 dwords every time. Therefore we'll bring 12 and 4 dwords. + * + * Older devices share a RETA table with the PF: 128 bytes. + * + * For them we do it in 3 steps. Therefore we'll bring it in 3 steps: + * 12, 12 and 8 dwords in each step correspondingly. + */ + + /* RETA[0..11] */ + err = _ixgbevf_get_reta(adapter, msgbuf, reta, 0, 12); + if (err) + return err; + + if (adapter->hw.mac.type >= ixgbe_mac_X550_vf) { + /* RETA[12..15] */ + err = _ixgbevf_get_reta(adapter, msgbuf, reta, 12, 4); + if (err) + return err; + + } else { + /* RETA[12..23] */ + err = _ixgbevf_get_reta(adapter, msgbuf, reta, 12, 12); + if (err) + return err; + + /* RETA[24..31] */ + err = _ixgbevf_get_reta(adapter, msgbuf, reta, 24, 8); + } + + return err; +} + /** * ixgbevf_set_rar_vf - set device MAC address * @hw: pointer to hardware structure @@ -545,6 +668,7 @@ int ixgbevf_get_queues(struct ixgbe_hw *hw, unsigned int *num_tcs, /* do nothing if API doesn't support ixgbevf_get_queues */ switch (hw->api_version) { case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: break; default: return 0; diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h index 6688250..7944962 100644 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h @@ -38,6 +38,7 @@ #include "mbx.h" struct ixgbe_hw; +struct ixgbevf_adapter; /* iterator type for walking multicast address lists */ typedef u8* (*ixgbe_mc_addr_itr) (struct ixgbe_hw *hw, u8 **mc_addr_ptr, @@ -210,4 +211,5 @@ void ixgbevf_rlpml_set_vf(struct ixgbe_hw *hw, u16 max_size); 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 ixgbevf_adapter *adapter, u32 *reta); #endif /* __IXGBE_VF_H__ */