From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752793AbbHTW1t (ORCPT ); Thu, 20 Aug 2015 18:27:49 -0400 Received: from mga01.intel.com ([192.55.52.88]:26374 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbbHTW1r (ORCPT ); Thu, 20 Aug 2015 18:27:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,717,1432623600"; d="scan'208";a="545673496" From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org, linux-nvdimm@ml01.01.org, Nicholas Moulin , Dan Williams Subject: [PATCH] nfit, nd_blk: BLK status register is only 32 bits Date: Thu, 20 Aug 2015 16:27:38 -0600 Message-Id: <1440109658-29164-1-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only read 32 bits for the BLK status register in read_blk_stat(). The format and size of this register is defined in the "NVDIMM Driver Writer's guide": http://pmem.io/documents/NVDIMM_Driver_Writers_Guide.pdf Signed-off-by: Ross Zwisler Reported-by: Nicholas Moulin --- drivers/acpi/nfit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index 7c2638f..8689ee1 100644 --- a/drivers/acpi/nfit.c +++ b/drivers/acpi/nfit.c @@ -1009,7 +1009,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; @@ -1017,7 +1017,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, -- 2.1.0