From patchwork Tue Oct 17 23:35:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13426203 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 1F2D243102 for ; Tue, 17 Oct 2023 23:35:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Mrb70A3E" Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34421B0 for ; Tue, 17 Oct 2023 16:35:41 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1c77449a6daso50619725ad.0 for ; Tue, 17 Oct 2023 16:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697585740; x=1698190540; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=cImd/Fhd+FMZtj9e5YHZnBefeuxEYvHxrfJNren1yFI=; b=Mrb70A3E31nZprLeGlgmbmkNVZegdHb80v1KL1yCZUDlkXS+kkoY+3hwQdeRrS0dMd X9U36R7IYUsNqHjy0JW3G6iT+EFBpY0EoRO59g276ACVeneBqgXs4MPCH5NHUeuKHc4Y HYFVEF3uWtrHNsbVCSGRsTc4PBot7RoclUedQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697585740; x=1698190540; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cImd/Fhd+FMZtj9e5YHZnBefeuxEYvHxrfJNren1yFI=; b=Clk6rvO1sxzd6BjRf9cP6Pbsfg41yjKiOBf0YKyy+O3lsJEkPUHwRlLgZW0Dlp+x25 599AdjycNrV7W3vpNzbpigFKwtKdwzLTACE3CpArg7+LzELFrgCBlwYxFkJouAa/K6nf jK7Djoc38FbtGCialc+DLCJto7kdZr6jOR+Qs/STEROvMiaADj06VRo7tJXTTob5ZDmR 5+7m5vOeuDLIL3g9LLANRIBjsGpbJMfcHklQtOYF86SUvLImbxVTpXA1xNyKaTvTiR95 WHfi8Nl/Dr6JytbMkiP3Xm4i6clBcKTpkV9g0ZNzeR5fJpQq3dOqQCwOFWqAXbAUlow7 U9bA== X-Gm-Message-State: AOJu0YycXDb4ot45CbSwnRb+tMmIzGCmKidvrB3IQ1C8s/KID7X/jm5H ntY5tWXYgqLfHyVAW0zZ7ohbJCRSXR5uMNzZXu1EnDCKb6ImWOgrGmWUVaf6pmk1sq6bE2KKRso l+CwaViOlIanKkJtnw7+oxCdq8cU6tvZODDlp2EYFXak33Dj/22TWHLuXIatprIAwc/chHWn69k y5Ziql+nV1rQ== X-Google-Smtp-Source: AGHT+IHYryXJgjRJ+3/6ydhVGgy9ALMB50NDAKiFnnrB8yQlvbIkLrvFNz0VP4oDLpcsQ9KAf8huVw== X-Received: by 2002:a17:903:1249:b0:1c4:3cd5:4298 with SMTP id u9-20020a170903124900b001c43cd54298mr4336604plh.18.1697585740182; Tue, 17 Oct 2023 16:35:40 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g14-20020a1709029f8e00b001bc18e579aesm2139458plq.101.2023.10.17.16.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 16:35:39 -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 v5 0/2] Switch DSA to inclusive terminology Date: Tue, 17 Oct 2023 16:35:34 -0700 Message-Id: <20231017233536.426704-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-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MIME_NO_TEXT, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 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 | 36 +- 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, 1553 insertions(+), 1547 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