* [GIT PULL] arch/microblaze fixes for 2.6.34-rc2
@ 2010-03-11 13:42 Michal Simek
2010-03-16 8:00 ` Michal Simek
2010-03-20 17:35 ` Grant Likely
0 siblings, 2 replies; 5+ messages in thread
From: Michal Simek @ 2010-03-11 13:42 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, John Williams
Hi Linus,
Please pull Microblaze changes to your tree. There is support for PCI
and new DMA interface.
Thanks,
Michal
The following changes since commit 522dba7134d6b2e5821d3457f7941ec34f668e6d:
Linus Torvalds (1):
Merge branch 'for-linus' of
git://git.kernel.org/.../jbarnes/pci-2.6
are available in the git repository at:
git://git.monstr.eu/linux-2.6-microblaze.git for-linus
Frans Pop (1):
microblaze: remove trailing space in messages
Michal Simek (26):
microblaze: Support DMA
microblaze: Implement __dma_sync_page
microblaze: Add {z,}alloc_maybe_bootmem functions
microblaze: Add irq_create_{of_,}mapping functions
microblaze: io.h include asm-generic/iomap.h
microblaze: Add pci.h
microblaze: Add pci-bridge.h
microblaze: Add core PCI files
microblaze: Enable PCI, missing files
microblaze: Add support for Xilinx PCI host bridge
microblaze: Add support from PREEMPT
microblaze: Move cache function to cache.c
microblaze: Preliminary support for dma drivers
microblaze: Change temp register for cmdline
microblaze: Use generic show_mem()
microblaze: Preliminary support for dma drivers
microblaze: Add define for ASM_LOOP
microblaze: Remove VMALLOC_VMADDR
microblaze: Remove ancient Kconfig option for consistent mapping
microblaze: pgtable.h: move consistent functions
microblaze: Add consistent code
microblaze: Fix dma alloc and free coherent dma functions
microblaze: PCI early support for noMMU system
microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
microblaze: Save current task directly
microblaze: entry.S use delay slot for return handlers
arch/microblaze/Kconfig | 64 +-
arch/microblaze/Makefile | 1 +
arch/microblaze/include/asm/device.h | 4 +
arch/microblaze/include/asm/dma-mapping.h | 154 +++-
arch/microblaze/include/asm/io.h | 31 +-
arch/microblaze/include/asm/irq.h | 37 +-
arch/microblaze/include/asm/page.h | 12 +-
arch/microblaze/include/asm/pci-bridge.h | 195 ++++
arch/microblaze/include/asm/pci.h | 178 ++++-
arch/microblaze/include/asm/pgalloc.h | 2 +-
arch/microblaze/include/asm/pgtable.h | 40 +-
arch/microblaze/include/asm/prom.h | 15 +
arch/microblaze/include/asm/system.h | 3 +
arch/microblaze/include/asm/tlbflush.h | 2 +-
arch/microblaze/kernel/Makefile | 2 +-
arch/microblaze/kernel/asm-offsets.c | 1 +
arch/microblaze/kernel/cpu/cache.c | 211 +++-
arch/microblaze/kernel/dma.c | 156 +++
arch/microblaze/kernel/entry.S | 116 +-
arch/microblaze/kernel/head.S | 13 +-
arch/microblaze/kernel/irq.c | 15 +
arch/microblaze/kernel/setup.c | 45 +-
arch/microblaze/mm/Makefile | 2 +-
arch/microblaze/mm/consistent.c | 246 +++++
arch/microblaze/mm/init.c | 39 +-
arch/microblaze/mm/pgtable.c | 2 +-
arch/microblaze/pci/Makefile | 6 +
arch/microblaze/pci/indirect_pci.c | 163 +++
arch/microblaze/pci/iomap.c | 39 +
arch/microblaze/pci/pci-common.c | 1642
+++++++++++++++++++++++++++++
arch/microblaze/pci/pci_32.c | 430 ++++++++
arch/microblaze/pci/xilinx_pci.c | 168 +++
drivers/pci/Makefile | 1 +
33 files changed, 3840 insertions(+), 195 deletions(-)
create mode 100644 arch/microblaze/kernel/dma.c
create mode 100644 arch/microblaze/mm/consistent.c
create mode 100644 arch/microblaze/pci/Makefile
create mode 100644 arch/microblaze/pci/indirect_pci.c
create mode 100644 arch/microblaze/pci/iomap.c
create mode 100644 arch/microblaze/pci/pci-common.c
create mode 100644 arch/microblaze/pci/pci_32.c
create mode 100644 arch/microblaze/pci/xilinx_pci.c
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2
2010-03-11 13:42 [GIT PULL] arch/microblaze fixes for 2.6.34-rc2 Michal Simek
@ 2010-03-16 8:00 ` Michal Simek
2010-03-20 17:35 ` Grant Likely
1 sibling, 0 replies; 5+ messages in thread
From: Michal Simek @ 2010-03-16 8:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML
Michal Simek wrote:
> Hi Linus,
>
> Please pull Microblaze changes to your tree. There is support for PCI
> and new DMA interface.
PING.
Michal
>
> Thanks,
> Michal
>
>
> The following changes since commit
> 522dba7134d6b2e5821d3457f7941ec34f668e6d:
> Linus Torvalds (1):
> Merge branch 'for-linus' of
> git://git.kernel.org/.../jbarnes/pci-2.6
>
> are available in the git repository at:
>
> git://git.monstr.eu/linux-2.6-microblaze.git for-linus
>
> Frans Pop (1):
> microblaze: remove trailing space in messages
>
> Michal Simek (26):
> microblaze: Support DMA
> microblaze: Implement __dma_sync_page
> microblaze: Add {z,}alloc_maybe_bootmem functions
> microblaze: Add irq_create_{of_,}mapping functions
> microblaze: io.h include asm-generic/iomap.h
> microblaze: Add pci.h
> microblaze: Add pci-bridge.h
> microblaze: Add core PCI files
> microblaze: Enable PCI, missing files
> microblaze: Add support for Xilinx PCI host bridge
> microblaze: Add support from PREEMPT
> microblaze: Move cache function to cache.c
> microblaze: Preliminary support for dma drivers
> microblaze: Change temp register for cmdline
> microblaze: Use generic show_mem()
> microblaze: Preliminary support for dma drivers
> microblaze: Add define for ASM_LOOP
> microblaze: Remove VMALLOC_VMADDR
> microblaze: Remove ancient Kconfig option for consistent mapping
> microblaze: pgtable.h: move consistent functions
> microblaze: Add consistent code
> microblaze: Fix dma alloc and free coherent dma functions
> microblaze: PCI early support for noMMU system
> microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
> microblaze: Save current task directly
> microblaze: entry.S use delay slot for return handlers
>
> arch/microblaze/Kconfig | 64 +-
> arch/microblaze/Makefile | 1 +
> arch/microblaze/include/asm/device.h | 4 +
> arch/microblaze/include/asm/dma-mapping.h | 154 +++-
> arch/microblaze/include/asm/io.h | 31 +-
> arch/microblaze/include/asm/irq.h | 37 +-
> arch/microblaze/include/asm/page.h | 12 +-
> arch/microblaze/include/asm/pci-bridge.h | 195 ++++
> arch/microblaze/include/asm/pci.h | 178 ++++-
> arch/microblaze/include/asm/pgalloc.h | 2 +-
> arch/microblaze/include/asm/pgtable.h | 40 +-
> arch/microblaze/include/asm/prom.h | 15 +
> arch/microblaze/include/asm/system.h | 3 +
> arch/microblaze/include/asm/tlbflush.h | 2 +-
> arch/microblaze/kernel/Makefile | 2 +-
> arch/microblaze/kernel/asm-offsets.c | 1 +
> arch/microblaze/kernel/cpu/cache.c | 211 +++-
> arch/microblaze/kernel/dma.c | 156 +++
> arch/microblaze/kernel/entry.S | 116 +-
> arch/microblaze/kernel/head.S | 13 +-
> arch/microblaze/kernel/irq.c | 15 +
> arch/microblaze/kernel/setup.c | 45 +-
> arch/microblaze/mm/Makefile | 2 +-
> arch/microblaze/mm/consistent.c | 246 +++++
> arch/microblaze/mm/init.c | 39 +-
> arch/microblaze/mm/pgtable.c | 2 +-
> arch/microblaze/pci/Makefile | 6 +
> arch/microblaze/pci/indirect_pci.c | 163 +++
> arch/microblaze/pci/iomap.c | 39 +
> arch/microblaze/pci/pci-common.c | 1642
> +++++++++++++++++++++++++++++
> arch/microblaze/pci/pci_32.c | 430 ++++++++
> arch/microblaze/pci/xilinx_pci.c | 168 +++
> drivers/pci/Makefile | 1 +
> 33 files changed, 3840 insertions(+), 195 deletions(-)
> create mode 100644 arch/microblaze/kernel/dma.c
> create mode 100644 arch/microblaze/mm/consistent.c
> create mode 100644 arch/microblaze/pci/Makefile
> create mode 100644 arch/microblaze/pci/indirect_pci.c
> create mode 100644 arch/microblaze/pci/iomap.c
> create mode 100644 arch/microblaze/pci/pci-common.c
> create mode 100644 arch/microblaze/pci/pci_32.c
> create mode 100644 arch/microblaze/pci/xilinx_pci.c
>
>
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2
2010-03-11 13:42 [GIT PULL] arch/microblaze fixes for 2.6.34-rc2 Michal Simek
2010-03-16 8:00 ` Michal Simek
@ 2010-03-20 17:35 ` Grant Likely
2010-03-21 22:32 ` John Williams
1 sibling, 1 reply; 5+ messages in thread
From: Grant Likely @ 2010-03-20 17:35 UTC (permalink / raw)
To: monstr; +Cc: Linus Torvalds, LKML, John Williams, devicetree-discuss
On Thu, Mar 11, 2010 at 6:42 AM, Michal Simek <monstr@monstr.eu> wrote:
> Hi Linus,
>
> Please pull Microblaze changes to your tree. There is support for PCI and
> new DMA interface.
>
> Thanks,
> Michal
Hi Michal.
I'm really unimpressed that you've merged the cloned PCI support code
when we talked about merging the common powerpc & microblaze bits
/before/ pushing it up to mainline. At the very least I would have
expected a reply back from you telling me that you disagree and that
you wanted to merge anyway. I didn't even get a reply back form you
when I asked about why the PCI bits were in your linux-next branch.
Now it needs to be merged in-place which is a lot more work.
g.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2
2010-03-20 17:35 ` Grant Likely
@ 2010-03-21 22:32 ` John Williams
2010-03-27 1:37 ` Grant Likely
0 siblings, 1 reply; 5+ messages in thread
From: John Williams @ 2010-03-21 22:32 UTC (permalink / raw)
To: Grant Likely; +Cc: monstr, Linus Torvalds, LKML, devicetree-discuss
Grant,
On Sun, Mar 21, 2010 at 3:35 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Thu, Mar 11, 2010 at 6:42 AM, Michal Simek <monstr@monstr.eu> wrote:
>> Hi Linus,
>>
>> Please pull Microblaze changes to your tree. There is support for PCI and
>> new DMA interface.
>>
>> Thanks,
>> Michal
>
> Hi Michal.
>
> I'm really unimpressed that you've merged the cloned PCI support code
> when we talked about merging the common powerpc & microblaze bits
> /before/ pushing it up to mainline. At the very least I would have
> expected a reply back from you telling me that you disagree and that
> you wanted to merge anyway. I didn't even get a reply back form you
> when I asked about why the PCI bits were in your linux-next branch.
>
> Now it needs to be merged in-place which is a lot more work.
You should blame me for this one. There was nothing deliberate about
it - I've been hassling Michal to get the DMA API upstream because
there's other work that depends on it, and with everything else going
on I plain forgot that his patchset included the PCI stuff that we
were still discussing with you.
Let me buy you a beer at ELC and you can berate me for it then!
John
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] arch/microblaze fixes for 2.6.34-rc2
2010-03-21 22:32 ` John Williams
@ 2010-03-27 1:37 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2010-03-27 1:37 UTC (permalink / raw)
To: John Williams; +Cc: monstr, Linus Torvalds, LKML, devicetree-discuss
On Sun, Mar 21, 2010 at 4:32 PM, John Williams
<john.williams@petalogix.com> wrote:
> Grant,
>
> On Sun, Mar 21, 2010 at 3:35 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
>> On Thu, Mar 11, 2010 at 6:42 AM, Michal Simek <monstr@monstr.eu> wrote:
>>> Hi Linus,
>>>
>>> Please pull Microblaze changes to your tree. There is support for PCI and
>>> new DMA interface.
>>>
>>> Thanks,
>>> Michal
>>
>> Hi Michal.
>>
>> I'm really unimpressed that you've merged the cloned PCI support code
>> when we talked about merging the common powerpc & microblaze bits
>> /before/ pushing it up to mainline. At the very least I would have
>> expected a reply back from you telling me that you disagree and that
>> you wanted to merge anyway. I didn't even get a reply back form you
>> when I asked about why the PCI bits were in your linux-next branch.
>>
>> Now it needs to be merged in-place which is a lot more work.
>
> You should blame me for this one. There was nothing deliberate about
> it - I've been hassling Michal to get the DMA API upstream because
> there's other work that depends on it, and with everything else going
> on I plain forgot that his patchset included the PCI stuff that we
> were still discussing with you.
Blame dutifully assigned.
The next question is how to proceed. I've not gotten to PCI code in
my rework yet, but I probably will in the next month or so. If you or
Michal doesn't get to it first, then I'll probably move the OF
portions of the powerpc version into drivers/of and make them
conditional on !CONFIG_MICROBLAZE. Microblaze adaptations can be
merged in at a later date and the !CONFIG_MICROBLAZE conditional
eventually dropped.
> Let me buy you a beer at ELC and you can berate me for it then!
done.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-27 1:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-11 13:42 [GIT PULL] arch/microblaze fixes for 2.6.34-rc2 Michal Simek
2010-03-16 8:00 ` Michal Simek
2010-03-20 17:35 ` Grant Likely
2010-03-21 22:32 ` John Williams
2010-03-27 1:37 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox