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

Commit 50af2fa1 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: ignore SIMG4726 config pseudo device 



I was hoping ATA_HORKAGE_NODMA | ATA_HORKAGE_SKIP_PM could keep it
happy but no even this doesn't work under certain configurations and
it's not like we can do anything useful with the cofig device anyway.
Replace ATA_HORKAGE_SKIP_PM with ATA_HORKAGE_DISABLE and use it for
the config device.  This makes the device completely ignored by
libata.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 906c1ff4

drivers/ata/libata-core.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -2126,6 +2126,13 @@ int ata_dev_configure(struct ata_device *dev) 
	dev->horkage |= ata_dev_blacklisted(dev);

	dev->horkage |= ata_dev_blacklisted(dev);

	ata_force_horkage(dev);

	ata_force_horkage(dev);





	if (dev->horkage & ATA_HORKAGE_DISABLE) {

		ata_dev_printk(dev, KERN_INFO,

			       "unsupported device, disabling\n");

		ata_dev_disable(dev);

		return 0;

	}



	/* let ACPI work its magic */

	/* let ACPI work its magic */

	rc = ata_acpi_on_devcfg(dev);

	rc = ata_acpi_on_devcfg(dev);

	if (rc)

	if (rc)
@@ -3893,8 +3900,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "SAMSUNG CD-ROM SN-124", "N001",	ATA_HORKAGE_NODMA },

	{ "SAMSUNG CD-ROM SN-124", "N001",	ATA_HORKAGE_NODMA },

	{ "Seagate STT20000A", NULL,		ATA_HORKAGE_NODMA },

	{ "Seagate STT20000A", NULL,		ATA_HORKAGE_NODMA },

	/* Odd clown on sil3726/4726 PMPs */

	/* Odd clown on sil3726/4726 PMPs */

	{ "Config  Disk",	NULL,		ATA_HORKAGE_NODMA |

	{ "Config  Disk",	NULL,		ATA_HORKAGE_DISABLE },

						ATA_HORKAGE_SKIP_PM },





	/* Weird ATAPI devices */

	/* Weird ATAPI devices */

	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },

	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 },

drivers/ata/libata-scsi.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1082,12 +1082,6 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc) 
	if (((cdb[4] >> 4) & 0xf) != 0)

	if (((cdb[4] >> 4) & 0xf) != 0)

		goto invalid_fld;       /* power conditions not supported */

		goto invalid_fld;       /* power conditions not supported */





	if (qc->dev->horkage & ATA_HORKAGE_SKIP_PM) {

		/* the device lacks PM support, finish without doing anything */

		scmd->result = SAM_STAT_GOOD;

		return 1;

	}



	if (cdb[4] & 0x1) {

	if (cdb[4] & 0x1) {

		tf->nsect = 1;	/* 1 sector, lba=0 */

		tf->nsect = 1;	/* 1 sector, lba=0 */

include/linux/libata.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -351,7 +351,7 @@ enum { 
	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */

	ATA_HORKAGE_NONCQ	= (1 << 2),	/* Don't use NCQ */

	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */

	ATA_HORKAGE_MAX_SEC_128	= (1 << 3),	/* Limit max sects to 128 */

	ATA_HORKAGE_BROKEN_HPA	= (1 << 4),	/* Broken HPA */

	ATA_HORKAGE_BROKEN_HPA	= (1 << 4),	/* Broken HPA */

	ATA_HORKAGE_SKIP_PM	= (1 << 5),	/* Skip PM operations */

	ATA_HORKAGE_DISABLE	= (1 << 5),	/* Disable it */

	ATA_HORKAGE_HPA_SIZE	= (1 << 6),	/* native size off by one */

	ATA_HORKAGE_HPA_SIZE	= (1 << 6),	/* native size off by one */

	ATA_HORKAGE_IPM		= (1 << 7),	/* Link PM problems */

	ATA_HORKAGE_IPM		= (1 << 7),	/* Link PM problems */

	ATA_HORKAGE_IVB		= (1 << 8),	/* cbl det validity bit bugs */

	ATA_HORKAGE_IVB		= (1 << 8),	/* cbl det validity bit bugs */