From patchwork Tue Feb 8 12:24:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 82320 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 93E2DB6F07 for ; Tue, 8 Feb 2011 23:27:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753855Ab1BHMYU (ORCPT ); Tue, 8 Feb 2011 07:24:20 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:48060 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752600Ab1BHMYT (ORCPT ); Tue, 8 Feb 2011 07:24:19 -0500 Received: by mail-ey0-f174.google.com with SMTP id 27so2880337eye.19 for ; Tue, 08 Feb 2011 04:24:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:date:message-id:in-reply-to :references:subject; bh=whIyPH2r/H+jNvBibvq1B3+7UqYEW+3/mHdr7dbzuHI=; b=xOcFOpjYHm3bEfr3Wl368YUxRt1TxNP7dvGU10nrv5+Z1+9AmKFRv7NB3FapjxfNwi H60u3vvj7RT2AiYHdd4A5ICZ4LVJjHn9ZEJtNHjpLJifUWUEXxL0bmhBzobT7X3YP4zn PCvUf8FMV7W565iuSk1gdlzSn4Kf9jEfkN1CA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=pDE8rmResJ/uh2/vzqByjm3HjyTHnDP0efORQvK1zNUJ5rvgRcn5JMovYnsjCfUV00 grv9aFpenY9eoT/vHoaNOpJmJtxfAquNl7Xna1doSSojLaZwSdtj+hdAjf3bwltS8MSa mevE/QYb1FcrlcdEawLJXXgYe60SVopW8JWKY= Received: by 10.213.11.9 with SMTP id r9mr1297670ebr.71.1297167858454; Tue, 08 Feb 2011 04:24:18 -0800 (PST) Received: from linux-mhg7.site (89-74-121-163.dynamic.chello.pl [89.74.121.163]) by mx.google.com with ESMTPS id q52sm3962282eei.9.2011.02.08.04.24.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 08 Feb 2011 04:24:17 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Tue, 08 Feb 2011 13:24:09 +0100 Message-Id: <20110208122409.19110.4233.sendpatchset@linux-mhg7.site> In-Reply-To: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> References: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> Subject: [PATCH 05/20] pata_efar: always program master_data before slave_data Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From 8acc9371550ce5f98da56f6888ae4b898096ed2c Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 8 Feb 2011 12:39:25 +0100 Subject: [PATCH 05/20] 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's slc90e66 host driver and also of libata's ata_piix one. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_efar.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) 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); 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) { 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); @@ -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);