31 Dec, 2008
2 commits
-
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
[ARM] pxafb: cleanup of the timing checking code
[ARM] pxafb: cleanup of the color format manipulation code
[ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
[ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
[ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
[ARM] pxafb: allow video memory size to be configurable
[ARM] pxa: add document on the MFP design and how to use it
[ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
[ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
[ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
[ARM] pxa: Update eseries defconfig
[ARM] 5352/1: add w90p910-plat config file
[ARM] s3c: S3C options should depend on PLAT_S3C
[ARM] mv78xx0: implement GPIO and GPIO interrupt support
[ARM] Kirkwood: implement GPIO and GPIO interrupt support
[ARM] Orion: share GPIO IRQ handling code
[ARM] Orion: share GPIO handling code
[ARM] s3c: define __io using the typesafe version
[ARM] S3C64XX: Ensure CPU_V6 is selected
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
ide-cd: remove dead dsc_overlap setting
ide: push local_irq_{save,restore}() to do_identify()
ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
ide: move Power Management support to ide-pm.c
ide: use ATA_DMA_* defines in ide-dma-sff.c
ide: checkpatch.pl fixes for ide-lib.c
ide: remove inline tags from ide-probe.c
ide: remove redundant code from ide_end_drive_cmd()
ide: struct device - replace bus_id with dev_name(), dev_set_name()
ide: rework handling of serialized ports (v2)
cy82c693: remove superfluous ide_cy82c693 chipset type
trm290: add IDE_HFLAG_TRM290 host flag
ide: add ->max_sectors field to struct ide_port_info
rz1000: apply chipset quirks early (v2)
ide: always set nIEN on idle devices
ide: fix ->quirk_list checking in ide_do_request()
gayle: set IDE_HFLAG_SERIALIZE explictly
cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
ali14xx: doesn't use shared IRQs
...
30 Dec, 2008
33 commits
-
dsc_overlap setting is not useful anymore for ide-cd so remove
"dsc_overlap" /proc setting, disallow changing the setting through
HDIO_SET_NICE ioctl and cleanup ide_cd{rom_setup,_release}().Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Push local_irq_{save,restore}() from actual_try_to_identify()
to do_identify() and remove no longer needed local_irq_enable().Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
No reason to run this function with local IRQs off.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
* Move legacy ISA/VLB ports handling from ide-probe.c to ide-legacy.c.
* Add CONFIG_IDE_LEGACY config option to be selected by host drivers
needing ide-legacy.c.v2:
Fix CONFIG_IDE_LEGACY not being defined in Kconfig.
(from Takashi Iwai )There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
In few places open-coded values were still being used. Fix it.
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Fix following errors/warnings detected by checkpatch.pl:
- WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
- WARNING: space prohibited between function name and open parenthesis '('
- ERROR: trailing whitespace
- ERROR: trailing statements should be on next line
- WARNING: printk() should include KERN_ facility levelSigned-off-by: Bartlomiej Zolnierkiewicz
-
Let the compiler handle it.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
rq->errors is overwritten later in this function.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
Acked-by: Greg Kroah-Hartman
Signed-off-by: Kay Sievers
Signed-off-by: Bartlomiej Zolnierkiewicz -
* hpt366: set IDE_HFLAG_SERIALIZE in ->host_flags if needed
in init_hwif_hpt366(). Remove HPT_SERIALIZE_IO while at it.* Set IDE_HFLAG_SERIALIZE in ->host_flags if needed in
ide_init_port().* Convert init_irq() to use IDE_HFLAG_SERIALIZE together with
hwif->host to find out ports which need to be serialized.* Remove no longer needed save_match() and ide_hwif_t.serialized.
v2:
* Set host's ->host_flags field instead of port's copy.This patch should fix the incorrect grouping of port(s) from
host(s) that need serialization with port(s) that happen to use
the same IRQ(s) but are from the host(s) that don't need it.Cc: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Since CY82C693 doesn't require serialization we may as well
use the default ide_pci chipset type.Signed-off-by: Bartlomiej Zolnierkiewicz
-
* Add IDE_HFLAG_TRM290 host flag and use it in ide_build_dmatable().
* Remove no longer needed ide_trm290 chipset type.
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ->max_sectors field to struct ide_port_info to allow host drivers
to specify value used for hwif->rqsize (if smaller than the default).* Convert pdc202xx_old to use ->max_sectors and remove no longer needed
IDE_HFLAG_RQSIZE_256 flag.There should be no functional changes caused by this patch.
Acked-by: Sergei Shtyltov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Use pci_name(dev) instead of hwif->name in init_hwif_rz1000().
* init_hwif_rz1000() -> rz1000_init_chipset(). Update rz1000_init_one()
to use rz1000_init_chipset() and add now required rz1000_remove().* Remove superfluous ide_rz1000 chipset type.
v2:
* unsigned int rz1000_init_chipset() -> int rz1000_disable_readahead()
per Sergei's suggestion.Cc: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Set nIEN for previous port/device in ide_do_request()
also if port uses a non-shared IRQ.* Remove no longer needed ide_hwif_t.sharing_irq.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
Fix nIEN quirk check to also omit quirky devices using pdc202xx_{new,old}
host drivers for which ->quirk_list == 2.Signed-off-by: Bartlomiej Zolnierkiewicz
-
If IDE doubler is used ports need to be serialized. Currently
init_irq() handles it fine but lets also set IDE_HFLAG_SERIALIZE
host flag explicitly in preparation for future changes.Also convert the driver to use struct ide_port_info while at it.
Cc: Geert Uytterhoeven
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Set IDE_HFLAG_SERIALIZE explictly for CMD646.
* Remove no longer needed ide_cmd646 chipset type (which has
a nice side-effect of fixing handling of unexpected IRQs).Cc: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
init_irq() shouldn't use IRQF_SHARED for ali14xx IDE IRQ handler.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
It doesn't make much sense nowadays and is problematic on some drives.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Both choose_drive() and PM handling code make sure that the queue
is unplugged so no need to check it again.Cc: Elias Oltmanns
Signed-off-by: Bartlomiej Zolnierkiewicz -
Now that (almost) all host drivers have been fixed not to abuse ide_lock
and core code usage of ide_lock has been sanitized we may safely replace
ide_lock by per-hwgroup locks.This patch is partially based on earlier patch from Ravikiran G Thirumalai.
While at it:
- don't use deprecated HWIF() and HWGROUP() macros
- update locking documentation in ide.hv2:
Add missing spin_lock_init(&hwgroup->lock). (Noticed by Elias Oltmanns)Cc: Vaibhav V. Nivargi
Cc: Alok N. Kataria
Cc: Shai Fultheim
Signed-off-by: Ravikiran Thirumalai
Cc: Elias Oltmanns
Signed-off-by: Bartlomiej Zolnierkiewicz -
This is just a preparation for future changes and there should be no
functional changes caused by this patch since ide_lock is currently
also used as queue lock.Signed-off-by: Bartlomiej Zolnierkiewicz
-
Use blk_end_request() instead of ide_lock + __blk_end_request()
in cdrom_end_request(), cdrom_newpc_intr(), __ide_end_request(),
ide_complete_pm_request() and ide_end_drive_cmd().[ ide_lock is currently also used as queue lock ]
Signed-off-by: Bartlomiej Zolnierkiewicz
-
__ide_end_request() needs ide_lock only for __blk_end_request()
call so push ide_lock taking inside __ide_end_requests().Signed-off-by: Bartlomiej Zolnierkiewicz
-
While at it:
- no need to check for hwgroup presence in ide_dump_opcode()Signed-off-by: Bartlomiej Zolnierkiewicz
-
[ and ide_cfg_mtx mutex provides a sufficient protection for callers ]
Signed-off-by: Bartlomiej Zolnierkiewicz
-
IDE settings are protected by ide_setting_mtx mutex so there is
no need to hold ide_lock in ide_setting_ioctl(), ide_read_setting()
and ide_proc_unregister_driver().Signed-off-by: Bartlomiej Zolnierkiewicz
-
Just a preparation for future changes.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
Commit 4dde4492d850a4c9bcaa92e5bd7f4eebe3e2f5ab ("ide: make drive->id
an union (take 2)") accidentally introduced an IDE ACPI regression which
at least on some machines confuses ACPI and breaks suspend. Fix it.Fixes kernel.org bug #12279:
http://bugzilla.kernel.org/show_bug.cgi?id=12279[ Sorry about the bug (IDE ACPI is not used by default so it managed
to slip in). Still it is kind of surprising that the bug breaks
suspend as it shouldn't impact anything except IDE ACPI (it seems
that it uncovered either some ACPI/PM deficiency or a BIOS bug). ]Reported-and-bisected-by: David Roka
Tested-by: David Roka
Cc: Rafael J. Wysocki
Cc: Len Brown
Signed-off-by: Bartlomiej Zolnierkiewicz -
This fixes data corruption on PIO mode.
Signed-off-by: Atsushi Nemoto
Cc: stable
Cc: sshtylyov@ru.mvista.com
Signed-off-by: Bartlomiej Zolnierkiewicz -
This fixes data corruption on some heavy load.
Signed-off-by: Atsushi Nemoto
Cc: stable
Cc: sshtylyov@ru.mvista.com
Signed-off-by: Bartlomiej Zolnierkiewicz
29 Dec, 2008
1 commit
-
Remove some more cruft from machw.h and drop the #include where it isn't
needed.Signed-off-by: Finn Thain
Signed-off-by: Geert Uytterhoeven
23 Dec, 2008
1 commit
-
In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)//
@@
type T;
expression E;
identifier i,fld;
statement S;
@@- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
//Signed-off-by: Julia Lawall
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz
16 Dec, 2008
1 commit
-
…mlind/linux-omap-2.6 into devel
13 Dec, 2008
1 commit
10 Dec, 2008
1 commit
-
The generic_defconfig has three section mismatches. This clears up
ioc4_ide_attach_one().Signed-off-by: Robin Holt
Signed-off-by: Mike Reid
Signed-off-by: Tony Luck
