ata: ahci: move marking of external port earlier

Move the marking of an external port earlier in the call chain.
This is needed for further cleanups.
No functional change intended.

Tested-by: Damien Le Moal <dlemoal@kernel.org>
Tested-by: Jian-Hong Pan <jhp@endlessos.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index da2e74fce2d995a932914876b44b3fb5d4275d2e..aa58ce615e7940ee1616b5505cfed1b70ede4b62 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1642,6 +1642,18 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,
        return pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);
 }
 
+static void ahci_mark_external_port(struct ata_port *ap)
+{
+       struct ahci_host_priv *hpriv = ap->host->private_data;
+       void __iomem *port_mmio = ahci_port_base(ap);
+       u32 tmp;
+
+       /* mark esata ports */
+       tmp = readl(port_mmio + PORT_CMD);
+       if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS))
+               ap->pflags |= ATA_PFLAG_EXTERNAL;
+}
+
 static void ahci_update_initial_lpm_policy(struct ata_port *ap,
                                           struct ahci_host_priv *hpriv)
 {
@@ -1934,6 +1946,8 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                if (ap->flags & ATA_FLAG_EM)
                        ap->em_message_type = hpriv->em_msg_type;
 
+               ahci_mark_external_port(ap);
+
                ahci_update_initial_lpm_policy(ap, hpriv);
 
                /* disabled/not-implemented port */

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 1a63200ea437b0e44731679674f75784dc8a3ec1..fca376f03c9e3795cf2b7bc1cb931bc7438de1e8 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1280,10 +1280,8 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
                           int port_no, void __iomem *mmio,
                           void __iomem *port_mmio)
 {
-       struct ahci_host_priv *hpriv = ap->host->private_data;
        const char *emsg = NULL;
        int rc;
-       u32 tmp;
 
        /* make sure port is not active */
        rc = ahci_deinit_port(ap, &emsg);
@@ -1291,11 +1289,6 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
                dev_warn(dev, "%s (%d)\n", emsg, rc);
 
        ahci_port_clear_pending_irq(ap);
-
-       /* mark esata ports */
-       tmp = readl(port_mmio + PORT_CMD);
-       if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS))
-               ap->pflags |= ATA_PFLAG_EXTERNAL;
 }
 
 void ahci_init_controller(struct ata_host *host)