From patchwork Thu Mar 13 13:41:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015026 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BCE10267B07 for ; Thu, 13 Mar 2025 13:41:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873314; cv=none; b=ELa1QlyXH7C1/N9hioHQ+Sekqjp7KZZKopDv96rYms6cenQFEcfRyKAg1IEvyD+mDgB/tbJpdvCIU6xY0u0oLKshKxljXRWHwTP9UUsK8n4szOg6n4SpPbHM4KcXoAM1c+XsyIxgLrV6XOi3EwokM2bq0n89JjXle3wBW9NcAak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873314; c=relaxed/simple; bh=BT5lWfMUTQOri9i/NI4YDR2vsj5kuck14Vz4RMGG7p4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RBBTVGbDg4Ytf7WqiWFr8KKZYYUS3UAyX0JFx1kPbza+ALTC5+8Hzb+TlJOvB8AyFU381ZSRB5vcebAf7ySPGC+Lr75wns0AiAxZrP3zM5NyBDXe3ODL0DGa4ZD25AGj/HCDKDTCscO5m4Z20nyzoTmCknpOti+vMc5V70wvLp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sUU8TSrz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sUU8TSrz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79F9BC4CEE5; Thu, 13 Mar 2025 13:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873313; bh=BT5lWfMUTQOri9i/NI4YDR2vsj5kuck14Vz4RMGG7p4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sUU8TSrzhbdLbR1r2ZOWtwDlQSeO17H7KWhwzCyS8X2U5nDSw5CSBHNOuwpms+yjJ SflgaOKrdZ5JOk4iky8kn22hH7PNl2hlJUNRKH+b8mje3TCWiKX0Iogvczthg/tr+L vniSX7Q+rpOduYn76TTE9fhNjmNgiO6kSWzWO+FrCHVqBdP9wKfyrWnwsWheskbMAG LrcK6p+EJzfIFq3Ol//I4HwJYHFPiLbQuSa2rlAUxLyVsGYsgcxHYsO7M/mb3yn+UB w1Gmwv7habrUrCeNxDzhGNcQjoMnlgJeBmiuiRg1T3Yz6+5p/K2AQZdR4WMUFd84i6 itqyq5NhsnX5Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 01/13] net: dsa: mv88e6xxx: remove unused .port_max_speed_mode() Date: Thu, 13 Mar 2025 14:41:34 +0100 Message-ID: <20250313134146.27087-2-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The .port_max_speed_mode() method is not used anymore since commit 40da0c32c3fc ("net: dsa: mv88e6xxx: remove handling for DSA and CPU ports"). Drop it. Fixes: 40da0c32c3fc ("net: dsa: mv88e6xxx: remove handling for DSA and CPU ports") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 9 ------- drivers/net/dsa/mv88e6xxx/chip.h | 4 ---- drivers/net/dsa/mv88e6xxx/port.c | 40 -------------------------------- drivers/net/dsa/mv88e6xxx/port.h | 9 ------- 4 files changed, 62 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 5db96ca52505..99d8d438e465 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4404,7 +4404,6 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6341_port_set_speed_duplex, - .port_max_speed_mode = mv88e6341_port_max_speed_mode, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -4797,7 +4796,6 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -4857,7 +4855,6 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390x_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390x_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -4917,7 +4914,6 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, @@ -5082,7 +5078,6 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -5241,7 +5236,6 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6341_port_set_speed_duplex, - .port_max_speed_mode = mv88e6341_port_max_speed_mode, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -5463,7 +5457,6 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -5527,7 +5520,6 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6390x_port_set_speed_duplex, - .port_max_speed_mode = mv88e6390x_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, @@ -5590,7 +5582,6 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6393x_port_set_speed_duplex, - .port_max_speed_mode = mv88e6393x_port_max_speed_mode, .port_tag_remap = mv88e6390_port_tag_remap, .port_set_policy = mv88e6393x_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h index 86bf113c9bfa..07671d9fe0c3 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.h +++ b/drivers/net/dsa/mv88e6xxx/chip.h @@ -551,10 +551,6 @@ struct mv88e6xxx_ops { int (*port_set_speed_duplex)(struct mv88e6xxx_chip *chip, int port, int speed, int duplex); - /* What interface mode should be used for maximum speed? */ - phy_interface_t (*port_max_speed_mode)(struct mv88e6xxx_chip *chip, - int port); - int (*port_tag_remap)(struct mv88e6xxx_chip *chip, int port); int (*port_set_policy)(struct mv88e6xxx_chip *chip, int port, diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index 66b1b7277281..d7a6d12aadbf 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -344,15 +344,6 @@ int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, duplex); } -phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port) -{ - if (port == 5) - return PHY_INTERFACE_MODE_2500BASEX; - - return PHY_INTERFACE_MODE_NA; -} - /* Support 10, 100, 200, 1000 Mbps (e.g. 88E6352 family) */ int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) @@ -384,15 +375,6 @@ int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, duplex); } -phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port) -{ - if (port == 9 || port == 10) - return PHY_INTERFACE_MODE_2500BASEX; - - return PHY_INTERFACE_MODE_NA; -} - /* Support 10, 100, 200, 1000, 2500, 10000 Mbps (e.g. 88E6190X) */ int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) @@ -407,15 +389,6 @@ int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, duplex); } -phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port) -{ - if (port == 9 || port == 10) - return PHY_INTERFACE_MODE_XAUI; - - return PHY_INTERFACE_MODE_NA; -} - /* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X) * Function mv88e6xxx_port_set_speed_duplex() can't be used as the register * values for speeds 2500 & 5000 conflict. @@ -509,19 +482,6 @@ int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, return 0; } -phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port) -{ - - if (port != 0 && port != 9 && port != 10) - return PHY_INTERFACE_MODE_NA; - - if (chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361) - return PHY_INTERFACE_MODE_2500BASEX; - - return PHY_INTERFACE_MODE_10GBASER; -} - static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port, phy_interface_t mode, bool force) { diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h index c1d2f99efb1c..d662b09bf481 100644 --- a/drivers/net/dsa/mv88e6xxx/port.h +++ b/drivers/net/dsa/mv88e6xxx/port.h @@ -501,15 +501,6 @@ int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex); -phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port); -phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port); -phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port); -phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip, - int port); - int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state); int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map); From patchwork Thu Mar 13 13:41:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015027 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 20F18267AE8 for ; Thu, 13 Mar 2025 13:41:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873317; cv=none; b=prs7DNiPv6Z9Jdbe73NiQvKx4GqRWbza3edTjXoIsmq7UaVOUBM8a1j13o0/3gTcHQdSC4M17hg7DW/JMNVfy0vZB6wvQ7msM5zbw6bEOCR1OYA3iTAzk/5sjG28kaXZASQ9xKn5AHX369CuV3t42yvqjC3dtXnVQUYhIy0SKfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873317; c=relaxed/simple; bh=ox5sPsgfn5qp2vKxbYdXZznttUL8jCEkximgmtRHOA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tmzLArq4GhwXyzi6G8g7mC+2gkvRw5IkmowD68pkUD60MPAnqM1L/RPYFg9BDAxDhdyJ8CV3yUn5GBgGpK3+f8sImvNGeY8kH35OnvJl0UkdKOsT8sfhjkrfvTfNjGDbNa4MuiGpgJr4CHV/5/oRv7BJ7qfuvfWYlV/FX+8x1Oo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CHcXZMjH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CHcXZMjH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7AF9C4CEDD; Thu, 13 Mar 2025 13:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873315; bh=ox5sPsgfn5qp2vKxbYdXZznttUL8jCEkximgmtRHOA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CHcXZMjHX4tHwhjiOopmHs4vpzr2GXm6zDohbcKaqSB82Ov2oSdqxh60LKFnW5cm4 ejH4omnN/hOp+JOwnjncVk8CFViR+Oc9wzb/ig1eT4quLiTQdYULVGM7UYnsbCMC47 0u6SNId8mPXx77ngWzMh9bc0HS7moblKLcp+ppVKSDI+jmCAJJrhiI+ErJli2ovXrp wLso19nMV1a4YiEy3WS7h3NCEON5lylIJHDLg3eVOqmoqS3Gfi1DxmkosOo1CzqrMH J+JSnkw5pMc0wObIEOmXJ3d5AAkxq9xCubVs9l8wu8jNYu37GR5LS4RUm46+Vd43rP unHg8Ef50o8Ow== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 02/13] net: dsa: mv88e6xxx: fix VTU methods for 6320 family Date: Thu, 13 Mar 2025 14:41:35 +0100 Message-ID: <20250313134146.27087-3-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The VTU registers of the 6320 family use the 6352 semantics, not 6185. Fix it. Fixes: b8fee9571063 ("net: dsa: mv88e6xxx: add VLAN Get Next support") Signed-off-by: Marek Behún --- This bug goes way back to 2015 to commit b8fee9571063 ("net: dsa: mv88e6xxx: add VLAN Get Next support") where mv88e6xxx_vtu_getnext() was first implemented: the check for whether the switch has STU did not contain the 6320 family. Therefore I put that commit into the Fixes tag. But the driver was heavily refactored since then, and the actual commits that this patch depends on are f1394b78a602 ("net: dsa: mv88e6xxx: add VTU GetNext operation") 0ad5daf6ba80 ("net: dsa: mv88e6xxx: add VTU Load/Purge operation") But I don't know how to declare it properly. Using the "Cc: stable" method with these commits tagged would mean they should be cherry-picked, but these commits in turn depend on other changes in the driver. --- drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 99d8d438e465..aa8ebe9d6bdc 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5164,8 +5164,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -5212,8 +5212,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, From patchwork Thu Mar 13 13:41:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015028 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 45B80267AE8 for ; Thu, 13 Mar 2025 13:41:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873319; cv=none; b=QGWUkFVb0uG0uKfEyF4QXCQ67JFRC6bby5bjGlfOuhvAEEqeoSL6tCDJ1eUFEINPlZS6ozR7HFCYd+NjWsxdMsopEr9u1jTkFMoSooiF0TzulAx675G31m225VWrwSvg9luseDhnNg1aJWV3dTgUBnoVgJrxPNSjTPL15tf2/cQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873319; c=relaxed/simple; bh=7y7lmY9fFtZ1M3ycc0ZidveBxq0X95qJTbS2zMGMHYo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=buOETmklME2/eh71gBql2gewidhXXl5Nk9uFxE/kcNALRMm4wQeWOsfnlo1XDUXjwoypoR2gadL6gK9Cy2/RLRW7RSN7lxuQSk8AB4p19MirMhSPs7cjBuE4WPI0J/9sPmA0YGOt7cTfMEzaDJDjO8itV2UOEc95MXe3lYGYlps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ogn74Ta+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ogn74Ta+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0119CC4CEEF; Thu, 13 Mar 2025 13:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873317; bh=7y7lmY9fFtZ1M3ycc0ZidveBxq0X95qJTbS2zMGMHYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ogn74Ta+TGAPL1PiQvGxkk/bJ2Wp6p/K3tiWBqcqD6CgGkjjxgJx5PPmjSCsRQUQM xGXqkbF2LgrByQNDvcW1GtewCnrZFX7E92faKv7TP6SRIROPMfArJu54cZ42jCYcFk uwckAnUJJh1pIGnNK4AaIQN/DTwqHAr62nPMJPOOQgLFQUDOX16JC5Tw3uMwlDF0cI nenUOZSQg8JmAVmbEI7o2XjIG8XvaVmXpPScVzTUt3MqOOIZpRbD2mwA93OPqTqors /mcBwqURJUMKLeCGeZlrgIBhSbBEZ2eY88pYwkMsmnsPyGWNW5iT5i5yn0UNjHChL3 qsTceWJiuTRmw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 03/13] net: dsa: mv88e6xxx: fix number of g1 interrupts for 6320 family Date: Thu, 13 Mar 2025 14:41:36 +0100 Message-ID: <20250313134146.27087-4-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The 6320 family has 9 global1 interrupt, not 8. Fix it. Fixes: dc30c35be720 ("net: dsa: mv88e6xxx: Implement interrupt support.") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index aa8ebe9d6bdc..e8c93199e24a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6235,7 +6235,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 15000, - .g1_irqs = 8, + .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, .atu_move_port_mask = 0xf, @@ -6261,7 +6261,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 15000, - .g1_irqs = 8, + .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, .atu_move_port_mask = 0xf, From patchwork Thu Mar 13 13:41:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015029 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 969A3267B6A for ; Thu, 13 Mar 2025 13:42:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873320; cv=none; b=ES7owU7F2vPjr2Y7ZCWQbAkIYU1gAzPDHi4eRShB/U9bJ0aFg7m9KZkvQe/DPZNG4/9kKGbe5imWhLy7SGYqXXwZsl0gC5PVhuHVhWJYQacDBWpmHf3jZoTC5/mqAXGD6KSu9n2xXZNyZZZylf2fwuhNWFSUwDZL5Kq2Il7Z6B4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873320; c=relaxed/simple; bh=fNHQFHQkZH1QEGiKZccPzNa9H3mzKwgOGeHy4QonBqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uaBvmb6PNaj3o9tB9nr9h1QNDAud/dF4UeztZoTV/MAjbauAZR44fRF9Pq5GrAivdM4NQTWsHOeE+biyT3YxSgdW1rR8ki0q4VpXgYZF/3mGz6x/ceZ4gq38RIrjTXxsACzY0PsUG+yDhsgJAFxJ6gnDQtzt57ri4nvQBtt/W7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cfnB3vid; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cfnB3vid" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EC5FC4CEEA; Thu, 13 Mar 2025 13:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873320; bh=fNHQFHQkZH1QEGiKZccPzNa9H3mzKwgOGeHy4QonBqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cfnB3vid64yHHFr8tzvDTvCpcx4eaUpZUfWK2GPzw1bIkvG6qVt1jTxN7F/MvcS5w rCmM17WeDpgmu9sn6kcYmjlmoh5YZ9+kouV67XCINHuawBG53ykEN3tKuOi04gSC0T h013EfbQwmmmLFp+iwsuCS/42OeekGWen70Mwvqc3iHCBG4xAB/Inu301LuaQ2Acjh 1x3fnXyTPb2YtX3dZc2UqZ+j0B6HjFZJYHVsyaVYh/eiNaD1u0ufwHVP3Z5KNxBgWc j+zW/zV7so6ZQxabbO8tMtunxw3pXWDw7z/pMAINytLxkhFcy8pBAahAoKl5OdoDKj 2iDl8xa1sLeBQ== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 04/13] net: dsa: mv88e6xxx: allow SPEED_200 for 6320 family on supported ports Date: Thu, 13 Mar 2025 14:41:37 +0100 Message-ID: <20250313134146.27087-5-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The 6320 family supports the ALT_SPEED bit on ports 2, 5 and 6. Allow this speed by implementing 6320 family specific .port_set_speed_duplex() method. Fixes: 96a2b40c7bd3 ("net: dsa: mv88e6xxx: add port's MAC speed setter") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- drivers/net/dsa/mv88e6xxx/port.c | 15 +++++++++++++++ drivers/net/dsa/mv88e6xxx/port.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index e8c93199e24a..7e4de1d347ec 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5138,7 +5138,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .port_set_link = mv88e6xxx_port_set_link, .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, - .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, + .port_set_speed_duplex = mv88e6320_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, @@ -5187,7 +5187,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .port_set_link = mv88e6xxx_port_set_link, .port_sync_link = mv88e6xxx_port_sync_link, .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, - .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, + .port_set_speed_duplex = mv88e6320_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c index d7a6d12aadbf..1b033056d409 100644 --- a/drivers/net/dsa/mv88e6xxx/port.c +++ b/drivers/net/dsa/mv88e6xxx/port.c @@ -327,6 +327,21 @@ int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, duplex); } +int mv88e6320_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, + int speed, int duplex) +{ + bool has_200 = (port == 2 || port == 5 || port == 6); + + if (speed > 1000) + return -EOPNOTSUPP; + + if (speed == 200 && !has_200) + return -EOPNOTSUPP; + + return mv88e6xxx_port_set_speed_duplex(chip, port, speed, has_200, + false, duplex); +} + /* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6341) */ int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex) diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h index d662b09bf481..4a4134987c43 100644 --- a/drivers/net/dsa/mv88e6xxx/port.h +++ b/drivers/net/dsa/mv88e6xxx/port.h @@ -490,6 +490,8 @@ int mv88e6185_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex); int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex); +int mv88e6320_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, + int speed, int duplex); int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, int speed, int duplex); int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port, From patchwork Thu Mar 13 13:41:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015030 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C7F82267735 for ; Thu, 13 Mar 2025 13:42:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873322; cv=none; b=Um+YeX1KW8eQ02OH+oD/Axg6RjL2mNsB4tDxj98pyFpZvbW83IyDJBZVqMNhbQi88Y+0yF/vyjhZmoQQuAy8moXVKNICRuY7Xr+LlDrD0h98iS0+juB0zya3LJ860PxmHJvnH4Zi8uZDOW0cdPfWdzzdIzzRKxlpGGYKirEnKOI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873322; c=relaxed/simple; bh=Vt7j7J0sBOJwNOw7IfKwlxRDExS0J95NEjJCHwgHE4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YBuHguN+VGJvqHb40lsHizijONJfnkVb3x3Pt7IdDtLmJ+tLCFoffTt0aSRvqi4CTfHC56StCzdSkna7zm0nRYv2JMVeZLZq/7cNmy3jFLO+kt7DoU7Y6I/QWgl4lku0a00gAOVruBpWau8ZxaACcihh2/MtkU23CtzCTJN8OGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bdlcOoBL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bdlcOoBL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DF84C4CEEB; Thu, 13 Mar 2025 13:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873322; bh=Vt7j7J0sBOJwNOw7IfKwlxRDExS0J95NEjJCHwgHE4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bdlcOoBL6vHWWzr5n92F4LJxIRIzIiHytg7DQ4NZONU688Evfy3I1T+oJClEtROHj ZlqXk/jU1j5FTXGmggRsIhtYixCL+qOnr2DYuZzsMfhBZFb1Xqqw5yhY+MsZZUv/+3 3l1hSEqQe5DXjGUurdd5v3dtwq4QWd+qnlfwa3bgCR7bB6g+wOWi5Nnqp0yXWtIu9H EKdVH8za1GVAP1lHewVY6w975VmdNR/ahrozeqYNv7GPCNUGAKQblyNwEkgn/U/uhO 6c6UjvuSAI+nTQppZxOuBWlMcXuM5YZ5Ab98kABkePdZTfr8uSPdPx8Irn/YnnOqEK r22Z8dY4M104g== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 05/13] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Date: Thu, 13 Mar 2025 14:41:38 +0100 Message-ID: <20250313134146.27087-6-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The atu_move_port_mask for 6341 family (Topaz) is 0xf, not 0x1f. The PortVec field is 8 bits wide, not 11 as in 6390 family. Fix this. Fixes: e606ca36bbf2 ("net: dsa: mv88e6xxx: rework ATU Remove") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 7e4de1d347ec..cd351a7f4906 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5809,7 +5809,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 3750, - .atu_move_port_mask = 0x1f, + .atu_move_port_mask = 0xf, .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, @@ -6287,7 +6287,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .global1_addr = 0x1b, .global2_addr = 0x1c, .age_time_coeff = 3750, - .atu_move_port_mask = 0x1f, + .atu_move_port_mask = 0xf, .g1_irqs = 9, .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, From patchwork Thu Mar 13 13:41:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015031 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1C5375FB95 for ; Thu, 13 Mar 2025 13:42:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873325; cv=none; b=pFzoTy3vB8zfREhVgt3ECQhlH/PkIT2mp97ENCK/9uL4knWt12aLYq6hsd8bGA5mDKREc9/fR9TTj+EYtMNW5JXDtAQ8u9V+1YB2ZH0Jcwf7JVZiBA76C8ov/IP+JHVgjCa9cTVJ7DHqMvtK52gqdACmRZKofIAwHeSNLoYWuVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873325; c=relaxed/simple; bh=RRBGJ0Hv4SrXZf6PdhmPktGA0EwoKR9Xc1vgMJaL2Gg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QMZbrI/YOa5Rm/2XVSJd2eBZgx6A4iKb+GVOeo6N8ZaCVX76kKVlfWYM/mgruM97lmD+pm3jviE35+qJQXdIns+tw4svxu9rsICYE1EMb65L/Vh++JHexuKOK9ZAmEUW8JGzTmjKCke1bKfI83CYH+hEyP4O1y8S2eEeckUQHgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dd6dqDiI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dd6dqDiI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB8D2C4CEDD; Thu, 13 Mar 2025 13:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873324; bh=RRBGJ0Hv4SrXZf6PdhmPktGA0EwoKR9Xc1vgMJaL2Gg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dd6dqDiIzNTJZiJ/dpxuackWdeADZ2D1NbGIxiXIRVUCNQNlKH4QIAC8WtdS5XZv8 FAV/GeirWcMB/7wgw1+Hgm1KnqNlb3dvZ0c6Hlk6XhDX9te1262J+cHFoYioMjFI5i y2rcRz/EIrsXW3VZDCqf/QN3KGlD/vvdfVEzCdWkHqbi+rddc05CIckNViM2aNIYB+ PsBtTthmgawRz0MDawD1hSGKg9CKr+cMaCP0al5S/Yv2veqb7oKHYQONBDGbOfF5Z+ zN1vtXKew81KVltstWtZp/KWq9vi8jacfXSxHHd++S52QalcYI3bNenGOgCtZNn4sz jOCdwXnuuJi9w== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 06/13] net: dsa: mv88e6xxx: enable PVT for 6321 switch Date: Thu, 13 Mar 2025 14:41:39 +0100 Message-ID: <20250313134146.27087-7-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit f36456522168 ("net: dsa: mv88e6xxx: move PVT description in info") forgot to enable PVT for 6321 switch. Fix it. Fixes: f36456522168 ("net: dsa: mv88e6xxx: move PVT description in info") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index cd351a7f4906..2f34cb1438b4 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6265,6 +6265,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .g2_irqs = 10, .stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1, .atu_move_port_mask = 0xf, + .pvt = true, .multi_chip = true, .edsa_support = MV88E6XXX_EDSA_SUPPORTED, .ptp_support = true, From patchwork Thu Mar 13 13:41:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015032 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4CA4A5FB95 for ; Thu, 13 Mar 2025 13:42:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873327; cv=none; b=BP1kB8owf4RAzczwCRn+8hz6enFxlXYV+Xjd7OFfxuHlNb00kaoR5UKQsIjirN9xcqrPJRvx4xSDaNRQDWCc7w8ZPB171q1amaGzuSZ8M+QZJ2kev09JXUy4ZKzBYVxFsXJ6UoB6v/Hqz56Btq/BJCjvCvtjXc48WPPguh3nuEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873327; c=relaxed/simple; bh=azKpCsWIgAGBPNx14li7ADhIDf9XH018umldh4P6+S8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jXtQxxaQ+3Z0EIXz0fKBUnU/vIHAq549tOnfk0VaPVIeoLMNvthQ3lUKtW9fqWSyFOcF/i695vSE/7brxfX887pXmdOvo8GTX87j116dX4LmvIKEsHhDf6qiQcRbFdDwqT+wrg4M9F3t18yUfmZHN7HQu2M21CC08FmsmFZ94Xk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZvX4clJd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZvX4clJd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EDEFC4CEEB; Thu, 13 Mar 2025 13:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873326; bh=azKpCsWIgAGBPNx14li7ADhIDf9XH018umldh4P6+S8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZvX4clJd1Q9SeLMXjHRPMXFETONikcf//1H+cebe95VTncpkIlGKIx5AabtQqRw7A Kv1kit46CT3dJP+H1l86z2/1+PQ9vHDr5x3WUWTQhxcYGBTcznSw4OPowWQQtNmw61 xRoyBjuNCW3inhnDfL/FNU9Byj/nKROIQiuRVRr1TgVUsxSYx0gN1N1iN89mZwXMGt yHIs7V8z/Rl2NRiMReGNUQBaj0yC9StaQuQYMUhiIBS8RBusqq4o7Y8Xa0L2XnsSBk cTm97lwSRI4G8lgWFggvac6vPFjR4/exw8aQLy8NSLRlqtomfdvrEJSXsaaQPxJawt +SBvENrv1hT/Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 07/13] net: dsa: mv88e6xxx: define .pot_clear() for 6321 Date: Thu, 13 Mar 2025 14:41:40 +0100 Message-ID: <20250313134146.27087-8-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 9e907d739cc3 ("net: dsa: mv88e6xxx: add POT operation") forgot to add the .pot_clear() method to the 6321 switch operations structure. Fix it. Fixes: 9e907d739cc3 ("net: dsa: mv88e6xxx: add POT operation") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 2f34cb1438b4..734aee3500c8 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5209,6 +5209,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, + .pot_clear = mv88e6xxx_g2_pot_clear, .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, From patchwork Thu Mar 13 13:41:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015033 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3BFDD5FB95 for ; Thu, 13 Mar 2025 13:42:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873329; cv=none; b=b2XbKEL4PuaQOvIyrwlzLCFwzuLAcUWWoMdCsbgAHWSZ4bj0p9FESg9erXNR5KtsBMSFXSADfIJRbcVLWekHA6ZUIoCrxy1+RWYYoZRbiM4UnI7sQXuOvoWk/HCA4w239+CoFz9A8X/EfYldcqvtSpm80FcWs292oGt/j2PyVTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873329; c=relaxed/simple; bh=+caaU80un7KreAnFvUlXPqQew1Yd9pb0REMRMGW++1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CpkpyUb1VBEXHOVdAcZ7fHWi/wEM5kC2SnVoQ1eCXfgVhFAurHgmSFKl752CH6HGQcgHO1UH0zVtILZRiincyJM/zvBORiiTLxRAJ/QzcBb3h/4668sxqeKcPhhJlJeBxKEaqGk+A1zgVphEIdU40NIKghCOV+SB4GEvwQ0vetc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DEzIOfGD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DEzIOfGD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C919C4CEE5; Thu, 13 Mar 2025 13:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873329; bh=+caaU80un7KreAnFvUlXPqQew1Yd9pb0REMRMGW++1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DEzIOfGDeVSLbOGmqc5XfSdEE1vvVK9IqDNHy/1Q4MV741tno1Uwcu+pNr+YYOVCQ BAcP3kw5IrGglfHh/zzMa76vl5AH5PrURsu6D3dyNXqmpGRGySleillZpsUAq6wWbd W1TYvpIrqjEswHgiPKILGyqdYggl4yly+2D2duPgucfGiTstmsn+W9Z7WNwnobj7ro jdVbQVMsBKkDSxzAgG5iKlKDSBwnZxpAUDfE1Hdf42eWMD9HfAw5Tcyo0a3pzeIC7y 2h/BgzxvXHYQp98rrOenT+bAPylhrCZFM1+V3HGmjzOPqCYRIldoVCSxd7aNM00q12 MIBXFCqGl2OQw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 08/13] net: dsa: mv88e6xxx: enable .rmu_disable() for 6320 family Date: Thu, 13 Mar 2025 14:41:41 +0100 Message-ID: <20250313134146.27087-9-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 9e5baf9b3636 ("net: dsa: mv88e6xxx: add RMU disable op") forgot to add the .rmu_disable() method for the 6320 family. Fix it. Fixes: 9e5baf9b3636 ("net: dsa: mv88e6xxx: add RMU disable op") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 734aee3500c8..e67c24d960cf 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5164,6 +5164,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6352_g1_rmu_disable, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, @@ -5213,6 +5214,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, + .rmu_disable = mv88e6352_g1_rmu_disable, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, From patchwork Thu Mar 13 13:41:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015034 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 78638267B66 for ; Thu, 13 Mar 2025 13:42:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873331; cv=none; b=f8oDL2EVziDaH6bBksc1Hma1Z89cdWxgEpQshGXbFIOk2cLE1c3zUOh1nVSpvOamX8Ny+Ch/3BHUpofiVUFFdbfrth8N2X4wNBXdQjm/EaENFHj7Q/WTmdnLFbeaPh7AqJ/j0xqRny1hWwHbY1ZxyH/sqSyTWVTa0Fnrgxyv7p4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873331; c=relaxed/simple; bh=tYchkEJVToIKJr8VHfiD2OO+eSNWneOh4XLK8FNZJaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rvGWksXS+yFAMthcTLsLstFiv/gQGlb4mjz3ZOSjISJk2jrJ4q1A5dJCupgpGAnTW+e385Mq/7f7tN5ylzxLDjZ8reMx6BPZt28aDi1NZBp3UEvzB72VAnSg3p1q3weuibUaMZaujIISICCUUxLxqMzbxmO+ndt8B5/GiSllsvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LK7U3iSs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LK7U3iSs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A365C4CEEB; Thu, 13 Mar 2025 13:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873331; bh=tYchkEJVToIKJr8VHfiD2OO+eSNWneOh4XLK8FNZJaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LK7U3iSs7SrZkyRlV91SLxf1DkgK+a46Pz17lIfaFXRCUHfNo7W6ROlLQnl7ZtRav T1vWPX8n9Wo+nKaqb8eb9NgDU8yfAiwskOv6Ew1zVwn3KPtKiPStrW3swDSxo7GaLp WLo7J91Jx24piy4QlfO/md5Xwsm67kEBIwtb6PnE7359ylI06bObEW2QAwrVnAfPMf upErO+cYi9COh7f8/TnHQPB0W8e+lVOv+HMfchxzWjxmbTa029cCLMWviZZjj/5xTo h4wOG9QHZc9OCYgsUa8M4Cvget3vQKN7BZHIEberFOsj7OctycPAL3TYMrcoCvkcFr As1eLKUvtr/Gg== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 09/13] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Date: Thu, 13 Mar 2025 14:41:42 +0100 Message-ID: <20250313134146.27087-10-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy") forgot to add the .port_set_policy() method for the 6320 family. Fix it. Fixes: f3a2cd326e44 ("net: dsa: mv88e6xxx: introduce .port_set_policy") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index e67c24d960cf..aba22ce3df07 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5140,6 +5140,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6320_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, .port_set_mcast_flood = mv88e6352_port_set_mcast_flood, @@ -5190,6 +5191,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, .port_set_speed_duplex = mv88e6320_port_set_speed_duplex, .port_tag_remap = mv88e6095_port_tag_remap, + .port_set_policy = mv88e6352_port_set_policy, .port_set_frame_mode = mv88e6351_port_set_frame_mode, .port_set_ucast_flood = mv88e6352_port_set_ucast_flood, .port_set_mcast_flood = mv88e6352_port_set_mcast_flood, From patchwork Thu Mar 13 13:41:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015035 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 16672267AE8 for ; Thu, 13 Mar 2025 13:42:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873334; cv=none; b=EwQUuHgZW5KMNMgkoQxkZQpK9ipruoqAU2CmqHpwcQhpTLlSUL1Fga0vNzZYNIKXvxn1ghm5fbKnfbCkvBIyyUaX0HYqaJ6++Tpt6XjTR/CZ9P3Y+czxxhAMCNgWMde5hlQbxreqktMV+wm4DKtSEpq6PKA6q6TzzlXwZBsMEOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873334; c=relaxed/simple; bh=Hd+Nc6jDCl3qrjRzq7ZKB1W5Ild9chlGlDzJiB+EIXU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hjcpy7GTrnWGZUAa3tgWJdU5cWu0Ze8x6bFFejGLusa+117mB+KTEPHeQoTQE11dgzP0h9Gwe8fjwHOFgvYyRGAdQTNNeLUrt8TNVHGP8VtiIxMh0p/mTzQVvwr/4Cul9n38B+LHSnXmi1+JsSuj+mukxPJyHQXabWzyB5nU4cQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B/+2v/0h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B/+2v/0h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7D2EC4CEE5; Thu, 13 Mar 2025 13:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873333; bh=Hd+Nc6jDCl3qrjRzq7ZKB1W5Ild9chlGlDzJiB+EIXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B/+2v/0hWxUrv016fJFYnHwn0XwaMuGOspWyLcTAqPc+Dn+xtGQGndUggZZGM3Ybh fiAvOg1WhrMeVpyGwhTYpfaByOCFu6CqU0EXBm1q72P22QClwg+H57+gt+ob2VsH5J e1X3Dcr4mW0fSDAvGSk3DA5pSfx80IlZ515FAszai8fYMfUjw+ZwxfoAnhiy9VRixJ eGibiiapd49UXez+2fhvpyK4xMLdJCIcgaLgXaBkv08hUT+ILpN0viBuYx8IR+GlUJ 8eIXy2AV+2UL3jTB3K693qT6Xdrk++zDGmyBIvvPsHGetSOTT7KreXvRXqwKCdP/6n m6XvrOLI+/Lrw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 10/13] net: dsa: mv88e6xxx: enable devlink ATU hash param for 6320 family Date: Thu, 13 Mar 2025 14:41:43 +0100 Message-ID: <20250313134146.27087-11-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit 23e8b470c7788 ("net: dsa: mv88e6xxx: Add devlink param for ATU hash algorithm.") introduced ATU hash algorithm access via devlink, but did not enable it for the 6320 family. Fix it. Fixes: 23e8b470c778 ("net: dsa: mv88e6xxx: Add devlink param for ATU hash algorithm.") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index aba22ce3df07..3b141631b680 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5166,6 +5166,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, + .atu_get_hash = mv88e6165_g1_atu_get_hash, + .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, @@ -5217,6 +5219,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, + .atu_get_hash = mv88e6165_g1_atu_get_hash, + .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, From patchwork Thu Mar 13 13:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015036 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6DAF2267AF4 for ; Thu, 13 Mar 2025 13:42:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873337; cv=none; b=KIQGKgsI8GZjLPKnjBcWDjPqvGf6OQz0tTTfS4b3zv4Q4HotyF+mtIJ3JISgTL83jkEMvrA8DBpaZVPN9f8I1IvVZTfNrzSyOlm9aGIlNtTHg9m1xt5FgEi242rTlpWrOUB2VFLjXFfUPDwNxrsVBiqJhzLuAotAiToFPy9kFaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873337; c=relaxed/simple; bh=qQSVtpaZKOAVOOUa01ICfEcuE/MI/lYKniAWFQOKaAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fPYtJ37cpE5BLD8gTHiKKIog1VRrV70p4VurFx216bMBvfn2yNc3EgoQDWE3GCFYEAuzKdQ5W3qvLuHC5jwzgn1iRhIYbbMnbqngBzmoV6yN3rgu/emgeXRqy8/IP1uQStQfP/eW+gpKdZnwCqRH5UeXaCwBYWvLpGXCQDgw1C8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LuvXA/zN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LuvXA/zN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11B83C4CEDD; Thu, 13 Mar 2025 13:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873335; bh=qQSVtpaZKOAVOOUa01ICfEcuE/MI/lYKniAWFQOKaAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LuvXA/zNQrOf17/b+UF9EztL+gHFBYrlHNV39fgdmUGirG8ZnbaMQ60ubW+J9GmsR Gl90xz3mc7yBbcGce1Q+OQSEeLHrxRIsXozoTiP+Y5jyeJjr6ei6LB+CRu4OZG36rX 5e3BlWwKFbJxzcpAlkbTO7cM1WhvNOYVCeeM/IaoNvB9Q9jZMn+AmOxX7wisg9P7UC ygoROsOpD2t7xG82FeyGtAKCxB/7abVghjpF/+/wElLGcvljZ0R0zOX5oGafB8hi0v Oj89+bFyPbTzv5wbXB7wTMqNN2vtWrCrLTU+d7BUimOjMnPxRfZbPBjD4BOPsqPzxt Iq4gMuRhca6rw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH net 11/13] net: dsa: mv88e6xxx: enable STU methods for 6320 family Date: Thu, 13 Mar 2025 14:41:44 +0100 Message-ID: <20250313134146.27087-12-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips") introduced STU methods but forgot to add it to the 6320 family. Fix it. Fixes: c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips") Signed-off-by: Marek Behún --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 3b141631b680..3849b8d55fa9 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5170,6 +5170,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .stu_getnext = mv88e6352_g1_stu_getnext, + .stu_loadpurge = mv88e6352_g1_stu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -5223,6 +5225,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .atu_set_hash = mv88e6165_g1_atu_set_hash, .vtu_getnext = mv88e6352_g1_vtu_getnext, .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .stu_getnext = mv88e6352_g1_stu_getnext, + .stu_loadpurge = mv88e6352_g1_stu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, @@ -6239,6 +6243,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b, @@ -6265,6 +6270,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b, From patchwork Thu Mar 13 13:41:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015037 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D2F2E267B6A; Thu, 13 Mar 2025 13:42:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873339; cv=none; b=U/1OtAMKDWBJuVS6PyMFE8P9SDyKxZVagW9ayoC1sXtdrlL4OvyeptEdN+ij/QRiz6RB3ea4wKB6A9g1z6FT/spmJ21RYAwnmHG1jlV142kN+8AVq4VttuAH4QmtlsY4/ldAjLTq4KmhGgtR6BqGvHvFyDvfWDmACxwk5AaH33Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873339; c=relaxed/simple; bh=1yTACMD9yPiilRcuCNwnjUeLb5zGlv9TzKcXia8sHdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gBrvHR3kWWujC9/y8ZEXBzPlbvoDTVG+Rp6tFnlnGormk0a1ZXJjX06tJMr54nv+onfCeJ6JHSmhvGFbNXA8c1cq3sWwxl5+xwWyNEvBhglhtPHbla0phLDGYbqpIvxIh4mAXdCkZquVJQMobjpTBm0dSCk/ELkuJ91nrj2ecSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=su5I6Z0b; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="su5I6Z0b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F835C4CEE5; Thu, 13 Mar 2025 13:42:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873338; bh=1yTACMD9yPiilRcuCNwnjUeLb5zGlv9TzKcXia8sHdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=su5I6Z0bMvDYdxv/Q5ubj87qQWtchO2+es3GiNr162PnAM2umamYwONSoCl/Mf1km 69p1O7Tw0POa4bUXgP+IU8InNZT62HWWGK96PAIHH0BwD+eKoeuIkAzSnKKmon4Tqr 8npv8D8+8HhZ9zE9QyRE8Ci0iF07Inu/d9mHBmgCmjOSIZlNBj9bY4TBFuHKEGJ+b4 ZyLDwTN8/Ag5delnkXu0gH9OYviF1tmeUfUZlseFHPrB07U9oqjY2rbep4Q+ime0ZB eqKA1i+q7r3AkLQ22jqOHZBz30EEJjQPo0bNUzkpX/mO01Wli09SNULf80oZvINyHC BlEmaflds3y+Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= , stable@vger.kernel.org Subject: [PATCH net 12/13] net: dsa: mv88e6xxx: fix internal PHYs for 6320 family Date: Thu, 13 Mar 2025 14:41:45 +0100 Message-ID: <20250313134146.27087-13-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Fix internal PHYs definition for the 6320 family, which has only 2 internal PHYs (on ports 3 and 4). Fixes: bc3931557d1d ("net: dsa: mv88e6xxx: Add number of internal PHYs") Signed-off-by: Marek Behún Cc: # 6.6.x --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 3849b8d55fa9..898aff46693b 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -6240,7 +6240,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .max_sid = 63, @@ -6267,7 +6268,8 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = { .num_databases = 4096, .num_macs = 8192, .num_ports = 7, - .num_internal_phys = 5, + .num_internal_phys = 2, + .internal_phys_offset = 3, .num_gpio = 15, .max_vid = 4095, .max_sid = 63, From patchwork Thu Mar 13 13:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 14015038 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5CDF9267B6A; Thu, 13 Mar 2025 13:42:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873341; cv=none; b=WIT212Yl24uRs9tRiSpZA4nb9djjAO+HNCfGn49rpoeaD22CXrgyxqRuyEiq3MD0t8UD9bSUCkfhiGt0F2JzoPYc47OACkc6mnnUwva2wvPuakjfqe2L9kuJe7NrvoqNzTRlPtCj7ffD7fyxsEfSAc7MWO3CF+Q4Riffy9bgIMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741873341; c=relaxed/simple; bh=3AiveYwmJJ73loAjlvkNyDS2sGIDEQW22xhB8L9mhkQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KnmmOkYQlpsFGGmYF2ncVFofcQwu3ld6vrAQSg0lw2AEFbMAvPGXqzO3IiY7mJ0z0tTYM3stBSXrggMMznpM9sJD/MOMFyA7D7tOw5dBRp73E+rghwoY84/l0qU1ZRqLCmCkca6o4eugeMxBdsBe8yaA02dW+io/jr7CS0aifSY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=skO+OwXg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="skO+OwXg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAB4DC4CEEA; Thu, 13 Mar 2025 13:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741873340; bh=3AiveYwmJJ73loAjlvkNyDS2sGIDEQW22xhB8L9mhkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=skO+OwXgAtRRYX42St8Xj5mwcSjnqgLLguLlynTHAjLqha3ttabqCEIkNZ6MD+IAF Sr9j8RtgfhYEfuF8qNAdJ+DVe7vkw5rblikPLPbLFOmJ3NvzytMdWoyZ2Ua3+XmpQy aFeOpMRAKQOJfWVpqaFEHeFcwlyYzCE901pRJFlHy4Z7yfWky4mssh37lUui2TsWbm Lb+wssIPK44G8+rOX2cRkoHxrzvM/3heOiMYTy3wEOLLAAMu/oh7j/fo0CqqW9/DMw ilJXJC6YWtEswwsTfbYcf7IApkQoganldGVOAXpmvT0DgtuN2mHpQx2QfniOHncSJx jiCW8JJxFfkvA== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Vladimir Oltean , "Russell King (Oracle)" , Vivien Didelot , Tobias Waldekranz , netdev@vger.kernel.org Cc: Lev Olshvang , =?utf-8?q?Marek_Beh=C3=BAn?= , stable@vger.kernel.org Subject: [PATCH net 13/13] net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family Date: Thu, 13 Mar 2025 14:41:46 +0100 Message-ID: <20250313134146.27087-14-kabel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313134146.27087-1-kabel@kernel.org> References: <20250313134146.27087-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Implement the workaround for erratum 3.3 RGMII timing may be out of spec when transmit delay is enabled for the 6320 family, which says: When transmit delay is enabled via Port register 1 bit 14 = 1, duty cycle may be out of spec. Under very rare conditions this may cause the attached device receive CRC errors. Signed-off-by: Marek Behún Cc: # 5.4.x --- drivers/net/dsa/mv88e6xxx/chip.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 898aff46693b..6e7c9bbd9787 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -3674,6 +3674,21 @@ static int mv88e6xxx_stats_setup(struct mv88e6xxx_chip *chip) return mv88e6xxx_g1_stats_clear(chip); } +static int mv88e6320_setup_errata(struct mv88e6xxx_chip *chip) +{ + u16 dummy; + int err; + + /* Workaround for erratum + * 3.3 RGMII timing may be out of spec when transmit delay is enabled + */ + err = mv88e6xxx_port_hidden_write(chip, 0, 0xf, 0x7, 0xe000); + if (err) + return err; + + return mv88e6xxx_port_hidden_read(chip, 0, 0xf, 0x7, &dummy); +} + /* Check if the errata has already been applied. */ static bool mv88e6390_setup_errata_applied(struct mv88e6xxx_chip *chip) { @@ -5125,6 +5140,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { static const struct mv88e6xxx_ops mv88e6320_ops = { /* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all, @@ -5180,6 +5196,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { static const struct mv88e6xxx_ops mv88e6321_ops = { /* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all,