From patchwork Mon Oct 23 18:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13433363 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D81FA21342 for ; Mon, 23 Oct 2023 18:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Ookjxrty" Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com [IPv6:2607:f8b0:4864:20::112c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E94893 for ; Mon, 23 Oct 2023 11:17:35 -0700 (PDT) Received: by mail-yw1-x112c.google.com with SMTP id 00721157ae682-5a82c2eb50cso34307207b3.2 for ; Mon, 23 Oct 2023 11:17:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1698085054; x=1698689854; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ohOgpx6HxjKT4lcBdiw2K5Mk8v9cAFlrurpmYK3DbsU=; b=Ookjxrtyfx/sz6A3KB6iwcgVv0kkOaZrDD9RnLP2/minlUAUwxn2w3J8TFMkG/du9g 8AKBzj1wVbszFEp4lByesP8jfZmeCWgVjN6JkTnduGk2DqhR+H11Bikk91JSFe6xhujE sr5X7Myif3yWJ6Jg89GR8kS3XaGsZQseVaxHY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698085054; x=1698689854; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ohOgpx6HxjKT4lcBdiw2K5Mk8v9cAFlrurpmYK3DbsU=; b=qxNKHEbZXqTVKpiavqp9eD0hwR8bQMl727HFRO+ksWysn1QDTaxUkLQzv6A2iYLpZ9 Ym/bGEkr/pv9PtAz231Urdqur3/Br7EEJZGoXdV/xLMXWVsY97Z9Ur2qWfHWxj+utdjo f12/9WBXFnJNDEhF0y83HeYoxxy+4KyNwwljrDpDtTbXZGWHgjH25JIJRSgoIvOe6bMZ EEdwm+zfq4Z9XsoMjUO20cn9qrLq+812oSgZzGNbH+xqY+MKp7p6wHfGuda1vTR76j9F lZe2zi/hiFu4MEzk/LtJMmuut9H0KHIOJt8n9Ej9rMy0moc9tgj73UxkI9D3b3oF0Flp HUMw== X-Gm-Message-State: AOJu0Yx005TDfKuCERwDrYqugGHBNaPSFn7gtlzl3K0cGu6G0ybok+a6 uakGoMQLxVzJZfgj+XILbneoUNacu1o2Q6A9WRHMKaYwGl2TDHZaS/gv2eJNISDIiyvVuFHHteS T+KpL/cDd0yzcjrdzisGjWbAu5vYKl+KQ8gabNGb68Ru6da+mMRDmhlcW8iWO/1svIjukAXqydo PyAzPbPwIUhDIv X-Google-Smtp-Source: AGHT+IHL6/UGlg8jHHWOsi0ZFZ1pGj7HD/aGHWM5ZQjReg1MB5NzKPsnda2/E4u+BxivnkjFtjm0jQ== X-Received: by 2002:a81:8344:0:b0:5a7:bfbf:1bc2 with SMTP id t65-20020a818344000000b005a7bfbf1bc2mr8870916ywf.20.1698085054234; Mon, 23 Oct 2023 11:17:34 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id ej17-20020ad45a51000000b0065b17ec4b49sm3054269qvb.46.2023.10.23.11.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 11:17:32 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Broadcom internal kernel review list , linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH net-next v7 0/2] Switch DSA to inclusive terminology Date: Mon, 23 Oct 2023 11:17:27 -0700 Message-Id: <20231023181729.1191071-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org One of the action items following Netconf'23 is to switch subsystems to use inclusive terminology. DSA has been making extensive use of the "master" and "slave" words which are now replaced by "conduit" and "user" respectively. Changes in v7: - rebased against latest change to drivers/net/dsa/bcm_sf2.c - collected Vladimir's R-by tags Changes in v6: - fixed typo in if_link.h (insted vs. instead) Changes in v5: - actually collected Rob's acked-by tag - added Stephen's Acked-by tag - fixed the stray references spotted by Vladimir Changes in v4: - added clarification that we used "master" and "slave" terms for a while - fixed include guard names in user.h - fixed some improper subtitutions - renamed STATE_CHANGE notifier - added Rob's ack on the DT patches from the first review Changes in v3: - properly align arguments with the changed function names - ensure markup delimiters lengths are corrected to the name word length - maintain the existing wording about LAG devices Changes in v2: - addressed kbuild test robots reports - preserve capitalization where relevant - fixed build error in mtk_ppe_offload.c Florian Fainelli (2): net: dsa: Use conduit and user terms net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT .../bindings/net/dsa/mediatek,mt7530.yaml | 2 +- Documentation/networking/dsa/b53.rst | 14 +- Documentation/networking/dsa/bcm_sf2.rst | 2 +- .../networking/dsa/configuration.rst | 102 +- Documentation/networking/dsa/dsa.rst | 162 +- Documentation/networking/dsa/lan9303.rst | 2 +- Documentation/networking/dsa/sja1105.rst | 6 +- .../dts/marvell/armada-3720-espressobin.dtsi | 2 +- drivers/net/dsa/b53/b53_common.c | 4 +- drivers/net/dsa/b53/b53_mdio.c | 2 +- drivers/net/dsa/bcm_sf2.c | 41 +- drivers/net/dsa/bcm_sf2.h | 2 +- drivers/net/dsa/bcm_sf2_cfp.c | 4 +- drivers/net/dsa/lan9303-core.c | 4 +- drivers/net/dsa/lantiq_gswip.c | 34 +- drivers/net/dsa/microchip/ksz9477.c | 6 +- drivers/net/dsa/microchip/ksz_common.c | 20 +- drivers/net/dsa/microchip/ksz_ptp.c | 2 +- drivers/net/dsa/mt7530.c | 18 +- drivers/net/dsa/mv88e6xxx/chip.c | 4 +- drivers/net/dsa/ocelot/felix.c | 68 +- drivers/net/dsa/ocelot/felix.h | 6 +- drivers/net/dsa/qca/qca8k-8xxx.c | 50 +- drivers/net/dsa/qca/qca8k-common.c | 4 +- drivers/net/dsa/qca/qca8k-leds.c | 6 +- drivers/net/dsa/qca/qca8k.h | 2 +- drivers/net/dsa/realtek/realtek-smi.c | 28 +- drivers/net/dsa/realtek/realtek.h | 2 +- drivers/net/dsa/realtek/rtl8365mb.c | 2 +- drivers/net/dsa/sja1105/sja1105_main.c | 4 +- drivers/net/dsa/xrs700x/xrs700x.c | 12 +- drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- .../net/ethernet/mediatek/mtk_ppe_offload.c | 2 +- include/linux/dsa/sja1105.h | 2 +- include/net/dsa.h | 56 +- include/net/dsa_stubs.h | 22 +- include/uapi/linux/if_link.h | 4 +- net/core/dev_ioctl.c | 2 +- net/dsa/Makefile | 6 +- net/dsa/{master.c => conduit.c} | 118 +- net/dsa/conduit.h | 22 + net/dsa/dsa.c | 224 +-- net/dsa/dsa.h | 12 +- net/dsa/master.h | 22 - net/dsa/netlink.c | 22 +- net/dsa/port.c | 124 +- net/dsa/port.h | 4 +- net/dsa/slave.h | 69 - net/dsa/switch.c | 20 +- net/dsa/switch.h | 8 +- net/dsa/tag.c | 10 +- net/dsa/tag.h | 26 +- net/dsa/tag_8021q.c | 22 +- net/dsa/tag_8021q.h | 2 +- net/dsa/tag_ar9331.c | 4 +- net/dsa/tag_brcm.c | 14 +- net/dsa/tag_dsa.c | 6 +- net/dsa/tag_gswip.c | 4 +- net/dsa/tag_hellcreek.c | 4 +- net/dsa/tag_ksz.c | 12 +- net/dsa/tag_lan9303.c | 4 +- net/dsa/tag_mtk.c | 4 +- net/dsa/tag_none.c | 6 +- net/dsa/tag_ocelot.c | 22 +- net/dsa/tag_ocelot_8021q.c | 12 +- net/dsa/tag_qca.c | 6 +- net/dsa/tag_rtl4_a.c | 6 +- net/dsa/tag_rtl8_4.c | 6 +- net/dsa/tag_rzn1_a5psw.c | 4 +- net/dsa/tag_sja1105.c | 30 +- net/dsa/tag_trailer.c | 4 +- net/dsa/tag_xrs700x.c | 4 +- net/dsa/{slave.c => user.c} | 1464 ++++++++--------- net/dsa/user.h | 69 + 75 files changed, 1555 insertions(+), 1550 deletions(-) rename net/dsa/{master.c => conduit.c} (76%) create mode 100644 net/dsa/conduit.h delete mode 100644 net/dsa/master.h delete mode 100644 net/dsa/slave.h rename net/dsa/{slave.c => user.c} (62%) create mode 100644 net/dsa/user.h