From patchwork Thu Mar 31 17:31:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 8715211 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8BD839F36E for ; Thu, 31 Mar 2016 17:36:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6B83202A1 for ; Thu, 31 Mar 2016 17:36:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E0062010C for ; Thu, 31 Mar 2016 17:36:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1algUa-0001An-HQ; Thu, 31 Mar 2016 17:34:48 +0000 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1algS9-0007Go-VC for linux-arm-kernel@lists.infradead.org; Thu, 31 Mar 2016 17:32:24 +0000 Received: by mail-wm0-x235.google.com with SMTP id 191so134286275wmq.0 for ; Thu, 31 Mar 2016 10:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pC3rrvf2m/KfJ6p+8ScqH9Voqa44OjGREwmPOQs/fn0=; b=hJWpVWdjlwy5tKdU5l9ObLFUlKeYoMJitTXe4ouNUdHF+BxvdfAeMIgyN4y2lHOTfo V5OyAULukSxCRCdKBob61/xp9YeDlN1IbhrMyOkWXlrzKYRxq5MWLC6ceOeHrm0e+RNn EY7RCHADTE8A8E/cQTK69GKJ4WLmPxb6fF5iM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pC3rrvf2m/KfJ6p+8ScqH9Voqa44OjGREwmPOQs/fn0=; b=LzZRjYbYvuyws6Z3koKMkSJcG9j+oFoyUXoJuGpJwfYn6N7PDgOUPNSTGnV2iU1b5x LxSABnwps0j3NHRGWS9XMYXowb3yHNGyHuol6VQg9TX9hKqc44XzTFUIrlmQSyRAd48S nF4Dx/DDF1P4JBxebatq9lhGOADVXHCUsY6Sp+4j1j3LSYNVV82JmJU82TP8C39PyfO0 bTKIbRP0fvIYhx8sHAE3NFHXOsXdcyKbu1XGZ4i2cc2tYXVVYY8JL6A6F/qi5k9tacFS jSQxCWBYO+g5LWd3koj6DIWDqKE51qcpU1HiQrxaBrP9SwuyrE2xfYmaeAe6qDy+ezTW yKSg== X-Gm-Message-State: AD7BkJJgH6jBFFigpcdTU4iYPX57r3cSROy9T7TrXdD+SoAFNdCfP1lflA2E2sksnzTNf9p0 X-Received: by 10.28.3.138 with SMTP id 132mr145741wmd.20.1459445516248; Thu, 31 Mar 2016 10:31:56 -0700 (PDT) Received: from localhost.localdomain (host-92-17-247-99.as13285.net. [92.17.247.99]) by smtp.gmail.com with ESMTPSA id gb9sm10024236wjb.26.2016.03.31.10.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Mar 2016 10:31:55 -0700 (PDT) From: Srinivas Kandagatla To: Tejun Heo , linux-ide@vger.kernel.org Subject: [PATCH v2 2/3] ata: ahci-platform: Add ports-implemented DT bindings. Date: Thu, 31 Mar 2016 18:31:39 +0100 Message-Id: <1459445500-9071-3-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459445500-9071-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1459445500-9071-1-git-send-email-srinivas.kandagatla@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160331_103218_571701_B1431152 X-CRM114-Status: GOOD ( 13.10 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, jmaggard10@gmail.com, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Hans de Goede , Rob Herring , Srinivas Kandagatla , Andy Gross , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On some SOCs PORTS_IMPL register value is never programmed by the firmware and left at zero value. Which means that no sata ports are available for software. AHCI driver used to cope up with this by fabricating the port_map if the PORTS_IMPL register is read zero, but recent patch broke this workaround as zero value was valid for NVMe disks. This patch adds ports-implemented DT bindings as workaround for this issue in a way that DT can can override the PORTS_IMPL register in cases where the firmware did not program it already. Fixes: 566d1827df2e ("libata: disable forced PORTS_IMPL for >= AHCI 1.3) Signed-off-by: Srinivas Kandagatla Acked-by: Tejun Heo Reviewed-by: Andy Gross --- Documentation/devicetree/bindings/ata/ahci-platform.txt | 4 ++++ drivers/ata/ahci_platform.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt index 30df832..87adfb2 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -32,6 +32,10 @@ Optional properties: - target-supply : regulator for SATA target power - phys : reference to the SATA PHY node - phy-names : must be "sata-phy" +- ports-implemented : Mask that indicates which ports that the HBA supports + are available for software to use. Useful if PORTS_IMPL + is not programmed by the BIOS, which is true with + some embedded SOC's. Required properties when using sub-nodes: - #address-cells : number of cells to encode an address diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 4044233..62a04c8 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -51,6 +51,9 @@ static int ahci_probe(struct platform_device *pdev) if (rc) return rc; + of_property_read_u32(dev->of_node, + "ports-implemented", &hpriv->force_port_map); + if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;