From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42372 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932998AbbGHHYU (ORCPT ); Wed, 8 Jul 2015 03:24:20 -0400 Subject: Patch "iommu/arm-smmu: Fix broken ATOS check" has been added to the 4.1-stable tree To: will.deacon@arm.com, gregkh@linuxfoundation.org, jroedel@suse.de, varun.sethi@freescale.com Cc: , From: Date: Wed, 08 Jul 2015 00:24:14 -0700 Message-ID: <1436340254254227@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/arm-smmu: Fix broken ATOS check to the 4.1-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-arm-smmu-fix-broken-atos-check.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d38f0ff9ab35414644995bae187d015c31aae19c Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 29 Jun 2015 17:47:42 +0100 Subject: iommu/arm-smmu: Fix broken ATOS check From: Will Deacon commit d38f0ff9ab35414644995bae187d015c31aae19c upstream. Commit 83a60ed8f0b5 ("iommu/arm-smmu: fix ARM_SMMU_FEAT_TRANS_OPS condition") accidentally negated the ID0_ATOSNS predicate in the ATOS feature check, causing the driver to attempt ATOS requests on SMMUv2 hardware without the ATOS feature implemented. This patch restores the predicate to the correct value. Reported-by: Varun Sethi Signed-off-by: Will Deacon Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1567,7 +1567,7 @@ static int arm_smmu_device_cfg_probe(str return -ENODEV; } - if ((id & ID0_S1TS) && ((smmu->version == 1) || (id & ID0_ATOSNS))) { + if ((id & ID0_S1TS) && ((smmu->version == 1) || !(id & ID0_ATOSNS))) { smmu->features |= ARM_SMMU_FEAT_TRANS_OPS; dev_notice(smmu->dev, "\taddress translation ops\n"); } Patches currently in stable-queue which might be from will.deacon@arm.com are queue-4.1/iommu-arm-smmu-fix-broken-atos-check.patch