Skip to content

Commit c8c2647

Browse files
shamiali2008oupton
authored andcommitted
arm64: Make  _midr_in_range_list() an exported function
Subsequent patch will add target implementation CPU support and that will require _midr_in_range_list() to access new data. To avoid exporting the data make _midr_in_range_list() a normal function and export it. No functional changes intended. Signed-off-by: Shameer Kolothum <[email protected]> Acked-by: Catalin Marinas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent c0000e5 commit c8c2647

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

arch/arm64/include/asm/cputype.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -276,20 +276,7 @@ static inline bool midr_is_cpu_model_range(u32 midr, u32 model, u32 rv_min,
276276
return _model == model && rv >= rv_min && rv <= rv_max;
277277
}
278278

279-
static inline bool is_midr_in_range(struct midr_range const *range)
280-
{
281-
return midr_is_cpu_model_range(read_cpuid_id(), range->model,
282-
range->rv_min, range->rv_max);
283-
}
284-
285-
static inline bool
286-
is_midr_in_range_list(struct midr_range const *ranges)
287-
{
288-
while (ranges->model)
289-
if (is_midr_in_range(ranges++))
290-
return true;
291-
return false;
292-
}
279+
bool is_midr_in_range_list(struct midr_range const *ranges);
293280

294281
static inline u64 __attribute_const__ read_cpuid_mpidr(void)
295282
{

arch/arm64/kernel/cpu_errata.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,21 @@
1414
#include <asm/kvm_asm.h>
1515
#include <asm/smp_plat.h>
1616

17+
static inline bool is_midr_in_range(struct midr_range const *range)
18+
{
19+
return midr_is_cpu_model_range(read_cpuid_id(), range->model,
20+
range->rv_min, range->rv_max);
21+
}
22+
23+
bool is_midr_in_range_list(struct midr_range const *ranges)
24+
{
25+
while (ranges->model)
26+
if (is_midr_in_range(ranges++))
27+
return true;
28+
return false;
29+
}
30+
EXPORT_SYMBOL_GPL(is_midr_in_range_list);
31+
1732
static bool __maybe_unused
1833
__is_affected_midr_range(const struct arm64_cpu_capabilities *entry,
1934
u32 midr, u32 revidr)

arch/arm64/kernel/image-vars.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ PROVIDE(__pi_arm64_sw_feature_override = arm64_sw_feature_override);
4949
PROVIDE(__pi_arm64_use_ng_mappings = arm64_use_ng_mappings);
5050
#ifdef CONFIG_CAVIUM_ERRATUM_27456
5151
PROVIDE(__pi_cavium_erratum_27456_cpus = cavium_erratum_27456_cpus);
52+
PROVIDE(__pi_is_midr_in_range_list = is_midr_in_range_list);
5253
#endif
5354
PROVIDE(__pi__ctype = _ctype);
5455
PROVIDE(__pi_memstart_offset_seed = memstart_offset_seed);

0 commit comments

Comments
 (0)