aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-03-24 23:22:50 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:18 -0400
commita1efdaba2dbd6fb89e23a87b66d3f4dd92c9f5af (patch)
tree6197c537892e0d887b2a90e369b74abf0500b9ac /include
parent959471936241bd83da7d0a76411cef6772140fe6 (diff)
libata: make reset related methods proper port operations
Currently reset methods are not specified directly in the ata_port_operations table. If a LLD wants to use custom reset methods, it should construct and use a error_handler which uses those reset methods. It's done this way for two reasons. First, the ops table already contained too many methods and adding four more of them would noticeably increase the amount of necessary boilerplate code all over low level drivers. Second, as ->error_handler uses those reset methods, it can get confusing. ie. By overriding ->error_handler, those reset ops can be made useless making layering a bit hazy. Now that ops table uses inheritance, the first problem doesn't exist anymore. The second isn't completely solved but is relieved by providing default values - most drivers can just override what it has implemented and don't have to concern itself about higher level callbacks. In fact, there currently is no driver which actually modifies error handling behavior. Drivers which override ->error_handler just wraps the standard error handler only to prepare the controller for EH. I don't think making ops layering strict has any noticeable benefit. This patch makes ->prereset, ->softreset, ->hardreset, ->postreset and their PMP counterparts propoer ops. Default ops are provided in the base ops tables and drivers are converted to override individual reset methods instead of creating custom error_handler. * ata_std_error_handler() doesn't use sata_std_hardreset() if SCRs aren't accessible. sata_promise doesn't need to use separate error_handlers for PATA and SATA anymore. * softreset is broken for sata_inic162x and sata_sx4. As libata now always prefers hardreset, this doesn't really matter but the ops are forced to NULL using ATA_OP_NULL for documentation purpose. * pata_hpt374 needs to use different prereset for the first and second PCI functions. This used to be done by branching from hpt374_error_handler(). The proper way to do this is to use separate ops and port_info tables for each function. Converted. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 88c6fa84ed74..01c233303aee 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -693,6 +693,14 @@ struct ata_port_operations {
693 693
694 void (*freeze)(struct ata_port *ap); 694 void (*freeze)(struct ata_port *ap);
695 void (*thaw)(struct ata_port *ap); 695 void (*thaw)(struct ata_port *ap);
696 ata_prereset_fn_t prereset;
697 ata_reset_fn_t softreset;
698 ata_reset_fn_t hardreset;
699 ata_postreset_fn_t postreset;
700 ata_prereset_fn_t pmp_prereset;
701 ata_reset_fn_t pmp_softreset;
702 ata_reset_fn_t pmp_hardreset;
703 ata_postreset_fn_t pmp_postreset;
696 void (*error_handler)(struct ata_port *ap); 704 void (*error_handler)(struct ata_port *ap);
697 void (*post_internal_cmd)(struct ata_queued_cmd *qc); 705 void (*post_internal_cmd)(struct ata_queued_cmd *qc);
698 706
@@ -909,10 +917,6 @@ extern void ata_bmdma_irq_clear(struct ata_port *ap);
909extern void ata_noop_irq_clear(struct ata_port *ap); 917extern void ata_noop_irq_clear(struct ata_port *ap);
910extern void ata_bmdma_freeze(struct ata_port *ap); 918extern void ata_bmdma_freeze(struct ata_port *ap);
911extern void ata_bmdma_thaw(struct ata_port *ap); 919extern void ata_bmdma_thaw(struct ata_port *ap);
912extern void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
913 ata_reset_fn_t softreset,
914 ata_reset_fn_t hardreset,
915 ata_postreset_fn_t postreset);
916extern void ata_bmdma_error_handler(struct ata_port *ap); 920extern void ata_bmdma_error_handler(struct ata_port *ap);
917extern void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc); 921extern void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc);
918extern int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, 922extern int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
@@ -1056,11 +1060,7 @@ extern int sata_pmp_std_prereset(struct ata_link *link, unsigned long deadline);
1056extern int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class, 1060extern int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class,
1057 unsigned long deadline); 1061 unsigned long deadline);
1058extern void sata_pmp_std_postreset(struct ata_link *link, unsigned int *class); 1062extern void sata_pmp_std_postreset(struct ata_link *link, unsigned int *class);
1059extern void sata_pmp_do_eh(struct ata_port *ap, 1063extern void sata_pmp_error_handler(struct ata_port *ap);
1060 ata_prereset_fn_t prereset, ata_reset_fn_t softreset,
1061 ata_reset_fn_t hardreset, ata_postreset_fn_t postreset,
1062 ata_prereset_fn_t pmp_prereset, ata_reset_fn_t pmp_softreset,
1063 ata_reset_fn_t pmp_hardreset, ata_postreset_fn_t pmp_postreset);
1064 1064
1065/* 1065/*
1066 * EH 1066 * EH
@@ -1080,6 +1080,7 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
1080extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, 1080extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
1081 ata_reset_fn_t softreset, ata_reset_fn_t hardreset, 1081 ata_reset_fn_t softreset, ata_reset_fn_t hardreset,
1082 ata_postreset_fn_t postreset); 1082 ata_postreset_fn_t postreset);
1083extern void ata_std_error_handler(struct ata_port *ap);
1083 1084
1084/* 1085/*
1085 * Base operations to inherit from and initializers for sht 1086 * Base operations to inherit from and initializers for sht