From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754071AbYEaIz7 (ORCPT ); Sat, 31 May 2008 04:55:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751290AbYEaIzt (ORCPT ); Sat, 31 May 2008 04:55:49 -0400 Received: from cantor.suse.de ([195.135.220.2]:49311 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750710AbYEaIzr (ORCPT ); Sat, 31 May 2008 04:55:47 -0400 Date: Sat, 31 May 2008 10:55:43 +0200 Message-ID: From: Takashi Iwai To: Rene Herman Cc: Andrew Morton , Bjorn Helgaas , Alan Cox , Linux Kernel , ALSA devel Subject: Re: [PATCH] PNP: set the pnp_card dma_mask for use by ISAPnP cards In-Reply-To: <484093A2.8060304@keyaccess.nl> References: <4823AAF2.7070102@keyaccess.nl> <482B38D6.5030804@keyaccess.nl> <48406E8D.8050408@keyaccess.nl> <200805301543.42208.bjorn.helgaas@hp.com> <48407B99.4080209@keyaccess.nl> <484093A2.8060304@keyaccess.nl> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta28) (fuki) (x86_64-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Sat, 31 May 2008 01:54:10 +0200, Rene Herman wrote: > > >From 801c13fb3e8564221a1fb21892dbe13add3d7cea Mon Sep 17 00:00:00 2001 > From: Rene Herman > Date: Fri, 30 May 2008 23:10:23 +0200 > Subject: [PATCH] PNP: set the pnp_card dma_mask for use by ISAPnP cards. > > dma_alloc_coherent() on x86 currently takes a passed in NULL device > pointer to mean that it should allocate an ISA compatible (24-bit) > buffer which is a bit of a hack. > > The ALSA ISA drivers are the main consumers of this but have a struct > device in fact readily available. > > For the PnP drivers, the specific pnp_dev->dev device pointer is not > always available at the right time so for now we want to pass the > pnp_card->dev instead which is always available. Set its dma_mask in > preparation for doing so. > > This does not fix a current bug -- 2.6.26-rc1 stumbled over the NULL > hack in dma_alloc_coherent() but this has already been fixed in commit > 4a367f3a9dbf2e7ffcee4702203479809236ee6e by Takashi Iwai. > > Signed-off-by: Rene Herman > Acked-by: Bjorn Helgaas > Cc: Takashi Iwai Acked-by: Takashi Iwai thanks, Takashi > Cc: Alan Cox > --- > drivers/pnp/card.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c > index a762a41..b00ef10 100644 > --- a/drivers/pnp/card.c > +++ b/drivers/pnp/card.c > @@ -8,6 +8,7 @@ > #include > #include > #include > +#include > #include "base.h" > > LIST_HEAD(pnp_cards); > @@ -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); > -- > 1.5.2.2 >