From patchwork Wed May 24 17:18:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13254341 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 B8541C7EE2D for ; Wed, 24 May 2023 17:19:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15603900005; Wed, 24 May 2023 13:19:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 108E4900002; Wed, 24 May 2023 13:19:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1123900005; Wed, 24 May 2023 13:19:21 -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 D9005900002 for ; Wed, 24 May 2023 13:19:21 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6F576AE4DC for ; Wed, 24 May 2023 17:19:21 +0000 (UTC) X-FDA: 80825809722.13.BF4B5AA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id C0AB140015 for ; Wed, 24 May 2023 17:19:19 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf04.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=1684948759; a=rsa-sha256; cv=none; b=pI4bMmcbFb6N8UrWcTDforq3TOnm/sOuDfxxpEwCkUtq8ma6IheIKconqTy8b8KJ7AlyWE rFH7koRs51A88t+nqiJg8esVdhL888pZvVipcOHq0EdpKs5KbBxZ6asrF6uHTz7EomZRz6 rKJKtcXdPIQgcR5ZuGPSO9GfXDTu1/8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf04.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=1684948759; 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=P1eswU29vM0nF+2OrASKsW9QuG/ezSkB9CLotuLXI1Q=; b=lslq3d3maMi1B1k1o3gHV7K/Zp0yDMV7/hCSsuKvEzgfXKafbEd1Zv0fAZrM+cv3Ztod6K fdvhJqOt1AVAUs5Lzc5Rg4ilV/IQfQQhOwWlwmuPZpabZCdZneP7/OTUH0XYeZuYFkDfPv 1gxEArpqiOYDfqzK+5uYokqnxgRbc1s= 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 D6553638D6; Wed, 24 May 2023 17:19:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 932BDC433EF; Wed, 24 May 2023 17:19:14 +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" , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 02/15] dma: Allow dma_get_cache_alignment() to be overridden by the arch code Date: Wed, 24 May 2023 18:18:51 +0100 Message-Id: <20230524171904.3967031-3-catalin.marinas@arm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230524171904.3967031-1-catalin.marinas@arm.com> References: <20230524171904.3967031-1-catalin.marinas@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: C0AB140015 X-Stat-Signature: 1hp5fgricktjrmobt4a3z5d3bj18ks4e X-Rspam-User: X-HE-Tag: 1684948759-692635 X-HE-Meta: U2FsdGVkX18SQlUwPUc+zJJTuvrhY2nJhEwK610FnyMtxJ6FbRDElYhwpfEFK8GCEEXh1/SKj/ifiP7nKNeZOkV9tlXrCdR/IuOyVKpd+txlcM0FLHgoD7//aThBDgarK927IycBLS9u3M7D78Mj8XnuT3kF3XSLHeVBiM+M7pK1+mHxUfDcs3vhQdjvqXEwF9dYnvJFcHgk0GRaKeumvh6fNNXli6zX9LR3LKnTEuY7eNLRykjbrTIiEh7PAnEGtg/7S1kD22t/JusTnTPzRP0m+o7oXedQb5g4dG53EBib/kOqWiw32wwpcLKWmnz5PtgRaiTacAYF7yWI3LFyd62eUM+rO+woOoEmbxV+PwUgMY83VBmKRNOJ6CWu9snqoTUMn3Omk8A50a24EFPbO3hUyVV8Bnw3l7KocSYgUCazyaGtBZeGA5yNUOQIm2e4/JzLjF768i1YHMrIv0gi/FHSqok1XUbKCCL/BjlEX/As0oKGwrV5eZK8S8hg20lj2lqGVvQPn8mtbW0PZa+6lJ7zsztXHqse4mbibiafTfoGV/8fq2wSw8QhfnjC8LVBL1YeND69tthLLwUFgG4p35+iQxJ+ssr8G5++ng8jJbmAK2BKd29m3/7JuLpdfkVHSYhc+ibGdOFeMKRV9Kc2oozFpyvz7mJ3CkrksNJPgu5kvWLC9e9Uybb/30PobteLiJ4PKE0Cz6NP5pVNt6NCMB9eY3Rs8b2NmfV9pbjasnDbUSOWOsuXErIs07Js85DodEsmzXayfH0u/tzwR2P7CSUa+vkamwKNqwMbyPd8YM2uhx1ivjI7EHShpmY+SNotHZ+Y6u9aND36Y33ajmFkCuD4T4xqq4EgYZBgAZqOdJRJ2JYn1S93VoyPusHcpiX8IZC0ce2zBleDz1eUl6N5FE1WMVU4sFKXjNReLuLoHbILQ1QGmvMxoycR4J7wtSstGr4JxHz+tsM837LtnK3 kjlzrQig KuS9sISsr+Hljc+KyBk6YA5kZ97i4MuozpT94Lwl9kM653gWj71N+WkfPv+JIHr7A3lr6PlYijXwGk/ifuFVKrvE0Dz+m8wwKSJep5CUpzQJ8pbl2iXBDRQt35/Hl9kWARrTvjTzyPUlDkBIhRYJdQJzYGdNz/P5et29h8lkq3BjmXrKMDkYWfzy8mtt0yN8L2dEZUAV04zcNYLA0ANPDbaAqqcxDHHniass2GMCWVjoB/FXPCzwtTLqktAB3NgSawfZ+fKve43P+qmMmsxlzLppjZgg0k7Tm+AkoMVCh7wle8/Hm3KVpiRlS/jklMyfCQ2Ezj+giPxGfyrn4yQEsmASD57D3J/MF4S7MVWA56V75ztMKIuATaFkkGvGuvXuVd9Io/rVyWHYBw2ALNBurNgXbUf3Bt/fs6oCtTZMr2/od6CwTAPP95tiMiEYgEhKT/+hbhYArMIR6+hi2Pj3hhmfLFoGT/BOO6bagWzEKH+aByFi/Zz8c4mRzeeOiovpSwsJY+8PlWE2jIS9/QD09bko117Lax1EQ9cJ6BTvtBgJi1Z9tC2DxDuhzdha/hcnfFuSk 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 Cc: Christoph Hellwig Cc: Robin Murphy Cc: Will Deacon Reviewed-by: Christoph Hellwig --- 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 3288a1339271..c41019289223 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -543,6 +543,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 @@ -550,6 +551,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)