From patchwork Fri Dec 1 02:52:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10086069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D7CD60327 for ; Fri, 1 Dec 2017 02:54:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8B752A2C5 for ; Fri, 1 Dec 2017 02:54:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDB412A2C8; Fri, 1 Dec 2017 02:54:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73E6E2A2C5 for ; Fri, 1 Dec 2017 02:54:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=P0vyzcqLBC7tTOXjm7gFctTyvAmkHtRkSqEw0FQ7PUg=; b=YcWoVmCgr9JL8Cb4ek/SljlzOf YoLjpR78+7qafbda6kueBkDdQXa3EJe2KR4JJG0z54krhOuYnK8vq85kHEmy7uKil0xbgxB/EqnRD C2mIS+JBhOHEnjyofiRkChd5ostsg9KPoccXDQ036AqjY1NfEUkdXBb/EPqQNzq0GhKxcDN2WYfKO xWfsrWMQiDCQ8JyCiJiX/Cw7ypxpSzAe9fM3Ua4VOidOdaWSFqB/ye5z0OuU/KCG94ndefZ4RE7zq uIw9prY3x62QLAXLr8mVAO5fDFXcbiNFO0aOxOMJpizpLjoAfsIQ1OBgvvEoKMNC0Hqb/1h5DgqvC aLrZ1fSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKbT7-0000AN-MT; Fri, 01 Dec 2017 02:54:25 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKbSD-0007lC-JL for linux-arm-kernel@lists.infradead.org; Fri, 01 Dec 2017 02:53:33 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 763FC6081F; Fri, 1 Dec 2017 02:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096792; bh=yQwkXBGrSgUP1IcWbb7G5iyE/DqFffMV9jY+3N/py+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IwM7lzbNchfbVBgRc9YhdKzYOB7wbG0SMNCcu4hqHrl1EADW/2M63WMez4CZ/Ev31 8fLzMNoxaaC+9YQehJJ9c+qFQWMb5V0mWqjXqx/CVbbKwZ7/cQohxqmAtDniBq/cp+ VfosiHZGnwbzplXHJvBe5O25nJs38eWyBUL2IEAw= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id D5BE06083B; Fri, 1 Dec 2017 02:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096792; bh=yQwkXBGrSgUP1IcWbb7G5iyE/DqFffMV9jY+3N/py+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IwM7lzbNchfbVBgRc9YhdKzYOB7wbG0SMNCcu4hqHrl1EADW/2M63WMez4CZ/Ev31 8fLzMNoxaaC+9YQehJJ9c+qFQWMb5V0mWqjXqx/CVbbKwZ7/cQohxqmAtDniBq/cp+ VfosiHZGnwbzplXHJvBe5O25nJs38eWyBUL2IEAw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org D5BE06083B Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-pci@vger.kernel.org, timur@codeaurora.org Subject: [PATCH V4 4/5] dmaengine: qcom_hidma: Add support for the new revision Date: Thu, 30 Nov 2017 21:52:55 -0500 Message-Id: <1512096776-22883-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512096776-22883-1-git-send-email-okaya@codeaurora.org> References: <1512096776-22883-1-git-send-email-okaya@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171130_185329_922070_7A8C3527 X-CRM114-Status: GOOD ( 13.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM" , Vinod Koul , linux-arm-msm@vger.kernel.org, open list , Sinan Kaya , David Brown , Andy Gross , Dan Williams , "open list:ARM/QUALCOMM SUPPORT" , 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-Virus-Scanned: ClamAV using ClamSMTP Add support for probing the newer HW and also organize MSI capable hardware into an array for maintenance reasons. Signed-off-by: Sinan Kaya --- drivers/dma/qcom/hidma.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index e366985..c146c6d 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -104,6 +105,9 @@ static void hidma_free(struct hidma_dev *dmadev) module_param(nr_desc_prm, uint, 0644); MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)"); +enum hidma_cap { + HIDMA_MSI_CAP = 1, +}; /* process completed descriptors */ static void hidma_process_completed(struct hidma_chan *mchan) @@ -736,25 +740,12 @@ static int hidma_request_msi(struct hidma_dev *dmadev, #endif } -static bool hidma_msi_capable(struct device *dev) +static bool hidma_test_capability(struct device *dev, enum hidma_cap test_cap) { - struct acpi_device *adev = ACPI_COMPANION(dev); - const char *of_compat; - int ret = -EINVAL; - - if (!adev || acpi_disabled) { - ret = device_property_read_string(dev, "compatible", - &of_compat); - if (ret) - return false; + enum hidma_cap cap; - ret = strcmp(of_compat, "qcom,hidma-1.1"); - } else { -#ifdef CONFIG_ACPI - ret = strcmp(acpi_device_hid(adev), "QCOM8062"); -#endif - } - return ret == 0; + cap = (enum hidma_cap) device_get_match_data(dev); + return cap ? ((cap & test_cap) > 0) : 0; } static int hidma_probe(struct platform_device *pdev) @@ -834,8 +825,7 @@ static int hidma_probe(struct platform_device *pdev) * Determine the MSI capability of the platform. Old HW doesn't * support MSI. */ - msi = hidma_msi_capable(&pdev->dev); - + msi = hidma_test_capability(&pdev->dev, HIDMA_MSI_CAP); device_property_read_u32(&pdev->dev, "desc-count", &dmadev->nr_descriptors); @@ -953,7 +943,8 @@ static int hidma_remove(struct platform_device *pdev) #if IS_ENABLED(CONFIG_ACPI) static const struct acpi_device_id hidma_acpi_ids[] = { {"QCOM8061"}, - {"QCOM8062"}, + {"QCOM8062", HIDMA_MSI_CAP}, + {"QCOM8063", HIDMA_MSI_CAP}, {}, }; MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids); @@ -961,7 +952,8 @@ static int hidma_remove(struct platform_device *pdev) static const struct of_device_id hidma_match[] = { {.compatible = "qcom,hidma-1.0",}, - {.compatible = "qcom,hidma-1.1",}, + {.compatible = "qcom,hidma-1.1", .data = (void *)(HIDMA_MSI_CAP),}, + {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),}, {}, }; MODULE_DEVICE_TABLE(of, hidma_match);