lkml.org 
[lkml]   [2021]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 10/17] scsi: ide: Mark power management requests with RQF_PM instead of RQF_PREEMPT
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit 5ae65383fc7633e0247c31b0c8bf0e6ea63b95a3 ]

    This is another step that prepares for the removal of RQF_PREEMPT.

    Link: https://lore.kernel.org/r/20201209052951.16136-5-bvanassche@acm.org
    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>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Hannes Reinecke <hare@suse.de>
    Reviewed-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.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 c210ea3bd02fa..4867b67b60d69 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 192e6c65d34e7..82ab308f1aafe 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;
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-01-05 02:07    [W:2.586 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site