From patchwork Mon Sep 24 14:49:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 147353 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp814617lji; Mon, 24 Sep 2018 07:51:20 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZJrohvbasrM5MJp0tQq9tLz5rJhJNBD0MIohukIZspXf2UJy+ie7S349qF2EnVsTfMuYYC X-Received: by 2002:a63:9b09:: with SMTP id r9-v6mr5230163pgd.307.1537800680371; Mon, 24 Sep 2018 07:51:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537800680; cv=none; d=google.com; s=arc-20160816; b=WERdFhAZ6il0f6/mw9YzbRKOTCD7MkIpxYRSDcl+MlJ4VDcfc3qy8GyzSa3/zbBWLg XzVXzni91kpesdXiJRIbFpnomilI0W/aiIcWqzt4fgRtT/0xnbVScWesvwq9xPWR+0co JT6YkEdgNlQ/pBXPwOsrZizNAO9Xr9qcU4zehp085OVaQ5PQK6Qc8Ri1PjcmMY0Pvfga f38vtHpNCERFQtp90RqqUvoagdIgxP+pnEcF1nOk1ybhD68HQy9LoN9yNzSf08ZJbYSk YnuAgsIS6Z87QZWfQuogKsMP5S16dgYlU7a3CQ52bfOOqj+4smIvcZR32Dx7BS2ncJH0 Bf0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=yUu70jNJEhWhEeJ3iwIIxbBDfI9adUJRG+xb4PSLYwE=; b=aWMuXNBnK0eeHr8rBUpTpUm81wkM7u1yvCsiLeATJ+jU8oT4n1IFQdtFB1KSXUTgw5 HTjBOgzYJ19t+iOkUXy3RQiTHqPZ5iGV6SFxeTgaU9n++3+GyEqrz3vs4GI2me8i+hJr +HeS1zTJOgnHgRPQkIr880ZvCzy6wx6DfVNjayqZngvrMl5/SouPsn6IKgmM5U1uaIr6 5tVwEEp73l0yeDBE/X5ZJtFYUnYXZ+tf4Tyo3YTHH/OpL9IAE3sDR9BI95UPGpOirejI Ca/rHPC1Yb13Kp0yz245v0owAYSZRb6UZLAZWPPp7vhkWERacw3Y7v/PBuIVeyFYAwMo Ft5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b="Eus/aO7L"; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m86-v6si37302761pfj.48.2018.09.24.07.51.20; Mon, 24 Sep 2018 07:51:20 -0700 (PDT) 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=@microsoft.com header.s=selector1 header.b="Eus/aO7L"; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388955AbeIXUxt (ORCPT + 32 others); Mon, 24 Sep 2018 16:53:49 -0400 Received: from mail-by2nam03on0094.outbound.protection.outlook.com ([104.47.42.94]:22973 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388790AbeIXUxs (ORCPT ); Mon, 24 Sep 2018 16:53:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yUu70jNJEhWhEeJ3iwIIxbBDfI9adUJRG+xb4PSLYwE=; b=Eus/aO7Lk/1cVjbm0gW34AuiW6g2JmJn1Zy3KYR+5+oZfXR4AY++5sZ56dTguCRai1ZkWc5rL/+r9B2lKd1+eJ/JKNQcMvSHLi2eA2bjPzLxpH8GzYnZuKiGKtG8E/h+rIhW8ANqY4eibwgNd2qM76C0HvnJxE8gOiYp/W+Ynu8= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0181.namprd21.prod.outlook.com (10.173.193.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.3; Mon, 24 Sep 2018 14:51:00 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1207.003; Mon, 24 Sep 2018 14:51:00 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Masahiro Yamada , Wolfram Sang , Sasha Levin Subject: [PATCH AUTOSEL 4.9 14/23] i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP Thread-Topic: [PATCH AUTOSEL 4.9 14/23] i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP Thread-Index: AQHUVBXNsuOXFxGVi06eWb2lP0qCnA== Date: Mon, 24 Sep 2018 14:49:31 +0000 Message-ID: <20180924144919.164617-14-alexander.levin@microsoft.com> References: <20180924144919.164617-1-alexander.levin@microsoft.com> In-Reply-To: <20180924144919.164617-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CY4PR21MB0181; 6:aT4zBPPMtftBDEUiwVclEKGaPOPFelsgllcDXXzqBv5K1okJCzj3jiNU6dFq0gqRJ4f7BrliA2gcvX9QJHLtRvvjaA3sEu/HHguPpHE7Vu/YAGnGJD+V4TrNENW0OIoGxTpdD7RTNpk6M3nPqDzX7m45hKUo8pMUwXaGPJTG/Ib0RKiYWRs+OlAP7V00dLMe7gp2WnWNSOLDkIZIzXO3T1N43HpV1yAmW1jLAN2RGabiybNQi4N8KIKX832KdAcVhM+mmUneiOCFo85LZuZFvyWBUm3b+c/YE4lKhvITc1FjJoGuFaEDE3Bvl8O5ezlQFtcqdRG+FDm6041QxldIGe5lcvWcxNuh2RwWYfLj9buS9y8OL0reGIW0Kbdp0TVWyf6nDBnXTpk6zfZI6hV6yNzK3dn51IUu5I5UhaTzk5bUpejnf8qfLd3W56/6U48K+sweV4+0T+C3h9kkjZI7zw==; 5:BHLhVAmLPuM5kORVDwnPsyl8YiYy/pWUwFGzQchHTg5GR2TxSzS6ez/yT16Mon2gBZXqGIw3YlTFiNg+gMCLEAskCJrQk9rajXrnVMVxKdb5HpGBkp99eWpiiR//TyZiVNX5iNIn6QUzPilFa/1WKytWCRMKOuWE3XKehNwm3K4=; 7:qre7gIHP8CX7G/D4WqD6EkbTJSHYUx/GQk3rSBpAMSuaaxHyzLOV4cLXPpf4D9N8svQWDR+pHI7anf46ZsMdJzik73wraDuc0Xnn9OCMSha54br54WwXNMCmCMzJs4WH6sCPo49X4vdy9fgJrqwNtWIqWlaNAqdegCXgyNoqDwCeGHJBMwJU7VSAGVEI0TL2T77ZxpWEbgqCZQ026V6N5qEX7kYSBc90GoojBrJdkyrtKHiQTJtlXNWEGTRWuM+9 x-ms-office365-filtering-correlation-id: 9553365f-e2e1-4634-52ea-08d6222d24fc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:CY4PR21MB0181; x-ms-traffictypediagnostic: CY4PR21MB0181: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231355)(944501410)(52105095)(2018427008)(10201501046)(93006095)(93001095)(3002001)(6055026)(149066)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991041); SRVR:CY4PR21MB0181; BCL:0; PCL:0; RULEID:; SRVR:CY4PR21MB0181; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(366004)(376002)(39860400002)(136003)(346002)(396003)(189003)(199004)(575784001)(10290500003)(6116002)(26005)(102836004)(3846002)(5660300001)(22452003)(110136005)(10090500001)(8676002)(15650500001)(1076002)(54906003)(105586002)(186003)(316002)(106356001)(2501003)(6436002)(97736004)(6486002)(107886003)(7736002)(36756003)(478600001)(72206003)(14454004)(71200400001)(71190400001)(305945005)(256004)(5250100002)(217873002)(6666003)(2616005)(68736007)(53936002)(81166006)(81156014)(2900100001)(476003)(86612001)(4326008)(8936002)(486006)(99286004)(6512007)(86362001)(2906002)(25786009)(66066001)(6506007)(11346002)(446003)(76176011)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR21MB0181; H:CY4PR21MB0776.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: prdSeWAYiD1qpj8Mp66u8OBP/8lb434kUoUCkb/j3rihs8XQi5NZed6YZUQHSRCzTfIYTC2B00wjZAFavVp0EEEjmO4y5zyoTCRbryQWyaE0Ytmt/8SWp13aoninK7QTOuQU8XmyftD092zxKdQBhVwJLMogauEV9kZoKuZk2t+s86dSJUcGtmW8qV6FP+vo8iUjkkQ235X+zrVsy2W9kuuv42Eb6YXziPPTCpvA1xXt0gx4XmSylui3R+dN/hnjKNHOBJK6JkI/kZ7ib/T8SA0sUZGhFeJqISM8eOp8CWcTZeo1Kn5qh0RqpEv6kR36lhgFJrK0jRsz1JqwzvcFnTQceeMBmBQ0m60Kfj9AytE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9553365f-e2e1-4634-52ea-08d6222d24fc X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 14:49:31.6337 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0181 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ Upstream commit 4c85609b08c4761eca0a40fd7beb06bc650f252d ] This driver currently emits a STOP if the next message is not I2C_MD_RD. It should not do it because it disturbs the I2C_RDWR ioctl, where read/write transactions are combined without STOP between. Issue STOP only when the message is the last one _or_ flagged with I2C_M_STOP. Fixes: 6a62974b667f ("i2c: uniphier_f: add UniPhier FIFO-builtin I2C driver") Signed-off-by: Masahiro Yamada Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-uniphier-f.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c index db9105e52c79..0da4991dd356 100644 --- a/drivers/i2c/busses/i2c-uniphier-f.c +++ b/drivers/i2c/busses/i2c-uniphier-f.c @@ -400,11 +400,8 @@ static int uniphier_fi2c_master_xfer(struct i2c_adapter *adap, return ret; for (msg = msgs; msg < emsg; msg++) { - /* If next message is read, skip the stop condition */ - bool stop = !(msg + 1 < emsg && msg[1].flags & I2C_M_RD); - /* but, force it if I2C_M_STOP is set */ - if (msg->flags & I2C_M_STOP) - stop = true; + /* Emit STOP if it is the last message or I2C_M_STOP is set. */ + bool stop = (msg + 1 == emsg) || (msg->flags & I2C_M_STOP); ret = uniphier_fi2c_master_xfer_one(adap, msg, stop); if (ret)