libata: increase PMP register access timeout to 3s (bf1bff6f) · Commits · 戴 / test

This timeout was set low because previously PMP register access was done via polling and register access timeouts could stack up. This is no longer the case. One timeout will make all following accesses fail immediately. In rare cases both marvell and SIMG PMPs need almost a second. Bump it to 3s. While at it, rename it to SATA_PMP_RW_TIMEOUT. It's not specific to SCR access. Signed-off-by:

Tejun Heo <htejun@gmail.com> Signed-off-by:

Jeff Garzik <jgarzik@redhat.com>

drivers/ata/libata-pmp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ static unsigned int sata_pmp_read(struct ata_link link, int reg, u32 r_val)
		tf.device = link->pmp;

		err_mask = ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0,
		SATA_PMP_SCR_TIMEOUT);
		SATA_PMP_RW_TIMEOUT);
		if (err_mask)
		return err_mask;

		@@ -88,7 +88,7 @@ static unsigned int sata_pmp_write(struct ata_link *link, int reg, u32 val)
		tf.lbah = (val >> 24) & 0xff;

		return ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0,
		SATA_PMP_SCR_TIMEOUT);
		SATA_PMP_RW_TIMEOUT);
		}

		/**

include/linux/libata.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ enum {
		ATA_EH_PMP_TRIES = 5,
		ATA_EH_PMP_LINK_TRIES = 3,

		SATA_PMP_SCR_TIMEOUT = 250,
		SATA_PMP_RW_TIMEOUT = 3000, /* PMP read/write timeout */

		/* Horkage types. May be set by libata or controller on drives
		(some horkage may be drive/controller pair dependant */

Admin message