Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2014-04-02 at 10:34 +1100, Benjamin Herrenschmidt wrote: Hi Linus ! This time around, the powerpc merges are going to be a little bit more complicated than usual. Looks like I sent this one twice, one with merge and one with next in the subject. They are otherwise identical (it's next really). I though I had cancelled the sending of the first one with the bad subject but it looks like my mailer was faster than me. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: My original intend was to put it in powerpc-next and then shoot it to stable, but it got a tad annoying (due to churn it needs to be applied at least on rc4 or later while my next is at rc1 and clean that way), so I put it in the merge branch. Quite frankly, I'll prefer to not merge it now, and then 3.13 will get it from stable, when it does things like this. Partly because it fixes a power-only bug, but potentially changes non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote: On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: My original intend was to put it in powerpc-next and then shoot it to stable, but it got a tad annoying (due to churn it needs to be applied at least on rc4 or later while my next is at rc1 and clean that way), so I put it in the merge branch. Quite frankly, I'll prefer to not merge it now, and then 3.13 will get it from stable, when it does things like this. Partly because it fixes a power-only bug, but potentially changes non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Right, I wasn't too comfortable either. I'll resend the pull request after the merge window is open. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a handful of powerpc fixes for 3.13. Grr. I've pulled it, but looking at that history, it's just pure and utter f*cking garbage. It was rebased *minutes* before sending it, as far as I can tell. Why? And it has a pointless merge that you must have created with --no-ff for no apparent good reason. WTF? What the hell happened here, and why? As mentioned, it's in my tree, but I was *this* close to just unpulling and saying fuck that when I started looking at it. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2013-12-09 at 19:58 -0800, Linus Torvalds wrote: On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a handful of powerpc fixes for 3.13. Grr. I've pulled it, but looking at that history, it's just pure and utter f*cking garbage. It was rebased *minutes* before sending it, as far as I can tell. Why? It was *created* shortly before sending it: Basically I put that thing together as a patchwork bundle which I grew over this week. Today I just applied them to my git, ran my build testers, booted a machine to dbl check and sent. I tend to not let things linger long in git when it's just fixes like that. And it has a pointless merge that you must have created with --no-ff for no apparent good reason. Oh that's my fault. I thought you preferred that way to keep track of cases where I pull from somebody since then the patch don't have my s-o-b... my bad for misunderstanding that part of the process. WTF? What the hell happened here, and why? As mentioned, it's in my tree, but I was *this* close to just unpulling and saying fuck that when I started looking at it. Heh sorry. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a few more powerpc changes for 3.10. I've merged your tree in at some point (which I generally avoid) in order to get the compat network fixes as soon as possible. Mostly regressions, and stuff I judged could/should still go in at this stage. Not pulled, because your hamster smells of eldeberries. This is not just bugfixes. In fact, as far as I can tell, this *introduces* bugs, with that get_user() in the exception path that can apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. I'm f*cking tired of people having problems understanding we're past rc5. If it's not something you would call stable material, you shouldn't send it to me. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
[ Is Jeremy the patchwork maintainer? If not, can people forward this to the real maintainer? ] On Sun, Jun 9, 2013 at 2:33 PM, Linus Torvalds torva...@linux-foundation.org wrote: This is not just bugfixes. In fact, as far as I can tell, this *introduces* bugs, with that get_user() in the exception path that can apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. Looking at that particular commit, I also notice that the commit itself is buggered in other ways too. It says: Date: Thu Jun 6 19:42:54 2013 + which surprised me due to the odd timezone, and it turns out it is pure and utter crap. Google finds the patch in patchwork, and Show headers there shows the expected timezone Date: Fri, 7 Jun 2013 15:42:54 +1000 and it turns out that apparently 'patchwork' is just making up random times, because when you download the email as an mbox, it will turn this into that corrupt and incorrect Date: Thu, 06 Jun 2013 19:42:54 - thing which is apparently how you got the wrong timestamp to begin with. That odd time doesn't even make any sense that I can see, because those two times have absolutely nothing in common afaik. Unless timezones work differently down under. It looks like some west-coast local time, but then it says - which is code for I have no f*cking clue what I'm doing. Just to make things extra exciting, patchwork actually shows yet *another* date string when you just look at the patch in the web interface: Date June 7, 2013, 5:42 a.m. and that actually seems to be the *correct* UTC version of that original email date. I have no idea what that Thu, 06 Jun 2013 19:42:54 - date is, and where it came from. But it is utter shite. Can somebody please make sure that patchwork doesn't destroy timezone/date information? I'm assuming this has been going on forever, and I just noticed because I looked at that particular commit for other reasons, and went Is Anton in Europe now?. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, 2013-06-09 at 14:33 -0700, Linus Torvalds wrote: On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a few more powerpc changes for 3.10. I've merged your tree in at some point (which I generally avoid) in order to get the compat network fixes as soon as possible. Mostly regressions, and stuff I judged could/should still go in at this stage. Not pulled, because your hamster smells of eldeberries. This is not just bugfixes. In fact, as far as I can tell, this *introduces* bugs, with that get_user() in the exception path that can apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. Ah right, brown paper bag for Anton and I :( I shouldn't have put that one in, it was a last minute bad decision after spending time tracking another stupid sigill in userspace (this time FSL CPUs not implementing some optional instructions that Fedora compiler seems configured to generate nowadays). I'm f*cking tired of people having problems understanding we're past rc5. If it's not something you would call stable material, you shouldn't send it to me. I've taken out that commit and the rename of the PMU interrupt (which while trivial probably wasn't important enough). Everything else is regressions/stable material. That does mean I rebased, but normally nobody bases on that merge branch so it should be fine. I'll send a new pull request. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Hi Linus, Is Jeremy the patchwork maintainer? Yep, that's me. and it turns out that apparently 'patchwork' is just making up random times, because when you download the email as an mbox, it will turn this into that corrupt and incorrect Date: Thu, 06 Jun 2013 19:42:54 - thing which is apparently how you got the wrong timestamp to begin with. We keep all patch dates in UTC, but were generating the Date header incorrectly. Now fixed: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 07 Jun 2013 05:42:54 - Commit is at: http://git.ozlabs.org/?p=patchwork;a=commitdiff;h=e7353352 Cheers, Jeremy ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 7:44 PM, Jeremy Kerr j...@ozlabs.org wrote: We keep all patch dates in UTC, but were generating the Date header incorrectly. Now fixed: No, not fixed. Keeping patch dates in UTC *corrupts* the date. I'll ask people to stop using patchworks if it cannot keep track of emailed dates. The date very much is a local time WITH A TIMEZONE. And it does matter. $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 07 Jun 2013 05:42:54 - No. The date from the email was Date: Fri, 7 Jun 2013 15:42:54 +1000 and we want *that* date. Not some random date that patchwork makes up that has no relevance. I know you have that date, because it shows up when asking for the headers in patchwork. Just use the right one, don't make up incorrect ones. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 8:06 PM, Linus Torvalds torva...@linux-foundation.org wrote: And it does matter. .. the rationale for this is that the work pattern of people is actually interesting information. You can do things like this: git log --pretty=%aD --author=Torvalds to see what my work pattern is, and I think that's *interesting*. Gathering statistics like whether people are generally doing 9-5 Mon-Fri is actually interesting data. You can do things like this: git log --since=6.months --pretty=%aD --author=Torvalds | cut -c1-3 | sort | uniq -c | sort -n and see (for example) that I do slow down on weekends. Same goes for things like what time of day ends up being most productive. You can do the statistics for me, and see that I tend to do the bulk of my pulls in the mornings (peak between 9-11) and that I'm not a night-owl (*big* drop-off after 8PM - that's what kids do to you). You can see a few really early-morning cases, but I suspect they were when I was jetlagged. So the date data is actually meaningful data. It's not just random noise. And to do these kinds of things, you absolutely have to have local-time with proper timezone information. Anything that screws that up is *broken*. git gets this right, unlike a lot of other broken SCM's. Git gets it right for a reason. Yeah, yeah, when people forward other peoples patches they often drop the date field, and the date of the patch ends up being the time that the last version of the patch got sent rather than anything else, so many of the statistics aren't valid. But a _tool_ that actively corrupts the date and time of a patch is just broken. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 8:20 PM, Linus Torvalds torva...@linux-foundation.org wrote: .. the rationale for this is that the work pattern of people is actually interesting information. You can do things like this: git log --pretty=%aD --author=Torvalds Final side note: for me, and other git users that apply other peoples patches, it's probably better to use git log --pretty=%cD --committer=Torvalds instead. Interestingly, that shows a different pattern than my authorship statistics, which are mainly pull requests. It turns out I commit patches much more in the afternoon. The reason is probably simple: in the mornings, I have pull requests waiting from overnight, so a fair number of pull requests where I am author at 9-11. But my biggest source of patches tends to be Andrew Morton, who sends the patches in the afternoon, so suddenly the commit counts skew towards being between 3pm-8pm when you take all my commits into accoint. Doing git log --since=6.months --pretty=%aD --grep=Signed.*Andrew.Morton backs that up: most of the commits that have sign-offs by Andrew are sent in the afternoon. I just find details like that really interesting, where you can actually mine for the workpatterns of people. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Hi Linus, No. The date from the email was Date: Fri, 7 Jun 2013 15:42:54 +1000 and we want *that* date. Ah, gotchya. So, we now use the original date header (if present) in the mbox views: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 7 Jun 2013 15:42:54 +1000 ... for all your data-mining needs. Cheers, Jeremy ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 9:20 PM, Jeremy Kerr j...@ozlabs.org wrote: So, we now use the original date header (if present) in the mbox views: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 7 Jun 2013 15:42:54 +1000 ... for all your data-mining needs. Goodie, and I see that it even works with old patches. Thanks. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sat, 2013-06-01 at 09:22 +1000, Benjamin Herrenschmidt wrote: Hi Linus ! Here are a few more fixes for powerpc 3.10. It's a bit more than I would have liked this late in the game but I suppose that's what happens with a brand new chip generation coming out. A few regression fixes, some last minute fixes for new P8 features such as transactional memory,... There's also one powerpc KVM patch that I requested that adds two missing functions to our in-kernel interrupt controller support which is itself a new 3.10 feature. These are defined by the base hypervisor specification. We didn't implement them originally because Linux doesn't use them but they are simple and I'm not comfortable having a half-implemented interface in 3.10 and having to deal with versionning etc... later when something starts needing those calls. They cannot be emulated in qemu when using in-kernel interrupt controller (not enough shared state). Just added a last minute patch to fix a typo introducing a breakage in our cputable for Power7+ processors, sorry about that, but the regression it fixes just hurt me :-) Sorry about that.. Cheers, Ben. The following changes since commit 58f8bbd2e39c3732c55698494338ee19a92c53a0: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2013-05-28 10:11:34 -0700) 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 badec11b645e21acbc2411d7759e3efa559af443: powerpc/cputable: Fix typo on P7+ cputable entry (2013-06-01 09:30:03 +1000) Aneesh Kumar K.V (1): powerpc/mm: Always invalidate tlb on hpte invalidate and update Kevin Hao (2): powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges Michael Ellerman (2): powerpc/perf: Revert to original NO_SIPR logic powerpc/perf: Add missing SIER support Michael Neuling (7): powerpc/tm: Make room for hypervisor in abort cause codes powerpc/tm: Update cause codes documentation powerpc/tm: Abort on emulation and alignment faults powerpc/tm: Move TM abort cause codes to uapi powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions powerpc/pseries: Kill all prefetch streams on context switch powerpc/pseries: Improve stream generation comments in copypage/user Nishanth Aravamudan (1): powerpc/cputable: Fix oprofile_cpu_type on power8 Paul Mackerras (1): powerpc/kvm/book3s: Add support for H_IPOLL and H_XIRR_X in XICS emulation Priyanka Jain (1): powerpc/32bit:Store temporary result in r0 instead of r8 Srivatsa S. Bhat (1): powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP Will Schmidt (1): powerpc/cputable: Fix typo on P7+ cputable entry chenhui zhao (1): powerpc/mpic: Fix irq distribution problem when MPIC_SINGLE_DEST_CPU Documentation/powerpc/transactional_memory.txt | 27 +- arch/powerpc/include/asm/hvcall.h |1 + arch/powerpc/include/asm/ppc_asm.h | 11 arch/powerpc/include/asm/processor.h | 13 ++--- arch/powerpc/include/asm/reg.h | 11 arch/powerpc/include/asm/signal.h |3 ++ arch/powerpc/include/asm/tm.h |2 + arch/powerpc/include/uapi/asm/Kbuild |1 + arch/powerpc/include/uapi/asm/tm.h | 18 +++ arch/powerpc/kernel/cputable.c |6 +-- arch/powerpc/kernel/entry_32.S |2 +- arch/powerpc/kernel/entry_64.S |7 +++ arch/powerpc/kernel/pci-common.c | 14 + arch/powerpc/kernel/signal.c | 40 +- arch/powerpc/kernel/signal.h |2 +- arch/powerpc/kernel/signal_32.c| 10 +--- arch/powerpc/kernel/signal_64.c| 23 +++- arch/powerpc/kernel/traps.c| 29 ++ arch/powerpc/kvm/book3s_hv.c |2 + arch/powerpc/kvm/book3s_pr_papr.c |2 + arch/powerpc/kvm/book3s_xics.c | 29 ++ arch/powerpc/lib/copypage_power7.S | 19 --- arch/powerpc/lib/copyuser_power7.S | 12 +++-- arch/powerpc/mm/hash_native_64.c | 30 --- arch/powerpc/perf/core-book3s.c| 67 +++- arch/powerpc/platforms/pseries/Kconfig |2 + arch/powerpc/sysdev/mpic.c |4 +- 27 files changed, 262 insertions(+), 125 deletions(-) create mode 100644 arch/powerpc/include/uapi/asm/tm.h ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Jan 28, 2013 at 4:09 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: It wasn't meant to be snarky, sorry about that... I'm kidding, I'm kidding, you can be as snarky as you want. It's not like I'm some fragile flower. My usual problem with git request-pull when the mirror haven't caught up yet. Branch is merge. Ok, I see it. Pulled and pushed out, Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, Jan 29, 2013 at 1:09 AM, Benjamin Herrenschmidt
b...@kernel.crashing.org wrote:
On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote:
I'll have you know that I haven't quite even left for Au yet, and I
have LCA before diving. So no snarky in between dives comments,
please.
It wasn't meant to be snarky, sorry about that...
Sharky? Sorry, couldn't resist.
Gr{oetje,eeting}s,
Poor Geert without sun, dives, and sharks
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Jan 28, 2013 at 3:42 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Whenever you have a chance between two dives, you might want to consider pulling my merge branch to pickup a few fixes for 3.8 that have been accumulating for the last couple of weeks (I was myself travelling then on vacation). I'll have you know that I haven't quite even left for Au yet, and I have LCA before diving. So no snarky in between dives comments, please. At least not for a few days. git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Nothing there. Forgot to push? Or some unnamed branch/tag? (And I _am_ leaving for the airport soon, so I may not get to it for a while unless you reply asap) Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote: I'll have you know that I haven't quite even left for Au yet, and I have LCA before diving. So no snarky in between dives comments, please. It wasn't meant to be snarky, sorry about that... At least not for a few days. git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Nothing there. Forgot to push? Or some unnamed branch/tag? My usual problem with git request-pull when the mirror haven't caught up yet. Branch is merge. (And I _am_ leaving for the airport soon, so I may not get to it for a while unless you reply asap) Have a good trip ! Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2013-01-03 at 17:13 +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Here are a couple of small powerpc fixes. They aren't new bugs (and they are both CCed to stable) but I didn't see the point of sitting on the fixes any longer. Looks like I still need to fix my script to get the branch name right for when the mirrors haven't caught up... It's git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
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(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
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(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: First, however, a note about the pull request details ... the diffstat looks completely on crack, any idea what's up ? It sees piles of files modified in various other archs generic code but I see no patch in that branch that touches any of them. So this happens if you have reverse merges (ie you've pulled my tree, or some other tree I've pulled), and there is no longer a single clear common point that you started from. In that case, there is no simple diff for the what has changed since that original point, and to get the diff for the merge you actually have to do the merge and check the end result. git-request-pull doesn't do that, it just assumes it's the simple case of some single common point. The fact that you haven't seen it until now just means that you've generally done a good job at keeping your powerpc tree clean from other trees, and containing only your own work. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: The following changes since commit 271fd03a3013b106ccc178d54219c1be0c9759b7: powerpc/powernv: I/O and memory alignment for P2P bridges (2012-09-11 16:59:47 -0600) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Hmm. There's nothing there. Did you mean for me to pull some branch/tag you didn't mention? Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2012-10-04 at 09:00 -0700, Linus Torvalds wrote: So this happens if you have reverse merges (ie you've pulled my tree, or some other tree I've pulled), and there is no longer a single clear common point that you started from. In that case, there is no simple diff for the what has changed since that original point, and to get the diff for the merge you actually have to do the merge and check the end result. git-request-pull doesn't do that, it just assumes it's the simple case of some single common point. That was more/less my guess. Thanks. The fact that you haven't seen it until now just means that you've generally done a good job at keeping your powerpc tree clean from other trees, and containing only your own work. Heh, yeah I try to :-) In this specific case, this was a topic branch from Bjorn which some pre-requisite patches to the generic PCI code that Gavin did to allow us to get rid of some custom resource allocation crap, so the getting rid of had a dependency on that topic branch. Unfortunately, Bjorn had also based that branch on top of some larger cleanup patch so I ended up pulling that as well from him, which tripped the whole thing. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2012-10-04 at 09:02 -0700, Linus Torvalds wrote: Hmm. There's nothing there. Did you mean for me to pull some branch/tag you didn't mention? Heh, yeah, the mirrors hadn't updated yet so git request-pull didn't put the branch name in. It's common but I usually fix it up by hand. Since I was probably too tired for thinking straight, I forgot that and forgot to put the proper branch name in the email subject as well... argh :-) It's in my next branch. Mirrors should be good by now, it's at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next Sorry for the misshap. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2012-09-05 at 16:12 +1000, Benjamin Herrenschmidt wrote: The following changes since commit 5b716ac728bcc01b1f2a7ed6e437196602237c27: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (2012-09-02 11:30:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Little glitch, the mirrors hadn't caught up yet when I use git request-pull so it didn't append the branch name. It's merge as the subject implies. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
[ Added defconfig updates from Kim to fix NFS boot on yocto ] The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to 1267643dc311e860e728dbd09a97c2e0a773bfdb: powerpc/fsl: fix Failed to mount /dev: No such device errors (2012-08-23 10:46:20 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host Kim Phillips (2): powerpc/fsl: update defconfigs powerpc/fsl: fix Failed to mount /dev: No such device errors Shengzhou Liu (1): powerpc/p4080ds: dts - add usb controller version info and port0 Tiejun Chen (1): booke/wdt: some ioctls do not return values properly Zhao Chenhui (1): powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS arch/powerpc/boot/dts/fsl/p4080si-post.dtsi |7 ++ arch/powerpc/configs/85xx/p1023rds_defconfig | 31 arch/powerpc/configs/corenet32_smp_defconfig | 29 +++--- arch/powerpc/configs/corenet64_smp_defconfig |1 + arch/powerpc/configs/mpc83xx_defconfig | 18 -- arch/powerpc/configs/mpc85xx_defconfig | 33 +++--- arch/powerpc/configs/mpc85xx_smp_defconfig | 32 +++-- arch/powerpc/sysdev/fsl_pci.c| 13 ++ drivers/watchdog/booke_wdt.c |7 +++--- 9 files changed, 60 insertions(+), 111 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
Ben, Added a watchdog fix. - k The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to 127c6e731106a2071ee4a6c5a34c471cd3e719f0: booke/wdt: some ioctls do not return values properly (2012-08-17 09:03:51 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host Shengzhou Liu (1): powerpc/p4080ds: dts - add usb controller version info and port0 Tiejun Chen (1): booke/wdt: some ioctls do not return values properly Zhao Chenhui (1): powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS arch/powerpc/boot/dts/fsl/p4080si-post.dtsi |7 +++ arch/powerpc/configs/mpc85xx_defconfig |1 + arch/powerpc/sysdev/fsl_pci.c | 13 - drivers/watchdog/booke_wdt.c|7 +++ 4 files changed, 19 insertions(+), 9 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
Ben, Poke. :) - k On Aug 10, 2012, at 8:07 AM, Kumar Gala wrote: Ben, Two updates from last week (one dts bug fix, one minor defconfig update) - k The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to 09a3017a585eb8567a7de15b426bb1dfb548bf0f: powerpc/p4080ds: dts - add usb controller version info and port0 (2012-08-10 07:47:02 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host Shengzhou Liu (1): powerpc/p4080ds: dts - add usb controller version info and port0 Zhao Chenhui (1): powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS arch/powerpc/boot/dts/fsl/p4080si-post.dtsi |7 +++ arch/powerpc/configs/mpc85xx_defconfig |1 + arch/powerpc/sysdev/fsl_pci.c | 13 - 3 files changed, 16 insertions(+), 5 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
Ben, Two updates from last week (one dts bug fix, one minor defconfig update) - k The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to 09a3017a585eb8567a7de15b426bb1dfb548bf0f: powerpc/p4080ds: dts - add usb controller version info and port0 (2012-08-10 07:47:02 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host Shengzhou Liu (1): powerpc/p4080ds: dts - add usb controller version info and port0 Zhao Chenhui (1): powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS arch/powerpc/boot/dts/fsl/p4080si-post.dtsi |7 +++ arch/powerpc/configs/mpc85xx_defconfig |1 + arch/powerpc/sysdev/fsl_pci.c | 13 - 3 files changed, 16 insertions(+), 5 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Aug 3, 2012, at 5:34 PM, Benjamin Herrenschmidt wrote: On Fri, 2012-08-03 at 08:39 -0500, Kumar Gala wrote: Ben, Weekly bug fix pull request. Well, Linus is on holiday so I don't think it makes sense for me to ask him to pull anything just yet... I'll put it in my tree some time next week and will send it along with whatever I have as well when it looks like he might be back :-) No problem, just trying to get into a weekly cadence of pull requests. - k Cheers, Ben. - k The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to c9f11c30374329a0d2a88cf05281ca49d8eca9ab: powerpc/fsl-pci: Only scan PCI bus if configured as a host (2012-08-03 08:25:52 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host arch/powerpc/sysdev/fsl_pci.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2012-08-03 at 08:39 -0500, Kumar Gala wrote: Ben, Weekly bug fix pull request. Well, Linus is on holiday so I don't think it makes sense for me to ask him to pull anything just yet... I'll put it in my tree some time next week and will send it along with whatever I have as well when it looks like he might be back :-) Cheers, Ben. - k The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge for you to fetch changes up to c9f11c30374329a0d2a88cf05281ca49d8eca9ab: powerpc/fsl-pci: Only scan PCI bus if configured as a host (2012-08-03 08:25:52 -0500) Jia Hongtao (1): powerpc/fsl-pci: Only scan PCI bus if configured as a host arch/powerpc/sysdev/fsl_pci.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
--- On Mon, 7/2/12, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: From: Benjamin Herrenschmidt b...@kernel.crashing.org Subject: Re: [git pull] Please pull powerpc.git merge branch To: Gerhard Pircher gerhard_pirc...@gmx.net Cc: linuxppc-dev list linuxppc-...@ozlabs.org Date: Monday, July 2, 2012, 3:20 PM On Mon, 2012-07-02 at 23:38 +0200, Gerhard Pircher wrote: What about this fix:? http://patchwork.ozlabs.org/patch/166346/ At least I can't see it in the log... The module fix went in. The ftrace patch, well, it's untested and we don't even know if we have a problem with mcount yet, so no, I haven't merged it yet. Cheers, Ben. I have had a chance to test this patch. Before it is applied I get the following message when loading a module: Not a trampoline [ cut here ] WARNING: at /src/git/linux-powerpc/kernel/trace/ftrace.c:1583 Modules linked in: gpio_w1_transport(O+) NIP: c008129c LR: c0082138 CTR: c021d744 REGS: c532dd80 TRAP: 0700 Tainted: G O (3.4.3-2-g23fc8c3) MSR: 00029032 EE,ME,IR,DR,RI CR: 22082282 XER: 2000 TASK = c5256900[363] 'insmod' THREAD: c532c000 GPR00: 0001 c532de30 c5256900 ffea c907b008 c046befc 20747261 GPR08: c046be40 c045c862 8000 22082224 10019fdc 100f GPR16: 100f5678 100dc70c eac3ec00 c0011bb0 c046890c GPR24: c907b008 c70d8f80 c0443d0c c5338000 000c c907b008 c049a910 NIP [c008129c] ftrace_bug+0xc0/0x25c LR [c0082138] ftrace_process_locs+0x47c/0x608 Call Trace: [c532de30] [c008fe04] ftrace_now+0x38/0x78 (unreliable) [c532de50] [c0082138] ftrace_process_locs+0x47c/0x608 [c532dea0] [c008232c] ftrace_module_notify+0x68/0x7c [c532deb0] [c004cd80] notifier_call_chain+0x90/0xe0 [c532dee0] [c004d27c] __blocking_notifier_call_chain+0x68/0x94 [c532df10] [c004d2cc] blocking_notifier_call_chain+0x24/0x34 [c532df20] [c0073b38] sys_init_module+0xa0/0x1e0 [c532df40] [c0011254] ret_from_syscall+0x0/0x38 --- Exception: c01 at 0xff5d694 LR = 0x1cd4 Instruction dump: 90090008 48294b71 3c60c03c 7fc4f378 7fc5f378 3863874c 48294b5d 48000188 3d20c046 3929c862 88090003 6801 0f00 2f80 409e0148 3d20c001 ---[ end trace aaa9b56024f9d2b9 ]--- ftrace failed to modify [c907b008] gpio_w1_reset_bus+0x8/0xc0 [gpio_w1_transport] actual: 48:00:04:99 and the trace file dump results in: # tracer: nop # # WARNING: FUNCTION TRACING IS CORRUPTED # MAY BE MISSING FUNCTION EVENTS # entries-in-buffer/entries-written: 0/0 #P:1 # # _-= irqs-off # / _= need-resched #| / _---= hardirq/softirq #|| / _--= preempt-depth #||| / delay # TASK-PID CPU# TIMESTAMP FUNCTION # | | | | | after the patch is applied I get no messages on module loading and ftrace no longer complains, and I can trace my module's functions. So I can add Tested-By: Roger Blofeld blofel...@yahoo.com -rb ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Original-Nachricht Datum: Mon, 02 Jul 2012 14:57:39 +1000 Von: Benjamin Herrenschmidt b...@kernel.crashing.org An: Linus Torvalds torva...@linux-foundation.org CC: linuxppc-dev list linuxppc-...@ozlabs.org, Andrew Morton a...@linux-foundation.org, Linux Kernel list linux-ker...@vger.kernel.org Betreff: [git pull] Please pull powerpc.git merge branch Hi Linus Here are two more fixes that I missed when scrubbing patchwork last week which are worth still having in 3.5. What about this fix:? http://patchwork.ozlabs.org/patch/166346/ At least I can't see it in the log... br, Gerhard ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2012-07-02 at 23:38 +0200, Gerhard Pircher wrote: What about this fix:? http://patchwork.ozlabs.org/patch/166346/ At least I can't see it in the log... The module fix went in. The ftrace patch, well, it's untested and we don't even know if we have a problem with mcount yet, so no, I haven't merged it yet. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Here are a few powerpc fixes. Arguably some of this should have come to you earlier but I'm only just catching up after my medical leave. Mostly these fixes regressions, a couple are long standing bugs. Benh, This should probably go up now too: http://patchwork.ozlabs.org/patch/167270/ Do you want me to send it separate from that series? Mikey ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, 2012-07-01 at 20:50 +1000, Michael Neuling wrote: Here are a few powerpc fixes. Arguably some of this should have come to you earlier but I'm only just catching up after my medical leave. Mostly these fixes regressions, a couple are long standing bugs. Benh, This should probably go up now too: http://patchwork.ozlabs.org/patch/167270/ Do you want me to send it separate from that series? Looks like it needs to go to -stable all the way down to 3.2... I'll send it tomorrow with the appropriate tags. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
Ben, Dropped the P1020RDB device tree patch as it was for the wrong board revision and pulled in some additional usb device tree fixes. - k The following changes since commit c2bc3a316a7281f67e36b34dac2802cbe36a9128: Merge branch 'x86/rdrand' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2012-01-16 18:23:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Jerry Huang (1): powerpc/85xx: Fix cmd12 bug and add the chip compatible for eSDHC Julia Lawall (1): arch/powerpc/sysdev/fsl_pci.c: add missing iounmap Michael Neuling (1): powerpc: fix compile error with 85xx/p1022_ds.c Ramneek Mehresh (2): powerpc/85xx: Enable USB2 controller node for P1020RDB powerpc/85xx: Add dr_mode property in USB nodes arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi |4 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi |3 ++- arch/powerpc/boot/dts/fsl/p1020si-post.dtsi |4 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi |3 ++- arch/powerpc/boot/dts/fsl/p2020si-post.dtsi |4 arch/powerpc/boot/dts/p1020rdb.dtsi | 13 ++--- arch/powerpc/boot/dts/p1021mds.dts|3 ++- arch/powerpc/boot/dts/p2020ds.dtsi|3 ++- arch/powerpc/boot/dts/p2020rdb.dts|3 ++- arch/powerpc/platforms/85xx/p1022_ds.c|1 + arch/powerpc/sysdev/fsl_pci.c |5 +++-- 11 files changed, 32 insertions(+), 14 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Jan 13, 2012, at 12:21 AM, Benjamin Herrenschmidt wrote: Hi Linus ! Please pull this couple of important bug fixes (a commit that went in breaks booting on some machines, this fixes it properly). Thanks ! Cheers, Ben. The following changes since commit 7b3480f8b701170c046e1ed362946f5f0d005e13: Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6 (2012-01-10 13:45:22 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Anton Blanchard (1): powerpc: Fix RCU idle and hcall tracing Li Zhong (1): powerpc: Fix unpaired __trace_hcall_entry and __trace_hcall_exit arch/powerpc/kernel/idle.c | 12 ++-- arch/powerpc/platforms/pseries/hvCall.S |3 ++- arch/powerpc/platforms/pseries/lpar.c | 14 ++ 3 files changed, 14 insertions(+), 15 deletions(-) Ben, This doesnt appear to have the compile fix for p1022_ds.c. - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2012-01-16 at 13:21 -0600, Kumar Gala wrote: This doesnt appear to have the compile fix for p1022_ds.c. I must have pulled it into the wrong branch or something... I'll do a new one after LCA. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
Ben, Pulled in a bunch of other minor fixes that have been sitting around for a while. - k The following changes since commit caca6a03d365883564885f2c1da3e88dcf65d139: Linux 3.2-rc3 (2011-11-23 20:20:28 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Alexandre Rusev (1): powerpc/fsl-lbc: Fix for fsl_upm Joakim Tjernlund (1): powerpc/qe: Fixup QE_General4 errata Julia Lawall (1): arch/powerpc/sysdev/ehv_pic.c: add missing kfree Kumar Gala (1): powerpc/85xx: Fix compile error on p3060_qds.c Paul Bolle (1): powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO' Roy Zang (1): powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe Shaohui Xie (1): drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac arch/powerpc/boot/dts/p1023rds.dts | 17 + arch/powerpc/platforms/85xx/Kconfig |2 +- arch/powerpc/platforms/85xx/p3060_qds.c |2 +- arch/powerpc/sysdev/ehv_pic.c |1 + arch/powerpc/sysdev/fsl_lbc.c |1 + arch/powerpc/sysdev/qe_lib/qe.c |2 +- drivers/edac/mpc85xx_edac.c |2 +- 7 files changed, 19 insertions(+), 8 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch (updated)
On Nov 23, 2011, at 11:03 PM, Kumar Gala wrote: Ben, A few minor fixes for FSL PPC SoCs to send up to Linus. - k The following changes since commit caca6a03d365883564885f2c1da3e88dcf65d139: Linux 3.2-rc3 (2011-11-23 20:20:28 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Kumar Gala (1): powerpc/85xx: Fix compile error on p3060_qds.c Paul Bolle (1): powerpc/p3060qds: Fix select of 'MPC8xxx_GPIO' Roy Zang (1): powerpc/p1023: set IRQ[4:6,11] to active-high level sensitive for PCIe arch/powerpc/boot/dts/p1023rds.dts | 17 + arch/powerpc/platforms/85xx/Kconfig |2 +- arch/powerpc/platforms/85xx/p3060_qds.c |2 +- 3 files changed, 15 insertions(+), 6 deletions(-) (updated 'merge' with): Joakim Tjernlund (1): powerpc/qe: Fixup QE_General4 errata arch/powerpc/sysdev/qe_lib/qe.c |2 +- - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 2011-11-08 at 15:21 +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Me again :-) So yesterday you pulled my -next branch with the bulk of what happened since the last merge window up to when I left for my long vacation (5 weeks). Today are a few remaining nits that happened during that time. .. Add added a build fix (the defconfig change enables KVM which hits a compile problem with some config combinations) so new pull request bellow. Sorry about that. Cheers, Ben. The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5: Linux 3.2-rc1 (2011-11-07 16:16:02 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Alexander Graf (1): powerpc/kvm: Fix build failure with HV KVM and CBE Anton Blanchard (1): powerpc: Add System RAM to /proc/iomem Benjamin Herrenschmidt (1): Merge remote-tracking branch 'agust/next' into merge Dipankar Sarma (1): powerpc/numa: NUMA topology support for PowerNV Geoff Levand (2): powerpc/ps3: Fix PS3 repository build warnings powerpc/ps3: Fix lv1_gpu_attribute hcall Heiko Schocher (2): powerpc/5200: add support for charon board powerpc, tqm5200: update tqm5200_defconfig to fit for charon board. Michael Neuling (1): powerpc: Add KVM as module to defconfigs Nishanth Aravamudan (1): powerpc/kvm: Fix build with older toolchains Yong Zhang (2): powerpc/irq: Remove IRQF_DISABLED powerpc/ps3: irq: Remove IRQF_DISABLED arch/powerpc/boot/dts/charon.dts | 236 arch/powerpc/configs/52xx/tqm5200_defconfig| 20 ++- arch/powerpc/configs/ppc64_defconfig |4 + arch/powerpc/configs/pseries_defconfig |4 + arch/powerpc/include/asm/floppy.h |4 +- arch/powerpc/include/asm/lv1call.h |2 +- arch/powerpc/include/asm/xics.h|4 +- arch/powerpc/kernel/exceptions-64s.S |6 +- arch/powerpc/kernel/smp.c |2 +- arch/powerpc/kvm/book3s_hv_rmhandlers.S|2 +- arch/powerpc/mm/mem.c | 30 +++ arch/powerpc/mm/numa.c | 24 ++- arch/powerpc/platforms/52xx/mpc5200_simple.c |1 + arch/powerpc/platforms/cell/beat.c |2 +- arch/powerpc/platforms/cell/celleb_scc_pciex.c |2 +- arch/powerpc/platforms/cell/iommu.c|3 +- arch/powerpc/platforms/cell/pmu.c |2 +- arch/powerpc/platforms/cell/spu_base.c |9 +- arch/powerpc/platforms/powermac/pic.c |1 - arch/powerpc/platforms/powermac/smp.c |4 +- arch/powerpc/platforms/ps3/device-init.c |2 +- arch/powerpc/platforms/ps3/repository.c| 32 ++-- arch/powerpc/sysdev/mpic.c |2 - arch/powerpc/sysdev/ppc4xx_soc.c |2 +- arch/powerpc/sysdev/xics/xics-common.c |5 +- drivers/ps3/ps3-vuart.c|2 +- drivers/ps3/ps3stor_lib.c |2 +- sound/ppc/snd_ps3.c|2 +- 28 files changed, 346 insertions(+), 65 deletions(-) create mode 100644 arch/powerpc/boot/dts/charon.dts ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, Aug 10, 2011 at 8:27 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a few fixes for powerpc. Mostly innocuous stuff, in fact most of it has been in my tree for a while, I just hadn't got a chance to actually send it as I was travelling. Cheers, Ben. The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED.. What branch? Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2011-08-10 at 11:07 -0700, Linus Torvalds wrote: On Wed, Aug 10, 2011 at 8:27 AM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Here are a few fixes for powerpc. Mostly innocuous stuff, in fact most of it has been in my tree for a while, I just hadn't got a chance to actually send it as I was travelling. Cheers, Ben. The following changes since commit 53d1e658df6e26d62500410719aaee2b82067c03: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-08-04 06:37:07 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED.. What branch? Heh oops, sorry, the mirror hadn't caught up. It's in the subject of the email tho :-) merge is the branch. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, May 20, 2011 at 9:35 AM, Kumar Gala ga...@kernel.crashing.org wrote: Shaohui Xie (2): powerpc/fsl_rio: move machine_check handler This patch causes a build failure if CONFIG_FSL_RIO is not defined: arch/powerpc/kernel/built-in.o: In function `machine_check_e500mc': /home/b04825/git/linux.hv/arch/powerpc/kernel/traps.c:429: undefined reference to `fsl_rio_mcheck_exception' arch/powerpc/kernel/built-in.o: In function `machine_check_e500': /home/b04825/git/linux.hv/arch/powerpc/kernel/traps.c:519: undefined reference to `fsl_rio_mcheck_exception' -- Timur Tabi Linux kernel developer at Freescale ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 27, 2011, at 1:55 AM, Benjamin Herrenschmidt wrote: Hi Linus ! Here's the 3 patches Kumar was complaining I forgot to pull :-) Two are pretty old patches related to FSL RapidIO stuff, and one is a bug fix. Cheers, Ben. Thanks. I know I'm a pain ;) - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 26, 2011, at 12:22 AM, Benjamin Herrenschmidt wrote: Hi Linus ! This is a bit more than I expected to send you that late in the merge window, but hopefully none of it should be problematic. A couple of patches were simply delayed due to misunderstandings as to which tree they should go through (4xx MSI and ftrace). There's a generic patch to linux/smp.h which removes some definitions that as far as we can tell aren't used anywhere anymore (we just removed the last use in powerpc in my previous pull request). The rest is either good enough bug fixes (in large part regressions), with a couple more cleanups from Milton on top of his big series that I merged earlier. Cheers, Ben. The following changes since commit 3f5785ec31adcb7cafa9135087297a38d9698cf8: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2011-05-25 17:00:17 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git ..BRANCH.NOT.VERIFIED.. Brian King (1): powerpc/pseries: Update MAX_HCALL_OPCODE to reflect page coalescing Eric B Munson (1): powerpc/oprofile: Handle events that raise an exception without overflowing Ian Munsie (1): powerpc/ftrace: Implement raw syscall tracepoints on PowerPC Milton Miller (8): Remove unused MSG_ flags in linux/smp.h powerpc/cell: Use common smp ipi actions powerpc/cell: Rename ipi functions to match current abstractions powerpc/irq: Remove stale and misleading comment powerpc/irq: Always free duplicate IRQ_LEGACY hosts powerpc/irq: Check desc in handle_one_irq and expand generic_handle_irq powerpc/irq: Protect irq_radix_revmap_lookup against irq_free_virt powerpc: Fix irq_free_virt by adjusting bounds before loop Rupjyoti Sarmah (1): powerpc/4xx: Adding PCIe MSI support Ben, Did you ignore my pull request with a bug fix and two long standing RIO patches? - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2011-05-26 at 09:02 -0500, Kumar Gala wrote: Ben, Did you ignore my pull request with a bug fix and two long standing RIO patches? I suppose I did ... oops :-) I'll send that today. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
When I try to build 'next' (now at 208b3a4c), it does not compile due
to a change from the following commit.
Benjamin Herrenschmidt (1):
powerpc/smp: Make start_secondary_resume available to all CPU variants
I would appreciate your help in getting this fixed...
Thanks,
Richard
PS the error looks like this:
AS arch/powerpc/kernel/misc_32.o
arch/powerpc/kernel/misc_32.S: Assembler messages:
arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
make[1]: *** [arch/powerpc/kernel] Error 2
${CROSS_COMPILE}gcc -v
Using built-in specs.
Target: powerpc-none-linux-gnuspe
Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe
--host=i686-pc-linux-gnu
--prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe
--with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc
--disable-libssp --disable-libmudflap --disable-libstdcxx-pch --enable-libgomp
--enable-shared --enable-threads --enable-languages=c,c++
--with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr
--with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548
--with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit
--enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128
--disable-nls --enable-e500_double
Thread model: posix
gcc version 4.3.2 (GCC)
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote: When I try to build 'next' (now at 208b3a4c), it does not compile due to a change from the following commit. Benjamin Herrenschmidt (1): powerpc/smp: Make start_secondary_resume available to all CPU variants I would appreciate your help in getting this fixed... Could you try the patch below? Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S, however it uses a 64-bit instruction which is not valid on 32-bit platforms. Use 'stw' instead. Reported-by: Richard Cochran richardcoch...@gmail.com Signed-off-by: Josh Boyer jwbo...@linux.vnet.ibm.com --- diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 402560e..998a100 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume) rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ addir1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD li r3,0 - std r3,0(r1)/* Zero the stack frame pointer */ + stw r3,0(r1)/* Zero the stack frame pointer */ bl start_secondary b . #endif /* CONFIG_SMP */ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote: On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote: When I try to build 'next' (now at 208b3a4c), it does not compile due to a change from the following commit. Benjamin Herrenschmidt (1): powerpc/smp: Make start_secondary_resume available to all CPU variants I would appreciate your help in getting this fixed... Could you try the patch below? Yes, and it both compiles and boots. Thanks, Richard Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S, however it uses a 64-bit instruction which is not valid on 32-bit platforms. Use 'stw' instead. Reported-by: Richard Cochran richardcoch...@gmail.com Signed-off-by: Josh Boyer jwbo...@linux.vnet.ibm.com --- diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 402560e..998a100 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume) rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ addir1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD li r3,0 - std r3,0(r1)/* Zero the stack frame pointer */ + stw r3,0(r1)/* Zero the stack frame pointer */ bl start_secondary b . #endif /* CONFIG_SMP */ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote: On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote: On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote: When I try to build 'next' (now at 208b3a4c), it does not compile due to a change from the following commit. Benjamin Herrenschmidt (1): powerpc/smp: Make start_secondary_resume available to all CPU variants I would appreciate your help in getting this fixed... Could you try the patch below? Yes, and it both compiles and boots. Thanks for testing! Ben, can you pull this patch in as-is (fixing up the Subject), or do you need me to resubmit it? josh Commit 69e3cea8d5fd526 introduced start_secondary_resume to misc_32.S, however it uses a 64-bit instruction which is not valid on 32-bit platforms. Use 'stw' instead. Reported-by: Richard Cochran richardcoch...@gmail.com Signed-off-by: Josh Boyer jwbo...@linux.vnet.ibm.com --- diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 402560e..998a100 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -700,7 +700,7 @@ _GLOBAL(start_secondary_resume) rlwinm r1,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ addir1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD li r3,0 -std r3,0(r1)/* Zero the stack frame pointer */ +stw r3,0(r1)/* Zero the stack frame pointer */ bl start_secondary b . #endif /* CONFIG_SMP */ ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 20, 2011, at 9:46 AM, Josh Boyer wrote: On Fri, May 20, 2011 at 04:32:59PM +0200, Richard Cochran wrote: On Fri, May 20, 2011 at 09:58:45AM -0400, Josh Boyer wrote: On Fri, May 20, 2011 at 03:23:29PM +0200, Richard Cochran wrote: When I try to build 'next' (now at 208b3a4c), it does not compile due to a change from the following commit. Benjamin Herrenschmidt (1): powerpc/smp: Make start_secondary_resume available to all CPU variants I would appreciate your help in getting this fixed... Could you try the patch below? Yes, and it both compiles and boots. Thanks for testing! Ben, can you pull this patch in as-is (fixing up the Subject), or do you need me to resubmit it? Yeah, we need this all so we can send it to stable for 2.6.39.1 - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2011-05-20 at 15:23 +0200, Richard Cochran wrote:
On Thu, May 19, 2011 at 02:06:18PM +1000, Benjamin Herrenschmidt wrote:
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
When I try to build 'next' (now at 208b3a4c), it does not compile due
to a change from the following commit.
Benjamin Herrenschmidt (1):
powerpc/smp: Make start_secondary_resume available to all CPU variants
I would appreciate your help in getting this fixed...
It's me being a moron. I'll send a fix to Linus.
Cheers,
Ben.
Thanks,
Richard
PS the error looks like this:
AS arch/powerpc/kernel/misc_32.o
arch/powerpc/kernel/misc_32.S: Assembler messages:
arch/powerpc/kernel/misc_32.S:703: Error: Unrecognized opcode: `std'
make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
make[1]: *** [arch/powerpc/kernel] Error 2
${CROSS_COMPILE}gcc -v
Using built-in specs.
Target: powerpc-none-linux-gnuspe
Configured with: ../gcc-4.3.2/configure --target=powerpc-none-linux-gnuspe
--host=i686-pc-linux-gnu
--prefix=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe
--with-sysroot=/opt/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe/libc
--disable-libssp --disable-libmudflap --disable-libstdcxx-pch
--enable-libgomp --enable-shared --enable-threads --enable-languages=c,c++
--with-gmp=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr
--with-mpfr=/usr/src/redhat/BUILD/csl-tc-4.3.74/host-libs/usr --with-cpu=8548
--with-gnu-as --with-gnu-ld --enable-symvers=gnu --enable-__cxa_atexit
--enable-cxx-flags=-mcpu=8548 --disable-multilib --with-long-double-128
--disable-nls --enable-e500_double
Thread model: posix
gcc version 4.3.2 (GCC)
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Dunno if it's too late or not yet but here's 3 fixes for powerpc that would be welcome to have in before the release. If not I'll send them first thing next (one of them is already in -next in fact). Gah. I just cut 2.6.39. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
From: Linus Torvalds torva...@linux-foundation.org Date: Wed, 18 May 2011 21:11:47 -0700 On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Dunno if it's too late or not yet but here's 3 fixes for powerpc that would be welcome to have in before the release. If not I'll send them first thing next (one of them is already in -next in fact). Gah. I just cut 2.6.39. I know we can't let these things go forever, but in my opinion we should have given this one or two more -rc's. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2011-05-18 at 21:11 -0700, Linus Torvalds wrote: On Wed, May 18, 2011 at 9:06 PM, Benjamin Herrenschmidt b...@kernel.crashing.org wrote: Dunno if it's too late or not yet but here's 3 fixes for powerpc that would be welcome to have in before the release. If not I'll send them first thing next (one of them is already in -next in fact). Gah. I just cut 2.6.39. Bah, no biggie. I'll stick some CC: stable and put them in -next :-) Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 18, 2011, at 11:06 PM, Benjamin Herrenschmidt wrote: Hi Linus Dunno if it's too late or not yet but here's 3 fixes for powerpc that would be welcome to have in before the release. If not I'll send them first thing next (one of them is already in -next in fact). Those are regression fixes and a build breakage. Cheers, Ben. The following changes since commit fce519588acfac249e8fdc1f5016c73d617de315: Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-05-18 13:25:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Ben Hutchings (1): powerpc/kexec: Fix build failure on 32-bit SMP Benjamin Herrenschmidt (1): powerpc/smp: Make start_secondary_resume available to all CPU variants kerstin jonsson (1): powerpc/4xx: Fix regression in SMP on 476 arch/powerpc/kernel/crash.c | 59 + arch/powerpc/kernel/head_32.S |9 -- arch/powerpc/kernel/misc_32.S | 11 +++ arch/powerpc/kernel/smp.c |4 +- 4 files changed, 43 insertions(+), 40 deletions(-) Can you pull this into next. - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Nov 21, 2010 at 6:05 PM, Michael Ellerman mich...@ellerman.id.au wrote: On Fri, 2010-11-19 at 17:02 +1100, Michael Neuling wrote: On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote: On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman mich...@ellerman.id.= au wrote: I vote for: =20 - Exception: 401 (Instruction Access) at f7937794 =20 Or: =20 =E2=98=9B Exception: 401 (Instruction Access) at f7937794 Let's get serious, it's _really_ like a phone call: =E2=98=8E Exception: 401 (Instruction Access) at f7937794 We need a dedicated NACK char! ␕! Surely it would be: ☣ josh ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 19 Nov 2010 16:44:18 +1100
Michael Ellerman mich...@ellerman.id.au wrote:
On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote:
On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman
mich...@ellerman.id.au wrote:
I vote for:
- Exception: 401 (Instruction Access) at f7937794
Or:
☛ Exception: 401 (Instruction Access) at f7937794
Let's get serious, it's _really_ like a phone call:
☎ Exception: 401 (Instruction Access) at f7937794
Sparc got it right:
void die_if_kernel(char *str, struct pt_regs *regs)
{
static int die_counter;
int count = 0;
/* Amuse the user. */
printk(
\\|/ \\|/\n
\@'/ .. \...@\\n
/_| \\__/ |_\\\n
\\__U_/\n);
-Scott
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-11-19 at 17:02 +1100, Michael Neuling wrote: On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote: On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman mich...@ellerman.id.= au wrote: I vote for: =20 - Exception: 401 (Instruction Access) at f7937794 =20 Or: =20 =E2=98=9B Exception: 401 (Instruction Access) at f7937794 Let's get serious, it's _really_ like a phone call: =E2=98=8E Exception: 401 (Instruction Access) at f7937794 We need a dedicated NACK char! ␕! signature.asc Description: This is a digitally signed message part ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Michael Neuling (1): powerpc: Fix call to subpage_protection() Well that's annoying... Looks like the bottom of my commit got chopped as the oops message has a --- in it. We lost the cc: sta...@kernel.org :-( Comparing the original post to the final commit: http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-November/087141.html To the final: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1c2c25c78740b2796c7c06640784cb6732fa4907 It'd be nice if we had something like this in: powerpc: fix debug prints to avoid --- Many commit tools assume anything below a line starting with --- is a comment. Since the following two prints are often used as debug outputs and hence in checkin comments avoid using --- in these Signed-off-by: Michael Neuling mi...@neuling.org --- Let the bike shedding begin! arch/powerpc/kernel/process.c |2 +- arch/powerpc/xmon/xmon.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6-ozlabs/arch/powerpc/kernel/process.c === --- linux-2.6-ozlabs.orig/arch/powerpc/kernel/process.c +++ linux-2.6-ozlabs/arch/powerpc/kernel/process.c @@ -1167,7 +1167,7 @@ struct pt_regs *regs = (struct pt_regs *) (sp + STACK_FRAME_OVERHEAD); lr = regs-link; - printk(--- Exception: %lx at %pS\nLR = %pS\n, + printk(=== Exception: %lx at %pS\nLR = %pS\n, regs-trap, (void *)regs-nip, (void *)lr); firstframe = 1; } Index: linux-2.6-ozlabs/arch/powerpc/xmon/xmon.c === --- linux-2.6-ozlabs.orig/arch/powerpc/xmon/xmon.c +++ linux-2.6-ozlabs/arch/powerpc/xmon/xmon.c @@ -1363,7 +1363,7 @@ sp + REGS_OFFSET); break; } -printf(--- Exception: %lx %s at , regs.trap, +printf(=== Exception: %lx %s at , regs.trap, getvecname(TRAP(regs))); pc = regs.nip; lr = regs.link; ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-11-19 at 08:42 +1100, Michael Neuling wrote: Michael Neuling (1): powerpc: Fix call to subpage_protection() Well that's annoying... Looks like the bottom of my commit got chopped as the oops message has a --- in it. We lost the cc: sta...@kernel.org :-( Comparing the original post to the final commit: http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-November/087141.html To the final: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1c2c25c78740b2796c7c06640784cb6732fa4907 LOL. It'd be nice if we had something like this in: powerpc: fix debug prints to avoid --- Many commit tools assume anything below a line starting with --- is a comment. Since the following two prints are often used as debug outputs and hence in checkin comments avoid using --- in these Signed-off-by: Michael Neuling mi...@neuling.org --- Let the bike shedding begin! I vote for: - Exception: 401 (Instruction Access) at f7937794 Because exceptions are like an arrow! signature.asc Description: This is a digitally signed message part ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote: On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman mich...@ellerman.id.au wrote: I vote for: - Exception: 401 (Instruction Access) at f7937794 Or: ☛ Exception: 401 (Instruction Access) at f7937794 Let's get serious, it's _really_ like a phone call: ☎ Exception: 401 (Instruction Access) at f7937794 cheers signature.asc Description: This is a digitally signed message part ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-11-19 at 16:31 +1100, Stephen Rothwell wrote: On Fri, 19 Nov 2010 09:08:02 +1100 Michael Ellerman mich...@ellerman.id.= au wrote: I vote for: =20 - Exception: 401 (Instruction Access) at f7937794 =20 Or: =20 =E2=98=9B Exception: 401 (Instruction Access) at f7937794 Let's get serious, it's _really_ like a phone call: =E2=98=8E Exception: 401 (Instruction Access) at f7937794 We need a dedicated NACK char! Mikey ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-10-08 at 11:04 -0500, Kumar Gala wrote: Ben, This isn't critical, but it does fix having the ppc64e_defconfig build cleanly. Doesn't matter, I'm putting it in -next. When is your -next branch btw ? It's overdue by 3 or 4 rc's already :-) Cheers, Ben. - k The following changes since commit 6b0cd00bc396daf5c2dcf17a8d82055335341f46: Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 (2010-10-07 13:59:32 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Kumar Gala (1): powerpc/ppc64e: Fix link problem when building ppc64e_defconfig arch/powerpc/platforms/85xx/smp.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, 2010-10-08 at 11:04 -0500, Kumar Gala wrote: Ben, This isn't critical, but it does fix having the ppc64e_defconfig build cleanly. BTW. Do you have a -next for me ? It's past time :-) Cheers, Ben. - k The following changes since commit 6b0cd00bc396daf5c2dcf17a8d82055335341f46: Merge branch 'hwpoison-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 (2010-10-07 13:59:32 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Kumar Gala (1): powerpc/ppc64e: Fix link problem when building ppc64e_defconfig arch/powerpc/platforms/85xx/smp.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 2010-08-31 at 15:56 +1000, Benjamin Herrenschmidt wrote: Hi Linus ! Here's a few small fixes, one is an important fix for a nasty regression breaking pseries machine running under hypervisor... oops ! I updated this with some embedded fixed from Kumar and a fix for a new deadlock in the pseries dlpar code. New log below. Cheers, Ben. The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c: Linus Torvalds (1): Linux 2.6.36-rc3 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Alexander Graf (1): powerpc/85xx: Fix compilation of mpc85xx_mds.c Anton Vorontsov (1): powerpc/85xx: Add P1021 PCI IDs and quirks Julia Lawall (2): arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap arch/powerpc/sysdev/qe_lib/qe.c: Add of_node_put to avoid memory leak Kumar Gala (1): powerpc/85xx: Fix compile issue with p1022_ds due to lmb rename to memblock Li Yang (1): fsl_rio: fix compile errors Matthew McClintock (1): powerpc/kexec: Adds correct calling convention for kexec purgatory Michael Neuling (1): powerpc: Don't use kernel stack with translation off Nathan Fontenot (1): powerpc/pseries: Correct rtas_data_buf locking in dlpar code Paul Mackerras (1): powerpc/perf_event: Reduce latency of calling perf_event_do_pending arch/powerpc/kernel/head_64.S | 12 ++-- arch/powerpc/kernel/misc_32.S |3 ++ arch/powerpc/kernel/time.c| 23 +++ arch/powerpc/platforms/83xx/mpc837x_mds.c |9 -- arch/powerpc/platforms/85xx/mpc85xx_mds.c |1 + arch/powerpc/platforms/85xx/p1022_ds.c|4 +- arch/powerpc/platforms/pseries/dlpar.c| 42 - arch/powerpc/sysdev/fsl_pci.c |2 + arch/powerpc/sysdev/fsl_rio.c |6 +++- arch/powerpc/sysdev/qe_lib/qe.c |1 + include/linux/pci_ids.h |2 + 11 files changed, 71 insertions(+), 34 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 13, 2010, at 11:28 PM, Kumar Gala wrote: The following changes since commit 131c6c9eddfa252e376edb4aeff9c7fe1b96a798: Benjamin Herrenschmidt (1): Merge commit 'kumar/merge' into merge are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Kumar Gala (1): powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace Li Yang (1): powerpc/fsl-booke: Fix InstructionTLBError execute permission check arch/powerpc/kernel/asm-offsets.c|8 arch/powerpc/kernel/head_fsl_booke.S | 13 ++--- arch/powerpc/mm/fsl_booke_mmu.c | 25 +++-- arch/powerpc/mm/mmu_decl.h | 10 +- arch/powerpc/mm/tlb_nohash_low.S | 28 5 files changed, 58 insertions(+), 26 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev I've just moved these into my next branch. Will send them to stable once they get pulled into .35. - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On May 12, 2010, at 2:46 AM, Benjamin Herrenschmidt wrote: Hi Linus ! Please pull this perf event fix from Paulus. Without it, using perf event can potentially oops the machine at any time. Thanks ! Cheers, Ben. The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8: Linus Torvalds (1): Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Paul Mackerras (1): powerpc/perf_event: Fix oops due to perf_event_do_pending call arch/powerpc/include/asm/hw_irq.h | 38 --- arch/powerpc/kernel/asm-offsets.c |1 - arch/powerpc/kernel/entry_64.S|9 - arch/powerpc/kernel/irq.c |6 arch/powerpc/kernel/time.c| 60 +--- 5 files changed, 48 insertions(+), 66 deletions(-) Ben, Did where you going to also send linus: http://patchwork.ozlabs.org/patch/51496/ - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2010-05-12 at 05:24 -0500, Kumar Gala wrote: Did where you going to also send linus: http://patchwork.ozlabs.org/patch/51496/ Forgot about that one... I'll add it to the pile tomorrow. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 2010-04-27 at 15:56 +1000, Benjamin Herrenschmidt wrote: Hi Linus ! PowerPC has been a bit quiet this time around :-) That is until Kumar woke me up with a few fixes and defconfig updates for the freescale embedded platforms. I added a few patches to that. Some ps3 defconfig maintainers change and a couple of nasty bug fixes. Here's an updated request. Cheers, Ben. The following changes since commit b91ce4d14a21fc04d165be30319541e0f9204f15: Linus Torvalds (1): Merge git://git.kernel.org/.../davem/net-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Anton Blanchard (1): powerpc/numa: Add form 1 NUMA affinity Anton Vorontsov (1): powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n Becky Bruce (1): powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS Benjamin Herrenschmidt (1): powerpc/pseries: Flush lazy kernel mappings after unplug operations Geoff Levand (2): powerpc/ps3: Update platform maintainer powerpc/ps3: Update ps3_defconfig Kim Phillips (4): powerpc/83xx: add RTC drivers in 83xx defconfig powerpc/83xx: enable EPOLL syscall in defconfig powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED Kumar Gala (2): powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32 Wolfgang Ocker (1): powerpc/fsl-cpm: Configure clock correctly for SCC MAINTAINERS |8 +- arch/powerpc/configs/83xx/asp8347_defconfig | 44 +++--- arch/powerpc/configs/83xx/kmeter1_defconfig | 28 ++-- arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 49 +++--- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 50 +++--- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 45 +++--- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 49 +++--- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 44 +++--- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 43 +++--- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 46 +++--- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 45 +++--- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 44 +++-- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 46 +++--- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 51 +++--- arch/powerpc/configs/83xx/sbc834x_defconfig | 44 +++--- arch/powerpc/configs/85xx/ksi8560_defconfig | 23 ++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 25 ++- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 34 +++-- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 31 +++-- arch/powerpc/configs/85xx/sbc8548_defconfig | 31 +++-- arch/powerpc/configs/85xx/sbc8560_defconfig | 25 ++- arch/powerpc/configs/85xx/socrates_defconfig | 51 --- arch/powerpc/configs/85xx/stx_gp3_defconfig | 51 --- arch/powerpc/configs/85xx/tqm8540_defconfig | 48 +++-- arch/powerpc/configs/85xx/tqm8541_defconfig | 54 -- arch/powerpc/configs/85xx/tqm8548_defconfig | 47 +++-- arch/powerpc/configs/85xx/tqm8555_defconfig | 54 -- arch/powerpc/configs/85xx/tqm8560_defconfig | 54 -- arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 59 +-- arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 102 +++- arch/powerpc/configs/86xx/gef_sbc310_defconfig| 53 --- arch/powerpc/configs/86xx/gef_sbc610_defconfig| 96 +++ arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 34 ++-- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 48 -- arch/powerpc/configs/86xx/sbc8641d_defconfig | 40 +++-- arch/powerpc/configs/adder875_defconfig | 18 +- arch/powerpc/configs/c2k_defconfig| 55 +++ arch/powerpc/configs/ep8248e_defconfig| 20 ++- arch/powerpc/configs/ep88xc_defconfig | 17 +- arch/powerpc/configs/linkstation_defconfig| 48 +++-- arch/powerpc/configs/mgcoge_defconfig | 31 +++- arch/powerpc/configs/mgsuvd_defconfig | 19 ++- arch/powerpc/configs/mpc7448_hpc2_defconfig | 26 ++- arch/powerpc/configs/mpc8272_ads_defconfig| 23 ++- arch/powerpc/configs/mpc83xx_defconfig| 124 +++--- arch/powerpc/configs/mpc85xx_defconfig| 62 +--- arch/powerpc/configs/mpc85xx_smp_defconfig| 64 +--- arch/powerpc/configs/mpc866_ads_defconfig | 20 +- arch/powerpc/configs/mpc86xx_defconfig| 57 --- arch/powerpc/configs/mpc885_ads_defconfig | 20 +- arch/powerpc/configs/pq2fads_defconfig| 22 ++- arch/powerpc/configs/prpmc2800_defconfig | 52 -- arch/powerpc/configs/ps3_defconfig| 189
Re: [git pull] Please pull powerpc.git merge branch
Hello Benjamin, Benjamin Herrenschmidt wrote: Hi Linus ! PowerPC has been a bit quiet this time around :-) That is until Kumar woke me up with a few fixes and defconfig updates for the freescale embedded platforms. I got no comments for the following patch: http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-March/081303.html Can this go in? Thanks bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 2010-04-27 at 12:48 +0200, Heiko Schocher wrote: Hello Benjamin, Benjamin Herrenschmidt wrote: Hi Linus ! PowerPC has been a bit quiet this time around :-) That is until Kumar woke me up with a few fixes and defconfig updates for the freescale embedded platforms. I got no comments for the following patch: http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-March/081303.html Can this go in? This is Kumar's call. However, it's definitely not something that can go in -rc5, we only take grave bugs / regression fixes at this stage. More like a candidate for -next. My -next branch is open, so it's up to Kumar to pick that up and send me something to pull from. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Ben, I've updated this to include this one additional patch for dealing with CONFIG_RELOCATE on FSL-BookE ppc32 http://patchwork.ozlabs.org/patch/51011/ - k On Apr 19, 2010, at 11:26 PM, Kumar Gala wrote: (Mostly defconfig updates, but a few minor bug fixes). The following changes since commit 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f: Linus Torvalds (1): Linux 2.6.34-rc5 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge Anton Vorontsov (1): powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n Becky Bruce (1): powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS Kim Phillips (4): powerpc/83xx: add RTC drivers in 83xx defconfig powerpc/83xx: enable EPOLL syscall in defconfig powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED Kumar Gala (1): powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx Wolfgang Ocker (1): powerpc/fsl-cpm: Configure clock correctly for SCC arch/powerpc/configs/83xx/asp8347_defconfig | 44 arch/powerpc/configs/83xx/kmeter1_defconfig | 28 +++-- arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 49 + arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 50 + arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 45 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 49 arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 44 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 43 arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 46 + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 45 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 44 --- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 46 + arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 51 + arch/powerpc/configs/83xx/sbc834x_defconfig | 44 arch/powerpc/configs/85xx/ksi8560_defconfig | 23 +++- arch/powerpc/configs/85xx/mpc8540_ads_defconfig | 25 +++-- arch/powerpc/configs/85xx/mpc8560_ads_defconfig | 34 -- arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | 31 -- arch/powerpc/configs/85xx/sbc8548_defconfig | 31 -- arch/powerpc/configs/85xx/sbc8560_defconfig | 25 +++-- arch/powerpc/configs/85xx/socrates_defconfig | 51 + arch/powerpc/configs/85xx/stx_gp3_defconfig | 51 + arch/powerpc/configs/85xx/tqm8540_defconfig | 48 +--- arch/powerpc/configs/85xx/tqm8541_defconfig | 54 ++--- arch/powerpc/configs/85xx/tqm8548_defconfig | 47 +--- arch/powerpc/configs/85xx/tqm8555_defconfig | 54 ++--- arch/powerpc/configs/85xx/tqm8560_defconfig | 54 ++--- arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 59 +++--- arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 102 +++--- arch/powerpc/configs/86xx/gef_sbc310_defconfig| 53 ++ arch/powerpc/configs/86xx/gef_sbc610_defconfig| 96 +++-- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 34 +++--- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 48 +--- arch/powerpc/configs/86xx/sbc8641d_defconfig | 40 --- arch/powerpc/configs/adder875_defconfig | 18 ++-- arch/powerpc/configs/c2k_defconfig| 55 - arch/powerpc/configs/ep8248e_defconfig| 20 +++- arch/powerpc/configs/ep88xc_defconfig | 17 ++-- arch/powerpc/configs/linkstation_defconfig| 48 +--- arch/powerpc/configs/mgcoge_defconfig | 31 -- arch/powerpc/configs/mgsuvd_defconfig | 19 ++-- arch/powerpc/configs/mpc7448_hpc2_defconfig | 26 +++-- arch/powerpc/configs/mpc8272_ads_defconfig| 23 +++- arch/powerpc/configs/mpc83xx_defconfig| 124 - arch/powerpc/configs/mpc85xx_defconfig| 62 +++ arch/powerpc/configs/mpc85xx_smp_defconfig| 64 +++ arch/powerpc/configs/mpc866_ads_defconfig | 20 ++-- arch/powerpc/configs/mpc86xx_defconfig| 57 ++ arch/powerpc/configs/mpc885_ads_defconfig | 20 ++-- arch/powerpc/configs/pq2fads_defconfig| 22 +++- arch/powerpc/configs/prpmc2800_defconfig | 52 ++--- arch/powerpc/configs/storcenter_defconfig | 33 +++--- arch/powerpc/mm/fsl_booke_mmu.c |4 +- arch/powerpc/platforms/85xx/Kconfig |4 +- arch/powerpc/platforms/86xx/Kconfig |4 +- arch/powerpc/sysdev/cpm1.c| 14 ++- arch/powerpc/sysdev/cpm2.c| 11 ++- 57 files changed, 1432 insertions(+), 904 deletions(-) ___
Re: [git pull] Please pull powerpc.git merge branch
Hi Kumar, On 4/27/2010 2:05 AM, Kumar Gala wrote: Ben, I've updated this to include this one additional patch for dealing with CONFIG_RELOCATE on FSL-BookE ppc32 http://patchwork.ozlabs.org/patch/51011/ Can this patch also be included: http://patchwork.ozlabs.org/patch/50289/ Thanks. Felix. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Apr 26, 2010, at 11:09 PM, Felix Radensky wrote: Hi Kumar, On 4/27/2010 2:05 AM, Kumar Gala wrote: Ben, I've updated this to include this one additional patch for dealing with CONFIG_RELOCATE on FSL-BookE ppc32 http://patchwork.ozlabs.org/patch/51011/ Can this patch also be included: http://patchwork.ozlabs.org/patch/50289/ Thanks. Felix. I didn't consider this a bug fix and thus didn't include it. It will go in for 2.6.35. - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2010-02-17 at 21:26 -0600, Kumar Gala wrote: On Feb 17, 2010, at 9:24 PM, Benjamin Herrenschmidt wrote: On Wed, 2010-02-17 at 21:21 -0600, Kumar Gala wrote: Ben, These are two minor fixes that should go into 2.6.33. It's a bit late for such fixes, but it's your platforms and your call here so I'll pull and push out to Linus. Cheers, Ben. Yeah, I've been swamped with other stuff and haven't found time to push them out. Was also hoping to find another oops that was reported but I cant reproduce it. Ok, done. Linus, feel free to pull from either Kumar's tree or mine: The following changes since commit b0483e78e5c4c9871fc5541875b3bc006846d46b: Linus Torvalds (1): Merge git://git.kernel.org/.../gregkh/tty-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Anton Vorontsov (1): powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards Peter Tyser (1): powerpc/85xx: Fix SMP when cpu-release-addr is in lowmem arch/powerpc/platforms/85xx/mpc85xx_mds.c |3 ++- arch/powerpc/platforms/85xx/smp.c | 21 +++-- 2 files changed, 21 insertions(+), 3 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Sun, 2010-01-31 at 10:34 +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Here are some more defconfig updates that I missed before LCA and a few PCI related fixes, some of them actually fixing regressions and one of them (the 4xx one) trivial enough that's really not worth delaying it. I've just added 2 commits. One is the powerpc version of the TIF_ABI_PENDING bit removal (thanks Andreas ! I love it when people do my work for me :-) and the other one is a small compile fix (a regression fix actually). New log below. Cheers, Ben. The following changes since commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600: Greg Kroah-Hartman (1): fnctl: f_modown should call write_lock_irqsave/restore are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Andreas Schwab (1): powerpc: TIF_ABI_PENDING bit removal Benjamin Herrenschmidt (5): powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge() powerpc/pci: Add missing hookup to pci_slot powerpc/pci: Add missing call to header fixup Merge commit 'jwb/merge' into merge powerpc/pseries: Fix xics build without CONFIG_SMP Josh Boyer (2): powerpc/44x: Update PowerPC 44x board defconfigs powerpc/40x: Update the PowerPC 40x board defconfigs Stef van Os (1): powerpc/4xx: Add pcix type 1 transactions arch/powerpc/configs/40x/acadia_defconfig | 241 ++- arch/powerpc/configs/40x/ep405_defconfig | 307 ++-- arch/powerpc/configs/40x/hcu4_defconfig| 256 +++- arch/powerpc/configs/40x/kilauea_defconfig | 140 --- arch/powerpc/configs/40x/makalu_defconfig | 190 ++- arch/powerpc/configs/40x/walnut_defconfig | 257 +++- arch/powerpc/configs/44x/arches_defconfig | 135 --- arch/powerpc/configs/44x/bamboo_defconfig | 255 +++- arch/powerpc/configs/44x/canyonlands_defconfig | 141 --- arch/powerpc/configs/44x/ebony_defconfig | 258 +++- arch/powerpc/configs/44x/eiger_defconfig | 128 +++--- arch/powerpc/configs/44x/katmai_defconfig | 253 +++- arch/powerpc/configs/44x/rainier_defconfig | 254 +++- arch/powerpc/configs/44x/redwood_defconfig | 274 +++-- arch/powerpc/configs/44x/sam440ep_defconfig| 284 +++--- arch/powerpc/configs/44x/sequoia_defconfig | 202 +++- arch/powerpc/configs/44x/taishan_defconfig | 258 +++- arch/powerpc/configs/44x/warp_defconfig| 228 -- arch/powerpc/configs/ppc40x_defconfig | 292 --- arch/powerpc/configs/ppc44x_defconfig | 309 +--- arch/powerpc/include/asm/elf.h |8 +- arch/powerpc/include/asm/thread_info.h |2 - arch/powerpc/kernel/pci_of_scan.c | 10 + arch/powerpc/kernel/process.c | 12 - arch/powerpc/platforms/pseries/xics.c |6 +- arch/powerpc/sysdev/ppc4xx_pci.c |3 +- drivers/pci/probe.c|4 +- include/linux/pci.h|4 + 28 files changed, 3412 insertions(+), 1299 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Jan 18, 2010 at 05:45:48PM +1100, Benjamin Herrenschmidt wrote: Hi Linus ! A tad late due to me slacking and leaving the patches take dust in patchwork for a bit too long, but here are a few bug fixes for powerpc and a bunch of defconfig freshen ups for some of our embedded platforms. You missed my defconfig updates. I sent you a pull request 2 weeks ago. http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-January/079309.html Those are still sitting in that tree on that branch if someone wanted to pull them directly. josh ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2010-01-18 at 07:32 -0500, Josh Boyer wrote: You missed my defconfig updates. I sent you a pull request 2 weeks ago. http://lists.ozlabs.org/pipermail/linuxppc-dev/2010-January/079309.html Those are still sitting in that tree on that branch if someone wanted to pull them directly. That's ok, it's just defconfigs, Ill send another pull request after Linus is done with the current one. Sorry about that. Jeremy: We need patchwork to track pull requests :-) Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines This is incredibly ugly. Why should the generic fs/Kconfig know about some random odd architecture detail like PPC_BOOK3S_64? I merged it, and noticed this because Super-H caused clashes by cleaning up. I would suggest PowerPC do the same. This patch is not signed-off, nor do I want any credit. But if it works on ppc, please send me something like this back. Linus --- arch/powerpc/Kconfig |3 +++ fs/Kconfig |2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..877db84 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -131,6 +131,9 @@ config PPC select GENERIC_ATOMIC64 if PPC32 select HAVE_PERF_EVENTS +config SYS_SUPPORTS_HUGETLBFS + defbool PPC_BOOK3S_64 + config EARLY_PRINTK bool default y diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool HugeTLB file system support - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote: On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines This is incredibly ugly. Why should the generic fs/Kconfig know about some random odd architecture detail like PPC_BOOK3S_64? I merged it, and noticed this because Super-H caused clashes by cleaning up. I would suggest PowerPC do the same. Right. I noticed the same thing yesterday and planned to do so today This patch is not signed-off, nor do I want any credit. But if it works on ppc, please send me something like this back. I'll stick something like that in my tree and send you a pull request. Cheers, Ben. Linus --- arch/powerpc/Kconfig |3 +++ fs/Kconfig |2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..877db84 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -131,6 +131,9 @@ config PPC select GENERIC_ATOMIC64 if PPC32 select HAVE_PERF_EVENTS +config SYS_SUPPORTS_HUGETLBFS + defbool PPC_BOOK3S_64 + config EARLY_PRINTK bool default y diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool HugeTLB file system support - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2009-10-29 at 09:14 -0700, Linus Torvalds wrote: On Tue, 27 Oct 2009, Benjamin Herrenschmidt wrote: Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines This is incredibly ugly. Why should the generic fs/Kconfig know about some random odd architecture detail like PPC_BOOK3S_64? I merged it, and noticed this because Super-H caused clashes by cleaning up. I would suggest PowerPC do the same. This patch is not signed-off, nor do I want any credit. But if it works on ppc, please send me something like this back. Pushed this to my merge branch: (BTW. Where does this SYS_* form comes from ? We had ARCH_ now we have SYS_ * ? Oic... it's a mips thing... oh well no big deal) From 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt b...@kernel.crashing.org Date: Fri, 30 Oct 2009 15:03:54 +1100 Subject: [PATCH] powerpc: Cleanup Kconfig selection of hugetlbfs support Signed-off-by: Benjamin Herrenschmidt b...@kernel.crashing.org --- arch/powerpc/Kconfig |4 fs/Kconfig |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 10a0a54..2ba14e7 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -414,6 +414,10 @@ config ARCH_SPARSEMEM_DEFAULT config ARCH_POPULATES_NODE_MAP def_bool y +config SYS_SUPPORTS_HUGETLBFS + def_bool y + depends on PPC_BOOK3S_64 + source mm/Kconfig config ARCH_MEMORY_PROBE diff --git a/fs/Kconfig b/fs/Kconfig index 2126078..64d44ef 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -135,7 +135,7 @@ config TMPFS_POSIX_ACL config HUGETLBFS bool HugeTLB file system support - depends on X86 || IA64 || PPC_BOOK3S_64 || SPARC64 || (S390 64BIT) || \ + depends on X86 || IA64 || SPARC64 || (S390 64BIT) || \ SYS_SUPPORTS_HUGETLBFS || BROKEN help hugetlbfs is a filesystem backing for HugeTLB pages, based on -- 1.6.1.2.14.gf26b5 ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Tue, 2009-10-27 at 18:11 +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Some of these might have been better in -rc4 or earlier, all my fault for having some backlog that I'm still going through. So we have some bug fixes (not necessarily regressions but also generally simple enough that I decided to go for 2.6.32 anyways) and a few very trivial Kconfig cleanups (outside of arch/powerpc but related to our symbols) from Kumar that could go anytime. I also had a pending pull request from Grant that I had forgotten. I added that, it's also minor stuff (device-tree and defconfig updates mostly and a couple of bug fixes). New consolidated pull request below. Cheers, Ben. The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414: Linus Torvalds (1): Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Andreas Schwab (2): powerpc: Fix segment mapping in vdso32 powerpc: Align vDSO base address Benjamin Herrenschmidt (2): powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule Merge commit 'gcl/merge' into merge Grant Likely (1): powerpc/5200: Update defconfigs Heiko Schocher (2): mpc5200: support for the MAN mpc5200 based board uc101 mpc5200: support for the MAN mpc5200 based board mucmc52 Josh Boyer (1): powerpc/booke: Fix xmon single step on PowerPC Book-E Julia Lawall (1): drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM Jérôme Pouiller (1): of: Remove nested function Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Minor cleanup to init/Kconfig powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to lib/Kconfig.debug Michael Neuling (1): powerpc/perf_events: Fix priority of MSR HV vs PR bits Stephen Rothwell (1): powerpc/iseries: Remove compiler version dependent hack Wolfram Sang (1): powerpc/boot/dts: drop obsolete 'fsl5200-clocking' arch/powerpc/boot/dts/cm5200.dts |1 - arch/powerpc/boot/dts/digsy_mtc.dts |1 - arch/powerpc/boot/dts/lite5200.dts|2 - arch/powerpc/boot/dts/lite5200b.dts |2 - arch/powerpc/boot/dts/media5200.dts |2 - arch/powerpc/boot/dts/motionpro.dts |1 - arch/powerpc/boot/dts/mpc5121ads.dts |3 - arch/powerpc/boot/dts/mucmc52.dts | 332 arch/powerpc/boot/dts/pcm030.dts |2 - arch/powerpc/boot/dts/pcm032.dts |2 - arch/powerpc/boot/dts/tqm5200.dts |1 - arch/powerpc/boot/dts/uc101.dts | 284 arch/powerpc/configs/52xx/cm5200_defconfig| 136 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 153 ++- arch/powerpc/configs/52xx/motionpro_defconfig | 146 +- arch/powerpc/configs/52xx/pcm030_defconfig| 142 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 148 +- arch/powerpc/configs/mpc5200_defconfig| 192 ++- arch/powerpc/configs/ppc64e_defconfig | 2199 + arch/powerpc/kernel/entry_64.S| 41 +- arch/powerpc/kernel/pci_64.c |2 + arch/powerpc/kernel/perf_event.c | 17 +- arch/powerpc/kernel/process.c |2 +- arch/powerpc/kernel/setup_64.c|1 - arch/powerpc/kernel/vdso.c| 11 +- arch/powerpc/kernel/vdso32/vdso32.lds.S |4 +- arch/powerpc/platforms/52xx/mpc5200_simple.c |2 + arch/powerpc/platforms/iseries/Makefile | 11 +- arch/powerpc/platforms/iseries/dt.c | 56 +- arch/powerpc/xmon/xmon.c | 20 +- drivers/of/of_mdio.c | 13 +- drivers/serial/mpc52xx_uart.c |2 +- fs/Kconfig|2 +- init/Kconfig |2 +- lib/Kconfig.debug |2 +- mm/Kconfig|2 +- sound/ppc/Kconfig |2 +- 37 files changed, 3490 insertions(+), 451 deletions(-) create mode 100644 arch/powerpc/boot/dts/mucmc52.dts create mode 100644 arch/powerpc/boot/dts/uc101.dts create mode 100644 arch/powerpc/configs/ppc64e_defconfig ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Aug 27, 2009 at 01:33:48PM +1000, Benjamin Herrenschmidt wrote: Hi Linus ! Here are a couple of last minute patches for 2.6.31. One is a regression fix (afaik) where a PS3 driver gets incorrectly loaded on other platforms and crashes, along with a PS3 defconfig update. The following changes since commit f415c413f458837bd0c27086b79aca889f9435e4: Linus Torvalds (1): Merge git://git.kernel.org/.../davem/net-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Geert Uytterhoeven (1): powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration Geoff Levand (1): powerpc/ps3: Update ps3_defconfig Hm. No 44x flush_icache_range patch? josh ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2009-08-27 at 07:05 -0400, Josh Boyer wrote: On Thu, Aug 27, 2009 at 01:33:48PM +1000, Benjamin Herrenschmidt wrote: Hi Linus ! Here are a couple of last minute patches for 2.6.31. One is a regression fix (afaik) where a PS3 driver gets incorrectly loaded on other platforms and crashes, along with a PS3 defconfig update. The following changes since commit f415c413f458837bd0c27086b79aca889f9435e4: Linus Torvalds (1): Merge git://git.kernel.org/.../davem/net-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Geert Uytterhoeven (1): powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration Geoff Levand (1): powerpc/ps3: Update ps3_defconfig Hm. No 44x flush_icache_range patch? Well, the ps3 stuff is a regression that will crash the machine on boot with some of the default configs... the 44x icache problem is not a regression and will cause some obscure ltrace behaviour issues. So the later is less high priority and I prefer having it in .32 and then send back to -stable. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote: Here are some late fixes for 2.6.29. I've included a radeonfb/aty128fb commit Will you also take care of the new ps3vram driver, which has been ack'ed by Jens for 2.6.29? Or do you prefer it to go in by email through Geoff (as PS3 maintainer), or from me directly? Thanks! With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone:+32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: geert.uytterhoe...@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2009-03-11 at 10:37 +0100, Geert Uytterhoeven wrote: On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote: Here are some late fixes for 2.6.29. I've included a radeonfb/aty128fb commit Will you also take care of the new ps3vram driver, which has been ack'ed by Jens for 2.6.29? Or do you prefer it to go in by email through Geoff (as PS3 maintainer), or from me directly? I'd like to have Andrew or Linus opinion on doing this driver swap that late in the process. Ben. Thanks! With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone:+32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: geert.uytterhoe...@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote: I'd like to have Andrew or Linus opinion on doing this driver swap that late in the process. Quite franklly, no. If it was a totally _new_ driver, there's no chance of regression, which is why we allow those drivers. But switching an old one for a new one does not match that pattern. We can clearly get regressions. As such, we don't do it late in the -rc series. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Hi Linus, On Wed, 11 Mar 2009, Linus Torvalds wrote: On Wed, 11 Mar 2009, Benjamin Herrenschmidt wrote: I'd like to have Andrew or Linus opinion on doing this driver swap that late in the process. Quite franklly, no. If it was a totally _new_ driver, there's no chance of regression, which is why we allow those drivers. But switching an old one for a new one does not match that pattern. We can clearly get regressions. As such, we don't do it late in the -rc series. Are you aware the old one was introduced in 2.6.29-rc1? So there cannot be a regression from 2.6.28 or older. Thanks! With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium Phone:+32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: geert.uytterhoe...@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010 ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 11 Mar 2009, Geert Uytterhoeven wrote: Are you aware the old one was introduced in 2.6.29-rc1? So there cannot be a regression from 2.6.28 or older. Ahh, no, that part hadn't registered. In that case, I guess I don't really care, as long as everybody involved feels it's clearly better than the one merged into -rc1. Linus ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Feb 26, 2009 at 03:07:24PM +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Please pull a few regression fixes for powerpc. Cheers, Ben. The following changes since commit 169d418b127b98a3e464e9c4b807ad083760f98c: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Mark Nelson (2): powerpc: Fix 64bit memcpy() regression powerpc: Fix 64bit __copy_tofrom_user() regression Michael Neuling (1): powerpc: Fix load/store float double alignment handler You don't seem to have your fix for PCI 2.x stuff on 4xx here. Patchwork has it in accepted state and Geert has been asking if it would go in 2.6.29. Any idea what is up with that one? josh ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2009-02-26 at 06:28 -0500, Josh Boyer wrote: On Thu, Feb 26, 2009 at 03:07:24PM +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Please pull a few regression fixes for powerpc. Cheers, Ben. The following changes since commit 169d418b127b98a3e464e9c4b807ad083760f98c: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Mark Nelson (2): powerpc: Fix 64bit memcpy() regression powerpc: Fix 64bit __copy_tofrom_user() regression Michael Neuling (1): powerpc: Fix load/store float double alignment handler You don't seem to have your fix for PCI 2.x stuff on 4xx here. Patchwork has it in accepted state and Geert has been asking if it would go in 2.6.29. Any idea what is up with that one? This isn't a regression is it ? so it's a bit late now, have you checked if it's in my next or test branch ? I would have though it would have gone through your tree, maybe I missed it some way. Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Fri, Feb 27, 2009 at 07:30:21AM +1100, Benjamin Herrenschmidt wrote: On Thu, 2009-02-26 at 06:28 -0500, Josh Boyer wrote: On Thu, Feb 26, 2009 at 03:07:24PM +1100, Benjamin Herrenschmidt wrote: Hi Linus ! Please pull a few regression fixes for powerpc. Cheers, Ben. The following changes since commit 169d418b127b98a3e464e9c4b807ad083760f98c: Linus Torvalds (1): Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Mark Nelson (2): powerpc: Fix 64bit memcpy() regression powerpc: Fix 64bit __copy_tofrom_user() regression Michael Neuling (1): powerpc: Fix load/store float double alignment handler You don't seem to have your fix for PCI 2.x stuff on 4xx here. Patchwork has it in accepted state and Geert has been asking if it would go in 2.6.29. Any idea what is up with that one? This isn't a regression is it ? so it's a bit late now, have you checked It's a regression from 2.6.28, yes. See: http://ozlabs.org/pipermail/linuxppc-dev/2009-February/067914.html and http://patchwork.ozlabs.org/patch/21527/ (note the Accepted state) if it's in my next or test branch ? I would have though it would have gone through your tree, maybe I missed it some way. I can't find it in your tree anywhere. josh ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Thu, 2009-02-26 at 15:46 -0500, Josh Boyer wrote: It's a regression from 2.6.28, yes. See: http://ozlabs.org/pipermail/linuxppc-dev/2009-February/067914.html and http://patchwork.ozlabs.org/patch/21527/ (note the Accepted state) if it's in my next or test branch ? I would have though it would have gone through your tree, maybe I missed it some way. I can't find it in your tree anywhere. That's weird... I wonder what happened. Accepted state normally means it has been merged. I'll stick it in. Cheers, Ben. ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
I wrote: Please pull from the 'merge' branch of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge to get one commit from Ben Herrenschmidt that fixes a regression since 2.6.27. I have just added one more commit from Kumar's merge branch, so when you pull the diffstat should be: arch/powerpc/boot/dts/mpc8349emitx.dts | 16 arch/powerpc/kernel/dma.c |1 + 2 files changed, 9 insertions(+), 8 deletions(-) If you had already pulled, please pull again, or pull Kumar's merge branch directly. Thanks, Paul. Anton Vorontsov (1): powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts Benjamin Herrenschmidt (1): powerpc: Fix dma_map_sg() cache flushing on non coherent platforms ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
Linus, Since I sent the pull request, I have added one more commit to my merge branch, which reverts the commit that Mel Gorman identified as causing NVRAM corruption (plus another commit that depended on it). So when you do this: Please pull from the 'merge' branch of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge you'll see this commit in addition: Paul Mackerras (1): Revert powerpc: Sync RPA note in zImage with kernel's RPA note I have included the overall diffstat below. Thanks, Paul. arch/powerpc/boot/addnote.c | 175 ++ arch/powerpc/boot/dts/mpc8313erdb.dts| 39 - arch/powerpc/boot/libfdt/fdt_ro.c|9 + arch/powerpc/boot/main.c |2 arch/powerpc/boot/wrapper|9 - arch/powerpc/configs/40x/acadia_defconfig| 59 +-- arch/powerpc/configs/40x/ep405_defconfig | 83 +++--- arch/powerpc/configs/40x/hcu4_defconfig | 125 +++- arch/powerpc/configs/40x/kilauea_defconfig | 69 ++--- arch/powerpc/configs/40x/makalu_defconfig| 69 ++--- arch/powerpc/configs/40x/walnut_defconfig| 77 +++--- arch/powerpc/configs/44x/arches_defconfig| 51 -- arch/powerpc/configs/44x/bamboo_defconfig| 77 +++--- arch/powerpc/configs/44x/canyonlands_defconfig | 61 +--- arch/powerpc/configs/44x/ebony_defconfig | 77 +++--- arch/powerpc/configs/44x/katmai_defconfig| 77 +++--- arch/powerpc/configs/44x/rainier_defconfig | 73 ++--- arch/powerpc/configs/44x/sam440ep_defconfig | 110 ++ arch/powerpc/configs/44x/sequoia_defconfig | 78 +++--- arch/powerpc/configs/44x/taishan_defconfig | 77 +++--- arch/powerpc/configs/44x/warp_defconfig | 82 +++--- arch/powerpc/configs/linkstation_defconfig | 11 + arch/powerpc/configs/ppc40x_defconfig| 106 +++-- arch/powerpc/configs/ppc44x_defconfig| 125 arch/powerpc/include/asm/iommu.h | 15 +- arch/powerpc/include/asm/kdump.h |8 - arch/powerpc/include/asm/mpic.h |2 arch/powerpc/include/asm/pci.h |2 arch/powerpc/kernel/dma-iommu.c | 34 ++-- arch/powerpc/kernel/head_64.S| 30 ++-- arch/powerpc/kernel/ibmebus.c| 27 ++- arch/powerpc/kernel/iommu.c | 25 ++- arch/powerpc/kernel/machine_kexec_64.c |9 - arch/powerpc/kernel/misc_64.S|9 - arch/powerpc/kernel/of_device.c |1 arch/powerpc/kernel/pci-common.c | 110 +++--- arch/powerpc/kernel/pci_64.c |2 arch/powerpc/kernel/prom_init.c | 10 + arch/powerpc/kernel/setup_64.c |6 - arch/powerpc/kernel/signal_32.c | 36 ++--- arch/powerpc/kernel/signal_64.c | 33 ++-- arch/powerpc/kernel/vio.c| 25 ++- arch/powerpc/kernel/vmlinux.lds.S|5 - arch/powerpc/oprofile/op_model_cell.c| 13 +- arch/powerpc/platforms/40x/Kconfig |2 arch/powerpc/platforms/85xx/mpc85xx_ds.c |3 arch/powerpc/platforms/86xx/pic.c|3 arch/powerpc/platforms/cell/iommu.c | 37 ++--- arch/powerpc/platforms/cell/ras.c|6 - arch/powerpc/platforms/embedded6xx/linkstation.c | 14 ++ arch/powerpc/platforms/iseries/iommu.c |7 + arch/powerpc/platforms/ps3/system-bus.c | 36 ++--- arch/powerpc/platforms/pseries/iommu.c |4 - arch/powerpc/platforms/pseries/pci_dlpar.c |2 arch/powerpc/sysdev/mpic.c | 59 +++ arch/powerpc/xmon/xmon.c |2 drivers/of/device.c | 11 + 57 files changed, 1444 insertions(+), 865 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
