From patchwork Sat May 12 00:18:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 8541 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C867423E20 for ; Sat, 12 May 2012 00:19:35 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 98CD9A18C2B for ; Sat, 12 May 2012 00:19:35 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so4054664yhp.11 for ; Fri, 11 May 2012 17:19:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:date:from :to:cc:subject:message-id:references:mime-version:content-type :content-disposition:in-reply-to:user-agent:x-gm-message-state; bh=NdVlXZhzFTgzg97LG/bNZNWZcgWWZNvC8MOLdrCGigw=; b=l3BCIatMaOpGKw9CeHDkGrSVnim0c47e+CdDpUV7bWPAFIXz7BTU6XIQXtkc+0CA5C ouzCQ4+PIkYEhWHLGjMTZ3RisqFEpZiYRhCVt1+BfQsfOqdvMjEMsVZG1y15i9B8apvw mEt7lnoodPdIEcXtZ8rAfqFwpfIsZCjuOSaLI9cvVlMYINItXcEDbXp9E7lLlxKO1kyn h8EgTfmfU8EsYILSsbqtLRmlzucAHyCcaLBNhEjBv/gtcXMl3gJ+QZgI8GkvIKWijQeM mi85p1WFxcvvS837r+ipiRYIegCXf8eqtuEIoW1exwE4RtbHp2ZUf2ymcxH6XNspK440 Q6oQ== Received: by 10.42.122.76 with SMTP id m12mr27055icr.38.1336781975129; Fri, 11 May 2012 17:19:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp211530ibj; Fri, 11 May 2012 17:19:34 -0700 (PDT) Received: by 10.68.194.73 with SMTP id hu9mr308387pbc.44.1336781974372; Fri, 11 May 2012 17:19:34 -0700 (PDT) Received: from mail-pz0-f50.google.com (mail-pz0-f50.google.com [209.85.210.50]) by mx.google.com with ESMTPS id qd4si3686412pbc.249.2012.05.11.17.19.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 May 2012 17:19:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.210.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-pz0-f50.google.com with SMTP id h15so4584569dan.37 for ; Fri, 11 May 2012 17:19:34 -0700 (PDT) Received: by 10.68.224.196 with SMTP id re4mr172353pbc.111.1336781973629; Fri, 11 May 2012 17:19:33 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id y5sm14251197pbk.5.2012.05.11.17.19.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 May 2012 17:19:32 -0700 (PDT) Date: Fri, 11 May 2012 17:18:05 -0700 From: Anton Vorontsov To: Greg Kroah-Hartman , Kees Cook , Colin Cross Cc: Arnd Bergmann , John Stultz , arve@android.com, Rebecca Schultz Zavin , Jesper Juhl , Randy Dunlap , Stephen Boyd , Thomas Meyer , Andrew Morton , Marco Stornelli , WANG Cong , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com Subject: [PATCH 07/11] persistent_ram: Introduce persistent_ram_free() Message-ID: <20120512001804.GG14782@lizard> References: <20120512001506.GA8653@lizard> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120512001506.GA8653@lizard> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQn6MLWggpwDmFpXw0VWlYw3Pm2PLGCrPqxG95wPleWkAc51CU+LW3yYTwhmd5Gmlvb6Qlhc A corresponding function to persistent_ram_new(). Signed-off-by: Anton Vorontsov --- drivers/staging/android/persistent_ram.c | 15 +++++++++++++++ drivers/staging/android/persistent_ram.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/drivers/staging/android/persistent_ram.c b/drivers/staging/android/persistent_ram.c index c16d7c2..63481da 100644 --- a/drivers/staging/android/persistent_ram.c +++ b/drivers/staging/android/persistent_ram.c @@ -364,6 +364,9 @@ static void *persistent_ram_iomap(phys_addr_t start, size_t size) static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, struct persistent_ram_zone *prz) { + prz->paddr = start; + prz->size = size; + if (pfn_valid(start >> PAGE_SHIFT)) prz->vaddr = persistent_ram_vmap(start, size); else @@ -437,6 +440,18 @@ static int __init persistent_ram_post_init(struct persistent_ram_zone *prz, bool return 0; } +void persistent_ram_free(struct persistent_ram_zone *prz) +{ + if (pfn_valid(prz->paddr >> PAGE_SHIFT)) { + vunmap(prz->vaddr); + } else { + iounmap(prz->vaddr); + release_mem_region(prz->paddr, prz->size); + } + persistent_ram_free_old(prz); + kfree(prz); +} + struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start, size_t size, bool ecc) diff --git a/drivers/staging/android/persistent_ram.h b/drivers/staging/android/persistent_ram.h index 8154d15..d3b2b45 100644 --- a/drivers/staging/android/persistent_ram.h +++ b/drivers/staging/android/persistent_ram.h @@ -39,6 +39,8 @@ struct persistent_ram { }; struct persistent_ram_zone { + phys_addr_t paddr; + size_t size; void *vaddr; struct persistent_ram_buffer *buffer; size_t buffer_size; @@ -66,6 +68,7 @@ int persistent_ram_early_init(struct persistent_ram *ram); struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start, size_t size, bool ecc); +void persistent_ram_free(struct persistent_ram_zone *prz); struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev, bool ecc);