From patchwork Tue May 10 22:26:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 67477 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2364648qge; Tue, 10 May 2016 15:26:24 -0700 (PDT) X-Received: by 10.98.94.194 with SMTP id s185mr61422261pfb.135.1462919184599; Tue, 10 May 2016 15:26:24 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uy10si5187941pac.210.2016.05.10.15.26.24; Tue, 10 May 2016 15:26:24 -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=@linaro.org; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752827AbcEJW0N (ORCPT + 29 others); Tue, 10 May 2016 18:26:13 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34001 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730AbcEJW0I (ORCPT ); Tue, 10 May 2016 18:26:08 -0400 Received: by mail-pf0-f171.google.com with SMTP id y69so10394643pfb.1 for ; Tue, 10 May 2016 15:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ynT/z3uN3uzcnGBmi0tIUjwTE/sRFMAcvP6jzNPongc=; b=K6CMCpelAQnG9Myo1M48dKn2pt0dG4+VAUjtV8oR71fu5FLUMazu6DNLYM1FYX328e 3+Hd/veqyLFK4KJmEDzWzEwPx1/UZVcKU0aBW5FYXmJAjaOHNJDmjXS0FxBIvHvI/EAA mjl7tYZP+qqOXiN+e6WRga+cidMiweQtLSzbk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ynT/z3uN3uzcnGBmi0tIUjwTE/sRFMAcvP6jzNPongc=; b=YYcwskTB/jxKHlTo1985YMers10rUwRZyCetB53UXuYYJ6rph9C3bB4aLJBrOZsKxY wr+tQMEZjn8cqf4b0hvQn3oC3oZ1/LTKpqCAyX3zgnMRga+lNG53I+aesXUpTgOVpTGE Q42edam31GTVTuT8Y1e8sqfAGxHpT+S8tHsB4O6L3cov678HS35473LjLklA+orfiuYX qq1a4yjlIDbVz55R5hvoUfp8XFg792CDVeJ+6Pqxb/Uo6t+wA8BNM+2zypdzY7C58X4r QnZ3CwfXGj3kJBpFNovGWX84iKbCTEMuUjbyqhgGsnlsqazEifpazvjmeqiG5VkQUIib 7U4Q== X-Gm-Message-State: AOPr4FVwVUBWRiRmcMqHmj+b5CsbRrHJU6Ls5WfIfg9AWEdgRh33ueK50H2aJcwFSZAuUo6O X-Received: by 10.98.93.129 with SMTP id n1mr19564pfj.16.1462919167418; Tue, 10 May 2016 15:26:07 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id bk8sm6883853pac.3.2016.05.10.15.26.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 15:26:06 -0700 (PDT) From: Stephen Boyd To: linux-kernel@vger.kernel.org Cc: linux-arm@lists.infradead.org, Mimi Zohar , Andrew Morton , Mark Brown , Ming Lei , Vikram Mulukutla Subject: [RFC/PATCHv3 v3 1/3] firmware: Consolidate kmap/read/write logic Date: Tue, 10 May 2016 15:26:01 -0700 Message-Id: <1462919163-2503-2-git-send-email-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.8.0.rc4 In-Reply-To: <1462919163-2503-1-git-send-email-stephen.boyd@linaro.org> References: <1462919163-2503-1-git-send-email-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We use similar structured code to read and write the kmapped firmware pages. The only difference is read copies from the kmap region and write copies to it. Consolidate this into one function to reduce duplication. Cc: Vikram Mulukutla Signed-off-by: Stephen Boyd --- drivers/base/firmware_class.c | 57 ++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 31 deletions(-) -- 2.8.0.rc4 diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 773fc3099769..01d55723d82c 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -691,6 +691,29 @@ out: static DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store); +static void firmware_rw(struct firmware_buf *buf, char *buffer, + loff_t offset, size_t count, bool read) +{ + while (count) { + void *page_data; + int page_nr = offset >> PAGE_SHIFT; + int page_ofs = offset & (PAGE_SIZE-1); + int page_cnt = min_t(size_t, PAGE_SIZE - page_ofs, count); + + page_data = kmap(buf->pages[page_nr]); + + if (read) + memcpy(buffer, page_data + page_ofs, page_cnt); + else + memcpy(page_data + page_ofs, buffer, page_cnt); + + kunmap(buf->pages[page_nr]); + buffer += page_cnt; + offset += page_cnt; + count -= page_cnt; + } +} + static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buffer, loff_t offset, size_t count) @@ -715,21 +738,8 @@ static ssize_t firmware_data_read(struct file *filp, struct kobject *kobj, ret_count = count; - while (count) { - void *page_data; - int page_nr = offset >> PAGE_SHIFT; - int page_ofs = offset & (PAGE_SIZE-1); - int page_cnt = min_t(size_t, PAGE_SIZE - page_ofs, count); - - page_data = kmap(buf->pages[page_nr]); - - memcpy(buffer, page_data + page_ofs, page_cnt); + firmware_rw(buf, buffer, offset, count, true); - kunmap(buf->pages[page_nr]); - buffer += page_cnt; - offset += page_cnt; - count -= page_cnt; - } out: mutex_unlock(&fw_lock); return ret_count; @@ -809,24 +819,9 @@ static ssize_t firmware_data_write(struct file *filp, struct kobject *kobj, goto out; retval = count; + firmware_rw(buf, buffer, offset, count, false); - while (count) { - void *page_data; - int page_nr = offset >> PAGE_SHIFT; - int page_ofs = offset & (PAGE_SIZE - 1); - int page_cnt = min_t(size_t, PAGE_SIZE - page_ofs, count); - - page_data = kmap(buf->pages[page_nr]); - - memcpy(page_data + page_ofs, buffer, page_cnt); - - kunmap(buf->pages[page_nr]); - buffer += page_cnt; - offset += page_cnt; - count -= page_cnt; - } - - buf->size = max_t(size_t, offset, buf->size); + buf->size = max_t(size_t, offset + count, buf->size); out: mutex_unlock(&fw_lock); return retval;