Skip to content
This repository was archived by the owner on Oct 5, 2018. It is now read-only.

Commit c02bc35

Browse files
Felix Fietkaudavem330
authored andcommitted
bgmac: fix MAC soft-reset bit for corerev > 4
Only core revisions older than 4 use BGMAC_CMDCFG_SR_REV0. This mainly fixes support for BCM4708A0KF SoCs with Ethernet core rev 5 (it means only some devices as most of BCM4708A0KF-s got core rev 4). This was tested for regressions on BCM47094 which doesn't seem to care which bit gets used. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 01c445a commit c02bc35

File tree

1 file changed

+3
-3
lines changed
  • drivers/net/ethernet/broadcom

1 file changed

+3
-3
lines changed

drivers/net/ethernet/broadcom/bgmac.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@
199199
#define BGMAC_CMDCFG_TAI 0x00000200
200200
#define BGMAC_CMDCFG_HD 0x00000400 /* Set if in half duplex mode */
201201
#define BGMAC_CMDCFG_HD_SHIFT 10
202-
#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for other revs */
203-
#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, only for core rev 4 */
204-
#define BGMAC_CMDCFG_SR(rev) ((rev == 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
202+
#define BGMAC_CMDCFG_SR_REV0 0x00000800 /* Set to reset mode, for core rev 0-3 */
203+
#define BGMAC_CMDCFG_SR_REV4 0x00002000 /* Set to reset mode, for core rev >= 4 */
204+
#define BGMAC_CMDCFG_SR(rev) ((rev >= 4) ? BGMAC_CMDCFG_SR_REV4 : BGMAC_CMDCFG_SR_REV0)
205205
#define BGMAC_CMDCFG_ML 0x00008000 /* Set to activate mac loopback mode */
206206
#define BGMAC_CMDCFG_AE 0x00400000
207207
#define BGMAC_CMDCFG_CFE 0x00800000

0 commit comments

Comments
 (0)