From patchwork Mon Aug 17 14:55:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Grohne X-Patchwork-Id: 262410 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3929CC433DF for ; Mon, 17 Aug 2020 14:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1583120748 for ; Mon, 17 Aug 2020 14:55:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intenta.de header.i=@intenta.de header.b="J1UNT+ak" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729100AbgHQOzk (ORCPT ); Mon, 17 Aug 2020 10:55:40 -0400 Received: from mail.intenta.de ([178.249.25.132]:41314 "EHLO mail.intenta.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729164AbgHQOzi (ORCPT ); Mon, 17 Aug 2020 10:55:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=intenta.de; s=dkim1; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:CC:To:From:Date; bh=MKQaz6MveHibIVc6CzUlSJUjmdnHdjraErzNAJq99Lo=; b=J1UNT+akYWqIz5Fafij6JXNf4FcT7M0kadQQCZt7cUG2NUfxwS55+s5JZ8Rz1i0sqKzjZOgv2JlcuaBwGrAQ0WXQn5reWJrmXzUwMQ2BpPAw8AQcAMKnuiLHLCY1C7NTZz2gO1SAGesyH/Myy/loM38c3IaQaxWQ6xXd/7+uMysYCXSbxkyYOOZ4Px10YhMVS+k0EtbWKbU0USN+WZgUz9DouAQvl030cWx3kNQJFnMhLIRcgBdRWYolcDGXqoogLaJK8TEtKnuFwtg3N3J2ipiH6SzEKMCKI9AOVCd2bts7QiBHoCpAAtCRuaUfz51HLdGJvffy4tbHAtqo7t7YFw==; Date: Mon, 17 Aug 2020 16:55:34 +0200 From: Helmut Grohne To: Andrew Lunn CC: Woojung Huh , Microchip Linux Driver Support , Vivien Didelot , Florian Fainelli , "David S. Miller" , Jakub Kicinski , Subject: [PATCH v2 2/6] net: dsa: microchip: delete unused member ksz_port.sgmii Message-ID: References: <20200725174130.GL1472201@lunn.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-ClientProxiedBy: ICSMA002.intenta.de (10.10.16.48) To ICSMA002.intenta.de (10.10.16.48) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Link: https://lore.kernel.org/netdev/20200721083300.GA12970@laureti-dev/ Signed-off-by: Helmut Grohne --- drivers/net/dsa/microchip/ksz9477.c | 2 -- drivers/net/dsa/microchip/ksz_common.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index c548894553bc..0ff54ee4f963 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -1305,8 +1305,6 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds) p->member = dev->port_mask; ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED); p->on = 1; - if (dev->chip_id == 0x00947700 && i == 6) - p->sgmii = 1; } } diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 0432cd38bf0b..83247140b784 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -32,7 +32,6 @@ struct ksz_port { u32 on:1; /* port is not disabled by hardware */ u32 fiber:1; /* port is fiber */ - u32 sgmii:1; /* port is SGMII */ u32 force:1; u32 read:1; /* read MIB counters in background */ u32 freeze:1; /* MIB counter freeze is enabled */ From patchwork Mon Aug 17 14:55:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Grohne X-Patchwork-Id: 262409 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA8A5C433E1 for ; Mon, 17 Aug 2020 14:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91413205CB for ; Mon, 17 Aug 2020 14:55:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intenta.de header.i=@intenta.de header.b="gvDr7Q8M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729045AbgHQOzx (ORCPT ); Mon, 17 Aug 2020 10:55:53 -0400 Received: from mail.intenta.de ([178.249.25.132]:41332 "EHLO mail.intenta.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729172AbgHQOzu (ORCPT ); Mon, 17 Aug 2020 10:55:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=intenta.de; s=dkim1; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:CC:To:From:Date; bh=eNeYOYLqRPrH4QMgS+phHvqZsDR01/ts1dXmb0Bc9xw=; b=gvDr7Q8MZP/m0Riuqa4DvsT7w0UFjiYJ7/ZbjY94WWoHwxIy3F6Ck8AYE/B48M2lgqUAeGF+vt48L1o3NyAlQOuHJf2KuBJlPgxLtOUIv0qvlidJJdHIFrleZWvu+DFsoXRDjbwDtZvTTZNHXjyNTM0k2ntZ2xXUR5GnEUcZJ/96bOf2EU0VKcqsbguU6ds/7+ccnBUGlnTX63dGuNtgvaJBP/SvNDnkaZ4cbjWfoxg/ZO+Lol6lVQl4U6wJa9cugBsN+JvSc8sXTxn76rNe1WpdiYqORc3u+4w6+dCD2nhhUotj1iuxdrUFfPbUF5g2+b4NltY8IA+jmyORQjZz1A==; Date: Mon, 17 Aug 2020 16:55:45 +0200 From: Helmut Grohne To: Andrew Lunn CC: Woojung Huh , Microchip Linux Driver Support , Vivien Didelot , Florian Fainelli , "David S. Miller" , Jakub Kicinski , Subject: [PATCH v2 4/6] net: dsa: microchip: delete unused member ksz_device.last_port Message-ID: <7d26b13709698dae79ed595382ff3cc9699eb0ea.1597675604.git.helmut.grohne@intenta.de> References: <20200725174130.GL1472201@lunn.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-ClientProxiedBy: ICSMA002.intenta.de (10.10.16.48) To ICSMA002.intenta.de (10.10.16.48) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Link: https://lore.kernel.org/netdev/20200721083300.GA12970@laureti-dev/ Signed-off-by: Helmut Grohne --- drivers/net/dsa/microchip/ksz8795.c | 1 - drivers/net/dsa/microchip/ksz_common.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index e62d54306765..3bdfe1f4d0f5 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1150,7 +1150,6 @@ static int ksz8795_switch_detect(struct ksz_device *dev) id2 = 0x65; } else if (id2 == CHIP_ID_94) { dev->port_cnt--; - dev->last_port = dev->port_cnt; id2 = 0x94; } id16 &= ~0xff; diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 8e277033bff7..1791442f04ee 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -68,7 +68,6 @@ struct ksz_device { int reg_mib_cnt; int mib_cnt; int mib_port_cnt; - int last_port; /* ports after that not used */ phy_interface_t interface; u32 regs_size; bool phy_errata_9477; From patchwork Mon Aug 17 14:59:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Grohne X-Patchwork-Id: 262407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 319C4C433E1 for ; Mon, 17 Aug 2020 14:59:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 07B92205CB for ; Mon, 17 Aug 2020 14:59:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intenta.de header.i=@intenta.de header.b="tIB/YheO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729070AbgHQO74 (ORCPT ); Mon, 17 Aug 2020 10:59:56 -0400 Received: from mail.intenta.de ([178.249.25.132]:41357 "EHLO mail.intenta.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726630AbgHQO7y (ORCPT ); Mon, 17 Aug 2020 10:59:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=intenta.de; s=dkim1; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:CC:To:From:Date; bh=DdHx8cvx8GNyWolx4FGyEq6qtgvNHmpmJypkc7o70bA=; b=tIB/YheO3b1KvNA9TBQfklbDi5AyBXJTVIscfDp7Z7kro/Qe4fD54pMIonkF0zyKraF6UUFATkHIU/MwtmZVXE2iwoxI9k3GUcaYrDWVL8g6k+l6yGxchJSLrmNtG3RjwSbBZN2jDUgdW7GfVLkekWrt0ljNvWOlimGFjiNXdMzUAmOsCH+lgTwkK0n9v3b4ztGNRR+yQtd2v9f38HGVF5X1aERc7e9BqAF2JXqxWUnJvuYloH9qqwLhyKv2iiD91gzawOV6bRGZOaXcx87Xnc2b2lu6RkgYQZ5hamMNYj3ljlafVvjeYCI80JQp1PlCNfonhiwSWOk9CyNpPUHGWQ==; Date: Mon, 17 Aug 2020 16:59:51 +0200 From: Helmut Grohne To: Andrew Lunn CC: Woojung Huh , Microchip Linux Driver Support , Vivien Didelot , Florian Fainelli , "David S. Miller" , Jakub Kicinski , Subject: [PATCH v2 6/6] net: dsa: microchip: delete unused member ksz_device.overrides Message-ID: References: <20200725174130.GL1472201@lunn.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) X-ClientProxiedBy: ICSMA002.intenta.de (10.10.16.48) To ICSMA002.intenta.de (10.10.16.48) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Link: https://lore.kernel.org/netdev/20200721083300.GA12970@laureti-dev/ Signed-off-by: Helmut Grohne --- drivers/net/dsa/microchip/ksz_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 0120f2b72091..10ff7774a867 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -82,7 +82,6 @@ struct ksz_device { u16 mirror_rx; u16 mirror_tx; u32 features; /* chip specific features */ - u32 overrides; /* chip functions set by user */ u16 host_mask; u16 port_mask; };