From patchwork Mon Jun 12 15:31:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13276856 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 01302C7EE2F for ; Mon, 12 Jun 2023 15:32:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8698E8E0003; Mon, 12 Jun 2023 11:32:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81A448E0002; Mon, 12 Jun 2023 11:32:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 709B48E0003; Mon, 12 Jun 2023 11:32:20 -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 5F6358E0002 for ; Mon, 12 Jun 2023 11:32:20 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3C00D1602A8 for ; Mon, 12 Jun 2023 15:32:20 +0000 (UTC) X-FDA: 80894487240.26.5BACBA4 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 6204F1C000C for ; Mon, 12 Jun 2023 15:32:17 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686583938; 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=7leEv/np438Rje1x+yfLLaxCOj/l02Ozp19Q4FMwCtg=; b=nOrFHsiNhz7OzYRC12IMEsIpwEbNOwcJaLdnFlxw6MLxqTvVIY+FkLDsT/dfk2xPV0jIZM SoAHIaDO7YWqNxbt5kaRBtUQRxxc0l7sKEEUTmy9jykg/t/gd/27R11d+UCayGDM1lWjvx +XdckaNpJGSGjWydflqM2ZIU3pMIpTE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686583938; a=rsa-sha256; cv=none; b=Og5kvKw7PYhrupoQt8TdWhUM7cNVYSCwAmY+gJwuwgRBPHlVa8RbTe/w4j6TG128w9XrWF BC/FvJREfDc5woOzVPqEuCwUre5soyr7AqrcEwisE5wawneE3YcaJg+jHmDPqDLLMj2bcJ 8xDhS2g6r7P7k0SOSfzJeVKj0a3eKqk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) 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 52A1462ADD; Mon, 12 Jun 2023 15:32:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA261C4339C; Mon, 12 Jun 2023 15:32:12 +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 02/17] dma: Allow dma_get_cache_alignment() to be overridden by the arch code Date: Mon, 12 Jun 2023 16:31:46 +0100 Message-Id: <20230612153201.554742-3-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-Stat-Signature: h9imt9k3nwei6k7rjmwohtdxfe37fnsp X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 6204F1C000C X-Rspam-User: X-HE-Tag: 1686583937-579134 X-HE-Meta: U2FsdGVkX19C4Q+wDC4Pgz/ZCCR45MQ3CyX3Z41ljvOyegEBOhtL4aV8te7hZbBzmc94Bw4BIGtpJ7I4ib0AnGgbOARs5QyA+0DR6oPFfoegQl+HqouR5poDF4881YL6r9sAaLvNxM90ST8GkgwJZiI4wXwqLwK7AP+7nG+denWAh1G7gJ9BBF8jT7LHjqjfssDM+X/6QiNkkKZSGUQ5rEZCOqlO1zMe+1egTnNSWL3OcOeYI1SrQOphJzNOyf/8TA4/OPqL85kTvLGRwLHFT74gCM35qPHu/gEH1xFKZMGFZs06TtRglFTYpOu9TAFQVI8TSySn/E9BmVZWCwNQhjhWgwSza2lAaXPdULYGV/cWnz3JWCeA3ZxK0GGd89RvP7C3ns4L5cgDrpC2uqhapS+MiJcf1hjK7YIx1Rqq+RjjOXrKyuDO3z+ME5GxtUTbMgc0lxFZQ/zkhRitR0sWJ1Wa5XOKpiERKgbP9NS261kQp6vk7LqFZ98N98WigE7kVEEnGLR49o2Ag5V32GtncfhplZTKVJIgtWdEz6P9pCSVkYNWlQ5kC9u3n71WSocZ5GaPWzKePcrb3CkNbVYiLYr4pCntrc+tlSjshZE+1I08NVVxfKykjpI/V8IJkLxJMYXOOp91jC00V3HtV6QOkGuhaRDMqayIcGkrJL10lDVJM+S0u/dFbtHf9KiL81Vtea+oC8tLhUt6eTz2v8i3+I+nAZhOoUV6eVXfusha0nXSy2WAoMlaiES7O7kK7bXumUIgKR/KjqdTdAsdWJrZXWj5rml3fprYQdxgUdkluhKEUs7KsaW7YpoREeT2gW+W0dIMz6Sw3+w1OgGPWOSnisMr/uLIyZwSqr9B/j5iOTMVOhjENjGb9VdF+3Ej62BDiJ15qBlTJzebaQygXpubtvjTlaSe/zIFag2fhTSmxxGi8AMQmC5fKUTI7l2/EmqEfLi9m9Iy/7uRkFNcEKQ kEbJoyvv mpQt+uo1fK1kD96wO8a7NsCXwoHXCKda5/hx6hNYzhOdrI1Y5O7woKI85fcp3HEpiFV3e54fdv014S1Fb/IIFGBEXd6UbNfKaM2ywU68i/+rbltLsHUu+ju1B7J4Pv4s6ENKjAf8B0kyrwLdXXKVUON9+Qfz0eEV9U27+Mi0+d8bUjvqT2KL7QwVxJl0Bs20niO9RPDQSYZ3UcolpHfGOS7LL6jJhka2HNpCrihwODaNaHeiey65KLkJsh8EL8XrDseNxPabm8uC+dxPfhtbYOLWcMljUbP2lU3U9+aaAwP4HhL0ZlXOXruKMApx9vJ78pqBVM8MSJcgFW/dfONbo/tcNj+Hv+3WAhwE7zmnYSHEEWlTtFKRd227tGXvIKVYL5TlLbStABEI2bGDXRLPPCj9r9W/iCd1sGLckiMvY+16LAEvAHMW3XVvFrUM/IXGT/eZ2PzLr2z3QvQu+EYXqe+uetcIBnzHX/i+2hlrBxsNkQg2vHeTi59KlfxrJ+4fWMvCp1B1my0FdN8ftoJiKUtCMKEcUHWH2+miboEzDbeInjGp+3P1DnIqdvg47mgnD5b4dYxo8dnikgj8ngFqJA/EKBg== 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: On arm64, ARCH_DMA_MINALIGN is larger than most cache line size configurations deployed. Allow an architecture to override dma_get_cache_alignment() in order to return a run-time probed value (e.g. cache_line_size()). Signed-off-by: Catalin Marinas Reviewed-by: Christoph Hellwig Cc: Robin Murphy Cc: Will Deacon Tested-by: Isaac J. Manjarres --- include/linux/dma-mapping.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index a50375331eac..e13050eb9777 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -544,6 +544,7 @@ static inline int dma_set_min_align_mask(struct device *dev, return 0; } +#ifndef dma_get_cache_alignment static inline int dma_get_cache_alignment(void) { #ifdef ARCH_HAS_DMA_MINALIGN @@ -551,6 +552,7 @@ static inline int dma_get_cache_alignment(void) #endif return 1; } +#endif static inline void *dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp)