Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795055415; b=eo2IFk/ipqb/peJpzgMSyNEMlSWq/6xxKW3gOmd0KJEz3Fna73jJAHJVwZJUG24oQwEb f3gIEbp1a47J/71D8LLhoYS8aifceouQyPP0ktA3yNn7Mmx3bJBdu8u2jrnepVRKGHv3l n2seq0sXd3sNJU+ORKvqrNoxJQP1N7up1hBjggxTzVZEfw/eGMboywF+RyQWKvvIJr8Nv t5YF1G1WN6MsPSLO74uk1Oy9U/lzOnXBni9nimjD5eKgSckYEULJv7Bmq5tmuu8oCgE8+ tWfX/jsqqrkopdfoENcwaMarvftXPuA4Tt3T7RmE68d672zm7uoz8omOkl22XABhNbA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055415; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=XqBGP1FaYXgmBhAKo0rVJBhAD6K1qOMiVD5WqTJ+Z1o=; b=esBOxixgVtqFMoWFtrGUnLAwdjJdIrdqOJXXxafy6uOYrfn2uqU2q0xO6k35UJEirMAw Ciq7N8Rgj2/Nt0+eRlJmGq0zahI1v4VAZFueLpCERpQwIlNkqEmFlg650tSwPUqZr35kK zedzfRoPCYXQv5VFivbzkXP2HVsyXCWCp+QMoOravdeleZVZfK+zg6GCCbsJ9WBiDXoSQ PIieCT28lZ0NMeRcv5bTUx9olhe6zipPQ2dO+hz970sCyBDJ1sztWZDEI6DkdeBGcsEpe oBxjPN7zLYr3bhWwk3IERqTFMY2NqxI1OMxIBMUsErIYMBB41EKK0CxirctTNFqFLyA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=sxNQXVb7; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4848606A331; Thu, 19 Nov 2026 02:30:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=sxNQXVb7 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B83CA1F000C5; Thu, 19 Nov 2026 02:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055415; bh=XqBGP1FaYXgmBhAKo0rVJBhAD6K1qOMiVD5WqTJ+Z1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sxNQXVb7mh+85Yd8DHrsHAKHbGuoxp9A5l7vsBHCe3rn644eozsqWLFm+kMqFYmOu ja1YCl9QynAfXy0qmoJXY1VOXrbakmM+N8Td280pQ8YR9yPCeFPxLpGkNlpiJd8XfO HvBUPgdmdGDbqad1OjuHnBqLOb+GV+fA8E4XyfSg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Orgad Shaneh , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.15 1622/2214] MIPS: Octeon: size the swiotlb for a modular OHCI platform driver Date: Wed, 18 Nov 2026 15:54:58 +0100 Message-ID: <20261118150116.861287520@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Orgad Shaneh [ Upstream commit f1dd1f0c8d595a019be503d40060d25721313b4a ] plat_swiotlb_setup() raises the swiotlb to 64 MB on OCTEON II with memory above 4 GB, because that OHCI can only DMA to 32 bits. The test is "#ifdef CONFIG_USB_OHCI_HCD_PLATFORM", which is false when the driver is a module - the usual way to build it - so the bump is silently skipped. What is left depends on the rest of the function: with PCI enabled the "memory past the BAR1 hole" branch happens to ask for the same 64 MB, but with CONFIG_PCI off - which is normal on these SoCs when no PCI devices are wired - swiotlbsize stays at the PAGE_SIZE it was initialised to. A full- or low-speed device on an OCTEON II board with more than 4 GB of RAM then has no bounce buffer to speak of. Use IS_ENABLED() so a modular OHCI gets the same sizing as a built-in one. Seen on a CN6635 board with 8 GB of RAM and CONFIG_USB_OHCI_HCD_PLATFORM=m. Fixes: a8667d706dfa ("MIPS: OCTEON: dma-octeon: fix OHCI USB config check") Assisted-by: Claude:claude-opus-5 Signed-off-by: Orgad Shaneh Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/cavium-octeon/dma-octeon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index df70308db0e69..8a9bf803c84ae 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c +++ b/arch/mips/cavium-octeon/dma-octeon.c @@ -231,7 +231,7 @@ void __init plat_swiotlb_setup(void) swiotlbsize = 64 * (1<<20); } #endif -#ifdef CONFIG_USB_OHCI_HCD_PLATFORM +#if IS_ENABLED(CONFIG_USB_OHCI_HCD_PLATFORM) /* OCTEON II ohci is only 32-bit. */ if (OCTEON_IS_OCTEON2() && max_addr >= 0x100000000ul) swiotlbsize = 64 * (1<<20); -- 2.53.0