On 2/4/20 5:55 PM, Hannes Reinecke wrote:
> Add missing bmdma tracepoints and drop the now pointless
> DPRINTK() calls.
Actually it should be: DPRINTK()/VPRINTK().
Please also consider merging this patch with patch #25.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
> ---
> drivers/ata/pata_octeon_cf.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
> index f5cd89173028..9527216e59b9 100644
> --- a/drivers/ata/pata_octeon_cf.c
> +++ b/drivers/ata/pata_octeon_cf.c
> @@ -19,7 +19,7 @@
> #include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <scsi/scsi_host.h>
> -
> +#include <trace/events/libata.h>
> #include <asm/byteorder.h>
> #include <asm/octeon/octeon.h>
>
> @@ -517,17 +517,14 @@ static void octeon_cf_exec_command16(struct ata_port *ap,
> u16 blob;
>
> if (tf->flags & ATA_TFLAG_DEVICE) {
> - VPRINTK("device 0x%X\n", tf->device);
> blob = tf->device;
> } else {
> blob = 0;
> }
>
> - DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);
> blob |= (tf->command << 8);
> __raw_writew(blob, base + 6);
>
> -
> ata_wait_idle(ap);
> }
>
> @@ -541,12 +538,10 @@ static void octeon_cf_dma_setup(struct ata_queued_cmd *qc)
> struct octeon_cf_port *cf_port;
>
> cf_port = ap->private_data;
> - DPRINTK("ENTER\n");
> /* issue r/w command */
> qc->cursg = qc->sg;
> cf_port->dma_finished = 0;
> ap->ops->sff_exec_command(ap, &qc->tf);
> - DPRINTK("EXIT\n");
> }
>
> /**
> @@ -798,8 +793,11 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc)
> case ATA_PROT_DMA:
> WARN_ON(qc->tf.flags & ATA_TFLAG_POLLING);
>
> + trace_ata_tf_load(ap, &qc->tf, qc->tag);
> ap->ops->sff_tf_load(ap, &qc->tf); /* load tf registers */
> + trace_ata_bmdma_setup(qp, &qc->tf, qc->tag);
> octeon_cf_dma_setup(qc); /* set up dma */
> + trace_ata_bmdma_start(ap, &qc->tf, qc->tag);
> octeon_cf_dma_start(qc); /* initiate dma */
> ap->hsm_task_state = HSM_ST_LAST;
> break;
>
