提交 9070ee4f 编写于 作者: J Jim Quinlan 提交者: Zheng Zengkai

reset: brcmstb-rescal: fix incorrect polarity of status bit

stable inclusion
from stable-5.10.77
commit e51371bd687e7ff4a2f5f53d97d4388500fb27e1
bugzilla: 185677 https://gitee.com/openeuler/kernel/issues/I4IAP7

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

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

commit f33eb7f2 upstream.

The readl_poll_timeout() should complete when the status bit
is a 1, not 0.

Fixes: 4cf176e5 ("reset: Add Broadcom STB RESCAL reset controller")
Signed-off-by: NJim Quinlan <jim2101024@gmail.com>
Signed-off-by: NFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20210914221122.62315-1-f.fainelli@gmail.comSigned-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.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>
上级 e2943da2
...@@ -38,7 +38,7 @@ static int brcm_rescal_reset_set(struct reset_controller_dev *rcdev, ...@@ -38,7 +38,7 @@ static int brcm_rescal_reset_set(struct reset_controller_dev *rcdev,
} }
ret = readl_poll_timeout(base + BRCM_RESCAL_STATUS, reg, ret = readl_poll_timeout(base + BRCM_RESCAL_STATUS, reg,
!(reg & BRCM_RESCAL_STATUS_BIT), 100, 1000); (reg & BRCM_RESCAL_STATUS_BIT), 100, 1000);
if (ret) { if (ret) {
dev_err(data->dev, "time out on SATA/PCIe rescal\n"); dev_err(data->dev, "time out on SATA/PCIe rescal\n");
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册