Re: [PATCH] w1: omap-hdq: Simplify driver with PM runtime autosuspend

Tony Lindgren
2019-12-16T03:09:53Z

Hi,

* Andreas Kemnade <andreas@kemnade.info> [191215 22:04]:
> On Sun, 15 Dec 2019 09:38:17 -0800
> If I remember correctly this thing is critical to get the hwmod out of
> reset but I need to examine that again:

Thanks for testing, yes that's what I thought might cause it
too, but nope :)

We currently disable interrupts for some reason after
the first read. That won't play with runtime PM autosuspend
at all as we never enable them again until the device has
idled. Can you try the following additional patch on top?

Regards,

Tony

8< -----------------
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -86,15 +86,6 @@ static inline u8 hdq_reg_merge(struct hdq_data *hdq_data, u32 offset,
return new_val;
}

-static void hdq_disable_interrupt(struct hdq_data *hdq_data, u32 offset,
- u32 mask)
-{
- u32 ie;
-
- ie = readl(hdq_data->hdq_base + offset);
- writel(ie & mask, hdq_data->hdq_base + offset);
-}
-
/*
* Wait for one or more bits in flag change.
* HDQ_FLAG_SET: wait until any bit in the flag is set.
@@ -474,15 +465,9 @@ static u8 omap_w1_read_byte(void *_hdq)
}

ret = hdq_read_byte(hdq_data, &val);
- if (ret) {
+ if (ret)
ret = -1;
- goto out_err;
- }

- hdq_disable_interrupt(hdq_data, OMAP_HDQ_CTRL_STATUS,
- ~OMAP_HDQ_CTRL_STATUS_INTERRUPTMASK);
-
-out_err:
pm_runtime_mark_last_busy(hdq_data->dev);
pm_runtime_put_autosuspend(hdq_data->dev);