From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752464AbbCWOXr (ORCPT ); Mon, 23 Mar 2015 10:23:47 -0400 Received: from 8bytes.org ([81.169.241.247]:35167 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100AbbCWOXp (ORCPT ); Mon, 23 Mar 2015 10:23:45 -0400 Date: Mon, 23 Mar 2015 15:23:41 +0100 From: Joerg Roedel To: Will Deacon Cc: Baptiste Reynal , "iommu@lists.linux-foundation.org" , "kvmarm@lists.cs.columbia.edu" , "tech@virtualopensystems.com" , "moderated list:ARM SMMU DRIVER" , open list Subject: Re: [PATCH v2 1/1] iommu/arm-smmu: fix ARM_SMMU_FEAT_TRANS_OPS condition Message-ID: <20150323142340.GA2226@8bytes.org> References: <1425484266-5449-1-git-send-email-b.reynal@virtualopensystems.com> <20150304183258.GN17250@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150304183258.GN17250@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 04, 2015 at 06:32:58PM +0000, Will Deacon wrote: > > - if (smmu->version == 1 || (!(id & ID0_ATOSNS) && (id & ID0_S1TS))) { > > + 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"); > > Acked-by: Will Deacon > > Sorry Joerg, but this is the latest in the drip of ARM SMMU fixes for > 4.0! Please pick it up with the rest. Applied to iommu/fixes, thanks.