From patchwork Mon Jan 18 17:15:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43145 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 51D34B7C63 for ; Tue, 19 Jan 2010 04:31:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754444Ab0ARRQT (ORCPT ); Mon, 18 Jan 2010 12:16:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754368Ab0ARRQQ (ORCPT ); Mon, 18 Jan 2010 12:16:16 -0500 Received: from fg-out-1718.google.com ([72.14.220.159]:54649 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754340Ab0ARRQO (ORCPT ); Mon, 18 Jan 2010 12:16:14 -0500 Received: by fg-out-1718.google.com with SMTP id 22so795957fge.1 for ; Mon, 18 Jan 2010 09:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=uK9AxCo1WxspFNPJV8mvig/y54eL6CQsypGh9F35RJ4=; b=bCrxoL3/w+8BFqJL/q5nmOb5DdYUsh0yPrcVxY6onWy1d50f6NB1sp4KLrEjpWLr8S 4ZCSXB0yuBumwIL5l7rk2q5oe8mKxC2bFWVDZtM5J2OKSkot7bAJKIHsjLi7f0y4U0E9 CmKkDjFQiflXh6yqshQAdzAR5JTw8bnH8aNEM= 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=qrZg3iuFbBkemedln5Qd93+WK6cLnYMbbVEWtiwfZzupPXXTxYq9MNPn1E+1SxowBu AAHVuRRjk82OgXCPzKoTrNSsM7HOwE3ZJcw+GWSS/u1BPZN0I/AzCUgjDJdNo9CVHW3T CUpWocI4lsguzIZ/Y6uuS0FgUdzYnJy9p0YWw= Received: by 10.216.88.1 with SMTP id z1mr521216wee.49.1263834972782; Mon, 18 Jan 2010 09:16:12 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id u14sm7552948gvf.4.2010.01.18.09.16.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:16:12 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 18 Jan 2010 18:15:04 +0100 Message-Id: <20100118171504.14623.11688.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 09/64] pata_cmd64x: fix handling of address setup timings Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] pata_cmd64x: fix handling of address setup timings Account for the requirements of the DMA mode currently used by the pair device. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_cmd64x.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 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_cmd64x.c =================================================================== --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c @@ -165,8 +165,14 @@ static void cmd64x_set_timing(struct ata if (pair) { struct ata_timing tp; + ata_timing_compute(pair, pair->pio_mode, &tp, T, 0); ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP); + if (pair->dma_mode) { + ata_timing_compute(pair, pair->dma_mode, + &tp, T, 0); + ata_timing_merge(&tp, &t, &t, ATA_TIMING_SETUP); + } } }