From patchwork Wed Oct 11 22:20:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13418014 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 44AC2249ED for ; Wed, 11 Oct 2023 22:20:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="gNJnVed/" Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C7BBDB for ; Wed, 11 Oct 2023 15:20:30 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-27d1f57bda7so103157a91.0 for ; Wed, 11 Oct 2023 15:20:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697062830; x=1697667630; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=4Gug9M3xRqmNkaWPpJ8Svoftj5zpcxsmnMFbGX8XfB8=; b=gNJnVed/97fR2unB1LEBlBtaBwgEgbt0tSkV6Ki/SF+Ojbh+cHaT3+MR8ATRBqHzCb C41PXtdfZm0YFKx65KFCtdFoyvswuykkh5wZKaCNEPBccdLmQ3Ee9L7/nZegU7aNXNVv BaIAKUk3mHxtpbQFG8RDOcdE9bHap2E7Soj1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697062830; x=1697667630; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4Gug9M3xRqmNkaWPpJ8Svoftj5zpcxsmnMFbGX8XfB8=; b=k/4JJGAnA17+LscrtvJ3UhgA+/OETHFoyXdjAb45rnvuQNdN86nTIfIdelA3ciJxAV VV4oKBdeHnsIe8OUsO8VTrwhfsjLcLsmODOtfABAl39iksW/IK6zn4a/nrjDwLlJDNtI wyy9BbcRIuiB0Em8KgnZ9NH8hP1XEEZetTMTlDP28e6ZFpoO4gOd8tbOGaiLAWX3zbf5 L/3hMhzK2gp9KUyPsIszE9QGHi0MD4qC5zUeTpUQZ3hkbtoIouaOeeREMBqUnnrNEtu1 9kEA13MeFvCBxzh8L+vXFIMzPZsveJ/M8oOtjC2YgpGhCg9nED7pKfptTBaCm6zT1QdJ Zaxw== X-Gm-Message-State: AOJu0YwbWtWe2wIfuM+ZqYxjca1DD8LkjxeuzI2sSFA+7Vm9dM+hZwAB RV55JCV1KeaFJbVsbdF+Br4ih6QKfL5gI8lcPn3S7LQLU4bsysO5JOC/3KN50htV2oBBITP91+S OxK1cVnUE11sc/uEEp0jRgCWOFNOBq8lYdfoFMJ7DRNksp6RtFHV24PzCjBZjRYKkZtIXMSBtTI nOkD5zcCpnQg== X-Google-Smtp-Source: AGHT+IGMORhJTTLB2n+laqiujUEh+7aQrV5LroY9q8mwSQdW7ryE6P2S/vC9iqXPuKMHnMJnsGQX9Q== X-Received: by 2002:a17:90a:db12:b0:27c:f1f9:43c1 with SMTP id g18-20020a17090adb1200b0027cf1f943c1mr6088698pjv.28.1697062829715; Wed, 11 Oct 2023 15:20:29 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 13-20020a170902c10d00b001c75d7f2597sm348256pli.141.2023.10.11.15.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 15:20:29 -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 v2 0/2] Switch DSA to inclusive terminology Date: Wed, 11 Oct 2023 15:20:24 -0700 Message-Id: <20231011222026.4181654-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,URIBL_BLOCKED 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 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 | 106 +- Documentation/networking/dsa/dsa.rst | 152 +- Documentation/networking/dsa/lan9303.rst | 2 +- Documentation/networking/dsa/sja1105.rst | 8 +- .../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 | 16 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/dsa/ocelot/felix.c | 62 +- drivers/net/dsa/ocelot/felix.h | 4 +- drivers/net/dsa/qca/qca8k-8xxx.c | 48 +- drivers/net/dsa/qca/qca8k-common.c | 2 +- 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/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 | 54 +- include/net/dsa_stubs.h | 10 +- include/uapi/linux/if_link.h | 4 +- net/core/dev_ioctl.c | 2 +- net/dsa/Makefile | 4 +- net/dsa/{master.c => conduit.c} | 96 +- net/dsa/conduit.h | 22 + net/dsa/dsa.c | 218 +-- net/dsa/dsa.h | 10 +- net/dsa/master.h | 22 - net/dsa/netlink.c | 22 +- net/dsa/port.c | 114 +- net/dsa/port.h | 2 +- net/dsa/slave.h | 69 - net/dsa/switch.c | 18 +- net/dsa/switch.h | 4 +- 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 | 4 +- 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} | 1240 ++++++++--------- net/dsa/user.h | 69 + 74 files changed, 1395 insertions(+), 1393 deletions(-) rename net/dsa/{master.c => conduit.c} (79%) 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} (67%) create mode 100644 net/dsa/user.h