From patchwork Mon Jan 18 17:17:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43096 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 95F37B7CCD for ; Tue, 19 Jan 2010 04:20:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754975Ab0ARRSu (ORCPT ); Mon, 18 Jan 2010 12:18:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754957Ab0ARRSs (ORCPT ); Mon, 18 Jan 2010 12:18:48 -0500 Received: from mail-ew0-f214.google.com ([209.85.219.214]:52797 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754939Ab0ARRSp (ORCPT ); Mon, 18 Jan 2010 12:18:45 -0500 Received: by mail-ew0-f214.google.com with SMTP id 6so3708367ewy.29 for ; Mon, 18 Jan 2010 09:18:44 -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=KLob6EmtWksVxf0/Rw3j7U19E5aHP2vKCuSrWovhti4=; b=fJHoPkOHGpjNmdLsJFvRkl4SLV+mEWztxcZGsrrvgKiwoKKdi7ERoNLjgTa0fzKnKg h/WIFA2U1WusU4Fj7qd4/2tLMIgv6SxGYyzLiYnaqjzq6wAzSWLz0m90rbtHNFDsWlUB jmrjv7S+u0XpZWK/cws3EHRNC/vLU7iSCAZGA= 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=wzg+fB3QrjvMdwl/Jl+LC588K9GJXkMZfqFJeAxezIUa2DCC9Wpbkmt4Fe6a80s4wz bP3b7+3MaTCFICc2z06SSfScnUwungyZCsqm5JM2bsxTHgbaJBPRePjD+1jNqwSBpde2 2cM86+Rt9FhudFDBVqb5j4EcI6+DIJfXfgOGA= Received: by 10.216.90.135 with SMTP id e7mr2395799wef.34.1263835118831; Mon, 18 Jan 2010 09:18:38 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id m5sm5202997gve.27.2010.01.18.09.18.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:18:38 -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:17:29 +0100 Message-Id: <20100118171729.14623.46024.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 25/64] ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute() Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute() Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-timings.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 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/ide/ide-timings.c =================================================================== --- a/drivers/ide/ide-timings.c +++ b/drivers/ide/ide-timings.c @@ -166,12 +166,13 @@ int ide_timing_compute(ide_drive_t *driv if (id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); - if (speed <= XFER_PIO_2) - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO]; - else if ((speed <= XFER_PIO_4) || - (speed == XFER_PIO_5 && !ata_id_is_cfa(id))) - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY]; - else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) + if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) { + if (speed <= XFER_PIO_2) + p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO]; + else if ((speed <= XFER_PIO_4) || + (speed == XFER_PIO_5 && !ata_id_is_cfa(id))) + p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY]; + } else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) p.cycle = id[ATA_ID_EIDE_DMA_MIN]; ide_timing_merge(&p, t, t, IDE_TIMING_CYCLE | IDE_TIMING_CYC8B);