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: 13433368 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0FA6C25B45 for ; Mon, 23 Oct 2023 18:18:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mii4EYRU+KsQTiSZOGcTCxnlHwMgWf47sXrFDxlp9UE=; b=hcg dTcQ5sK6dF4vQKj5QmCZDIA72WKr/YkHRxNp2QdMjAEodW5CWXvs1qPurpbQoeciP83sWkbHvSBlD pKu9DP5rcyMRl0zF56f0bTHASlx7TYccsNsNKCINV/79mTVJhR6qS99Pc2x4PYkkExXjU0KXLwGlS SozhrOdL0k5qI1jiD3a0UZ7YOu+POJyhUC/is1iU16TtmNBYpVsSRw5DB9W500/KzRUxKt8FBQXe5 +My+heYJMLrP3JxpxIKV/psjiO+GsysR+aeuihU+/unZxDaZ40QZQ/5DgCnSjUJuTfFqMMOtb42aP ldbA3nN2L6zY0OLCTfZKa7nBqk1+0JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quzUi-0083yc-2c; Mon, 23 Oct 2023 18:17:40 +0000 Received: from mail-yw1-x112e.google.com ([2607:f8b0:4864:20::112e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1quzUf-0083wm-0h for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 18:17:38 +0000 Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-5a7fb84f6ceso34478917b3.1 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=lists.infradead.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=rS8ELL/YMjrV2nPVvH8GbCFEAAqyvcsRcUrYXYx06kE=; b=hiYJnLP9KZr8riBuUmiALWYDbfq0Lpoy1dN+VitJdyM77tybAi6Lry02miMXPjmIM4 jhjtqkmTzFKy0WY/v4mNrDlQW01KGK69eE+omA2Ju+dXK3baDVTzT76z6QpnDGYwiwgC gkpbdWillsINZqy57A8skiItcluijpgLz6J88= 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=rS8ELL/YMjrV2nPVvH8GbCFEAAqyvcsRcUrYXYx06kE=; b=AN5x30B2X1OXELrWzgRsdgPeC2j6WIv3VWGP2jddxxvaxrpiZoS2mTKAuWRe3gqdxp BwRI4OVDG2HS7YEXTrGe4ZZqLbq+NSvfLrO5slqRiG/CnR98zbuHngSmWNICp9wDWxSc 3lhoEYesdYjRMJbwgz+NW/hEBwsWxhz7hhoLC7e9zJZ7YyzOF05fAK6TzbVwY0SKF/Fg L6RwUqb8q/FFY2pdtDxKfUYJS/48lfENci5JsyxyciNEVpAI9z+qZRSZLX+EmcZ9pF46 diReCzvqnyWvN34u+b6VjuH2ghG0HvobXu5gkwC0ogoTvLNjJtcVAul7ym9aPUtDe/e9 BHiA== X-Gm-Message-State: AOJu0Yx7lph+w/cTwIuyiMA6F0ba1oa6i9HwkOejSdrDlGdKTNleEzWq BjvXJ3CmoY1kqx/L0JGz4OvF5A== 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 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231023_111737_254101_716E8F61 X-CRM114-Status: GOOD ( 15.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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