From patchwork Wed Jan 5 18:59:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 77624 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 1684CB6EE8 for ; Thu, 6 Jan 2011 06:01:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452Ab1AETBO (ORCPT ); Wed, 5 Jan 2011 14:01:14 -0500 Received: from mail.dev.rtsoft.ru ([213.79.90.226]:58458 "HELO mail.dev.rtsoft.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750854Ab1AETBO (ORCPT ); Wed, 5 Jan 2011 14:01:14 -0500 Received: (qmail 13883 invoked from network); 5 Jan 2011 19:01:10 -0000 Received: from unknown (HELO wasted.dev.rtsoft.ru) (192.168.1.70) by 0 with SMTP; 5 Jan 2011 19:01:10 -0000 To: jgarzik@pobox.com, linux-ide@vger.kernel.org Subject: [PATCH] pata_hpt37x: actually limit HPT370 to UltraDMA/66 Cc: alan@lxorguk.ukuu.org.uk Content-Disposition: inline From: Sergei Shtylyov Organization: MontaVista Software Inc. Date: Wed, 5 Jan 2011 21:59:49 +0300 MIME-Version: 1.0 Message-Id: <201101052159.49796.sshtylyov@ru.mvista.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock is less than 50 MHz but due to cut&paste type mistake this code has no effect... Signed-off-by: Sergei Shtylyov --- The patch is against the recent Linus' tree plus 2 patches that I posted before: http://marc.info/?l=linux-ide&m=129330632207779 http://marc.info/?l=linux-ide&m=129356704826019 drivers/ata/pata_hpt37x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 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: linux-2.6/drivers/ata/pata_hpt37x.c =================================================================== --- linux-2.6.orig/drivers/ata/pata_hpt37x.c +++ linux-2.6/drivers/ata/pata_hpt37x.c @@ -24,7 +24,7 @@ #include #define DRV_NAME "pata_hpt37x" -#define DRV_VERSION "0.6.17" +#define DRV_VERSION "0.6.18" struct hpt_clock { u8 xfer_speed; @@ -771,20 +771,20 @@ static int hpt37x_init_one(struct pci_de .udma_mask = ATA_UDMA5, .port_ops = &hpt370a_port_ops }; - /* HPT370 - UDMA100 */ + /* HPT370 - UDMA66 */ static const struct ata_port_info info_hpt370_33 = { .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = ATA_PIO4, .mwdma_mask = ATA_MWDMA2, - .udma_mask = ATA_UDMA5, + .udma_mask = ATA_UDMA4, .port_ops = &hpt370_port_ops }; - /* HPT370A - UDMA100 */ + /* HPT370A - UDMA66 */ static const struct ata_port_info info_hpt370a_33 = { .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = ATA_PIO4, .mwdma_mask = ATA_MWDMA2, - .udma_mask = ATA_UDMA5, + .udma_mask = ATA_UDMA4, .port_ops = &hpt370a_port_ops }; /* HPT372 - UDMA133 */