From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com ([74.125.82.68]:53864 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288AbeCWOtR (ORCPT ); Fri, 23 Mar 2018 10:49:17 -0400 Received: by mail-wm0-f68.google.com with SMTP id e194so4046498wmd.3 for ; Fri, 23 Mar 2018 07:49:17 -0700 (PDT) Date: Fri, 23 Mar 2018 15:49:14 +0100 From: Jiri Pirko To: Andrew Lunn Cc: netdev@vger.kernel.org, davem@davemloft.net, idosch@mellanox.com, jakub.kicinski@netronome.com, mlxsw@mellanox.com, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, michael.chan@broadcom.com, ganeshgr@chelsio.com, saeedm@mellanox.com, simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com, john.hurley@netronome.com, dirk.vandermerwe@netronome.com, alexander.h.duyck@intel.com, ogerlitz@mellanox.com, dsahern@gmail.com, vijaya.guvva@cavium.com, satananda.burla@cavium.com, raghu.vatsavayi@cavium.com, felix.manlunas@cavium.com, gospo@broadcom.com, sathya.perla@broadcom.com, vasundhara-v.volam@broadcom.com, tariqt@mellanox.com, eranbe@mellanox.com, jeffrey.t.kirsher@intel.com Subject: Re: [patch net-next RFC 04/12] dsa: set devlink port attrs for dsa ports Message-ID: <20180323144914.GA2125@nanopsycho> References: <20180322105522.8186-1-jiri@resnulli.us> <20180322105522.8186-5-jiri@resnulli.us> <20180323133002.GF5145@lunn.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180323133002.GF5145@lunn.ch> Sender: netdev-owner@vger.kernel.org List-ID: Fri, Mar 23, 2018 at 02:30:02PM CET, andrew@lunn.ch wrote: >On Thu, Mar 22, 2018 at 11:55:14AM +0100, Jiri Pirko wrote: >> From: Jiri Pirko >> >> Set the attrs and allow to expose port flavour to user via devlink. >> >> Signed-off-by: Jiri Pirko >> --- >> net/dsa/dsa2.c | 23 +++++++++++++++++++++++ >> 1 file changed, 23 insertions(+) >> >> diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c >> index adf50fbc4c13..49453690696d 100644 >> --- a/net/dsa/dsa2.c >> +++ b/net/dsa/dsa2.c >> @@ -270,7 +270,27 @@ static int dsa_port_setup(struct dsa_port *dp) >> case DSA_PORT_TYPE_UNUSED: >> break; >> case DSA_PORT_TYPE_CPU: >> + /* dp->index is used now as port_number. However >> + * CPU ports should have separate numbering >> + * independent from front panel port numbers. >> + */ >> + devlink_port_attrs_set(&dp->devlink_port, >> + DEVLINK_PORT_FLAVOUR_CPU, >> + dp->index, false, 0); >> + err = dsa_port_link_register_of(dp); >> + if (err) { >> + dev_err(ds->dev, "failed to setup link for port %d.%d\n", >> + ds->index, dp->index); >> + return err; >> + } > >Ah, i get it. These used to be two case statements with one code >block. But you split them apart, so needed to duplicate the >dsa_port_link_register. > >Unfortunately, you forgot to add a 'break;', so it still falls >through, and overwrites the port flavour to DSA. ah, crap. Don't have hw to test this :/ Will fix. Thanks! > >> case DSA_PORT_TYPE_DSA: >> + /* dp->index is used now as port_number. However >> + * DSA ports should have separate numbering >> + * independent from front panel port numbers. >> + */ >> + devlink_port_attrs_set(&dp->devlink_port, >> + DEVLINK_PORT_FLAVOUR_DSA, >> + dp->index, false, 0); > > Andrew