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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 9DC36C76186 for ; Wed, 24 Jul 2019 19:48:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 699E721873 for ; Wed, 24 Jul 2019 19:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997730; bh=kxrR3ZTKLhywdYlMyzuCoqVwYydWCssFeep6qKQ5QGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WUec38sxILIBD9ZRiHLjIJTEqxIA5XRLZcYtvvjgtbYt3hZJ19fH2IND0q42GMjUV aSG6HdSOYZ5xjh8dy/kxBegRDfAVW3j82GQatvyajxkkV/zJWHcEWGfrnYxFP2UD1o WVhtuIqnLdCPo/H3ClkKXXHSZFdIwqmaayHg7dxE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403859AbfGXTst (ORCPT ); Wed, 24 Jul 2019 15:48:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:56390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403815AbfGXTss (ORCPT ); Wed, 24 Jul 2019 15:48:48 -0400 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 63B9021873; Wed, 24 Jul 2019 19:48:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997727; bh=kxrR3ZTKLhywdYlMyzuCoqVwYydWCssFeep6qKQ5QGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEOZw7k306Vcg6Fv3zdCstiNJYEjdofvWczzTUuro7rQbd0jIA30rQEHuzgLV5yf+ UxGTc7e273tbLQHq/jmntxTyTlH52ulyD0mt/L6bzPC7tg1isopXs1qU7LYx0nuq+K C27O8YChrUl0TaEohh1ShKVmJ6wW0W9HfdgYgUbI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.1 082/371] regmap: fix bulk writes on paged registers Date: Wed, 24 Jul 2019 21:17:14 +0200 Message-Id: <20190724191731.019355270@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit db057679de3e9e6a03c1bcd5aee09b0d25fd9f5b ] On buses like SlimBus and SoundWire which does not support gather_writes yet in regmap, A bulk write on paged register would be silently ignored after programming page. This is because local variable 'ret' value in regmap_raw_write_impl() gets reset to 0 once page register is written successfully and the code below checks for 'ret' value to be -ENOTSUPP before linearising the write buffer to send to bus->write(). Fix this by resetting the 'ret' value to -ENOTSUPP in cases where gather_writes() is not supported or single register write is not possible. Signed-off-by: Srinivas Kandagatla Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/base/regmap/regmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 4f822e087def..61d1a0864dea 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1642,6 +1642,8 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, map->format.reg_bytes + map->format.pad_bytes, val, val_len); + else + ret = -ENOTSUPP; /* If that didn't work fall back on linearising by hand. */ if (ret == -ENOTSUPP) { -- 2.20.1