* [git pull] Please pull powerpc.git merge branch
From: Benjamin Herrenschmidt @ 2012-11-25 22:07 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linuxppc-dev list, Linux Kernel list
Hi Linus !
Here's a patch that would be good to still have in 3.7. It's a one liner fixing
a regression introduced by the new EEH code in .37 (potential oops on some
PCI setups when configuring MSIs).
Cheers,
Ben.
The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97:
Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f:
powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 13:26:05 +1100)
----------------------------------------------------------------
Alexey Kardashevskiy (1):
powerpc/pseries: Fix oops with MSIs when missing EEH PEs
arch/powerpc/platforms/pseries/msi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
^ permalink raw reply
* [git pull] Please pull powerpc.git next branch
From: Kumar Gala @ 2012-11-25 13:27 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
The following changes since commit cedddd812a79a4fda3885a15711aee3de78c4a24:
powerpc: Disable relocation on exceptions when kexecing (2012-11-15 15:08:08 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git next
for you to fetch changes up to 1723d90915d4689fa2e8cd4151d45ea38c96cb99:
powerpc/dma/raidengine: add raidengine device (2012-11-25 07:19:51 -0600)
----------------------------------------------------------------
Jia Hongtao (1):
powerpc/fsl-pci: Add PCI controller ATMU PM support
Timur Tabi (2):
drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS]
powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
Tushar Behera (1):
powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
Varun Sethi (1):
powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct
Xuelin Shi (1):
powerpc/dma/raidengine: add raidengine device
York Sun (1):
powerpc/mpc85xx: Change spin table to cached memory
.../devicetree/bindings/powerpc/fsl/raideng.txt | 81 +++++++++++++++++++
arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 1 +
arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 6 ++
arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 ++++++++++++++++++++
arch/powerpc/include/asm/fsl_guts.h | 4 +-
arch/powerpc/platforms/85xx/p1022_ds.c | 2 +-
arch/powerpc/platforms/85xx/smp.c | 49 ++++++++---
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +
arch/powerpc/sysdev/fsl_pci.c | 37 ++++++++-
drivers/virt/fsl_hypervisor.c | 3 -
10 files changed, 250 insertions(+), 20 deletions(-)
create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt
create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi
^ permalink raw reply
* Re: [PATCH] i2c-cpm: Fix to takeback i2c bus master-ship after a collision
From: Kumar Gala @ 2012-11-25 13:21 UTC (permalink / raw)
To: sachin surendran; +Cc: linuxppc-dev
In-Reply-To: <CABCb4NUJ0uJA5Z9vdgLndvpLrnK=m5xaeiHZxAwHKFU2DroaFw@mail.gmail.com>
On Oct 30, 2012, at 10:00 PM, sachin surendran wrote:
> In case of collision on i2c bus the controller which lost bus =
mastership stays as a slave
> for all subsequent transfers. This results in the i2c controller never =
writing to the bus=20
> for future transactions, resulting in i2c transfer timeouts.
> This fix checks for a collision on last I2C transaction and sets the =
I2COM_MASTER=20
> bit for the new transaction.
>=20
> Signed-off-by: Sachin Surendran <sachin.surendran@alliedtelesis.co.nz>
> ---
> drivers/i2c/busses/i2c-cpm.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
patch doesn't apply, please resend properly.
- k
>=20
> diff --git a/drivers/i2c/busses/i2c-cpm.c =
b/drivers/i2c/busses/i2c-cpm.c
> index c1e1096..bb94c6d 100644
> --- a/drivers/i2c/busses/i2c-cpm.c
> +++ b/drivers/i2c/busses/i2c-cpm.c
> @@ -338,6 +338,14 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, =
struct i2c_msg *msgs, int num)
> tptr =3D 0;
> rptr =3D 0;
> =20
> + /*
> + * If there was a collision in the last i2c transaction,
> + * Set I2COM_MASTER as it was cleared during collision.
> + */
> + if (in_be16(&tbdf->cbd_sc) & BD_SC_CL) {
> + out_8(&cpm->i2c_reg->i2com, I2COM_MASTER);
> + }
> +
> while (tptr < num) {
> pmsg =3D &msgs[tptr];
> dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
>=20
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply
* Re: [PATCH 1/2] powerpc/dma/raidengine: add raidengine device
From: Kumar Gala @ 2012-11-25 13:21 UTC (permalink / raw)
To: <b29237@freescale.com>
Cc: Harninder Rai, iws, vinod.koul, linux-kernel, Naveen Burmi,
dan.j.williams, linuxppc-dev
In-Reply-To: <1353488481-14371-1-git-send-email-b29237@freescale.com>
On Nov 21, 2012, at 3:01 AM, <b29237@freescale.com> =
<b29237@freescale.com> wrote:
> From: Xuelin Shi <b29237@freescale.com>
>=20
> The RaidEngine is a new Freescale hardware that used for parity
> computation offloading in RAID5/6.
>=20
> This patch adds the device node in device tree and related binding
> documentation.
>=20
> Signed-off-by: Harninder Rai <harninder.rai@freescale.com>
> Signed-off-by: Naveen Burmi <naveenburmi@freescale.com>
> Signed-off-by: Xuelin Shi <b29237@freescale.com>
> ---
> .../devicetree/bindings/powerpc/fsl/raideng.txt | 81 =
+++++++++++++++++++
> arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 1 +
> arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 6 ++
> arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 =
++++++++++++++++++++
> 4 files changed, 173 insertions(+)
> create mode 100644 =
Documentation/devicetree/bindings/powerpc/fsl/raideng.txt
> create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi
applied to next
- k=
^ permalink raw reply
* Re: [PATCH 2/4] iommu/fsl: Add PAMU bypass enable register to ccsr_guts structure.
From: Kumar Gala @ 2012-11-25 13:21 UTC (permalink / raw)
To: Varun Sethi
Cc: joerg.roedel, linux-kernel, iommu, scottwood, linuxppc-dev, timur
In-Reply-To: <1353419697-31269-3-git-send-email-Varun.Sethi@freescale.com>
On Nov 20, 2012, at 7:54 AM, Varun Sethi wrote:
> PAMU bypass enable register added to the ccsr_guts structure.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
> ---
> arch/powerpc/include/asm/fsl_guts.h | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
applied to next
- k
^ permalink raw reply
* Re: [PATCH][V3] powerpc/fsl-pci: Add PCI controller ATMU PM support
From: Kumar Gala @ 2012-11-25 13:07 UTC (permalink / raw)
To: Jia Hongtao; +Cc: B07421, linuxppc-dev, B04825
In-Reply-To: <1352340667-11184-1-git-send-email-B38951@freescale.com>
On Nov 7, 2012, at 8:11 PM, Jia Hongtao wrote:
> Power supply for PCI controller ATMU registers is off when system go to
> deep-sleep state. So ATMU registers should be re-setup during PCI
> controllers resume from sleep.
>
> Signed-off-by: Jia Hongtao <B38951@freescale.com>
> Signed-off-by: Li Yang <leoli@freescale.com>
> ---
> arch/powerpc/sysdev/fsl_pci.c | 37 +++++++++++++++++++++++++++++++++++--
> 1 files changed, 35 insertions(+), 2 deletions(-)
applied to next
- k
^ permalink raw reply
* Re: [PATCH 2/2] powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
From: Kumar Gala @ 2012-11-25 13:07 UTC (permalink / raw)
To: Timur Tabi; +Cc: paul.gortmaker, Anatolij Gustschin, linuxppc-dev
In-Reply-To: <1350330741-11390-2-git-send-email-timur@freescale.com>
On Oct 15, 2012, at 2:52 PM, Timur Tabi wrote:
> Function fsl_pcibios_fixup_bus() is available only if PCI is enabled. The
> MPC8610 HPCD platform file was not protecting the assigned with an #ifdef,
> which results in a link failure when PCI is disabled. Every other platform
> already has this #ifdef.
>
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
applied to next
- k
^ permalink raw reply
* Re: [PATCH 1/2] powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
From: Kumar Gala @ 2012-11-25 13:07 UTC (permalink / raw)
To: Tushar Behera; +Cc: devicetree-discuss, linuxppc-dev, patches
In-Reply-To: <1353385912-25882-1-git-send-email-tushar.behera@linaro.org>
On Nov 19, 2012, at 10:31 PM, Tushar Behera wrote:
> The third argument for of_get_property() is a pointer, hence pass
> NULL instead of 0.
>
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> ---
> arch/powerpc/platforms/85xx/p1022_ds.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
applied to next
- k
^ permalink raw reply
* Re: [PATCH] powerpc/mpc85xx: Change spin table to cached memory
From: Gala Kumar-B11780 @ 2012-11-25 13:01 UTC (permalink / raw)
To: sun york-R58495
Cc: Wood Scott-B07421, Tabi Timur-B04825,
<linuxppc-dev@lists.ozlabs.org>
In-Reply-To: <1348962275-24052-1-git-send-email-yorksun@freescale.com>
On Sep 29, 2012, at 6:44 PM, York Sun wrote:
> ePAPR v1.1 requires the spin table to be in cached memory. So we need
> to change the call argument of ioremap to enable cache and coherence.
> We also flush the cache after writing to spin table to keep it compatible
> with previous cache-inhibit spin table. Flushing before and after
> accessing spin table is recommended by ePAPR.
>=20
> Signed-off-by: York Sun <yorksun@freescale.com>
> Acked-by: Timur Tabi <timur@freescale.com>
> ---
> This patch applies to git://git.kernel.org/pub/scm/linux/kernel/git/galak=
/powerpc.git next branch.
>=20
> arch/powerpc/platforms/85xx/smp.c | 49 +++++++++++++++++++++++++++-----=
-----
> 1 file changed, 36 insertions(+), 13 deletions(-)
applied to next
- k=
^ permalink raw reply
* Re: [PATCH] powerpc/pci-hotplug: fix the rescanned pci device's dma_set_mask issue
From: Kumar Gala @ 2012-11-25 12:41 UTC (permalink / raw)
To: Yuanquan Chen; +Cc: linuxppc-dev, r61911
In-Reply-To: <1353644968-29469-1-git-send-email-B41889@freescale.com>
On Nov 22, 2012, at 10:29 PM, Yuanquan Chen wrote:
> On powerpc arch, dma_ops of rescanned pci device after system's =
booting up won't be
> initialized by system, so it will fail to execute the dma_set_mask in =
the device's
> driver. Initialize it to solve this issue.
>=20
> Signed-off-by: Yuanquan Chen <B41889@freescale.com>
> ---
> arch/powerpc/include/asm/dma-mapping.h | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
This is not the right way to get the dma_ops setup. You need to find =
some other point for the hotplug scenario to get the dma_ops setup.
- k
>=20
> diff --git a/arch/powerpc/include/asm/dma-mapping.h =
b/arch/powerpc/include/asm/dma-mapping.h
> index 7816087..22eae53 100644
> --- a/arch/powerpc/include/asm/dma-mapping.h
> +++ b/arch/powerpc/include/asm/dma-mapping.h
> @@ -126,8 +126,11 @@ static inline int dma_supported(struct device =
*dev, u64 mask)
> {
> struct dma_map_ops *dma_ops =3D get_dma_ops(dev);
>=20
> - if (unlikely(dma_ops =3D=3D NULL))
> - return 0;
> + if (unlikely(dma_ops =3D=3D NULL)) {
> + set_dma_ops(dev, &dma_direct_ops);
> + set_dma_offset(dev, PCI_DRAM_OFFSET);
> + dma_ops =3D &dma_direct_ops;
> + }
> if (dma_ops->dma_supported =3D=3D NULL)
> return 1;
> return dma_ops->dma_supported(dev, mask);
> --=20
> 1.7.9.5
>=20
>=20
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply
* Re: [PATCH 056/493] edac: remove use of __devexit_p
From: Greg KH @ 2012-11-24 17:59 UTC (permalink / raw)
To: Borislav Petkov
Cc: Arvind R., Mark Gross, Mauro Carvalho Chehab, Jason Uhlenkott,
Ranganathan Desikan, Bill Pemberton, Egor Martovetsky,
Doug Thompson, Olof Johansson, linux-edac, linuxppc-dev,
Tim Small
In-Reply-To: <20121124091453.GC25143@x1.alien8.de>
On Sat, Nov 24, 2012 at 10:14:53AM +0100, Borislav Petkov wrote:
> On Fri, Nov 23, 2012 at 08:40:24AM -0800, Greg KH wrote:
> > No, as there will not be any discarded sections anymore because
> > CONFIG_HOTPLUG is always enabled. We will just delete this whole
> > #if/#endif section once all users of __devexit_p() are gone from the
> > tree.
> >
> > Does that help out?
>
> Yes, I missed the fact that there won't be any discarded sections
> anymore. Btw, in that case, you'd probably need to remove all those
>
> #ifdef CONFIG_HOTPLUG
>
> ...
>
> #endif
>
> stanzas surrounding different places in the kernel (I see 40ish
> currenty) now that HOTPLUG is def_bool y and if you haven't done so yet.
That removal was done as part of this 493 patches long patchset :)
> Thanks for explaining.
>
> Btw, you can have my
>
> Acked-by: Borislav Petkov <bp@alien8.de>
>
> for the amd64_edac pieces.
Thanks, I will add it there,
greg k-h
^ permalink raw reply
* Re: [PATCH 056/493] edac: remove use of __devexit_p
From: Borislav Petkov @ 2012-11-24 9:14 UTC (permalink / raw)
To: Greg KH
Cc: Arvind R., Mark Gross, Mauro Carvalho Chehab, Jason Uhlenkott,
Ranganathan Desikan, Bill Pemberton, Egor Martovetsky,
Doug Thompson, Olof Johansson, linux-edac, linuxppc-dev,
Tim Small
In-Reply-To: <20121123164024.GB5471@kroah.com>
On Fri, Nov 23, 2012 at 08:40:24AM -0800, Greg KH wrote:
> No, as there will not be any discarded sections anymore because
> CONFIG_HOTPLUG is always enabled. We will just delete this whole
> #if/#endif section once all users of __devexit_p() are gone from the
> tree.
>
> Does that help out?
Yes, I missed the fact that there won't be any discarded sections
anymore. Btw, in that case, you'd probably need to remove all those
#ifdef CONFIG_HOTPLUG
...
#endif
stanzas surrounding different places in the kernel (I see 40ish
currenty) now that HOTPLUG is def_bool y and if you haven't done so yet.
Thanks for explaining.
Btw, you can have my
Acked-by: Borislav Petkov <bp@alien8.de>
for the amd64_edac pieces.
--
Regards/Gruss,
Boris.
^ permalink raw reply
* [GIT PULL 0/8] perf/urgent fixes
From: Arnaldo Carvalho de Melo @ 2012-11-24 0:20 UTC (permalink / raw)
To: Ingo Molnar
Cc: David Howells, linuxppc-dev, Paul Mackerras,
Arnaldo Carvalho de Melo, Robert Richter, x86, Xiao Guangrong,
acme, Sukadev Bhattiprolu, linux-arch, Peter Zijlstra,
Namhyung Kim, Anton Blanchard, Arnaldo Carvalho de Melo, Dong Hao,
Borislav Petkov, Runzhen Wang, Thomas Gleixner, linux-kernel,
David Ahern, Linus Torvalds
Hi Ingo,
Tested using a cross-compiler and directly on a Raspberry pi (ARM) with
raspbian.
Please consider pulling.
- Arnaldo
The following changes since commit 18423d3562f396206e0928a71177eeb2edfed077:
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2012-11-13 18:51:51 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux tags/perf-urgent-for-mingo
for you to fetch changes up to 7321090f6751c9987c26a8c81c63680d16a614d7:
perf kvm: Fix building perf kvm on non x86 arches (2012-11-23 20:40:17 -0300)
----------------------------------------------------------------
perf/urgent fixes
. Don't build 'perf kvm stat" on non-x86 arches, fix from Xiao Guangrong.
. UAPI fixes to get perf building again in non-x86 arches, from David Howells.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
Merge tag 'perf-uapi-20121119' of git://git.infradead.org/users/dhowells/linux-headers into perf/urgent
David Howells (6):
x86: Export asm/{svm.h,vmx.h,perf_regs.h}
Merge branch 'x86-pre-uapi' into perf-uapi
tools: Define a Makefile function to do subdir processing
tools: Honour the O= flag when tool build called from a higher Makefile
tools: Pass the target in descend
perf: Make perf build for x86 with UAPI disintegration applied
Sukadev Bhattiprolu (1):
perf powerpc: Use uapi/unistd.h to fix build error
Xiao Guangrong (2):
perf kvm: Rename perf_kvm to perf_kvm_stat
perf kvm: Fix building perf kvm on non x86 arches
Makefile | 6 +-
arch/x86/include/asm/Kbuild | 3 +
include/linux/hw_breakpoint.h | 31 +-------
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/hw_breakpoint.h | 30 ++++++++
tools/Makefile | 24 +++---
tools/perf/Makefile | 29 +++++++-
tools/perf/arch/x86/include/perf_regs.h | 2 +-
tools/perf/builtin-kvm.c | 121 +++++++++++++++++--------------
tools/perf/builtin-test.c | 2 +-
tools/perf/perf.h | 16 +---
tools/perf/util/evsel.c | 4 +-
tools/perf/util/evsel.h | 3 +-
tools/perf/util/header.h | 2 +-
tools/perf/util/parse-events-test.c | 2 +-
tools/perf/util/parse-events.c | 2 +-
tools/perf/util/parse-events.h | 2 +-
tools/perf/util/pmu.h | 2 +-
tools/perf/util/session.h | 2 +-
tools/scripts/Makefile.include | 23 +++++-
20 files changed, 181 insertions(+), 126 deletions(-)
create mode 100644 include/uapi/linux/hw_breakpoint.h
^ permalink raw reply
* [PATCH 5/8] perf powerpc: Use uapi/unistd.h to fix build error
From: Arnaldo Carvalho de Melo @ 2012-11-24 0:20 UTC (permalink / raw)
To: Ingo Molnar
Cc: Peter Zijlstra, Robert Richter, Anton Blanchard, linux-kernel,
Arnaldo Carvalho de Melo, linuxppc-dev, Ingo Molnar,
Paul Mackerras, Sukadev Bhattiprolu
In-Reply-To: <1353716453-9693-1-git-send-email-acme@infradead.org>
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Use the 'unistd.h' from arch/powerpc/include/uapi to build the perf tool.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Cc: Anton Blanchard <anton@au1.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: linuxppc-dev@ozlabs.org
Link: http://lkml.kernel.org/r/20121107191818.GA16211@us.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/perf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index c50985e..e2ba8f0 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -26,7 +26,7 @@ void get_term_dimensions(struct winsize *ws);
#endif
#ifdef __powerpc__
-#include "../../arch/powerpc/include/asm/unistd.h"
+#include "../../arch/powerpc/include/uapi/asm/unistd.h"
#define rmb() asm volatile ("sync" ::: "memory")
#define cpu_relax() asm volatile ("" ::: "memory");
#define CPUINFO_PROC "cpu"
--
1.7.9.2.358.g22243
^ permalink raw reply related
* [PATCH 7/9] sh: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:36 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
---
arch/sh/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
index 8bd965e..b437f2c 100644
--- a/arch/sh/include/asm/dma-mapping.h
+++ b/arch/sh/include/asm/dma-mapping.h
@@ -46,6 +46,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+ debug_dma_mapping_error(dev, dma_addr);
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);
--
1.7.9.5
^ permalink raw reply related
* [PATCH 3/9] ia64: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:32 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
---
arch/ia64/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index 4f5e814..cf3ab7e 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -58,6 +58,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
{
struct dma_map_ops *ops = platform_dma_get_ops(dev);
+ debug_dma_mapping_error(dev, daddr);
return ops->mapping_error(dev, daddr);
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH 4/9] microblaze: dma-mapping: support debug_dma_mapping_error
From: Shuah Khan @ 2012-11-23 21:33 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add support for debug_dma_mapping_error() call to avoid warning from
debug_dma_unmap() interface when it checks for mapping error checked
status. Without this patch, device driver failed to check map error
warning is generated.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Acked-by: Michal Simek <monstr@monstr.eu>
---
This patch is already in linux-next. Including it in this series for
completeness. linux-next commit f229605441030bcd315c21d97b25889d63ed0130
-- shuah
---
arch/microblaze/include/asm/dma-mapping.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 01d2282..46460f1 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -114,6 +114,8 @@ static inline void __dma_sync(unsigned long paddr,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+
+ debug_dma_mapping_error(dev, dma_addr);
if (ops->mapping_error)
return ops->mapping_error(dev, dma_addr);
--
1.7.9.5
^ permalink raw reply related
* [PATCH 6/9] powerpc: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:35 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
---
arch/powerpc/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index 7816087..e27e9ad 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -172,6 +172,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
struct dma_map_ops *dma_ops = get_dma_ops(dev);
+ debug_dma_mapping_error(dev, dma_addr);
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
--
1.7.9.5
^ permalink raw reply related
* [PATCH 5/9] mips: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:34 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
---
arch/mips/include/asm/dma-mapping.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index be39a12..006b43e 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -40,6 +40,8 @@ static inline int dma_supported(struct device *dev, u64 mask)
static inline int dma_mapping_error(struct device *dev, u64 mask)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+
+ debug_dma_mapping_error(dev, mask);
return ops->mapping_error(dev, mask);
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH 9/9] tile: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:37 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
---
arch/tile/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h
index 4b6247d..f2ff191 100644
--- a/arch/tile/include/asm/dma-mapping.h
+++ b/arch/tile/include/asm/dma-mapping.h
@@ -72,6 +72,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
static inline int
dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
+ debug_dma_mapping_error(dev, dma_addr);
return get_dma_ops(dev)->mapping_error(dev, dma_addr);
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH 8/9] sparc: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:37 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
arch/sparc/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
index 8493fd3..05fe53f 100644
--- a/arch/sparc/include/asm/dma-mapping.h
+++ b/arch/sparc/include/asm/dma-mapping.h
@@ -59,6 +59,7 @@ static inline void dma_free_attrs(struct device *dev, size_t size,
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
+ debug_dma_mapping_error(dev, dma_addr);
return (dma_addr == DMA_ERROR_CODE);
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH 0/9] dma_debug: add debug_dma_mapping_error support to architectures that support DMA_DEBUG_API
From: Shuah Khan @ 2012-11-23 21:29 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
An earlier patch added dma mapping error debug feature to dma_debug
infrastructure. References:
https://lkml.org/lkml/2012/10/8/296
https://lkml.org/lkml/2012/11/3/219
The following series of patches adds the call to debug_dma_mapping_error() to
architecture specific dma_mapping_error() interfaces on the following
architectures that support CONFIG_DMA_API_DEBUG.
arm64
c6x
ia64
microblaze
mips
powerpc
sh
sparc
tile
arm - Change is already in Marek's dma-mapping tree[1]
https://patchwork.kernel.org/patch/1625601/
microblaze - Change is already in linux-next. Including it for completeness
linux-next commit f229605441030bcd315c21d97b25889d63ed0130
x86 - done in the first patch that added the feature.
ARM64: dma_debug: add debug_dma_mapping_error support
c6x: dma_debug: add debug_dma_mapping_error support
ia64: dma_debug: add debug_dma_mapping_error support
microblaze: dma-mapping: support debug_dma_mapping_error
mips: dma_debug: add debug_dma_mapping_error support
powerpc: dma_debug: add debug_dma_mapping_error support
sh: dma_debug: add debug_dma_mapping_error support
sparc: dma_debug: add debug_dma_mapping_error support
tile: dma_debug: add debug_dma_mapping_error support
Thanks,
-- Shuah
^ permalink raw reply
* [PATCH 2/9] c6x: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:32 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Acked-by: Mark Salter <msalter@redhat.com>
---
arch/c6x/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h
index 03579fd..3c69406 100644
--- a/arch/c6x/include/asm/dma-mapping.h
+++ b/arch/c6x/include/asm/dma-mapping.h
@@ -32,6 +32,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
*/
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
+ debug_dma_mapping_error(dev, dma_addr);
return dma_addr == ~0;
}
--
1.7.9.5
^ permalink raw reply related
* [PATCH 1/9] ARM64: dma_debug: add debug_dma_mapping_error support
From: Shuah Khan @ 2012-11-23 21:31 UTC (permalink / raw)
To: Joerg Roedel, a-jacquiot, fenghua.yu, catalin.marinas, lethal,
benh, ralf, tony.luck, davem, m.szyprowski, msalter, monstr,
Ming Lei
Cc: linux-mips, linux-ia64, linux-c6x-dev, linux-sh,
microblaze-uclinux, LKML, shuahkhan, sparclinux, linuxppc-dev,
linux-arm-kernel
Add dma-debug interface debug_dma_mapping_error() to debug drivers that fail
to check dma mapping errors on addresses returned by dma_map_single() and
dma_map_page() interfaces.
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/asm/dma-mapping.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index 538f4b4..9947768 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -50,6 +50,7 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
{
struct dma_map_ops *ops = get_dma_ops(dev);
+ debug_dma_mapping_error(dev, dev_addr);
return ops->mapping_error(dev, dev_addr);
}
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH 056/493] edac: remove use of __devexit_p
From: Greg KH @ 2012-11-23 16:40 UTC (permalink / raw)
To: Borislav Petkov
Cc: Arvind R., Mark Gross, Mauro Carvalho Chehab, Jason Uhlenkott,
Ranganathan Desikan, Bill Pemberton, Egor Martovetsky,
Doug Thompson, Olof Johansson, linux-edac, linuxppc-dev,
Tim Small
In-Reply-To: <20121123100635.GC18765@x1.alien8.de>
On Fri, Nov 23, 2012 at 11:06:35AM +0100, Borislav Petkov wrote:
> On Thu, Nov 22, 2012 at 10:22:22AM -0800, Greg KH wrote:
> > On Thu, Nov 22, 2012 at 02:44:51PM +0100, Borislav Petkov wrote:
> > > On Mon, Nov 19, 2012 at 01:20:05PM -0500, Bill Pemberton wrote:
> > > > CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
> > > > needed.
> > >
> > > Erm, I don't understand. __devexit_p is defined also for modules not
> > > only for CONFIG_HOTPLUG:
> > >
> > > #if defined(MODULE) || defined(CONFIG_HOTPLUG)
> > > #define __devexit_p(x) x
> > > #else
> > > #define __devexit_p(x) NULL
> > > #endif
> > >
> > > AFAICT, we cannot remove it yet no?
> >
> > If MODULE is defined, it defaults to nothing. And now that
> > CONFIG_HOTPLUG is always set to Y, this always defaults to nothing.
>
> Huh, if MODULE is defined, __devexit_p(x) evaluates to the function name
> 'x' itself, AFAICT.
Yes, sorry, that is what I was trying to say here, I meant "nothing" in
that the macro did not do anything, not that it was setting it to NULL.
> So, if MODULE is defined and we have a reference from retained sections
> to a discarded section (I'm rereading the comment over __devexit_p in
> <include/linux/init.h> btw) then we'll get linker errors so we'd still
> need the ifdef thing, no?
No, as there will not be any discarded sections anymore because
CONFIG_HOTPLUG is always enabled. We will just delete this whole
#if/#endif section once all users of __devexit_p() are gone from the
tree.
Does that help out?
thanks,
greg k-h
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox