Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp1426939pxb; Fri, 1 Oct 2021 10:18:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxddlR3zasMTyLhbbcn43XL2aHFS14ZSiskt85xA+dS1PbroJuIamEm94DKxII79GkZy7wp X-Received: by 2002:a17:902:a70e:b0:13e:1274:c352 with SMTP id w14-20020a170902a70e00b0013e1274c352mr10426007plq.58.1633108695480; Fri, 01 Oct 2021 10:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633108695; cv=none; d=google.com; s=arc-20160816; b=AIW3xMloNlrELhXA6T5U0tLVY/L5Ltk5mmEaYHN/b6gDe6qr6q0jTXXZnUncSwM42n WOHIfDqMT0FIM8LFHmmUg4SCQze8605S99NidmQUiY8D2TTStHttrZ53Iug4a2GKQJ8U swCt0oeZJtjP++HVJ1ERkgeQqGnJv3lWQXpMk1sK9eFOPcRebu3ODvq0MjVuCwfrx40O EcLNzYlcB5QLv7G2Rl08/LOrwi+RzRItjOTumFUZQbe//VkWy1EVYXRhUNkGoobscfbq NVpcihEFdKITq7aCtscg91c04jicfA8zAiJ0i4g0ShUeTxSuvVoT1Mir3/IIs+WZhxIi D0DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=PpiVQ52MIF9oIfyU445npenXWnXwwzN3etCyazchKt8=; b=UKx0TdOYV7qEznhCeuSoJR2MWhjLlN/TlXHPR465nmKdlWCJXD+K0RDkut8Js88xXp H3xDZ5JetZdf7RxMNTloqhJ634LvE6sp+InpboiwyHFHkyLBuX/Y5fSi9UwI2SMp4Zb1 D2Vb/DD8bN240viN6+2sdq/ouSkotJl3lGacTeN/H3LuIecpnA5bqVV76lKjamIvKYTs xUFxCdOkb9nfRQnXreE4xK+8/szfdKjXruj3a/rcrNXTyvaKn7tQoQWsQfq5dy+pV1MC wFkjUTza1AScivuYqnkUh+/DvIUGJ4l4p2ypVo9lyQwwJKcghNsS3xePdG7emTx8PyYk 1C3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m2si9254796pjd.33.2021.10.01.10.18.00; Fri, 01 Oct 2021 10:18:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232005AbhJAPXr (ORCPT + 99 others); Fri, 1 Oct 2021 11:23:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231869AbhJAPXq (ORCPT ); Fri, 1 Oct 2021 11:23:46 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8EBDC061775; Fri, 1 Oct 2021 08:22:02 -0700 (PDT) Received: from guri.fritz.box (unknown [IPv6:2a02:810a:880:f54:dd31:3048:d332:54e2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dafna) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id E35C21F457D1; Fri, 1 Oct 2021 16:21:59 +0100 (BST) From: Dafna Hirschfeld To: broonie@kernel.org Cc: Dafna Hirschfeld , kernel@collabora.com, linux-spi@vger.kernel.org, enric.balletbo@collabora.com, dafna3@gmail.com, Mason Zhang , Laxman Dewangan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, wsd_upstream@mediatek.com, Matthias Brugger Subject: [PATCH v2] spi: mediatek: skip delays if they are 0 Date: Fri, 1 Oct 2021 17:21:53 +0200 Message-Id: <20211001152153.4604-1-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the function 'mtk_spi_set_hw_cs_timing' the 'setup', 'hold' and 'inactive' delays are configured. In case those values are 0 it causes errors on mt8173: cros-ec-i2c-tunnel 1100a000.spi:ec@0:i2c-tunnel0: Error transferring EC i2c message -71 cros-ec-spi spi0.0: EC failed to respond in time. This patch fixes that issues by setting only the values that are not 0. Fixes: 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") Signed-off-by: Dafna Hirschfeld --- Changes since v1: v1 was a revert of the commits 04e6bb0d6bb1 ("spi: modify set_cs_timing parameter") 5c842e51ac63 ("spi: mediatek: fix build warnning in set cs timing") this version fixes the erros instead of reverting drivers/spi/spi-mt65xx.c | 64 ++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 386e8c84be0a..a15de10ee286 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -233,36 +233,44 @@ static int mtk_spi_set_hw_cs_timing(struct spi_device *spi) return delay; inactive = (delay * DIV_ROUND_UP(mdata->spi_clk_hz, 1000000)) / 1000; - setup = setup ? setup : 1; - hold = hold ? hold : 1; - inactive = inactive ? inactive : 1; - - reg_val = readl(mdata->base + SPI_CFG0_REG); - if (mdata->dev_comp->enhance_timing) { - hold = min_t(u32, hold, 0x10000); - setup = min_t(u32, setup, 0x10000); - reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_HOLD_OFFSET); - reg_val |= (((hold - 1) & 0xffff) - << SPI_ADJUST_CFG0_CS_HOLD_OFFSET); - reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_SETUP_OFFSET); - reg_val |= (((setup - 1) & 0xffff) - << SPI_ADJUST_CFG0_CS_SETUP_OFFSET); - } else { - hold = min_t(u32, hold, 0x100); - setup = min_t(u32, setup, 0x100); - reg_val &= ~(0xff << SPI_CFG0_CS_HOLD_OFFSET); - reg_val |= (((hold - 1) & 0xff) << SPI_CFG0_CS_HOLD_OFFSET); - reg_val &= ~(0xff << SPI_CFG0_CS_SETUP_OFFSET); - reg_val |= (((setup - 1) & 0xff) - << SPI_CFG0_CS_SETUP_OFFSET); + if (hold || setup) { + reg_val = readl(mdata->base + SPI_CFG0_REG); + if (mdata->dev_comp->enhance_timing) { + if (hold) { + hold = min_t(u32, hold, 0x10000); + reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_HOLD_OFFSET); + reg_val |= (((hold - 1) & 0xffff) + << SPI_ADJUST_CFG0_CS_HOLD_OFFSET); + } + if (setup) { + setup = min_t(u32, setup, 0x10000); + reg_val &= ~(0xffff << SPI_ADJUST_CFG0_CS_SETUP_OFFSET); + reg_val |= (((setup - 1) & 0xffff) + << SPI_ADJUST_CFG0_CS_SETUP_OFFSET); + } + } else { + if (hold) { + hold = min_t(u32, hold, 0x100); + reg_val &= ~(0xff << SPI_CFG0_CS_HOLD_OFFSET); + reg_val |= (((hold - 1) & 0xff) << SPI_CFG0_CS_HOLD_OFFSET); + } + if (setup) { + setup = min_t(u32, setup, 0x100); + reg_val &= ~(0xff << SPI_CFG0_CS_SETUP_OFFSET); + reg_val |= (((setup - 1) & 0xff) + << SPI_CFG0_CS_SETUP_OFFSET); + } + } + writel(reg_val, mdata->base + SPI_CFG0_REG); } - writel(reg_val, mdata->base + SPI_CFG0_REG); - inactive = min_t(u32, inactive, 0x100); - reg_val = readl(mdata->base + SPI_CFG1_REG); - reg_val &= ~SPI_CFG1_CS_IDLE_MASK; - reg_val |= (((inactive - 1) & 0xff) << SPI_CFG1_CS_IDLE_OFFSET); - writel(reg_val, mdata->base + SPI_CFG1_REG); + if (inactive) { + inactive = min_t(u32, inactive, 0x100); + reg_val = readl(mdata->base + SPI_CFG1_REG); + reg_val &= ~SPI_CFG1_CS_IDLE_MASK; + reg_val |= (((inactive - 1) & 0xff) << SPI_CFG1_CS_IDLE_OFFSET); + writel(reg_val, mdata->base + SPI_CFG1_REG); + } return 0; } -- 2.17.1