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

Commit f79d409f authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

[PATCH] libata - fix bracketing and DMA oops 



The upstream tree has the ATA_DFLAG_PIO bug fixed but does not have the
pass throuugh bug fix

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b6079ca4

drivers/scsi/libata-scsi.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -1921,7 +1921,7 @@ unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf, 
		return 0;

		return 0;





	dpofua = 0;

	dpofua = 0;

	if (ata_dev_supports_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 &&

	if (ata_dev_supports_fua(args->id) && (dev->flags & ATA_DFLAG_LBA48) &&

	    (!(dev->flags & ATA_DFLAG_PIO) || dev->multi_count))

	    (!(dev->flags & ATA_DFLAG_PIO) || dev->multi_count))

		dpofua = 1 << 4;

		dpofua = 1 << 4;
@@ -2408,10 +2408,15 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) 
{

{

	struct ata_taskfile *tf = &(qc->tf);

	struct ata_taskfile *tf = &(qc->tf);

	struct scsi_cmnd *cmd = qc->scsicmd;

	struct scsi_cmnd *cmd = qc->scsicmd;

	struct ata_device *dev = qc->dev;





	if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)

	if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)

		goto invalid_fld;

		goto invalid_fld;

		

		

	/* We may not issue DMA commands if no DMA mode is set */

	if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0)

		goto invalid_fld;



	if (scsicmd[1] & 0xe0)

	if (scsicmd[1] & 0xe0)

		/* PIO multi not supported yet */

		/* PIO multi not supported yet */

		goto invalid_fld;

		goto invalid_fld;