LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [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

* 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

* 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] 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] 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 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 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][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/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 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] 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

* [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

* [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

* Re: [git pull] Please pull powerpc.git merge branch
From: Benjamin Herrenschmidt @ 2012-11-25 22:16 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linuxppc-dev list, Linux Kernel list
In-Reply-To: <1353881283.16666.5.camel@pasglop>

On Mon, 2012-11-26 at 09:08 +1100, Benjamin Herrenschmidt wrote:
> On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote:
> > 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).

I've just added a second fix for EEH (Gavin found another issue) which
is trivial enough (and tested) so it should still go in. Updated pull
request:

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 merge

for you to fetch changes up to e716e014384688d1a50d1aa5213ee74748c6d4e0:

  powerpc/eeh: Do not invalidate PE properly (2012-11-26 09:14:16 +1100)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      powerpc/pseries: Fix oops with MSIs when missing EEH PEs

Gavin Shan (1):
      powerpc/eeh: Do not invalidate PE properly

 arch/powerpc/platforms/pseries/eeh_pe.c |    2 +-
 arch/powerpc/platforms/pseries/msi.c    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

^ permalink raw reply

* [PATCH 1/1] i2c-cpm: Fix to takeback i2c bus master-ship after a collision
From: sachin.surendran @ 2012-11-25 22:20 UTC (permalink / raw)
  To: galak, jochen; +Cc: Sachin Surendran, sachin.surendran, linuxppc-dev

From: Sachin Surendran <sachin.surendran@alliedtelesis.co.nz>

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 for future transactions, resulting
in i2c transfer timeouts.
  This fix checks for a collision on last I2C transaction and sets the
I2COM_MASTER bit for the new transaction.

Signed-off-by: Sachin Surendran <sachin.surendran@alliedtelesis.co.nz>
---
 drivers/i2c/busses/i2c-cpm.c |    8 ++++++++
 1 file changed, 8 insertions(+)

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 = 0;
 	rptr = 0;
 
+	/*
+	 * 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 = &msgs[tptr];
 		dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
-- 
1.7.9.5

^ permalink raw reply related

* Re: [git pull] Please pull powerpc.git next branch
From: Benjamin Herrenschmidt @ 2012-11-25 22:26 UTC (permalink / raw)
  To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <alpine.LFD.2.00.1211250726550.14762@right.am.freescale.net>

On Sun, 2012-11-25 at 07:27 -0600, Kumar Gala wrote:

Next time, put a little message with "highlights" that I can include in
the merge commit, that's how we tend to do things nowadays :-)

Cheers,
Ben.

> 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: sachin surendran @ 2012-11-25 22:57 UTC (permalink / raw)
  To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <B8BB551F-BD07-41A9-BCA6-7451C3D12CAA@kernel.crashing.org>

Hi Kumar,
             I have resent the updated patch.

Regards
Sachin

On Mon, Nov 26, 2012 at 2:21 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
>
> 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
>> for future transactions, resulting in i2c transfer timeouts.
>>   This fix checks for a collision on last I2C transaction and sets the I2COM_MASTER
>> bit for the new transaction.
>>
>> 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
>
>>
>> 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 = 0;
>>         rptr = 0;
>>
>> +       /*
>> +        * 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 = &msgs[tptr];
>>                 dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
>>
>> _______________________________________________
>> Linuxppc-dev mailing list
>> Linuxppc-dev@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/linuxppc-dev
>

^ permalink raw reply

* Re: [git pull] Please pull powerpc.git merge branch
From: Benjamin Herrenschmidt @ 2012-11-25 22:08 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linuxppc-dev list, Linux Kernel list
In-Reply-To: <1353881249.16666.4.camel@pasglop>

On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote:
> 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 

And the branch is "merge".

Cheers,
Ben.

> 
> 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

* RE: [PATCH 3/4 v5] iommu/fsl: Add iommu domain attributes required by fsl PAMU driver.
From: Sethi Varun-B16395 @ 2012-11-26  5:24 UTC (permalink / raw)
  To: joerg.roedel@amd.com
  Cc: Wood Scott-B07421, Tabi Timur-B04825,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	Sethi Varun-B16395, linuxppc-dev@lists.ozlabs.org
In-Reply-To: <1353419697-31269-4-git-send-email-Varun.Sethi@freescale.com>

Hi Joerg,
Any comments? Can we apply this patch?

Regards
Varun

> -----Original Message-----
> From: Sethi Varun-B16395
> Sent: Tuesday, November 20, 2012 7:25 PM
> To: joerg.roedel@amd.com; iommu@lists.linux-foundation.org; linuxppc-
> dev@lists.ozlabs.org; linux-kernel@vger.kernel.org; Wood Scott-B07421;
> Tabi Timur-B04825
> Cc: Sethi Varun-B16395
> Subject: [PATCH 3/4 v5] iommu/fsl: Add iommu domain attributes required
> by fsl PAMU driver.
>=20
> Added the following domain attributes required by FSL PAMU driver:
> 1. Subwindows field added to the iommu domain geometry attribute.
> 2. Added new iommu stash attribute, which allows setting of the
>    LIODN specific stash id parameter through IOMMU API.
> 3. Added an attribute for enabling/disabling DMA to a particular
>    memory window.
>=20
> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
> ---
> changes in v5:
> - Updated description of the subwindows field.
> changes in v4:
> - Updated comment explaining subwindows(as mentioned by Scott).
> change in v3:
> -renamed the stash attribute targets
>  include/linux/iommu.h |   43 +++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 43 insertions(+), 0 deletions(-)
>=20
> diff --git a/include/linux/iommu.h b/include/linux/iommu.h index
> f3b99e1..7ca1cda 100644
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@ -44,6 +44,41 @@ struct iommu_domain_geometry {
>  	dma_addr_t aperture_start; /* First address that can be mapped
> */
>  	dma_addr_t aperture_end;   /* Last address that can be mapped
> */
>  	bool force_aperture;       /* DMA only allowed in mappable range?
> */
> +
> +	/*
> +	 * A geometry mapping can be created in one of the following ways
> +	 * for an IOMMU:
> +	 * 1. A single contiguous window
> +	 * 2. Through arbritary paging throughout the aperture.
> +	 * 3. Using multiple subwindows
> +	 *
> +	 * In absence of arbritary paging, subwindows allow for supporting
> +	 * physically discontiguous mappings.
> +	 *
> +	 * This attribute indicates number of DMA subwindows supported by
> +	 * the geometry. If there is a single window that maps the entire
> +	 * geometry, attribute must be set to "1". A value of "0" implies
> +	 * that this mechanism is not used at all(normal paging is used).
> +	 * Value other than* "0" or "1" indicates the actual number of
> +	 * subwindows.
> +	 */
> +	u32 subwindows;
> +};
> +
> +/* cache stash targets */
> +#define IOMMU_ATTR_CACHE_L1 1
> +#define IOMMU_ATTR_CACHE_L2 2
> +#define IOMMU_ATTR_CACHE_L3 3
> +
> +/* This attribute corresponds to IOMMUs capable of generating
> + * a stash transaction. A stash transaction is typically a
> + * hardware initiated prefetch of data from memory to cache.
> + * This attribute allows configuring stashig specific parameters
> + * in the IOMMU hardware.
> + */
> +struct iommu_stash_attribute {
> +	u32 	cpu;	/* cpu number */
> +	u32 	cache;	/* cache to stash to: L1,L2,L3 */
>  };
>=20
>  struct iommu_domain {
> @@ -60,6 +95,14 @@ struct iommu_domain {  enum iommu_attr {
>  	DOMAIN_ATTR_MAX,
>  	DOMAIN_ATTR_GEOMETRY,
> +	/* Set the IOMMU hardware stashing
> +	 * parameters.
> +	 */
> +	DOMAIN_ATTR_STASH,
> +	/* Explicity enable/disable DMA for a
> +         * particular memory window.
> +         */
> +	DOMAIN_ATTR_ENABLE,
>  };
>=20
>  #ifdef CONFIG_IOMMU_API
> --
> 1.7.4.1

^ permalink raw reply

* Re: [PATCH] powerpc/pci-hotplug: fix the rescanned pci device's dma_set_mask issue
From: Chen Yuanquan-B41889 @ 2012-11-26  5:29 UTC (permalink / raw)
  To: Kumar Gala; +Cc: linuxppc-dev, r61911
In-Reply-To: <455E76A9-ABB3-4FF6-A19E-612E43223C4A@kernel.crashing.org>

On 11/25/2012 08:41 PM, Kumar Gala wrote:
> 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.
>>
>> 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

Hi Kumar,

I read the code about pci bus scan and rescan. Only the 
pcibios_fixup_bus in pci_scan_child_bus and
pcibios_enable_device in pci_rescan_bus are arch related code. The 
pcibios_fixup_bus won't be called
for the rescanned PCI devices due to the bus->is_added has been set for 
the first scanning at boot time.
So I think it's more reasonable to do the same work as pcibios_fixup_bus 
for rescanned PCI device in
pcibios_enable_device. The patch code is a copy of 
pcibios_setup_bus_devices called by pcibios_fixup_bus,
It can solve the dma_set_mask and irq related issues of rescanned PCI 
device on powerpc arch. What's
your opinion?

Thanks,
yuanquan

diff --git a/arch/powerpc/kernel/pci-common.c 
b/arch/powerpc/kernel/pci-common.c
index 7f94f76..30f7d61 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1496,6 +1496,23 @@ int pcibios_enable_device(struct pci_dev *dev, 
int mask)
                 if (ppc_md.pcibios_enable_device_hook(dev))
                         return -EINVAL;

+       if (!dev->is_added) {
+               set_dev_node(&dev->dev, pcibus_to_node(dev->bus));
+
+               /* Hook up default DMA ops */
+               set_dma_ops(&dev->dev, pci_dma_ops);
+               set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
+
+               /* Additional platform DMA/iommu setup */
+               if (ppc_md.pci_dma_dev_setup)
+                       ppc_md.pci_dma_dev_setup(dev);
+
+               /* Read default IRQs and fixup if necessary */
+               pci_read_irq_line(dev);
+               if (ppc_md.pci_irq_fixup)
+                       ppc_md.pci_irq_fixup(dev);
+       }
+
         return pci_enable_resources(dev, mask);
  }

>> 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 = get_dma_ops(dev);
>>
>> -	if (unlikely(dma_ops == NULL))
>> -		return 0;
>> +	if (unlikely(dma_ops == NULL)) {
>> +		set_dma_ops(dev, &dma_direct_ops);
>> +		set_dma_offset(dev, PCI_DRAM_OFFSET);
>> +		dma_ops = &dma_direct_ops;
>> +	}
>> 	if (dma_ops->dma_supported == NULL)
>> 		return 1;
>> 	return dma_ops->dma_supported(dev, mask);
>> -- 
>> 1.7.9.5
>>
>>
>> _______________________________________________
>> Linuxppc-dev mailing list
>> Linuxppc-dev@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
>
>

^ permalink raw reply related

* RE: [PATCH 1/4 v2] iommu/fsl: Store iommu domain information pointer in archdata.
From: Sethi Varun-B16395 @ 2012-11-26  5:33 UTC (permalink / raw)
  To: Kumar Gala
  Cc: Wood Scott-B07421, joerg.roedel@amd.com, Tabi Timur-B04825,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	Sethi Varun-B16395, linuxppc-dev@lists.ozlabs.org
In-Reply-To: <1353419697-31269-2-git-send-email-Varun.Sethi@freescale.com>

Hi Kumar,
Can you please apply this patch.

Regards
Varun

> -----Original Message-----
> From: Sethi Varun-B16395
> Sent: Tuesday, November 20, 2012 7:25 PM
> To: joerg.roedel@amd.com; iommu@lists.linux-foundation.org; linuxppc-
> dev@lists.ozlabs.org; linux-kernel@vger.kernel.org; Wood Scott-B07421;
> Tabi Timur-B04825
> Cc: Sethi Varun-B16395
> Subject: [PATCH 1/4 v2] iommu/fsl: Store iommu domain information pointer
> in archdata.
>=20
> Add a new field in the device (powerpc) archdata structure for storing
> iommu domain information pointer. This pointer is stored when the device
> is attached to a particular domain.
>=20
> Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
> ---
>  arch/powerpc/include/asm/device.h |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>=20
> diff --git a/arch/powerpc/include/asm/device.h
> b/arch/powerpc/include/asm/device.h
> index 77e97dd..6dc79fe 100644
> --- a/arch/powerpc/include/asm/device.h
> +++ b/arch/powerpc/include/asm/device.h
> @@ -28,6 +28,10 @@ struct dev_archdata {
>  		void		*iommu_table_base;
>  	} dma_data;
>=20
> +	/* IOMMU domain information pointer. This would be set
> +	 * when this device is attached to an iommu_domain.
> +	 */
> +	void			*iommu_domain;
>  #ifdef CONFIG_SWIOTLB
>  	dma_addr_t		max_direct_dma_addr;
>  #endif
> --
> 1.7.4.1

^ permalink raw reply

* [PATCH] powerpc/pasemi: enable PRINTK_TIME in defconfig
From: Olof Johansson @ 2012-11-26  6:51 UTC (permalink / raw)
  To: benh; +Cc: Olof Johansson, linuxppc-dev

Enable PRINTK_TIME in pasemi_defconfig. Also regenerate it, it seems
that a lot of options have moved around since last time savedefconfig
was ran on it.

Signed-off-by: Olof Johansson <olof@lixom.net>
---
 arch/powerpc/configs/pasemi_defconfig | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 840a2c2..bd8a6f7 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -1,28 +1,27 @@
 CONFIG_PPC64=y
 CONFIG_ALTIVEC=y
-# CONFIG_VIRT_CPU_ACCOUNTING is not set
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_MAC_PARTITION=y
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_PPC_PASEMI=y
 CONFIG_PPC_PASEMI_IOMMU=y
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEBUG=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_1000=y
 CONFIG_PPC_64K_PAGES=y
 # CONFIG_SECCOMP is not set
@@ -47,7 +46,6 @@ CONFIG_INET_ESP=y
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_SLRAM=y
@@ -58,7 +56,6 @@ CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_LEGACY=y
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDECD=y
@@ -91,21 +88,19 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
-CONFIG_MARVELL_PHY=y
-CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
-CONFIG_NET_PCI=y
-CONFIG_E1000=y
 CONFIG_TIGON3=y
+CONFIG_E1000=y
 CONFIG_PASEMI_MAC=y
+CONFIG_MARVELL_PHY=y
 CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_HW_RANDOM=y
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C_CHARDEV=y
@@ -146,14 +141,11 @@ CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_SL811_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_PASEMI=y
@@ -164,8 +156,6 @@ CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_INOTIFY=y
-CONFIG_AUTOFS_FS=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_ISO9660_FS=y
 CONFIG_UDF_FS=y
@@ -177,27 +167,22 @@ CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V4=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_MAC_PARTITION=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_CRC_CCITT=y
+CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_SCHED_DEBUG is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_XMON=y
 CONFIG_XMON_DEFAULT=y
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_BLOWFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-- 
1.7.10.1.488.g05fbf7a

^ permalink raw reply related

* Re: [PATCH 0/9] dma_debug: add debug_dma_mapping_error support to architectures that support DMA_DEBUG_API
From: Marek Szyprowski @ 2012-11-26 10:57 UTC (permalink / raw)
  To: shuah.khan
  Cc: linux-mips, linux-ia64, a-jacquiot, catalin.marinas, Ming Lei,
	shuahkhan, sparclinux, linux-c6x-dev, Joerg Roedel, linux-sh,
	msalter, fenghua.yu, microblaze-uclinux, linux-arm-kernel, monstr,
	tony.luck, LKML, ralf, lethal, linuxppc-dev, davem
In-Reply-To: <1353706142.5270.93.camel@lorien2>

Hello,

On 11/23/2012 10:29 PM, Shuah Khan wrote:
> 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.

I've took all the patches to the next-dma-debug branch in my tree, I sorry
that You have to wait so long for it. My branch is based on Joerg's
dma-debug branch and I've included it for testing in linux-next branch.

Joerg: would You mind if I handle pushing the whole branch to v3.8
via my kernel tree? Those changes should be kept close together to
avoid build breaks for bisecting.

Best regards
-- 
Marek Szyprowski
Samsung Poland R&D Center

^ permalink raw reply

* Re: [PATCH 0/9] dma_debug: add debug_dma_mapping_error support to architectures that support DMA_DEBUG_API
From: Joerg Roedel @ 2012-11-26 11:20 UTC (permalink / raw)
  To: Marek Szyprowski
  Cc: linux-mips, linux-ia64, a-jacquiot, catalin.marinas, Ming Lei,
	shuahkhan, sparclinux, linux-c6x-dev, linux-sh, msalter,
	shuah.khan, fenghua.yu, microblaze-uclinux, linux-arm-kernel,
	monstr, tony.luck, LKML, ralf, lethal, linuxppc-dev, davem
In-Reply-To: <50B34B0F.3080204@samsung.com>

On Mon, Nov 26, 2012 at 11:57:19AM +0100, Marek Szyprowski wrote:
> I've took all the patches to the next-dma-debug branch in my tree, I sorry
> that You have to wait so long for it. My branch is based on Joerg's
> dma-debug branch and I've included it for testing in linux-next branch.
> 
> Joerg: would You mind if I handle pushing the whole branch to v3.8
> via my kernel tree? Those changes should be kept close together to
> avoid build breaks for bisecting.

I'll apply the patches to my tree soon enough. But before that I'll wait
a little bit longer to give the arch maintainers the chance to add the
missing Acked-bys.


	Joerg

^ permalink raw reply

* Re: [PATCH 0/9] dma_debug: add debug_dma_mapping_error support to architectures that support DMA_DEBUG_API
From: Joerg Roedel @ 2012-11-26 11:22 UTC (permalink / raw)
  To: Shuah Khan
  Cc: linux-mips, linux-ia64, a-jacquiot, catalin.marinas, Ming Lei,
	shuahkhan, sparclinux, m.szyprowski, linux-c6x-dev, linux-sh,
	msalter, fenghua.yu, microblaze-uclinux, linux-arm-kernel, monstr,
	tony.luck, LKML, ralf, lethal, linuxppc-dev, davem
In-Reply-To: <1353706142.5270.93.camel@lorien2>

Hi Shuah,

On Fri, Nov 23, 2012 at 02:29:02PM -0700, Shuah Khan wrote:
> 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

Have you compile-tested the invididual archs you are changing here?


	Joerg

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox