From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934704AbcAZPjF (ORCPT ); Tue, 26 Jan 2016 10:39:05 -0500 Received: from mail-bl2on0087.outbound.protection.outlook.com ([65.55.169.87]:18432 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933040AbcAZPjA (ORCPT ); Tue, 26 Jan 2016 10:39:00 -0500 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=amd.com; 8bytes.org; dkim=none (message not signed) header.d=none;8bytes.org; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0O1KGSQ-08-8RI-02 X-M-MSG: From: Wan Zongshun To: Joerg Roedel , CC: Suravee Suthikulpanit , Borislav Petkov , Ray Huang , , , , , "Wan Zongshun" Subject: [PATCH V2 8/8] iommu/amd: Set AMD iommu callbacks for amba bus Date: Tue, 26 Jan 2016 18:14:37 -0500 Message-ID: <1453850077-2539-9-git-send-email-vincent.wan@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453850077-2539-1-git-send-email-vincent.wan@amd.com> References: <1453850077-2539-1-git-send-email-vincent.wan@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)(4326007)(2906002)(53416004)(50466002)(87936001)(19580405001)(92566002)(33646002)(86362001)(36756003)(5003940100001)(50226001)(77096005)(1096002)(1220700001)(229853001)(48376002)(2950100001)(106466001)(97736004)(76176999)(5001770100001)(19580395003)(189998001)(5008740100001)(50986999)(105586002)(586003)(101416001)(5003600100002)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0853;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;2:N+fJUSgOLHeEpxpji6U1Jc/fUcXK0PPPKSaUipks364tNqHOx1/DLnJiaFqOC+kDVhHZg+84h1+MwMNa9xTAqyDTKGX2qsrAIIFc78pKfGYY1III9GyN1WAT+pwF1lZIj0rVW9rfZtW3/pOcs+GN/w==;3:yDFMYs5p4CtDN8QM6zuMaQNIFCZrZwcYKGuSHNWaKf7gFue0Ptl9IV7EGusY6m3qU1Zxs/i/lxAtAgIHkd501b6PwII+7ib+TTFj+JmtoYZQRbTTYx4dS8zeEmsvnLnWIzD21zloadHIVW/rVdgoUPyZH3CT6XXiONOL4aXj3Dp08YE7s3+gzcPUOEOgSz+SuoM1zIk14x2lg2IWCEAqYF0Kf4rA6uFE2vVrdl/A+9Q=;25:5ttHvZiUdUbIAtD2rJMyHXskvrNwSJlggVaPfX4RnPLeM4Ji5hcfUudE7rP75e2nSm+TmmXuE7dW9MMqV/EUvY68t4sg6CbKJsvPdSt9up45BtNhQLCdFV1RP7BFcOa4bt3UP0KJ3JWJDvKQja2L0LyEj+6pqLUS+slkd5adt45EH9qfzAn7ZVG3I+PSxCqlY3nAbBiv33lgjClH05ZklBDTI0p0nSEHUXTHIUXGN67N9Cbo+XNvElGbRBOyeOK7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0853; X-MS-Office365-Filtering-Correlation-Id: ea29eb68-a9ad-4f80-1cec-08d32666cd20 X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;20:B/SduvoJD7lXCeQYK3KZ9TQmo+HOIzDBgPIlIDxt66UOgbQfwhq+AOMUAn1d+25xee5iuiHAq7sgpflw4Q6F9LjGDa4Zu8gRpeR4t1oADtEZLutQ0vFFgewx67dzqyRoO1wv3y+UAHGk6SDVSaCuDjHcSYBy755g5n6tI07tDw4jdZblMJqYANGnsy/R/QrSwiWHSVHXldvKF8Ujb/RGNDjLqDK+t1T7qoKzpI4FK1+nO56qee6zxcqsF2OG2C9uez2eW2jID76a0MRGw68HeC9P3/eVuguHVe/FG5KriMYVacEyUB1qCAP8ZGN7GdQVnAk9iIX7neWysC+yaLcdTIfeCkrzEiZG3NGThwpUbDM+9L5IpR0h6aeG3FItLMn1HGMm/qOSI2ZeZ5zIhUgpVUv0DO8Ya0wfDGNMIa8/lcd8tYTRxs/OHWuWOXTjQrVaDPIuEy3DAUFA1751bYwrnsvgqaufO7cs/Z8lR9SyaYxncfdraHjRs/Mv8noSlsDq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(123027)(601004)(2401047)(13024025)(5005006)(13018025)(520078)(13017025)(13023025)(8121501046)(13015025)(10201501046)(3002001);SRVR:CY1PR12MB0853;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0853; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;4:G7RKzY7PeisWGWVvgOK/2biqR/Z9YYr5BB3+MNyi7mMzXM07O/cywxwTJoPEb5HZqO6p7AfBMxZiN0qVdk8xVM67/zlmAI2sq1JgoyO+2VQV3hu9mD28LSIvasmkXL7EU3cEoJMzku+AeyGW5+fvzcT18vXxcK2h3eWPgkDsiIw14s4s/l2jWIww90TAiCOrnxy0+RIjXgcrsxwvllZ2L0mW72tPcpktCn6J/QGqEgqsZZ0znrOmPoFGXaNhk2aKpObuqrxZlNTuSIigH6Tz5iKBA08TIufoRgc8gt6Gx1p6qd8bzulExyOn5ljEA1i5vcsufRQkA03KdJFiTKpBmcPTbnw6B6uFcQUC6iovwOYGal8VKoqwD0eyDhb5/g+SsKxec18hlzBmA4McdzUCDCL80eHbE4DS6dpWC05SEjo5OKRg04jlTplKuhrSpVa0J8KKFbA6IDi/A88cga8SzjgA7AZyREJfqQPSHHeoQdUl5UaP172KgWoRRmLViz7wBAwx+3JUt+HGswx73Iz84w== X-Forefront-PRVS: 08331F819E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0853;23:DMpjbwIQ3SohMPdxmyRd7PI/NiO7h96x5ipahNUml?= =?us-ascii?Q?etl+dNDjDusI140kdxuIeDER1GjFW5/vCAKLuZidg46hjXWUL+SNYQRDVb1f?= =?us-ascii?Q?q6MS0rQ46ydt9i8of5RaWkdBc9uyMY6ipwxRhkjtrj8AbXd9+I6b7SS6tbDf?= =?us-ascii?Q?FzKm/xiUS8FVAUBQJKJaZlztAodhqmxZLxBjDHOh9yvXDWWqHt+iiyBsf+tg?= =?us-ascii?Q?vulEMTN9DuaYofLQS07XH7X+JeL9BSDxgmJXlD9CgpyJgAsT+lyx+anJ2KMC?= =?us-ascii?Q?hXux5TT+re4Vh9b/pPBv41umXCliXgoUWAyEhxvv9uWHf6Iv7LhibSb/H+PP?= =?us-ascii?Q?juZGgZr+vBg+Fn+Xe4alKX1SC6c9396npfLwMrMgexyNKCI4zsn/M/kxQVJV?= =?us-ascii?Q?9e6XqSHbazRSmsgNN/vnXkKeppdqUXpyk4ivxrX/2Mrzr4vpxWMWJmkxsGSt?= =?us-ascii?Q?oCszEBdn4gHQyVrZQ+Yt+mhmyrYaLXyjUHDquHP+/+HwQKQFlD/fD+z3NKm2?= =?us-ascii?Q?xm2YGGCFFgK6OWVoUYGSp8GlqNn7sZ70VvBIDoHxVKDVEp3XuXeCwGPwYWAx?= =?us-ascii?Q?zy1JCxlnSvc6vpIgVUYIvIAVyUnPoEqajlwxDiff6oz0rWUeYnpPDq6igQED?= =?us-ascii?Q?MhiBlxdrhEAoMKeuWwVWhTglVLsdY+E9E5U97jSy+S7QDEATc9arn+20Gyb/?= =?us-ascii?Q?rKsRR6deReZXBUO0mJ69uKbHq7SOILdqTIuTV6GyuREMydnnD8ZCgwZjYfA4?= =?us-ascii?Q?3YxR1oQUEhLOBNKPXjIZPzrPRAFFDgP+RbCBvaWNIjqcbve7dpr8Db/O68+4?= =?us-ascii?Q?vmE0rgSMvwQWq1iPyxbG/bIcwe4ny17wjO1Mafu4qzH491DtYdJ3AhuFtjFN?= =?us-ascii?Q?hNaa0X4euWq2qYxQ/yUnXNLrCwBvC6MEaO+4cgNo+CU07/wB68Rau3jSa8NJ?= =?us-ascii?Q?aa6dvZzWIpQp3Y0NrcLNJTKM02JqXU/ulRDqAQdiQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0853;5:v6ggVChRz74DuyNk/u9ozFB7yYG0R+BRiO/zcGymFIMbKX9CwGkJhLd94NqepG7g+5XO2oJDS+xns+hq08oqGxladc/hJY8/6hIHvwnk9T8WIPAxOBWTFJVRDeZcPPN/gIR3SL8qP8hxoCfyqRm09w==;24:nG/YRgG1PJrMWqhvA1ChHCoYNkq77jBl0OkgvcEyzE/9HPJtchluCI9sCtTgWHYyaeaX2fSY50nl2ggNkruJ0gGaK3HwyuT9OZlu/kNkN8s=;20:ZFjwFfwHOcXhln/wE5W+zKxzqjzpGLImBFsla4ko6pa525TtxSjl4FpRHzAj2NdkexRHJ2oRi6P9yfg7Qouvqh4n1zQbPP/TQrCN/wGYwkHv29yMWQ+p6es8ii5SsLwGSPNtSJqJf1XMovq1iqtsiZgiQchXes4XFuQ6M2joFmw4SKAT7S/C0jiPgU3MQsj85IG1FLLCh+LkOsbY/ksEJzCzP0SQ1FG1+npC70qJ01JS4ovQ621oJ0l4NTbCWSkH SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2016 15:38:55.4012 (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: CY1PR12MB0853 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wan Zongshun AMD Uart DMA belongs to ACPI HID type device, and its driver is basing on AMBA Bus, need also IOMMU support. This patch is just to set the AMD iommu callbacks for amba bus. Signed-off-by: Wan Zongshun --- drivers/iommu/amd_iommu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 59398f9..9194161 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -2965,7 +2966,17 @@ static struct dma_map_ops amd_iommu_dma_ops = { int __init amd_iommu_init_api(void) { - return bus_set_iommu(&pci_bus_type, &amd_iommu_ops); + int err = 0; + + err = bus_set_iommu(&pci_bus_type, &amd_iommu_ops); + if (err) + return err; +#ifdef CONFIG_ARM_AMBA + err = bus_set_iommu(&amba_bustype, &amd_iommu_ops); + if (err) + return err; +#endif + return 0; } int __init amd_iommu_init_dma_ops(void) -- 1.9.1