From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Ming Lei <ming.lei@redhat.com>,
linux-scsi@vger.kernel.org, linux-block@vger.kernel.org,
Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.de>,
"David S . Miller" <davem@davemloft.net>,
Alan Stern <stern@rowland.harvard.edu>,
Can Guo <cang@codeaurora.org>,
Stanley Chu <stanley.chu@mediatek.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Subject: [PATCH v4 4/9] ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT
Date: Sun, 29 Nov 2020 18:46:10 -0800 [thread overview]
Message-ID: <20201130024615.29171-5-bvanassche@acm.org> (raw)
In-Reply-To: <20201130024615.29171-1-bvanassche@acm.org>
This is another step that prepares for the removal of RQF_PREEMPT.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Can Guo <cang@codeaurora.org>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/ide/ide-io.c | 2 +-
drivers/ide/ide-pm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c210ea3bd02f..4867b67b60d6 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -518,7 +518,7 @@ blk_status_t ide_issue_rq(ide_drive_t *drive, struct request *rq,
*/
if ((drive->dev_flags & IDE_DFLAG_BLOCKED) &&
ata_pm_request(rq) == 0 &&
- (rq->rq_flags & RQF_PREEMPT) == 0) {
+ (rq->rq_flags & RQF_PM) == 0) {
/* there should be no pending command at this point */
ide_unlock_port(hwif);
goto plug_device;
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index 192e6c65d34e..82ab308f1aaf 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -77,7 +77,7 @@ int generic_ide_resume(struct device *dev)
}
memset(&rqpm, 0, sizeof(rqpm));
- rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_PREEMPT);
+ rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_PM);
ide_req(rq)->type = ATA_PRIV_PM_RESUME;
ide_req(rq)->special = &rqpm;
rqpm.pm_step = IDE_PM_START_RESUME;
next prev parent reply other threads:[~2020-11-30 2:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 2:46 [PATCH v4 0/9] Rework runtime suspend and SPI domain validation Bart Van Assche
2020-11-30 2:46 ` [PATCH v4 1/9] block: Fix a race in the runtime power management code Bart Van Assche
2020-11-30 2:46 ` [PATCH v4 2/9] block: Introduce BLK_MQ_REQ_PM Bart Van Assche
2020-12-01 11:31 ` Christoph Hellwig
2020-12-02 6:50 ` Hannes Reinecke
2020-11-30 2:46 ` [PATCH v4 3/9] ide: Do not set the RQF_PREEMPT flag for sense requests Bart Van Assche
2020-12-01 11:29 ` Christoph Hellwig
2020-12-02 6:52 ` Hannes Reinecke
2020-11-30 2:46 ` Bart Van Assche [this message]
2020-12-01 11:31 ` [PATCH v4 4/9] ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT Christoph Hellwig
2020-12-02 6:53 ` Hannes Reinecke
2020-11-30 2:46 ` [PATCH v4 5/9] scsi: Do not wait for a request in scsi_eh_lock_door() Bart Van Assche
2020-12-02 7:06 ` Hannes Reinecke
2020-12-03 5:10 ` Bart Van Assche
2020-12-03 7:18 ` Hannes Reinecke
2020-12-03 7:27 ` Ming Lei
2020-12-04 16:50 ` Bart Van Assche
2020-11-30 2:46 ` [PATCH v4 6/9] scsi_transport_spi: Set RQF_PM for domain validation commands Bart Van Assche
2020-12-01 11:31 ` Christoph Hellwig
2020-11-30 2:46 ` [PATCH v4 7/9] scsi: Only process PM requests if rpm_status != RPM_ACTIVE Bart Van Assche
2020-12-01 11:32 ` Christoph Hellwig
2020-12-02 7:14 ` Hannes Reinecke
2020-11-30 2:46 ` [PATCH v4 8/9] block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT Bart Van Assche
2020-12-01 11:33 ` Christoph Hellwig
2020-12-02 7:15 ` Hannes Reinecke
2020-11-30 2:46 ` [PATCH v4 9/9] block: Do not accept any requests while suspended Bart Van Assche
2020-12-02 7:16 ` Hannes Reinecke
2020-12-02 1:51 ` [PATCH v4 0/9] Rework runtime suspend and SPI domain validation Martin K. Petersen
2020-12-06 0:01 ` Jens Axboe
2020-12-08 1:56 ` Martin K. Petersen
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=20201130024615.29171-5-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=axboe@kernel.dk \
--cc=cang@codeaurora.org \
--cc=davem@davemloft.net \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=rafael.j.wysocki@intel.com \
--cc=stanley.chu@mediatek.com \
--cc=stern@rowland.harvard.edu \
/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).