Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528AbcDVLd0 (ORCPT ); Fri, 22 Apr 2016 07:33:26 -0400 Received: from smtp-out6.electric.net ([192.162.217.193]:60584 "EHLO smtp-out6.electric.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752192AbcDVLdX (ORCPT ); Fri, 22 Apr 2016 07:33:23 -0400 From: David Laight To: "'Andy Shevchenko'" , Tejun Heo , "linux-ide@vger.kernel.org" , "Rob Herring" , "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , Christian Lamparter , =?utf-8?B?TcOlbnMgUnVsbGfDpXJk?= , Julian Margetson Subject: RE: [PATCH v1 08/23] ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands Thread-Topic: [PATCH v1 08/23] ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands Thread-Index: AQHRm/wI23tn+zksI061TOzCehIhcZ+V3EAA Date: Fri, 22 Apr 2016 11:32:00 +0000 Message-ID: <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> In-Reply-To: <1461262544-115408-9-git-send-email-andriy.shevchenko@linux.intel.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.202.99.200] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-Outbound-IP: 213.249.233.130 X-Env-From: David.Laight@ACULAB.COM X-PolicySMART: 3396946, 3397078 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u3MBXYLC016803 Content-Length: 1367 Lines: 46 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); } David