[PATCH 17/24] exec: Declare tlb_set_page() in 'exec/cputlb.h'

Philippe Mathieu-Daudé posted 24 patches 1 week, 2 days ago
[PATCH 17/24] exec: Declare tlb_set_page() in 'exec/cputlb.h'
Posted by Philippe Mathieu-Daudé 1 week, 2 days ago
Move CPU TLB related methods to "exec/cputlb.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/exec/cputlb.h   | 11 +++++++++++
 include/exec/exec-all.h |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h
index ae4798a017..9075d94ec5 100644
--- a/include/exec/cputlb.h
+++ b/include/exec/cputlb.h
@@ -108,4 +108,15 @@ void tlb_set_page_with_attrs(CPUState *cpu, vaddr addr,
                              hwaddr paddr, MemTxAttrs attrs,
                              int prot, int mmu_idx, vaddr size);
 
+/**
+ * tlb_set_page:
+ *
+ * This function is equivalent to calling tlb_set_page_with_attrs()
+ * with an @attrs argument of MEMTXATTRS_UNSPECIFIED. It's provided
+ * as a convenience for CPUs which don't use memory transaction attributes.
+ */
+void tlb_set_page(CPUState *cpu, vaddr addr,
+                  hwaddr paddr, int prot,
+                  int mmu_idx, vaddr size);
+
 #endif
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index 2b314d658b..2e58540005 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -174,15 +174,6 @@ void tlb_flush_range_by_mmuidx_all_cpus_synced(CPUState *cpu,
                                                uint16_t idxmap,
                                                unsigned bits);
 
-/* tlb_set_page:
- *
- * This function is equivalent to calling tlb_set_page_with_attrs()
- * with an @attrs argument of MEMTXATTRS_UNSPECIFIED. It's provided
- * as a convenience for CPUs which don't use memory transaction attributes.
- */
-void tlb_set_page(CPUState *cpu, vaddr addr,
-                  hwaddr paddr, int prot,
-                  int mmu_idx, vaddr size);
 #else
 static inline void tlb_flush_page(CPUState *cpu, vaddr addr)
 {
-- 
2.45.2


Re: [PATCH 17/24] exec: Declare tlb_set_page() in 'exec/cputlb.h'
Posted by Pierrick Bouvier 1 week, 2 days ago
On 11/13/24 17:13, Philippe Mathieu-Daudé wrote:
> Move CPU TLB related methods to "exec/cputlb.h".
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/exec/cputlb.h   | 11 +++++++++++
>   include/exec/exec-all.h |  9 ---------
>   2 files changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h
> index ae4798a017..9075d94ec5 100644
> --- a/include/exec/cputlb.h
> +++ b/include/exec/cputlb.h
> @@ -108,4 +108,15 @@ void tlb_set_page_with_attrs(CPUState *cpu, vaddr addr,
>                                hwaddr paddr, MemTxAttrs attrs,
>                                int prot, int mmu_idx, vaddr size);
>   
> +/**
> + * tlb_set_page:
> + *
> + * This function is equivalent to calling tlb_set_page_with_attrs()
> + * with an @attrs argument of MEMTXATTRS_UNSPECIFIED. It's provided
> + * as a convenience for CPUs which don't use memory transaction attributes.
> + */
> +void tlb_set_page(CPUState *cpu, vaddr addr,
> +                  hwaddr paddr, int prot,
> +                  int mmu_idx, vaddr size);
> +
>   #endif
> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
> index 2b314d658b..2e58540005 100644
> --- a/include/exec/exec-all.h
> +++ b/include/exec/exec-all.h
> @@ -174,15 +174,6 @@ void tlb_flush_range_by_mmuidx_all_cpus_synced(CPUState *cpu,
>                                                  uint16_t idxmap,
>                                                  unsigned bits);
>   
> -/* tlb_set_page:
> - *
> - * This function is equivalent to calling tlb_set_page_with_attrs()
> - * with an @attrs argument of MEMTXATTRS_UNSPECIFIED. It's provided
> - * as a convenience for CPUs which don't use memory transaction attributes.
> - */
> -void tlb_set_page(CPUState *cpu, vaddr addr,
> -                  hwaddr paddr, int prot,
> -                  int mmu_idx, vaddr size);
>   #else
>   static inline void tlb_flush_page(CPUState *cpu, vaddr addr)
>   {

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>