From: "Reimar Döffinger" <Reimar.Doeffinger@gmx.de>
To: Damien Le Moal <Damien.LeMoal@wdc.com>,
linux-ide@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
hch@infradead.org
Subject: [PATCH] libata: fix checking of DMA state
Date: Thu, 19 Aug 2021 10:13:40 +0200 [thread overview]
Message-ID: <20210819081340.4362-1-Reimar.Doeffinger@gmx.de> (raw)
In-Reply-To: <DM6PR04MB7081AB7034F116CDFBA43890E7FF9@DM6PR04MB7081.namprd04.prod.outlook.com>
Checking if DMA is enabled should be done via the
ata_dma_enabled helper function, since the init state
0xff indicates disabled.
Only the libata-core logic is tested on actual devices,
the other changes are based on code review only.
---
Changes to previous version:
- removed initialization change for SATA. I got confused by the
ping-pong between libata-eh and libata-core and thought SATA did not
set up xfermode
- reviewed other cases that used dma_mode in boolean context and those
seemed to need changing as well, so added them to patch.
I did not see any places that would set dma_mode to 0 ever, so I
do think they were all indeed wrong.
drivers/ata/libata-core.c | 2 +-
drivers/ata/libata-scsi.c | 4 ++--
drivers/ata/pata_ali.c | 2 +-
drivers/ata/pata_optidma.c | 4 ++--
drivers/ata/pata_radisys.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9934f6c465f4..52469b39d424 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2004,7 +2004,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
retry:
ata_tf_init(dev, &tf);
- if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
+ if (ata_dma_enabled(dev) && ata_id_has_read_log_dma_ext(dev->id) &&
!(dev->horkage & ATA_HORKAGE_NO_DMA_LOG)) {
tf.command = ATA_CMD_READ_LOG_DMA_EXT;
tf.protocol = ATA_PROT_DMA;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index b9588c52815d..9e51251161e9 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3023,7 +3023,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
ata_qc_set_pc_nbytes(qc);
/* We may not issue DMA commands if no DMA mode is set */
- if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0) {
+ if (tf->protocol == ATA_PROT_DMA && !ata_dma_enabled(dev)) {
fp = 1;
goto invalid_fld;
}
@@ -3173,7 +3173,7 @@ static unsigned int ata_scsi_write_same_xlat(struct ata_queued_cmd *qc)
u8 unmap = cdb[1] & 0x8;
/* we may not issue DMA commands if no DMA mode is set */
- if (unlikely(!dev->dma_mode))
+ if (unlikely(!ata_dma_enabled(dev)))
goto invalid_opcode;
/*
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 557ecf466102..28b56811306f 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -215,7 +215,7 @@ static void ali_set_piomode(struct ata_port *ap, struct ata_device *adev)
struct ata_timing p;
ata_timing_compute(pair, pair->pio_mode, &p, T, 1);
ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);
- if (pair->dma_mode) {
+ if (ata_dma_enabled(pair)) {
ata_timing_compute(pair, pair->dma_mode, &p, T, 1);
ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);
}
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index f6278d9de348..ad1090b90e52 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -153,7 +153,7 @@ static void optidma_mode_setup(struct ata_port *ap, struct ata_device *adev, u8
if (pair) {
u8 pair_addr;
/* Hardware constraint */
- if (pair->dma_mode)
+ if (ata_dma_enabled(pair))
pair_addr = 0;
else
pair_addr = addr_timing[pci_clock][pair->pio_mode - XFER_PIO_0];
@@ -301,7 +301,7 @@ static u8 optidma_make_bits43(struct ata_device *adev)
};
if (!ata_dev_enabled(adev))
return 0;
- if (adev->dma_mode)
+ if (ata_dma_enabled(adev))
return adev->dma_mode - XFER_MW_DMA_0;
return bits43[adev->pio_mode - XFER_PIO_0];
}
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 8fde4a86401b..626b14f0f2ea 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -173,7 +173,7 @@ static unsigned int radisys_qc_issue(struct ata_queued_cmd *qc)
if (adev != ap->private_data) {
/* UDMA timing is not shared */
if (adev->dma_mode < XFER_UDMA_0) {
- if (adev->dma_mode)
+ if (ata_dma_enabled(adev))
radisys_set_dmamode(ap, adev);
else if (adev->pio_mode)
radisys_set_piomode(ap, adev);
--
2.32.0
next prev parent reply other threads:[~2021-08-19 8:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-14 13:47 [PATCH] libata: add kernel parameter to force ATA_HORKAGE_NO_DMA_LOG Reimar Döffinger
2021-08-15 8:18 ` Christoph Hellwig
2021-08-15 16:27 ` [PATCH] libata: Disable ATA_CMD_READ_LOG_DMA_EXT in problematic cases Reimar Döffinger
2021-08-16 0:10 ` Damien Le Moal
2021-08-16 17:15 ` Reimar Döffinger
2021-08-17 19:06 ` Reimar Döffinger
2021-08-18 22:49 ` Damien Le Moal
2021-08-16 17:26 ` Reimar Döffinger
2021-08-17 7:45 ` Damien Le Moal
2021-08-17 18:01 ` Reimar Döffinger
2021-08-17 19:03 ` [PATCH] libata: fix setting and checking of DMA state Reimar Döffinger
2021-08-18 23:30 ` Damien Le Moal
2021-08-19 8:13 ` Reimar Döffinger [this message]
2021-08-19 12:56 ` [PATCH] libata: fix " Reimar Döffinger
2021-09-27 8:56 ` Paul Menzel
2021-09-27 9:10 ` Reimar Döffinger
2021-09-27 9:15 ` Damien Le Moal
2021-10-03 13:28 ` [PATCH v4] Fixes to DMA state check Reimar Döffinger
2021-10-03 13:28 ` [PATCH 1/6] libata: fix checking of DMA state Reimar Döffinger
2021-10-03 13:28 ` [PATCH 2/6] libata-scsi: " Reimar Döffinger
2021-10-03 13:28 ` [PATCH 3/6] pata_ali: " Reimar Döffinger
2021-10-03 13:28 ` [PATCH 4/6] pata_amd: " Reimar Döffinger
2021-10-03 13:28 ` [PATCH 5/6] pata_optidma: " Reimar Döffinger
2021-10-03 13:28 ` [PATCH 6/6] pata_radisys: " Reimar Döffinger
2021-10-12 2:20 ` [PATCH v4] Fixes to DMA state check Damien Le Moal
2021-10-12 6:30 ` Reimar Döffinger
[not found] ` <605EE991-5DA2-4A8D-9691-967D68D3AB51@gmx.de>
2021-10-12 6:32 ` Damien Le Moal
2021-10-12 6:33 ` Damien Le Moal
2021-08-15 16:34 ` [PATCH] libata: add kernel parameter to force ATA_HORKAGE_NO_DMA_LOG Reimar Döffinger
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=20210819081340.4362-1-Reimar.Doeffinger@gmx.de \
--to=reimar.doeffinger@gmx.de \
--cc=Damien.LeMoal@wdc.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=linux-ide@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).