2013-03-04 17:59:57

by Dave Jiang

Subject: [PATCH] ioatdma: make debug output more readable

Making OP field a hex instead of integer to make it more readable. Also add
the dump out of the NEXT field.

Signed-off-by: Dave Jiang <[email protected]>
---
drivers/dma/ioat/dma.h | 2 +-
drivers/dma/ioat/dma_v3.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
index 53a4cbb..95ae7b3 100644
--- a/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@ -179,7 +179,7 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct ioat_dma_descriptor *hw,
struct device *dev = to_dev(chan);

dev_dbg(dev, "desc[%d]: (%#llx->%#llx) cookie: %d flags: %#x"
- " ctl: %#x (op: %d int_en: %d compl: %d)\n", id,
+ " ctl: %#10.8x (op: %#x int_en: %d compl: %d)\n", id,
(unsigned long long) tx->phys,
(unsigned long long) hw->next, tx->cookie, tx->flags,
hw->ctl, hw->ctl_f.op, hw->ctl_f.int_en, hw->ctl_f.compl_write);
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
index 53ea4bd..ce6fcee 100644
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@ -605,7 +605,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
int i;

dev_dbg(dev, "desc[%d]: (%#llx->%#llx) flags: %#x"
- " sz: %#x ctl: %#x (op: %d int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
+ " sz: %#10.8x ctl: %#x (op: %#x int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
desc_id(desc), (unsigned long long) desc->txd.phys,
(unsigned long long) (pq_ex ? pq_ex->next : pq->next),
desc->txd.flags, pq->size, pq->ctl, pq->ctl_f.op, pq->ctl_f.int_en,
@@ -617,6 +617,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
(unsigned long long) pq_get_src(descs, i), pq->coef[i]);
dev_dbg(dev, "\tP: %#llx\n", pq->p_addr);
dev_dbg(dev, "\tQ: %#llx\n", pq->q_addr);
+ dev_dbg(dev, "\tNEXT: %#llx\n", pq->next);
}

static struct dma_async_tx_descriptor *

2013-03-05 22:26:44

by Dave Jiang

Subject: Re: [PATCH] ioatdma: make debug output more readable

On 03/05/2013 03:20 PM, Dan Williams wrote:
>
> On 3/4/13 9:59 AM, "Dave Jiang" <[email protected]> wrote:
>
>> Making OP field a hex instead of integer to make it more readable. Also
>> add
>> the dump out of the NEXT field.
>>
>> Signed-off-by: Dave Jiang <[email protected]>
>> ---
>> drivers/dma/ioat/dma.h | 2 +-
>> drivers/dma/ioat/dma_v3.c | 3 ++-
>> 2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
>> index 53a4cbb..95ae7b3 100644
>> --- a/drivers/dma/ioat/dma.h
>> +++ b/drivers/dma/ioat/dma.h
>> @@ -179,7 +179,7 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct
>> ioat_dma_descriptor *hw,
>> struct device *dev = to_dev(chan);
>>
>> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) cookie: %d flags: %#x"
>> - " ctl: %#x (op: %d int_en: %d compl: %d)\n", id,
>> + " ctl: %#10.8x (op: %#x int_en: %d compl: %d)\n", id,
>> (unsigned long long) tx->phys,
>> (unsigned long long) hw->next, tx->cookie, tx->flags,
>> hw->ctl, hw->ctl_f.op, hw->ctl_f.int_en, hw->ctl_f.compl_write);
>> diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
>> index 53ea4bd..ce6fcee 100644
>> --- a/drivers/dma/ioat/dma_v3.c
>> +++ b/drivers/dma/ioat/dma_v3.c
>> @@ -605,7 +605,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct
>> ioat_ring_ent *desc, struct
>> int i;
>>
>> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) flags: %#x"
>> - " sz: %#x ctl: %#x (op: %d int: %d compl: %d pq: '%s%s' src_cnt:
>> %d)\n",
>> + " sz: %#10.8x ctl: %#x (op: %#x int: %d compl: %d pq: '%s%s' src_cnt:
>> %d)\n",
>> desc_id(desc), (unsigned long long) desc->txd.phys,
>> (unsigned long long) (pq_ex ? pq_ex->next : pq->next),
>> desc->txd.flags, pq->size, pq->ctl, pq->ctl_f.op, pq->ctl_f.int_en,
>> @@ -617,6 +617,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct
>> ioat_ring_ent *desc, struct
>> (unsigned long long) pq_get_src(descs, i), pq->coef[i]);
>> dev_dbg(dev, "\tP: %#llx\n", pq->p_addr);
>> dev_dbg(dev, "\tQ: %#llx\n", pq->q_addr);
>> + dev_dbg(dev, "\tNEXT: %#llx\n", pq->next);
> Looks ok, did you want to distinguish when ->next is pointing to an
> extended descriptor?

