From nobody Thu Apr 9 13:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D59CC433FE for ; Mon, 7 Nov 2022 03:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231303AbiKGD52 (ORCPT ); Sun, 6 Nov 2022 22:57:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231139AbiKGD5W (ORCPT ); Sun, 6 Nov 2022 22:57:22 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44489C762; Sun, 6 Nov 2022 19:57:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1667793441; x=1699329441; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6xoDohR+dK+0LjrYru6J9+T6Qu1usqCr04cNAJGYu8s=; b=o4JtdRBDOxNZA2LSy8tZzzps1zb1Jrsg3jHW0olyTY/sfg5gdEIE394V E2UQeRFMeJOlU1efk2Yye/Jxei8VcbR4BMdaz2EJH9vSw1gXgPPeA+uit DQ7ioDaf8NC6NMNmsBQUV8sFxZgVZqApLg2m+JgEcHN9U39XRk4lyZKek m+RH6qaEBrSidDS1EPOAxNQe8ic6nTeGC3gzThsmi1JUAXW3Wm6YWGJoM FyPNkFWV9EQT3PNCzwtq7O/JQbRaV4sSNDbp5g7cwvRwisu3P31R96r7a VBjg8mSyAHSU1bndGfTxoZt5wc0SD0zoaBvIUm3cqKkoB8pluI7gCscbj w==; X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="198654885" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Nov 2022 20:57:20 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) 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.12; Sun, 6 Nov 2022 20:57:20 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sun, 6 Nov 2022 20:57:16 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , , Subject: [PATCH net-next v2 1/5] net: dsa: microchip: add ksz9563 in ksz_switch_ops and select based on compatible string Date: Mon, 7 Nov 2022 14:59:18 +0530 Message-ID: <20221107092922.5926-2-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> References: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add KSZ9563 inside ksz_switch_chips structure with port_nirq as 3. KSZ9563 use KSZ9893 switch parameters but port_nirq count is 3 for KSZ9563 whereas 2 for KSZ9893. Add KSZ9563 inside ksz_switch_chips as a separate member and from device tree map compatible string into KSZ9563 inside ksz_spi.c and ksz9477_i2c.c. Global Chip ID 1 and 2 registers read value 9893, select sku based on Global Chip ID 4 Register which read 0x1c for KSZ9563. Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/ksz9477.c | 3 ++- drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- drivers/net/dsa/microchip/ksz_common.c | 33 +++++++++++++++++++++++-- drivers/net/dsa/microchip/ksz_common.h | 3 +++ drivers/net/dsa/microchip/ksz_spi.c | 2 +- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchi= p/ksz9477.c index a6a0321a8931..0d6b40968657 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -195,7 +195,8 @@ int ksz9477_reset_switch(struct ksz_device *dev) =20 /* KSZ9893 compatible chips do not support refclk configuration */ if (dev->chip_id =3D=3D KSZ9893_CHIP_ID || - dev->chip_id =3D=3D KSZ8563_CHIP_ID) + dev->chip_id =3D=3D KSZ8563_CHIP_ID || + dev->chip_id =3D=3D KSZ9563_CHIP_ID) return 0; =20 data8 =3D SW_ENABLE_REFCLKO; diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/micr= ochip/ksz9477_i2c.c index 3763930dc6fc..55146584e9b5 100644 --- a/drivers/net/dsa/microchip/ksz9477_i2c.c +++ b/drivers/net/dsa/microchip/ksz9477_i2c.c @@ -101,7 +101,7 @@ static const struct of_device_id ksz9477_dt_ids[] =3D { }, { .compatible =3D "microchip,ksz9563", - .data =3D &ksz_switch_chips[KSZ9893] + .data =3D &ksz_switch_chips[KSZ9563] }, { .compatible =3D "microchip,ksz8563", diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index d612181b3226..f7e414e747ed 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -1282,6 +1282,31 @@ const struct ksz_chip_data ksz_switch_chips[] =3D { .gbit_capable =3D {true, true, true}, }, =20 + [KSZ9563] =3D { + .chip_id =3D KSZ9563_CHIP_ID, + .dev_name =3D "KSZ9563", + .num_vlans =3D 4096, + .num_alus =3D 4096, + .num_statics =3D 16, + .cpu_ports =3D 0x07, /* can be configured as cpu port */ + .port_cnt =3D 3, /* total port count */ + .port_nirqs =3D 3, + .ops =3D &ksz9477_dev_ops, + .mib_names =3D ksz9477_mib_names, + .mib_cnt =3D ARRAY_SIZE(ksz9477_mib_names), + .reg_mib_cnt =3D MIB_COUNTER_NUM, + .regs =3D ksz9477_regs, + .masks =3D ksz9477_masks, + .shifts =3D ksz9477_shifts, + .xmii_ctrl0 =3D ksz9477_xmii_ctrl0, + .xmii_ctrl1 =3D ksz8795_xmii_ctrl1, /* Same as ksz8795 */ + .supports_mii =3D {false, false, true}, + .supports_rmii =3D {false, false, true}, + .supports_rgmii =3D {false, false, true}, + .internal_phy =3D {true, true, false}, + .gbit_capable =3D {true, true, true}, + }, + [KSZ9567] =3D { .chip_id =3D KSZ9567_CHIP_ID, .dev_name =3D "KSZ9567", @@ -2389,7 +2414,8 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(str= uct dsa_switch *ds, =20 if (dev->chip_id =3D=3D KSZ8830_CHIP_ID || dev->chip_id =3D=3D KSZ8563_CHIP_ID || - dev->chip_id =3D=3D KSZ9893_CHIP_ID) + dev->chip_id =3D=3D KSZ9893_CHIP_ID || + dev->chip_id =3D=3D KSZ9563_CHIP_ID) proto =3D DSA_TAG_PROTO_KSZ9893; =20 if (dev->chip_id =3D=3D KSZ9477_CHIP_ID || @@ -2509,7 +2535,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int = port, data8 |=3D bitval[P_RGMII_SEL]; /* On KSZ9893, disable RGMII in-band status support */ if (dev->chip_id =3D=3D KSZ9893_CHIP_ID || - dev->chip_id =3D=3D KSZ8563_CHIP_ID) + dev->chip_id =3D=3D KSZ8563_CHIP_ID || + dev->chip_id =3D=3D KSZ9563_CHIP_ID) data8 &=3D ~P_MII_MAC_MODE; break; default: @@ -2782,6 +2809,8 @@ static int ksz_switch_detect(struct ksz_device *dev) =20 if (id4 =3D=3D SKU_ID_KSZ8563) dev->chip_id =3D KSZ8563_CHIP_ID; + else if (id4 =3D=3D SKU_ID_KSZ9563) + dev->chip_id =3D KSZ9563_CHIP_ID; else dev->chip_id =3D KSZ9893_CHIP_ID; =20 diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/micro= chip/ksz_common.h index 9cfa179575ce..c6726cbd5465 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -154,6 +154,7 @@ enum ksz_model { KSZ9896, KSZ9897, KSZ9893, + KSZ9563, KSZ9567, LAN9370, LAN9371, @@ -172,6 +173,7 @@ enum ksz_chip_id { KSZ9896_CHIP_ID =3D 0x00989600, KSZ9897_CHIP_ID =3D 0x00989700, KSZ9893_CHIP_ID =3D 0x00989300, + KSZ9563_CHIP_ID =3D 0x00956300, KSZ9567_CHIP_ID =3D 0x00956700, LAN9370_CHIP_ID =3D 0x00937000, LAN9371_CHIP_ID =3D 0x00937100, @@ -551,6 +553,7 @@ static inline int is_lan937x(struct ksz_device *dev) /* KSZ9893, KSZ9563, KSZ8563 specific register */ #define REG_CHIP_ID4 0x0f #define SKU_ID_KSZ8563 0x3c +#define SKU_ID_KSZ9563 0x1c =20 /* Driver set switch broadcast storm protection at 10% rate. */ #define BROADCAST_STORM_PROT_RATE 10 diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchi= p/ksz_spi.c index 1b6ab891b986..4f2186779082 100644 --- a/drivers/net/dsa/microchip/ksz_spi.c +++ b/drivers/net/dsa/microchip/ksz_spi.c @@ -163,7 +163,7 @@ static const struct of_device_id ksz_dt_ids[] =3D { }, { .compatible =3D "microchip,ksz9563", - .data =3D &ksz_switch_chips[KSZ9893] + .data =3D &ksz_switch_chips[KSZ9563] }, { .compatible =3D "microchip,ksz8563", --=20 2.34.1 From nobody Thu Apr 9 13:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB809C43217 for ; Mon, 7 Nov 2022 03:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231374AbiKGD5l (ORCPT ); Sun, 6 Nov 2022 22:57:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231283AbiKGD51 (ORCPT ); Sun, 6 Nov 2022 22:57:27 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6096CC762; Sun, 6 Nov 2022 19:57:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1667793446; x=1699329446; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XREYEvSdINiMHV6IL4y/XM301yNPd7W2TtRBmVU9SiM=; b=ZyceMPIzQhjIMPCwRh7K8FUlCu/G/oT5uoJLQIQ0niQ/uzem3cgeNYjM 5r3P5PkpVZOpy4LT4avXmeH8Fnq2UllweAq1tLBofXW92vY6ZMZxrNqkE OUpN3gDYKpKIBQ3GhUKnWUDlJ8KESuWxB3lVOn8bWtYa3eq7Q5BXJxY+0 ZzUmGfxd15LVb5+MtcoARejiTMj/DwKLsbrTrASfPU0O2voF0Jekr49QW /MHYZotOEl9b3abKe0KzrU+0Tk3Yx4bwI11bhQJzxIyhPyYYKVO6a0gKF d78JnhQ91kiiHfO9pewTIRNAO2iKVULCzvBjA9Yr2P/K19zn8cpMLO0OC g==; X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="187916795" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Nov 2022 20:57:25 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) 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.12; Sun, 6 Nov 2022 20:57:25 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sun, 6 Nov 2022 20:57:21 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , , Subject: [PATCH net-next v2 2/5] net: dsa: microchip: add irq in i2c probe Date: Mon, 7 Nov 2022 14:59:19 +0530 Message-ID: <20221107092922.5926-3-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> References: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" add device irq in i2c probe function. Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/ksz9477_i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/micr= ochip/ksz9477_i2c.c index 55146584e9b5..caa9acf1495c 100644 --- a/drivers/net/dsa/microchip/ksz9477_i2c.c +++ b/drivers/net/dsa/microchip/ksz9477_i2c.c @@ -41,6 +41,8 @@ static int ksz9477_i2c_probe(struct i2c_client *i2c, if (i2c->dev.platform_data) dev->pdata =3D i2c->dev.platform_data; =20 + dev->irq =3D i2c->irq; + ret =3D ksz_switch_register(dev); =20 /* Main DSA driver may not be started yet. */ --=20 2.34.1 From nobody Thu Apr 9 13:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D92F4C433FE for ; Mon, 7 Nov 2022 03:57:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231177AbiKGD5q (ORCPT ); Sun, 6 Nov 2022 22:57:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231346AbiKGD5g (ORCPT ); Sun, 6 Nov 2022 22:57:36 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2454EFAC2; Sun, 6 Nov 2022 19:57:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1667793452; x=1699329452; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sZkHzp4axHvnVQJ1e6P/AN6YKQRNToLw1Xi9YPFU8ms=; b=Aw0cPgCVFiAPMTLHIT/iKppt69I+cGbtxwi3RajBcBCNNJkOn83XsJKb tgHXn1JOEihe1A6JiJdBmWEmOS4deNQiHXp2F9WZVKlcregU/C0tmjdr2 MmmWTP16lMdNXCuS2L8pjrBm99H3Qi8xTezQb6oQXu/tJB5MxQKWLvbSZ zhOheD4X8pGQvlWsdN+XoGimt58l0hE0APgVe5kvMqt4ZFSXYYPhpMeXZ +zGU2Af8wJgvp3s2FRrLztztwfmIyPpsKl3sf7FsAz8cxSKpQKuT9daey aSyyDvaiJYHatfvhrEHhBv/16CNd054DfVJsmc2IKlCjJAY+fHwrxn2Y+ A==; X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="122073048" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Nov 2022 20:57:31 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Sun, 6 Nov 2022 20:57:30 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sun, 6 Nov 2022 20:57:26 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , , Subject: [PATCH net-next v2 3/5] net: dsa: microchip: add error checking for ksz_pwrite Date: Mon, 7 Nov 2022 14:59:20 +0530 Message-ID: <20221107092922.5926-4-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> References: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add status validation for port register write inside lan937x_change_mtu. ksz_pwrite and ksz_pread api's are updated with return type int (Reference patch mentioned below). Update lan937x_change_mtu with status validation for ksz_pwrite16(). Link: https://patchwork.kernel.org/project/netdevbpf/patch/20220826105634.3= 855578-6-o.rempel@pengutronix.de/ Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/lan937x_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/mic= rochip/lan937x_main.c index 7e4f307a0387..06d3d0308cba 100644 --- a/drivers/net/dsa/microchip/lan937x_main.c +++ b/drivers/net/dsa/microchip/lan937x_main.c @@ -242,7 +242,11 @@ int lan937x_change_mtu(struct ksz_device *dev, int por= t, int new_mtu) } =20 /* Write the frame size in PORT_MAX_FR_SIZE register */ - ksz_pwrite16(dev, port, PORT_MAX_FR_SIZE, new_mtu); + ret =3D ksz_pwrite16(dev, port, PORT_MAX_FR_SIZE, new_mtu); + if (ret) { + dev_err(ds->dev, "failed to update mtu for port %d\n", port); + return ret; + } =20 return 0; } --=20 2.34.1 From nobody Thu Apr 9 13:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB30DC433FE for ; Mon, 7 Nov 2022 03:58:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231361AbiKGD6B (ORCPT ); Sun, 6 Nov 2022 22:58:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbiKGD5i (ORCPT ); Sun, 6 Nov 2022 22:57:38 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3AA6E095; Sun, 6 Nov 2022 19:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1667793456; x=1699329456; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0wXSUs/stCX4n/UAX5pCiYlq8CvlIWxfpXl+9+NLOIw=; b=kICgCO03n87tPUCarKAXL3gCPAnZAsAhrFojHbsbtc5saIY+zXFXpQDj s/BLCG1Ias6GvbnAAMizb6o+l+E6tnqW0EZH445tCHyjUwjKe6Sz0Drcn 3NrJECaCiM4y9VM1dl4AfC6OrDdEQvHWtXD/CxrnEhC/pJg7/GCE+M0UE RlXQeJz6Ib6r5XlYAba+J8zGXAcYtfGwura9Aq7tX1jJzz1mxmakrqeC6 KEKqz5UE1GePFNCiy8yFHECzRC5PYnU8EYzYL8x68qmPA+t8z4+K6Phvb uNZG3kycv0vL1b+uhvXBZJOt866bRWQDzpvT5COfRaCpvAphKpfq4Ihgc g==; X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="187916840" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Nov 2022 20:57:36 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Sun, 6 Nov 2022 20:57:36 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sun, 6 Nov 2022 20:57:32 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , , Subject: [PATCH net-next v2 4/5] net: dsa: microchip: ksz8563: Add number of port irq Date: Mon, 7 Nov 2022 14:59:21 +0530 Message-ID: <20221107092922.5926-5-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> References: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" KSZ8563 have three port interrupts: PTP, PHY and ACL. Add port_nirq as 3 for KSZ8563 inside ksz_chip_data. Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/ksz_common.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index f7e414e747ed..8c8db315317d 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -1039,6 +1039,7 @@ const struct ksz_chip_data ksz_switch_chips[] =3D { .num_statics =3D 16, .cpu_ports =3D 0x07, /* can be configured as cpu port */ .port_cnt =3D 3, /* total port count */ + .port_nirqs =3D 3, .ops =3D &ksz9477_dev_ops, .mib_names =3D ksz9477_mib_names, .mib_cnt =3D ARRAY_SIZE(ksz9477_mib_names), --=20 2.34.1 From nobody Thu Apr 9 13:42:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7986C433FE for ; Mon, 7 Nov 2022 03:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230160AbiKGD6N (ORCPT ); Sun, 6 Nov 2022 22:58:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231305AbiKGD5y (ORCPT ); Sun, 6 Nov 2022 22:57:54 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BC2310549; Sun, 6 Nov 2022 19:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1667793464; x=1699329464; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cmNTa7zVOFJxvvcO+PfybH0ef81VinhQBT/y9wv2pE4=; b=YNb5KPd8aaCvuN1ZeHfmPVTvZUKDCLdAHYKWUe0QDkpFsIAIZC3b26z1 uJSgZG4ApiRi8DrcYKmy5eDD+nDEf/xMVUqjorWi+9p5xiwz+X2+Xjcw4 aTSqTphFRg3aCsr1YDbeHajse3K37LsavRT7wRIA5sIkK/qV4lyQr5NuA Yru11NjqDggiFF3yqrQt5gpFDNHVVj0O4xxbvOXRTe7kLBB8c/fH7Ms7n yloiegjrVuJ/E36Gww+0ID+ZlwN9fOwW2J4AJeVVqxrYOXfqdAI3fZNWI AQ40x9ffNwj9qhTEyzq9GBn1D0GbOoJpzyvMJRmK3ow1Wg92xkTH9chBG w==; X-IronPort-AV: E=Sophos;i="5.96,143,1665471600"; d="scan'208";a="182188393" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 06 Nov 2022 20:57:43 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) 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.12; Sun, 6 Nov 2022 20:57:43 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Sun, 6 Nov 2022 20:57:39 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , , Subject: [PATCH net-next v2 5/5] net: dsa: microchip: add dev_err_probe in probe functions Date: Mon, 7 Nov 2022 14:59:22 +0530 Message-ID: <20221107092922.5926-6-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> References: <20221107092922.5926-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Probe functions uses normal dev_err() to check error conditions and print messages. Replace dev_err() with dev_err_probe() to have more standardized format and error logging. Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/ksz8863_smi.c | 9 ++++----- drivers/net/dsa/microchip/ksz9477_i2c.c | 8 +++----- drivers/net/dsa/microchip/ksz_spi.c | 8 +++----- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/micr= ochip/ksz8863_smi.c index ddb40838181e..2f4623f3bd85 100644 --- a/drivers/net/dsa/microchip/ksz8863_smi.c +++ b/drivers/net/dsa/microchip/ksz8863_smi.c @@ -152,11 +152,10 @@ static int ksz8863_smi_probe(struct mdio_device *mdio= dev) ®map_smi[i], dev, &rc); if (IS_ERR(dev->regmap[i])) { - ret =3D PTR_ERR(dev->regmap[i]); - dev_err(&mdiodev->dev, - "Failed to initialize regmap%i: %d\n", - ksz8863_regmap_config[i].val_bits, ret); - return ret; + return dev_err_probe(&mdiodev->dev, + PTR_ERR(dev->regmap[i]), + "Failed to initialize regmap%i\n", + ksz8863_regmap_config[i].val_bits); } } =20 diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/micr= ochip/ksz9477_i2c.c index caa9acf1495c..db4aec0a51dc 100644 --- a/drivers/net/dsa/microchip/ksz9477_i2c.c +++ b/drivers/net/dsa/microchip/ksz9477_i2c.c @@ -30,11 +30,9 @@ static int ksz9477_i2c_probe(struct i2c_client *i2c, rc.lock_arg =3D &dev->regmap_mutex; dev->regmap[i] =3D devm_regmap_init_i2c(i2c, &rc); if (IS_ERR(dev->regmap[i])) { - ret =3D PTR_ERR(dev->regmap[i]); - dev_err(&i2c->dev, - "Failed to initialize regmap%i: %d\n", - ksz9477_regmap_config[i].val_bits, ret); - return ret; + return dev_err_probe(&i2c->dev, PTR_ERR(dev->regmap[i]), + "Failed to initialize regmap%i\n", + ksz9477_regmap_config[i].val_bits); } } =20 diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchi= p/ksz_spi.c index 4f2186779082..96c52e8fb51b 100644 --- a/drivers/net/dsa/microchip/ksz_spi.c +++ b/drivers/net/dsa/microchip/ksz_spi.c @@ -71,11 +71,9 @@ static int ksz_spi_probe(struct spi_device *spi) dev->regmap[i] =3D devm_regmap_init_spi(spi, &rc); =20 if (IS_ERR(dev->regmap[i])) { - ret =3D PTR_ERR(dev->regmap[i]); - dev_err(&spi->dev, - "Failed to initialize regmap%i: %d\n", - regmap_config[i].val_bits, ret); - return ret; + return dev_err_probe(&spi->dev, PTR_ERR(dev->regmap[i]), + "Failed to initialize regmap%i\n", + regmap_config[i].val_bits); } } =20 --=20 2.34.1