Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9e582aa authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm, nfit: enable support for volatile ranges 



Allow volatile nfit ranges to participate in all the same infrastructure
provided for persistent memory regions. A resulting resulting namespace
device will still be called "pmem", but the parent region type will be
"nd_volatile". This is in preparation for disabling the dax ->flush()
operation in the pmem driver when it is hosted on a volatile range.

Cc: Jan Kara <jack@suse.cz>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent c00b396e

drivers/acpi/nfit/core.c

+8 −1
Original line number Diff line number Diff line
@@ -2227,6 +2227,13 @@ static bool nfit_spa_is_virtual(struct acpi_nfit_system_address *spa) 
		nfit_spa_type(spa) == NFIT_SPA_PCD);

}



static bool nfit_spa_is_volatile(struct acpi_nfit_system_address *spa)

{

	return (nfit_spa_type(spa) == NFIT_SPA_VDISK ||

		nfit_spa_type(spa) == NFIT_SPA_VCD   ||

		nfit_spa_type(spa) == NFIT_SPA_VOLATILE);

}



static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,

		struct nfit_spa *nfit_spa)

{
@@ -2301,7 +2308,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc, 
				ndr_desc);

		if (!nfit_spa->nd_region)

			rc = -ENOMEM;

	} else if (nfit_spa_type(spa) == NFIT_SPA_VOLATILE) {

	} else if (nfit_spa_is_volatile(spa)) {

		nfit_spa->nd_region = nvdimm_volatile_region_create(nvdimm_bus,

				ndr_desc);

		if (!nfit_spa->nd_region)

drivers/nvdimm/bus.c

+4 −4
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ static int to_nd_device_type(struct device *dev) 
{

	if (is_nvdimm(dev))

		return ND_DEVICE_DIMM;

	else if (is_nd_pmem(dev))

	else if (is_memory(dev))

		return ND_DEVICE_REGION_PMEM;

	else if (is_nd_blk(dev))

		return ND_DEVICE_REGION_BLK;

	else if (is_nd_dax(dev))

		return ND_DEVICE_DAX_PMEM;

	else if (is_nd_pmem(dev->parent) || is_nd_blk(dev->parent))

	else if (is_nd_region(dev->parent))

		return nd_region_to_nstype(to_nd_region(dev->parent));



	return 0;
@@ -56,7 +56,7 @@ static int nvdimm_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 
	 * Ensure that region devices always have their numa node set as

	 * early as possible.

	 */

	if (is_nd_pmem(dev) || is_nd_blk(dev))

	if (is_nd_region(dev))

		set_dev_node(dev, to_nd_region(dev)->numa_node);

	return add_uevent_var(env, "MODALIAS=" ND_DEVICE_MODALIAS_FMT,

			to_nd_device_type(dev));
@@ -65,7 +65,7 @@ static int nvdimm_bus_uevent(struct device *dev, struct kobj_uevent_env *env) 
static struct module *to_bus_provider(struct device *dev)

{

	/* pin bus providers while regions are enabled */

	if (is_nd_pmem(dev) || is_nd_blk(dev)) {

	if (is_nd_region(dev)) {

		struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev);



		return nvdimm_bus->nd_desc->module;

drivers/nvdimm/core.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ void nvdimm_badblocks_populate(struct nd_region *nd_region, 
	struct nvdimm_bus *nvdimm_bus;

	struct list_head *poison_list;



	if (!is_nd_pmem(&nd_region->dev)) {

	if (!is_memory(&nd_region->dev)) {

		dev_WARN_ONCE(&nd_region->dev, 1,

				"%s only valid for pmem regions\n", __func__);

		return;

drivers/nvdimm/dax_devs.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct device *nd_dax_create(struct nd_region *nd_region) 
	struct device *dev = NULL;

	struct nd_dax *nd_dax;



	if (!is_nd_pmem(&nd_region->dev))

	if (!is_memory(&nd_region->dev))

		return NULL;



	nd_dax = nd_dax_alloc(nd_region);

drivers/nvdimm/dimm_devs.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int alias_dpa_busy(struct device *dev, void *data) 
	struct resource *res;

	int i;



	if (!is_nd_pmem(dev))

	if (!is_memory(dev))

		return 0;



	nd_region = to_nd_region(dev);