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: 13418018 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 DF395CDB47E for ; Wed, 11 Oct 2023 22:21:04 +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=6RhUb22g6ma0w6ULD6q7u17BGineqaObV4qMHjWZvIk=; b=0My MT0Ta7rA4tFosB3QifefOJ6odJii31KvIBDT79OyCNmJyzatgRWp5oeiR//O9c6yMuxxGhC1VkRzg yjb5EqmXJwFOnMGBZTHEHOE79RHDmXj91TI5bIiLFzUbGoJyuDKu0WPuYZj0q41J52OxuSgYmVxxw N1PYMLvEa7gbpHim5zPHZStQudaVXJhIfpV9pGczv210V0y/cipyJ8gUmOuWiRG63aZXykBDs4AHV BeKeiv1GdLIR+tjP97V8NE27tmY+ok2KFEyfqYDnFyRjA8BaRLoTA6ScQp/A3VK8qd4mndTP0gh99 L4Oc1vTthQrMXMD62TzkT/KO3o5d+mQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqhZE-00GpR5-0p; Wed, 11 Oct 2023 22:20:36 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqhZA-00GpPy-2D for linux-arm-kernel@lists.infradead.org; Wed, 11 Oct 2023 22:20:34 +0000 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2777a5e22b5so239614a91.1 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=lists.infradead.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=QyIJeXmLOpt+7MRr+rQarrAnhOTMExG8QQvqA37gnEY=; b=dXxheHc1ztcBca+U+LI5rSbRTz2mXS/KLdMtpjQ0LCz4pGpSEyPLC8vwf8ylpxBqt8 tDoMDQZNaLvwbek4qBbeC452f2AUuXREEaiEBm0D/+dieDO8+Hnknfo4zDpJZFKJZYVK 4WlinAJrzxewL/U6n7voKXjrYIm4+amTkp5qk= 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=QyIJeXmLOpt+7MRr+rQarrAnhOTMExG8QQvqA37gnEY=; b=kNgtGEtmXndNRFxOikaYi8gmvTTkkxeKhS95KjuNcNc/jzA1NL8aGReZUII/ZnDxkY CcWRD0X8XB/4tR4Uu5G+sZRdbalYMRQ+h/l/iP7vaEc0LjrFhOtDC4fltABcViMzPshL AqtG6NLw+pCxE+HmrMfKFsIwKmooOPgM3Mjjtej1ByNa/1diULy3Ych5lNdeUUU3X0Ax KAZr0oiyEeFtAimyogfaqYvi3Kuq8Nk3EPfJzdC32KDK5zxJmbXelNuQiq2wogTsELo3 awa/gJ1en2tQRRUxZ5B2/vofGylMkUq9HBhNbWA+TmJDinW1spS6X9MY7llFoXtpH0v/ c6lQ== X-Gm-Message-State: AOJu0YzPlQm69S+nWZqMbmOz8WY+19Gpe+JKm5ed+EJ1G5N0Q/jeXALm o8dHTrsll8puFHgt6U0p9ZSKjw== 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 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231011_152032_727892_43736512 X-CRM114-Status: GOOD ( 13.79 ) 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 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 Reviewed-by: Andrew Lunn