From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0101654BD4; Tue, 27 Feb 2024 13:59:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042358; cv=none; b=qgvD2wzHf9B7XdcnFY0/dD/3xpynblirobxCiCZV1XyG0WyI9oxMqhYemd2lfRAG42ln9JOPVp/lVoUbA1mwORZy9mczfn6h0K1Dm5ypts/nxYZwbWTM8G6N01irNH/7F+DcB/kPfxmntWukybkjK9K+LgR8HeWd/y1QcVIuzzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042358; c=relaxed/simple; bh=5zMcfl9nDLhBJH7QZwy8W+344q9pfnk7cIzgSdvOAig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cEuNzMHWXNyeUmAacNgzLxtMWK178V1xD2lXsnOm2BEI3swFiR1m70uWefrH4dOBY0Lf1t2+4cm6HdV1xxLldjRAb3TPB800xkq7z2/AmgC2iwdEHZYQGoAZx6hAp47dU7ZjbFNUWezFJVHqWvfnec/UgQq15XVFJS3XuQR30QE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vU9WsI7C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vU9WsI7C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 807CBC433F1; Tue, 27 Feb 2024 13:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709042357; bh=5zMcfl9nDLhBJH7QZwy8W+344q9pfnk7cIzgSdvOAig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vU9WsI7CXUy00T+8wVeq8TZuaNpLlYrwVr4YB+2G0SBu7ep4fkkIa6I7AfFFi7HNj plQn7thjm00Rp/LL/ENVP28ntBjRbNj6vST0T3AoYdVdCHpvVsGjwLqmwFEHhZjLdc 63KPAaKuQ3sU8Zd0mtI1Cr0h22RyTSPGHtvcGPak= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Machek , Lad Prabhakar , Conor Dooley , Sasha Levin Subject: [PATCH 6.6 266/299] cache: ax45mp_cache: Align end size to cache boundary in ax45mp_dma_cache_wback() Date: Tue, 27 Feb 2024 14:26:17 +0100 Message-ID: <20240227131634.250191003@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131625.847743063@linuxfoundation.org> References: <20240227131625.847743063@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lad Prabhakar [ Upstream commit 9bd405c48b0ac4de087c0c4440fd79597201b8a7 ] Align the end size to cache boundary size in ax45mp_dma_cache_wback() callback likewise done in ax45mp_dma_cache_inv() callback. Additionally return early in case of start == end. Fixes: d34599bcd2e4 ("cache: Add L2 cache management for Andes AX45MP RISC-V core") Reported-by: Pavel Machek Link: https://lore.kernel.org/cip-dev/ZYsdKDiw7G+kxQ3m@duo.ucw.cz/ Signed-off-by: Lad Prabhakar Signed-off-by: Conor Dooley Signed-off-by: Sasha Levin --- drivers/cache/ax45mp_cache.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/cache/ax45mp_cache.c b/drivers/cache/ax45mp_cache.c index 57186c58dc849..1d7dd3d2c101c 100644 --- a/drivers/cache/ax45mp_cache.c +++ b/drivers/cache/ax45mp_cache.c @@ -129,8 +129,12 @@ static void ax45mp_dma_cache_wback(phys_addr_t paddr, size_t size) unsigned long line_size; unsigned long flags; + if (unlikely(start == end)) + return; + line_size = ax45mp_priv.ax45mp_cache_line_size; start = start & (~(line_size - 1)); + end = ((end + line_size - 1) & (~(line_size - 1))); local_irq_save(flags); ax45mp_cpu_dcache_wb_range(start, end); local_irq_restore(flags); -- 2.43.0