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: 8721591 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 E2F289F38C for ; Fri, 1 Apr 2016 07:55:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B3D32039E for ; Fri, 1 Apr 2016 07:55:29 +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 2F7AB2039D for ; Fri, 1 Apr 2016 07:55: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 1alttq-0005Vp-H2; Fri, 01 Apr 2016 07:53:46 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1altta-0005J8-93 for linux-arm-kernel@lists.infradead.org; Fri, 01 Apr 2016 07:53:32 +0000 Received: by mail-wm0-x229.google.com with SMTP id 191so10570590wmq.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=Y9uVH7qrxYK7Babgr/2D1XTjmHE3r80QfuBeyJWLeQEFuADQ2HqiTi0eYqdBAKUW4A vntixHgOX8X2ohArTC59KgStgnmJQHFnE6O78MZJuP3QVgGpPXNCzFyVb/LAvazGveiC boRguklsmURXm+127aaJcIrrOlvHIpPzVINnDDTNVQglGfDcV189cAHOqJY7UaIJ2L5W HnQ6ybva7bOIjXIka7FX/Refk9RVLZLWNiwMYsRLx5Ru2yW4268ANOSdCCda3TygkoNH EK0GFNSMQ/8KWZ9iNXh6oBs0ueOYngZO3jPQWaOuNCdWC2WIL8G83fgmFrvTYs3uG75G OkLg== X-Gm-Message-State: AD7BkJJWLZWJLF5lo3ABEEBLuS0/Y3dDpxB8P8VR0odisOFQSP3q4h6xgUIGce3+yDRlmg/a 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160401_005330_630754_1C950133 X-CRM114-Status: GOOD ( 13.06 ) X-Spam-Score: -2.0 (--) 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 Acked-by: Rob Herring --- 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;