From patchwork Fri Dec 1 02:52:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 843314 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-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="HoFYI0ko"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="CBt/WU+g"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynzQ15qkcz9sBd for ; Fri, 1 Dec 2017 13:54:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752209AbdLACxJ (ORCPT ); Thu, 30 Nov 2017 21:53:09 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56004 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751790AbdLACxH (ORCPT ); Thu, 30 Nov 2017 21:53:07 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5874C607E4; Fri, 1 Dec 2017 02:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096786; bh=DsaInQgjBm+vo+R/THx46h2X7jk8HbtaTse2B+3z5/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HoFYI0kos/Oq6Zy7v7vcLwYHf0t0788+PRNYpaQpS7vRtUtCWfG9Op9/S/XFhLo22 ekSL8gN4fRyKvMEbsZoJlg9e7CCRkNKA6rz/t1oJfK9Gp3rsHX+6uTAINOk1P6RXII u6WqMNlfCu0R/4/UBpl0XSTA3YLTiMjY5av6nNCA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 8EEC4601D4; Fri, 1 Dec 2017 02:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096785; bh=DsaInQgjBm+vo+R/THx46h2X7jk8HbtaTse2B+3z5/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CBt/WU+gJzCWR8yK9ltv7OQF93opJmgSa5OcEOR03xlCCN358+WQ3RYDJEDv/aiqM GV4EkhGXP4FvJPjZVRLv0WZGE0Kd/K7c0q7MND5gGJNgM7U8cxLsnrD1GDKaXDHTG5 QOhCzNtZdggjkiCNXCXrvOSvRzwUGHdutcht0/uw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8EEC4601D4 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Vinod Koul , Rob Herring , Mark Rutland , dmaengine@vger.kernel.org (open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 1/5] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW Date: Thu, 30 Nov 2017 21:52:52 -0500 Message-Id: <1512096776-22883-2-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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org A new version of the HIDMA IP has been released with bug fixes. Bumping the hardware version to differentiate from others. Signed-off-by: Sinan Kaya --- Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt index 55492c2..5d93d6d 100644 --- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt @@ -47,8 +47,8 @@ When the OS is not in control of the management interface (i.e. it's a guest), the channel nodes appear on their own, not under a management node. Required properties: -- compatible: must contain "qcom,hidma-1.0" for initial HW or "qcom,hidma-1.1" -for MSI capable HW. +- compatible: must contain "qcom,hidma-1.0" for initial HW or + "qcom,hidma-1.1"/"qcom,hidma-1.2" for MSI capable HW. - reg: Addresses for the transfer and event channel - interrupts: Should contain the event interrupt - desc-count: Number of asynchronous requests this channel can handle From patchwork Fri Dec 1 02:52:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 843313 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-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="Ua1/qRlP"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Ua1/qRlP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynzPW70Cjz9sBd for ; Fri, 1 Dec 2017 13:54:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbdLACxK (ORCPT ); Thu, 30 Nov 2017 21:53:10 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56096 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752130AbdLACxI (ORCPT ); Thu, 30 Nov 2017 21:53:08 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 81EF6607F4; Fri, 1 Dec 2017 02:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096787; bh=hHpRXN3IH0sFSX+8vEDCedaJ6rtNwDYRxFA381zGvJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ua1/qRlPl6kJJ/mMo3seG12W54mh5P7LZSaQchIlox5PUYfZdjsdfwVSoIpJXRcEZ XHObx4iISgPGVbBWon4hq2I+cVttlIufjZ1KhqtAY/ZZ1p+cbDx/72GkHA9q1mqZxE u7oW5vS9ya+InAvjl2eSEqWAooqMRZ5w4Uumb0Hw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 25518607C7; Fri, 1 Dec 2017 02:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096787; bh=hHpRXN3IH0sFSX+8vEDCedaJ6rtNwDYRxFA381zGvJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ua1/qRlPl6kJJ/mMo3seG12W54mh5P7LZSaQchIlox5PUYfZdjsdfwVSoIpJXRcEZ XHObx4iISgPGVbBWon4hq2I+cVttlIufjZ1KhqtAY/ZZ1p+cbDx/72GkHA9q1mqZxE u7oW5vS9ya+InAvjl2eSEqWAooqMRZ5w4Uumb0Hw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 25518607C7 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org (open list:ACPI), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function Date: Thu, 30 Nov 2017 21:52:53 -0500 Message-Id: <1512096776-22883-3-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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org OF has of_device_get_match_data() function to extract driver specific data structure. Add a similar function for ACPI. Signed-off-by: Sinan Kaya Acked-by: Rafael J. Wysocki --- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 4d0979e..b271eb1 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, } EXPORT_SYMBOL_GPL(acpi_match_device); +void *acpi_get_match_data(const struct device *dev) +{ + const struct acpi_device_id *match; + + match = acpi_match_device(dev->driver->acpi_match_table, dev); + if (!match) + return NULL; + + return (void *)match->driver_data; +} +EXPORT_SYMBOL_GPL(acpi_get_match_data); + int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 502af53..a927260 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev); +void *acpi_get_match_data(const struct device *dev); extern bool acpi_driver_match_device(struct device *dev, const struct device_driver *drv); int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device( return NULL; } +static inline void *acpi_get_match_data(const struct device *dev) +{ + return NULL; +} + static inline bool acpi_driver_match_device(struct device *dev, const struct device_driver *drv) { From patchwork Fri Dec 1 02:52:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 843309 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-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="Uymjt2kh"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="kWkCUo6E"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynzNY2lxGz9sNd for ; Fri, 1 Dec 2017 13:53:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752310AbdLACxO (ORCPT ); Thu, 30 Nov 2017 21:53:14 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56272 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752297AbdLACxL (ORCPT ); Thu, 30 Nov 2017 21:53:11 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1C4BB607C7; Fri, 1 Dec 2017 02:53:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096791; bh=5vW84OVHICyDv2/FLBsR+xDDizO9t8SdV1laBoi8Yo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uymjt2kheGAWB2aEqxrM/VklZytKg33NHV203EFr0mWSlwObFAambWnbu/zln4hJf ZSFmq+dIZzeANQal790ArKS3ekPMZ2FqciwK+odNloWhNee7oL3v9a1pPcP4ROrLoK SOIeVBJe5bXk0KcgHIX06Q01jKIdq3+PRPkswGHE= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 DA13B607C7; Fri, 1 Dec 2017 02:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096790; bh=5vW84OVHICyDv2/FLBsR+xDDizO9t8SdV1laBoi8Yo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWkCUo6EGkFSTLTmQyYOtv8/4b0LGoB3YfaBUyI8xk3sFUmWUQPUXCYcreFxkimv1 G1A+RY5OF1JtkbSiI5LGS7f73seofzI7ZovGpO9OIepD8YiCpxZsF3i1jbNqp5008i Iy6+qdZUWpnMq4/RPOD/DjWsBdT5vbOTmfAeIvxI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DA13B607C7 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Greg Kroah-Hartman , "Rafael J. Wysocki" , Mika Westerberg , Sakari Ailus , Dmitry Torokhov , Rob Herring , Kieran Bingham , linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 3/5] device property: Introduce a common API to fetch device match data Date: Thu, 30 Nov 2017 21:52:54 -0500 Message-Id: <1512096776-22883-4-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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org There is an OF/ACPI function to obtain the driver data. We want to hide OF/ACPI details from the device drivers and abstract following the device family of functions. Signed-off-by: Sinan Kaya --- drivers/base/property.c | 14 ++++++++++++++ include/linux/property.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 7ed99c1..6adec89 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -1335,3 +1336,16 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, return fwnode_call_int_op(fwnode, graph_parse_endpoint, endpoint); } EXPORT_SYMBOL(fwnode_graph_parse_endpoint); + +void *device_get_match_data(struct device *dev) +{ + void *ret; + + if (IS_ENABLED(CONFIG_OF) && dev->of_node) + ret = (void *)of_device_get_match_data(dev); + else + ret = acpi_get_match_data(dev); + + return ret; +} +EXPORT_SYMBOL_GPL(device_get_match_data); diff --git a/include/linux/property.h b/include/linux/property.h index 6bebee1..01fa55b 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -275,6 +275,8 @@ int device_add_properties(struct device *dev, enum dev_dma_attr device_get_dma_attr(struct device *dev); +void *device_get_match_data(struct device *dev); + int device_get_phy_mode(struct device *dev); void *device_get_mac_address(struct device *dev, char *addr, int alen); 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: 843312 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-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="IwM7lzbN"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="IwM7lzbN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynzPN0VPWz9sNd for ; Fri, 1 Dec 2017 13:54:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752473AbdLACxn (ORCPT ); Thu, 30 Nov 2017 21:53:43 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56316 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752130AbdLACxN (ORCPT ); Thu, 30 Nov 2017 21:53:13 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 6395D6083D; 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= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Andy Gross , David Brown , Dan Williams , Vinod Koul , linux-soc@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT), dmaengine@vger.kernel.org (open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM), linux-kernel@vger.kernel.org (open list) 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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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); From patchwork Fri Dec 1 02:52:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 843310 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-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="iH5lsJCd"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="Thk8QLUf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynzNp59Pkz9sBd for ; Fri, 1 Dec 2017 13:53:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbdLACxS (ORCPT ); Thu, 30 Nov 2017 21:53:18 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:56384 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbdLACxO (ORCPT ); Thu, 30 Nov 2017 21:53:14 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1325B607DC; Fri, 1 Dec 2017 02:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1512096794; bh=YefAJe2IIBTp6WBmFUED8arRvkWQdJB/LoR6jFRTtp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iH5lsJCd9EflCWToiw0VelHUSXs2Ots0EOrh7YcF8C5A9jmJaAJF6xqvmCwcpVb3F Qise68BJiyf4daxJn9Mt77F+VlzRKEILE5wam9CZpQ9XsBTiMBBSkOyvjVeFTVUERc +QMTezpbDLUZZWXvkq3qWpvi0vODmRpYNnYcALac= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 76A1860847; 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=1512096793; bh=YefAJe2IIBTp6WBmFUED8arRvkWQdJB/LoR6jFRTtp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Thk8QLUfG536lFdfrzcAG9gVjfSiCrldCNuO4hjFq3ICJ7hFr09gPJJqZpjmUoqEM XLsYgCpQRaeT6aBGQ5A7S57tia4WrAkJb9vPd7Clo2m6FBbgHJ8FwmW8uL9CM1D5dJ x1+OWXUa7sqjiX8KrtRqRdANwRpeIcmYplCyJejU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 76A1860847 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 Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Andy Gross , David Brown , Dan Williams , Vinod Koul , linux-soc@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT), dmaengine@vger.kernel.org (open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 5/5] dmaengine: qcom_hidma: Add identity register support Date: Thu, 30 Nov 2017 21:52:56 -0500 Message-Id: <1512096776-22883-6-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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The location for destination event channel register has been relocated from offset 0x28 to 0x40. Update the code accordingly. Signed-off-by: Sinan Kaya --- drivers/dma/qcom/hidma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index c146c6d..963cc52 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -107,6 +107,7 @@ static void hidma_free(struct hidma_dev *dmadev) enum hidma_cap { HIDMA_MSI_CAP = 1, + HIDMA_IDENTITY_CAP, }; /* process completed descriptors */ @@ -838,7 +839,10 @@ static int hidma_probe(struct platform_device *pdev) if (!dmadev->nr_descriptors) dmadev->nr_descriptors = HIDMA_NR_DEFAULT_DESC; - dmadev->chidx = readl(dmadev->dev_trca + 0x28); + if (hidma_test_capability(&pdev->dev, HIDMA_IDENTITY_CAP)) + dmadev->chidx = readl(dmadev->dev_trca + 0x40); + else + dmadev->chidx = readl(dmadev->dev_trca + 0x28); /* Set DMA mask to 64 bits. */ rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); @@ -944,7 +948,7 @@ static int hidma_remove(struct platform_device *pdev) static const struct acpi_device_id hidma_acpi_ids[] = { {"QCOM8061"}, {"QCOM8062", HIDMA_MSI_CAP}, - {"QCOM8063", HIDMA_MSI_CAP}, + {"QCOM8063", (HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP)}, {}, }; MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids); @@ -953,7 +957,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", .data = (void *)(HIDMA_MSI_CAP),}, - {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),}, + {.compatible = "qcom,hidma-1.2", + .data = (void *)(HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP),}, {}, }; MODULE_DEVICE_TABLE(of, hidma_match);