From patchwork Mon Jan 18 17:14:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 43147 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 E9467B7C63 for ; Tue, 19 Jan 2010 04:33:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754473Ab0ARRcK (ORCPT ); Mon, 18 Jan 2010 12:32:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754151Ab0ARRQH (ORCPT ); Mon, 18 Jan 2010 12:16:07 -0500 Received: from mail-ew0-f214.google.com ([209.85.219.214]:53275 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754239Ab0ARRQD (ORCPT ); Mon, 18 Jan 2010 12:16:03 -0500 Received: by mail-ew0-f214.google.com with SMTP id 6so3704487ewy.29 for ; Mon, 18 Jan 2010 09:16:00 -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=iMBBZUH2E1vePqVrDO6fefnOLeKxAtfNZYVDvefreHA=; b=X15504MhppEJKcJJOhrzbeYNRpzAJNUuAb7cyiJ0CgSWwmno/RhFU62IZyktUdPSRE Y9eS5uiRAblierQ7m4GM0NmCVp3jqZ/FrfVDY7aW2f/Svb6SXtrWKlnyCLX6WLBz9ESR hn4Kh9IS2g7BMGljIJyAIGGAc9BZ6qyjWO4Fk= 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=gmF6kC/ZjamXzTvV40NaN5YEbNdxe6IB+62pD4ZLbyCNv5MpUH+zl/x2OkgdigHSXa rZF9Ktms83oQp2oYB6csrK7AnfqQSJsfnvVtLomhAKVO5PV+tiMbYIl+qklv8bcT6hyX DpFX0oPqv89n1QQFR9LJrRdhnNC7Jtc5fFJ9A= Received: by 10.216.90.139 with SMTP id e11mr2215076wef.111.1263834948847; Mon, 18 Jan 2010 09:15:48 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id p10sm9376469gvf.13.2010.01.18.09.15.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 18 Jan 2010 09:15:47 -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:14:37 +0100 Message-Id: <20100118171437.14623.12197.sendpatchset@localhost> In-Reply-To: <20100118171349.14623.90030.sendpatchset@localhost> References: <20100118171349.14623.90030.sendpatchset@localhost> Subject: [PATCH 06/64] pata_atiixp: add locking for parallel scanning 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_atiixp: add locking for parallel scanning This is similar change as commit 60c3be3 for ata_piix host driver and while pata_atiixp doesn't enable parallel scan yet the race could probably also be triggered by requesting re-scanning of both ports at the same time using SCSI sysfs interface. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_atiixp.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- 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_atiixp.c =================================================================== --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -1,7 +1,7 @@ /* * pata_atiixp.c - ATI PATA for new ATA layer * (C) 2005 Red Hat Inc - * (C) 2009 Bartlomiej Zolnierkiewicz + * (C) 2009-2010 Bartlomiej Zolnierkiewicz * * Based on * @@ -71,6 +71,8 @@ static int atiixp_prereset(struct ata_li return ata_sff_prereset(link, deadline); } +static DEFINE_SPINLOCK(atiixp_lock); + /** * atiixp_set_piomode - set PIO mode data * @ap: ATA interface @@ -85,12 +87,15 @@ static void atiixp_set_piomode(struct at static u8 pio_timings[5] = { 0x5D, 0x47, 0x34, 0x22, 0x20 }; struct pci_dev *pdev = to_pci_dev(ap->host->dev); + unsigned long flags; int dn = 2 * ap->port_no + adev->devno; int timing_shift = (16 * ap->port_no) + 8 * (adev->devno ^ 1); int pio = adev->pio_mode - XFER_PIO_0; u32 pio_timing_data; u16 pio_mode_data; + spin_lock_irqsave(&atiixp_lock, flags); + pci_read_config_word(pdev, ATIIXP_IDE_PIO_MODE, &pio_mode_data); pio_mode_data &= ~(0x7 << (4 * dn)); pio_mode_data |= pio << (4 * dn); @@ -100,6 +105,8 @@ static void atiixp_set_piomode(struct at pio_timing_data &= ~(0xFF << timing_shift); pio_timing_data |= (pio_timings[pio] << timing_shift); pci_write_config_dword(pdev, ATIIXP_IDE_PIO_TIMING, pio_timing_data); + + spin_unlock_irqrestore(&atiixp_lock, flags); } /** @@ -115,10 +122,13 @@ static void atiixp_set_dmamode(struct at static u8 mwdma_timings[5] = { 0x77, 0x21, 0x20 }; struct pci_dev *pdev = to_pci_dev(ap->host->dev); + unsigned long flags; int dma = adev->dma_mode; int dn = 2 * ap->port_no + adev->devno; u16 tmp16; + spin_lock_irqsave(&atiixp_lock, flags); + pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); if (adev->dma_mode >= XFER_UDMA_0) { @@ -149,6 +159,8 @@ static void atiixp_set_dmamode(struct at } pci_write_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, tmp16); + + spin_unlock_irqrestore(&atiixp_lock, flags); } static struct scsi_host_template atiixp_sht = {