On Mon, Jan 13, 2020 at 11:06 PM Sibi Sankar <sibis@xxxxxxxxxxxxxx> wrote:
>
> Hey Evan,
>
> Thanks for the review!
> sry for the delayed response
>
> On 2020-01-08 02:51, Evan Green wrote:
> > On Wed, Dec 18, 2019 at 9:45 PM Sibi Sankar <sibis@xxxxxxxxxxxxxx>
> > wrote:
> >>
> >> Add the out of reset sequence support for modem sub-system on SC7180
> >> SoCs. It requires access to an additional halt nav register to put
> >> the modem back into reset.
> >>
> >> Signed-off-by: Sibi Sankar <sibis@xxxxxxxxxxxxxx>
> >> ---
> >> drivers/remoteproc/qcom_q6v5_mss.c | 199
> >> ++++++++++++++++++++++++++++-
> >> 1 file changed, 198 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c
> >> b/drivers/remoteproc/qcom_q6v5_mss.c
> >> index 164fc2a53ef11..51f451311f5fc 100644
> >> --- a/drivers/remoteproc/qcom_q6v5_mss.c
> >> +++ b/drivers/remoteproc/qcom_q6v5_mss.c
> >> @@ -68,6 +68,9 @@
> >> #define AXI_HALTREQ_REG 0x0
> >> #define AXI_HALTACK_REG 0x4
> >> #define AXI_IDLE_REG 0x8
> >> +#define NAV_AXI_HALTREQ_BIT BIT(0)
> >> +#define NAV_AXI_HALTACK_BIT BIT(1)
> >> +#define NAV_AXI_IDLE_BIT BIT(2)
> >>
> >> #define HALT_ACK_TIMEOUT_MS 100
> >>
> >> @@ -101,9 +104,11 @@
> >> #define QDSP6SS_ACC_OVERRIDE_VAL 0x20
> >>
> >> /* QDSP6v65 parameters */
> >> +#define QDSP6SS_CORE_CBCR 0x20
> >> #define QDSP6SS_SLEEP 0x3C
> >> #define QDSP6SS_BOOT_CORE_START 0x400
> >> #define QDSP6SS_BOOT_CMD 0x404
> >> +#define QDSP6SS_BOOT_STATUS 0x408
> >> #define SLEEP_CHECK_MAX_LOOPS 200
> >> #define BOOT_FSM_TIMEOUT 10000
> >>
> >> @@ -131,6 +136,7 @@ struct rproc_hexagon_res {
> >> int version;
> >> bool need_mem_protection;
> >> bool has_alt_reset;
> >> + bool has_halt_nav;
> >> };
> >>
> >> struct q6v5 {
> >> @@ -141,9 +147,14 @@ struct q6v5 {
> >> void __iomem *rmb_base;
> >>
> >> struct regmap *halt_map;
> >> + struct regmap *halt_nav_map;
> >> + struct regmap *conn_map;
> >> +
> >> u32 halt_q6;
> >> u32 halt_modem;
> >> u32 halt_nc;
> >> + u32 halt_nav;
> >> + u32 conn_box;
> >>
> >> struct reset_control *mss_restart;
> >> struct reset_control *pdc_reset;
> >> @@ -187,6 +198,7 @@ struct q6v5 {
> >> struct qcom_sysmon *sysmon;
> >> bool need_mem_protection;
> >> bool has_alt_reset;
> >> + bool has_halt_nav;
> >> int mpss_perm;
> >> int mba_perm;
> >> const char *hexagon_mdt_image;
> >> @@ -198,6 +210,7 @@ enum {
> >> MSS_MSM8974,
> >> MSS_MSM8996,
> >> MSS_MSM8998,
> >> + MSS_SC7180,
> >> MSS_SDM845,
> >> };
> >>
> >> @@ -396,6 +409,18 @@ static int q6v5_reset_assert(struct q6v5 *qproc)
> >> reset_control_assert(qproc->pdc_reset);
> >> ret = reset_control_reset(qproc->mss_restart);
> >> reset_control_deassert(qproc->pdc_reset);
> >> + } else if (qproc->has_halt_nav) {
> >> + /* SWAR using CONN_BOX_SPARE_0 for pipeline glitch
> >> issue */
> >
> > Can you elaborate more in this comment, or remove it? Right now it
> > doesn't help me since I don't know what SWAR is, I don't see a
>
> SWAR -> software work around
>
> I'll have to stop with the dumb
> abbreviations
heh I've never heard that one before. SWWA?
>
> > reference to CONN_BOX_SPARE_0 in the code, I don't know what a
>
> conn_box_spare_0 is at an offset
> 0xb3e4 in the conn_map which is
> described in the bindings.
>
> > CONN_BOX is, and I don't know any details about the glitch issue :)
>
> lol, yes I get that the comment does
> not give details on the glitch. It
> was targeted towards explaining why
> there is a deviation in the reset_
> assert sequence from the other SoCs.
> If you still feel the comment does
> not add any value I can get it
> removed.
Maybe just infusing some of the clarity you described here would be enough.
>
> >
> >> + reset_control_assert(qproc->pdc_reset);
> >> + regmap_update_bits(qproc->conn_map, qproc->conn_box,
> >> + BIT(0), BIT(0));
> >
> > Make a register name #define for this bit?
>
> we'll have to make one up for it
> since conn_box_spare_0 does not
> have any predefined bits and seems
> to be used to implement some missing
> functionality.
Hm, so its functionality is controlled by firmware? Or was just
defined super late in hardware so as to be termed spare through many
earlier spins of the hardware? Making one up sounds fine, it's just
nice for readability to get a sense of what exactly this bit is when
we toggle it.
>
> >
> >> + regmap_update_bits(qproc->halt_nav_map,
> >> qproc->halt_nav,
> >> + NAV_AXI_HALTREQ_BIT, 0);
> >> + reset_control_assert(qproc->mss_restart);
> >> + reset_control_deassert(qproc->pdc_reset);
> >> + regmap_update_bits(qproc->conn_map, qproc->conn_box,
> >> + BIT(0), 0);
> >> + ret = reset_control_deassert(qproc->mss_restart);
> >> } else {
> >> ret = reset_control_assert(qproc->mss_restart);
> >> }
> >> @@ -413,6 +438,8 @@ static int q6v5_reset_deassert(struct q6v5 *qproc)
> >> ret = reset_control_reset(qproc->mss_restart);
> >> writel(0, qproc->rmb_base + RMB_MBA_ALT_RESET);
> >> reset_control_deassert(qproc->pdc_reset);
> >> + } else if (qproc->has_halt_nav) {
> >> + ret = reset_control_reset(qproc->mss_restart);
> >> } else {
> >> ret = reset_control_deassert(qproc->mss_restart);
> >> }
> >> @@ -499,6 +526,54 @@ static int q6v5proc_reset(struct q6v5 *qproc)
> >> return ret;
> >> }
> >>
> >> + goto pbl_wait;
> >
> > Ick, this could benefit from a refactor that pulls those sorta-common
> > steps "Remove IO clamp" through "Start core execution" into a helper
> > function and then calls the new function from each case that needs it.
> >
> >> + } else if (qproc->version == MSS_SC7180) {
> >> + val = readl(qproc->reg_base + QDSP6SS_SLEEP);
> >> + val |= 0x1;
> >
> > It'd be nice if there were defines for these magic 0x1 values in this
> > hunk too.
> >
> >> + writel(val, qproc->reg_base + QDSP6SS_SLEEP);
> >> +
> >> + ret = readl_poll_timeout(qproc->reg_base +
> >> QDSP6SS_SLEEP,
> >> + val, !(val & BIT(31)), 1,
> >> + SLEEP_CHECK_MAX_LOOPS);
> >> + if (ret) {
> >> + dev_err(qproc->dev, "QDSP6SS Sleep clock timed
> >> out\n");
> >> + return -ETIMEDOUT;
> >> + }
> >
> > This toggling of the sleep bit is the same as sdm845, it could also be
> > put into a helper function.
>
> https://patchwork.kernel.org/patch/11250301/
> https://patchwork.kernel.org/patch/11250317/
>
> I did club ^^ a portion of the out of
> reset sequence together reducing
> code duplication initially but that
> made the entire thing unreadable.
>
> The general consensus at that time
> was to introduce a patch for sc7180
> that is most readable and have a
> cleanup later with a lot of helper
> functions and less branching like
> you suggested.
Sounds good.
>
> >
> >> +
> >> + /* Turn on the XO clock needed for PLL setup */
> >> + val = readl(qproc->reg_base + QDSP6SS_XO_CBCR);
> >> + val |= 0x1;
> >> + writel(val, qproc->reg_base + QDSP6SS_XO_CBCR);
> >> +
> >> + ret = readl_poll_timeout(qproc->reg_base +
> >> QDSP6SS_XO_CBCR,
> >> + val, !(val & BIT(31)), 1,
> >> + SLEEP_CHECK_MAX_LOOPS);
> >
> > Nit: SLEEP_CHECK_MAX_LOOPS isn't a loop count, it should really have
> > been named something like SLEEP_CHECK_TIMEOUT_US. Could be done in a
> > separate change.
>
> I'll skip this for now. I'll
> make sure that this gets named
> appropriately during the
> planned refactor.
Thanks!
