From patchwork Tue Dec 30 16:30:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Zolotarov X-Patchwork-Id: 424658 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 3A791140119 for ; Wed, 31 Dec 2014 03:31:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751373AbaL3Qaw (ORCPT ); Tue, 30 Dec 2014 11:30:52 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:54848 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750833AbaL3Qau (ORCPT ); Tue, 30 Dec 2014 11:30:50 -0500 Received: by mail-wi0-f175.google.com with SMTP id l15so24301623wiw.8 for ; Tue, 30 Dec 2014 08:30:48 -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=+kygl1RC7gPVqZOmf5LvvcFj3FksntdK7/K/Xa1AEEc=; b=fn7deaMREWn4ZUuXsnTUIgucB/dm1IzZdIdfx2n5mj6hbVqBdW9vYJ2zwTkP4HNPLr 8NyJtcPuyzouQsGwxcIvEvmk920xBtzOjlyXPPFb6nq0xLUp6km+ARMT5CIndA1MZBQu zwkqhV0eDkdoCl7jTEVFEVuS9LEJ3OygbYhfB0eba7pxlwz7CM6b70uHlDe59ZsPb+uu TOj/h+/kEV/Qe/I6HvxXur3mfwM2gMmEOnLBWX5XvvvbZO6zY10eXBM1vqGhJBNKLQZF k0eWFJ3QYLUmjGzYCADdiE2LqT0XatNZ4qov7g+qmUtey68prV0A/wjiZ0gf1jMHYjBt yW0g== X-Gm-Message-State: ALoCoQnYZbmO6NerJXJBIyaQXro/8jDh2C+HRSnVyy56O6iQRIEjzY1kEVTyS/0lKcFU//FouCb/ X-Received: by 10.194.91.205 with SMTP id cg13mr123421857wjb.21.1419957048846; Tue, 30 Dec 2014 08:30:48 -0800 (PST) Received: from vladz-laptop.cloudius-systems.com. (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id dc1sm39028047wib.18.2014.12.30.08.30.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Dec 2014 08:30:47 -0800 (PST) From: Vlad Zolotarov To: netdev@vger.kernel.org Cc: gleb@cloudius-systems.com, avi@cloudius-systems.com, Vlad Zolotarov Subject: [RFC PATCH net-next 1/5] ixgbe: Add a RETA query command to VF-PF channel API Date: Tue, 30 Dec 2014 18:30:31 +0200 Message-Id: <1419957035-1078-2-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419957035-1078-1-git-send-email-vladz@cloudius-systems.com> References: <1419957035-1078-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 82599 VFs and PF share the same RSS redirection table (RETA). Therefore we just return it for all VFs. RETA table is an array of 32 registers and the maximum number of registers that may be delivered in a single VF-PF channel command is 15. Therefore we will deliver the whole table in 3 steps: 12, 12 and 8 registers in each step correspondingly. Thus this patch does the following: - Adds a new API version (to specify a new commands set). - Adds the IXGBE_VF_GET_RETA_[0,1,2] commands to the VF-PF commands set. Signed-off-by: Vlad Zolotarov --- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 6 +++++ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 35 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h index a5cb755..c1123d9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h @@ -73,6 +73,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 */ }; @@ -91,6 +92,11 @@ enum ixgbe_pfvf_api_rev { /* mailbox API, version 1.1 VF requests */ #define IXGBE_VF_GET_QUEUES 0x09 /* get queue configuration */ +/* mailbox API, version 1.2 VF requests */ +#define IXGBE_VF_GET_RETA_0 0x0a /* get RETA[0..11] */ +#define IXGBE_VF_GET_RETA_1 0x0b /* get RETA[12..23] */ +#define IXGBE_VF_GET_RETA_2 0x0c /* get RETA[24..31] */ + /* 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/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index c76ba90..84db1a5 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -427,6 +427,7 @@ static s32 ixgbe_set_vf_lpe(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) #endif /* CONFIG_FCOE */ switch (adapter->vfinfo[vf].vf_api) { case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: /* * Version 1.1 supports jumbo frames on VFs if PF has * jumbo frames enabled which means legacy VFs are @@ -894,6 +895,7 @@ static int ixgbe_negotiate_vf_api(struct ixgbe_adapter *adapter, switch (api) { case ixgbe_mbox_api_10: case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: adapter->vfinfo[vf].vf_api = api; return 0; default: @@ -917,6 +919,7 @@ static int ixgbe_get_vf_queues(struct ixgbe_adapter *adapter, switch (adapter->vfinfo[vf].vf_api) { case ixgbe_mbox_api_20: case ixgbe_mbox_api_11: + case ixgbe_mbox_api_12: break; default: return -1; @@ -944,6 +947,29 @@ static int ixgbe_get_vf_queues(struct ixgbe_adapter *adapter, return 0; } +static int ixgbe_get_vf_reta(struct ixgbe_adapter *adapter, + u32 *msgbuf, u32 vf, int reta_offset_dw, + size_t dwords) +{ + struct ixgbe_hw *hw = &adapter->hw; + int i; + u32 *reta = &msgbuf[1]; + + /* verify the PF is supporting the correct API */ + switch (adapter->vfinfo[vf].vf_api) { + case ixgbe_mbox_api_12: + break; + default: + return -EPERM; + } + + /* Read the appropriate portion of RETA */ + for (i = 0; i < dwords; i++) + reta[i] = IXGBE_READ_REG(hw, IXGBE_RETA(i + reta_offset_dw)); + + return 0; +} + static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) { u32 mbx_size = IXGBE_VFMAILBOX_SIZE; @@ -1000,6 +1026,15 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) case IXGBE_VF_GET_QUEUES: retval = ixgbe_get_vf_queues(adapter, msgbuf, vf); break; + case IXGBE_VF_GET_RETA_0: + retval = ixgbe_get_vf_reta(adapter, msgbuf, vf, 0, 12); + break; + case IXGBE_VF_GET_RETA_1: + retval = ixgbe_get_vf_reta(adapter, msgbuf, vf, 12, 12); + break; + case IXGBE_VF_GET_RETA_2: + retval = ixgbe_get_vf_reta(adapter, msgbuf, vf, 24, 8); + break; default: e_err(drv, "Unhandled Msg %8.8x\n", msgbuf[0]); retval = IXGBE_ERR_MBX;