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

Commit 12ee7d3c authored by Mark Lord's avatar Mark Lord Committed by Jeff Garzik
Browse files

libata sata_qstor nuke idle state 



sata_qstor nuke idle state.

We're really only ever in one of two hardware states:  packet, or mmio.
Get rid of unnecessary "qs_state_idle" state.

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 647c595d

drivers/ata/sata_qstor.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ enum { 
	QS_DMA_BOUNDARY		= ~0UL

	QS_DMA_BOUNDARY		= ~0UL

};

};





typedef enum { qs_state_idle, qs_state_pkt, qs_state_mmio } qs_state_t;

typedef enum { qs_state_mmio, qs_state_pkt } qs_state_t;





struct qs_port_priv {

struct qs_port_priv {

	u8			*pkt;

	u8			*pkt;
@@ -219,7 +219,9 @@ static void qs_irq_clear(struct ata_port *ap) 
static inline void qs_enter_reg_mode(struct ata_port *ap)

static inline void qs_enter_reg_mode(struct ata_port *ap)

{

{

	u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000);

	u8 __iomem *chan = qs_mmio_base(ap->host) + (ap->port_no * 0x4000);

	struct qs_port_priv *pp = ap->private_data;





	pp->state = qs_state_mmio;

	writeb(QS_CTR0_REG, chan + QS_CCT_CTR0);

	writeb(QS_CTR0_REG, chan + QS_CCT_CTR0);

	readb(chan + QS_CCT_CTR0);        /* flush */

	readb(chan + QS_CCT_CTR0);        /* flush */

}

}
@@ -235,19 +237,12 @@ static inline void qs_reset_channel_logic(struct ata_port *ap) 




static void qs_phy_reset(struct ata_port *ap)

static void qs_phy_reset(struct ata_port *ap)

{

{

	struct qs_port_priv *pp = ap->private_data;



	pp->state = qs_state_idle;

	qs_reset_channel_logic(ap);

	qs_reset_channel_logic(ap);

	sata_phy_reset(ap);

	sata_phy_reset(ap);

}

}





static void qs_eng_timeout(struct ata_port *ap)

static void qs_eng_timeout(struct ata_port *ap)

{

{

	struct qs_port_priv *pp = ap->private_data;



	if (pp->state != qs_state_idle) /* healthy paranoia */

		pp->state = qs_state_mmio;

	qs_reset_channel_logic(ap);

	qs_reset_channel_logic(ap);

	ata_eng_timeout(ap);

	ata_eng_timeout(ap);

}

}
@@ -406,7 +401,6 @@ static inline unsigned int qs_intr_pkt(struct ata_host *host) 
					switch (sHST) {

					switch (sHST) {

					case 0: /* successful CPB */

					case 0: /* successful CPB */

					case 3: /* device error */

					case 3: /* device error */

						pp->state = qs_state_idle;

						qs_enter_reg_mode(qc->ap);

						qs_enter_reg_mode(qc->ap);

						qc->err_mask |= ac_err_mask(sDST);

						qc->err_mask |= ac_err_mask(sDST);

						ata_qc_complete(qc);

						ata_qc_complete(qc);
@@ -445,7 +439,6 @@ static inline unsigned int qs_intr_mmio(struct ata_host *host) 
					ap->print_id, qc->tf.protocol, status);

					ap->print_id, qc->tf.protocol, status);





				/* complete taskfile transaction */

				/* complete taskfile transaction */

				pp->state = qs_state_idle;

				qc->err_mask |= ac_err_mask(status);

				qc->err_mask |= ac_err_mask(status);

				ata_qc_complete(qc);

				ata_qc_complete(qc);

				handled = 1;

				handled = 1;
@@ -501,7 +494,6 @@ static int qs_port_start(struct ata_port *ap) 
	rc = ata_port_start(ap);

	rc = ata_port_start(ap);

	if (rc)

	if (rc)

		return rc;

		return rc;

	qs_enter_reg_mode(ap);

	pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);

	pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);

	if (!pp)

	if (!pp)

		return -ENOMEM;

		return -ENOMEM;
@@ -512,6 +504,7 @@ static int qs_port_start(struct ata_port *ap) 
	memset(pp->pkt, 0, QS_PKT_BYTES);

	memset(pp->pkt, 0, QS_PKT_BYTES);

	ap->private_data = pp;

	ap->private_data = pp;





	qs_enter_reg_mode(ap);

	addr = (u64)pp->pkt_dma;

	addr = (u64)pp->pkt_dma;

	writel((u32) addr,        chan + QS_CCF_CPBA);

	writel((u32) addr,        chan + QS_CCF_CPBA);

	writel((u32)(addr >> 32), chan + QS_CCF_CPBA + 4);

	writel((u32)(addr >> 32), chan + QS_CCF_CPBA + 4);