From patchwork Mon Mar 28 12:56:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Plyatov X-Patchwork-Id: 88599 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 0BF39B6FC1 for ; Mon, 28 Mar 2011 23:56:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753995Ab1C1M4f (ORCPT ); Mon, 28 Mar 2011 08:56:35 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:34356 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753612Ab1C1M4d (ORCPT ); Mon, 28 Mar 2011 08:56:33 -0400 Received: by mail-fx0-f46.google.com with SMTP id 17so2610219fxm.19 for ; Mon, 28 Mar 2011 05:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=VD1V6duhatguCn36OPospl+zQAZ0qMaB0kZIdvmty8Q=; b=rgTES1sIu4+S9SM76pwpfCIWBSFmFP+mYBPui8fl1zaRV1ThN1w0V7/CIFiLuqDGbW +dLP8Tr1P3D+OYscd5lPOuRK3aHgntrZMD+pJvex9tlC1IJRPOcyCSMpEx9wwiJGVB5F DgVD3sdwN3ynNnGJba++66TGnDygeDaZ88ICc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=JietAoBC1Swc4PksgKgCAJlwl05rLZdRGC5rIQFLk6f7gaWak0UzXv9FfuXwt/yglh O3WPVWOE3EasgcLVjyanVC+9cLCyp2U+efUHsBsYvd9rzCr34lispCE75FgZgUD6uAXY od1M4KXKw4e0Rv5JV+V9KsvakO1FV1+l+Btps= Received: by 10.223.93.200 with SMTP id w8mr4388571fam.81.1301316992478; Mon, 28 Mar 2011 05:56:32 -0700 (PDT) Received: from localhost.localdomain ([109.165.12.222]) by mx.google.com with ESMTPS id o12sm1473376fav.30.2011.03.28.05.56.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Mar 2011 05:56:30 -0700 (PDT) From: Igor Plyatov To: Jeff Garzik , linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Igor Plyatov Subject: [PATCH v4 2/2] ata: pata_at91.c bugfix for high master clock Date: Mon, 28 Mar 2011 16:56:15 +0400 Message-Id: <1301316975-27761-2-git-send-email-plyatov@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1301316975-27761-1-git-send-email-plyatov@gmail.com> References: <1301316975-27761-1-git-send-email-plyatov@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The AT91SAM9 microcontrollers with master clock higher then 105 MHz and PIO0, have overflow of the NCS_RD_PULSE value in the MSB. This lead to "NCS_RD_PULSE" pulse longer then "NRD_CYCLE" pulse and driver does not detect ATA device. Signed-off-by: Igor Plyatov --- drivers/ata/pata_at91.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c index 0267d54..a5fdbdc 100644 --- a/drivers/ata/pata_at91.c +++ b/drivers/ata/pata_at91.c @@ -33,11 +33,12 @@ #define DRV_NAME "pata_at91" -#define DRV_VERSION "0.1" +#define DRV_VERSION "0.2" #define CF_IDE_OFFSET 0x00c00000 #define CF_ALT_IDE_OFFSET 0x00e00000 #define CF_IDE_RES_SIZE 0x08 +#define NCS_RD_PULSE_LIMIT 0x3f /* maximal value for pulse bitfields */ struct at91_ide_info { unsigned long mode; @@ -119,6 +120,11 @@ static void set_smc_timing(struct device *dev, /* (CS0, CS1, DIR, OE) <= (CFCE1, CFCE2, CFRNW, NCSX) timings */ ncs_read_setup = 1; ncs_read_pulse = read_cycle - 2; + if (ncs_read_pulse > NCS_RD_PULSE_LIMIT) { + ncs_read_pulse = NCS_RD_PULSE_LIMIT; + dev_warn(dev, "ncs_read_pulse limited to maximal value %lu\n", + ncs_read_pulse); + } /* Write timings same as read timings */ write_cycle = read_cycle;