From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Steve Wahl <steve.wahl@hpe.com>, Kevin Tian <kevin.tian@intel.com> Cc: David Woodhouse <dwmw2@infradead.org>, Jerry Snitselaar <jsnitsel@redhat.com>, Mike Travis <mike.travis@hpe.com>, Dimitri Sivanich <sivanich@hpe.com>, Russ Anderson <russ.anderson@hpe.com>, iommu@lists.linux.dev, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com> Subject: [PATCH v1 5/6] iommu/vt-d: Remove global g_iommus array Date: Sat, 25 Jun 2022 20:52:03 +0800 [thread overview] Message-ID: <20220625125204.2199437-6-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220625125204.2199437-1-baolu.lu@linux.intel.com> The g_iommus is not used anywhere. Remove it to avoid dead code. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/iommu/intel/iommu.c | 42 ------------------------------------- 1 file changed, 42 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index f6d7055cffd7..9a284394b2c5 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -126,9 +126,6 @@ static inline unsigned long virt_to_dma_pfn(void *p) return page_to_dma_pfn(virt_to_page(p)); } -/* global iommu list, set NULL for ignored DMAR units */ -static struct intel_iommu **g_iommus; - static void __init check_tylersburg_isoch(void); static int rwbf_quirk; @@ -287,9 +284,6 @@ static LIST_HEAD(dmar_satc_units); #define for_each_rmrr_units(rmrr) \ list_for_each_entry(rmrr, &dmar_rmrr_units, list) -/* bitmap for indexing intel_iommus */ -static int g_num_of_iommus; - static void dmar_remove_one_dev_info(struct device *dev); int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); @@ -1694,7 +1688,6 @@ static void free_dmar_iommu(struct intel_iommu *iommu) iommu->domain_ids = NULL; } - g_iommus[iommu->seq_id] = NULL; iommu->flags &= ~VTD_FLAG_IOMMU_PROBED; /* free context mapping */ @@ -2899,36 +2892,6 @@ static int __init init_dmars(void) struct intel_iommu *iommu; int ret; - /* - * for each drhd - * allocate root - * initialize and program root entry to not present - * endfor - */ - for_each_drhd_unit(drhd) { - /* - * lock not needed as this is only incremented in the single - * threaded kernel __init code path all other access are read - * only - */ - if (g_num_of_iommus < DMAR_UNITS_SUPPORTED) { - g_num_of_iommus++; - continue; - } - pr_err_once("Exceeded %d IOMMUs\n", DMAR_UNITS_SUPPORTED); - } - - /* Preallocate enough resources for IOMMU hot-addition */ - if (g_num_of_iommus < DMAR_UNITS_SUPPORTED) - g_num_of_iommus = DMAR_UNITS_SUPPORTED; - - g_iommus = kcalloc(g_num_of_iommus, sizeof(struct intel_iommu *), - GFP_KERNEL); - if (!g_iommus) { - ret = -ENOMEM; - goto error; - } - ret = intel_cap_audit(CAP_AUDIT_STATIC_DMAR, NULL); if (ret) goto free_iommu; @@ -2951,7 +2914,6 @@ static int __init init_dmars(void) intel_pasid_max_id); } - g_iommus[iommu->seq_id] = iommu; iommu->flags |= VTD_FLAG_IOMMU_PROBED; intel_iommu_init_qi(iommu); @@ -3079,9 +3041,6 @@ static int __init init_dmars(void) free_dmar_iommu(iommu); } - kfree(g_iommus); - -error: return ret; } @@ -3488,7 +3447,6 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru) if (iommu->gcmd & DMA_GCMD_TE) iommu_disable_translation(iommu); - g_iommus[iommu->seq_id] = iommu; iommu->flags |= VTD_FLAG_IOMMU_PROBED; ret = iommu_init_domains(iommu); if (ret == 0) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Lu Baolu <baolu.lu@linux.intel.com> To: Joerg Roedel <joro@8bytes.org>, Steve Wahl <steve.wahl@hpe.com>, Kevin Tian <kevin.tian@intel.com> Cc: Dimitri Sivanich <sivanich@hpe.com>, Russ Anderson <russ.anderson@hpe.com>, Mike Travis <mike.travis@hpe.com>, Jerry Snitselaar <jsnitsel@redhat.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, David Woodhouse <dwmw2@infradead.org> Subject: [PATCH v1 5/6] iommu/vt-d: Remove global g_iommus array Date: Sat, 25 Jun 2022 20:52:03 +0800 [thread overview] Message-ID: <20220625125204.2199437-6-baolu.lu@linux.intel.com> (raw) In-Reply-To: <20220625125204.2199437-1-baolu.lu@linux.intel.com> The g_iommus is not used anywhere. Remove it to avoid dead code. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> --- drivers/iommu/intel/iommu.c | 42 ------------------------------------- 1 file changed, 42 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index f6d7055cffd7..9a284394b2c5 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -126,9 +126,6 @@ static inline unsigned long virt_to_dma_pfn(void *p) return page_to_dma_pfn(virt_to_page(p)); } -/* global iommu list, set NULL for ignored DMAR units */ -static struct intel_iommu **g_iommus; - static void __init check_tylersburg_isoch(void); static int rwbf_quirk; @@ -287,9 +284,6 @@ static LIST_HEAD(dmar_satc_units); #define for_each_rmrr_units(rmrr) \ list_for_each_entry(rmrr, &dmar_rmrr_units, list) -/* bitmap for indexing intel_iommus */ -static int g_num_of_iommus; - static void dmar_remove_one_dev_info(struct device *dev); int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); @@ -1694,7 +1688,6 @@ static void free_dmar_iommu(struct intel_iommu *iommu) iommu->domain_ids = NULL; } - g_iommus[iommu->seq_id] = NULL; iommu->flags &= ~VTD_FLAG_IOMMU_PROBED; /* free context mapping */ @@ -2899,36 +2892,6 @@ static int __init init_dmars(void) struct intel_iommu *iommu; int ret; - /* - * for each drhd - * allocate root - * initialize and program root entry to not present - * endfor - */ - for_each_drhd_unit(drhd) { - /* - * lock not needed as this is only incremented in the single - * threaded kernel __init code path all other access are read - * only - */ - if (g_num_of_iommus < DMAR_UNITS_SUPPORTED) { - g_num_of_iommus++; - continue; - } - pr_err_once("Exceeded %d IOMMUs\n", DMAR_UNITS_SUPPORTED); - } - - /* Preallocate enough resources for IOMMU hot-addition */ - if (g_num_of_iommus < DMAR_UNITS_SUPPORTED) - g_num_of_iommus = DMAR_UNITS_SUPPORTED; - - g_iommus = kcalloc(g_num_of_iommus, sizeof(struct intel_iommu *), - GFP_KERNEL); - if (!g_iommus) { - ret = -ENOMEM; - goto error; - } - ret = intel_cap_audit(CAP_AUDIT_STATIC_DMAR, NULL); if (ret) goto free_iommu; @@ -2951,7 +2914,6 @@ static int __init init_dmars(void) intel_pasid_max_id); } - g_iommus[iommu->seq_id] = iommu; iommu->flags |= VTD_FLAG_IOMMU_PROBED; intel_iommu_init_qi(iommu); @@ -3079,9 +3041,6 @@ static int __init init_dmars(void) free_dmar_iommu(iommu); } - kfree(g_iommus); - -error: return ret; } @@ -3488,7 +3447,6 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru) if (iommu->gcmd & DMA_GCMD_TE) iommu_disable_translation(iommu); - g_iommus[iommu->seq_id] = iommu; iommu->flags |= VTD_FLAG_IOMMU_PROBED; ret = iommu_init_domains(iommu); if (ret == 0) -- 2.25.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2022-06-25 12:56 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-25 12:51 [PATCH v1 0/6] iommu/vt-d: Reset DMAR_UNITS_SUPPORTED Lu Baolu 2022-06-25 12:51 ` Lu Baolu 2022-06-25 12:51 ` [PATCH v1 1/6] iommu/vt-d: Remove unused domain_get_iommu() Lu Baolu 2022-06-25 12:51 ` Lu Baolu 2022-06-30 8:19 ` Tian, Kevin 2022-06-30 8:19 ` Tian, Kevin 2022-06-25 12:52 ` [PATCH v1 2/6] iommu/vt-d: Use IDA interface to manage iommu sequence id Lu Baolu 2022-06-25 12:52 ` Lu Baolu 2022-06-30 8:21 ` Tian, Kevin 2022-06-30 8:21 ` Tian, Kevin 2022-07-01 1:17 ` Lu Baolu 2022-07-01 1:17 ` Lu Baolu 2022-06-25 12:52 ` [PATCH v1 3/6] iommu/vt-d: Refactor iommu information of each domain Lu Baolu 2022-06-25 12:52 ` Lu Baolu 2022-06-30 8:28 ` Tian, Kevin 2022-06-30 8:28 ` Tian, Kevin 2022-07-01 2:35 ` Lu Baolu 2022-07-01 2:35 ` Lu Baolu 2022-06-25 12:52 ` [PATCH v1 4/6] iommu/vt-d: Add VTD_FLAG_IOMMU_PROBED flag Lu Baolu 2022-06-25 12:52 ` Lu Baolu 2022-06-30 8:29 ` Tian, Kevin 2022-06-30 8:29 ` Tian, Kevin 2022-07-01 3:13 ` Baolu Lu 2022-07-01 3:13 ` Baolu Lu 2022-07-01 6:09 ` Tian, Kevin 2022-07-01 6:09 ` Tian, Kevin 2022-06-25 12:52 ` Lu Baolu [this message] 2022-06-25 12:52 ` [PATCH v1 5/6] iommu/vt-d: Remove global g_iommus array Lu Baolu 2022-06-30 8:29 ` Tian, Kevin 2022-06-30 8:29 ` Tian, Kevin 2022-06-25 12:52 ` [PATCH v1 6/6] iommu/vt-d: Make DMAR_UNITS_SUPPORTED default 1024 Lu Baolu 2022-06-25 12:52 ` Lu Baolu 2022-06-30 8:30 ` Tian, Kevin 2022-06-30 8:30 ` Tian, Kevin 2022-06-28 12:39 ` [PATCH v1 0/6] iommu/vt-d: Reset DMAR_UNITS_SUPPORTED Baolu Lu 2022-06-28 12:39 ` Baolu Lu 2022-07-06 18:55 ` Steve Wahl
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220625125204.2199437-6-baolu.lu@linux.intel.com \ --to=baolu.lu@linux.intel.com \ --cc=dwmw2@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=iommu@lists.linux.dev \ --cc=joro@8bytes.org \ --cc=jsnitsel@redhat.com \ --cc=kevin.tian@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mike.travis@hpe.com \ --cc=russ.anderson@hpe.com \ --cc=sivanich@hpe.com \ --cc=steve.wahl@hpe.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.