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

Commit 6e80ecdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm fixes from Dan Williams:
 "A crash fix and corresponding regression test enabling for the crash
  scenario. The unit test for this crash is available in ndctl-v58.2.

  This branch has received a build success notification from the
  0day-kbuild robot over 148 configs. The fix is tagged for -stable /
  backport to 4.13"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm, namespace: fix btt claim class crash
  tools/testing/nvdimm: disable labels for nfit_test.1
parents 4a704d6d 33a56086

drivers/nvdimm/namespace_devs.c

+9 −0
Original line number Diff line number Diff line
@@ -1417,6 +1417,15 @@ static int btt_claim_class(struct device *dev) 
		struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);

		struct nd_namespace_index *nsindex;



		/*

		 * If any of the DIMMs do not support labels the only

		 * possible BTT format is v1.

		 */

		if (!ndd) {

			loop_bitmask = 0;

			break;

		}



		nsindex = to_namespace_index(ndd, ndd->ns_current);

		if (nsindex == NULL)

			loop_bitmask |= 1;

tools/testing/nvdimm/test/nfit.c

+0 −3
Original line number Diff line number Diff line
@@ -1527,9 +1527,6 @@ static void nfit_test1_setup(struct nfit_test *t) 
	set_bit(ND_CMD_ARS_START, &acpi_desc->bus_cmd_force_en);

	set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_cmd_force_en);

	set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_cmd_force_en);

	set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_cmd_force_en);

	set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);

	set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);

}



static int nfit_test_blk_do_io(struct nd_blk_region *ndbr, resource_size_t dpa,