From patchwork Wed May 31 15:48:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13262458 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 0D54EC77B73 for ; Wed, 31 May 2023 15:49:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E6CA8E0001; Wed, 31 May 2023 11:49:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 996AE6B0074; Wed, 31 May 2023 11:49:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 885DD8E0001; Wed, 31 May 2023 11:49:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 799C16B0072 for ; Wed, 31 May 2023 11:49:05 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1432F1C6EAC for ; Wed, 31 May 2023 15:49:05 +0000 (UTC) X-FDA: 80850983850.08.41AE376 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id 693B4180024 for ; Wed, 31 May 2023 15:49:03 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf24.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=1685548143; 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=X9GvMJYtQNhC/CV+bvo1nqxSzdMjEtDAvkUK7+TAINo=; b=pl2C9eADssJ7bYv3NuxNlCcTGg2utvSS0mxWMbys82X3P5F98Hm19gHeawxfMXtgFGakwg x21txakJP8O3EMk3nqVt8ShplwbUdSYSxn8KtiQAdjCyUP0wdN/WeSW2hbfsC3+jXjIXu9 nu9DgZjf6taNjx/zfLVvLj44H7MgLBQ= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf24.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=1685548143; a=rsa-sha256; cv=none; b=XdePTn1ks7GthhQLQI2J9ktFPboPimeWEbs24296uaKirD4NoW7l2nNkNTvU92zrRQVA4x PB5XmHRuB/B11Vq8dLZGM/sH102ik67ADWonpJdQ2Sc12OdIvEfgPyH90iCO10PCXaBrM7 QVhz7WYCpxqxHnvAWWyrPFqs1+K41+s= 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 9BBC860F0D; Wed, 31 May 2023 15:49:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C08ABC433EF; Wed, 31 May 2023 15:48:58 +0000 (UTC) From: Catalin Marinas To: Linus Torvalds , Christoph Hellwig , Robin Murphy Cc: Arnd Bergmann , Greg Kroah-Hartman , Will Deacon , Marc Zyngier , Andrew Morton , Herbert Xu , Ard Biesheuvel , Isaac Manjarres , Saravana Kannan , Alasdair Kergon , Daniel Vetter , Joerg Roedel , Mark Brown , Mike Snitzer , "Rafael J. Wysocki" , Jonathan Cameron , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 05/17] drivers/base: Use ARCH_DMA_MINALIGN instead of ARCH_KMALLOC_MINALIGN Date: Wed, 31 May 2023 16:48:24 +0100 Message-Id: <20230531154836.1366225-6-catalin.marinas@arm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531154836.1366225-1-catalin.marinas@arm.com> References: <20230531154836.1366225-1-catalin.marinas@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 693B4180024 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: hz7h7qbk4i69xmcfn96myi9qgoa39s9u X-HE-Tag: 1685548143-437405 X-HE-Meta: U2FsdGVkX1+pFcKJwGethd9OffS+LcrfEIjzDxWbGY1L66/4EO4KJA9nHWeVDTbAjsKtFQakLiPHJN9+/2si7838ZqZ4rZqF7bdAgX+4cjkzYF4d6o0GynBm3jpRgHLaJXoDNXMLk3eJswA0HjZTkPNQZZJplAEh/OJbcYm3qyxT8GCb8NBHj9YDf5IupG/wxAXo/UAbyApxQnOx5BxBVN6yda+5eCdS5usxfXaE6DPUbTEYj92Ddo3G98UyfwbKjfjCdMeYxke4sgKRZtWmE4H3ARlOK/ywn0tgd5ldMJnt3ZBknPr6s+LF890tyxJcnjriRphK78g7ptsMIWIb+FqmSYXHjJ1nn/aQywnprUp8eRZ8qF848gkO4PylA4imVC8MXcfSAbY95VjZTg5uGTU1z+xvMXmk5ywt2C3NDdSn6ytjI/2jrO4Jmcn8/VKTJB2IO+rKvRrveY57FwoUerkw4lHimRGhLFHuR6HJ2fP4qqUPABSjEHCPUeeRvQTtC1FAfpl6skfLPzMDAFUCmbJUy2hoqj6KxRxf+hQFwGsRDVVpUWU1NXVUu5CMTTb0+B9j+YndUAoI4VUiUOjcp/WxzNCDZVbr9bgWvS5eJ5+YznzDwc/Y81KpQNR2Sqve4zV0c8b+B+k1mlbOOqDpNhpzuhE7Tju62cn/lr5vi1wE/DzQ26fkezJSFhhKxGVC2W/tJqj1rnjtPp4cgXSXpVdA5LpoPdsw1EzNvS9r29x7H+FlDKwtAWT+/BQZLKRlCsM/BM34SUTm3dGKt1EbGFTYnnA8OCKfT0SdOYOla1oSo8rKpAZES6bdfMTWyO5wXNxkJteh5Pm46OyTNIPUr6sRrUwNk6XGpV15zf1Njgys8ptguhPYuCad0zRokz7E4TPekg2eGJU5JcMomwg4o2ntc/cgO91J6fEyWSQ2h+WPyis2p+gSHd6Fck10OKY27zNmWSPe5c8Srj4EjOw MsmuZpWB 4Dmg50Kgw9AlTr3pvuPuzLFtHPYaF0yaAHkiJ2/nrZucayTA0AucA4qKvvGu6WDh6UadZHTjQA6LPw43dcRM9GrXQMfIZYLrT33noJ7FNw4OFd3CN+/ReZflJvo+qyAjJyepnBgm/ByUwvJCzRA30ZqAOV6e9HZem9MWvahi+NPJSyD6Y06JDoTcM4CFnyaO65UWWZJ4dLqVtJ6gTjQnazO5P1hZQ9QTscX5jCyTtw45XzY1jxjjlqGaod9wS8GKObre/imQl0LtfpzbKExD2bZmmk75nYss6puL6TLz9dmEgdMqejdjeszEO/Rj1hpaoo4rR5yNrblu31sJ/clU7mMHRwl2fO756o7WXTbua1o3PzqWoiu4DCeXSI2N3oIWQquzdL8a+Hcmymp6vaQH24GBOnAUzQe52j/6UA8MH3k7XWwsbbfwvuwK24XCgblrJ2QZ+C2wvfWLwllbFlNi45plDJpQkImLnG2f6qrLfwrjxzpcWLRFsqBeJFUK+A9ivmLPpOWGXqGKxqezcNdIUqIjXcQSnJagCTvf9GX+c9CBzYbcTNfm/RIKZnfM2ZBtyFf6Ttl+s6U4JQlDY58+gkLeGjm7KFgKc5PSrdC/Lp+6fYXS11fTFusaDEQ== 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 Acked-by: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" --- drivers/base/devres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 5c998cfac335..3df0025d12aa 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -29,10 +29,10 @@ struct devres { * 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 devres when allocated by kmalloc(). */ - u8 __aligned(ARCH_KMALLOC_MINALIGN) data[]; + u8 __aligned(ARCH_DMA_MINALIGN) data[]; }; struct devres_group {