From patchwork Tue Oct 10 21:39:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13416184 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D18FDCD98C6 for ; Tue, 10 Oct 2023 21:39:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344118AbjJJVjv (ORCPT ); Tue, 10 Oct 2023 17:39:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343946AbjJJVju (ORCPT ); Tue, 10 Oct 2023 17:39:50 -0400 Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 076169D for ; Tue, 10 Oct 2023 14:39:49 -0700 (PDT) Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-41b2bf4e9edso2660001cf.1 for ; Tue, 10 Oct 2023 14:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1696973988; x=1697578788; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=kiW95JpAAA0bRXv2UI8r9acdmO7Ajxh1U2X+TWD3FMs=; b=HU0gkVp7eQ0b1sC7at0lnzBbgpo/fjQbDRTORtWvwRg1zNO3PIRs97u2nzz8clF1z4 dzf6Q2SZKZvoVVSWXffFxNIHIMerNQA3BZAYMKQGNNbMGZDUcDb52jkrBrB/6EfQTvYv r+CQvt4YpPPoi9xlpMyGDtN7XFPJL8Q/6xOd8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696973988; x=1697578788; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kiW95JpAAA0bRXv2UI8r9acdmO7Ajxh1U2X+TWD3FMs=; b=K5At4BvVsRLnzwo0waq5BJI/Cn2aFOZhvqF9jNTLj9M7JyVfu4VIIZKex+wQWCu2/5 RhVLWJ9CCzsrCl/0ZXUwih5vZwJprBYV+Gpe6QVDgUuyTaUKBnEJe9UjJ6qvWCaNGyjQ udbaDVdVqn1HczV51EXDG6S/4oG5cIU6NoVwx/v9bZ5G0vVMWL/rt4SeqQ+5VHc1QXyX HEXfLofMrYWEjIAok40dX08vGLpJLq3mmaswom3H0iqzUMRufOSDx59OKx+oisGhyvMc kbWftTQv6Y71CZlHY/kW0SwfC8mYRSSMAH0SodGRvSEDLl1vnZ9k2IVLRQ2VinwatVLT B3rw== X-Gm-Message-State: AOJu0YwTVZhC2UNwC084ANEfiGiodLkwCjOKxqrUiavuc7apb3OeKNFd vTZHRwSxKTE3hWUVOnhOI0zActVIa5Eo3FcacCU= X-Google-Smtp-Source: AGHT+IGsKV075x99LP82wEXfoCU9G0DMUXJOol2hhdUduMGdrSdgI4Jjef7JIEzPkb6LIlDbEsn+Cg== X-Received: by 2002:a05:622a:1314:b0:417:f666:b780 with SMTP id v20-20020a05622a131400b00417f666b780mr22357478qtk.19.1696973988085; Tue, 10 Oct 2023 14:39:48 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bb36-20020a05622a1b2400b00403ad6ec2e8sm4804797qtb.26.2023.10.10.14.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 14:39:47 -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 , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-renesas-soc@vger.kernel.org (open list:RENESAS RZ/N1 A5PSW SWITCH DRIVER) Subject: [PATCH net-next 0/2] Switch DSA to inclusive terminology Date: Tue, 10 Oct 2023 14:39:40 -0700 Message-Id: <20231010213942.3633407-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.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. 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 | 150 +- 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 +- include/linux/dsa/sja1105.h | 2 +- include/net/dsa.h | 54 +- include/net/dsa_stubs.h | 10 +- include/uapi/linux/if_link.h | 3 +- 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 + 73 files changed, 1392 insertions(+), 1391 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 Acked-by: Rob Herring