From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D33CC04E87 for ; Wed, 15 May 2019 12:09:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C86D420657 for ; Wed, 15 May 2019 12:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922141; bh=+IRaOdImXqku3mtR+U0O3ccsw4B39A+wBwxX/ebnjzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YwSftlnTL/1kUmrn7kd1l3qKrAowcdA9XnV9DeTYrFNT2gMTfmL+HEteLqX7vnI5d hQia2ILyWl2H0SvKquCroglcvwsGF7l5OYffqqtc4L+3VAMeGqm4+wGSOJmhv4NPET XiYA6gNmwsDETZtaxeULS6tCcCCBK5JiJeTE4VnM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728499AbfEOLII (ORCPT ); Wed, 15 May 2019 07:08:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:40250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727959AbfEOLIH (ORCPT ); Wed, 15 May 2019 07:08:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F68420644; Wed, 15 May 2019 11:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918486; bh=+IRaOdImXqku3mtR+U0O3ccsw4B39A+wBwxX/ebnjzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nvJOIK5EK1mkzjgO17kX7SX91kHa9zTbXkKf5H0N23k1NhddnSIUwzlmiIL/6l58K mThHGTxiTq/ucvTlNHKtKziDtcpe+ZQH5IeHmVGYpbYKvRWFUJouGPsDjFTIzx1FnK 3x4L430AaUILotrJ2TPgJSRGn1dfpTrG3+XJZfhM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joerg Roedel , Sasha Levin Subject: [PATCH 4.4 149/266] iommu/amd: Set exclusion range correctly Date: Wed, 15 May 2019 12:54:16 +0200 Message-Id: <20190515090727.954099751@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 3c677d206210f53a4be972211066c0f1cd47fe12 ] The exlcusion range limit register needs to contain the base-address of the last page that is part of the range, as bits 0-11 of this register are treated as 0xfff by the hardware for comparisons. So correctly set the exclusion range in the hardware to the last page which is _in_ the range. Fixes: b2026aa2dce44 ('x86, AMD IOMMU: add functions for programming IOMMU MMIO space') Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/amd_iommu_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 94f1bf772ec93..db85cc5791dce 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -295,7 +295,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val) static void iommu_set_exclusion_range(struct amd_iommu *iommu) { u64 start = iommu->exclusion_start & PAGE_MASK; - u64 limit = (start + iommu->exclusion_length) & PAGE_MASK; + u64 limit = (start + iommu->exclusion_length - 1) & PAGE_MASK; u64 entry; if (!iommu->exclusion_start) -- 2.20.1