Skip to content

L
linux
Commit 63734a32 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files
Options

fore2000 - fix misannotations 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 5ffa6d7f
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 108 deletions
drivers/atm/fore200e.c
View file @ 63734a32
...@@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg) ...@@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
if (fore200e_getstats(fore200e) < 0) if (fore200e_getstats(fore200e) < 0)
return -EIO; return -EIO;
tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors); tmp.section_bip = be32_to_cpu(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors); tmp.line_bip = be32_to_cpu(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors); tmp.path_bip = be32_to_cpu(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = cpu_to_be32(fore200e->stats->oc3.line_febe_errors); tmp.line_febe = be32_to_cpu(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = cpu_to_be32(fore200e->stats->oc3.path_febe_errors); tmp.path_febe = be32_to_cpu(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors); tmp.corr_hcs = be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors); tmp.uncorr_hcs = be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = cpu_to_be32(fore200e->stats->aal0.cells_transmitted) + tmp.tx_cells = be32_to_cpu(fore200e->stats->aal0.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal34.cells_transmitted) + be32_to_cpu(fore200e->stats->aal34.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal5.cells_transmitted); be32_to_cpu(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = cpu_to_be32(fore200e->stats->aal0.cells_received) + tmp.rx_cells = be32_to_cpu(fore200e->stats->aal0.cells_received) +
cpu_to_be32(fore200e->stats->aal34.cells_received) + be32_to_cpu(fore200e->stats->aal34.cells_received) +
cpu_to_be32(fore200e->stats->aal5.cells_received); be32_to_cpu(fore200e->stats->aal5.cells_received);
if (arg) if (arg)
return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0; return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;
...@@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e) ...@@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e)
static int __devinit static int __devinit
fore200e_load_fw(struct fore200e* fore200e) fore200e_load_fw(struct fore200e* fore200e)
{ {
u32* fw_data = (u32*) fore200e->bus->fw_data; __le32* fw_data = (__le32*) fore200e->bus->fw_data;
u32 fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32); u32 fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);
struct fw_header* fw_header = (struct fw_header*) fw_data; struct fw_header* fw_header = (struct fw_header*) fw_data;
...@@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" 4b5b:\n" " 4b5b:\n"
" crc_header_errors:\t\t%10u\n" " crc_header_errors:\t\t%10u\n"
" framing_errors:\t\t%10u\n", " framing_errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->phy.crc_header_errors), be32_to_cpu(fore200e->stats->phy.crc_header_errors),
cpu_to_be32(fore200e->stats->phy.framing_errors)); be32_to_cpu(fore200e->stats->phy.framing_errors));
if (!left--) if (!left--)
return sprintf(page, "\n" return sprintf(page, "\n"
...@@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" path_febe_errors:\t\t%10u\n" " path_febe_errors:\t\t%10u\n"
" corr_hcs_errors:\t\t%10u\n" " corr_hcs_errors:\t\t%10u\n"
" ucorr_hcs_errors:\t\t%10u\n", " ucorr_hcs_errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->oc3.section_bip8_errors), be32_to_cpu(fore200e->stats->oc3.section_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.path_bip8_errors), be32_to_cpu(fore200e->stats->oc3.path_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.line_bip24_errors), be32_to_cpu(fore200e->stats->oc3.line_bip24_errors),
cpu_to_be32(fore200e->stats->oc3.line_febe_errors), be32_to_cpu(fore200e->stats->oc3.line_febe_errors),
cpu_to_be32(fore200e->stats->oc3.path_febe_errors), be32_to_cpu(fore200e->stats->oc3.path_febe_errors),
cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors), be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors),
cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors)); be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors));
if (!left--) if (!left--)
return sprintf(page,"\n" return sprintf(page,"\n"
...@@ -2995,12 +2995,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -2995,12 +2995,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" vpi no conn:\t\t%10u\n" " vpi no conn:\t\t%10u\n"
" vci out of range:\t\t%10u\n" " vci out of range:\t\t%10u\n"
" vci no conn:\t\t%10u\n", " vci no conn:\t\t%10u\n",
cpu_to_be32(fore200e->stats->atm.cells_transmitted), be32_to_cpu(fore200e->stats->atm.cells_transmitted),
cpu_to_be32(fore200e->stats->atm.cells_received), be32_to_cpu(fore200e->stats->atm.cells_received),
cpu_to_be32(fore200e->stats->atm.vpi_bad_range), be32_to_cpu(fore200e->stats->atm.vpi_bad_range),
cpu_to_be32(fore200e->stats->atm.vpi_no_conn), be32_to_cpu(fore200e->stats->atm.vpi_no_conn),
cpu_to_be32(fore200e->stats->atm.vci_bad_range), be32_to_cpu(fore200e->stats->atm.vci_bad_range),
cpu_to_be32(fore200e->stats->atm.vci_no_conn)); be32_to_cpu(fore200e->stats->atm.vci_no_conn));
if (!left--) if (!left--)
return sprintf(page,"\n" return sprintf(page,"\n"
...@@ -3008,9 +3008,9 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -3008,9 +3008,9 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" TX:\t\t\t%10u\n" " TX:\t\t\t%10u\n"
" RX:\t\t\t%10u\n" " RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n", " dropped:\t\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal0.cells_transmitted), be32_to_cpu(fore200e->stats->aal0.cells_transmitted),
cpu_to_be32(fore200e->stats->aal0.cells_received), be32_to_cpu(fore200e->stats->aal0.cells_received),
cpu_to_be32(fore200e->stats->aal0.cells_dropped)); be32_to_cpu(fore200e->stats->aal0.cells_dropped));
if (!left--) if (!left--)
return sprintf(page,"\n" return sprintf(page,"\n"
...@@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" RX:\t\t\t%10u\n" " RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n" " dropped:\t\t\t%10u\n"
" protocol errors:\t\t%10u\n", " protocol errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal34.cells_transmitted), be32_to_cpu(fore200e->stats->aal34.cells_transmitted),
cpu_to_be32(fore200e->stats->aal34.cells_received), be32_to_cpu(fore200e->stats->aal34.cells_received),
cpu_to_be32(fore200e->stats->aal34.cells_dropped), be32_to_cpu(fore200e->stats->aal34.cells_dropped),
cpu_to_be32(fore200e->stats->aal34.cells_crc_errors), be32_to_cpu(fore200e->stats->aal34.cells_crc_errors),
cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors), be32_to_cpu(fore200e->stats->aal34.cells_protocol_errors),
cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted), be32_to_cpu(fore200e->stats->aal34.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal34.cspdus_received), be32_to_cpu(fore200e->stats->aal34.cspdus_received),
cpu_to_be32(fore200e->stats->aal34.cspdus_dropped), be32_to_cpu(fore200e->stats->aal34.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors)); be32_to_cpu(fore200e->stats->aal34.cspdus_protocol_errors));
if (!left--) if (!left--)
return sprintf(page,"\n" return sprintf(page,"\n"
...@@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" dropped:\t\t\t%10u\n" " dropped:\t\t\t%10u\n"
" CRC errors:\t\t%10u\n" " CRC errors:\t\t%10u\n"
" protocol errors:\t\t%10u\n", " protocol errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal5.cells_transmitted), be32_to_cpu(fore200e->stats->aal5.cells_transmitted),
cpu_to_be32(fore200e->stats->aal5.cells_received), be32_to_cpu(fore200e->stats->aal5.cells_received),
cpu_to_be32(fore200e->stats->aal5.cells_dropped), be32_to_cpu(fore200e->stats->aal5.cells_dropped),
cpu_to_be32(fore200e->stats->aal5.congestion_experienced), be32_to_cpu(fore200e->stats->aal5.congestion_experienced),
cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted), be32_to_cpu(fore200e->stats->aal5.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal5.cspdus_received), be32_to_cpu(fore200e->stats->aal5.cspdus_received),
cpu_to_be32(fore200e->stats->aal5.cspdus_dropped), be32_to_cpu(fore200e->stats->aal5.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors), be32_to_cpu(fore200e->stats->aal5.cspdus_crc_errors),
cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors)); be32_to_cpu(fore200e->stats->aal5.cspdus_protocol_errors));
if (!left--) if (!left--)
return sprintf(page,"\n" return sprintf(page,"\n"
...@@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page) ...@@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" large b2:\t\t\t%10u\n" " large b2:\t\t\t%10u\n"
" RX PDUs:\t\t\t%10u\n" " RX PDUs:\t\t\t%10u\n"
" TX PDUs:\t\t\t%10lu\n", " TX PDUs:\t\t\t%10lu\n",
cpu_to_be32(fore200e->stats->aux.small_b1_failed), be32_to_cpu(fore200e->stats->aux.small_b1_failed),
cpu_to_be32(fore200e->stats->aux.large_b1_failed), be32_to_cpu(fore200e->stats->aux.large_b1_failed),
cpu_to_be32(fore200e->stats->aux.small_b2_failed), be32_to_cpu(fore200e->stats->aux.small_b2_failed),
cpu_to_be32(fore200e->stats->aux.large_b2_failed), be32_to_cpu(fore200e->stats->aux.large_b2_failed),
cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed), be32_to_cpu(fore200e->stats->aux.rpd_alloc_failed),
fore200e->tx_sat); fore200e->tx_sat);
if (!left--) if (!left--)
......
drivers/atm/fore200e.h
View file @ 63734a32
...@@ -349,90 +349,90 @@ typedef struct oc3_block { ...@@ -349,90 +349,90 @@ typedef struct oc3_block {
/* physical encoding statistics */ /* physical encoding statistics */
typedef struct stats_phy { typedef struct stats_phy {
u32 crc_header_errors; /* cells received with bad header CRC */ __be32 crc_header_errors; /* cells received with bad header CRC */
u32 framing_errors; /* cells received with bad framing */ __be32 framing_errors; /* cells received with bad framing */
u32 pad[ 2 ]; /* i960 padding */ __be32 pad[ 2 ]; /* i960 padding */
} stats_phy_t; } stats_phy_t;
/* OC-3 statistics */ /* OC-3 statistics */
typedef struct stats_oc3 { typedef struct stats_oc3 {
u32 section_bip8_errors; /* section 8 bit interleaved parity */ __be32 section_bip8_errors; /* section 8 bit interleaved parity */
u32 path_bip8_errors; /* path 8 bit interleaved parity */ __be32 path_bip8_errors; /* path 8 bit interleaved parity */
u32 line_bip24_errors; /* line 24 bit interleaved parity */ __be32 line_bip24_errors; /* line 24 bit interleaved parity */
u32 line_febe_errors; /* line far end block errors */ __be32 line_febe_errors; /* line far end block errors */
u32 path_febe_errors; /* path far end block errors */ __be32 path_febe_errors; /* path far end block errors */
u32 corr_hcs_errors; /* correctable header check sequence */ __be32 corr_hcs_errors; /* correctable header check sequence */
u32 ucorr_hcs_errors; /* uncorrectable header check sequence */ __be32 ucorr_hcs_errors; /* uncorrectable header check sequence */
u32 pad[ 1 ]; /* i960 padding */ __be32 pad[ 1 ]; /* i960 padding */
} stats_oc3_t; } stats_oc3_t;
/* ATM statistics */ /* ATM statistics */
typedef struct stats_atm { typedef struct stats_atm {
u32 cells_transmitted; /* cells transmitted */ __be32 cells_transmitted; /* cells transmitted */
u32 cells_received; /* cells received */ __be32 cells_received; /* cells received */
u32 vpi_bad_range; /* cell drops: VPI out of range */ __be32 vpi_bad_range; /* cell drops: VPI out of range */
u32 vpi_no_conn; /* cell drops: no connection for VPI */ __be32 vpi_no_conn; /* cell drops: no connection for VPI */
u32 vci_bad_range; /* cell drops: VCI out of range */ __be32 vci_bad_range; /* cell drops: VCI out of range */
u32 vci_no_conn; /* cell drops: no connection for VCI */ __be32 vci_no_conn; /* cell drops: no connection for VCI */
u32 pad[ 2 ]; /* i960 padding */ __be32 pad[ 2 ]; /* i960 padding */
} stats_atm_t; } stats_atm_t;
/* AAL0 statistics */ /* AAL0 statistics */
typedef struct stats_aal0 { typedef struct stats_aal0 {
u32 cells_transmitted; /* cells transmitted */ __be32 cells_transmitted; /* cells transmitted */
u32 cells_received; /* cells received */ __be32 cells_received; /* cells received */
u32 cells_dropped; /* cells dropped */ __be32 cells_dropped; /* cells dropped */
u32 pad[ 1 ]; /* i960 padding */ __be32 pad[ 1 ]; /* i960 padding */
} stats_aal0_t; } stats_aal0_t;
/* AAL3/4 statistics */ /* AAL3/4 statistics */
typedef struct stats_aal34 { typedef struct stats_aal34 {
u32 cells_transmitted; /* cells transmitted from segmented PDUs */ __be32 cells_transmitted; /* cells transmitted from segmented PDUs */
u32 cells_received; /* cells reassembled into PDUs */ __be32 cells_received; /* cells reassembled into PDUs */
u32 cells_crc_errors; /* payload CRC error count */ __be32 cells_crc_errors; /* payload CRC error count */
u32 cells_protocol_errors; /* SAR or CS layer protocol errors */ __be32 cells_protocol_errors; /* SAR or CS layer protocol errors */
u32 cells_dropped; /* cells dropped: partial reassembly */ __be32 cells_dropped; /* cells dropped: partial reassembly */
u32 cspdus_transmitted; /* CS PDUs transmitted */ __be32 cspdus_transmitted; /* CS PDUs transmitted */
u32 cspdus_received; /* CS PDUs received */ __be32 cspdus_received; /* CS PDUs received */
u32 cspdus_protocol_errors; /* CS layer protocol errors */ __be32 cspdus_protocol_errors; /* CS layer protocol errors */
u32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */ __be32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */
u32 pad[ 3 ]; /* i960 padding */ __be32 pad[ 3 ]; /* i960 padding */
} stats_aal34_t; } stats_aal34_t;
/* AAL5 statistics */ /* AAL5 statistics */
typedef struct stats_aal5 { typedef struct stats_aal5 {
u32 cells_transmitted; /* cells transmitted from segmented SDUs */ __be32 cells_transmitted; /* cells transmitted from segmented SDUs */
u32 cells_received; /* cells reassembled into SDUs */ __be32 cells_received; /* cells reassembled into SDUs */
u32 cells_dropped; /* reassembled PDUs dropped (in cells) */ __be32 cells_dropped; /* reassembled PDUs dropped (in cells) */
u32 congestion_experienced; /* CRC error and length wrong */ __be32 congestion_experienced; /* CRC error and length wrong */
u32 cspdus_transmitted; /* CS PDUs transmitted */ __be32 cspdus_transmitted; /* CS PDUs transmitted */
u32 cspdus_received; /* CS PDUs received */ __be32 cspdus_received; /* CS PDUs received */
u32 cspdus_crc_errors; /* CS PDUs CRC errors */ __be32 cspdus_crc_errors; /* CS PDUs CRC errors */
u32 cspdus_protocol_errors; /* CS layer protocol errors */ __be32 cspdus_protocol_errors; /* CS layer protocol errors */
u32 cspdus_dropped; /* reassembled PDUs dropped */ __be32 cspdus_dropped; /* reassembled PDUs dropped */
u32 pad[ 3 ]; /* i960 padding */ __be32 pad[ 3 ]; /* i960 padding */
} stats_aal5_t; } stats_aal5_t;
/* auxiliary statistics */ /* auxiliary statistics */
typedef struct stats_aux { typedef struct stats_aux {
u32 small_b1_failed; /* receive BD allocation failures */ __be32 small_b1_failed; /* receive BD allocation failures */
u32 large_b1_failed; /* receive BD allocation failures */ __be32 large_b1_failed; /* receive BD allocation failures */
u32 small_b2_failed; /* receive BD allocation failures */ __be32 small_b2_failed; /* receive BD allocation failures */
u32 large_b2_failed; /* receive BD allocation failures */ __be32 large_b2_failed; /* receive BD allocation failures */
u32 rpd_alloc_failed; /* receive PDU allocation failures */ __be32 rpd_alloc_failed; /* receive PDU allocation failures */
u32 receive_carrier; /* no carrier = 0, carrier = 1 */ __be32 receive_carrier; /* no carrier = 0, carrier = 1 */
u32 pad[ 2 ]; /* i960 padding */ __be32 pad[ 2 ]; /* i960 padding */
} stats_aux_t; } stats_aux_t;
...@@ -643,10 +643,10 @@ typedef struct host_bsq { ...@@ -643,10 +643,10 @@ typedef struct host_bsq {
/* header of the firmware image */ /* header of the firmware image */
typedef struct fw_header { typedef struct fw_header {
u32 magic; /* magic number */ __le32 magic; /* magic number */
u32 version; /* firmware version id */ __le32 version; /* firmware version id */
u32 load_offset; /* fw load offset in board memory */ __le32 load_offset; /* fw load offset in board memory */
u32 start_offset; /* fw execution start address in board memory */ __le32 start_offset; /* fw execution start address in board memory */
} fw_header_t; } fw_header_t;
#define FW_HEADER_MAGIC 0x65726f66 /* 'fore' */ #define FW_HEADER_MAGIC 0x65726f66 /* 'fore' */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7