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 91597C433E1 for ; Mon, 24 Aug 2020 17:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73EF7206F0 for ; Mon, 24 Aug 2020 17:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598289266; bh=nQK7sQ9PIi9e6YS6uT4vUUKm2HZlpHTD8PtUGW7LvZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lokesuRleVzR3AWHKjfkKinExF6ZuxASdHAGzKbhcp65In9WH/z0Zmu0XbtbqpemP iDXz6AeBDRhhYQIoi6w4GDYPx4ut8mtXZ+ojptDCY20/2zgMytS0eGwhLj+6+XC4Pf kJmi4wZrJpUhBZR5btKINPE9NLMNg/l89QQLFqmg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727927AbgHXROC (ORCPT ); Mon, 24 Aug 2020 13:14:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:40220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728374AbgHXQhV (ORCPT ); Mon, 24 Aug 2020 12:37:21 -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 C848722EBE; Mon, 24 Aug 2020 16:36:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598287013; bh=nQK7sQ9PIi9e6YS6uT4vUUKm2HZlpHTD8PtUGW7LvZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oboDI4LvtLBnN5p8adnaARTIyQuPvAZyMXWlFxfKn0vj1t34quo23BOeQ1607jXMl PU8k9HsWkcMsG1D/IGL+66pHvuhRNwTkbKOYRLtko6gDBCPz/rR576FjAdwameQTX9 hnlae2EwhZy71A3e1Ol0PXs6ZKPJ0ovnqKiXzYsM= 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.7 14/54] spi: stm32: fix stm32_spi_prepare_mbr in case of odd clk_rate Date: Mon, 24 Aug 2020 12:35:53 -0400 Message-Id: <20200824163634.606093-14-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163634.606093-1-sashal@kernel.org> References: <20200824163634.606093-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@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 faaff58cf415e..08492284369dd 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