Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: et131x: Clean the IPG types up

Browse source 
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-10-06 15:50:26 +01:00 committed by Greg Kroah-Hartman
parent d8fd9d7ecf
commit 308e93e0a3
2 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/staging/et131x/et1310_address_map.h
View file

@ -1388,29 +1388,14 @@ typedef union _MAC_CFG2_t {
/* /*
* structure for Interpacket gap reg in mac address map. * structure for Interpacket gap reg in mac address map.
* located at address 0x5008 * located at address 0x5008
*
* 31: reserved
* 30-24: non B2B ipg 1
* 23: undefined
* 22-16: non B2B ipg 2
* 15-8: Min ifg enforce
* 7-0: B2B ipg
*/ */
typedef union _MAC_IPG_t {
u32 value;
struct {
#ifdef _BIT_FIELDS_HTOL
u32 reserved:1; /* bit 31 */
u32 non_B2B_ipg_1:7; /* bits 24-30 */
u32 undefined2:1; /* bit 23 */
u32 non_B2B_ipg_2:7; /* bits 16-22 */
u32 min_ifg_enforce:8; /* bits 8-15 */
u32 undefined1:1; /* bit 7 */
u32 B2B_ipg:7; /* bits 0-6 */
#else
u32 B2B_ipg:7; /* bits 0-6 */
u32 undefined1:1; /* bit 7 */
u32 min_ifg_enforce:8; /* bits 8-15 */
u32 non_B2B_ipg_2:7; /* bits 16-22 */
u32 undefined2:1; /* bit 23 */
u32 non_B2B_ipg_1:7; /* bits 24-30 */
u32 reserved:1; /* bit 31 */
#endif
} bits;
} MAC_IPG_t, *PMAC_IPG_t;
/* /*
* structure for half duplex reg in mac address map. * structure for half duplex reg in mac address map.
@ -1731,7 +1716,7 @@ typedef union _MAC_STATION_ADDR2_t {
typedef struct _MAC_t { /* Location: */ typedef struct _MAC_t { /* Location: */
MAC_CFG1_t cfg1; /* 0x5000 */ MAC_CFG1_t cfg1; /* 0x5000 */
MAC_CFG2_t cfg2; /* 0x5004 */ MAC_CFG2_t cfg2; /* 0x5004 */
MAC_IPG_t ipg; /* 0x5008 */ u32 ipg; /* 0x5008 */
MAC_HFDP_t hfdp; /* 0x500C */ MAC_HFDP_t hfdp; /* 0x500C */
MAC_MAX_FM_LEN_t max_fm_len; /* 0x5010 */ MAC_MAX_FM_LEN_t max_fm_len; /* 0x5010 */
u32 rsv1; /* 0x5014 */ u32 rsv1; /* 0x5014 */

10
drivers/staging/et131x/et1310_mac.c
View file

@ -101,7 +101,7 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
struct _MAC_t __iomem *pMac = &etdev->regs->mac; struct _MAC_t __iomem *pMac = &etdev->regs->mac;
MAC_STATION_ADDR1_t station1; MAC_STATION_ADDR1_t station1;
MAC_STATION_ADDR2_t station2; MAC_STATION_ADDR2_t station2;
MAC_IPG_t ipg; u32 ipg;
MAC_HFDP_t hfdp; MAC_HFDP_t hfdp;
MII_MGMT_CFG_t mii_mgmt_cfg; MII_MGMT_CFG_t mii_mgmt_cfg;
@ -111,11 +111,9 @@ void ConfigMACRegs1(struct et131x_adapter *etdev)
writel(0xC00F0000, &pMac->cfg1.value); writel(0xC00F0000, &pMac->cfg1.value);
/* Next lets configure the MAC Inter-packet gap register */ /* Next lets configure the MAC Inter-packet gap register */
ipg.bits.non_B2B_ipg_1 = 0x38; /* 58d */ ipg = 0x38005860; /* IPG1 0x38 IPG2 0x58 B2B 0x60 */
ipg.bits.non_B2B_ipg_2 = 0x58; /* 88d */ ipg |= 0x50 << 8; /* ifg enforce 0x50 */
ipg.bits.min_ifg_enforce = 0x50; /* 80d */ writel(ipg, &pMac->ipg);
ipg.bits.B2B_ipg = 0x60; /* 96d */
writel(ipg.value, &pMac->ipg.value);
/* Next lets configure the MAC Half Duplex register */ /* Next lets configure the MAC Half Duplex register */
hfdp.bits.alt_beb_trunc = 0xA; hfdp.bits.alt_beb_trunc = 0xA;