From patchwork Tue Mar 15 21:22:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Bizon X-Patchwork-Id: 87084 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 0BABBB7036 for ; Wed, 16 Mar 2011 08:22:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757353Ab1COVWs (ORCPT ); Tue, 15 Mar 2011 17:22:48 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:58231 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab1COVWs (ORCPT ); Tue, 15 Mar 2011 17:22:48 -0400 Received: from bobafett.staff.proxad.net (unknown [213.228.1.121]) by smtp4-g21.free.fr (Postfix) with ESMTP id 829744C821C; Tue, 15 Mar 2011 22:22:39 +0100 (CET) Received: from [172.18.3.156] (unknown [172.18.3.156]) by bobafett.staff.proxad.net (Postfix) with ESMTP id 792F4180205; Tue, 15 Mar 2011 22:22:38 +0100 (CET) Subject: [PATCH] ahci: don't enable port irq before handler is registered From: Maxime Bizon Reply-To: mbizon@freebox.fr To: Tejun Heo Cc: Robert Hancock , Jeff Garzik , linux-ide In-Reply-To: <20110315151931.GA17376@htj.dyndns.org> References: <1300129707.28545.34.camel@sakura.staff.proxad.net> <4D7EB9EB.8030807@gmail.com> <1300162840.2118.4.camel@kero> <20110315071937.GB8635@htj.dyndns.org> <1300200509.10827.27.camel@sakura.staff.proxad.net> <1300201422.10827.39.camel@sakura.staff.proxad.net> <20110315151931.GA17376@htj.dyndns.org> Organization: Freebox Date: Tue, 15 Mar 2011 22:22:38 +0100 Message-ID: <1300224158.10827.52.camel@sakura.staff.proxad.net> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Maxime Bizon The ahci_pmp_attach() & ahci_pmp_detach() unmask port irq, but they are also called during port initialization, before ahci host irq handler is registered. On ce4100 platform, this sometimes triggers "irq 4: nobody cared" message when loading driver. Fixed this by not touching the register if the port is in frozen state, and mark all uninitialized port as frozen. Signed-off-by: Maxime Bizon --- drivers/ata/libahci.c | 15 +++++++++++++-- drivers/ata/libata-core.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 26d4523..eb5afdd 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1897,7 +1897,15 @@ static void ahci_pmp_attach(struct ata_port *ap) ahci_enable_fbs(ap); pp->intr_mask |= PORT_IRQ_BAD_PMP; - writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK); + + /* + * This may be called while we are still initializing the ahci + * host, and interrupt handler is not yet registered at that + * time. So don't mess with irq mask register unless the port + * is actually enabled. + */ + if (!(ap->pflags & ATA_PFLAG_FROZEN)) + writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK); } static void ahci_pmp_detach(struct ata_port *ap) @@ -1913,7 +1921,10 @@ static void ahci_pmp_detach(struct ata_port *ap) writel(cmd, port_mmio + PORT_CMD); pp->intr_mask &= ~PORT_IRQ_BAD_PMP; - writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK); + + /* see comment above in ahci_pmp_attach() */ + if (!(ap->pflags & ATA_PFLAG_FROZEN)) + writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK); } int ahci_port_resume(struct ata_port *ap) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index d4e52e2..02d5703 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5480,7 +5480,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host) if (!ap) return NULL; - ap->pflags |= ATA_PFLAG_INITIALIZING; + ap->pflags |= ATA_PFLAG_INITIALIZING | ATA_PFLAG_FROZEN; ap->lock = &host->lock; ap->print_id = -1; ap->host = host;