提交 6079479a 编写于 作者: R Rafał Miłecki 提交者: Zheng Zengkai

net: dsa: b53: Set correct number of ports in the DSA struct

stable inclusion
from stable-5.10.68
commit c361c955609a48d993f07caa93fdcc516de20849
bugzilla: 182671 https://gitee.com/openeuler/kernel/issues/I4EWUH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c361c955609a48d993f07caa93fdcc516de20849

--------------------------------

[ Upstream commit d12e1c46 ]

Setting DSA_MAX_PORTS caused DSA to call b53 callbacks (e.g.
b53_disable_port() during dsa_register_switch()) for invalid
(non-existent) ports. That made b53 modify unrelated registers and is
one of reasons for a broken BCM5301x support.

This problem exists for years but DSA_MAX_PORTS usage has changed few
times. It seems the most accurate to reference commit dropping
dsa_switch_alloc() in the Fixes tag.

Fixes: 7e99e347 ("net: dsa: remove dsa_switch_alloc helper")
Signed-off-by: NRafał Miłecki <rafal@milecki.pl>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 846141b0
...@@ -2559,6 +2559,8 @@ static int b53_switch_init(struct b53_device *dev) ...@@ -2559,6 +2559,8 @@ static int b53_switch_init(struct b53_device *dev)
dev->enabled_ports |= BIT(dev->cpu_port); dev->enabled_ports |= BIT(dev->cpu_port);
dev->num_ports = fls(dev->enabled_ports); dev->num_ports = fls(dev->enabled_ports);
dev->ds->num_ports = min_t(unsigned int, dev->num_ports, DSA_MAX_PORTS);
/* Include non standard CPU port built-in PHYs to be probed */ /* Include non standard CPU port built-in PHYs to be probed */
if (is539x(dev) || is531x5(dev)) { if (is539x(dev) || is531x5(dev)) {
for (i = 0; i < dev->num_ports; i++) { for (i = 0; i < dev->num_ports; i++) {
...@@ -2603,7 +2605,6 @@ struct b53_device *b53_switch_alloc(struct device *base, ...@@ -2603,7 +2605,6 @@ struct b53_device *b53_switch_alloc(struct device *base,
return NULL; return NULL;
ds->dev = base; ds->dev = base;
ds->num_ports = DSA_MAX_PORTS;
dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL); dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL);
if (!dev) if (!dev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册