ibm_newemac: Various fixes and additions for PPC405EZ
Subsystems (3)
PATCH v2 1/3 ibm_newemac: Allow the "no flow control" EMAC feature to work
In reply to Josh BoyerSome 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.
--- drivers/net/ibm_newemac/Kconfig | 4 ++++ drivers/net/ibm_newemac/core.c | 2 ++ drivers/net/ibm_newemac/core.h | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)
drivers/net/ibm_newemac/Kconfig +4 -0
@@ -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
drivers/net/ibm_newemac/core.c +2 -0
@@ -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 */
drivers/net/ibm_newemac/core.h +3 -0
@@ -341,6 +341,9 @@ enum {#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, };
Signature · 1 line
1.5.5.1
PATCH v2 2/3 ibm_newemac: Introduce mal_has_feature
In reply to Josh BoyerThere are some PowerPC SoCs that do odd things with the MAL handling. In order to accommodate them, we need to introduce a feature mechanism that is similar to the existing emac_has_feature function.
This adds a feature variable to the mal_instance structure, and adds a mal_has_feature function. Two features are defined and are guarded by Kconfig options that are selected by the affected platforms.
MAL_FTR_CLEAR_ICINSTAT is used for platforms that need to clear the interrupt bits in the ICINTSTAT SDR for txeob/rxeob. This is common on MAL implementations that have interrupt coalescing.
MAL_FTR_COMMON_ERR_INT is used for platforms that have SERR, TXDE, and RXDE OR'd into a single interrupt bit.
--- drivers/net/ibm_newemac/Kconfig | 8 ++++++++ drivers/net/ibm_newemac/mal.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-)
drivers/net/ibm_newemac/Kconfig +8 -0
@@ -66,3 +66,11 @@ config IBM_NEW_EMAC_EMAC4 config IBM_NEW_EMAC_NO_FLOW_CTRL bool default n + +config IBM_NEW_EMAC_MAL_CLR_ICINTSTAT + bool + default n + +config IBM_NEW_EMAC_MAL_COMMON_ERR + bool + default n
drivers/net/ibm_newemac/mal.h +34 -0
@@ -213,6 +213,8 @@ struct mal_instance {struct of_device *ofdev;int index;spinlock_t lock; + +unsigned int features; };static inline u32 get_mal_dcrn (struct mal_instance *mal,int reg)
@@ -225,6 +227,38 @@ static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val)dcr_write (mal->dcr_host, reg, val); } +/* Features of various MAL implementations */ + +/* Set if you have interrupt coalescing and you have to clear the SDR +* register for TXEOB and RXEOB interrupts to work +*/ +#define MAL_FTR_CLEAR_ICINTSTAT 0x00000001 + +/* Set if your MAL has SERR, TXDE, and RXDE OR'd into a single UIC +* interrupt +*/ +#define MAL_FTR_COMMON_ERR_INT 0x00000002 + +enum { +MAL_FTRS_ALWAYS =0 , + + MAL_FTRS_POSSIBLE = +#ifdef CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT + MAL_FTR_CLEAR_ICINTSTAT | +#endif +#ifdef CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR + MAL_FTR_COMMON_ERR_INT | +#endif + 0, +}; + +static inline int mal_has_feature (struct mal_instance *dev, +unsigned long feature) +{ +return (MAL_FTRS_ALWAYS & feature) || + (MAL_FTRS_POSSIBLE & dev->features & feature); +} +/* Register MAL devices */ int mal_init (void );void mal_exit (void );
Signature · 1 line
1.5.5.1
PATCH v2 3/3 ibm_newemac: MAL support for PowerPC 405EZ
In reply to Josh BoyerThe PowerPC 405EZ SoC has some differences in the interrupt layout and handling for the MAL. The SERR, TXDE, and RXDE interrupts are OR'd into a single interrupt. Also, due to the possibility for interrupt coalescing, the TXEOB and RXEOB interrupts require an interrupt bit to be cleared in the ICINTSTAT SDR.
This sets the proper MAL feature bits for 405EZ boards, and adds a common shared handler for SERR, TXDE, and RXDE. The defines for the ICINTSTAT DCR are added to the proper header file as well.
This has been adapted from code originally written by Stefan Roese.
--- arch/powerpc/include/asm/dcr-regs.h | 7 ++++ drivers/net/ibm_newemac/mal.c | 60 ++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/dcr-regs.h +7 -0
@@ -68,6 +68,13 @@#define SDR0_UART3 0x0123#define SDR0_CUST0 0x4000 +/* SDR for 405EZ */ +#define DCRN_SDR_ICINTSTAT 0x4510 +#define ICINTSTAT_ICRX 0x80000000 +#define ICINTSTAT_ICTX0 0x40000000 +#define ICINTSTAT_ICTX1 0x20000000 +#define ICINTSTAT_ICTX 0x60000000 +/* * All those DCR register addresses are offsets from the base address * for the SRAM0 controller (e.g. 0x20 on 440GX). The base address is
drivers/net/ibm_newemac/mal.c +55 -5
112 lines not on this page · raw message
Signature · 1 line
1.5.5.1
v2 cover ibm_newemac: Various fixes and additions for PPC405EZ
The following patch series adds things needed to support the PowerPC 405EZ SoC. I've incorporated the suggestions and fixes from the previous round of patches and barring any further comments these should be ready to go.
josh
Josh Boyer (3):
ibm_newemac: Allow the "no flow control" EMAC feature to work
ibm_newemac: Introduce mal_has_feature
ibm_newemac: MAL support for PowerPC 405EZ
arch/powerpc/include/asm/dcr-regs.h | 7 ++++ drivers/net/ibm_newemac/Kconfig | 12 +++++++ drivers/net/ibm_newemac/core.c | 2 + drivers/net/ibm_newemac/core.h | 3 ++ drivers/net/ibm_newemac/mal.c | 60 ++++++++++++++++++++++++++++++++--- drivers/net/ibm_newemac/mal.h | 34 ++++++++++++++++++++ 6 files changed, 113 insertions(+), 5 deletions(-)
Quoted 3 lines · Josh Boyer
The following patch series adds things needed to support the PowerPC 405EZ SoC. I've incorporated the suggestions and fixes from the previous round of patches and barring any further comments these should be ready to go.
For some reason, I got this email but not the 3 following patch ones...
Cheers,
Ben.
Quoted 14 lines
josh
Josh Boyer (3):
ibm_newemac: Allow the "no flow control" EMAC feature to work
ibm_newemac: Introducemal_has_feature
ibm_newemac: MAL support for PowerPC 405EZarch/powerpc/include/asm/dcr-regs.h | 7 ++++ drivers/net/ibm_newemac/Kconfig | 12 +++++++ drivers/net/ibm_newemac/core.c | 2 + drivers/net/ibm_newemac/core.h | 3 ++ drivers/net/ibm_newemac/mal.c | 60 ++++++++++++++++++++++++++++++++--- drivers/net/ibm_newemac/mal.h | 34 ++++++++++++++++++++ 6 files changed, 113 insertions(+), 5 deletions(-)
Quoted 6 lines · On Tue, 09 Sep 2008 17:11:23 +1000 Benjamin Herrenschmidt…
Quoted 3 lines · Josh Boyer
The following patch series adds things needed to support the PowerPC 405EZ SoC. I've incorporated the suggestions and fixes from the previous round of patches and barring any further comments these should be ready to go.
For some reason, I got this email but not the 3 following patch ones...
Erm.. odd.
http://patchwork.ozlabs.org/patch/208/
http://patchwork.ozlabs.org/patch/209/
http://patchwork.ozlabs.org/patch/210/
All of them were addressed to you and netdev, with linuxppc-dev on CC. You should have gotten them..
josh
Quoted 10 lines · On Mon, 8 Sep 2008 08:44:59 -0400 Josh Boyer <[email protected]> wrote:
The following patch series adds things needed to support the PowerPC 405EZ SoC. I've incorporated the suggestions and fixes from the previous round of patches and barring any further comments these should be ready to go.
josh
Josh Boyer (3):
ibm_newemac: Allow the "no flow control" EMAC feature to work
ibm_newemac: Introducemal_has_feature
ibm_newemac: MAL support for PowerPC 405EZ
I should mention that I have a platform support patch series that depends on these for working ethernet. I can bring this set in through my tree at the same time if the patches look fine and Jeff acks that.
josh
Re: [PATCH 1/3] ibm_newemac: Allow the "no flow control" EMAC feature to work
In reply to Josh BoyerQuoted 8 lines · Josh Boyer
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
Kconfigoption for affected platforms to select and puts the feature in theEMAC_FTRS_POSSIBLElist. This is set for PowerPC 405EZ platforms as well.
Quoted 6 lines
Signed-off-by Josh Boyer <[email protected]>--- drivers/net/ibm_newemac/Kconfig | 4 ++++ drivers/net/ibm_newemac/core.c | 2 ++ drivers/net/ibm_newemac/core.h | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-)
ACK patches 1-3