| Message ID | 20100118171555.14623.3131.sendpatchset@localhost |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 18 Jan 2010 18:15:55 +0100 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote: > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> > Subject: [PATCH] pata_efar: always program master_data before slave_data > > We may need to set SITRE before programming slave_data. You don't - but making them all the same is worth doing anyway for readability and future possibly merging into helpers -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/18/2010 12:15 PM, Bartlomiej Zolnierkiewicz wrote: > From: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > Subject: [PATCH] pata_efar: always program master_data before slave_data > > We may need to set SITRE before programming slave_data. > > This makes pata_efar match the behavior of IDE slc90e66 host driver > and also libata ata_piix one. > > Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@gmail.com> > --- > drivers/ata/pata_efar.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) OK but did not apply to libata-dev.git -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: b/drivers/ata/pata_efar.c =================================================================== --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c @@ -72,8 +72,10 @@ static void efar_set_timings(struct ata_ u8 pio, bool use_mwdma) { struct pci_dev *dev = to_pci_dev(ap->host->dev); + unsigned int is_slave = (adev->devno != 0); u8 master_port = ap->port_no ? 0x42 : 0x40; u16 master_data; + u8 slave_data; int control = 0; /* @@ -104,14 +106,13 @@ static void efar_set_timings(struct ata_ pci_read_config_word(dev, master_port, &master_data); /* Set PPE, IE, and TIME as appropriate */ - if (adev->devno == 0) { + if (is_slave == 0) { master_data &= 0xCCF0; master_data |= control; master_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); } else { int shift = 4 * ap->port_no; - u8 slave_data; master_data &= 0xFF0F; master_data |= (control << 4); @@ -120,11 +121,12 @@ static void efar_set_timings(struct ata_ pci_read_config_byte(dev, 0x44, &slave_data); slave_data &= ap->port_no ? 0x0F : 0xF0; slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << shift; - pci_write_config_byte(dev, 0x44, slave_data); } master_data |= 0x4000; /* Ensure SITRE is set */ pci_write_config_word(dev, master_port, master_data); + if (is_slave) + pci_write_config_byte(dev, 0x44, slave_data); } /**