Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754367AbYFBWm4 (ORCPT ); Mon, 2 Jun 2008 18:42:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752576AbYFBWmq (ORCPT ); Mon, 2 Jun 2008 18:42:46 -0400 Received: from g5t0009.atlanta.hp.com ([15.192.0.46]:2610 "EHLO g5t0009.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbYFBWmq (ORCPT ); Mon, 2 Jun 2008 18:42:46 -0400 From: Bjorn Helgaas To: Andrew Morton , Linus Torvalds Subject: Re: 53052feb6 (PNP: remove pnp_mem_flags() as an lvalue) breaks my ALSA intel8x0 sound card regression Date: Mon, 2 Jun 2008 16:42:49 -0600 User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405) Cc: "Avuton Olrich" , "Rene Herman" , "Rene Herman" , "Len Brown" , "Linux Kernel Mailing List" , "Rafael J. Wysocki" References: <3aa654a40806010742r1d61caa2j681882145533b56a@mail.gmail.com> <200806021605.14519.bjorn.helgaas@hp.com> <3aa654a40806021523k5b89cd0cjbcddf5810d05072b@mail.gmail.com> In-Reply-To: <3aa654a40806021523k5b89cd0cjbcddf5810d05072b@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806021642.50491.bjorn.helgaas@hp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2567 Lines: 68 On Monday 02 June 2008 04:23:28 pm Avuton Olrich wrote: > On Mon, Jun 2, 2008 at 3:05 PM, Bjorn Helgaas wrote: > > On Monday 02 June 2008 01:06:12 pm Rene Herman wrote: > >> On 02-06-08 05:25, Avuton Olrich wrote: > >> > >> > On Sun, Jun 1, 2008 at 9:20 AM, Rene Herman wrote: > >> >> On 01-06-08 16:42, Avuton Olrich wrote: > >> >> > >> >>> My intel8x0 card stops working due to a regression; bisection and > >> >>> information below. > > > > Thank you very much for doing all the work to bisect this and write > > up such a complete report. > > > > Can you try the patch below, please? > > ... > > Sweet! That works, thanks for the quick fix. Feel free to add me as Tested-by:. The patch below fixes this regression from 2.6.25 and should go in 2.6.26. PNP: mark resources that conflict with PCI devices "disabled" Both the PNP/PCI conflict detection quirk and the PNP system driver must use the same mechanism to mark resources as disabled. I think it's best to keep the resource and to keep the type bit (IORESOURCE_MEM, etc), so that we match the list from firmware as closely as possible. Fixes this regression from 2.6.25: http://lkml.org/lkml/2008/6/1/82 Signed-off-by: Bjorn Helgaas Tested-by: Avuton Olrich Index: work11/drivers/pnp/quirks.c =================================================================== --- work11.orig/drivers/pnp/quirks.c 2008-06-02 14:59:03.000000000 -0600 +++ work11/drivers/pnp/quirks.c 2008-06-02 15:42:35.000000000 -0600 @@ -286,7 +286,7 @@ static void quirk_system_pci_resources(s pci_name(pdev), i, (unsigned long long) pci_start, (unsigned long long) pci_end); - res->flags = 0; + res->flags |= IORESOURCE_DISABLED; } } } Index: work11/drivers/pnp/system.c =================================================================== --- work11.orig/drivers/pnp/system.c 2008-06-02 14:58:56.000000000 -0600 +++ work11/drivers/pnp/system.c 2008-06-02 15:44:36.000000000 -0600 @@ -81,7 +81,7 @@ static void reserve_resources_of_dev(str } for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) { - if (res->flags & IORESOURCE_UNSET) + if (res->flags & IORESOURCE_DISABLED) continue; reserve_range(dev, res->start, res->end, 0); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/