Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 79cefa55 编写于 作者: D Daeseok Youn 提交者： Greg Kroah-Hartman
浏览文件
操作

staging: cxt1e1: remove redundant curly braces in musycc.c 

Signed-off-by: NDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 b7923d22
隐藏空白更改
内联 并排
Showing with 102 addition and 107 deletion
drivers/staging/cxt1e1/musycc.c
浏览文件 @ 79cefa55
...@@ -73,6 +73,10 @@ musycc_dump_rxbuffer_ring(mch_t *ch, int lockit) ...@@ -73,6 +73,10 @@ musycc_dump_rxbuffer_ring(mch_t *ch, int lockit)
u_int32_t status; u_int32_t status;
int n; int n;
#ifdef RLD_DUMP_BUFDATA
u_int32_t *dp;
int len = 0;
#endif
if (lockit) if (lockit)
spin_lock_irqsave(&ch->ch_rxlock, flags); spin_lock_irqsave(&ch->ch_rxlock, flags);
if (ch->rxd_num == 0) if (ch->rxd_num == 0)
...@@ -82,45 +86,40 @@ musycc_dump_rxbuffer_ring(mch_t *ch, int lockit) ...@@ -82,45 +86,40 @@ musycc_dump_rxbuffer_ring(mch_t *ch, int lockit)
m = &ch->mdr[ch->rxix_irq_srv]; m = &ch->mdr[ch->rxix_irq_srv];
for (n = ch->rxd_num; n; n--) { for (n = ch->rxd_num; n; n--) {
status = le32_to_cpu(m->status); status = le32_to_cpu(m->status);
{ pr_info("%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
pr_info("%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n", (m == &ch->mdr[ch->rxix_irq_srv]) ? 'F' : ' ',
(m == &ch->mdr[ch->rxix_irq_srv]) ? 'F' : ' ', (unsigned long) m, n,
(unsigned long) m, n, status,
status, m->data ? (status & HOST_RX_OWNED ? 'H' : 'M') : '-',
m->data ? (status & HOST_RX_OWNED ? 'H' : 'M') : '-', status & POLL_DISABLED ? 'P' : '-',
status & POLL_DISABLED ? 'P' : '-', status & EOBIRQ_ENABLE ? 'b' : '-',
status & EOBIRQ_ENABLE ? 'b' : '-', status & EOMIRQ_ENABLE ? 'm' : '-',
status & EOMIRQ_ENABLE ? 'm' : '-', status & LENGTH_MASK,
status & LENGTH_MASK, le32_to_cpu(m->data), le32_to_cpu(m->next));
le32_to_cpu(m->data), le32_to_cpu(m->next));
#ifdef RLD_DUMP_BUFDATA #ifdef RLD_DUMP_BUFDATA
{ len = status & LENGTH_MASK;
u_int32_t *dp;
int len = status & LENGTH_MASK;
#if 1 #if 1
if (m->data && (status & HOST_RX_OWNED)) if (m->data && (status & HOST_RX_OWNED))
#else #else
if (m->data) /* always dump regardless of valid RX if (m->data) /* always dump regardless of valid RX
* data */ * data */
#endif #endif
{ {
dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data))); dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data)));
if (len >= 0x10) if (len >= 0x10)
pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len, pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
*dp, *(dp + 1), *(dp + 2), *(dp + 3)); *dp, *(dp + 1), *(dp + 2), *(dp + 3));
else if (len >= 0x08) else if (len >= 0x08)
pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len, pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
*dp, *(dp + 1)); *dp, *(dp + 1));
else else
pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp); pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
}
} }
#endif #endif
}
m = m->snext; m = m->snext;
} }
} /* -for- */ }
pr_info("\n"); pr_info("\n");
if (lockit) if (lockit)
...@@ -135,6 +134,10 @@ musycc_dump_txbuffer_ring(mch_t *ch, int lockit) ...@@ -135,6 +134,10 @@ musycc_dump_txbuffer_ring(mch_t *ch, int lockit)
unsigned long flags = 0; unsigned long flags = 0;
u_int32_t status; u_int32_t status;
int n; int n;
#ifdef RLD_DUMP_BUFDATA
u_int32_t *dp;
int len = 0;
#endif
if (lockit) if (lockit)
spin_lock_irqsave(&ch->ch_txlock, flags); spin_lock_irqsave(&ch->ch_txlock, flags);
...@@ -145,37 +148,32 @@ musycc_dump_txbuffer_ring(mch_t *ch, int lockit) ...@@ -145,37 +148,32 @@ musycc_dump_txbuffer_ring(mch_t *ch, int lockit)
m = ch->txd_irq_srv; m = ch->txd_irq_srv;
for (n = ch->txd_num; n; n--) { for (n = ch->txd_num; n; n--) {
status = le32_to_cpu(m->status); status = le32_to_cpu(m->status);
{ pr_info("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n",
pr_info("%c%c %08lx[%2d]: sts %08x (%c%c%c%c:%d.) Data [%08x] Next [%08x]\n", (m == ch->txd_usr_add) ? 'F' : ' ',
(m == ch->txd_usr_add) ? 'F' : ' ', (m == ch->txd_irq_srv) ? 'L' : ' ',
(m == ch->txd_irq_srv) ? 'L' : ' ', (unsigned long) m, n,
(unsigned long) m, n, status,
status, m->data ? (status & MUSYCC_TX_OWNED ? 'M' : 'H') : '-',
m->data ? (status & MUSYCC_TX_OWNED ? 'M' : 'H') : '-', status & POLL_DISABLED ? 'P' : '-',
status & POLL_DISABLED ? 'P' : '-', status & EOBIRQ_ENABLE ? 'b' : '-',
status & EOBIRQ_ENABLE ? 'b' : '-', status & EOMIRQ_ENABLE ? 'm' : '-',
status & EOMIRQ_ENABLE ? 'm' : '-', status & LENGTH_MASK,
status & LENGTH_MASK, le32_to_cpu(m->data), le32_to_cpu(m->next));
le32_to_cpu(m->data), le32_to_cpu(m->next));
#ifdef RLD_DUMP_BUFDATA #ifdef RLD_DUMP_BUFDATA
{ len = status & LENGTH_MASK;
u_int32_t *dp;
int len = status & LENGTH_MASK; if (m->data) {
dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data)));
if (m->data) { if (len >= 0x10)
dp = (u_int32_t *) OS_phystov((void *) (le32_to_cpu(m->data))); pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len,
if (len >= 0x10) *dp, *(dp + 1), *(dp + 2), *(dp + 3));
pr_info(" %x[%x]: %08X %08X %08X %08x\n", (u_int32_t) dp, len, else if (len >= 0x08)
*dp, *(dp + 1), *(dp + 2), *(dp + 3)); pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len,
else if (len >= 0x08) *dp, *(dp + 1));
pr_info(" %x[%x]: %08X %08X\n", (u_int32_t) dp, len, else
*dp, *(dp + 1)); pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
else
pr_info(" %x[%x]: %08X\n", (u_int32_t) dp, len, *dp);
}
}
#endif
} }
#endif
m = m->snext; m = m->snext;
} }
} /* -for- */ } /* -for- */
...@@ -195,21 +193,19 @@ status_t ...@@ -195,21 +193,19 @@ status_t
musycc_dump_ring(ci_t *ci, unsigned int chan) musycc_dump_ring(ci_t *ci, unsigned int chan)
{ {
mch_t *ch; mch_t *ch;
int bh;
if (chan >= MAX_CHANS_USED) if (chan >= MAX_CHANS_USED)
return SBE_DRVR_FAIL; /* E2BIG */ return SBE_DRVR_FAIL; /* E2BIG */
{
int bh;
bh = atomic_read(&ci->bh_pending); bh = atomic_read(&ci->bh_pending);
pr_info(">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n", pr_info(">> bh_pend %d [%d] ihead %d itail %d [%d] th_cnt %d bh_cnt %d wdcnt %d note %d\n",
bh, max_bh, ci->iqp_headx, ci->iqp_tailx, max_intcnt, bh, max_bh, ci->iqp_headx, ci->iqp_tailx, max_intcnt,
ci->intlog.drvr_intr_thcount, ci->intlog.drvr_intr_thcount,
ci->intlog.drvr_intr_bhcount, ci->intlog.drvr_intr_bhcount,
ci->wdcount, ci->wd_notify); ci->wdcount, ci->wd_notify);
max_bh = 0; /* reset counter */ max_bh = 0; /* reset counter */
max_intcnt = 0; /* reset counter */ max_intcnt = 0; /* reset counter */
}
ch = sd_find_chan(dummy, chan); ch = sd_find_chan(dummy, chan);
if (!ch) { if (!ch) {
...@@ -336,6 +332,10 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */ ...@@ -336,6 +332,10 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */
mpi_t *pi; mpi_t *pi;
struct mdesc *md; struct mdesc *md;
#if defined(RLD_TRANS_DEBUG) || defined(RLD_RXACT_DEBUG)
static int hereb4 = 7;
#endif
ch = container_of(arg, struct c4_chan_info, ch_work); ch = container_of(arg, struct c4_chan_info, ch_work);
pi = ch->up; pi = ch->up;
...@@ -353,24 +353,20 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */ ...@@ -353,24 +353,20 @@ musycc_wq_chan_restart(void *arg) /* channel private structure */
ch->ch_start_rx = 0; ch->ch_start_rx = 0;
#if defined(RLD_TRANS_DEBUG) || defined(RLD_RXACT_DEBUG) #if defined(RLD_TRANS_DEBUG) || defined(RLD_RXACT_DEBUG)
{ if (hereb4) { /* RLD DEBUG */
static int hereb4 = 7; hereb4--;
if (hereb4) { /* RLD DEBUG */
hereb4--;
#ifdef RLD_TRANS_DEBUG #ifdef RLD_TRANS_DEBUG
md = &ch->mdr[ch->rxix_irq_srv]; md = &ch->mdr[ch->rxix_irq_srv];
pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n", pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status), ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status),
ch->s.rx_packets); ch->s.rx_packets);
#elif defined(RLD_RXACT_DEBUG) #elif defined(RLD_RXACT_DEBUG)
md = &ch->mdr[ch->rxix_irq_srv]; md = &ch->mdr[ch->rxix_irq_srv];
pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n", pr_info("++ musycc_wq_chan_restart[%d] CHAN RX ACTIVATE: rxix_irq_srv %d, md %p sts %x, rxpkt %lu\n",
ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status), ch->channum, ch->rxix_irq_srv, md, le32_to_cpu(md->status),
ch->s.rx_packets); ch->s.rx_packets);
musycc_dump_rxbuffer_ring(ch, 1); /* RLD DEBUG */ musycc_dump_rxbuffer_ring(ch, 1); /* RLD DEBUG */
#endif #endif
}
} }
#endif #endif
musycc_serv_req(pi, SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION | ch->gchan); musycc_serv_req(pi, SR_CHANNEL_ACTIVATE | SR_RX_DIRECTION | ch->gchan);
...@@ -877,6 +873,9 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan) ...@@ -877,6 +873,9 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan)
md->data = 0; md->data = 0;
if (md->mem_token) { if (md->mem_token) {
#ifdef CONFIG_SBE_WAN256T3_NCOMM
int hdlcnum = 0;
#endif
/* upcount channel */ /* upcount channel */
atomic_sub(OS_mem_token_tlen(md->mem_token), &ch->tx_pending); atomic_sub(OS_mem_token_tlen(md->mem_token), &ch->tx_pending);
/* upcount card */ /* upcount card */
...@@ -888,14 +887,12 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan) ...@@ -888,14 +887,12 @@ musycc_bh_tx_eom(mpi_t *pi, int gchan)
#ifdef CONFIG_SBE_WAN256T3_NCOMM #ifdef CONFIG_SBE_WAN256T3_NCOMM
/* callback that our packet was sent */ /* callback that our packet was sent */
{ hdlcnum = (pi->portnum * 32 + gchan);
int hdlcnum = (pi->portnum * 32 + gchan);
if (hdlcnum >= 228) { if (hdlcnum >= 228) {
if (nciProcess_TX_complete) if (nciProcess_TX_complete)
(*nciProcess_TX_complete) (hdlcnum, (*nciProcess_TX_complete) (hdlcnum,
getuserbychan(gchan)); getuserbychan(gchan));
}
} }
#endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/ #endif /*** CONFIG_SBE_WAN256T3_NCOMM ***/
...@@ -1361,26 +1358,24 @@ musycc_intr_bh_tasklet(ci_t *ci) ...@@ -1361,26 +1358,24 @@ musycc_intr_bh_tasklet(ci_t *ci)
*/ */
ch->ch_start_tx = CH_START_TX_ONR; ch->ch_start_tx = CH_START_TX_ONR;
{
#ifdef RLD_TRANS_DEBUG #ifdef RLD_TRANS_DEBUG
if (1 || cxt1e1_log_level >= LOG_MONITOR) if (1 || cxt1e1_log_level >= LOG_MONITOR)
#else #else
if (cxt1e1_log_level >= LOG_MONITOR) if (cxt1e1_log_level >= LOG_MONITOR)
#endif #endif
{ {
pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n", pr_info("%s: TX buffer underflow [ONR] on channel %d, mode %x QStopped %x free %d\n",
ci->devname, ch->channum, ch->p.chan_mode, sd_queue_stopped(ch->user), ch->txd_free); ci->devname, ch->channum, ch->p.chan_mode, sd_queue_stopped(ch->user), ch->txd_free);
#ifdef RLD_DEBUG #ifdef RLD_DEBUG
if (ch->p.chan_mode == 2) { /* problem = ONR on HDLC if (ch->p.chan_mode == 2) { /* problem = ONR on HDLC
* mode */ * mode */
pr_info("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n", pr_info("++ Failed Last %x Next %x QStopped %x, start_tx %x tx_full %d txd_free %d mode %x\n",
(u_int32_t) ch->txd_irq_srv, (u_int32_t) ch->txd_usr_add, (u_int32_t) ch->txd_irq_srv, (u_int32_t) ch->txd_usr_add,
sd_queue_stopped(ch->user), sd_queue_stopped(ch->user),
ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode); ch->ch_start_tx, ch->tx_full, ch->txd_free, ch->p.chan_mode);
musycc_dump_txbuffer_ring(ch, 0); musycc_dump_txbuffer_ring(ch, 0);
}
#endif
} }
#endif
} }
} else { /* RX buffer overrun */ } else { /* RX buffer overrun */
/* /*
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或