From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760482AbYFLMxG (ORCPT ); Thu, 12 Jun 2008 08:53:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758051AbYFLMwt (ORCPT ); Thu, 12 Jun 2008 08:52:49 -0400 Received: from vs166246.vserver.de ([62.75.166.246]:37674 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755731AbYFLMws (ORCPT ); Thu, 12 Jun 2008 08:52:48 -0400 From: Michael Buesch To: "Kirill A. Shutemov" Subject: Re: [PATCH] ssb: Partial revert of 4ac5846 to fix coherent DMA mask setting Date: Thu, 12 Jun 2008 14:52:24 +0200 User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405) Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Glauber Costa References: <1213274522-7059-1-git-send-email-kirill@shutemov.name> In-Reply-To: <1213274522-7059-1-git-send-email-kirill@shutemov.name> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200806121452.24592.mb@bu3sch.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 12 June 2008 14:42:02 Kirill A. Shutemov wrote: > dma_set_mask() doesn't set coherent_dma_mask, this can cause > strange error like "powering down PHY" in b44(bz #10473). > > At x86_64 this error had been hidden until aa99b16. This patch is wrong. I will send the right patch soon. > Signed-off-by: Kirill A. Shutemov > --- > drivers/ssb/main.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c > index 7cf8851..b7fbbc4 100644 > --- a/drivers/ssb/main.c > +++ b/drivers/ssb/main.c > @@ -1170,8 +1170,9 @@ int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask) > struct device *dma_dev = ssb_dev->dma_dev; > > #ifdef CONFIG_SSB_PCIHOST > - if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI) > - return dma_set_mask(dma_dev, mask); > + if (ssb_dev->bus->bustype == SSB_BUSTYPE_PCI && > + !dma_supported(dma_dev, mask)) > + return -EIO; > #endif > dma_dev->coherent_dma_mask = mask; > dma_dev->dma_mask = &dma_dev->coherent_dma_mask; -- Greetings Michael.