From patchwork Mon Nov 7 09:29:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 16227 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1818362wru; Sun, 6 Nov 2022 20:03:09 -0800 (PST) X-Google-Smtp-Source: AMsMyM4Eg3m4U0xIXvt6xX/OrFx5DAmEkfanBRYqqXcLLmuoI53lQuxHtRpT5n5vaVIBt2mSLaGp X-Received: by 2002:aa7:c7d1:0:b0:461:2a82:497e with SMTP id o17-20020aa7c7d1000000b004612a82497emr48982393eds.267.1667793789337; Sun, 06 Nov 2022 20:03:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667793789; cv=none; d=google.com; s=arc-20160816; b=epwaWudIS4mr/6qvUu7Hz88HWwVq1sWY22DS7oc8IhTp8EZy2HkC3lyMpiYOaWdhsc a/8Eve4ERFnr8TMez/wSmixlIVNFDTL6mBokhbh9GABWL5gJVLZEEfUkz1ITGJr93Is3 tMCaTh62nlxxG1+zA27HgLI3zdsEJUQEEJhv/K89arFc+/dpZRlWVhHJOu5Jo2BxlVoE 6Ik2BPkx2T88lM/T9aIM+HwZr9HaWz3vns33nQ8s8fzEBpZh9aEZPe4G5PN/RqEiCS/V dDx1h2lNZgFXuZ3Ja2mlh4Wwk/hnWPmvQw40Rx6GqIEVn7PpMxCOBMhi9cfDis3YPdIB xU/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xwRNWDpSWIgnK6sZjPbbqAdJKqFEchx0aNI1/6C1Qn0=; b=XZAF/KipLsBVWptrmDzBra/rDMOvstjioW/HY6xRiO7VpB2N8xdECsMmCN/Mw2mmvF bS2/X5QZJMjqAOZonYrG/8qLHwtO19ktYkll87LhkOCXt+bBFuFVE3ulEVPAZmO79iga eLQNnHMaKrcXVTPgAyc7B0Q6fQpESnbZvq0c8+8gH1eqh302SVKvT8eCyf5QDhURvja1 45QWBJpk3BLIDk1/ALWTX5FpdFXombiK7MuJf3HAJLj9smeaEik9BWgd+YXKp9+5r8dr eKhmsNNkiRbVN/ZkDjxf3q53fVpylvMb/L4BY6WpO417N0wkpPiTO/xf9L8gZjwqwBCt WCWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=o4JtdRBD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xc3-20020a170907074300b0078034101c0esi8295553ejb.978.2022.11.06.20.02.42; Sun, 06 Nov 2022 20:03:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=o4JtdRBD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231289AbiKGD51 (ORCPT + 99 others); Sun, 6 Nov 2022 22:57:27 -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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748808540312008718?= X-GMAIL-MSGID: =?utf-8?q?1748808540312008718?= 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/microchip/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) /* KSZ9893 compatible chips do not support refclk configuration */ if (dev->chip_id == KSZ9893_CHIP_ID || - dev->chip_id == KSZ8563_CHIP_ID) + dev->chip_id == KSZ8563_CHIP_ID || + dev->chip_id == KSZ9563_CHIP_ID) return 0; data8 = SW_ENABLE_REFCLKO; diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/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[] = { }, { .compatible = "microchip,ksz9563", - .data = &ksz_switch_chips[KSZ9893] + .data = &ksz_switch_chips[KSZ9563] }, { .compatible = "microchip,ksz8563", diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/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[] = { .gbit_capable = {true, true, true}, }, + [KSZ9563] = { + .chip_id = KSZ9563_CHIP_ID, + .dev_name = "KSZ9563", + .num_vlans = 4096, + .num_alus = 4096, + .num_statics = 16, + .cpu_ports = 0x07, /* can be configured as cpu port */ + .port_cnt = 3, /* total port count */ + .port_nirqs = 3, + .ops = &ksz9477_dev_ops, + .mib_names = ksz9477_mib_names, + .mib_cnt = ARRAY_SIZE(ksz9477_mib_names), + .reg_mib_cnt = MIB_COUNTER_NUM, + .regs = ksz9477_regs, + .masks = ksz9477_masks, + .shifts = ksz9477_shifts, + .xmii_ctrl0 = ksz9477_xmii_ctrl0, + .xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */ + .supports_mii = {false, false, true}, + .supports_rmii = {false, false, true}, + .supports_rgmii = {false, false, true}, + .internal_phy = {true, true, false}, + .gbit_capable = {true, true, true}, + }, + [KSZ9567] = { .chip_id = KSZ9567_CHIP_ID, .dev_name = "KSZ9567", @@ -2389,7 +2414,8 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, if (dev->chip_id == KSZ8830_CHIP_ID || dev->chip_id == KSZ8563_CHIP_ID || - dev->chip_id == KSZ9893_CHIP_ID) + dev->chip_id == KSZ9893_CHIP_ID || + dev->chip_id == KSZ9563_CHIP_ID) proto = DSA_TAG_PROTO_KSZ9893; if (dev->chip_id == KSZ9477_CHIP_ID || @@ -2509,7 +2535,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int port, data8 |= bitval[P_RGMII_SEL]; /* On KSZ9893, disable RGMII in-band status support */ if (dev->chip_id == KSZ9893_CHIP_ID || - dev->chip_id == KSZ8563_CHIP_ID) + dev->chip_id == KSZ8563_CHIP_ID || + dev->chip_id == KSZ9563_CHIP_ID) data8 &= ~P_MII_MAC_MODE; break; default: @@ -2782,6 +2809,8 @@ static int ksz_switch_detect(struct ksz_device *dev) if (id4 == SKU_ID_KSZ8563) dev->chip_id = KSZ8563_CHIP_ID; + else if (id4 == SKU_ID_KSZ9563) + dev->chip_id = KSZ9563_CHIP_ID; else dev->chip_id = KSZ9893_CHIP_ID; diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/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 = 0x00989600, KSZ9897_CHIP_ID = 0x00989700, KSZ9893_CHIP_ID = 0x00989300, + KSZ9563_CHIP_ID = 0x00956300, KSZ9567_CHIP_ID = 0x00956700, LAN9370_CHIP_ID = 0x00937000, LAN9371_CHIP_ID = 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 /* 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/microchip/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[] = { }, { .compatible = "microchip,ksz9563", - .data = &ksz_switch_chips[KSZ9893] + .data = &ksz_switch_chips[KSZ9563] }, { .compatible = "microchip,ksz8563", From patchwork Mon Nov 7 09:29:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 16229 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1818562wru; Sun, 6 Nov 2022 20:03:39 -0800 (PST) X-Google-Smtp-Source: AMsMyM7T8lq0t4kh65CyvqxuKyMd7QqJaJGIYFjdettZHYqY5/itveChwktEVaAIq8+UKRGIl6+R X-Received: by 2002:a17:902:7689:b0:187:48d:d9be with SMTP id m9-20020a170902768900b00187048dd9bemr28826050pll.102.1667793819267; Sun, 06 Nov 2022 20:03:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667793819; cv=none; d=google.com; s=arc-20160816; b=ThMxPD383LYVIqPNSv9cwwql/qE0nz9EyoFAkKPBnwcmhghZGIbwNbSfYU2X2nL9Lh k3KGG1WM5C93Bvdoxx0//Wwa3LOXoMxJFEPQqTi70BvWx2moKJwfillKVe0Co+MfD1qD gZbgGX+tT0szlNkpifRBZ8T5eHMvZrKqa1SmTABE9VxtWphNf2GZQqT1B/p2o7kAOcEJ aCnRAl4Wc6EbjjGFCpbE/it2Z2ggGOMp5rz3bvNTN7/y+NKsjsXqZbIHUiRfqRpksEU6 scIsiJMQLRghI1NHKOD5BLu6KZxQCN5NU84+K92UGHc2IvMVP66/N9tdziVVgAyhlMeb /XsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lfd9osbMvONWfppHFW5HiM8uBJo6ASNUVIa74GMvLfk=; b=ebSU+b5vKXvjBwmIVYCoRjEmD6Oz1P3+WrdydV/OS3TS1POtLGGnbNl0jDJPLyH1Zy 0rW6y8+gb9PfMOgTNOEzOVr/8gkee0mlH2hIBGEWuBbpQKyPrL58vNllVqP42+qcWy+v rykqMPUiGg3h6NSxQhoSZGKIE0UOTjn/Gy293ByUKbTxkt5CzqO3PkEfI/7IXMGC8O1y c+QEAFv0O3Ka3VSd4bSzQEPqgGWaLPYY3j0PaBozy5weQzmQybEkq5DCzZWXJANPGchE I3rNRFqO4uSHz90bGA9ENOc/T8MhXmbHCo8dVF0HP4U653aAs860Q1guKvuiUKaodjj+ fa7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=ZyceMPIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h9-20020a170902f54900b00186fb907e27si9935572plf.552.2022.11.06.20.03.26; Sun, 06 Nov 2022 20:03:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=ZyceMPIz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231330AbiKGD5j (ORCPT + 99 others); Sun, 6 Nov 2022 22:57:39 -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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748808571703100138?= X-GMAIL-MSGID: =?utf-8?q?1748808571703100138?= 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/microchip/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 = i2c->dev.platform_data; + dev->irq = i2c->irq; + ret = ksz_switch_register(dev); /* Main DSA driver may not be started yet. */ From patchwork Mon Nov 7 09:29:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 16228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1818538wru; Sun, 6 Nov 2022 20:03:34 -0800 (PST) X-Google-Smtp-Source: AMsMyM6AbZ4iSl/DcPKWLE4LXNLDZYviWnWONltMUdJnV91fEfUt9jcF40bqyOcaROWgd87dUu9+ X-Received: by 2002:a17:902:e54e:b0:187:ba9:4305 with SMTP id n14-20020a170902e54e00b001870ba94305mr44418446plf.167.1667793814473; Sun, 06 Nov 2022 20:03:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667793814; cv=none; d=google.com; s=arc-20160816; b=JNbIZFSsP+0aw3f77cLXRDCY/5GGsAB05Xi1QLUBDbUbLFLWW6bbv3gGxAsJeSdPsU SO/o8G2l9M0eFxQG5vlMK/m9HLw09fXSKT5qRlC8mrhiUOyTD8V2q1676qoVnD8QTk2g jGNsI/7xAKW5wR28Uzbfim1NvkTy8aSHd0xbndwN8t0GU0Advy/ceT5TcO1oFApUHEVS ZgTMWPHgdWwNTm0Vq67Qs7xmxHt0/YfJuaZ7DURo5qoxyIzEL/C/XKAy+7E8/SjT6Nma HG3QfVysjrDzMMpv7iQxufXg2GdSfBC764pgtnXngaeskOMnFr/7KYKi5Dx+tRpTn2I4 NQJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SxHiO70i9PsvluYl8QEPfvHjq+Kxe7Zx7Z8JewlmLQw=; b=EOKNsh1euT1IEcoSCABphANy/sYQSaYTuu6pKevAAjfh1h96gruLoyOXcnI2G7MYWI xZaIUA7Ue9GvhZMvw8OH/YoDrLffBNnoZAVbWoIGtGUfNWjRg3CrXI8asLda4eV8GT0r ySGLLjesuUwo/9vqs6byunCNjf2uNLZXusl9pGUGPp+p4wi8jk1VYgoBldYpa3zq+qLw Ta7TkiyplP/sgVxMh/WZmaGACRsznywFKasXSryF6gm+1cuI77eyfbqHK6mM01+c6x+Q DUM1D8Z615U4iy1EODKnt1hgaMg4zXYF5uO4XR5VL3NvEVGzFOTVNKgJ+U08PBWDxUEa VFpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Aw0cPgCV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v25-20020a637a19000000b0046265702353si9672371pgc.203.2022.11.06.20.03.20; Sun, 06 Nov 2022 20:03:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Aw0cPgCV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231324AbiKGD5o (ORCPT + 99 others); Sun, 6 Nov 2022 22:57:44 -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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748808566560564543?= X-GMAIL-MSGID: =?utf-8?q?1748808566560564543?= 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.3855578-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/microchip/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 port, int new_mtu) } /* Write the frame size in PORT_MAX_FR_SIZE register */ - ksz_pwrite16(dev, port, PORT_MAX_FR_SIZE, new_mtu); + ret = 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; + } return 0; } From patchwork Mon Nov 7 09:29:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 16230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1818772wru; Sun, 6 Nov 2022 20:04:13 -0800 (PST) X-Google-Smtp-Source: AMsMyM6pzkXZLcncQqcg2Vywd4FzS9RmSHe+aDCAyR9b89tAGsS7Y5lSABDh/2GDxCxaOd0dp2kE X-Received: by 2002:a17:902:ebce:b0:186:9905:11bf with SMTP id p14-20020a170902ebce00b00186990511bfmr49603626plg.110.1667793853633; Sun, 06 Nov 2022 20:04:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667793853; cv=none; d=google.com; s=arc-20160816; b=Glxny9TudRzOhO12icGxCcQOQrIk8VBxylZvHbWs5bDyeA9ZcSj8SrDDhJYwESeWQV CKN5n1w59Z4naZqyOCw3cHjK4ii7tP2IfDCg/BioS9oUWWutrI6/UhWV0f6QU+roP1uM 6sERdi3uzgGidn6WntrfexsZMZBTzDYQ82mraiUdvEZvygzKcBMYxYdFwHhp19R1CV/e 9RcE2acbsyd8lg/32pkiVT67Z6dJJCxAH6bAXE/XYKSCFZGllLq2w82Iz2doqfnNK/C+ ytqn0yZT9GQci2NLe/K+YUywieqc1yqMwftqdmyPl0BRKYygo4aQVkdR2XO2CNxqhJW4 hQdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7k3JftLSa/eepgApMzgNrncdhMmUYNfgt2BmCEQ3558=; b=YJCLw038xJk8H2yQ5Rygqn3O3XfUk77k+aRL5VXcQ1nCUGGH5kDMGgL68Ui3i5fNmV qX2LdWWm589NtqNnX0W4p8dvLUhy1z1bAc2kaGd5KPGO8mIzRfIr0WQgW8QewbNnhBRW Q2lx4iIRPy6B6ZbTyYBFyizMaJXVyHLSHOyhp6/lggAqMhW2uNe5JUZsv+v8Eqc9xCG5 mvEi6OB8kVyCxYqy4SFvacNb5uSHd4OAsp9rFlc6j05+EjGWgi5T30qg+mrHYtK/u5RW mTG9qeFrzXP+VeS3czbIfkFJNiX+1LIq6dizgHe+rW/jBIWtQ4v7W28XWGVFZ7azFHXb Wefw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=kICgCO03; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 16-20020a17090a1a5000b00212f0d1bf7csi7581689pjl.158.2022.11.06.20.04.00; Sun, 06 Nov 2022 20:04:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=kICgCO03; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231346AbiKGD6A (ORCPT + 99 others); Sun, 6 Nov 2022 22:58:00 -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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748808607822089515?= X-GMAIL-MSGID: =?utf-8?q?1748808607822089515?= 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/microchip/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[] = { .num_statics = 16, .cpu_ports = 0x07, /* can be configured as cpu port */ .port_cnt = 3, /* total port count */ + .port_nirqs = 3, .ops = &ksz9477_dev_ops, .mib_names = ksz9477_mib_names, .mib_cnt = ARRAY_SIZE(ksz9477_mib_names), From patchwork Mon Nov 7 09:29:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 16231 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1818872wru; Sun, 6 Nov 2022 20:04:34 -0800 (PST) X-Google-Smtp-Source: AMsMyM5chVZ9lzkNxNjm7vE8xi0B24YnDz+2A+EANvZB0EU/R+6dT0GrCYazJt2MaDMxq0ctPobh X-Received: by 2002:a17:906:8473:b0:77b:efa8:50e4 with SMTP id hx19-20020a170906847300b0077befa850e4mr45627178ejc.250.1667793874508; Sun, 06 Nov 2022 20:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667793874; cv=none; d=google.com; s=arc-20160816; b=kH1UScnDnaQrhG5tD3PuXs6SNodh3VDzEGZnIMBSmy4G//d/6WeCX69ceMUrAdH02V Xg1emkkgXwF3rPCbPdhD24sTKGGMfx0uIWkL1G143AuPR2vPIVIXnefaY79VnZJLL392 tV4P0+NUknN+uhmMoNiCs32qM+7q08Hk7BeLshY2T297JYH0OOQEiei9fbk72L/xHtxQ sPuuLmwYmNd8JQ3BGM12zejWCAQE1KK5+jha8SmJoeQMM3aravOgC7DgMUuMBpEq1trN XS1/dKecUeH6AkRtXcIMkF7YFRHTxVGjkuwxbnMY5WLqGOSWSCgscXW9lDlg1CgY6nBA /a+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T4SphrekBZGYqUX4VHQ36QXvRgNoaLzkBK1gmIZ1oQ4=; b=AmQ6fnbbhnzIkrKO3c4Icmew2axylZ2G1xevugO0lQBbcvVyZm9iy/+145rye4OjFz nf4q/bjgok+kR5lxw9t4pIWUZt8xRH6fN1dxkFuSwUxORCUPCRquFs5+ztMKpinRke2L ESFS8L6VdFK0qUJr6TLnIIo5FNjjSwhDXB7BuRx9JupHm4xBKdSI6PXZGRhc8mVhDc7e uY7h4R5zwqNwQ3txl7RuH9iPFMhC4ulEViQGhYNqYUs0UhcKzZv++dGB3NPx5RNI77db DPZ7U5dKX1/D+jnsRFh4/cZZtV6SPVl4M2U6AMNFrMpiIPrdbImzuNN38SOPR6smaVpQ 0n0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=YNb5KPd8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gn35-20020a1709070d2300b0078e11a20640si8750603ejc.2.2022.11.06.20.04.10; Sun, 06 Nov 2022 20:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=YNb5KPd8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230263AbiKGD6J (ORCPT + 99 others); Sun, 6 Nov 2022 22:58:09 -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 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748808630083171583?= X-GMAIL-MSGID: =?utf-8?q?1748808630083171583?= 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/microchip/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 *mdiodev) ®map_smi[i], dev, &rc); if (IS_ERR(dev->regmap[i])) { - ret = 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); } } diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/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 = &dev->regmap_mutex; dev->regmap[i] = devm_regmap_init_i2c(i2c, &rc); if (IS_ERR(dev->regmap[i])) { - ret = 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); } } diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/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] = devm_regmap_init_spi(spi, &rc); if (IS_ERR(dev->regmap[i])) { - ret = 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); } }