linux.git/drivers, branch v2.6.17

[PATCH] sky2: netconsole suspend/resume interaction

2006-06-17T17:52:12+00:00

A couple of fixes that should prevent crashes when using netconsole and
suspend/resume. First, netconsole poll routine shouldn't run unless the
device is up; second, the NAPI poll should be disabled during suspend.

This is only an issue on sky2, because it has to have one NAPI poll
routine for both ports on dual port boards. Normal drivers use
netif_rx_schedule_prep and that checks for netif_running.

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

[PATCH] fix cdrom open

2006-06-17T17:44:26+00:00

Some time ago the cdrom open routine was changed so that we call the
driver's open routine before checking to see if it is read only.  However,
if we discovered that a read write open was not possible and the open
flags required a writable open, we just returned -EROFS without calling
the driver's release routine.   This seems to work for most cdrom drivers,
but breaks the Powerpc iSeries virtual cdrom rather badly.

This just inserts the release call in the error path to balance the call
to "->open()" done by "open_for_data()".

Signed-off-by: Stephen Rothwell 
Signed-off-by: Jens Axboe 
Signed-off-by: Linus Torvalds

[PATCH] sky2: stop/start hardware idle timer on suspend/resume

2006-06-13T20:16:41+00:00

The resume bug was caused not by an early interrupt but because the idle
timeout was not being stopped on suspend.  Also disable hardware IRQ's
on suspend.  Will need to revisit this with hotplug?

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

[PATCH] sky2: save/restore base hardware irq during suspend/resume

2006-06-13T20:16:41+00:00

The hardware should be fully shut off during suspend, and the base
irq mask restored during resume.

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

[PATCH] sky2: fix hotplug detect during poll

2006-06-13T20:16:41+00:00

If the poll routine detects no hardware available, it needs to dequeue
it self from the network poll list. Linus didn't understand NAPI.

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

[PATCH] sky2: don't hard code number of ports

2006-06-13T20:16:41+00:00

It is cleaner, to not loop over both ports if only one exists.

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

[PATCH] sky2: set_power_state should be void

2006-06-13T20:16:40+00:00

The set power state function is cleaner if it doesn't return anything.
The only caller that could fail is in suspend() and it can check the argument
there.

Signed-off-by: Stephen Hemminger 
Signed-off-by: Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-arm

2006-06-12T20:45:41+00:00

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix Integrator and Versatile interrupt initialisation
  [ARM] 3546/1: PATCH: subtle lost interrupts bug on i.MX
  [ARM] 3547/1: PXA-OHCI: Allow platforms to specify a power budget
  [ARM] Fix Neponset IRQ handling

[sky2] Fix sky2 network driver suspend/resume

2006-06-12T19:53:27+00:00

This fixes two independent problems: it would not save the PCI state on
suspend (and thus try to resume a nonexistent state on resume), and
while shut off, if an interrupt happened on the same shared irq, the irq
handler would react very badly to the interrupt status being an invalid
all-ones state.

Acked-by: Jeff Garzik 
Signed-off-by: Linus Torvalds

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

2006-06-12T14:47:04+00:00

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] sata_mv: grab host lock inside eng_timeout