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 X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2E36C48BD4 for ; Tue, 25 Jun 2019 09:01:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A389B21670 for ; Tue, 25 Jun 2019 09:01:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="k570TjvB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731253AbfFYJBq (ORCPT ); Tue, 25 Jun 2019 05:01:46 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:44376 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731222AbfFYJBn (ORCPT ); Tue, 25 Jun 2019 05:01:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LHgyWTRPcVpDvWhZbPOCqS5v8RHTbXiDcQRTEjmDFOI=; b=k570TjvB7grF3smBg6Uzpa48y7 9OPkhnknPz1bXd+ZsYgiKlbgae3M06EE0nbP5/TcOdE14pHFeV65si1vZf/Ex7CkFpPYvwH/X0pZS AlRIsc46RmaWu/JBW43hIFp3VuuMun9kp6fl8b8dB/WeyRfqlAj2XWBr/ae9BkuDO03qOaxDRc3Ec Sg8x8LoR9ESu1W2aJtOTqZY5Xme8CCNxzBa+uE3ERPEMOdOKa21yrtujuCSxole5xrv9TrlhLNq2L XEp5sLfNhWOS18q4Bq/iNBp76j4/+BkMd1mTswu+2RSxm9jbeqnzddOv1u/MmAd5jF5v1pqaREzQr GCt10lbQ==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hfhKg-0004CW-JD; Tue, 25 Jun 2019 09:01:42 +0000 From: Christoph Hellwig To: Geert Uytterhoeven Cc: linux-m68k@lists.linux-m68k.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] m68k: implement arch_dma_prep_coherent Date: Tue, 25 Jun 2019 11:01:35 +0200 Message-Id: <20190625090135.18872-3-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190625090135.18872-1-hch@lst.de> References: <20190625090135.18872-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we remap memory as non-cached to be used as a DMA coherent buffer we should writeback all cache and invalidate the cache lines so that we make sure we have a clean slate. Implement this using the cache_push() helper. Signed-off-by: Christoph Hellwig --- arch/m68k/Kconfig | 1 + arch/m68k/kernel/dma.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 3a52bf46e043..00f5c98a5e05 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -4,6 +4,7 @@ config M68K default y select ARCH_32BIT_OFF_T select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE + select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select ARCH_NO_COHERENT_DMA_MMAP if !MMU diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index 9c6a350a16d8..e720e6eed838 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c @@ -18,6 +18,11 @@ #include #if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) +void arch_dma_prep_coherent(struct page *page, size_t size) +{ + cache_push(page_to_phys(page), size); +} + pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs) { -- 2.20.1