From patchwork Fri Apr 1 07:52:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 64832 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp588980lbc; Fri, 1 Apr 2016 00:53:37 -0700 (PDT) X-Received: by 10.66.66.235 with SMTP id i11mr28649255pat.146.1459497214540; Fri, 01 Apr 2016 00:53:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 22si19690894pfp.87.2016.04.01.00.53.34; Fri, 01 Apr 2016 00:53:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758824AbcDAHxc (ORCPT + 29 others); Fri, 1 Apr 2016 03:53:32 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:37078 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758314AbcDAHxL (ORCPT ); Fri, 1 Apr 2016 03:53:11 -0400 Received: by mail-wm0-f46.google.com with SMTP id p65so12196742wmp.0 for ; Fri, 01 Apr 2016 00:53:09 -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=3V+ysiN5MIy9cOk1hbmqvENtUJH8uSaPqJMzOXy1oSA=; b=afMBiUnbp7JNwI0AYypxo79LIbMf6IonnftegLp+92qxj66gxsA3fJHKH34WlrsMkm 1SjKl6t03DBW2tpBug9RRehRue2XFfARlrxPp0BTzxesK6sBzGKxRYyjs2HTCGP2hymU /E4x3eewI+dhSVOaaTlIZGpk5e4Kkc1HEjVX4= 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=3V+ysiN5MIy9cOk1hbmqvENtUJH8uSaPqJMzOXy1oSA=; b=B6Hx6b+3RR+D0Ejgbi9wZ7D7js/QhyOyuyAWKtaLTvBmnKLDg1usmEc/CyW50p1IRR TOVErjPbWa6y7uCjpDmQVYj4cug4KsZPqzvpTXI5tMIbUiF2grT8CwHFwST9puEQFh0B LlcXJiiSqTnG/oYr3WZBzyWbdIP5AD8wubufIDgVsfqpqCepOgoucc2VXbYbEiXHNlPX 4shQKcKknH9KY6miPKaNvhREYWU5No8Xa5WemEsnMvYvAJzgCAnpqcrDui0TJnUo/v2V +ZSZSVFDF5eWTKBVwAB7F5AdOohjHAduSLEjfvGKYs97S8TbOjzeKcwNBkjDxQhiwQFL wknw== X-Gm-Message-State: AD7BkJKxISo+Mx3+pnw4mII5IfFR/jm8+Novp37xoHqvUSzBuczDwF76OyvwULWvJLArca7w X-Received: by 10.28.19.140 with SMTP id 134mr2290821wmt.73.1459497188771; Fri, 01 Apr 2016 00:53:08 -0700 (PDT) Received: from localhost.localdomain (host-92-17-247-99.as13285.net. [92.17.247.99]) by smtp.gmail.com with ESMTPSA id x203sm13169192wmg.23.2016.04.01.00.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 00:53:08 -0700 (PDT) From: Srinivas Kandagatla To: Tejun Heo , linux-ide@vger.kernel.org Cc: Rob Herring , Andy Gross , Hans de Goede , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, jmaggard10@gmail.com, Srinivas Kandagatla Subject: [PATCH v3 2/3] ata: ahci-platform: Add ports-implemented DT bindings. Date: Fri, 1 Apr 2016 08:52:57 +0100 Message-Id: <1459497178-31090-3-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459497178-31090-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1459497178-31090-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(+) -- 2.5.0 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;