Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7DB1C43381 for ; Sun, 24 Mar 2019 10:15:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91A36222A7 for ; Sun, 24 Mar 2019 10:15:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="jxy5gW+z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728800AbfCXKPG (ORCPT ); Sun, 24 Mar 2019 06:15:06 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36642 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726173AbfCXKOu (ORCPT ); Sun, 24 Mar 2019 06:14:50 -0400 Received: by mail-wm1-f67.google.com with SMTP id h18so6095197wml.1 for ; Sun, 24 Mar 2019 03:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g+YoPVbXhy0jQ/Mce6TYIbcua1DU643cPNmiHsJXvBI=; b=jxy5gW+zMXrVNZ/tksQVepH7vExNmM7W3Zq7UTEV8oY8taZF6lksT2+VR4cZn3X9Dm xb9YmmakU76b5V0klkOoOZkcjBbMEWsVeDtRmaFk5ROvQFa9kCiEELSX75Ke998tBhhT jBsPuiVzKK4OKeSUcIdRvMz0FJ6lndrC3Co5lGirPwtTnPJHYZgpXatDREO0fdca6zUc 0YCsJqaEH0XbgtSfcM8diPtY1ZKZFz6EiqiYoajjERqxsHEQz+QseSGVuiXMH5LWdS8Y gqLu+74HinXXmTSHNOd8eLdFsIs9vW3mK5MKq/WN4GJElww0Z5tHU8uGDR8DZEk6OQHq Iitw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=g+YoPVbXhy0jQ/Mce6TYIbcua1DU643cPNmiHsJXvBI=; b=JN7+lYQI5zbs/Z7Ny4ijdtzQREuKkikRegB2tK463MtM5CiyrdjB1DPZofbWCDI2gr 11paNfqGOIYUX1KE5+lN4W11NN1mb6haZbxY495svstqBgcLC0CcodD/XjsOSZ7TBSrL F+mzhEcvefiWyJ4X4UrM4/wjFm/VvITMzAaRlRV+0VV1WDk0ZSyFHFK9HLTDxxjpvzpz F/lJ1ue5rbL4ulhKbCZB/piwEgfHvVHxu06/RpxwMJdy0qWuGm00fzBLvWARokfToJrt crk3MOCP4VUCfiytqa1jTXvukbMAAZJmnb/xtJpdW6Dmfcx1N+bmAZWxtw9566DGJy0b xSaQ== X-Gm-Message-State: APjAAAVsG/sNt4D+1XEGS6uC/wOuiBHZPVr+zU5MHlAUp8odFSpkmIO8 9/axxmHsenqEZXj0AElUFwUeltSFn+k= X-Google-Smtp-Source: APXvYqwiqYfuEzEi4nGgGLpD+lqyh1/a7XJPMUYpRCMSVQC9YrdVBJQWK3aQE3ldPIW8czifLuWpIQ== X-Received: by 2002:a1c:a8d3:: with SMTP id r202mr8621502wme.106.1553422488234; Sun, 24 Mar 2019 03:14:48 -0700 (PDT) Received: from localhost (ip-94-113-125-71.net.upcbroadband.cz. [94.113.125.71]) by smtp.gmail.com with ESMTPSA id m17sm7636562wrx.3.2019.03.24.03.14.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Mar 2019 03:14:47 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next v3 09/15] dsa: move devlink_port_attrs_set() call before register Date: Sun, 24 Mar 2019 11:14:32 +0100 Message-Id: <20190324101438.6376-10-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190324101438.6376-1-jiri@resnulli.us> References: <20190324101438.6376-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Since attrs are static during the existence of devlink port, set the before registration of the port. Signed-off-by: Jiri Pirko Reviewed-by: Andrew Lunn --- v1->v2: - fixed comment for port numbering --- net/dsa/dsa2.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 4558de672b4f..fe0a6197db9c 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -258,14 +258,36 @@ static void dsa_tree_teardown_default_cpu(struct dsa_switch_tree *dst) static int dsa_port_setup(struct dsa_port *dp) { + enum devlink_port_flavour flavour; struct dsa_switch *ds = dp->ds; - int err = 0; + int err; + + if (dp->type == DSA_PORT_TYPE_UNUSED) + return 0; memset(&dp->devlink_port, 0, sizeof(dp->devlink_port)); - if (dp->type != DSA_PORT_TYPE_UNUSED) - err = devlink_port_register(ds->devlink, &dp->devlink_port, - dp->index); + switch (dp->type) { + case DSA_PORT_TYPE_CPU: + flavour = DEVLINK_PORT_FLAVOUR_CPU; + break; + case DSA_PORT_TYPE_DSA: + flavour = DEVLINK_PORT_FLAVOUR_DSA; + break; + case DSA_PORT_TYPE_USER: /* fall-through */ + default: + flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL; + break; + } + + /* dp->index is used now as port_number. However + * CPU and DSA ports should have separate numbering + * independent from front panel port numbers. + */ + devlink_port_attrs_set(&dp->devlink_port, flavour, + dp->index, false, 0); + err = devlink_port_register(ds->devlink, &dp->devlink_port, + dp->index); if (err) return err; @@ -273,13 +295,6 @@ 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", @@ -288,13 +303,6 @@ static int dsa_port_setup(struct dsa_port *dp) } break; 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); err = dsa_port_link_register_of(dp); if (err) { dev_err(ds->dev, "failed to setup link for port %d.%d\n", @@ -303,9 +311,6 @@ static int dsa_port_setup(struct dsa_port *dp) } break; case DSA_PORT_TYPE_USER: - devlink_port_attrs_set(&dp->devlink_port, - DEVLINK_PORT_FLAVOUR_PHYSICAL, - dp->index, false, 0); err = dsa_slave_create(dp); if (err) dev_err(ds->dev, "failed to create slave for port %d.%d\n", -- 2.17.2