Skip to content

Commit 6e80ecd

Browse files
committed
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
2 parents 4a704d6 + 33a5608 commit 6e80ecd

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

drivers/nvdimm/namespace_devs.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,6 +1417,15 @@ static int btt_claim_class(struct device *dev)
14171417
struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
14181418
struct nd_namespace_index *nsindex;
14191419

1420+
/*
1421+
* If any of the DIMMs do not support labels the only
1422+
* possible BTT format is v1.
1423+
*/
1424+
if (!ndd) {
1425+
loop_bitmask = 0;
1426+
break;
1427+
}
1428+
14201429
nsindex = to_namespace_index(ndd, ndd->ns_current);
14211430
if (nsindex == NULL)
14221431
loop_bitmask |= 1;

tools/testing/nvdimm/test/nfit.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,9 +1527,6 @@ static void nfit_test1_setup(struct nfit_test *t)
15271527
set_bit(ND_CMD_ARS_START, &acpi_desc->bus_cmd_force_en);
15281528
set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_cmd_force_en);
15291529
set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_cmd_force_en);
1530-
set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_cmd_force_en);
1531-
set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
1532-
set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
15331530
}
15341531

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

0 commit comments

Comments
 (0)