Probably a good idea. Let me add that

2013-03-05 22:43:01

by Dan Williams

Subject: Re: [PATCH] ioatdma: make debug output more readable

On 3/4/13 9:59 AM, "Dave Jiang" <[email protected]> wrote:

>Making OP field a hex instead of integer to make it more readable. Also
>add
>the dump out of the NEXT field.
>
>Signed-off-by: Dave Jiang <[email protected]>
>---
> drivers/dma/ioat/dma.h | 2 +-
> drivers/dma/ioat/dma_v3.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
>index 53a4cbb..95ae7b3 100644
>--- a/drivers/dma/ioat/dma.h
>+++ b/drivers/dma/ioat/dma.h
>@@ -179,7 +179,7 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct
>ioat_dma_descriptor *hw,
> struct device *dev = to_dev(chan);
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) cookie: %d flags: %#x"
>- " ctl: %#x (op: %d int_en: %d compl: %d)\n", id,
>+ " ctl: %#10.8x (op: %#x int_en: %d compl: %d)\n", id,
> (unsigned long long) tx->phys,
> (unsigned long long) hw->next, tx->cookie, tx->flags,
> hw->ctl, hw->ctl_f.op, hw->ctl_f.int_en, hw->ctl_f.compl_write);
>diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
>index 53ea4bd..ce6fcee 100644
>--- a/drivers/dma/ioat/dma_v3.c
>+++ b/drivers/dma/ioat/dma_v3.c
>@@ -605,7 +605,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct
>ioat_ring_ent *desc, struct
> int i;
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) flags: %#x"
>- " sz: %#x ctl: %#x (op: %d int: %d compl: %d pq: '%s%s' src_cnt:
>%d)\n",
>+ " sz: %#10.8x ctl: %#x (op: %#x int: %d compl: %d pq: '%s%s' src_cnt:
>%d)\n",
> desc_id(desc), (unsigned long long) desc->txd.phys,
> (unsigned long long) (pq_ex ? pq_ex->next : pq->next),
> desc->txd.flags, pq->size, pq->ctl, pq->ctl_f.op, pq->ctl_f.int_en,
>@@ -617,6 +617,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct
>ioat_ring_ent *desc, struct
> (unsigned long long) pq_get_src(descs, i), pq->coef[i]);
> dev_dbg(dev, "\tP: %#llx\n", pq->p_addr);
> dev_dbg(dev, "\tQ: %#llx\n", pq->q_addr);
>+ dev_dbg(dev, "\tNEXT: %#llx\n", pq->next);

Looks ok, did you want to distinguish when ->next is pointing to an
extended descriptor?

2013-03-07 12:52:48

by Vinod Koul

Subject: Re: [PATCH] ioatdma: make debug output more readable

On Mon, Mar 04, 2013 at 10:59:54AM -0700, Dave Jiang wrote:
> Making OP field a hex instead of integer to make it more readable. Also add
> the dump out of the NEXT field.
>
> Signed-off-by: Dave Jiang <[email protected]>
Applied thanks

