| Message ID | 20231221044350.441285-1-kai.heng.feng@canonical.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | r8169: Fix PCI error on system resume | expand |
On 12/20/2023 8:43 PM, Kai-Heng Feng wrote: > Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding. > > > [ 688.051096] r8169 0000:02:00.1 enp2s0f1: rtl_ep_ocp_read_cond == 0 (loop: 10, delay: 10000). > [ 688.175131] r8169 0000:02:00.1 enp2s0f1: Link is Down > ... > [ 691.534611] r8169 0000:02:00.1 enp2s0f1: PCI error (cmd = 0x0407, status_errs = 0x0000) > > Since increase the loop wait on rtl_ep_ocp_read_cond can eliminate the > issue, so let rtl8168ep_driver_start() to wait a bit longer. > This doesn't really describe what the issue is that you are fixing. I think a more clear commit message would be helpful. Also, why "30" loops? Does this need a Fixes tag? If so the Fixes tag should be added and the subject line should start with: "[PATCH net]". Otherwise, the subject line should start with: "[PATCH net-next]". Thanks, Brett > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c > index bb787a52bc75..81fd31f6fac4 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -1211,7 +1211,7 @@ static void rtl8168ep_driver_start(struct rtl8169_private *tp) > { > r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START); > r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01); > - rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 10); > + rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30); > } > > static void rtl8168_driver_start(struct rtl8169_private *tp) > -- > 2.34.1 > >
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index bb787a52bc75..81fd31f6fac4 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -1211,7 +1211,7 @@ static void rtl8168ep_driver_start(struct rtl8169_private *tp) { r8168ep_ocp_write(tp, 0x01, 0x180, OOB_CMD_DRIVER_START); r8168ep_ocp_write(tp, 0x01, 0x30, r8168ep_ocp_read(tp, 0x30) | 0x01); - rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 10); + rtl_loop_wait_high(tp, &rtl_ep_ocp_read_cond, 10000, 30); } static void rtl8168_driver_start(struct rtl8169_private *tp)
[ 688.051096] r8169 0000:02:00.1 enp2s0f1: rtl_ep_ocp_read_cond == 0 (loop: 10, delay: 10000). [ 688.175131] r8169 0000:02:00.1 enp2s0f1: Link is Down ... [ 691.534611] r8169 0000:02:00.1 enp2s0f1: PCI error (cmd = 0x0407, status_errs = 0x0000) Since increase the loop wait on rtl_ep_ocp_read_cond can eliminate the issue, so let rtl8168ep_driver_start() to wait a bit longer. Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)