Skip to content

Commit

Permalink
powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code
Browse files Browse the repository at this point in the history
rfi_flush_enable() includes a check to see if we're already
enabled (or disabled), and in that case does nothing.

But that means calling setup_rfi_flush() a 2nd time doesn't actually
work, which is a bit confusing.

Move that check into the debugfs code, where it really belongs.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Mar 27, 2018
1 parent ac96588 commit 1e2a9fc
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions arch/powerpc/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -846,9 +846,6 @@ static void do_nothing(void *unused)

void rfi_flush_enable(bool enable)
{
if (rfi_flush == enable)
return;

if (enable) {
do_rfi_flush_fixups(enabled_flush_types);
on_each_cpu(do_nothing, NULL, 1);
Expand Down Expand Up @@ -902,13 +899,19 @@ void __init setup_rfi_flush(enum l1d_flush_type types, bool enable)
#ifdef CONFIG_DEBUG_FS
static int rfi_flush_set(void *data, u64 val)
{
bool enable;

if (val == 1)
rfi_flush_enable(true);
enable = true;
else if (val == 0)
rfi_flush_enable(false);
enable = false;
else
return -EINVAL;

/* Only do anything if we're changing state */
if (enable != rfi_flush)
rfi_flush_enable(enable);

return 0;
}

Expand Down

0 comments on commit 1e2a9fc

Please sign in to comment.