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: 147355 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp814388lji; Mon, 24 Sep 2018 07:51:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYj01ez37pUdDPRY5pSsLttdPTplY9A3PpfRNi4DOqEnODiTEYy3N63Mt4YNTlbBsxs1oZa X-Received: by 2002:a62:6a01:: with SMTP id f1-v6mr10728530pfc.156.1537800667915; Mon, 24 Sep 2018 07:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537800667; cv=none; d=google.com; s=arc-20160816; b=lchBJ6zGFdIcz1dGwnUFQwsO+aJpI38JbYMyLcLf04dkhJPGFOPds3bmc4LeLva3yn 9HJSdnjOC923s0o2wRk7TZ1+MYPQ5gAoxwAP/s2b4WptQRmGh8/33EdvWI78ZNmufrZk hjmiyvl3x4+ox3r0DhSVvyknhxKoX+LXS6wItRYwp4VGxoBlHHSPKFqmqWIXmRoFKOtM QoI3FReHU9h9BUi72Bh5/sl/T0aKc/Fo/HYG2H0mu2Vk0jISe9D36olUQFvRvqRcJ8BS DmhJ+G0PXn4m6ITW37mocAeyrUMHVRCZMelJ56Us9LFuVeLObW0Pw0HUGLNcky5ydO5N PCAA== 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=2EQvxnxV9Im7I6t3phX96Kh3moA+/lOiAjdKPdhsaGg=; b=R/LmKRWcfct7DiJxkrgRKHpkvwppQCx6tp4V/jjE7bg6qyJyla4mLScg46fi2Wg8Bc mFMwbvIEdoHSDwiZXMOrMKIeACd3/XHd9HKGD/bHOtqThpymUYCzygfxCTLmHJyQIYiM 1IY3RumoX81c5RvvrEIvOktbV7jt+Ip8hsKTJp8uyby1a61RdhAM2Hv+0oNPQJwn8xHE 02SCc7IPpBgt/HEorNY87Q4MXe4TpxBW8KLAvOXv3FMQKc6Nf+YupKAfgnTsDbYdRSg1 Bx6Zown5u6+hXdnURT9MsvC9l1qJBQtjJx7p1YWt431+JIL38UsRwQw4RZgtbVFr1FtK bGRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=NyfzNu9z; 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 u1-v6si35962463plb.291.2018.09.24.07.51.07; Mon, 24 Sep 2018 07:51:07 -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=NyfzNu9z; 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 S2388820AbeIXUxf (ORCPT + 32 others); Mon, 24 Sep 2018 16:53:35 -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 S1730084AbeIXUxe (ORCPT ); Mon, 24 Sep 2018 16:53:34 -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=2EQvxnxV9Im7I6t3phX96Kh3moA+/lOiAjdKPdhsaGg=; b=NyfzNu9z9QW6BlxQEcJzPn21BoTy2p920KCFPzU0hyLg6SopSzjNkKfAxnRFJYro2PkHvIv65hrkB36dc/Fl/ydFmdohcqCRJEIUNmULvxI/RnZ2fojJWViSRW53JxmJgCJZ4AkviERes9TqWo5sU21U5i6ivwuB4Tc3gBe0I8g= 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 13/23] i2c: uniphier: issue STOP only for last message or I2C_M_STOP Thread-Topic: [PATCH AUTOSEL 4.9 13/23] i2c: uniphier: issue STOP only for last message or I2C_M_STOP Thread-Index: AQHUVBXNV4b8MDE1wEeOVqrfbBzmhw== Date: Mon, 24 Sep 2018 14:49:31 +0000 Message-ID: <20180924144919.164617-13-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:pu9f71nQVrCd8m46IbhELCYaOo/2kOngxZuO+oW5EItuxhKsEgQSPEr0Be6jWSRCKMHpQrggbkFrUdv4qUbLeF0ZcJSgYy2Y1dwXDKRD6Xpxnu9OyvEUPxY7TFvh/y7qwI77nELPmnZtGNIkTra0uckwBhk2QB6NlQIXLjdFod0BIy4DVt2P8Ssn+p3kEqk0pT7+AhRpnaFsai1lhjOuQN/lfvX3s6huMCLqFnBlsK7B7n2zyyNccAtTvrx/cQalJh5abrxP5j7jbT9JcFddWYVgUP07q2baTEP5SAoYYT1nCd52OC7CGBbCm+2pN5LX7Ez5cWql8qB0yGRNPXlcTsb47vdgFj1eaVOxq6Sl9ZAH2NvX9IDRhs4C3+aH/Zp9xYOafZBQwNiZKkE+I8u24H1DKP0p++jSWkgOowP/eilS59KPLtztgbbHCdJpO/QdLMYac6TaSEfypkXQo/1x/w==; 5:J5QzRwuPP5uSO1GG7UvCLbxFlYRRFRgs+IWlyEtXL0n7BMiiT+wMDBz6UMQ59YFCKl5uVPGTeaTEVIh4cjeyLehWdzGUQT0ZxM24B6OUEf51LnXaLjRxKUju6SqUfLZYFQNT0JifuX/gILSGFAJpYi2Ig8jUEmPyQB1jOVn8uhc=; 7:tDdMFyJUChkwi8ITpUWwnm/5rJSzlGlRX4lcFp9Ys35x0JQ/1Ed18OF58hOSIWDv8S7rWYdqJhZWuo8UvCCAb6/0krBde6O/j4a9mUVRdKDBxBuPexCZ6yXeBiAGUGs6NVeEZYwpyJZVAaz+KNKLJighwlheho+VRSSrjtNzaSxX4ZH47RLqrXWXdOZWK8zLddE5lKg4nXbI9TEqjklw2c58savHKzgk6ij5NMU9QzBFM5cAgNKZUOg8Syn+XhZQ x-ms-office365-filtering-correlation-id: a734eab0-7706-4062-d0b6-08d6222d24ce 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)(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: Kq+kiPKLjU2/Suc1ALZQdmlcKCxMje6A3lC8DPK8+5BqW7refRXaBTg8d7UoIAYDkO00UebD0QG35mD4MNspRMIL7+twggA2OyMcpRIkcgal695QufBr6+6mG4lRMEqRlzesfkkZIWUXu8WIgU6mxIG1LlGzpxBvhT/fUTju1O+kkl1ABXu7CDdcDjBq2i8aU2vc+tBVrPJbSDLMdbHu96/GEemsE+TkKH4Zb7qQHMGDZYCgRTAu7kGOfJf1fvcu1lhOexyAS4ng3L1eR3PPe01wtZy5wCqs/iYP4H3S7urDFDlS+MPDEqmjZ8tvMXK9MqPNLUchJMtkTF9eJF8B5PhiYoYKCr6y/rXoq3qmc3A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a734eab0-7706-4062-d0b6-08d6222d24ce X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 14:49:31.1173 (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 38f5d8d8cbb2ffa2b54315118185332329ec891c ] 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: dd6fd4a32793 ("i2c: uniphier: add UniPhier FIFO-less I2C driver") Signed-off-by: Masahiro Yamada Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-uniphier.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c index 56e92af46ddc..fdfcee9230e4 100644 --- a/drivers/i2c/busses/i2c-uniphier.c +++ b/drivers/i2c/busses/i2c-uniphier.c @@ -247,11 +247,8 @@ static int uniphier_i2c_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_i2c_master_xfer_one(adap, msg, stop); if (ret)