All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaron Lu <aaron.lu@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Borislav Petkov <bp@alien8.de>,
	Dutra Julio <dutra.julio@gmail.com>,
	Phillip Wood <phillip.wood@dunelm.org.uk>,
	Tejun Heo <tj@kernel.org>, Alan Cox <alan@lxorguk.ukuu.org.uk>,
	Szymon Janc <szymon@janc.net.pl>,
	Bernd Buschinski <b.buschinski@googlemail.com>,
	linux-ide@vger.kernel.org
Subject: [PATCH] libata: fix ata_dma_enabled
Date: Mon, 03 Dec 2012 09:04:20 +0800	[thread overview]
Message-ID: <50BBFA94.2070105@intel.com> (raw)


ata_dma_enabled should check if device is either using multi word DMA
or ultra DMA instead of checking 0xff, as dma_mode 0 is not a valid dma
mode either.

This patch fixes the following bug:
https://bugzilla.kernel.org/show_bug.cgi?id=49151

Reported-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Tested-by: Dutra Julio <dutra.julio@gmail.com>
Tested-by: Szymon Janc <szymon@janc.net.pl>
Tested-by: Bernd Buschinski <b.buschinski@googlemail.com>
Cc: <stable@kernel.org>
---
 include/linux/libata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 77eeeda..2444695 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1617,7 +1617,7 @@ static inline int ata_using_udma(struct ata_device *adev)
 
 static inline int ata_dma_enabled(struct ata_device *adev)
 {
-	return (adev->dma_mode == 0xFF ? 0 : 1);
+	return ata_using_mwdma(adev) || ata_using_udma(adev);
 }
 
 /**************************************************************************
-- 
1.8.0.1.2.gd1eded4


             reply	other threads:[~2012-12-03  1:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-03  1:04 Aaron Lu [this message]
2012-12-03  1:22 ` [PATCH] libata: fix ata_dma_enabled Alan Cox
2012-12-03  1:35   ` Aaron Lu
2012-12-03  1:46     ` Alan Cox
2012-12-03  3:35 ` [PATCH] libata: set dma_mode to 0xff in reset Aaron Lu
2012-12-03  9:43   ` Alan Cox
2012-12-03 10:07   ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50BBFA94.2070105@intel.com \
    --to=aaron.lu@intel.com \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=b.buschinski@googlemail.com \
    --cc=bp@alien8.de \
    --cc=dutra.julio@gmail.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=szymon@janc.net.pl \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.