From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752997AbcADFee (ORCPT ); Mon, 4 Jan 2016 00:34:34 -0500 Received: from mail-by2on0065.outbound.protection.outlook.com ([207.46.100.65]:26192 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752790AbcADFde (ORCPT ); Mon, 4 Jan 2016 00:33:34 -0500 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O0EY3P-08-6BA-02 X-M-MSG: From: Wang Hongcheng To: Andy Shevchenko , Vinod Koul , Mika Westerberg , Greg Kroah-Hartman , "Rafael J. Wysocki" CC: , , , , Borislav Petkov , Huang Rui , Wan Zongshun , Ken Xue , Robin Murphy , Graeme Gregory , Tony Li , Xiangliang Yu , Wang Hongcheng Subject: [PATCH 5/6] dmaengine: pl330: provide ACPI dmaengine interface Date: Mon, 4 Jan 2016 13:31:40 +0800 Message-ID: <1451885501-2710-6-git-send-email-annie.wang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1451885501-2710-1-git-send-email-annie.wang@amd.com> References: <1451885501-2710-1-git-send-email-annie.wang@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(189002)(199003)(106466001)(33646002)(50466002)(5003600100002)(229853001)(19580395003)(19580405001)(189998001)(2950100001)(105586002)(5008740100001)(4326007)(76176999)(5001770100001)(47776003)(1096002)(50226001)(50986999)(48376002)(101416001)(87936001)(1220700001)(97736004)(36756003)(5003940100001)(586003)(77096005)(53416004)(86362001)(575784001)(92566002)(11100500001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0719;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;2:jIIll6W9mmQTbbCgVYiGF9bc5Wmc5tfkDGB3bNIbZOKstLTWlJdXaW0X3XR4BdJ9hzwgNwxqhpiE8qk8pAAax3jsAJkUo1Mkn2KG59cIt8VBkQL62uPn4vfzVXRldfr2+t09FHqit6e40rOA27nXNw==;3:IxUDTnhz4akvHS3awfaIiIrUz5XtQhAq8cCMbJxLVzsJDrBxYyNp6BAxdjM+E0VKToQYk/Ida92Ju7uss+Ush3+UbLOpuCH3QJRyb4xmOzZW+/cv8jFFsNnDUQuDKk2USEKJqLZkpt1ppNunnZxxuBIeyhIJZyomYzkOSpz8s/WhRxknA8juSuCFLQevK6uK8TIVBDSojdAjgQyRl2bYud7S4xCalyRI0Vd1+cxGQ8Q=;25:AxrlwEMh1ZRBdWbTCirX36Xlz3BRp/L/R3hX/LnZ5PVtzcSzQBfhQsk/84NUTe7kN/EURw89vo8CJ6BUV8KsF3H+ur7VDRr8W076TLvcQap/t18WpU8xF39+EZ4OVhXxtx4mH4XhPhv75ASDmWqwf8X7HKdim996oSs+Q+UhLL4m2VbQCD+jUgGaULydHVZt2qWhfbFW9f6ZuqCut/SBuflHmhT1P+ohaZEJUc6TupTCsoBMyrxeRoOW7bNT1KzN X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;20:uhMYDSWZW6cJHa+EC/qssLxDJ+v0b9J6I7wS5VHMLF4l9aMUUMMRkebbZIrUH2wTVi6j0qeA/mrLmz+n3k7Hzqbwk/u/uyXYfGuLFV+JqkmThIU1n32zbIj/dr7p5nzwwhpR3XKgO/p6ARq/3b7JqbaLCBC4sIl0Fz3XZOXyLsvyskTNjmbFltGY4xgkJYV9XICy8qK/UX7dOYcoJzUQghODkN1oUf2k00uWSBPl1w3LmHX5zslL0xqMdIEwQMxQ+mn4azS0qe9Y6R2cgdnMiZbJw2utJnnLsCMYVqPxDNA8DOX+gxi9Zg0xl9YcuGz6ZMwsFs4H7iX0USgJtgHBA36tpiy3TwCh4VMEYeKAZeVwfn9Np0pn9WPvASs9YIHnMpON1H5ytI10feH7KyXRaqizZd3oKVwfDqAkCzzAgyJn1UFYJ8NnVoidcTVCZ4wpreWeaKZenE5un/0J431pSemsScVCL51EVmNmT6wTZNeHSv4lHmaMLi79z20bgnAB;4:2bM/ZzyfHWfAFXy4yrIjLtfkdue9zr90CcE/m4Z43vunjRzgZH0IWJXQmocbyrtmK9KkvBIlvKbYhyLnlZaWBIE6ctj/gaVMFSvtebMP4Bv8cXc4J69q9zzmZYosG2Mgyn2mi4NVDkKwXK7MzsJvQNkc88aas63lX22olsfetTI8AtdnlWwe5wEZV3WDMftLybcbgstQq1/kNW74YiMhllG2U2G0N4XwrgtPtRsFFkeJwoSQAAeyq/V+jkOeALSDaFoARAGCben4qfOYaJevWcq+4CdOy3oJYXrVaNOQdZxpPVlS7b6m3eALIgDBdFvo4bs5YQggN3zlfgMUmg69QUupKWYHjHUrmEOsaG3dM1wdaRRDEGmncBbI/UauEVRWEKLnfySgIwnp8UgGNir/C3yIUMMXnE7gJPYIdne35rc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001);SRVR:SN1PR12MB0719;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0719; X-Forefront-PRVS: 08118EFC2B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0719;23:qBEKKz8Gg5JcqLJM2B6c5twJLDl5oB3hkTaJnOLcg?= =?us-ascii?Q?zBjdztnjazPCNsvs6kEt/5C12Fap7JKrQ0eguCrIUVPu8oiQNh43pm2NLDwf?= =?us-ascii?Q?RlhwGAVhBTHOAYfY/e7cXdyY6vAg22uQjUCQjTnlWRaY/DR8IxKk+EdPfldX?= =?us-ascii?Q?fgQAY58eW3LMkWG1bIMZEaOi5HgqhwSLoEPXoYKtKDtdJiYFi50h0rnygxyx?= =?us-ascii?Q?YQk7PzI/avp4usNDomwDMzMQwuEpRN8kE/R9xdKNd1Ebx5Oij49eCUf/2Tng?= =?us-ascii?Q?gDInWF6/Yb9/HSIMZeOPsTgoOm+JxUVDwHvPsM46oQ05oMqsRFS8h9TObKv3?= =?us-ascii?Q?FzgScL6GxKiYGnRoo3/BP9ge7ygJHtkG/qFSouwp3ZH7ojGhGKUDFFGySUnF?= =?us-ascii?Q?bGPcqlaQwa8Xglo56KS1Aluy0gUcHkpc7j/pufUptBme2KItkJV2AoOYB9NW?= =?us-ascii?Q?oS0d4phCbtOv/J03syp9oBg2sPqxTOypxIHb49G8BZVxebvPXKPJPCw0qAK9?= =?us-ascii?Q?aJP/Vzwj+jVPKkMTxT2d1FrLuWfx3UcLIlYbYhchJZQA7+lRQnn27Lh9FL33?= =?us-ascii?Q?nWjKGti1WXiwy/6Ew1fzjtfmak9WfNUVYZ44sZlrFhyyBDng7kzFuu4iW7Qb?= =?us-ascii?Q?ZtmB8bzeiM0q4FeZxK5P0fDzKAmi5L952cb3VNUOJKI/BZaKyYpEIV14Jp+P?= =?us-ascii?Q?Eqvio6tjGJbkOlpIYUqEqQ6LFeoDUl/ywasBGky1yX5KUgJMM8hTiKcZmr3Q?= =?us-ascii?Q?FwkJLGH1K9kYtKvgVNpVOoe3GhZ5ChhIAGqSZ7XmOMpjw4gXGTb/+b4CfVlB?= =?us-ascii?Q?9pjjNdOaqoxdeL36VjRtqMX7fK6N7aMTKwDpwynzTEcZ9BzGsbcMnMOCsPct?= =?us-ascii?Q?z7ITjS0ex8FVE+C9xuBqpTz9E8z88RK8H3yLbFhar2l8i6d9+xhEuIQiFnMZ?= =?us-ascii?Q?WuExhcRrHcSZSmziWZCWTq5kQd0KngLVVUL3ZKIJkHfF7ZYHKmqZ4+qRt3yk?= =?us-ascii?Q?yC1sr4X8dfprQpmfvOuRKiv?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0719;5:2+UIdYTuOMsRazRuwLoNx9vmL4AZvffZnkSJssCT2rMhtSQ25yRTAOA08HN7pVSyWIlFy//3J0WwHJQL8pnelOlB0AsQwq68oNcvrNmHw4asS5ixr0jlMsjG3o8S+7sDvxrRwfxzKLf7BxxRjmyg2w==;24:ZSJxUbxax9iYdP+PpzDn0LAica53ZXQuLkGJJj9/e4IPGdo7gsRs+FugU+taDK43B4mPvJhydD3Igc2p2oH3NaR6zBgfEqIniu7nlUWe7us=;20:MUKKL98m8E/mFHNtxkh2g65vyc/CnhVQ1DP+T9JZnzzpvh05QdyBGOVxl9rP6AJaEiVfVel8KS3mjwAGR+OdasYRuOtK4EbQoGBorYPwdr/eo8AHwUN6QrTrKoeCVQjcwMMf0He/VrdjQ7v6fM7FX7hvBb9fm25gGbnrY74MaGu/Oud7HUgBBCT/9S3xt/Snx4guNVxtY2/P9ACKCg9p9LtokJKFJAYvueV6GcF/kHVy2hOmbrTiGFo2+B7/FU1l SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2016 05:33:27.9247 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.222];Helo=[atltwp02.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0719 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org register acpi_dma controller, so ACPI devices can request pl330 DMA channel. Request line info is get from private data. Signed-off-by: Wang Hongcheng --- drivers/acpi/acpi_apd.c | 34 +++++++++++++++++++++++++--------- drivers/dma/pl330.c | 27 +++++++++++++++++++++++++++ include/linux/amba/pl330.h | 4 ++++ 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c index 4d71a65..1f16cca 100644 --- a/drivers/acpi/acpi_apd.c +++ b/drivers/acpi/acpi_apd.c @@ -38,11 +38,23 @@ struct apd_private_data; static u8 peri_id[2] = { 0, 1 }; -static struct dma_pl330_platdata amd_pl330 = { - .nr_valid_peri = 2, - .peri_id = peri_id, - .mcbuf_sz = 0, - .flags = IRQF_SHARED, +static struct dma_pl330_platdata amd_pl330[] = { + { + .nr_valid_peri = 2, + .peri_id = peri_id, + .mcbuf_sz = 0, + .flags = IRQF_SHARED, + .base_request_line = 1, + .num = 0, + }, + { + .nr_valid_peri = 2, + .peri_id = peri_id, + .mcbuf_sz = 0, + .flags = IRQF_SHARED, + .base_request_line = 2, + .num = 0, + } }; /** * struct apd_device_desc - a descriptor for apd device @@ -101,6 +113,7 @@ static int acpi_apd_setup_quirks(struct apd_private_data *pdata) unsigned int irq[AMBA_NR_IRQS]; struct clk *clk = ERR_PTR(-ENODEV); char amba_devname[100]; + int devnum; resource = kzalloc(sizeof(*resource), GFP_KERNEL); if (!resource) @@ -131,8 +144,11 @@ static int acpi_apd_setup_quirks(struct apd_private_data *pdata) if (!amba_dev) goto amba_alloc_err; + devnum = amba_devname[strlen(dev_name(&pdev->dev)) - 1] - '0'; + amba_dev->dev.coherent_dma_mask = acpi_dma_supported(ACPI_COMPANION(&pdev->dev)) ? DMA_BIT_MASK(64) : 0; + amba_dev->dev.platform_data = &amd_pl330[devnum]; amba_dev->dev.fwnode = acpi_fwnode_handle(ACPI_COMPANION(&pdev->dev)); amba_dev->dev.parent = &pdev->dev; @@ -162,10 +178,10 @@ static int acpi_apd_setup_quirks(struct apd_private_data *pdata) kfree(resource); - dma_cap_set(DMA_MEMCPY, amd_pl330.cap_mask); - dma_cap_set(DMA_SLAVE, amd_pl330.cap_mask); - dma_cap_set(DMA_CYCLIC, amd_pl330.cap_mask); - dma_cap_set(DMA_PRIVATE, amd_pl330.cap_mask); + dma_cap_set(DMA_MEMCPY, amd_pl330[devnum].cap_mask); + dma_cap_set(DMA_SLAVE, amd_pl330[devnum].cap_mask); + dma_cap_set(DMA_CYCLIC, amd_pl330[devnum].cap_mask); + dma_cap_set(DMA_PRIVATE, amd_pl330[devnum].cap_mask); return 0; diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 5e5fb46..e0e0b6e 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2079,6 +2079,22 @@ static struct dma_chan *of_dma_pl330_xlate(struct of_phandle_args *dma_spec, return dma_get_slave_channel(&pl330->peripherals[chan_id].chan); } +static struct dma_chan *acpi_dma_pl330_xlate(struct acpi_dma_spec *dma_spec, + struct acpi_dma *adma) +{ + struct pl330_dmac *pl330 = adma->data; + struct dma_pl330_platdata *pdat; + unsigned int chan_id; + + pdat = dev_get_platdata(adma->dev); + + chan_id = dma_spec->chan_id; + if (chan_id >= pl330->num_peripherals) + return NULL; + + return dma_get_slave_channel(&pl330->peripherals[chan_id].chan); +} + static int pl330_alloc_chan_resources(struct dma_chan *chan) { struct dma_pl330_chan *pch = to_pchan(chan); @@ -2918,6 +2934,17 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) } } + if (has_acpi_companion(&adev->dev)) { + ret = acpi_dma_controller_register(&adev->dev, + acpi_dma_pl330_xlate, + pdat->base_request_line, + pdat->num, pl330); + if (ret) { + dev_err(&adev->dev, + "unable to register DMA to the generic ACPI DMA helpers\n"); + } + } + adev->dev.dma_parms = &pl330->dma_parms; /* diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h index cdc80f0..1190f69 100644 --- a/include/linux/amba/pl330.h +++ b/include/linux/amba/pl330.h @@ -31,6 +31,10 @@ struct dma_pl330_platdata { unsigned mcbuf_sz; /*flags for irq sharing, default is non-shared*/ unsigned flags; + /*device base request line*/ + unsigned short base_request_line; + /*device request line range*/ + unsigned short num; }; extern bool pl330_filter(struct dma_chan *chan, void *param); -- 1.9.1