From patchwork Mon Jun 12 15:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13276862 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 788F2C7EE2F for ; Mon, 12 Jun 2023 15:32:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13E028E000A; Mon, 12 Jun 2023 11:32:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EFE68E0002; Mon, 12 Jun 2023 11:32:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF8788E000A; Mon, 12 Jun 2023 11:32:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E1BB48E0002 for ; Mon, 12 Jun 2023 11:32:37 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A7B23C028F for ; Mon, 12 Jun 2023 15:32:37 +0000 (UTC) X-FDA: 80894487954.11.81B97B5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id ED071A0017 for ; Mon, 12 Jun 2023 15:32:35 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf15.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686583956; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bcILxfP7Z0mS5m2l+jEBqFRdY0jwbrbm2JIuHvtSng4=; b=Inv8aoEomArAnVXHYqzfU0euGrCVPflzV4ZNLlH/m/MqAQbeg1jnS3Q2vVhKFzyblDQzni Mxi9JHSHN9NYAszAYfOR5EY6thY23NBPyj1MdJ7ZXDvcpC3BLoEPrUATtRqt7MQsOW0e3e R42Msgx89yD2VP6fzMCAkGPyfbqhmYU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf15.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686583956; a=rsa-sha256; cv=none; b=Ny9TzSI0NW25dVvbfMUGRJ4RyqwtN2f+HssONWPKBRi9A5LROPsUOIqlB8fDTpO72NmzbC lch1WpT5CSryk6dm+Ia9Qrv1QI0TIKOVhmGYBOUsqAstO1ej8v5SYHDEjPSpNfNd+OvHVW JjuibARc47l2jKgFG3a2m4yEFb8o3oE= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D6B39618D8; Mon, 12 Jun 2023 15:32:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49096C433A4; Mon, 12 Jun 2023 15:32:30 +0000 (UTC) From: Catalin Marinas To: Andrew Morton , Linus Torvalds Cc: Christoph Hellwig , Robin Murphy , Arnd Bergmann , Greg Kroah-Hartman , Will Deacon , Marc Zyngier , Herbert Xu , Ard Biesheuvel , Isaac Manjarres , Saravana Kannan , Alasdair Kergon , Daniel Vetter , Joerg Roedel , Mark Brown , Mike Snitzer , "Rafael J. Wysocki" , Jonathan Cameron , Vlastimil Babka , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 06/17] drivers/gpu: Use ARCH_DMA_MINALIGN instead of ARCH_KMALLOC_MINALIGN Date: Mon, 12 Jun 2023 16:31:50 +0100 Message-Id: <20230612153201.554742-7-catalin.marinas@arm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612153201.554742-1-catalin.marinas@arm.com> References: <20230612153201.554742-1-catalin.marinas@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: ED071A0017 X-Stat-Signature: ma6957t9hd3wo17qq3kh6y6zmnfy5eom X-Rspam-User: X-HE-Tag: 1686583955-993408 X-HE-Meta: U2FsdGVkX1/jHhxhdI3RE0PuEhDE9DWQTuWe5MZDQCb4qBEMepFTplXyo2EPTnTrU/v6/d0QpUpHyi/VjrI8nkCVacL0PAYNxzzfCdEDqMq7dgNAENaQINAZzUvhQTP7s4M8p2AV3aJWD+WvY98q2PsVlac9v+WiOAM4KU+hmUWv06gdtp4Qiqm0b8WLom/Jh8DDB3gVOBeXxjpEG2m1ASKaIq5oqRDWpVK1bTSFXi1boqkjjRV/r6iPB+GSDg24XBZoqt68YpPv1X26Eg+196i5Xk/AENPOpfzxhjpRfwY5OOMBu71hvGO2EK1rIZHnWgWhM4LVObR+Ph6Is6yQipn6NhwgYQm8t2aXIrcDqwIMKvdOzBlp1KyVUEHJk2j3YrkuA1kxT1MROZe7fUKSUMpQ/0lv49BKdgGPxviSqKMKk7Xphye9JByU5ovfrNqeOR/yGRklfZ0xS+YBdWcnig3sr/Y26MwVFDZOcRmem+coCPMzctLw0xaDu8/8R5VJ8bkdWwCcyK5IllHRcjTURqSSuLnDbPGz88tYKVUvCj2AqSgMyR1bKvrZWF/J+f+k+nsaoOFLPnH21Mdu7RorKuAJ4mrO9YICUIdvrgwtUccNol9ZiL6ZAsYKo7pBkr90L8qlwfKd3wjCrlPH+iCiqyQlnXC/SBAhJoBbDJi1sLMg6p/x21AFfTA5N4IyuUqwtWU5M1VX9oQ0FKIj3XB9fh7QBdGhcEtBK9WIlK7ov2Tmt6PnzO09xY97Aoc/cyszbwmbv3wg3PYmPQFKed9/wLgj6xAl3XWNvumkjoPA+zXr+GgSyTn5Y80IntK25Ke5VDgQwRe6KTqUdeQxjBAm909TBKr5rlpfZ3EI3rOg37/T2X149TQafIIZ6eIpM8K9A6EWxooJqieC4g03zpx4jGol2pVi54U2x1mdli+0256bi48oOJT+duSAGT8fkuWVXZCz7ffJgz81Fzukq+o kcNNsTOM hdkjQB/hYfOnd2YNGC3bHrgEeUEaejZDyV14lCCZ0KsTcNXvZYwR3nmBIuBTM7Yyk7eoMpcS87YrupwAmM+lp1if2uy0K/aqWCTHQQE992xraRtAFlYLVkn6HxcURS6mC7DwdeCUd0Ymb9iDXz98ftZvc+HmTJTP7FTMdbTygb2i+TVng36G5t5rhaugCWAPVJ7bSMimNaRiojpTkmJSLMNRsFep/jkpaoYywQcOy0BsMjd18OFVAEeTETTlXv6iXsxW2XUQBTDrlzzlkwBdLqcA/wmVlChpUwzgqDav/awEIMy6R7BrTk7d59sabZd9GeSwhh1F5iXNYDThlA36693rBFvvDs1DwRd6pMifkmdnJTZhYaskAYL5ktH2stVIXgZYlNERIrmsoUaL03BiJcl6osjgNogsOWML80QJyw1HougfSDxePLsEn1TavxtKC6VMQHP+IsMwzz2+lzUPJjAM6UlSUEc1HoxjPuB49cblqw68JXlFoYC6jLoEje2FYQ08yd0b/HiObB2g4GaGyZuQaXA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: ARCH_DMA_MINALIGN represents the minimum (static) alignment for safe DMA operations while ARCH_KMALLOC_MINALIGN is the minimum kmalloc() objects alignment. Signed-off-by: Catalin Marinas Cc: Daniel Vetter Tested-by: Isaac J. Manjarres --- drivers/gpu/drm/drm_managed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c index 4cf214de50c4..3a5802f60e65 100644 --- a/drivers/gpu/drm/drm_managed.c +++ b/drivers/gpu/drm/drm_managed.c @@ -49,10 +49,10 @@ struct drmres { * Some archs want to perform DMA into kmalloc caches * and need a guaranteed alignment larger than * the alignment of a 64-bit integer. - * Thus we use ARCH_KMALLOC_MINALIGN here and get exactly the same - * buffer alignment as if it was allocated by plain kmalloc(). + * Thus we use ARCH_DMA_MINALIGN for data[] which will force the same + * alignment for struct drmres when allocated by kmalloc(). */ - u8 __aligned(ARCH_KMALLOC_MINALIGN) data[]; + u8 __aligned(ARCH_DMA_MINALIGN) data[]; }; static void free_dr(struct drmres *dr)