From patchwork Fri Dec 13 21:37:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 3342621 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D70289F2A9 for ; Fri, 13 Dec 2013 21:37:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B856207F8 for ; Fri, 13 Dec 2013 21:37:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F63E207D1 for ; Fri, 13 Dec 2013 21:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750930Ab3LMVhK (ORCPT ); Fri, 13 Dec 2013 16:37:10 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:42078 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750822Ab3LMVhJ (ORCPT ); Fri, 13 Dec 2013 16:37:09 -0500 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id C3ADC13F10F; Fri, 13 Dec 2013 21:37:08 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id B3E6C13F307; Fri, 13 Dec 2013 21:37:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost (i-global252.qualcomm.com [199.106.103.252]) (using SSLv3 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5522513F10F; Fri, 13 Dec 2013 21:37:08 +0000 (UTC) Date: Fri, 13 Dec 2013 13:37:07 -0800 From: Stephen Boyd To: Mark Brown Cc: Samuel Ortiz , Lee Jones , Srinivas Ramana , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 3/8] regmap: Add support for using regmap over ssbi Message-ID: <20131213213707.GO21983@codeaurora.org> References: <1386718523-2587-1-git-send-email-sboyd@codeaurora.org> <1386718523-2587-4-git-send-email-sboyd@codeaurora.org> <20131210235000.GK11468@sirena.org.uk> <52A7AE1B.3040201@codeaurora.org> <20131211005106.GL11468@sirena.org.uk> <52A7C0C3.2070805@codeaurora.org> <20131211132729.GT11468@sirena.org.uk> <52AA42FD.4040503@codeaurora.org> <20131213104128.GT11044@sirena.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20131213104128.GT11044@sirena.org.uk> User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 12/13, Mark Brown wrote: > On Thu, Dec 12, 2013 at 03:13:01PM -0800, Stephen Boyd wrote: > > > > bulk_read() should decay to individual reads if there isn't a block > > > operaton and it's not like the hardware actually supports bulk reads > > > anyway. > > > So regmap_bulk_read() should work if I don't have a map->bus? To make it > > work with reg_read/write I had to do this. I'm not sure how to make > > bulk_write work. I came up with this (possibly ugly) patch. It works for my specific case but I'm not sure if unpacking the val bits into an unsigned int and passing that to _regmap_write() is sane. What do you think? ---8<---- diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 1ccd61b..333c059 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -1514,11 +1514,9 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, { int ret = 0, i; size_t val_bytes = map->format.val_bytes; - void *wval; + void *wval = NULL; - if (!map->bus) - return -EINVAL; - if (!map->format.parse_inplace) + if (map->bus && !map->format.parse_inplace) return -EINVAL; if (reg % map->reg_stride) return -EINVAL; @@ -1528,7 +1526,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, /* No formatting is require if val_byte is 1 */ if (val_bytes == 1) { wval = (void *)val; - } else { + } else if (map->bus) { wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL); if (!wval) { ret = -ENOMEM; @@ -1538,24 +1536,37 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, for (i = 0; i < val_count * val_bytes; i += val_bytes) map->format.parse_inplace(wval + i); } - /* - * Some devices does not support bulk write, for - * them we have a series of single write operations. - */ - if (map->use_single_rw) { - for (i = 0; i < val_count; i++) { - ret = _regmap_raw_write(map, + + if (map->bus) { + /* + * Some devices does not support bulk write, for + * them we have a series of single write operations. + */ + if (map->use_single_rw) { + for (i = 0; i < val_count; i++) { + ret = _regmap_raw_write(map, reg + (i * map->reg_stride), val + (i * val_bytes), val_bytes); - if (ret != 0) - return ret; + if (ret != 0) + return ret; + } + } else { + ret = _regmap_raw_write(map, reg, wval, + val_bytes * val_count); } } else { - ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); + for (i = 0; i < val_count; i++) { + unsigned int ival; + ival = *(unsigned int *)(val + (i * val_bytes)); + ret = _regmap_write(map, reg + (i * map->reg_stride), + ival); + if (ret != 0) + goto out; + } } - if (val_bytes != 1) + if (val_bytes != 1 && map->bus) kfree(wval); out: