tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Revert "BACKPORT: FROMLIST: iommu/io-pgtable-arm: Add post table walker callback"

Browse Source 
This reverts commit b828a3c3b7.

This walker is not needed anymore.

Bug: 357781595
Bug: 384432312
Change-Id: I424784ea7ca168a7357f0517f938c3c73ae24add
Signed-off-by: Mostafa Saleh <smostafa@google.com>
This commit is contained in:
Mostafa Saleh
2025-01-29 13:59:57 +00:00
committed by Treehugger Robot
parent 299fef55ed
commit 136bd19c12
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/iommu/io-pgtable-arm-common.c
+1 -17
View File
@@ -569,16 +569,6 @@ static int visit_pgtable_walk(struct io_pgtable_walk_data *walk_data, int lvl,
return 0;
}
static void visit_pgtable_post_table(struct io_pgtable_walk_data *walk_data,
arm_lpae_iopte *ptep, int lvl)
{
struct io_pgtable_walk_common *walker = walk_data->data;
struct arm_lpae_io_pgtable_walk_data *data = walker->data;
if (data->visit_post_table)
data->visit_post_table(data, ptep, lvl);
}
static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova,
size_t size, struct io_pgtable_walk_common *walker)
{
@@ -586,7 +576,6 @@ static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova,
struct io_pgtable_walk_data walk_data = {
.data = walker,
.visit = visit_pgtable_walk,
.visit_post_table = visit_pgtable_post_table,
.addr = iova,
.end = iova + size,
};
@@ -602,7 +591,6 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data,
struct io_pgtable_cfg *cfg = &iop->cfg;
arm_lpae_iopte pte = READ_ONCE(*ptep);
struct io_pgtable_walk_common *walker = walk_data->data;
arm_lpae_iopte *old_ptep = ptep;
bool is_leaf, is_table;
size_t size = ARM_LPAE_BLOCK_SIZE(lvl, data);
@@ -630,12 +618,8 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data,
return -EINVAL;
ptep = iopte_deref(pte, data);
ret = __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1);
if (walk_data->visit_post_table)
walk_data->visit_post_table(walk_data, old_ptep, lvl);
return ret;
return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1);
}
int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data,
include/linux/io-pgtable-arm.h
-2
View File
@@ -23,8 +23,6 @@ struct io_pgtable_walk_data {
struct io_pgtable_walk_common *data;
int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl,
arm_lpae_iopte *ptep, size_t size);
void (*visit_post_table)(struct io_pgtable_walk_data *walk_data,
arm_lpae_iopte *ptep, int lvl);
unsigned long flags;
u64 addr;
const u64 end;
include/linux/io-pgtable.h
-2
View File
@@ -197,8 +197,6 @@ struct arm_lpae_io_pgtable_walk_data {
u64 ptes[4];
int level;
void *cookie;
void (*visit_post_table)(struct arm_lpae_io_pgtable_walk_data *data,
u64 *ptep, int lvl);
};
/**