Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 22fe9446e82f1fe4b59900db4599061384efb0ad

Authored by Tejun Heo
Committed by Linus Torvalds
1 parent ddb503b429
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Revert "libata: ahci_start_engine compliant to AHCI spec" 

This reverts commit 270dac35c26433d06a89150c51e75ca0181ca7e4.

The commits causes command timeouts on AC plug/unplug.  It isn't yet
clear why.  As the commit was for a single rather obscure controller,
revert the change for now.

The problem was reported and bisected by Gu Rui in bug#34692.

 https://bugzilla.kernel.org/show_bug.cgi?id=34692

Also, reported by Rafael and Michael in the following thread.

 http://thread.gmane.org/gmane.linux.kernel/1138771

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Gu Rui <chaos.proton@gmail.com>
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Michael Leun <lkml20100708@newton.leun.net>
Cc: Jian Peng <jipeng2005@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 0 additions and 21 deletions Side-by-side Diff

drivers/ata/libahci.c
Diff comments   View file @ 22fe944
... ... @@ -561,27 +561,6 @@
561 561 {
562 562 void __iomem *port_mmio = ahci_port_base(ap);
563 563 u32 tmp;
564   - u8 status;
565   -
566   - status = readl(port_mmio + PORT_TFDATA) & 0xFF;
567   -
568   - /*
569   - * At end of section 10.1 of AHCI spec (rev 1.3), it states
570   - * Software shall not set PxCMD.ST to 1 until it is determined
571   - * that a functoinal device is present on the port as determined by
572   - * PxTFD.STS.BSY=0, PxTFD.STS.DRQ=0 and PxSSTS.DET=3h
573   - *
574   - * Even though most AHCI host controllers work without this check,
575   - * specific controller will fail under this condition
576   - */
577   - if (status & (ATA_BUSY | ATA_DRQ))
578   - return;
579   - else {
580   - ahci_scr_read(&ap->link, SCR_STATUS, &tmp);
581   -
582   - if ((tmp & 0xf) != 0x3)
583   - return;
584   - }
585 564  
586 565 /* start DMA */
587 566 tmp = readl(port_mmio + PORT_CMD);