From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [3/8,v4] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware From: Vinod Koul Message-Id: <20190120111115.GU4635@vkoul-mobl> Date: Sun, 20 Jan 2019 16:41:15 +0530 To: John Stultz Cc: lkml , Youlin Wang , Dan Williams , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Tanglei Han List-ID: T24gMTYtMDEtMTksIDA5OjEwLCBKb2huIFN0dWx0eiB3cm90ZToKPiBGcm9tOiBZb3VsaW4gV2Fu ZyA8d3d4NTc1ODIyQG5vdGVzbWFpbC5odWF3ZWkuY29tPgo+IAo+IE9uIHRoZSBoaTM2NjAgaGFy ZHdhcmUgdGhlcmUgYXJlIHR3byAoYXQgbGVhc3QpIERNQSBjb250cm9sbGVycywKPiB0aGUgRE1B LVAgKFBlcmlwaGVyaWFsIERNQSkgYW5kIHRoZSBETUEtQSAoQXVkaW8gRE1BKS4gVGhlCiAgICAg ICAgICAgICAgICAgICAgXl5eCnR5cG8KCj4gdHdvIGJsb2NrcyBhcmUgc2ltaWxhciwgYnV0IGhh dmUgc29tZSBzbGlnaHQgZGlmZmVyZW5jZXMuIFRoaXMKPiByZXN1bHRlZCBpbiB0aGUgdmVuZG9y IGltcGxlbWVudGluZyB0d28gc2VwYXJhdGUgZHJpdmVycywgd2hpY2gKPiBhZnRlciByZXZpZXcs IHRoZXkgaGF2ZSBiZWVuIGFibGUgdG8gY29uZGVuc2UgYW5kIHJlLXVzZSB0aGUKPiBleGlzdGlu ZyBrM2RtYSBkcml2ZXIuCj4gCj4gVGh1cywgdGhpcyBwYXRjaCBhZGRzIHN1cHBvcnQgZm9yIHRo ZSBuZXcgImhpc2ktcGNtLWFzcC1kbWEtMS4wIgo+IGNvbXBhdGlibGUgc3RyaW5nIGluIHRoZSBi aW5kaW5nLgo+IAo+IE9uZSBkaWZmZXJlbmNlIHdpdGggdGhlIERNQS1BIGNvbnRyb2xsZXIsIGlz IHRoYXQgaXQgZG9lcyBub3QKPiBuZWVkIHRvIGluaXRpYWxpemUgYSBjbG9jay4gU28gd2Ugc2tp cCB0aGlzIGJ5IGFkZGluZyBhbmQgdXNpbmcKPiBzb2MgZGF0YSBmbGFncy4KPiAKPiBBZnRlciBh Ym92ZSB0aGlzIGRyaXZlciB3aWxsIHN1cHBvcnQgYm90aCBrMyBhbmQgaGlzaV9hc3AgZG1hCj4g aGFyZHdhcmUuCgpHcmVhdCB0aGFua3MgZm9yIHRoZSBlZmZvcnQhCgo+IAo+IENjOiBEYW4gV2ls bGlhbXMgPGRhbi5qLndpbGxpYW1zQGludGVsLmNvbT4KPiBDYzogVmlub2QgS291bCA8dmtvdWxA a2VybmVsLm9yZz4KPiBDYzogWmh1YW5nbHVhbiBTdSA8c3V6aHVhbmdsdWFuQGhpc2lsaWNvbi5j b20+Cj4gQ2M6IFJ5YW4gR3JhY2hlayA8cnlhbkBlZGl0ZWQudXM+Cj4gQ2M6IE1hbml2YW5uYW4g U2FkaGFzaXZhbSA8bWFuaXZhbm5hbi5zYWRoYXNpdmFtQGxpbmFyby5vcmc+Cj4gQ2M6IGRtYWVu Z2luZUB2Z2VyLmtlcm5lbC5vcmcKPiBBY2tlZC1ieTogTWFuaXZhbm5hbiBTYWRoYXNpdmFtIDxt YW5pdmFubmFuLnNhZGhhc2l2YW1AbGluYXJvLm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBZb3VsaW4g V2FuZyA8d3d4NTc1ODIyQG5vdGVzbWFpbC5odWF3ZWkuY29tPgo+IFNpZ25lZC1vZmYtYnk6IFRh bmdsZWkgSGFuIDxoYW50YW5nbGVpQGh1YXdlaS5jb20+Cj4gW2pzdHVsdHo6IFJld29ya2VkIHRv IHVzZSBvZl9tYXRjaF9kYXRhLCBjb21taXQgbXNnIGltcHJvdmVtZW50c10KPiBTaWduZWQtb2Zm LWJ5OiBKb2huIFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KPiAtLS0KPiB2MjoKPiAq IFJld29ya2VkIHRvIHVzZSBvZl9tYXRjaF9kYXRhCj4gdjM6Cj4gKiBGdXJ0aGVyIHJld29yayBv ZiB0aGUgY29tbWl0IG1lc3NhZ2UKPiAtLS0KPiAgZHJpdmVycy9kbWEvazNkbWEuYyB8IDM3ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDMy IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv ZG1hL2szZG1hLmMgYi9kcml2ZXJzL2RtYS9rM2RtYS5jCj4gaW5kZXggZmRlYzJiNi4uZGY2MTQw NiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2RtYS9rM2RtYS5jCj4gKysrIGIvZHJpdmVycy9kbWEv azNkbWEuYwo+IEBAIC0xMTYsNiArMTE2LDEzIEBAIHN0cnVjdCBrM19kbWFfZGV2IHsKPiAgCXVu c2lnbmVkIGludAkJaXJxOwo+ICB9Owo+ICAKPiArCj4gKyNkZWZpbmUgSzNfRkxBR19OT0NMSyAg KDE8PDApCgp3aHkgbm90IHVzZSBCSVQoKQoKc3BhY2UgYmV0d2VlbiB0d28gcGxlYXNlCgo+ICtz dHJ1Y3QgazNkbWFfc29jX2RhdGEgewo+ICsJdW5zaWduZWQgbG9uZyBmbGFnczsKPiArfTsKPiAr Cj4gKwo+ICAjZGVmaW5lIHRvX2szX2RtYShkbWFkZXYpIGNvbnRhaW5lcl9vZihkbWFkZXYsIHN0 cnVjdCBrM19kbWFfZGV2LCBzbGF2ZSkKPiAgCj4gIHN0YXRpYyBpbnQgazNfZG1hX2NvbmZpZ193 cml0ZShzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sCj4gQEAgLTc5MCw4ICs3OTcsMjEgQEAgc3RhdGlj IGludCBrM19kbWFfdHJhbnNmZXJfcmVzdW1lKHN0cnVjdCBkbWFfY2hhbiAqY2hhbikKPiAgCXJl dHVybiAwOwo+ICB9Cj4gIAo+ICtzdGF0aWMgY29uc3Qgc3RydWN0IGszZG1hX3NvY19kYXRhIGsz X3YxX2RtYV9kYXRhID0gewo+ICsJLmZsYWdzID0gMCwKPiArfTsKClNvIGJhc2ljYWxseSB0aGlz IGlzIGRlZmF1bHQgcmlnaHQsIGRvIHdlIG5lZWQgdG8gc2V0IGRtYV9kYXRhIGFuZCBub3QKYXNz dW1lIGRlZmF1bHQuLgoKPiArCj4gK3N0YXRpYyBjb25zdCBzdHJ1Y3QgazNkbWFfc29jX2RhdGEg YXNwX3YxX2RtYV9kYXRhID0gewo+ICsJLmZsYWdzID0gSzNfRkxBR19OT0NMSywKPiArfTsKPiAr Cj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIGszX3BkbWFfZHRfaWRzW10gPSB7 Cj4gLQl7IC5jb21wYXRpYmxlID0gImhpc2lsaWNvbixrMy1kbWEtMS4wIiwgfSwKPiArCXsgLmNv bXBhdGlibGUgPSAiaGlzaWxpY29uLGszLWRtYS0xLjAiLAo+ICsJICAuZGF0YSA9ICZrM192MV9k bWFfZGF0YQo+ICsJfSwKPiArCXsgLmNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpc2ktcGNtLWFz cC1kbWEtMS4wIiwKPiArCSAgLmRhdGEgPSAmYXNwX3YxX2RtYV9kYXRhCj4gKwl9LAo+ICAJe30K PiAgfTsKPiAgTU9EVUxFX0RFVklDRV9UQUJMRShvZiwgazNfcGRtYV9kdF9pZHMpOwo+IEBAIC04 MTAsNiArODMwLDcgQEAgc3RhdGljIHN0cnVjdCBkbWFfY2hhbiAqazNfb2ZfZG1hX3NpbXBsZV94 bGF0ZShzdHJ1Y3Qgb2ZfcGhhbmRsZV9hcmdzICpkbWFfc3BlYywKPiAgCj4gIHN0YXRpYyBpbnQg azNfZG1hX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKm9wKQo+ICB7Cj4gKwljb25zdCBz dHJ1Y3QgazNkbWFfc29jX2RhdGEgKnNvY19kYXRhOwo+ICAJc3RydWN0IGszX2RtYV9kZXYgKmQ7 Cj4gIAljb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkICpvZl9pZDsKPiAgCXN0cnVjdCByZXNvdXJj ZSAqaW9yZXM7Cj4gQEAgLTgyMyw2ICs4NDQsMTAgQEAgc3RhdGljIGludCBrM19kbWFfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqb3ApCj4gIAlpZiAoIWQpCj4gIAkJcmV0dXJuIC1FTk9N RU07Cj4gIAo+ICsJc29jX2RhdGEgPSBkZXZpY2VfZ2V0X21hdGNoX2RhdGEoJm9wLT5kZXYpOwo+ ICsJaWYgKCFzb2NfZGF0YSkKPiArCQlyZXR1cm4gLUVJTlZBTDsKClNvIHRoaXMgaXMgbm90IG9w dGlvbmFsLCBlaXRoZXIgd2F5cyBmaW5lIGJ5IG1lIDopCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F9CCC61CE4 for ; Sun, 20 Jan 2019 11:12:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 072AA2087B for ; Sun, 20 Jan 2019 11:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547982771; bh=pUOprQbOADkmOadE8UJzN9vDHOZ7uNyMZtLXB22wOk0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=vwOgbbWOEoVlgKdI7hCD0tH11cQG6nn9/tJZc6wv2duOHTmgRO/Uk+jjOTLH+nhlA Sa1iKbWRc7cPwCKRaXQZnhg3gZ7LDAzd1+F7XkJQYUAJWDyKv6CdqTeSQg+/O7iNUT wfZ5pa8WuR0qQIWQtAF5iFadEjxoSQFmZ+/VXAcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730483AbfATLMu (ORCPT ); Sun, 20 Jan 2019 06:12:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:55604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728894AbfATLMu (ORCPT ); Sun, 20 Jan 2019 06:12:50 -0500 Received: from localhost (unknown [122.178.235.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CBE7C2085B; Sun, 20 Jan 2019 11:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547982769; bh=pUOprQbOADkmOadE8UJzN9vDHOZ7uNyMZtLXB22wOk0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sy2AlZr7qMofSZWVrStX0nB8070kOv04jM8gDama/gUmkFv7efOuw0w2VqcsUp3Lf b3saEyLzlpSoFyWLOZUtlbG8c0ma6O+uRdq9X09QW7iA4rda6VPVTOhzNMVlm5MtdE MUHKEfqjK6gjmNhbW4AbLkGFYmp/Oi+nOmpE1Lok= Date: Sun, 20 Jan 2019 16:41:15 +0530 From: Vinod Koul To: John Stultz Cc: lkml , Youlin Wang , Dan Williams , Zhuangluan Su , Ryan Grachek , Manivannan Sadhasivam , dmaengine@vger.kernel.org, Tanglei Han Subject: Re: [PATCH 3/8 v4] dma: k3dma: Upgrade k3dma driver to support hisi_asp_dma hardware Message-ID: <20190120111115.GU4635@vkoul-mobl> References: <1547658629-25378-1-git-send-email-john.stultz@linaro.org> <1547658629-25378-4-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1547658629-25378-4-git-send-email-john.stultz@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 16-01-19, 09:10, John Stultz wrote: > From: Youlin Wang > > On the hi3660 hardware there are two (at least) DMA controllers, > the DMA-P (Peripherial DMA) and the DMA-A (Audio DMA). The ^^^ typo > two blocks are similar, but have some slight differences. This > resulted in the vendor implementing two separate drivers, which > after review, they have been able to condense and re-use the > existing k3dma driver. > > Thus, this patch adds support for the new "hisi-pcm-asp-dma-1.0" > compatible string in the binding. > > One difference with the DMA-A controller, is that it does not > need to initialize a clock. So we skip this by adding and using > soc data flags. > > After above this driver will support both k3 and hisi_asp dma > hardware. Great thanks for the effort! > > Cc: Dan Williams > Cc: Vinod Koul > Cc: Zhuangluan Su > Cc: Ryan Grachek > Cc: Manivannan Sadhasivam > Cc: dmaengine@vger.kernel.org > Acked-by: Manivannan Sadhasivam > Signed-off-by: Youlin Wang > Signed-off-by: Tanglei Han > [jstultz: Reworked to use of_match_data, commit msg improvements] > Signed-off-by: John Stultz > --- > v2: > * Reworked to use of_match_data > v3: > * Further rework of the commit message > --- > drivers/dma/k3dma.c | 37 ++++++++++++++++++++++++++++++++----- > 1 file changed, 32 insertions(+), 5 deletions(-) > > diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c > index fdec2b6..df61406 100644 > --- a/drivers/dma/k3dma.c > +++ b/drivers/dma/k3dma.c > @@ -116,6 +116,13 @@ struct k3_dma_dev { > unsigned int irq; > }; > > + > +#define K3_FLAG_NOCLK (1<<0) why not use BIT() space between two please > +struct k3dma_soc_data { > + unsigned long flags; > +}; > + > + > #define to_k3_dma(dmadev) container_of(dmadev, struct k3_dma_dev, slave) > > static int k3_dma_config_write(struct dma_chan *chan, > @@ -790,8 +797,21 @@ static int k3_dma_transfer_resume(struct dma_chan *chan) > return 0; > } > > +static const struct k3dma_soc_data k3_v1_dma_data = { > + .flags = 0, > +}; So basically this is default right, do we need to set dma_data and not assume default.. > + > +static const struct k3dma_soc_data asp_v1_dma_data = { > + .flags = K3_FLAG_NOCLK, > +}; > + > static const struct of_device_id k3_pdma_dt_ids[] = { > - { .compatible = "hisilicon,k3-dma-1.0", }, > + { .compatible = "hisilicon,k3-dma-1.0", > + .data = &k3_v1_dma_data > + }, > + { .compatible = "hisilicon,hisi-pcm-asp-dma-1.0", > + .data = &asp_v1_dma_data > + }, > {} > }; > MODULE_DEVICE_TABLE(of, k3_pdma_dt_ids); > @@ -810,6 +830,7 @@ static struct dma_chan *k3_of_dma_simple_xlate(struct of_phandle_args *dma_spec, > > static int k3_dma_probe(struct platform_device *op) > { > + const struct k3dma_soc_data *soc_data; > struct k3_dma_dev *d; > const struct of_device_id *of_id; > struct resource *iores; > @@ -823,6 +844,10 @@ static int k3_dma_probe(struct platform_device *op) > if (!d) > return -ENOMEM; > > + soc_data = device_get_match_data(&op->dev); > + if (!soc_data) > + return -EINVAL; So this is not optional, either ways fine by me :) -- ~Vinod