From patchwork Mon Oct 30 14:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 159752 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2243184vqb; Mon, 30 Oct 2023 07:09:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBJjfQDM8tWjfpIRQvouXioR7+oX/hQlNH3LVUYimcKWBdFB+UGjljKSrV/ociR53Mygbz X-Received: by 2002:a17:902:ab43:b0:1c9:b2c1:13a2 with SMTP id ij3-20020a170902ab4300b001c9b2c113a2mr9038891plb.50.1698674945509; Mon, 30 Oct 2023 07:09:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698674945; cv=none; d=google.com; s=arc-20160816; b=jacKX4chnC6CmRRqZ4mQyt9ZkKGCjL2SLKnYseQdns8AtQSV6+4cZ6pxAmR7CXM83J sCgB/3LLRUw9euT23ol4AGi+EjReTtrsbcTGPt7TOKrPM7N3NO9TVECPBqMhht+/Yaz0 EcYGJwS4PmTMDkR8bDqYZ63bD48hD1yI0uldKKCRGLKMIAo61bmzdb43Rwvms/G8zjfH vpieCxKZTcFXUkRWgiVxQPY8GEVYugpx8AjWKqIFVP9TshekSlgHWtihNiDj6ZEOiqhL h5GE7FeT0fsBZj8PZ66wk0GGrpQo6ZtZ8hhQUqd0yts+0s3wsCHkvJm4mRWBOv4xKES9 CZVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=ZvVwMmMCo28cYULH2hI7U9noh43qi+Y+r47o/gBi8K0=; fh=yjxUoE4h8Stf5mgBdYCFAlTCCF31CsqX8z/FigLrzXQ=; b=HIOL+F5zsW/6ncVDjvifGqLxHcumCUJ9nWNlNi15DIO01zm371djPrGwswl5LvkEKr m3mpLhonGrtnUKrvlafdWVwEDZT6Iwz4n3rdANwZKJGV1h8XmPJ6SCXZQWkt7CDkeY/E k2ZIVocSHjstKtQFWBFr6fvkUKXPFN42zqT56uWniDSAt+qsR4Sl8YxT4dMQWG9wnZTh Lb522vBNVkVimhQbVQkR46yjZLEUn5ZdgOCdlxkoia6b6TTiOBwideQq0i67J28bGU+6 3xEF1Z8pEJ+wU9JwSXj/LAdxIYKqlil7Gwhg5MaCmhYvXsWsfzub3nMjXiolb5zU9WsJ HZHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=2W2T4tXs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id c14-20020a170903234e00b001cc1a3e42d8si1691924plh.324.2023.10.30.07.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 07:09:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=2W2T4tXs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 1D467804B392; Mon, 30 Oct 2023 07:09:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233329AbjJ3OIr (ORCPT + 31 others); Mon, 30 Oct 2023 10:08:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbjJ3OIq (ORCPT ); Mon, 30 Oct 2023 10:08:46 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9C589B for ; Mon, 30 Oct 2023 07:08:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:In-Reply-To:References; bh=ZvVwMmMCo28cYULH2hI7U9noh43qi+Y+r47o/gBi8K0=; b=2W2T4tXsXA3+MrRnsZ/2CgXlHA 0vbu6ddViciW4oH3aa2bWbnOK4P80TAkVwLSgZUD2EDRx1xfz9T8PUCFfea5z6cYpNUVKWoOtQkKH qm+IgSkFJOp9MrHtkCJ0RLgJjxXbF4eQik3BQveFC3aOugRNA5eX2J5WMRvRsdx1aRry+HFjlNSt7 LE707TBWKbeKhAPSsubvOh9jWxWIwtxLHPer7faI7tv+HZMLB4pAFWmZaiTUqO6hVjs1YQ37tpHKj XKhloJjzEroXhPindG89xH/KnK5pDXloztrjgIg/2QJ9O/Rzk5p7zv0uXfSSRNCPovGJfeNiJKVXm e/Ctj/9A==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qxSwd-003SqF-36; Mon, 30 Oct 2023 14:08:44 +0000 Date: Mon, 30 Oct 2023 15:08:41 +0100 From: Christoph Hellwig To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, iommu@lists.linux.dev Subject: [GIT PULL] dma-mapping updates for Linux 6.7 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 30 Oct 2023 07:09:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781189779678345278 X-GMAIL-MSGID: 1781189779678345278 Hi Linus, the Kconfig dependencies added in this branch caught configuration issues in a riscv platform. The fixes for that went into th soc tree, so it if you want to avoid them it might make sense to pull this branch after the soc tree. The following changes since commit ce55c22ec8b223a90ff3e084d842f73cfba35588: Merge tag 'net-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2023-10-19 12:08:18 -0700) are available in the Git repository at: git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-6.7-2023-10-30 for you to fetch changes up to 36d91e851598a9ea523ad4681dd11fa661d59695: dma-debug: Fix a typo in a debugging eye-catcher (2023-10-23 07:52:54 +0200) ---------------------------------------------------------------- dma-mapping updates for Linux 6.7 - get rid of the fake support for coherent DMA allocation on coldfire with caches (Christoph Hellwig) - add a few Kconfig dependencies so that Kconfig catches the use of invalid configurations (Christoph Hellwig) - fix a type in dma-debug output (Chuck Lever) - rewrite a comment in swiotlb (Sean Christopherson) ---------------------------------------------------------------- Christoph Hellwig (8): dma-direct: add dependencies to CONFIG_DMA_GLOBAL_POOL dma-direct: add a CONFIG_ARCH_HAS_DMA_ALLOC symbol dma-direct: simplify the use atomic pool logic in dma_direct_alloc dma-direct: warn when coherent allocations aren't supported m68k: use the coherent DMA code for coldfire without data cache net: fec: use dma_alloc_noncoherent for data cache enabled coldfire m68k: don't provide arch_dma_alloc for nommu/coldfire m68k: remove unused includes from dma.c Chuck Lever (1): dma-debug: Fix a typo in a debugging eye-catcher Sean Christopherson (1): swiotlb: rewrite comment explaining why the source is preserved on DMA_FROM_DEVICE arch/arm/Kconfig | 1 + arch/m68k/Kconfig | 6 +-- arch/m68k/Kconfig.cpu | 12 +++++ arch/m68k/kernel/Makefile | 2 +- arch/m68k/kernel/dma.c | 34 +----------- arch/parisc/Kconfig | 1 + drivers/net/ethernet/freescale/fec_main.c | 86 +++++++++++++++++++++++++++---- kernel/dma/Kconfig | 11 ++++ kernel/dma/debug.c | 2 +- kernel/dma/direct.c | 37 +++++-------- kernel/dma/swiotlb.c | 12 +++-- 11 files changed, 127 insertions(+), 77 deletions(-)