From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753940AbdBARj6 (ORCPT ); Wed, 1 Feb 2017 12:39:58 -0500 Received: from mail-bl2nam02on0086.outbound.protection.outlook.com ([104.47.38.86]:42928 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753914AbdBARjl (ORCPT ); Wed, 1 Feb 2017 12:39:41 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Robert.Richter@cavium.com; From: Robert Richter To: Marc Zyngier CC: Thomas Gleixner , Jason Cooper , , Robert Richter , Subject: [PATCH 9/9] irqchip, gicv3-its, cma: Use CMA for allocation of large device tables Date: Wed, 1 Feb 2017 18:38:33 +0100 Message-ID: <20170201173833.12630-10-rrichter@cavium.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170201173833.12630-1-rrichter@cavium.com> References: <20170201173833.12630-1-rrichter@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [92.229.95.220] X-ClientProxiedBy: DB6PR1001CA0017.EURPRD10.PROD.OUTLOOK.COM (10.171.79.27) To BY2PR07MB2343.namprd07.prod.outlook.com (10.166.114.145) X-MS-Office365-Filtering-Correlation-Id: d5b27dc0-117b-4aed-bb65-08d44ac944a8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BY2PR07MB2343; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB2343;3:d8tdv0ceG3R0xqDO9n6TATRr8X8Xz/aZ6c57Ovb+cDy7+p8C+3iET0R9oNcdy7vpfAVgqN2gacgm8xLpLCoRRhNknJEsZXgIPMPbFC6JZ1a+4BoMlOkZd1z7f8Hgdj5PRuXC8v/bt3E6LeTOaYivGSgSfT6REocvigoWiWpCJjW0oAMRDE8YuoN0Hf2xYXrydFmut5mzJWxt+LixoSjLIYLBnSYJnDHoxXvyi8aF/zzglZcwbCzmqjJs9teeY3DP9xNzWi/NpBPqxgBdURgHiQ==;25:fK4yhnrj1yYeIxN8ff2NASIuILT4e+J8WIFt34Xbh1uhwIyYF9SogJDV7d35CP8rEvTOk6oCN87FBE7ggCdRqin2d698M7KfGdRGwER872lTKtasFupRI0cMxqT2qlbHgDKNCXk10BPCEOuDxFqeNbkm/wjLUo5eZPwErUI0k4fRXDGplD+/oazQ0M6AljZ5yEdOrm1jMHMesvV50Qma+h5Kg9e9Ul/jM7G3zYnMaKPxOaIur18ekBq71Kq5OH8cgO+ZiuPm4ltQNofhz5bpc3gFb3qGzPfJApxTYe8BMj/vxzcpQ+GBu7nA08lthzgcfX+2Np85foiDDPU57YKI9QQVahcr9TrhK2aW7POduQoBoOVt2D2TH1KlK62em13dXkk3aU1F+7L87vd4Xw7UMA==;31:v9FQQYFmkHYRN0Da3gQCnfAob1kAHh+bVgk/a9XNpGyXYxt+K3AfeEPaJY8P2sX2rQDVmULYT86oEmj51BAdiysMIWyN6zbjD8hkILsJx1CD4Cm7ML48IywsqRHbh9YuodyE1cDMbRsNn/IpS1kDccjKSmmg61pYlOgNol/cY7hxnxh1Z5SWdf+RkWRCr402vAMrYVlvc0VznDw1VR42Snr/fGfD07MtNtPYgTUn+Jc= X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB2343;20:SU09ES+o3Zl8eFd92KIbWZ9e0xpbI2YVWfmhbHqPnQQSv4844hOTgX30rBfOMYWnkQ8zARejFeDS1fq6YP9ctnn8Spvi4RTP79hbG6FHubFy6gpl9R2T3WOBaho7x4usdF153DttJ3yleIAIIoX9lZCAH0ZyFF68SjjlSVW/NYJI3ia/XB566N99GCclIkHyV6kWShzNAyhY4/Ku6/3+aCniVrKZy2uVzENflUVx7tZCIzdY87m9nsNt3tILPo2YxVF+D+wGTs0oq6yS3OTzQaM6+QX7JFQjQW0ATkuck0m0SGIJOFqaiDh/9xf2v9R+rIQxevoZCUhk/VUTaJPvIvar9HV6Twl6NW0ZSJY5oHnTAPxczGeatOUVL9jRm2o0CjWyLuYCrmhAuH/JX1ZRmwbtgM4JiAY01e0pDyQP45PAUOsvhzfa0vTOoRGqfvwGTLorusO1yQif4ufc5rkxS3wMRcJBQmRI9o/raBVTVw7mVf+SKZVlGnFbeZPtysQI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123560025)(20161123555025)(20161123564025)(20161123558025)(20161123562025)(6072148);SRVR:BY2PR07MB2343;BCL:0;PCL:0;RULEID:;SRVR:BY2PR07MB2343; X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB2343;4:+d2N5IDHkOqbz0LSRfCbHlGc74Ylxy7wEW12LtCH4PKSc2O5r6EAY4q49B+TbxHOwJ+FJ2NeYvh94BRTiVRVuITLvS3Djp785PxCmnC+g7DO9nRd3wHWJ94KKJhxnSra3l7/y0UpKW5MaqBwSJUScPNDV7mC8nM8Y+T4RXSeXOcMyFZi5eLQleHEfQblspw+mokP4ll7hJzyUv3attGg2eLCV8TBU3udK7IpOUn83C57LBH5GixGgN/Ix8XFQ2OJGRngtf6W9FF2zcDVJXkRzRSmusPV0CHUeG83LoBfAOYkrfx/ggMxqlpO8bHnyhdTkQqSAY2i0yvlNdkvDsctCuYNNDP+9UbrIGDzexBqlcimOJ0J1MrJZA8NJQOSbz/taqYdpMvr/ML8smGyUi6yYO3Xw8ArnN5ixFQlpZxR75eJiLRZqbbLzbHM9VPkmRe55FD5KM4bj2aEjO61DiUoUIdSI9Vbi97d/6A6xJbuzqs4WQdXxL8lwnh+5j3/ZVSVmn6wCdxDTcgxFwxBzBRMf26HSAjRa297m+5HSNyQOyaEnygfaXSoVSwcMCqx+MgpG45RU9zqYqu7/8F5vbE2j3av5Y6Kh3lnMuBTQJxlDCA= X-Forefront-PRVS: 0205EDCD76 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(81156014)(81166006)(189998001)(5660300001)(110136003)(97736004)(6916009)(2950100002)(50226002)(6666003)(106356001)(105586002)(101416001)(42186005)(66066001)(8676002)(33646002)(47776003)(305945005)(7736002)(38730400001)(6506006)(6486002)(76176999)(68736007)(6512007)(53936002)(54906002)(5003940100001)(25786008)(1076002)(3846002)(6116002)(2906002)(4326007)(48376002)(50466002)(92566002)(50986999)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR07MB2343;H:rric.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR07MB2343;23:ibAEL7oA3Uvsslpy0IdTQAdE19Jww3l6aNEGlcqn8?= =?us-ascii?Q?Xv4o+TJPkUBMWzbsLrW2TU27axE07SEiYX27ypu+5aJ1ejmGps5PrGYVJLwV?= =?us-ascii?Q?tXtmCo10zalJIygPFi+nvkmzWM/xBVm/tJY1Bpp0lyASTBBlZ+vDIn0Z0fxA?= =?us-ascii?Q?2dH2or6EbttWDtsrrgsrO7Ks3nH2ZYrMGyKyZi4hTTt5EU9IMpbHdew0ArHZ?= =?us-ascii?Q?H/DrxqsBkSCS18VNdkVch9mjV6OouNEcbPExAEq1DSI16yhgN+Re8ECex4e2?= =?us-ascii?Q?5odOMUD8KnOM2lhhl+5pV1pmjwCzqTyOvSGoAW/tMsqJfBEepagk18OCIdp1?= =?us-ascii?Q?MwKTWK5RoJlA40pCb3sg6NQlJVLhCytpes2wrnqs8ydoVbRUV5N0qKE896R6?= =?us-ascii?Q?tGyusfUT3766uZfkLsyFOtMvy1K+zixLRoDrs0Z1PRGCLPvbP/0y85UFRneu?= =?us-ascii?Q?Wid4WzS1OSThBBXZglhKvtAYAcYEh6mRAcEQusvLKM7J+H3oB5ZHJT323G1O?= =?us-ascii?Q?fcRe4bWMcnuc5PpP4IoCC+DMVZ1zk2Tla46BpjXPdhu35IW+VddqE6uKUg1w?= =?us-ascii?Q?LwMFIgHdHZ/nmYAECUTtUkSwNvAYivg/fb01BdfAx2Grn5Oai4b7W6ZB4GSC?= =?us-ascii?Q?qE6IIgM6mmIiM+CKGs5ltJU4fAG3ipe1Dj4oCkqTCMOBmfgFdLvB41dJ7vnb?= =?us-ascii?Q?igCfAlOdYJjUlf1FriXlgi7UnVEnYYFoJAHV1+ECq7tE3gTZmcFox/vzzVfI?= =?us-ascii?Q?6SMvC3J00RzpxZUYQhgYVus4c5l6CTdya2duvoy5Lyzw4IqEeVxW8/cumjcU?= =?us-ascii?Q?SI5xakEweeUFEFF7siw8f5Gx8v4XgRynfFw4r/DPmGA19/vfB1Q6xjVPluot?= =?us-ascii?Q?kxibzv94wkDes2FNrod2x/C5bCHMsfqBB8Rf7PL8cnyrys5oP9kMFMrBLmX+?= =?us-ascii?Q?+24j+HQCyQ2Xi7Bj5Q+jrIlhl6/aH6zI6Qw4BoTB4ogVv58i5aMFMuQ8xZav?= =?us-ascii?Q?Bm63txdPZ3x4ib8A3026PlLqTYjiXh7vuFInD9g1jLXK+syB0rd+z+WHU9Nw?= =?us-ascii?Q?XIXWS2SLsd9IMdwMvsEW15mHpksSuT9V8oGheiGBfNNr87oRk/n5XDApRxyg?= =?us-ascii?Q?OVcFXmgkG8=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB2343;6:ZfPBV9fP+fJJEyyKXIUutsKXazgO2604d3hCVF5mxnICYQQgNkIkCdH3KTZAYOo+o3zdv6BYThoQyITUb8VjKBd6bbicMNKqvedVbwYE57GfyJw1Z7GGTwNE6PPGfSLow6YYkTaFUcaJVeeYTDNlcsjwXywBD/TtjhyjWBqay+t6StM2W+LDY9f9YfXJ9lYWGQZHstmR77qidcBmab7BkbLKakj+1SJbzHfgPKw+i8T56dPYRnz4F36WwkRNwv05S0hGnVaC7YyOjZtrvGMsOEWfdmN8KHdt+60eQDeGdjZGYSawrd86rdU97PvgP6TCb+c9CkJmhqgHo9ZBXKXYL0fulklWjZvTWEALoYuEWOv1ZSdmZc/0vJFQ9NXSMBt4YUNNTvBa9TViIQC/L6D/Aw==;5:I/pB6UV+csa0vnQAMmisSdiePwtq82vrzxEkT/pxtpd+6HMTKhTx8zWeDtxec71phhtVw50IdGj+9ErBslW6gPqFFh/g2yGqQbPUCfcDsGfdtTt/TuWxA6uICAySRobqoxr3h/hZYmda2A5QkTjT5A==;24:dS/TNq0KxwDiMNJzEJ0if7ErDrCGY11LSDqT9c7mNwFKA+cJns+QyfDolaCH753ie0eLiNU7swVFIcbUAYX6a4jecihjO9g93qTEJ9GIZmk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BY2PR07MB2343;7:n8n9BO8ETssJv2Hbgn5PIWFoCMw+kKVBskMad4MV7qVNSKSAFYwN/mfrxK/6kcqoEGiEUe+L61tGufp55ClMnXETfxZPX3qxo+btQf/VpPwa7/LQuo2dKEsfyKKM3njARn/RKOjD1d8ttaDqbkIp5AXJbOqk3mslNVczreMuPKVRJRHnYhzrNBcAdydAKJsovBMKsRnhlFrZuc/w/23O9ZqwNUcruZwPpJU6DjP3RG0N4kV9cCPaR8t0QCoEzHCTfQY591gwXoe8t62PacFiwO7w6IgkL6Eati2OlV+8etREPqo98hHYUSXhBkD1y34Uj1OhHonu4fxf1lzSoITKMjbd5cJTlUoGDF6DtadbOnFeZc1fyJbR/utJbgmu1lLBM5vL3J3HrtiYZ36O5DKGtlryoyNgwpQVQ5nqe80aeX6QVmkJX6L+0Bi7KA7k7Ke0oRMtz/Y3M+Ml3kcAEx4+QIC1uKhYMfctGZd+BX92PxXGVMvMFJnyHcPWa3/BtufojhNiVcaMJXAaIexGJBc5JA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2017 17:39:25.1350 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB2343 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The gicv3-its device table may have a size of up to 16MB. With 4k pagesize the maximum size of memory allocation is 4MB. Use CMA for allocation of large tables. We use the device managed version of dma_alloc_coherent(). Thus, we don't need to release it manually on device removal. Signed-off-by: Robert Richter --- drivers/irqchip/irq-gic-v3-its.c | 69 +++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 86b8b9f79f68..e44547c7a2d2 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -860,6 +861,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, u64 type = GITS_BASER_TYPE(val); u32 alloc_pages; void *base; + dma_addr_t dma_handle; u64 tmp; retry_alloc_baser: @@ -872,13 +874,26 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, order = get_order(GITS_BASER_PAGES_MAX * psz); } - base = (void *)devm_get_free_pages(&its->dev, GFP_KERNEL | __GFP_ZERO, - order); - if (!base) + base = dmam_alloc_coherent(&its->dev, + PAGE_ORDER_TO_SIZE(order), + &dma_handle, + GFP_KERNEL | __GFP_ZERO); + + if (!base && order >= MAX_ORDER) { + order = MAX_ORDER - 1; + dev_warn(&its->dev, "Device Table too large, reduce ids %u->%u, no CMA memory available\n", + its->device_ids, + ilog2(PAGE_ORDER_TO_SIZE(order) / (int)esz)); + goto retry_alloc_baser; + } + + if (!base) { + dev_err(&its->dev, "Failed to allocate device table\n"); return -ENOMEM; + } retry_baser: - val = (virt_to_phys(base) | + val = (dma_handle | (type << GITS_BASER_TYPE_SHIFT) | ((esz - 1) << GITS_BASER_ENTRY_SIZE_SHIFT) | ((alloc_pages - 1) << GITS_BASER_PAGES_SHIFT) | @@ -919,29 +934,28 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser, goto retry_baser; } - if ((val ^ tmp) & GITS_BASER_PAGE_SIZE_MASK) { - /* - * Page size didn't stick. Let's try a smaller - * size and retry. If we reach 4K, then - * something is horribly wrong... - */ - devm_free_pages(&its->dev, (unsigned long)base); - baser->base = NULL; - - switch (psz) { - case SZ_16K: - psz = SZ_4K; - goto retry_alloc_baser; - case SZ_64K: - psz = SZ_16K; - goto retry_alloc_baser; + if (val != tmp) { + dmam_free_coherent(&its->dev, PAGE_ORDER_TO_SIZE(order), + base, dma_handle); + + if (GITS_BASER_PAGE_SIZE_MASK) { + /* + * Page size didn't stick. Let's try a smaller + * size and retry. If we reach 4K, then + * something is horribly wrong... + */ + switch (psz) { + case SZ_16K: + psz = SZ_4K; + goto retry_alloc_baser; + case SZ_64K: + psz = SZ_16K; + goto retry_alloc_baser; + } } - } - if (val != tmp) { dev_err(&its->dev, "%s doesn't stick: %llx %llx\n", its_base_type_string[type], val, tmp); - devm_free_pages(&its->dev, (unsigned long)base); return -ENXIO; } @@ -999,12 +1013,6 @@ static bool its_parse_baser_device(struct its_node *its, struct its_baser *baser * feature is not supported by hardware. */ new_order = max_t(u32, get_order(esz << ids), new_order); - if (new_order >= MAX_ORDER) { - new_order = MAX_ORDER - 1; - ids = ilog2(PAGE_ORDER_TO_SIZE(new_order) / (int)esz); - dev_warn(&its->dev, "Device Table too large, reduce ids %u->%u\n", - its->device_ids, ids); - } *order = new_order; @@ -1691,6 +1699,9 @@ static int __init its_init_one(struct its_node *its) return err; } + /* Setup dma_ops for dmam_alloc_coherent() */ + arch_setup_dma_ops(&its->dev, 0, 0, NULL, true); + its_base = devm_ioremap(&its->dev, its->phys_base, its->phys_size); if (!its_base) { dev_warn(&its->dev, "Unable to map ITS registers\n"); -- 2.11.0