> ---
> drivers/dma/ioat/dma.h | 2 +-
> drivers/dma/ioat/dma_v3.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
> index 53a4cbb..95ae7b3 100644
> --- a/drivers/dma/ioat/dma.h
> +++ b/drivers/dma/ioat/dma.h
> @@ -179,7 +179,7 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct ioat_dma_descriptor *hw,
> struct device *dev = to_dev(chan);
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) cookie: %d flags: %#x"
> - " ctl: %#x (op: %d int_en: %d compl: %d)\n", id,
> + " ctl: %#10.8x (op: %#x int_en: %d compl: %d)\n", id,
> (unsigned long long) tx->phys,
> (unsigned long long) hw->next, tx->cookie, tx->flags,
> hw->ctl, hw->ctl_f.op, hw->ctl_f.int_en, hw->ctl_f.compl_write);
> diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
> index 53ea4bd..ce6fcee 100644
> --- a/drivers/dma/ioat/dma_v3.c
> +++ b/drivers/dma/ioat/dma_v3.c
> @@ -605,7 +605,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
> int i;
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) flags: %#x"
> - " sz: %#x ctl: %#x (op: %d int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
> + " sz: %#10.8x ctl: %#x (op: %#x int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
> desc_id(desc), (unsigned long long) desc->txd.phys,
> (unsigned long long) (pq_ex ? pq_ex->next : pq->next),
> desc->txd.flags, pq->size, pq->ctl, pq->ctl_f.op, pq->ctl_f.int_en,
> @@ -617,6 +617,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
> (unsigned long long) pq_get_src(descs, i), pq->coef[i]);
> dev_dbg(dev, "\tP: %#llx\n", pq->p_addr);
> dev_dbg(dev, "\tQ: %#llx\n", pq->q_addr);
> + dev_dbg(dev, "\tNEXT: %#llx\n", pq->next);
> }
>
> static struct dma_async_tx_descriptor *
>

2013-03-07 12:53:10

by Vinod Koul

Subject: Re: [PATCH] ioatdma: make debug output more readable

On Mon, Mar 04, 2013 at 10:59:54AM -0700, Dave Jiang wrote:
> Making OP field a hex instead of integer to make it more readable. Also add
> the dump out of the NEXT field.
>
> Signed-off-by: Dave Jiang <[email protected]>
Applied Thanks
> ---
> drivers/dma/ioat/dma.h | 2 +-
> drivers/dma/ioat/dma_v3.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
> index 53a4cbb..95ae7b3 100644
> --- a/drivers/dma/ioat/dma.h
> +++ b/drivers/dma/ioat/dma.h
> @@ -179,7 +179,7 @@ __dump_desc_dbg(struct ioat_chan_common *chan, struct ioat_dma_descriptor *hw,
> struct device *dev = to_dev(chan);
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) cookie: %d flags: %#x"
> - " ctl: %#x (op: %d int_en: %d compl: %d)\n", id,
> + " ctl: %#10.8x (op: %#x int_en: %d compl: %d)\n", id,
> (unsigned long long) tx->phys,
> (unsigned long long) hw->next, tx->cookie, tx->flags,
> hw->ctl, hw->ctl_f.op, hw->ctl_f.int_en, hw->ctl_f.compl_write);
> diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
> index 53ea4bd..ce6fcee 100644
> --- a/drivers/dma/ioat/dma_v3.c
> +++ b/drivers/dma/ioat/dma_v3.c
> @@ -605,7 +605,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
> int i;
>
> dev_dbg(dev, "desc[%d]: (%#llx->%#llx) flags: %#x"
> - " sz: %#x ctl: %#x (op: %d int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
> + " sz: %#10.8x ctl: %#x (op: %#x int: %d compl: %d pq: '%s%s' src_cnt: %d)\n",
> desc_id(desc), (unsigned long long) desc->txd.phys,
> (unsigned long long) (pq_ex ? pq_ex->next : pq->next),
> desc->txd.flags, pq->size, pq->ctl, pq->ctl_f.op, pq->ctl_f.int_en,
> @@ -617,6 +617,7 @@ dump_pq_desc_dbg(struct ioat2_dma_chan *ioat, struct ioat_ring_ent *desc, struct
> (unsigned long long) pq_get_src(descs, i), pq->coef[i]);
> dev_dbg(dev, "\tP: %#llx\n", pq->p_addr);
> dev_dbg(dev, "\tQ: %#llx\n", pq->q_addr);
> + dev_dbg(dev, "\tNEXT: %#llx\n", pq->next);
> }
>
> static struct dma_async_tx_descriptor *
>