Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
Hi Ben, On 29.11.2010 [12:02:57 +1100], Benjamin Herrenschmidt wrote: On Wed, 2010-09-15 at 11:05 -0700, Nishanth Aravamudan wrote: Without this change drivers, such as ibmvscsi, fail to load with the previous change. --- So you broke bisection... fold the patch instead or invert them Thanks for the review. I resent this series on 10/18 and it had the patches folded together. Thanks, Nish -- Nishanth Aravamudan n...@us.ibm.com IBM Linux Technology Center ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
On Mon, 2010-11-29 at 11:46 -0800, Nishanth Aravamudan wrote: So you broke bisection... fold the patch instead or invert them Thanks for the review. I resent this series on 10/18 and it had the patches folded together. Right, I know :-) I just mistakenly had that old one still tagged in patchwork, my bad. I've merged some of the new ones already. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
On Wed, 2010-09-15 at 11:05 -0700, Nishanth Aravamudan wrote:
Without this change drivers, such as ibmvscsi, fail to load with the
previous change.
---
So you broke bisection... fold the patch instead or invert them
Cheers,
Ben.
arch/powerpc/kernel/vio.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 3c3083f..e8d73de 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1259,6 +1259,9 @@ struct vio_dev *vio_register_device_node(struct
device_node *of_node)
viodev-dev.parent = vio_bus_device.dev;
viodev-dev.bus = vio_bus_type;
viodev-dev.release = vio_dev_release;
+/* needed to ensure proper operation of coherent allocations
+ * later, in case driver doesn't set it explicitly */
+dma_set_coherent_mask(viodev-dev, DMA_BIT_MASK(64));
/* register with generic device framework */
if (device_register(viodev-dev)) {
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
On Wed, Sep 15, 2010 at 12:05 PM, Nishanth Aravamudan n...@us.ibm.com wrote:
Without this change drivers, such as ibmvscsi, fail to load with the
previous change.
Shouldn't this patch be ordered before the previous change then to
preserve bisectability?
Also, patch descriptions should be explicit about what the previous
change refers to. Once this is committed, git log may very well
insert other changes from other branches between this commit and
whatever previous change refers to.
g.
---
arch/powerpc/kernel/vio.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 3c3083f..e8d73de 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1259,6 +1259,9 @@ struct vio_dev *vio_register_device_node(struct
device_node *of_node)
viodev-dev.parent = vio_bus_device.dev;
viodev-dev.bus = vio_bus_type;
viodev-dev.release = vio_dev_release;
+ /* needed to ensure proper operation of coherent allocations
+ * later, in case driver doesn't set it explicitly */
+ dma_set_coherent_mask(viodev-dev, DMA_BIT_MASK(64));
/* register with generic device framework */
if (device_register(viodev-dev)) {
--
1.7.0.4
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
On 15.09.2010 [12:37:58 -0600], Grant Likely wrote: On Wed, Sep 15, 2010 at 12:05 PM, Nishanth Aravamudan n...@us.ibm.com wrote: Without this change drivers, such as ibmvscsi, fail to load with the previous change. Shouldn't this patch be ordered before the previous change then to preserve bisectability? You are probably right. I wasn't sure if I should fold it in or keep it separate. I should have changed the order, though. Sorry about that! Also, patch descriptions should be explicit about what the previous change refers to. Once this is committed, git log may very well insert other changes from other branches between this commit and whatever previous change refers to. Yep -- what's the best way to make the reference? By subject from the patch? Obviously I don't have the SHA1 with which the commit will go upstream. Thanks, Nish -- Nishanth Aravamudan n...@us.ibm.com IBM Linux Technology Center ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set
On Wed, Sep 15, 2010 at 11:44:56AM -0700, Nishanth Aravamudan wrote: On 15.09.2010 [12:37:58 -0600], Grant Likely wrote: On Wed, Sep 15, 2010 at 12:05 PM, Nishanth Aravamudan n...@us.ibm.com wrote: Without this change drivers, such as ibmvscsi, fail to load with the previous change. Shouldn't this patch be ordered before the previous change then to preserve bisectability? You are probably right. I wasn't sure if I should fold it in or keep it separate. I should have changed the order, though. Sorry about that! It's such a small patch I would just fold it in. Also, patch descriptions should be explicit about what the previous change refers to. Once this is committed, git log may very well insert other changes from other branches between this commit and whatever previous change refers to. Yep -- what's the best way to make the reference? By subject from the patch? Obviously I don't have the SHA1 with which the commit will go upstream. By name should be good. As long as a reader doesn't need background information from your head to figure out why the change was made then it should be okay. g. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
