Skip to contentSkip to conversation

Patch "iommu/io-pgtable-arm: Check for v7s-incapable systems" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 17, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

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 <[email protected]> know about it.

Quoted 1 line

From 82db33dc5e49fb625262d81125625d07a0d6184e Mon Sep 17 00:00:00 2001

From: Robin Murphy <[email protected]>
Date: Tue, 13 Sep 2016 18:02:02 +0100
Subject: iommu/io-pgtable-arm: Check for v7s-incapable systems

From: Robin Murphy <[email protected]>

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")
---
 drivers/iommu/io-pgtable-arm-v7s.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/iommu/io-pgtable-arm-v7s.c +4 -0
@@ -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 [email protected] are

queue-4.8/iommu-io-pgtable-arm-check-for-v7s-incapable-systems.patch