From mboxrd@z Thu Jan 1 00:00:00 1970 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=-8.5 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_MUTT 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 A2EF1C43381 for ; Mon, 1 Apr 2019 13:04:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64A9020828 for ; Mon, 1 Apr 2019 13:04:10 +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="AmyQ/NQS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726800AbfDANEJ (ORCPT ); Mon, 1 Apr 2019 09:04:09 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:33970 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726421AbfDANEI (ORCPT ); Mon, 1 Apr 2019 09:04:08 -0400 Received: by mail-wm1-f68.google.com with SMTP id r186so1561382wmf.1 for ; Mon, 01 Apr 2019 06:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6k7hsqmPdPtx/gzMTTD/NGh9t0oZfqmGuwDFa2vhF3A=; b=AmyQ/NQS6Q7sInqGQxSb3QIJxS/ycnCWEtG+uJTxFXze2k2wq4ustWen4RPCbvi5Wy C2M8olLu+Us2hgCkEPPCsvGevcusM2c6yWR5ypxbMbfy0Y/a/dRKdv18UW/7nRFPzw8l XIYbDBF6nX02VIeJXPUeCN/SYZmVmjGabu3CXxv1uiD1wGLsz/vnj28EOVdE31o5+yq8 c1S+18cUM0DButqydql+LBo2G3o55NtyieOy8hCKc51Bz58ldjMWmnnfBsw+n4BeacIP oPQ5/sVgf0Rk0/+ihsfWoFXtbCsX8u2xyfTjzzyOT8x8msWxYlb7BvLOBK4PSBsnZvcl BYjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6k7hsqmPdPtx/gzMTTD/NGh9t0oZfqmGuwDFa2vhF3A=; b=SnXIw+TlqU3qZnQ5FEwJakJUyHhgJ9/v+ch506EIlWLwKHJmpdM9WeSV8V4p/nFGG4 8X0GClrrRcIB1CpG7tNYKWQ4xu5+yVhPdoNfX735l+OxpkvisNxOPrtCm80f/UJ60eq5 bdR4qT71Lqg37OfRtWTmbM+szo09qzLjULYoOkatFQbMINiQH35Rvt+T5A30Gcd8qfdD aPQfeCfqHx01LdRKzHVIVb1S0vgRyXmN0ONVRvYUD1xAuk2l8X31NAnADBq/KMExBw2V WwSsQNJyAgJilcdvOlys2A5TPCR6rqSwqOCK1Y14QQYSbByhEEgenaDlfgRfmIf7C34a d0Sw== X-Gm-Message-State: APjAAAXFyS1BJjffsRDOp9V7QgT1KMbU7qcpj0mUsNynWcQRhnMJVWzY auy0LRnohw/aKVPbSApcxh83CA== X-Google-Smtp-Source: APXvYqznK5lwsAb9spotmgPTBuJJTFOi/4P57zQIJtpwSY3+7arMD2h7JSsmc4ZavBj/mdacqJUaUQ== X-Received: by 2002:a1c:3842:: with SMTP id f63mr12497628wma.25.1554123846821; Mon, 01 Apr 2019 06:04:06 -0700 (PDT) Received: from localhost (mail.chocen-mesto.cz. [85.163.43.2]) by smtp.gmail.com with ESMTPSA id f11sm11525850wrm.30.2019.04.01.06.04.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Apr 2019 06:04:06 -0700 (PDT) Date: Mon, 1 Apr 2019 15:04:05 +0200 From: Jiri Pirko To: Florian Fainelli Cc: netdev@vger.kernel.org, davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com Subject: Re: [patch net-next 11/12] dsa: pass switch ID through devlink_port_attrs_set() Message-ID: <20190401130405.GA2655@nanopsycho> References: <20190328211254.1894-1-jiri@resnulli.us> <20190328211254.1894-12-jiri@resnulli.us> <10e0e438-87b3-a1a4-d23c-98cd6f0dc3d3@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <10e0e438-87b3-a1a4-d23c-98cd6f0dc3d3@gmail.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fri, Mar 29, 2019 at 10:59:54PM CET, f.fainelli@gmail.com wrote: >On 3/28/19 2:12 PM, Jiri Pirko wrote: >> From: Jiri Pirko >> >> Pass the switch ID down the to devlink through devlink_port_attrs_set() >> so it can be used by devlink_compat_switch_id_get(). Leave >> ndo_get_port_parent_id implementation only for legacy. > >Nit you are passing the switch fabric id (dst->index), the switch id is >in ds->index. I'm doing the same as dsa_slave_get_port_parent_id() does. If it is not correct, please fix it there. > >> >> Signed-off-by: Jiri Pirko >> --- >> net/dsa/dsa2.c | 4 +++- >> net/dsa/slave.c | 1 - >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c >> index 514be0583642..410cb0da9def 100644 >> --- a/net/dsa/dsa2.c >> +++ b/net/dsa/dsa2.c >> @@ -260,6 +260,7 @@ static int dsa_port_setup(struct dsa_port *dp) >> { >> enum devlink_port_flavour flavour; >> struct dsa_switch *ds = dp->ds; >> + struct dsa_switch_tree *dst = ds->dst; >> int err; >> >> if (dp->type == DSA_PORT_TYPE_UNUSED) >> @@ -285,7 +286,8 @@ static int dsa_port_setup(struct dsa_port *dp) >> * independent from front panel port numbers. >> */ >> devlink_port_attrs_set(&dp->devlink_port, flavour, >> - dp->index, false, 0, NULL, 0); >> + dp->index, false, 0, >> + (const char *) &dst->index, sizeof(dst->index)); >> err = devlink_port_register(ds->devlink, &dp->devlink_port, >> dp->index); >> if (err) >> diff --git a/net/dsa/slave.c b/net/dsa/slave.c >> index 80be8e86c82d..026a4003d520 100644 >> --- a/net/dsa/slave.c >> +++ b/net/dsa/slave.c >> @@ -1130,7 +1130,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { >> .ndo_get_phys_port_name = dsa_slave_get_phys_port_name, >> .ndo_setup_tc = dsa_slave_setup_tc, >> .ndo_get_stats64 = dsa_slave_get_stats64, >> - .ndo_get_port_parent_id = dsa_slave_get_port_parent_id, >> .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, >> .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, >> .ndo_get_devlink_port = dsa_slave_get_devlink_port, >> > > >-- >Florian