Skip to content

Commit

Permalink
ibm_newemac: Allow the "no flow control" EMAC feature to work
Browse files Browse the repository at this point in the history
Some PowerPC 40x chips have errata that force us not to use the integrated
flow control.  We have the feature defined, but it currently can't be used
because it is never added to EMAC_FTRS_POSSIBLE.

This adds a Kconfig option for affected platforms to select and puts the
feature in the EMAC_FTRS_POSSIBLE list.  This is set for PowerPC 405EZ
platforms as well.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
  • Loading branch information
Josh Boyer committed Sep 30, 2008
1 parent 1afb7f8 commit b68d185
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/ibm_newemac/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ config IBM_NEW_EMAC_TAH
config IBM_NEW_EMAC_EMAC4
bool
default n

config IBM_NEW_EMAC_NO_FLOW_CTRL
bool
default n
2 changes: 2 additions & 0 deletions drivers/net/ibm_newemac/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2567,6 +2567,8 @@ static int __devinit emac_init_config(struct emac_instance *dev)
if (of_device_is_compatible(np, "ibm,emac-440ep") ||
of_device_is_compatible(np, "ibm,emac-440gr"))
dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
if (of_device_is_compatible(np, "ibm,emac-405ez"))
dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
}

/* Fixup some feature bits based on the device tree */
Expand Down
3 changes: 3 additions & 0 deletions drivers/net/ibm_newemac/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,9 @@ enum {
#endif
#ifdef CONFIG_IBM_NEW_EMAC_RGMII
EMAC_FTR_HAS_RGMII |
#endif
#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
EMAC_FTR_NO_FLOW_CONTROL_40x |
#endif
EMAC_FTR_440EP_PHY_CLK_FIX,
};
Expand Down

0 comments on commit b68d185

Please sign in to comment.