x86, libnvdimm, pmem: remove global pmem api (ca6a4657) · Commits · 戴 / test

MAINTAINERS

+1 −3

Original line number	Diff line number	Diff line
		@@ -7592,9 +7592,7 @@ M: Ross Zwisler <ross.zwisler@linux.intel.com>
		L: linux-nvdimm@lists.01.org
		Q: https://patchwork.kernel.org/project/linux-nvdimm/list/
		S: Supported
		F: drivers/nvdimm/pmem.c
		F: include/linux/pmem.h
		F: arch/*/include/asm/pmem.h
		F: drivers/nvdimm/pmem*

		LIGHTNVM PLATFORM SUPPORT
		M: Matias Bjorling <mb@lightnvm.io>

arch/x86/include/asm/pmem.h

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		/*
		* Copyright(c) 2015 Intel Corporation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*/
		#ifndef __ASM_X86_PMEM_H__
		#define __ASM_X86_PMEM_H__

		#include <linux/uaccess.h>
		#include <asm/cacheflush.h>
		#include <asm/cpufeature.h>
		#include <asm/special_insns.h>

		#ifdef CONFIG_ARCH_HAS_PMEM_API
		/**
		* arch_memcpy_to_pmem - copy data to persistent memory
		* @dst: destination buffer for the copy
		* @src: source buffer for the copy
		* @n: length of the copy in bytes
		*
		* Copy data to persistent memory media via non-temporal stores so that
		* a subsequent pmem driver flush operation will drain posted write queues.
		*/
		static inline void arch_memcpy_to_pmem(void dst, const void src, size_t n)
		{
		int rem;

		/*
		* We are copying between two kernel buffers, if
		* __copy_from_user_inatomic_nocache() returns an error (page
		* fault) we would have already reported a general protection fault
		* before the WARN+BUG.
		*/
		rem = __copy_from_user_inatomic_nocache(dst, (void __user *) src, n);
		if (WARN(rem, "%s: fault copying %p <- %p unwritten: %d\n",
		__func__, dst, src, rem))
		BUG();
		}
		#endif /* CONFIG_ARCH_HAS_PMEM_API */
		#endif /* __ASM_X86_PMEM_H__ */

drivers/acpi/nfit/core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#include <linux/list.h>
		#include <linux/acpi.h>
		#include <linux/sort.h>
		#include <linux/pmem.h>
		#include <linux/io.h>
		#include <linux/nd.h>
		#include <asm/cacheflush.h>
		@@ -1956,7 +1955,7 @@ static int acpi_nfit_blk_region_enable(struct nvdimm_bus *nvdimm_bus,
		nfit_blk->bdw_offset = nfit_mem->bdw->offset;
		mmio = &nfit_blk->mmio[BDW];
		mmio->addr.base = devm_nvdimm_memremap(dev, nfit_mem->spa_bdw->address,
		nfit_mem->spa_bdw->length, ARCH_MEMREMAP_PMEM);
		nfit_mem->spa_bdw->length, nd_blk_memremap_flags(ndbr));
		if (!mmio->addr.base) {
		dev_dbg(dev, "%s: %s failed to map bdw\n", __func__,
		nvdimm_name(nvdimm));

drivers/nvdimm/claim.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@
		*/
		#include <linux/device.h>
		#include <linux/sizes.h>
		#include <linux/pmem.h>
		#include "nd-core.h"
		#include "pmem.h"
		#include "pfn.h"

drivers/nvdimm/dimm_devs.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/mm.h>
		#include "nd-core.h"
		#include "label.h"
		#include "pmem.h"
		#include "nd.h"

		static DEFINE_IDA(dimm_ida);
		@@ -235,6 +236,13 @@ struct nvdimm nd_blk_region_to_dimm(struct nd_blk_region ndbr)
		}
		EXPORT_SYMBOL_GPL(nd_blk_region_to_dimm);

		unsigned long nd_blk_memremap_flags(struct nd_blk_region *ndbr)
		{
		/* pmem mapping properties are private to libnvdimm */
		return ARCH_MEMREMAP_PMEM;
		}
		EXPORT_SYMBOL_GPL(nd_blk_memremap_flags);

		struct nvdimm_drvdata to_ndd(struct nd_mapping nd_mapping)
		{
		struct nvdimm *nvdimm = nd_mapping->nvdimm;

Admin message