diff options
| author | Manuel Lauss <manuel.lauss@gmail.com> | 2016-02-27 16:10:05 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-02-29 16:17:57 -0500 |
| commit | dc8b4afc4a04fac8ee55a19b59f2356a25e7e778 (patch) | |
| tree | f6fdc637a89ad3e4eda0cf93271ced61e0262248 /drivers/ata/libahci.c | |
| parent | d243bed32f5042582896237f88fa1798aee55ff9 (diff) | |
| download | linux-stable-dc8b4afc4a04fac8ee55a19b59f2356a25e7e778.tar.gz linux-stable-dc8b4afc4a04fac8ee55a19b59f2356a25e7e778.tar.bz2 linux-stable-dc8b4afc4a04fac8ee55a19b59f2356a25e7e778.zip | |
ata: ahci: don't mark HotPlugCapable Ports as external/removable
The HPCP bit is set by bioses for on-board sata ports either because
they think sata is hotplug capable in general or to allow Windows
to display a "device eject" icon on ports which are routed to an
external connector bracket.
However in Redhat Bugzilla #1310682, users report that with kernel 4.4,
where this bit test first appeared, a lot of partitions on sata drives
are now mounted automatically.
This patch should fix redhat and a lot of other distros which
unconditionally automount all devices which have the "removable"
bit set.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 8a3e33cf92c7 ("ata: ahci: find eSATA ports and flag them as removable" changes userspace behavior)
Link: http://lkml.kernel.org/g/56CF35FA.1070500@redhat.com
Cc: stable@vger.kernel.org #v4.4+
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 513b3fa74d78..85ea5142a095 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1168,8 +1168,7 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap, /* mark esata ports */ tmp = readl(port_mmio + PORT_CMD); - if ((tmp & PORT_CMD_HPCP) || - ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS))) + if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS)) ap->pflags |= ATA_PFLAG_EXTERNAL; } |