From patchwork Fri Oct 13 21:52:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13421762 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 EF500CDB487 for ; Fri, 13 Oct 2023 21:53:35 +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=qD+UOEjahUhH9enGtTiPUgM6yxUBDIEZn8UkhqSSgco=; b=KPs GiLSgqk4XIxyenV/kbpJlUj+BvR69W2g6Msr/BpeHL9KNGuMmwnr1VcJcJT0bRaq4IPW7pbNc+Trz 20pWuoFocUtNvbMk+7Ae5LcFZUnyBBG/iIeAFTmUig7fZmweRKt6J1xxrj1qSTHetBjywGjvbYJ5v eRBbdXanV9a4mPcEV1x6ZZk/01hv+SmVPgI/TccNHGJshnN/r+u7x+gdYcZYrt0xHbt3H1pLQ87Sh 6zQwxbCFNo0/oPEcwwT+ifHQNZlY2UV3g2aZUaiIqjVNYSP7MIeSzfasYDDotr/TU2/HqGxpWJnPb BDAfnxiOrtiYxVPytS9oEqvSPbIc2JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qrQ5g-004Krz-1H; Fri, 13 Oct 2023 21:53:04 +0000 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qrQ5d-004KqN-0T for linux-arm-kernel@lists.infradead.org; Fri, 13 Oct 2023 21:53:02 +0000 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-77386822cfbso165568785a.0 for ; Fri, 13 Oct 2023 14:52:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697233976; x=1697838776; darn=lists.infradead.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=U6Mq/Mv3mW0juE/sOVcBBXIsNIojKn8RQm4G/I9p7Os=; b=Uu5KXFv/ApF4K+7OM42eQ3qpeFG/Lmq8rwEs/H9kNPBoTqhHzeR7XlDUvjBtq1NYhz DhDrX1WkDZDixGIuPXTkQjxWsNgeRfW72eKZLafNSaVo/vJ71TcHbPPx+oTkIhyhlDbq OoWzScLPwjDpFR9XwcFjFx2+sa8POMJkdNK7s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697233976; x=1697838776; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=U6Mq/Mv3mW0juE/sOVcBBXIsNIojKn8RQm4G/I9p7Os=; b=QiGe+IbqEqyk0pIJfq1H3mqreTVdFJNE1ZFOOadeH3QjPBYn1UdPr8JKhWJMVXD+a8 wAlavP17CCN+N9DkSGwyN2aaZT9SzxCXwtDLYDPrV/WcU9ngk4ndLyl49l7dB9omE0aq uo2DZBi7zkgHU7lvqF4d8tQrZoZKscde0mPYwe6zMp/VkagVT+vqZ7N180uCaeqtfQN8 wH74NipDAGk0Cm2DwJcEqpvi0yCE8OCQX/GNDLiZHA3CPNIWqjVy+fzk8BNj8AUf0lg4 JisOHyMwrzCGbomI3CZNawPz880+nWEoT0EljXy/paGMVjh7BffW18Rim8I9Jh0xDFqX 3x8g== X-Gm-Message-State: AOJu0Yyx9fw5QtkrfK8ftSkjCysdarjA6l+B6ko8qTSu6gepxb5K2Wh1 XC9GnDN8IcOhIVh++csDXtdYJg== X-Google-Smtp-Source: AGHT+IGvolrTSuur7kHoyJkoUsShsSJLY4cBLb/turbAyFsP4hpckyhJtZ81KaO0i+qHQQNMqSQBlA== X-Received: by 2002:a05:6214:27ed:b0:66d:1b3a:481e with SMTP id jt13-20020a05621427ed00b0066d1b3a481emr6624061qvb.6.1697233974972; Fri, 13 Oct 2023 14:52:54 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id y11-20020a0cf14b000000b0066d0621bb67sm1005295qvl.114.2023.10.13.14.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 14:52:54 -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 v3 0/2] Switch DSA to inclusive terminology Date: Fri, 13 Oct 2023 14:52:49 -0700 Message-Id: <20231013215251.152912-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-20231013_145301_217542_81A4FD02 X-CRM114-Status: GOOD ( 12.75 ) 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 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 | 156 +- 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 | 16 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 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 | 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 | 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 | 222 +-- 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 | 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 | 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} | 1462 ++++++++--------- net/dsa/user.h | 69 + 74 files changed, 1539 insertions(+), 1537 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