Commits · d06e7a56d91328267a96b1a4df4ede7529f829e8 · linux / linux-davinci

05 Jul, 2005 2 commits
- Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · d06e7a56
  Linus Torvalds authored Jul 05, 2005
  
  d06e7a56
- Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 346fced8
  Linus Torvalds authored Jul 05, 2005
  
  346fced8
04 Jul, 2005 9 commits

[SPARC64]: Fix IRQ retry interval timer value on sparc64 PCI controllers. · 864ae180
David S. Miller authored Jul 04, 2005
```
Use '5' instead of 'infinity'.
Signed-off-by: David S. Miller <davem@davemloft.net>
```
864ae180

[SPARC64]: Small Schizo PCI controller programming tweaks. · 9fba62a5

David S. Miller authored Jul 04, 2005

Use macro instead of magic value for Tomatillo discard-
timeout interrupt enable register bit.

Leave OBP programming PTO value unless Tomatillo and
version >= 0x2.

If no-bus-parking property is present, explicitly clear
PCICTRL_PARK bit.
Signed-off-by: David S. Miller <davem@davemloft.net>

9fba62a5

[SPARC64]: Do proper DMA IRQ syncing on Tomatillo · bb6743f4

David S. Miller authored Jul 04, 2005

This was the main impetus behind adding the PCI IRQ shim.

In order to properly order DMA writes wrt. interrupts, you have to
write to a PCI controller register, then poll for that bit clearing.
There is one bit for each interrupt source, and setting this register
bit tells Tomatillo to drain all pending DMA from that device.

Furthermore, Tomatillo's with revision less than 4 require us to do a
block store due to some memory transaction ordering issues it has on
JBUS.
Signed-off-by: David S. Miller <davem@davemloft.net>

bb6743f4

[SPARC64]: Add support for IRQ pre-handlers. · 088dd1f8

David S. Miller authored Jul 04, 2005

This allows a PCI controller to shim into IRQ delivery
so that DMA queues can be drained, if necessary.

If some bus specific code needs to run before an IRQ
handler is invoked, the bus driver simply needs to setup
the function pointer in bucket->irq_info->pre_handler and
the two args bucket->irq_info->pre_handler_arg[12].

The Schizo PCI driver is converted over to use a pre-handler
for the DMA write-sync processing it needs when a device
is behind a PCI->PCI bus deeper than the top-level APB
bridges.

While we're here, clean up all of the action allocation
and handling.  Now, we allocate the irqaction as part of
the bucket->irq_info area.  There is an array of 4 irqaction
(for PCI irq sharing) and a bitmask saying which entries
are active.

The bucket->irq_info is allocated at build_irq() time, not
at request_irq() time.  This simplifies request_irq() and
free_irq() tremendously.

The SMP dynamic IRQ retargetting code got removed in this
change too.  It was disabled for a few months now, and we
can resurrect it in the future if we want.
Signed-off-by: David S. Miller <davem@davemloft.net>

088dd1f8

[SPARC]: bpp: remove sleep_on usage · 06326e40

Christoph Hellwig authored Jul 04, 2005

Use schedule_timeout() instead of sleep_on + timer.  Totally untested
due to lack of hardware, but the changes are rather trivial.
Signed-off-by: David S. Miller <davem@davemloft.net>

06326e40

[SPARC64/COMPAT]: Add some compat ioctl for ppdev · e7270dec

Raphael Assenat authored Jul 04, 2005

The following patch adds some ioctls to include/linux/compat_ioctl.h
to allow using ppdev from the 32 bit user space on sparc64.

This patch also adds the PPDEV option in the sparc64 menu, near Parallel
printer support in the 'General machine setup' submenu.

All those ioctls seem to be compatible, since (correct me if I'm wrong)
they dont use the 'long' type. See include/linux/ppdev.h.

The application I used to test the new ioctls only used the following:
PPEXCL
PPCLAIM
PPNEGOT
PPGETMODES
PPRCONTROL
PPWCONTROL
PPDATADIR
PPWDATA
PPRDATA

But I beleive that the other ioctls will work fine.
Signed-off-by: David S. Miller <davem@davemloft.net>

e7270dec

[PATCH] ARM: Fix new-ABI layout of struct stat64 · 17af691c

Russell King authored Jul 04, 2005

Add __attribute__((packed)) to ensure that the stat64 structure is
correctly laid out no matter which ABI the kernel is compiled for.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

17af691c

[PATCH] ARM: Fix non-standard PXA io_pg_offst initialisers · 68070bde

Russell King authored Jul 04, 2005

These didn't match my sed expression correctly, fix them up manually.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

68070bde

[PATCH] ARM: Change 'param_offset' to 'boot_params' · f9bd6ea4
Russell King authored Jul 04, 2005
```
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
```
f9bd6ea4

03 Jul, 2005 21 commits

Merge master.kernel.org:/home/rmk/linux-2.6-arm · 19f7241a
Linus Torvalds authored Jul 03, 2005

19f7241a
Merge master.kernel.org:/home/rmk/linux-2.6-serial · 08ab8c20
Linus Torvalds authored Jul 03, 2005

08ab8c20

[PATCH] Serial: Fix console port spinlock initialisation · 976ecd12

Russell King authored Jul 03, 2005

Initialise the spinlock for port being used by the console early, but
don't re-initialise it again later.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

976ecd12

[PATCH] ARM: 2784/1: Fix the block cache flush operation range · 0d670b41

Catalin Marinas authored Jul 03, 2005

Patch from Catalin Marinas

The range for the ARMv6 block cache operations is inclusive but the
kernel doesn't re-calculate the end address, causing a page fault when
used (this only happens with support for cache aliasing, otherwise the
blk_flush_kern_dcache_page() is not called). This patch subtracts
L1_CACHE_BYTES from the end address.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

0d670b41

[PATCH] ARM: 2785/1: S3C24XX - serial calls request_irq() with IRQs disabled · 75f631dc

Ben Dooks authored Jul 03, 2005

Patch from Ben Dooks

The request_irq() function is called by s3c24xx uart driver with
the local IRQs disabled. The request_irq() function can allocate
memory via kmalloc(), and this may sleep causing a warning about
sleeping in an invalid context.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

75f631dc

[PATCH] ARM: Remove machine description macros · e9dea0c6

Russell King authored Jul 03, 2005

Remove the pointless machine description macros, favouring C99
initialisers instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

e9dea0c6

[PATCH] drivers/ide/Makefile: kill dead CONFIG_BLK_DEV_IDE_TCQ entry · 10e047b4

Adrian Bunk authored Jul 03, 2005

This patch kills the dead CONFIG_BLK_DEV_IDE_TCQ entry.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

10e047b4

[PATCH] amd74xx: support MCP55 device IDs · 21e2c01d

Rob Punkunus authored Jul 03, 2005

From: Rob Punkunus <rpunkunus@nvidia.com>

Rob Punkunus recently submitted a patch to enable support for MCP51/MCP55 in
the amd74xx driver. This patch was whitespace-corrupted and didn't apply to
2.6.12 since MCP51 support was merged in the 2.6.12-rc series.

Gentoo would like to support this hardware for our upcoming release media, so
I fixed the patch, and here it is :)
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

21e2c01d

[PATCH] ide: fix line break in ide messages · 13bbbf28

Denis Vlasenko authored Jul 03, 2005

From: Denis Vlasenko <vda@ilport.com.ua>

* printk("\n") is misplaced, resulting in stray empty line in kernel log
* cleanups nerby: some back-to-back printks are combined, etc
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>

13bbbf28