070-v4.6-0004-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334
  1. From c02bc350f9dbce7d637c394a6e1c4d29dc5b28b2 Mon Sep 17 00:00:00 2001
  2. From: Felix Fietkau <nbd@nbd.name>
  3. Date: Tue, 12 Apr 2016 18:27:29 +0200
  4. Subject: [PATCH] bgmac: fix MAC soft-reset bit for corerev > 4
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Only core revisions older than 4 use BGMAC_CMDCFG_SR_REV0. This mainly
  9. fixes support for BCM4708A0KF SoCs with Ethernet core rev 5 (it means
  10. only some devices as most of BCM4708A0KF-s got core rev 4).
  11. This was tested for regressions on BCM47094 which doesn't seem to care
  12. which bit gets used.
  13. Signed-off-by: Felix Fietkau <nbd@nbd.name>
  14. Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  15. Signed-off-by: David S. Miller <davem@davemloft.net>
  16. ---
  17. --- a/drivers/net/ethernet/broadcom/bgmac.h
  18. +++ b/drivers/net/ethernet/broadcom/bgmac.h
  19. @@ -199,9 +199,9 @@
  20. #define BGMAC_CMDCFG_TAI 0x00000200
  21. #define BGMAC_CMDCFG_HD 0x00000400 /* Set if in half duplex mode */
  22. #define BGMAC_CMDCFG_HD_SHIFT 10
  23. -#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for other revs */
  24. -#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, only for core rev 4 */
  25. -#define BGMAC_CMDCFG_SR(rev) ((rev == 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
  26. +#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for core rev 0-3 */
  27. +#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, for core rev >= 4 */
  28. +#define BGMAC_CMDCFG_SR(rev) ((rev >= 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
  29. #define BGMAC_CMDCFG_ML 0x00008000 /* Set to activate mac loopback mode */
  30. #define BGMAC_CMDCFG_AE 0x00400000
  31. #define BGMAC_CMDCFG_CFE 0x00800000