Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libata: reimplement ata_acpi_cbl_80wire() using ata_acpi_gtm_xfermask()

Browse source 
Reimplement ata_acpi_cbl_80wire() using ata_acpi_gtm_xfermask() and
while at it relocate the function below ata_acpi_gtm_xfermask().

New ata_acpi_cbl_80wire() implementation takes @gtm, in both pata_via
and pata_amd, use the initial GTM value.  Both are trying to peek
initial BIOS configuration, so using initial caching value makes
sense.  This fixes ACPI part of cable detection in pata_amd which
previously always returned 0 because configuring PIO0 during reset
clears DMA configuration.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2007-12-18 16:33:06 +09:00 • committed by Jeff Garzik
parent a0f79b929a
commit 021ee9a6da
4 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/ata/libata-acpi.c
View file

@ -490,38 +490,29 @@ EXPORT_SYMBOL_GPL(ata_acpi_gtm_xfermask);
/** /**
* ata_acpi_cbl_80wire - Check for 80 wire cable * ata_acpi_cbl_80wire - Check for 80 wire cable
* @ap: Port to check * @ap: Port to check
* @gtm: GTM data to use
* *
* Return 1 if the ACPI mode data for this port indicates the BIOS selected * Return 1 if the @gtm indicates the BIOS selected an 80wire mode.
* an 80wire mode.
*/ */
int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm)
int ata_acpi_cbl_80wire(struct ata_port *ap)
{ {
const struct ata_acpi_gtm *gtm = ata_acpi_init_gtm(ap); struct ata_device *dev;
int valid = 0;
if (!gtm) ata_link_for_each_dev(dev, &ap->link) {
return 0; unsigned long xfer_mask, udma_mask;
/* Split timing, DMA enabled */ if (!ata_dev_enabled(dev))
if ((gtm->flags & 0x11) == 0x11 && gtm->drive[0].dma < 55) continue;
valid |= 1;
if ((gtm->flags & 0x14) == 0x14 && gtm->drive[1].dma < 55) xfer_mask = ata_acpi_gtm_xfermask(dev, gtm);
valid |= 2; ata_unpack_xfermask(xfer_mask, NULL, NULL, &udma_mask);
/* Shared timing, DMA enabled */
if ((gtm->flags & 0x11) == 0x01 && gtm->drive[0].dma < 55) if (udma_mask & ~ATA_UDMA_MASK_40C)
valid |= 1; return 1;
if ((gtm->flags & 0x14) == 0x04 && gtm->drive[0].dma < 55) }
valid |= 2;
/* Drive check */
if ((valid & 1) && ata_dev_enabled(&ap->link.device[0]))
return 1;
if ((valid & 2) && ata_dev_enabled(&ap->link.device[1]))
return 1;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ata_acpi_cbl_80wire); EXPORT_SYMBOL_GPL(ata_acpi_cbl_80wire);
static void ata_acpi_gtf_to_tf(struct ata_device *dev, static void ata_acpi_gtf_to_tf(struct ata_device *dev,

3
drivers/ata/pata_amd.c
View file

@ -272,7 +272,8 @@ static int nv_cable_detect(struct ata_port *ap)
if ((udma & 0xC4) == 0xC4 || (udma & 0xC400) == 0xC400) if ((udma & 0xC4) == 0xC4 || (udma & 0xC400) == 0xC400)
cbl = ATA_CBL_PATA80; cbl = ATA_CBL_PATA80;
/* And a triple check across suspend/resume with ACPI around */ /* And a triple check across suspend/resume with ACPI around */
if (ata_acpi_cbl_80wire(ap)) if (ata_acpi_init_gtm(ap) &&
ata_acpi_cbl_80wire(ap, ata_acpi_init_gtm(ap)))
cbl = ATA_CBL_PATA80; cbl = ATA_CBL_PATA80;
return cbl; return cbl;
} }

3
drivers/ata/pata_via.c
View file

@ -185,7 +185,8 @@ static int via_cable_detect(struct ata_port *ap) {
if (ata66 & (0x10100000 >> (16 * ap->port_no))) if (ata66 & (0x10100000 >> (16 * ap->port_no)))
return ATA_CBL_PATA80; return ATA_CBL_PATA80;
/* Check with ACPI so we can spot BIOS reported SATA bridges */ /* Check with ACPI so we can spot BIOS reported SATA bridges */
if (ata_acpi_cbl_80wire(ap)) if (ata_acpi_init_gtm(ap) &&
ata_acpi_cbl_80wire(ap, ata_acpi_init_gtm(ap)))
return ATA_CBL_PATA80; return ATA_CBL_PATA80;
return ATA_CBL_PATA40; return ATA_CBL_PATA40;
} }

10
include/linux/libata.h
View file

@ -968,18 +968,16 @@ static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
return &ap->__acpi_init_gtm; return &ap->__acpi_init_gtm;
return NULL; return NULL;
} }
extern int ata_acpi_cbl_80wire(struct ata_port *ap);
int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm); int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm);
int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm); int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm);
unsigned long ata_acpi_gtm_xfermask(struct ata_device *dev, unsigned long ata_acpi_gtm_xfermask(struct ata_device *dev,
const struct ata_acpi_gtm *gtm); const struct ata_acpi_gtm *gtm);
int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm);
#else #else
static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap) static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
{ {
return NULL; return NULL;
} }
static inline int ata_acpi_cbl_80wire(struct ata_port *ap) { return 0; }
static inline int ata_acpi_stm(const struct ata_port *ap, static inline int ata_acpi_stm(const struct ata_port *ap,
struct ata_acpi_gtm *stm) struct ata_acpi_gtm *stm)
@ -998,6 +996,12 @@ static inline unsigned int ata_acpi_gtm_xfermask(struct ata_device *dev,
{ {
return 0; return 0;
} }
static inline int ata_acpi_cbl_80wire(struct ata_port *ap,
const struct ata_acpi_gtm *gtm)
{
return 0;
}
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI