Skip to content

L
linux
Commit 72d8a0d2 authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files
Options

rapidio/tsi721: add filtered debug output 

Replace "all-or-nothing" debug output with controlled debug output using
functional block masks.  This allows run time control of debug messages
through 'dbg_level' module parameter.
Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1679e8da
Show whitespace changes
Inline Side-by-side
Showing with 249 additions and 189 deletions
Documentation/rapidio/tsi721.txt
View file @ 72d8a0d2
...@@ -16,6 +16,15 @@ For inbound messages this driver uses destination ID matching to forward message ...@@ -16,6 +16,15 @@ For inbound messages this driver uses destination ID matching to forward message
into the corresponding message queue. Messaging callbacks are implemented to be into the corresponding message queue. Messaging callbacks are implemented to be
fully compatible with RIONET driver (Ethernet over RapidIO messaging services). fully compatible with RIONET driver (Ethernet over RapidIO messaging services).
1. Module parameters:
- 'dbg_level' - This parameter allows to control amount of debug information
generated by this device driver. This parameter is formed by set of
This parameter can be changed bit masks that correspond to the specific
functional block.
For mask definitions see 'drivers/rapidio/devices/tsi721.h'
This parameter can be changed dynamically.
Use CONFIG_RAPIDIO_DEBUG=y to enable debug output at the top level.
II. Known problems II. Known problems
None. None.
......
drivers/rapidio/devices/tsi721.c
View file @ 72d8a0d2
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
#include "tsi721.h" #include "tsi721.h"
#ifdef DEBUG
u32 dbg_level = DBG_INIT | DBG_EXIT;
module_param(dbg_level, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)");
#endif
static void tsi721_omsg_handler(struct tsi721_device *priv, int ch); static void tsi721_omsg_handler(struct tsi721_device *priv, int ch);
static void tsi721_imsg_handler(struct tsi721_device *priv, int ch); static void tsi721_imsg_handler(struct tsi721_device *priv, int ch);
...@@ -141,9 +147,9 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size, ...@@ -141,9 +147,9 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
& TSI721_DMAC_STS_RUN) { & TSI721_DMAC_STS_RUN) {
udelay(1); udelay(1);
if (++i >= 5000000) { if (++i >= 5000000) {
dev_dbg(&priv->pdev->dev, tsi_debug(MAINT, &priv->pdev->dev,
"%s : DMA[%d] read timeout ch_status=%x\n", "DMA[%d] read timeout ch_status=%x",
__func__, priv->mdma.ch_id, ch_stat); priv->mdma.ch_id, ch_stat);
if (!do_wr) if (!do_wr)
*data = 0xffffffff; *data = 0xffffffff;
err = -EIO; err = -EIO;
...@@ -155,10 +161,12 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size, ...@@ -155,10 +161,12 @@ static int tsi721_maint_dma(struct tsi721_device *priv, u32 sys_size,
/* If DMA operation aborted due to error, /* If DMA operation aborted due to error,
* reinitialize DMA channel * reinitialize DMA channel
*/ */
dev_dbg(&priv->pdev->dev, "%s : DMA ABORT ch_stat=%x\n", tsi_debug(MAINT, &priv->pdev->dev, "DMA ABORT ch_stat=%x",
__func__, ch_stat); ch_stat);
dev_dbg(&priv->pdev->dev, "OP=%d : destid=%x hc=%x off=%x\n", tsi_debug(MAINT, &priv->pdev->dev,
do_wr ? MAINT_WR : MAINT_RD, destid, hopcount, offset); "OP=%d : destid=%x hc=%x off=%x",
do_wr ? MAINT_WR : MAINT_RD,
destid, hopcount, offset);
iowrite32(TSI721_DMAC_INT_ALL, regs + TSI721_DMAC_INT); iowrite32(TSI721_DMAC_INT_ALL, regs + TSI721_DMAC_INT);
iowrite32(TSI721_DMAC_CTL_INIT, regs + TSI721_DMAC_CTL); iowrite32(TSI721_DMAC_CTL_INIT, regs + TSI721_DMAC_CTL);
udelay(10); udelay(10);
...@@ -336,8 +344,8 @@ static int tsi721_dsend(struct rio_mport *mport, int index, ...@@ -336,8 +344,8 @@ static int tsi721_dsend(struct rio_mport *mport, int index,
offset = (((mport->sys_size) ? RIO_TT_CODE_16 : RIO_TT_CODE_8) << 18) | offset = (((mport->sys_size) ? RIO_TT_CODE_16 : RIO_TT_CODE_8) << 18) |
(destid << 2); (destid << 2);
dev_dbg(&priv->pdev->dev, tsi_debug(DBELL, &priv->pdev->dev,
"Send Doorbell 0x%04x to destID 0x%x\n", data, destid); "Send Doorbell 0x%04x to destID 0x%x", data, destid);
iowrite16be(data, priv->odb_base + offset); iowrite16be(data, priv->odb_base + offset);
return 0; return 0;
...@@ -411,10 +419,10 @@ static void tsi721_db_dpc(struct work_struct *work) ...@@ -411,10 +419,10 @@ static void tsi721_db_dpc(struct work_struct *work)
dbell->dinb(mport, dbell->dev_id, DBELL_SID(idb.bytes), dbell->dinb(mport, dbell->dev_id, DBELL_SID(idb.bytes),
DBELL_TID(idb.bytes), DBELL_INF(idb.bytes)); DBELL_TID(idb.bytes), DBELL_INF(idb.bytes));
} else { } else {
dev_dbg(&priv->pdev->dev, tsi_debug(DBELL, &priv->pdev->dev,
"spurious inb doorbell, sid %2.2x tid %2.2x" "spurious IDB sid %2.2x tid %2.2x info %4.4x",
" info %4.4x\n", DBELL_SID(idb.bytes), DBELL_SID(idb.bytes), DBELL_TID(idb.bytes),
DBELL_TID(idb.bytes), DBELL_INF(idb.bytes)); DBELL_INF(idb.bytes));
} }
wr_ptr = ioread32(priv->regs + wr_ptr = ioread32(priv->regs +
...@@ -470,8 +478,8 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr) ...@@ -470,8 +478,8 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr)
if (intval & TSI721_SR_CHINT_IDBQRCV) if (intval & TSI721_SR_CHINT_IDBQRCV)
tsi721_dbell_handler(priv); tsi721_dbell_handler(priv);
else else
dev_info(&priv->pdev->dev, tsi_info(&priv->pdev->dev,
"Unsupported SR_CH_INT %x\n", intval); "Unsupported SR_CH_INT %x", intval);
/* Clear interrupts */ /* Clear interrupts */
iowrite32(intval, iowrite32(intval,
...@@ -533,8 +541,8 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr) ...@@ -533,8 +541,8 @@ static irqreturn_t tsi721_irqhandler(int irq, void *ptr)
int ch; int ch;
if (dev_ch_int & TSI721_INT_BDMA_CHAN_M) { if (dev_ch_int & TSI721_INT_BDMA_CHAN_M) {
dev_dbg(&priv->pdev->dev, tsi_debug(DMA, &priv->pdev->dev,
"IRQ from DMA channel 0x%08x\n", dev_ch_int); "IRQ from DMA channel 0x%08x", dev_ch_int);
for (ch = 0; ch < TSI721_DMA_MAXCH; ch++) { for (ch = 0; ch < TSI721_DMA_MAXCH; ch++) {
if (!(dev_ch_int & TSI721_INT_BDMA_CHAN(ch))) if (!(dev_ch_int & TSI721_INT_BDMA_CHAN(ch)))
...@@ -749,8 +757,8 @@ static int tsi721_enable_msix(struct tsi721_device *priv) ...@@ -749,8 +757,8 @@ static int tsi721_enable_msix(struct tsi721_device *priv)
err = pci_enable_msix_exact(priv->pdev, entries, ARRAY_SIZE(entries)); err = pci_enable_msix_exact(priv->pdev, entries, ARRAY_SIZE(entries));
if (err) { if (err) {
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Failed to enable MSI-X (err=%d)\n", err); "Failed to enable MSI-X (err=%d)", err);
return err; return err;
} }
...@@ -824,8 +832,8 @@ static int tsi721_request_irq(struct tsi721_device *priv) ...@@ -824,8 +832,8 @@ static int tsi721_request_irq(struct tsi721_device *priv)
DRV_NAME, (void *)priv); DRV_NAME, (void *)priv);
if (err) if (err)
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Unable to allocate interrupt, Error: %d\n", err); "Unable to allocate interrupt, err=%d", err);
return err; return err;
} }
...@@ -891,7 +899,7 @@ tsi721_obw_alloc(struct tsi721_device *priv, struct tsi721_obw_bar *pbar, ...@@ -891,7 +899,7 @@ tsi721_obw_alloc(struct tsi721_device *priv, struct tsi721_obw_bar *pbar,
return -ENOMEM; return -ENOMEM;
if (!new_win) { if (!new_win) {
dev_err(&priv->pdev->dev, "ERR: OBW count tracking failed\n"); tsi_err(&priv->pdev->dev, "OBW count tracking failed");
return -EIO; return -EIO;
} }
...@@ -918,6 +926,9 @@ static int tsi721_map_outb_win(struct rio_mport *mport, u16 destid, u64 rstart, ...@@ -918,6 +926,9 @@ static int tsi721_map_outb_win(struct rio_mport *mport, u16 destid, u64 rstart,
u32 zsize; u32 zsize;
int ret = -ENOMEM; int ret = -ENOMEM;
tsi_debug(OBW, &priv->pdev->dev,
"did=%d ra=0x%llx sz=0x%x", destid, rstart, size);
if (!is_power_of_2(size) || (size < 0x8000) || (rstart & (size - 1))) if (!is_power_of_2(size) || (size < 0x8000) || (rstart & (size - 1)))
return -EINVAL; return -EINVAL;
...@@ -940,6 +951,8 @@ static int tsi721_map_outb_win(struct rio_mport *mport, u16 destid, u64 rstart, ...@@ -940,6 +951,8 @@ static int tsi721_map_outb_win(struct rio_mport *mport, u16 destid, u64 rstart,
ob_win = &priv->ob_win[obw]; ob_win = &priv->ob_win[obw];
ob_win->destid = destid; ob_win->destid = destid;
ob_win->rstart = rstart; ob_win->rstart = rstart;
tsi_debug(OBW, &priv->pdev->dev,
"allocated OBW%d @%llx", obw, ob_win->base);
/* /*
* Configure Outbound Window * Configure Outbound Window
...@@ -990,11 +1003,15 @@ static void tsi721_unmap_outb_win(struct rio_mport *mport, ...@@ -990,11 +1003,15 @@ static void tsi721_unmap_outb_win(struct rio_mport *mport,
struct tsi721_ob_win *ob_win; struct tsi721_ob_win *ob_win;
int i; int i;
tsi_debug(OBW, &priv->pdev->dev, "did=%d ra=0x%llx", destid, rstart);
for (i = 0; i < TSI721_OBWIN_NUM; i++) { for (i = 0; i < TSI721_OBWIN_NUM; i++) {
ob_win = &priv->ob_win[i]; ob_win = &priv->ob_win[i];
if (ob_win->active && if (ob_win->active &&
ob_win->destid == destid && ob_win->rstart == rstart) { ob_win->destid == destid && ob_win->rstart == rstart) {
tsi_debug(OBW, &priv->pdev->dev,
"free OBW%d @%llx", i, ob_win->base);
ob_win->active = false; ob_win->active = false;
iowrite32(0, priv->regs + TSI721_OBWINLB(i)); iowrite32(0, priv->regs + TSI721_OBWINLB(i));
ob_win->pbar->free += ob_win->size; ob_win->pbar->free += ob_win->size;
...@@ -1078,15 +1095,15 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart, ...@@ -1078,15 +1095,15 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
int ret = -EBUSY; int ret = -EBUSY;
if (direct) { if (direct) {
dev_dbg(&priv->pdev->dev,
"Direct (RIO_0x%llx -> PCIe_0x%pad), size=0x%x",
rstart, &lstart, size);
/* Calculate minimal acceptable window size and base address */ /* Calculate minimal acceptable window size and base address */
ibw_size = roundup_pow_of_two(size); ibw_size = roundup_pow_of_two(size);
ibw_start = lstart & ~(ibw_size - 1); ibw_start = lstart & ~(ibw_size - 1);
tsi_debug(IBW, &priv->pdev->dev,
"Direct (RIO_0x%llx -> PCIe_0x%pad), size=0x%x, ibw_start = 0x%llx",
rstart, &lstart, size, ibw_start);
while ((lstart + size) > (ibw_start + ibw_size)) { while ((lstart + size) > (ibw_start + ibw_size)) {
ibw_size *= 2; ibw_size *= 2;
ibw_start = lstart & ~(ibw_size - 1); ibw_start = lstart & ~(ibw_size - 1);
...@@ -1102,7 +1119,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart, ...@@ -1102,7 +1119,7 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
return -ENOMEM; return -ENOMEM;
} else { } else {
dev_dbg(&priv->pdev->dev, tsi_debug(IBW, &priv->pdev->dev,
"Translated (RIO_0x%llx -> PCIe_0x%pad), size=0x%x", "Translated (RIO_0x%llx -> PCIe_0x%pad), size=0x%x",
rstart, &lstart, size); rstart, &lstart, size);
...@@ -1197,9 +1214,9 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart, ...@@ -1197,9 +1214,9 @@ static int tsi721_rio_map_inb_mem(struct rio_mport *mport, dma_addr_t lstart,
priv->ibwin_cnt--; priv->ibwin_cnt--;
dev_dbg(&priv->pdev->dev, tsi_debug(IBW, &priv->pdev->dev,
"Configured IBWIN%d (RIO_0x%llx -> PCIe_0x%llx), size=0x%llx\n", "Configured IBWIN%d (RIO_0x%llx -> PCIe_0x%pad), size=0x%llx",
i, ibw_start, (unsigned long long)loc_start, ibw_size); i, ibw_start, &loc_start, ibw_size);
return 0; return 0;
out: out:
...@@ -1219,7 +1236,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport, ...@@ -1219,7 +1236,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport,
struct tsi721_ib_win *ib_win; struct tsi721_ib_win *ib_win;
int i; int i;
dev_dbg(&priv->pdev->dev, tsi_debug(IBW, &priv->pdev->dev,
"Unmap IBW mapped to PCIe_0x%pad", &lstart); "Unmap IBW mapped to PCIe_0x%pad", &lstart);
/* Search for matching active inbound translation window */ /* Search for matching active inbound translation window */
...@@ -1255,7 +1272,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport, ...@@ -1255,7 +1272,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport,
break; break;
} }
dev_dbg(&priv->pdev->dev, "Disable IBWIN_%d", i); tsi_debug(IBW, &priv->pdev->dev, "Disable IBWIN_%d", i);
iowrite32(0, priv->regs + TSI721_IBWIN_LB(i)); iowrite32(0, priv->regs + TSI721_IBWIN_LB(i));
ib_win->active = false; ib_win->active = false;
priv->ibwin_cnt++; priv->ibwin_cnt++;
...@@ -1264,7 +1281,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport, ...@@ -1264,7 +1281,7 @@ static void tsi721_rio_unmap_inb_mem(struct rio_mport *mport,
} }
if (i == TSI721_IBWIN_NUM) if (i == TSI721_IBWIN_NUM)
dev_dbg(&priv->pdev->dev, tsi_debug(IBW, &priv->pdev->dev,
"IB window mapped to %pad not found", &lstart); "IB window mapped to %pad not found", &lstart);
} }
...@@ -1319,7 +1336,7 @@ static int tsi721_port_write_init(struct tsi721_device *priv) ...@@ -1319,7 +1336,7 @@ static int tsi721_port_write_init(struct tsi721_device *priv)
spin_lock_init(&priv->pw_fifo_lock); spin_lock_init(&priv->pw_fifo_lock);
if (kfifo_alloc(&priv->pw_fifo, if (kfifo_alloc(&priv->pw_fifo,
TSI721_RIO_PW_MSG_SIZE * 32, GFP_KERNEL)) { TSI721_RIO_PW_MSG_SIZE * 32, GFP_KERNEL)) {
dev_err(&priv->pdev->dev, "PW FIFO allocation failed\n"); tsi_err(&priv->pdev->dev, "PW FIFO allocation failed");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1351,8 +1368,9 @@ static int tsi721_doorbell_init(struct tsi721_device *priv) ...@@ -1351,8 +1368,9 @@ static int tsi721_doorbell_init(struct tsi721_device *priv)
if (!priv->idb_base) if (!priv->idb_base)
return -ENOMEM; return -ENOMEM;
dev_dbg(&priv->pdev->dev, "Allocated IDB buffer @ %p (phys = %llx)\n", tsi_debug(DBELL, &priv->pdev->dev,
priv->idb_base, (unsigned long long)priv->idb_dma); "Allocated IDB buffer @ %p (phys = %pad)",
priv->idb_base, &priv->idb_dma);
iowrite32(TSI721_IDQ_SIZE_VAL(IDB_QSIZE), iowrite32(TSI721_IDQ_SIZE_VAL(IDB_QSIZE),
priv->regs + TSI721_IDQ_SIZE(IDB_QUEUE)); priv->regs + TSI721_IDQ_SIZE(IDB_QUEUE));
...@@ -1398,9 +1416,8 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv) ...@@ -1398,9 +1416,8 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv)
int bd_num = 2; int bd_num = 2;
void __iomem *regs; void __iomem *regs;
dev_dbg(&priv->pdev->dev, tsi_debug(MAINT, &priv->pdev->dev,
"Init Block DMA Engine for Maintenance requests, CH%d\n", "Init BDMA_%d Maintenance requests", TSI721_DMACH_MAINT);
TSI721_DMACH_MAINT);
/* /*
* Initialize DMA channel for maintenance requests * Initialize DMA channel for maintenance requests
...@@ -1420,8 +1437,8 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv) ...@@ -1420,8 +1437,8 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv)
priv->mdma.bd_phys = bd_phys; priv->mdma.bd_phys = bd_phys;
priv->mdma.bd_base = bd_ptr; priv->mdma.bd_base = bd_ptr;
dev_dbg(&priv->pdev->dev, "DMA descriptors @ %p (phys = %llx)\n", tsi_debug(MAINT, &priv->pdev->dev, "DMA descriptors @ %p (phys = %pad)",
bd_ptr, (unsigned long long)bd_phys); bd_ptr, &bd_phys);
/* Allocate space for descriptor status FIFO */ /* Allocate space for descriptor status FIFO */
sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ? sts_size = (bd_num >= TSI721_DMA_MINSTSSZ) ?
...@@ -1443,9 +1460,9 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv) ...@@ -1443,9 +1460,9 @@ static int tsi721_bdma_maint_init(struct tsi721_device *priv)
priv->mdma.sts_base = sts_ptr; priv->mdma.sts_base = sts_ptr;
priv->mdma.sts_size = sts_size; priv->mdma.sts_size = sts_size;
dev_dbg(&priv->pdev->dev, tsi_debug(MAINT, &priv->pdev->dev,
"desc status FIFO @ %p (phys = %llx) size=0x%x\n", "desc status FIFO @ %p (phys = %pad) size=0x%x",
sts_ptr, (unsigned long long)sts_phys, sts_size); sts_ptr, &sts_phys, sts_size);
/* Initialize DMA descriptors ring */ /* Initialize DMA descriptors ring */
bd_ptr[bd_num - 1].type_id = cpu_to_le32(DTYPE3 << 29); bd_ptr[bd_num - 1].type_id = cpu_to_le32(DTYPE3 << 29);
...@@ -1720,8 +1737,8 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch) ...@@ -1720,8 +1737,8 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch)
omsg_int = ioread32(priv->regs + TSI721_OBDMAC_INT(ch)); omsg_int = ioread32(priv->regs + TSI721_OBDMAC_INT(ch));
if (omsg_int & TSI721_OBDMAC_INT_ST_FULL) if (omsg_int & TSI721_OBDMAC_INT_ST_FULL)
dev_info(&priv->pdev->dev, tsi_info(&priv->pdev->dev,
"OB MBOX%d: Status FIFO is full\n", ch); "OB MBOX%d: Status FIFO is full", ch);
if (omsg_int & (TSI721_OBDMAC_INT_DONE | TSI721_OBDMAC_INT_IOF_DONE)) { if (omsg_int & (TSI721_OBDMAC_INT_DONE | TSI721_OBDMAC_INT_IOF_DONE)) {
u32 srd_ptr; u32 srd_ptr;
...@@ -1777,7 +1794,7 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch) ...@@ -1777,7 +1794,7 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch)
} }
if (tx_slot >= priv->omsg_ring[ch].size) if (tx_slot >= priv->omsg_ring[ch].size)
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"OB_MSG tx_slot=%x > size=%x", "OB_MSG tx_slot=%x > size=%x",
tx_slot, priv->omsg_ring[ch].size); tx_slot, priv->omsg_ring[ch].size);
WARN_ON(tx_slot >= priv->omsg_ring[ch].size); WARN_ON(tx_slot >= priv->omsg_ring[ch].size);
...@@ -1799,7 +1816,7 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch) ...@@ -1799,7 +1816,7 @@ static void tsi721_omsg_handler(struct tsi721_device *priv, int ch)
* reinitialize OB MSG channel * reinitialize OB MSG channel
*/ */
dev_dbg(&priv->pdev->dev, "OB MSG ABORT ch_stat=%x\n", tsi_debug(OMSG, &priv->pdev->dev, "OB MSG ABORT ch_stat=%x",
ioread32(priv->regs + TSI721_OBDMAC_STS(ch))); ioread32(priv->regs + TSI721_OBDMAC_STS(ch)));
iowrite32(TSI721_OBDMAC_INT_ERROR, iowrite32(TSI721_OBDMAC_INT_ERROR,
...@@ -1874,9 +1891,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -1874,9 +1891,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
&priv->omsg_ring[mbox].omq_phys[i], &priv->omsg_ring[mbox].omq_phys[i],
GFP_KERNEL); GFP_KERNEL);
if (priv->omsg_ring[mbox].omq_base[i] == NULL) { if (priv->omsg_ring[mbox].omq_base[i] == NULL) {
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"Unable to allocate OB MSG data buffer for" "ENOMEM for OB_MSG_%d data buffer", mbox);
" MBOX%d\n", mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out_buf; goto out_buf;
} }
...@@ -1888,9 +1904,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -1888,9 +1904,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
(entries + 1) * sizeof(struct tsi721_omsg_desc), (entries + 1) * sizeof(struct tsi721_omsg_desc),
&priv->omsg_ring[mbox].omd_phys, GFP_KERNEL); &priv->omsg_ring[mbox].omd_phys, GFP_KERNEL);
if (priv->omsg_ring[mbox].omd_base == NULL) { if (priv->omsg_ring[mbox].omd_base == NULL) {
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"Unable to allocate OB MSG descriptor memory " "ENOMEM for OB_MSG_%d descriptor memory", mbox);
"for MBOX%d\n", mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out_buf; goto out_buf;
} }
...@@ -1904,9 +1919,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -1904,9 +1919,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
sizeof(struct tsi721_dma_sts), sizeof(struct tsi721_dma_sts),
&priv->omsg_ring[mbox].sts_phys, GFP_KERNEL); &priv->omsg_ring[mbox].sts_phys, GFP_KERNEL);
if (priv->omsg_ring[mbox].sts_base == NULL) { if (priv->omsg_ring[mbox].sts_base == NULL) {
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"Unable to allocate OB MSG descriptor status FIFO " "ENOMEM for OB_MSG_%d status FIFO", mbox);
"for MBOX%d\n", mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out_desc; goto out_desc;
} }
...@@ -1942,9 +1956,9 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -1942,9 +1956,9 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
priv->msix[idx].irq_name, (void *)priv); priv->msix[idx].irq_name, (void *)priv);
if (rc) { if (rc) {
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"Unable to allocate MSI-X interrupt for " "Unable to get MSI-X IRQ for OBOX%d-DONE",
"OBOX%d-DONE\n", mbox); mbox);
goto out_stat; goto out_stat;
} }
...@@ -1953,9 +1967,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -1953,9 +1967,8 @@ static int tsi721_open_outb_mbox(struct rio_mport *mport, void *dev_id,
priv->msix[idx].irq_name, (void *)priv); priv->msix[idx].irq_name, (void *)priv);
if (rc) { if (rc) {
dev_dbg(&priv->pdev->dev, tsi_debug(OMSG, &priv->pdev->dev,
"Unable to allocate MSI-X interrupt for " "Unable to get MSI-X IRQ for MBOX%d-INT", mbox);
"MBOX%d-INT\n", mbox);
idx = TSI721_VECT_OMB0_DONE + mbox; idx = TSI721_VECT_OMB0_DONE + mbox;
free_irq(priv->msix[idx].vector, (void *)priv); free_irq(priv->msix[idx].vector, (void *)priv);
goto out_stat; goto out_stat;
...@@ -2096,16 +2109,13 @@ static void tsi721_imsg_handler(struct tsi721_device *priv, int ch) ...@@ -2096,16 +2109,13 @@ static void tsi721_imsg_handler(struct tsi721_device *priv, int ch)
imsg_int = ioread32(priv->regs + TSI721_IBDMAC_INT(ch)); imsg_int = ioread32(priv->regs + TSI721_IBDMAC_INT(ch));
if (imsg_int & TSI721_IBDMAC_INT_SRTO) if (imsg_int & TSI721_IBDMAC_INT_SRTO)
dev_info(&priv->pdev->dev, "IB MBOX%d SRIO timeout\n", tsi_info(&priv->pdev->dev, "IB MBOX%d SRIO timeout", mbox);
mbox);
if (imsg_int & TSI721_IBDMAC_INT_PC_ERROR) if (imsg_int & TSI721_IBDMAC_INT_PC_ERROR)
dev_info(&priv->pdev->dev, "IB MBOX%d PCIe error\n", tsi_info(&priv->pdev->dev, "IB MBOX%d PCIe error", mbox);
mbox);
if (imsg_int & TSI721_IBDMAC_INT_FQ_LOW) if (imsg_int & TSI721_IBDMAC_INT_FQ_LOW)
dev_info(&priv->pdev->dev, tsi_info(&priv->pdev->dev, "IB MBOX%d IB free queue low", mbox);
"IB MBOX%d IB free queue low\n", mbox);
/* Clear IB channel interrupts */ /* Clear IB channel interrupts */
iowrite32(imsg_int, priv->regs + TSI721_IBDMAC_INT(ch)); iowrite32(imsg_int, priv->regs + TSI721_IBDMAC_INT(ch));
...@@ -2169,8 +2179,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -2169,8 +2179,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
GFP_KERNEL); GFP_KERNEL);
if (priv->imsg_ring[mbox].buf_base == NULL) { if (priv->imsg_ring[mbox].buf_base == NULL) {
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Failed to allocate buffers for IB MBOX%d\n", mbox); "Failed to allocate buffers for IB MBOX%d", mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto out;
} }
...@@ -2183,8 +2193,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -2183,8 +2193,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
GFP_KERNEL); GFP_KERNEL);
if (priv->imsg_ring[mbox].imfq_base == NULL) { if (priv->imsg_ring[mbox].imfq_base == NULL) {
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Failed to allocate free queue for IB MBOX%d\n", mbox); "Failed to allocate free queue for IB MBOX%d", mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out_buf; goto out_buf;
} }
...@@ -2196,8 +2206,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -2196,8 +2206,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
&priv->imsg_ring[mbox].imd_phys, GFP_KERNEL); &priv->imsg_ring[mbox].imd_phys, GFP_KERNEL);
if (priv->imsg_ring[mbox].imd_base == NULL) { if (priv->imsg_ring[mbox].imd_base == NULL) {
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Failed to allocate descriptor memory for IB MBOX%d\n", "Failed to allocate descriptor memory for IB MBOX%d",
mbox); mbox);
rc = -ENOMEM; rc = -ENOMEM;
goto out_dma; goto out_dma;
...@@ -2256,9 +2266,9 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -2256,9 +2266,9 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
priv->msix[idx].irq_name, (void *)priv); priv->msix[idx].irq_name, (void *)priv);
if (rc) { if (rc) {
dev_dbg(&priv->pdev->dev, tsi_debug(IMSG, &priv->pdev->dev,
"Unable to allocate MSI-X interrupt for " "Unable to get MSI-X IRQ for IBOX%d-DONE",
"IBOX%d-DONE\n", mbox); mbox);
goto out_desc; goto out_desc;
} }
...@@ -2267,9 +2277,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id, ...@@ -2267,9 +2277,8 @@ static int tsi721_open_inb_mbox(struct rio_mport *mport, void *dev_id,
priv->msix[idx].irq_name, (void *)priv); priv->msix[idx].irq_name, (void *)priv);
if (rc) { if (rc) {
dev_dbg(&priv->pdev->dev, tsi_debug(IMSG, &priv->pdev->dev,
"Unable to allocate MSI-X interrupt for " "Unable to get MSI-X IRQ for IBOX%d-INT", mbox);
"IBOX%d-INT\n", mbox);
free_irq( free_irq(
priv->msix[TSI721_VECT_IMB0_RCV + mbox].vector, priv->msix[TSI721_VECT_IMB0_RCV + mbox].vector,
(void *)priv); (void *)priv);
...@@ -2392,8 +2401,8 @@ static int tsi721_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf) ...@@ -2392,8 +2401,8 @@ static int tsi721_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
rx_slot = priv->imsg_ring[mbox].rx_slot; rx_slot = priv->imsg_ring[mbox].rx_slot;
if (priv->imsg_ring[mbox].imq_base[rx_slot]) { if (priv->imsg_ring[mbox].imq_base[rx_slot]) {
dev_err(&priv->pdev->dev, tsi_err(&priv->pdev->dev,
"Error adding inbound buffer %d, buffer exists\n", "Error adding inbound buffer %d, buffer exists",
rx_slot); rx_slot);
rc = -EINVAL; rc = -EINVAL;
goto out; goto out;
...@@ -2619,7 +2628,7 @@ static void tsi721_mport_release(struct device *dev) ...@@ -2619,7 +2628,7 @@ static void tsi721_mport_release(struct device *dev)
{ {
struct rio_mport *mport = to_rio_mport(dev); struct rio_mport *mport = to_rio_mport(dev);
dev_dbg(dev, "RIO: %s %s id=%d\n", __func__, mport->name, mport->id); tsi_debug(EXIT, dev, "%s id=%d", mport->name, mport->id);
} }
/** /**
...@@ -2663,15 +2672,15 @@ static int tsi721_setup_mport(struct tsi721_device *priv) ...@@ -2663,15 +2672,15 @@ static int tsi721_setup_mport(struct tsi721_device *priv)
else if (!pci_enable_msi(pdev)) else if (!pci_enable_msi(pdev))
priv->flags |= TSI721_USING_MSI; priv->flags |= TSI721_USING_MSI;
else else
dev_info(&pdev->dev, tsi_debug(MPORT, &pdev->dev,
"MSI/MSI-X is not available. Using legacy INTx.\n"); "MSI/MSI-X is not available. Using legacy INTx.");
#endif /* CONFIG_PCI_MSI */ #endif /* CONFIG_PCI_MSI */
err = tsi721_request_irq(priv); err = tsi721_request_irq(priv);
if (err) { if (err) {
dev_err(&pdev->dev, "Unable to get assigned PCI IRQ " tsi_err(&pdev->dev, "Unable to get PCI IRQ %02X (err=0x%x)",
"vector %02X err=0x%x\n", pdev->irq, err); pdev->irq, err);
return err; return err;
} }
...@@ -2712,15 +2721,14 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2712,15 +2721,14 @@ static int tsi721_probe(struct pci_dev *pdev,
int err; int err;
priv = kzalloc(sizeof(struct tsi721_device), GFP_KERNEL); priv = kzalloc(sizeof(struct tsi721_device), GFP_KERNEL);
if (priv == NULL) { if (!priv) {
dev_err(&pdev->dev, "Failed to allocate memory for device\n");
err = -ENOMEM; err = -ENOMEM;
goto err_exit; goto err_exit;
} }
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, "Failed to enable PCI device\n"); tsi_err(&pdev->dev, "Failed to enable PCI device");
goto err_clean; goto err_clean;
} }
...@@ -2729,11 +2737,10 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2729,11 +2737,10 @@ static int tsi721_probe(struct pci_dev *pdev,
#ifdef DEBUG #ifdef DEBUG
{ {
int i; int i;
for (i = 0; i <= PCI_STD_RESOURCE_END; i++) { for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
dev_dbg(&pdev->dev, "res[%d] @ 0x%llx (0x%lx, 0x%lx)\n", tsi_debug(INIT, &pdev->dev, "res%d %pR",
i, (unsigned long long)pci_resource_start(pdev, i), i, &pdev->resource[i]);
(unsigned long)pci_resource_len(pdev, i),
pci_resource_flags(pdev, i));
} }
} }
#endif #endif
...@@ -2745,8 +2752,7 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2745,8 +2752,7 @@ static int tsi721_probe(struct pci_dev *pdev,
if (!(pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM) || if (!(pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM) ||
pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM_64 || pci_resource_flags(pdev, BAR_0) & IORESOURCE_MEM_64 ||
pci_resource_len(pdev, BAR_0) < TSI721_REG_SPACE_SIZE) { pci_resource_len(pdev, BAR_0) < TSI721_REG_SPACE_SIZE) {
dev_err(&pdev->dev, tsi_err(&pdev->dev, "Missing or misconfigured CSR BAR0");
"Missing or misconfigured CSR BAR0, aborting.\n");
err = -ENODEV; err = -ENODEV;
goto err_disable_pdev; goto err_disable_pdev;
} }
...@@ -2755,8 +2761,7 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2755,8 +2761,7 @@ static int tsi721_probe(struct pci_dev *pdev,
if (!(pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM) || if (!(pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM) ||
pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM_64 || pci_resource_flags(pdev, BAR_1) & IORESOURCE_MEM_64 ||
pci_resource_len(pdev, BAR_1) < TSI721_DB_WIN_SIZE) { pci_resource_len(pdev, BAR_1) < TSI721_DB_WIN_SIZE) {
dev_err(&pdev->dev, tsi_err(&pdev->dev, "Missing or misconfigured Doorbell BAR1");
"Missing or misconfigured Doorbell BAR1, aborting.\n");
err = -ENODEV; err = -ENODEV;
goto err_disable_pdev; goto err_disable_pdev;
} }
...@@ -2773,8 +2778,8 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2773,8 +2778,8 @@ static int tsi721_probe(struct pci_dev *pdev,
if (pci_resource_flags(pdev, BAR_2) & IORESOURCE_MEM_64) { if (pci_resource_flags(pdev, BAR_2) & IORESOURCE_MEM_64) {
if (pci_resource_flags(pdev, BAR_2) & IORESOURCE_PREFETCH) if (pci_resource_flags(pdev, BAR_2) & IORESOURCE_PREFETCH)
dev_info(&pdev->dev, tsi_debug(INIT, &pdev->dev,
"Prefetchable OBW BAR2 will not be used\n"); "Prefetchable OBW BAR2 will not be used");
else { else {
priv->p2r_bar[0].base = pci_resource_start(pdev, BAR_2); priv->p2r_bar[0].base = pci_resource_start(pdev, BAR_2);
priv->p2r_bar[0].size = pci_resource_len(pdev, BAR_2); priv->p2r_bar[0].size = pci_resource_len(pdev, BAR_2);
...@@ -2783,8 +2788,8 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2783,8 +2788,8 @@ static int tsi721_probe(struct pci_dev *pdev,
if (pci_resource_flags(pdev, BAR_4) & IORESOURCE_MEM_64) { if (pci_resource_flags(pdev, BAR_4) & IORESOURCE_MEM_64) {
if (pci_resource_flags(pdev, BAR_4) & IORESOURCE_PREFETCH) if (pci_resource_flags(pdev, BAR_4) & IORESOURCE_PREFETCH)
dev_info(&pdev->dev, tsi_debug(INIT, &pdev->dev,
"Prefetchable OBW BAR4 will not be used\n"); "Prefetchable OBW BAR4 will not be used");
else { else {
priv->p2r_bar[1].base = pci_resource_start(pdev, BAR_4); priv->p2r_bar[1].base = pci_resource_start(pdev, BAR_4);
priv->p2r_bar[1].size = pci_resource_len(pdev, BAR_4); priv->p2r_bar[1].size = pci_resource_len(pdev, BAR_4);
...@@ -2793,8 +2798,7 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2793,8 +2798,7 @@ static int tsi721_probe(struct pci_dev *pdev,
err = pci_request_regions(pdev, DRV_NAME); err = pci_request_regions(pdev, DRV_NAME);
if (err) { if (err) {
dev_err(&pdev->dev, "Cannot obtain PCI resources, " tsi_err(&pdev->dev, "Unable to obtain PCI resources");
"aborting.\n");
goto err_disable_pdev; goto err_disable_pdev;
} }
...@@ -2802,16 +2806,14 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2802,16 +2806,14 @@ static int tsi721_probe(struct pci_dev *pdev,
priv->regs = pci_ioremap_bar(pdev, BAR_0); priv->regs = pci_ioremap_bar(pdev, BAR_0);
if (!priv->regs) { if (!priv->regs) {
dev_err(&pdev->dev, tsi_err(&pdev->dev, "Unable to map device registers space");
"Unable to map device registers space, aborting\n");
err = -ENOMEM; err = -ENOMEM;
goto err_free_res; goto err_free_res;
} }
priv->odb_base = pci_ioremap_bar(pdev, BAR_1); priv->odb_base = pci_ioremap_bar(pdev, BAR_1);
if (!priv->odb_base) { if (!priv->odb_base) {
dev_err(&pdev->dev, tsi_err(&pdev->dev, "Unable to map outbound doorbells space");
"Unable to map outbound doorbells space, aborting\n");
err = -ENOMEM; err = -ENOMEM;
goto err_unmap_bars; goto err_unmap_bars;
} }
...@@ -2820,16 +2822,16 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2820,16 +2822,16 @@ static int tsi721_probe(struct pci_dev *pdev,
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (err) { if (err) {
dev_info(&pdev->dev, "Unable to set DMA mask\n"); tsi_err(&pdev->dev, "Unable to set DMA mask");
goto err_unmap_bars; goto err_unmap_bars;
} }
if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
dev_info(&pdev->dev, "Unable to set consistent DMA mask\n"); tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
} else { } else {
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
if (err) if (err)
dev_info(&pdev->dev, "Unable to set consistent DMA mask\n"); tsi_info(&pdev->dev, "Unable to set consistent DMA mask");
} }
BUG_ON(!pci_is_pcie(pdev)); BUG_ON(!pci_is_pcie(pdev));
...@@ -2858,7 +2860,7 @@ static int tsi721_probe(struct pci_dev *pdev, ...@@ -2858,7 +2860,7 @@ static int tsi721_probe(struct pci_dev *pdev,
tsi721_init_sr2pc_mapping(priv); tsi721_init_sr2pc_mapping(priv);
if (tsi721_bdma_maint_init(priv)) { if (tsi721_bdma_maint_init(priv)) {
dev_err(&pdev->dev, "BDMA initialization failed, aborting\n"); tsi_err(&pdev->dev, "BDMA initialization failed");
err = -ENOMEM; err = -ENOMEM;
goto err_unmap_bars; goto err_unmap_bars;
} }
...@@ -2907,7 +2909,7 @@ static void tsi721_remove(struct pci_dev *pdev) ...@@ -2907,7 +2909,7 @@ static void tsi721_remove(struct pci_dev *pdev)
{ {
struct tsi721_device *priv = pci_get_drvdata(pdev); struct tsi721_device *priv = pci_get_drvdata(pdev);
dev_dbg(&pdev->dev, "%s enter\n", __func__); tsi_debug(EXIT, &pdev->dev, "enter");
tsi721_disable_ints(priv); tsi721_disable_ints(priv);
tsi721_free_irq(priv); tsi721_free_irq(priv);
...@@ -2935,14 +2937,14 @@ static void tsi721_remove(struct pci_dev *pdev) ...@@ -2935,14 +2937,14 @@ static void tsi721_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
kfree(priv); kfree(priv);
dev_dbg(&pdev->dev, "%s exit\n", __func__); tsi_debug(EXIT, &pdev->dev, "exit");
} }
static void tsi721_shutdown(struct pci_dev *pdev) static void tsi721_shutdown(struct pci_dev *pdev)
{ {
struct tsi721_device *priv = pci_get_drvdata(pdev); struct tsi721_device *priv = pci_get_drvdata(pdev);
dev_dbg(&pdev->dev, "RIO: %s\n", __func__); tsi_debug(EXIT, &pdev->dev, "enter");
tsi721_disable_ints(priv); tsi721_disable_ints(priv);
tsi721_dma_stop_all(priv); tsi721_dma_stop_all(priv);
......
drivers/rapidio/devices/tsi721.h
View file @ 72d8a0d2
...@@ -21,6 +21,46 @@ ...@@ -21,6 +21,46 @@
#ifndef __TSI721_H #ifndef __TSI721_H
#define __TSI721_H #define __TSI721_H
/* Debug output filtering masks */
enum {
DBG_NONE = 0,
DBG_INIT = BIT(0), /* driver init */
DBG_EXIT = BIT(1), /* driver exit */
DBG_MPORT = BIT(2), /* mport add/remove */
DBG_MAINT = BIT(3), /* maintenance ops messages */
DBG_DMA = BIT(4), /* DMA transfer messages */
DBG_DMAV = BIT(5), /* verbose DMA transfer messages */
DBG_IBW = BIT(6), /* inbound window */
DBG_EVENT = BIT(7), /* event handling messages */
DBG_OBW = BIT(8), /* outbound window messages */
DBG_DBELL = BIT(9), /* doorbell messages */
DBG_OMSG = BIT(10), /* doorbell messages */
DBG_IMSG = BIT(11), /* doorbell messages */
DBG_ALL = ~0,
};
#ifdef DEBUG
extern u32 dbg_level;
#define tsi_debug(level, dev, fmt, arg...) \
do { \
if (DBG_##level & dbg_level) \
dev_dbg(dev, "%s: " fmt "\n", __func__, ##arg); \
} while (0)
#else
#define tsi_debug(level, dev, fmt, arg...) \
no_printk(KERN_DEBUG "%s: " fmt "\n", __func__, ##arg)
#endif
#define tsi_info(dev, fmt, arg...) \
dev_info(dev, "%s: " fmt "\n", __func__, ##arg)
#define tsi_warn(dev, fmt, arg...) \
dev_warn(dev, "%s: WARNING " fmt "\n", __func__, ##arg)
#define tsi_err(dev, fmt, arg...) \
dev_err(dev, "%s: ERROR " fmt "\n", __func__, ##arg)
#define DRV_NAME "tsi721" #define DRV_NAME "tsi721"
#define DEFAULT_HOPCOUNT 0xff #define DEFAULT_HOPCOUNT 0xff
......
drivers/rapidio/devices/tsi721_dma.c
View file @ 72d8a0d2
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kfifo.h> #include <linux/kfifo.h>
#include <linux/sched.h>
#include <linux/delay.h> #include <linux/delay.h>
#include "../../dma/dmaengine.h" #include "../../dma/dmaengine.h"
...@@ -75,7 +76,7 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num) ...@@ -75,7 +76,7 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num)
struct tsi721_device *priv = to_tsi721(bdma_chan->dchan.device); struct tsi721_device *priv = to_tsi721(bdma_chan->dchan.device);
#endif #endif
dev_dbg(dev, "Init Block DMA Engine, CH%d\n", bdma_chan->id); tsi_debug(DMA, &bdma_chan->dchan.dev->device, "DMAC%d", bdma_chan->id);
/* /*
* Allocate space for DMA descriptors * Allocate space for DMA descriptors
...@@ -91,8 +92,9 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num) ...@@ -91,8 +92,9 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num)
bdma_chan->bd_phys = bd_phys; bdma_chan->bd_phys = bd_phys;
bdma_chan->bd_base = bd_ptr; bdma_chan->bd_base = bd_ptr;
dev_dbg(dev, "DMA descriptors @ %p (phys = %llx)\n", tsi_debug(DMA, &bdma_chan->dchan.dev->device,
bd_ptr, (unsigned long long)bd_phys); "DMAC%d descriptors @ %p (phys = %pad)",
bdma_chan->id, bd_ptr, &bd_phys);
/* Allocate space for descriptor status FIFO */ /* Allocate space for descriptor status FIFO */
sts_size = ((bd_num + 1) >= TSI721_DMA_MINSTSSZ) ? sts_size = ((bd_num + 1) >= TSI721_DMA_MINSTSSZ) ?
...@@ -114,9 +116,9 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num) ...@@ -114,9 +116,9 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num)
bdma_chan->sts_base = sts_ptr; bdma_chan->sts_base = sts_ptr;
bdma_chan->sts_size = sts_size; bdma_chan->sts_size = sts_size;
dev_dbg(dev, tsi_debug(DMA, &bdma_chan->dchan.dev->device,
"desc status FIFO @ %p (phys = %llx) size=0x%x\n", "DMAC%d desc status FIFO @ %p (phys = %pad) size=0x%x",
sts_ptr, (unsigned long long)sts_phys, sts_size); bdma_chan->id, sts_ptr, &sts_phys, sts_size);
/* Initialize DMA descriptors ring using added link descriptor */ /* Initialize DMA descriptors ring using added link descriptor */
bd_ptr[bd_num].type_id = cpu_to_le32(DTYPE3 << 29); bd_ptr[bd_num].type_id = cpu_to_le32(DTYPE3 << 29);
...@@ -155,7 +157,8 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num) ...@@ -155,7 +157,8 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num)
priv->msix[idx].irq_name, (void *)bdma_chan); priv->msix[idx].irq_name, (void *)bdma_chan);
if (rc) { if (rc) {
dev_dbg(dev, "Unable to get MSI-X for BDMA%d-DONE\n", tsi_debug(DMA, &bdma_chan->dchan.dev->device,
"Unable to get MSI-X for DMAC%d-DONE",
bdma_chan->id); bdma_chan->id);
goto err_out; goto err_out;
} }
...@@ -166,7 +169,8 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num) ...@@ -166,7 +169,8 @@ static int tsi721_bdma_ch_init(struct tsi721_bdma_chan *bdma_chan, int bd_num)
priv->msix[idx].irq_name, (void *)bdma_chan); priv->msix[idx].irq_name, (void *)bdma_chan);
if (rc) { if (rc) {
dev_dbg(dev, "Unable to get MSI-X for BDMA%d-INT\n", tsi_debug(DMA, &bdma_chan->dchan.dev->device,
"Unable to get MSI-X for DMAC%d-INT",
bdma_chan->id); bdma_chan->id);
free_irq( free_irq(
priv->msix[TSI721_VECT_DMA0_DONE + priv->msix[TSI721_VECT_DMA0_DONE +
...@@ -302,20 +306,22 @@ static irqreturn_t tsi721_bdma_msix(int irq, void *ptr) ...@@ -302,20 +306,22 @@ static irqreturn_t tsi721_bdma_msix(int irq, void *ptr)
static void tsi721_start_dma(struct tsi721_bdma_chan *bdma_chan) static void tsi721_start_dma(struct tsi721_bdma_chan *bdma_chan)
{ {
if (!tsi721_dma_is_idle(bdma_chan)) { if (!tsi721_dma_is_idle(bdma_chan)) {
dev_err(bdma_chan->dchan.device->dev, tsi_err(&bdma_chan->dchan.dev->device,
"BUG: Attempt to start non-idle channel\n"); "DMAC%d Attempt to start non-idle channel",
bdma_chan->id);
return; return;
} }
if (bdma_chan->wr_count == bdma_chan->wr_count_next) { if (bdma_chan->wr_count == bdma_chan->wr_count_next) {
dev_err(bdma_chan->dchan.device->dev, tsi_err(&bdma_chan->dchan.dev->device,
"BUG: Attempt to start DMA with no BDs ready\n"); "DMAC%d Attempt to start DMA with no BDs ready %d",
bdma_chan->id, task_pid_nr(current));
return; return;
} }
dev_dbg(bdma_chan->dchan.device->dev, tsi_debug(DMA, &bdma_chan->dchan.dev->device, "DMAC%d (wrc=%d) %d",
"%s: chan_%d (wrc=%d)\n", __func__, bdma_chan->id, bdma_chan->id, bdma_chan->wr_count_next,
bdma_chan->wr_count_next); task_pid_nr(current));
iowrite32(bdma_chan->wr_count_next, iowrite32(bdma_chan->wr_count_next,
bdma_chan->regs + TSI721_DMAC_DWRCNT); bdma_chan->regs + TSI721_DMAC_DWRCNT);
...@@ -417,10 +423,11 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -417,10 +423,11 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
struct tsi721_dma_desc *bd_ptr = NULL; struct tsi721_dma_desc *bd_ptr = NULL;
u32 idx, rd_idx; u32 idx, rd_idx;
u32 add_count = 0; u32 add_count = 0;
struct device *ch_dev = &dchan->dev->device;
if (!tsi721_dma_is_idle(bdma_chan)) { if (!tsi721_dma_is_idle(bdma_chan)) {
dev_err(bdma_chan->dchan.device->dev, tsi_err(ch_dev, "DMAC%d ERR: Attempt to use non-idle channel",
"BUG: Attempt to use non-idle channel\n"); bdma_chan->id);
return -EIO; return -EIO;
} }
...@@ -431,7 +438,7 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -431,7 +438,7 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
rio_addr = desc->rio_addr; rio_addr = desc->rio_addr;
next_addr = -1; next_addr = -1;
bcount = 0; bcount = 0;
sys_size = dma_to_mport(bdma_chan->dchan.device)->sys_size; sys_size = dma_to_mport(dchan->device)->sys_size;
rd_idx = ioread32(bdma_chan->regs + TSI721_DMAC_DRDCNT); rd_idx = ioread32(bdma_chan->regs + TSI721_DMAC_DRDCNT);
rd_idx %= (bdma_chan->bd_num + 1); rd_idx %= (bdma_chan->bd_num + 1);
...@@ -443,18 +450,18 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -443,18 +450,18 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
add_count++; add_count++;
} }
dev_dbg(dchan->device->dev, "%s: BD ring status: rdi=%d wri=%d\n", tsi_debug(DMA, ch_dev, "DMAC%d BD ring status: rdi=%d wri=%d",
__func__, rd_idx, idx); bdma_chan->id, rd_idx, idx);
for_each_sg(desc->sg, sg, desc->sg_len, i) { for_each_sg(desc->sg, sg, desc->sg_len, i) {
dev_dbg(dchan->device->dev, "sg%d/%d addr: 0x%llx len: %d\n", tsi_debug(DMAV, ch_dev, "DMAC%d sg%d/%d addr: 0x%llx len: %d",
i, desc->sg_len, bdma_chan->id, i, desc->sg_len,
(unsigned long long)sg_dma_address(sg), sg_dma_len(sg)); (unsigned long long)sg_dma_address(sg), sg_dma_len(sg));
if (sg_dma_len(sg) > TSI721_BDMA_MAX_BCOUNT) { if (sg_dma_len(sg) > TSI721_BDMA_MAX_BCOUNT) {
dev_err(dchan->device->dev, tsi_err(ch_dev, "DMAC%d SG entry %d is too large",
"%s: SG entry %d is too large\n", __func__, i); bdma_chan->id, i);
err = -EINVAL; err = -EINVAL;
break; break;
} }
...@@ -471,17 +478,16 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -471,17 +478,16 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
} else if (next_addr != -1) { } else if (next_addr != -1) {
/* Finalize descriptor using total byte count value */ /* Finalize descriptor using total byte count value */
tsi721_desc_fill_end(bd_ptr, bcount, 0); tsi721_desc_fill_end(bd_ptr, bcount, 0);
dev_dbg(dchan->device->dev, tsi_debug(DMAV, ch_dev, "DMAC%d prev desc final len: %d",
"%s: prev desc final len: %d\n", bdma_chan->id, bcount);
__func__, bcount);
} }
desc->rio_addr = rio_addr; desc->rio_addr = rio_addr;
if (i && idx == rd_idx) { if (i && idx == rd_idx) {
dev_dbg(dchan->device->dev, tsi_debug(DMAV, ch_dev,
"%s: HW descriptor ring is full @ %d\n", "DMAC%d HW descriptor ring is full @ %d",
__func__, i); bdma_chan->id, i);
desc->sg = sg; desc->sg = sg;
desc->sg_len -= i; desc->sg_len -= i;
break; break;
...@@ -490,13 +496,12 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -490,13 +496,12 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
bd_ptr = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[idx]; bd_ptr = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[idx];
err = tsi721_desc_fill_init(desc, bd_ptr, sg, sys_size); err = tsi721_desc_fill_init(desc, bd_ptr, sg, sys_size);
if (err) { if (err) {
dev_err(dchan->device->dev, tsi_err(ch_dev, "Failed to build desc: err=%d", err);
"Failed to build desc: err=%d\n", err);
break; break;
} }
dev_dbg(dchan->device->dev, "bd_ptr = %p did=%d raddr=0x%llx\n", tsi_debug(DMAV, ch_dev, "DMAC%d bd_ptr = %p did=%d raddr=0x%llx",
bd_ptr, desc->destid, desc->rio_addr); bdma_chan->id, bd_ptr, desc->destid, desc->rio_addr);
next_addr = sg_dma_address(sg); next_addr = sg_dma_address(sg);
bcount = sg_dma_len(sg); bcount = sg_dma_len(sg);
...@@ -511,8 +516,9 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc) ...@@ -511,8 +516,9 @@ static int tsi721_submit_sg(struct tsi721_tx_desc *desc)
entry_done: entry_done:
if (sg_is_last(sg)) { if (sg_is_last(sg)) {
tsi721_desc_fill_end(bd_ptr, bcount, 0); tsi721_desc_fill_end(bd_ptr, bcount, 0);
dev_dbg(dchan->device->dev, "%s: last desc final len: %d\n", tsi_debug(DMAV, ch_dev,
__func__, bcount); "DMAC%d last desc final len: %d",
bdma_chan->id, bcount);
desc->sg_len = 0; desc->sg_len = 0;
} else { } else {
rio_addr += sg_dma_len(sg); rio_addr += sg_dma_len(sg);
...@@ -531,7 +537,7 @@ static void tsi721_advance_work(struct tsi721_bdma_chan *bdma_chan, ...@@ -531,7 +537,7 @@ static void tsi721_advance_work(struct tsi721_bdma_chan *bdma_chan,
{ {
int err; int err;
dev_dbg(bdma_chan->dchan.device->dev, "%s: Enter\n", __func__); tsi_debug(DMA, &bdma_chan->dchan.dev->device, "DMAC%d", bdma_chan->id);
if (!tsi721_dma_is_idle(bdma_chan)) if (!tsi721_dma_is_idle(bdma_chan))
return; return;
...@@ -555,13 +561,14 @@ static void tsi721_advance_work(struct tsi721_bdma_chan *bdma_chan, ...@@ -555,13 +561,14 @@ static void tsi721_advance_work(struct tsi721_bdma_chan *bdma_chan,
tsi721_start_dma(bdma_chan); tsi721_start_dma(bdma_chan);
else { else {
tsi721_dma_tx_err(bdma_chan, desc); tsi721_dma_tx_err(bdma_chan, desc);
dev_dbg(bdma_chan->dchan.device->dev, tsi_debug(DMA, &bdma_chan->dchan.dev->device,
"ERR: tsi721_submit_sg failed with err=%d\n", "DMAC%d ERR: tsi721_submit_sg failed with err=%d",
err); bdma_chan->id, err);
} }
} }
dev_dbg(bdma_chan->dchan.device->dev, "%s: Exit\n", __func__); tsi_debug(DMA, &bdma_chan->dchan.dev->device, "DMAC%d Exit",
bdma_chan->id);
} }
static void tsi721_dma_tasklet(unsigned long data) static void tsi721_dma_tasklet(unsigned long data)
...@@ -570,16 +577,16 @@ static void tsi721_dma_tasklet(unsigned long data) ...@@ -570,16 +577,16 @@ static void tsi721_dma_tasklet(unsigned long data)
u32 dmac_int, dmac_sts; u32 dmac_int, dmac_sts;
dmac_int = ioread32(bdma_chan->regs + TSI721_DMAC_INT); dmac_int = ioread32(bdma_chan->regs + TSI721_DMAC_INT);
dev_dbg(bdma_chan->dchan.device->dev, "%s: DMAC%d_INT = 0x%x\n", tsi_debug(DMA, &bdma_chan->dchan.dev->device, "DMAC%d_INT = 0x%x",
__func__, bdma_chan->id, dmac_int); bdma_chan->id, dmac_int);
/* Clear channel interrupts */ /* Clear channel interrupts */
iowrite32(dmac_int, bdma_chan->regs + TSI721_DMAC_INT); iowrite32(dmac_int, bdma_chan->regs + TSI721_DMAC_INT);
if (dmac_int & TSI721_DMAC_INT_ERR) { if (dmac_int & TSI721_DMAC_INT_ERR) {
dmac_sts = ioread32(bdma_chan->regs + TSI721_DMAC_STS); dmac_sts = ioread32(bdma_chan->regs + TSI721_DMAC_STS);
dev_err(bdma_chan->dchan.device->dev, tsi_err(&bdma_chan->dchan.dev->device,
"%s: DMA ERROR - DMAC%d_STS = 0x%x\n", "ERR - DMAC%d_STS = 0x%x",
__func__, bdma_chan->id, dmac_sts); bdma_chan->id, dmac_sts);
spin_lock(&bdma_chan->lock); spin_lock(&bdma_chan->lock);
bdma_chan->active_tx = NULL; bdma_chan->active_tx = NULL;
...@@ -587,9 +594,9 @@ static void tsi721_dma_tasklet(unsigned long data) ...@@ -587,9 +594,9 @@ static void tsi721_dma_tasklet(unsigned long data)
} }
if (dmac_int & TSI721_DMAC_INT_STFULL) { if (dmac_int & TSI721_DMAC_INT_STFULL) {
dev_err(bdma_chan->dchan.device->dev, tsi_err(&bdma_chan->dchan.dev->device,
"%s: DMAC%d descriptor status FIFO is full\n", "DMAC%d descriptor status FIFO is full",
__func__, bdma_chan->id); bdma_chan->id);
} }
if (dmac_int & (TSI721_DMAC_INT_DONE | TSI721_DMAC_INT_IOFDONE)) { if (dmac_int & (TSI721_DMAC_INT_DONE | TSI721_DMAC_INT_IOFDONE)) {
...@@ -633,8 +640,9 @@ static dma_cookie_t tsi721_tx_submit(struct dma_async_tx_descriptor *txd) ...@@ -633,8 +640,9 @@ static dma_cookie_t tsi721_tx_submit(struct dma_async_tx_descriptor *txd)
/* Check if the descriptor is detached from any lists */ /* Check if the descriptor is detached from any lists */
if (!list_empty(&desc->desc_node)) { if (!list_empty(&desc->desc_node)) {
dev_err(bdma_chan->dchan.device->dev, tsi_err(&bdma_chan->dchan.dev->device,
"%s: wrong state of descriptor %p\n", __func__, txd); "DMAC%d wrong state of descriptor %p",
bdma_chan->id, txd);
return -EIO; return -EIO;
} }
...@@ -659,16 +667,15 @@ static int tsi721_alloc_chan_resources(struct dma_chan *dchan) ...@@ -659,16 +667,15 @@ static int tsi721_alloc_chan_resources(struct dma_chan *dchan)
struct tsi721_tx_desc *desc = NULL; struct tsi721_tx_desc *desc = NULL;
int i; int i;
dev_dbg(dchan->device->dev, "%s: for channel %d\n", tsi_debug(DMA, &dchan->dev->device, "DMAC%d", bdma_chan->id);
__func__, bdma_chan->id);
if (bdma_chan->bd_base) if (bdma_chan->bd_base)
return TSI721_DMA_TX_QUEUE_SZ; return TSI721_DMA_TX_QUEUE_SZ;
/* Initialize BDMA channel */ /* Initialize BDMA channel */
if (tsi721_bdma_ch_init(bdma_chan, dma_desc_per_channel)) { if (tsi721_bdma_ch_init(bdma_chan, dma_desc_per_channel)) {
dev_err(dchan->device->dev, "Unable to initialize data DMA" tsi_err(&dchan->dev->device, "Unable to initialize DMAC%d",
" channel %d, aborting\n", bdma_chan->id); bdma_chan->id);
return -ENODEV; return -ENODEV;
} }
...@@ -676,8 +683,9 @@ static int tsi721_alloc_chan_resources(struct dma_chan *dchan) ...@@ -676,8 +683,9 @@ static int tsi721_alloc_chan_resources(struct dma_chan *dchan)
desc = kcalloc(TSI721_DMA_TX_QUEUE_SZ, sizeof(struct tsi721_tx_desc), desc = kcalloc(TSI721_DMA_TX_QUEUE_SZ, sizeof(struct tsi721_tx_desc),
GFP_KERNEL); GFP_KERNEL);
if (!desc) { if (!desc) {
dev_err(dchan->device->dev, tsi_err(&dchan->dev->device,
"Failed to allocate logical descriptors\n"); "DMAC%d Failed to allocate logical descriptors",
bdma_chan->id);
tsi721_bdma_ch_free(bdma_chan); tsi721_bdma_ch_free(bdma_chan);
return -ENOMEM; return -ENOMEM;
} }
...@@ -718,8 +726,7 @@ static void tsi721_free_chan_resources(struct dma_chan *dchan) ...@@ -718,8 +726,7 @@ static void tsi721_free_chan_resources(struct dma_chan *dchan)
{ {
struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan); struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
dev_dbg(dchan->device->dev, "%s: for channel %d\n", tsi_debug(DMA, &dchan->dev->device, "DMAC%d", bdma_chan->id);
__func__, bdma_chan->id);
if (bdma_chan->bd_base == NULL) if (bdma_chan->bd_base == NULL)
return; return;
...@@ -744,7 +751,7 @@ static void tsi721_issue_pending(struct dma_chan *dchan) ...@@ -744,7 +751,7 @@ static void tsi721_issue_pending(struct dma_chan *dchan)
{ {
struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan); struct tsi721_bdma_chan *bdma_chan = to_tsi721_chan(dchan);
dev_dbg(dchan->device->dev, "%s: Enter\n", __func__); tsi_debug(DMA, &dchan->dev->device, "DMAC%d", bdma_chan->id);
spin_lock_bh(&bdma_chan->lock); spin_lock_bh(&bdma_chan->lock);
if (tsi721_dma_is_idle(bdma_chan) && bdma_chan->active) { if (tsi721_dma_is_idle(bdma_chan) && bdma_chan->active) {
...@@ -766,11 +773,12 @@ struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan, ...@@ -766,11 +773,12 @@ struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan,
struct dma_async_tx_descriptor *txd = NULL; struct dma_async_tx_descriptor *txd = NULL;
if (!sgl || !sg_len) { if (!sgl || !sg_len) {
dev_err(dchan->device->dev, "%s: No SG list\n", __func__); tsi_err(&dchan->dev->device, "DMAC%d No SG list",
bdma_chan->id);
return NULL; return NULL;
} }
dev_dbg(dchan->device->dev, "%s: %s\n", __func__, tsi_debug(DMA, &dchan->dev->device, "DMAC%d %s", bdma_chan->id,
(dir == DMA_DEV_TO_MEM)?"READ":"WRITE"); (dir == DMA_DEV_TO_MEM)?"READ":"WRITE");
if (dir == DMA_DEV_TO_MEM) if (dir == DMA_DEV_TO_MEM)
...@@ -789,8 +797,9 @@ struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan, ...@@ -789,8 +797,9 @@ struct dma_async_tx_descriptor *tsi721_prep_rio_sg(struct dma_chan *dchan,
break; break;
} }
} else { } else {
dev_err(dchan->device->dev, tsi_err(&dchan->dev->device,
"%s: Unsupported DMA direction option\n", __func__); "DMAC%d Unsupported DMA direction option",
bdma_chan->id);
return NULL; return NULL;
} }
...@@ -823,7 +832,7 @@ static int tsi721_terminate_all(struct dma_chan *dchan) ...@@ -823,7 +832,7 @@ static int tsi721_terminate_all(struct dma_chan *dchan)
u32 dmac_int; u32 dmac_int;
LIST_HEAD(list); LIST_HEAD(list);
dev_dbg(dchan->device->dev, "%s: Entry\n", __func__); tsi_debug(DMA, &dchan->dev->device, "DMAC%d", bdma_chan->id);
spin_lock_bh(&bdma_chan->lock); spin_lock_bh(&bdma_chan->lock);
...@@ -933,7 +942,7 @@ int tsi721_register_dma(struct tsi721_device *priv) ...@@ -933,7 +942,7 @@ int tsi721_register_dma(struct tsi721_device *priv)
err = dma_async_device_register(&mport->dma); err = dma_async_device_register(&mport->dma);
if (err) if (err)
dev_err(&priv->pdev->dev, "Failed to register DMA device\n"); tsi_err(&priv->pdev->dev, "Failed to register DMA device");
return err; return err;
} }
......
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