[PATCH 6/10] mmc: sdhci-xenon: Add Marvell Xenon SDHC core functionality

[Ulf Hansson]

On 24 November 2016 at 13:41, Ziji Hu <huziji at marvell.com> wrote:
> Hi Ulf,
>
> On 2016/11/24 18:43, Ulf Hansson wrote:
>> On 31 October 2016 at 12:09, Gregory CLEMENT
>> <gregory.clement at free-electrons.com> wrote:
>>> From: Ziji Hu <huziji at marvell.com>
>>>
> <snip>
>>> +static int xenon_emmc_signal_voltage_switch(struct mmc_host *mmc,
>>> +                                           struct mmc_ios *ios)
>>> +{
>>> +       unsigned char voltage = ios->signal_voltage;
>>> +
>>> +       if ((voltage == MMC_SIGNAL_VOLTAGE_330) ||
>>> +           (voltage == MMC_SIGNAL_VOLTAGE_180))
>>> +               return __emmc_signal_voltage_switch(mmc, voltage);
>>> +
>>> +       dev_err(mmc_dev(mmc), "Unsupported signal voltage: %d\n",
>>> +               voltage);
>>> +       return -EINVAL;
>>
>> This wrapper function seems unnessarry. It only adds a dev_err(), so
>> then might as well do that in __emmc_signal_voltage_switch().
>>
>      Sure. Will merge it back to __emmc_signal_voltage_switch().
>
>>> +}
>>> +
>>> +static int xenon_start_signal_voltage_switch(struct mmc_host *mmc,
>>> +                                            struct mmc_ios *ios)
>>> +{
>>> +       struct sdhci_host *host = mmc_priv(mmc);
>>> +       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
>>> +       struct sdhci_xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
>>> +
>>> +       /*
>>> +        * Before SD/SDIO set signal voltage, SD bus clock should be
>>> +        * disabled. However, sdhci_set_clock will also disable the Internal
>>> +        * clock in mmc_set_signal_voltage().
>>
>> If that's the case then that is wrong in the generic sdhci code.
>> What's the reason why it can't be fixed there instead of having this
>> workaround?
>>
>     In my very own opinion, SD Spec doesn't specify whether SDCLK should be
>     enabled or not during power setting.
>     Enabling SDCLK might be a special condition only required by our SDHC.
>     I try to avoid breaking other vendors' SDHC functionality
>     if their SDHCs require SDCLK disabled.
>     Thus I prefer to keep it inside our SDHC driver.

I let Adrian comment on this.

For sure we should avoid breaking other sdhci variant, but on the
other hand *if* the generic code is wrong we should fix it!

>
>>> +        * If Internal clock is disabled, the 3.3V/1.8V bit can not be updated.
>>> +        * Thus here manually enable internal clock.
>>> +        *
>>> +        * After switch completes, it is unnecessary to disable internal clock,
>>> +        * since keeping internal clock active obeys SD spec.
>>> +        */
>>> +       enable_xenon_internal_clk(host);
>>> +
>>> +       if (priv->emmc_slot)
>>> +               return xenon_emmc_signal_voltage_switch(mmc, ios);
>>> +
>>> +       return sdhci_start_signal_voltage_switch(mmc, ios);
>>> +}
>>> +
>>> +/*
>>> + * After determining which slot is used for SDIO,
>>> + * some additional task is required.
>>> + */
>>> +static void xenon_init_card(struct mmc_host *mmc, struct mmc_card *card)
>>> +{
>>> +       struct sdhci_host *host = mmc_priv(mmc);
>>> +       u32 reg;
>>> +       u8 slot_idx;
>>> +       struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
>>> +       struct sdhci_xenon_priv *priv = sdhci_pltfm_priv(pltfm_host);
>>> +
>>> +       /* Link the card for delay adjustment */
>>> +       priv->card_candidate = card;
>>> +       /* Set tuning functionality of this slot */
>>> +       xenon_slot_tuning_setup(host);
>>
>> This looks weird. I assume this can be done as a part of the regular
>> tuning seqeunce!?
>>
>     It is our SDHC specific preparation prior to tuning, rather than a
>     standard step in spec.
>     Thus I leave it inside our driver.

My point is that this isn't the purpose of ->init_card(). thus you are
abusing it.

Try to make it work in another way, please. I think you can.

>
>>> +
>>> +       slot_idx = priv->slot_idx;
>>> +       if (!mmc_card_sdio(card)) {
>>> +               /* Clear SDIO Card Inserted indication */
>>
>> Why do you need this?
>>
>> If you need to reset this, I think it's better to do it from
>> ->set_ios() at MMC_POWER_OFF.
>>
>     This field indicates SDIO card and controls async interrupt feature
>     of SDIO in our SDHC.
>     This async interrupt feature is enabled when SDIO card is inserted.
>     It should be disabled if SD card is inserted instead.

What do you mean by SDIO async interupts? Are you talking about SDIO
irqs on DAT1 line?

Those is supposed to be enabled when someone explicitly requests them,
not when the card is inserted.
In other words when an SDIO func driver have called sdio_claim_irq().

Moreover, we have ->enable_sdio_irq() ops that deals with this.

[...]

>>> +
>>> +       /*
>>> +        * Xenon Specific property:
>>> +        * emmc: explicitly indicate whether this slot is for eMMC
>>> +        * slotno: the index of slot. Refer to SDHC_SYS_CFG_INFO register
>>> +        * tun-count: the interval between re-tuning
>>> +        * PHY type: "sdhc phy", "emmc phy 5.0" or "emmc phy 5.1"
>>> +        */
>>> +       if (of_property_read_bool(np, "marvell,xenon-emmc"))
>>> +               priv->emmc_slot = true;
>>
>> So, you need this because of the eMMC voltage switch behaviour, right?
>>
>> Then I would rather like to describe this a generic DT bindings for
>> the eMMC voltage level support. There have acutally been some earlier
>> discussions for this, but we haven't yet made some changes.
>>
>> I think what is missing is a mmc-ddr-3_3v DT binding, which when set,
>> allows the host driver to accept I/O voltage switches to 3.3V. If not
>> supported the  ->start_signal_voltage_switch() ops may return -EINVAL.
>> This would inform the mmc core to move on to the next supported
>> voltage level. There might be some minor additional changes to the mmc
>> card initialization sequence, but those should be simple.
>>
>> I can help out to look into this, unless you want to do it yourself of course!?
>>
>    Yes. One of the reasons is to provide eMMC specific voltage setting.
>    But in my very own opinion, it should be irrelevant to voltage level.
>    The eMMC voltage setting on our SDHC is different from SD/SDIO voltage switch.
>    It will become more complex with different SOC implementation details.

Got it. Although I think we can cope with that fine just by using the
different SD/eMMC speed modes settings defined in DT (or from the
SDHCI caps register)

>    Unfortunately, MMC driver cannot determine the card type yet when eMMC voltage
>    setting should be executed.
>    Thus an flag is required here to tell driver to execute eMMC voltage setting.
>
>    Besides, additional eMMC specific settings might be implemented in future, besides
>    voltage setting. Most of them should be completed before MMC driver recognizes the
>    card type. Thus I have to keep this flag to indicate current SDHC is for eMMC.

I doubt you will need a generic "eMMC" flag, but let's see when we go forward.

Currently it's clear you don't need such a flag, so I will submit a
change adding a DT binding for "mmc-ddr-3_3v" then we can take it from
there, to see if it suits your needs.

[...]

Kind regards
Uffe