* [PATCH v1] scsi: ufs: Re-factor ufshcd_get_pwr_dev_param
@ 2019-02-25 4:10 stanley.chu-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: stanley.chu-NuS5LvNUpcJWk0Htik3J/w @ 2019-02-25 4:10 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA, avri.altman-Sjgp3cTcYWE,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
liwei213-hv44wF8Li93QT0dZR+AlfA,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ,
peter.wang-NuS5LvNUpcJWk0Htik3J/w
Hello,
This series re-factors ufshcd_get_pwr_dev_param in vendors' drivers. This function is for vendors to decide finally agreed attributes for power mode change if vendors define
their host capability in struct ufs_dev_params. Because it is using by both ufs-qcom and ufs-hisi currently and may be used in other vendors in the future, simply re-factor it and then evevry vendors can reuse it.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 0/3] scsi: ufs: Re-factor ufshcd_get_pwr_dev_param
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
@ 2019-02-25 4:10 ` stanley.chu-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <1551067825-22654-2-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-02-25 4:10 ` [PATCH v1 1/3] scsi: ufs: Introduce ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: stanley.chu-NuS5LvNUpcJWk0Htik3J/w @ 2019-02-25 4:10 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA, avri.altman-Sjgp3cTcYWE,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
liwei213-hv44wF8Li93QT0dZR+AlfA,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ, Stanley Chu,
peter.wang-NuS5LvNUpcJWk0Htik3J/w
From: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
Hello,
This series re-factors ufshcd_get_pwr_dev_param in vendors' drivers. This function is for vendors to decide finally agreed attributes for power mode change if vendors define
their host capability in struct ufs_dev_params. Because it is using by both ufs-qcom and ufs-hisi currently and may be used in other vendors in the future, simply re-factor it and then evevry vendors can reuse it.
Stanley Chu (3):
scsi: ufs: Introduce ufshcd_get_pwr_dev_param
scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param
scsi: ufs-hisi: Re-factor ufshcd_get_pwr_dev_param
drivers/scsi/ufs/ufs-hisi.c | 109 ++-----------------------------
drivers/scsi/ufs/ufs-qcom.c | 106 ++----------------------------
drivers/scsi/ufs/ufshcd-pltfrm.c | 98 +++++++++++++++++++++++++++
drivers/scsi/ufs/ufshcd-pltfrm.h | 21 ++++++
4 files changed, 127 insertions(+), 207 deletions(-)
--
2.18.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 1/3] scsi: ufs: Introduce ufshcd_get_pwr_dev_param
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-02-25 4:10 ` [PATCH v1 0/3] " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
@ 2019-02-25 4:10 ` stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 2/3] scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 3/3] scsi: ufs-hisi: " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
3 siblings, 0 replies; 7+ messages in thread
From: stanley.chu-NuS5LvNUpcJWk0Htik3J/w @ 2019-02-25 4:10 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA, avri.altman-Sjgp3cTcYWE,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
liwei213-hv44wF8Li93QT0dZR+AlfA,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ, Stanley Chu,
peter.wang-NuS5LvNUpcJWk0Htik3J/w
From: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
ufshcd_get_pwr_dev_param is for vendors to decide finally
agreed attributes for power mode change if vendors define
their host capability in struct ufs_dev_params.
This api is using by both ufs-qcom and ufs-hisi now and
will also be used in ufs-mediatek. Simply re-factor it
and then evevry vendors can reuse it.
Signed-off-by: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/scsi/ufs/ufshcd-pltfrm.c | 98 ++++++++++++++++++++++++++++++++
drivers/scsi/ufs/ufshcd-pltfrm.h | 21 +++++++
2 files changed, 119 insertions(+)
diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 895a9b5ac989..508c561c9a62 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -39,6 +39,7 @@
#include "ufshcd.h"
#include "ufshcd-pltfrm.h"
+#include "unipro.h"
#define UFSHCD_DEFAULT_LANES_PER_DIRECTION 2
@@ -289,6 +290,103 @@ static void ufshcd_init_lanes_per_dir(struct ufs_hba *hba)
}
}
+/**
+ * ufshcd_get_pwr_dev_param - get finally agreed attributes for
+ * power mode change
+ * @pltfrm_param: pointer to platform parameters
+ * @dev_max: pointer to device attributes
+ * @agreed_pwr: returned agreed attributes
+ *
+ * Returns 0 on success, non-zero value on failure
+ */
+int ufshcd_get_pwr_dev_param(struct ufs_dev_params *pltfrm_param,
+ struct ufs_pa_layer_attr *dev_max,
+ struct ufs_pa_layer_attr *agreed_pwr)
+{
+ int min_pltfrm_gear;
+ int min_dev_gear;
+ bool is_dev_sup_hs = false;
+ bool is_pltfrm_max_hs = false;
+
+ if (dev_max->pwr_rx == FAST_MODE)
+ is_dev_sup_hs = true;
+
+ if (pltfrm_param->desired_working_mode == UFS_HS_MODE) {
+ is_pltfrm_max_hs = true;
+ min_pltfrm_gear = min_t(u32, pltfrm_param->hs_rx_gear,
+ pltfrm_param->hs_tx_gear);
+ } else {
+ min_pltfrm_gear = min_t(u32, pltfrm_param->pwm_rx_gear,
+ pltfrm_param->pwm_tx_gear);
+ }
+
+ /*
+ * device doesn't support HS but
+ * pltfrm_param->desired_working_mode is HS,
+ * thus device and pltfrm_param don't agree
+ */
+ if (!is_dev_sup_hs && is_pltfrm_max_hs) {
+ pr_info("%s: device doesn't support HS\n",
+ __func__);
+ return -ENOTSUPP;
+ } else if (is_dev_sup_hs && is_pltfrm_max_hs) {
+ /*
+ * since device supports HS, it supports FAST_MODE.
+ * since pltfrm_param->desired_working_mode is also HS
+ * then final decision (FAST/FASTAUTO) is done according
+ * to pltfrm_params as it is the restricting factor
+ */
+ agreed_pwr->pwr_rx = pltfrm_param->rx_pwr_hs;
+ agreed_pwr->pwr_tx = agreed_pwr->pwr_rx;
+ } else {
+ /*
+ * here pltfrm_param->desired_working_mode is PWM.
+ * it doesn't matter whether device supports HS or PWM,
+ * in both cases pltfrm_param->desired_working_mode will
+ * determine the mode
+ */
+ agreed_pwr->pwr_rx = pltfrm_param->rx_pwr_pwm;
+ agreed_pwr->pwr_tx = agreed_pwr->pwr_rx;
+ }
+
+ /*
+ * we would like tx to work in the minimum number of lanes
+ * between device capability and vendor preferences.
+ * the same decision will be made for rx
+ */
+ agreed_pwr->lane_tx = min_t(u32, dev_max->lane_tx,
+ pltfrm_param->tx_lanes);
+ agreed_pwr->lane_rx = min_t(u32, dev_max->lane_rx,
+ pltfrm_param->rx_lanes);
+
+ /* device maximum gear is the minimum between device rx and tx gears */
+ min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
+
+ /*
+ * if both device capabilities and vendor pre-defined preferences are
+ * both HS or both PWM then set the minimum gear to be the chosen
+ * working gear.
+ * if one is PWM and one is HS then the one that is PWM get to decide
+ * what is the gear, as it is the one that also decided previously what
+ * pwr the device will be configured to.
+ */
+ if ((is_dev_sup_hs && is_pltfrm_max_hs) ||
+ (!is_dev_sup_hs && !is_pltfrm_max_hs)) {
+ agreed_pwr->gear_rx =
+ min_t(u32, min_dev_gear, min_pltfrm_gear);
+ } else if (!is_dev_sup_hs) {
+ agreed_pwr->gear_rx = min_dev_gear;
+ } else {
+ agreed_pwr->gear_rx = min_pltfrm_gear;
+ }
+ agreed_pwr->gear_tx = agreed_pwr->gear_rx;
+
+ agreed_pwr->hs_rate = pltfrm_param->hs_rate;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(ufshcd_get_pwr_dev_param);
+
/**
* ufshcd_pltfrm_init - probe routine of the driver
* @pdev: pointer to Platform device handle
diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.h b/drivers/scsi/ufs/ufshcd-pltfrm.h
index df64c4180340..af85fb37e433 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.h
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.h
@@ -16,6 +16,27 @@
#include "ufshcd.h"
+#define UFS_PWR_MODE 1
+#define UFS_HS_MODE 2
+
+struct ufs_dev_params {
+ u32 pwm_rx_gear; /* pwm rx gear to work in */
+ u32 pwm_tx_gear; /* pwm tx gear to work in */
+ u32 hs_rx_gear; /* hs rx gear to work in */
+ u32 hs_tx_gear; /* hs tx gear to work in */
+ u32 rx_lanes; /* number of rx lanes */
+ u32 tx_lanes; /* number of tx lanes */
+ u32 rx_pwr_pwm; /* rx pwm working pwr */
+ u32 tx_pwr_pwm; /* tx pwm working pwr */
+ u32 rx_pwr_hs; /* rx hs working pwr */
+ u32 tx_pwr_hs; /* tx hs working pwr */
+ u32 hs_rate; /* rate A/B to work in HS */
+ u32 desired_working_mode;
+};
+
+int ufshcd_get_pwr_dev_param(struct ufs_dev_params *dev_param,
+ struct ufs_pa_layer_attr *dev_max,
+ struct ufs_pa_layer_attr *agreed_pwr);
int ufshcd_pltfrm_init(struct platform_device *pdev,
struct ufs_hba_variant_ops *vops);
void ufshcd_pltfrm_shutdown(struct platform_device *pdev);
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 2/3] scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-02-25 4:10 ` [PATCH v1 0/3] " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 1/3] scsi: ufs: Introduce ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
@ 2019-02-25 4:10 ` stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 3/3] scsi: ufs-hisi: " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
3 siblings, 0 replies; 7+ messages in thread
From: stanley.chu-NuS5LvNUpcJWk0Htik3J/w @ 2019-02-25 4:10 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA, avri.altman-Sjgp3cTcYWE,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
liwei213-hv44wF8Li93QT0dZR+AlfA,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ, Stanley Chu,
peter.wang-NuS5LvNUpcJWk0Htik3J/w
From: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
ufshcd_get_pwr_dev_param function and ufs_dev_params struct
are re-factored to ufs common driver thus change the way this
driver used.
Signed-off-by: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/scsi/ufs/ufs-qcom.c | 106 ++----------------------------------
1 file changed, 4 insertions(+), 102 deletions(-)
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 3aeadb14aae1..a6b6f6eb9061 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -595,104 +595,6 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
return err;
}
-struct ufs_qcom_dev_params {
- u32 pwm_rx_gear; /* pwm rx gear to work in */
- u32 pwm_tx_gear; /* pwm tx gear to work in */
- u32 hs_rx_gear; /* hs rx gear to work in */
- u32 hs_tx_gear; /* hs tx gear to work in */
- u32 rx_lanes; /* number of rx lanes */
- u32 tx_lanes; /* number of tx lanes */
- u32 rx_pwr_pwm; /* rx pwm working pwr */
- u32 tx_pwr_pwm; /* tx pwm working pwr */
- u32 rx_pwr_hs; /* rx hs working pwr */
- u32 tx_pwr_hs; /* tx hs working pwr */
- u32 hs_rate; /* rate A/B to work in HS */
- u32 desired_working_mode;
-};
-
-static int ufs_qcom_get_pwr_dev_param(struct ufs_qcom_dev_params *qcom_param,
- struct ufs_pa_layer_attr *dev_max,
- struct ufs_pa_layer_attr *agreed_pwr)
-{
- int min_qcom_gear;
- int min_dev_gear;
- bool is_dev_sup_hs = false;
- bool is_qcom_max_hs = false;
-
- if (dev_max->pwr_rx == FAST_MODE)
- is_dev_sup_hs = true;
-
- if (qcom_param->desired_working_mode == FAST) {
- is_qcom_max_hs = true;
- min_qcom_gear = min_t(u32, qcom_param->hs_rx_gear,
- qcom_param->hs_tx_gear);
- } else {
- min_qcom_gear = min_t(u32, qcom_param->pwm_rx_gear,
- qcom_param->pwm_tx_gear);
- }
-
- /*
- * device doesn't support HS but qcom_param->desired_working_mode is
- * HS, thus device and qcom_param don't agree
- */
- if (!is_dev_sup_hs && is_qcom_max_hs) {
- pr_err("%s: failed to agree on power mode (device doesn't support HS but requested power is HS)\n",
- __func__);
- return -ENOTSUPP;
- } else if (is_dev_sup_hs && is_qcom_max_hs) {
- /*
- * since device supports HS, it supports FAST_MODE.
- * since qcom_param->desired_working_mode is also HS
- * then final decision (FAST/FASTAUTO) is done according
- * to qcom_params as it is the restricting factor
- */
- agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
- qcom_param->rx_pwr_hs;
- } else {
- /*
- * here qcom_param->desired_working_mode is PWM.
- * it doesn't matter whether device supports HS or PWM,
- * in both cases qcom_param->desired_working_mode will
- * determine the mode
- */
- agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
- qcom_param->rx_pwr_pwm;
- }
-
- /*
- * we would like tx to work in the minimum number of lanes
- * between device capability and vendor preferences.
- * the same decision will be made for rx
- */
- agreed_pwr->lane_tx = min_t(u32, dev_max->lane_tx,
- qcom_param->tx_lanes);
- agreed_pwr->lane_rx = min_t(u32, dev_max->lane_rx,
- qcom_param->rx_lanes);
-
- /* device maximum gear is the minimum between device rx and tx gears */
- min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
-
- /*
- * if both device capabilities and vendor pre-defined preferences are
- * both HS or both PWM then set the minimum gear to be the chosen
- * working gear.
- * if one is PWM and one is HS then the one that is PWM get to decide
- * what is the gear, as it is the one that also decided previously what
- * pwr the device will be configured to.
- */
- if ((is_dev_sup_hs && is_qcom_max_hs) ||
- (!is_dev_sup_hs && !is_qcom_max_hs))
- agreed_pwr->gear_rx = agreed_pwr->gear_tx =
- min_t(u32, min_dev_gear, min_qcom_gear);
- else if (!is_dev_sup_hs)
- agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_dev_gear;
- else
- agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_qcom_gear;
-
- agreed_pwr->hs_rate = qcom_param->hs_rate;
- return 0;
-}
-
#ifdef CONFIG_MSM_BUS_SCALING
static int ufs_qcom_get_bus_vote(struct ufs_qcom_host *host,
const char *speed_mode)
@@ -920,7 +822,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
{
u32 val;
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
- struct ufs_qcom_dev_params ufs_qcom_cap;
+ struct ufs_dev_params ufs_qcom_cap;
int ret = 0;
if (!dev_req_params) {
@@ -959,9 +861,9 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
ufs_qcom_cap.hs_rx_gear = UFS_HS_G2;
}
- ret = ufs_qcom_get_pwr_dev_param(&ufs_qcom_cap,
- dev_max_params,
- dev_req_params);
+ ret = ufshcd_get_pwr_dev_param(&ufs_qcom_cap,
+ dev_max_params,
+ dev_req_params);
if (ret) {
pr_err("%s: failed to determine capabilities\n",
__func__);
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 3/3] scsi: ufs-hisi: Re-factor ufshcd_get_pwr_dev_param
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
` (2 preceding siblings ...)
2019-02-25 4:10 ` [PATCH v1 2/3] scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
@ 2019-02-25 4:10 ` stanley.chu-NuS5LvNUpcJWk0Htik3J/w
3 siblings, 0 replies; 7+ messages in thread
From: stanley.chu-NuS5LvNUpcJWk0Htik3J/w @ 2019-02-25 4:10 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA, avri.altman-Sjgp3cTcYWE,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
liwei213-hv44wF8Li93QT0dZR+AlfA,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ, Stanley Chu,
peter.wang-NuS5LvNUpcJWk0Htik3J/w
From: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
ufshcd_get_pwr_dev_param function and ufs_dev_params struct
are re-factored to ufs common driver thus change the way this
driver used.
Signed-off-by: Stanley Chu <stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/scsi/ufs/ufs-hisi.c | 109 ++----------------------------------
1 file changed, 4 insertions(+), 105 deletions(-)
diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c
index 452e19f8fb47..01faad26ec26 100644
--- a/drivers/scsi/ufs/ufs-hisi.c
+++ b/drivers/scsi/ufs/ufs-hisi.c
@@ -272,108 +272,7 @@ static int ufs_hi3660_link_startup_notify(struct ufs_hba *hba,
return err;
}
-struct ufs_hisi_dev_params {
- u32 pwm_rx_gear; /* pwm rx gear to work in */
- u32 pwm_tx_gear; /* pwm tx gear to work in */
- u32 hs_rx_gear; /* hs rx gear to work in */
- u32 hs_tx_gear; /* hs tx gear to work in */
- u32 rx_lanes; /* number of rx lanes */
- u32 tx_lanes; /* number of tx lanes */
- u32 rx_pwr_pwm; /* rx pwm working pwr */
- u32 tx_pwr_pwm; /* tx pwm working pwr */
- u32 rx_pwr_hs; /* rx hs working pwr */
- u32 tx_pwr_hs; /* tx hs working pwr */
- u32 hs_rate; /* rate A/B to work in HS */
- u32 desired_working_mode;
-};
-
-static int ufs_hisi_get_pwr_dev_param(
- struct ufs_hisi_dev_params *hisi_param,
- struct ufs_pa_layer_attr *dev_max,
- struct ufs_pa_layer_attr *agreed_pwr)
-{
- int min_hisi_gear;
- int min_dev_gear;
- bool is_dev_sup_hs = false;
- bool is_hisi_max_hs = false;
-
- if (dev_max->pwr_rx == FASTAUTO_MODE || dev_max->pwr_rx == FAST_MODE)
- is_dev_sup_hs = true;
-
- if (hisi_param->desired_working_mode == FAST) {
- is_hisi_max_hs = true;
- min_hisi_gear = min_t(u32, hisi_param->hs_rx_gear,
- hisi_param->hs_tx_gear);
- } else {
- min_hisi_gear = min_t(u32, hisi_param->pwm_rx_gear,
- hisi_param->pwm_tx_gear);
- }
-
- /*
- * device doesn't support HS but
- * hisi_param->desired_working_mode is HS,
- * thus device and hisi_param don't agree
- */
- if (!is_dev_sup_hs && is_hisi_max_hs) {
- pr_err("%s: device not support HS\n", __func__);
- return -ENOTSUPP;
- } else if (is_dev_sup_hs && is_hisi_max_hs) {
- /*
- * since device supports HS, it supports FAST_MODE.
- * since hisi_param->desired_working_mode is also HS
- * then final decision (FAST/FASTAUTO) is done according
- * to hisi_params as it is the restricting factor
- */
- agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
- hisi_param->rx_pwr_hs;
- } else {
- /*
- * here hisi_param->desired_working_mode is PWM.
- * it doesn't matter whether device supports HS or PWM,
- * in both cases hisi_param->desired_working_mode will
- * determine the mode
- */
- agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
- hisi_param->rx_pwr_pwm;
- }
-
- /*
- * we would like tx to work in the minimum number of lanes
- * between device capability and vendor preferences.
- * the same decision will be made for rx
- */
- agreed_pwr->lane_tx =
- min_t(u32, dev_max->lane_tx, hisi_param->tx_lanes);
- agreed_pwr->lane_rx =
- min_t(u32, dev_max->lane_rx, hisi_param->rx_lanes);
-
- /* device maximum gear is the minimum between device rx and tx gears */
- min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
-
- /*
- * if both device capabilities and vendor pre-defined preferences are
- * both HS or both PWM then set the minimum gear to be the chosen
- * working gear.
- * if one is PWM and one is HS then the one that is PWM get to decide
- * what is the gear, as it is the one that also decided previously what
- * pwr the device will be configured to.
- */
- if ((is_dev_sup_hs && is_hisi_max_hs) ||
- (!is_dev_sup_hs && !is_hisi_max_hs))
- agreed_pwr->gear_rx = agreed_pwr->gear_tx =
- min_t(u32, min_dev_gear, min_hisi_gear);
- else
- agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_hisi_gear;
-
- agreed_pwr->hs_rate = hisi_param->hs_rate;
-
- pr_info("ufs final power mode: gear = %d, lane = %d, pwr = %d, rate = %d\n",
- agreed_pwr->gear_rx, agreed_pwr->lane_rx, agreed_pwr->pwr_rx,
- agreed_pwr->hs_rate);
- return 0;
-}
-
-static void ufs_hisi_set_dev_cap(struct ufs_hisi_dev_params *hisi_param)
+static void ufs_hisi_set_dev_cap(struct ufs_dev_params *hisi_param)
{
hisi_param->rx_lanes = UFS_HISI_LIMIT_NUM_LANES_RX;
hisi_param->tx_lanes = UFS_HISI_LIMIT_NUM_LANES_TX;
@@ -434,7 +333,7 @@ static int ufs_hi3660_pwr_change_notify(struct ufs_hba *hba,
struct ufs_pa_layer_attr *dev_max_params,
struct ufs_pa_layer_attr *dev_req_params)
{
- struct ufs_hisi_dev_params ufs_hisi_cap;
+ struct ufs_dev_params ufs_hisi_cap;
int ret = 0;
if (!dev_req_params) {
@@ -447,8 +346,8 @@ static int ufs_hi3660_pwr_change_notify(struct ufs_hba *hba,
switch (status) {
case PRE_CHANGE:
ufs_hisi_set_dev_cap(&ufs_hisi_cap);
- ret = ufs_hisi_get_pwr_dev_param(
- &ufs_hisi_cap, dev_max_params, dev_req_params);
+ ret = ufshcd_get_pwr_dev_param(&ufs_hisi_cap,
+ dev_max_params, dev_req_params);
if (ret) {
dev_err(hba->dev,
"%s: failed to determine capabilities\n", __func__);
--
2.18.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCH v1 0/3] scsi: ufs: Re-factor ufshcd_get_pwr_dev_param
[not found] ` <1551067825-22654-2-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
@ 2019-02-25 8:54 ` Avri Altman
[not found] ` <SN6PR04MB4925AA743160274DF3DC90C9FC7A0-UKdxhu0+N/VnT3GYGerMaFM8qxBPnqtHvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Avri Altman @ 2019-02-25 8:54 UTC (permalink / raw)
To: stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w@public.gmane.org
Cc: chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
liwei213-hv44wF8Li93QT0dZR+AlfA@public.gmane.org,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org,
peter.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org
Hi,
> Hello,
>
> This series re-factors ufshcd_get_pwr_dev_param in vendors' drivers. This
> function is for vendors to decide finally agreed attributes for power mode
> change if vendors define
> their host capability in struct ufs_dev_params. Because it is using by both
> ufs-qcom and ufs-hisi currently and may be used in other vendors in the
> future, simply re-factor it and then evevry vendors can reuse it.
>
> Stanley Chu (3):
> scsi: ufs: Introduce ufshcd_get_pwr_dev_param
> scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param
> scsi: ufs-hisi: Re-factor ufshcd_get_pwr_dev_param
I think its fine to do all this in a single patch as part of your "Add Mediatek..." series,
So it won't get unnecessarily delayed.
Looks fine to me.
Thanks,
Avri
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH v1 0/3] scsi: ufs: Re-factor ufshcd_get_pwr_dev_param
[not found] ` <SN6PR04MB4925AA743160274DF3DC90C9FC7A0-UKdxhu0+N/VnT3GYGerMaFM8qxBPnqtHvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
@ 2019-02-25 9:13 ` Stanley Chu
0 siblings, 0 replies; 7+ messages in thread
From: Stanley Chu @ 2019-02-25 9:13 UTC (permalink / raw)
To: Avri Altman
Cc: linux-scsi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
martin.petersen-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org,
chun-hung.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
kuohong.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
subhashj-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
liwei213-hv44wF8Li93QT0dZR+AlfA@public.gmane.org,
alim.akhtar-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org,
matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
pedrom.sousa-HKixBCOQz3hWk0Htik3J/w@public.gmane.org,
vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org,
peter.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org
Hi Avri,
Thanks so much for consideration.
Then I will combine this series to "scsi: ufs-mediatek: Add UFS support
for Mediatek SoC chips" and upload a completed version later.
On Mon, 2019-02-25 at 08:54 +0000, Avri Altman wrote:
> Hi,
>
> > Hello,
> >
> > This series re-factors ufshcd_get_pwr_dev_param in vendors' drivers. This
> > function is for vendors to decide finally agreed attributes for power mode
> > change if vendors define
> > their host capability in struct ufs_dev_params. Because it is using by both
> > ufs-qcom and ufs-hisi currently and may be used in other vendors in the
> > future, simply re-factor it and then evevry vendors can reuse it.
> >
> > Stanley Chu (3):
> > scsi: ufs: Introduce ufshcd_get_pwr_dev_param
> > scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param
> > scsi: ufs-hisi: Re-factor ufshcd_get_pwr_dev_param
> I think its fine to do all this in a single patch as part of your "Add Mediatek..." series,
> So it won't get unnecessarily delayed.
>
> Looks fine to me.
>
> Thanks,
> Avri
Thanks,
Stanley
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-25 9:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-25 4:10 [PATCH v1] scsi: ufs: Re-factor ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <1551067825-22654-1-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-02-25 4:10 ` [PATCH v1 0/3] " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
[not found] ` <1551067825-22654-2-git-send-email-stanley.chu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-02-25 8:54 ` Avri Altman
[not found] ` <SN6PR04MB4925AA743160274DF3DC90C9FC7A0-UKdxhu0+N/VnT3GYGerMaFM8qxBPnqtHvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2019-02-25 9:13 ` Stanley Chu
2019-02-25 4:10 ` [PATCH v1 1/3] scsi: ufs: Introduce ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 2/3] scsi: ufs-qcom: Re-factor ufshcd_get_pwr_dev_param stanley.chu-NuS5LvNUpcJWk0Htik3J/w
2019-02-25 4:10 ` [PATCH v1 3/3] scsi: ufs-hisi: " stanley.chu-NuS5LvNUpcJWk0Htik3J/w
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).