From patchwork Fri Jun 7 17:34:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Lane X-Patchwork-Id: 1112895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Mmbw6pXxz9s3l; Mon, 10 Jun 2019 18:33:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1haFjc-0003Qb-6b; Mon, 10 Jun 2019 08:32:56 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hZIlL-0006Cr-EF for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 17:34:47 +0000 Received: from mail-yw1-f72.google.com ([209.85.161.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hZIlK-0003fO-W4 for kernel-team@lists.ubuntu.com; Fri, 07 Jun 2019 17:34:47 +0000 Received: by mail-yw1-f72.google.com with SMTP id 77so2691724ywp.14 for ; Fri, 07 Jun 2019 10:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9gZkqg2xtAUXBefmDDtN0UATKOdGppsqCGStdX8EKCM=; b=oyzgMbcsVPsq4q3UWiM8/VTqXhYn+6GU8N6aEbaBdeGDgttQWzpGFZrjO3IBn0bxHi +Zq/bmGEmdA6fHpUhBOWT0CjrTmwGpjhj5Kw7aZcZ9LyGZF1CL5oP40pRKtwJGTjo7+n LYtxawAILmYY/vPi7tUD7D+yjfUV4y7dQFDWNX/M9FWJtwl4bHoH9srdgi27JIsM0SKK kKKYbfBmvz+PtIDuDv7o3w+/gqP4u0+wbDtBPEhGD7WizL+Aavsv1Kwz0Tr/0nhV8rwD YWwpYwxcwZx73WWnFkFNYe06GAq+f3pf8blh1Db6p/OxW2RFbvX3HKc3xWWSh8bDH2xd dk7w== X-Gm-Message-State: APjAAAV/BUyNm7h8Pt3J9QNWkxCUk87O174Zj/v12Xd4M5YH09qsK10o fVLk3hyFu8RnQF+pkwnQN0Ov2/SPKW7qVB+SMwA6TzdFVZ4Z+++mJHw3PEyz+gUg1ArBaP3QpKU ngAYRUMwtunhRPILZMrzsIkl6yrTAxhPzkZkUAFgR/w== X-Received: by 2002:a0d:d404:: with SMTP id w4mr15937493ywd.333.1559928885823; Fri, 07 Jun 2019 10:34:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOQwJTG0ZkPzgVJuZC1IMQ8aP47Pf4efk+aWGjztZXzp2pDkHsAxOyLSx7FJVBQRB/PlVY5A== X-Received: by 2002:a0d:d404:: with SMTP id w4mr15937474ywd.333.1559928885473; Fri, 07 Jun 2019 10:34:45 -0700 (PDT) Received: from galactica.lanes ([174.24.193.243]) by smtp.gmail.com with ESMTPSA id f3sm602429ywb.53.2019.06.07.10.34.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 10:34:44 -0700 (PDT) From: Jeff Lane To: kernel-team@lists.ubuntu.com Subject: [SRU][DISCO][PATCH] iommu/amd: Set exclusion range correctly Date: Fri, 7 Jun 2019 13:34:33 -0400 Message-Id: <20190607173433.32695-6-jeffrey.lane@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190607173433.32695-1-jeffrey.lane@canonical.com> References: <20190607173433.32695-1-jeffrey.lane@canonical.com> X-Mailman-Approved-At: Mon, 10 Jun 2019 08:32:51 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Joerg Roedel BugLink: https://bugs.launchpad.net/bugs/1823037 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 (cherry picked from commit 3c677d206210f53a4be972211066c0f1cd47fe12 5.2-rc1) Signed-off-by: Jeffrey Lane --- 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 84fa5b22371e..e8a2efe0afce 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -358,7 +358,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)