From patchwork Wed Sep 4 06:27:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter X-Patchwork-Id: 13789804 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 81979139579; Wed, 4 Sep 2024 06:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431280; cv=none; b=cF1utsBy+gs4V5bXOD6GXcdOfMgyiGClMQ4vbNu5f50jLjph7FskbKbsy9hHTXSFylja3hmKwqkyHESlpElsdSiV8huOfGuIynPlUsM2hBlkyeFGrlhrpyAPwFZePs1cwW7WM0GqJ3V91A0Wg4VrgnnIkT/Gw4PBkpDaW2LNEyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431280; c=relaxed/simple; bh=obA9dxpCUGQxT2WkHqZCk0H6H19Rw8sW7aLJIxK8DBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CZpozY6Sk4QqjwMChqTk6ZVRna15EGsKxWtsXait0BO4bMGh9dSYJse8TAATYe6qbtawJNe4Jk8XGdlkoCZMvq6cfGQjmaAYPUgSJn9885dVNVVAeoyu6yKILnLCqWp+H8nvHSZni/SYoJj6qcurhdyixqyOgEE4qDqx7Jd45iE= 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=nXGOKLqz; arc=none smtp.client-ip=209.85.218.54 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="nXGOKLqz" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a86abbd68ffso69202566b.0; Tue, 03 Sep 2024 23:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725431277; x=1726036077; 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; bh=e6i3Km+inX9EWUYXQA5l7QVIM9SmXTJ4vnExYfHEiFc=; b=nXGOKLqz3CvUlprM5G8g+UMSLK6bHYJCChUz7UNtYFeMMhCF1h2WjkUIMRDQgKcbC+ 3Ht/GVly06CZIU7bPYqklaQcovi8e3w0dd3MWZYrrpTwNVMGI2S1mYts4Da9pb9MCJtf 8xsgHS3wpbJaD4aWDQD1pQGQWeHbw4OtnhVlshvdG+Jz8kmzfvinl4CxppDY0rfULf9B STMDjvvBWMDdglEXyFFHHeG2MgNIdaDMGiZ/ZzyXnQPOEc68BJmcJ8rcsrjzBXcxRR3g 1m91Fzz5+ieCRUMTAM0+F2FGatGlf37d4qKz4rBszy7DtY335s5ql2MY//PZFEGeIDWV 9PyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725431277; x=1726036077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e6i3Km+inX9EWUYXQA5l7QVIM9SmXTJ4vnExYfHEiFc=; b=EPU50s1WspG/85l/JBkAWae3WMZVxWPkalXmmIh8vf8xn4OX3S3FiSV1sbfe+OPxXN +ljAoJBK/WY031pWEQ5Gg19khC09Q9HZeHMA0HGm9gBNWrbBJIA/zDA0Y++7FdxWxRcJ 119glKowdHJ1haNu5poD6f3lKzTWbyWEk+hOi1Zw7K0wKPuBANwLr2hJd1diDsYa1uyJ ZRrm88Dum1XyADvFX7jzkp0lx/kqiSRRDqOBbpbMypuQEGHraJkZXH/MOzNh6BQtPhO9 E+WkpwaB3hBHwaZe6wgZpZ3s3ThpVkpKuYWjoVddzhcgFif9Y+9SWJFkjVMIFcRGQRoK PvcQ== X-Forwarded-Encrypted: i=1; AJvYcCUFAzxTtr39IClNQwokvaRdF4S7JSO0Vrtxz40kupaWN87byoff7LOGIUSxlevoq2RnPl6o9ujTX3IiwJ0=@vger.kernel.org X-Gm-Message-State: AOJu0YxhjUbccz38pKEiu9lcthPUqRCvNEfg/RlRk7cHnfJxxhrYQOfL 6TtXVEu17eLGACvYXfU7ks2C2uGBklAFoz/XJX60Edb/DxjwGfQT X-Google-Smtp-Source: AGHT+IEG0w+o65UONk6K4rdQjzQi03jHVFigLwkEyUHda2O0uSLHCZwdU2wJ2FrxAmw4tph2S1wePw== X-Received: by 2002:a17:907:3e1f:b0:a7d:a453:dba1 with SMTP id a640c23a62f3a-a8a430ba903mr104411366b.20.1725431276328; Tue, 03 Sep 2024 23:27:56 -0700 (PDT) Received: from lapsy144.cern.ch (lapsy144.ipv6.cern.ch. [2001:1458:202:99::100:4b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8988ff0465sm768659666b.29.2024.09.03.23.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 23:27:55 -0700 (PDT) From: vtpieter@gmail.com To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Arun.Ramadoss@microchip.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tristram.Ha@microchip.com, o.rempel@pengutronix.de, Pieter Van Trappen Subject: [PATCH net-next v4 1/3] net: dsa: microchip: rename ksz8 series files Date: Wed, 4 Sep 2024 08:27:40 +0200 Message-ID: <20240904062749.466124-2-vtpieter@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240904062749.466124-1-vtpieter@gmail.com> References: <20240904062749.466124-1-vtpieter@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Pieter Van Trappen The first KSZ8 series implementation was done for a KSZ8795 device but since several other KSZ8 devices have been added. Rename these files to adhere to the ksz8 naming convention as already used in most functions and the existing ksz8.h; add an explanatory note. Signed-off-by: Pieter Van Trappen Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/Kconfig | 9 ++++++--- drivers/net/dsa/microchip/Makefile | 2 +- drivers/net/dsa/microchip/{ksz8795.c => ksz8.c} | 11 +++++++++-- .../net/dsa/microchip/{ksz8795_reg.h => ksz8_reg.h} | 11 ++++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) rename drivers/net/dsa/microchip/{ksz8795.c => ksz8.c} (99%) rename drivers/net/dsa/microchip/{ksz8795_reg.h => ksz8_reg.h} (98%) diff --git a/drivers/net/dsa/microchip/Kconfig b/drivers/net/dsa/microchip/Kconfig index c1b906c05a02..12a86585a77f 100644 --- a/drivers/net/dsa/microchip/Kconfig +++ b/drivers/net/dsa/microchip/Kconfig @@ -1,14 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig NET_DSA_MICROCHIP_KSZ_COMMON - tristate "Microchip KSZ8795/KSZ9477/LAN937x series switch support" + tristate "Microchip KSZ8XXX/KSZ9XXX/LAN937X series switch support" depends on NET_DSA select NET_DSA_TAG_KSZ select NET_DSA_TAG_NONE select NET_IEEE8021Q_HELPERS select DCB help - This driver adds support for Microchip KSZ9477 series switch and - KSZ8795/KSZ88x3 switch chips. + This driver adds support for Microchip KSZ8, KSZ9 and + LAN937X series switch chips, being KSZ8863/8873, + KSZ8895/8864, KSZ8794/8795/8765, + KSZ9477/9897/9896/9567/8567, KSZ9893/9563/8563 and + LAN9370/9371/9372/9373/9374. config NET_DSA_MICROCHIP_KSZ9477_I2C tristate "KSZ series I2C connected switch driver" diff --git a/drivers/net/dsa/microchip/Makefile b/drivers/net/dsa/microchip/Makefile index 1cfba1ec9355..9347cfb3d0b5 100644 --- a/drivers/net/dsa/microchip/Makefile +++ b/drivers/net/dsa/microchip/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON) += ksz_switch.o ksz_switch-objs := ksz_common.o ksz_dcb.o ksz_switch-objs += ksz9477.o ksz9477_acl.o ksz9477_tc_flower.o -ksz_switch-objs += ksz8795.o +ksz_switch-objs += ksz8.o ksz_switch-objs += lan937x_main.o ifdef CONFIG_NET_DSA_MICROCHIP_KSZ_PTP diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8.c similarity index 99% rename from drivers/net/dsa/microchip/ksz8795.c rename to drivers/net/dsa/microchip/ksz8.c index aa09d89debf0..7af3c0853505 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -1,6 +1,13 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Microchip KSZ8795 switch driver + * Microchip KSZ8XXX series switch driver + * + * It supports the following switches: + * - KSZ8863, KSZ8873 aka KSZ88X3 + * - KSZ8895, KSZ8864 aka KSZ8895 family + * - KSZ8794, KSZ8795, KSZ8765 aka KSZ87XX + * Note that it does NOT support: + * - KSZ8563, KSZ8567 - see KSZ9477 driver * * Copyright (C) 2017 Microchip Technology Inc. * Tristram Ha @@ -23,7 +30,7 @@ #include #include "ksz_common.h" -#include "ksz8795_reg.h" +#include "ksz8_reg.h" #include "ksz8.h" static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set) diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8_reg.h similarity index 98% rename from drivers/net/dsa/microchip/ksz8795_reg.h rename to drivers/net/dsa/microchip/ksz8_reg.h index 69566a5d9cda..ff264d57594f 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8_reg.h @@ -1,13 +1,18 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* - * Microchip KSZ8795 register definitions + * Microchip KSZ8XXX series register definitions + * + * The base for these definitions is KSZ8795 but unless indicated + * differently by their prefix, they apply to all KSZ8 series + * devices. Registers and masks that do change are defined in + * dedicated structures in ksz_common.c. * * Copyright (c) 2017 Microchip Technology Inc. * Tristram Ha */ -#ifndef __KSZ8795_REG_H -#define __KSZ8795_REG_H +#ifndef __KSZ8_REG_H +#define __KSZ8_REG_H #define KS_PORT_M 0x1F From patchwork Wed Sep 4 06:27:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter X-Patchwork-Id: 13789805 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 DCA48839E3; Wed, 4 Sep 2024 06:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431281; cv=none; b=kH+X3R8W2osgmJS1AcCaHUqsuo7GvdJ4YuUdGhhNaP0Ilop3ffMnI5cQQd/og/5KRcti6xmXiWcyg/5xhn9sH+YZoN7ZlCFLQzVbk/g/R8KNvuU5KXu1Rl/JlQRPP7n5pNqN4YyrwXxARCmRN+wIGFP1jDQVL7SQ25yHoUYFhno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431281; c=relaxed/simple; bh=KKvHqt3siS6yomCisTHDJUcUhDzuy3LBBgDMRQ4k+Rg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rd6R/FkbTB4vLQVbsAoVJpznoH3JISJ6LrW9K/blUYu94qc6VX2NpVpB0Ea9hW2ly/amQo0z3Zbgz3sgkcJaqDiEP4JWpWIH7FXCvLpD+sm4nplWoWYGqOlbn+HVHtk2ZI6GL5N/3EUOeNuSYcnptpCAz/jHt7XPF6ZOE0tgGb8= 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=WcOaYKve; arc=none smtp.client-ip=209.85.218.45 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="WcOaYKve" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a86984e035aso756639266b.2; Tue, 03 Sep 2024 23:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725431278; x=1726036078; 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; bh=XndFyI8puSjAv9/6vHD7/Fma9yvh6kpyB+LRqezDNzk=; b=WcOaYKveycOVq3BYzo/ugqI9aAKPKRjtRLAm8d5RbBBOfHQqQMppEkMdZTgn2jGCpN R1PCMawkXKSPNVUG04ZL9R5/2fP6HKMzqb1EJasAbM+E2Dvgiy3YlTwNoN6fFrHU99Nj kyee8D8dpG1NcwVFLKE9kzKR+unVdN8rBQ7wOW7/2KYaZzij/aNfvQ1+662RSnlzaX/F Z28BT9rIH+UdK5MSPbeSoqHOGjB2g3oDu5OLUJiWPmKYqLO70o/uDZCUKeSVecFdbaBk rqzEurOaS9QWHmewobeSP8NcHS/KLmlpy23SmFaNTbvmI4smhksBF9z9VjuDNcfvUKS+ PV2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725431278; x=1726036078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XndFyI8puSjAv9/6vHD7/Fma9yvh6kpyB+LRqezDNzk=; b=kkmV6StiwMm0BLGgEdob0fWtjEnAa+F0m2tZ5pI+NHSPDUzTnVYnNxyjXxK7K+wuXd ED4RwqoqmminMm0YxR45LJTTHQK2OQTspbB4avA/n6jCbfoN51yXKMxvrUbGPJwDi+nL FTxL34pAEwgIC0heGsbB2xEZWhk/6U9ir4rkqG/7et9VochFoa8g+vhIlLy4YIDiIch4 Xq47wIdgtCXLtalNRbgjhUyb4LhHca1YnvFej1TEp1fxUotgt3s+f36gU4q19F/a0ugq ao8c/ba0p2uM6WrHQt9+3a/6X41SdiRSDlGkPs6AwtSrath4h6Nv8yyGpIxAJ9MmL65k F17g== X-Forwarded-Encrypted: i=1; AJvYcCXKMYS5lnAFRyGW/gmwFSFftBRVykByNO98LVotYHL5tt5uADi/AVccpyxtnb14hMcnWXLer6bW/cjhs8c=@vger.kernel.org X-Gm-Message-State: AOJu0YxKQD/o3nHhzwwd7TT8I5N9ykObRSj7KNxUNuJL3bvwWUqNPQpb S2QeAefpvd2nq3wEzvpOmoJsIp+b4Z5CP988eYEu3cDJNzA4iN88 X-Google-Smtp-Source: AGHT+IGqRdhlSbRBFRUDFkNS9/prBBxbHcHxOrFcquStHEOeY4xfizmbi3zAqf7gQMqVc5WNOUo7lw== X-Received: by 2002:a17:907:948b:b0:a86:c252:aaa2 with SMTP id a640c23a62f3a-a89a379d069mr1190820166b.51.1725431278130; Tue, 03 Sep 2024 23:27:58 -0700 (PDT) Received: from lapsy144.cern.ch (lapsy144.ipv6.cern.ch. [2001:1458:202:99::100:4b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8988ff0465sm768659666b.29.2024.09.03.23.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 23:27:57 -0700 (PDT) From: vtpieter@gmail.com To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Arun.Ramadoss@microchip.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tristram.Ha@microchip.com, o.rempel@pengutronix.de, Pieter Van Trappen , Arun Ramadoss Subject: [PATCH net-next v4 2/3] net: dsa: microchip: clean up ksz8_reg definition macros Date: Wed, 4 Sep 2024 08:27:41 +0200 Message-ID: <20240904062749.466124-3-vtpieter@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240904062749.466124-1-vtpieter@gmail.com> References: <20240904062749.466124-1-vtpieter@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Pieter Van Trappen Remove macros that are already defined at more appropriate places. Signed-off-by: Pieter Van Trappen Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz8_reg.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8_reg.h b/drivers/net/dsa/microchip/ksz8_reg.h index ff264d57594f..329688603a58 100644 --- a/drivers/net/dsa/microchip/ksz8_reg.h +++ b/drivers/net/dsa/microchip/ksz8_reg.h @@ -364,8 +364,6 @@ #define REG_IND_DATA_1 0x77 #define REG_IND_DATA_0 0x78 -#define REG_IND_DATA_PME_EEE_ACL 0xA0 - #define REG_INT_STATUS 0x7C #define REG_INT_ENABLE 0x7D @@ -709,8 +707,6 @@ #define KSZ8795_ID_LO 0x1550 #define KSZ8863_ID_LO 0x1430 -#define KSZ8795_SW_ID 0x8795 - #define PHY_REG_LINK_MD 0x1D #define PHY_START_CABLE_DIAG BIT(15) From patchwork Wed Sep 4 06:27:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter X-Patchwork-Id: 13789806 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 F2ADA12FF9C; Wed, 4 Sep 2024 06:28:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431286; cv=none; b=jwVSZgysb7TJGTGcufN+A5e8W3JjNv4+7C+K1OZuRN91Rh7HvePpfv+DXDXNFnqHz0m2asu2YrS7NiYRYzc7fYCnI9KpIXgBVPqPRVc/7li9gAxh6Sir+J/eNvH+eEqfM4XD8CSfp3hxwNa42z6sEAVa0BuLnGPo/Ac4cXRCiN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725431286; c=relaxed/simple; bh=zMMT5+DbOampsFcX5H1ixwm6s0F5yXjKj1eW0lcoHdc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l9icyyC1pgx0AQFLoejBnZq99uO3p8HMiHoMBCVHt+b8oDWQCnfsaLvQSlQNeWbxudGE90g/beoX0BhmSvqB1T2iYs5ciGG0Hz4T9bQ8w1OlagBY0mbjz8VOWahoiQcUUXQrYSc2guvS5ifF344LPl7WwblWUvR/urFVgBt9M2E= 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=FWuUjlj8; arc=none smtp.client-ip=209.85.167.54 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="FWuUjlj8" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5334c018913so5839684e87.0; Tue, 03 Sep 2024 23:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725431283; x=1726036083; 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; bh=4a+gMxbI979G9nZ/VWTAp+MczbRAr3v0zN8HLEFJfPs=; b=FWuUjlj8UvzMhV1qchh3laTxFMtNLi+LHfILj1B4ssLbai67KfCnio+FnlpopdyJMX 3vAnaNnUJlqfxh8bcdN6kM1eb6zgg3Rzw2wS/9kHeox39frMjBYzsPqhrjmycVhuZ/Ih jh0L/WEHPL31UE2+cmC7esygyK/PVj6bzuEAthRurxRlh0pdiwGwbyQqvvn4Njqi4SYV 9XrPRmhU4gVChI27VhFZrj0kvfQEXj1q+mkqVBrHw2KBMFUK/O8wcLgd0buDcbdJjapp MG6OxxI3sgf5SNNP2MzgXnM0eP/pdl6MToHpBo+A8CxpOmMskNn1OINfmOAgPqJJ1aAM XnZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725431283; x=1726036083; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4a+gMxbI979G9nZ/VWTAp+MczbRAr3v0zN8HLEFJfPs=; b=LTtO+3SQC8GgXc18hyg22sbCF8/ZLwqwDrfXaHuUqxf2U0MFFMUl82GitLw6wzJPGl OwSN9Gk0MtZmWZQ7QrXqvm0nlP6dvvsUAsyWMo1NHAH4lk9SAJZxIxXEWGIA10DzrP0D 8IoZec/xHEceJB+f4I7Nd8MS7YSCO5JrFH++65xV5hHISmbRT+JL0mkoq0dVYVL0l16X MTySddF7GqVDhcB4kkDOgliWmojOweMyclznBCMY+/N2RI8lW1+r/BTBnRjildCR9Bgv jV7Z25CSRU9OSoK1SYSpgSbRzzWIBt63nLJRb6ZjH9b/MSEqTBOH1PCUhljHuT7D4oug WV8g== X-Forwarded-Encrypted: i=1; AJvYcCUPh07vyFM7fCid3p5mG2AIWpdaOR5F/3UWLroCWzPIJ4Rp3Ex5e4vg+cw4QZTD703pT4RE08LXb+QuvVs=@vger.kernel.org X-Gm-Message-State: AOJu0YxwL8o0KZmKbl143xvkWGM7u4+J6u7KSXOuSKHbnjiFBtISK+8j NLs5haZpPfqejdcfJeJgU3pUYEH7lmyBE9j925msycE1Na5h7gtX X-Google-Smtp-Source: AGHT+IE3pfoT/gWXkiaxcQf3OXmKnZypUUTfbZgc4tcaTXO8lKPOtfZfKUllGSq4U0Ck5tp82w2Qhg== X-Received: by 2002:a05:6512:3da9:b0:52c:dcd4:8953 with SMTP id 2adb3069b0e04-53546b4a1e5mr11049647e87.36.1725431282723; Tue, 03 Sep 2024 23:28:02 -0700 (PDT) Received: from lapsy144.cern.ch (lapsy144.ipv6.cern.ch. [2001:1458:202:99::100:4b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8988ff0465sm768659666b.29.2024.09.03.23.28.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 23:28:02 -0700 (PDT) From: vtpieter@gmail.com To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , Arun.Ramadoss@microchip.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tristram.Ha@microchip.com, o.rempel@pengutronix.de, Pieter Van Trappen , Arun Ramadoss Subject: [PATCH net-next v4 3/3] net: dsa: microchip: replace unclear KSZ8830 strings Date: Wed, 4 Sep 2024 08:27:42 +0200 Message-ID: <20240904062749.466124-4-vtpieter@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240904062749.466124-1-vtpieter@gmail.com> References: <20240904062749.466124-1-vtpieter@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Pieter Van Trappen Replace ksz8830 with ksz88x3 for CHIP_ID definition and other strings. This due to KSZ8830 not being an actual switch but the Chip ID shared among KSZ8863/8873 switches, impossible to differentiate from their Chip ID or Revision ID registers. Now all KSZ*_CHIP_ID macros refer to actual, existing switches which removes confusion. Signed-off-by: Pieter Van Trappen Acked-by: Arun Ramadoss --- drivers/net/dsa/microchip/ksz8.c | 2 +- drivers/net/dsa/microchip/ksz8863_smi.c | 4 +- drivers/net/dsa/microchip/ksz_common.c | 48 ++++++++++----------- drivers/net/dsa/microchip/ksz_common.h | 4 +- drivers/net/dsa/microchip/ksz_spi.c | 6 +-- include/linux/platform_data/microchip-ksz.h | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c index 7af3c0853505..da7110d67558 100644 --- a/drivers/net/dsa/microchip/ksz8.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -194,7 +194,7 @@ int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu) case KSZ8794_CHIP_ID: case KSZ8765_CHIP_ID: return ksz8795_change_mtu(dev, frame_size); - case KSZ8830_CHIP_ID: + case KSZ88X3_CHIP_ID: case KSZ8864_CHIP_ID: case KSZ8895_CHIP_ID: return ksz8863_change_mtu(dev, frame_size); diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c index 5711a59e2ac9..a8bfcd917bf7 100644 --- a/drivers/net/dsa/microchip/ksz8863_smi.c +++ b/drivers/net/dsa/microchip/ksz8863_smi.c @@ -199,11 +199,11 @@ static void ksz8863_smi_shutdown(struct mdio_device *mdiodev) static const struct of_device_id ksz8863_dt_ids[] = { { .compatible = "microchip,ksz8863", - .data = &ksz_switch_chips[KSZ8830] + .data = &ksz_switch_chips[KSZ88X3] }, { .compatible = "microchip,ksz8873", - .data = &ksz_switch_chips[KSZ8830] + .data = &ksz_switch_chips[KSZ88X3] }, { }, }; diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 6609bf271ad0..972ccb84bd53 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -246,16 +246,16 @@ static const struct ksz_drive_strength ksz9477_drive_strengths[] = { { SW_DRIVE_STRENGTH_28MA, 28000 }, }; -/* ksz8830_drive_strengths - Drive strength mapping for KSZ8830, KSZ8873, .. +/* ksz88x3_drive_strengths - Drive strength mapping for KSZ8863, KSZ8873, .. * variants. * This values are documented in KSZ8873 and KSZ8863 datasheets. */ -static const struct ksz_drive_strength ksz8830_drive_strengths[] = { +static const struct ksz_drive_strength ksz88x3_drive_strengths[] = { { 0, 8000 }, { KSZ8873_DRIVE_STRENGTH_16MA, 16000 }, }; -static void ksz8830_phylink_mac_config(struct phylink_config *config, +static void ksz88x3_phylink_mac_config(struct phylink_config *config, unsigned int mode, const struct phylink_link_state *state); static void ksz_phylink_mac_config(struct phylink_config *config, @@ -265,8 +265,8 @@ static void ksz_phylink_mac_link_down(struct phylink_config *config, unsigned int mode, phy_interface_t interface); -static const struct phylink_mac_ops ksz8830_phylink_mac_ops = { - .mac_config = ksz8830_phylink_mac_config, +static const struct phylink_mac_ops ksz88x3_phylink_mac_ops = { + .mac_config = ksz88x3_phylink_mac_config, .mac_link_down = ksz_phylink_mac_link_down, .mac_link_up = ksz8_phylink_mac_link_up, }; @@ -1442,8 +1442,8 @@ const struct ksz_chip_data ksz_switch_chips[] = { .internal_phy = {true, true, true, true, false}, }, - [KSZ8830] = { - .chip_id = KSZ8830_CHIP_ID, + [KSZ88X3] = { + .chip_id = KSZ88X3_CHIP_ID, .dev_name = "KSZ8863/KSZ8873", .num_vlans = 16, .num_alus = 0, @@ -1453,7 +1453,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_tx_queues = 4, .num_ipms = 4, .ops = &ksz88xx_dev_ops, - .phylink_mac_ops = &ksz8830_phylink_mac_ops, + .phylink_mac_ops = &ksz88x3_phylink_mac_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, @@ -1487,7 +1487,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_tx_queues = 4, .num_ipms = 4, .ops = &ksz88xx_dev_ops, - .phylink_mac_ops = &ksz8830_phylink_mac_ops, + .phylink_mac_ops = &ksz88x3_phylink_mac_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, @@ -1510,7 +1510,7 @@ const struct ksz_chip_data ksz_switch_chips[] = { .num_tx_queues = 4, .num_ipms = 4, .ops = &ksz88xx_dev_ops, - .phylink_mac_ops = &ksz8830_phylink_mac_ops, + .phylink_mac_ops = &ksz88x3_phylink_mac_ops, .mib_names = ksz88xx_mib_names, .mib_cnt = ARRAY_SIZE(ksz88xx_mib_names), .reg_mib_cnt = MIB_COUNTER_NUM, @@ -2724,7 +2724,7 @@ static u32 ksz_get_phy_flags(struct dsa_switch *ds, int port) struct ksz_device *dev = ds->priv; switch (dev->chip_id) { - case KSZ8830_CHIP_ID: + case KSZ88X3_CHIP_ID: /* Silicon Errata Sheet (DS80000830A): * Port 1 does not work with LinkMD Cable-Testing. * Port 1 does not respond to received PAUSE control frames. @@ -3050,7 +3050,7 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, if (ksz_is_ksz87xx(dev) || ksz_is_8895_family(dev)) proto = DSA_TAG_PROTO_KSZ8795; - if (dev->chip_id == KSZ8830_CHIP_ID || + if (dev->chip_id == KSZ88X3_CHIP_ID || dev->chip_id == KSZ8563_CHIP_ID || dev->chip_id == KSZ9893_CHIP_ID || dev->chip_id == KSZ9563_CHIP_ID) @@ -3162,7 +3162,7 @@ static int ksz_max_mtu(struct dsa_switch *ds, int port) case KSZ8794_CHIP_ID: case KSZ8765_CHIP_ID: return KSZ8795_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN; - case KSZ8830_CHIP_ID: + case KSZ88X3_CHIP_ID: case KSZ8864_CHIP_ID: case KSZ8895_CHIP_ID: return KSZ8863_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN; @@ -3334,7 +3334,7 @@ phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit) return interface; } -static void ksz8830_phylink_mac_config(struct phylink_config *config, +static void ksz88x3_phylink_mac_config(struct phylink_config *config, unsigned int mode, const struct phylink_link_state *state) { @@ -3518,7 +3518,7 @@ static int ksz_switch_detect(struct ksz_device *dev) break; case KSZ88_FAMILY_ID: if (id2 == KSZ88_CHIP_ID_63) - dev->chip_id = KSZ8830_CHIP_ID; + dev->chip_id = KSZ88X3_CHIP_ID; else return -ENODEV; break; @@ -4592,24 +4592,24 @@ static int ksz9477_drive_strength_write(struct ksz_device *dev, } /** - * ksz8830_drive_strength_write() - Set the drive strength configuration for - * KSZ8830 compatible chip variants. + * ksz88x3_drive_strength_write() - Set the drive strength configuration for + * KSZ8863 compatible chip variants. * @dev: ksz device * @props: Array of drive strength properties to be set * @num_props: Number of properties in the array * - * This function applies the specified drive strength settings to KSZ8830 chip + * This function applies the specified drive strength settings to KSZ88X3 chip * variants (KSZ8873, KSZ8863). * It ensures the configurations align with what the chip variant supports and * warns or errors out on unsupported settings. * * Return: 0 on success, error code otherwise */ -static int ksz8830_drive_strength_write(struct ksz_device *dev, +static int ksz88x3_drive_strength_write(struct ksz_device *dev, struct ksz_driver_strength_prop *props, int num_props) { - size_t array_size = ARRAY_SIZE(ksz8830_drive_strengths); + size_t array_size = ARRAY_SIZE(ksz88x3_drive_strengths); int microamp; int i, ret; @@ -4622,10 +4622,10 @@ static int ksz8830_drive_strength_write(struct ksz_device *dev, } microamp = props[KSZ_DRIVER_STRENGTH_IO].value; - ret = ksz_drive_strength_to_reg(ksz8830_drive_strengths, array_size, + ret = ksz_drive_strength_to_reg(ksz88x3_drive_strengths, array_size, microamp); if (ret < 0) { - ksz_drive_strength_error(dev, ksz8830_drive_strengths, + ksz_drive_strength_error(dev, ksz88x3_drive_strengths, array_size, microamp); return ret; } @@ -4685,8 +4685,8 @@ static int ksz_parse_drive_strength(struct ksz_device *dev) return 0; switch (dev->chip_id) { - case KSZ8830_CHIP_ID: - return ksz8830_drive_strength_write(dev, of_props, + case KSZ88X3_CHIP_ID: + return ksz88x3_drive_strength_write(dev, of_props, ARRAY_SIZE(of_props)); case KSZ8795_CHIP_ID: case KSZ8794_CHIP_ID: diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index e08d5a1339f4..bec846e20682 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -200,7 +200,7 @@ enum ksz_model { KSZ8795, KSZ8794, KSZ8765, - KSZ8830, + KSZ88X3, KSZ8864, KSZ8895, KSZ9477, @@ -628,7 +628,7 @@ static inline bool ksz_is_ksz87xx(struct ksz_device *dev) static inline bool ksz_is_ksz88x3(struct ksz_device *dev) { - return dev->chip_id == KSZ8830_CHIP_ID; + return dev->chip_id == KSZ88X3_CHIP_ID; } static inline bool ksz_is_8895_family(struct ksz_device *dev) diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c index f4287310e89f..e3e341431f09 100644 --- a/drivers/net/dsa/microchip/ksz_spi.c +++ b/drivers/net/dsa/microchip/ksz_spi.c @@ -54,7 +54,7 @@ static int ksz_spi_probe(struct spi_device *spi) if (!chip) return -EINVAL; - if (chip->chip_id == KSZ8830_CHIP_ID) + if (chip->chip_id == KSZ88X3_CHIP_ID) regmap_config = ksz8863_regmap_config; else if (chip->chip_id == KSZ8795_CHIP_ID || chip->chip_id == KSZ8794_CHIP_ID || @@ -137,7 +137,7 @@ static const struct of_device_id ksz_dt_ids[] = { }, { .compatible = "microchip,ksz8863", - .data = &ksz_switch_chips[KSZ8830] + .data = &ksz_switch_chips[KSZ88X3] }, { .compatible = "microchip,ksz8864", @@ -145,7 +145,7 @@ static const struct of_device_id ksz_dt_ids[] = { }, { .compatible = "microchip,ksz8873", - .data = &ksz_switch_chips[KSZ8830] + .data = &ksz_switch_chips[KSZ88X3] }, { .compatible = "microchip,ksz8895", diff --git a/include/linux/platform_data/microchip-ksz.h b/include/linux/platform_data/microchip-ksz.h index d074019474f5..2ee1a679e592 100644 --- a/include/linux/platform_data/microchip-ksz.h +++ b/include/linux/platform_data/microchip-ksz.h @@ -27,7 +27,7 @@ enum ksz_chip_id { KSZ8795_CHIP_ID = 0x8795, KSZ8794_CHIP_ID = 0x8794, KSZ8765_CHIP_ID = 0x8765, - KSZ8830_CHIP_ID = 0x8830, + KSZ88X3_CHIP_ID = 0x8830, KSZ8864_CHIP_ID = 0x8864, KSZ8895_CHIP_ID = 0x8895, KSZ9477_CHIP_ID = 0x00947700,