From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Sep 2019 17:55:29 +0000 (-0700)
Subject: Merge tag 'libnvdimm-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6cb2e9ee51b5f1539f027346a02904e282b87d4d;p=linux.git

Merge tag 'libnvdimm-for-5.4' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull libnvdimm updates from Dan Williams:
 "Some reworks to better support nvdimms on powerpc and an nvdimm
  security interface update:

   - Rework the nvdimm core to accommodate architectures with different
     page sizes and ones that can change supported huge page sizes at
     boot time rather than a compile time constant.

   - Introduce a distinct 'frozen' attribute for the nvdimm security
     state since it is independent of the locked state.

   - Miscellaneous fixups"

* tag 'libnvdimm-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  libnvdimm: Use PAGE_SIZE instead of SZ_4K for align check
  libnvdimm/label: Remove the dpa align check
  libnvdimm/pfn_dev: Add page size and struct page size to pfn superblock
  libnvdimm/pfn_dev: Add a build check to make sure we notice when struct page size change
  libnvdimm/pmem: Advance namespace seed for specific probe errors
  libnvdimm/region: Rewrite _probe_success() to _advance_seeds()
  libnvdimm/security: Consolidate 'security' operations
  libnvdimm/security: Tighten scope of nvdimm->busy vs security operations
  libnvdimm/security: Introduce a 'frozen' attribute
  libnvdimm, region: Use struct_size() in kzalloc()
  tools/testing/nvdimm: Fix fallthrough warning
  libnvdimm/of_pmem: Provide a unique name for bus provider
---

6cb2e9ee51b5f1539f027346a02904e282b87d4d
diff --cc drivers/nvdimm/pfn_devs.c
index cb98b8fe786e2,ce9ef18282dd0..bb9cc5cf08738
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@@ -724,9 -751,10 +753,11 @@@ static int nd_pfn_init(struct nd_pfn *n
  	memcpy(pfn_sb->uuid, nd_pfn->uuid, 16);
  	memcpy(pfn_sb->parent_uuid, nd_dev_to_uuid(&ndns->dev), 16);
  	pfn_sb->version_major = cpu_to_le16(1);
- 	pfn_sb->version_minor = cpu_to_le16(3);
+ 	pfn_sb->version_minor = cpu_to_le16(4);
 +	pfn_sb->end_trunc = cpu_to_le32(end_trunc);
  	pfn_sb->align = cpu_to_le32(nd_pfn->align);
+ 	pfn_sb->page_struct_size = cpu_to_le16(MAX_STRUCT_PAGE_SIZE);
+ 	pfn_sb->page_size = cpu_to_le32(PAGE_SIZE);
  	checksum = nd_sb_checksum((struct nd_gen_sb *) pfn_sb);
  	pfn_sb->checksum = cpu_to_le64(checksum);