Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 900e599e authored by shaohua.li@intel.com's avatar shaohua.li@intel.com Committed by Jens Axboe
Browse files

SATA: enable non-queueable flush flag 



Enable non-queueable flush flag for SATA.

Stable: 2.6.39 only

Cc: stable@kernel.org
Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 3ac0cc45

drivers/ata/libata-scsi.c

+7 −6
Original line number Diff line number Diff line
@@ -1089,21 +1089,21 @@ static int atapi_drain_needed(struct request *rq) 
static int ata_scsi_dev_config(struct scsi_device *sdev,

			       struct ata_device *dev)

{

	struct request_queue *q = sdev->request_queue;



	if (!ata_id_has_unload(dev->id))

		dev->flags |= ATA_DFLAG_NO_UNLOAD;



	/* configure max sectors */

	blk_queue_max_hw_sectors(sdev->request_queue, dev->max_sectors);

	blk_queue_max_hw_sectors(q, dev->max_sectors);



	if (dev->class == ATA_DEV_ATAPI) {

		struct request_queue *q = sdev->request_queue;

		void *buf;



		sdev->sector_size = ATA_SECT_SIZE;



		/* set DMA padding */

		blk_queue_update_dma_pad(sdev->request_queue,

					 ATA_DMA_PAD_SZ - 1);

		blk_queue_update_dma_pad(q, ATA_DMA_PAD_SZ - 1);



		/* configure draining */

		buf = kmalloc(ATAPI_MAX_DRAIN, q->bounce_gfp | GFP_KERNEL);
@@ -1131,8 +1131,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev, 
			"sector_size=%u > PAGE_SIZE, PIO may malfunction\n",

			sdev->sector_size);



	blk_queue_update_dma_alignment(sdev->request_queue,

				       sdev->sector_size - 1);

	blk_queue_update_dma_alignment(q, sdev->sector_size - 1);



	if (dev->flags & ATA_DFLAG_AN)

		set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
@@ -1145,6 +1144,8 @@ static int ata_scsi_dev_config(struct scsi_device *sdev, 
		scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, depth);

	}



	blk_queue_flush_queueable(q, false);



	dev->sdev = sdev;

	return 0;

}