Commit f045fd75 authored Aug 25, 2015 by Linus Torvalds

nvdimm

Pull nvdimm fix from Dan Williams:
 "A single fix for status register read size in the nd_blk driver.

  The effect of getting the width of this register read wrong is that
  all I/O fails when the read returns non-zero.  Given the availability
  of ACPI 6 NFIT enabled platforms, this could reasonably wait to come
  in during the 4.3 merge window with a tag for 4.2-stable.  Otherwise,
  this makes the 4.2 kernel fully functional with devices that conform
  to the mmio-block-apertures defined in the ACPI 6 NFIT (NVDIMM
  Firmware Interface Table)"

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nfit, nd_blk: BLK status register is only 32 bits

parents b1713b13 de4a196c

drivers/acpi/nfit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1024,7 +1024,7 @@ static void wmb_blk(struct nfit_blk *nfit_blk)
		wmb_pmem();
		}

		static u64 read_blk_stat(struct nfit_blk *nfit_blk, unsigned int bw)
		static u32 read_blk_stat(struct nfit_blk *nfit_blk, unsigned int bw)
		{
		struct nfit_blk_mmio *mmio = &nfit_blk->mmio[DCR];
		u64 offset = nfit_blk->stat_offset + mmio->size * bw;
		@@ -1032,7 +1032,7 @@ static u64 read_blk_stat(struct nfit_blk *nfit_blk, unsigned int bw)
		if (mmio->num_lines)
		offset = to_interleave_offset(offset, mmio);

		return readq(mmio->base + offset);
		return readl(mmio->base + offset);
		}

		static void write_blk_ctl(struct nfit_blk *nfit_blk, unsigned int bw,