ibm_newemac: Added 16K Tx FIFO size support for EMAC4
Subsystems (2)
PATCH v2 1/1 ibm_newemac: Added 16K Tx FIFO size support for EMAC4
Some of the EMAC V4 implementations support 16K Tx FIFOs. This patch adds support for this functionality and fixes typos in the Tx FIFO size error messages.
---
v1->v2: local date/time was out-of-sync and thus mail was as well
drivers/net/ibm_newemac/core.c | 7 +++++-- drivers/net/ibm_newemac/emac.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ibm_newemac/core.c +5 -2
@@ -443,7 +443,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s ret |=EMAC_MR1_TFS_2K ;break ;default : -printk (KERN_WARNING "%s: Unknown Rx FIFO size %d\n" , +printk (KERN_WARNING "%s: Unknown Tx FIFO size %d\n" , dev->ndev->name, tx_size); }
@@ -470,6 +470,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_DBG2 (dev,"__emac4_calc_base_mr1" NL );switch (tx_size) { +case 16384 : + ret |=EMAC4_MR1_TFS_16K ; +break ;case 4096 : ret |=EMAC4_MR1_TFS_4K ;break ;
@@ -477,7 +480,7 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_ ret |=EMAC4_MR1_TFS_2K ;break ;default : -printk (KERN_WARNING "%s: Unknown Rx FIFO size %d\n" , +printk (KERN_WARNING "%s: Unknown Tx FIFO size %d\n" , dev->ndev->name, tx_size); }
drivers/net/ibm_newemac/emac.h +1 -0
@@ -153,6 +153,7 @@ struct emac_regs {#define EMAC4_MR1_RFS_16K 0x00280000#define EMAC4_MR1_TFS_2K 0x00020000#define EMAC4_MR1_TFS_4K 0x00030000 +#define EMAC4_MR1_TFS_16K 0x00050000#define EMAC4_MR1_TR 0x00008000#define EMAC4_MR1_MWSW_001 0x00001000#define EMAC4_MR1_JPSM 0x00000800
Signature · 1 line
1.6.3.2
Quoted 3 lines · Dave Mitchell
Some of the EMAC V4 implementations support 16K Tx FIFOs. This patch adds support for this functionality and fixes typos in the Tx FIFO size error messages.
---
Quoted 55 lines
Signed-off-by Dave Mitchell <[email protected]>Acked-by Prodyut Hazarika <[email protected]>Acked-by Victor Gallardo <[email protected]>Acked-by Loc Ho <[email protected]>---
v1->v2: local date/time was out-of-sync and thus mail was as welldrivers/net/ibm_newemac/core.c | 7 +++++-- drivers/net/ibm_newemac/emac.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)drivers/net/ibm_newemac/core.c +5
-2@@ -443,7 +443,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s ret |=EMAC_MR1_TFS_2K ;break ;default : -printk (KERN_WARNING "%s: Unknown Rx FIFO size %d\n" , +printk (KERN_WARNING "%s: Unknown Tx FIFO size %d\n" , dev->ndev->name, tx_size); }@@ -470,6 +470,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_DBG2 (dev,"__emac4_calc_base_mr1" NL );switch (tx_size) { +case 16384 : + ret |=EMAC4_MR1_TFS_16K ; +break ;case 4096 : ret |=EMAC4_MR1_TFS_4K ;break ;@@ -477,7 +480,7 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_ ret |=EMAC4_MR1_TFS_2K ;break ;default : -printk (KERN_WARNING "%s: Unknown Rx FIFO size %d\n" , +printk (KERN_WARNING "%s: Unknown Tx FIFO size %d\n" , dev->ndev->name, tx_size); }drivers/net/ibm_newemac/emac.h +1
-0@@ -153,6 +153,7 @@ struct emac_regs {#define EMAC4_MR1_RFS_16K 0x00280000#define EMAC4_MR1_TFS_2K 0x00020000#define EMAC4_MR1_TFS_4K 0x00030000 +#define EMAC4_MR1_TFS_16K 0x00050000#define EMAC4_MR1_TR 0x00008000#define EMAC4_MR1_MWSW_001 0x00001000#define EMAC4_MR1_JPSM 0x00000800
From: Benjamin Herrenschmidt <[email protected]>
Date: Fri, 09 Oct 2009 13:15:02 +1100
Quoted 5 lines · Dave Mitchell
Quoted 3 lines
Some of the EMAC V4 implementations support 16K Tx FIFOs. This patch adds support for this functionality and fixes typos in the Tx FIFO size error messages.
Quoted 7 lines
---
Quoted 4 lines
Signed-off-by Dave Mitchell <[email protected]>Acked-by Prodyut Hazarika <[email protected]>Acked-by Victor Gallardo <[email protected]>Acked-by Loc Ho <[email protected]>
Applied to net-2.6, thanks!