{"id":816261,"url":"http://patchwork.ozlabs.org/api/patches/816261/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-6-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920141516.1402-6-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-20T14:15:05","name":"[net-next,05/16] mlxsw: spectrum_switchdev: Break smid write function","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"0b6e65e911d5f70a0d00e54e6060f335a1790c71","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-6-jiri@resnulli.us/mbox/","series":[{"id":4129,"url":"http://patchwork.ozlabs.org/api/series/4129/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4129","date":"2017-09-20T14:15:00","name":"mlxsw: Multicast flood update","version":1,"mbox":"http://patchwork.ozlabs.org/series/4129/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816261/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816261/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"Ske4l1va\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1y14t7pz9s82\n\tfor ;\n\tThu, 21 Sep 2017 00:16:25 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751850AbdITOQX (ORCPT );\n\tWed, 20 Sep 2017 10:16:23 -0400","from mail-wm0-f65.google.com ([74.125.82.65]:37562 \"EHLO\n\tmail-wm0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751701AbdITOPY (ORCPT\n\t); Wed, 20 Sep 2017 10:15:24 -0400","by mail-wm0-f65.google.com with SMTP id f4so2563870wmh.4\n\tfor ; Wed, 20 Sep 2017 07:15:23 -0700 (PDT)","from localhost (ip-89-177-125-82.net.upcbroadband.cz.\n\t[89.177.125.82]) by smtp.gmail.com with ESMTPSA id\n\tp80sm1747466wmf.42.2017.09.20.07.15.21\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 07:15:21 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=QXE+wbB895CXRccE91pu+jGmQXQQNSwIIb+V99dukBs=;\n\tb=Ske4l1vaNI1wQQuCJfZWhLJ6mHkXGdXHWxIaIZ/u3yazIqh6z7Q7mHoHx6nAXJ13W2\n\tQX/i5EmnoH2tvrcC1b1+W/NiLqAiNPHJ83wy1tk8sYg66LCAxzOsWnDjJE56NFQX0Md/\n\tsVdTqeWcXCZyaujmfOKDe6mwE1E9vYLMRltn0A+p+UDhdXXeZVJbG0tUfbcYnjm7XLOC\n\tzOqnP9Z+eo3ruLMLCfY7UIHH0tLj1ou39fqc+MwjGkLJRYuj3GHecGK+OC95KRICIp3Y\n\t82NtvB97C9b/0ZxqtY2k+WvkxkRwaJozRjUpzo4p0bcvDpbM7qwzNwdemiqNNdKSEZrC\n\tzv0w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=QXE+wbB895CXRccE91pu+jGmQXQQNSwIIb+V99dukBs=;\n\tb=g7WmvlUBqmSGo4n0od8AdQVdfQh8/WNL9dHOtzLS05Sc2xL/jDPE5mm+wh9X06SfG/\n\txopnVtXI+5gB1SlTy2hYt7CvnaI0XPjyAjRPoTMv8kWO/TvXv4Q4OJMTvLcRXOnd+Uwu\n\tphy830WQy+dKVVTOicz+feJHOObL/UIyUbYwUrgoT+Qm+o+VV3TvVOMimM1712LrSOgH\n\tC5IxPuzaWWE23HSvx42wyZNu9J9rPAMiLjWGHXmuSgZcxWCQrq/MNfdBjLHC5MbQakJN\n\te1t5H9sISwKYiO2P4WIu+OQoCQ2uUvTPsVZ7U87VTq7ghxteGnjHYJVyjMkwCNlmPTXP\n\toYWQ==","X-Gm-Message-State":"AHPjjUgHpBXxdd7imoiuhGaXV3bAhooADmzZRls/NZZeUQMAY94ig9Xx\n\tPGyouoH8t6OEJQ0jUyNgCjDlM/qP","X-Google-Smtp-Source":"AOwi7QAsdAagSc5+n8pR8f1oiYhNU78Hivs10cNg+J9h20oIYZAs2/l2ffactdOJ8Y6pDmDzxI2g+w==","X-Received":"by 10.28.228.213 with SMTP id b204mr4143441wmh.157.1505916921830;\n\tWed, 20 Sep 2017 07:15:21 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, nogahf@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 05/16] mlxsw: spectrum_switchdev: Break smid write\n\tfunction","Date":"Wed, 20 Sep 2017 16:15:05 +0200","Message-Id":"<20170920141516.1402-6-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170920141516.1402-1-jiri@resnulli.us>","References":"<20170920141516.1402-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Nogah Frankel \n\nBreak the smid write function into two, one that cleans the ports that\nmight be still written there and one that changes an exiting mid entry.\n\nSigned-off-by: Nogah Frankel \nSigned-off-by: Jiri Pirko \n---\n .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 42 +++++++++++++++-------\n 1 file changed, 30 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex 2ba8a44..09ead97 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -1190,7 +1190,7 @@ mlxsw_sp_port_fdb_set(struct mlxsw_sp_port *mlxsw_sp_port,\n }\n \n static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr,\n-\t\t\t\tu16 fid, u16 mid, bool adding)\n+\t\t\t\tu16 fid, u16 mid_idx, bool adding)\n {\n \tchar *sfd_pl;\n \tint err;\n@@ -1201,16 +1201,16 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr,\n \n \tmlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0);\n \tmlxsw_reg_sfd_mc_pack(sfd_pl, 0, addr, fid,\n-\t\t\t MLXSW_REG_SFD_REC_ACTION_NOP, mid);\n+\t\t\t MLXSW_REG_SFD_REC_ACTION_NOP, mid_idx);\n \terr = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);\n \tkfree(sfd_pl);\n \treturn err;\n }\n \n-static int mlxsw_sp_port_smid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 mid,\n-\t\t\t\t bool add, bool clear_all_ports)\n+/* clean the an entry from the HW and write there a full new entry */\n+static int mlxsw_sp_port_smid_full_entry(struct mlxsw_sp *mlxsw_sp,\n+\t\t\t\t\t u16 mid_idx)\n {\n-\tstruct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;\n \tchar *smid_pl;\n \tint err, i;\n \n@@ -1218,12 +1218,29 @@ static int mlxsw_sp_port_smid_set(struct mlxsw_sp_port *mlxsw_sp_port, u16 mid,\n \tif (!smid_pl)\n \t\treturn -ENOMEM;\n \n-\tmlxsw_reg_smid_pack(smid_pl, mid, mlxsw_sp_port->local_port, add);\n-\tif (clear_all_ports) {\n-\t\tfor (i = 1; i < mlxsw_core_max_ports(mlxsw_sp->core); i++)\n-\t\t\tif (mlxsw_sp->ports[i])\n-\t\t\t\tmlxsw_reg_smid_port_mask_set(smid_pl, i, 1);\n+\tmlxsw_reg_smid_pack(smid_pl, mid_idx, 0, false);\n+\tfor (i = 1; i < mlxsw_core_max_ports(mlxsw_sp->core); i++) {\n+\t\tif (mlxsw_sp->ports[i])\n+\t\t\tmlxsw_reg_smid_port_mask_set(smid_pl, i, 1);\n \t}\n+\n+\terr = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(smid), smid_pl);\n+\tkfree(smid_pl);\n+\treturn err;\n+}\n+\n+static int mlxsw_sp_port_smid_set(struct mlxsw_sp_port *mlxsw_sp_port,\n+\t\t\t\t u16 mid_idx, bool add)\n+{\n+\tstruct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;\n+\tchar *smid_pl;\n+\tint err;\n+\n+\tsmid_pl = kmalloc(MLXSW_REG_SMID_LEN, GFP_KERNEL);\n+\tif (!smid_pl)\n+\t\treturn -ENOMEM;\n+\n+\tmlxsw_reg_smid_pack(smid_pl, mid_idx, mlxsw_sp_port->local_port, add);\n \terr = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(smid), smid_pl);\n \tkfree(smid_pl);\n \treturn err;\n@@ -1336,10 +1353,11 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\t\treturn -ENOMEM;\n \t\t}\n \t\tis_new_mid = true;\n+\t\tmlxsw_sp_port_smid_full_entry(mlxsw_sp, mid->mid);\n \t}\n \tset_bit(mlxsw_sp_port->local_port, mid->ports_in_mid);\n \n-\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true, is_new_mid);\n+\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true);\n \tif (err) {\n \t\tnetdev_err(dev, \"Unable to set SMID\\n\");\n \t\tgoto err_out;\n@@ -1458,7 +1476,7 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\treturn -EINVAL;\n \t}\n \n-\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, false, false);\n+\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, false);\n \tif (err)\n \t\tnetdev_err(dev, \"Unable to remove port from SMID\\n\");\n \n","prefixes":["net-next","05/16"]}