From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 837DEC433E1 for ; Mon, 24 Aug 2020 16:38:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52B4722D73 for ; Mon, 24 Aug 2020 16:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598287138; bh=E2udv7PcDmcZvpjkc35TWF0LROGr5O+RSyJib5/Zdbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lyC9P521VSdhXqLb3IQqmqYkN+d78qDrrDfd3iKZAkZdxes+lnhFfr1uuCUuVj+ej Ib9XkErJoayDpnLIvWDNlgjcr9PMrVZWL0uKQ8U4WtMk7DkRcG7Q/F5VhhJMJLL0gW QFaTjZu486CPCujTGgXM53ILFiZUvf8ldRHcgZsA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728527AbgHXQi4 (ORCPT ); Mon, 24 Aug 2020 12:38:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:39334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728219AbgHXQfY (ORCPT ); Mon, 24 Aug 2020 12:35:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 726EE214F1; Mon, 24 Aug 2020 16:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286924; bh=E2udv7PcDmcZvpjkc35TWF0LROGr5O+RSyJib5/Zdbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHdbSKqI2Wluax4+1DiZaC2GGXXhNjrW5tIiF7A1TyRYDEuHoxQxexobRP7EYttG/ 6GJh1sEeiyeIjbSBqZ4w/sprao8BVDj35E73FmTXrYZWJ+jzkNOT98+QhGoiZrkcbk fqQm60CzZSFhGl/4L47DZIpIw7PR6zVPSRGfGc9Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Amelie Delaunay , Alain Volmat , Mark Brown , Sasha Levin , linux-spi@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.8 15/63] spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Date: Mon, 24 Aug 2020 12:34:15 -0400 Message-Id: <20200824163504.605538-15-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Amelie Delaunay [ Upstream commit 9cc61973bf9385b19ff5dda4a2a7e265fcba85e4 ] Fix spi->clk_rate when it is odd to the nearest lowest even value because minimum SPI divider is 2. Signed-off-by: Amelie Delaunay Signed-off-by: Alain Volmat Link: https://lore.kernel.org/r/1597043558-29668-4-git-send-email-alain.volmat@st.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-stm32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index e5450233f3f8b..571dea72bf7e6 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -441,7 +441,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz, { u32 div, mbrdiv; - div = DIV_ROUND_UP(spi->clk_rate, speed_hz); + /* Ensure spi->clk_rate is even */ + div = DIV_ROUND_UP(spi->clk_rate & ~0x1, speed_hz); /* * SPI framework set xfer->speed_hz to master->max_speed_hz if -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2457FC433DF for ; Mon, 24 Aug 2020 16:52:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF6FB20578 for ; Mon, 24 Aug 2020 16:52:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fJV9yt9K"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="LDu8kU8T"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="rHdbSKqI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF6FB20578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7Bao7IE2SS27ICvuvW346+XuqaNvL61hyd3DY9zhn0Q=; b=fJV9yt9KN4LSdc5emfktqYUMZ BkRjWRbrupIUvEJfOJWtY0/3D04nmREI4miNhMomPl67o+1kKLWST3gwexOs9DhAFYitKIfOd/5jL aan9aJOfKsl4x3TCxUCRfv3u44+E7rXOhL/22llTEHwK7tJSh7Yvm2gNIPW+kupE0djFiKv499O9U PPiZaxiwhAhLj4xZiO2NXNWK3uaNlZXwG80WWO+cwbShGfHHLN3TO7OjPuV+q/pw0JDnLF7Bk29xS 5PZ/Zg9QnKqhk4TL1zF5p0KNptLIXj3FA7T3edQwOO+qR8zQL+VebS61OMstCvBIGYVEbaOJjlPaA 4RLMcGLRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFfg-0007IY-Ea; Mon, 24 Aug 2020 16:50:12 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFbF-00056s-3b for linux-arm-kernel@merlin.infradead.org; Mon, 24 Aug 2020 16:45:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=cR7//kpAx7ZtY0SC1ZCNA3aD5Z5fEZvsRXdNlY0TDIE=; b=LDu8kU8TM3JHJWxcni94V0OxAy u0PXUXbv3p24npNQQi1S/29Lnhq6BkySOns3X81L7JHi/oRGarkJOorH86l9h5qdR+k3l9Vl/TVkx t2t+6HeLm8RpW7O58J66lGWz/Hsxf/Goon1FMIfnSHiD+2Ng6Bt1dda6gcBw3zJr6tdIYCm3FZv6e VpkiBTkgROjRV6P1k31yYbTK3h5Nm3orn1salK0e17lOdkX/lDpj3ApO95+6vlil1Gjvxwuw9OU8j OMiHjt3V9w//o8qeo2e+pefVEWGnWS9XjbfI48XI5zFmJs0mkBgvw3FeG2n9hL4NqxNV4m5MS9Scf VpJpg1xQ==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kAFbA-0001pw-6y for linux-arm-kernel@lists.infradead.org; Mon, 24 Aug 2020 16:45:35 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 726EE214F1; Mon, 24 Aug 2020 16:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598286924; bh=E2udv7PcDmcZvpjkc35TWF0LROGr5O+RSyJib5/Zdbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHdbSKqI2Wluax4+1DiZaC2GGXXhNjrW5tIiF7A1TyRYDEuHoxQxexobRP7EYttG/ 6GJh1sEeiyeIjbSBqZ4w/sprao8BVDj35E73FmTXrYZWJ+jzkNOT98+QhGoiZrkcbk fqQm60CzZSFhGl/4L47DZIpIw7PR6zVPSRGfGc9Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 15/63] spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Date: Mon, 24 Aug 2020 12:34:15 -0400 Message-Id: <20200824163504.605538-15-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163504.605538-1-sashal@kernel.org> References: <20200824163504.605538-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200824_174532_568289_2E9667B1 X-CRM114-Status: GOOD ( 11.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Amelie Delaunay , linux-spi@vger.kernel.org, Alain Volmat , Mark Brown , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Amelie Delaunay [ Upstream commit 9cc61973bf9385b19ff5dda4a2a7e265fcba85e4 ] Fix spi->clk_rate when it is odd to the nearest lowest even value because minimum SPI divider is 2. Signed-off-by: Amelie Delaunay Signed-off-by: Alain Volmat Link: https://lore.kernel.org/r/1597043558-29668-4-git-send-email-alain.volmat@st.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-stm32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index e5450233f3f8b..571dea72bf7e6 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -441,7 +441,8 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz, { u32 div, mbrdiv; - div = DIV_ROUND_UP(spi->clk_rate, speed_hz); + /* Ensure spi->clk_rate is even */ + div = DIV_ROUND_UP(spi->clk_rate & ~0x1, speed_hz); /* * SPI framework set xfer->speed_hz to master->max_speed_hz if -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel