From nobody Sun Sep 22 13:18:26 2024 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 000FEC4332F for ; Tue, 23 Nov 2021 11:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236024AbhKWLYZ (ORCPT ); Tue, 23 Nov 2021 06:24:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235541AbhKWLYV (ORCPT ); Tue, 23 Nov 2021 06:24:21 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64EE9C06173E for ; Tue, 23 Nov 2021 03:21:13 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id g18so19132635pfk.5 for ; Tue, 23 Nov 2021 03:21:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cXx4tPUfUH9pafyzAeGR5gquV85Y2Z7tudxqqufT9GE=; b=Wyu1LS1cdtTMg0hBT2U10oleP2US7ydiLPsXo5v+x1MNLCd6m33da3VzYuAdmFxMDv /atTSJHqbJlfRgPOsJTgGAwa42sZEMLJfCeeybWG2f34PtVrGXjnb2T1yJRaaAh4pnH5 yo0ASPO7kd0LehyYoqSA3V7IvNbzQ7efFI4NM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cXx4tPUfUH9pafyzAeGR5gquV85Y2Z7tudxqqufT9GE=; b=CoHi79Zxb+isnXFxvbQKDOhnn1y58stHnKLwgfwUy2AJP1NXqvO79zOAXexnS8Arol g4KNgsI+djZn4gKSNrTQEagou0usUZJRDXZWtMH5togdT2men3okWDQQGKeyd1bnEllY IQMM1lXnQOdQYCZjSx9f3bqRMEKRLKM+zSKvjrFTTRb7mCy29kG0h3ThF30dAsslkmXs KlpAEpjc6Js1dRLiQFmM6FOE6JV6qxRqSqV65/YfkiHtA2ljJ5QTZQyYiV6BCNsf006N GoKzvwTKM6nPh0h5E1gN2tLwbN7p6HVxQIXb6C6UasKQ/6Spj1JjOKVgOxrbLb1m5RyK 7Vxg== X-Gm-Message-State: AOAM532pDAjHfZ4KBhjga9EgQSXudHLnbX1oJAdxZo4/IWrEwCwDRDVV gg4rwc25VcWyY7Pj6S9LfSp/3w== X-Google-Smtp-Source: ABdhPJxjIMzcvOjNvrJ8u+XuK5KrPYWq/y8+SH32D3Ysykp7V9Qvil0zhFT6XjR7GIbSKLcWQI8AkA== X-Received: by 2002:a63:1813:: with SMTP id y19mr3266275pgl.93.1637666472835; Tue, 23 Nov 2021 03:21:12 -0800 (PST) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:d1ae:c331:ed2a:15e9]) by smtp.gmail.com with ESMTPSA id 63sm11093914pfz.119.2021.11.23.03.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 03:21:12 -0800 (PST) From: Hsin-Yi Wang To: Christoph Hellwig Cc: Marek Szyprowski , Robin Murphy , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Rob Herring , Maxime Ripard , - , devicetree@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, senozhatsky@chromium.org, tfiga@chromium.org Subject: [PATCH 1/3] dma: swiotlb: Allow restricted-dma-pool to customize IO_TLB_SEGSIZE Date: Tue, 23 Nov 2021 19:21:02 +0800 Message-Id: <20211123112104.3530135-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211123112104.3530135-1-hsinyi@chromium.org> References: <20211123112104.3530135-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Default IO_TLB_SEGSIZE is 128, but some use cases requires more slabs. Otherwise swiotlb_find_slots() will fail. This patch allows each mem pool to decide their own io-tlb-segsize through dt property. Signed-off-by: Hsin-Yi Wang --- include/linux/swiotlb.h | 1 + kernel/dma/swiotlb.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h index 569272871375c4..73b3312f23e65b 100644 --- a/include/linux/swiotlb.h +++ b/include/linux/swiotlb.h @@ -95,6 +95,7 @@ struct io_tlb_mem { unsigned long nslabs; unsigned long used; unsigned int index; + unsigned int io_tlb_segsize; spinlock_t lock; struct dentry *debugfs; bool late_alloc; diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 8e840fbbed7c7a..021eef1844ca4c 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -145,9 +145,10 @@ void swiotlb_print_info(void) (mem->nslabs << IO_TLB_SHIFT) >> 20); } =20 -static inline unsigned long io_tlb_offset(unsigned long val) +static inline unsigned long io_tlb_offset(unsigned long val, + unsigned long io_tlb_segsize) { - return val & (IO_TLB_SEGSIZE - 1); + return val & (io_tlb_segsize - 1); } =20 static inline unsigned long nr_slots(u64 val) @@ -186,13 +187,16 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem= *mem, phys_addr_t start, mem->end =3D mem->start + bytes; mem->index =3D 0; mem->late_alloc =3D late_alloc; + if (!mem->io_tlb_segsize) + mem->io_tlb_segsize =3D IO_TLB_SEGSIZE; =20 if (swiotlb_force =3D=3D SWIOTLB_FORCE) mem->force_bounce =3D true; =20 spin_lock_init(&mem->lock); for (i =3D 0; i < mem->nslabs; i++) { - mem->slots[i].list =3D IO_TLB_SEGSIZE - io_tlb_offset(i); + mem->slots[i].list =3D mem->io_tlb_segsize - + io_tlb_offset(i, mem->io_tlb_segsize); mem->slots[i].orig_addr =3D INVALID_PHYS_ADDR; mem->slots[i].alloc_size =3D 0; } @@ -523,7 +527,7 @@ static int swiotlb_find_slots(struct device *dev, phys_= addr_t orig_addr, alloc_size - (offset + ((i - index) << IO_TLB_SHIFT)); } for (i =3D index - 1; - io_tlb_offset(i) !=3D IO_TLB_SEGSIZE - 1 && + io_tlb_offset(i, mem->io_tlb_segsize) !=3D mem->io_tlb_segsize - 1 && mem->slots[i].list; i--) mem->slots[i].list =3D ++count; =20 @@ -603,7 +607,7 @@ static void swiotlb_release_slots(struct device *dev, p= hys_addr_t tlb_addr) * with slots below and above the pool being returned. */ spin_lock_irqsave(&mem->lock, flags); - if (index + nslots < ALIGN(index + 1, IO_TLB_SEGSIZE)) + if (index + nslots < ALIGN(index + 1, mem->io_tlb_segsize)) count =3D mem->slots[index + nslots].list; else count =3D 0; @@ -623,8 +627,8 @@ static void swiotlb_release_slots(struct device *dev, p= hys_addr_t tlb_addr) * available (non zero) */ for (i =3D index - 1; - io_tlb_offset(i) !=3D IO_TLB_SEGSIZE - 1 && mem->slots[i].list; - i--) + io_tlb_offset(i, mem->io_tlb_segsize) !=3D mem->io_tlb_segsize - 1 && + mem->slots[i].list; i--) mem->slots[i].list =3D ++count; mem->used -=3D nslots; spin_unlock_irqrestore(&mem->lock, flags); @@ -701,7 +705,9 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t = paddr, size_t size, =20 size_t swiotlb_max_mapping_size(struct device *dev) { - return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE; + struct io_tlb_mem *mem =3D dev->dma_io_tlb_mem; + + return ((size_t)IO_TLB_SIZE) * mem->io_tlb_segsize; } =20 bool is_swiotlb_active(struct device *dev) @@ -788,6 +794,7 @@ static int rmem_swiotlb_device_init(struct reserved_mem= *rmem, { struct io_tlb_mem *mem =3D rmem->priv; unsigned long nslabs =3D rmem->size >> IO_TLB_SHIFT; + struct device_node *np; =20 /* * Since multiple devices can share the same pool, the private data, @@ -808,6 +815,17 @@ static int rmem_swiotlb_device_init(struct reserved_me= m *rmem, =20 set_memory_decrypted((unsigned long)phys_to_virt(rmem->base), rmem->size >> PAGE_SHIFT); + + np =3D of_find_node_by_phandle(rmem->phandle); + if (np) { + if (!of_property_read_u32(np, "io-tlb-segsize", + &mem->io_tlb_segsize)) { + if (hweight32(mem->io_tlb_segsize) !=3D 1) + mem->io_tlb_segsize =3D IO_TLB_SEGSIZE; + } + of_node_put(np); + } + swiotlb_init_io_tlb_mem(mem, rmem->base, nslabs, false); mem->force_bounce =3D true; mem->for_alloc =3D true; --=20 2.34.0.rc2.393.gf8c9666880-goog From nobody Sun Sep 22 13:18:26 2024 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 DFDDCC4332F for ; Tue, 23 Nov 2021 11:21:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235647AbhKWLYa (ORCPT ); Tue, 23 Nov 2021 06:24:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236028AbhKWLY0 (ORCPT ); Tue, 23 Nov 2021 06:24:26 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0192C06174A for ; Tue, 23 Nov 2021 03:21:15 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id m15so18002328pgu.11 for ; Tue, 23 Nov 2021 03:21:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z+/tM6AGO8qVa/0Ves95KRNhzSUdOxRaqnGgKB5D++M=; b=XpXqNAebRwgXhworSNtt028SsP5KTorBtVnPQ2NDJ5AqE0w8IT8BOg6T3ewnDOxn0x QaNyBlTudA5wA6HUsP3tTtdlTWjvrE8GuQPbTwT1fW+w1gEOlQN/lkvuxJNQ4SJKqEYn we3ePUFjfo44/HkRFeRMoGLKvp+vx0wcGlvTA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z+/tM6AGO8qVa/0Ves95KRNhzSUdOxRaqnGgKB5D++M=; b=wiU3t3cE2hZrUvjSEUB7GOAoUC1mUxLmwADVImMUzNxIJQhSos2CypXClbj8cW93eH oKsmBkzThKiJy55QjRzbGLLG+tDAy3nBFrQ41mTnxVTBnhRBbnS/ako8kWN+ncwTNfoS OQL2zCYUWywMXLS62ZwDMi/EtcUv6CyYuayvD1OZMjfVNwARB4fZjhmmhFNlxsRkVCqY QfqkIEnMN5a353PqyRzg8LzkTvArJWqBMk0YmuqqELgcBiBro2c2NWnTQ0IdEEmMJmci RVenHWtmEld6WzujAo/JKjfXyw41MZaEB1YSiRty2Lnlpdb214ya5aV2F4taZTQSGiHK zFHA== X-Gm-Message-State: AOAM532hi/jVoLkaj2AJ+5SUz2e0yvdWDrxSnZ1D7g2xElPxN2jdtt8S 2xwQESdYk3WOrQ4J4C3eHpwv0CxAPTHOFw== X-Google-Smtp-Source: ABdhPJxETkQVjZ/TElThsyh1V0RdLsnWog1QFLXL9SdSSg23n2Tff5mZqtPLZT8Oh2DPEEUzXXmy1w== X-Received: by 2002:a63:f64:: with SMTP id 36mr3117696pgp.464.1637666475417; Tue, 23 Nov 2021 03:21:15 -0800 (PST) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:d1ae:c331:ed2a:15e9]) by smtp.gmail.com with ESMTPSA id 63sm11093914pfz.119.2021.11.23.03.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 03:21:15 -0800 (PST) From: Hsin-Yi Wang To: Christoph Hellwig Cc: Marek Szyprowski , Robin Murphy , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Rob Herring , Maxime Ripard , - , devicetree@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, senozhatsky@chromium.org, tfiga@chromium.org Subject: [PATCH 2/3] dt-bindings: Add io-tlb-segsize property for restricted-dma-pool Date: Tue, 23 Nov 2021 19:21:03 +0800 Message-Id: <20211123112104.3530135-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211123112104.3530135-1-hsinyi@chromium.org> References: <20211123112104.3530135-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a io-tlb-segsize property that each restricted-dma-pool can set its own io_tlb_segsize since some use cases require slabs larger than default value (128). Signed-off-by: Hsin-Yi Wang --- .../bindings/reserved-memory/shared-dma-pool.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/devicetree/bindings/reserved-memory/shared-dma-p= ool.yaml b/Documentation/devicetree/bindings/reserved-memory/shared-dma-poo= l.yaml index a4bf757d6881de..6198bf6b76f0b2 100644 --- a/Documentation/devicetree/bindings/reserved-memory/shared-dma-pool.yaml +++ b/Documentation/devicetree/bindings/reserved-memory/shared-dma-pool.yaml @@ -56,6 +56,14 @@ properties: If this property is present, then Linux will use the region for the default pool of the consistent DMA allocator. =20 + io-tlb-segsize: + type: u32 + description: > + Each restricted-dma-pool can use this property to set its own + io_tlb_segsize. If not set, it will use the default value + IO_TLB_SEGSIZE defined in include/linux/swiotlb.h. The value has + to be a power of 2, otherwise it will fall back to IO_TLB_SEGSIZE. + unevaluatedProperties: false =20 examples: --=20 2.34.0.rc2.393.gf8c9666880-goog From nobody Sun Sep 22 13:18:26 2024 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 8094CC433EF for ; Tue, 23 Nov 2021 11:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235985AbhKWLYd (ORCPT ); Tue, 23 Nov 2021 06:24:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236040AbhKWLY0 (ORCPT ); Tue, 23 Nov 2021 06:24:26 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6586EC06175A for ; Tue, 23 Nov 2021 03:21:18 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id cq22-20020a17090af99600b001a9550a17a5so1839170pjb.2 for ; Tue, 23 Nov 2021 03:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mq8nc34v9wy9BHUcdNCchv5TcJtzwaMW4yDN1UOKTXs=; b=JpDT/+FDBCbI5IBaWeaKfzyOwUUOyTt+Vw1ovqm0zuzKZZrjqWO3dJqGL1pzmsZRcz WEzphSwzny6i8imySPh8owk0bZ7mV09ROF7m2cIZELwxwLD3zWFbiIveEf0Sy/YacdFK n/sQubJ/NkmPIgp5pbeN1xtI08xQWQungcwqY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mq8nc34v9wy9BHUcdNCchv5TcJtzwaMW4yDN1UOKTXs=; b=ysbtpZYcFb2q65adDslpV2//QR/INFg3hmI5cxO9bI6AwnEfeKTXRt5IDE9j2/tS+C kYSgQeAO470kVmBEB87s2MtF86MetTFyh1v4jbausSl9A4TT9pUPD4a/KHTCMDx6gEZZ K/LTicjmU3+AnC3BPmij+hwrIstmLewN4mew0uXXd7I2ANuemrq/+16AkbgG+5/MOI8J aRsc0471owuJ0SNXftLyNn7IwJ6CZJCtX2jkS+VdRY23GCk2LtvfZTApwmiCqdOvAFJ8 QQGk1F9dVYC4an9IP7lpz0FwfmNNX0+psZXXvxZXxO997YS7s/THG4NSyapkpt/pArf5 Tb4A== X-Gm-Message-State: AOAM532mX95WbjgohFgwce3ukUbvqKR2+BGBEaF76Pz44Xs6R3TM1/tR R+QZkG49u3a8To9tX6i3hkOHsg== X-Google-Smtp-Source: ABdhPJxp5J8vQC13ZWDo2EQlaskUNOPku9PaqV5etdp5QIpELJ9fUxb88Pk4hXN6hRe8tLOckb6fGg== X-Received: by 2002:a17:902:7d96:b0:142:87dc:7dd3 with SMTP id a22-20020a1709027d9600b0014287dc7dd3mr5260273plm.11.1637666477920; Tue, 23 Nov 2021 03:21:17 -0800 (PST) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:d1ae:c331:ed2a:15e9]) by smtp.gmail.com with ESMTPSA id 63sm11093914pfz.119.2021.11.23.03.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 03:21:17 -0800 (PST) From: Hsin-Yi Wang To: Christoph Hellwig Cc: Marek Szyprowski , Robin Murphy , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Rob Herring , Maxime Ripard , - , devicetree@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, senozhatsky@chromium.org, tfiga@chromium.org Subject: [PATCH 3/3] arm64: dts: mt8183: use restricted swiotlb for scp mem Date: Tue, 23 Nov 2021 19:21:04 +0800 Message-Id: <20211123112104.3530135-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211123112104.3530135-1-hsinyi@chromium.org> References: <20211123112104.3530135-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use restricted-dma-pool for mtk_scp's reserved memory. And set the io-tlb-segsize to 4096 since the driver needs at least 2560 slabs to allocate memory. Signed-off-by: Hsin-Yi Wang --- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/bo= ot/dts/mediatek/mt8183-kukui.dtsi index 94c13c45919445..de94b2fd7f33e7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -109,9 +109,9 @@ reserved_memory: reserved-memory { ranges; =20 scp_mem_reserved: scp_mem_region { - compatible =3D "shared-dma-pool"; + compatible =3D "restricted-dma-pool"; reg =3D <0 0x50000000 0 0x2900000>; - no-map; + io-tlb-segsize =3D <4096>; }; }; =20 --=20 2.34.0.rc2.393.gf8c9666880-goog