From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35702 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148AbcKQIRq (ORCPT ); Thu, 17 Nov 2016 03:17:46 -0500 Subject: Patch "iommu/io-pgtable-arm: Check for v7s-incapable systems" has been added to the 4.8-stable tree To: robin.murphy@arm.com, eric.auger@redhat.com, gregkh@linuxfoundation.org, will.deacon@arm.com Cc: , From: Date: Thu, 17 Nov 2016 09:17:46 +0100 Message-ID: <147937066654150@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled iommu/io-pgtable-arm: Check for v7s-incapable systems to the 4.8-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: iommu-io-pgtable-arm-check-for-v7s-incapable-systems.patch and it can be found in the queue-4.8 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 82db33dc5e49fb625262d81125625d07a0d6184e Mon Sep 17 00:00:00 2001 From: Robin Murphy Date: Tue, 13 Sep 2016 18:02:02 +0100 Subject: iommu/io-pgtable-arm: Check for v7s-incapable systems From: Robin Murphy commit 82db33dc5e49fb625262d81125625d07a0d6184e upstream. On machines with no 32-bit addressable RAM whatsoever, we shouldn't even touch the v7s format as it's never going to work. Fixes: e5fc9753b1a8 ("iommu/io-pgtable: Add ARMv7 short descriptor support") Reported-by: Eric Auger Tested-by: Eric Auger Signed-off-by: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/io-pgtable-arm-v7s.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -633,6 +633,10 @@ static struct io_pgtable *arm_v7s_alloc_ { struct arm_v7s_io_pgtable *data; +#ifdef PHYS_OFFSET + if (upper_32_bits(PHYS_OFFSET)) + return NULL; +#endif if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS) return NULL; Patches currently in stable-queue which might be from robin.murphy@arm.com are queue-4.8/iommu-io-pgtable-arm-check-for-v7s-incapable-systems.patch