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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 40283C43381 for ; Fri, 29 Mar 2019 22:00:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEB272184D for ; Fri, 29 Mar 2019 22:00:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YyE3NXbT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730233AbfC2WAG (ORCPT ); Fri, 29 Mar 2019 18:00:06 -0400 Received: from mail-yb1-f194.google.com ([209.85.219.194]:45616 "EHLO mail-yb1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729771AbfC2WAG (ORCPT ); Fri, 29 Mar 2019 18:00:06 -0400 Received: by mail-yb1-f194.google.com with SMTP id b18so1319180yba.12 for ; Fri, 29 Mar 2019 15:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=NONqdfWvaIaJN8qqyX0pNb3TFLw2lZOtNOFWsYyACuw=; b=YyE3NXbTWmqvF6pgb5Vh24HKQtrYNMfAovYzhyeXoNmFnT1fqIf0WqKm2jTYZ5l36c fADTB3949uD0Sxcc4/OIrtvfIdOvwWsizyIUDC0Rkc1nyoRFdGO/ouEJDLMrs1UZ07If wz86lzAYu4Uz4EWXvyfNK+tz0QnGVwjTimgQyeQDUt+1Uwlk3VUW5NA76SVV06IY+CE3 qLWMfVOC+cCwlEE7Q2MjJXvkJBF28ph42O9oMHwAG616WQ5OnvpUdWScCDJ0+GV2YyME b6y4hlF2wocZl7LnKCAtEYpckZuh4FDDZGs61aGCd8nIL4TWrWpfnqIKbttS6Mjw4KiH mPbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=NONqdfWvaIaJN8qqyX0pNb3TFLw2lZOtNOFWsYyACuw=; b=p9KPI4gXgM5t23DC5oFpZr9lHxy0finKG5cV6+wYaPyGubF5XaPAswhGWLLcJEqX5X jIgsNApdXkc0AQ/12emdtNOKxj+ACCvxThlHOpcFLU29RcelJ+uhiXbrSPd546Vs9yCa WZYKN1AMh+tpdgmiHSSjixoq8e6L529iMdUO6EN5j7uKkh9IqVhEaK/b5fGS9N0OnHxM qenaYKhQ1RkqQkPWPCc1c+gFSwOIsFDBOkme/1rvMYK5kA55qNxisB4yloA/U9IVUjrc +BbEWrhz41YT4kQ6yIWl1YVQtwqiJ5DrO7/+P38G+dh//kM7aC5b/a5L2BN+k+9CMrnv UVCA== X-Gm-Message-State: APjAAAVm/Gwsw0THyw+8g20we4TuQrbkTqfTf2tBZqJSv2j2l8BwZWnJ QNsGL7XDj5UIIoK7/s6uPrA= X-Google-Smtp-Source: APXvYqxoNgIcPL2rUvSvdC/n9m8gNDynsR4NGmygMLypBZCdsC/ZvVyB7Anc5sQoRFDd/uOTozlEvw== X-Received: by 2002:a25:3455:: with SMTP id b82mr3495995yba.198.1553896805445; Fri, 29 Mar 2019 15:00:05 -0700 (PDT) Received: from [10.67.49.126] ([192.19.223.250]) by smtp.googlemail.com with ESMTPSA id 199sm1002180ywg.25.2019.03.29.15.00.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 15:00:04 -0700 (PDT) Subject: Re: [patch net-next 11/12] dsa: pass switch ID through devlink_port_attrs_set() To: Jiri Pirko , netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, andrew@lunn.ch, vivien.didelot@gmail.com, michael.chan@broadcom.com References: <20190328211254.1894-1-jiri@resnulli.us> <20190328211254.1894-12-jiri@resnulli.us> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; prefer-encrypt=mutual; keydata= mQGiBEjPuBIRBACW9MxSJU9fvEOCTnRNqG/13rAGsj+vJqontvoDSNxRgmafP8d3nesnqPyR xGlkaOSDuu09rxuW+69Y2f1TzjFuGpBk4ysWOR85O2Nx8AJ6fYGCoeTbovrNlGT1M9obSFGQ X3IzRnWoqlfudjTO5TKoqkbOgpYqIo5n1QbEjCCwCwCg3DOH/4ug2AUUlcIT9/l3pGvoRJ0E AICDzi3l7pmC5IWn2n1mvP5247urtHFs/uusE827DDj3K8Upn2vYiOFMBhGsxAk6YKV6IP0d ZdWX6fqkJJlu9cSDvWtO1hXeHIfQIE/xcqvlRH783KrihLcsmnBqOiS6rJDO2x1eAgC8meAX SAgsrBhcgGl2Rl5gh/jkeA5ykwbxA/9u1eEuL70Qzt5APJmqVXR+kWvrqdBVPoUNy/tQ8mYc nzJJ63ng3tHhnwHXZOu8hL4nqwlYHRa9eeglXYhBqja4ZvIvCEqSmEukfivk+DlIgVoOAJbh qIWgvr3SIEuR6ayY3f5j0f2ejUMYlYYnKdiHXFlF9uXm1ELrb0YX4GMHz7QnRmxvcmlhbiBG YWluZWxsaSA8Zi5mYWluZWxsaUBnbWFpbC5jb20+iGYEExECACYCGyMGCwkIBwMCBBUCCAME FgIDAQIeAQIXgAUCVF/S8QUJHlwd3wAKCRBhV5kVtWN2DvCVAJ4u4/bPF4P3jxb4qEY8I2gS 6hG0gACffNWlqJ2T4wSSn+3o7CCZNd7SLSC5BA0ESM+4EhAQAL/o09boR9D3Vk1Tt7+gpYr3 WQ6hgYVON905q2ndEoA2J0dQxJNRw3snabHDDzQBAcqOvdi7YidfBVdKi0wxHhSuRBfuOppu pdXkb7zxuPQuSveCLqqZWRQ+Cc2QgF7SBqgznbe6Ngout5qXY5Dcagk9LqFNGhJQzUGHAsIs hap1f0B1PoUyUNeEInV98D8Xd/edM3mhO9nRpUXRK9Bvt4iEZUXGuVtZLT52nK6Wv2EZ1TiT OiqZlf1P+vxYLBx9eKmabPdm3yjalhY8yr1S1vL0gSA/C6W1o/TowdieF1rWN/MYHlkpyj9c Rpc281gAO0AP3V1G00YzBEdYyi0gaJbCEQnq8Vz1vDXFxHzyhgGz7umBsVKmYwZgA8DrrB0M oaP35wuGR3RJcaG30AnJpEDkBYHznI2apxdcuTPOHZyEilIRrBGzDwGtAhldzlBoBwE3Z3MY 31TOpACu1ZpNOMysZ6xiE35pWkwc0KYm4hJA5GFfmWSN6DniimW3pmdDIiw4Ifcx8b3mFrRO BbDIW13E51j9RjbO/nAaK9ndZ5LRO1B/8Fwat7bLzmsCiEXOJY7NNpIEpkoNoEUfCcZwmLrU +eOTPzaF6drw6ayewEi5yzPg3TAT6FV3oBsNg3xlwU0gPK3v6gYPX5w9+ovPZ1/qqNfOrbsE FRuiSVsZQ5s3AAMFD/9XjlnnVDh9GX/r/6hjmr4U9tEsM+VQXaVXqZuHKaSmojOLUCP/YVQo 7IiYaNssCS4FCPe4yrL4FJJfJAsbeyDykMN7wAnBcOkbZ9BPJPNCbqU6dowLOiy8AuTYQ48m vIyQ4Ijnb6GTrtxIUDQeOBNuQC/gyyx3nbL/lVlHbxr4tb6YkhkO6shjXhQh7nQb33FjGO4P WU11Nr9i/qoV8QCo12MQEo244RRA6VMud06y/E449rWZFSTwGqb0FS0seTcYNvxt8PB2izX+ HZA8SL54j479ubxhfuoTu5nXdtFYFj5Lj5x34LKPx7MpgAmj0H7SDhpFWF2FzcC1bjiW9mjW HaKaX23Awt97AqQZXegbfkJwX2Y53ufq8Np3e1542lh3/mpiGSilCsaTahEGrHK+lIusl6mz Joil+u3k01ofvJMK0ZdzGUZ/aPMZ16LofjFA+MNxWrZFrkYmiGdv+LG45zSlZyIvzSiG2lKy kuVag+IijCIom78P9jRtB1q1Q5lwZp2TLAJlz92DmFwBg1hyFzwDADjZ2nrDxKUiybXIgZp9 aU2d++ptEGCVJOfEW4qpWCCLPbOT7XBr+g/4H3qWbs3j/cDDq7LuVYIe+wchy/iXEJaQVeTC y5arMQorqTFWlEOgRA8OP47L9knl9i4xuR0euV6DChDrguup2aJVU4hPBBgRAgAPAhsMBQJU X9LxBQkeXB3fAAoJEGFXmRW1Y3YOj4UAn3nrFLPZekMeqX5aD/aq/dsbXSfyAKC45Go0YyxV HGuUuzv+GKZ6nsysJ7kCDQRXG8fwARAA6q/pqBi5PjHcOAUgk2/2LR5LjjesK50bCaD4JuNc YDhFR7Vs108diBtsho3w8WRd9viOqDrhLJTroVckkk74OY8r+3t1E0Dd4wHWHQZsAeUvOwDM PQMqTUBFuMi6ydzTZpFA2wBR9x6ofl8Ax+zaGBcFrRlQnhsuXLnM1uuvS39+pmzIjasZBP2H UPk5ifigXcpelKmj6iskP3c8QN6x6GjUSmYx+xUfs/GNVSU1XOZn61wgPDbgINJd/THGdqiO iJxCLuTMqlSsmh1+E1dSdfYkCb93R/0ZHvMKWlAx7MnaFgBfsG8FqNtZu3PCLfizyVYYjXbV WO1A23riZKqwrSJAATo5iTS65BuYxrFsFNPrf7TitM8E76BEBZk0OZBvZxMuOs6Z1qI8YKVK UrHVGFq3NbuPWCdRul9SX3VfOunr9Gv0GABnJ0ET+K7nspax0xqq7zgnM71QEaiaH17IFYGS sG34V7Wo3vyQzsk7qLf9Ajno0DhJ+VX43g8+AjxOMNVrGCt9RNXSBVpyv2AMTlWCdJ5KI6V4 KEzWM4HJm7QlNKE6RPoBxJVbSQLPd9St3h7mxLcne4l7NK9eNgNnneT7QZL8fL//s9K8Ns1W t60uQNYvbhKDG7+/yLcmJgjF74XkGvxCmTA1rW2bsUriM533nG9gAOUFQjURkwI8jvMAEQEA AYkCaAQYEQIACQUCVxvH8AIbAgIpCRBhV5kVtWN2DsFdIAQZAQIABgUCVxvH8AAKCRCH0Jac RAcHBIkHD/9nmfog7X2ZXMzL9ktT++7x+W/QBrSTCTmq8PK+69+INN1ZDOrY8uz6htfTLV9+ e2W6G8/7zIvODuHk7r+yQ585XbplgP0V5Xc8iBHdBgXbqnY5zBrcH+Q/oQ2STalEvaGHqNoD UGyLQ/fiKoLZTPMur57Fy1c9rTuKiSdMgnT0FPfWVDfpR2Ds0gpqWePlRuRGOoCln5GnREA/ 2MW2rWf+CO9kbIR+66j8b4RUJqIK3dWn9xbENh/aqxfonGTCZQ2zC4sLd25DQA4w1itPo+f5 V/SQxuhnlQkTOCdJ7b/mby/pNRz1lsLkjnXueLILj7gNjwTabZXYtL16z24qkDTI1x3g98R/ xunb3/fQwR8FY5/zRvXJq5us/nLvIvOmVwZFkwXc+AF+LSIajqQz9XbXeIP/BDjlBNXRZNdo dVuSU51ENcMcilPr2EUnqEAqeczsCGpnvRCLfVQeSZr2L9N4svNhhfPOEscYhhpHTh0VPyxI pPBNKq+byuYPMyk3nj814NKhImK0O4gTyCK9b+gZAVvQcYAXvSouCnTZeJRrNHJFTgTgu6E0 caxTGgc5zzQHeX67eMzrGomG3ZnIxmd1sAbgvJUDaD2GrYlulfwGWwWyTNbWRvMighVdPkSF 6XFgQaosWxkV0OELLy2N485YrTr2Uq64VKyxpncLh50e2RnyAJ9Za0Dx0yyp44iD1OvHtkEI M5kY0ACeNhCZJvZ5g4C2Lc9fcTHu8jxmEkI= Message-ID: <10e0e438-87b3-a1a4-d23c-98cd6f0dc3d3@gmail.com> Date: Fri, 29 Mar 2019 14:59:54 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190328211254.1894-12-jiri@resnulli.us> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. > > 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