From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5788F22837F; Tue, 8 Jul 2025 03:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.153.233 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944747; cv=none; b=dlHTJhM/BvpkFwJBBifuRplT3CDG0icQOJ9b4i6TBvN1DlsRLH/jYVWI63bKMOgJaBbfh9nO8Igd+3c85BF0Hwnqi58OLp/NXGkNm7/Rzw/bM9yJSeVVAakeC4ktSk2PObAuKZnFB08Ofu5Lb3ybQyBXXRhA63tB0YVHzCcEr+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944747; c=relaxed/simple; bh=Ivk9CmB5Xpl4qfnnkhGKgkFBDyv2dw7MCTAYbBqMzDA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZHkwYH19puxv6ZPSpyTk0lpadyDpgxwZh1R1l2xRoDPLxbtnMJRZCo05eep6tRMkFiVksU8dUDunrU6MD+xgxm6vJq7RzkRC6FboM8M/QvUudalT2MsoTd+R9tm2QD+m5xXPsUZnYwd4Banw+g3jbtee1++cgZkuzKcXL7GImFU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=uKS6BymJ; arc=none smtp.client-ip=68.232.153.233 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="uKS6BymJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944745; x=1783480745; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ivk9CmB5Xpl4qfnnkhGKgkFBDyv2dw7MCTAYbBqMzDA=; b=uKS6BymJXOlsHSudK++uCzptsDj4HWOE3qtDV4MX1Gn7FzgPR8Ntka3E bXnyQQbu4sav369JEg6XjTA1CQpUZ3Ut39TjXoFPsL+Z7UkOMrN63g550 +SxCaHkTLqKO6NQvYFG/OiBdPzPq7zbL+lqnxSXRPiGn3uBPczUdhQ2oZ kPSlgqtzckZcDgi4t5u9LnIkvsthWwKSQUJSCrDzjb2mWQiIPuDGE0xyo 8+pkQpfkLbPm6fX8h4QvNbYn8JJmBBUvt7ob1rsQaMpCokTBW+IcLHMsM kK9MGaQCsDI7ZrPJuKMBS4B2wO2LJlQ/yXHtpsorOZfemrSYABenfq9ZN g==; X-CSE-ConnectionGUID: 2pvk/woCRhK7m/XLenE80g== X-CSE-MsgGUID: N4hF7oSFQg2/87pMFiWeXQ== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43686943" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:56 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:44 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:44 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 1/6 v2] dt-bindings: net: dsa: microchip: Add KSZ8463 switch support Date: Mon, 7 Jul 2025 20:16:43 -0700 Message-ID: <20250708031648.6703-2-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha KSZ8463 switch is a 3-port switch based from KSZ8863. Its register access is significantly different from the other KSZ SPI switches. Signed-off-by: Tristram Ha Acked-by: Krzysztof Kozlowski Reviewed-by: Andrew Lunn --- Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b= /Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml index 62ca63e8a26f..eb4607460db7 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml @@ -18,6 +18,7 @@ properties: # required and optional properties. compatible: enum: + - microchip,ksz8463 - microchip,ksz8765 - microchip,ksz8794 - microchip,ksz8795 --=20 2.34.1 From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D21AC1DDD1; Tue, 8 Jul 2025 03:17:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944639; cv=none; b=sKPIdt+ywNmFV8tBzkExcP0z93mpSf5E/CE0LjExkG0m9yNuH2nVlZQbosfxqqJ2GPSmExdHuGBHckOY2wyDPzvR2ifEswLnDjoV3sA1D+zRdJQF8ine3hvzxoIYqeAb24nmujA9BlvbPiSsUHwBavdFrSngGENwXaX4MnUQ38Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944639; c=relaxed/simple; bh=6bx/Zz1UqwlsyHy6BhYJRPtyPqCDinDZc1KRINGZhG0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fnflhTsMdYeoxfnGl1WtlCyDCnuLx4CjXrt3Yco57gHOhcbEs728C3zALTSiM9JZ3itM4IRTd1vrNlGn8khveBSAI2KRtFTgRmhqqkMzBCfllr1ivFrDc26rDCjZEnzTjp2/XU5BDwid5hjWFN8CeQeFp96XDr5Ry4tpoJujSgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=Z7W406b5; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Z7W406b5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944635; x=1783480635; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6bx/Zz1UqwlsyHy6BhYJRPtyPqCDinDZc1KRINGZhG0=; b=Z7W406b5idZnnXKWsj3yEiO7c6+sa6wNQw0qPmQuR0g0lUDgoZQL8IaE FgT9OVyrApSb/nbxWSE0/UBj7DGkp+nJcPZOzQ7P/Y5hfJI49xw0E3Ale xOcH8gTPumR0AAx/Ma9/RVC4AQ1UsN5unoh/rcycUU8oben9iJ0J2BdAB 9RZmcbPxzVnojUhyn/0OcD3KvM8hPPWAXHvACA/95ZA8grppfm/jRrVyB lHF9xQs/mV48xPeb9N0+FJr8vv29wTjDgZODGjdhseI7uoPAMjCpIntkR yzO5AhAflnvwRKgSt28B1hQy7RlRq/JxEEY3s59Roc/DKwiDeaP6Nfpx7 g==; X-CSE-ConnectionGUID: cVEISvaDRiehsZPvdpmZNg== X-CSE-MsgGUID: 8aL1KSujTLOZQqVkxDzNYg== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43198298" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:14 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:45 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:44 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 2/6 v2] net: dsa: microchip: Add KSZ8463 switch support to KSZ DSA driver Date: Mon, 7 Jul 2025 20:16:44 -0700 Message-ID: <20250708031648.6703-3-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha KSZ8463 switch is a 3-port switch based from KSZ8863. Its major difference from other KSZ SPI switches is its register access is not a simple continual 8-bit transfer with automatic address increase but uses a byte-enable mechanism specifying 8-bit, 16-bit, or 32-bit access. Its registers are also defined in 16-bit format because it shares a design with a MAC controller using 16-bit access. As a result some common register accesses need to be re-arranged. The 64-bit access used by other switches needs to be broken into 2 32-bit accesses. This patch adds the basic structure for using KSZ8463. It cannot use the same regmap table for other KSZ switches as it interprets the 16-bit value as little-endian and its SPI commands are different. KSZ8463's internal PHYs use standard PHY register definitions so there is no need to remap things. However, the hardware has a bug that the high word and low word of the PHY id are swapped. In addition the port registers are arranged differently so KSZ8463 has its own mapping for port registers and PHY registers. Signed-off-by: Tristram Ha --- drivers/net/dsa/microchip/ksz8.c | 87 +++++++++++++++ drivers/net/dsa/microchip/ksz8.h | 4 + drivers/net/dsa/microchip/ksz8_reg.h | 49 +++++++++ drivers/net/dsa/microchip/ksz_common.c | 114 ++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.h | 33 ++++++ drivers/net/dsa/microchip/ksz_spi.c | 14 +++ include/linux/platform_data/microchip-ksz.h | 1 + 7 files changed, 302 insertions(+) diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/k= sz8.c index be433b4e2b1c..92a720ee1f71 100644 --- a/drivers/net/dsa/microchip/ksz8.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -3,6 +3,7 @@ * Microchip KSZ8XXX series switch driver * * It supports the following switches: + * - KSZ8463 * - KSZ8863, KSZ8873 aka KSZ88X3 * - KSZ8895, KSZ8864 aka KSZ8895 family * - KSZ8794, KSZ8795, KSZ8765 aka KSZ87XX @@ -194,6 +195,7 @@ int ksz8_change_mtu(struct ksz_device *dev, int port, i= nt mtu) case KSZ8794_CHIP_ID: case KSZ8765_CHIP_ID: return ksz8795_change_mtu(dev, frame_size); + case KSZ8463_CHIP_ID: case KSZ88X3_CHIP_ID: case KSZ8864_CHIP_ID: case KSZ8895_CHIP_ID: @@ -1947,6 +1949,91 @@ u32 ksz8_get_port_addr(int port, int offset) return PORT_CTRL_ADDR(port, offset); } =20 +u32 ksz8463_get_port_addr(int port, int offset) +{ + return offset + 0x18 * port; +} + +static inline u16 ksz8463_get_phy_addr(u16 phy, u16 reg, u16 offset) +{ + return offset + reg * 2 + phy * (P2MBCR - P1MBCR); +} + +int ksz8463_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val) +{ + bool processed =3D true; + u16 sw_reg =3D 0; + u16 data; + int ret; + + if (phy > 1) + return -ENOSPC; + switch (reg) { + case MII_PHYSID1: + sw_reg =3D ksz8463_get_phy_addr(phy, 0, PHY1IHR); + break; + case MII_PHYSID2: + sw_reg =3D ksz8463_get_phy_addr(phy, 0, PHY1ILR); + break; + case MII_BMCR: + case MII_BMSR: + case MII_ADVERTISE: + case MII_LPA: + sw_reg =3D ksz8463_get_phy_addr(phy, reg, P1MBCR); + break; + + /* No MMD access. */ + case MII_MMD_CTRL: + case MII_MMD_DATA: + break; + case MII_TPISTATUS: + /* This register holds the PHY interrupt status for simulated + * Micrel KSZ PHY. + */ + data =3D 0x0505; + break; + default: + processed =3D false; + break; + } + if (processed && sw_reg) { + ret =3D ksz_read16(dev, sw_reg, &data); + if (ret) + return ret; + *val =3D data; + } + + return 0; +} + +int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val) +{ + u16 sw_reg =3D 0; + int ret; + + if (phy > 1) + return -ENOSPC; + + /* No write to fiber port. */ + if (dev->ports[phy].fiber) + return 0; + switch (reg) { + case MII_BMCR: + case MII_ADVERTISE: + sw_reg =3D ksz8463_get_phy_addr(phy, reg, P1MBCR); + break; + default: + break; + } + if (sw_reg) { + ret =3D ksz_write16(dev, sw_reg, val); + if (ret) + return ret; + } + + return 0; +} + int ksz8_switch_init(struct ksz_device *dev) { dev->cpu_port =3D fls(dev->info->cpu_ports) - 1; diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/k= sz8.h index e1c79ff97123..0f2cd1474b44 100644 --- a/drivers/net/dsa/microchip/ksz8.h +++ b/drivers/net/dsa/microchip/ksz8.h @@ -63,4 +63,8 @@ void ksz8_phylink_mac_link_up(struct phylink_config *conf= ig, bool tx_pause, bool rx_pause); int ksz8_all_queues_split(struct ksz_device *dev, int queues); =20 +u32 ksz8463_get_port_addr(int port, int offset); +int ksz8463_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val); +int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val); + #endif diff --git a/drivers/net/dsa/microchip/ksz8_reg.h b/drivers/net/dsa/microch= ip/ksz8_reg.h index 329688603a58..8f5845812383 100644 --- a/drivers/net/dsa/microchip/ksz8_reg.h +++ b/drivers/net/dsa/microchip/ksz8_reg.h @@ -729,6 +729,55 @@ #define PHY_POWER_SAVING_ENABLE BIT(2) #define PHY_REMOTE_LOOPBACK BIT(1) =20 +/* KSZ8463 specific registers. */ +#define P1MBCR 0x4C +#define P1MBSR 0x4E +#define PHY1ILR 0x50 +#define PHY1IHR 0x52 +#define P1ANAR 0x54 +#define P1ANLPR 0x58 +#define P2MBCR 0x58 +#define P2MBSR 0x5A +#define PHY2ILR 0x5C +#define PHY2IHR 0x5E +#define P2ANAR 0x60 +#define P2ANLPR 0x62 + +#define P1CR1 0x6C +#define P1CR2 0x6E +#define P1CR3 0x72 +#define P1CR4 0x7E +#define P1SR 0x80 + +#define KSZ8463_FLUSH_TABLE_CTRL 0xAD + +#define KSZ8463_FLUSH_DYN_MAC_TABLE BIT(2) +#define KSZ8463_FLUSH_STA_MAC_TABLE BIT(1) + +#define KSZ8463_REG_SW_CTRL_9 0xAE + +#define KSZ8463_REG_CFG_CTRL 0xD8 + +#define PORT_2_COPPER_MODE BIT(7) +#define PORT_1_COPPER_MODE BIT(6) +#define PORT_COPPER_MODE_S 6 + +#define KSZ8463_REG_SW_RESET 0x126 + +#define KSZ8463_GLOBAL_SOFTWARE_RESET BIT(0) + +#define KSZ8463_PTP_CLK_CTRL 0x600 + +#define PTP_CLK_ENABLE BIT(1) + +#define KSZ8463_PTP_MSG_CONF1 0x620 + +#define PTP_ENABLE BIT(6) + +#define KSZ8463_REG_DSP_CTRL_6 0x734 + +#define COPPER_RECEIVE_ADJUSTMENT BIT(13) + /* Chip resource */ =20 #define PRIO_QUEUES 4 diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 6e1daf0018bc..095e647b3897 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -331,6 +331,38 @@ static const struct phylink_mac_ops ksz8_phylink_mac_o= ps =3D { .mac_enable_tx_lpi =3D ksz_phylink_mac_enable_tx_lpi, }; =20 +static const struct ksz_dev_ops ksz8463_dev_ops =3D { + .setup =3D ksz8_setup, + .get_port_addr =3D ksz8463_get_port_addr, + .cfg_port_member =3D ksz8_cfg_port_member, + .flush_dyn_mac_table =3D ksz8_flush_dyn_mac_table, + .port_setup =3D ksz8_port_setup, + .r_phy =3D ksz8463_r_phy, + .w_phy =3D ksz8463_w_phy, + .r_mib_cnt =3D ksz8_r_mib_cnt, + .r_mib_pkt =3D ksz8_r_mib_pkt, + .r_mib_stat64 =3D ksz88xx_r_mib_stats64, + .freeze_mib =3D ksz8_freeze_mib, + .port_init_cnt =3D ksz8_port_init_cnt, + .fdb_dump =3D ksz8_fdb_dump, + .fdb_add =3D ksz8_fdb_add, + .fdb_del =3D ksz8_fdb_del, + .mdb_add =3D ksz8_mdb_add, + .mdb_del =3D ksz8_mdb_del, + .vlan_filtering =3D ksz8_port_vlan_filtering, + .vlan_add =3D ksz8_port_vlan_add, + .vlan_del =3D ksz8_port_vlan_del, + .mirror_add =3D ksz8_port_mirror_add, + .mirror_del =3D ksz8_port_mirror_del, + .get_caps =3D ksz8_get_caps, + .config_cpu_port =3D ksz8_config_cpu_port, + .enable_stp_addr =3D ksz8_enable_stp_addr, + .reset =3D ksz8_reset_switch, + .init =3D ksz8_switch_init, + .exit =3D ksz8_switch_exit, + .change_mtu =3D ksz8_change_mtu, +}; + static const struct ksz_dev_ops ksz88xx_dev_ops =3D { .setup =3D ksz8_setup, .get_port_addr =3D ksz8_get_port_addr, @@ -517,6 +549,60 @@ static const struct ksz_dev_ops lan937x_dev_ops =3D { .exit =3D lan937x_switch_exit, }; =20 +static const u16 ksz8463_regs[] =3D { + [REG_SW_MAC_ADDR] =3D 0x10, + [REG_IND_CTRL_0] =3D 0x30, + [REG_IND_DATA_8] =3D 0x26, + [REG_IND_DATA_CHECK] =3D 0x26, + [REG_IND_DATA_HI] =3D 0x28, + [REG_IND_DATA_LO] =3D 0x2C, + [REG_IND_MIB_CHECK] =3D 0x2F, + [P_FORCE_CTRL] =3D 0x0C, + [P_LINK_STATUS] =3D 0x0E, + [P_LOCAL_CTRL] =3D 0x0C, + [P_NEG_RESTART_CTRL] =3D 0x0D, + [P_REMOTE_STATUS] =3D 0x0E, + [P_SPEED_STATUS] =3D 0x0F, + [S_TAIL_TAG_CTRL] =3D 0xAD, + [P_STP_CTRL] =3D 0x6F, + [S_START_CTRL] =3D 0x01, + [S_BROADCAST_CTRL] =3D 0x06, + [S_MULTICAST_CTRL] =3D 0x04, +}; + +static const u32 ksz8463_masks[] =3D { + [PORT_802_1P_REMAPPING] =3D BIT(3), + [SW_TAIL_TAG_ENABLE] =3D BIT(0), + [MIB_COUNTER_OVERFLOW] =3D BIT(7), + [MIB_COUNTER_VALID] =3D BIT(6), + [VLAN_TABLE_FID] =3D GENMASK(15, 12), + [VLAN_TABLE_MEMBERSHIP] =3D GENMASK(18, 16), + [VLAN_TABLE_VALID] =3D BIT(19), + [STATIC_MAC_TABLE_VALID] =3D BIT(19), + [STATIC_MAC_TABLE_USE_FID] =3D BIT(21), + [STATIC_MAC_TABLE_FID] =3D GENMASK(25, 22), + [STATIC_MAC_TABLE_OVERRIDE] =3D BIT(20), + [STATIC_MAC_TABLE_FWD_PORTS] =3D GENMASK(18, 16), + [DYNAMIC_MAC_TABLE_ENTRIES_H] =3D GENMASK(1, 0), + [DYNAMIC_MAC_TABLE_MAC_EMPTY] =3D BIT(2), + [DYNAMIC_MAC_TABLE_NOT_READY] =3D BIT(7), + [DYNAMIC_MAC_TABLE_ENTRIES] =3D GENMASK(31, 24), + [DYNAMIC_MAC_TABLE_FID] =3D GENMASK(19, 16), + [DYNAMIC_MAC_TABLE_SRC_PORT] =3D GENMASK(21, 20), + [DYNAMIC_MAC_TABLE_TIMESTAMP] =3D GENMASK(23, 22), +}; + +static u8 ksz8463_shifts[] =3D { + [VLAN_TABLE_MEMBERSHIP_S] =3D 16, + [STATIC_MAC_FWD_PORTS] =3D 16, + [STATIC_MAC_FID] =3D 22, + [DYNAMIC_MAC_ENTRIES_H] =3D 8, + [DYNAMIC_MAC_ENTRIES] =3D 24, + [DYNAMIC_MAC_FID] =3D 16, + [DYNAMIC_MAC_TIMESTAMP] =3D 22, + [DYNAMIC_MAC_SRC_PORT] =3D 20, +}; + static const u16 ksz8795_regs[] =3D { [REG_SW_MAC_ADDR] =3D 0x68, [REG_IND_CTRL_0] =3D 0x6E, @@ -1387,6 +1473,29 @@ static const struct regmap_access_table ksz8873_regi= ster_set =3D { }; =20 const struct ksz_chip_data ksz_switch_chips[] =3D { + [KSZ8463] =3D { + .chip_id =3D KSZ8463_CHIP_ID, + .dev_name =3D "KSZ8463", + .num_vlans =3D 16, + .num_alus =3D 0, + .num_statics =3D 8, + .cpu_ports =3D 0x4, /* can be configured as cpu port */ + .port_cnt =3D 3, + .num_tx_queues =3D 4, + .num_ipms =3D 4, + .ops =3D &ksz8463_dev_ops, + .phylink_mac_ops =3D &ksz88x3_phylink_mac_ops, + .mib_names =3D ksz88xx_mib_names, + .mib_cnt =3D ARRAY_SIZE(ksz88xx_mib_names), + .reg_mib_cnt =3D MIB_COUNTER_NUM, + .regs =3D ksz8463_regs, + .masks =3D ksz8463_masks, + .shifts =3D ksz8463_shifts, + .supports_mii =3D {false, false, true}, + .supports_rmii =3D {false, false, true}, + .internal_phy =3D {true, true, false}, + }, + [KSZ8563] =3D { .chip_id =3D KSZ8563_CHIP_ID, .dev_name =3D "KSZ8563", @@ -3400,6 +3509,7 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(str= uct dsa_switch *ds, proto =3D DSA_TAG_PROTO_KSZ8795; =20 if (dev->chip_id =3D=3D KSZ88X3_CHIP_ID || + dev->chip_id =3D=3D KSZ8463_CHIP_ID || dev->chip_id =3D=3D KSZ8563_CHIP_ID || dev->chip_id =3D=3D KSZ9893_CHIP_ID || dev->chip_id =3D=3D KSZ9563_CHIP_ID) @@ -3512,6 +3622,7 @@ static int ksz_max_mtu(struct dsa_switch *ds, int por= t) case KSZ8794_CHIP_ID: case KSZ8765_CHIP_ID: return KSZ8795_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN; + case KSZ8463_CHIP_ID: case KSZ88X3_CHIP_ID: case KSZ8864_CHIP_ID: case KSZ8895_CHIP_ID: @@ -3866,6 +3977,9 @@ static int ksz_switch_detect(struct ksz_device *dev) id2 =3D FIELD_GET(SW_CHIP_ID_M, id16); =20 switch (id1) { + case KSZ84_FAMILY_ID: + dev->chip_id =3D KSZ8463_CHIP_ID; + break; case KSZ87_FAMILY_ID: if (id2 =3D=3D KSZ87_CHIP_ID_95) { u8 val; diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/micro= chip/ksz_common.h index a08417df2ca4..3ffca7054983 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -222,6 +222,7 @@ struct ksz_device { =20 /* List of supported models */ enum ksz_model { + KSZ8463, KSZ8563, KSZ8567, KSZ8795, @@ -761,6 +762,7 @@ static inline bool ksz_is_sgmii_port(struct ksz_device = *dev, int port) #define REG_CHIP_ID0 0x00 =20 #define SW_FAMILY_ID_M GENMASK(15, 8) +#define KSZ84_FAMILY_ID 0x84 #define KSZ87_FAMILY_ID 0x87 #define KSZ88_FAMILY_ID 0x88 #define KSZ8895_FAMILY_ID 0x95 @@ -906,6 +908,9 @@ static inline bool ksz_is_sgmii_port(struct ksz_device = *dev, int port) #define KSZ_SPI_OP_RD 3 #define KSZ_SPI_OP_WR 2 =20 +#define KSZ8463_SPI_OP_RD 0 +#define KSZ8463_SPI_OP_WR 1 + #define swabnot_used(x) 0 =20 #define KSZ_SPI_OP_FLAG_MASK(opcode, swp, regbits, regpad) \ @@ -939,4 +944,32 @@ static inline bool ksz_is_sgmii_port(struct ksz_device= *dev, int port) [KSZ_REGMAP_32] =3D KSZ_REGMAP_ENTRY(32, swp, (regbits), (regpad), (rega= lign)), \ } =20 +#define KSZ8463_REGMAP_ENTRY(width, swp, regbits, regpad, regalign) \ + { \ + .name =3D #width, \ + .val_bits =3D (width), \ + .reg_stride =3D 1, \ + .reg_bits =3D (regbits) + (regalign), \ + .pad_bits =3D (regpad), \ + .max_register =3D BIT(regbits) - 1, \ + .cache_type =3D REGCACHE_NONE, \ + .read_flag_mask =3D \ + KSZ_SPI_OP_FLAG_MASK(KSZ8463_SPI_OP_RD, swp, \ + regbits, regpad), \ + .write_flag_mask =3D \ + KSZ_SPI_OP_FLAG_MASK(KSZ8463_SPI_OP_WR, swp, \ + regbits, regpad), \ + .lock =3D ksz_regmap_lock, \ + .unlock =3D ksz_regmap_unlock, \ + .reg_format_endian =3D REGMAP_ENDIAN_BIG, \ + .val_format_endian =3D REGMAP_ENDIAN_LITTLE \ + } + +#define KSZ8463_REGMAP_TABLE(ksz, swp, regbits, regpad, regalign) \ + static const struct regmap_config ksz##_regmap_config[] =3D { \ + [KSZ_REGMAP_8] =3D KSZ8463_REGMAP_ENTRY(8, swp, (regbits), (regpad), (re= galign)), \ + [KSZ_REGMAP_16] =3D KSZ8463_REGMAP_ENTRY(16, swp, (regbits), (regpad), (= regalign)), \ + [KSZ_REGMAP_32] =3D KSZ8463_REGMAP_ENTRY(32, swp, (regbits), (regpad), (= regalign)), \ + } + #endif diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchi= p/ksz_spi.c index b633d263098c..d7ce2d1cc3f0 100644 --- a/drivers/net/dsa/microchip/ksz_spi.c +++ b/drivers/net/dsa/microchip/ksz_spi.c @@ -16,6 +16,10 @@ =20 #include "ksz_common.h" =20 +#define KSZ8463_SPI_ADDR_SHIFT 13 +#define KSZ8463_SPI_ADDR_ALIGN 1 +#define KSZ8463_SPI_TURNAROUND_SHIFT 2 + #define KSZ8795_SPI_ADDR_SHIFT 12 #define KSZ8795_SPI_ADDR_ALIGN 3 #define KSZ8795_SPI_TURNAROUND_SHIFT 1 @@ -28,6 +32,9 @@ #define KSZ9477_SPI_ADDR_ALIGN 3 #define KSZ9477_SPI_TURNAROUND_SHIFT 5 =20 +KSZ8463_REGMAP_TABLE(ksz8463, 16, KSZ8463_SPI_ADDR_SHIFT, + KSZ8463_SPI_TURNAROUND_SHIFT, KSZ8463_SPI_ADDR_ALIGN); + KSZ_REGMAP_TABLE(ksz8795, 16, KSZ8795_SPI_ADDR_SHIFT, KSZ8795_SPI_TURNAROUND_SHIFT, KSZ8795_SPI_ADDR_ALIGN); =20 @@ -58,6 +65,8 @@ static int ksz_spi_probe(struct spi_device *spi) dev->chip_id =3D chip->chip_id; if (chip->chip_id =3D=3D KSZ88X3_CHIP_ID) regmap_config =3D ksz8863_regmap_config; + else if (chip->chip_id =3D=3D KSZ8463_CHIP_ID) + regmap_config =3D ksz8463_regmap_config; else if (chip->chip_id =3D=3D KSZ8795_CHIP_ID || chip->chip_id =3D=3D KSZ8794_CHIP_ID || chip->chip_id =3D=3D KSZ8765_CHIP_ID) @@ -125,6 +134,10 @@ static void ksz_spi_shutdown(struct spi_device *spi) } =20 static const struct of_device_id ksz_dt_ids[] =3D { + { + .compatible =3D "microchip,ksz8463", + .data =3D &ksz_switch_chips[KSZ8463] + }, { .compatible =3D "microchip,ksz8765", .data =3D &ksz_switch_chips[KSZ8765] @@ -214,6 +227,7 @@ static const struct of_device_id ksz_dt_ids[] =3D { MODULE_DEVICE_TABLE(of, ksz_dt_ids); =20 static const struct spi_device_id ksz_spi_ids[] =3D { + { "ksz8463" }, { "ksz8765" }, { "ksz8794" }, { "ksz8795" }, diff --git a/include/linux/platform_data/microchip-ksz.h b/include/linux/pl= atform_data/microchip-ksz.h index 0e0e8fe6975f..028781ad4059 100644 --- a/include/linux/platform_data/microchip-ksz.h +++ b/include/linux/platform_data/microchip-ksz.h @@ -23,6 +23,7 @@ #include =20 enum ksz_chip_id { + KSZ8463_CHIP_ID =3D 0x8463, KSZ8563_CHIP_ID =3D 0x8563, KSZ8795_CHIP_ID =3D 0x8795, KSZ8794_CHIP_ID =3D 0x8794, --=20 2.34.1 From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FB1927455; Tue, 8 Jul 2025 03:17:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944639; cv=none; b=XYPHMUzsT14IXBCinlcqaoSbHwvbIAYeGdu6Hha/Jbu0TaHcjKVPtWAADHGETNGJ/s/IVqdjBBaRRr5jLjvNFxUZrqESVnUzusyLLui+LdGogiTL83cb55b79VjuLsbsJF+vvoda2iUERomjxZQWbFCH+gYemfjuJ3wCIEEjvv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944639; c=relaxed/simple; bh=yStGgUDYbWBkiH5IdJRndUHQ2yUN1Owjo5N7S/Ai+bU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u93haz214QXZcxNGsfpCaIMD3qx6JYQs/9xeCGmHA8YKAuH3+JRphzodE3uwE4cMTPZP8cfBUwS/k6auMKqdlSZZ4QaH1NnwJAXpi4wEE7KdLln2teb5iCwDWxuGbwp0UbglE82TI9HtZo/PbY3WOjKdPO2M/XZ4eUWn0k2AnqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=e7zNxxXM; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="e7zNxxXM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944637; x=1783480637; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yStGgUDYbWBkiH5IdJRndUHQ2yUN1Owjo5N7S/Ai+bU=; b=e7zNxxXM5l574BNQZecQNqJcwrIsdsur7dJ53b9t/yVoVoPrYad85gpU 5kvu1tM/Y+B4tomz7FsXsI2Vj6qMeAnw/gac0ufywO9kOxBRuUvfHae3f cXIUqt+RdTgJhYeAYagUuz4US2CFl7RbxXaHsYgaPO74kGbCH/BUhZJRF eosSsrYKXY+BRRgKjK38tC7PmqAPChnzPqVPcCN9KH+6f52KlpKZB3ISb R8Q+2FVi5ISkKM4ugI6k/jTbeWu5YNOm4y8/jbRLWiiIvy3EPG9PLQ5Tj yo3u0HUW1T8DtKWGSULusrIsp4gfSipk0TP6JEWnVqw3H8jTXzGCTeeW3 A==; X-CSE-ConnectionGUID: cVEISvaDRiehsZPvdpmZNg== X-CSE-MsgGUID: mMHZchAPTMmH27enKIWLLA== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43198300" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:15 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:45 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:45 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 3/6 v2] net: dsa: microchip: Transform register for use with KSZ8463 Date: Mon, 7 Jul 2025 20:16:45 -0700 Message-ID: <20250708031648.6703-4-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha KSZ8463 uses a byte-enable mechanism to specify 8-bit, 16-bit, and 32-bit access. The register is first shifted right by 2 then left by 4. Extra 4 bits are added. If the access is 8-bit one of the 4 bits is set. If the access is 16-bit two of the 4 bits are set. If the access is 32-bit all 4 bits are set. The SPI command for read or write is then added. As there are no automatic address increase and continuous SPI transfer the 64-bit access needs to broken into 2 32-bit accesses. All common access functions in ksz_common.h are updated to include register transformation call so that the correct register access is used for KSZ8463. KSZ8463/KSZ8795/KSZ8863/KSZ8895 common code for switch access is updated to include the register transformation function if common access functions in ksz_common.h are not used. In addition PORT_CTRL_ADDR is replaced with the get_port_addr helper function as KSZ8463 has different port register arrangement. Signed-off-by: Tristram Ha --- drivers/net/dsa/microchip/ksz8.c | 10 ++-- drivers/net/dsa/microchip/ksz_common.c | 5 +- drivers/net/dsa/microchip/ksz_common.h | 71 +++++++++++++++++++++----- 3 files changed, 67 insertions(+), 19 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/k= sz8.c index 92a720ee1f71..f0c6049afe51 100644 --- a/drivers/net/dsa/microchip/ksz8.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -36,13 +36,15 @@ =20 static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set) { - regmap_update_bits(ksz_regmap_8(dev), addr, bits, set ? bits : 0); + regmap_update_bits(ksz_regmap_8(dev), reg8(dev, addr), bits, + set ? bits : 0); } =20 static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 = bits, bool set) { - regmap_update_bits(ksz_regmap_8(dev), PORT_CTRL_ADDR(port, offset), + regmap_update_bits(ksz_regmap_8(dev), + reg8(dev, dev->dev_ops->get_port_addr(port, offset)), bits, set ? bits : 0); } =20 @@ -1888,14 +1890,14 @@ int ksz8_setup(struct dsa_switch *ds) ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true); =20 /* Enable aggressive back off algorithm in half duplex mode. */ - regmap_update_bits(ksz_regmap_8(dev), REG_SW_CTRL_1, + regmap_update_bits(ksz_regmap_8(dev), reg8(dev, REG_SW_CTRL_1), SW_AGGR_BACKOFF, SW_AGGR_BACKOFF); =20 /* * Make sure unicast VLAN boundary is set as default and * enable no excessive collision drop. */ - regmap_update_bits(ksz_regmap_8(dev), REG_SW_CTRL_2, + regmap_update_bits(ksz_regmap_8(dev), reg8(dev, REG_SW_CTRL_2), UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP, UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP); =20 diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 095e647b3897..5261747b7753 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2991,7 +2991,8 @@ static int ksz_setup(struct dsa_switch *ds) =20 ds->num_tx_queues =3D dev->info->num_tx_queues; =20 - regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL], + regmap_update_bits(ksz_regmap_8(dev), + reg8(dev, regs[S_MULTICAST_CTRL]), MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE); =20 ksz_init_mib_timer(dev); @@ -3051,7 +3052,7 @@ static int ksz_setup(struct dsa_switch *ds) goto out_ptp_clock_unregister; =20 /* start switch */ - regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL], + regmap_update_bits(ksz_regmap_8(dev), reg8(dev, regs[S_START_CTRL]), SW_START, SW_START); =20 return 0; diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/micro= chip/ksz_common.h index 3ffca7054983..cdf89e50238a 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -485,10 +485,36 @@ static inline struct regmap *ksz_regmap_32(struct ksz= _device *dev) return dev->regmap[KSZ_REGMAP_32]; } =20 +static inline bool ksz_is_ksz8463(struct ksz_device *dev) +{ + return dev->chip_id =3D=3D KSZ8463_CHIP_ID; +} + +static inline u32 reg8(struct ksz_device *dev, u32 reg) +{ + if (ksz_is_ksz8463(dev)) + return ((reg >> 2) << 4) | (1 << (reg & 3)); + return reg; +} + +static inline u32 reg16(struct ksz_device *dev, u32 reg) +{ + if (ksz_is_ksz8463(dev)) + return ((reg >> 2) << 4) | (reg & 2 ? 0x0c : 0x03); + return reg; +} + +static inline u32 reg32(struct ksz_device *dev, u32 reg) +{ + if (ksz_is_ksz8463(dev)) + return ((reg >> 2) << 4) | 0xf; + return reg; +} + static inline int ksz_read8(struct ksz_device *dev, u32 reg, u8 *val) { unsigned int value; - int ret =3D regmap_read(ksz_regmap_8(dev), reg, &value); + int ret =3D regmap_read(ksz_regmap_8(dev), reg8(dev, reg), &value); =20 if (ret) dev_err(dev->dev, "can't read 8bit reg: 0x%x %pe\n", reg, @@ -501,7 +527,7 @@ static inline int ksz_read8(struct ksz_device *dev, u32= reg, u8 *val) static inline int ksz_read16(struct ksz_device *dev, u32 reg, u16 *val) { unsigned int value; - int ret =3D regmap_read(ksz_regmap_16(dev), reg, &value); + int ret =3D regmap_read(ksz_regmap_16(dev), reg16(dev, reg), &value); =20 if (ret) dev_err(dev->dev, "can't read 16bit reg: 0x%x %pe\n", reg, @@ -514,7 +540,7 @@ static inline int ksz_read16(struct ksz_device *dev, u3= 2 reg, u16 *val) static inline int ksz_read32(struct ksz_device *dev, u32 reg, u32 *val) { unsigned int value; - int ret =3D regmap_read(ksz_regmap_32(dev), reg, &value); + int ret =3D regmap_read(ksz_regmap_32(dev), reg32(dev, reg), &value); =20 if (ret) dev_err(dev->dev, "can't read 32bit reg: 0x%x %pe\n", reg, @@ -529,7 +555,17 @@ static inline int ksz_read64(struct ksz_device *dev, u= 32 reg, u64 *val) u32 value[2]; int ret; =20 - ret =3D regmap_bulk_read(ksz_regmap_32(dev), reg, value, 2); + if (ksz_is_ksz8463(dev)) { + int i; + + for (i =3D 0; i < 2; i++) + ret =3D regmap_read(ksz_regmap_32(dev), + reg32(dev, reg + i * 4), + &value[i]); + *val =3D (u64)value[0] << 32 | value[1]; + return ret; + } + ret =3D regmap_bulk_read(ksz_regmap_32(dev), reg32(dev, reg), value, 2); if (ret) dev_err(dev->dev, "can't read 64bit reg: 0x%x %pe\n", reg, ERR_PTR(ret)); @@ -543,7 +579,7 @@ static inline int ksz_write8(struct ksz_device *dev, u3= 2 reg, u8 value) { int ret; =20 - ret =3D regmap_write(ksz_regmap_8(dev), reg, value); + ret =3D regmap_write(ksz_regmap_8(dev), reg8(dev, reg), value); if (ret) dev_err(dev->dev, "can't write 8bit reg: 0x%x %pe\n", reg, ERR_PTR(ret)); @@ -555,7 +591,7 @@ static inline int ksz_write16(struct ksz_device *dev, u= 32 reg, u16 value) { int ret; =20 - ret =3D regmap_write(ksz_regmap_16(dev), reg, value); + ret =3D regmap_write(ksz_regmap_16(dev), reg16(dev, reg), value); if (ret) dev_err(dev->dev, "can't write 16bit reg: 0x%x %pe\n", reg, ERR_PTR(ret)); @@ -567,7 +603,7 @@ static inline int ksz_write32(struct ksz_device *dev, u= 32 reg, u32 value) { int ret; =20 - ret =3D regmap_write(ksz_regmap_32(dev), reg, value); + ret =3D regmap_write(ksz_regmap_32(dev), reg32(dev, reg), value); if (ret) dev_err(dev->dev, "can't write 32bit reg: 0x%x %pe\n", reg, ERR_PTR(ret)); @@ -580,7 +616,7 @@ static inline int ksz_rmw16(struct ksz_device *dev, u32= reg, u16 mask, { int ret; =20 - ret =3D regmap_update_bits(ksz_regmap_16(dev), reg, mask, value); + ret =3D regmap_update_bits(ksz_regmap_16(dev), reg16(dev, reg), mask, val= ue); if (ret) dev_err(dev->dev, "can't rmw 16bit reg 0x%x: %pe\n", reg, ERR_PTR(ret)); @@ -593,7 +629,7 @@ static inline int ksz_rmw32(struct ksz_device *dev, u32= reg, u32 mask, { int ret; =20 - ret =3D regmap_update_bits(ksz_regmap_32(dev), reg, mask, value); + ret =3D regmap_update_bits(ksz_regmap_32(dev), reg32(dev, reg), mask, val= ue); if (ret) dev_err(dev->dev, "can't rmw 32bit reg 0x%x: %pe\n", reg, ERR_PTR(ret)); @@ -610,14 +646,22 @@ static inline int ksz_write64(struct ksz_device *dev,= u32 reg, u64 value) val[0] =3D swab32(value & 0xffffffffULL); val[1] =3D swab32(value >> 32ULL); =20 - return regmap_bulk_write(ksz_regmap_32(dev), reg, val, 2); + if (ksz_is_ksz8463(dev)) { + int i, ret; + + for (i =3D 0; i < 2; i++) + ret =3D regmap_write(ksz_regmap_32(dev), + reg32(dev, reg + i * 4), val[i]); + return ret; + } + return regmap_bulk_write(ksz_regmap_32(dev), reg32(dev, reg), val, 2); } =20 static inline int ksz_rmw8(struct ksz_device *dev, int offset, u8 mask, u8= val) { int ret; =20 - ret =3D regmap_update_bits(ksz_regmap_8(dev), offset, mask, val); + ret =3D regmap_update_bits(ksz_regmap_8(dev), reg8(dev, offset), mask, va= l); if (ret) dev_err(dev->dev, "can't rmw 8bit reg 0x%x: %pe\n", offset, ERR_PTR(ret)); @@ -710,12 +754,13 @@ static inline bool ksz_is_8895_family(struct ksz_devi= ce *dev) static inline bool is_ksz8(struct ksz_device *dev) { return ksz_is_ksz87xx(dev) || ksz_is_ksz88x3(dev) || - ksz_is_8895_family(dev); + ksz_is_8895_family(dev) || ksz_is_ksz8463(dev); } =20 static inline bool is_ksz88xx(struct ksz_device *dev) { - return ksz_is_ksz88x3(dev) || ksz_is_8895_family(dev); + return ksz_is_ksz88x3(dev) || ksz_is_8895_family(dev) || + ksz_is_ksz8463(dev); } =20 static inline bool is_ksz9477(struct ksz_device *dev) --=20 2.34.1 From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45EC97DA9C; Tue, 8 Jul 2025 03:17:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; cv=none; b=Mfm7QVbXtSZEKWJQcpx0GWJqiR+ar5f3ua454ER5utD7o2AVs0ky2fg9vnMIJ5l6EqmJOVGGDZamrmyp9/6U80nI8D/9tq/o25Q3D8TY39LPBGjMM2Y/SHAU1uUtQLJv/3GKuHGGTr0RsnqHoY87++Iq/Z5xN5DZN4M3wZitF/U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; c=relaxed/simple; bh=TPIb0xPK187K7rLue1DLpFCg5Yh7MklSC0DJpXh+ee4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i06WOXWQ6TLpZUoGYElakRGIKyiAvvyoYQqLufVARxDsCdJZl6xLDkIlDIlRFo9x4WZlFKXQP55KnSWFVW0+FRkE+u733SRR9U0Lz7U6el5NHV5sDPRk7eV0MkjAiO2EQAkCbvGzFaqST0nkWMf5ilE0vjTlev2fssgA2eQ21lA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=fUhZlEwk; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="fUhZlEwk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944639; x=1783480639; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TPIb0xPK187K7rLue1DLpFCg5Yh7MklSC0DJpXh+ee4=; b=fUhZlEwk723SyoIeLBZ5VU90X/XoTvz1o0DZg6+Jp7ygPx+8V5x2Ezfm ivF/EKpRhHC9iGQD/es0phRyYbadQapdWTE5ZMhEmhkX+s8mXnYWg1hWG 5Ucvfw/COwlUGkDD/g3weqOMVX9eklF+ZAEQR87jnN9pNatmEjyxhLo5P xzdvpavikS/fL/whhU5ukM4Cbq48NkpZnuQLAO5/EQ0EPzqK0r4NQ9Qz6 nIHCRD/94uSdrCPtBaEySl5Bvhp3CC/h1PcA1YBqDk6dwxbuEit4Kq2gp ZIF6VvDRiSeTVGZMPBdZMb/raJyAx2dIFH9/y0puTeSRyQemjP45TI6UY w==; X-CSE-ConnectionGUID: cVEISvaDRiehsZPvdpmZNg== X-CSE-MsgGUID: RaoMSu4ITc6n/SZ2t2Hj0w== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43198301" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:16 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:46 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:46 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 4/6 v2] net: dsa: microchip: Use different registers for KSZ8463 Date: Mon, 7 Jul 2025 20:16:46 -0700 Message-ID: <20250708031648.6703-5-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha KSZ8463 does not use same set of registers as KSZ8863 so it is necessary to change some registers when using KSZ8463. Signed-off-by: Tristram Ha --- drivers/net/dsa/microchip/ksz8.c | 78 +++++++++++++++++++------- drivers/net/dsa/microchip/ksz_common.c | 35 +++++++++--- drivers/net/dsa/microchip/ksz_dcb.c | 10 +++- 3 files changed, 94 insertions(+), 29 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/k= sz8.c index f0c6049afe51..904db68e11f3 100644 --- a/drivers/net/dsa/microchip/ksz8.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -143,6 +143,11 @@ int ksz8_reset_switch(struct ksz_device *dev) KSZ8863_GLOBAL_SOFTWARE_RESET | KSZ8863_PCS_RESET, true); ksz_cfg(dev, KSZ8863_REG_SW_RESET, KSZ8863_GLOBAL_SOFTWARE_RESET | KSZ8863_PCS_RESET, false); + } else if (ksz_is_ksz8463(dev)) { + ksz_cfg(dev, KSZ8463_REG_SW_RESET, + KSZ8463_GLOBAL_SOFTWARE_RESET, true); + ksz_cfg(dev, KSZ8463_REG_SW_RESET, + KSZ8463_GLOBAL_SOFTWARE_RESET, false); } else { /* reset switch */ ksz_write8(dev, REG_POWER_MANAGEMENT_1, @@ -231,6 +236,11 @@ static int ksz8_port_queue_split(struct ksz_device *de= v, int port, int queues) WEIGHTED_FAIR_QUEUE_ENABLE); if (ret) return ret; + } else if (ksz_is_ksz8463(dev)) { + mask_4q =3D KSZ8873_PORT_4QUEUE_SPLIT_EN; + mask_2q =3D KSZ8873_PORT_2QUEUE_SPLIT_EN; + reg_4q =3D P1CR1; + reg_2q =3D P1CR1 + 1; } else { mask_4q =3D KSZ8795_PORT_4QUEUE_SPLIT_EN; mask_2q =3D KSZ8795_PORT_2QUEUE_SPLIT_EN; @@ -1269,12 +1279,15 @@ int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16= reg, u16 val) =20 void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member) { + int offset =3D P_MIRROR_CTRL; u8 data; =20 - ksz_pread8(dev, port, P_MIRROR_CTRL, &data); - data &=3D ~PORT_VLAN_MEMBERSHIP; + if (ksz_is_ksz8463(dev)) + offset =3D P1CR2; + ksz_pread8(dev, port, offset, &data); + data &=3D ~dev->port_mask; data |=3D (member & dev->port_mask); - ksz_pwrite8(dev, port, P_MIRROR_CTRL, data); + ksz_pwrite8(dev, port, offset, data); } =20 void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port) @@ -1282,6 +1295,8 @@ void ksz8_flush_dyn_mac_table(struct ksz_device *dev,= int port) u8 learn[DSA_MAX_PORTS]; int first, index, cnt; const u16 *regs; + int reg =3D S_FLUSH_TABLE_CTRL; + int mask =3D SW_FLUSH_DYN_MAC_TABLE; =20 regs =3D dev->info->regs; =20 @@ -1299,7 +1314,11 @@ void ksz8_flush_dyn_mac_table(struct ksz_device *dev= , int port) ksz_pwrite8(dev, index, regs[P_STP_CTRL], learn[index] | PORT_LEARN_DISABLE); } - ksz_cfg(dev, S_FLUSH_TABLE_CTRL, SW_FLUSH_DYN_MAC_TABLE, true); + if (ksz_is_ksz8463(dev)) { + reg =3D KSZ8463_FLUSH_TABLE_CTRL; + mask =3D KSZ8463_FLUSH_DYN_MAC_TABLE; + } + ksz_cfg(dev, reg, mask, true); for (index =3D first; index < cnt; index++) { if (!(learn[index] & PORT_LEARN_DISABLE)) ksz_pwrite8(dev, index, regs[P_STP_CTRL], learn[index]); @@ -1438,7 +1457,7 @@ int ksz8_fdb_del(struct ksz_device *dev, int port, co= nst unsigned char *addr, int ksz8_port_vlan_filtering(struct ksz_device *dev, int port, bool flag, struct netlink_ext_ack *extack) { - if (ksz_is_ksz88x3(dev)) + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) return -ENOTSUPP; =20 /* Discard packets with VID not enabled on the switch */ @@ -1454,9 +1473,12 @@ int ksz8_port_vlan_filtering(struct ksz_device *dev,= int port, bool flag, =20 static void ksz8_port_enable_pvid(struct ksz_device *dev, int port, bool s= tate) { - if (ksz_is_ksz88x3(dev)) { - ksz_cfg(dev, REG_SW_INSERT_SRC_PVID, - 0x03 << (4 - 2 * port), state); + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) { + int reg =3D REG_SW_INSERT_SRC_PVID; + + if (ksz_is_ksz8463(dev)) + reg =3D KSZ8463_REG_SW_CTRL_9; + ksz_cfg(dev, reg, 0x03 << (4 - 2 * port), state); } else { ksz_pwrite8(dev, port, REG_PORT_CTRL_12, state ? 0x0f : 0x00); } @@ -1471,7 +1493,7 @@ int ksz8_port_vlan_add(struct ksz_device *dev, int po= rt, u16 data, new_pvid =3D 0; u8 fid, member, valid; =20 - if (ksz_is_ksz88x3(dev)) + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) return -ENOTSUPP; =20 /* If a VLAN is added with untagged flag different from the @@ -1540,7 +1562,7 @@ int ksz8_port_vlan_del(struct ksz_device *dev, int po= rt, u16 data, pvid; u8 fid, member, valid; =20 - if (ksz_is_ksz88x3(dev)) + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) return -ENOTSUPP; =20 ksz_pread16(dev, port, REG_PORT_CTRL_VID, &pvid); @@ -1570,19 +1592,23 @@ int ksz8_port_mirror_add(struct ksz_device *dev, in= t port, struct dsa_mall_mirror_tc_entry *mirror, bool ingress, struct netlink_ext_ack *extack) { + int offset =3D P_MIRROR_CTRL; + + if (ksz_is_ksz8463(dev)) + offset =3D P1CR2; if (ingress) { - ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_RX, true); + ksz_port_cfg(dev, port, offset, PORT_MIRROR_RX, true); dev->mirror_rx |=3D BIT(port); } else { - ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_TX, true); + ksz_port_cfg(dev, port, offset, PORT_MIRROR_TX, true); dev->mirror_tx |=3D BIT(port); } =20 - ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_SNIFFER, false); + ksz_port_cfg(dev, port, offset, PORT_MIRROR_SNIFFER, false); =20 /* configure mirror port */ if (dev->mirror_rx || dev->mirror_tx) - ksz_port_cfg(dev, mirror->to_local_port, P_MIRROR_CTRL, + ksz_port_cfg(dev, mirror->to_local_port, offset, PORT_MIRROR_SNIFFER, true); =20 return 0; @@ -1591,20 +1617,23 @@ int ksz8_port_mirror_add(struct ksz_device *dev, in= t port, void ksz8_port_mirror_del(struct ksz_device *dev, int port, struct dsa_mall_mirror_tc_entry *mirror) { + int offset =3D P_MIRROR_CTRL; u8 data; =20 + if (ksz_is_ksz8463(dev)) + offset =3D P1CR2; if (mirror->ingress) { - ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_RX, false); + ksz_port_cfg(dev, port, offset, PORT_MIRROR_RX, false); dev->mirror_rx &=3D ~BIT(port); } else { - ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_TX, false); + ksz_port_cfg(dev, port, offset, PORT_MIRROR_TX, false); dev->mirror_tx &=3D ~BIT(port); } =20 - ksz_pread8(dev, port, P_MIRROR_CTRL, &data); + ksz_pread8(dev, port, offset, &data); =20 if (!dev->mirror_rx && !dev->mirror_tx) - ksz_port_cfg(dev, mirror->to_local_port, P_MIRROR_CTRL, + ksz_port_cfg(dev, mirror->to_local_port, offset, PORT_MIRROR_SNIFFER, false); } =20 @@ -1629,17 +1658,24 @@ void ksz8_port_setup(struct ksz_device *dev, int po= rt, bool cpu_port) const u16 *regs =3D dev->info->regs; struct dsa_switch *ds =3D dev->ds; const u32 *masks; + int offset; u8 member; =20 masks =3D dev->info->masks; =20 /* enable broadcast storm limit */ - ksz_port_cfg(dev, port, P_BCAST_STORM_CTRL, PORT_BROADCAST_STORM, true); + offset =3D P_BCAST_STORM_CTRL; + if (ksz_is_ksz8463(dev)) + offset =3D P1CR1; + ksz_port_cfg(dev, port, offset, PORT_BROADCAST_STORM, true); =20 ksz8_port_queue_split(dev, port, dev->info->num_tx_queues); =20 /* replace priority */ - ksz_port_cfg(dev, port, P_802_1P_CTRL, + offset =3D P_802_1P_CTRL; + if (ksz_is_ksz8463(dev)) + offset =3D P1CR2; + ksz_port_cfg(dev, port, offset, masks[PORT_802_1P_REMAPPING], false); =20 if (cpu_port) @@ -1905,7 +1941,7 @@ int ksz8_setup(struct dsa_switch *ds) =20 ksz_cfg(dev, S_MIRROR_CTRL, SW_MIRROR_RX_TX, false); =20 - if (!ksz_is_ksz88x3(dev)) + if (!ksz_is_ksz88x3(dev) && !ksz_is_ksz8463(dev)) ksz_cfg(dev, REG_SW_CTRL_19, SW_INS_TAG_ENABLE, true); =20 for (i =3D 0; i < (dev->info->num_vlans / 4); i++) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 5261747b7753..55108237180c 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2951,6 +2951,7 @@ static int ksz_parse_drive_strength(struct ksz_device= *dev); static int ksz_setup(struct dsa_switch *ds) { struct ksz_device *dev =3D ds->priv; + u16 storm_mask, storm_rate; struct dsa_port *dp; struct ksz_port *p; const u16 *regs; @@ -2980,10 +2981,15 @@ static int ksz_setup(struct dsa_switch *ds) } =20 /* set broadcast storm protection 10% rate */ - regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL], - BROADCAST_STORM_RATE, - (BROADCAST_STORM_VALUE * - BROADCAST_STORM_PROT_RATE) / 100); + storm_mask =3D BROADCAST_STORM_RATE; + storm_rate =3D (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100; + if (ksz_is_ksz8463(dev)) { + storm_mask =3D cpu_to_be16(storm_mask); + storm_rate =3D cpu_to_be16(storm_rate); + } + regmap_update_bits(ksz_regmap_16(dev), + reg16(dev, regs[S_BROADCAST_CTRL]), + storm_mask, storm_rate); =20 dev->dev_ops->config_cpu_port(ds); =20 @@ -4222,6 +4228,17 @@ static int ksz_ets_band_to_queue(struct tc_ets_qopt_= offload_replace_params *p, return p->bands - 1 - band; } =20 +static u8 ksz8463_tc_ctrl(int port, int queue) +{ + u8 reg; + + reg =3D 0xC8 + port * 4; + reg +=3D ((3 - queue) / 2) * 2; + reg++; + reg -=3D (queue & 1); + return reg; +} + /** * ksz88x3_tc_ets_add - Configure ETS (Enhanced Transmission Selection) * for a port on KSZ88x3 switch @@ -4257,6 +4274,8 @@ static int ksz88x3_tc_ets_add(struct ksz_device *dev,= int port, * port/queue */ reg =3D KSZ8873_TXQ_SPLIT_CTRL_REG(port, queue); + if (ksz_is_ksz8463(dev)) + reg =3D ksz8463_tc_ctrl(port, queue); =20 /* Clear WFQ enable bit to select strict priority scheduling */ ret =3D ksz_rmw8(dev, reg, KSZ8873_TXQ_WFQ_ENABLE, 0); @@ -4292,6 +4311,8 @@ static int ksz88x3_tc_ets_del(struct ksz_device *dev,= int port) * port/queue */ reg =3D KSZ8873_TXQ_SPLIT_CTRL_REG(port, queue); + if (ksz_is_ksz8463(dev)) + reg =3D ksz8463_tc_ctrl(port, queue); =20 /* Set WFQ enable bit to revert back to default scheduling * mode @@ -4439,7 +4460,7 @@ static int ksz_tc_setup_qdisc_ets(struct dsa_switch *= ds, int port, struct ksz_device *dev =3D ds->priv; int ret; =20 - if (is_ksz8(dev) && !ksz_is_ksz88x3(dev)) + if (is_ksz8(dev) && !(ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))) return -EOPNOTSUPP; =20 if (qopt->parent !=3D TC_H_ROOT) { @@ -4453,13 +4474,13 @@ static int ksz_tc_setup_qdisc_ets(struct dsa_switch= *ds, int port, if (ret) return ret; =20 - if (ksz_is_ksz88x3(dev)) + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) return ksz88x3_tc_ets_add(dev, port, &qopt->replace_params); else return ksz_tc_ets_add(dev, port, &qopt->replace_params); case TC_ETS_DESTROY: - if (ksz_is_ksz88x3(dev)) + if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) return ksz88x3_tc_ets_del(dev, port); else return ksz_tc_ets_del(dev, port); diff --git a/drivers/net/dsa/microchip/ksz_dcb.c b/drivers/net/dsa/microchi= p/ksz_dcb.c index c3b501997ac9..7131c5caac54 100644 --- a/drivers/net/dsa/microchip/ksz_dcb.c +++ b/drivers/net/dsa/microchip/ksz_dcb.c @@ -16,10 +16,12 @@ * Therefore, we define the base offset as 0x00 here to align with that lo= gic. */ #define KSZ8_REG_PORT_1_CTRL_0 0x00 +#define KSZ8463_REG_PORT_1_CTRL_0 0x6C #define KSZ8_PORT_DIFFSERV_ENABLE BIT(6) #define KSZ8_PORT_802_1P_ENABLE BIT(5) #define KSZ8_PORT_BASED_PRIO_M GENMASK(4, 3) =20 +#define KSZ8463_REG_TOS_DSCP_CTRL 0x16 #define KSZ88X3_REG_TOS_DSCP_CTRL 0x60 #define KSZ8765_REG_TOS_DSCP_CTRL 0x90 =20 @@ -98,6 +100,8 @@ static void ksz_get_default_port_prio_reg(struct ksz_dev= ice *dev, int *reg, *reg =3D KSZ8_REG_PORT_1_CTRL_0; *mask =3D KSZ8_PORT_BASED_PRIO_M; *shift =3D __bf_shf(KSZ8_PORT_BASED_PRIO_M); + if (ksz_is_ksz8463(dev)) + *reg =3D KSZ8463_REG_PORT_1_CTRL_0; } else { *reg =3D KSZ9477_REG_PORT_MRI_MAC_CTRL; *mask =3D KSZ9477_PORT_BASED_PRIO_M; @@ -122,10 +126,12 @@ static void ksz_get_dscp_prio_reg(struct ksz_device *= dev, int *reg, *reg =3D KSZ8765_REG_TOS_DSCP_CTRL; *per_reg =3D 4; *mask =3D GENMASK(1, 0); - } else if (ksz_is_ksz88x3(dev)) { + } else if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) { *reg =3D KSZ88X3_REG_TOS_DSCP_CTRL; *per_reg =3D 4; *mask =3D GENMASK(1, 0); + if (ksz_is_ksz8463(dev)) + *reg =3D KSZ8463_REG_TOS_DSCP_CTRL; } else { *reg =3D KSZ9477_REG_DIFFSERV_PRIO_MAP; *per_reg =3D 2; @@ -151,6 +157,8 @@ static void ksz_get_apptrust_map_and_reg(struct ksz_dev= ice *dev, *map =3D ksz8_apptrust_map_to_bit; *reg =3D KSZ8_REG_PORT_1_CTRL_0; *mask =3D KSZ8_PORT_DIFFSERV_ENABLE | KSZ8_PORT_802_1P_ENABLE; + if (ksz_is_ksz8463(dev)) + *reg =3D KSZ8463_REG_PORT_1_CTRL_0; } else { *map =3D ksz9477_apptrust_map_to_bit; *reg =3D KSZ9477_REG_PORT_MRI_PRIO_CTRL; --=20 2.34.1 From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87DC1230BEB; Tue, 8 Jul 2025 03:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; cv=none; b=tKh6nllTK2KDaWDX2rmMA/WTXJMWVH68VGFzvKNCARrWpfGpHoYmArEw9FP7Lld+lgwXPau1LMdp9tYSEMi4bWMqSa0CMhPveype9h4pr9IU6kOaEcUCV7c9Gj8QrOtw5xD4BVK8bnMmniE5pTpC6OeEARqsPuM283iom9PRbBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; c=relaxed/simple; bh=iN5fh+trLgbMvoKdItlJ3HldX49ue6jj1zJZbO2ZAnk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nARfxTHUBWR2JoG8Ml5p94eNM7w8am/xSa730dYs3h3PtmTbMt5FLPn3fk9OyjiuY3UlfpUH8zolX7km7a0jy7NK0WFV97ZciiOkGMQGerUMYb0X0qR15etuSVaHYC78qyUq9qJ4d35r1fDQemnKiANmgTlH7c3rGkXxiD3yMTA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=Da5Pn9Kl; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="Da5Pn9Kl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944639; x=1783480639; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iN5fh+trLgbMvoKdItlJ3HldX49ue6jj1zJZbO2ZAnk=; b=Da5Pn9Kl0efLnll61T+vAQC0hs+DartvNZ1Ov5tc3/S4RJ8ePbQ4X+q8 UNT8OkzKB1HJEKg4xrdv2sGOOb/ZAp2LWlQF3csX0t0F8d/4y6tCD99/9 H14b87DWipKHfMMeYkU1VePQs/Iu8o9Ue8ziEswzOhC/qLEkwbaUMHWv8 u9gwHvZ18XLcrdpIyPh/TNccAo6cS6exU50CtrKQkSlCNMlM9HFr7NiZy oa1/W/rt0t5lm5bpp4xeJChcmxKnvALNXMoHc0EBxZ5T5oj0sDNinxKvc JkDljsAzu9zxkX6oCH16X4OrtUNfiUxUrSfGMs7fkELYdTyR0dsU5wdyw g==; X-CSE-ConnectionGUID: cVEISvaDRiehsZPvdpmZNg== X-CSE-MsgGUID: 9lpJ/QtHQ6m7Y88gw/uvSA== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43198302" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:17 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:47 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:46 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 5/6 v2] net: dsa: microchip: Write switch MAC address differently for KSZ8463 Date: Mon, 7 Jul 2025 20:16:47 -0700 Message-ID: <20250708031648.6703-6-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha KSZ8463 uses 16-bit register definitions so it writes differently for 8-bit switch MAC address. Signed-off-by: Tristram Ha Reviewed-by: Andrew Lunn --- drivers/net/dsa/microchip/ksz_common.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 55108237180c..c08e6578a0df 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -4823,7 +4823,16 @@ int ksz_switch_macaddr_get(struct dsa_switch *ds, in= t port, =20 /* Program the switch MAC address to hardware */ for (i =3D 0; i < ETH_ALEN; i++) { - ret =3D ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, addr[i]); + if (ksz_is_ksz8463(dev)) { + u16 addr16 =3D ((u16)addr[i] << 8) | addr[i + 1]; + + ret =3D ksz_write16(dev, regs[REG_SW_MAC_ADDR] + i, + addr16); + i++; + } else { + ret =3D ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, + addr[i]); + } if (ret) goto macaddr_drop; } --=20 2.34.1 From nobody Tue Oct 7 18:28:35 2025 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B34F32343C9; Tue, 8 Jul 2025 03:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=68.232.154.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; cv=none; b=Xc6KoWkCnR57xnAvIRTgoRFags6CmNt7A/czPI1hU3p9q5/g4Q39S3UcnITu2u0gh1KkhTS7Jx6ixmsLK6iFUctK5Yy8qJJ4mzo13k9G2p0ftHQ7y94U8y3NtlLScIETu9x4h7zmxS3okjKlKyox6CnLyZxxvGCB5XxzA65eYfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751944641; c=relaxed/simple; bh=yaM4TO7Trs1zxekdm1BdALVDkOi1WzDqa6qkyV8slns=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MJqUMST+j1TTSdNSdIVrJdWHnD51vU8AOv/7JKgQkuSLBzvY+G++z6i+JWWdzsEZ0ZpNUC0f35voVhN+k0XxsXJgObYH6E34fXZB4Ttgi/amFNxOWnOEtAoDbp5M9SyWkyglnutQvAzH8cEALb69Ys/ncbLNGfKzRwy0TZgnvBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com; spf=pass smtp.mailfrom=microchip.com; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b=DIYryuX7; arc=none smtp.client-ip=68.232.154.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=microchip.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=microchip.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=microchip.com header.i=@microchip.com header.b="DIYryuX7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1751944639; x=1783480639; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yaM4TO7Trs1zxekdm1BdALVDkOi1WzDqa6qkyV8slns=; b=DIYryuX7D/RIUHaWi7Ha+6aOic+z1uo1FSmk9DPPNFq7PCRYA/0Bm89O AHXqEZ8inbWToAeyf/GH734MIrZxbuinCYyvYCKT46LVsoSUjgNZgVBm8 rZB/sLkWDu2bwAUgHBEGS/orIqq6/o1wF12yH9LYWNDMYTlGGlZoP4x7M 2nG68e+lswKRHfGzby81Z8MKHMlB3Mo8vyKlnkP6Em1ru9Vivwsd6ZuBd KE+g8lFQXWZi70ccyFRyP0J2jt0t8jlhqE1WIpU+1Q+1FoyrP1JLhpHrs tjyPFPipMs8g4wzyUZkUGxNiDSKso2WVQ2CVFv+c2Idyhe4w4aKIQ6dzD Q==; X-CSE-ConnectionGUID: cVEISvaDRiehsZPvdpmZNg== X-CSE-MsgGUID: +EB7KnAmQT2nOQYvsqhkOQ== X-IronPort-AV: E=Sophos;i="6.16,296,1744095600"; d="scan'208";a="43198304" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Jul 2025 20:17:17 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Mon, 7 Jul 2025 20:16:47 -0700 Received: from pop-os.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Mon, 7 Jul 2025 20:16:47 -0700 From: To: Woojung Huh , Andrew Lunn , Vladimir Oltean , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley CC: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marek Vasut , , , , , Tristram Ha Subject: [PATCH net-next 6/6 v2] net: dsa: microchip: Setup fiber ports for KSZ8463 Date: Mon, 7 Jul 2025 20:16:48 -0700 Message-ID: <20250708031648.6703-7-Tristram.Ha@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708031648.6703-1-Tristram.Ha@microchip.com> References: <20250708031648.6703-1-Tristram.Ha@microchip.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" From: Tristram Ha The fiber ports in KSZ8463 cannot be detected internally, so it requires specifying that condition in the device tree. Like the one used in Micrel PHY the port link can only be read and there is no write to the PHY. The driver programs registers to operate fiber ports correctly. The PTP function of the switch is also turned off as it may interfere the normal operation of the MAC. Signed-off-by: Tristram Ha --- drivers/net/dsa/microchip/ksz8.c | 26 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_common.c | 3 +++ 2 files changed, 29 insertions(+) diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/k= sz8.c index 904db68e11f3..1207879ef80c 100644 --- a/drivers/net/dsa/microchip/ksz8.c +++ b/drivers/net/dsa/microchip/ksz8.c @@ -1715,6 +1715,7 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) const u32 *masks; const u16 *regs; u8 remote; + u8 fiber_ports =3D 0; int i; =20 masks =3D dev->info->masks; @@ -1745,6 +1746,31 @@ void ksz8_config_cpu_port(struct dsa_switch *ds) else ksz_port_cfg(dev, i, regs[P_STP_CTRL], PORT_FORCE_FLOW_CTRL, false); + if (p->fiber) + fiber_ports |=3D (1 << i); + } + if (ksz_is_ksz8463(dev)) { + /* Setup fiber ports. */ + if (fiber_ports) { + regmap_update_bits(ksz_regmap_16(dev), + reg16(dev, KSZ8463_REG_CFG_CTRL), + fiber_ports << PORT_COPPER_MODE_S, + 0); + regmap_update_bits(ksz_regmap_16(dev), + reg16(dev, KSZ8463_REG_DSP_CTRL_6), + COPPER_RECEIVE_ADJUSTMENT, 0); + } + + /* Turn off PTP function as the switch's proprietary way of + * handling timestamp is not supported in current Linux PTP + * stack implementation. + */ + regmap_update_bits(ksz_regmap_16(dev), + reg16(dev, KSZ8463_PTP_MSG_CONF1), + PTP_ENABLE, 0); + regmap_update_bits(ksz_regmap_16(dev), + reg16(dev, KSZ8463_PTP_CLK_CTRL), + PTP_CLK_ENABLE, 0); } } =20 diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index c08e6578a0df..b3153b45ced9 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -5441,6 +5441,9 @@ int ksz_switch_register(struct ksz_device *dev) &dev->ports[port_num].interface); =20 ksz_parse_rgmii_delay(dev, port_num, port); + dev->ports[port_num].fiber =3D + of_property_read_bool(port, + "micrel,fiber-mode"); } of_node_put(ports); } --=20 2.34.1