mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
pata_it8213: Cable detect
Another not-quite PIIX, another cable type conversion Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
a0fcdc0259
commit
5816fbbf22
1 changed files with 23 additions and 13 deletions
|
@ -25,8 +25,8 @@
|
|||
* it8213_pre_reset - check for 40/80 pin
|
||||
* @ap: Port
|
||||
*
|
||||
* Perform cable detection for the 8213 ATA interface. This is
|
||||
* different to the PIIX arrangement
|
||||
* Filter out ports by the enable bits before doing the normal reset
|
||||
* and probe.
|
||||
*/
|
||||
|
||||
static int it8213_pre_reset(struct ata_port *ap)
|
||||
|
@ -34,23 +34,14 @@ static int it8213_pre_reset(struct ata_port *ap)
|
|||
static const struct pci_bits it8213_enable_bits[] = {
|
||||
{ 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */
|
||||
};
|
||||
|
||||
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
|
||||
u8 tmp;
|
||||
|
||||
if (!pci_test_config_bits(pdev, &it8213_enable_bits[ap->port_no]))
|
||||
return -ENOENT;
|
||||
|
||||
pci_read_config_byte(pdev, 0x42, &tmp);
|
||||
if (tmp & 2) /* The initial docs are incorrect */
|
||||
ap->cbl = ATA_CBL_PATA40;
|
||||
else
|
||||
ap->cbl = ATA_CBL_PATA80;
|
||||
return ata_std_prereset(ap);
|
||||
}
|
||||
|
||||
/**
|
||||
* it8213_probe_reset - Probe specified port on PATA host controller
|
||||
* it8213_error_handler - Probe specified port on PATA host controller
|
||||
* @ap: Port to probe
|
||||
*
|
||||
* LOCKING:
|
||||
|
@ -62,10 +53,28 @@ static void it8213_error_handler(struct ata_port *ap)
|
|||
ata_bmdma_drive_eh(ap, it8213_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
|
||||
}
|
||||
|
||||
/**
|
||||
* it8213_cable_detect - check for 40/80 pin
|
||||
* @ap: Port
|
||||
*
|
||||
* Perform cable detection for the 8213 ATA interface. This is
|
||||
* different to the PIIX arrangement
|
||||
*/
|
||||
|
||||
static int it8213_cable_detect(struct ata_port *ap)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
|
||||
u8 tmp;
|
||||
pci_read_config_byte(pdev, 0x42, &tmp);
|
||||
if (tmp & 2) /* The initial docs are incorrect */
|
||||
return ATA_CBL_PATA40;
|
||||
return ATA_CBL_PATA80;
|
||||
}
|
||||
|
||||
/**
|
||||
* it8213_set_piomode - Initialize host controller PATA PIO timings
|
||||
* @ap: Port whose timings we are configuring
|
||||
* @adev: um
|
||||
* @adev: Device whose timings we are configuring
|
||||
*
|
||||
* Set PIO mode for device, in host controller PCI config space.
|
||||
*
|
||||
|
@ -268,6 +277,7 @@ static const struct ata_port_operations it8213_ops = {
|
|||
.thaw = ata_bmdma_thaw,
|
||||
.error_handler = it8213_error_handler,
|
||||
.post_internal_cmd = ata_bmdma_post_internal_cmd,
|
||||
.cable_detect = it8213_cable_detect,
|
||||
|
||||
.bmdma_setup = ata_bmdma_setup,
|
||||
.bmdma_start = ata_bmdma_start,
|
||||
|
|
Loading…
Reference in a new issue