From 072de836f53be56a70cecf70b43ae43b7ce17376 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 10:08:36 +0000
Subject: [PATCH] mk-rootfs.sh
---
kernel/drivers/iommu/io-pgtable.c | 75 +------------------------------------
1 files changed, 3 insertions(+), 72 deletions(-)
diff --git a/kernel/drivers/iommu/io-pgtable.c b/kernel/drivers/iommu/io-pgtable.c
index b720e39..94394c8 100644
--- a/kernel/drivers/iommu/io-pgtable.c
+++ b/kernel/drivers/iommu/io-pgtable.c
@@ -1,33 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-only
/*
* Generic page table allocator for IOMMUs.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright (C) 2014 ARM Limited
*
* Author: Will Deacon <will.deacon@arm.com>
*/
-#define pr_fmt(fmt) "io-pgtable: " fmt
-
#include <linux/bug.h>
#include <linux/io-pgtable.h>
#include <linux/kernel.h>
#include <linux/types.h>
-#include <linux/iommu.h>
-#include <linux/debugfs.h>
-#include <linux/atomic.h>
-#include <linux/module.h>
static const struct io_pgtable_init_fns *
io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] = {
@@ -36,16 +19,12 @@
[ARM_32_LPAE_S2] = &io_pgtable_arm_32_lpae_s2_init_fns,
[ARM_64_LPAE_S1] = &io_pgtable_arm_64_lpae_s1_init_fns,
[ARM_64_LPAE_S2] = &io_pgtable_arm_64_lpae_s2_init_fns,
+ [ARM_MALI_LPAE] = &io_pgtable_arm_mali_lpae_init_fns,
#endif
#ifdef CONFIG_IOMMU_IO_PGTABLE_ARMV7S
[ARM_V7S] = &io_pgtable_arm_v7s_init_fns,
#endif
-#ifdef CONFIG_IOMMU_IO_PGTABLE_FAST
- [ARM_V8L_FAST] = &io_pgtable_av8l_fast_init_fns,
-#endif
};
-
-static struct dentry *io_pgtable_top;
struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
struct io_pgtable_cfg *cfg,
@@ -84,56 +63,8 @@
if (!ops)
return;
- iop = container_of(ops, struct io_pgtable, ops);
+ iop = io_pgtable_ops_to_pgtable(ops);
io_pgtable_tlb_flush_all(iop);
io_pgtable_init_table[iop->fmt]->free(iop);
}
EXPORT_SYMBOL_GPL(free_io_pgtable_ops);
-
-static atomic_t pages_allocated;
-
-void *io_pgtable_alloc_pages_exact(struct io_pgtable_cfg *cfg, void *cookie,
- size_t size, gfp_t gfp_mask)
-{
- void *ret;
-
- if (cfg->tlb->alloc_pages_exact)
- ret = cfg->tlb->alloc_pages_exact(cookie, size, gfp_mask);
- else
- ret = alloc_pages_exact(size, gfp_mask);
-
- if (likely(ret))
- atomic_add(1 << get_order(size), &pages_allocated);
-
- return ret;
-}
-
-void io_pgtable_free_pages_exact(struct io_pgtable_cfg *cfg, void *cookie,
- void *virt, size_t size)
-{
- if (cfg->tlb->free_pages_exact)
- cfg->tlb->free_pages_exact(cookie, virt, size);
- else
- free_pages_exact(virt, size);
-
- atomic_sub(1 << get_order(size), &pages_allocated);
-}
-
-static int __init io_pgtable_init(void)
-{
- static const char io_pgtable_str[] __initconst = "io-pgtable";
- static const char pages_str[] __initconst = "pages";
-
- io_pgtable_top = debugfs_create_dir(io_pgtable_str, iommu_debugfs_top);
- debugfs_create_atomic_t(pages_str, 0600, io_pgtable_top,
- &pages_allocated);
- return 0;
-}
-
-static void __exit io_pgtable_exit(void)
-{
- debugfs_remove_recursive(io_pgtable_top);
-}
-
-module_init(io_pgtable_init);
-module_exit(io_pgtable_exit);
--
Gitblit v1.6.2