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 B53F7188A0C; Tue, 10 Sep 2024 10:10:41 +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=1725963041; cv=none; b=azEpvWqo7q1lit2deizJiOcIh+zzDFd6h+S8yjH8jGT33AnpArlDo7VGBpB5FEgQn6Htta4/fcCxpRTYAFL4TYBa6/Gt9d2CS8iQLAf3m8LEl3DT1StBx6mQTDeaLrJgKF/Zj84HRU7MgJCFV/lqxTCtc7VF1DtT6OpIPCwGQPk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963041; c=relaxed/simple; bh=S7HGkgeN5SvbbVkSJW7QN9RTtJgcGAAoGrOOK8uSfkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rcevoKSQVgjGlvbAhHG5RPswxO2CLHmyFSFVZD8DnzMwHmyYiJTGXqGs3nyfGBgePbZwDgqpjaCyd+9U3JzO2zSzO42Nq45vKm66HvUkHtfUXgzS4yZailipPh9huv90BVGAemSaiSu7jWceqe4zuztim6yeCVj2vrt9QAEMYYA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wGSz6dvB; 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="wGSz6dvB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C9A3C4CEC3; Tue, 10 Sep 2024 10:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725963041; bh=S7HGkgeN5SvbbVkSJW7QN9RTtJgcGAAoGrOOK8uSfkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wGSz6dvBsF+LWtBJKdtqrKI8pHSHtzO6KtccQ86YhUgFDV0PANlL3kJOc605cPY3l I78tR2i9QfuBWmee/9ExiFhZHxO4rqVKCN99eeIUihIDvQD6+gskaRFlcG0i6IjZMR FYT/YeULNEea9kv8psvS1xcsyS1hCYhdxlVJZrFc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jarkko Nikula , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.1 116/192] i3c: mipi-i3c-hci: Error out instead on BUG_ON() in IBI DMA setup Date: Tue, 10 Sep 2024 11:32:20 +0200 Message-ID: <20240910092602.799495791@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092557.876094467@linuxfoundation.org> References: <20240910092557.876094467@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jarkko Nikula [ Upstream commit 8a2be2f1db268ec735419e53ef04ca039fc027dc ] Definitely condition dma_get_cache_alignment * defined value > 256 during driver initialization is not reason to BUG_ON(). Turn that to graceful error out with -EINVAL. Signed-off-by: Jarkko Nikula Link: https://lore.kernel.org/r/20240628131559.502822-3-jarkko.nikula@linux.intel.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/i3c/master/mipi-i3c-hci/dma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c index 337c95d43f3f..edc3a69bfe31 100644 --- a/drivers/i3c/master/mipi-i3c-hci/dma.c +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c @@ -291,7 +291,10 @@ static int hci_dma_init(struct i3c_hci *hci) rh->ibi_chunk_sz = dma_get_cache_alignment(); rh->ibi_chunk_sz *= IBI_CHUNK_CACHELINES; - BUG_ON(rh->ibi_chunk_sz > 256); + if (rh->ibi_chunk_sz > 256) { + ret = -EINVAL; + goto err_out; + } ibi_status_ring_sz = rh->ibi_status_sz * rh->ibi_status_entries; ibi_data_ring_sz = rh->ibi_chunk_sz * rh->ibi_chunks_total; -- 2.43.0