Commit 029cfd6b authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: implement and use ops inheritance 



libata lets low level drivers build ata_port_operations table and
register it with libata core layer.  This allows low level drivers
high level of flexibility but also burdens them with lots of
boilerplate entries.

This becomes worse for drivers which support related similar
controllers which differ slightly.  They share most of the operations
except for a few.  However, the driver still needs to list all
operations for each variant.  This results in large number of
duplicate entries, which is not only inefficient but also error-prone
as it becomes very difficult to tell what the actual differences are.

This duplicate boilerplates all over the low level drivers also make
updating the core layer exteremely difficult and error-prone.  When
compounded with multi-branched development model, it ends up
accumulating inconsistencies over time.  Some of those inconsistencies
cause immediate problems and fixed.  Others just remain there dormant
making maintenance increasingly difficult.

To rectify the problem, this patch implements ata_port_operations
inheritance.  To allow LLDs to easily re-use their own ops tables
overriding only specific methods, this patch implements poor man's
class inheritance.  An ops table has ->inherits field which can be set
to any ops table as long as it doesn't create a loop.  When the host
is started, the inheritance chain is followed and any operation which
isn't specified is taken from the nearest ancestor which has it
specified.  This operation is called finalization and done only once
per an ops table and the LLD doesn't have to do anything special about
it other than making the ops table non-const such that libata can
update it.

libata provides four base ops tables lower drivers can inherit from -
base, sata, pmp, sff and bmdma.  To avoid overriding these ops
accidentaly, these ops are declared const and LLDs should always
inherit these instead of using them directly.

After finalization, all the ops table are identical before and after
the patch except for setting .irq_handler to ata_interrupt in drivers
which didn't use to.  The .irq_handler doesn't have any actual effect
and the field will soon be removed by later patch.

* sata_sx4 is still using old style EH and currently doesn't take
  advantage of ops inheritance.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 68d1d07b

drivers/ata/ahci.c

+11 −83
Original line number Diff line number Diff line
@@ -280,118 +280,46 @@ static struct scsi_host_template ahci_sht = { 
	.shost_attrs		= ahci_shost_attrs,

};



