Introduce line card support for modular switch
Subsystems (6)
Ido Schimmel
maintainercover Introduce line card support for modular switch
Jiri says:
This patchset introduces support for modular switch systems and also introduces mlxsw support for NVIDIA Mellanox SN4800 modular switch. It contains 8 slots to accommodate line cards - replaceable PHY modules which may contain gearboxes.
Currently supported line card:
16X 100GbE (QSFP28)
Other line cards that are going to be supported:
8X 200GbE (QSFP56)
4X 400GbE (QSFP-DD)
There may be other types of line cards added in the future.
To be consistent with the port split configuration (splitter cabels), the line card entities are treated in the similar way. The nature of a line card is not "a pluggable device", but "a pluggable PHY module".
A concept of "provisioning" is introduced. The user may "provision" certain slot with a line card type. Driver then creates all instances (devlink ports, netdevices, etc) related to this line card type. It does not matter if the line card is plugged-in at the time. User is able to configure netdevices, devlink ports, setup port splitters, etc. From the perspective of the switch ASIC, all is present and can be configured.
The carrier of netdevices stays down if the line card is not plugged-in. Once the line card is inserted and activated, the carrier of the related netdevices is then reflecting the physical line state, same as for an ordinary fixed port.
Once user does not want to use the line card related instances anymore, he can "unprovision" the slot. Driver then removes the instances.
Patches 1-4 are extending devlink driver API and UAPI in order to register, show, dump, provision and activate the line card. Patches 5-17 are implementing the introduced API in mlxsw. The last patch adds a selftest for mlxsw line cards.
Example:
$ devlink port # No ports are listed
$ devlink lc
pci/0000:01:00.0:
lc 1 state unprovisioned
supported_types:
16x100G
lc 2 state unprovisioned
supported_types:
16x100G
lc 3 state unprovisioned
supported_types:
16x100G
lc 4 state unprovisioned
supported_types:
16x100G
lc 5 state unprovisioned
supported_types:
16x100G
lc 6 state unprovisioned
supported_types:
16x100G
lc 7 state unprovisioned
supported_types:
16x100G
lc 8 state unprovisioned
supported_types:
16x100GNote that driver exposes list supported line card types. Currently there is only one: "16x100G".
To provision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G
$ devlink lc show pci/0000:01:00.0 lc 8
pci/0000:01:00.0:
lc 8 state active type 16x100G
supported_types:
16x100G
$ devlink port
pci/0000:01:00.0/0: type notset flavour cpu port 0 splittable false
pci/0000:01:00.0/53: type eth netdev enp1s0nl8p1 flavour physical lc 8 port 1 splittable true lanes 4
pci/0000:01:00.0/54: type eth netdev enp1s0nl8p2 flavour physical lc 8 port 2 splittable true lanes 4
pci/0000:01:00.0/55: type eth netdev enp1s0nl8p3 flavour physical lc 8 port 3 splittable true lanes 4
pci/0000:01:00.0/56: type eth netdev enp1s0nl8p4 flavour physical lc 8 port 4 splittable true lanes 4
pci/0000:01:00.0/57: type eth netdev enp1s0nl8p5 flavour physical lc 8 port 5 splittable true lanes 4
pci/0000:01:00.0/58: type eth netdev enp1s0nl8p6 flavour physical lc 8 port 6 splittable true lanes 4
pci/0000:01:00.0/59: type eth netdev enp1s0nl8p7 flavour physical lc 8 port 7 splittable true lanes 4
pci/0000:01:00.0/60: type eth netdev enp1s0nl8p8 flavour physical lc 8 port 8 splittable true lanes 4
pci/0000:01:00.0/61: type eth netdev enp1s0nl8p9 flavour physical lc 8 port 9 splittable true lanes 4
pci/0000:01:00.0/62: type eth netdev enp1s0nl8p10 flavour physical lc 8 port 10 splittable true lanes 4
pci/0000:01:00.0/63: type eth netdev enp1s0nl8p11 flavour physical lc 8 port 11 splittable true lanes 4
pci/0000:01:00.0/64: type eth netdev enp1s0nl8p12 flavour physical lc 8 port 12 splittable true lanes 4
pci/0000:01:00.0/125: type eth netdev enp1s0nl8p13 flavour physical lc 8 port 13 splittable true lanes 4
pci/0000:01:00.0/126: type eth netdev enp1s0nl8p14 flavour physical lc 8 port 14 splittable true lanes 4
pci/0000:01:00.0/127: type eth netdev enp1s0nl8p15 flavour physical lc 8 port 15 splittable true lanes 4
pci/0000:01:00.0/128: type eth netdev enp1s0nl8p16 flavour physical lc 8 port 16 splittable true lanes 4To uprovision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 notype
Jiri Pirko (17):
devlink: add support to create line card and expose to user
devlink: implement line card provisioning
devlink: implement line card active state
devlink: add port to line card relationship set
mlxsw: spectrum: Allow lane to start from non-zero index
mlxsw: spectrum: Allocate port mapping array of structs instead of
pointers
mlxsw: reg: Add Ports Mapping Event Configuration Register
mlxsw: Narrow the critical section of devl_lock during ports
creation/removal
mlxsw: spectrum: Introduce port mapping change event processing
mlxsw: reg: Add Management DownStream Device Query Register
mlxsw: reg: Add Management DownStream Device Control Register
mlxsw: reg: Add Management Binary Code Transfer Register
mlxsw: core_linecards: Add line card objects and implement
provisioning
mlxsw: core_linecards: Implement line card activation process
mlxsw: core: Extend driver ops by remove selected ports op
mlxsw: spectrum: Add port to linecard mapping
selftests: mlxsw: Introduce devlink line card
provision/unprovision/activation tests
.../networking/devlink/devlink-linecard.rst | 122 ++ Documentation/networking/devlink/index.rst | 1 + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 56 +- drivers/net/ethernet/mellanox/mlxsw/core.h | 62 +- .../ethernet/mellanox/mlxsw/core_linecards.c | 1005 +++++++++++++++++ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 15 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 376 ++++++ .../net/ethernet/mellanox/mlxsw/spectrum.c | 283 ++++- .../net/ethernet/mellanox/mlxsw/spectrum.h | 10 +- .../mellanox/mlxsw/spectrum_ethtool.c | 37 +- drivers/net/ethernet/mellanox/mlxsw/trap.h | 6 + include/net/devlink.h | 48 + include/uapi/linux/devlink.h | 23 + net/core/devlink.c | 653 ++++++++++- .../drivers/net/mlxsw/devlink_linecard.sh | 280 +++++ 16 files changed, 2896 insertions(+), 84 deletions(-) create mode 100644 Documentation/networking/devlink/devlink-linecard.rst create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_linecards.c create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 1/17 devlink: add support to create line card and expose to user
From: Jiri Pirko <[email protected]>
Extend the devlink API so the driver is going to be able to create and destroy linecard instances. There can be multiple line cards per devlink device. Expose this new type of object over devlink netlink API to the userspace, with notifications.
--- include/net/devlink.h | 4 + include/uapi/linux/devlink.h | 7 + net/core/devlink.c | 270 ++++++++++++++++++++++++++++++++++- 3 files changed, 280 insertions(+), 1 deletion(-)
include/net/devlink.h +4 -0
@@ -22,6 +22,7 @@#include <linux/firmware.h> struct devlink ; +struct devlink_linecard ;struct devlink_port_phys_attrs {u32 port_number;/* Same value as "split group".
@@ -1536,6 +1537,9 @@ void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port,int devlink_rate_leaf_create (struct devlink_port *port,void *priv);void devlink_rate_leaf_destroy (struct devlink_port *devlink_port);void devlink_rate_nodes_destroy (struct devlink *devlink); +struct devlink_linecard *devlink_linecard_create (struct devlink *devlink, +unsigned int linecard_index); +void devlink_linecard_destroy (struct devlink_linecard *linecard); int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, u32 size, u16 ingress_pools_count, u16 egress_pools_count, u16 ingress_tc_count,
include/uapi/linux/devlink.h +7 -0
@@ -131,6 +131,11 @@ enum devlink_command {DEVLINK_CMD_RATE_NEW ,DEVLINK_CMD_RATE_DEL , +DEVLINK_CMD_LINECARD_GET ,/* can dump */ +DEVLINK_CMD_LINECARD_SET , +DEVLINK_CMD_LINECARD_NEW , +DEVLINK_CMD_LINECARD_DEL , +/* add new commands above here */ __DEVLINK_CMD_MAX,DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX -1
@@ -553,6 +558,8 @@ enum devlink_attr {DEVLINK_ATTR_REGION_MAX_SNAPSHOTS ,/* u32 */ +DEVLINK_ATTR_LINECARD_INDEX ,/* u32 */ +/* add new attributes above here, update the policy in devlink.c */ __DEVLINK_ATTR_MAX,
net/core/devlink.c +269 -1
376 lines not on this page · raw message
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 2/17 devlink: implement line card provisioning
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
In order to be able to configure all needed stuff on a port/netdevice of a line card without the line card being present, introduce line card provisioning. Basically by setting a type, provisioning process will start and driver is supposed to create a placeholder for instances (ports/netdevices) for a line card type.
Allow the user to query the supported line card types over line card get command. Then implement two netlink command SET to allow user to set/unset the card type.
On the driver API side, add provision/unprovision ops and supported types array to be advertised. Upon provision op call, the driver should take care of creating the instances for the particular line card type. Introduce provision_set/clear() functions to be called by the driver once the provisioning/unprovisioning is done on its side. These helpers are not to be called directly due to the async nature of provisioning.
Example:
$ devlink port # No ports are listed
$ devlink lc
pci/0000:01:00.0:
lc 1 state unprovisioned
supported_types:
16x100G
lc 2 state unprovisioned
supported_types:
16x100G
lc 3 state unprovisioned
supported_types:
16x100G
lc 4 state unprovisioned
supported_types:
16x100G
lc 5 state unprovisioned
supported_types:
16x100G
lc 6 state unprovisioned
supported_types:
16x100G
lc 7 state unprovisioned
supported_types:
16x100G
lc 8 state unprovisioned
supported_types:
16x100G$ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G
$ devlink lc show pci/0000:01:00.0 lc 8
pci/0000:01:00.0:
lc 8 state active type 16x100G
supported_types:
16x100G
$ devlink port
pci/0000:01:00.0/0: type notset flavour cpu port 0 splittable false
pci/0000:01:00.0/53: type eth netdev enp1s0nl8p1 flavour physical lc 8 port 1 splittable true lanes 4
pci/0000:01:00.0/54: type eth netdev enp1s0nl8p2 flavour physical lc 8 port 2 splittable true lanes 4
pci/0000:01:00.0/55: type eth netdev enp1s0nl8p3 flavour physical lc 8 port 3 splittable true lanes 4
pci/0000:01:00.0/56: type eth netdev enp1s0nl8p4 flavour physical lc 8 port 4 splittable true lanes 4
pci/0000:01:00.0/57: type eth netdev enp1s0nl8p5 flavour physical lc 8 port 5 splittable true lanes 4
pci/0000:01:00.0/58: type eth netdev enp1s0nl8p6 flavour physical lc 8 port 6 splittable true lanes 4
pci/0000:01:00.0/59: type eth netdev enp1s0nl8p7 flavour physical lc 8 port 7 splittable true lanes 4
pci/0000:01:00.0/60: type eth netdev enp1s0nl8p8 flavour physical lc 8 port 8 splittable true lanes 4
pci/0000:01:00.0/61: type eth netdev enp1s0nl8p9 flavour physical lc 8 port 9 splittable true lanes 4
pci/0000:01:00.0/62: type eth netdev enp1s0nl8p10 flavour physical lc 8 port 10 splittable true lanes 4
pci/0000:01:00.0/63: type eth netdev enp1s0nl8p11 flavour physical lc 8 port 11 splittable true lanes 4
pci/0000:01:00.0/64: type eth netdev enp1s0nl8p12 flavour physical lc 8 port 12 splittable true lanes 4
pci/0000:01:00.0/125: type eth netdev enp1s0nl8p13 flavour physical lc 8 port 13 splittable true lanes 4
pci/0000:01:00.0/126: type eth netdev enp1s0nl8p14 flavour physical lc 8 port 14 splittable true lanes 4
pci/0000:01:00.0/127: type eth netdev enp1s0nl8p15 flavour physical lc 8 port 15 splittable true lanes 4
pci/0000:01:00.0/128: type eth netdev enp1s0nl8p16 flavour physical lc 8 port 16 splittable true lanes 4$ devlink lc set pci/0000:01:00.0 lc 8 notype
--- .../networking/devlink/devlink-linecard.rst | 121 +++++++ Documentation/networking/devlink/index.rst | 1 + include/net/devlink.h | 43 ++- include/uapi/linux/devlink.h | 15 + net/core/devlink.c | 322 +++++++++++++++++- 5 files changed, 497 insertions(+), 5 deletions(-) create mode 100644 Documentation/networking/devlink/devlink-linecard.rst
Documentation/networking/devlink/devlink-linecard.rst new file +121 -0
@@ -0,0 +1,121 @@ +.. SPDX-License-Identifier: GPL-2.0 + +================= +Devlink Line card +================= + +Background +========== + +The ``devlink-linecard`` mechanism is targeted for manipulation of +line cards that serve as a detachable PHY modules for modular switch +system. Following operations are provided: + + * Get a list of supported line card types. + * Provision of a slot with specific line card type. + * Get and monitor of line card state and its change. + +Line card according to the type may contain one or more gearboxes +to mux the lanes with certain speed to multiple ports with lanes +of different speed. Line card ensures N:M mapping between +the switch ASIC modules and physical front panel ports. + +Overview +======== + +Each line card devlink object is created by device driver, +according to the physical line card slots available on the device. + +Similar to splitter cable, where the device might have no way +of detection of the splitter cable geometry, the device +might not have a way to detect line card type. For that devices, +concept of provisioning is introduced. It allows the user to: + + * Provision a line card slot with certain line card type + + - Device driver would instruct the ASIC to prepare all + resources accordingly. The device driver would + create all instances, namely devlink port and netdevices + that reside on the line card, according to the line card type + * Manipulate of line card entities even without line card + being physically connected or powered-up + * Setup splitter cable on line card ports + + - As on the ordinary ports, user may provision a splitter + cable of a certain type, without the need to + be physically connected to the port + * Configure devlink ports and netdevices + +Netdevice carrier is decided as follows: + + * Line card is not inserted or powered-down + + - The carrier is always down + * Line card is inserted and powered up + + - The carrier is decided as for ordinary port netdevice + +Line card state +=============== + +The ``devlink-linecard`` mechanism supports the following line card states: + + * ``unprovisioned``: Line card is not provisioned on the slot. + * ``unprovisioning``: Line card slot is currently being unprovisioned. + * ``provisioning``: Line card slot is currently in a process of being provisioned + with a line card type. + * ``provisioning_failed``: Provisioning was not successful. + * ``provisioned``: Line card slot is provisioned with a type. + +The following diagram provides a general overview of ``devlink-linecard`` +state transitions:: + + +-------------------------+ + | | + +----------------------------------> unprovisioned | + | | | + | +--------|-------^--------+ + | | | + | | | + | +--------v-------|--------+ + | | | + | | provisioning | + | | | + | +------------|------------+ + | | + | +-----------------------------+ + | | | + | +------------v------------+ +------------v------------+ + | | | | | + +----- provisioning_failed | | provisioned | + | | | | | + | +------------^------------+ +------------|------------+ + | | | + | | | + | | +------------v------------+ + | | | | + | | | unprovisioning | + | | | | + | | +------------|------------+ + | | | + | +-----------------------------+ + | | + +-----------------------------------------------+ + + +Example usage +============= + +.. code:: shell + + $ devlink lc show [ DEV [ lc LC_INDEX ] ] + $ devlink lc set DEV lc LC_INDEX [ { type LC_TYPE | notype } ] + + # Show current line card configuration and status for all slots: + $ devlink lc + + # Set slot 8 to be provisioned with type "16x100G": + $ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G + + # Set slot 8 to be unprovisioned: + $ devlink lc set pci/0000:01:00.0 lc 8 notype
Documentation/networking/devlink/index.rst +1 -0
@@ -39,6 +39,7 @@ general. devlink-resource devlink-reload devlink-trap + devlink-linecard Driver-specific documentation -----------------------------
include/net/devlink.h +41 -2
56 lines not on this page · raw message
include/uapi/linux/devlink.h +15 -0
@@ -343,6 +343,18 @@ enum devlink_reload_limit {#define DEVLINK_RELOAD_LIMITS_VALID_MASK (_BITUL(__DEVLINK_RELOAD_LIMIT_MAX) - 1) +enum devlink_linecard_state { +DEVLINK_LINECARD_STATE_UNSPEC , +DEVLINK_LINECARD_STATE_UNPROVISIONED , +DEVLINK_LINECARD_STATE_UNPROVISIONING , +DEVLINK_LINECARD_STATE_PROVISIONING , +DEVLINK_LINECARD_STATE_PROVISIONING_FAILED , +DEVLINK_LINECARD_STATE_PROVISIONED , + + __DEVLINK_LINECARD_STATE_MAX, +DEVLINK_LINECARD_STATE_MAX = __DEVLINK_LINECARD_STATE_MAX -1 +}; +enum devlink_attr {/* don't change the order or add anything between, this is ABI! */ DEVLINK_ATTR_UNSPEC ,
@@ -559,6 +571,9 @@ enum devlink_attr {DEVLINK_ATTR_REGION_MAX_SNAPSHOTS ,/* u32 */ DEVLINK_ATTR_LINECARD_INDEX ,/* u32 */ +DEVLINK_ATTR_LINECARD_STATE ,/* u8 */ +DEVLINK_ATTR_LINECARD_TYPE ,/* string */ + DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES, /* nested *//* add new attributes above here, update the policy in devlink.c */
net/core/devlink.c +319 -3
433 lines not on this page · raw message
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 3/17 devlink: implement line card active state
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Allow driver to mark a line card as active. Expose this state to the userspace over devlink netlink interface with proper notifications. 'active' state means that line card was plugged in after being provisioned.
--- .../networking/devlink/devlink-linecard.rst | 11 ++--- include/net/devlink.h | 2 + include/uapi/linux/devlink.h | 1 + net/core/devlink.c | 41 +++++++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-)
Documentation/networking/devlink/devlink-linecard.rst +6 -5
@@ -66,6 +66,7 @@ The ``devlink-linecard`` mechanism supports the following line card states: with a line card type. * ``provisioning_failed``: Provisioning was not successful. * ``provisioned``: Line card slot is provisioned with a type. + * ``active``: Line card is powered-up and active. The following diagram provides a general overview of ``devlink-linecard`` state transitions::
@@ -85,11 +86,11 @@ state transitions:: | | | +-----------------------------+ | | | - | +------------v------------+ +------------v------------+ - | | | | | - +----- provisioning_failed | | provisioned | - | | | | | - | +------------^------------+ +------------|------------+ + | +------------v------------+ +------------v------------+ +-------------------------+ + | | | | ----> | + +----- provisioning_failed | | provisioned | | active | + | | | | <---- | + | +------------^------------+ +------------|------------+ +-------------------------+ | | | | | | | | +------------v------------+
include/net/devlink.h +2 -0
@@ -1579,6 +1579,8 @@ void devlink_linecard_provision_set(struct devlink_linecard *linecard, const char *type);void devlink_linecard_provision_clear (struct devlink_linecard *linecard);void devlink_linecard_provision_fail (struct devlink_linecard *linecard); +void devlink_linecard_activate (struct devlink_linecard *linecard); +void devlink_linecard_deactivate (struct devlink_linecard *linecard); int devlink_sb_register(struct devlink *devlink, unsigned int sb_index, u32 size, u16 ingress_pools_count, u16 egress_pools_count, u16 ingress_tc_count,
include/uapi/linux/devlink.h +1 -0
@@ -350,6 +350,7 @@ enum devlink_linecard_state {DEVLINK_LINECARD_STATE_PROVISIONING ,DEVLINK_LINECARD_STATE_PROVISIONING_FAILED ,DEVLINK_LINECARD_STATE_PROVISIONED , +DEVLINK_LINECARD_STATE_ACTIVE , __DEVLINK_LINECARD_STATE_MAX,DEVLINK_LINECARD_STATE_MAX = __DEVLINK_LINECARD_STATE_MAX -1
net/core/devlink.c +41 -0
47 lines not on this page · raw message
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 4/17 devlink: add port to line card relationship set
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
In order to properly inform user about relationship between port and line card, introduce a driver API to set line card for a port. Use this information to extend port devlink netlink message by line card index and also include the line card index into phys_port_name and by that into a netdevice name.
--- include/net/devlink.h | 3 +++ net/core/devlink.c | 26 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-)
include/net/devlink.h +3 -0
@@ -136,6 +136,7 @@ struct devlink_port {struct mutex reporters_lock;/* Protects reporter_list */ struct devlink_rate *devlink_rate; +struct devlink_linecard *linecard; };struct devlink_port_new_attrs {
@@ -1571,6 +1572,8 @@ void devlink_port_attrs_pci_sf_set(struct devlink_port *devlink_port,int devlink_rate_leaf_create (struct devlink_port *port,void *priv);void devlink_rate_leaf_destroy (struct devlink_port *devlink_port);void devlink_rate_nodes_destroy (struct devlink *devlink); +void devlink_port_linecard_set (struct devlink_port *devlink_port, +struct devlink_linecard *linecard);struct devlink_linecard *devlink_linecard_create (struct devlink *devlink,unsigned int linecard_index,const struct devlink_linecard_ops *ops,void *priv);
net/core/devlink.c +25 -1
@@ -1243,6 +1243,10 @@ static int devlink_nl_port_fill(struct sk_buff *msg, goto nla_put_failure;if (devlink_nl_port_function_attrs_put (msg, devlink_port, extack)) goto nla_put_failure; +if (devlink_port->linecard && +nla_put_u32 (msg,DEVLINK_ATTR_LINECARD_INDEX , + devlink_port->linecard->index)) + goto nla_put_failure;genlmsg_end (msg, hdr);return 0 ;
@@ -10105,6 +10109,21 @@ void devlink_rate_nodes_destroy(struct devlink *devlink) }EXPORT_SYMBOL_GPL (devlink_rate_nodes_destroy); +/** +* devlink_port_linecard_set - Link port with a linecard +* +* @devlink_port: devlink port +* @linecard: devlink linecard +*/ +void devlink_port_linecard_set (struct devlink_port *devlink_port, +struct devlink_linecard *linecard) +{ +if (WARN_ON (devlink_port->devlink)) +return ; + devlink_port->linecard = linecard; +} +EXPORT_SYMBOL_GPL (devlink_port_linecard_set); +static int __devlink_port_phys_port_name_get (struct devlink_port *devlink_port,char *name,size_t len) {
@@ -10116,7 +10135,12 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,switch (attrs->flavour) {case DEVLINK_PORT_FLAVOUR_PHYSICAL : - n =snprintf (name, len,"p%u" , attrs->phys.port_number); +if (devlink_port->linecard) + n =snprintf (name, len,"l%u" , + devlink_port->linecard->index); +if (n < len) + n +=snprintf (name + n, len - n,"p%u" , + attrs->phys.port_number);if (n < len && attrs->split) n +=snprintf (name + n, len - n,"s%u" , attrs->phys.split_subport_number);
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 5/17 mlxsw: spectrum: Allow lane to start from non-zero index
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
So far, the lane index always started from zero. That is not true for modular systems with gearbox-equipped linecards. Loose the check so the lanes can start from non-zero index.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +3 -1
@@ -486,6 +486,7 @@ mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp, u16 local_port, {char pmlp_pl[MLXSW_REG_PMLP_LEN ];bool separate_rxtx; +u8 first_lane;u8 module;u8 width;int err;
@@ -498,6 +499,7 @@ mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp, u16 local_port, module =mlxsw_reg_pmlp_module_get (pmlp_pl,0 ); width =mlxsw_reg_pmlp_width_get (pmlp_pl); separate_rxtx =mlxsw_reg_pmlp_rxtx_get (pmlp_pl); + first_lane =mlxsw_reg_pmlp_tx_lane_get (pmlp_pl,0 );if (width && !is_power_of_2 (width)) { dev_err(mlxsw_sp->bus_info->dev, "Port %d: Unsupported module config: width value is not power of 2\n",
@@ -518,7 +520,7 @@ mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp, u16 local_port, local_port);return -EINVAL ; } -if (mlxsw_reg_pmlp_tx_lane_get (pmlp_pl, i) != i) { +if (mlxsw_reg_pmlp_tx_lane_get (pmlp_pl, i) != i + first_lane) {dev_err (mlxsw_sp->bus_info->dev,"Port %d: Unsupported module config: TX and RX lane numbers are not sequential\n" , local_port);return -EINVAL ;
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 6/17 mlxsw: spectrum: Allocate port mapping array of structs instead of pointers
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Instead of array of pointers to port mapping structures, allocate the array of structures directly.
--- .../net/ethernet/mellanox/mlxsw/spectrum.c | 32 +++++-------------- .../net/ethernet/mellanox/mlxsw/spectrum.h | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +8 -24
@@ -1891,8 +1891,8 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp) goto err_cpu_port_create;for (i =1 ; i < max_ports; i++) { - port_mapping = mlxsw_sp->port_mapping[i]; -if (!port_mapping) + port_mapping = &mlxsw_sp->port_mapping[i]; +if (!port_mapping->width)continue ; err =mlxsw_sp_port_create (mlxsw_sp, i, false, port_mapping);if (err)
@@ -1914,12 +1914,12 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)static int mlxsw_sp_port_module_info_init (struct mlxsw_sp *mlxsw_sp) {unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core); -struct mlxsw_sp_port_mapping port_mapping; +struct mlxsw_sp_port_mapping *port_mapping;int i;int err; mlxsw_sp->port_mapping =kcalloc (max_ports, -sizeof (struct mlxsw_sp_port_mapping *), +sizeof (struct mlxsw_sp_port_mapping ),GFP_KERNEL );if (!mlxsw_sp->port_mapping)return -ENOMEM ;
@@ -1928,36 +1928,20 @@ static int mlxsw_sp_port_module_info_init(struct mlxsw_sp *mlxsw_sp)if (mlxsw_core_port_is_xm (mlxsw_sp->core, i))continue ; - err =mlxsw_sp_port_module_info_get (mlxsw_sp, i, &port_mapping); + port_mapping = &mlxsw_sp->port_mapping[i]; + err =mlxsw_sp_port_module_info_get (mlxsw_sp, i, port_mapping);if (err) goto err_port_module_info_get; -if (!port_mapping.width) -continue ; - - mlxsw_sp->port_mapping[i] =kmemdup (&port_mapping, -sizeof (port_mapping), -GFP_KERNEL ); -if (!mlxsw_sp->port_mapping[i]) { - err = -ENOMEM ; - goto err_port_module_info_dup; - } }return 0 ; err_port_module_info_get: -err_port_module_info_dup: -for (i--; i >=1 ; i--) -kfree (mlxsw_sp->port_mapping[i]);kfree (mlxsw_sp->port_mapping);return err; }static void mlxsw_sp_port_module_info_fini (struct mlxsw_sp *mlxsw_sp) { -int i; - -for (i =1 ; i <mlxsw_core_max_ports (mlxsw_sp->core); i++) -kfree (mlxsw_sp->port_mapping[i]);kfree (mlxsw_sp->port_mapping); }
@@ -2007,8 +1991,8 @@ static void mlxsw_sp_port_unsplit_create(struct mlxsw_sp *mlxsw_sp,for (i =0 ; i < count; i++) {u16 local_port =mlxsw_reg_pmtdb_port_num_get (pmtdb_pl, i); - port_mapping = mlxsw_sp->port_mapping[local_port]; -if (!port_mapping || !mlxsw_sp_local_port_valid (local_port)) + port_mapping = &mlxsw_sp->port_mapping[local_port]; +if (!port_mapping->width || !mlxsw_sp_local_port_valid (local_port))continue ;mlxsw_sp_port_create (mlxsw_sp, local_port, false, port_mapping);
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +1 -1
@@ -164,7 +164,7 @@ struct mlxsw_sp {unsigned char base_mac[ETH_ALEN ];const unsigned char *mac_mask;struct mlxsw_sp_upper *lags; -struct mlxsw_sp_port_mapping **port_mapping; +struct mlxsw_sp_port_mapping *port_mapping;struct rhashtable sample_trigger_ht;struct mlxsw_sp_sb *sb;struct mlxsw_sp_bridge *bridge;
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 7/17 mlxsw: reg: Add Ports Mapping Event Configuration Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
The PMECR register is used to enable/disable event triggering in case of local port mapping change.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 64 +++++++++++++++++++++++ 1 file changed, 64 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +64 -0
@@ -5875,6 +5875,69 @@ static inline void mlxsw_reg_pmtdb_pack(char *payload, u8 slot_index, u8 module,mlxsw_reg_pmtdb_num_ports_set (payload, num_ports); } +/* PMECR - Ports Mapping Event Configuration Register +* -------------------------------------------------- +* The PMECR register is used to enable/disable event triggering +* in case of local port mapping change. +*/ +#define MLXSW_REG_PMECR_ID 0x501B +#define MLXSW_REG_PMECR_LEN 0x20 + +MLXSW_REG_DEFINE (pmecr,MLXSW_REG_PMECR_ID ,MLXSW_REG_PMECR_LEN ); + +/* reg_pmecr_local_port +* Local port number. +* Access: Index +*/ +MLXSW_ITEM32_LP (reg, pmecr,0x00 ,16 ,0x00 ,12 ); + +/* reg_pmecr_ee +* Event update enable. If this bit is set, event generation will be updated +* based on the e field. Only relevant on Set operations. +* Access: WO +*/ +MLXSW_ITEM32 (reg, pmecr, ee,0x04 ,30 ,1 ); + +/* reg_pmecr_eswi +* Software ignore enable bit. If this bit is set, the value of swi is used. +* If this bit is clear, the value of swi is ignored. +* Only relevant on Set operations. +* Access: WO +*/ +MLXSW_ITEM32 (reg, pmecr, eswi,0x04 ,24 ,1 ); + +/* reg_pmecr_swi +* Software ignore. If this bit is set, the device shouldn't generate events +* in case of PMLP SET operation but only upon self local port mapping change +* (if applicable according to e configuration). This is supplementary +* configuration on top of e value. +* Access: RW +*/ +MLXSW_ITEM32 (reg, pmecr, swi,0x04 ,8 ,1 ); + +enum mlxsw_reg_pmecr_e { +MLXSW_REG_PMECR_E_DO_NOT_GENERATE_EVENT , +MLXSW_REG_PMECR_E_GENERATE_EVENT , +MLXSW_REG_PMECR_E_GENERATE_SINGLE_EVENT , +}; + +/* reg_pmecr_e +* Event generation on local port mapping change. +* Access: RW +*/ +MLXSW_ITEM32 (reg, pmecr, e,0x04 ,0 ,2 ); + +static inline void mlxsw_reg_pmecr_pack (char *payload,u16 local_port, +enum mlxsw_reg_pmecr_e e) +{ +MLXSW_REG_ZERO (pmecr, payload); +mlxsw_reg_pmecr_local_port_set (payload, local_port); +mlxsw_reg_pmecr_e_set (payload, e); +mlxsw_reg_pmecr_ee_set (payload, true); +mlxsw_reg_pmecr_swi_set (payload, true); +mlxsw_reg_pmecr_eswi_set (payload, true); +} +/* PMPE - Port Module Plug/Unplug Event Register * --------------------------------------------- * This register reports any operational status change of a module.
@@ -12678,6 +12741,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (pmaos),MLXSW_REG (pplr),MLXSW_REG (pmtdb), +MLXSW_REG (pmecr),MLXSW_REG (pmpe),MLXSW_REG (pddr), MLXSW_REG(pmmp),
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 8/17 mlxsw: Narrow the critical section of devl_lock during ports creation/removal
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
No need to hold the lock for alloc and freecpu. So narrow the critical section. Follow-up patch is going to benefit from this by adding more code to the functions which will be out of the critical as well.
--- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 13 +++++++------ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 +++++++------- 2 files changed, 14 insertions(+), 13 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/minimal.c +7 -6
@@ -328,6 +328,7 @@ static void mlxsw_m_port_module_unmap(struct mlxsw_m *mlxsw_m, u8 module)static int mlxsw_m_ports_create (struct mlxsw_m *mlxsw_m) {unsigned int max_ports =mlxsw_core_max_ports (mlxsw_m->core); +struct devlink *devlink =priv_to_devlink (mlxsw_m->core);u8 last_module = max_ports;int i;int err;
@@ -356,6 +357,7 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m) }/* Create port objects for each valid entry */ +devl_lock (devlink);for (i =0 ; i < mlxsw_m->max_ports; i++) {if (mlxsw_m->module_to_port[i] >0 && !mlxsw_core_port_is_xm (mlxsw_m->core, i)) {
@@ -366,6 +368,7 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m) goto err_module_to_port_create; } } +devl_unlock (devlink);return 0 ;
@@ -375,6 +378,7 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)mlxsw_m_port_remove (mlxsw_m, mlxsw_m->module_to_port[i]); } +devl_unlock (devlink); i = max_ports; err_module_to_port_map:for (i--; i >0 ; i--)
@@ -387,8 +391,10 @@ static int mlxsw_m_ports_create(struct mlxsw_m *mlxsw_m)static void mlxsw_m_ports_remove (struct mlxsw_m *mlxsw_m) { +struct devlink *devlink =priv_to_devlink (mlxsw_m->core);int i; +devl_lock (devlink);for (i =0 ; i < mlxsw_m->max_ports; i++) {if (mlxsw_m->module_to_port[i] >0 ) { mlxsw_m_port_remove(mlxsw_m,
@@ -396,6 +402,7 @@ static void mlxsw_m_ports_remove(struct mlxsw_m *mlxsw_m)mlxsw_m_port_module_unmap (mlxsw_m, i); } } +devl_unlock (devlink);kfree (mlxsw_m->module_to_port);kfree (mlxsw_m->ports);
@@ -424,7 +431,6 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core, struct netlink_ext_ack *extack) {struct mlxsw_m *mlxsw_m =mlxsw_core_driver_priv (mlxsw_core); -struct devlink *devlink =priv_to_devlink (mlxsw_core);int err; mlxsw_m->core = mlxsw_core;
@@ -440,9 +446,7 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core,return err; } -devl_lock (devlink); err =mlxsw_m_ports_create (mlxsw_m); -devl_unlock (devlink);if (err) {dev_err (mlxsw_m->bus_info->dev,"Failed to create ports\n" );return err;
@@ -454,11 +458,8 @@ static int mlxsw_m_init(struct mlxsw_core *mlxsw_core,static void mlxsw_m_fini (struct mlxsw_core *mlxsw_core) {struct mlxsw_m *mlxsw_m =mlxsw_core_driver_priv (mlxsw_core); -struct devlink *devlink =priv_to_devlink (mlxsw_core); -devl_lock (devlink);mlxsw_m_ports_remove (mlxsw_m); -devl_unlock (devlink); }static const struct mlxsw_config_profile mlxsw_m_config_profile;
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +7 -7
@@ -1863,12 +1863,15 @@ static bool mlxsw_sp_port_created(struct mlxsw_sp *mlxsw_sp, u16 local_port)static void mlxsw_sp_ports_remove (struct mlxsw_sp *mlxsw_sp) { +struct devlink *devlink =priv_to_devlink (mlxsw_sp->core);int i; +devl_lock (devlink);for (i =1 ; i <mlxsw_core_max_ports (mlxsw_sp->core); i++)if (mlxsw_sp_port_created (mlxsw_sp, i))mlxsw_sp_port_remove (mlxsw_sp, i);mlxsw_sp_cpu_port_remove (mlxsw_sp); +devl_unlock (devlink);kfree (mlxsw_sp->ports); mlxsw_sp->ports =NULL ; }
@@ -1876,6 +1879,7 @@ static void mlxsw_sp_ports_remove(struct mlxsw_sp *mlxsw_sp)static int mlxsw_sp_ports_create (struct mlxsw_sp *mlxsw_sp) {unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core); +struct devlink *devlink =priv_to_devlink (mlxsw_sp->core);struct mlxsw_sp_port_mapping *port_mapping;size_t alloc_size;int i;
@@ -1886,6 +1890,7 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)if (!mlxsw_sp->ports)return -ENOMEM ; +devl_lock (devlink); err =mlxsw_sp_cpu_port_create (mlxsw_sp);if (err) goto err_cpu_port_create;
@@ -1898,6 +1903,7 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)if (err) goto err_port_create; } +devl_unlock (devlink);return 0 ; err_port_create:
@@ -1906,6 +1912,7 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)mlxsw_sp_port_remove (mlxsw_sp, i);mlxsw_sp_cpu_port_remove (mlxsw_sp); err_cpu_port_create: +devl_unlock (devlink);kfree (mlxsw_sp->ports); mlxsw_sp->ports =NULL ;return err;
@@ -2805,7 +2812,6 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, struct netlink_ext_ack *extack) {struct mlxsw_sp *mlxsw_sp =mlxsw_core_driver_priv (mlxsw_core); -struct devlink *devlink =priv_to_devlink (mlxsw_core);int err; mlxsw_sp->core = mlxsw_core;
@@ -2966,9 +2972,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, goto err_sample_trigger_init; } -devl_lock (devlink); err =mlxsw_sp_ports_create (mlxsw_sp); -devl_unlock (devlink);if (err) {dev_err (mlxsw_sp->bus_info->dev,"Failed to create ports\n" ); goto err_ports_create;
@@ -3149,12 +3153,8 @@ static int mlxsw_sp4_init(struct mlxsw_core *mlxsw_core,static void mlxsw_sp_fini (struct mlxsw_core *mlxsw_core) {struct mlxsw_sp *mlxsw_sp =mlxsw_core_driver_priv (mlxsw_core); -struct devlink *devlink =priv_to_devlink (mlxsw_core); -devl_lock (devlink);mlxsw_sp_ports_remove (mlxsw_sp); -devl_unlock (devlink); -rhashtable_destroy (&mlxsw_sp->sample_trigger_ht);mlxsw_sp_port_module_info_fini (mlxsw_sp);mlxsw_sp_dpipe_fini (mlxsw_sp);
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 9/17 mlxsw: spectrum: Introduce port mapping change event processing
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Register PMLPE trap and process the port mapping changes delivered by it by creating related ports. Note that this happens after provisioning. The INI of the linecard is processed and merged by FW. PMLPE is generated for each port. Process this mapping change.
Layout of PMLPE is the same as layout of PMLP.
--- .../net/ethernet/mellanox/mlxsw/spectrum.c | 166 +++++++++++++++++- .../net/ethernet/mellanox/mlxsw/spectrum.h | 7 + drivers/net/ethernet/mellanox/mlxsw/trap.h | 2 + 3 files changed, 166 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +157 -9
@@ -481,21 +481,16 @@ mlxsw_sp_port_system_port_mapping_set(struct mlxsw_sp_port *mlxsw_sp_port) }static int -mlxsw_sp_port_module_info_get (struct mlxsw_sp *mlxsw_sp,u16 local_port, -struct mlxsw_sp_port_mapping *port_mapping) +mlxsw_sp_port_module_info_parse (struct mlxsw_sp *mlxsw_sp, +u16 local_port,char *pmlp_pl, +struct mlxsw_sp_port_mapping *port_mapping) { -char pmlp_pl[MLXSW_REG_PMLP_LEN ];bool separate_rxtx;u8 first_lane;u8 module;u8 width; -int err;int i; -mlxsw_reg_pmlp_pack (pmlp_pl, local_port); - err =mlxsw_reg_query (mlxsw_sp->core,MLXSW_REG (pmlp), pmlp_pl); -if (err) -return err; module =mlxsw_reg_pmlp_module_get (pmlp_pl,0 ); width =mlxsw_reg_pmlp_width_get (pmlp_pl); separate_rxtx =mlxsw_reg_pmlp_rxtx_get (pmlp_pl);
@@ -534,6 +529,21 @@ mlxsw_sp_port_module_info_get(struct mlxsw_sp *mlxsw_sp, u16 local_port,return 0 ; } +static int +mlxsw_sp_port_module_info_get (struct mlxsw_sp *mlxsw_sp,u16 local_port, +struct mlxsw_sp_port_mapping *port_mapping) +{ +char pmlp_pl[MLXSW_REG_PMLP_LEN ]; +int err; + +mlxsw_reg_pmlp_pack (pmlp_pl, local_port); + err =mlxsw_reg_query (mlxsw_sp->core,MLXSW_REG (pmlp), pmlp_pl); +if (err) +return err; +return mlxsw_sp_port_module_info_parse (mlxsw_sp, local_port, + pmlp_pl, port_mapping); +} +static int mlxsw_sp_port_module_map (struct mlxsw_sp *mlxsw_sp,u16 local_port,const struct mlxsw_sp_port_mapping *port_mapping)
@@ -1861,13 +1871,121 @@ static bool mlxsw_sp_port_created(struct mlxsw_sp *mlxsw_sp, u16 local_port)return mlxsw_sp->ports[local_port] !=NULL ; } +static int mlxsw_sp_port_mapping_event_set (struct mlxsw_sp *mlxsw_sp, +u16 local_port,bool enable) +{ +char pmecr_pl[MLXSW_REG_PMECR_LEN ]; + +mlxsw_reg_pmecr_pack (pmecr_pl, local_port, + enable ?MLXSW_REG_PMECR_E_GENERATE_EVENT : +MLXSW_REG_PMECR_E_DO_NOT_GENERATE_EVENT ); +return mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (pmecr), pmecr_pl); +} + +struct mlxsw_sp_port_mapping_event { +struct list_head list; +char pmlp_pl[MLXSW_REG_PMLP_LEN ]; +}; + +static void mlxsw_sp_port_mapping_events_work (struct work_struct *work) +{ +struct mlxsw_sp_port_mapping_event *event, *next_event; +struct mlxsw_sp_port_mapping_events *events; +struct mlxsw_sp_port_mapping port_mapping; +struct mlxsw_sp *mlxsw_sp; +struct devlink *devlink; +LIST_HEAD (event_queue); +u16 local_port; +int err; + + events = container_of(work, struct mlxsw_sp_port_mapping_events, work); + mlxsw_sp = container_of(events, struct mlxsw_sp, port_mapping_events); + devlink =priv_to_devlink (mlxsw_sp->core); + +spin_lock_bh (&events->queue_lock); +list_splice_init (&events->queue, &event_queue); +spin_unlock_bh (&events->queue_lock); + +list_for_each_entry_safe (event, next_event, &event_queue, list) { + local_port =mlxsw_reg_pmlp_local_port_get (event->pmlp_pl); + err =mlxsw_sp_port_module_info_parse (mlxsw_sp, local_port, + event->pmlp_pl, &port_mapping); +if (err) + goto out; + +if (WARN_ON_ONCE (!port_mapping.width)) + goto out; + +devl_lock (devlink); + +if (!mlxsw_sp_port_created (mlxsw_sp, local_port)) +mlxsw_sp_port_create (mlxsw_sp, local_port, + false, &port_mapping); +else +WARN_ON_ONCE (1 ); + +devl_unlock (devlink); + + mlxsw_sp->port_mapping[local_port] = port_mapping; + +out: +kfree (event); + } +} + +static void +mlxsw_sp_port_mapping_listener_func (const struct mlxsw_reg_info *reg, +char *pmlp_pl,void *priv) +{ +struct mlxsw_sp_port_mapping_events *events; +struct mlxsw_sp_port_mapping_event *event; +struct mlxsw_sp *mlxsw_sp = priv; +u16 local_port; + + local_port =mlxsw_reg_pmlp_local_port_get (pmlp_pl); +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port))) +return ; + + events = &mlxsw_sp->port_mapping_events; + event =kmalloc (sizeof (*event),GFP_ATOMIC ); +if (!event) +return ; +memcpy (event->pmlp_pl, pmlp_pl,sizeof (event->pmlp_pl)); +spin_lock (&events->queue_lock); +list_add_tail (&event->list, &events->queue); +spin_unlock (&events->queue_lock); +mlxsw_core_schedule_work (&events->work); +} + +static void +__mlxsw_sp_port_mapping_events_cancel (struct mlxsw_sp *mlxsw_sp) +{ +struct mlxsw_sp_port_mapping_event *event, *next_event; +struct mlxsw_sp_port_mapping_events *events; + + events = &mlxsw_sp->port_mapping_events; + +/* Caller needs to make sure that no new event is going to appear. */ +cancel_work_sync (&events->work); +list_for_each_entry_safe (event, next_event, &events->queue, list) { +list_del (&event->list); +kfree (event); + } +} +static void mlxsw_sp_ports_remove (struct mlxsw_sp *mlxsw_sp) { +unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core);struct devlink *devlink =priv_to_devlink (mlxsw_sp->core);int i; +for (i =1 ; i < max_ports; i++) +mlxsw_sp_port_mapping_event_set (mlxsw_sp, i, false); +/* Make sure all scheduled events are processed */ +__mlxsw_sp_port_mapping_events_cancel (mlxsw_sp); +devl_lock (devlink); -for (i =1 ; i <mlxsw_core_max_ports (mlxsw_sp->core); i++) +for (i =1 ; i < max_ports; i++)if (mlxsw_sp_port_created (mlxsw_sp, i))mlxsw_sp_port_remove (mlxsw_sp, i);mlxsw_sp_cpu_port_remove (mlxsw_sp);
@@ -1880,6 +1998,7 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp) {unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core);struct devlink *devlink =priv_to_devlink (mlxsw_sp->core); +struct mlxsw_sp_port_mapping_events *events;struct mlxsw_sp_port_mapping *port_mapping;size_t alloc_size;int i;
@@ -1890,6 +2009,17 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)if (!mlxsw_sp->ports)return -ENOMEM ; + events = &mlxsw_sp->port_mapping_events; +INIT_LIST_HEAD (&events->queue); +spin_lock_init (&events->queue_lock); +INIT_WORK (&events->work, mlxsw_sp_port_mapping_events_work); + +for (i =1 ; i < max_ports; i++) { + err =mlxsw_sp_port_mapping_event_set (mlxsw_sp, i, true); +if (err) + goto err_event_enable; + } +devl_lock (devlink); err =mlxsw_sp_cpu_port_create (mlxsw_sp);if (err)
@@ -1910,9 +2040,15 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp)for (i--; i >=1 ; i--)if (mlxsw_sp_port_created (mlxsw_sp, i))mlxsw_sp_port_remove (mlxsw_sp, i); + i = max_ports;mlxsw_sp_cpu_port_remove (mlxsw_sp); err_cpu_port_create:devl_unlock (devlink); +err_event_enable: +for (i--; i >=1 ; i--) +mlxsw_sp_port_mapping_event_set (mlxsw_sp, i, false); +/* Make sure all scheduled events are processed */ +__mlxsw_sp_port_mapping_events_cancel (mlxsw_sp);kfree (mlxsw_sp->ports); mlxsw_sp->ports =NULL ;return err;
@@ -2074,6 +2210,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u16 local_port, err_port_split_create:mlxsw_sp_port_unsplit_create (mlxsw_sp, count, pmtdb_pl); +return err; }
@@ -2294,6 +2431,11 @@ static const struct mlxsw_listener mlxsw_sp1_listener[] = { MLXSW_EVENTL(mlxsw_sp1_ptp_ing_fifo_event_func, PTP_ING_FIFO, SP_PTP0), }; +static const struct mlxsw_listener mlxsw_sp2_listener[] = { +/* Events */ +MLXSW_SP_EVENTL (mlxsw_sp_port_mapping_listener_func,PMLPE ), +}; +static int mlxsw_sp_cpu_policers_set (struct mlxsw_core *mlxsw_core) {struct mlxsw_sp *mlxsw_sp =mlxsw_core_driver_priv (mlxsw_core);
@@ -3085,6 +3227,8 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core, mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops; mlxsw_sp->mall_ops = &mlxsw_sp2_mall_ops; mlxsw_sp->router_ops = &mlxsw_sp2_router_ops; + mlxsw_sp->listeners = mlxsw_sp2_listener; + mlxsw_sp->listeners_count =ARRAY_SIZE (mlxsw_sp2_listener); mlxsw_sp->lowest_shaper_bs =MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP2 ;return mlxsw_sp_init (mlxsw_core, mlxsw_bus_info, extack);
@@ -3115,6 +3259,8 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core, mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops; mlxsw_sp->mall_ops = &mlxsw_sp2_mall_ops; mlxsw_sp->router_ops = &mlxsw_sp2_router_ops; + mlxsw_sp->listeners = mlxsw_sp2_listener; + mlxsw_sp->listeners_count =ARRAY_SIZE (mlxsw_sp2_listener); mlxsw_sp->lowest_shaper_bs =MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP3 ;return mlxsw_sp_init (mlxsw_core, mlxsw_bus_info, extack);
@@ -3145,6 +3291,8 @@ static int mlxsw_sp4_init(struct mlxsw_core *mlxsw_core, mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops; mlxsw_sp->mall_ops = &mlxsw_sp2_mall_ops; mlxsw_sp->router_ops = &mlxsw_sp2_router_ops; + mlxsw_sp->listeners = mlxsw_sp2_listener; + mlxsw_sp->listeners_count =ARRAY_SIZE (mlxsw_sp2_listener); mlxsw_sp->lowest_shaper_bs =MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP4 ;return mlxsw_sp_init (mlxsw_core, mlxsw_bus_info, extack);
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +7 -0
@@ -150,6 +150,12 @@ struct mlxsw_sp_port_mapping {u8 lane; }; +struct mlxsw_sp_port_mapping_events { +struct list_head queue; +spinlock_t queue_lock;/* protects queue */ +struct work_struct work; +}; +struct mlxsw_sp_parsing {refcount_t parsing_depth_ref;u16 parsing_depth;
@@ -165,6 +171,7 @@ struct mlxsw_sp {const unsigned char *mac_mask;struct mlxsw_sp_upper *lags;struct mlxsw_sp_port_mapping *port_mapping; +struct mlxsw_sp_port_mapping_events port_mapping_events;struct rhashtable sample_trigger_ht;struct mlxsw_sp_sb *sb;struct mlxsw_sp_bridge *bridge;
drivers/net/ethernet/mellanox/mlxsw/trap.h +2 -0
@@ -133,6 +133,8 @@ enum mlxsw_event_trap_id {MLXSW_TRAP_ID_PTP_ING_FIFO =0x2D ,/* PTP Egress FIFO has a new entry */ MLXSW_TRAP_ID_PTP_EGR_FIFO =0x2E , +/* Port mapping change */ + MLXSW_TRAP_ID_PMLPE = 0x32E, };#endif /* _MLXSW_TRAP_H */
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 10/17 mlxsw: reg: Add Management DownStream Device Query Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
The MDDQ register allows to query the DownStream device properties.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 144 ++++++++++++++++++++++ 1 file changed, 144 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +144 -0
@@ -11492,6 +11492,149 @@ mlxsw_reg_mgpir_unpack(char *payload, u8 *num_of_devices, *num_of_slots =mlxsw_reg_mgpir_num_of_slots_get (payload); } +/* MDDQ - Management DownStream Device Query Register +* -------------------------------------------------- +* This register allows to query the DownStream device properties. The desired +* information is chosen upon the query_type field and is delivered by 32B +* of data blocks. +*/ +#define MLXSW_REG_MDDQ_ID 0x9161 +#define MLXSW_REG_MDDQ_LEN 0x30 + +MLXSW_REG_DEFINE (mddq,MLXSW_REG_MDDQ_ID ,MLXSW_REG_MDDQ_LEN ); + +/* reg_mddq_sie +* Slot info event enable. +* When set to '1', each change in the slot_info.provisioned / sr_valid / +* active / ready will generate a DSDSC event. +* Access: RW +*/ +MLXSW_ITEM32 (reg, mddq, sie,0x00 ,31 ,1 ); + +enum mlxsw_reg_mddq_query_type { +MLXSW_REG_MDDQ_QUERY_TYPE_SLOT_INFO =1 , +MLXSW_REG_MDDQ_QUERY_TYPE_SLOT_NAME =3 , +}; + +/* reg_mddq_query_type +* Access: Index +*/ +MLXSW_ITEM32 (reg, mddq, query_type,0x00 ,16 ,8 ); + +/* reg_mddq_slot_index +* Slot index. 0 is reserved. +* Access: Index +*/ +MLXSW_ITEM32 (reg, mddq, slot_index,0x00 ,0 ,4 ); + +/* reg_mddq_slot_info_provisioned +* If set, the INI file is applied and the card is provisioned. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_provisioned,0x10 ,31 ,1 ); + +/* reg_mddq_slot_info_sr_valid +* If set, Shift Register is valid (after being provisioned) and data +* can be sent from the switch ASIC to the line-card CPLD over Shift-Register. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_sr_valid,0x10 ,30 ,1 ); + +enum mlxsw_reg_mddq_slot_info_ready { +MLXSW_REG_MDDQ_SLOT_INFO_READY_NOT_READY , +MLXSW_REG_MDDQ_SLOT_INFO_READY_READY , +MLXSW_REG_MDDQ_SLOT_INFO_READY_ERROR , +}; + +/* reg_mddq_slot_info_lc_ready +* If set, the LC is powered on, matching the INI version and a new FW +* version can be burnt (if necessary). +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_lc_ready,0x10 ,28 ,2 ); + +/* reg_mddq_slot_info_active +* If set, the FW has completed the MDDC.device_enable command. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_active,0x10 ,27 ,1 ); + +/* reg_mddq_slot_info_hw_revision +* Major user-configured version number of the current INI file. +* Valid only when active or ready are '1'. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_hw_revision,0x14 ,16 ,16 ); + +/* reg_mddq_slot_info_ini_file_version +* User-configured version number of the current INI file. +* Valid only when active or lc_ready are '1'. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_ini_file_version,0x14 ,0 ,16 ); + +/* reg_mddq_slot_info_card_type +* Access: RO +*/ +MLXSW_ITEM32 (reg, mddq, slot_info_card_type,0x18 ,0 ,8 ); + +static inline void +__mlxsw_reg_mddq_pack (char *payload,u8 slot_index, +enum mlxsw_reg_mddq_query_type query_type) +{ +MLXSW_REG_ZERO (mddq, payload); +mlxsw_reg_mddq_slot_index_set (payload, slot_index); +mlxsw_reg_mddq_query_type_set (payload, query_type); +} + +static inline void +mlxsw_reg_mddq_slot_info_pack (char *payload,u8 slot_index,bool sie) +{ +__mlxsw_reg_mddq_pack (payload, slot_index, +MLXSW_REG_MDDQ_QUERY_TYPE_SLOT_INFO ); +mlxsw_reg_mddq_sie_set (payload, sie); +} + +static inline void +mlxsw_reg_mddq_slot_info_unpack (const char *payload,u8 *p_slot_index, +bool *p_provisioned,bool *p_sr_valid, +enum mlxsw_reg_mddq_slot_info_ready *p_lc_ready, +bool *p_active,u16 *p_hw_revision, +u16 *p_ini_file_version, +u8 *p_card_type) +{ + *p_slot_index =mlxsw_reg_mddq_slot_index_get (payload); + *p_provisioned =mlxsw_reg_mddq_slot_info_provisioned_get (payload); + *p_sr_valid =mlxsw_reg_mddq_slot_info_sr_valid_get (payload); + *p_lc_ready =mlxsw_reg_mddq_slot_info_lc_ready_get (payload); + *p_active =mlxsw_reg_mddq_slot_info_active_get (payload); + *p_hw_revision =mlxsw_reg_mddq_slot_info_hw_revision_get (payload); + *p_ini_file_version =mlxsw_reg_mddq_slot_info_ini_file_version_get (payload); + *p_card_type =mlxsw_reg_mddq_slot_info_card_type_get (payload); +} + +#define MLXSW_REG_MDDQ_SLOT_ASCII_NAME_LEN 20 + +/* reg_mddq_slot_ascii_name +* Slot's ASCII name. +* Access: RO +*/ +MLXSW_ITEM_BUF (reg, mddq, slot_ascii_name,0x10 , +MLXSW_REG_MDDQ_SLOT_ASCII_NAME_LEN ); + +static inline void +mlxsw_reg_mddq_slot_name_pack (char *payload,u8 slot_index) +{ +__mlxsw_reg_mddq_pack (payload, slot_index, +MLXSW_REG_MDDQ_QUERY_TYPE_SLOT_NAME ); +} + +static inline void +mlxsw_reg_mddq_slot_name_unpack (const char *payload,char *slot_ascii_name) +{ +mlxsw_reg_mddq_slot_ascii_name_memcpy_from (payload, slot_ascii_name); +} +/* MFDE - Monitoring FW Debug Register * ----------------------------------- */
@@ -12811,6 +12954,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (mtptpt),MLXSW_REG (mfgd),MLXSW_REG (mgpir), +MLXSW_REG (mddq),MLXSW_REG (mfde),MLXSW_REG (tngcr), MLXSW_REG(tnumt),
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 11/17 mlxsw: reg: Add Management DownStream Device Control Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
The MDDC register allows to control downstream devices and line cards.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +37 -0
@@ -11635,6 +11635,42 @@ mlxsw_reg_mddq_slot_name_unpack(const char *payload, char *slot_ascii_name)mlxsw_reg_mddq_slot_ascii_name_memcpy_from (payload, slot_ascii_name); } +/* MDDC - Management DownStream Device Control Register +* ---------------------------------------------------- +* This register allows to control downstream devices and line cards. +*/ +#define MLXSW_REG_MDDC_ID 0x9163 +#define MLXSW_REG_MDDC_LEN 0x30 + +MLXSW_REG_DEFINE (mddc,MLXSW_REG_MDDC_ID ,MLXSW_REG_MDDC_LEN ); + +/* reg_mddc_slot_index +* Slot index. 0 is reserved. +* Access: Index +*/ +MLXSW_ITEM32 (reg, mddc, slot_index,0x00 ,0 ,4 ); + +/* reg_mddc_rst +* Reset request. +* Access: OP +*/ +MLXSW_ITEM32 (reg, mddc, rst,0x04 ,29 ,1 ); + +/* reg_mddc_device_enable +* When set, FW is the manager and allowed to program the downstream device. +* Access: RW +*/ +MLXSW_ITEM32 (reg, mddc, device_enable,0x04 ,28 ,1 ); + +static inline void mlxsw_reg_mddc_pack (char *payload,u8 slot_index,bool rst, +bool device_enable) +{ +MLXSW_REG_ZERO (mddc, payload); +mlxsw_reg_mddc_slot_index_set (payload, slot_index); +mlxsw_reg_mddc_rst_set (payload, rst); +mlxsw_reg_mddc_device_enable_set (payload, device_enable); +} +/* MFDE - Monitoring FW Debug Register * ----------------------------------- */
@@ -12955,6 +12991,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (mfgd),MLXSW_REG (mgpir),MLXSW_REG (mddq), +MLXSW_REG (mddc),MLXSW_REG (mfde),MLXSW_REG (tngcr), MLXSW_REG(tnumt),
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 12/17 mlxsw: reg: Add Management Binary Code Transfer Register
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
The MBCT register allows to transfer binary INI codes from the host to the management FW by transferring it by chunks of maximum 1KB.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 122 ++++++++++++++++++++++ 1 file changed, 122 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/reg.h +122 -0
@@ -11492,6 +11492,127 @@ mlxsw_reg_mgpir_unpack(char *payload, u8 *num_of_devices, *num_of_slots =mlxsw_reg_mgpir_num_of_slots_get (payload); } +/* MBCT - Management Binary Code Transfer Register +* ----------------------------------------------- +* This register allows to transfer binary codes from the host to +* the management FW by transferring it by chunks of maximum 1KB. +*/ +#define MLXSW_REG_MBCT_ID 0x9120 +#define MLXSW_REG_MBCT_LEN 0x420 + +MLXSW_REG_DEFINE (mbct,MLXSW_REG_MBCT_ID ,MLXSW_REG_MBCT_LEN ); + +/* reg_mbct_slot_index +* Slot index. 0 is reserved. +* Access: Index +*/ +MLXSW_ITEM32 (reg, mbct, slot_index,0x00 ,0 ,4 ); + +/* reg_mbct_data_size +* Actual data field size in bytes for the current data transfer. +* Access: WO +*/ +MLXSW_ITEM32 (reg, mbct, data_size,0x04 ,0 ,11 ); + +enum mlxsw_reg_mbct_op { +MLXSW_REG_MBCT_OP_ERASE_INI_IMAGE =1 , +MLXSW_REG_MBCT_OP_DATA_TRANSFER ,/* Download */ +MLXSW_REG_MBCT_OP_ACTIVATE , +MLXSW_REG_MBCT_OP_CLEAR_ERRORS =6 , +MLXSW_REG_MBCT_OP_QUERY_STATUS , +}; + +/* reg_mbct_op +* Access: WO +*/ +MLXSW_ITEM32 (reg, mbct, op,0x08 ,28 ,4 ); + +/* reg_mbct_last +* Indicates that the current data field is the last chunk of the INI. +* Access: WO +*/ +MLXSW_ITEM32 (reg, mbct, last,0x08 ,26 ,1 ); + +/* reg_mbct_oee +* Opcode Event Enable. When set a BCTOE event will be sent once the opcode +* was executed and the fsm_state has changed. +* Access: WO +*/ +MLXSW_ITEM32 (reg, mbct, oee,0x08 ,25 ,1 ); + +enum mlxsw_reg_mbct_status { +/* Partial data transfer completed successfully and ready for next +* data transfer. +*/ +MLXSW_REG_MBCT_STATUS_PART_DATA =2 , +MLXSW_REG_MBCT_STATUS_LAST_DATA , +MLXSW_REG_MBCT_STATUS_ERASE_COMPLETE , +/* Error - trying to erase INI while it being used. */ +MLXSW_REG_MBCT_STATUS_ERROR_INI_IN_USE , +/* Last data transfer completed, applying magic pattern. */ +MLXSW_REG_MBCT_STATUS_ERASE_FAILED =7 , +MLXSW_REG_MBCT_STATUS_INI_ERROR , +MLXSW_REG_MBCT_STATUS_ACTIVATION_FAILED , +MLXSW_REG_MBCT_STATUS_ILLEGAL_OPERATION =11 , +}; + +/* reg_mbct_status +* Status. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mbct, status,0x0C ,24 ,5 ); + +enum mlxsw_reg_mbct_fsm_state { +MLXSW_REG_MBCT_FSM_STATE_INI_IN_USE =5 , +MLXSW_REG_MBCT_FSM_STATE_ERROR , +}; + +/* reg_mbct_fsm_state +* FSM state. +* Access: RO +*/ +MLXSW_ITEM32 (reg, mbct, fsm_state,0x0C ,16 ,4 ); + +#define MLXSW_REG_MBCT_DATA_LEN 1024 + +/* reg_mbct_data +* Up to 1KB of data. +* Access: WO +*/ +MLXSW_ITEM_BUF (reg, mbct, data,0x20 ,MLXSW_REG_MBCT_DATA_LEN ); + +static inline void mlxsw_reg_mbct_pack (char *payload,u8 slot_index, +enum mlxsw_reg_mbct_op op,bool oee) +{ +MLXSW_REG_ZERO (mbct, payload); +mlxsw_reg_mbct_slot_index_set (payload, slot_index); +mlxsw_reg_mbct_op_set (payload, op); +mlxsw_reg_mbct_oee_set (payload, oee); +} + +static inline void mlxsw_reg_mbct_dt_pack (char *payload, +u16 data_size,bool last, +const char *data) +{ +if (WARN_ON (data_size >MLXSW_REG_MBCT_DATA_LEN )) +return ; +mlxsw_reg_mbct_data_size_set (payload, data_size); +mlxsw_reg_mbct_last_set (payload, last); +mlxsw_reg_mbct_data_memcpy_to (payload, data); +} + +static inline void +mlxsw_reg_mbct_unpack (const char *payload,u8 *p_slot_index, +enum mlxsw_reg_mbct_status *p_status, +enum mlxsw_reg_mbct_fsm_state *p_fsm_state) +{ +if (p_slot_index) + *p_slot_index =mlxsw_reg_mbct_slot_index_get (payload); + *p_status =mlxsw_reg_mbct_status_get (payload); +if (p_fsm_state) + *p_fsm_state =mlxsw_reg_mbct_fsm_state_get (payload); +} +/* MDDQ - Management DownStream Device Query Register * -------------------------------------------------- * This register allows to query the DownStream device properties. The desired
@@ -12990,6 +13111,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {MLXSW_REG (mtptpt),MLXSW_REG (mfgd),MLXSW_REG (mgpir), +MLXSW_REG (mbct),MLXSW_REG (mddq),MLXSW_REG (mddc), MLXSW_REG(mfde),
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 13/17 mlxsw: core_linecards: Add line card objects and implement provisioning
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce objects for line cards and an infrastructure around that. Use devlink_linecard_create/destroy() to register the line card with devlink core. Implement provisioning ops with a list of supported line cards.
--- drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 19 + drivers/net/ethernet/mellanox/mlxsw/core.h | 46 + .../ethernet/mellanox/mlxsw/core_linecards.c | 929 ++++++++++++++++++ .../net/ethernet/mellanox/mlxsw/spectrum.c | 6 + drivers/net/ethernet/mellanox/mlxsw/trap.h | 4 + 6 files changed, 1006 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_linecards.c
drivers/net/ethernet/mellanox/mlxsw/Makefile +2 -1
@@ -1,7 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_MLXSW_CORE) += mlxsw_core.o mlxsw_core-objs := core.o core_acl_flex_keys.o \ - core_acl_flex_actions.o core_env.o + core_acl_flex_actions.o core_env.o \ + core_linecards.o mlxsw_core-$(CONFIG_MLXSW_CORE_HWMON) += core_hwmon.o mlxsw_core-$(CONFIG_MLXSW_CORE_THERMAL) += core_thermal.o obj-$(CONFIG_MLXSW_PCI) += mlxsw_pci.o
drivers/net/ethernet/mellanox/mlxsw/core.c +19 -0
@@ -82,6 +82,7 @@ struct mlxsw_core {struct mlxsw_res res;struct mlxsw_hwmon *hwmon;struct mlxsw_thermal *thermal; +struct mlxsw_linecards *linecards;struct mlxsw_core_port *ports;unsigned int max_ports;atomic_t active_ports_count;
@@ -94,6 +95,17 @@ struct mlxsw_core {/* driver_priv has to be always the last item */ }; +struct mlxsw_linecards *mlxsw_core_linecards (struct mlxsw_core *mlxsw_core) +{ +return mlxsw_core->linecards; +} + +void mlxsw_core_linecards_set (struct mlxsw_core *mlxsw_core, +struct mlxsw_linecards *linecards) +{ + mlxsw_core->linecards = linecards; +} +#define MLXSW_PORT_MAX_PORTS_DEFAULT 0x40static u64 mlxsw_ports_occ_get (void *priv)
@@ -2145,6 +2157,10 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,if (err) goto err_fw_rev_validate; + err =mlxsw_linecards_init (mlxsw_core, mlxsw_bus_info); +if (err) + goto err_linecards_init; + err =mlxsw_core_health_init (mlxsw_core);if (err) goto err_health_init;
@@ -2183,6 +2199,8 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, err_hwmon_init:mlxsw_core_health_fini (mlxsw_core); err_health_init: +mlxsw_linecards_fini (mlxsw_core); +err_linecards_init: err_fw_rev_validate:if (!reload)mlxsw_core_params_unregister (mlxsw_core);
@@ -2255,6 +2273,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,mlxsw_thermal_fini (mlxsw_core->thermal);mlxsw_hwmon_fini (mlxsw_core->hwmon);mlxsw_core_health_fini (mlxsw_core); +mlxsw_linecards_fini (mlxsw_core);if (!reload)mlxsw_core_params_unregister (mlxsw_core);mlxsw_emad_fini (mlxsw_core);
drivers/net/ethernet/mellanox/mlxsw/core.h +46 -0
56 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/core_linecards.c new file +929 -0
929 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +6 -0
@@ -89,6 +89,11 @@ static const struct mlxsw_fw_rev mlxsw_sp3_fw_rev = { "." __stringify(MLXSW_SP_FWREV_MINOR) \ "." __stringify(MLXSW_SP_FWREV_SUBMINOR) ".mfa2" +#define MLXSW_SP_LINECARDS_INI_BUNDLE_FILENAME \ + "mellanox/lc_ini_bundle_" \ + __stringify(MLXSW_SP_FWREV_MINOR) "_" \ + __stringify(MLXSW_SP_FWREV_SUBMINOR) ".bin" +static const char mlxsw_sp1_driver_name[] ="mlxsw_spectrum" ;static const char mlxsw_sp2_driver_name[] ="mlxsw_spectrum2" ;static const char mlxsw_sp3_driver_name[] ="mlxsw_spectrum3" ;
@@ -5159,3 +5164,4 @@ MODULE_DEVICE_TABLE(pci, mlxsw_sp4_pci_id_table);MODULE_FIRMWARE (MLXSW_SP1_FW_FILENAME );MODULE_FIRMWARE (MLXSW_SP2_FW_FILENAME );MODULE_FIRMWARE (MLXSW_SP3_FW_FILENAME ); +MODULE_FIRMWARE (MLXSW_SP_LINECARDS_INI_BUNDLE_FILENAME );
drivers/net/ethernet/mellanox/mlxsw/trap.h +4 -0
@@ -133,6 +133,10 @@ enum mlxsw_event_trap_id {MLXSW_TRAP_ID_PTP_ING_FIFO =0x2D ,/* PTP Egress FIFO has a new entry */ MLXSW_TRAP_ID_PTP_EGR_FIFO =0x2E , +/* Downstream Device Status Change */ +MLXSW_TRAP_ID_DSDSC =0x321 , +/* Binary Code Transfer Operation Executed Event */ +MLXSW_TRAP_ID_BCTOE =0x322 ,/* Port mapping change */ MLXSW_TRAP_ID_PMLPE = 0x32E, };
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 14/17 mlxsw: core_linecards: Implement line card activation process
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Allow to process events generated upon line card getting "ready" and "active".
When DSDSC event with "ready" bit set is delivered, that means the line card is powered up. Use MDDC register to push the line card to active state. Once FW is done with that, the DSDSC event with "active" bit set is delivered.
--- drivers/net/ethernet/mellanox/mlxsw/core.h | 4 +- .../ethernet/mellanox/mlxsw/core_linecards.c | 63 +++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/core.h +3 -1
@@ -564,7 +564,9 @@ struct mlxsw_linecard {char mbct_pl[MLXSW_REG_MBCT_LEN ];/* Too big for stack */ enum mlxsw_linecard_status_event_type status_event_type_to;struct delayed_work status_event_to_dw; - u8 provisioned:1; + u8 provisioned:1, + ready:1, + active:1;u16 hw_revision;u16 ini_version; };
drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +63 -0
87 lines not on this page · raw message
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 15/17 mlxsw: core: Extend driver ops by remove selected ports op
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
In case of line card implementation, the core has to have a way to remove relevant ports manually. Extend the Spectrum driver ops by an op that implements port removal of selected ports upon request.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 9 +++++++++ drivers/net/ethernet/mellanox/mlxsw/core.h | 8 ++++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 17 +++++++++++++++++ 3 files changed, 34 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/core.c +9 -0
@@ -3143,6 +3143,15 @@ bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u16 local_port) }EXPORT_SYMBOL (mlxsw_core_port_is_xm); +void mlxsw_core_ports_remove_selected (struct mlxsw_core *mlxsw_core, +bool (*selector)(void *priv,u16 local_port), +void *priv) +{ +if (WARN_ON_ONCE (!mlxsw_core->driver->ports_remove_selected)) +return ; + mlxsw_core->driver->ports_remove_selected (mlxsw_core, selector, priv); +} +struct mlxsw_env *mlxsw_core_env (const struct mlxsw_core *mlxsw_core) {return mlxsw_core->env;
drivers/net/ethernet/mellanox/mlxsw/core.h +8 -0
@@ -258,6 +258,10 @@ struct devlink_port * mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, u16 local_port);bool mlxsw_core_port_is_xm (const struct mlxsw_core *mlxsw_core,u16 local_port); +void mlxsw_core_ports_remove_selected (struct mlxsw_core *mlxsw_core, +bool (*selector)(void *priv, +u16 local_port), +void *priv);struct mlxsw_env *mlxsw_core_env (const struct mlxsw_core *mlxsw_core);int mlxsw_core_schedule_dw (struct delayed_work *dwork,unsigned long delay);
@@ -331,6 +335,10 @@ struct mlxsw_driver { unsigned int count, struct netlink_ext_ack *extack);int (*port_unsplit)(struct mlxsw_core *mlxsw_core,u16 local_port,struct netlink_ext_ack *extack); +void (*ports_remove_selected)(struct mlxsw_core *mlxsw_core, +bool (*selector)(void *priv, +u16 local_port), +void *priv);int (*sb_pool_get)(struct mlxsw_core *mlxsw_core,unsigned int sb_index,u16 pool_index,struct devlink_sb_pool_info *pool_info);
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +17 -0
@@ -1999,6 +1999,20 @@ static void mlxsw_sp_ports_remove(struct mlxsw_sp *mlxsw_sp) mlxsw_sp->ports =NULL ; } +static void +mlxsw_sp_ports_remove_selected (struct mlxsw_core *mlxsw_core, +bool (*selector)(void *priv,u16 local_port), +void *priv) +{ +struct mlxsw_sp *mlxsw_sp =mlxsw_core_driver_priv (mlxsw_core); +unsigned int max_ports =mlxsw_core_max_ports (mlxsw_core); +int i; + +for (i =1 ; i < max_ports; i++) +if (mlxsw_sp_port_created (mlxsw_sp, i) &&selector (priv, i)) +mlxsw_sp_port_remove (mlxsw_sp, i); +} +static int mlxsw_sp_ports_create (struct mlxsw_sp *mlxsw_sp) {unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core);
@@ -3785,6 +3799,7 @@ static struct mlxsw_driver mlxsw_sp2_driver = { .fini = mlxsw_sp_fini, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, + .ports_remove_selected = mlxsw_sp_ports_remove_selected, .sb_pool_get = mlxsw_sp_sb_pool_get, .sb_pool_set = mlxsw_sp_sb_pool_set, .sb_port_pool_get = mlxsw_sp_sb_port_pool_get,
@@ -3822,6 +3837,7 @@ static struct mlxsw_driver mlxsw_sp3_driver = { .fini = mlxsw_sp_fini, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, + .ports_remove_selected = mlxsw_sp_ports_remove_selected, .sb_pool_get = mlxsw_sp_sb_pool_get, .sb_pool_set = mlxsw_sp_sb_pool_set, .sb_port_pool_get = mlxsw_sp_sb_port_pool_get,
@@ -3857,6 +3873,7 @@ static struct mlxsw_driver mlxsw_sp4_driver = { .fini = mlxsw_sp_fini, .port_split = mlxsw_sp_port_split, .port_unsplit = mlxsw_sp_port_unsplit, + .ports_remove_selected = mlxsw_sp_ports_remove_selected, .sb_pool_get = mlxsw_sp_sb_pool_get, .sb_pool_set = mlxsw_sp_sb_pool_set, .sb_port_pool_get = mlxsw_sp_sb_port_pool_get,
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 16/17 mlxsw: spectrum: Add port to linecard mapping
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
For each port get slot_index using PMLP register. For ports residing on a linecard, identify it with the linecard by setting mapping using devlink_port_linecard_set() helper. Use linecard slot index for PMTDB register queries.
--- drivers/net/ethernet/mellanox/mlxsw/core.c | 28 ++++++++++-- drivers/net/ethernet/mellanox/mlxsw/core.h | 6 ++- .../ethernet/mellanox/mlxsw/core_linecards.c | 13 ++++++ drivers/net/ethernet/mellanox/mlxsw/minimal.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 9 ++++ .../net/ethernet/mellanox/mlxsw/spectrum.c | 44 ++++++++++++++----- .../net/ethernet/mellanox/mlxsw/spectrum.h | 1 + .../mellanox/mlxsw/spectrum_ethtool.c | 37 +++++++++------- 8 files changed, 107 insertions(+), 33 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/core.c +24 -4
@@ -48,6 +48,7 @@ struct mlxsw_core_port {struct devlink_port devlink_port;void *port_driver_priv;u16 local_port; +struct mlxsw_linecard *linecard; };void *mlxsw_core_port_driver_priv (struct mlxsw_core_port *mlxsw_core_port)
@@ -2975,7 +2976,7 @@ EXPORT_SYMBOL(mlxsw_core_res_get); static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port, enum devlink_port_flavour flavour, - u32 port_number, bool split, + u8 slot_index, u32 port_number, bool split, u32 split_port_subnumber, bool splittable, u32 lanes, const unsigned char *switch_id,
@@ -2998,6 +2999,15 @@ static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port, attrs.switch_id.id_len = switch_id_len; mlxsw_core_port->local_port = local_port;devlink_port_attrs_set (devlink_port, &attrs); +if (slot_index) { +struct mlxsw_linecard *linecard; + + linecard =mlxsw_linecard_get (mlxsw_core->linecards, + slot_index); + mlxsw_core_port->linecard = linecard; +devlink_port_linecard_set (devlink_port, + linecard->devlink_linecard); + } err =devl_port_register (devlink, devlink_port, local_port);if (err)memset (mlxsw_core_port,0 ,sizeof (*mlxsw_core_port));
@@ -3015,7 +3025,7 @@ static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u16 local_port } int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port, - u32 port_number, bool split, + u8 slot_index, u32 port_number, bool split, u32 split_port_subnumber, bool splittable, u32 lanes, const unsigned char *switch_id,
@@ -3024,7 +3034,7 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port,int err; err =__mlxsw_core_port_init (mlxsw_core, local_port, -DEVLINK_PORT_FLAVOUR_PHYSICAL , +DEVLINK_PORT_FLAVOUR_PHYSICAL , slot_index, port_number, split, split_port_subnumber, splittable, lanes, switch_id, switch_id_len);
@@ -3055,7 +3065,7 @@ int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core, err =__mlxsw_core_port_init (mlxsw_core,MLXSW_PORT_CPU_PORT ,DEVLINK_PORT_FLAVOUR_CPU , -0 , false,0 , false,0 , +0 ,0 , false,0 , false,0 , switch_id, switch_id_len);if (err)return err;
@@ -3131,6 +3141,16 @@ mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, }EXPORT_SYMBOL (mlxsw_core_port_devlink_port_get); +struct mlxsw_linecard * +mlxsw_core_port_linecard_get (struct mlxsw_core *mlxsw_core, +u16 local_port) +{ +struct mlxsw_core_port *mlxsw_core_port = + &mlxsw_core->ports[local_port]; + +return mlxsw_core_port->linecard; +} +bool mlxsw_core_port_is_xm (const struct mlxsw_core *mlxsw_core,u16 local_port) {const struct mlxsw_bus_info *bus_info = mlxsw_core->bus_info;
drivers/net/ethernet/mellanox/mlxsw/core.h +5 -1
@@ -236,7 +236,8 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,void *mlxsw_core_port_driver_priv (struct mlxsw_core_port *mlxsw_core_port);int mlxsw_core_port_init (struct mlxsw_core *mlxsw_core,u16 local_port, -u32 port_number,bool split,u32 split_port_subnumber, +u8 slot_index,u32 port_number,bool split, +u32 split_port_subnumber,bool splittable,u32 lanes,const unsigned char *switch_id,unsigned char switch_id_len);
@@ -257,6 +258,9 @@ enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,struct devlink_port *mlxsw_core_port_devlink_port_get (struct mlxsw_core *mlxsw_core,u16 local_port); +struct mlxsw_linecard * +mlxsw_core_port_linecard_get (struct mlxsw_core *mlxsw_core, +u16 local_port);bool mlxsw_core_port_is_xm (const struct mlxsw_core *mlxsw_core,u16 local_port); void mlxsw_core_ports_remove_selected(struct mlxsw_core *mlxsw_core, bool (*selector)(void *priv,
drivers/net/ethernet/mellanox/mlxsw/core_linecards.c +13 -0
@@ -481,6 +481,15 @@ mlxsw_linecard_ini_in_use_wait(struct mlxsw_core *mlxsw_core,return 0 ; } +static bool mlxsw_linecard_port_selector (void *priv,u16 local_port) +{ +struct mlxsw_linecard *linecard = priv; +struct mlxsw_core *mlxsw_core; + + mlxsw_core = linecard->linecards->mlxsw_core; +return linecard ==mlxsw_core_port_linecard_get (mlxsw_core, local_port); +} + static int mlxsw_linecard_provision(struct devlink_linecard *devlink_linecard, void *priv, const char *type, const void *type_priv,
@@ -531,6 +540,10 @@ static int mlxsw_linecard_unprovision(struct devlink_linecard *devlink_linecard, mlxsw_core = linecard->linecards->mlxsw_core; +mlxsw_core_ports_remove_selected (mlxsw_core, + mlxsw_linecard_port_selector, + linecard); + err =mlxsw_linecard_ini_in_use_wait (mlxsw_core, linecard, extack);if (err) goto err_out;
drivers/net/ethernet/mellanox/mlxsw/minimal.c +1 -1
@@ -223,7 +223,7 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u16 local_port, u8 module)struct net_device *dev;int err; - err =mlxsw_core_port_init (mlxsw_m->core, local_port, + err =mlxsw_core_port_init (mlxsw_m->core, local_port,0 , module +1 , false,0 , false,0 , mlxsw_m->base_mac,sizeof (mlxsw_m->base_mac));
drivers/net/ethernet/mellanox/mlxsw/reg.h +9 -0
@@ -4325,6 +4325,15 @@ MLXSW_ITEM32(reg, pmlp, width, 0x00, 0, 8);*/ MLXSW_ITEM32_INDEXED (reg, pmlp, module,0x04 ,0 ,8 ,0x04 ,0x00 , false); +/* reg_pmlp_slot_index +* Module number. +* Slot_index +* Slot_index = 0 represent the onboard (motherboard). +* In case of non-modular system only slot_index = 0 is available. +* Access: RW +*/ +MLXSW_ITEM32_INDEXED (reg, pmlp, slot_index,0x04 ,8 ,4 ,0x04 ,0x00 , false); +/* reg_pmlp_tx_lane * Tx Lane. When rxtx field is cleared, this field is used for Rx as well. * Access: RW
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +32 -12
147 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +1 -0
@@ -145,6 +145,7 @@ struct mlxsw_sp_mall_entry;struct mlxsw_sp_port_mapping {u8 module; +u8 slot_index;u8 width;/* Number of lanes used by the port */ u8 module_width;/* Number of lanes in the module (static) */ u8 lane;
drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c +22 -15
@@ -568,14 +568,14 @@ struct mlxsw_sp_port_stats {static u64 mlxsw_sp_port_get_transceiver_overheat_stats (struct mlxsw_sp_port *mlxsw_sp_port) { -struct mlxsw_sp_port_mapping port_mapping = mlxsw_sp_port->mapping;struct mlxsw_core *mlxsw_core = mlxsw_sp_port->mlxsw_sp->core; +u8 slot_index = mlxsw_sp_port->mapping.slot_index; +u8 module = mlxsw_sp_port->mapping.module;u64 stats;int err; - err =mlxsw_env_module_overheat_counter_get (mlxsw_core,0 , - port_mapping.module, - &stats); + err =mlxsw_env_module_overheat_counter_get (mlxsw_core, slot_index, + module, &stats);if (err)return mlxsw_sp_port->module_overheat_initial_val;
@@ -1035,7 +1035,8 @@ static int mlxsw_sp_get_module_info(struct net_device *netdev,struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (netdev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; -return mlxsw_env_get_module_info (netdev, mlxsw_sp->core,0 , +return mlxsw_env_get_module_info (netdev, mlxsw_sp->core, + mlxsw_sp_port->mapping.slot_index, mlxsw_sp_port->mapping.module, modinfo); }
@@ -1045,10 +1046,11 @@ static int mlxsw_sp_get_module_eeprom(struct net_device *netdev, {struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (netdev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; +u8 slot_index = mlxsw_sp_port->mapping.slot_index; +u8 module = mlxsw_sp_port->mapping.module; -return mlxsw_env_get_module_eeprom (netdev, mlxsw_sp->core,0 , - mlxsw_sp_port->mapping.module, ee, - data); +return mlxsw_env_get_module_eeprom (netdev, mlxsw_sp->core, slot_index, + module, ee, data); } static int
@@ -1058,10 +1060,11 @@ mlxsw_sp_get_module_eeprom_by_page(struct net_device *dev, {struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; +u8 slot_index = mlxsw_sp_port->mapping.slot_index;u8 module = mlxsw_sp_port->mapping.module; -return mlxsw_env_get_module_eeprom_by_page (mlxsw_sp->core,0 , module, - page, extack); +return mlxsw_env_get_module_eeprom_by_page (mlxsw_sp->core, slot_index, + module, page, extack); } static int
@@ -1202,9 +1205,11 @@ static int mlxsw_sp_reset(struct net_device *dev, u32 *flags) {struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; +u8 slot_index = mlxsw_sp_port->mapping.slot_index;u8 module = mlxsw_sp_port->mapping.module; -return mlxsw_env_reset_module (dev, mlxsw_sp->core,0 , module, flags); +return mlxsw_env_reset_module (dev, mlxsw_sp->core, slot_index, + module, flags); } static int
@@ -1214,10 +1219,11 @@ mlxsw_sp_get_module_power_mode(struct net_device *dev, {struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; +u8 slot_index = mlxsw_sp_port->mapping.slot_index;u8 module = mlxsw_sp_port->mapping.module; -return mlxsw_env_get_module_power_mode (mlxsw_sp->core,0 , module, - params, extack); +return mlxsw_env_get_module_power_mode (mlxsw_sp->core, slot_index, + module, params, extack); } static int
@@ -1227,10 +1233,11 @@ mlxsw_sp_set_module_power_mode(struct net_device *dev, {struct mlxsw_sp_port *mlxsw_sp_port =netdev_priv (dev);struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; +u8 slot_index = mlxsw_sp_port->mapping.slot_index;u8 module = mlxsw_sp_port->mapping.module; -return mlxsw_env_set_module_power_mode (mlxsw_sp->core,0 , module, - params->policy, extack); +return mlxsw_env_set_module_power_mode (mlxsw_sp->core, slot_index, + module, params->policy, extack); }const struct ethtool_ops mlxsw_sp_port_ethtool_ops = {
Signature · 1 line
2.33.1
Ido Schimmel
maintainerPATCH 17/17 selftests: mlxsw: Introduce devlink line card provision/unprovision/activation tests
In reply to Ido SchimmelFrom: Jiri Pirko <[email protected]>
Introduce basic line card manipulation which consists of provisioning, unprovisioning and activation of a line card.
--- .../drivers/net/mlxsw/devlink_linecard.sh | 280 ++++++++++++++++++ 1 file changed, 280 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh
tools/testing/selftests/drivers/net/mlxsw/devlink_linecard.sh new file +280 -0
@@ -0,0 +1,280 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# In addition to the common variables, user might use: +# LC_SLOT - If not set, all probed line cards are going to be tested, +# with an exception of the "activation_16x100G_test". +# It set, only the selected line card is going to be used +# for tests, including "activation_16x100G_test". + +lib_dir=$(dirname $0)/../../../net/forwarding + +ALL_TESTS=" + unprovision_test + provision_test + activation_16x100G_test +" + +NUM_NETIFS=0 + +source $lib_dir/lib.sh +source $lib_dir/devlink_lib.sh + +until_lc_state_is() +{ + local state=$1; shift + local current=$("$@") + + echo "$current" + [ "$current" == "$state" ] +} + +until_lc_state_is_not() +{ + ! until_lc_state_is "$@" +} + +lc_state_get() +{ + local lc=$1 + + devlink lc show $DEVLINK_DEV lc $lc -j | jq -e -r ".[][][].state" +} + +lc_wait_until_state_changes() +{ + local lc=$1 + local state=$2 + local timeout=$3 # ms + + busywait "$timeout" until_lc_state_is_not "$state" lc_state_get "$lc" +} + +lc_wait_until_state_becomes() +{ + local lc=$1 + local state=$2 + local timeout=$3 # ms + + busywait "$timeout" until_lc_state_is "$state" lc_state_get "$lc" +} + +until_lc_port_count_is() +{ + local port_count=$1; shift + local current=$("$@") + + echo "$current" + [ $current == $port_count ] +} + +lc_port_count_get() +{ + local lc=$1 + + devlink port -j | jq -e -r ".[][] | select(.lc==$lc) | .port" | wc -l +} + +lc_wait_until_port_count_is() +{ + local lc=$1 + local port_count=$2 + local timeout=$3 # ms + + busywait "$timeout" until_lc_port_count_is "$port_count" lc_port_count_get "$lc" +} + +PROV_UNPROV_TIMEOUT=8000 # ms +POST_PROV_ACT_TIMEOUT=2000 # ms +PROV_PORTS_INSTANTIATION_TIMEOUT=15000 # ms + +unprovision_one() +{ + local lc=$1 + local state + + state=$(lc_state_get $lc) + check_err $? "Failed to get state of linecard $lc" + if [[ "$state" == "unprovisioned" ]]; then + return + fi + + log_info "Unprovisioning linecard $lc" + + devlink lc set $DEVLINK_DEV lc $lc notype + check_err $? "Failed to trigger linecard $lc unprovisioning" + + state=$(lc_wait_until_state_changes $lc "unprovisioning" \ + $PROV_UNPROV_TIMEOUT) + check_err $? "Failed to unprovision linecard $lc (timeout)" + + [ "$state" == "unprovisioned" ] + check_err $? "Failed to unprovision linecard $lc (state=$state)" +} + +provision_one() +{ + local lc=$1 + local type=$2 + local state + + log_info "Provisioning linecard $lc" + + devlink lc set $DEVLINK_DEV lc $lc type $type + check_err $? "Failed trigger linecard $lc provisioning" + + state=$(lc_wait_until_state_changes $lc "provisioning" \ + $PROV_UNPROV_TIMEOUT) + check_err $? "Failed to provision linecard $lc (timeout)" + + [ "$state" == "provisioned" ] || [ "$state" == "active" ] + check_err $? "Failed to provision linecard $lc (state=$state)" + + provisioned_type=$(devlink lc show $DEVLINK_DEV lc $lc -j | jq -e -r ".[][][].type") + [ "$provisioned_type" == "$type" ] + check_err $? "Wrong provision type returned for linecard $lc (got \"$provisioned_type\", expected \"$type\")" + + # Wait for possible activation to make sure the state + # won't change after return from this function. + state=$(lc_wait_until_state_becomes $lc "active" \ + $POST_PROV_ACT_TIMEOUT) +} + +unprovision_test() +{ + RET=0 + local lc + + lc=$LC_SLOT + unprovision_one $lc + log_test "Unprovision" +} + +LC_16X100G_TYPE="16x100G" +LC_16X100G_PORT_COUNT=16 + +supported_types_check() +{ + local lc=$1 + local supported_types_count + local type_index + local lc_16x100_found=false + + supported_types_count=$(devlink lc show $DEVLINK_DEV lc $lc -j | \ + jq -e -r ".[][][].supported_types | length") + [ $supported_types_count != 0 ] + check_err $? "No supported types found for linecard $lc" + for (( type_index=0; type_index<$supported_types_count; type_index++ )) + do + type=$(devlink lc show $DEVLINK_DEV lc $lc -j | \ + jq -e -r ".[][][].supported_types[$type_index]") + if [[ "$type" == "$LC_16X100G_TYPE" ]]; then + lc_16x100_found=true + break + fi + done + [ $lc_16x100_found = true ] + check_err $? "16X100G not found between supported types of linecard $lc" +} + +ports_check() +{ + local lc=$1 + local expected_port_count=$2 + local port_count + + port_count=$(lc_wait_until_port_count_is $lc $expected_port_count \ + $PROV_PORTS_INSTANTIATION_TIMEOUT) + [ $port_count != 0 ] + check_err $? "No port associated with linecard $lc" + [ $port_count == $expected_port_count ] + check_err $? "Unexpected port count linecard $lc (got $port_count, expected $expected_port_count)" +} + +provision_test() +{ + RET=0 + local lc + local type + local state + + lc=$LC_SLOT + supported_types_check $lc + state=$(lc_state_get $lc) + check_err $? "Failed to get state of linecard $lc" + if [[ "$state" != "unprovisioned" ]]; then + unprovision_one $lc + fi + provision_one $lc $LC_16X100G_TYPE + ports_check $lc $LC_16X100G_PORT_COUNT + log_test "Provision" +} + +ACTIVATION_TIMEOUT=20000 # ms + +interface_check() +{ + ip link set $h1 up + ip link set $h2 up + ifaces_upped=true + setup_wait +} + +activation_16x100G_test() +{ + RET=0 + local lc + local type + local state + + lc=$LC_SLOT + type=$LC_16X100G_TYPE + + unprovision_one $lc + provision_one $lc $type + state=$(lc_wait_until_state_becomes $lc "active" \ + $ACTIVATION_TIMEOUT) + check_err $? "Failed to get linecard $lc activated (timeout)" + + interface_check + + log_test "Activation 16x100G" +} + +setup_prepare() +{ + local lc_num=$(devlink lc show -j | jq -e -r ".[][\"$DEVLINK_DEV\"] |length") + if [[ $? -ne 0 ]] || [[ $lc_num -eq 0 ]]; then + echo "SKIP: No linecard support found" + exit $ksft_skip + fi + + if [ -z "$LC_SLOT" ]; then + echo "SKIP: \"LC_SLOT\" variable not provided" + exit $ksft_skip + fi + + # Interfaces are not present during the script start, + # that's why we define NUM_NETIFS here so dummy + # implicit veth pairs are not created. + NUM_NETIFS=2 + h1=${NETIFS[p1]} + h2=${NETIFS[p2]} + ifaces_upped=false +} + +cleanup() +{ + if [ "$ifaces_upped" = true ] ; then + ip link set $h1 down + ip link set $h2 down + fi +} + +trap cleanup EXIT + +setup_prepare + +tests_run + +exit $EXIT_STATUS
Signature · 1 line
2.33.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 13 lines · On Mon, 18 Apr 2022 09:42:24 +0300 you wrote:
Jiri says:
This patchset introduces support for modular switch systems and also introduces mlxsw support for NVIDIA Mellanox SN4800 modular switch. It contains 8 slots to accommodate line cards - replaceable PHY modules which may contain gearboxes.
Currently supported line card:
16X 100GbE (QSFP28)
Other line cards that are going to be supported:
8X 200GbE (QSFP56)
4X 400GbE (QSFP-DD)
There may be other types of line cards added in the future.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,01/17] devlink: add support to create line card and expose to user
https://git.kernel.org/netdev/net-next/c/c246f9b5fd61 - [net-next,02/17] devlink: implement line card provisioning https://git.kernel.org/netdev/net-next/c/fcdc8ce23a30 - [net-next,03/17] devlink: implement line card active state https://git.kernel.org/netdev/net-next/c/fc9f50d5b366 - [net-next,04/17] devlink: add port to line card relationship set https://git.kernel.org/netdev/net-next/c/b83758598538 - [net-next,05/17] mlxsw: spectrum: Allow lane to start from non-zero index https://git.kernel.org/netdev/net-next/c/bac62191a3d4 - [net-next,06/17] mlxsw: spectrum: Allocate port mapping array of structs instead of pointers https://git.kernel.org/netdev/net-next/c/d3ad2d88209f - [net-next,07/17] mlxsw: reg: Add Ports Mapping Event Configuration Register https://git.kernel.org/netdev/net-next/c/ebf0c5341731 - [net-next,08/17] mlxsw: Narrow the critical section of devl_lock during ports creation/removal https://git.kernel.org/netdev/net-next/c/adc6462376b1 - [net-next,09/17] mlxsw: spectrum: Introduce port mapping change event processing https://git.kernel.org/netdev/net-next/c/b0ec003e9a90 - [net-next,10/17] mlxsw: reg: Add Management DownStream Device Query Register https://git.kernel.org/netdev/net-next/c/505f524dc660 - [net-next,11/17] mlxsw: reg: Add Management DownStream Device Control Register https://git.kernel.org/netdev/net-next/c/5290a8ff2e11 - [net-next,12/17] mlxsw: reg: Add Management Binary Code Transfer Register https://git.kernel.org/netdev/net-next/c/5bade5aa4afc - [net-next,13/17] mlxsw: core_linecards: Add line card objects and implement provisioning https://git.kernel.org/netdev/net-next/c/b217127e5e4e - [net-next,14/17] mlxsw: core_linecards: Implement line card activation process https://git.kernel.org/netdev/net-next/c/ee7a70fa671b - [net-next,15/17] mlxsw: core: Extend driver ops by remove selected ports op https://git.kernel.org/netdev/net-next/c/45bf3b7267e0 - [net-next,16/17] mlxsw: spectrum: Add port to linecard mapping https://git.kernel.org/netdev/net-next/c/6445eef0f600 - [net-next,17/17] selftests: mlxsw: Introduce devlink line card provision/unprovision/activation tests https://git.kernel.org/netdev/net-next/c/e1fad9517f0f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 97 lines · Ido Schimmel
Jiri says:
This patchset introduces support for modular switch systems and also introduces mlxsw support for NVIDIA Mellanox SN4800 modular switch. It contains 8 slots to accommodate line cards - replaceable PHY modules which may contain gearboxes.
Currently supported line card:
16X 100GbE (QSFP28)
Other line cards that are going to be supported:
8X 200GbE (QSFP56)
4X 400GbE (QSFP-DD)
There may be other types of line cards added in the future.To be consistent with the port split configuration (splitter cabels), the line card entities are treated in the similar way. The nature of a line card is not "a pluggable device", but "a pluggable PHY module".
A concept of "provisioning" is introduced. The user may "provision" certain slot with a line card type. Driver then creates all instances (devlink ports, netdevices, etc) related to this line card type. It does not matter if the line card is plugged-in at the time. User is able to configure netdevices, devlink ports, setup port splitters, etc. From the perspective of the switch ASIC, all is present and can be configured.
The carrier of netdevices stays down if the line card is not plugged-in. Once the line card is inserted and activated, the carrier of the related netdevices is then reflecting the physical line state, same as for an ordinary fixed port.
Once user does not want to use the line card related instances anymore, he can "unprovision" the slot. Driver then removes the instances.
Patches 1-4 are extending devlink driver API and UAPI in order to register, show, dump, provision and activate the line card. Patches 5-17 are implementing the introduced API in mlxsw. The last patch adds a selftest for mlxsw line cards.
Example:
$ devlink port # No ports are listed $ devlink lc pci/0000:01:00.0: lc 1 state unprovisioned supported_types: 16x100G lc 2 state unprovisioned supported_types: 16x100G lc 3 state unprovisioned supported_types: 16x100G lc 4 state unprovisioned supported_types: 16x100G lc 5 state unprovisioned supported_types: 16x100G lc 6 state unprovisioned supported_types: 16x100G lc 7 state unprovisioned supported_types: 16x100G lc 8 state unprovisioned supported_types: 16x100GNote that driver exposes list supported line card types. Currently there is only one: "16x100G".
To provision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G $ devlink lc show pci/0000:01:00.0 lc 8 pci/0000:01:00.0: lc 8 state active type 16x100G supported_types: 16x100G $ devlink port pci/0000:01:00.0/0: type notset flavour cpu port 0 splittable false pci/0000:01:00.0/53: type eth netdev enp1s0nl8p1 flavour physical lc 8 port 1 splittable true lanes 4 pci/0000:01:00.0/54: type eth netdev enp1s0nl8p2 flavour physical lc 8 port 2 splittable true lanes 4 pci/0000:01:00.0/55: type eth netdev enp1s0nl8p3 flavour physical lc 8 port 3 splittable true lanes 4 pci/0000:01:00.0/56: type eth netdev enp1s0nl8p4 flavour physical lc 8 port 4 splittable true lanes 4 pci/0000:01:00.0/57: type eth netdev enp1s0nl8p5 flavour physical lc 8 port 5 splittable true lanes 4 pci/0000:01:00.0/58: type eth netdev enp1s0nl8p6 flavour physical lc 8 port 6 splittable true lanes 4 pci/0000:01:00.0/59: type eth netdev enp1s0nl8p7 flavour physical lc 8 port 7 splittable true lanes 4 pci/0000:01:00.0/60: type eth netdev enp1s0nl8p8 flavour physical lc 8 port 8 splittable true lanes 4 pci/0000:01:00.0/61: type eth netdev enp1s0nl8p9 flavour physical lc 8 port 9 splittable true lanes 4 pci/0000:01:00.0/62: type eth netdev enp1s0nl8p10 flavour physical lc 8 port 10 splittable true lanes 4 pci/0000:01:00.0/63: type eth netdev enp1s0nl8p11 flavour physical lc 8 port 11 splittable true lanes 4 pci/0000:01:00.0/64: type eth netdev enp1s0nl8p12 flavour physical lc 8 port 12 splittable true lanes 4 pci/0000:01:00.0/125: type eth netdev enp1s0nl8p13 flavour physical lc 8 port 13 splittable true lanes 4 pci/0000:01:00.0/126: type eth netdev enp1s0nl8p14 flavour physical lc 8 port 14 splittable true lanes 4 pci/0000:01:00.0/127: type eth netdev enp1s0nl8p15 flavour physical lc 8 port 15 splittable true lanes 4 pci/0000:01:00.0/128: type eth netdev enp1s0nl8p16 flavour physical lc 8 port 16 splittable true lanes 4
Quoted 4 lines
To uprovision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 notype
are there any changes from the last RFC?
Jiri Pirko
maintainerQuoted 98 lines · Mon, Apr 18, 2022 at 04:31:30PM CEST, [email protected] wrote:
Quoted 97 lines · Ido Schimmel
Jiri says:
This patchset introduces support for modular switch systems and also introduces mlxsw support for NVIDIA Mellanox SN4800 modular switch. It contains 8 slots to accommodate line cards - replaceable PHY modules which may contain gearboxes.
Currently supported line card:
16X 100GbE (QSFP28)
Other line cards that are going to be supported:
8X 200GbE (QSFP56)
4X 400GbE (QSFP-DD)
There may be other types of line cards added in the future.To be consistent with the port split configuration (splitter cabels), the line card entities are treated in the similar way. The nature of a line card is not "a pluggable device", but "a pluggable PHY module".
A concept of "provisioning" is introduced. The user may "provision" certain slot with a line card type. Driver then creates all instances (devlink ports, netdevices, etc) related to this line card type. It does not matter if the line card is plugged-in at the time. User is able to configure netdevices, devlink ports, setup port splitters, etc. From the perspective of the switch ASIC, all is present and can be configured.
The carrier of netdevices stays down if the line card is not plugged-in. Once the line card is inserted and activated, the carrier of the related netdevices is then reflecting the physical line state, same as for an ordinary fixed port.
Once user does not want to use the line card related instances anymore, he can "unprovision" the slot. Driver then removes the instances.
Patches 1-4 are extending devlink driver API and UAPI in order to register, show, dump, provision and activate the line card. Patches 5-17 are implementing the introduced API in mlxsw. The last patch adds a selftest for mlxsw line cards.
Example:
$ devlink port # No ports are listed $ devlink lc pci/0000:01:00.0: lc 1 state unprovisioned supported_types: 16x100G lc 2 state unprovisioned supported_types: 16x100G lc 3 state unprovisioned supported_types: 16x100G lc 4 state unprovisioned supported_types: 16x100G lc 5 state unprovisioned supported_types: 16x100G lc 6 state unprovisioned supported_types: 16x100G lc 7 state unprovisioned supported_types: 16x100G lc 8 state unprovisioned supported_types: 16x100GNote that driver exposes list supported line card types. Currently there is only one: "16x100G".
To provision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G $ devlink lc show pci/0000:01:00.0 lc 8 pci/0000:01:00.0: lc 8 state active type 16x100G supported_types: 16x100G $ devlink port pci/0000:01:00.0/0: type notset flavour cpu port 0 splittable false pci/0000:01:00.0/53: type eth netdev enp1s0nl8p1 flavour physical lc 8 port 1 splittable true lanes 4 pci/0000:01:00.0/54: type eth netdev enp1s0nl8p2 flavour physical lc 8 port 2 splittable true lanes 4 pci/0000:01:00.0/55: type eth netdev enp1s0nl8p3 flavour physical lc 8 port 3 splittable true lanes 4 pci/0000:01:00.0/56: type eth netdev enp1s0nl8p4 flavour physical lc 8 port 4 splittable true lanes 4 pci/0000:01:00.0/57: type eth netdev enp1s0nl8p5 flavour physical lc 8 port 5 splittable true lanes 4 pci/0000:01:00.0/58: type eth netdev enp1s0nl8p6 flavour physical lc 8 port 6 splittable true lanes 4 pci/0000:01:00.0/59: type eth netdev enp1s0nl8p7 flavour physical lc 8 port 7 splittable true lanes 4 pci/0000:01:00.0/60: type eth netdev enp1s0nl8p8 flavour physical lc 8 port 8 splittable true lanes 4 pci/0000:01:00.0/61: type eth netdev enp1s0nl8p9 flavour physical lc 8 port 9 splittable true lanes 4 pci/0000:01:00.0/62: type eth netdev enp1s0nl8p10 flavour physical lc 8 port 10 splittable true lanes 4 pci/0000:01:00.0/63: type eth netdev enp1s0nl8p11 flavour physical lc 8 port 11 splittable true lanes 4 pci/0000:01:00.0/64: type eth netdev enp1s0nl8p12 flavour physical lc 8 port 12 splittable true lanes 4 pci/0000:01:00.0/125: type eth netdev enp1s0nl8p13 flavour physical lc 8 port 13 splittable true lanes 4 pci/0000:01:00.0/126: type eth netdev enp1s0nl8p14 flavour physical lc 8 port 14 splittable true lanes 4 pci/0000:01:00.0/127: type eth netdev enp1s0nl8p15 flavour physical lc 8 port 15 splittable true lanes 4 pci/0000:01:00.0/128: type eth netdev enp1s0nl8p16 flavour physical lc 8 port 16 splittable true lanes 4
Quoted 8 lines
Quoted 4 lines
To uprovision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 notypeare there any changes from the last RFC?
Yes, many of them, I din't track them. Mainly, the RFC was backed by netdevsim implementation, this is mlxsw with actual HW underneath.
Quoted 104 lines · Jiri Pirko
Quoted 103 lines · Mon, Apr 18, 2022 at 04:31:30PM CEST, [email protected] wrote:
Quoted 101 lines · Ido Schimmel
Jiri says:
This patchset introduces support for modular switch systems and also introduces mlxsw support for NVIDIA Mellanox SN4800 modular switch. It contains 8 slots to accommodate line cards - replaceable PHY modules which may contain gearboxes.
Currently supported line card:
16X 100GbE (QSFP28)
Other line cards that are going to be supported:
8X 200GbE (QSFP56)
4X 400GbE (QSFP-DD)
There may be other types of line cards added in the future.To be consistent with the port split configuration (splitter cabels), the line card entities are treated in the similar way. The nature of a line card is not "a pluggable device", but "a pluggable PHY module".
A concept of "provisioning" is introduced. The user may "provision" certain slot with a line card type. Driver then creates all instances (devlink ports, netdevices, etc) related to this line card type. It does not matter if the line card is plugged-in at the time. User is able to configure netdevices, devlink ports, setup port splitters, etc. From the perspective of the switch ASIC, all is present and can be configured.
The carrier of netdevices stays down if the line card is not plugged-in. Once the line card is inserted and activated, the carrier of the related netdevices is then reflecting the physical line state, same as for an ordinary fixed port.
Once user does not want to use the line card related instances anymore, he can "unprovision" the slot. Driver then removes the instances.
Patches 1-4 are extending devlink driver API and UAPI in order to register, show, dump, provision and activate the line card. Patches 5-17 are implementing the introduced API in mlxsw. The last patch adds a selftest for mlxsw line cards.
Example:
$ devlink port # No ports are listed $ devlink lc pci/0000:01:00.0: lc 1 state unprovisioned supported_types: 16x100G lc 2 state unprovisioned supported_types: 16x100G lc 3 state unprovisioned supported_types: 16x100G lc 4 state unprovisioned supported_types: 16x100G lc 5 state unprovisioned supported_types: 16x100G lc 6 state unprovisioned supported_types: 16x100G lc 7 state unprovisioned supported_types: 16x100G lc 8 state unprovisioned supported_types: 16x100GNote that driver exposes list supported line card types. Currently there is only one: "16x100G".
To provision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 type 16x100G $ devlink lc show pci/0000:01:00.0 lc 8 pci/0000:01:00.0: lc 8 state active type 16x100G supported_types: 16x100G $ devlink port pci/0000:01:00.0/0: type notset flavour cpu port 0 splittable false pci/0000:01:00.0/53: type eth netdev enp1s0nl8p1 flavour physical lc 8 port 1 splittable true lanes 4 pci/0000:01:00.0/54: type eth netdev enp1s0nl8p2 flavour physical lc 8 port 2 splittable true lanes 4 pci/0000:01:00.0/55: type eth netdev enp1s0nl8p3 flavour physical lc 8 port 3 splittable true lanes 4 pci/0000:01:00.0/56: type eth netdev enp1s0nl8p4 flavour physical lc 8 port 4 splittable true lanes 4 pci/0000:01:00.0/57: type eth netdev enp1s0nl8p5 flavour physical lc 8 port 5 splittable true lanes 4 pci/0000:01:00.0/58: type eth netdev enp1s0nl8p6 flavour physical lc 8 port 6 splittable true lanes 4 pci/0000:01:00.0/59: type eth netdev enp1s0nl8p7 flavour physical lc 8 port 7 splittable true lanes 4 pci/0000:01:00.0/60: type eth netdev enp1s0nl8p8 flavour physical lc 8 port 8 splittable true lanes 4 pci/0000:01:00.0/61: type eth netdev enp1s0nl8p9 flavour physical lc 8 port 9 splittable true lanes 4 pci/0000:01:00.0/62: type eth netdev enp1s0nl8p10 flavour physical lc 8 port 10 splittable true lanes 4 pci/0000:01:00.0/63: type eth netdev enp1s0nl8p11 flavour physical lc 8 port 11 splittable true lanes 4 pci/0000:01:00.0/64: type eth netdev enp1s0nl8p12 flavour physical lc 8 port 12 splittable true lanes 4 pci/0000:01:00.0/125: type eth netdev enp1s0nl8p13 flavour physical lc 8 port 13 splittable true lanes 4 pci/0000:01:00.0/126: type eth netdev enp1s0nl8p14 flavour physical lc 8 port 14 splittable true lanes 4 pci/0000:01:00.0/127: type eth netdev enp1s0nl8p15 flavour physical lc 8 port 15 splittable true lanes 4 pci/0000:01:00.0/128: type eth netdev enp1s0nl8p16 flavour physical lc 8 port 16 splittable true lanes 4To uprovision the slot #8:
$ devlink lc set pci/0000:01:00.0 lc 8 notype
Quoted 6 lines
Quoted 3 lines
are there any changes from the last RFC?
Yes, many of them, I din't track them. Mainly, the RFC was backed by netdevsim implementation, this is mlxsw with actual HW underneath.
I don't think David was asking about the backing implementation, but about the interface itself. I don't remember any changes in this aspect during the internal review and I also compared the uAPI files and they seem to be the same. The only change that I do remember is making the APIs idempotent. Previously, this would fail:
# devlink lc set pci/0000:01:00.0 lc 8 notype # devlink lc set pci/0000:01:00.0 lc 8 notype