mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
net: tsec: Use portable regs type (uint->u32)
Use cross arch portable u32 instead of uint for the tsec registers. Remove the typedefs for the register struct definitions in the process. Fix long lines. Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
This commit is contained in:
Claudiu Manoil
Joe Hershberger
parent
9c9141fd04
commit
82ef75ca5c
2 changed files with 136 additions and 138 deletions
|
|
@ -166,7 +166,7 @@ static void init_registers(struct tsec __iomem *regs)
|
|||
out_be32(®s->rctrl, 0x00000000);
|
||||
|
||||
/* Init RMON mib registers */
|
||||
memset((void *)&(regs->rmon), 0, sizeof(rmon_mib_t));
|
||||
memset((void *)®s->rmon, 0, sizeof(regs->rmon));
|
||||
|
||||
out_be32(®s->rmon.cam1, 0xffffffff);
|
||||
out_be32(®s->rmon.cam2, 0xffffffff);
|
||||
|
|
|
|||
272
include/tsec.h
272
include/tsec.h
|
|
@ -210,179 +210,177 @@ struct rxbd8 {
|
|||
uint32_t bufptr; /* Buffer Pointer */
|
||||
};
|
||||
|
||||
typedef struct rmon_mib
|
||||
{
|
||||
struct tsec_rmon_mib {
|
||||
/* Transmit and Receive Counters */
|
||||
uint tr64; /* Transmit and Receive 64-byte Frame Counter */
|
||||
uint tr127; /* Transmit and Receive 65-127 byte Frame Counter */
|
||||
uint tr255; /* Transmit and Receive 128-255 byte Frame Counter */
|
||||
uint tr511; /* Transmit and Receive 256-511 byte Frame Counter */
|
||||
uint tr1k; /* Transmit and Receive 512-1023 byte Frame Counter */
|
||||
uint trmax; /* Transmit and Receive 1024-1518 byte Frame Counter */
|
||||
uint trmgv; /* Transmit and Receive 1519-1522 byte Good VLAN Frame */
|
||||
u32 tr64; /* Tx/Rx 64-byte Frame Counter */
|
||||
u32 tr127; /* Tx/Rx 65-127 byte Frame Counter */
|
||||
u32 tr255; /* Tx/Rx 128-255 byte Frame Counter */
|
||||
u32 tr511; /* Tx/Rx 256-511 byte Frame Counter */
|
||||
u32 tr1k; /* Tx/Rx 512-1023 byte Frame Counter */
|
||||
u32 trmax; /* Tx/Rx 1024-1518 byte Frame Counter */
|
||||
u32 trmgv; /* Tx/Rx 1519-1522 byte Good VLAN Frame */
|
||||
/* Receive Counters */
|
||||
uint rbyt; /* Receive Byte Counter */
|
||||
uint rpkt; /* Receive Packet Counter */
|
||||
uint rfcs; /* Receive FCS Error Counter */
|
||||
uint rmca; /* Receive Multicast Packet (Counter) */
|
||||
uint rbca; /* Receive Broadcast Packet */
|
||||
uint rxcf; /* Receive Control Frame Packet */
|
||||
uint rxpf; /* Receive Pause Frame Packet */
|
||||
uint rxuo; /* Receive Unknown OP Code */
|
||||
uint raln; /* Receive Alignment Error */
|
||||
uint rflr; /* Receive Frame Length Error */
|
||||
uint rcde; /* Receive Code Error */
|
||||
uint rcse; /* Receive Carrier Sense Error */
|
||||
uint rund; /* Receive Undersize Packet */
|
||||
uint rovr; /* Receive Oversize Packet */
|
||||
uint rfrg; /* Receive Fragments */
|
||||
uint rjbr; /* Receive Jabber */
|
||||
uint rdrp; /* Receive Drop */
|
||||
u32 rbyt; /* Receive Byte Counter */
|
||||
u32 rpkt; /* Receive Packet Counter */
|
||||
u32 rfcs; /* Receive FCS Error Counter */
|
||||
u32 rmca; /* Receive Multicast Packet (Counter) */
|
||||
u32 rbca; /* Receive Broadcast Packet */
|
||||
u32 rxcf; /* Receive Control Frame Packet */
|
||||
u32 rxpf; /* Receive Pause Frame Packet */
|
||||
u32 rxuo; /* Receive Unknown OP Code */
|
||||
u32 raln; /* Receive Alignment Error */
|
||||
u32 rflr; /* Receive Frame Length Error */
|
||||
u32 rcde; /* Receive Code Error */
|
||||
u32 rcse; /* Receive Carrier Sense Error */
|
||||
u32 rund; /* Receive Undersize Packet */
|
||||
u32 rovr; /* Receive Oversize Packet */
|
||||
u32 rfrg; /* Receive Fragments */
|
||||
u32 rjbr; /* Receive Jabber */
|
||||
u32 rdrp; /* Receive Drop */
|
||||
/* Transmit Counters */
|
||||
uint tbyt; /* Transmit Byte Counter */
|
||||
uint tpkt; /* Transmit Packet */
|
||||
uint tmca; /* Transmit Multicast Packet */
|
||||
uint tbca; /* Transmit Broadcast Packet */
|
||||
uint txpf; /* Transmit Pause Control Frame */
|
||||
uint tdfr; /* Transmit Deferral Packet */
|
||||
uint tedf; /* Transmit Excessive Deferral Packet */
|
||||
uint tscl; /* Transmit Single Collision Packet */
|
||||
u32 tbyt; /* Transmit Byte Counter */
|
||||
u32 tpkt; /* Transmit Packet */
|
||||
u32 tmca; /* Transmit Multicast Packet */
|
||||
u32 tbca; /* Transmit Broadcast Packet */
|
||||
u32 txpf; /* Transmit Pause Control Frame */
|
||||
u32 tdfr; /* Transmit Deferral Packet */
|
||||
u32 tedf; /* Transmit Excessive Deferral Packet */
|
||||
u32 tscl; /* Transmit Single Collision Packet */
|
||||
/* (0x2_n700) */
|
||||
uint tmcl; /* Transmit Multiple Collision Packet */
|
||||
uint tlcl; /* Transmit Late Collision Packet */
|
||||
uint txcl; /* Transmit Excessive Collision Packet */
|
||||
uint tncl; /* Transmit Total Collision */
|
||||
u32 tmcl; /* Transmit Multiple Collision Packet */
|
||||
u32 tlcl; /* Transmit Late Collision Packet */
|
||||
u32 txcl; /* Transmit Excessive Collision Packet */
|
||||
u32 tncl; /* Transmit Total Collision */
|
||||
|
||||
uint res2;
|
||||
u32 res2;
|
||||
|
||||
uint tdrp; /* Transmit Drop Frame */
|
||||
uint tjbr; /* Transmit Jabber Frame */
|
||||
uint tfcs; /* Transmit FCS Error */
|
||||
uint txcf; /* Transmit Control Frame */
|
||||
uint tovr; /* Transmit Oversize Frame */
|
||||
uint tund; /* Transmit Undersize Frame */
|
||||
uint tfrg; /* Transmit Fragments Frame */
|
||||
u32 tdrp; /* Transmit Drop Frame */
|
||||
u32 tjbr; /* Transmit Jabber Frame */
|
||||
u32 tfcs; /* Transmit FCS Error */
|
||||
u32 txcf; /* Transmit Control Frame */
|
||||
u32 tovr; /* Transmit Oversize Frame */
|
||||
u32 tund; /* Transmit Undersize Frame */
|
||||
u32 tfrg; /* Transmit Fragments Frame */
|
||||
/* General Registers */
|
||||
uint car1; /* Carry Register One */
|
||||
uint car2; /* Carry Register Two */
|
||||
uint cam1; /* Carry Register One Mask */
|
||||
uint cam2; /* Carry Register Two Mask */
|
||||
} rmon_mib_t;
|
||||
u32 car1; /* Carry Register One */
|
||||
u32 car2; /* Carry Register Two */
|
||||
u32 cam1; /* Carry Register One Mask */
|
||||
u32 cam2; /* Carry Register Two Mask */
|
||||
};
|
||||
|
||||
typedef struct tsec_hash_regs
|
||||
{
|
||||
uint iaddr0; /* Individual Address Register 0 */
|
||||
uint iaddr1; /* Individual Address Register 1 */
|
||||
uint iaddr2; /* Individual Address Register 2 */
|
||||
uint iaddr3; /* Individual Address Register 3 */
|
||||
uint iaddr4; /* Individual Address Register 4 */
|
||||
uint iaddr5; /* Individual Address Register 5 */
|
||||
uint iaddr6; /* Individual Address Register 6 */
|
||||
uint iaddr7; /* Individual Address Register 7 */
|
||||
uint res1[24];
|
||||
uint gaddr0; /* Group Address Register 0 */
|
||||
uint gaddr1; /* Group Address Register 1 */
|
||||
uint gaddr2; /* Group Address Register 2 */
|
||||
uint gaddr3; /* Group Address Register 3 */
|
||||
uint gaddr4; /* Group Address Register 4 */
|
||||
uint gaddr5; /* Group Address Register 5 */
|
||||
uint gaddr6; /* Group Address Register 6 */
|
||||
uint gaddr7; /* Group Address Register 7 */
|
||||
uint res2[24];
|
||||
} tsec_hash_t;
|
||||
struct tsec_hash_regs {
|
||||
u32 iaddr0; /* Individual Address Register 0 */
|
||||
u32 iaddr1; /* Individual Address Register 1 */
|
||||
u32 iaddr2; /* Individual Address Register 2 */
|
||||
u32 iaddr3; /* Individual Address Register 3 */
|
||||
u32 iaddr4; /* Individual Address Register 4 */
|
||||
u32 iaddr5; /* Individual Address Register 5 */
|
||||
u32 iaddr6; /* Individual Address Register 6 */
|
||||
u32 iaddr7; /* Individual Address Register 7 */
|
||||
u32 res1[24];
|
||||
u32 gaddr0; /* Group Address Register 0 */
|
||||
u32 gaddr1; /* Group Address Register 1 */
|
||||
u32 gaddr2; /* Group Address Register 2 */
|
||||
u32 gaddr3; /* Group Address Register 3 */
|
||||
u32 gaddr4; /* Group Address Register 4 */
|
||||
u32 gaddr5; /* Group Address Register 5 */
|
||||
u32 gaddr6; /* Group Address Register 6 */
|
||||
u32 gaddr7; /* Group Address Register 7 */
|
||||
u32 res2[24];
|
||||
};
|
||||
|
||||
struct tsec {
|
||||
/* General Control and Status Registers (0x2_n000) */
|
||||
uint res000[4];
|
||||
u32 res000[4];
|
||||
|
||||
uint ievent; /* Interrupt Event */
|
||||
uint imask; /* Interrupt Mask */
|
||||
uint edis; /* Error Disabled */
|
||||
uint res01c;
|
||||
uint ecntrl; /* Ethernet Control */
|
||||
uint minflr; /* Minimum Frame Length */
|
||||
uint ptv; /* Pause Time Value */
|
||||
uint dmactrl; /* DMA Control */
|
||||
uint tbipa; /* TBI PHY Address */
|
||||
u32 ievent; /* Interrupt Event */
|
||||
u32 imask; /* Interrupt Mask */
|
||||
u32 edis; /* Error Disabled */
|
||||
u32 res01c;
|
||||
u32 ecntrl; /* Ethernet Control */
|
||||
u32 minflr; /* Minimum Frame Length */
|
||||
u32 ptv; /* Pause Time Value */
|
||||
u32 dmactrl; /* DMA Control */
|
||||
u32 tbipa; /* TBI PHY Address */
|
||||
|
||||
uint res034[3];
|
||||
uint res040[48];
|
||||
u32 res034[3];
|
||||
u32 res040[48];
|
||||
|
||||
/* Transmit Control and Status Registers (0x2_n100) */
|
||||
uint tctrl; /* Transmit Control */
|
||||
uint tstat; /* Transmit Status */
|
||||
uint res108;
|
||||
uint tbdlen; /* Tx BD Data Length */
|
||||
uint res110[5];
|
||||
uint ctbptr; /* Current TxBD Pointer */
|
||||
uint res128[23];
|
||||
uint tbptr; /* TxBD Pointer */
|
||||
uint res188[30];
|
||||
u32 tctrl; /* Transmit Control */
|
||||
u32 tstat; /* Transmit Status */
|
||||
u32 res108;
|
||||
u32 tbdlen; /* Tx BD Data Length */
|
||||
u32 res110[5];
|
||||
u32 ctbptr; /* Current TxBD Pointer */
|
||||
u32 res128[23];
|
||||
u32 tbptr; /* TxBD Pointer */
|
||||
u32 res188[30];
|
||||
/* (0x2_n200) */
|
||||
uint res200;
|
||||
uint tbase; /* TxBD Base Address */
|
||||
uint res208[42];
|
||||
uint ostbd; /* Out of Sequence TxBD */
|
||||
uint ostbdp; /* Out of Sequence Tx Data Buffer Pointer */
|
||||
uint res2b8[18];
|
||||
u32 res200;
|
||||
u32 tbase; /* TxBD Base Address */
|
||||
u32 res208[42];
|
||||
u32 ostbd; /* Out of Sequence TxBD */
|
||||
u32 ostbdp; /* Out of Sequence Tx Data Buffer Pointer */
|
||||
u32 res2b8[18];
|
||||
|
||||
/* Receive Control and Status Registers (0x2_n300) */
|
||||
uint rctrl; /* Receive Control */
|
||||
uint rstat; /* Receive Status */
|
||||
uint res308;
|
||||
uint rbdlen; /* RxBD Data Length */
|
||||
uint res310[4];
|
||||
uint res320;
|
||||
uint crbptr; /* Current Receive Buffer Pointer */
|
||||
uint res328[6];
|
||||
uint mrblr; /* Maximum Receive Buffer Length */
|
||||
uint res344[16];
|
||||
uint rbptr; /* RxBD Pointer */
|
||||
uint res388[30];
|
||||
u32 rctrl; /* Receive Control */
|
||||
u32 rstat; /* Receive Status */
|
||||
u32 res308;
|
||||
u32 rbdlen; /* RxBD Data Length */
|
||||
u32 res310[4];
|
||||
u32 res320;
|
||||
u32 crbptr; /* Current Receive Buffer Pointer */
|
||||
u32 res328[6];
|
||||
u32 mrblr; /* Maximum Receive Buffer Length */
|
||||
u32 res344[16];
|
||||
u32 rbptr; /* RxBD Pointer */
|
||||
u32 res388[30];
|
||||
/* (0x2_n400) */
|
||||
uint res400;
|
||||
uint rbase; /* RxBD Base Address */
|
||||
uint res408[62];
|
||||
u32 res400;
|
||||
u32 rbase; /* RxBD Base Address */
|
||||
u32 res408[62];
|
||||
|
||||
/* MAC Registers (0x2_n500) */
|
||||
uint maccfg1; /* MAC Configuration #1 */
|
||||
uint maccfg2; /* MAC Configuration #2 */
|
||||
uint ipgifg; /* Inter Packet Gap/Inter Frame Gap */
|
||||
uint hafdup; /* Half-duplex */
|
||||
uint maxfrm; /* Maximum Frame */
|
||||
uint res514;
|
||||
uint res518;
|
||||
u32 maccfg1; /* MAC Configuration #1 */
|
||||
u32 maccfg2; /* MAC Configuration #2 */
|
||||
u32 ipgifg; /* Inter Packet Gap/Inter Frame Gap */
|
||||
u32 hafdup; /* Half-duplex */
|
||||
u32 maxfrm; /* Maximum Frame */
|
||||
u32 res514;
|
||||
u32 res518;
|
||||
|
||||
uint res51c;
|
||||
u32 res51c;
|
||||
|
||||
uint resmdio[6];
|
||||
u32 resmdio[6];
|
||||
|
||||
uint res538;
|
||||
u32 res538;
|
||||
|
||||
uint ifstat; /* Interface Status */
|
||||
uint macstnaddr1; /* Station Address, part 1 */
|
||||
uint macstnaddr2; /* Station Address, part 2 */
|
||||
uint res548[46];
|
||||
u32 ifstat; /* Interface Status */
|
||||
u32 macstnaddr1; /* Station Address, part 1 */
|
||||
u32 macstnaddr2; /* Station Address, part 2 */
|
||||
u32 res548[46];
|
||||
|
||||
/* (0x2_n600) */
|
||||
uint res600[32];
|
||||
u32 res600[32];
|
||||
|
||||
/* RMON MIB Registers (0x2_n680-0x2_n73c) */
|
||||
rmon_mib_t rmon;
|
||||
uint res740[48];
|
||||
struct tsec_rmon_mib rmon;
|
||||
u32 res740[48];
|
||||
|
||||
/* Hash Function Registers (0x2_n800) */
|
||||
tsec_hash_t hash;
|
||||
struct tsec_hash_regs hash;
|
||||
|
||||
uint res900[128];
|
||||
u32 res900[128];
|
||||
|
||||
/* Pattern Registers (0x2_nb00) */
|
||||
uint resb00[62];
|
||||
uint attr; /* Default Attribute Register */
|
||||
uint attreli; /* Default Attribute Extract Length and Index */
|
||||
u32 resb00[62];
|
||||
u32 attr; /* Default Attribute Register */
|
||||
u32 attreli; /* Default Attribute Extract Length and Index */
|
||||
|
||||
/* TSEC Future Expansion Space (0x2_nc00-0x2_nffc) */
|
||||
uint resc00[256];
|
||||
u32 resc00[256];
|
||||
};
|
||||
|
||||
#define TSEC_GIGABIT (1 << 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue