lkml.org 
[lkml]   [2020]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/4] scsi: ufs: introduce ufs_hba_variant_params to collect customizable parameters
    Date
    There are more and more customizable parameters showed up
    in UFS driver. Let's collect them into a unified place to make
    the driver more clean.

    Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
    ---
    drivers/scsi/ufs/ufshcd.c | 38 +++++++++++++++-----------------------
    drivers/scsi/ufs/ufshcd.h | 8 +++++++-
    2 files changed, 22 insertions(+), 24 deletions(-)

    diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
    index 426073a518ef..cdacbe6378a1 100644
    --- a/drivers/scsi/ufs/ufshcd.c
    +++ b/drivers/scsi/ufs/ufshcd.c
    @@ -1353,23 +1353,6 @@ static int ufshcd_devfreq_get_dev_status(struct device *dev,
    return 0;
    }

    -static struct devfreq_dev_profile ufs_devfreq_profile = {
    - .polling_ms = 100,
    - .target = ufshcd_devfreq_target,
    - .get_dev_status = ufshcd_devfreq_get_dev_status,
    -};
    -
    -#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
    -static struct devfreq_simple_ondemand_data ufs_ondemand_data = {
    - .upthreshold = 70,
    - .downdifferential = 5,
    -};
    -
    -static void *gov_data = &ufs_ondemand_data;
    -#else
    -static void *gov_data; /* NULL */
    -#endif
    -
    static int ufshcd_devfreq_init(struct ufs_hba *hba)
    {
    struct list_head *clk_list = &hba->clk_list_head;
    @@ -1385,12 +1368,12 @@ static int ufshcd_devfreq_init(struct ufs_hba *hba)
    dev_pm_opp_add(hba->dev, clki->min_freq, 0);
    dev_pm_opp_add(hba->dev, clki->max_freq, 0);

    - ufshcd_vops_config_scaling_param(hba, &ufs_devfreq_profile,
    - gov_data);
    + ufshcd_vops_config_scaling_param(hba, &hba->vps->devfreq_profile,
    + &hba->vps->ondemand_data);
    devfreq = devfreq_add_device(hba->dev,
    - &ufs_devfreq_profile,
    + &hba->vps->devfreq_profile,
    DEVFREQ_GOV_SIMPLE_ONDEMAND,
    - gov_data);
    + &hba->vps->ondemand_data);
    if (IS_ERR(devfreq)) {
    ret = PTR_ERR(devfreq);
    dev_err(hba->dev, "Unable to register with devfreq %d\n", ret);
    @@ -4314,7 +4297,7 @@ int ufshcd_hba_enable(struct ufs_hba *hba)
    * instruction might be read back.
    * This delay can be changed based on the controller.
    */
    - ufshcd_delay_us(hba->hba_enable_delay_us, 100);
    + ufshcd_delay_us(hba->vps->hba_enable_delay_us, 100);

    /* wait for the host controller to complete initialization */
    retry = 50;
    @@ -7477,6 +7460,15 @@ static const struct attribute_group *ufshcd_driver_groups[] = {
    NULL,
    };

    +static struct ufs_hba_variant_params ufs_hba_vps = {
    + .hba_enable_delay_us = 1000,
    + .devfreq_profile.polling_ms = 100,
    + .devfreq_profile.target = ufshcd_devfreq_target,
    + .devfreq_profile.get_dev_status = ufshcd_devfreq_get_dev_status,
    + .ondemand_data.upthreshold = 70,
    + .ondemand_data.downdifferential = 5,
    +};
    +
    static struct scsi_host_template ufshcd_driver_template = {
    .module = THIS_MODULE,
    .name = UFSHCD,
    @@ -8724,7 +8716,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)

    hba->mmio_base = mmio_base;
    hba->irq = irq;
    - hba->hba_enable_delay_us = 1000;
    + hba->vps = &ufs_hba_vps;

    err = ufshcd_hba_init(hba);
    if (err)
    diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
    index 23a434c03c2a..f7bdf52ba8b0 100644
    --- a/drivers/scsi/ufs/ufshcd.h
    +++ b/drivers/scsi/ufs/ufshcd.h
    @@ -566,6 +566,12 @@ enum ufshcd_caps {
    UFSHCD_CAP_WB_EN = 1 << 7,
    };

    +struct ufs_hba_variant_params {
    + struct devfreq_dev_profile devfreq_profile;
    + struct devfreq_simple_ondemand_data ondemand_data;
    + u16 hba_enable_delay_us;
    +};
    +
    /**
    * struct ufs_hba - per adapter private structure
    * @mmio_base: UFSHCI base register address
    @@ -663,6 +669,7 @@ struct ufs_hba {
    int nutmrs;
    u32 ufs_version;
    const struct ufs_hba_variant_ops *vops;
    + struct ufs_hba_variant_params *vps;
    void *priv;
    unsigned int irq;
    bool is_irq_enabled;
    @@ -684,7 +691,6 @@ struct ufs_hba {
    u32 eh_flags;
    u32 intr_mask;
    u16 ee_ctrl_mask;
    - u16 hba_enable_delay_us;
    bool is_powered;

    /* Work Queues */
    --
    2.18.0
    \
     
     \ /
      Last update: 2020-05-09 11:39    [W:3.059 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site