Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 039ece38 authored by Hans de Goede's avatar Hans de Goede Committed by Tejun Heo
Browse files

libahci: Allow drivers to override start_engine 



Allwinner A10 and A20 ARM SoCs have an AHCI sata controller which needs a
special register to be poked before starting the DMA engine.

This register gets reset on an ahci_stop_engine call, so there is no other
place then ahci_start_engine where this poking can be done.

This commit allows drivers to override ahci_start_engine behavior for use by
the Allwinner AHCI driver (and potentially other drivers in the future).

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent b2a52b6a

drivers/ata/ahci.c

+4 −2
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, 
				 unsigned long deadline)

{

	struct ata_port *ap = link->ap;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	bool online;

	int rc;
@@ -573,7 +574,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, 
	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),

				 deadline, &online, NULL);



	ahci_start_engine(ap);

	hpriv->start_engine(ap);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);
@@ -588,6 +589,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 
{

	struct ata_port *ap = link->ap;

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

	struct ata_taskfile tf;

	bool online;
@@ -603,7 +605,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 
	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),

				 deadline, &online, NULL);



	ahci_start_engine(ap);

	hpriv->start_engine(ap);



	/* The pseudo configuration device on SIMG4726 attached to

	 * ASUS P5W-DH Deluxe doesn't send signature FIS after

drivers/ata/ahci.h

+6 −0
Original line number Diff line number Diff line
@@ -323,6 +323,12 @@ struct ahci_host_priv { 
	u32			em_msg_type;	/* EM message type */

	struct clk		*clk;		/* Only for platforms supporting clk */

	void			*plat_data;	/* Other platform data */

	/*

	 * Optional ahci_start_engine override, if not set this gets set to the

	 * default ahci_start_engine during ahci_save_initial_config, this can

	 * be overridden anytime before the host is activated.

	 */

	void			(*start_engine)(struct ata_port *ap);

};



extern int ahci_ignore_sss;

drivers/ata/libahci.c

+19 −7
Original line number Diff line number Diff line
@@ -393,6 +393,9 @@ static ssize_t ahci_show_em_supported(struct device *dev, 
 *

 *	If inconsistent, config values are fixed up by this function.

 *

 *	If it is not set already this function sets hpriv->start_engine to

 *	ahci_start_engine.

 *

 *	LOCKING:

 *	None.

 */
@@ -499,6 +502,9 @@ void ahci_save_initial_config(struct device *dev, 
	hpriv->cap = cap;

	hpriv->cap2 = cap2;

	hpriv->port_map = port_map;



	if (!hpriv->start_engine)

		hpriv->start_engine = ahci_start_engine;

}

EXPORT_SYMBOL_GPL(ahci_save_initial_config);
@@ -765,7 +771,7 @@ static void ahci_start_port(struct ata_port *ap) 


	/* enable DMA */

	if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE))

		ahci_start_engine(ap);

		hpriv->start_engine(ap);



	/* turn on LEDs */

	if (ap->flags & ATA_FLAG_EM) {
@@ -1234,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap) 


	/* restart engine */

 out_restart:

	ahci_start_engine(ap);

	hpriv->start_engine(ap);

	return rc;

}

EXPORT_SYMBOL_GPL(ahci_kick_engine);
@@ -1426,6 +1432,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, 
	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	struct ata_port *ap = link->ap;

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

	struct ata_taskfile tf;

	bool online;
@@ -1443,7 +1450,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, 
	rc = sata_link_hardreset(link, timing, deadline, &online,

				 ahci_check_ready);



	ahci_start_engine(ap);

	hpriv->start_engine(ap);



	if (online)

		*class = ahci_dev_classify(ap);
@@ -2007,10 +2014,12 @@ static void ahci_thaw(struct ata_port *ap) 


void ahci_error_handler(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;



	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {

		/* restart engine */

		ahci_stop_engine(ap);

		ahci_start_engine(ap);

		hpriv->start_engine(ap);

	}



	sata_pmp_error_handler(ap);
@@ -2031,6 +2040,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc) 


static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *port_mmio = ahci_port_base(ap);

	struct ata_device *dev = ap->link.device;

	u32 devslp, dm, dito, mdat, deto;
@@ -2094,7 +2104,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) 
		   PORT_DEVSLP_ADSE);

	writel(devslp, port_mmio + PORT_DEVSLP);



	ahci_start_engine(ap);

	hpriv->start_engine(ap);



	/* enable device sleep feature for the drive */

	err_mask = ata_dev_set_feature(dev,
@@ -2106,6 +2116,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) 


static void ahci_enable_fbs(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct ahci_port_priv *pp = ap->private_data;

	void __iomem *port_mmio = ahci_port_base(ap);

	u32 fbs;
@@ -2134,11 +2145,12 @@ static void ahci_enable_fbs(struct ata_port *ap) 
	} else

		dev_err(ap->host->dev, "Failed to enable FBS\n");



	ahci_start_engine(ap);

	hpriv->start_engine(ap);

}



static void ahci_disable_fbs(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct ahci_port_priv *pp = ap->private_data;

	void __iomem *port_mmio = ahci_port_base(ap);

	u32 fbs;
@@ -2166,7 +2178,7 @@ static void ahci_disable_fbs(struct ata_port *ap) 
		pp->fbs_enabled = false;

	}



	ahci_start_engine(ap);

	hpriv->start_engine(ap);

}



static void ahci_pmp_attach(struct ata_port *ap)

drivers/ata/sata_highbank.c

+2 −1
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, 
	static const unsigned long timing[] = { 5, 100, 500};

	struct ata_port *ap = link->ap;

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG;

	struct ata_taskfile tf;

	bool online;
@@ -430,7 +431,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, 
			break;

	} while (!online && retry--);



	ahci_start_engine(ap);

	hpriv->start_engine(ap);



	if (online)

		*class = ahci_dev_classify(ap);