libnvdimm/pfn: Prevent raw mode fallback if pfn-infoblock valid

[linux-2.6-microblaze.git] / drivers / nvdimm / pfn_devs.c

diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index b94f7a7..79fe02d 100644 (file)
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -561,14 +561,14 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
                        dev_dbg(&nd_pfn->dev, "align: %lx:%lx mode: %d:%d\n",
                                        nd_pfn->align, align, nd_pfn->mode,
                                        mode);
-                       return -EINVAL;
+                       return -EOPNOTSUPP;
                }
        }
 
        if (align > nvdimm_namespace_capacity(ndns)) {
                dev_err(&nd_pfn->dev, "alignment: %lx exceeds capacity %llx\n",
                                align, nvdimm_namespace_capacity(ndns));
-               return -EINVAL;
+               return -EOPNOTSUPP;
        }
 
        /*
@@ -581,7 +581,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
        if (offset >= resource_size(&nsio->res)) {
                dev_err(&nd_pfn->dev, "pfn array size exceeds capacity of %s\n",
                                dev_name(&ndns->dev));
-               return -EBUSY;
+               return -EOPNOTSUPP;
        }
 
        if ((align && !IS_ALIGNED(nsio->res.start + offset + start_pad, align))
@@ -589,7 +589,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
                dev_err(&nd_pfn->dev,
                                "bad offset: %#llx dax disabled align: %#lx\n",
                                offset, align);
-               return -ENXIO;
+               return -EOPNOTSUPP;
        }
 
        return 0;
@@ -750,7 +750,7 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn)
        start = nsio->res.start;
        size = resource_size(&nsio->res);
        npfns = PHYS_PFN(size - SZ_8K);
-       align = max(nd_pfn->align, (1UL << SUBSECTION_SHIFT));
+       align = max(nd_pfn->align, SUBSECTION_SIZE);
        end_trunc = start + size - ALIGN_DOWN(start + size, align);
        if (nd_pfn->mode == PFN_MODE_PMEM) {
                /*