From patchwork Thu Oct 26 05:37:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 830449 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="CmqJ14gy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMwl40C4Hz9t3n for ; Thu, 26 Oct 2017 16:37:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932185AbdJZFhn (ORCPT ); Thu, 26 Oct 2017 01:37:43 -0400 Received: from mail-sn1nam02on0044.outbound.protection.outlook.com ([104.47.36.44]:43184 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751179AbdJZFhh (ORCPT ); Thu, 26 Oct 2017 01:37:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1bgHegD2KkJtQs2w5keLFXhTXLU9Z/SnIycEOj6b1DI=; b=CmqJ14gyqp+zHiDbaxeNt592nJJJ5V0s48lxZjR3PcYT60Fnys3atu2EXgwmJS2SdIy73hUgzZqtw35kRJXTq5YAS5t45gm2mlNEM6ti3p85LJLIhxsQ9qWiyzFAnan6n59kVzR1Aj1XPLvcoMqRWWZ2Qag0P+u87T2TPmVqcSo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by CY4PR07MB3175.namprd07.prod.outlook.com (10.172.115.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.178.6; Thu, 26 Oct 2017 05:37:35 +0000 Date: Wed, 25 Oct 2017 22:37:32 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, vijaya.guvva@cavium.com Subject: [PATCH net-next 2/3] liquidio: Configure switchdev with devlink Message-ID: <20171026053732.GA17890@felix-thinkpad.cavium.com> References: <20171026053641.GA17861@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20171026053641.GA17861@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: DM5PR11CA0023.namprd11.prod.outlook.com (10.175.92.161) To CY4PR07MB3175.namprd07.prod.outlook.com (10.172.115.141) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f44c779-4965-4ea1-c003-08d51c33a95f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:CY4PR07MB3175; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 3:KVWZux5BVCj0FTE6FBoU//A1nQ7xx8CxU/sTuoggQSdYNGx3wFj0bCzl9QrDeATX3CiHB/2M8dBRzLEu7Z3RePFjvtx1uxoTjVf2r1jy90i7soSkZDtu02puvZL3/9Ngxj51UH2C3Iz4c9b17KwzpOlUwCTDLojJuL4ZxjvkLYAJTyq+vjcjpxGGIRzfIHOmcOKulpsmAornA+Zkqw7NMNjP/4yOJSNc7K7Y/QwpkZ54/+4knq7Wp29xNashLQut; 25:+dKNdlVDkT5zy5XjIPyqFuVsKBJMABmUkd0Nn8Ir/+zVEaLZH7hd6UM08SIRGlUw/OXALH4jhn5BDx72wgOCiPg/bytM46WNUvorsoqn2O7aZHbRtJMXBKVruD5zjS0jOqChwa5/dxZpzInk3WDmYpw/47hyBQLY6/1+kHe3NrWsJJaXd7V3vFso8iqfwSKZ0j62ZS7iQkxv6FP/kRZFo7f4gR5Jy+5IJ5HOyIPYxGKI7/iB9uQhOUekqLu9svi4Q13+5u/uK3bqd4uxFMWC3CzMyPYA5Pww8LsWTzlVxIXPOPtrcb687x17VCYlXYKWxW8al82bq5Nbgzf1ay/eFg==; 31:OOkAOhYbAxMXq1yiUjs+hKK7scnvOKBO2KLZQo4M9Nb8s7ddhtl7krEOgIvHDLLModRIEnHhBG5+oNQ88Oth3lph2K2IZBnox9AVZqH/B2Uo15dDWd1alA2TYf2ScgYkw0Ogs5IbLqhnzGk94XB03HVRVOODWvocYvkcBUuxTChf8BF5p+WECiYonASM0aE/LTZ96st0cZLDAONu12Vra+69rtZW2TtjQu7J9AUomOY= X-MS-TrafficTypeDiagnostic: CY4PR07MB3175: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 20:h9Z65tAH5JP9iwzkNDDdcba9DwVj2wzQ7k9/46k9DJEoeSpL0H5g/rtoq5cqFDHMV+PZo5TJfNRQfJHpAJvagcMIueaSEiC5JFg8l99Nc86Ome+ePcTjxs+6j/xOKsIU1hiMIKjKSG7dd94GKjm3RudjMajdykMraa82x/crlV22k/F7UpMh5OUxOtaD9quQllqR2JRDuHE4/va05tCUoqQrbLC2itH9TuHHlZP5LNV3TQwzx0gUoer0r9eJx8ZTRNhrZBz5wf0SSyRp2EO7Qu+BLu0SBDuMx1MI4y/hZbqYP2FmqIMCSS6OdDVkq+jtdPPCWtMHjXBkVJJR5liokwVrYO2LVPRUZT++Dz0Isu3yczF6xS64ppyo+NHITfbTY5yx20VqoC7IMxew8z1tD04bxtdUfwObspkykEg5+OnEBHtbgv+IVg3G1WhYT5Jr54NpH5iOtu2eJ1UtfAQGJMpzOEgO39znOsy5S9xhJGFVGetc+VzVmtRglsRgXoxL; 4:jZupYIeThw6SJlu/R5nWTZP7Quztz0e6sonH9yAtNTMoNnOCqHHzfOG7L0X7VAZVsRVpCt52N/O/wH8BOkLFP6wg6sH2Hc5r+bl1i26wVJS3utsavktMtPqBzAi9MUGTcFMPqUhJ3jiR7MyoZYUH4imPbVksS36ZeaPCYdB2UiK+OC8JbkBtAU80vCq75IwsZc33M2MXcfHzkEI59FwrSfvRzOkeYaLFWc3kHEl/BDQ6+dWFT9sbYBxW6Xuq0gqBHv7HarzsMdBc3sNbOxfK33hSb68pftdqK9qL70HDcPBoSKXLvYK3sNcPXh5rMO9P X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3002001)(3231020)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3175; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3175; X-Forefront-PRVS: 04724A515E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(346002)(376002)(199003)(189002)(305945005)(316002)(5660300001)(58126008)(16586007)(6666003)(2950100002)(97736004)(6916009)(8936002)(1076002)(6486002)(81156014)(53936002)(47776003)(478600001)(23726003)(575784001)(86362001)(4326008)(25786009)(3846002)(6116002)(81166006)(33656002)(76506005)(101416001)(2361001)(72206003)(106356001)(105586002)(2351001)(189998001)(16526018)(107886003)(66066001)(68736007)(7736002)(8676002)(50466002)(2906002)(50986999)(76176999)(6496005)(54356999)(83506002)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3175; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 23:YrrQWfQsIZCyBK2PCNDVvoCnlUA65gwjfzktmD8xzozk1mPMbXfPaSBnD3K57Dl8CJEHg6PMP3lxw0pYE9GP78TOyaLv4lJrHc2yEzTf59jLAKJd/nb04SpS2lA9TNRcOaGtuShWnvDWFZEyRICOwBRe9Le75BFYxCCWxw8w0U9K7uAGfoLC6jjwX3sWlyFxYG6OrLpVDQ1j0wls1Cc3ncvj+UEZgeQJeL3YOHjZVH5IfMuuvkZ5S/+IttE82S7yUljIqjFdbB6vxr83zxAVRSQW23RAl9PgewEkYqHVbKlJk1eAAQQrDrxgJ4Fbt8OV1b0LPVm/8z1WmTWkxLeyHkZIVeLpKoecscuW7KcdAqis+DsKqoafHqNg51q7eFcwOTTfTWUh9TiUCyAas+jvzO7ov1dtldoZRR6mkjS0sK1nMOQNwwltpi1ru8dPVdKmLAOiX6rM4yTplBh5Tq5v3QnYrRF5JSOm2pP747+psCrkRhPyunjRkZoKl+rHF1v5YHK9rfP/Yr26HgJKaNXVcjY7jSsOJHPK6uDo2tl0M28zYHbl/ZFXs35y+F0tlduRYwwGjwi56bE2XMiiPzhFmFk3MpfDAmmUAY0glFGExQ4Uk/cnDJy+zzl0VNKGXta2txqoyLAw4pJrzFj0z6WMvNJwEpf0G2a1C/94UHLagWa1ljxNVX/PrGd6HZvtxh0AnMJG2zKKwMmYH/1wySp2Y48EMg+17XIqQ/reuEo38Hlbt0lhFqevU5wBPeaMyQlJVNtZK1HPG0LIh57VW2+9uwKfQPDFOZRZ89TE8c1azWIzBwC2beXcvPku7iB6cVWPbHqQYFWU45HNBUN3lM9fHo/ps/UaCXogvDXmGO5gGWm30kRJzzFuoXmhBMGBiDJjhyLMS/3xhjC40mX7cSAKMgbQIsRXoC1FO0oDb8VwXVt2lHQQG9DfvcPz2rLAXfD+Ql9LniFRm7zllMa17pDM7mm5zVHJBAFIGSysXoi3xGm21B7F47Nds7Cp2zbxRbujIb7YdZoidLdXJSnoIIi5ndVZQSJnmsr9yrXxvNx7TWu4WOzDgVozcB6oHkJPv/M0naMVFpbbluYO2IUXvUhk+chuU8joeK2ZuY+I97BG6U3YyMBg8ed2GKysuqWMVJz9KMd735ZEuv2w2zpRU8UWXbnKtrYffel3cT6yBgV5Lcd7IYteRMxAKj5hXtRdNTaW4e721YdbyYheZL71BDHKHg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3175; 6:h2AGaflB/lpGaxbITSH3SdTHAg3hlqn3o9iIxkEe9O9XZWkVxJk/oymf9uncDw14uB2atKzxPKULq55MLf1ccThcwU8wkMwS8uj35uki2eXDSz/ET0M6Rm9E4Gh4mjAZI1Z7ryVw/MlPap/C3+QrN755/vVVplhx9vxgSJdoQjkvjUDW9y602GSkMZOSxd1gyJs1fbuwyHD1V3xWr6WqogGSvr3Pcn0mWjhvR7SFflsuoh7HBDkqMnj3GXZb0QyVFXye6FZs6W19lljlewYkJLniHNRcfFdVOiA/0+dvfs0gMmVBIx4dZcc+b+E50neOQcnd1uLTBVT39LSfz4T8mOK2R4zj/3V9DPwKrm++JOc=; 5:H5LKKJNFeoxvOkHboI3x8AOQQZXb6px5uMiV3ruJF5zGMCysOrmaRzgmPV02XTdLzZNKWZP8MnJLzccb9ZhbvO0T8biqU90X9dR3G5UdykfwWrhDXzCUf/ASDDEvT80B7Hzma+DFjPz7Wp/D2a1AP3STXMlCx+j1zrMAX7DnLqg=; 24:TsvbnIXlz5WMNoX35sjWnAxru83PLmxDcs7j9WXzUv6OhqIzWujo6xTd8RggXj9BrerqrkMO+MhmENadZ9gCFc4uyLFWFXpzwPhC47Hass0=; 7:16SWcvvhJXmNxJbsjhBXb/mlYEUkMQfwWeECj4dF+QDsnpIMefEEdkI2B1qR/PQMka2YlZskYugu/4HwGsl7jVxtM09c8vuk/GDpBB2mmlLjae8aKNNBfkG+fCFNSdiYQ+EhJL23eoxMsRwYM2WlFCllP9hADFfNEerAMZBKrthstnkbgAj031U1o2Qi2gJkKYEMdnlEP/fAS4E6Gp+Ndf+A/Ph166PswGoFyRl9b9dvtzSthMI0ndRViQSEq46M SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2017 05:37:35.1608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f44c779-4965-4ea1-c003-08d51c33a95f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3175 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vijaya Mohan Guvva Enable and disable switchdev on SRIOV capable LiquidIO NIC with devlink. Create representor netdev for each SRIOV VF function on SRIOV enable and and do the cleanup on SRIOV disable. Signed-off-by: Vijaya Mohan Guvva Signed-off-by: Satanand Burla Signed-off-by: Raghu Vatsavayi Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/Kconfig | 1 + drivers/net/ethernet/cavium/liquidio/lio_main.c | 89 ++++++++++++++++++++++ drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 6 ++ .../net/ethernet/cavium/liquidio/liquidio_common.h | 2 + .../net/ethernet/cavium/liquidio/octeon_device.h | 7 ++ 5 files changed, 105 insertions(+) diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig index dcbce6c..63be75e 100644 --- a/drivers/net/ethernet/cavium/Kconfig +++ b/drivers/net/ethernet/cavium/Kconfig @@ -53,6 +53,7 @@ config THUNDER_NIC_RGX config LIQUIDIO tristate "Cavium LiquidIO support" depends on 64BIT + depends on MAY_USE_DEVLINK imply PTP_1588_CLOCK select FW_LOADER select LIBCRC32C diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index a946996..10e06e6 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -35,6 +35,7 @@ #include "cn68xx_device.h" #include "cn23xx_pf_device.h" #include "liquidio_image.h" +#include "lio_vf_rep.h" MODULE_AUTHOR("Cavium Networks, "); MODULE_DESCRIPTION("Cavium LiquidIO Intelligent Server Adapter Driver"); @@ -1609,6 +1610,8 @@ static int liquidio_stop_nic_module(struct octeon_device *oct) oct->cmd_resp_state = OCT_DRV_OFFLINE; spin_unlock_bh(&oct->cmd_resp_wqlock); + lio_vf_rep_destroy(oct); + for (i = 0; i < oct->ifcount; i++) { lio = GET_LIO(oct->props[i].netdev); for (j = 0; j < oct->num_oqs; j++) @@ -1619,6 +1622,12 @@ static int liquidio_stop_nic_module(struct octeon_device *oct) for (i = 0; i < oct->ifcount; i++) liquidio_destroy_nic_device(oct, i); + if (oct->devlink) { + devlink_unregister(oct->devlink); + devlink_free(oct->devlink); + oct->devlink = NULL; + } + dev_dbg(&oct->pci_dev->dev, "Network interfaces stopped\n"); return 0; } @@ -3311,6 +3320,59 @@ static int liquidio_set_vf_link_state(struct net_device *netdev, int vfidx, } static int +liquidio_eswitch_mode_get(struct devlink *devlink, u16 *mode) +{ + struct lio_devlink_priv *priv; + struct octeon_device *oct; + + priv = devlink_priv(devlink); + oct = priv->oct; + + *mode = oct->eswitch_mode; + + return 0; +} + +static int +liquidio_eswitch_mode_set(struct devlink *devlink, u16 mode) +{ + struct lio_devlink_priv *priv; + struct octeon_device *oct; + int ret = 0; + + priv = devlink_priv(devlink); + oct = priv->oct; + + if (!(oct->fw_info.app_cap_flags & LIQUIDIO_SWITCHDEV_CAP)) + return -EINVAL; + + if (oct->eswitch_mode == mode) + return 0; + + switch (mode) { + case DEVLINK_ESWITCH_MODE_SWITCHDEV: + oct->eswitch_mode = mode; + ret = lio_vf_rep_create(oct); + break; + + case DEVLINK_ESWITCH_MODE_LEGACY: + lio_vf_rep_destroy(oct); + oct->eswitch_mode = mode; + break; + + default: + ret = -EINVAL; + } + + return ret; +} + +static const struct devlink_ops liquidio_devlink_ops = { + .eswitch_mode_get = liquidio_eswitch_mode_get, + .eswitch_mode_set = liquidio_eswitch_mode_set, +}; + +static int lio_pf_switchdev_attr_get(struct net_device *dev, struct switchdev_attr *attr) { struct lio *lio = GET_LIO(dev); @@ -3465,6 +3527,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) u32 resp_size, ctx_size, data_size; u32 ifidx_or_pfnum; struct lio_version *vdata; + struct devlink *devlink; + struct lio_devlink_priv *lio_devlink; /* This is to handle link status changes */ octeon_register_dispatch_fn(octeon_dev, OPCODE_NIC, @@ -3797,6 +3861,26 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) octeon_free_soft_command(octeon_dev, sc); } + devlink = devlink_alloc(&liquidio_devlink_ops, + sizeof(struct lio_devlink_priv)); + if (!devlink) { + dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n"); + goto setup_nic_wait_intr; + } + + lio_devlink = devlink_priv(devlink); + lio_devlink->oct = octeon_dev; + + if (devlink_register(devlink, &octeon_dev->pci_dev->dev)) { + devlink_free(devlink); + dev_err(&octeon_dev->pci_dev->dev, + "devlink registration failed\n"); + goto setup_nic_wait_intr; + } + + octeon_dev->devlink = devlink; + octeon_dev->eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY; + return 0; setup_nic_dev_fail: @@ -3891,6 +3975,7 @@ static int liquidio_enable_sriov(struct pci_dev *dev, int num_vfs) } if (!num_vfs) { + lio_vf_rep_destroy(oct); ret = lio_pci_sriov_disable(oct); } else if (num_vfs > oct->sriov_info.max_vfs) { dev_err(&oct->pci_dev->dev, @@ -3902,6 +3987,10 @@ static int liquidio_enable_sriov(struct pci_dev *dev, int num_vfs) ret = octeon_enable_sriov(oct); dev_info(&oct->pci_dev->dev, "oct->pf_num:%d num_vfs:%d\n", oct->pf_num, num_vfs); + ret = lio_vf_rep_create(oct); + if (ret) + dev_info(&oct->pci_dev->dev, + "vf representor create failed"); } return ret; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c index 760893c..2207956 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c @@ -515,6 +515,9 @@ lio_vf_rep_create(struct octeon_device *oct) struct net_device *ndev; int i, num_vfs; + if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV) + return 0; + if (!oct->sriov_info.sriov_enabled) return 0; @@ -599,6 +602,9 @@ lio_vf_rep_destroy(struct octeon_device *oct) struct net_device *ndev; int i; + if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV) + return; + if (!oct->sriov_info.sriov_enabled) return; diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h index 3aceb78..1226ba5 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -110,6 +110,8 @@ enum octeon_tag_type { #define MAX_IOQ_INTERRUPTS_PER_PF (64 * 2) #define MAX_IOQ_INTERRUPTS_PER_VF (8 * 2) +#define LIQUIDIO_SWITCHDEV_CAP 0x2 + #define SCR2_BIT_FW_LOADED 63 /* App specific capabilities from firmware to pf driver */ diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h index c97e067..63b0c75 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.h @@ -23,6 +23,7 @@ #define _OCTEON_DEVICE_H_ #include +#include /** PCI VendorId Device Id */ #define OCTEON_CN68XX_PCIID 0x91177d @@ -396,6 +397,10 @@ struct lio_vf_rep_list { struct net_device *ndev[CN23XX_MAX_VFS_PER_PF]; }; +struct lio_devlink_priv { + struct octeon_device *oct; +}; + /** The Octeon device. * Each Octeon device has this structure to represent all its * components. @@ -575,6 +580,8 @@ struct octeon_device { bool ptp_enable; struct lio_vf_rep_list vf_rep_list; + struct devlink *devlink; + enum devlink_eswitch_mode eswitch_mode; }; #define OCT_DRV_ONLINE 1