--- drivers/ata/libata-core.c

+++ drivers/ata/libata-core.c

@@ -159,6 +159,10 @@ int libata_allow_tpm = 0;

module_param_named(allow_tpm, libata_allow_tpm, int, 0444);

MODULE_PARM_DESC(allow_tpm, "Permit the use of TPM commands (0=off [default], 1=on)");

+static int atapi_an;

+module_param(atapi_an, int, 0444);

+MODULE_PARM_DESC(atapi_an, "Enable ATAPI AN media presence notification (0=0ff [default], 1=on)");

+

MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("Library module for ATA devices");

MODULE_LICENSE("GPL");

@@ -2570,7 +2574,8 @@ int ata_dev_configure(struct ata_device

* to enable ATAPI AN to discern between PHY status

* changed notifications and ATAPI ANs.

*/

- if ((ap->flags & ATA_FLAG_AN) && ata_id_has_atapi_AN(id) &&

+ if (atapi_an &&

+ (ap->flags & ATA_FLAG_AN) && ata_id_has_atapi_AN(id) &&

(!sata_pmp_attached(ap) ||

sata_scr_read(&ap->link, SCR_NOTIFICATION, &sntf) == 0)) {

unsigned int err_mask;

@@ -4348,6 +4353,9 @@ static const struct ata_blacklist_entry

{ "HTS541080G9SA00", "MB4OC60D", ATA_HORKAGE_NONCQ, },

{ "HTS541010G9SA00", "MBZOC60D", ATA_HORKAGE_NONCQ, },

+ /* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */

+ { "C300-CTFDDAC128MAG", "0001", ATA_HORKAGE_NONCQ, },

+

/* devices which puke on READ_NATIVE_MAX */

{ "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, },

{ "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA },