Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm (8b1b41ee) · Commits · 戴 / test

drivers/acpi/nfit/core.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
	struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);		struct acpi_nfit_desc *acpi_desc = to_acpi_nfit_desc(nd_desc);
	struct device *dev = acpi_desc->dev;		struct device *dev = acpi_desc->dev;
	struct acpi_nfit_flush_work flush;		struct acpi_nfit_flush_work flush;
			int rc;

	/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */		/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
	device_lock(dev);		device_lock(dev);
	@@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
	INIT_WORK_ONSTACK(&flush.work, flush_probe);		INIT_WORK_ONSTACK(&flush.work, flush_probe);
	COMPLETION_INITIALIZER_ONSTACK(flush.cmp);		COMPLETION_INITIALIZER_ONSTACK(flush.cmp);
	queue_work(nfit_wq, &flush.work);		queue_work(nfit_wq, &flush.work);
	return wait_for_completion_interruptible(&flush.cmp);
			rc = wait_for_completion_interruptible(&flush.cmp);
			cancel_work_sync(&flush.work);
			return rc;
	}		}

	static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,		static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,

drivers/nvdimm/namespace_devs.c

+10 −7

Original line number	Original line	Diff line number	Diff line
	@@ -52,17 +52,17 @@ static void namespace_blk_release(struct device *dev)
	kfree(nsblk);		kfree(nsblk);
	}		}

	static struct device_type namespace_io_device_type = {		static const struct device_type namespace_io_device_type = {
	.name = "nd_namespace_io",		.name = "nd_namespace_io",
	.release = namespace_io_release,		.release = namespace_io_release,
	};		};

	static struct device_type namespace_pmem_device_type = {		static const struct device_type namespace_pmem_device_type = {
	.name = "nd_namespace_pmem",		.name = "nd_namespace_pmem",
	.release = namespace_pmem_release,		.release = namespace_pmem_release,
	};		};

	static struct device_type namespace_blk_device_type = {		static const struct device_type namespace_blk_device_type = {
	.name = "nd_namespace_blk",		.name = "nd_namespace_blk",
	.release = namespace_blk_release,		.release = namespace_blk_release,
	};		};
	@@ -962,8 +962,8 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
	struct nvdimm_drvdata *ndd;		struct nvdimm_drvdata *ndd;
	struct nd_label_id label_id;		struct nd_label_id label_id;
	u32 flags = 0, remainder;		u32 flags = 0, remainder;
			int rc, i, id = -1;
	u8 *uuid = NULL;		u8 *uuid = NULL;
	int rc, i;

	if (dev->driver \|\| ndns->claim)		if (dev->driver \|\| ndns->claim)
	return -EBUSY;		return -EBUSY;
	@@ -972,11 +972,13 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
	struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);		struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);

	uuid = nspm->uuid;		uuid = nspm->uuid;
			id = nspm->id;
	} else if (is_namespace_blk(dev)) {		} else if (is_namespace_blk(dev)) {
	struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);		struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);

	uuid = nsblk->uuid;		uuid = nsblk->uuid;
	flags = NSLABEL_FLAG_LOCAL;		flags = NSLABEL_FLAG_LOCAL;
			id = nsblk->id;
	}		}

	/*		/*
	@@ -1039,10 +1041,11 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)

	/*		/*
	* Try to delete the namespace if we deleted all of its		* Try to delete the namespace if we deleted all of its
	* allocation, this is not the seed device for the region, and		* allocation, this is not the seed or 0th device for the
	* it is not actively claimed by a btt instance.		* region, and it is not actively claimed by a btt, pfn, or dax
			* instance.
	*/		*/
	if (val == 0 && nd_region->ns_seed != dev && !ndns->claim)		if (val == 0 && id != 0 && nd_region->ns_seed != dev && !ndns->claim)
	nd_device_unregister(dev, ND_ASYNC);		nd_device_unregister(dev, ND_ASYNC);

	return rc;		return rc;

drivers/nvdimm/pfn_devs.c

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -627,15 +627,12 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
	size = resource_size(&nsio->res);		size = resource_size(&nsio->res);
	npfns = (size - start_pad - end_trunc - SZ_8K) / SZ_4K;		npfns = (size - start_pad - end_trunc - SZ_8K) / SZ_4K;
	if (nd_pfn->mode == PFN_MODE_PMEM) {		if (nd_pfn->mode == PFN_MODE_PMEM) {
	unsigned long memmap_size;

	/*		/*
	* vmemmap_populate_hugepages() allocates the memmap array in		* vmemmap_populate_hugepages() allocates the memmap array in
	* HPAGE_SIZE chunks.		* HPAGE_SIZE chunks.
	*/		*/
	memmap_size = ALIGN(64 * npfns, HPAGE_SIZE);		offset = ALIGN(start + SZ_8K + 64 * npfns + dax_label_reserve,
	offset = ALIGN(start + SZ_8K + memmap_size + dax_label_reserve,		max(nd_pfn->align, HPAGE_SIZE)) - start;
	nd_pfn->align) - start;
	} else if (nd_pfn->mode == PFN_MODE_RAM)		} else if (nd_pfn->mode == PFN_MODE_RAM)
	offset = ALIGN(start + SZ_8K + dax_label_reserve,		offset = ALIGN(start + SZ_8K + dax_label_reserve,
	nd_pfn->align) - start;		nd_pfn->align) - start;

Admin message