From patchwork Fri Jun 5 14:10:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 6554601 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 318B8C0020 for ; Fri, 5 Jun 2015 14:19:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E02A20687 for ; Fri, 5 Jun 2015 14:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A7832065B for ; Fri, 5 Jun 2015 14:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423368AbbFEORo (ORCPT ); Fri, 5 Jun 2015 10:17:44 -0400 Received: from 8bytes.org ([81.169.241.247]:59094 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423015AbbFEOLM (ORCPT ); Fri, 5 Jun 2015 10:11:12 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 0949832E; Fri, 5 Jun 2015 16:11:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1433513471; bh=I6UkurjOKCb0eL9bYHhR/8ZLmT2Ljm3OiMo/ND0QKYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hE8YJL4qnwg2q80TdTcb7vJ5m7SiZJBnPpGt0dBcyL+UAqKUL7SCNPzxIqPgpJs4+ PQvsOhmWpcJ4dzi5mIetW7FnaEUwbaV4qgk5IRBmE3InOrMa74e/mQWmVUfL3GK+Xn HRPVb1c14/mA//F2d2IFgqMJn9sardXRg0Kc6H5iC+LOtRZ8EhrKLQj7g54T1zSqor 55Ambvbt95yPNuND5HxESqKKVUgV4uAyfIOjBiPX7/qeMdr30OMuMv1aor2Y53zFNe ANONOyDpb/8TjoWcpZnotLge5bJww4qm1tN4y1JsK2EhLh2JVwhDpn3UVjC0E4qWka EpBg0oNTKW2nQ== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: zhen-hual@hp.com, bhe@redhat.com, dwmw2@infradead.org, vgoyal@redhat.com, dyoung@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, indou.takao@jp.fujitsu.com, bhelgaas@google.com, doug.hatch@hp.com, jerry.hoemann@hp.com, tom.vaden@hp.com, li.zhang6@hp.com, lisa.mitchell@hp.com, billsumnerlinux@gmail.com, rwright@hp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kexec@lists.infradead.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 02/17] iommu/vt-d: Remove __iommu_save_to_oldmem() function Date: Fri, 5 Jun 2015 16:10:48 +0200 Message-Id: <1433513463-19128-3-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433513463-19128-1-git-send-email-joro@8bytes.org> References: <1433513463-19128-1-git-send-email-joro@8bytes.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel This function is unused and can be removed. Tested-by: Baoquan He Signed-off-by: Joerg Roedel --- drivers/iommu/intel-iommu.c | 36 ------------------------------------ include/linux/intel-iommu.h | 2 -- 2 files changed, 38 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 60d5491..a061c3f 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4978,42 +4978,6 @@ int __iommu_load_from_oldmem(void *to, unsigned long from, unsigned long size) } /* - * Copy memory from a virtually-addressed area into a physically-addressed area - */ -int __iommu_save_to_oldmem(unsigned long to, void *from, unsigned long size) -{ - unsigned long pfn; /* Page Frame Number */ - size_t csize = (size_t)size; /* Num(bytes to copy) */ - unsigned long offset; /* Lower 12 bits of to */ - void __iomem *virt_mem; - struct iommu_remapped_entry *mapped; - - pfn = to >> VTD_PAGE_SHIFT; - offset = to & (~VTD_PAGE_MASK); - - if (page_is_ram(pfn)) { - memcpy(pfn_to_kaddr(pfn) + offset, from, csize); - } else{ - mapped = kzalloc(sizeof(struct iommu_remapped_entry), - GFP_KERNEL); - if (!mapped) - return -ENOMEM; - - virt_mem = ioremap_cache((unsigned long)to, size); - if (!virt_mem) { - kfree(mapped); - return -ENOMEM; - } - memcpy(virt_mem, from, size); - mutex_lock(&__iommu_mem_list_lock); - mapped->mem = virt_mem; - list_add_tail(&mapped->list, &__iommu_remapped_mem); - mutex_unlock(&__iommu_mem_list_lock); - } - return size; -} - -/* * Free the mapped memory for ioremap; */ int __iommu_free_mapped_mem(void) diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index a81ceee..9526c28 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -393,8 +393,6 @@ extern const struct attribute_group *intel_iommu_groups[]; extern int __iommu_load_from_oldmem(void *to, unsigned long from, unsigned long size); -extern int __iommu_save_to_oldmem(unsigned long to, void *from, - unsigned long size); extern int __iommu_free_mapped_mem(void); #endif