Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190AbcDVLoU (ORCPT ); Fri, 22 Apr 2016 07:44:20 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34195 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbcDVLoS (ORCPT ); Fri, 22 Apr 2016 07:44:18 -0400 From: Christian Lamparter To: David Laight Cc: "'Andy Shevchenko'" , Tejun Heo , "linux-ide@vger.kernel.org" , Rob Herring , "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , =?ISO-8859-1?Q?M=E5ns_Rullg=E5rd?= , Julian Margetson Subject: Re: [PATCH v1 08/23] ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands Date: Fri, 22 Apr 2016 13:44:15 +0200 Message-ID: <1873082.m6E4AZmIX5@debian64> User-Agent: KMail/4.14.10 (Linux/4.6.0-rc3-wt+; KDE/4.14.14; x86_64; ; ) In-Reply-To: <063D6719AE5E284EB5DD2968C1650D6D5F4A7ECF@AcuExch.aculab.com> References: <1461262544-115408-1-git-send-email-andriy.shevchenko@linux.intel.com> <1461262544-115408-9-git-send-email-andriy.shevchenko@linux.intel.com> <063D6719AE5E284EB5DD2968C1650D6D5F4A7ECF@AcuExch.aculab.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2325 Lines: 70 On Friday, April 22, 2016 11:32:00 AM David Laight wrote: > From: Andy Shevchenko > > Sent: 21 April 2016 19:15 > > ata_sff_qc_issue() can't handle DMA commands and thus we have to avoid it for > > them. Do call ata_bmdma_qc_issue() instead for this case. > > > > Suggested-by: Christian Lamparter > > Signed-off-by: Andy Shevchenko > > --- > > drivers/ata/sata_dwc_460ex.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c > > index 038e5fb..845c35d 100644 > > --- a/drivers/ata/sata_dwc_460ex.c > > +++ b/drivers/ata/sata_dwc_460ex.c > > @@ -1061,10 +1061,12 @@ static unsigned int sata_dwc_qc_issue(struct ata_queued_cmd *qc) > > __func__, tag, qc->ap->link.sactive, sactive); > > > > ap->ops->sff_tf_load(ap, &qc->tf); > > - sata_dwc_exec_command_by_tag(ap, &qc->tf, qc->tag, > > + sata_dwc_exec_command_by_tag(ap, &qc->tf, tag, > > SATA_DWC_CMD_ISSUED_PEND); > > + } else if (ata_is_dma(qc->tf.protocol)) { > > + return ata_bmdma_qc_issue(qc); > > } else { > > - ata_sff_qc_issue(qc); > > + return ata_sff_qc_issue(qc); > > } > > return 0; > > } > > I'd nuke those 'else if', they make it very hard to read. > I Think the code is: > > sata_dwc_exec_command_by_tag(...); > return 0; > } > > if (ata_is_dma(qc->tf.protocol)) > return ata_bmdma_qc_issue(qc); > > return ata_sff_qc_issue(qc); > } What about something like this instead? ata_bmdma_qc_issue already calls ata_sff_qc_issue, if it's not a dma transfere anyway [0]. --- diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index 6a61184..67cce54 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c @@ -1096,12 +1096,9 @@ static unsigned int sata_dwc_qc_issue(struct ata_queued_cmd *qc) ap->ops->sff_tf_load(ap, &qc->tf); sata_dwc_exec_command_by_tag(ap, &qc->tf, tag, SATA_DWC_CMD_ISSUED_PEND); - } else if (ata_is_dma(qc->tf.protocol)) { + return 0; + } else return ata_bmdma_qc_issue(qc); - } else { - return ata_sff_qc_issue(qc); - } - return 0; } static void sata_dwc_error_handler(struct ata_port *ap) --- [0]