From patchwork Fri Jan 12 21:24:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 10161727 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C1D44602A7 for ; Fri, 12 Jan 2018 21:26:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B481B28AB4 for ; Fri, 12 Jan 2018 21:26:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A93FE28ABB; Fri, 12 Jan 2018 21:26:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C2D628AB4 for ; Fri, 12 Jan 2018 21:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964844AbeALV0h (ORCPT ); Fri, 12 Jan 2018 16:26:37 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:46843 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965304AbeALVYl (ORCPT ); Fri, 12 Jan 2018 16:24:41 -0500 Received: by mail-pf0-f193.google.com with SMTP id y5so5311637pff.13 for ; Fri, 12 Jan 2018 13:24:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0vgEuXFQLx2Al+9pTzPjGrSyZwOLfXKsDDTswSVicF8=; b=W6JtlVLMUbPcz0BHkrYVo/2aQWnlj+M3R8jMQ42kkfXpAxakta9Z0SHR1+nkv/CbK9 y9FtJx38zbkOCsmLbQRcAZXxHnyOx5yfRqyBsnklqyB/N6I9IX/pWAw71+cixUqoCcTh 3psSK9BTPWlzx9J+wWmT2mleknVZCDny4viGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0vgEuXFQLx2Al+9pTzPjGrSyZwOLfXKsDDTswSVicF8=; b=NZ8lhuBmAmL540LBf49miobJk5VRtUyXwiqNZUAlLui48JMCtyTUfOriXTMJpvitfK H5JBLTGwtAKPtBMTV6kl1oJU7FY29VLgJ+cCtTOHVoBOol4zfpzrMRVMxqOlM21vg3ax vSMygVDBrJNszDO8zxTj4l2qLVHZ51nkV62jvyIQ4FnHvaGNSQfXelFnwckxCfTYSSOv gg7u6quTynArwSKISv7O3T+7zR8TKUqcsmQICQhKUJKYhx2C5F7xKFoFUne0dpPo6FNN oTeMdyM16pVbXqxpzp++vZu2pZ9mb8hCQOmdvztfCS3rc3i+rolAUHca54vzsEXNeXr8 tkIw== X-Gm-Message-State: AKwxyteXImXVjuSggoZFRJGCNjQDrrsZxXIv5B/ACAmHOcink3HBnnsu wl5tlMx+oLtneUlI/iSgkmZyag== X-Google-Smtp-Source: ACJfBotTghZx3jIRSm5bRooOMWl8Mj5XypcEo81lnAoyIffm5SbUknOvCU0giQ8v01+WQ/90obCtnA== X-Received: by 10.84.168.198 with SMTP id f64mr13469065plb.248.1515792280991; Fri, 12 Jan 2018 13:24:40 -0800 (PST) Received: from exogeni.mtv.corp.google.com ([2620:0:1000:1600:211e:5908:95bc:4888]) by smtp.gmail.com with ESMTPSA id t71sm18616186pfg.115.2018.01.12.13.24.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 13:24:40 -0800 (PST) From: Derek Basehore To: linux-kernel@vger.kernel.org Cc: linux-pm@vger.kernel.org, rafael.j.wysocki@intel.com, tglx@linutronix.de, briannorris@chromium.org, marc.zyngier@arm.com, Derek Basehore Subject: [PATCH 2/8] lib/iomap_copy: add __ioread64_copy() Date: Fri, 12 Jan 2018 13:24:16 -0800 Message-Id: <20180112212422.148625-3-dbasehore@chromium.org> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <20180112212422.148625-1-dbasehore@chromium.org> References: <20180112212422.148625-1-dbasehore@chromium.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some drivers will want to read IO memory 64 bits at a time. Add an API for this. The 64-bit vs. 32-bit behavior is the same as the existing __iowrite64_copy(), where we don't expect to need to (or be able to) write in 64-bit chunks, so we fall back to a 32-bit equivalent. Change-Id: Ia681f60bb98a0c6107052bccbeb5032861a93a0b Signed-off-by: Derek Basehore Signed-off-by: Brian Norris --- include/linux/io.h | 1 + lib/iomap_copy.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/linux/io.h b/include/linux/io.h index 32e30e8fb9db..53c34a0d65f7 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -31,6 +31,7 @@ struct resource; __visible void __iowrite32_copy(void __iomem *to, const void *from, size_t count); void __ioread32_copy(void *to, const void __iomem *from, size_t count); void __iowrite64_copy(void __iomem *to, const void *from, size_t count); +void __ioread64_copy(void *to, const void __iomem *from, size_t count); #ifdef CONFIG_MMU int ioremap_page_range(unsigned long addr, unsigned long end, diff --git a/lib/iomap_copy.c b/lib/iomap_copy.c index b8f1d6cbb200..71c137ede5fb 100644 --- a/lib/iomap_copy.c +++ b/lib/iomap_copy.c @@ -89,3 +89,29 @@ void __attribute__((weak)) __iowrite64_copy(void __iomem *to, } EXPORT_SYMBOL_GPL(__iowrite64_copy); + +/** + * __ioread64_copy - copy data from MMIO space, in 64-bit units + * @to: destination (must be 64-bit aligned) + * @from: source, in MMIO space (must be 64-bit aligned) + * @count: number of 64-bit quantities to copy + * + * Copy data from MMIO space to kernel space, in units of 64 bits at a time if + * on a 64-bit system. 32-bit systems will fall back to 32 bits at a time. + * Order of access is not guaranteed, nor is a memory barrier performed + * afterwards. + */ +void __ioread64_copy(void *to, const void __iomem *from, size_t count) +{ +#ifdef CONFIG_64BIT + u64 *dst = to; + const u64 __iomem *src = from; + const u64 __iomem *end = src + count; + + while (src < end) + *dst++ = __raw_readq(src++); +#else + __ioread32_copy(to, from, count * 2); +#endif +} +EXPORT_SYMBOL_GPL(__ioread64_copy);