Re: [PATCH 05/20] pata_efar: always program master_data before slave_data

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello.

On 08-02-2011 15:24, Bartlomiej Zolnierkiewicz wrote:
[...]

We may need to set SITRE before programming slave_data.

This makes pata_efar match the behavior of IDE's slc90e66 host driver
and also of libata's ata_piix one.

Signed-off-by: Bartlomiej Zolnierkiewicz<bzolnier@xxxxxxxxx>
[...]

diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index 1e2ff7d..7f564d7 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -74,10 +74,12 @@ static void efar_set_timings(struct ata_port *ap, struct ata_device *adev,
  			     u8 pio, bool use_mwdma)
  {
  	struct pci_dev *dev	= to_pci_dev(ap->host->dev);
+	unsigned int is_slave	= (adev->devno != 0);

   What's the point of this variable? To save one pointer dereference? :-)

  	unsigned long flags;
  	u8 master_port		= ap->port_no ? 0x42 : 0x40;
  	u16 master_data;
  	u8 udma_enable;
+	u8 slave_data;
  	int control = 0;

  	/*
@@ -110,14 +112,13 @@ static void efar_set_timings(struct ata_port *ap, struct ata_device *adev,
  	pci_read_config_word(dev, master_port,&master_data);

  	/* Set PPE, IE, and TIME as appropriate */
-	if (adev->devno == 0) {
+	if (is_slave == 0) {

   !is_slave appeals more to me. :-)

@@ -126,12 +127,14 @@ static void efar_set_timings(struct ata_port *ap, struct ata_device *adev,
  		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);
+
  	pci_read_config_byte(dev, 0x48,&udma_enable);
  	udma_enable&= ~(1<<  (2 * ap->port_no + adev->devno));
  	pci_write_config_byte(dev, 0x48, udma_enable);

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Filesystems]     [Linux SCSI]     [Linux RAID]     [Git]     [Kernel Newbies]     [Linux Newbie]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Samba]     [Device Mapper]

  Powered by Linux