Skip to content

Commit

Permalink
xtensa: use fallback for random_get_entropy() instead of zero
Browse files Browse the repository at this point in the history
In the event that random_get_entropy() can't access a cycle counter or
similar, falling back to returning 0 is really not the best we can do.
Instead, at least calling random_get_entropy_fallback() would be
preferable, because that always needs to return _something_, even
falling back to jiffies eventually. It's not as though
random_get_entropy_fallback() is super high precision or guaranteed to
be entropic, but basically anything that's not zero all the time is
better than returning zero all the time.

This is accomplished by just including the asm-generic code like on
other architectures, which means we can get rid of the empty stub
function here.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  • Loading branch information
zx2c4 committed May 13, 2022
1 parent ac9756c commit e10e2f5
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/xtensa/include/asm/timex.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@

extern unsigned long ccount_freq;

typedef unsigned long long cycles_t;

#define get_cycles() (0)

void local_timer_setup(unsigned cpu);

/*
Expand All @@ -59,4 +55,6 @@ static inline void set_linux_timer (unsigned long ccompare)
xtensa_set_sr(ccompare, SREG_CCOMPARE + LINUX_TIMER);
}

#include <asm-generic/timex.h>

#endif /* _XTENSA_TIMEX_H */

0 comments on commit e10e2f5

Please sign in to comment.