From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA7D0C77B7A for ; Wed, 31 May 2023 13:53:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237188AbjEaNxS (ORCPT ); Wed, 31 May 2023 09:53:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237346AbjEaNu0 (ORCPT ); Wed, 31 May 2023 09:50:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EB0030DC; Wed, 31 May 2023 06:45:59 -0700 (PDT) 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 13C9C63B22; Wed, 31 May 2023 13:45:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D061BC433EF; Wed, 31 May 2023 13:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685540754; bh=dGrqX5L8WiOq02ann3SFdrcLL+pFWgZRZorwYCf07rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pgbt+rH0T8FRrSLWQqf4R+RgEPiNxAo7Cg/a8i9mZfApX3Eu3ECInqNP3CxJpETob zogHxSHip9dkNTuidhlelWbOcT5jWnI/b12//4Q/FYBPEfijw49ZxO7Kf/rZLMYN9o 2D3PXeN/eVebRANFfMkGjFS2R7iLXjviHrqQjWUgTZThWQ8CqIgYhGoqq+fA+Rwpxe FOfL3BNXrQca/YnGrq4qQoDgOeH5BpmwX5PAXKqsKcSX/snEZzFTi7uNrSbO8rrHgL ilMlmJ9Ja09ja9vQqsshyYQKnrmjP3e3+A+6qOlFXO6/0qxM9MgcH2aQiIM8+QKMUI KeOATxnPkYDhQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Helge Deller , Sasha Levin , James.Bottomley@HansenPartnership.com, gaoxin@cdjrlc.com, linux-parisc@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 08/13] parisc: Improve cache flushing for PCXL in arch_sync_dma_for_cpu() Date: Wed, 31 May 2023 09:45:36 -0400 Message-Id: <20230531134541.3385043-8-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531134541.3385043-1-sashal@kernel.org> References: <20230531134541.3385043-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Helge Deller [ Upstream commit 59fa12646d9f56c842b4d5b6418ed77af625c588 ] Add comment in arch_sync_dma_for_device() and handle the direction flag in arch_sync_dma_for_cpu(). When receiving data from the device (DMA_FROM_DEVICE) unconditionally purge the data cache in arch_sync_dma_for_cpu(). Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- arch/parisc/kernel/pci-dma.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index 04c48f1ef3fbd..20084336704fc 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c @@ -464,13 +464,29 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { + /* + * fdc: The data cache line is written back to memory, if and only if + * it is dirty, and then invalidated from the data cache. + */ flush_kernel_dcache_range((unsigned long)phys_to_virt(paddr), size); } void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { - flush_kernel_dcache_range((unsigned long)phys_to_virt(paddr), size); + unsigned long addr = (unsigned long) phys_to_virt(paddr); + + switch (dir) { + case DMA_TO_DEVICE: + case DMA_BIDIRECTIONAL: + flush_kernel_dcache_range(addr, size); + return; + case DMA_FROM_DEVICE: + purge_kernel_dcache_range_asm(addr, addr + size); + return; + default: + BUG(); + } } void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size, -- 2.39.2