14 Mar, 2009
1 commit
-
since it fails the virt_to_page() translation check with DEBUG_VIRTUAL
enabled.Signed-off-by: Borislav Petkov
[bart: backport to Linus' tree]
Signed-off-by: Bartlomiej Zolnierkiewicz
07 Jan, 2009
1 commit
-
* Merge ide_hwgroup_t with ide_hwif_t.
* Cleanup init_irq() accordingly, then remove no longer needed
ide_remove_port_from_hwgroup() and ide_ports[].* Remove now unused HWGROUP() macro.
While at it:
* ide_dump_ata_error() fixups
v2:
* Fix ->quirk_list check in do_ide_request()
(s/hwif->cur_dev/prev_port->cur_dev).Signed-off-by: Bartlomiej Zolnierkiewicz
02 Jan, 2009
3 commits
-
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
- cdrom_timer_expiry -> ide_cd_expiry
- remove expiry-arg to ide_issue_pc as it is redundant now
- ide_debug_log -> debug_logSigned-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
This makes the top-level function just allocate a single pc entry, and then
pass it down as a pointer to all the helper functions that also need one
of those "struct ide_atapi_pc" things. As far as I can tell, the use of
these things never overlaps each other, BUT I DID NOT CHECK VERY CLOSELY!So I'm not guaranteeing this is correct, and I don't have the hardware. It
would be good for somebody who knows the code more, and has the hardware,
could please test this?With this, ide-floppy still has fairly big stack usage, but instead of
idefloppy_ioctl [vmlinux]: 1208
ide_floppy_get_capacity [vmlinux]: 872
idefloppy_release [vmlinux]: 408
idefloppy_open [vmlinux]: 408where those two first ones are at the very top of the list of stack users
for me, it's nowide_floppy_get_capacity [vmlinux]: 404
ide_floppy_ioctl [vmlinux]: 364ie they are still high, but they are no longer at the top.
Borislav: Since ide_floppy_get_capacity is passed as a function pointer to other
parts of the kernel (e.g., block layer) we need that ide_atapi_pc to be created
on stack. Also, redid stack users numbers above. The two functions missing from
Linus' original 'make stackusage' output are due to ide being
rewritten/reorganized atm.Signed-off-by: Linus Torvalds
Signed-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz
18 Oct, 2008
11 commits
-
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add struct ide_disk_ops containing protocol specific methods.
* Add 'struct ide_disk_ops *' to ide_drive_t.
* Convert ide-{disk,floppy} drivers to use struct ide_disk_ops.
* Merge ide-{disk,floppy} drivers into generic ide-gd driver.
While at it:
- ide_disk_init_capacity() -> ide_disk_get_capacity()Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
While at it:
- idefloppy_do_request() -> ide_floppy_do_request()
- idefloppy_end_request() -> ide_floppy_end_request()
- idefloppy_setup() -> ide_floppy_setup()There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Just use IDE_DFLAG_DOORLOCKING instead.
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Use drive->capacity64 for caching current capacity.
* Switch ide_floppy_capacity() to use drive->capacity64.
* Call set_capacity() in idefloppy_open() and ide_floppy_probe()
instead of ide_floppy_get_capacity().There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz
14 Oct, 2008
16 commits
-
While at it:
- idefloppy_capacity() -> ide_floppy_capacity()
- idefloppy_proc[] -> ide_floppy_proc[]
- idefloppy_settings[] -> ide_floppy_settings[]v2:
Build fix for CONFIG_IDE_PROC_FS=n from Elias Oltmanns.Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
While at it:
- idefloppy_ioctl() -> ide_floppy_ioctl()v2:
Fix for idefloppy_ioctl name change from Stephen Rothwell.Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Set IDE_AFLAG_DRQ_INTERRUPT in do_identify() instead of ATAPI
device drivers *_setup() methods.While at it:
- use ata_id_cdb_intr()There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add 'unsigned long dev_flags' to ide_drive_t and convert bitfields
to IDE_DFLAG_* flags.While at it:
- IDE_DFLAG_ADDRESSING -> IDE_DFLAG_LBA48
- fixup some comments
- remove needless g->flags zeroing from ide*_probe()There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz
-
... with which to control to verbosity of debug messages on module load time.
Signed-off-by: Borislav Petkov
[bart: no need to zero debug_mask + move module_param() closer debug_mask]
[bart: init drive->debug_mask in ide_floppy_probe() not in idefloppy_open()]
Signed-off-by: Bartlomiej Zolnierkiewicz -
Also:
- leave in the possibility for optimizing away all debugging macros
- add a PFX macro and prepend all printk calls with it for consistency
- change idefloppy_create_rw_cmd's 1st arg from idefloppy_floppy_t * to
ide_drive_t *.
- add a missing printk-level in idefloppy_init
- fix minor checkpatch warningsSigned-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Introduce to_ide_drv() and ide_drv_g() macros and replace the respective
definitions of similar ones in each driver.There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Move ->ticks field from struct ide_floppy_obj to ide_drive_t.
* Move idefloppy_transfer_pc() to ide-atapi.c and make
ide_transfer_pc() use it.* Always use ide_transfer_pc as a handler in ide_issue_pc().
* Remove no longer used idefloppy_start_pc_transfer(),
ide*_transfer_pc() and 'handler' argument from ide_issue_pc().* Make ide_transfer_pc() static.
While at it:
* idefloppy_transfer_pc() -> ide_delayed_transfer_pc()
* IDEFLOPPY_TICKS_DELAY -> IDEFLOPPY_PC_DELAY
* ->ticks -> ->pc_delay
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Always use ide_pc_intr as a handler in ide_pc_intr().
* Remove no longer used ide*_pc_intr() and 'handler'
argument from ide_{transfer_pc,pc_intr}().* Make ide_pc_intr() static.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add ->pc_{update,io}_buffers methods to ide_drive_t and use
them instead of {update,io}_buffers ide_pc_intr() arguments.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_create_request_sense_cmd() and ide_retry_pc() helpers
and convert ide-{atapi,floppy,tape}.c to use them.* Remove no longer used ide*_create_request_sense_cmd(),
ide*_retry_pc() and 'retry_pc' argument from ide_pc_intr().* Make ide_queue_pc_head() static.
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add 'struct ide_atapi_pc request_sense_pc' and 'request request_sense_rq' to
ide_drive_t and use them instead of fields in struct ide_{floppy,tape}_obj.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Move idescsi_expiry() to ide-atapi.c.
* Move get_timeout() to .
* Drop 'timeout' and 'expiry' arguments from ide_pc_intr().
While at it:
* idescsi_expiry() -> ide_scsi_expiry()
* get_timeout() -> ide_scsi_get_timeout()
There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add pointer to the current packet command (struct ide_atapi_pc *pc)
to ide_drive_t and use it instead of the pointer in struct ide_*_obj.* Use drive->pc in ide_{issue,transfer}_pc() and ide_pc_intr()
instead of 'pc' argument.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add 'int dsc' argument to ->pc_callback method.
* Call ide_tape_handle_dsc() internally in ide_tape_callback()
if dsc argument is set and update ide_pc_intr() accordingly.There should be no functional changes caused by this patch.
Cc: Borislav Petkov
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz
11 Oct, 2008
8 commits
-
Use a special request for serialisation purposes and get rid of the
awkward ide_spin_wait_hwgroup(). This also involves converting the
ide_devset structure so it can be shared by the /proc and the ioctl code.Signed-off-by: Elias Oltmanns
[bart: use rq->cmd[] directly]
Signed-off-by: Bartlomiej Zolnierkiewicz -
While at it:
* IDE{FLOPPY,TAPE}_WAIT_CMD -> WAIT_{FLOPPY,TAPE}_CMD
* Use enum for WAIT_* defines.
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_do_test_unit_ready() helper and convert ide-{floppy,tape}.c
to use it.* Remove no longer used idetape_create_test_unit_ready_cmd().
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_do_start_stop() helper and convert ide-{floppy,tape}.c
to use it.* Remove no longer used idefloppy_create_start_stop_cmd()
and idetape_create_load_unload_cmd().There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Set IDE_AFLAG_NO_DOORLOCK in idetape_get_mode_sense_result(), check it
in ide_tape_set_media_lock() and cleanup idetape_create_prevent_cmd().* Set IDE_AFLAG_NO_DOORLOCK in ide_floppy_create_read_capacity_cmd() and
check it instead of IDE_AFLAG_CLIK_DRIVE in ide_floppy_set_media_lock().* Add ide_set_media_lock() helper and convert ide-{floppy,tape}.c to use it.
* Remove no longer used ide*_create_prevent_cmd()/ide*_set_media_lock().
* Update comment in accordingly.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
While at it:
- idefloppy_create_read_capacity_cmd() -> ide_floppy_create_read_capacity_cmd()
- idefloppy_create_mode_sense_cmd() -> ide_floppy_create_mode_sense_cmd()
- idefloppy_create_request_sense_cmd() -> ide_floppy_create_request_sense_cmd()
- idefloppy_create_format_unit_cmd() -> ide_floppy_create_format_unit_cmd()
- idefloppy_get_sfrp_bit() -> ide_floppy_get_sfrp_bit()Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
Add IDE_AFLAG_{SRFP,WP} drive->atapi_flags and use them
instead of ->{srfp,wp} struct ide_floppy_obj fields.There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Signed-off-by: Bartlomiej Zolnierkiewicz -
* Add ide_queue_pc_tail() and convert ide-{floppy,tape}.c to use it
instead of ide*_queue_pc_tail().* Remove no longer used ide*_queue_pc_tail().
There should be no functional changes caused by this patch.
Acked-by: Borislav Petkov
Acked-by: Sergei Shtylyov
Signed-off-by: Bartlomiej Zolnierkiewicz
