Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libata: make gtf_filter per-dev

Browse Source 
Add ->gtf_filter to ata_device and set it to ata_acpi_gtf_filter when
initializing ata_link.  This is to allow quirks which apply different
gtf filters.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Tejun Heo 2009-09-16 04:17:28 +09:00 committed by Jeff Garzik
parent fa5b561c4e
commit 110f66d25c
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ata/libata-acpi.c
View File

@ -20,7 +20,7 @@
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; 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, 0x8=FPDMA non-zero offset, 0x10=FPDMA DMA Setup FIS auto-activate)"); 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)");
@ -603,10 +603,11 @@ static void ata_acpi_gtf_to_tf(struct ata_device *dev,
tf->command = gtf->tf[6]; /* 0x1f7 */ tf->command = gtf->tf[6]; /* 0x1f7 */
} }
static int ata_acpi_filter_tf(const struct ata_taskfile *tf, static int ata_acpi_filter_tf(struct ata_device *dev,
const struct ata_taskfile *tf,
const struct ata_taskfile *ptf) const struct ata_taskfile *ptf)
{ {
if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_SETXFER) { if (dev->gtf_filter & ATA_ACPI_FILTER_SETXFER) {
/* libata doesn't use ACPI to configure transfer mode. /* libata doesn't use ACPI to configure transfer mode.
* It will only confuse device configuration. Skip. * It will only confuse device configuration. Skip.
*/ */
@ -615,7 +616,7 @@ static int ata_acpi_filter_tf(const struct ata_taskfile *tf,
return 1; return 1;
} }
if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_LOCK) { if (dev->gtf_filter & ATA_ACPI_FILTER_LOCK) {
/* BIOS writers, sorry but we don't wanna lock /* BIOS writers, sorry but we don't wanna lock
* features unless the user explicitly said so. * features unless the user explicitly said so.
*/ */
@ -640,18 +641,18 @@ static int ata_acpi_filter_tf(const struct ata_taskfile *tf,
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 */ /* inhibit enabling DIPM */
if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_DIPM && if (dev->gtf_filter & ATA_ACPI_FILTER_DIPM &&
tf->nsect == SATA_DIPM) tf->nsect == SATA_DIPM)
return 1; return 1;
/* inhibit FPDMA non-zero offset */ /* inhibit FPDMA non-zero offset */
if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_FPDMA_OFFSET && if (dev->gtf_filter & ATA_ACPI_FILTER_FPDMA_OFFSET &&
(tf->nsect == SATA_FPDMA_OFFSET || (tf->nsect == SATA_FPDMA_OFFSET ||
tf->nsect == SATA_FPDMA_IN_ORDER)) tf->nsect == SATA_FPDMA_IN_ORDER))
return 1; return 1;
/* inhibit FPDMA auto activation */ /* inhibit FPDMA auto activation */
if (ata_acpi_gtf_filter & ATA_ACPI_FILTER_FPDMA_AA && if (dev->gtf_filter & ATA_ACPI_FILTER_FPDMA_AA &&
tf->nsect == SATA_FPDMA_AA) tf->nsect == SATA_FPDMA_AA)
return 1; return 1;
} }
@ -705,7 +706,7 @@ static int ata_acpi_run_tf(struct ata_device *dev,
pptf = &ptf; pptf = &ptf;
} }
if (!ata_acpi_filter_tf(&tf, pptf)) { if (!ata_acpi_filter_tf(dev, &tf, pptf)) {
rtf = tf; rtf = tf;
err_mask = ata_exec_internal(dev, &rtf, NULL, err_mask = ata_exec_internal(dev, &rtf, NULL,
DMA_NONE, NULL, 0, 0); DMA_NONE, NULL, 0, 0);

3
drivers/ata/libata-core.c
View File

@ -5591,6 +5591,9 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)
dev->link = link; dev->link = link;
dev->devno = dev - link->device; dev->devno = dev - link->device;
#ifdef CONFIG_ATA_ACPI
dev->gtf_filter = ata_acpi_gtf_filter;
#endif
ata_dev_init(dev); ata_dev_init(dev);
} }
} }

2
drivers/ata/libata.h
View File

@ -118,6 +118,8 @@ extern void ata_lpm_schedule(struct ata_port *ap, enum link_pm);
/* libata-acpi.c */ /* libata-acpi.c */
#ifdef CONFIG_ATA_ACPI #ifdef CONFIG_ATA_ACPI
extern unsigned int ata_acpi_gtf_filter;
extern void ata_acpi_associate_sata_port(struct ata_port *ap); extern void ata_acpi_associate_sata_port(struct ata_port *ap);
extern void ata_acpi_associate(struct ata_host *host); extern void ata_acpi_associate(struct ata_host *host);
extern void ata_acpi_dissociate(struct ata_host *host); extern void ata_acpi_dissociate(struct ata_host *host);

1
include/linux/libata.h
View File

@ -598,6 +598,7 @@ struct ata_device {
#ifdef CONFIG_ATA_ACPI #ifdef CONFIG_ATA_ACPI
acpi_handle acpi_handle; acpi_handle acpi_handle;
union acpi_object *gtf_cache; union acpi_object *gtf_cache;
unsigned int gtf_filter;
#endif #endif
/* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */ /* n_sector is CLEAR_BEGIN, read comment above CLEAR_BEGIN */
u64 n_sectors; /* size of device, if ATA */ u64 n_sectors; /* size of device, if ATA */