-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'nfp-devlink-port-implementation'
Jakub Kicinski says:
====================
nfp: devlink port implementation
This series adds basic devlink support. The operations we can perform
are port show and port split/unsplit.
v2:
Register devlink first, and then register all the ports. Port {,un}split
searches the port list, which is protected by a mutex. If port split
is requested before ports are registered we will simply not find the port
and return -EINVAL.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>- Loading branch information
Showing
9 changed files
with
289 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| /* | ||
| * Copyright (C) 2017 Netronome Systems, Inc. | ||
| * | ||
| * This software is dual licensed under the GNU General License Version 2, | ||
| * June 1991 as shown in the file COPYING in the top-level directory of this | ||
| * source tree or the BSD 2-Clause License provided below. You have the | ||
| * option to license this software under the complete terms of either license. | ||
| * | ||
| * The BSD 2-Clause License: | ||
| * | ||
| * Redistribution and use in source and binary forms, with or | ||
| * without modification, are permitted provided that the following | ||
| * conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above | ||
| * copyright notice, this list of conditions and the following | ||
| * disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above | ||
| * copyright notice, this list of conditions and the following | ||
| * disclaimer in the documentation and/or other materials | ||
| * provided with the distribution. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
| * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
| * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| #include <linux/rtnetlink.h> | ||
| #include <net/devlink.h> | ||
|
|
||
| #include "nfpcore/nfp_nsp.h" | ||
| #include "nfp_app.h" | ||
| #include "nfp_main.h" | ||
| #include "nfp_port.h" | ||
|
|
||
| static int | ||
| nfp_devlink_fill_eth_port(struct nfp_port *port, | ||
| struct nfp_eth_table_port *copy) | ||
| { | ||
| struct nfp_eth_table_port *eth_port; | ||
|
|
||
| eth_port = __nfp_port_get_eth_port(port); | ||
| if (!eth_port) | ||
| return -EINVAL; | ||
|
|
||
| memcpy(copy, eth_port, sizeof(*eth_port)); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static int | ||
| nfp_devlink_fill_eth_port_from_id(struct nfp_pf *pf, unsigned int port_index, | ||
| struct nfp_eth_table_port *copy) | ||
| { | ||
| struct nfp_port *port; | ||
|
|
||
| port = nfp_port_from_id(pf, NFP_PORT_PHYS_PORT, port_index); | ||
|
|
||
| return nfp_devlink_fill_eth_port(port, copy); | ||
| } | ||
|
|
||
| static int | ||
| nfp_devlink_set_lanes(struct nfp_pf *pf, unsigned int idx, unsigned int lanes) | ||
| { | ||
| struct nfp_nsp *nsp; | ||
| int ret; | ||
|
|
||
| nsp = nfp_eth_config_start(pf->cpp, idx); | ||
| if (IS_ERR(nsp)) | ||
| return PTR_ERR(nsp); | ||
|
|
||
| ret = __nfp_eth_set_split(nsp, lanes); | ||
| if (ret) { | ||
| nfp_eth_config_cleanup_end(nsp); | ||
| return ret; | ||
| } | ||
|
|
||
| ret = nfp_eth_config_commit_end(nsp); | ||
| if (ret < 0) | ||
| return ret; | ||
| if (ret) /* no change */ | ||
| return 0; | ||
|
|
||
| return nfp_net_refresh_port_table_sync(pf); | ||
| } | ||
|
|
||
| static int | ||
| nfp_devlink_port_split(struct devlink *devlink, unsigned int port_index, | ||
| unsigned int count) | ||
| { | ||
| struct nfp_pf *pf = devlink_priv(devlink); | ||
| struct nfp_eth_table_port eth_port; | ||
| int ret; | ||
|
|
||
| if (count < 2) | ||
| return -EINVAL; | ||
|
|
||
| mutex_lock(&pf->lock); | ||
|
|
||
| rtnl_lock(); | ||
| ret = nfp_devlink_fill_eth_port_from_id(pf, port_index, ð_port); | ||
| rtnl_unlock(); | ||
| if (ret) | ||
| goto out; | ||
|
|
||
| if (eth_port.is_split || eth_port.port_lanes % count) { | ||
| ret = -EINVAL; | ||
| goto out; | ||
| } | ||
|
|
||
| ret = nfp_devlink_set_lanes(pf, eth_port.index, | ||
| eth_port.port_lanes / count); | ||
| out: | ||
| mutex_unlock(&pf->lock); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| static int | ||
| nfp_devlink_port_unsplit(struct devlink *devlink, unsigned int port_index) | ||
| { | ||
| struct nfp_pf *pf = devlink_priv(devlink); | ||
| struct nfp_eth_table_port eth_port; | ||
| int ret; | ||
|
|
||
| mutex_lock(&pf->lock); | ||
|
|
||
| rtnl_lock(); | ||
| ret = nfp_devlink_fill_eth_port_from_id(pf, port_index, ð_port); | ||
| rtnl_unlock(); | ||
| if (ret) | ||
| goto out; | ||
|
|
||
| if (!eth_port.is_split) { | ||
| ret = -EINVAL; | ||
| goto out; | ||
| } | ||
|
|
||
| ret = nfp_devlink_set_lanes(pf, eth_port.index, eth_port.port_lanes); | ||
| out: | ||
| mutex_unlock(&pf->lock); | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
| const struct devlink_ops nfp_devlink_ops = { | ||
| .port_split = nfp_devlink_port_split, | ||
| .port_unsplit = nfp_devlink_port_unsplit, | ||
| }; | ||
|
|
||
| int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) | ||
| { | ||
| struct nfp_eth_table_port eth_port; | ||
| struct devlink *devlink; | ||
| int ret; | ||
|
|
||
| rtnl_lock(); | ||
| ret = nfp_devlink_fill_eth_port(port, ð_port); | ||
| rtnl_unlock(); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| devlink_port_type_eth_set(&port->dl_port, port->netdev); | ||
| if (eth_port.is_split) | ||
| devlink_port_split_set(&port->dl_port, eth_port.label_port); | ||
|
|
||
| devlink = priv_to_devlink(app->pf); | ||
|
|
||
| return devlink_port_register(devlink, &port->dl_port, port->eth_id); | ||
| } | ||
|
|
||
| void nfp_devlink_port_unregister(struct nfp_port *port) | ||
| { | ||
| devlink_port_unregister(&port->dl_port); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.