On 4 October 2017 at 19:39, Wolfram Sang
<wsa+renesas@xxxxxxxxxxxxxxxxxxxx> wrote:
> Parse the new binding and store it in the host struct after doing some
> sanity checks. The code is designed to support fixed SD driver type if
> we ever need that.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
> ---
> Changes since RFC v1:
> * rebased to mmc/next based on 4.14-rc3
>
> drivers/mmc/core/core.c | 28 +++++++++++++++++++++++-----
> drivers/mmc/core/host.c | 11 ++++++++++-
> include/linux/mmc/host.h | 2 ++
> 3 files changed, 35 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
> index c287d297710aa4..64b454efc924c5 100644
> --- a/drivers/mmc/core/core.c
> +++ b/drivers/mmc/core/core.c
> @@ -1785,6 +1785,18 @@ void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type)
> mmc_set_ios(host);
> }
>
> +static int mmc_select_fixed_drive_strength(struct mmc_card *card,
> + unsigned int max_dtr, int host_drv,
> + int card_drv, int *drv_type)
> +{
> + int ret = 0, preset = card->host->fixed_drv_type;
> +
> + if (card->type == MMC_TYPE_MMC)
> + ret = card_drv & mmc_driver_type_mask(preset) ? preset : 0;
> +
> + return ret;
> +}
After a second thought, I would rather prefer to have this code
implemented in mmc.c, in mmc_select_driver_type(). If we later find a
case for SD/SDIO, we can consider to move this to core.c.
Moreover, I think when host->fixed_drv_type has a value set, using
that value should take precedence over calling
mmc_select_drive_strength(). That is not the case below.
Sorry for not realizing this in v1.
> +
> int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
> int card_drv_type, int *drv_type)
> {
> @@ -1793,7 +1805,7 @@ int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
>
> *drv_type = 0;
>
> - if (!host->ops->select_drive_strength)
> + if (!host->ops->select_drive_strength && !host->fixed_drv_type)
> return 0;
>
> /* Use SD definition of driver strength for hosts */
> @@ -1812,10 +1824,16 @@ int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
> * information and let the hardware specific code
> * return what is possible given the options
> */
> - return host->ops->select_drive_strength(card, max_dtr,
> - host_drv_type,
> - card_drv_type,
> - drv_type);
> + if (host->ops->select_drive_strength)
> + return host->ops->select_drive_strength(card, max_dtr,
> + host_drv_type,
> + card_drv_type,
> + drv_type);
> + else
> + return mmc_select_fixed_drive_strength(card, max_dtr,
> + host_drv_type,
> + card_drv_type,
> + drv_type);
> }
[...]
Kind regards
Uffe
