From: Sinan Kaya <okaya@codeaurora.org> To: dmaengine@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, timur@codeaurora.org, devicetree@vger.kernel.org, cov@codeaurora.org, vinod.koul@intel.com, jcm@redhat.com Cc: shankerd@codeaurora.org, vikrams@codeaurora.org, eric.auger@linaro.org, agross@codeaurora.org, arnd@arndb.de, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya <okaya@codeaurora.org>, linux-kernel@vger.kernel.org Subject: [PATCH V13 08/10] dma: qcom_hidma: read the channel id from HW Date: Fri, 29 Jan 2016 17:35:11 -0500 [thread overview] Message-ID: <1454106914-15857-9-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1454106914-15857-1-git-send-email-okaya@codeaurora.org> Removing the flexibility to choose the event channel as there is no real use case right now. We have been using the values in ACPI that match the HW defaults. OS is reading the event-channel from the HW register now. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 3 -- drivers/dma/qcom/hidma.c | 39 +--------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt index e3677a5..fd5618b 100644 --- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt @@ -51,7 +51,6 @@ Required properties: - reg: Addresses for the transfer and event channel - interrupts: Should contain the event interrupt - desc-count: Number of asynchronous requests this channel can handle -- channel-index: The HW event channel completions will be delivered. - iommus: required a iommu node Example: @@ -75,7 +74,6 @@ Hypervisor OS configuration: interrupts = <0 389 0>; desc-count = <10>; iommus = <&system_mmu>; - channel-index = <4>; }; }; @@ -87,6 +85,5 @@ Guest OS configuration: <0 0x5c0b0000 0x0 0x1000>; interrupts = <0 389 0>; desc-count = <10>; - channel-index = <4>; iommus = <&system_mmu>; }; diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index ac20bdb..7180367 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -101,26 +101,6 @@ static unsigned int nr_desc_prm; module_param(nr_desc_prm, uint, 0644); MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)"); -#define HIDMA_MAX_CHANNELS 64 -static int channel_idx[HIDMA_MAX_CHANNELS] = { - [0 ... (HIDMA_MAX_CHANNELS - 1)] = -1 -}; - -/* - * Each DMA channel is associated with an event channel for interrupt - * delivery. The event channel index usually comes from the firmware through - * ACPI/DT. When a HIDMA channel is executed in the guest machine context (QEMU) - * the device tree gets auto-generated based on the memory and IRQ resources - * this driver uses on the host machine. Any device specific paraemeter such as - * channel-index gets ignored by the QEMU. - * We are using this command line parameter to pass the event channel index to - * the guest machine. - */ -static unsigned int num_channel_idx; -module_param_array_named(channel_idx, channel_idx, int, &num_channel_idx, - 0644); -MODULE_PARM_DESC(channel_idx, "channel index array for the notifications"); -static atomic_t channel_ref_count; /* process completed descriptors */ static void hidma_process_completed(struct hidma_chan *mchan) @@ -592,7 +572,6 @@ static int hidma_probe(struct platform_device *pdev) struct resource *trca_resource; struct resource *evca_resource; int chirq; - int current_channel_index = atomic_read(&channel_ref_count); void __iomem *evca; void __iomem *trca; int rc; @@ -668,22 +647,7 @@ static int hidma_probe(struct platform_device *pdev) goto dmafree; } - if (current_channel_index > HIDMA_MAX_CHANNELS) { - rc = -EINVAL; - goto dmafree; - } - - dmadev->chidx = -1; - device_property_read_u32(&pdev->dev, "channel-index", &dmadev->chidx); - - /* kernel command line override for the guest machine */ - if (channel_idx[current_channel_index] != -1) - dmadev->chidx = channel_idx[current_channel_index]; - - if (dmadev->chidx == -1) { - rc = -EINVAL; - goto dmafree; - } + 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)); @@ -724,7 +688,6 @@ static int hidma_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dmadev); pm_runtime_mark_last_busy(dmadev->ddev.dev); pm_runtime_put_autosuspend(dmadev->ddev.dev); - atomic_inc(&channel_ref_count); return 0; uninit: -- 1.8.2.1
WARNING: multiple messages have this Message-ID (diff)
From: okaya@codeaurora.org (Sinan Kaya) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V13 08/10] dma: qcom_hidma: read the channel id from HW Date: Fri, 29 Jan 2016 17:35:11 -0500 [thread overview] Message-ID: <1454106914-15857-9-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1454106914-15857-1-git-send-email-okaya@codeaurora.org> Removing the flexibility to choose the event channel as there is no real use case right now. We have been using the values in ACPI that match the HW defaults. OS is reading the event-channel from the HW register now. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 3 -- drivers/dma/qcom/hidma.c | 39 +--------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt index e3677a5..fd5618b 100644 --- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt @@ -51,7 +51,6 @@ Required properties: - reg: Addresses for the transfer and event channel - interrupts: Should contain the event interrupt - desc-count: Number of asynchronous requests this channel can handle -- channel-index: The HW event channel completions will be delivered. - iommus: required a iommu node Example: @@ -75,7 +74,6 @@ Hypervisor OS configuration: interrupts = <0 389 0>; desc-count = <10>; iommus = <&system_mmu>; - channel-index = <4>; }; }; @@ -87,6 +85,5 @@ Guest OS configuration: <0 0x5c0b0000 0x0 0x1000>; interrupts = <0 389 0>; desc-count = <10>; - channel-index = <4>; iommus = <&system_mmu>; }; diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c index ac20bdb..7180367 100644 --- a/drivers/dma/qcom/hidma.c +++ b/drivers/dma/qcom/hidma.c @@ -101,26 +101,6 @@ static unsigned int nr_desc_prm; module_param(nr_desc_prm, uint, 0644); MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)"); -#define HIDMA_MAX_CHANNELS 64 -static int channel_idx[HIDMA_MAX_CHANNELS] = { - [0 ... (HIDMA_MAX_CHANNELS - 1)] = -1 -}; - -/* - * Each DMA channel is associated with an event channel for interrupt - * delivery. The event channel index usually comes from the firmware through - * ACPI/DT. When a HIDMA channel is executed in the guest machine context (QEMU) - * the device tree gets auto-generated based on the memory and IRQ resources - * this driver uses on the host machine. Any device specific paraemeter such as - * channel-index gets ignored by the QEMU. - * We are using this command line parameter to pass the event channel index to - * the guest machine. - */ -static unsigned int num_channel_idx; -module_param_array_named(channel_idx, channel_idx, int, &num_channel_idx, - 0644); -MODULE_PARM_DESC(channel_idx, "channel index array for the notifications"); -static atomic_t channel_ref_count; /* process completed descriptors */ static void hidma_process_completed(struct hidma_chan *mchan) @@ -592,7 +572,6 @@ static int hidma_probe(struct platform_device *pdev) struct resource *trca_resource; struct resource *evca_resource; int chirq; - int current_channel_index = atomic_read(&channel_ref_count); void __iomem *evca; void __iomem *trca; int rc; @@ -668,22 +647,7 @@ static int hidma_probe(struct platform_device *pdev) goto dmafree; } - if (current_channel_index > HIDMA_MAX_CHANNELS) { - rc = -EINVAL; - goto dmafree; - } - - dmadev->chidx = -1; - device_property_read_u32(&pdev->dev, "channel-index", &dmadev->chidx); - - /* kernel command line override for the guest machine */ - if (channel_idx[current_channel_index] != -1) - dmadev->chidx = channel_idx[current_channel_index]; - - if (dmadev->chidx == -1) { - rc = -EINVAL; - goto dmafree; - } + 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)); @@ -724,7 +688,6 @@ static int hidma_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dmadev); pm_runtime_mark_last_busy(dmadev->ddev.dev); pm_runtime_put_autosuspend(dmadev->ddev.dev); - atomic_inc(&channel_ref_count); return 0; uninit: -- 1.8.2.1
next prev parent reply other threads:[~2016-01-29 22:35 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-29 22:35 [PATCH V13 00/10] dma: add Qualcomm Technologies HIDMA driver Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 01/10] dma: qcom_bam_dma: move to qcom directory Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 02/10] dma: hidma: Add Device Tree binding Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 03/10] dma: add Qualcomm Technologies HIDMA management driver Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 04/10] dma: add Qualcomm Technologies HIDMA channel driver Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 05/10] dma: qcom_hidma: implement lower level hardware interface Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 06/10] dma: qcom_hidma: add debugfs hooks Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 07/10] dma: qcom_hidma: add support for object hierarchy Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya [this message] 2016-01-29 22:35 ` [PATCH V13 08/10] dma: qcom_hidma: read the channel id from HW Sinan Kaya 2016-02-01 15:14 ` Rob Herring 2016-02-01 15:14 ` Rob Herring 2016-02-03 18:32 ` Sinan Kaya 2016-02-03 18:32 ` Sinan Kaya 2016-02-01 15:35 ` Mark Rutland 2016-02-01 15:35 ` Mark Rutland 2016-02-01 15:46 ` Sinan Kaya 2016-02-01 15:46 ` Sinan Kaya 2016-02-03 18:32 ` Sinan Kaya 2016-02-03 18:32 ` Sinan Kaya 2016-02-03 18:32 ` Sinan Kaya 2016-02-03 18:36 ` Mark Rutland 2016-02-03 18:36 ` Mark Rutland 2016-02-03 18:46 ` Sinan Kaya 2016-02-03 18:46 ` Sinan Kaya 2016-02-07 15:04 ` Sinan Kaya 2016-02-07 15:04 ` Sinan Kaya 2016-02-07 15:04 ` Sinan Kaya 2016-02-09 21:01 ` Sinan Kaya 2016-02-09 21:01 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 09/10] vfio, platform: add support for ACPI while detecting the reset driver Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-01-30 12:52 ` kbuild test robot 2016-01-30 12:52 ` kbuild test robot 2016-01-30 12:52 ` kbuild test robot 2016-01-31 13:53 ` Sinan Kaya 2016-01-31 13:53 ` Sinan Kaya 2016-01-31 13:53 ` Sinan Kaya 2016-02-01 16:08 ` Eric Auger 2016-02-01 16:08 ` Eric Auger 2016-02-01 16:16 ` Sinan Kaya 2016-02-01 16:16 ` Sinan Kaya 2016-02-01 16:29 ` Eric Auger 2016-02-01 16:29 ` Eric Auger 2016-02-01 16:44 ` Sinan Kaya 2016-02-01 16:44 ` Sinan Kaya 2016-02-01 16:49 ` Timur Tabi 2016-02-01 16:49 ` Timur Tabi 2016-02-01 16:56 ` Sinan Kaya 2016-02-01 16:56 ` Sinan Kaya 2016-02-03 18:38 ` Sinan Kaya 2016-02-03 18:38 ` Sinan Kaya 2016-01-29 22:35 ` [PATCH V13 10/10] vfio, platform: add QTI HIDMA " Sinan Kaya 2016-01-29 22:35 ` Sinan Kaya 2016-02-01 15:41 ` Eric Auger 2016-02-01 15:41 ` Eric Auger 2016-02-01 15:41 ` Eric Auger 2016-02-01 15:51 ` Sinan Kaya 2016-02-01 15:51 ` Sinan Kaya
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1454106914-15857-9-git-send-email-okaya@codeaurora.org \ --to=okaya@codeaurora.org \ --cc=agross@codeaurora.org \ --cc=arnd@arndb.de \ --cc=cov@codeaurora.org \ --cc=devicetree@vger.kernel.org \ --cc=dmaengine@vger.kernel.org \ --cc=eric.auger@linaro.org \ --cc=jcm@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=shankerd@codeaurora.org \ --cc=timur@codeaurora.org \ --cc=vikrams@codeaurora.org \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.