From nobody Fri Jul 24 04:46:03 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 026EB3DAAA6 for ; Thu, 23 Jul 2026 19:53:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836431; cv=none; b=kp29HFZr/uYJGSMNR6TSx6i/YJmGgrYhEULNa30/NfcGPj01ubV6AVImZ2AljLz5ohysCEB5it7BO6RZKCi5NCcDbveFd9GYcGJDOzMfUppM9lUK1os7lJDj+SmXYiQukKDbCoJxzQbqQUwaflFXu72QH9V+HydKM/dJbe5Ln1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836431; c=relaxed/simple; bh=446eQVmWNqj5YmkZE5Gn3CZgTxR/CxFnRnjNliN559c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=egIlWw6YdRMA+QMBpWBFrMnEDUq2uNCHklpBIaTVt3VMkNIc6veFFjnIWFt60PAiLAgMvpGFu/uzoHWtVVBvEQQRdJqCQjsQu6QodvfKRVE++As1XM7DRbAc7vGihYoIMYp7mbh4pLf/n3PfQu87Gk0GdpaPOOSCcN2rylV2kZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MROWBerp; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MROWBerp" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso11886695ad.3 for ; Thu, 23 Jul 2026 12:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784836429; x=1785441229; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=5BIdz36PjgYcAb053ISHszQWOmkFf0UUYxlT7CgSK5s=; b=MROWBerpaw8MUPcPPZnaJfKtWtiajW8cxPdzVK2DRHa9IU400gOqSqQ8Hr9sfgsj/E 2eBDxscRX5NTGc/e+wWG+wED/ZTEZvQeqQaXclb6VJw3pQ6Zxl5TZhaKAWyG/n45UMQ/ AZr6BXuN9qzpiAfldPe8CAuf6yr9sFznr5wWee2Aycq57DJASxxxEcQ11EuPUOHMh9/T 3pjfRbA3piVijirxoF4wXm3pmTkKXMxemRCa376B8OJKNJrvErHc3+4LTcbN/GnzQssP /jUU3wEL5X7BLIHTgQ4iRMxEjpWHT0rCKMiIQ27+amDVLj8xbsGgO9AaCGVc5gKT/jhb KWGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784836429; x=1785441229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=5BIdz36PjgYcAb053ISHszQWOmkFf0UUYxlT7CgSK5s=; b=RiOiDCRbQV1H7OXwtVI/bAKmYTQFU0Earxe3zfcJ89/wl+qoqNBTuOjr3xf10HiLYG SDLmXJpzDRk5kDiE1vX8T+3TZ//zXXvn/jNwmfmp+weNfYyMQ8ddXwhdrr7fYQonP3aO L+5oUx/FcT9GYNTnynnhaGJCsooYAtMlH2CNKsgF3qyAaADUBTqsQokr2H7EfkpJRPPy K80+qBiOOyJGau0vLpglVBf+pZBp43tAnFY347DyQR32K+9Mn7TTonZgDUdgW32Kpa7i N6s47tsBXor7TBCNUHcRlChcHYUvgrYIzGYmc7GGNATmP+p6WnlZR5I1V8ZgtltnGpnY J6aA== X-Forwarded-Encrypted: i=1; AHgh+RpSTa6PYW9C3INwoh9bHMYXnfOyGNDNqUQgxFs/+raUm6b1NepRKsh4TsTt+N8ecgdyACR6L9M0bu/vgDA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywn6mJTokVuNzzdiDEOWyUJ+oMa80OCAN50CAaDxWTX5PNdE477 e60fuVE2RBIHCbp4P/T9Br4SHYdCCNaIjuSoeT2EWdE9gAdPBNvMLtxpsANJwSgm X-Gm-Gg: AR+sD13xgMtvE7O4Shc4hLivjv/JFeQoSnPvhHBYy+2sXJ/U0sYLfH0Gv6Db9LupCwF Qk2nS9PuBLFChb8FjkUntKYyx0dbH2CVo7uQB6w1mAXWgaW7+KmbW0ywWBBROHAtU/jndnG6aA/ uhrNeYjDJvt29dYXjZ82NFyagV0WtHWs2Eu6x3caxzolijcIkZwUHvUv5Maur5SWMW2tQA811CI fqpaB73AolUPXRnyN2hqHC7ISZM59+OIFCtcd2eUN4IN32lvy3G8b+oHEI8w5LbWL1oLXXTTCHD rUO2hRNruBJIn/WFVafPXp/k7jhBPM+PixKzSpY/lJ18tATchqGk6JxNu29Zr5M6fVBwjBUCJT7 kHUhJDIE7AqXlOiIH1bJthWfn3Ia0HoYY7sqo/oO/93qfhRXgPJZWDnTGtR/xA5KEhx7AZ2Z9bg pxnpIi3vqw+R2r/1cYwqTEeN2mdO8D X-Received: by 2002:a17:902:ea10:b0:2ca:de3:15e1 with SMTP id d9443c01a7336-2cfa708e887mr50040375ad.31.1784836429185; Thu, 23 Jul 2026 12:53:49 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:5c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8f310644sm39106625ad.55.2026.07.23.12.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 12:53:47 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v7 1/3] net: dsa: motorcomm: Move to subdirectory Date: Fri, 24 Jul 2026 03:53:30 +0800 Message-ID: <20260723195335.806002-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260723195335.806002-1-mmyangfl@gmail.com> References: <20260723195335.806002-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" yt921x is already the longest single-file DSA driver, so it's time to split it into parts. Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- MAINTAINERS | 2 +- drivers/net/dsa/Kconfig | 10 ++-------- drivers/net/dsa/Makefile | 2 +- drivers/net/dsa/motorcomm/Kconfig | 8 ++++++++ drivers/net/dsa/motorcomm/Makefile | 3 +++ drivers/net/dsa/{yt921x.c =3D> motorcomm/chip.c} | 2 +- drivers/net/dsa/{yt921x.h =3D> motorcomm/chip.h} | 0 7 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 drivers/net/dsa/motorcomm/Kconfig create mode 100644 drivers/net/dsa/motorcomm/Makefile rename drivers/net/dsa/{yt921x.c =3D> motorcomm/chip.c} (99%) rename drivers/net/dsa/{yt921x.h =3D> motorcomm/chip.h} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f3218abefd0c..90c921e14a7a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18231,7 +18231,7 @@ M: David Yang L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/dsa/motorcomm,yt921x.yaml -F: drivers/net/dsa/yt921x.* +F: drivers/net/dsa/motorcomm/ F: net/dsa/tag_yt921x.c =20 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index 4ab567c5bbaf..98e9bbe47de7 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -72,6 +72,8 @@ config NET_DSA_MV88E6060 =20 source "drivers/net/dsa/microchip/Kconfig" =20 +source "drivers/net/dsa/motorcomm/Kconfig" + source "drivers/net/dsa/mv88e6xxx/Kconfig" =20 source "drivers/net/dsa/mxl862xx/Kconfig" @@ -158,12 +160,4 @@ config NET_DSA_VITESSE_VSC73XX_PLATFORM This enables support for the Vitesse VSC7385, VSC7388, VSC7395 and VSC7398 SparX integrated ethernet switches, connected over a CPU-attached address bus and work in memory-mapped I/O mode. - -config NET_DSA_YT921X - tristate "Motorcomm YT9215 ethernet switch chip support" - select NET_DSA_TAG_YT921X - select NET_IEEE8021Q_HELPERS if DCB - help - This enables support for the Motorcomm YT9215 ethernet switch - chip. endmenu diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index d2975badffc0..138225baa4d5 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -14,11 +14,11 @@ obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) +=3D lan9303_md= io.o obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) +=3D vitesse-vsc73xx-core.o obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) +=3D vitesse-vsc73xx-platfo= rm.o obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) +=3D vitesse-vsc73xx-spi.o -obj-$(CONFIG_NET_DSA_YT921X) +=3D yt921x.o obj-y +=3D b53/ obj-y +=3D hirschmann/ obj-y +=3D lantiq/ obj-y +=3D microchip/ +obj-y +=3D motorcomm/ obj-y +=3D mv88e6xxx/ obj-y +=3D mxl862xx/ obj-y +=3D netc/ diff --git a/drivers/net/dsa/motorcomm/Kconfig b/drivers/net/dsa/motorcomm/= Kconfig new file mode 100644 index 000000000000..1fddd386f866 --- /dev/null +++ b/drivers/net/dsa/motorcomm/Kconfig @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: ISC +config NET_DSA_YT921X + tristate "Motorcomm YT9215 ethernet switch chip support" + select NET_DSA_TAG_YT921X + select NET_IEEE8021Q_HELPERS if DCB + help + This enables support for the Motorcomm YT9215 ethernet switch + chip. diff --git a/drivers/net/dsa/motorcomm/Makefile b/drivers/net/dsa/motorcomm= /Makefile new file mode 100644 index 000000000000..afd03be9fa35 --- /dev/null +++ b/drivers/net/dsa/motorcomm/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: ISC +obj-$(CONFIG_NET_DSA_YT921X) +=3D yt921x.o +yt921x-objs :=3D chip.o diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/motorcomm/chip.c similarity index 99% rename from drivers/net/dsa/yt921x.c rename to drivers/net/dsa/motorcomm/chip.c index 159b16606f6c..f070732845eb 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -26,7 +26,7 @@ #include #include =20 -#include "yt921x.h" +#include "chip.h" =20 struct yt921x_mib_desc { unsigned int size; diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/motorcomm/chip.h similarity index 100% rename from drivers/net/dsa/yt921x.h rename to drivers/net/dsa/motorcomm/chip.h --=20 2.53.0 From nobody Fri Jul 24 04:46:03 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E370E3D967D for ; Thu, 23 Jul 2026 19:53:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836434; cv=none; b=r4zc3z6ysSxcvJU9gD3Bj5f5c24xz0aE1DtRvU36wKd5DVtuXrBbqW+Xrp5+KFW4CIJ/pwyXrkhVaNtEVL6ux6KPp9mtZzRF94ss7bV/cjmjENp/7QE4sUoTUcY8z1i23+GSb6E97dsn/7JNOx9RLPZnsZ8SBT9c5sYxJyeVcC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836434; c=relaxed/simple; bh=sCR7LCduQulp62y3Ouz854y7aYy0BrQ6pXog8+b4Jd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i34mYpfje5IXbRbUGbcRk95VcEImUx74TqeflUrmcE32+UyIbJ1KT60O5xAbEaXEtEaTFLeXuBc3LFclLrkbOKjhaTdVDCJqL0umi3RNrHOdNbQOndbL28T/e45zsTlZAUqOd8gSmXDDLOIBec4dirLFarcDEkMrQ5IJcmURE+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OHmRnJtq; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OHmRnJtq" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2cf6d65d8a7so14476915ad.0 for ; Thu, 23 Jul 2026 12:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784836432; x=1785441232; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KHAz6u3wdG+hZ6Dsr9mcpDC869qiGMxaGeFpJqp6Z1Y=; b=OHmRnJtq9E7CJP02Ftt14EU2QR/3eUiS3yE7OQUBt+dkKXHlajMgdnpf7xPlhhUzjG 1+NstEZdDSYLuXtBngymGjKPPr57GVRlxnSXhSfpsWbxDUf3S4vyqbSDkhW5cdMajQEK YJOCARb86f25laN61anzk7O/zRulsX5Zz58vLLgK3lm846jMrclgks0tXZt4vAt0Jxc7 nqjeyvFXf7yrREUroSrmnYu9swC7+qA9AxqNMWTmpjNhxr/4s+f6/yh2xyrQzxSNBZG+ R2qM9z8sWTfXAAp3lc2O4KZLqz9NQJz+je6+DQWi7OsPjdDcWdxaj+2AcpAh0pMihwjv 3P/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784836432; x=1785441232; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=KHAz6u3wdG+hZ6Dsr9mcpDC869qiGMxaGeFpJqp6Z1Y=; b=rxGaOZBQkjU3aa+d4XzgNWh1vJt4zu4AEq003OsohRfGLi0kiPAv1rUISh8Ofk4W8s FU1yeWAxgjr3H8iW8rPC0pToXKi2SggPMohX+QCRv4js8HYdzZc+ECLypVEB2sd7elb7 orB+DqgDwiy9PFHQToTEsH3cqy3a7ukhWW/932ycx0EACL5G+EbGvp6dU0KWHQEo8sRb 3P+rsjmD8UrNqroeOLKbU2rbvdgKsM4wIahEqrdWoOXPvxrZ4qcfU1K3iBb30F7ZppqB UOPt3jexwucXgJdNosLClskS5bvqEodhnJvgLZRbRIv1nT76S0RCJG0s8U81bXH5gWVl g3dA== X-Forwarded-Encrypted: i=1; AHgh+RqDthmDh3Vp7NYrCnvk10GdHNxrq7cn0RAuZmWJiILnb37Gp61QrjKMUlnhX9tYXjNMPlW6hfDXltXv67g=@vger.kernel.org X-Gm-Message-State: AOJu0YwrR81eMw6jTaUHtcUbIP1pCIyqxxOfIL8AAm7/Wpziop10zVAq aCl0lf4wHBf+4fZ2Wfpssw1eUcL3vaXjmhMbuIYe5oAORGVYHlFoeEr1 X-Gm-Gg: AR+sD11zZ8KOEyXyu6EWjXMfj2Xu23QNBj32YtUi5ljz2gEpyhisnYltJq9eubZDFKV eyM/gKS+S2TtZMhL6F+ypxzImHOvoquvMSwsOtyeSN1ooFOY1q7ST2cfm+bEWW/UA8VX19rR8uF nw3WTcdCM2NJIY8+sOO1+pL8iReCaKZK7mR9koJpxHAHcK05vLsiMMAp7gyjel+YEF+y1iXWuFx EE5VjiS2NwYOpMiyqN6yXjOSBEQxT9j/tMWaiwjWvwu2s/0eBCm8+ZfLAyTCXwocMJHSPGBIMBv gK0EUKbt6nwoLoYIui8Uiz0Vnep2eBOleHQPU1upz7/HEasJd/veXBaMiwtUHkuqUXuMJ2J/sBI cmUJCKBzYou2O80HsEJFz1CkYS8IWrGe7JHCzZ10vUF3DR4f3XlQDIzHl8K75s8NjiZYGCeEoVV NUdLz0WID7kbhoLZGSx4aORbpXUGXr X-Received: by 2002:a17:903:26c6:b0:2ca:a03a:29b2 with SMTP id d9443c01a7336-2cfa71b761amr52254525ad.8.1784836432139; Thu, 23 Jul 2026 12:53:52 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:5c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8f310644sm39106625ad.55.2026.07.23.12.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 12:53:51 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v7 2/3] net: dsa: motorcomm: Split SMI module Date: Fri, 24 Jul 2026 03:53:31 +0800 Message-ID: <20260723195335.806002-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260723195335.806002-1-mmyangfl@gmail.com> References: <20260723195335.806002-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" SMI operations are going to be used across different modules. Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- drivers/net/dsa/motorcomm/Makefile | 1 + drivers/net/dsa/motorcomm/chip.c | 207 +---------------------------- drivers/net/dsa/motorcomm/smi.c | 157 ++++++++++++++++++++++ drivers/net/dsa/motorcomm/smi.h | 88 ++++++++++++ 4 files changed, 247 insertions(+), 206 deletions(-) create mode 100644 drivers/net/dsa/motorcomm/smi.c create mode 100644 drivers/net/dsa/motorcomm/smi.h diff --git a/drivers/net/dsa/motorcomm/Makefile b/drivers/net/dsa/motorcomm= /Makefile index afd03be9fa35..6cea5313a444 100644 --- a/drivers/net/dsa/motorcomm/Makefile +++ b/drivers/net/dsa/motorcomm/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: ISC obj-$(CONFIG_NET_DSA_YT921X) +=3D yt921x.o yt921x-objs :=3D chip.o +yt921x-objs +=3D smi.o diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/c= hip.c index f070732845eb..6dee25b6754a 100644 --- a/drivers/net/dsa/motorcomm/chip.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -27,6 +26,7 @@ #include =20 #include "chip.h" +#include "smi.h" =20 struct yt921x_mib_desc { unsigned int size; @@ -155,9 +155,6 @@ static const struct yt921x_info yt921x_infos[] =3D { =20 #define YT921X_VID_UNWARE 4095 =20 -#define YT921X_POLL_SLEEP_US 10000 -#define YT921X_POLL_TIMEOUT_US 100000 - /* The interval should be small enough to avoid overflow of 32bit MIBs. * * Until we can read MIBs from stats64 call directly (i.e. sleep @@ -196,208 +193,6 @@ static u32 ethaddr_lo2_to_u32(const unsigned char *ad= dr) return (addr[4] << 8) | addr[5]; } =20 -static int yt921x_reg_read(struct yt921x_priv *priv, u32 reg, u32 *valp) -{ - WARN_ON(!mutex_is_locked(&priv->reg_lock)); - - return priv->reg_ops->read(priv->reg_ctx, reg, valp); -} - -static int yt921x_reg_write(struct yt921x_priv *priv, u32 reg, u32 val) -{ - WARN_ON(!mutex_is_locked(&priv->reg_lock)); - - return priv->reg_ops->write(priv->reg_ctx, reg, val); -} - -static int -yt921x_reg_wait(struct yt921x_priv *priv, u32 reg, u32 mask, u32 *valp) -{ - u32 val; - int res; - int ret; - - ret =3D read_poll_timeout(yt921x_reg_read, res, - res || (val & mask) =3D=3D *valp, - YT921X_POLL_SLEEP_US, YT921X_POLL_TIMEOUT_US, - false, priv, reg, &val); - if (ret) - return ret; - if (res) - return res; - - *valp =3D val; - return 0; -} - -static int -yt921x_reg_update_bits(struct yt921x_priv *priv, u32 reg, u32 mask, u32 va= l) -{ - int res; - u32 v; - u32 u; - - res =3D yt921x_reg_read(priv, reg, &v); - if (res) - return res; - - u =3D v; - u &=3D ~mask; - u |=3D val; - if (u =3D=3D v) - return 0; - - return yt921x_reg_write(priv, reg, u); -} - -static int yt921x_reg_set_bits(struct yt921x_priv *priv, u32 reg, u32 mask) -{ - return yt921x_reg_update_bits(priv, reg, 0, mask); -} - -static int yt921x_reg_clear_bits(struct yt921x_priv *priv, u32 reg, u32 ma= sk) -{ - return yt921x_reg_update_bits(priv, reg, mask, 0); -} - -static int -yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool s= et) -{ - return yt921x_reg_update_bits(priv, reg, mask, !set ? 0 : mask); -} - -/* Some multi-word registers, like VLANn_CTRL, should be treated as a sing= le - * long register. More specifically, writes to parts of its words won't be= come - * visible, until the last word is written. - * - * Here we require full read and write operations over these registers to - * eliminate potential issues, although partial reads/writes are also poss= ible. - */ - -static void update_ctrls_unaligned(u32 *lo, u32 *hi, u64 mask, u64 val) -{ - *lo &=3D ~lower_32_bits(mask); - *hi &=3D ~upper_32_bits(mask); - *lo |=3D lower_32_bits(val); - *hi |=3D upper_32_bits(val); -} - -static int -yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, - unsigned int num_regs) -{ - int res; - - for (unsigned int i =3D 0; i < num_regs; i++) { - res =3D yt921x_reg_read(priv, reg + 4 * i, &vals[i]); - if (res) - return res; - } - - return 0; -} - -static int -yt921x_regs_write(struct yt921x_priv *priv, u32 reg, const u32 *vals, - unsigned int num_regs) -{ - int res; - - for (unsigned int i =3D 0; i < num_regs; i++) { - res =3D yt921x_reg_write(priv, reg + 4 * i, vals[i]); - if (res) - return res; - } - - return 0; -} - -static int -yt921x_regs_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s, - const u32 *vals, unsigned int num_regs) -{ - bool changed =3D false; - u32 vs[4]; - int res; - - BUILD_BUG_ON(num_regs > ARRAY_SIZE(vs)); - - res =3D yt921x_regs_read(priv, reg, vs, num_regs); - if (res) - return res; - - for (unsigned int i =3D 0; i < num_regs; i++) { - u32 u =3D vs[i]; - - u &=3D ~masks[i]; - u |=3D vals[i]; - if (u !=3D vs[i]) - changed =3D true; - - vs[i] =3D u; - } - - if (!changed) - return 0; - - return yt921x_regs_write(priv, reg, vs, num_regs); -} - -static int -yt921x_regs_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *masks, - unsigned int num_regs) -{ - bool changed =3D false; - u32 vs[4]; - int res; - - BUILD_BUG_ON(num_regs > ARRAY_SIZE(vs)); - - res =3D yt921x_regs_read(priv, reg, vs, num_regs); - if (res) - return res; - - for (unsigned int i =3D 0; i < num_regs; i++) { - u32 u =3D vs[i]; - - u &=3D ~masks[i]; - if (u !=3D vs[i]) - changed =3D true; - - vs[i] =3D u; - } - - if (!changed) - return 0; - - return yt921x_regs_write(priv, reg, vs, num_regs); -} - -static int -yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) -{ - return yt921x_regs_write(priv, reg, vals, 2); -} - -static int -yt921x_reg64_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mas= ks, - const u32 *vals) -{ - return yt921x_regs_update_bits(priv, reg, masks, vals, 2); -} - -static int -yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s) -{ - return yt921x_regs_clear_bits(priv, reg, masks, 2); -} - -static int -yt921x_reg96_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) -{ - return yt921x_regs_write(priv, reg, vals, 3); -} - static int yt921x_reg_mdio_read(void *context, u32 reg, u32 *valp) { struct yt921x_reg_mdio *mdio =3D context; diff --git a/drivers/net/dsa/motorcomm/smi.c b/drivers/net/dsa/motorcomm/sm= i.c new file mode 100644 index 000000000000..9054896e4cd1 --- /dev/null +++ b/drivers/net/dsa/motorcomm/smi.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2026 David Yang + */ + +#include + +#include "chip.h" +#include "smi.h" + +#define YT921X_POLL_SLEEP_US 10000 +#define YT921X_POLL_TIMEOUT_US 100000 + +int yt921x_reg_read(struct yt921x_priv *priv, u32 reg, u32 *valp) +{ + lockdep_assert_held_once(&priv->reg_lock); + + return priv->reg_ops->read(priv->reg_ctx, reg, valp); +} + +int yt921x_reg_write(struct yt921x_priv *priv, u32 reg, u32 val) +{ + lockdep_assert_held_once(&priv->reg_lock); + + return priv->reg_ops->write(priv->reg_ctx, reg, val); +} + +int yt921x_reg_wait(struct yt921x_priv *priv, u32 reg, u32 mask, u32 *valp) +{ + u32 val; + int res; + int ret; + + ret =3D read_poll_timeout(yt921x_reg_read, res, + res || (val & mask) =3D=3D *valp, + YT921X_POLL_SLEEP_US, YT921X_POLL_TIMEOUT_US, + false, priv, reg, &val); + if (ret) + return ret; + if (res) + return res; + + *valp =3D val; + return 0; +} + +int yt921x_reg_update_bits(struct yt921x_priv *priv, u32 reg, u32 mask, u3= 2 val) +{ + int res; + u32 v; + u32 u; + + res =3D yt921x_reg_read(priv, reg, &v); + if (res) + return res; + + u =3D v; + u &=3D ~mask; + u |=3D val; + if (u =3D=3D v) + return 0; + + return yt921x_reg_write(priv, reg, u); +} + +int +yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, + unsigned int num_regs) +{ + int res; + + for (unsigned int i =3D 0; i < num_regs; i++) { + res =3D yt921x_reg_read(priv, reg + 4 * i, &vals[i]); + if (res) + return res; + } + + return 0; +} + +int +yt921x_regs_write(struct yt921x_priv *priv, u32 reg, const u32 *vals, + unsigned int num_regs) +{ + int res; + + for (unsigned int i =3D 0; i < num_regs; i++) { + res =3D yt921x_reg_write(priv, reg + 4 * i, vals[i]); + if (res) + return res; + } + + return 0; +} + +int +yt921x_regs_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s, + const u32 *vals, unsigned int num_regs) +{ + bool changed =3D false; + u32 vs[4]; + int res; + + if (WARN_ON_ONCE(num_regs > ARRAY_SIZE(vs))) + return -EINVAL; + + res =3D yt921x_regs_read(priv, reg, vs, num_regs); + if (res) + return res; + + for (unsigned int i =3D 0; i < num_regs; i++) { + u32 u =3D vs[i]; + + u &=3D ~masks[i]; + u |=3D vals[i]; + if (u !=3D vs[i]) + changed =3D true; + + vs[i] =3D u; + } + + if (!changed) + return 0; + + return yt921x_regs_write(priv, reg, vs, num_regs); +} + +int +yt921x_regs_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *masks, + unsigned int num_regs) +{ + bool changed =3D false; + u32 vs[4]; + int res; + + if (WARN_ON_ONCE(num_regs > ARRAY_SIZE(vs))) + return -EINVAL; + + res =3D yt921x_regs_read(priv, reg, vs, num_regs); + if (res) + return res; + + for (unsigned int i =3D 0; i < num_regs; i++) { + u32 u =3D vs[i]; + + u &=3D ~masks[i]; + if (u !=3D vs[i]) + changed =3D true; + + vs[i] =3D u; + } + + if (!changed) + return 0; + + return yt921x_regs_write(priv, reg, vs, num_regs); +} diff --git a/drivers/net/dsa/motorcomm/smi.h b/drivers/net/dsa/motorcomm/sm= i.h new file mode 100644 index 000000000000..2e956065eb90 --- /dev/null +++ b/drivers/net/dsa/motorcomm/smi.h @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (c) 2026 David Yang + */ + +#ifndef _YT_SMI_H +#define _YT_SMI_H + +#include +#include + +struct yt921x_priv; + +int yt921x_reg_read(struct yt921x_priv *priv, u32 reg, u32 *valp); +int yt921x_reg_write(struct yt921x_priv *priv, u32 reg, u32 val); +int yt921x_reg_wait(struct yt921x_priv *priv, u32 reg, u32 mask, u32 *valp= ); +int yt921x_reg_update_bits(struct yt921x_priv *priv, u32 reg, u32 mask, + u32 val); + +static inline int +yt921x_reg_set_bits(struct yt921x_priv *priv, u32 reg, u32 mask) +{ + return yt921x_reg_update_bits(priv, reg, 0, mask); +} + +static inline int +yt921x_reg_clear_bits(struct yt921x_priv *priv, u32 reg, u32 mask) +{ + return yt921x_reg_update_bits(priv, reg, mask, 0); +} + +static inline int +yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool s= et) +{ + return yt921x_reg_update_bits(priv, reg, mask, !set ? 0 : mask); +} + +/* Some multi-word registers, like VLANn_CTRL, should be treated as a sing= le + * long register. More specifically, writes to parts of its words won't be= come + * visible, until the last word is written. + * + * Here we require full read and write operations over these registers to + * eliminate potential issues, although partial reads/writes are also poss= ible. + */ + +static inline void update_ctrls_unaligned(u32 *lo, u32 *hi, u64 mask, u64 = val) +{ + *lo &=3D ~lower_32_bits(mask); + *hi &=3D ~upper_32_bits(mask); + *lo |=3D lower_32_bits(val); + *hi |=3D upper_32_bits(val); +} + +int yt921x_regs_read(struct yt921x_priv *priv, u32 reg, u32 *vals, + unsigned int num_regs); +int yt921x_regs_write(struct yt921x_priv *priv, u32 reg, const u32 *vals, + unsigned int num_regs); +int yt921x_regs_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *= masks, + const u32 *vals, unsigned int num_regs); +int yt921x_regs_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *m= asks, + unsigned int num_regs); + +static inline int +yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{ + return yt921x_regs_write(priv, reg, vals, 2); +} + +static inline int +yt921x_reg64_update_bits(struct yt921x_priv *priv, u32 reg, const u32 *mas= ks, + const u32 *vals) +{ + return yt921x_regs_update_bits(priv, reg, masks, vals, 2); +} + +static inline int +yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, const u32 *mask= s) +{ + return yt921x_regs_clear_bits(priv, reg, masks, 2); +} + +static inline int +yt921x_reg96_write(struct yt921x_priv *priv, u32 reg, const u32 *vals) +{ + return yt921x_regs_write(priv, reg, vals, 3); +} + +#endif --=20 2.53.0 From nobody Fri Jul 24 04:46:03 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0669B3ACF10 for ; Thu, 23 Jul 2026 19:53:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836438; cv=none; b=IIUROMxQKymTqsE5p0iOBCUp11UqC6tO4XohmhGfv3cXJVma2BAmab8lSDn4QWZf3PbzgOgSZeFJ5A6E9y8auhVTbtmyAGocRSDd8IxcdqoJeiorZLnWMowRQAQBB1IxpE+uLpti2fso8NmIz9Et7lgN8ft0IUtmIfyIHdCt9Y0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784836438; c=relaxed/simple; bh=loDLMoOW5jFB7yQhRSeL9P64Bx6YCkurLy+SjhtFQjQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XISzl/Wci9Bf+FLZOsANg8IOJTm/RqF0K/gxxfyu92nKs4r6B33u8wmtcgLiwJfJ9r0TvtKukNk3QgULdzePq2E6MKgOD3SGxdIPVfOYczY0Clsef3iF5g9H7m+5dEfmO8mHHWSaHzDthV1E3HxL+4RznDwtOaxVUe44TqGgKgM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bvWRMrsS; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bvWRMrsS" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ceae1ed204so11034675ad.0 for ; Thu, 23 Jul 2026 12:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784836435; x=1785441235; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zLsssPy54xcsA6SQRvPIqiZJOe4r0EysuxLYn3cPZCE=; b=bvWRMrsSVNYuSkCVM92RdWEIbZ8SYqMg5NCcI1ZjYUoqSnG1GJ3dcHTRpj/htA4YO0 TaUx/oqsN6mH5mugMR7r/2jKHWmsYtbrDMGJyioCZTKgC3L66YkIv4JAH3FzgFeEJ0M7 Z5uDzELPwYJzbKj5lf7LBBLHYoqbQfCoLk9iEBAWNFVZaAGyavcjBDcW5pHom16vPUHN O0YHjzxi9trIBtMwRQ2+4wXJATJvFylb6c+m/D3hHeDV3S+lzk64tmUtEvdwoUFAqJGM TJx06IDWtGmCmkkEFf0TsH0lIQhENLYG4zZLqbFLi0FSW7zP6axFRefXMH3VDKgeVjhV rmsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784836435; x=1785441235; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=zLsssPy54xcsA6SQRvPIqiZJOe4r0EysuxLYn3cPZCE=; b=j3RpoB0pWvlwwPB3vFZU9l1+UiwDxnefMsV/6Hho9d600hmvXFbrQyS3O8JIWuEKFC +AbuhOcYNpDSitF3kJ1NJe7G6n5bJZUQDUs5kG4j04mX1VY9Jr3RFEXhd8EW0XAdSaFi MrKWVQ/xUMsE2AD0RWx0C55JvP7yWneBxf39fjCCkj+AMhGy2zU7tWT2x/NsW0qfiRK9 I3u422yP9A5YgF8jo3Txa5XbipVSM07rmDAPV9d6ZvIbtFQ/ZjesJTbt/LOg6ERGAB4R OvPCsDGfAHM2ojHVFmIq2GKoCmfzwGToWhwP/lTf7mnUfNr1nt0HHcMNVw8e6s7/4f0Y 8iJA== X-Forwarded-Encrypted: i=1; AHgh+RqIDO8PMrVjlu+D2MJcuFBx/0BlULz+YQbsT0dermaAflLqdqwADUApjraoOzjovzODjXYuFSRTsP5awPw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzd87Ji8gr/UrJHScJZ30DH4IHwcpl7hPgpZ4WD+98baYWWtK1P k636anywT6TE05lBZAuacvpcXYjJgFkweWZmR2xsWZQ/9vCSNzfbWRjU X-Gm-Gg: AR+sD12YyY4J4xI5kZCf8vUXx1D1+ieym2LS/hI2v0vGym507PGtJcWs3+2EAcfzvLZ k0dL15168/wJa/TYGRU4juAaIEn15Sw1Ktfrew08uytp7Y15ncYv9UAWrMdA0iO+cbqhwnAUljF a6qkdccIENzigQG8cVAfvEr+4dOFAsdaryEfVPap50Iyay3Ik8IEgjmkxwNblUN2qYlUSZNHxJF FWXdRApdxgUDBRexyzqzplrHhN7PqbiskYSfBHiiQshTBblpM9ZEOeLhekBxOmmy7/jze2pBWyM UEqOPKFDFgcAtMWCmgrECLOeWj6c80/RBSwBBk0/DcSXQSvND4gmyAELiwbTHygSKlawMNpf4dB TLmKBl0bHZTJd7kb+UDJtua1q9FH4lo5Ta8yDD1D8y8Ei53iobKF8AGyINI2g2Db0z/RwdmMNiB piHZydn7y7u3xqBMlHrS/G8Y3pdgE42veBm2tqbz0= X-Received: by 2002:a17:903:3d05:b0:2cc:6b7a:dfcb with SMTP id d9443c01a7336-2cfa6c793bamr54733435ad.33.1784836435260; Thu, 23 Jul 2026 12:53:55 -0700 (PDT) Received: from d.home.yangfl.dn42 ([2a09:bac5:6619:3046::4cf:5c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf8f310644sm39106625ad.55.2026.07.23.12.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 12:53:54 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v7 3/3] net: dsa: motorcomm: Add LED support Date: Fri, 24 Jul 2026 03:53:32 +0800 Message-ID: <20260723195335.806002-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260723195335.806002-1-mmyangfl@gmail.com> References: <20260723195335.806002-1-mmyangfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" LEDs can be described in the device tree using the same format as qca8k. Each port can configure up to 3 LEDs. Currently, only parallel mode and strict 1:1 mapping are supported. Signed-off-by: David Yang Reviewed-by: Andrew Lunn --- drivers/net/dsa/motorcomm/Kconfig | 9 + drivers/net/dsa/motorcomm/Makefile | 1 + drivers/net/dsa/motorcomm/chip.c | 13 +- drivers/net/dsa/motorcomm/chip.h | 11 + drivers/net/dsa/motorcomm/leds.c | 647 +++++++++++++++++++++++++++++ drivers/net/dsa/motorcomm/leds.h | 121 ++++++ 6 files changed, 800 insertions(+), 2 deletions(-) create mode 100644 drivers/net/dsa/motorcomm/leds.c create mode 100644 drivers/net/dsa/motorcomm/leds.h diff --git a/drivers/net/dsa/motorcomm/Kconfig b/drivers/net/dsa/motorcomm/= Kconfig index 1fddd386f866..3438e0b14361 100644 --- a/drivers/net/dsa/motorcomm/Kconfig +++ b/drivers/net/dsa/motorcomm/Kconfig @@ -6,3 +6,12 @@ config NET_DSA_YT921X help This enables support for the Motorcomm YT9215 ethernet switch chip. + +config NET_DSA_YT921X_LEDS + bool "LED support for Motorcomm YT9215" + default y + depends on NET_DSA_YT921X + depends on LEDS_CLASS=3Dy || LEDS_CLASS=3DNET_DSA_YT921X + help + This enables support for controlling the LEDs attached to the + Motorcomm YT9215 switch chips. diff --git a/drivers/net/dsa/motorcomm/Makefile b/drivers/net/dsa/motorcomm= /Makefile index 6cea5313a444..5a63db0029ff 100644 --- a/drivers/net/dsa/motorcomm/Makefile +++ b/drivers/net/dsa/motorcomm/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: ISC obj-$(CONFIG_NET_DSA_YT921X) +=3D yt921x.o yt921x-objs :=3D chip.o +yt921x-$(CONFIG_NET_DSA_YT921X_LEDS) +=3D leds.o yt921x-objs +=3D smi.o diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/c= hip.c index 6dee25b6754a..553efacd4f5e 100644 --- a/drivers/net/dsa/motorcomm/chip.c +++ b/drivers/net/dsa/motorcomm/chip.c @@ -26,6 +26,7 @@ #include =20 #include "chip.h" +#include "leds.h" #include "smi.h" =20 struct yt921x_mib_desc { @@ -151,8 +152,6 @@ static const struct yt921x_info yt921x_infos[] =3D { {} }; =20 -#define YT921X_NAME "yt921x" - #define YT921X_VID_UNWARE 4095 =20 /* The interval should be small enough to avoid overflow of 32bit MIBs. @@ -4581,6 +4580,12 @@ static int yt921x_dsa_setup(struct dsa_switch *ds) if (res) return res; =20 +#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) + res =3D yt921x_leds_setup(priv); + if (res) + dev_warn(dev, "Failed to setup LEDs: %d\n", res); +#endif + return 0; } =20 @@ -4681,6 +4686,10 @@ static void yt921x_mdio_remove(struct mdio_device *m= diodev) if (!priv) return; =20 +#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) + yt921x_leds_remove(priv); +#endif + for (size_t i =3D ARRAY_SIZE(priv->ports); i-- > 0; ) { struct yt921x_port *pp =3D &priv->ports[i]; =20 diff --git a/drivers/net/dsa/motorcomm/chip.h b/drivers/net/dsa/motorcomm/c= hip.h index 555046526669..de4143057931 100644 --- a/drivers/net/dsa/motorcomm/chip.h +++ b/drivers/net/dsa/motorcomm/chip.h @@ -850,9 +850,13 @@ enum yt921x_fdb_entry_status { #define YT921X_ACL_NUM (YT921X_ACL_BLK_NUM * YT921X_ACL_ENT_PER_BLK) #define YT921X_UDF_NUM 8 =20 +#define YT921X_LED_GROUP_NUM 3 + /* 8 internal + 2 external + 1 mcu */ #define YT921X_PORT_NUM 11 =20 +#define YT921X_NAME "yt921x" + #define yt921x_port_is_internal(port) ((port) < 8) #define yt921x_port_is_external(port) (8 <=3D (port) && (port) < 9) =20 @@ -938,6 +942,13 @@ struct yt921x_port { struct yt921x_mib mib; u64 rx_frames; u64 tx_frames; + +#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) + unsigned char led_duty; + unsigned short led_cycle; + + struct yt921x_led *leds[YT921X_LED_GROUP_NUM]; +#endif }; =20 struct yt921x_reg_ops { diff --git a/drivers/net/dsa/motorcomm/leds.c b/drivers/net/dsa/motorcomm/l= eds.c new file mode 100644 index 000000000000..85c9bb139ead --- /dev/null +++ b/drivers/net/dsa/motorcomm/leds.c @@ -0,0 +1,647 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2026 David Yang + */ + +#include + +#include "chip.h" +#include "leds.h" +#include "smi.h" + +#define to_yt921x_led(led_cdev) \ + container_of_const((led_cdev), struct yt921x_led, cdev) +#define to_yt921x_port(led) ((led)->port) +#define to_yt921x_priv(pp) \ + container_of_const((pp), struct yt921x_priv, ports[(pp)->index]) +#define to_device(priv) ((priv)->ds.dev) + +static u32 yt921x_led_regaddr(struct yt921x_priv *priv, int port, int grou= p) +{ + switch (group) { + case 0: + default: + return YT921X_LED0_PORTn(port); + case 1: + return YT921X_LED1_PORTn(port); + case 2: + return YT921X_LED2_PORTn(port); + } +} + +static int +yt921x_led_force_get(struct yt921x_priv *priv, int port, int group, bool *= onp) +{ + u32 val; + int res; + + res =3D yt921x_reg_read(priv, YT921X_LED2_PORTn(port), &val); + if (res) + return res; + + *onp =3D (val & YT921X_LED2_PORT_FORCEn_M(group)) =3D=3D + YT921X_LED2_PORT_FORCEn_ON(group); + return 0; +} + +static int +yt921x_led_force_set(struct yt921x_priv *priv, int port, int group, bool o= n) +{ + struct yt921x_port *pp =3D &priv->ports[port]; + struct yt921x_led *led =3D pp->leds[group]; + u32 ctrl; + u32 mask; + + led->use_cycle =3D false; + led->use_duty =3D false; + + mask =3D YT921X_LED2_PORT_FORCEn_M(group); + ctrl =3D on ? YT921X_LED2_PORT_FORCEn_ON(group) : + YT921X_LED2_PORT_FORCEn_OFF(group); + return yt921x_reg_update_bits(priv, YT921X_LED2_PORTn(port), mask, + ctrl); +} + +static int +yt921x_led_blink_select(const struct yt921x_priv *priv, unsigned long on, + unsigned long off, unsigned short *cyclep, + unsigned char *dutyp) +{ + static const unsigned char dutys[] =3D { + YT921X_LED_DUTY(1, 6), + YT921X_LED_DUTY(1, 4), + YT921X_LED_DUTY(1, 3), + YT921X_LED_DUTY(1, 2), + }; + unsigned int cycle_upper; + unsigned int cycle_req; + unsigned int duty_req; + unsigned int cycle; + unsigned int duty; + + cycle =3D YT921X_LED_BLINK_MAX; + cycle_upper =3D cycle * 11585 / 8192 + 1; /* M_SQRT2 * cycle */ + if (check_add_overflow(on, off, &cycle_req) || cycle_req >=3D cycle_upper) + return -EOPNOTSUPP; + + for (; cycle > YT921X_LED_BLINK_MIN; cycle_upper >>=3D 1, cycle >>=3D 1) + if (cycle_req >=3D cycle_upper >> 1) + break; + *cyclep =3D cycle; + + duty_req =3D DIV_ROUND_CLOSEST(YT921X_LED_DUTY_DENOM * + (on > off ? off : on), cycle_req); + for (unsigned int i =3D ARRAY_SIZE(dutys) - 1;; i--) + if (i =3D=3D 0 || duty_req >=3D (dutys[i - 1] + dutys[i]) / 2) { + duty =3D dutys[i]; + break; + } + if (on > off) + duty =3D YT921X_LED_DUTY_DENOM - duty; + *dutyp =3D duty; + + return 0; +} + +static int +yt921x_led_blink_set(struct yt921x_priv *priv, int port, int group, + unsigned long *onp, unsigned long *offp) +{ + struct yt921x_port *pp =3D &priv->ports[port]; + struct yt921x_led *led =3D pp->leds[group]; + unsigned short cycle; + unsigned char duty; + bool use_cycle; + u32 ctrl; + u32 mask; + u32 val; + int res; + + if (!*onp && !*offp) { + cycle =3D YT921X_LED_BLINK_DEF; + duty =3D YT921X_LED_DUTY(1, 2); + for (unsigned int i =3D 0; i < YT921X_LED_GROUP_NUM; i++) + if (i !=3D group && pp->leds[i] && + pp->leds[i]->use_duty) { + duty =3D pp->led_duty; + break; + } + + use_cycle =3D false; + } else { + bool change_cycle; + bool change_duty; + + res =3D yt921x_led_blink_select(priv, *onp, *offp, &cycle, &duty); + if (res) + return res; + + use_cycle =3D cycle < YT921X_LED_BLINK_DEF; + change_cycle =3D use_cycle && cycle !=3D pp->led_cycle; + change_duty =3D duty !=3D pp->led_duty; + if (change_cycle || change_duty) + for (unsigned int i =3D 0; i < YT921X_LED_GROUP_NUM; + i++) { + if (i =3D=3D group || !pp->leds[i]) + continue; + if ((change_cycle && pp->leds[i]->use_cycle) || + (change_duty && pp->leds[i]->use_duty)) + return -EOPNOTSUPP; + } + } + + /* The chip seems to jam a while if changing duty directly */ + res =3D yt921x_reg_read(priv, YT921X_LED2_PORTn(port), &val); + if (res) + return res; + + ctrl =3D val & ~YT921X_LED2_PORT_FORCEn_M(group); + ctrl |=3D YT921X_LED2_PORT_FORCEn_DONTCARE(group); + if (val !=3D ctrl) { + res =3D yt921x_reg_write(priv, YT921X_LED2_PORTn(port), ctrl); + if (res) + return res; + } + + mask =3D YT921X_LED1_PORT_BLINK_DUTY_M | YT921X_LED1_PORT_BLINK_DUTY_COMP; + switch (duty >=3D YT921X_LED_DUTY(1, 2) ? duty : + YT921X_LED_DUTY_DENOM - duty) { + default: + duty =3D YT921X_LED_DUTY(1, 2); + fallthrough; + case YT921X_LED_DUTY(1, 2): + ctrl =3D YT921X_LED1_PORT_BLINK_DUTY_1_2; + break; + case YT921X_LED_DUTY(2, 3): + ctrl =3D YT921X_LED1_PORT_BLINK_DUTY_2_3; + break; + case YT921X_LED_DUTY(3, 4): + ctrl =3D YT921X_LED1_PORT_BLINK_DUTY_3_4; + break; + case YT921X_LED_DUTY(5, 6): + ctrl =3D YT921X_LED1_PORT_BLINK_DUTY_5_6; + break; + } + if (duty < YT921X_LED_DUTY(1, 2)) + ctrl |=3D YT921X_LED1_PORT_BLINK_DUTY_COMP; + if (use_cycle) { + mask |=3D YT921X_LED1_PORT_OTHER_BLINK_M; + ctrl |=3D YT921X_LED1_PORT_OTHER_BLINK(9 - __fls(cycle)); + } + res =3D yt921x_reg_update_bits(priv, YT921X_LED1_PORTn(port), mask, ctrl); + if (res) + return res; + + ctrl =3D val & ~(YT921X_LED2_PORT_FORCEn_M(group) | + YT921X_LED2_PORT_FORCE_BLINKn_M(group)); + ctrl |=3D YT921X_LED2_PORT_FORCEn_BLINK(group); + if (use_cycle) + ctrl |=3D YT921X_LED2_PORT_FORCE_BLINKn_OTHER(group); + else + ctrl |=3D YT921X_LED2_PORT_FORCE_BLINKn(group, __fls(cycle) - 9); + res =3D yt921x_reg_write(priv, YT921X_LED2_PORTn(port), ctrl); + if (res) + return res; + + led->use_cycle =3D use_cycle; + if (use_cycle) + pp->led_cycle =3D cycle; + led->use_duty =3D true; + pp->led_duty =3D duty; + + *onp =3D DIV_ROUND_CLOSEST(duty * cycle, YT921X_LED_DUTY_DENOM); + *offp =3D cycle - *onp; + return 0; +} + +struct yt921x_led_trigger_map { + unsigned long flags; + u32 mask; +}; + +static const struct yt921x_led_trigger_map yt921x_led_trigger_maps[] =3D { + {BIT(TRIGGER_NETDEV_LINK), + YT921X_LEDx_PORT_ACT_DUPLEX_HALF | YT921X_LEDx_PORT_ACT_DUPLEX_FULL}, + {BIT(TRIGGER_NETDEV_LINK_10), YT921X_LEDx_PORT_ACT_10M}, + {BIT(TRIGGER_NETDEV_LINK_100), YT921X_LEDx_PORT_ACT_100M}, + {BIT(TRIGGER_NETDEV_LINK_1000), YT921X_LEDx_PORT_ACT_1000M}, + {BIT(TRIGGER_NETDEV_HALF_DUPLEX), YT921X_LEDx_PORT_ACT_DUPLEX_HALF}, + {BIT(TRIGGER_NETDEV_FULL_DUPLEX), YT921X_LEDx_PORT_ACT_DUPLEX_FULL}, + {BIT(TRIGGER_NETDEV_TX), YT921X_LEDx_PORT_ACT_TX_BLINK}, + {BIT(TRIGGER_NETDEV_RX), YT921X_LEDx_PORT_ACT_RX_BLINK}, + {BIT(TRIGGER_NETDEV_TX_ERR) | BIT(TRIGGER_NETDEV_RX_ERR), + YT921X_LEDx_PORT_ACT_COLLISION_BLINK}, +}; + +static bool +yt921x_led_trigger_is_supported(const struct yt921x_priv *priv, int port, + int group, unsigned long flags) +{ + if (!flags) + return true; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(yt921x_led_trigger_maps); i++) { + const struct yt921x_led_trigger_map *map =3D &yt921x_led_trigger_maps[i]; + + if ((flags & map->flags) =3D=3D map->flags) { + flags &=3D ~map->flags; + if (!flags) + return true; + } + } + + return false; +} + +static int +yt921x_led_trigger_get(struct yt921x_priv *priv, int port, int group, + unsigned long *flagsp) +{ + u32 addr; + u32 val; + int res; + + res =3D yt921x_reg_read(priv, YT921X_LED2_PORTn(port), &val); + if (res) + return res; + + if ((val & YT921X_LED2_PORT_FORCEn_M(group)) !=3D + YT921X_LED2_PORT_FORCEn_DONTCARE(group)) { + *flagsp =3D 0; + return 0; + } + + if (group !=3D 2) { + addr =3D yt921x_led_regaddr(priv, port, group); + res =3D yt921x_reg_read(priv, addr, &val); + if (res) + return res; + } + + *flagsp =3D 0; + for (unsigned int i =3D 0; i < ARRAY_SIZE(yt921x_led_trigger_maps); i++) { + const struct yt921x_led_trigger_map *map =3D &yt921x_led_trigger_maps[i]; + + if ((val & map->mask) =3D=3D map->mask) + *flagsp |=3D map->flags; + } + + return 0; +} + +static int +yt921x_led_trigger_set(struct yt921x_priv *priv, int port, int group, + unsigned long flags) +{ + struct yt921x_port *pp =3D &priv->ports[port]; + struct yt921x_led *led =3D pp->leds[group]; + u32 addr; + u32 ctrl; + u32 mask; + int res; + + ctrl =3D 0; + for (unsigned int i =3D 0; i < ARRAY_SIZE(yt921x_led_trigger_maps); i++) { + const struct yt921x_led_trigger_map *map =3D &yt921x_led_trigger_maps[i]; + + if ((flags & map->flags) =3D=3D map->flags) { + flags &=3D ~map->flags; + ctrl |=3D map->mask; + if (!flags) + break; + } + } + if (flags) + return -EOPNOTSUPP; + + led->use_cycle =3D false; + led->use_duty =3D false; + + mask =3D !group ? YT921X_LED0_PORT_ACT_M : YT921X_LEDx_PORT_ACT_M; + if (group =3D=3D 2) { + mask |=3D YT921X_LED2_PORT_FORCEn_M(group); + ctrl |=3D YT921X_LED2_PORT_FORCEn_DONTCARE(group); + } + addr =3D yt921x_led_regaddr(priv, port, group); + res =3D yt921x_reg_update_bits(priv, addr, mask, ctrl); + if (res) + return res; + + if (group !=3D 2) { + mask =3D YT921X_LED2_PORT_FORCEn_M(group); + ctrl =3D YT921X_LED2_PORT_FORCEn_DONTCARE(group); + res =3D yt921x_reg_update_bits(priv, YT921X_LED2_PORTn(port), + mask, ctrl); + if (res) + return res; + } + + return 0; +} + +static int +yt921x_cled_brightness_set_blocking(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_led_force_set(priv, pp->index, led->group, brightness); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int +yt921x_cled_blink_set(struct led_classdev *led_cdev, unsigned long *delay_= on, + unsigned long *delay_off) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_led_blink_set(priv, pp->index, led->group, delay_on, + delay_off); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static struct device * __maybe_unused +yt921x_cled_hw_control_get_device(struct led_classdev *led_cdev) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + struct dsa_port *dp; + + dp =3D dsa_to_port(&priv->ds, pp->index); + if (!dp || !dp->user) + return NULL; + return &dp->user->dev; +} + +static int __maybe_unused +yt921x_cled_hw_control_is_supported(struct led_classdev *led_cdev, + unsigned long flags) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + + if (yt921x_led_trigger_is_supported(priv, pp->index, led->group, flags)) + return 0; + return -EOPNOTSUPP; +} + +static int __maybe_unused +yt921x_cled_hw_control_get(struct led_classdev *led_cdev, unsigned long *f= lagsp) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_led_trigger_get(priv, pp->index, led->group, flagsp); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int __maybe_unused +yt921x_cled_hw_control_set(struct led_classdev *led_cdev, unsigned long fl= ags) +{ + struct yt921x_led *led =3D to_yt921x_led(led_cdev); + struct yt921x_port *pp =3D to_yt921x_port(led); + struct yt921x_priv *priv =3D to_yt921x_priv(pp); + int res; + + mutex_lock(&priv->reg_lock); + res =3D yt921x_led_trigger_set(priv, pp->index, led->group, flags); + mutex_unlock(&priv->reg_lock); + + return res; +} + +static int +yt921x_led_setup(struct yt921x_priv *priv, int port, + struct fwnode_handle *fwnode, u32 *inv_maskp, u32 *inv_ctrlp) +{ + struct yt921x_port *pp =3D &priv->ports[port]; + struct device *dev =3D to_device(priv); + struct led_init_data init_data; + struct led_classdev *led_cdev; + char name[LED_MAX_NAME_SIZE]; + enum led_default_state state; + struct yt921x_led *led; + bool force_high; + bool force_low; + int polarity; + u32 group; + bool on; + int res; + + res =3D fwnode_property_read_u32(fwnode, "reg", &group); + if (res) + return res; + if (group >=3D YT921X_LED_GROUP_NUM) { + dev_err(dev, "Invalid LED reg %u for port %d\n", group, port); + return -EINVAL; + } + if (pp->leds[group]) + return -EEXIST; + + force_high =3D fwnode_property_read_bool(fwnode, "active-high"); + force_low =3D fwnode_property_read_bool(fwnode, "active-low"); + if (force_high && force_low) { + dev_err(dev, "Duplicate polarities for LED %02d:%02u\n", + port, group); + return -EINVAL; + } + polarity =3D force_high ? 1 : force_low ? -1 : 0; + + led =3D devm_kzalloc(dev, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + led->port =3D pp; + led->group =3D group; + + state =3D led_init_default_state_get(fwnode); + + mutex_lock(&priv->reg_lock); + pp->leds[group] =3D led; + switch (state) { + case LEDS_DEFSTATE_OFF: + case LEDS_DEFSTATE_ON: + default: + on =3D state =3D=3D LEDS_DEFSTATE_ON; + res =3D yt921x_led_force_set(priv, port, group, on); + break; + case LEDS_DEFSTATE_KEEP: + res =3D yt921x_led_force_get(priv, port, group, &on); + break; + } + mutex_unlock(&priv->reg_lock); + if (res) + goto err; + + led_cdev =3D &led->cdev; + led_cdev->brightness =3D on; + led_cdev->max_brightness =3D 1; + led_cdev->flags =3D LED_RETAIN_AT_SHUTDOWN; + led_cdev->brightness_set_blocking =3D yt921x_cled_brightness_set_blocking; + led_cdev->blink_set =3D yt921x_cled_blink_set; +#ifdef CONFIG_LEDS_TRIGGERS + led_cdev->hw_control_trigger =3D "netdev"; + led_cdev->hw_control_get_device =3D yt921x_cled_hw_control_get_device; + led_cdev->hw_control_is_supported =3D yt921x_cled_hw_control_is_supported; + led_cdev->hw_control_get =3D yt921x_cled_hw_control_get; + led_cdev->hw_control_set =3D yt921x_cled_hw_control_set; +#endif + + snprintf(name, sizeof(name), YT921X_NAME "-%u:%02d:%02u", + priv->ds.index, port, group); + init_data =3D (typeof(init_data)){ + .fwnode =3D fwnode, + .devicename =3D name, + .devname_mandatory =3D true, + }; + res =3D devm_led_classdev_register_ext(dev, led_cdev, &init_data); + if (res) + goto err; + + if (polarity) { + u32 bit =3D YT921X_LED_PAR_INV_INVnm(group, port); + + *inv_maskp |=3D bit; + if (polarity > 0) + *inv_ctrlp |=3D bit; + } + return 0; + +err: + mutex_lock(&priv->reg_lock); + pp->leds[group] =3D NULL; + mutex_unlock(&priv->reg_lock); + + devm_kfree(dev, led); + return res; +} + +static void yt921x_leds_remove_port(struct yt921x_priv *priv, int port) +{ + struct yt921x_port *pp =3D &priv->ports[port]; + struct device *dev =3D to_device(priv); + + for (int group =3D 0; group < YT921X_LED_GROUP_NUM; group++) { + struct yt921x_led *led =3D pp->leds[group]; + + if (led) + devm_led_classdev_unregister(dev, &led->cdev); + } + + for (int group =3D 0; group < YT921X_LED_GROUP_NUM; group++) { + struct yt921x_led *led =3D pp->leds[group]; + + if (led) { + pp->leds[group] =3D NULL; + devm_kfree(dev, led); + } + } +} + +static int +yt921x_leds_setup_port(struct yt921x_priv *priv, int port, u32 *inv_maskp, + u32 *inv_ctrlp) +{ + struct dsa_switch *ds =3D &priv->ds; + struct device_node *leds_np; + struct dsa_port *dp; + int res; + + dp =3D dsa_to_port(ds, port); + leds_np =3D of_get_child_by_name(dp->dn, "leds"); + if (!leds_np) + return 0; + + for_each_child_of_node_scoped(leds_np, led_np) { + res =3D yt921x_led_setup(priv, port, of_fwnode_handle(led_np), + inv_maskp, inv_ctrlp); + if (res) { + of_node_put(leds_np); + goto err; + } + } + + of_node_put(leds_np); + return 0; + +err: + yt921x_leds_remove_port(priv, port); + return res; +} + +void yt921x_leds_remove(struct yt921x_priv *priv) +{ + for (int port =3D 0; port < YT921X_PORT_NUM; port++) + yt921x_leds_remove_port(priv, port); +} + +int yt921x_leds_setup(struct yt921x_priv *priv) +{ + struct device *dev =3D to_device(priv); + struct dsa_switch *ds =3D &priv->ds; + struct dsa_port *dp; + u32 inv_ctrl =3D 0; + u32 inv_mask =3D 0; + u32 ctrl; + u32 mask; + int res; + + dsa_switch_for_each_port(dp, ds) { + int port =3D dp->index; + + if (!dp->dn) + continue; + + res =3D yt921x_leds_setup_port(priv, port, &inv_mask, &inv_ctrl); + if (res) + dev_warn(dev, "Failed to setup LEDs for port %d: %d\n", + port, res); + } + + mutex_lock(&priv->reg_lock); + + /* Inversion is internal - force on will give low logic. + * In the rest of the file, treat LEDs as if active-low. + */ + if (inv_mask) { + res =3D yt921x_reg_update_bits(priv, YT921X_LED_PAR_INV, inv_mask, + inv_ctrl); + if (res) + goto end; + } + + mask =3D YT921X_LED_CTRL_MODE_M | YT921X_LED_CTRL_PORT_NUM_M | + YT921X_LED_CTRL_EN; + ctrl =3D YT921X_LED_CTRL_MODE_PARALLEL | + YT921X_LED_CTRL_PORT_NUM(YT921X_PORT_NUM - 1) | + YT921X_LED_CTRL_EN; + res =3D yt921x_reg_update_bits(priv, YT921X_LED_CTRL, mask, ctrl); + +end: + mutex_unlock(&priv->reg_lock); + + if (res) { + yt921x_leds_remove(priv); + return res; + } + + return 0; +} diff --git a/drivers/net/dsa/motorcomm/leds.h b/drivers/net/dsa/motorcomm/l= eds.h new file mode 100644 index 000000000000..67373a190c8f --- /dev/null +++ b/drivers/net/dsa/motorcomm/leds.h @@ -0,0 +1,121 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (c) 2026 David Yang + */ + +#ifndef _YT_LEDS_H +#define _YT_LEDS_H + +#include +#include +#include +#include + +#define YT921X_LED_CTRL 0xd0000 +#define YT921X_LED_CTRL_EN BIT(21) +#define YT921X_LED_CTRL_LOOPDETECT_BLINK_M GENMASK(20, 19) /* cycle =3D 5= 12 * x ms */ +#define YT921X_LED_CTRL_LOOPDETECT_BLINK(x) FIELD_PREP(YT921X_LED_CTRL_= LOOPDETECT_BLINK_M, (x)) +#define YT921X_LED_CTRL_PORT_NUM_M GENMASK(16, 13) +#define YT921X_LED_CTRL_PORT_NUM(x) FIELD_PREP(YT921X_LED_CTRL_PORT_NU= M_M, (x)) +#define YT921X_LED_CTRL_MODE_M GENMASK(1, 0) +#define YT921X_LED_CTRL_MODE(x) FIELD_PREP(YT921X_LED_CTRL_MODE_M, (x)) +#define YT921X_LED_CTRL_MODE_PARALLEL YT921X_LED_CTRL_MODE(0) +#define YT921X_LED_CTRL_MODE_SERIAL YT921X_LED_CTRL_MODE(2) +#define YT921X_LED0_PORTn(port) (0xd0004 + 4 * (port)) +#define YT921X_LED0_PORT_ACT_M GENMASK(17, 0) +#define YT921X_LED0_PORT_ACT_LINK_TRY_DIS BIT(17) +#define YT921X_LED0_PORT_ACT_COLLISION_BLINK_INDI BIT(16) +#define YT921X_LED1_PORTn(port) (0xd0040 + 4 * (port)) +#define YT921X_LED1_PORT_OTHER_BLINK_M GENMASK(31, 30) /* cycle =3D 512 = >> x ms */ +#define YT921X_LED1_PORT_OTHER_BLINK(x) FIELD_PREP(YT921X_LED1_PORT_OTH= ER_BLINK_M, (x)) +#define YT921X_LED1_PORT_EEE_BLINK_M GENMASK(29, 28) /* cycle =3D 512 >>= x ms */ +#define YT921X_LED1_PORT_EEE_BLINK(x) FIELD_PREP(YT921X_LED1_PORT_EEE_= BLINK_M, (x)) +#define YT921X_LED1_PORT_BLINK_DUTY_COMP BIT(27) +#define YT921X_LED1_PORT_BLINK_DUTY_M GENMASK(26, 25) +#define YT921X_LED1_PORT_BLINK_DUTY(x) FIELD_PREP(YT921X_LED1_PORT_BLIN= K_DUTY_M, (x)) +#define YT921X_LED1_PORT_BLINK_DUTY_1_2 YT921X_LED1_PORT_BLINK_DUTY(0) +#define YT921X_LED1_PORT_BLINK_DUTY_2_3 YT921X_LED1_PORT_BLINK_DUTY(1) +#define YT921X_LED1_PORT_BLINK_DUTY_3_4 YT921X_LED1_PORT_BLINK_DUTY(2) +#define YT921X_LED1_PORT_BLINK_DUTY_5_6 YT921X_LED1_PORT_BLINK_DUTY(3) +#define YT921X_LED2_PORTn(port) (0xd0080 + 4 * (port)) +#define YT921X_LED2_PORT_FORCEn_M(grp) GENMASK(4 * (grp) + 19, 4 * (grp)= + 18) +#define YT921X_LED2_PORT_FORCEn(grp, x) ((x) << (4 * (grp) + 18)) +#define YT921X_LED2_PORT_FORCEn_DONTCARE(grp) YT921X_LED2_PORT_FORCEn(g= rp, 0) +#define YT921X_LED2_PORT_FORCEn_BLINK(grp) YT921X_LED2_PORT_FORCEn(grp,= 1) +#define YT921X_LED2_PORT_FORCEn_ON(grp) YT921X_LED2_PORT_FORCEn(grp, 2) +#define YT921X_LED2_PORT_FORCEn_OFF(grp) YT921X_LED2_PORT_FORCEn(grp, 3) +#define YT921X_LED2_PORT_FORCE_BLINKn_M(grp) GENMASK(4 * (grp) + 17, 4 * = (grp) + 16) /* cycle =3D 512 << x ms */ +#define YT921X_LED2_PORT_FORCE_BLINKn(grp, x) ((x) << (4 * (grp) + 16)) +#define YT921X_LED2_PORT_FORCE_BLINKn_OTHER(grp) YT921X_LED2_PORT_FORCE_= BLINKn(grp, 3) +#define YT921X_LEDx_PORT_ACT_M GENMASK(15, 0) +#define YT921X_LEDx_PORT_ACT_EEE_BLINK BIT(15) +#define YT921X_LEDx_PORT_ACT_LOOPDETECT_BLINK BIT(14) +#define YT921X_LEDx_PORT_ACT_ACTIVE_BLINK BIT(13) +#define YT921X_LEDx_PORT_ACT_DUPLEX_FULL BIT(12) +#define YT921X_LEDx_PORT_ACT_DUPLEX_HALF BIT(11) +#define YT921X_LEDx_PORT_ACT_TX_BLINK BIT(10) +#define YT921X_LEDx_PORT_ACT_RX_BLINK BIT(9) +#define YT921X_LEDx_PORT_ACT_TX BIT(8) +#define YT921X_LEDx_PORT_ACT_RX BIT(7) +#define YT921X_LEDx_PORT_ACT_1000M BIT(6) +#define YT921X_LEDx_PORT_ACT_100M BIT(5) +#define YT921X_LEDx_PORT_ACT_10M BIT(4) +#define YT921X_LEDx_PORT_ACT_COLLISION_BLINK BIT(3) +#define YT921X_LEDx_PORT_ACT_1000M_BLINK BIT(2) +#define YT921X_LEDx_PORT_ACT_100M_BLINK BIT(1) +#define YT921X_LEDx_PORT_ACT_10M_BLINK BIT(0) +#define YT921X_LED_SER_CTRL 0xd0100 +#define YT921X_LED_SER_CTRL_UNK GENMASK(25, 24) /* delay? */ +#define YT921X_LED_SER_CTRL_ACTIVE_LOW BIT(4) +#define YT921X_LED_SER_CTRL_GRP_NUM_M GENMASK(1, 0) /* #grp - 1 */ +#define YT921X_LED_SER_CTRL_GRP_NUM(x) FIELD_PREP(YT921X_LED_SER_CTRL_G= RP_NUM_M, (x)) +#define YT921X_LED_SER_MAPnm(grp, port) (0xd0104 + 8 * (2 - (grp)) + 4 * (= (port) / 5)) +#define YT921X_LED_SER_MAP_DSTn_PORT_M(port) GENMASK(6 * ((port) % 5) + 5= , 6 * ((port) % 5) + 2) +#define YT921X_LED_SER_MAP_DSTn_PORT(port, x) ((x) << (6 * ((port) % 5)= + 2)) +#define YT921X_LED_SER_MAP_DSTn_LED_M(port) GENMASK(6 * ((port) % 5) + 1,= 6 * ((port) % 5)) +#define YT921X_LED_SER_MAP_DSTn_LED(port, x) ((x) << (6 * ((port) % 5))) +#define YT921X_LED_PAR_PORTS 0xd01c4 +#define YT921X_LED_PAR_INV 0xd01c8 +#define YT921X_LED_PAR_INV_INVnm(grp, port) BIT(10 * (grp) + (port)) +#define YT921X_LED_PAR_MAPn(port) (0xd01d0 + 4 * (port)) +#define YT921X_LED_PAR_MAP_DSTn_PORT_M(grp) GENMASK(6 * (grp) + 5, 6 * (g= rp) + 2) +#define YT921X_LED_PAR_MAP_DSTn_PORT(grp, x) ((x) << (6 * (grp) + 2)) +#define YT921X_LED_PAR_MAP_DSTn_LED_M(grp) GENMASK(6 * (grp) + 1, 6 * (gr= p)) +#define YT921X_LED_PAR_MAP_DSTn_LED(grp, x) ((x) << (6 * (grp))) + +#define YT921X_LED_BLINK_MIN 64 +#define YT921X_LED_BLINK_DEF 512 +#define YT921X_LED_BLINK_MAX 2048 + +/* 2 * lcm(2, 3, 4, 6) */ +#define YT921X_LED_DUTY_DENOM 24 +#define YT921X_LED_DUTY(nom, denom) (YT921X_LED_DUTY_DENOM * (nom) / (deno= m)) + +struct yt921x_priv; + +struct yt921x_led { + struct led_classdev cdev; + struct yt921x_port *port; + unsigned char group; + + bool use_cycle:1; + bool use_duty:1; +}; + +#if IS_ENABLED(CONFIG_NET_DSA_YT921X_LEDS) + +void yt921x_leds_remove(struct yt921x_priv *priv); +int yt921x_leds_setup(struct yt921x_priv *priv); + +#else + +static inline void yt921x_leds_remove(struct yt921x_priv *priv) {} + +static inline int yt921x_leds_setup(struct yt921x_priv *priv) +{ + return 0; +} + +#endif + +#endif --=20 2.53.0