Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp24646pja; Fri, 22 Nov 2019 02:59:36 -0800 (PST) X-Google-Smtp-Source: APXvYqzhb4LVDM7BFYWZ6Skcec4jgpTt2jcZiqD1FK3b4cXY/vIxK03l9hOrSIYPWpqmzNTl79AT X-Received: by 2002:a50:9316:: with SMTP id m22mr281602eda.39.1574420376880; Fri, 22 Nov 2019 02:59:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574420376; cv=none; d=google.com; s=arc-20160816; b=DCq4jIA9Y54qIGPnQVeD3wknyghdpv8ttmpMFOqzTME8Jb1h9N2Ay3aW8w9At/gpJu KOeZjVL8StZn0ZcfMhzN5HUGy5iNT8nJVdBY35OxaZY4Bqa/R8BqpKxTdW+CGMCFZe9i KJugI9miskkVu/plJYEejSYUsCSrFVLdBpaHerWoOj3d8eCDMugKQmpWb3FMN4IAXvrr 6aGii8Cp+eKYk0FPAfTc9/JSFuuvBB8Dj1EQumRNQyi5li8XRWGscCMi1PjtqwZcSElL MFjdqVzmoxTkXmeOXWgyOS43kzGq2Cs48Ev6yrXNJ0mTLIEXe9Shsm4IBa4KhOMNgBL5 L/tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WXkvbNXOn6FJH4HCgXnNYtjUCruV/M/Gz0SCxg+5qT0=; b=K3NqWbmVe5tpjObeg/v9sS5MNSx+s4f9SsBmgJ2Qkn49PE2M9Y0MQG3NMTrh7i+XHA KG/6mQGRIvbJbDyGDcDSIk95HhwBCNVrwR5GN6xrTXmgCS0efhckPZKlYCP2Uddtq/tw xkEpX7I73JxWxMbN0hwMQXG2mtUV1vHB6PshojOlC3sBtJia8epLuywa1GXMR+v3wrUe z1s5R2UONpvoLE1gpqphNBN6pXU8EsqvCHmZ3j/wNZ1hJ5Yo2uhaxAoq6NU5SFp1L0Ne tyLZQWySq19U309ajMyT5U6zSzpQWmLgFPrCHJJlDKrhbJgSGXmDwOFv+vcdoa3wi1Im xYQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oE5YAKcD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si3693927ejt.387.2019.11.22.02.59.13; Fri, 22 Nov 2019 02:59:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oE5YAKcD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730571AbfKVK4U (ORCPT + 99 others); Fri, 22 Nov 2019 05:56:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:44104 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730563AbfKVK4S (ORCPT ); Fri, 22 Nov 2019 05:56:18 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F188E2071C; Fri, 22 Nov 2019 10:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574420177; bh=KOxhOyJHSWa7DPV+48JX7Z1O9zoxYUJ7NP+wrtc+h3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oE5YAKcDPSDCHOYrL0wvwnYHuu233kQsb/Iq0bD2gYPt6fftdC2EuP+E/LFfsjFLf jP6wvNyktM1WMr4paTpTBbnimMOYdYzb+CJX3MT7APldnBUuKSsf2TwpsfeoL1ZhRC dOoGNSSTtCw3/zaN3OBoB65gLJfXN/CQfIx8Fh+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hsin-Yi Wang , Wolfram Sang , Guenter Roeck Subject: [PATCH 4.19 002/220] i2c: mediatek: modify threshold passed to i2c_get_dma_safe_msg_buf() Date: Fri, 22 Nov 2019 11:26:07 +0100 Message-Id: <20191122100912.877438787@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100912.732983531@linuxfoundation.org> References: <20191122100912.732983531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hsin-Yi Wang commit bc1a7f75c85e226e82f183d30d75c357f92b6029 upstream. DMA with zero-length transfers doesn't make sense and this HW doesn't support them at all, so increase the threshold. Fixes: fc66b39fe36a ("i2c: mediatek: Use DMA safe buffers for i2c transactions") Signed-off-by: Hsin-Yi Wang [wsa: reworded commit message] Signed-off-by: Wolfram Sang Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-mt65xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -503,7 +503,7 @@ static int mtk_i2c_do_transfer(struct mt writel(I2C_DMA_INT_FLAG_NONE, i2c->pdmabase + OFFSET_INT_FLAG); writel(I2C_DMA_CON_RX, i2c->pdmabase + OFFSET_CON); - dma_rd_buf = i2c_get_dma_safe_msg_buf(msgs, 0); + dma_rd_buf = i2c_get_dma_safe_msg_buf(msgs, 1); if (!dma_rd_buf) return -ENOMEM; @@ -526,7 +526,7 @@ static int mtk_i2c_do_transfer(struct mt writel(I2C_DMA_INT_FLAG_NONE, i2c->pdmabase + OFFSET_INT_FLAG); writel(I2C_DMA_CON_TX, i2c->pdmabase + OFFSET_CON); - dma_wr_buf = i2c_get_dma_safe_msg_buf(msgs, 0); + dma_wr_buf = i2c_get_dma_safe_msg_buf(msgs, 1); if (!dma_wr_buf) return -ENOMEM; @@ -549,7 +549,7 @@ static int mtk_i2c_do_transfer(struct mt writel(I2C_DMA_CLR_FLAG, i2c->pdmabase + OFFSET_INT_FLAG); writel(I2C_DMA_CLR_FLAG, i2c->pdmabase + OFFSET_CON); - dma_wr_buf = i2c_get_dma_safe_msg_buf(msgs, 0); + dma_wr_buf = i2c_get_dma_safe_msg_buf(msgs, 1); if (!dma_wr_buf) return -ENOMEM; @@ -561,7 +561,7 @@ static int mtk_i2c_do_transfer(struct mt return -ENOMEM; } - dma_rd_buf = i2c_get_dma_safe_msg_buf((msgs + 1), 0); + dma_rd_buf = i2c_get_dma_safe_msg_buf((msgs + 1), 1); if (!dma_rd_buf) { dma_unmap_single(i2c->dev, wpaddr, msgs->len, DMA_TO_DEVICE);