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

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

libata: implement more acpi filtering options 



Currently libata-acpi can only filter DIPM among SATA feature enables
via _GTF.  This patch adds the capability to filter out FPDMA non-zero
offset, in-order guarantee and auto-activation.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f1bce7f8

drivers/ata/libata-acpi.c

+15 −4
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 




static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;

static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;

module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);

module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);

MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM)");

MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)");





#define NO_PORT_MULT		0xffff

#define NO_PORT_MULT		0xffff

#define SATA_ADR(root, pmp)	(((root) << 16) | (pmp))

#define SATA_ADR(root, pmp)	(((root) << 16) | (pmp))
@@ -637,12 +637,23 @@ static int ata_acpi_filter_tf(const struct ata_taskfile *tf, 
			return 1;

			return 1;

	}

	}





	if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_DIPM) {

		/* inhibit enabling DIPM */

	if (tf->command == ATA_CMD_SET_FEATURES &&

	if (tf->command == ATA_CMD_SET_FEATURES &&

		    tf->feature == SETFEATURES_SATA_ENABLE &&

	    tf->feature == SETFEATURES_SATA_ENABLE) {

		/* inhibit enabling DIPM */

		if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_DIPM &&

		    tf->nsect == SATA_DIPM)

		    tf->nsect == SATA_DIPM)

			return 1;

			return 1;



		/* inhibit FPDMA non-zero offset */

		if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_FPDMA_OFFSET &&

		    (tf->nsect == SATA_FPDMA_OFFSET ||

		     tf->nsect == SATA_FPDMA_IN_ORDER))

			return 1;



		/* inhibit FPDMA auto activation */

		if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_FPDMA_AA &&

		    tf->nsect == SATA_FPDMA_AA)

			return 1;

	}

	}





	return 0;

	return 0;

include/linux/ata.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -334,9 +334,12 @@ enum { 
	SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */

	SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */





	/* SETFEATURE Sector counts for SATA features */

	/* SETFEATURE Sector counts for SATA features */

	SATA_FPDMA_OFFSET	= 0x01,	/* FPDMA non-zero buffer offsets */

	SATA_FPDMA_AA		= 0x02, /* FPDMA Setup FIS Auto-Activate */

	SATA_FPDMA_AA		= 0x02, /* FPDMA Setup FIS Auto-Activate */

	SATA_DIPM		= 0x03,	/* Device Initiated Power Management */

	SATA_DIPM		= 0x03,	/* Device Initiated Power Management */

	SATA_FPDMA_IN_ORDER	= 0x04,	/* FPDMA in-order data delivery */

	SATA_AN			= 0x05,	/* Asynchronous Notification */

	SATA_AN			= 0x05,	/* Asynchronous Notification */

	SATA_SSP		= 0x06,	/* Software Settings Preservation */





	/* feature values for SET_MAX */

	/* feature values for SET_MAX */

	ATA_SET_MAX_ADDR	= 0x00,

	ATA_SET_MAX_ADDR	= 0x00,

include/linux/libata.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,8 @@ enum { 
	ATA_ACPI_FILTER_SETXFER	= 1 << 0,

	ATA_ACPI_FILTER_SETXFER	= 1 << 0,

	ATA_ACPI_FILTER_LOCK	= 1 << 1,

	ATA_ACPI_FILTER_LOCK	= 1 << 1,

	ATA_ACPI_FILTER_DIPM	= 1 << 2,

	ATA_ACPI_FILTER_DIPM	= 1 << 2,

	ATA_ACPI_FILTER_FPDMA_OFFSET = 1 << 3,	/* FPDMA non-zero offset */

	ATA_ACPI_FILTER_FPDMA_AA = 1 << 4,	/* FPDMA auto activate */





	ATA_ACPI_FILTER_DEFAULT	= ATA_ACPI_FILTER_SETXFER |

	ATA_ACPI_FILTER_DEFAULT	= ATA_ACPI_FILTER_SETXFER |

				  ATA_ACPI_FILTER_LOCK |

				  ATA_ACPI_FILTER_LOCK |