aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ucc_geth.h
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-06-02 14:10:09 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-03 06:18:23 -0400
commitba2d3587912f82d1ab4367975b1df460db60fb1e (patch)
tree1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/ucc_geth.h
parent1273d97674a1782ff55b823aa6c40aea9b538aaf (diff)
drivers/net: use __packed annotation
cleanup patch. Use new __packed annotation in drivers/net/ Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ucc_geth.h')
-rw-r--r--drivers/net/ucc_geth.h46
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
index ef1fbeb11c6e..05a95586f3c5 100644
--- a/drivers/net/ucc_geth.h
+++ b/drivers/net/ucc_geth.h
@@ -106,7 +106,7 @@ struct ucc_geth {
106 u32 scar; /* Statistics carry register */ 106 u32 scar; /* Statistics carry register */
107 u32 scam; /* Statistics caryy mask register */ 107 u32 scam; /* Statistics caryy mask register */
108 u8 res5[0x200 - 0x1c4]; 108 u8 res5[0x200 - 0x1c4];
109} __attribute__ ((packed)); 109} __packed;
110 110
111/* UCC GETH TEMODR Register */ 111/* UCC GETH TEMODR Register */
112#define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics 112#define TEMODER_TX_RMON_STATISTICS_ENABLE 0x0100 /* enable Tx statistics
@@ -420,11 +420,11 @@ struct ucc_geth {
420 420
421struct ucc_geth_thread_data_tx { 421struct ucc_geth_thread_data_tx {
422 u8 res0[104]; 422 u8 res0[104];
423} __attribute__ ((packed)); 423} __packed;
424 424
425struct ucc_geth_thread_data_rx { 425struct ucc_geth_thread_data_rx {
426 u8 res0[40]; 426 u8 res0[40];
427} __attribute__ ((packed)); 427} __packed;
428 428
429/* Send Queue Queue-Descriptor */ 429/* Send Queue Queue-Descriptor */
430struct ucc_geth_send_queue_qd { 430struct ucc_geth_send_queue_qd {
@@ -432,19 +432,19 @@ struct ucc_geth_send_queue_qd {
432 u8 res0[0x8]; 432 u8 res0[0x8];
433 u32 last_bd_completed_address;/* initialize to last entry in BD ring */ 433 u32 last_bd_completed_address;/* initialize to last entry in BD ring */
434 u8 res1[0x30]; 434 u8 res1[0x30];
435} __attribute__ ((packed)); 435} __packed;
436 436
437struct ucc_geth_send_queue_mem_region { 437struct ucc_geth_send_queue_mem_region {
438 struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES]; 438 struct ucc_geth_send_queue_qd sqqd[NUM_TX_QUEUES];
439} __attribute__ ((packed)); 439} __packed;
440 440
441struct ucc_geth_thread_tx_pram { 441struct ucc_geth_thread_tx_pram {
442 u8 res0[64]; 442 u8 res0[64];
443} __attribute__ ((packed)); 443} __packed;
444 444
445struct ucc_geth_thread_rx_pram { 445struct ucc_geth_thread_rx_pram {
446 u8 res0[128]; 446 u8 res0[128];
447} __attribute__ ((packed)); 447} __packed;
448 448
449#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64 449#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING 64
450#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64 450#define THREAD_RX_PRAM_ADDITIONAL_FOR_EXTENDED_FILTERING_8 64
@@ -484,7 +484,7 @@ struct ucc_geth_scheduler {
484 /**< weight factor for queues */ 484 /**< weight factor for queues */
485 u32 minw; /* temporary variable handled by QE */ 485 u32 minw; /* temporary variable handled by QE */
486 u8 res1[0x70 - 0x64]; 486 u8 res1[0x70 - 0x64];
487} __attribute__ ((packed)); 487} __packed;
488 488
489struct ucc_geth_tx_firmware_statistics_pram { 489struct ucc_geth_tx_firmware_statistics_pram {
490 u32 sicoltx; /* single collision */ 490 u32 sicoltx; /* single collision */
@@ -506,7 +506,7 @@ struct ucc_geth_tx_firmware_statistics_pram {
506 and 1518 octets */ 506 and 1518 octets */
507 u32 txpktsjumbo; /* total packets (including bad) between 1024 507 u32 txpktsjumbo; /* total packets (including bad) between 1024
508 and MAXLength octets */ 508 and MAXLength octets */
509} __attribute__ ((packed)); 509} __packed;
510 510
511struct ucc_geth_rx_firmware_statistics_pram { 511struct ucc_geth_rx_firmware_statistics_pram {
512 u32 frrxfcser; /* frames with crc error */ 512 u32 frrxfcser; /* frames with crc error */
@@ -540,7 +540,7 @@ struct ucc_geth_rx_firmware_statistics_pram {
540 replaced */ 540 replaced */
541 u32 insertvlan; /* total frames that had their VLAN tag 541 u32 insertvlan; /* total frames that had their VLAN tag
542 inserted */ 542 inserted */
543} __attribute__ ((packed)); 543} __packed;
544 544
545struct ucc_geth_rx_interrupt_coalescing_entry { 545struct ucc_geth_rx_interrupt_coalescing_entry {
546 u32 interruptcoalescingmaxvalue; /* interrupt coalescing max 546 u32 interruptcoalescingmaxvalue; /* interrupt coalescing max
@@ -548,23 +548,23 @@ struct ucc_geth_rx_interrupt_coalescing_entry {
548 u32 interruptcoalescingcounter; /* interrupt coalescing counter, 548 u32 interruptcoalescingcounter; /* interrupt coalescing counter,
549 initialize to 549 initialize to
550 interruptcoalescingmaxvalue */ 550 interruptcoalescingmaxvalue */
551} __attribute__ ((packed)); 551} __packed;
552 552
553struct ucc_geth_rx_interrupt_coalescing_table { 553struct ucc_geth_rx_interrupt_coalescing_table {
554 struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES]; 554 struct ucc_geth_rx_interrupt_coalescing_entry coalescingentry[NUM_RX_QUEUES];
555 /**< interrupt coalescing entry */ 555 /**< interrupt coalescing entry */
556} __attribute__ ((packed)); 556} __packed;
557 557
558struct ucc_geth_rx_prefetched_bds { 558struct ucc_geth_rx_prefetched_bds {
559 struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */ 559 struct qe_bd bd[NUM_BDS_IN_PREFETCHED_BDS]; /* prefetched bd */
560} __attribute__ ((packed)); 560} __packed;
561 561
562struct ucc_geth_rx_bd_queues_entry { 562struct ucc_geth_rx_bd_queues_entry {
563 u32 bdbaseptr; /* BD base pointer */ 563 u32 bdbaseptr; /* BD base pointer */
564 u32 bdptr; /* BD pointer */ 564 u32 bdptr; /* BD pointer */
565 u32 externalbdbaseptr; /* external BD base pointer */ 565 u32 externalbdbaseptr; /* external BD base pointer */
566 u32 externalbdptr; /* external BD pointer */ 566 u32 externalbdptr; /* external BD pointer */
567} __attribute__ ((packed)); 567} __packed;
568 568
569struct ucc_geth_tx_global_pram { 569struct ucc_geth_tx_global_pram {
570 u16 temoder; 570 u16 temoder;
@@ -580,13 +580,13 @@ struct ucc_geth_tx_global_pram {
580 u32 tqptr; /* a base pointer to the Tx Queues Memory 580 u32 tqptr; /* a base pointer to the Tx Queues Memory
581 Region */ 581 Region */
582 u8 res2[0x80 - 0x74]; 582 u8 res2[0x80 - 0x74];
583} __attribute__ ((packed)); 583} __packed;
584 584
585/* structure representing Extended Filtering Global Parameters in PRAM */ 585/* structure representing Extended Filtering Global Parameters in PRAM */
586struct ucc_geth_exf_global_pram { 586struct ucc_geth_exf_global_pram {
587 u32 l2pcdptr; /* individual address filter, high */ 587 u32 l2pcdptr; /* individual address filter, high */
588 u8 res0[0x10 - 0x04]; 588 u8 res0[0x10 - 0x04];
589} __attribute__ ((packed)); 589} __packed;
590 590
591struct ucc_geth_rx_global_pram { 591struct ucc_geth_rx_global_pram {
592 u32 remoder; /* ethernet mode reg. */ 592 u32 remoder; /* ethernet mode reg. */
@@ -620,7 +620,7 @@ struct ucc_geth_rx_global_pram {
620 u32 exfGlobalParam; /* base address for extended filtering global 620 u32 exfGlobalParam; /* base address for extended filtering global
621 parameters */ 621 parameters */
622 u8 res6[0x100 - 0xC4]; /* Initialize to zero */ 622 u8 res6[0x100 - 0xC4]; /* Initialize to zero */
623} __attribute__ ((packed)); 623} __packed;
624 624
625#define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01 625#define GRACEFUL_STOP_ACKNOWLEDGE_RX 0x01
626 626
@@ -639,7 +639,7 @@ struct ucc_geth_init_pram {
639 u32 txglobal; /* tx global */ 639 u32 txglobal; /* tx global */
640 u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */ 640 u32 txthread[ENET_INIT_PARAM_MAX_ENTRIES_TX]; /* tx threads */
641 u8 res3[0x1]; 641 u8 res3[0x1];
642} __attribute__ ((packed)); 642} __packed;
643 643
644#define ENET_INIT_PARAM_RGF_SHIFT (32 - 4) 644#define ENET_INIT_PARAM_RGF_SHIFT (32 - 4)
645#define ENET_INIT_PARAM_TGF_SHIFT (32 - 8) 645#define ENET_INIT_PARAM_TGF_SHIFT (32 - 8)
@@ -661,7 +661,7 @@ struct ucc_geth_82xx_enet_address {
661 u16 h; /* address (MSB) */ 661 u16 h; /* address (MSB) */
662 u16 m; /* address */ 662 u16 m; /* address */
663 u16 l; /* address (LSB) */ 663 u16 l; /* address (LSB) */
664} __attribute__ ((packed)); 664} __packed;
665 665
666/* structure representing 82xx Address Filtering PRAM */ 666/* structure representing 82xx Address Filtering PRAM */
667struct ucc_geth_82xx_address_filtering_pram { 667struct ucc_geth_82xx_address_filtering_pram {
@@ -672,7 +672,7 @@ struct ucc_geth_82xx_address_filtering_pram {
672 struct ucc_geth_82xx_enet_address __iomem taddr; 672 struct ucc_geth_82xx_enet_address __iomem taddr;
673 struct ucc_geth_82xx_enet_address __iomem paddr[NUM_OF_PADDRS]; 673 struct ucc_geth_82xx_enet_address __iomem paddr[NUM_OF_PADDRS];
674 u8 res0[0x40 - 0x38]; 674 u8 res0[0x40 - 0x38];
675} __attribute__ ((packed)); 675} __packed;
676 676
677/* GETH Tx firmware statistics structure, used when calling 677/* GETH Tx firmware statistics structure, used when calling
678 UCC_GETH_GetStatistics. */ 678 UCC_GETH_GetStatistics. */
@@ -696,7 +696,7 @@ struct ucc_geth_tx_firmware_statistics {
696 and 1518 octets */ 696 and 1518 octets */
697 u32 txpktsjumbo; /* total packets (including bad) between 1024 697 u32 txpktsjumbo; /* total packets (including bad) between 1024
698 and MAXLength octets */ 698 and MAXLength octets */
699} __attribute__ ((packed)); 699} __packed;
700 700
701/* GETH Rx firmware statistics structure, used when calling 701/* GETH Rx firmware statistics structure, used when calling
702 UCC_GETH_GetStatistics. */ 702 UCC_GETH_GetStatistics. */
@@ -732,7 +732,7 @@ struct ucc_geth_rx_firmware_statistics {
732 replaced */ 732 replaced */
733 u32 insertvlan; /* total frames that had their VLAN tag 733 u32 insertvlan; /* total frames that had their VLAN tag
734 inserted */ 734 inserted */
735} __attribute__ ((packed)); 735} __packed;
736 736
737/* GETH hardware statistics structure, used when calling 737/* GETH hardware statistics structure, used when calling
738 UCC_GETH_GetStatistics. */ 738 UCC_GETH_GetStatistics. */
@@ -781,7 +781,7 @@ struct ucc_geth_hardware_statistics {
781 u32 rbca; /* Total number of frames received successfully 781 u32 rbca; /* Total number of frames received successfully
782 that had destination address equal to the 782 that had destination address equal to the
783 broadcast address */ 783 broadcast address */
784} __attribute__ ((packed)); 784} __packed;
785 785
786/* UCC GETH Tx errors returned via TxConf callback */ 786/* UCC GETH Tx errors returned via TxConf callback */
787#define TX_ERRORS_DEF 0x0200 787#define TX_ERRORS_DEF 0x0200