From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762691AbYENSk3 (ORCPT ); Wed, 14 May 2008 14:40:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758647AbYENSkS (ORCPT ); Wed, 14 May 2008 14:40:18 -0400 Received: from smtpq2.groni1.gr.home.nl ([213.51.130.201]:58233 "EHLO smtpq2.groni1.gr.home.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758454AbYENSkQ (ORCPT ); Wed, 14 May 2008 14:40:16 -0400 Message-ID: <482B3274.2060006@keyaccess.nl> Date: Wed, 14 May 2008 20:41:56 +0200 From: Rene Herman User-Agent: Thunderbird 2.0.0.14 (X11/20080421) MIME-Version: 1.0 To: Bjorn Helgaas CC: Takashi Iwai , Alan Cox , Linux Kernel , ALSA devel Subject: Re: 2.6.26-rc1 regression: ISA DMA broken (bisected) References: <4823AAF2.7070102@keyaccess.nl> <20080513180107.1a3893f1@core> <4829D0E5.8050905@keyaccess.nl> <200805131718.40138.bjorn.helgaas@hp.com> <482ADF34.2010004@keyaccess.nl> <482B0807.9050404@keyaccess.nl> In-Reply-To: <482B0807.9050404@keyaccess.nl> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.0 (-) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14-05-08 17:40, Rene Herman wrote: CC list trimmed as now PNP and ALSA specific. > Like this? With this (on top of the previous patch setting the > dma_mask ofcourse) legacy ISA actually appears to be fine but it's > then ISAPnP which goes bonkers again. Sigh. Getting an allocation > failure. Don't understand why yet since pnp_alloc_dev() definitely > sets the mask already. Will stare... You're in a maze of struct device *s, all alike... I was passing the pnp_card->dev instead of the initialized pnp_dev->dev. And, not doing so brings out a difference between ISAPnP and legacy ISA again insofar that legacy ISA does not consist of cards with multiple devices. We just have the single struct device * for the ISA device. This therefore would be the easiest solution (and works fine) but seems a bit of a hack. Bjorn, do you have an opinion? If I abstract things out a bit more I might be able to do this nicer. One might on the other hand argue that the dma_mask is going to be constant for all card devices so might as well just use the card dev. sound/{isa,oss} together with drivers/isdn/hisax/ are the only pnp_card users. diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index a762a41..a2842a7 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "base.h" @@ -167,6 +168,9 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number, card->number); + card->dev.coherent_dma_mask = DMA_24BIT_MASK; + card->dev.dma_mask = &card->dev.coherent_dma_mask; + dev_id = pnp_add_card_id(card, pnpid); if (!dev_id) { kfree(card);