| Message ID | 20230316083050.2108-1-harini.katakam@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed0578a46c5f08647f5ecb0e3c735a53267426f7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: macb: Increase halt timeout to accommodate 10Mbps link | expand |
On 16/03/2023 at 09:30, Harini Katakam wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > From: Harini Katakam <harini.katakam@xilinx.com> > > Increase halt timeout to accommodate for 16K SRAM at 10Mbps rounded. > > Signed-off-by: Harini Katakam <harini.katakam@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> Fine with me: Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Best regards, Nicolas > --- > drivers/net/ethernet/cadence/macb_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 51c9fd6f68a4..96fd2aa9ee90 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -94,8 +94,7 @@ struct sifive_fu540_macb_mgmt { > /* Graceful stop timeouts in us. We should allow up to > * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions) > */ > -#define MACB_HALT_TIMEOUT 1230 > - > +#define MACB_HALT_TIMEOUT 14000 > #define MACB_PM_TIMEOUT 100 /* ms */ > > #define MACB_MDIO_TIMEOUT 1000000 /* in usecs */ > -- > 2.17.1 >
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 16 Mar 2023 14:00:50 +0530 you wrote: > From: Harini Katakam <harini.katakam@xilinx.com> > > Increase halt timeout to accommodate for 16K SRAM at 10Mbps rounded. > > Signed-off-by: Harini Katakam <harini.katakam@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > > [...] Here is the summary with links: - [net-next] net: macb: Increase halt timeout to accommodate 10Mbps link https://git.kernel.org/netdev/net-next/c/ed0578a46c5f You are awesome, thank you!
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 51c9fd6f68a4..96fd2aa9ee90 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -94,8 +94,7 @@ struct sifive_fu540_macb_mgmt { /* Graceful stop timeouts in us. We should allow up to * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions) */ -#define MACB_HALT_TIMEOUT 1230 - +#define MACB_HALT_TIMEOUT 14000 #define MACB_PM_TIMEOUT 100 /* ms */ #define MACB_MDIO_TIMEOUT 1000000 /* in usecs */