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

Commit 8393b811 authored by Gabriele Mazzotta's avatar Gabriele Mazzotta Committed by Tejun Heo
Browse files

libata: Add helper to determine when PHY events should be ignored 



This is a preparation commit that will allow to add other criteria
according to which PHY events should be dropped.

Signed-off-by: default avatarGabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
parent e0e2674b

drivers/ata/libahci.c

+1 −2
Original line number Diff line number Diff line
@@ -1707,8 +1707,7 @@ static void ahci_handle_port_interrupt(struct ata_port *ap, 
	if (unlikely(resetting))

		status &= ~PORT_IRQ_BAD_PMP;



	/* if LPM is enabled, PHYRDY doesn't mean anything */

	if (ap->link.lpm_policy > ATA_LPM_MAX_POWER) {

	if (sata_lpm_ignore_phy_events(&ap->link)) {

		status &= ~PORT_IRQ_PHYRDY;

		ahci_scr_write(&ap->link, SCR_ERROR, SERR_PHYRDY_CHG);

	}

drivers/ata/libata-core.c

+19 −0
Original line number Diff line number Diff line
@@ -6752,6 +6752,25 @@ u32 ata_wait_register(struct ata_port *ap, void __iomem *reg, u32 mask, u32 val, 
	return tmp;

}



/**

 *	sata_lpm_ignore_phy_events - test if PHY event should be ignored

 *	@link: Link receiving the event

 *

 *	Test whether the received PHY event has to be ignored or not.

 *

 *	LOCKING:

 *	None:

 *

 *	RETURNS:

 *	True if the event has to be ignored.

 */

bool sata_lpm_ignore_phy_events(struct ata_link *link)

{

	/* if LPM is enabled, PHYRDY doesn't mean anything */

	return !!(link->lpm_policy > ATA_LPM_MAX_POWER);

}

EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);



/*

 * Dummy port_ops

 */

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,7 @@ extern struct ata_device *ata_dev_pair(struct ata_device *adev); 
extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);

extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap);

extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q);

extern bool sata_lpm_ignore_phy_events(struct ata_link *link);



extern int ata_cable_40wire(struct ata_port *ap);

extern int ata_cable_80wire(struct ata_port *ap);