Re: [PATCH #upstream-fixes] libata: mask off DET when restoring SControl for detach

[Jeff Garzik <jeff@garzik.org>]

Tejun Heo wrote:
> libata restores SControl on detach; however, trying to restore
> non-zero DET can cause undeterministic behavior including PMP device
> going offline till power cycling.  Mask off DET when restoring
> SControl.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> ---
>  drivers/ata/libata-core.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: work/drivers/ata/libata-core.c
> ===================================================================
> --- work.orig/drivers/ata/libata-core.c
> +++ work/drivers/ata/libata-core.c
> @@ -5936,7 +5936,7 @@ static void ata_port_detach(struct ata_p
>  	 * to us.  Restore SControl and disable all existing devices.
>  	 */
>  	__ata_port_for_each_link(link, ap) {
> -		sata_scr_write(link, SCR_CONTROL, link->saved_scontrol);
> +		sata_scr_write(link, SCR_CONTROL, link->saved_scontrol & 0xff0);
>  		ata_link_for_each_dev(dev, link)
>  			ata_dev_disable(dev);

applied