From mboxrd@z Thu Jan 1 00:00:00 1970 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 294521917E3; Tue, 29 Apr 2025 17:40: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=1745948420; cv=none; b=qsHnAf5LFzefAffLqDO3rT5jgs1vOoSsvzCrl3Xv+hvqFKQcV80LynUAonwAsItkJ10O5zuIipafKyEiV4FJyaSmPdhSyTlz0/HhkQ6WmpcTBd6/0Hz8XITVpS+GHufuJHcppVdWIGMzIl7Fd1DbkBmZsWGqmjV+x9q/GB7lGhE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745948420; c=relaxed/simple; bh=9JMgEPd/otdSbJ0s8WLEDI9siMgh1bCE80fLRJX1fyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BoLquwKBvHKYkRFAq0lJB0ytPWug6pO3xU5hG1Pvn7AewRowIDxrv71sv38dh1fsZnpXqK91R0LWwwQckRgqw3e9qJrdQfQEk7xcz1j6fQjiV5Dxl/5gf5lNZXF6OHyOGiYrcxYCy+hiny576QVzeP8mCW8aLq/miQKRsq4WXOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=huRlL5kk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="huRlL5kk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5DF4C4CEE3; Tue, 29 Apr 2025 17:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745948420; bh=9JMgEPd/otdSbJ0s8WLEDI9siMgh1bCE80fLRJX1fyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=huRlL5kkCwEEqaCA19U3B7ZPLJFu+EGjt8XzIotvmAWkLO2bhq2Ry/WP0bP0GHrYt gFkHHD18W49cqS/9fXg+5V0e6h9TVSkGv9BjQkgGACgwxmB5cOgvYMtV2IFtbnQBQO GVo3JwG2S5dmT253hO2w0CIEMNPHReIGrRbBJyfA= From: Greg Kroah-Hartman To: stable@vger.kernel.org, "stable@vger.kernel.org, Sasha Levin" Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Marek=20Beh=C3=BAn?= , Andrew Lunn , Jakub Kicinski Subject: [PATCH 6.12 268/280] net: dsa: mv88e6xxx: enable STU methods for 6320 family Date: Tue, 29 Apr 2025 18:43:29 +0200 Message-ID: <20250429161126.099934959@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161115.008747050@linuxfoundation.org> References: <20250429161115.008747050@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Marek Beh�n" commit 1428a6109b20e356188c3fb027bdb7998cc2fb98 upstream. Commit c050f5e91b47 ("net: dsa: mv88e6xxx: Fill in STU support for all supported chips") introduced STU methods, but did not add them 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 Reviewed-by: Andrew Lunn Link: https://patch.msgid.link/20250317173250.28780-6-kabel@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -5213,6 +5213,8 @@ static const struct mv88e6xxx_ops mv88e6 .reset = mv88e6352_g1_reset, .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, @@ -5263,6 +5265,8 @@ static const struct mv88e6xxx_ops mv88e6 .reset = mv88e6352_g1_reset, .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, @@ -6258,6 +6262,7 @@ static const struct mv88e6xxx_info mv88e .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b, @@ -6283,6 +6288,7 @@ static const struct mv88e6xxx_info mv88e .num_internal_phys = 5, .num_gpio = 15, .max_vid = 4095, + .max_sid = 63, .port_base_addr = 0x10, .phy_base_addr = 0x0, .global1_addr = 0x1b,