735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From e7731194fdf085f46d58b1adccfddbd0dfee4873 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
  3. Date: Fri, 7 Jul 2023 08:53:25 +0200
  4. Subject: [PATCH] net: bgmac: postpone turning IRQs off to avoid SoC hangs
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Turning IRQs off is done by accessing Ethernet controller registers.
  9. That can't be done until device's clock is enabled. It results in a SoC
  10. hang otherwise.
  11. This bug remained unnoticed for years as most bootloaders keep all
  12. Ethernet interfaces turned on. It seems to only affect a niche SoC
  13. family BCM47189. It has two Ethernet controllers but CFE bootloader uses
  14. only the first one.
  15. Fixes: 34322615cbaa ("net: bgmac: Mask interrupts during probe")
  16. Signed-off-by: Rafał Miłecki <[email protected]>
  17. Reviewed-by: Michal Kubiak <[email protected]>
  18. Signed-off-by: David S. Miller <[email protected]>
  19. ---
  20. drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
  21. 1 file changed, 2 insertions(+), 2 deletions(-)
  22. --- a/drivers/net/ethernet/broadcom/bgmac.c
  23. +++ b/drivers/net/ethernet/broadcom/bgmac.c
  24. @@ -1492,8 +1492,6 @@ int bgmac_enet_probe(struct bgmac *bgmac
  25. bgmac->in_init = true;
  26. - bgmac_chip_intrs_off(bgmac);
  27. -
  28. net_dev->irq = bgmac->irq;
  29. SET_NETDEV_DEV(net_dev, bgmac->dev);
  30. dev_set_drvdata(bgmac->dev, bgmac);
  31. @@ -1511,6 +1509,8 @@ int bgmac_enet_probe(struct bgmac *bgmac
  32. */
  33. bgmac_clk_enable(bgmac, 0);
  34. + bgmac_chip_intrs_off(bgmac);
  35. +
  36. /* This seems to be fixing IRQ by assigning OOB #6 to the core */
  37. if (!(bgmac->feature_flags & BGMAC_FEAT_IDM_MASK)) {
  38. if (bgmac->feature_flags & BGMAC_FEAT_IRQ_ID_OOB_6)