All of lore.kernel.org
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Olaf Hering <olh@suse.de>
Cc: Robert Hancock <hancockr@shaw.ca>,
	linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
	Stefan Richter <stefanr@s5r6.in-berlin.de>,
	Paul Mackerras <paulus@samba.org>,
	stable@kernel.org
Subject: [PATCH] powerpc: Fix initialization and usage of dma_mask
Date: Tue, 07 Aug 2007 08:05:10 +1000	[thread overview]
Message-ID: <1186437910.938.79.camel@localhost.localdomain> (raw)
In-Reply-To: <1186436597.938.71.camel@localhost.localdomain>

powerpc has a couple of bugs in the usage of dma_masks that tend to
break when drivers explicitely try to set a 32 bits mask for example.

First the code that generates the pci devices from the OF device-tree
doesn't initialize the mask properly, then our implementation of
set_dma_mask() was trying to validate the -previous- mask value, not the
one passed in as an argument.

This patch should fix these.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Does this fix the problem you've noticed ?

(I do still think that sbp2 isn't the right place for that call btw :-)

Index: linux-work/include/asm-powerpc/dma-mapping.h
===================================================================
--- linux-work.orig/include/asm-powerpc/dma-mapping.h	2007-08-07 07:59:05.000000000 +1000
+++ linux-work/include/asm-powerpc/dma-mapping.h	2007-08-07 07:59:09.000000000 +1000
@@ -96,7 +96,7 @@
 		return -EIO;
 	if (dma_ops->set_dma_mask != NULL)
 		return dma_ops->set_dma_mask(dev, dma_mask);
-	if (!dev->dma_mask || !dma_supported(dev, *dev->dma_mask))
+	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
 		return -EIO;
 	*dev->dma_mask = dma_mask;
 	return 0;
Index: linux-work/arch/powerpc/kernel/pci_64.c
===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci_64.c	2007-08-07 08:00:20.000000000 +1000
+++ linux-work/arch/powerpc/kernel/pci_64.c	2007-08-07 08:00:47.000000000 +1000
@@ -372,6 +372,7 @@
 
 	dev->current_state = 4;		/* unknown power state */
 	dev->error_state = pci_channel_io_normal;
+	dev->dma_mask = 0xffffffff;
 
 	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
 		/* a PCI-PCI bridge */

WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Olaf Hering <olh@suse.de>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>,
	Robert Hancock <hancockr@shaw.ca>,
	linuxppc-dev@ozlabs.org, stable@kernel.org,
	linux-kernel@vger.kernel.org, Paul Mackerras <paulus@samba.org>
Subject: [PATCH] powerpc: Fix initialization and usage of dma_mask
Date: Tue, 07 Aug 2007 08:05:10 +1000	[thread overview]
Message-ID: <1186437910.938.79.camel@localhost.localdomain> (raw)
In-Reply-To: <1186436597.938.71.camel@localhost.localdomain>

powerpc has a couple of bugs in the usage of dma_masks that tend to
break when drivers explicitely try to set a 32 bits mask for example.

First the code that generates the pci devices from the OF device-tree
doesn't initialize the mask properly, then our implementation of
set_dma_mask() was trying to validate the -previous- mask value, not the
one passed in as an argument.

This patch should fix these.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

Does this fix the problem you've noticed ?

(I do still think that sbp2 isn't the right place for that call btw :-)

Index: linux-work/include/asm-powerpc/dma-mapping.h
===================================================================
--- linux-work.orig/include/asm-powerpc/dma-mapping.h	2007-08-07 07:59:05.000000000 +1000
+++ linux-work/include/asm-powerpc/dma-mapping.h	2007-08-07 07:59:09.000000000 +1000
@@ -96,7 +96,7 @@
 		return -EIO;
 	if (dma_ops->set_dma_mask != NULL)
 		return dma_ops->set_dma_mask(dev, dma_mask);
-	if (!dev->dma_mask || !dma_supported(dev, *dev->dma_mask))
+	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
 		return -EIO;
 	*dev->dma_mask = dma_mask;
 	return 0;
Index: linux-work/arch/powerpc/kernel/pci_64.c
===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci_64.c	2007-08-07 08:00:20.000000000 +1000
+++ linux-work/arch/powerpc/kernel/pci_64.c	2007-08-07 08:00:47.000000000 +1000
@@ -372,6 +372,7 @@
 
 	dev->current_state = 4;		/* unknown power state */
 	dev->error_state = pci_channel_io_normal;
+	dev->dma_mask = 0xffffffff;
 
 	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
 		/* a PCI-PCI bridge */



  reply	other threads:[~2007-08-06 22:05 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <fa.Qn3Snqoik3hhnxcA6HqjGV0Yzck@ifi.uio.no>
2007-08-04 17:14 ` [PATCH 2.6.22.y] ieee1394: revert "sbp2: enforce 32bit DMA mapping" Robert Hancock
2007-08-04 17:30   ` Stefan Richter
2007-08-04 17:30     ` Stefan Richter
2007-08-05  0:15     ` Benjamin Herrenschmidt
2007-08-05  0:15       ` Benjamin Herrenschmidt
2007-08-05  7:54       ` Stefan Richter
2007-08-05  7:54         ` Stefan Richter
2007-08-05 22:04         ` Benjamin Herrenschmidt
2007-08-05 22:04           ` Benjamin Herrenschmidt
2007-08-06 13:51           ` Olaf Hering
2007-08-06 13:51             ` Olaf Hering
2007-08-06 21:47             ` Benjamin Herrenschmidt
2007-08-06 21:47               ` Benjamin Herrenschmidt
2007-08-06 22:22               ` Stefan Richter
2007-08-06 22:22                 ` Stefan Richter
2007-08-06 22:25                 ` Robert Hancock
2007-08-06 22:25                   ` Robert Hancock
2007-08-06 22:32                   ` Benjamin Herrenschmidt
2007-08-06 22:32                     ` Benjamin Herrenschmidt
2007-08-06 22:35                     ` Robert Hancock
2007-08-06 22:35                       ` Robert Hancock
2007-08-06 22:59                       ` Stefan Richter
2007-08-06 22:59                         ` Stefan Richter
2007-08-06 22:48                   ` Stefan Richter
2007-08-06 22:48                     ` Stefan Richter
2007-08-07  2:18                     ` Andi Kleen
2007-08-07  2:18                       ` Andi Kleen
2007-08-06 22:29                 ` Benjamin Herrenschmidt
2007-08-06 22:29                   ` Benjamin Herrenschmidt
2007-08-06 11:58         ` Olaf Hering
2007-08-06 11:58           ` Olaf Hering
2007-08-06 21:43           ` Benjamin Herrenschmidt
2007-08-06 21:43             ` Benjamin Herrenschmidt
2007-08-06 22:05             ` Benjamin Herrenschmidt [this message]
2007-08-06 22:05               ` [PATCH] powerpc: Fix initialization and usage of dma_mask Benjamin Herrenschmidt
2007-08-06 22:30               ` Olaf Hering
2007-08-06 22:30                 ` Olaf Hering

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1186437910.938.79.camel@localhost.localdomain \
    --to=benh@kernel.crashing.org \
    --cc=hancockr@shaw.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=olh@suse.de \
    --cc=paulus@samba.org \
    --cc=stable@kernel.org \
    --cc=stefanr@s5r6.in-berlin.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.