From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Hongcheng Subject: [PATCH 6/9] dmaengine:pl330: set segment_boundary_mask = 0cffffffff Date: Fri, 4 Dec 2015 11:24:23 +0800 Message-ID: <1449199466-6081-7-git-send-email-annie.wang@amd.com> References: <1449199466-6081-1-git-send-email-annie.wang@amd.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1449199466-6081-1-git-send-email-annie.wang@amd.com> Sender: linux-kernel-owner@vger.kernel.org To: Vinod Koul , Mika Westerberg , Joerg Roedel , Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, dmaengine@vger.kernel.org, iommu@lists.linux-foundation.org, Borislav Petkov , Huang Rui , Wan Zongshun , Ken Xue , Tony Li , Wang Hongcheng , Wan Zongshun List-Id: linux-acpi@vger.kernel.org Because amd iommu and software iommu need this mask.For example, if we use software iommu without this mask, we will get 'Out of SW-IOMMU space' error, when calling swiotlb_map_page function. Signed-off-by: Wan Zongshun Signed-off-by: Wang Hongcheng --- drivers/dma/pl330.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 9d7af0d..fb46fdf 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2966,6 +2966,10 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) if (ret) dev_err(&adev->dev, "unable to set the seg size\n"); + dev_info(&adev->dev, "set the seg boundary\n"); + ret = dma_set_seg_boundary(&adev->dev, 0xffffffff); + if (ret) + dev_err(&adev->dev, "unable to set the seg boundary\n"); dev_info(&adev->dev, "Loaded driver for PL330 DMAC-%x\n", adev->periphid); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755395AbbLDDll (ORCPT ); Thu, 3 Dec 2015 22:41:41 -0500 Received: from mail-by2on0071.outbound.protection.outlook.com ([207.46.100.71]:30400 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755093AbbLDDlf (ORCPT ); Thu, 3 Dec 2015 22:41:35 -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: 0NYTDK1-08-EAK-02 X-M-MSG: From: Wang Hongcheng To: Vinod Koul , Mika Westerberg , Joerg Roedel , "Greg Kroah-Hartman" , "Rafael J. Wysocki" CC: , , , , , Borislav Petkov , Huang Rui , Wan Zongshun , Ken Xue , Tony Li , Wang Hongcheng , Wan Zongshun Subject: [PATCH 6/9] dmaengine:pl330: set segment_boundary_mask = 0cffffffff Date: Fri, 4 Dec 2015 11:24:23 +0800 Message-ID: <1449199466-6081-7-git-send-email-annie.wang@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449199466-6081-1-git-send-email-annie.wang@amd.com> References: <1449199466-6081-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)(199003)(189002)(77096005)(106466001)(19580395003)(5003600100002)(50466002)(11100500001)(101416001)(229853001)(48376002)(33646002)(105586002)(36756003)(19580405001)(53416004)(575784001)(586003)(50226001)(86362001)(47776003)(5003940100001)(1096002)(50986999)(97736004)(5001770100001)(76176999)(1220700001)(5008740100001)(92566002)(87936001)(2950100001)(189998001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR12MB0714;H:atltwp02.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0714;2:lkH4g0fE2Xy570+s0fTsVUSJql/qYZ1cibrgJXslJp16yiWvoKPQrSavW/kvNbjjuHAm2rHwLq0yukEBMDJ5vR3bS3GUip7zF1eZiT1lvAHQgny3Ktr7xaO6UsqbrNLe6J22WKpbQRwcbrZ74IgabA==;3:WtKT4ekkXN8VQldlZMsrmks2IJZnIADpQw0OLsYUk+ftI+YT4jmeSBSBH4HYtpuyCulik62SaJ3B8+tmZJYU0PuGQYWiaWW37bLK1k4eo+JN3mMVG5A8Ar240KUrVsYAycdUdhvyhaOCQKqX0Vi+tOsN+pY0eeL0QQpM8aP4sYPRcMxfYNFyRenrLNN9TO+tVN7GLW7xCKXVpq5jI1E5Y5oSRvuGFOmWB6SpqQ2jU1M=;25:MMA1Eol2D2iszO5X4alsaVlePHwkbWTFZrnjB+e/+qorB5V/O3f56WAiSWwDhxhFTW+WUbSfWrTMG3cdg1bbO9z5WAIRb8wXmqETb6VA64gcbZKs5H9Eb+wXMyGEtQIq/6Jm3hTpJLJYQIw+O0CjjC+5DbBMsYo17aBWpORiUwuONpoYRyF1N7DsKo01b2VXsrMIzyIDESqpNcEztffttjS8fhAuuA4ztxw5VCCJOScCAXYWaKjaCmDZ1ZZC5yNTWbwpvopTMmM9lKvhc22Z/g== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0714; X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0714;20:vE8eZKpIH/7Av1HBcMS2I8u04LZL7Or/t5AqDZ1KH8SfDrL/TESJ2UhvbXCxM9YLuXdVOsQZfg7G5GBdOEtorTp1qG5gPvmTkLCIdj5QDDA63ZkXgAlWY/nS6yTc5kUkMGWv8uxoYjRcgPck32qI0o00y+fpe22gDmcNs9uQFU5KR8g2NDWTcBFC9d2XBN67UrnNvPAr/6sYZBfrt7VxDk7y7/MXUiDMx9Z5G32PBARBJyVhrlRLwS+Koj636GIbkRUy7JCIEXX56axZ+i58sVJzxbmJ/lKUsDxWGzD5sI9FB8IxoD2zOVUOiuCvlqynipnwYDScOac0iCMflp4rc9LZ6JxZKL6chTOoK521l7V2v8N01pBVwJk62Wo9KebdL0S9yBAhZl5FlAr5MHoV5Jp0536hD8srpr6aV6muFIHWUHG2uvG5KCuAYA8JDUEhvnUU0OfeuWNHLhKdXhFZJAic6ammNumB50nK6jENlnBPSxKx22wJWEFWg+cP8JWN;4:8/zbwv6VOINueABgcmYxf++9jhWRNmfJe2O03YPADVSYDWsq0XHNJa2vt0NVcGnrXPVHeWkS8Xr2slZGsY6KjB/RqYazvKnmNcoLOB4HIsyKJTUxGQemt2Z0NCWJcKxldTB56LA2ATfLWrMySTmw35k9ShLaV0DelZOt8RPn/E9C3Zp6M1gbEIJ2dZBcP+Co7RtMt0B61a4SEy1QvnFQPgKKPFJzxUaaMUQVAYAK8Egz0TT4G0Eq9k10JN6W0hyB4P6kZCUH7dSTZOLJhMvrienJ3pa9qRkNdz2I5qdrUGjI0gqIvJGvkh7PVz2HexKc6OTI4aUeZIMvlCqNuDeCBkc2610r58G12mZGUKehltm0u/dYz5wG6ppiiSuEs6FiZK0eQVNJ0/AtQoJAXP3iKPj2HjzOWlKeu7M0oirxPeQ= 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)(8121501046)(5005006)(10201501046)(3002001);SRVR:CY1PR12MB0714;BCL:0;PCL:0;RULEID:;SRVR:CY1PR12MB0714; X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR12MB0714;23:XhjRUesN1VbLLFkY6jIWYifWU8faP/89354VZTt1F?= =?us-ascii?Q?e80VquibmgmSJE+lUt3K91FXMDe3nwr3e0LnaPKB4S+diNf4JgWWWPWavkCV?= =?us-ascii?Q?cZSQj+jSpqB4sjxdziyadPto2X+Fn13sA9HQsjaitoNNcWr3xg7G0sgi+SRn?= =?us-ascii?Q?2sr6MOINJkDeTojKer4Ul3QQ5z/YgOac9i+fdDwb+0IcUlMmj4soW9SmAbxP?= =?us-ascii?Q?DL+dsqJq2XF9awIkrIEqINSq648ir0C2T1j5KhesLRci7dTahU8oXOLSitpI?= =?us-ascii?Q?0UgJJCF7GNQaCTwHznqhSCwM7IGxarXF9s0xwSphF3m2YjQl9jkd2mo+RmAs?= =?us-ascii?Q?pkJYcBrxivIBCIErRbw1FJKXrvbQONDiLF3k6Gsi2uCH4T9yF7vxzSfzr05J?= =?us-ascii?Q?cO/MIpN0V/bagDB8yyZLUTWA64VqwrqAOld6dLjJRscXhQQngKYyH46lHnWw?= =?us-ascii?Q?fdJS/iJBsC4ypbKsdksL6v8cdETbif6EBfacOUP7eUagQqUJsYSPmJIq2ESY?= =?us-ascii?Q?fTXZbphGcIY2TnK3ROs9fQw5iRYYgzMlN8NQV75b1uF+xSBjkIYE4T418ly9?= =?us-ascii?Q?tI2VQCpll8jpJQ1MzSKhz22T4s0ga/3wRtrlzodN6bmRL3lWq4O/0GmkahNJ?= =?us-ascii?Q?WoxpGrWlIGqnX2sE3lXg7qsPUI/7sVQa6raDFT7vvPw3633/mitWOJtPsTWw?= =?us-ascii?Q?YMRip7bVFidA0BWfLr7YHHH5UlOq5pNQZPvGdkWlcDP8mXV+RGFZcabIj1zj?= =?us-ascii?Q?Lf7n5wv6elL6xxSV1PVx1MrdHAELaGHxfEnM3T2OvqJW21TAhhU+P41NxhL+?= =?us-ascii?Q?UauXp5WXfnImGK+MoxCtmiEOehTuK+K4s9WfxOTcFBddwj/cPfWKxo/18suC?= =?us-ascii?Q?o4aUCH1YvVni40L+ZZVNn8eeVbYB+p4L1T4YYS+IK27LnnFj7xUwh04jw19Q?= =?us-ascii?Q?RSOBLULAcWNQhsNvIARdsuYMUeBdKkM6mZo+6sZkgCF9/N2jSWvnvuf43CU+?= =?us-ascii?Q?ro=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR12MB0714;5:pQoM4MCYGJO3dv9uc12urYvy0Dv9KU86jH012nQDBsVgRGeGWRmGcgWvJ84SAPhrAGWboCFx8ktT3byH5bOgJMF6TIhfrnaqmouFF2dS+gvuWCP0P6vcUwJ9iwHqZSWRDE2k7ktJMVfztHDFSAbNrg==;24:hoUvgAsENRbrIOhxARWSUt0bRIHcZP/IHR4aq5XukdolYZVDVPRD+QllwDPWeltnqVvTdi42na+zrsLfzRTNIFzqe/Bk86YR3Daz76p6na4=;20:zsTqgU+reu5dtuupysr/SvlQuFFIPGIHjIuhK47LsGjzdOQq/iynCdaEE644tzYlgMUmwWckceOfQflQ6Jk3MLsPEXFJJHkcx7Fb036llK8C8Ys/Yen+mT8IbD1n/w+DM4FGqZNXAiNZJIwdbrOLk7P5CrNP5ULLn+SGFr/yhEJvPQRBlvAXwHNjFXzN/7FeEhJMD75TRHge5wHNmjlX66ZATLnq657VqbybL5RU/57+v2qkbJlFlsUUsoANo5RL SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2015 03:26:28.3009 (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: CY1PR12MB0714 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Because amd iommu and software iommu need this mask.For example, if we use software iommu without this mask, we will get 'Out of SW-IOMMU space' error, when calling swiotlb_map_page function. Signed-off-by: Wan Zongshun Signed-off-by: Wang Hongcheng --- drivers/dma/pl330.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c index 9d7af0d..fb46fdf 100644 --- a/drivers/dma/pl330.c +++ b/drivers/dma/pl330.c @@ -2966,6 +2966,10 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) if (ret) dev_err(&adev->dev, "unable to set the seg size\n"); + dev_info(&adev->dev, "set the seg boundary\n"); + ret = dma_set_seg_boundary(&adev->dev, 0xffffffff); + if (ret) + dev_err(&adev->dev, "unable to set the seg boundary\n"); dev_info(&adev->dev, "Loaded driver for PL330 DMAC-%x\n", adev->periphid); -- 1.9.1