From patchwork Sat Jan 12 23:30:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1024017 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lixom.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lixom-net.20150623.gappssmtp.com header.i=@lixom-net.20150623.gappssmtp.com header.b="E1ef8QWt"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43cbZp6Wlqz9s4s for ; Sun, 13 Jan 2019 10:30:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726406AbfALXa5 (ORCPT ); Sat, 12 Jan 2019 18:30:57 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:34652 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbfALXa5 (ORCPT ); Sat, 12 Jan 2019 18:30:57 -0500 Received: by mail-ot1-f65.google.com with SMTP id t5so16377329otk.1 for ; Sat, 12 Jan 2019 15:30:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=cVQI5zAAbtFJ5MW6pU5zNzD1Tr+/9DwaXN0Ey/EXGKg=; b=E1ef8QWtK/j5a+K4ybt5yrsXK7qyDwy2wiN2oHT6nK2EkgrTzPyFreIoVsd+7wqCJK goKAZqmtgLRM3S+IM+rdcirJE3oA3/v9F3ZiNiOYJN7f5iRbTpT+5UOfTof3GTPI7Iuw GzfcdY0SKaqfAm+RW026m3UVYwLmwA1WUfopfFQYNlg0tivnTbnemmyOcW0MC7c4FJ27 hkB0Q+CvVQLPxjJPoWbl2mb0wWpPP5yckjI0KiBLzKI4JMmmqisOChHj7lrDvjmk1OyC 3QRirwH53lvkJ6KTd2b1WqDc9yg+kcqh9UVCJ9PiOD80rQBLZN1frgJWCWsQsqmmOHWv o07g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cVQI5zAAbtFJ5MW6pU5zNzD1Tr+/9DwaXN0Ey/EXGKg=; b=fr+O2BIpStqMgQs0URnDCitOb2SV3Mt/jqCGxgPSbXGipi1mS7Z181FFg74s57yXdf M/t04CfJD3AVtia5LBjRy8G/WQGTWMiqXcL8AnGnl/d1MZaO0nDb0g40acaG/E35pdOh ynY4XCD4BTfS3n1l8pF9vP33/yV1GBeS+acO2PdWl5htEvW6dMFmYih9EkI+FPAZH8/H H2hR0BcnnoJaWOwOIkJ1oL3cgg40CBHkGyipuuv3E5MIWY9PUrmcX9nAk1OAWBzjBKHC Te6bTELOYjxCr6t3PiEOgxRS3Yp1rBGGUYhAjzfbp009GaCe55Mwy+JCLhAV70UmLWu6 i1iw== X-Gm-Message-State: AJcUukfFkv2K2Ym1ZKI6U51ELaTefzCqvhN33/vxNKkVB74I0iyk2G02 N9of7bAYsd1vjBOpjnYqAE1LmQ== X-Google-Smtp-Source: ALg8bN4BhDR0gVlk5fCMEq3o9JO3Q9QRuo0Wa1+k90R+NAez68ZCQ5sc9eEixntpTXUMSq1Mxwt/iw== X-Received: by 2002:a9d:2f66:: with SMTP id h93mr13841630otb.165.1547335856385; Sat, 12 Jan 2019 15:30:56 -0800 (PST) Received: from rip.lixom.net (99-152-116-91.lightspeed.sntcca.sbcglobal.net. [99.152.116.91]) by smtp.gmail.com with ESMTPSA id r1sm34556354oti.44.2019.01.12.15.30.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 15:30:55 -0800 (PST) From: Olof Johansson To: torvalds@linux-foundation.org Cc: axboe@kernel.dk, hdegoede@redhat.com, linux-ide@vger.kernel.org, Olof Johansson , Grzegorz Jaszczyk , Miquel Raynal Subject: [PATCH] Revert "ata: libahci_platform: comply to PHY framework" Date: Sat, 12 Jan 2019 15:30:38 -0800 Message-Id: <20190112233038.28465-1-olof@lixom.net> X-Mailer: git-send-email 2.11.0 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org This reverts commit 49e54187ae0b2f9b5c0760e568a103baf4481610. This doesn't compile. It seems that the generic driver is dependent on the PHY_MODE_SATA symbol, which is nowhere to be found in the mainline, nor linux-next, sources to date -- besides a local define in one Marvell driver. drivers/ata/libahci_platform.c:59:37: error: 'PHY_MODE_SATA' undeclared (first use in this function); did you mean 'PHY_MODE_PCIE'? So, let's revert this until the needed external dependencies are available. Fixes: 49e54187ae0b2 ('ata: libahci_platform: comply to PHY framework') Cc: Hans de Goede Cc: Grzegorz Jaszczyk Cc: Miquel Raynal Cc: Jens Axboe Signed-off-by: Olof Johansson Acked-by: Jens Axboe --- drivers/ata/ahci.h | 2 -- drivers/ata/libahci_platform.c | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 8810475f307ac..ef356e70e6de8 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -254,8 +254,6 @@ enum { AHCI_HFLAG_IS_MOBILE = (1 << 25), /* mobile chipset, use SATA_MOBILE_LPM_POLICY as default lpm_policy */ - AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during - suspend/resume */ /* ap->flags bits */ diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 81b1a3332ed6d..4b900fc659f73 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -56,12 +56,6 @@ static int ahci_platform_enable_phys(struct ahci_host_priv *hpriv) if (rc) goto disable_phys; - rc = phy_set_mode(hpriv->phys[i], PHY_MODE_SATA); - if (rc) { - phy_exit(hpriv->phys[i]); - goto disable_phys; - } - rc = phy_power_on(hpriv->phys[i]); if (rc) { phy_exit(hpriv->phys[i]); @@ -744,9 +738,6 @@ int ahci_platform_suspend_host(struct device *dev) writel(ctl, mmio + HOST_CTL); readl(mmio + HOST_CTL); /* flush */ - if (hpriv->flags & AHCI_HFLAG_SUSPEND_PHYS) - ahci_platform_disable_phys(hpriv); - return ata_host_suspend(host, PMSG_SUSPEND); } EXPORT_SYMBOL_GPL(ahci_platform_suspend_host); @@ -765,7 +756,6 @@ EXPORT_SYMBOL_GPL(ahci_platform_suspend_host); int ahci_platform_resume_host(struct device *dev) { struct ata_host *host = dev_get_drvdata(dev); - struct ahci_host_priv *hpriv = host->private_data; int rc; if (dev->power.power_state.event == PM_EVENT_SUSPEND) { @@ -776,9 +766,6 @@ int ahci_platform_resume_host(struct device *dev) ahci_init_controller(host); } - if (hpriv->flags & AHCI_HFLAG_SUSPEND_PHYS) - ahci_platform_enable_phys(hpriv); - ata_host_resume(host); return 0;