@@ -1153,6 +1153,9 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (hpriv->cap & HOST_CAP_PMP)
pi.flags |= ATA_FLAG_PMP;
+ if (hpriv->cap & HOST_CAP_SXS)
+ pi.flags |= ATA_FLAG_EXTERNAL;
+
ahci_set_em_messages(hpriv, &pi);
if (ahci_broken_system_poweroff(pdev)) {
@@ -172,6 +172,9 @@ enum {
PORT_CMD_ALPE = (1 << 26), /* Aggressive Link PM enable */
PORT_CMD_ATAPI = (1 << 24), /* Device is ATAPI */
PORT_CMD_FBSCP = (1 << 22), /* FBS Capable Port */
+ PORT_CMD_ESP = (1 << 21), /* External SATA Port */
+ PORT_CMD_MPSP = (1 << 19), /* Mechanical Presence Switch Attached to Port */
+ PORT_CMD_HPCP = (1 << 18), /* Hot Plug Capable Port */
PORT_CMD_PMP = (1 << 17), /* PMP attached */
PORT_CMD_LIST_ON = (1 << 15), /* cmd list DMA engine running */
PORT_CMD_FIS_ON = (1 << 14), /* FIS DMA engine running */
@@ -1097,6 +1097,23 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
writel(1 << port_no, mmio + HOST_IRQ_STAT);
}
+static bool ahci_port_pluggable(struct ata_port *ap)
+{
+ void __iomem *port_mmio = ahci_port_base(ap);
+ u32 cmd;
+
+ cmd = readl(port_mmio + PORT_CMD);
+
+ if ((ap->flags & ATA_FLAG_EXTERNAL) &&
+ (cmd & PORT_CMD_ESP))
+ return true;
+
+ if (cmd & (PORT_CMD_MPSP | PORT_CMD_HPCP))
+ return true;
+
+ return false;
+}
+
void ahci_init_controller(struct ata_host *host)
{
struct ahci_host_priv *hpriv = host->private_data;
@@ -1112,6 +1129,9 @@ void ahci_init_controller(struct ata_host *host)
if (ata_port_is_dummy(ap))
continue;
+ if (ahci_port_pluggable(ap))
+ ap->flags |= ATA_FLAG_PLUGGABLE;
+
ahci_port_init(host->dev, ap, i, mmio, port_mmio);
}
@@ -292,8 +292,10 @@ int ata_tport_add(struct device *parent,
}
device_enable_async_suspend(dev);
- pm_runtime_set_active(dev);
- pm_runtime_enable(dev);
+ if (!(ap->flags & ATA_FLAG_PLUGGABLE)) {
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+ }
transport_add_device(dev);
transport_configure_device(dev);
@@ -209,8 +209,10 @@ enum {
ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity
* led */
ATA_FLAG_NO_DIPM = (1 << 23), /* host not happy with DIPM */
+ ATA_FLAG_EXTERNAL = (1 << 24), /* controller supports external SATA */
+ ATA_FLAG_PLUGGABLE = (1 << 25), /* port is hotpluggable */
- /* bits 24:31 of ap->flags are reserved for LLD specific flags */
+ /* bits 26:31 of ap->flags are reserved for LLD specific flags */
/* struct ata_port pflags */
Currently, hotplug doesn't work if port is already runtime suspended. For now, we simply disable runtime pm for hotpluggable port. Later, we should add runtime pm support for hotpluggable port too. https://lkml.org/lkml/2012/2/19/70 TODO: add similar hotpluggable port check for controllers other than AHCI. Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz> Reported-and-tested-by: cwillu@cwillu.com Reported-and-tested-by: jackdachef@gmail.com Signed-off-by: Lin Ming <ming.m.lin@intel.com> --- drivers/ata/ahci.c | 3 +++ drivers/ata/ahci.h | 3 +++ drivers/ata/libahci.c | 20 ++++++++++++++++++++ drivers/ata/libata-transport.c | 6 ++++-- include/linux/libata.h | 4 +++- 5 files changed, 33 insertions(+), 3 deletions(-)