From patchwork Thu Mar 11 08:01:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1450985 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) 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 4Dx1d72rCmz9sWY; Thu, 11 Mar 2021 19:02:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lKGGu-0003FG-7q; Thu, 11 Mar 2021 08:02:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKGGr-0003Ea-UY for kernel-team@lists.ubuntu.com; Thu, 11 Mar 2021 08:02:13 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKGGr-00050k-MI for kernel-team@lists.ubuntu.com; Thu, 11 Mar 2021 08:02:13 +0000 Received: by mail-ej1-f71.google.com with SMTP id v10so8369687ejh.15 for ; Thu, 11 Mar 2021 00:02:13 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=PYqaNmglNFligUetpPB4HL5fuem4T+/6HFJES+XyGF0=; b=P7a7yjxQf6AJBifvYGFz6gtQ8wqRBzj6MNkgimch5f9OwqkePijXVKu67uPEy3NwgI icrrP4YhSgoaE8DAM7+fQ1Kd/RRDNlCmo/5eu7d1mijh3J9JZen/yf6BS57MOZ7pe5zN 0tcgPf9X9rZLXmzfw/bC2xkTzs5kS5SArYJwnKTKXMkdqzJjR/4wP4IOLB04/MpQud7Y SxHcFJNGFYdac+u5t1QI3pipXrM91CCFdJEYFzX24IZX6CljSkxtM8uI/z37WLto2IG2 51hYPEyxvkaEMPxRbGtPS9r8UuPavGOzCs/vSLJwuOSG7he/2vv266Pj3uy0ZxhmRocp SstQ== X-Gm-Message-State: AOAM530jgVQcuN5Fkqyc9qiLG+LKfY3nqPNAlEKhDu2wQJkUja2nUinV ySrcJsHXlUo8i2E2CktaDsYqiJmEVJtlGSM7mgJWudb5NAZ8GLqeLlLmS18vi8/Vy8JgOM9E6jY mXOf8VyUS7ZbMSAZ0MJmwebzcb0bZysTnCkdpQUJ3sA== X-Received: by 2002:a17:906:5918:: with SMTP id h24mr1874222ejq.501.1615449733358; Thu, 11 Mar 2021 00:02:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwg+Pgdg/03S1uczqoqVXNbDbeHoqbDF3FSAwGS3jYQ29pnVk8zATiZWx32PTnAUp+3sHblBA== X-Received: by 2002:a17:906:5918:: with SMTP id h24mr1874200ejq.501.1615449733146; Thu, 11 Mar 2021 00:02:13 -0800 (PST) Received: from xps-13-7390.homenet.telecomitalia.it (host-95-235-132-1.retail.telecomitalia.it. [95.235.132.1]) by smtp.gmail.com with ESMTPSA id k26sm865984ejx.81.2021.03.11.00.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 00:02:12 -0800 (PST) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/1] Revert "iommu/vt-d: Gracefully handle DMAR units with no supported address widths" Date: Thu, 11 Mar 2021 09:01:56 +0100 Message-Id: <20210311080155.47562-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210311080155.47562-1-andrea.righi@canonical.com> References: <20210311080155.47562-1-andrea.righi@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1918590 This reverts commit 561ef22a7d396289a1c5a1d18057ccdf9bb59826. It seems that this patch is addressing the problem correctly only with kernels >4.4. For now it is probably safer to simply drop this patch and revert this change in 4.4 to avoid introducing potential regressions. Signed-off-by: Andrea Righi --- drivers/iommu/dmar.c | 45 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 78174f2f9fafb..00169c9eb3eed 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -1012,8 +1012,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) { struct intel_iommu *iommu; u32 ver, sts; - int agaw = -1; - int msagaw = -1; + int agaw = 0; + int msagaw = 0; int err; if (!drhd->reg_base_addr) { @@ -1038,28 +1038,17 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) } err = -EINVAL; - if (cap_sagaw(iommu->cap) == 0) { - pr_info("%s: No supported address widths. Not attempting DMA translation.\n", - iommu->name); - drhd->ignored = 1; + agaw = iommu_calculate_agaw(iommu); + if (agaw < 0) { + pr_err("Cannot get a valid agaw for iommu (seq_id = %d)\n", + iommu->seq_id); + goto err_unmap; } - - if (!drhd->ignored) { - agaw = iommu_calculate_agaw(iommu); - if (agaw < 0) { - pr_err("Cannot get a valid agaw for iommu (seq_id = %d)\n", - iommu->seq_id); - drhd->ignored = 1; - } - } - if (!drhd->ignored) { - msagaw = iommu_calculate_max_sagaw(iommu); - if (msagaw < 0) { - pr_err("Cannot get a valid max agaw for iommu (seq_id = %d)\n", - iommu->seq_id); - drhd->ignored = 1; - agaw = -1; - } + msagaw = iommu_calculate_max_sagaw(iommu); + if (msagaw < 0) { + pr_err("Cannot get a valid max agaw for iommu (seq_id = %d)\n", + iommu->seq_id); + goto err_unmap; } iommu->agaw = agaw; iommu->msagaw = msagaw; @@ -1088,12 +1077,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) drhd->iommu = iommu; - /* - * This is only for hotplug; at boot time intel_iommu_enabled won't - * be set yet. When intel_iommu_init() runs, it registers the units - * present at boot time, then sets intel_iommu_enabled. - */ - if (intel_iommu_enabled && !drhd->ignored) + if (intel_iommu_enabled) iommu->iommu_dev = iommu_device_create(NULL, iommu, intel_iommu_groups, "%s", iommu->name); @@ -1111,8 +1095,7 @@ error: static void free_iommu(struct intel_iommu *iommu) { - if (intel_iommu_enabled && iommu->iommu_dev) - iommu_device_destroy(iommu->iommu_dev); + iommu_device_destroy(iommu->iommu_dev); if (iommu->irq) { if (iommu->pr_irq) {