From patchwork Fri May 24 18:26:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 13673529 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B242C25B7D for ; Fri, 24 May 2024 18:30:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YJq/uKbUmmumYZQ2gjMp24YcTFx9cpiDQROYfZM1SXE=; b=nXJhJ9rToKjGLe BqMa8BCwxhv5j8twLDGWzN+KYppPiYU3xFdsSzT49MysCU2cCTwfGxBYq9FfI7rVfrMb8hHlbj/PD ybZx0k2F9FYsl40A+io5Sp5u2mzDEuh+tVzgkrnUHL1kI6VCko76ahNsEJCP4copXZSJM/op1CzRC zZ2vwrAhXzMu4aietry3Rujb/VePJOZcakBVBTY1e2TiPwAhAzHDl2RXvb/qyltIpEkmm0HNUIg42 PWspOQNi2SbFeoBHET02XTvXG5Pakgos43PmCWqGTkF/yeqg792KffDiFg8JydjGiS+WiluiGtD4I vytqsjiCJH8OKjlOJ8rQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZgS-00000009asI-3nWj; Fri, 24 May 2024 18:30:28 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZeA-00000009ZGE-2jca for linux-arm-kernel@bombadil.infradead.org; Fri, 24 May 2024 18:28:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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; bh=HLyqz2osfPGnGJK1wbt1y32SqdJNw076C0yH+gVvyYs=; b=TmyuTe1Cinn05t5nU4DT4sPk2S 6wEPkHcw5Sr0k9CtxWypsH06WocH9W65aEeLyfomaCZXot/tHd8+U5JMheQVALUj1/VTSE1+gPaUy jNWeHIcBERVmzb/rBCo635eqjLw08L4ixnpwtJR2driJKzMZtSN+St+Uy00zY+e5TSj5/f4KMHLzM HGYYQOFyIGFZKH1gg2/TmU+V5+hdVelkhsyMs3BwL6vdHr2JOrBpYvvEtq2FXm7LEALd+MtKhcng6 qy7f8XRxVxjMY8OF9GhTCArO09Ub9aIZ79wOkpyPexnjusfAlQzPFI/uk8h8fArPVEk0NMD9UZ6ai jfT4kI5g==; Received: from mail-wm1-x364.google.com ([2a00:1450:4864:20::364]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAZe4-00000009vJ7-27pU for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2024 18:28:05 +0000 Received: by mail-wm1-x364.google.com with SMTP id 5b1f17b1804b1-4200ee78f33so34494085e9.3 for ; Fri, 24 May 2024 11:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1716575277; x=1717180077; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HLyqz2osfPGnGJK1wbt1y32SqdJNw076C0yH+gVvyYs=; b=qyYN1goDv7jKegkg0BnX8ql9LAqx3KYkP3BW1FY18GgbcZs40rDOMxY0ywiPCHZG0r 6Pz5JLNV5bScuda1waoonH6SNGZ8Wt/NRnlwuaBbPgauWIDzFWeQrWt/zjvRDbkJ9j9v V8hr+ULrsy6hXBSOwbX2TTJ5Nzrl6fgNhvY1LXcLjmfIBq00ihXI1N4d0InmAxKQ1RFQ 0Ln5uSYxeT4QOhwrCK8o4NfP6LnyV3NoTuqBhnS0Y2iaz3OO8s59ztOhJPBowaO2Gnro bVoHTTYyaKzb+H+82PjeY9gkyn0SdneJ9xDDeq5BVxKOjBoEai67pnvpJP4gD5lsNpIK EP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716575277; x=1717180077; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HLyqz2osfPGnGJK1wbt1y32SqdJNw076C0yH+gVvyYs=; b=aKbsx5NPlPLt+Yj1Zed6RDt6FvzKBBeyVNp0V+4IdGhqamKWHQBQCLXHRFhFo3AAml 1U/OyFgR7BH/JavZLkmwZU29R013bDZYO/VqVCzD9ZiLkW3UdpV6wYg9eXSddDLOMzXd 1y6bw22ZAXUtU/maKvAHFYla6+7VlYnBiqm4OdfaFao1iJM7nR+c8MZPbdS/Y8bZ04BF uRdZe4VcdHUlWwS81J47UJPFgtwWNqJjafS/KD+5+ioD699n50jd0Hj1KFmkgSG7c1JV 6XNASci56rzP7MpVi14Uo8TIflZou8j2AWKUq4SYKZtKv0/htotYwBWsDTH9XTzkBXE+ vnEA== X-Forwarded-Encrypted: i=1; AJvYcCX6J5taTrvPU9S4Z8BzWojEaL2w2x3CjzwAIwj8KI7rt43uH+SA7pvKo1PgqK76fPVNYIPQfdM0Pje0wtouYUxg887iPXOaaDB7bSIgraCCbjo5Klo= X-Gm-Message-State: AOJu0Yw0L0uTQh/mFJmIQNWe91FUCnc5+w25eYgE0+z0x7J9McJPKOk0 PBEY0TUmlscPv4uYnQo6Rwkq8Hbf7pYCuNdvvVrIJOjsijLIeZSjeg8En+OfoQ6vXfKqzn5z/pe V7DNG1fj0x3I0/pYESvQN5vjGx/N9s7J6 X-Google-Smtp-Source: AGHT+IHZyoYiw+ZfDDIW+lJcq4U5OZo2v43Ubu3YaXBugY/8GE8OzbxogUWp09sQZEXs2xF6wDmcdkXhQP7U X-Received: by 2002:a05:600c:548f:b0:418:c1a3:8521 with SMTP id 5b1f17b1804b1-42108aa8866mr22319455e9.26.1716575277729; Fri, 24 May 2024 11:27:57 -0700 (PDT) Received: from raspberrypi.com ([188.39.149.98]) by smtp-relay.gmail.com with ESMTPS id 5b1f17b1804b1-42100fa9be9sm5432805e9.40.2024.05.24.11.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 11:27:57 -0700 (PDT) X-Relaying-Domain: raspberrypi.com From: Dave Stevenson To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , Vinod Koul , Maxime Ripard , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Ulf Hansson , Mark Brown , Christoph Hellwig , Marek Szyprowski , Robin Murphy , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Vladimir Murzin , Phil Elwell , Stefan Wahren , Serge Semin Cc: devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mmc@vger.kernel.org, linux-spi@vger.kernel.org, iommu@lists.linux.dev, linux-sound@vger.kernel.org, Dave Stevenson Subject: [PATCH 11/18] dmaengine: bcm2835: Use dma_map_resource to map addresses Date: Fri, 24 May 2024 19:26:55 +0100 Message-Id: <20240524182702.1317935-12-dave.stevenson@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> References: <20240524182702.1317935-1-dave.stevenson@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240524_192801_003700_08C6E5B4 X-CRM114-Status: GOOD ( 16.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is a need to account for dma-ranges and iommus in the dma mapping process, and the public API for handling that is dma_map_resource. Add support for mapping addresses to the DMA driver. Signed-off-by: Dave Stevenson --- drivers/dma/bcm2835-dma.c | 46 ++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index 9531c0b82071..e48008b06716 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -67,6 +67,10 @@ struct bcm2835_cb_entry { struct bcm2835_dma_chan_map { dma_addr_t addr; + enum dma_data_direction dir; + + phys_addr_t slave_addr; + unsigned int xfer_size; }; struct bcm2835_chan { @@ -294,12 +298,44 @@ static int bcm2835_dma_map_slave_addr(struct dma_chan *chan, return 0; } - /* - * This path will be updated to handle new clients, but currently should - * never be used. - */ + if (dev_size != DMA_SLAVE_BUSWIDTH_4_BYTES) + return -EIO; + + /* Reuse current map if possible. */ + if (dev_addr == map->slave_addr && + dev_size == map->xfer_size && + dev_dir == map->dir) + return 0; + + /* Remove old mapping if present. */ + if (map->xfer_size) { + dev_dbg(chan->device->dev, "chan: unmap %zx@%pap to %pad dir: %s\n", + dev_size, &dev_addr, &map->addr, + dev_dir == DMA_TO_DEVICE ? "DMA_TO_DEVICE" : "DMA_FROM_DEVICE"); + dma_unmap_resource(chan->device->dev, map->addr, + map->xfer_size, map->dir, 0); + } + map->xfer_size = 0; - return -EINVAL; + /* Create new slave address map. */ + map->addr = dma_map_resource(chan->device->dev, dev_addr, dev_size, + dev_dir, 0); + + if (dma_mapping_error(chan->device->dev, map->addr)) { + dev_err(chan->device->dev, "chan: failed to map %zx@%pap", + dev_size, &dev_addr); + return -EIO; + } + + dev_dbg(chan->device->dev, "chan: map %zx@%pap to %pad dir: %s\n", + dev_size, &dev_addr, &map->addr, + dev_dir == DMA_TO_DEVICE ? "DMA_TO_DEVICE" : "DMA_FROM_DEVICE"); + + map->slave_addr = dev_addr; + map->xfer_size = dev_size; + map->dir = dev_dir; + + return 0; } static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc)