src/: Remove g_ prefixes and _g suffixes from variables

These were often used to distinguish CAR_GLOBAL variables that weren't
directly usable. Since we're getting rid of this special case, also get
rid of the marker.

This change was created using coccinelle and the following script:
	@match@
	type T;
	identifier old =~ "^(g_.*|.*_g)$";
	@@
	old

	@script:python global_marker@
	old << match.old;
	new;
	@@
	new = old
	if old[0:2] == "g_":
	  new = new[2:]

	if new[-2:] == "_g":
	  new = new[:-2]

	coccinelle.new = new

	@@
	identifier match.old, global_marker.new;
	@@
	- old
	+ new

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old;
	+ T new;

	@@
	type T;
	identifier match.old, global_marker.new;
	@@
	- T old
	+ T new
	 = ...;

There were some manual fixups: Some code still uses the global/local
variable naming scheme, so keep g_* there, and some variable names
weren't completely rewritten.

Change-Id: I4936ff9780a0d3ed9b8b539772bc48887f8d5eed
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37358
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
This commit is contained in:
Patrick Georgi
2019-11-29 11:47:47 +01:00
parent ae64f22e8d
commit c9b13594eb
17 changed files with 301 additions and 298 deletions

View File

@@ -19,8 +19,8 @@
#include <commonlib/helpers.h>
#include <delay.h>
static u32 g_timer_fsb;
static u32 g_timer_tsc;
static u32 timer_fsb;
static u32 timer_tsc;
/* This is not an architectural MSR. */
#define MSR_PLATFORM_INFO 0xce
@@ -98,8 +98,8 @@ static void resolve_timebase(void)
ret = get_fsb_tsc(&fsb, &ratio);
if (ret == 0) {
u32 tsc = 100 * DIV_ROUND_CLOSEST(ratio * fsb, 100);
g_timer_fsb = fsb;
g_timer_tsc = tsc;
timer_fsb = fsb;
timer_tsc = tsc;
return;
}
@@ -109,27 +109,27 @@ static void resolve_timebase(void)
printk(BIOS_ERR, "CPU not supported\n");
/* Set some semi-ridiculous defaults. */
g_timer_fsb = 500;
g_timer_tsc = 5000;
timer_fsb = 500;
timer_tsc = 5000;
return;
}
u32 get_timer_fsb(void)
{
if (g_timer_fsb > 0)
return g_timer_fsb;
if (timer_fsb > 0)
return timer_fsb;
resolve_timebase();
return g_timer_fsb;
return timer_fsb;
}
unsigned long tsc_freq_mhz(void)
{
if (g_timer_tsc > 0)
return g_timer_tsc;
if (timer_tsc > 0)
return timer_tsc;
resolve_timebase();
return g_timer_tsc;
return timer_tsc;
}
/**

View File

@@ -62,7 +62,7 @@ static struct monotonic_counter {
int initialized;
struct mono_time time;
uint32_t last_value;
} mono_counter_g;
} mono_counter;
void timer_monotonic_get(struct mono_time *mt)
{
@@ -70,7 +70,7 @@ void timer_monotonic_get(struct mono_time *mt)
uint32_t usecs_elapsed;
uint32_t timer_fsb;
if (!mono_counter_g.initialized) {
if (!mono_counter.initialized) {
init_timer();
timer_fsb = get_timer_fsb();
/* An FSB frequency of 200Mhz provides a 20 second polling
@@ -80,22 +80,22 @@ void timer_monotonic_get(struct mono_time *mt)
printk(BIOS_WARNING,
"apic timer freq (%d) may be too fast.\n",
timer_fsb);
mono_counter_g.last_value = lapic_read(LAPIC_TMCCT);
mono_counter_g.initialized = 1;
mono_counter.last_value = lapic_read(LAPIC_TMCCT);
mono_counter.initialized = 1;
}
timer_fsb = get_timer_fsb();
current_tick = lapic_read(LAPIC_TMCCT);
/* Note that the APIC timer counts down. */
usecs_elapsed = (mono_counter_g.last_value - current_tick) / timer_fsb;
usecs_elapsed = (mono_counter.last_value - current_tick) / timer_fsb;
/* Update current time and tick values only if a full tick occurred. */
if (usecs_elapsed) {
mono_time_add_usecs(&mono_counter_g.time, usecs_elapsed);
mono_counter_g.last_value = current_tick;
mono_time_add_usecs(&mono_counter.time, usecs_elapsed);
mono_counter.last_value = current_tick;
}
/* Save result. */
*mt = mono_counter_g.time;
*mt = mono_counter.time;
}
#endif

View File

@@ -48,7 +48,7 @@ static struct monotonic_counter {
int initialized;
struct mono_time time;
uint64_t last_value;
} mono_counter_g;
} mono_counter;
void timer_monotonic_get(struct mono_time *mt)
{
@@ -56,14 +56,14 @@ void timer_monotonic_get(struct mono_time *mt)
uint64_t ticks_elapsed;
unsigned long ticks_per_usec;
if (!mono_counter_g.initialized) {
if (!mono_counter.initialized) {
init_timer();
mono_counter_g.last_value = rdtscll();
mono_counter_g.initialized = 1;
mono_counter.last_value = rdtscll();
mono_counter.initialized = 1;
}
current_tick = rdtscll();
ticks_elapsed = current_tick - mono_counter_g.last_value;
ticks_elapsed = current_tick - mono_counter.last_value;
ticks_per_usec = tsc_freq_mhz();
/* Update current time and tick values only if a full tick occurred. */
@@ -71,11 +71,11 @@ void timer_monotonic_get(struct mono_time *mt)
uint64_t usecs_elapsed;
usecs_elapsed = ticks_elapsed / ticks_per_usec;
mono_time_add_usecs(&mono_counter_g.time, (long)usecs_elapsed);
mono_counter_g.last_value = current_tick;
mono_time_add_usecs(&mono_counter.time, (long)usecs_elapsed);
mono_counter.last_value = current_tick;
}
/* Save result. */
*mt = mono_counter_g.time;
*mt = mono_counter.time;
}
#endif