From patchwork Wed Sep 7 16:23:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan McGee X-Patchwork-Id: 113789 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 D8591B6F83 for ; Thu, 8 Sep 2011 02:24:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756222Ab1IGQXg (ORCPT ); Wed, 7 Sep 2011 12:23:36 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:64704 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756163Ab1IGQXe (ORCPT ); Wed, 7 Sep 2011 12:23:34 -0400 Received: by yxj19 with SMTP id 19so4049381yxj.19 for ; Wed, 07 Sep 2011 09:23:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=yxKn8WV2r3QmnzI3HiJuuJ9EEa7fwQU9BoTLwYatMNw=; b=utynqhW8SHFtd18oZVZBBSnfg/3GAGZv4ze24wyezrXQfJMJp56HKKRfVCdnFMpk35 k/g8kzZ7stZAM1Hn+3WfC8EBpy0APXV0iMZs5H7qKhGz/ba18Cqlam0HgrNQUesMUUcA +Drv8J3WNSDVtsT51nacUzOSQQX6POlugVAOA= Received: by 10.236.161.33 with SMTP id v21mr33942422yhk.82.1315412613677; Wed, 07 Sep 2011 09:23:33 -0700 (PDT) Received: from localhost (c-71-239-242-45.hsd1.il.comcast.net [71.239.242.45]) by mx.google.com with ESMTPS id c62sm460977yhj.25.2011.09.07.09.23.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Sep 2011 09:23:29 -0700 (PDT) From: Dan McGee To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jeff Garzik , Bartlomiej Zolnierkiewicz Subject: [PATCH 2/5] pata_sis: add mode_filter method for certain sis5513 chipsets Date: Wed, 7 Sep 2011 11:23:19 -0500 Message-Id: <1315412602-6560-3-git-send-email-dpmcgee@gmail.com> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1315412602-6560-1-git-send-email-dpmcgee@gmail.com> References: <1315412602-6560-1-git-send-email-dpmcgee@gmail.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This mirrors a very old commit (3160d5416f39da9d9, "sis5513: add ->udma_filter method for chipset_family >= ATA_133") to the old sis5513 IDE driver that prevents certain setups from working. UDMA6 (ATA/133) is not supported on some chipsets and we need to ensure this mode is not chosen even if a connected drive supports it. Port this old patch forward to the new PATA driver to ensure UDMA5 is the highest mode used if that is what is supported. Kernel bugzilla #41582. Reviewed-by: Bartlomiej Zolnierkiewicz Signed-off-by: Dan McGee --- drivers/ata/pata_sis.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c index 10af293..fb4e90f 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -509,6 +509,27 @@ static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev) pci_write_config_dword(pdev, port, t1); } +/** + * sis_133_mode_filter - mode selection filter + * @adev: ATA device + * + * Block UDMA6 on devices that do not support it. + */ + +static unsigned long sis_133_mode_filter(struct ata_device *adev, unsigned long mask) +{ + struct ata_port *ap = adev->link->ap; + struct pci_dev *pdev = to_pci_dev(ap->host->dev); + int port = sis_port_base(adev); + u32 t1; + + pci_read_config_dword(pdev, port, &t1); + /* if ATA133 is disabled, mask it out */ + if (!(t1 & 0x08)) + mask &= ~(0xC0 << ATA_SHIFT_UDMA); + return mask; +} + static struct scsi_host_template sis_sht = { ATA_BMDMA_SHT(DRV_NAME), }; @@ -530,6 +551,7 @@ static struct ata_port_operations sis_133_ops = { .set_piomode = sis_133_set_piomode, .set_dmamode = sis_133_set_dmamode, .cable_detect = sis_133_cable_detect, + .mode_filter = sis_133_mode_filter, }; static struct ata_port_operations sis_133_early_ops = { @@ -779,10 +801,13 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) switch(trueid) { case 0x5518: /* SIS 962/963 */ + dev_info(&pdev->dev, + "SiS 962/963 MuTIOL IDE UDMA133 controller\n"); chipset = &sis133; if ((idemisc & 0x40000000) == 0) { pci_write_config_dword(pdev, 0x54, idemisc | 0x40000000); - printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n"); + dev_info(&pdev->dev, + "Switching to 5513 register mapping\n"); } break; case 0x0180: /* SIS 965/965L */