linux-next: manual merge of the irqdomain tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the irqdomain tree got a conflict in arch/powerpc/platforms/iseries/irq.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the tree and three commits from the irqdomain tree. I just removed the file. -- Cheers, Steph

Re: linux-next: manual merge of the net-next tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi Dave, On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller wrote: > > From: Stephen Rothwell > Date: Fri, 9 Mar 2012 13:36:46 +1100 > > > Today's linux-next merge of the net-next tree got a conflict in > > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 > > ("net: power

Re: linux-next: manual merge of the net-next tree with the powerpc tree

2012-03-08 Thread David Miller
From: Stephen Rothwell Date: Fri, 9 Mar 2012 13:36:46 +1100 > Today's linux-next merge of the net-next tree got a conflict in > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 > ("net: powerpc: remove the legacy iSeries ethernet driver") from the > powerpc tree and commit 41de

linux-next: manual merge of the driver-core tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8 ("Eliminate get_driver() and put_driver()") from the driver-core tree. Just conte

linux-next: manual merge of the tip tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/powerpc/platforms/iseries/setup.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the powerpc tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()") from the tip tr

Re: 3.3.0-rc6-next-20120308 boot failure on POWER7 blade

2012-03-08 Thread Anton Blanchard
Hi Ben, > Looks like something that got fixed but the new patches from Bjorn > aren't in next yet. I'll fwd you the patch separately to apply on top > of what you have see if that helps (to confirm that's indeed the > issue). Thanks, confirmed that it fixes it. Patch below in case anyone else is

Re: [PATCH 1/2] powerpc/44x: Fix PCI MSI support for Maui APM821xx SoC and Bluestone board

2012-03-08 Thread Benjamin Herrenschmidt
On Fri, 2012-03-09 at 10:17 +0700, Mai La wrote: > This patch consists of: > - Enable PCI MSI as default for Bluestone board > - Define number of MSI interrupt for Maui APM821xx SoC using in Bluestone > board > - Fix returning ENODEV as finding MSI node > - Fix MSI physical high and low address >

Re: 3.3.0-rc6-next-20120308 boot failure on POWER7 blade

2012-03-08 Thread Benjamin Herrenschmidt
On Fri, 2012-03-09 at 14:25 +1100, Anton Blanchard wrote: > Hi, > > I'm seeing this on a POWER7 blade booting 3.3.0-rc6-next-20120308: Looks like something that got fixed but the new patches from Bjorn aren't in next yet. I'll fwd you the patch separately to apply on top

3.3.0-rc6-next-20120308 boot failure on POWER7 blade

2012-03-08 Thread Anton Blanchard
Hi, I'm seeing this on a POWER7 blade booting 3.3.0-rc6-next-20120308: PCI host bridge to bus :00 pci_bus :00: root bus resource [io 0x10-0x10] (bus address [0xf-0xf]) pci_bus :00: root bus resource [mem 0x3b00-0x3b001fff] (bus address [0xe00

[PATCH 2/2] powerpc/44x: Add PCI MSI node for Maui APM821xx SoC and Bluestone board in DTS

2012-03-08 Thread Mai La
Signed-off-by: Mai La --- arch/powerpc/boot/dts/bluestone.dts | 24 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts index 2a56a0d..8ea6325 100644 --- a/arch/powerpc/boot/dts/blue

[PATCH 1/2] powerpc/44x: Fix PCI MSI support for Maui APM821xx SoC and Bluestone board

2012-03-08 Thread Mai La
This patch consists of: - Enable PCI MSI as default for Bluestone board - Define number of MSI interrupt for Maui APM821xx SoC using in Bluestone board - Fix returning ENODEV as finding MSI node - Fix MSI physical high and low address - Keep MSI data logically Signed-off-by: Mai La --- arch/powe

Re: linux-next: manual merge of the powerpc tree with the arm tree

2012-03-08 Thread Benjamin Herrenschmidt
On Fri, 2012-03-09 at 00:39 +, Russell King wrote: > On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote: > > Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If > > I remove it, then I get Kconfig warnings: > > > > warning: (PPC) selects SPARSE_IRQ which

linux-next: manual merge of the net-next tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 ("net: powerpc: remove the legacy iSeries ethernet driver") from the powerpc tree and commit 41de8d4cff21 ("drivers/net: Remove alloc_etherdev error messages"

linux-next: manual merge of the pci tree with the powerpc tree

2012-03-08 Thread Stephen Rothwell
Hi Jesse, Today's linux-next merge of the pci tree got a conflict in arch/powerpc/platforms/iseries/pci.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the powerpc tree and commit 673c97562489 ("powerpc/PCI: replace pci_probe_only with pci_flags") from t

Re: linux-next: manual merge of the powerpc tree with the arm tree

2012-03-08 Thread Russell King
On Fri, Mar 09, 2012 at 10:35:46AM +1100, Benjamin Herrenschmidt wrote: > Actually, I didn't keep MAY_HAVE_SPARSE_IRQ, I kept HAVE_SPARSE_IRQ. If > I remove it, then I get Kconfig warnings: > > warning: (PPC) selects SPARSE_IRQ which has unmet direct dependencies > (HAVE_GENERIC_HARDIRQS && HAVE_S

Re: linux-next: manual merge of the powerpc tree with the arm tree

2012-03-08 Thread Benjamin Herrenschmidt
On Thu, 2012-03-08 at 16:52 +1100, Benjamin Herrenschmidt wrote: > On Thu, 2012-03-08 at 14:51 +1100, Stephen Rothwell wrote: > > Hi Mikey, > > > > On Thu, 08 Mar 2012 13:33:56 +1100 Michael Neuling > > wrote: > > > > > > Surely we only need SPARSE_IRQ now and not MAY_HAVE_SPARSE_IRQ. > > > >

Re: [PATCH 19/38] KVM: PPC: e500mc: add load inst fixup

2012-03-08 Thread Marcelo Tosatti
On Wed, Feb 29, 2012 at 01:09:47AM +0100, Alexander Graf wrote: > There's always a chance we're unable to read a guest instruction. The guest > could have its TLB mapped execute-, but not readable, something odd happens > and our TLB gets flushed. So it's a good idea to be prepared for that case >

Re: [PATCH] PPC: Don't sync timebase when inside VM

2012-03-08 Thread McClintock Matthew-B29882
On Thu, Mar 8, 2012 at 12:43 PM, Scott Wood wrote: > On 03/08/2012 12:24 PM, McClintock Matthew-B29882 wrote: >> On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood wrote: >>> On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote: On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood wrote: > On

Re: [PATCH] PPC: Don't sync timebase when inside VM

2012-03-08 Thread Scott Wood
On 03/08/2012 12:24 PM, McClintock Matthew-B29882 wrote: > On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood wrote: >> On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote: >>> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood wrote: On 03/02/2012 10:30 AM, Alexander Graf wrote: > > On 02.03.

Re: [PATCH] PPC: Don't sync timebase when inside VM

2012-03-08 Thread McClintock Matthew-B29882
On Thu, Mar 8, 2012 at 12:20 PM, Scott Wood wrote: > On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote: >> On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood wrote: >>> On 03/02/2012 10:30 AM, Alexander Graf wrote: On 02.03.2012, at 17:20, Scott Wood wrote: > Again, for 85xx we shoul

Re: [PATCH] PPC: Don't sync timebase when inside VM

2012-03-08 Thread Scott Wood
On 03/08/2012 11:31 AM, McClintock Matthew-B29882 wrote: > On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood wrote: >> On 03/02/2012 10:30 AM, Alexander Graf wrote: >>> >>> On 02.03.2012, at 17:20, Scott Wood wrote: Again, for 85xx we should *never* sync the timebase in the kernel, hypervisor

Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

2012-03-08 Thread Greg Kroah-Hartman
On Thu, Mar 08, 2012 at 03:28:53PM +1100, Stephen Rothwell wrote: > Hi all, > > This series of patches removes all the legacy iSeries platform specific > drivers (and the iSeries specific part of one). The legacy iSeries > platform main code has already bee removed along with CONFIG_PPC_ISERIES,

Re: [PATCH] PPC: Don't sync timebase when inside VM

2012-03-08 Thread McClintock Matthew-B29882
On Fri, Mar 2, 2012 at 11:17 AM, Scott Wood wrote: > On 03/02/2012 10:30 AM, Alexander Graf wrote: >> >> On 02.03.2012, at 17:20, Scott Wood wrote: >> >>> On Fri, Mar 02, 2012 at 03:12:33PM +0100, Alexander Graf wrote: When running inside a virtual machine, we can not modify timebase, so

RE: [PATCH 2/4] fsl_pci: Add a workaround for PCI 5 errata in MPC8548

2012-03-08 Thread Zhao Chenhui-B35336
> On Mar 6, 2012, at 3:10 AM, Zhao Chenhui wrote: > > > + if ((fsl_svr_is(SVR_8548) || fsl_svr_is(SVR_8548_E)) && > > Should this also have 8547, 8547E, 8545, 8545E, 8543, & 8543E? Yes. I will include these chips. -Chenhui > > > + !early_find_capability(hose, 0, 0, PCI

Re: [PATCH 5/7] tty: powerpc: remove SERIAL_ICOM dependency on PPC_ISERIES

2012-03-08 Thread Alan Cox
On Thu, 8 Mar 2012 15:39:31 +1100 Stephen Rothwell wrote: > The PowerPC legacy iSeries platform is being removed so this is no > longer selectable. Fine by me ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo

Re: [PATCH 0/7] powerpc: remove the legacy iSeries platform specific drivers

2012-03-08 Thread Jens Axboe
On 03/08/2012 05:28 AM, Stephen Rothwell wrote: > It would probably be easiest if all these patches were merged via the > powerpc tree to eliminate any dependencies between them. Their impact on > generic code is very small. Go ahead, no point in doing otherwise. -- Jens Axboe