From patchwork Wed Jul 1 16:51:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Codrin Ciubotariu X-Patchwork-Id: 1320705 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=IZbai1sO; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xnLg73q9z9sTV for ; Thu, 2 Jul 2020 02:51:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732574AbgGAQvg (ORCPT ); Wed, 1 Jul 2020 12:51:36 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:59557 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732514AbgGAQvg (ORCPT ); Wed, 1 Jul 2020 12:51:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593622295; x=1625158295; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=XKMbsXqy97UiYqdVQKPNtIxaciqrXC9S2rGEsOOT1gw=; b=IZbai1sObFKWFsO7kSPs0isTazrHLAnan0+JFi7EQDU5RrMoSge8yJh4 hBD7FMi++J/gQ2yV4lWmrPGcUDjSrGBMeBx997kB7MdVowIGZOdelbLJ3 VYtgebtwmHEOXHkJ0dAIqdSThsHXaZaEE0wwJjnPiYNz+L+aD+Mkq4j8t AIkawe7W/LuA6ukWy35YxHO6EkBSsRn3FWMfwgGy470HQf8SZ+ZrixDrM IIXneCWNcF5uKZbRQ1svS6NenXXAKfz/rWx9h+w89pfM1aWh/GhxIxk6n VhApYpJyyTqxks2Si8P3AfvM7HLFHu49uV09xFZYOo6/5fp5q7nLPC/44 A==; IronPort-SDR: h0bI9J+xanlQiFJuT9JdnzaveqFWFAUJJbvC60mr2rASdBEgaW4AHjs6VHjXRTxR6LcLI/Hnqo 1vrZOtPnL6U5M0ERgx1EuRcf0eq53egKNvI1PCyvvo+mPkV/yqHElO+q1nZq3Eov9bGwvkWG7W +9Rpi7g2MstPwb/rePm1dr7bfjts9uZad+uMNy4cwvTKl4svV7XXXknyT8KTSTcQjC2UmyOsV5 T62+bEVle2gtr+viexNNuENtnAOdX9+3LTXZlcXFzzWMuS5JFgdMihFEpSpgS42EvSAIShdq6X EFQ= X-IronPort-AV: E=Sophos;i="5.75,301,1589266800"; d="scan'208";a="82247335" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 09:51:34 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) 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.1979.3; Wed, 1 Jul 2020 09:51:15 -0700 Received: from rob-ult-m19940.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 09:51:10 -0700 From: Codrin Ciubotariu To: , CC: , , , , , , , , Codrin Ciubotariu Subject: [PATCH 1/2] net: dsa: microchip: set the correct number of ports in dsa_switch Date: Wed, 1 Jul 2020 19:51:27 +0300 Message-ID: <20200701165128.1213447-1-codrin.ciubotariu@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The number of ports is incorrectly set to the maximum available for a DSA switch. Even if the extra ports are not used, this causes some functions to be called later, like port_disable() and port_stp_state_set(). If the driver doesn't check the port index, it will end up modifying unknown registers. Fixes: b987e98e50ab ("dsa: add DSA switch driver for Microchip KSZ9477") Signed-off-by: Codrin Ciubotariu --- drivers/net/dsa/microchip/ksz8795.c | 7 +++++-- drivers/net/dsa/microchip/ksz9477.c | 7 +++++-- drivers/net/dsa/microchip/ksz_common.c | 26 ++++++++++++++++---------- drivers/net/dsa/microchip/ksz_common.h | 1 + 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 47d65b77caf7..b0227b0e31e6 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1225,8 +1225,6 @@ static int ksz8795_switch_init(struct ksz_device *dev) { int i; - dev->ds->ops = &ksz8795_switch_ops; - for (i = 0; i < ARRAY_SIZE(ksz8795_switch_chips); i++) { const struct ksz_chip_data *chip = &ksz8795_switch_chips[i]; @@ -1268,6 +1266,11 @@ static int ksz8795_switch_init(struct ksz_device *dev) return -ENOMEM; } + dev->ds = ksz_dsa_switch_alloc(dev); + if (!dev->ds) + return -ENOMEM; + dev->ds->ops = &ksz8795_switch_ops; + return 0; } diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 9a51b8a4de5d..833cf3763000 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -1545,8 +1545,6 @@ static int ksz9477_switch_init(struct ksz_device *dev) { int i; - dev->ds->ops = &ksz9477_switch_ops; - for (i = 0; i < ARRAY_SIZE(ksz9477_switch_chips); i++) { const struct ksz_chip_data *chip = &ksz9477_switch_chips[i]; @@ -1588,6 +1586,11 @@ static int ksz9477_switch_init(struct ksz_device *dev) return -ENOMEM; } + dev->ds = ksz_dsa_switch_alloc(dev); + if (!dev->ds) + return -ENOMEM; + dev->ds->ops = &ksz9477_switch_ops; + return 0; } diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index fd1d6676ae4f..4a41f0c7dbbc 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -387,30 +387,36 @@ EXPORT_SYMBOL_GPL(ksz_disable_port); struct ksz_device *ksz_switch_alloc(struct device *base, void *priv) { - struct dsa_switch *ds; struct ksz_device *swdev; - ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL); - if (!ds) - return NULL; - - ds->dev = base; - ds->num_ports = DSA_MAX_PORTS; - swdev = devm_kzalloc(base, sizeof(*swdev), GFP_KERNEL); if (!swdev) return NULL; - ds->priv = swdev; swdev->dev = base; - swdev->ds = ds; swdev->priv = priv; return swdev; } EXPORT_SYMBOL(ksz_switch_alloc); +struct dsa_switch *ksz_dsa_switch_alloc(struct ksz_device *swdev) +{ + struct dsa_switch *ds; + + ds = devm_kzalloc(swdev->dev, sizeof(*ds), GFP_KERNEL); + if (!ds) + return NULL; + + ds->dev = swdev->dev; + ds->num_ports = swdev->port_cnt; + ds->priv = swdev; + + return ds; +} +EXPORT_SYMBOL(ksz_dsa_switch_alloc); + int ksz_switch_register(struct ksz_device *dev, const struct ksz_dev_ops *ops) { diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index f2c9bb68fd33..785702514a46 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -145,6 +145,7 @@ struct ksz_dev_ops { }; struct ksz_device *ksz_switch_alloc(struct device *base, void *priv); +struct dsa_switch *ksz_dsa_switch_alloc(struct ksz_device *swdev); int ksz_switch_register(struct ksz_device *dev, const struct ksz_dev_ops *ops); void ksz_switch_remove(struct ksz_device *dev); From patchwork Wed Jul 1 16:51:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Codrin Ciubotariu X-Patchwork-Id: 1320706 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=hjQlQBiX; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xnLn0Hq0z9sTY for ; Thu, 2 Jul 2020 02:51:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732587AbgGAQvl (ORCPT ); Wed, 1 Jul 2020 12:51:41 -0400 Received: from esa3.microchip.iphmx.com ([68.232.153.233]:59557 "EHLO esa3.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732578AbgGAQvj (ORCPT ); Wed, 1 Jul 2020 12:51:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593622299; x=1625158299; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KtFvv4njZRd4RUyqHqCrtp8f+r4C5L+zEXOcmypW9aY=; b=hjQlQBiXXwe6X91Juq0GhrCpk9/OWtCqC8k1eT64+BtfnIZ7uC6F4vb/ CW26FoWQBL6Fgpf0m+qEr1HvEZQee+sLeaq5acDBX8tovhaBn2e/2JbOd tk2MrPEknDHAghvPjB3xE+D+agn3yC3LRvOUpLonmNGpddyc2Ez+skUDw CoFwarinbNWD2WuFAld5js6vt04BRE8HwqalHLnUqWZOWpI8hCRLAH7GB 2YBZs5XW/eL0llAoaBS4gSPHYEdHUCjXr9xdU+HN7mLT6mQPPUdAjnvss LcRFJQa05dvxFImWZxqPXbi3EjG0IA7AMgE5mNPcFw3j/xvhaQHmqiyMv w==; IronPort-SDR: 8RLMovVziAW+boUG/RB7ra2K2nTbM7GMGiexCzt67DidZVnC4U6A5RbOaWQfbIWpjXEHHD7cyo r9TkqjwUaiT6PPnBObeoAsYN8MSxT40QB2BB0AbkEXzuG8v8qQggD6PkoxWTu+OOm9vvJhiOMz rJAwiuQko8zGGT0oRqbrH2zFHDs20WMxLmBbkAF5C7ZG5jRzqJDwSrce/KMOVj4WY5OFKyIFyB WNCb/xKdgC4obd1uZoDNLwo0ZsMFuip0YA2UKp0rhRet3CjdMIDRDTRWYB8S91tio2RHFDGyWN dAM= X-IronPort-AV: E=Sophos;i="5.75,301,1589266800"; d="scan'208";a="82247352" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 09:51:39 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) 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.1979.3; Wed, 1 Jul 2020 09:51:19 -0700 Received: from rob-ult-m19940.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 09:51:15 -0700 From: Codrin Ciubotariu To: , CC: , , , , , , , , Codrin Ciubotariu Subject: [PATCH 2/2] net: dsa: microchip: split adjust_link() in phylink_mac_link_{up|down}() Date: Wed, 1 Jul 2020 19:51:28 +0300 Message-ID: <20200701165128.1213447-2-codrin.ciubotariu@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200701165128.1213447-1-codrin.ciubotariu@microchip.com> References: <20200701165128.1213447-1-codrin.ciubotariu@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The DSA subsystem moved to phylink and adjust_link() became deprecated in the process. This patch removes adjust_link from the KSZ DSA switches and adds phylink_mac_link_up() and phylink_mac_link_down(). Signed-off-by: Codrin Ciubotariu --- drivers/net/dsa/microchip/ksz8795.c | 3 ++- drivers/net/dsa/microchip/ksz9477.c | 3 ++- drivers/net/dsa/microchip/ksz_common.c | 32 ++++++++++++++++---------- drivers/net/dsa/microchip/ksz_common.h | 7 ++++-- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index b0227b0e31e6..d07231d1def5 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -1111,7 +1111,8 @@ static const struct dsa_switch_ops ksz8795_switch_ops = { .setup = ksz8795_setup, .phy_read = ksz_phy_read16, .phy_write = ksz_phy_write16, - .adjust_link = ksz_adjust_link, + .phylink_mac_link_down = ksz_mac_link_down, + .phylink_mac_link_up = ksz_mac_link_up, .port_enable = ksz_enable_port, .port_disable = ksz_disable_port, .get_strings = ksz8795_get_strings, diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index 833cf3763000..162f2bd84774 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c @@ -1399,7 +1399,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { .setup = ksz9477_setup, .phy_read = ksz9477_phy_read16, .phy_write = ksz9477_phy_write16, - .adjust_link = ksz_adjust_link, + .phylink_mac_link_down = ksz_mac_link_down, + .phylink_mac_link_up = ksz_mac_link_up, .port_enable = ksz_enable_port, .port_disable = ksz_disable_port, .get_strings = ksz9477_get_strings, diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 4a41f0c7dbbc..a35d6ba8dd8a 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -135,26 +135,34 @@ int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val) } EXPORT_SYMBOL_GPL(ksz_phy_write16); -void ksz_adjust_link(struct dsa_switch *ds, int port, - struct phy_device *phydev) +void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode, + phy_interface_t interface) { struct ksz_device *dev = ds->priv; struct ksz_port *p = &dev->ports[port]; /* Read all MIB counters when the link is going down. */ - if (!phydev->link) { - p->read = true; - schedule_delayed_work(&dev->mib_read, 0); - } + p->read = true; + schedule_delayed_work(&dev->mib_read, 0); + + mutex_lock(&dev->dev_mutex); + dev->live_ports &= ~(1 << port); + mutex_unlock(&dev->dev_mutex); +} +EXPORT_SYMBOL_GPL(ksz_mac_link_down); + +void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, + phy_interface_t interface, struct phy_device *phydev, + int speed, int duplex, bool tx_pause, bool rx_pause) +{ + struct ksz_device *dev = ds->priv; + + /* Remember which port is connected and active. */ mutex_lock(&dev->dev_mutex); - if (!phydev->link) - dev->live_ports &= ~(1 << port); - else - /* Remember which port is connected and active. */ - dev->live_ports |= (1 << port) & dev->on_ports; + dev->live_ports |= (1 << port) & dev->on_ports; mutex_unlock(&dev->dev_mutex); } -EXPORT_SYMBOL_GPL(ksz_adjust_link); +EXPORT_SYMBOL_GPL(ksz_mac_link_up); int ksz_sset_count(struct dsa_switch *ds, int port, int sset) { diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 785702514a46..b1c468713609 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -160,8 +160,11 @@ void ksz_init_mib_timer(struct ksz_device *dev); int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg); int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val); -void ksz_adjust_link(struct dsa_switch *ds, int port, - struct phy_device *phydev); +void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode, + phy_interface_t interface); +void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, + phy_interface_t interface, struct phy_device *phydev, + int speed, int duplex, bool tx_pause, bool rx_pause); int ksz_sset_count(struct dsa_switch *ds, int port, int sset); void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf); int ksz_port_bridge_join(struct dsa_switch *ds, int port,