static const struct ata_port_operations ahci_ops = {

static struct ata_port_operations ahci_ops = {

	.inherits		= &sata_pmp_port_ops,



	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,



	.dev_config		= ahci_dev_config,



	.tf_read		= ahci_tf_read,



	.qc_defer		= sata_pmp_qc_defer_cmd_switch,

	.qc_prep		= ahci_qc_prep,

	.qc_issue		= ahci_qc_issue,



	.irq_clear		= ata_noop_irq_clear,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,



	.freeze			= ahci_freeze,

	.thaw			= ahci_thaw,



	.error_handler		= ahci_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



	.pmp_attach		= ahci_pmp_attach,

	.pmp_detach		= ahci_pmp_detach,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif

	.enable_pm		= ahci_enable_alpm,

	.disable_pm		= ahci_disable_alpm,



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,

};



static const struct ata_port_operations ahci_vt8251_ops = {

	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,



	.dev_config		= ahci_dev_config,



	.tf_read		= ahci_tf_read,



	.qc_defer		= sata_pmp_qc_defer_cmd_switch,

	.qc_prep		= ahci_qc_prep,

	.qc_issue		= ahci_qc_issue,



	.irq_clear		= ata_noop_irq_clear,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,



	.freeze			= ahci_freeze,

	.thaw			= ahci_thaw,



	.error_handler		= ahci_vt8251_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



	.pmp_attach		= ahci_pmp_attach,

	.pmp_detach		= ahci_pmp_detach,



	.enable_pm		= ahci_enable_alpm,

	.disable_pm		= ahci_disable_alpm,

#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif

	.enable_pm		= ahci_enable_alpm,

	.disable_pm		= ahci_disable_alpm,



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,

};



static const struct ata_port_operations ahci_p5wdh_ops = {

	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,



	.dev_config		= ahci_dev_config,



	.tf_read		= ahci_tf_read,



	.qc_defer		= sata_pmp_qc_defer_cmd_switch,

	.qc_prep		= ahci_qc_prep,

	.qc_issue		= ahci_qc_issue,



	.irq_clear		= ata_noop_irq_clear,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,



	.freeze			= ahci_freeze,

	.thaw			= ahci_thaw,

static struct ata_port_operations ahci_vt8251_ops = {

	.inherits		= &ahci_ops,

	.error_handler		= ahci_vt8251_error_handler,

};



static struct ata_port_operations ahci_p5wdh_ops = {

	.inherits		= &ahci_ops,

	.error_handler		= ahci_p5wdh_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



	.pmp_attach		= ahci_pmp_attach,

	.pmp_detach		= ahci_pmp_detach,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif

	.enable_pm		= ahci_enable_alpm,

	.disable_pm		= ahci_disable_alpm,



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,

};



#define AHCI_HFLAGS(flags)	.private_data	= (void *)(flags)

drivers/ata/ata_generic.c

+2 −29
Original line number Diff line number Diff line
@@ -99,36 +99,9 @@ static struct scsi_host_template generic_sht = { 
};



static struct ata_port_operations generic_port_ops = {

	.set_mode	= generic_set_mode,

	.mode_filter	= ata_pci_default_filter,



	.tf_load	= ata_tf_load,

	.tf_read	= ata_tf_read,

	.check_status 	= ata_check_status,

	.exec_command	= ata_exec_command,

	.dev_select 	= ata_std_dev_select,



	.bmdma_setup 	= ata_bmdma_setup,

	.bmdma_start 	= ata_bmdma_start,

	.bmdma_stop	= ata_bmdma_stop,

	.bmdma_status 	= ata_bmdma_status,



	.data_xfer	= ata_data_xfer,



	.freeze		= ata_bmdma_freeze,

	.thaw		= ata_bmdma_thaw,

	.error_handler	= ata_bmdma_error_handler,

	.post_internal_cmd = ata_bmdma_post_internal_cmd,

	.inherits	= &ata_bmdma_port_ops,

	.cable_detect	= ata_cable_unknown,



	.qc_prep 	= ata_qc_prep,

	.qc_issue	= ata_qc_issue_prot,



	.irq_handler	= ata_interrupt,

	.irq_clear	= ata_bmdma_irq_clear,

	.irq_on		= ata_irq_on,



	.port_start	= ata_sff_port_start,

	.set_mode	= generic_set_mode,

};



static int all_generic_ide;		/* Set to claim all devices */

drivers/ata/ata_piix.c

+14 −135
Original line number Diff line number Diff line
@@ -294,155 +294,34 @@ static struct scsi_host_template piix_sht = { 
	ATA_BMDMA_SHT(DRV_NAME),

};



static const struct ata_port_operations piix_pata_ops = {

static struct ata_port_operations piix_pata_ops = {

	.inherits		= &ata_bmdma_port_ops,

	.cable_detect		= ata_cable_40wire,

	.set_piomode		= piix_set_piomode,

	.set_dmamode		= piix_set_dmamode,

	.mode_filter		= ata_pci_default_filter,



	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= piix_pata_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.cable_detect		= ata_cable_40wire,



	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,

};



	.port_start		= ata_sff_port_start,

static struct ata_port_operations piix_vmw_ops = {

	.inherits		= &piix_pata_ops,

	.bmdma_status		= piix_vmw_bmdma_status,

};



static const struct ata_port_operations ich_pata_ops = {

	.set_piomode		= piix_set_piomode,

	.set_dmamode		= ich_set_dmamode,

	.mode_filter		= ata_pci_default_filter,



	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= piix_pata_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

static struct ata_port_operations ich_pata_ops = {

	.inherits		= &piix_pata_ops,

	.cable_detect		= ich_pata_cable_detect,



	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

	.set_dmamode		= ich_set_dmamode,

};



static const struct ata_port_operations piix_sata_ops = {

	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



	.mode_filter		= ata_pci_default_filter,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

static struct ata_port_operations piix_sata_ops = {

	.inherits		= &ata_bmdma_port_ops,

};



static const struct ata_port_operations piix_vmw_ops = {

	.set_piomode		= piix_set_piomode,

	.set_dmamode		= piix_set_dmamode,

	.mode_filter		= ata_pci_default_filter,



	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= piix_vmw_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= piix_pata_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.cable_detect		= ata_cable_40wire,



	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

};



static const struct ata_port_operations piix_sidpr_sata_ops = {

	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



static struct ata_port_operations piix_sidpr_sata_ops = {

	.inherits		= &piix_sata_ops,

	.scr_read		= piix_sidpr_scr_read,

	.scr_write		= piix_sidpr_scr_write,



	.mode_filter		= ata_pci_default_filter,

	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= piix_sidpr_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

};



static const struct piix_map_db ich5_map_db = {

drivers/ata/libata-core.c

+111 −2
Original line number Diff line number Diff line
@@ -74,6 +74,56 @@ const unsigned long sata_deb_timing_normal[] = { 5, 100, 2000 }; 
const unsigned long sata_deb_timing_hotplug[]		= {  25,  500, 2000 };

const unsigned long sata_deb_timing_long[]		= { 100, 2000, 5000 };



const struct ata_port_operations ata_base_port_ops = {

	.irq_clear		= ata_noop_irq_clear,

};



const struct ata_port_operations sata_port_ops = {

	.inherits		= &ata_base_port_ops,



	.qc_defer		= ata_std_qc_defer,

	.dev_select		= ata_noop_dev_select,

};



const struct ata_port_operations sata_pmp_port_ops = {

	.inherits		= &sata_port_ops,

};



const struct ata_port_operations ata_sff_port_ops = {

	.inherits		= &ata_base_port_ops,



	.qc_prep		= ata_qc_prep,

	.qc_issue		= ata_qc_issue_prot,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= ata_bmdma_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,



	.dev_select		= ata_std_dev_select,

	.check_status		= ata_check_status,

	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.exec_command		= ata_exec_command,

	.data_xfer		= ata_data_xfer,

	.irq_on			= ata_irq_on,



	.port_start		= ata_sff_port_start,

	.irq_handler		= ata_interrupt,

};



const struct ata_port_operations ata_bmdma_port_ops = {

	.inherits		= &ata_sff_port_ops,



	.mode_filter		= ata_pci_default_filter,



	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.irq_clear		= ata_bmdma_irq_clear,

};



static unsigned int ata_dev_init_params(struct ata_device *dev,

					u16 heads, u16 sectors);

static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
@@ -6971,6 +7021,56 @@ static void ata_host_stop(struct device *gendev, void *res) 
		host->ops->host_stop(host);

}



/**

 *	ata_finalize_port_ops - finalize ata_port_operations

 *	@ops: ata_port_operations to finalize

 *

 *	An ata_port_operations can inherit from another ops and that

 *	ops can again inherit from another.  This can go on as many

 *	times as necessary as long as there is no loop in the

 *	inheritance chain.

 *

 *	Ops tables are finalized when the host is started.  NULL or

 *	unspecified entries are inherited from the closet ancestor

 *	which has the method and the entry is populated with it.

 *	After finalization, the ops table directly points to all the

 *	methods and ->inherits is no longer necessary and cleared.

 *

 *	Using ATA_OP_NULL, inheriting ops can force a method to NULL.

 *

 *	LOCKING:

 *	None.

 */

static void ata_finalize_port_ops(struct ata_port_operations *ops)

{

	static spinlock_t lock = SPIN_LOCK_UNLOCKED;

	const struct ata_port_operations *cur;

	void **begin = (void **)ops;

	void **end = (void **)&ops->inherits;

	void **pp;



	if (!ops || !ops->inherits)

		return;



	spin_lock(&lock);



	for (cur = ops->inherits; cur; cur = cur->inherits) {

		void **inherit = (void **)cur;



		for (pp = begin; pp < end; pp++, inherit++)

			if (!*pp)

				*pp = *inherit;

	}



	for (pp = begin; pp < end; pp++)

		if (IS_ERR(*pp))

			*pp = NULL;



	ops->inherits = NULL;



	spin_unlock(&lock);

}



/**

 *	ata_host_start - start and freeze ports of an ATA host

 *	@host: ATA host to start ports for
@@ -6996,9 +7096,13 @@ int ata_host_start(struct ata_host *host) 
	if (host->flags & ATA_HOST_STARTED)

		return 0;



	ata_finalize_port_ops(host->ops);



	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];



		ata_finalize_port_ops(ap->ops);



		if (!host->ops && !ata_port_is_dummy(ap))

			host->ops = ap->ops;
@@ -7060,7 +7164,7 @@ int ata_host_start(struct ata_host *host) 
 */

/* KILLME - the only user left is ipr */

void ata_host_init(struct ata_host *host, struct device *dev,

		   unsigned long flags, const struct ata_port_operations *ops)

		   unsigned long flags, struct ata_port_operations *ops)

{

	spin_lock_init(&host->lock);

	host->dev = dev;
@@ -7749,7 +7853,7 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc) 
	return AC_ERR_SYSTEM;

}



const struct ata_port_operations ata_dummy_port_ops = {

struct ata_port_operations ata_dummy_port_ops = {

	.check_status		= ata_dummy_check_status,

	.check_altstatus	= ata_dummy_check_status,

	.dev_select		= ata_noop_dev_select,
@@ -7777,6 +7881,11 @@ const struct ata_port_info ata_dummy_port_info = { 
EXPORT_SYMBOL_GPL(sata_deb_timing_normal);

EXPORT_SYMBOL_GPL(sata_deb_timing_hotplug);

EXPORT_SYMBOL_GPL(sata_deb_timing_long);

EXPORT_SYMBOL_GPL(ata_base_port_ops);

EXPORT_SYMBOL_GPL(sata_port_ops);

EXPORT_SYMBOL_GPL(sata_pmp_port_ops);

EXPORT_SYMBOL_GPL(ata_sff_port_ops);

EXPORT_SYMBOL_GPL(ata_bmdma_port_ops);

EXPORT_SYMBOL_GPL(ata_dummy_port_ops);

EXPORT_SYMBOL_GPL(ata_dummy_port_info);

EXPORT_SYMBOL_GPL(ata_std_bios_param);

drivers/ata/pata_acpi.c

+5 −30
Original line number Diff line number Diff line
@@ -235,39 +235,14 @@ static struct scsi_host_template pacpi_sht = { 
	ATA_BMDMA_SHT(DRV_NAME),

};



static const struct ata_port_operations pacpi_ops = {

static struct ata_port_operations pacpi_ops = {

	.inherits		= &ata_bmdma_port_ops,

	.qc_issue		= pacpi_qc_issue_prot,

	.cable_detect		= pacpi_cable_detect,

	.mode_filter		= pacpi_mode_filter,

	.set_piomode		= pacpi_set_piomode,

	.set_dmamode		= pacpi_set_dmamode,

	.mode_filter		= pacpi_mode_filter,



	/* Task file is PCI ATA format, use helpers */

	.tf_load		= ata_tf_load,

	.tf_read		= ata_tf_read,

	.check_status		= ata_check_status,

	.exec_command		= ata_exec_command,

	.dev_select		= ata_std_dev_select,



	.freeze			= ata_bmdma_freeze,

	.thaw			= ata_bmdma_thaw,

	.error_handler		= pacpi_error_handler,

	.post_internal_cmd	= ata_bmdma_post_internal_cmd,

	.cable_detect		= pacpi_cable_detect,



	/* BMDMA handling is PCI ATA format, use helpers */

	.bmdma_setup		= ata_bmdma_setup,

	.bmdma_start		= ata_bmdma_start,

	.bmdma_stop		= ata_bmdma_stop,

	.bmdma_status		= ata_bmdma_status,

	.qc_prep		= ata_qc_prep,

	.qc_issue		= pacpi_qc_issue_prot,

	.data_xfer		= ata_data_xfer,



	/* Timeout handling */

	.irq_handler		= ata_interrupt,

	.irq_clear		= ata_bmdma_irq_clear,

	.irq_on			= ata_irq_on,



	/* Generic PATA PCI ATA helpers */

	.port_start		= pacpi_port_start,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE