Skip to content
/ linux Public
forked from torvalds/linux

Commit

Permalink
amba: Retry adding deferred devices at late_initcall
Browse files Browse the repository at this point in the history
If amba bus devices defer when adding, the amba bus code simply retries
adding the devices every 5 seconds. This doesn't work well as it
completely unsynchronized with starting the init process which can
happen in less than 5 secs. Add a retry during late_initcall. If the
amba devices are added, then deferred probe takes over. If the
dependencies have not probed at this point, then there's no improvement
over previous behavior. To completely solve this, we'd need to retry
after every successful probe as deferred probe does.

The list_empty() check now happens outside the mutex, but the mutex
wasn't necessary in the first place.

This needed to use deferred probe instead of fragile initcall ordering
on 32-bit VExpress systems where the apb_pclk has a number of probe
dependencies (vexpress-sysregs, vexpress-config).

Cc: John Stultz <[email protected]>
Cc: Saravana Kannan <[email protected]>
Cc: Nicolas Saenz Julienne <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Russell King <[email protected]>
Tested-by: Sudeep Holla <[email protected]>
Reviewed-by: Sudeep Holla <[email protected]>
Reviewed-by: Linus Walleij <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
  • Loading branch information
robherring committed May 5, 2020
1 parent 6aec54a commit 039599c
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions drivers/amba/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ static DECLARE_DELAYED_WORK(deferred_retry_work, amba_deferred_retry_func);

#define DEFERRED_DEVICE_TIMEOUT (msecs_to_jiffies(5 * 1000))

static void amba_deferred_retry_func(struct work_struct *dummy)
static int amba_deferred_retry(void)
{
struct deferred_device *ddev, *tmp;

Expand All @@ -521,11 +521,19 @@ static void amba_deferred_retry_func(struct work_struct *dummy)
kfree(ddev);
}

mutex_unlock(&deferred_devices_lock);

return 0;
}
late_initcall(amba_deferred_retry);

static void amba_deferred_retry_func(struct work_struct *dummy)
{
amba_deferred_retry();

if (!list_empty(&deferred_devices))
schedule_delayed_work(&deferred_retry_work,
DEFERRED_DEVICE_TIMEOUT);

mutex_unlock(&deferred_devices_lock);
}

/**
Expand Down

0 comments on commit 039599c

Please sign in to comment.