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: 13426206 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 AA637CDB483 for ; Tue, 17 Oct 2023 23:36:19 +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=TtKFOoW+TnBhuGmR3SNE4eyuE7ZKO6GpRZSv5EIbe/8=; b=lWg CBF3EUan8R4VjDOvHLB5qWf/xnn4yxNcAj4rkOmZkT0JkE1a732es1KW3Pb+xMnOhNgU87pr+tHa3 Zxz0oT4OCJ/CxklMi3BZ4CfpRlGcMSXxAb2rKrz0Z5hHrzMvu/rWoAAFfDLSIaWai0I8wFMS2ZZOq tZr8EzBL+OcJQMB6Hk4ua50dBYKAgieXIb9+Za68EqAjhcHdV+A6wPRspwL64kKSezjbuDgoXJzHp RqIKH2eXgO6lrSVv70CSYS9c3eWSCBmpNitfb9f6V8MzfUjjGvyiQCDY4w6fi/jlA6udFd+pwEJob SZkrcvPnbn1Tzg9PbncGGTloRtxQOLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qstbF-00DQQi-20; Tue, 17 Oct 2023 23:35:45 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qstbC-00DQQ0-2K for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 23:35:44 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c9d922c039so50458035ad.3 for ; Tue, 17 Oct 2023 16:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697585740; x=1698190540; darn=lists.infradead.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=jJdkcrK2ukyed5M6XJSdD3Rud3lvDJ7tsvf1s0L14O4=; b=ErRIYAe803FTfqsDtnG/WuCHSj6e72zniyXI7uic2wmVHE/RkMB6MZFOSPxNUHcqy9 kipJLqDOL8SU13J1wpwSxTcxRQLAuskjrl/uls9i9ln81Gv3ZbBfb1SwZQv5fDMJqUpv w66jZYKmmyr2mad+53PZiNNsFNdGsQFg0XHHU= 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=jJdkcrK2ukyed5M6XJSdD3Rud3lvDJ7tsvf1s0L14O4=; b=Wulxp6Nqv78cAcodUQx3qh2Dr6e5haXERWruVqINqkgxLbzWOwcaYnBhkeQgZGMqmJ ysgAXbyiTOEEpkBAA13gkPvBR+KzEZX60DcE5KI3jExG22i5WfyWtIyimJ2dBsVKpzsK tD88l7vGO5rfxjXmFbpD398sMQndYwJazLdr5Ltj/LgaJmmV7zfoo0lcRhzx36hC2MAq k9522/M5HUc8cKz4gtKjlcIN5ragsPnZdhPYcMIKM+aslIXhwkh6YrKQijb8y2GP0WYR ed8qcu3BS6ThVnyvuVf0cEexgE84ClmVI11MQDqyjFuyMrMVN/cNs273zxvC4ymR8Jo9 EPIw== X-Gm-Message-State: AOJu0YwxDhdcclQ5EezIoEv3d4ttlzETYR8UCfoliE057dZm7rDyPyH4 ufddzFYWjErxwXCGN7xV4q/kiQ== 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 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_163543_221743_282696F4 X-CRM114-Status: GOOD ( 15.49 ) 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 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