* [PATCH V9 1/2] scsi: ufs: set the device reference clock setting [not found] <1534846649-2456-1-git-send-email-sayalil@codeaurora.org> @ 2018-08-21 10:17 ` Sayali Lokhande 2018-08-21 10:17 ` Sayali Lokhande 1 sibling, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-21 10:17 UTC (permalink / raw) To: subhashj, cang, vivek.gautam, rnayak, vinholikatti, jejb, martin.petersen, asutoshd, evgreen, riteshh Cc: adrian.hunter, linux-scsi, Sayali Lokhande, open list From: Subhash Jadavani <subhashj@codeaurora.org> UFS host supplies the reference clock to UFS device and UFS device specification allows host to provide one of the 4 frequencies (19.2 MHz, 26 MHz, 38.4 MHz, 52 MHz) for reference clock. Host should set the device reference clock frequency setting in the device based on what frequency it is supplying to UFS device. Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Can Guo <cang@codeaurora.org> Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> --- drivers/scsi/ufs/ufs.h | 14 ++++++++ drivers/scsi/ufs/ufshcd.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.h | 2 ++ 3 files changed, 108 insertions(+) diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index 14e5bf7..a2e76b1 100644 --- a/drivers/scsi/ufs/ufs.h +++ b/drivers/scsi/ufs/ufs.h @@ -378,6 +378,20 @@ enum query_opcode { UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8, }; +/* bRefClkFreq attribute values */ +enum ufs_ref_clk_freq { + REF_CLK_FREQ_19_2_MHZ = 0, + REF_CLK_FREQ_26_MHZ = 1, + REF_CLK_FREQ_38_4_MHZ = 2, + REF_CLK_FREQ_52_MHZ = 3, + REF_CLK_FREQ_INVAL = -1, +}; + +struct ufs_ref_clk { + u32 freq_hz; + enum ufs_ref_clk_freq val; +}; + /* Query response result code */ enum { QUERY_RESULT_SUCCESS = 0x00, diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c5b1bf1..e946844 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6296,6 +6296,91 @@ static void ufshcd_def_desc_sizes(struct ufs_hba *hba) hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; } +static struct ufs_ref_clk ufs_ref_clk_freqs[] = { + {19200000, REF_CLK_FREQ_19_2_MHZ}, + {26000000, REF_CLK_FREQ_26_MHZ}, + {38400000, REF_CLK_FREQ_38_4_MHZ}, + {52000000, REF_CLK_FREQ_52_MHZ}, + {0, REF_CLK_FREQ_INVAL}, +}; + +static inline enum ufs_ref_clk_freq +ufs_get_bref_clk_for_ref_clk_freq_hz(u32 freq) +{ + int i = 0; + + while (ufs_ref_clk_freqs[i].freq_hz != freq) { + if (!ufs_ref_clk_freqs[i].freq_hz) + return REF_CLK_FREQ_INVAL; + i++; + } + + return ufs_ref_clk_freqs[i].val; +} + +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba) +{ + struct device *dev = hba->dev; + struct device_node *np = dev->of_node; + struct clk *refclk = NULL; + u32 freq = 0; + + if (!np) + return; + + hba->dev_ref_clk_freq = REF_CLK_FREQ_INVAL; + + refclk = of_clk_get_by_name(np, "ref_clk"); + if (!refclk) + return; + + freq = clk_get_rate(refclk); + if (freq > REF_CLK_FREQ_52_MHZ) { + dev_err(hba->dev, + "%s: invalid ref_clk setting = %d\n", + __func__, freq); + return; + } + + hba->dev_ref_clk_freq = + ufs_get_bref_clk_for_ref_clk_freq_hz(freq); +} + +static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) +{ + int err = 0; + int ref_clk = -1; + u32 freq = (u32)hba->dev_ref_clk_freq; + + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &ref_clk); + + if (err) { + dev_err(hba->dev, "%s: failed reading bRefClkFreq. err = %d\n", + __func__, err); + goto out; + } + + if (ref_clk == hba->dev_ref_clk_freq) + goto out; /* nothing to update */ + + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &freq); + + if (err) + dev_err(hba->dev, "%s: bRefClkFreq setting to %u Hz failed\n", + __func__, ufs_ref_clk_freqs[freq].freq_hz); + /* + * It is good to print this out here to debug any later failures + * related to gear switch. + */ + dev_dbg(hba->dev, "%s: bRefClkFreq setting to %u Hz succeeded\n", + __func__, ufs_ref_clk_freqs[freq].freq_hz); + +out: + return err; +} + /** * ufshcd_probe_hba - probe hba to detect device and initialize * @hba: per-adapter instance @@ -6361,6 +6446,12 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) "%s: Failed getting max supported power mode\n", __func__); } else { + /* + * Set the right value to bRefClkFreq before attempting to + * switch to HS gears. + */ + if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL) + ufshcd_set_dev_ref_clk(hba); ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); if (ret) { dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n", @@ -7693,6 +7784,7 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) INIT_LIST_HEAD(&hba->clk_list_head); + ufshcd_parse_dev_ref_clk_freq(hba); out_error: return err; } diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8110dcd..45013b6 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -548,6 +548,7 @@ struct ufs_hba { void *priv; unsigned int irq; bool is_irq_enabled; + enum ufs_ref_clk_freq dev_ref_clk_freq; /* Interrupt aggregation support is broken */ #define UFSHCD_QUIRK_BROKEN_INTR_AGGR 0x1 @@ -746,6 +747,7 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg) int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask, u32 val, unsigned long interval_us, unsigned long timeout_ms, bool can_sleep); +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba); static inline void check_upiu_size(void) { -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V9 1/2] scsi: ufs: set the device reference clock setting @ 2018-08-21 10:17 ` Sayali Lokhande 0 siblings, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-21 10:17 UTC (permalink / raw) To: subhashj, cang, vivek.gautam, rnayak, vinholikatti, jejb, martin.petersen, asutoshd, evgreen, riteshh Cc: adrian.hunter, linux-scsi, Sayali Lokhande, open list From: Subhash Jadavani <subhashj@codeaurora.org> UFS host supplies the reference clock to UFS device and UFS device specification allows host to provide one of the 4 frequencies (19.2 MHz, 26 MHz, 38.4 MHz, 52 MHz) for reference clock. Host should set the device reference clock frequency setting in the device based on what frequency it is supplying to UFS device. Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Can Guo <cang@codeaurora.org> Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> --- drivers/scsi/ufs/ufs.h | 14 ++++++++ drivers/scsi/ufs/ufshcd.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.h | 2 ++ 3 files changed, 108 insertions(+) diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h index 14e5bf7..a2e76b1 100644 --- a/drivers/scsi/ufs/ufs.h +++ b/drivers/scsi/ufs/ufs.h @@ -378,6 +378,20 @@ enum query_opcode { UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8, }; +/* bRefClkFreq attribute values */ +enum ufs_ref_clk_freq { + REF_CLK_FREQ_19_2_MHZ = 0, + REF_CLK_FREQ_26_MHZ = 1, + REF_CLK_FREQ_38_4_MHZ = 2, + REF_CLK_FREQ_52_MHZ = 3, + REF_CLK_FREQ_INVAL = -1, +}; + +struct ufs_ref_clk { + u32 freq_hz; + enum ufs_ref_clk_freq val; +}; + /* Query response result code */ enum { QUERY_RESULT_SUCCESS = 0x00, diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c5b1bf1..e946844 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6296,6 +6296,91 @@ static void ufshcd_def_desc_sizes(struct ufs_hba *hba) hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; } +static struct ufs_ref_clk ufs_ref_clk_freqs[] = { + {19200000, REF_CLK_FREQ_19_2_MHZ}, + {26000000, REF_CLK_FREQ_26_MHZ}, + {38400000, REF_CLK_FREQ_38_4_MHZ}, + {52000000, REF_CLK_FREQ_52_MHZ}, + {0, REF_CLK_FREQ_INVAL}, +}; + +static inline enum ufs_ref_clk_freq +ufs_get_bref_clk_for_ref_clk_freq_hz(u32 freq) +{ + int i = 0; + + while (ufs_ref_clk_freqs[i].freq_hz != freq) { + if (!ufs_ref_clk_freqs[i].freq_hz) + return REF_CLK_FREQ_INVAL; + i++; + } + + return ufs_ref_clk_freqs[i].val; +} + +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba) +{ + struct device *dev = hba->dev; + struct device_node *np = dev->of_node; + struct clk *refclk = NULL; + u32 freq = 0; + + if (!np) + return; + + hba->dev_ref_clk_freq = REF_CLK_FREQ_INVAL; + + refclk = of_clk_get_by_name(np, "ref_clk"); + if (!refclk) + return; + + freq = clk_get_rate(refclk); + if (freq > REF_CLK_FREQ_52_MHZ) { + dev_err(hba->dev, + "%s: invalid ref_clk setting = %d\n", + __func__, freq); + return; + } + + hba->dev_ref_clk_freq = + ufs_get_bref_clk_for_ref_clk_freq_hz(freq); +} + +static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) +{ + int err = 0; + int ref_clk = -1; + u32 freq = (u32)hba->dev_ref_clk_freq; + + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &ref_clk); + + if (err) { + dev_err(hba->dev, "%s: failed reading bRefClkFreq. err = %d\n", + __func__, err); + goto out; + } + + if (ref_clk == hba->dev_ref_clk_freq) + goto out; /* nothing to update */ + + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &freq); + + if (err) + dev_err(hba->dev, "%s: bRefClkFreq setting to %u Hz failed\n", + __func__, ufs_ref_clk_freqs[freq].freq_hz); + /* + * It is good to print this out here to debug any later failures + * related to gear switch. + */ + dev_dbg(hba->dev, "%s: bRefClkFreq setting to %u Hz succeeded\n", + __func__, ufs_ref_clk_freqs[freq].freq_hz); + +out: + return err; +} + /** * ufshcd_probe_hba - probe hba to detect device and initialize * @hba: per-adapter instance @@ -6361,6 +6446,12 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) "%s: Failed getting max supported power mode\n", __func__); } else { + /* + * Set the right value to bRefClkFreq before attempting to + * switch to HS gears. + */ + if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL) + ufshcd_set_dev_ref_clk(hba); ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); if (ret) { dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n", @@ -7693,6 +7784,7 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) INIT_LIST_HEAD(&hba->clk_list_head); + ufshcd_parse_dev_ref_clk_freq(hba); out_error: return err; } diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 8110dcd..45013b6 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -548,6 +548,7 @@ struct ufs_hba { void *priv; unsigned int irq; bool is_irq_enabled; + enum ufs_ref_clk_freq dev_ref_clk_freq; /* Interrupt aggregation support is broken */ #define UFSHCD_QUIRK_BROKEN_INTR_AGGR 0x1 @@ -746,6 +747,7 @@ static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg) int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask, u32 val, unsigned long interval_us, unsigned long timeout_ms, bool can_sleep); +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba); static inline void check_upiu_size(void) { -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V9 1/2] scsi: ufs: set the device reference clock setting 2018-08-21 10:17 ` Sayali Lokhande (?) @ 2018-08-23 17:19 ` Evan Green 2018-08-24 5:24 ` Sayali Lokhande -1 siblings, 1 reply; 8+ messages in thread From: Evan Green @ 2018-08-23 17:19 UTC (permalink / raw) To: sayalil Cc: subhashj, cang, vivek.gautam, Rajendra Nayak, Vinayak Holikatti, jejb, martin.petersen, asutoshd, riteshh, adrian.hunter, linux-scsi, linux-kernel On Tue, Aug 21, 2018 at 3:18 AM Sayali Lokhande <sayalil@codeaurora.org> wrote: > > From: Subhash Jadavani <subhashj@codeaurora.org> > > UFS host supplies the reference clock to UFS device and UFS device > specification allows host to provide one of the 4 frequencies (19.2 MHz, > 26 MHz, 38.4 MHz, 52 MHz) for reference clock. Host should set the > device reference clock frequency setting in the device based on what > frequency it is supplying to UFS device. > > Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> > Signed-off-by: Can Guo <cang@codeaurora.org> > Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> > --- > drivers/scsi/ufs/ufs.h | 14 ++++++++ > drivers/scsi/ufs/ufshcd.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ > drivers/scsi/ufs/ufshcd.h | 2 ++ > 3 files changed, 108 insertions(+) > > diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h > index 14e5bf7..a2e76b1 100644 > --- a/drivers/scsi/ufs/ufs.h > +++ b/drivers/scsi/ufs/ufs.h > @@ -378,6 +378,20 @@ enum query_opcode { > UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8, > }; > > +/* bRefClkFreq attribute values */ > +enum ufs_ref_clk_freq { > + REF_CLK_FREQ_19_2_MHZ = 0, > + REF_CLK_FREQ_26_MHZ = 1, > + REF_CLK_FREQ_38_4_MHZ = 2, > + REF_CLK_FREQ_52_MHZ = 3, > + REF_CLK_FREQ_INVAL = -1, > +}; > + > +struct ufs_ref_clk { > + u32 freq_hz; > + enum ufs_ref_clk_freq val; > +}; > + > /* Query response result code */ > enum { > QUERY_RESULT_SUCCESS = 0x00, > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index c5b1bf1..e946844 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -6296,6 +6296,91 @@ static void ufshcd_def_desc_sizes(struct ufs_hba *hba) > hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; > } > > +static struct ufs_ref_clk ufs_ref_clk_freqs[] = { > + {19200000, REF_CLK_FREQ_19_2_MHZ}, > + {26000000, REF_CLK_FREQ_26_MHZ}, > + {38400000, REF_CLK_FREQ_38_4_MHZ}, > + {52000000, REF_CLK_FREQ_52_MHZ}, > + {0, REF_CLK_FREQ_INVAL}, > +}; > + > +static inline enum ufs_ref_clk_freq > +ufs_get_bref_clk_for_ref_clk_freq_hz(u32 freq) This name is a little hairy. Maybe ufs_get_bref_clk_from_hz, or ufs_hz_to_bref_clk? > +{ > + int i = 0; > + > + while (ufs_ref_clk_freqs[i].freq_hz != freq) { > + if (!ufs_ref_clk_freqs[i].freq_hz) > + return REF_CLK_FREQ_INVAL; > + i++; > + } > + > + return ufs_ref_clk_freqs[i].val; > +} > + > +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba) > +{ > + struct device *dev = hba->dev; > + struct device_node *np = dev->of_node; > + struct clk *refclk = NULL; > + u32 freq = 0; > + > + if (!np) > + return; > + > + hba->dev_ref_clk_freq = REF_CLK_FREQ_INVAL; > + > + refclk = of_clk_get_by_name(np, "ref_clk"); > + if (!refclk) > + return; > + > + freq = clk_get_rate(refclk); > + if (freq > REF_CLK_FREQ_52_MHZ) { freq is in Hertz, but the enum value will be something like 3. I think you should just call your function below, and then check the return value of it for the error case you're trying to do here. > + dev_err(hba->dev, > + "%s: invalid ref_clk setting = %d\n", > + __func__, freq); > + return; > + } > + > + hba->dev_ref_clk_freq = > + ufs_get_bref_clk_for_ref_clk_freq_hz(freq); > +} > + > +static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) > +{ > + int err = 0; You don't need to initialize this since you immediately assign it below. > + int ref_clk = -1; > + u32 freq = (u32)hba->dev_ref_clk_freq; Is the cast necessary? > + > + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, > + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &ref_clk); > + > + if (err) { > + dev_err(hba->dev, "%s: failed reading bRefClkFreq. err = %d\n", > + __func__, err); > + goto out; > + } > + > + if (ref_clk == hba->dev_ref_clk_freq) > + goto out; /* nothing to update */ > + > + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, > + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &freq); > + > + if (err) > + dev_err(hba->dev, "%s: bRefClkFreq setting to %u Hz failed\n", > + __func__, ufs_ref_clk_freqs[freq].freq_hz); > + /* > + * It is good to print this out here to debug any later failures > + * related to gear switch. > + */ > + dev_dbg(hba->dev, "%s: bRefClkFreq setting to %u Hz succeeded\n", > + __func__, ufs_ref_clk_freqs[freq].freq_hz); In the error case you print out both the failed message and the success message? > + > +out: > + return err; > +} > + > /** > * ufshcd_probe_hba - probe hba to detect device and initialize > * @hba: per-adapter instance > @@ -6361,6 +6446,12 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) > "%s: Failed getting max supported power mode\n", > __func__); > } else { > + /* > + * Set the right value to bRefClkFreq before attempting to > + * switch to HS gears. > + */ > + if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL) > + ufshcd_set_dev_ref_clk(hba); > ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); > if (ret) { > dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n", > @@ -7693,6 +7784,7 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) > > INIT_LIST_HEAD(&hba->clk_list_head); > > + ufshcd_parse_dev_ref_clk_freq(hba); I get an uncomfortable feeling about calling this function from alloc_host, given that everybody else calls their parse functions from ufshcd_pltfrm_init. I wonder if you should just initialize the new member here in alloc_host to the invalid value, and then move the call to the parse function where you had it before in ufshcd_pltfrm_init. That way you don't have the problems in the previous series with leaving the value uninitialized, but you're also not calling of_ functions from alloc_host, which seems like an abuse of alloc_host. -Evan ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V9 1/2] scsi: ufs: set the device reference clock setting 2018-08-23 17:19 ` Evan Green @ 2018-08-24 5:24 ` Sayali Lokhande 0 siblings, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-24 5:24 UTC (permalink / raw) To: Evan Green Cc: subhashj, cang, vivek.gautam, Rajendra Nayak, Vinayak Holikatti, jejb, martin.petersen, asutoshd, riteshh, adrian.hunter, linux-scsi, linux-kernel On 8/23/2018 10:49 PM, Evan Green wrote: > On Tue, Aug 21, 2018 at 3:18 AM Sayali Lokhande <sayalil@codeaurora.org> wrote: >> From: Subhash Jadavani <subhashj@codeaurora.org> >> >> UFS host supplies the reference clock to UFS device and UFS device >> specification allows host to provide one of the 4 frequencies (19.2 MHz, >> 26 MHz, 38.4 MHz, 52 MHz) for reference clock. Host should set the >> device reference clock frequency setting in the device based on what >> frequency it is supplying to UFS device. >> >> Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> >> Signed-off-by: Can Guo <cang@codeaurora.org> >> Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> >> --- >> drivers/scsi/ufs/ufs.h | 14 ++++++++ >> drivers/scsi/ufs/ufshcd.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ >> drivers/scsi/ufs/ufshcd.h | 2 ++ >> 3 files changed, 108 insertions(+) >> >> diff --git a/drivers/scsi/ufs/ufs.h b/drivers/scsi/ufs/ufs.h >> index 14e5bf7..a2e76b1 100644 >> --- a/drivers/scsi/ufs/ufs.h >> +++ b/drivers/scsi/ufs/ufs.h >> @@ -378,6 +378,20 @@ enum query_opcode { >> UPIU_QUERY_OPCODE_TOGGLE_FLAG = 0x8, >> }; >> >> +/* bRefClkFreq attribute values */ >> +enum ufs_ref_clk_freq { >> + REF_CLK_FREQ_19_2_MHZ = 0, >> + REF_CLK_FREQ_26_MHZ = 1, >> + REF_CLK_FREQ_38_4_MHZ = 2, >> + REF_CLK_FREQ_52_MHZ = 3, >> + REF_CLK_FREQ_INVAL = -1, >> +}; >> + >> +struct ufs_ref_clk { >> + u32 freq_hz; >> + enum ufs_ref_clk_freq val; >> +}; >> + >> /* Query response result code */ >> enum { >> QUERY_RESULT_SUCCESS = 0x00, >> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c >> index c5b1bf1..e946844 100644 >> --- a/drivers/scsi/ufs/ufshcd.c >> +++ b/drivers/scsi/ufs/ufshcd.c >> @@ -6296,6 +6296,91 @@ static void ufshcd_def_desc_sizes(struct ufs_hba *hba) >> hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; >> } >> >> +static struct ufs_ref_clk ufs_ref_clk_freqs[] = { >> + {19200000, REF_CLK_FREQ_19_2_MHZ}, >> + {26000000, REF_CLK_FREQ_26_MHZ}, >> + {38400000, REF_CLK_FREQ_38_4_MHZ}, >> + {52000000, REF_CLK_FREQ_52_MHZ}, >> + {0, REF_CLK_FREQ_INVAL}, >> +}; >> + >> +static inline enum ufs_ref_clk_freq >> +ufs_get_bref_clk_for_ref_clk_freq_hz(u32 freq) > This name is a little hairy. Maybe ufs_get_bref_clk_from_hz, or > ufs_hz_to_bref_clk? Done. ufs_get_bref_clk_from_hz() sounds good. Will update. >> +{ >> + int i = 0; >> + >> + while (ufs_ref_clk_freqs[i].freq_hz != freq) { >> + if (!ufs_ref_clk_freqs[i].freq_hz) >> + return REF_CLK_FREQ_INVAL; >> + i++; >> + } >> + >> + return ufs_ref_clk_freqs[i].val; >> +} >> + >> +void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba) >> +{ >> + struct device *dev = hba->dev; >> + struct device_node *np = dev->of_node; >> + struct clk *refclk = NULL; >> + u32 freq = 0; >> + >> + if (!np) >> + return; >> + >> + hba->dev_ref_clk_freq = REF_CLK_FREQ_INVAL; >> + >> + refclk = of_clk_get_by_name(np, "ref_clk"); >> + if (!refclk) >> + return; >> + >> + freq = clk_get_rate(refclk); >> + if (freq > REF_CLK_FREQ_52_MHZ) { > freq is in Hertz, but the enum value will be something like 3. I think > you should just call your function below, and then check the return > value of it for the error case you're trying to do here. Agree. I should be checking hba->dev_ref_clk_freq instead of freq (which is in hz). Will update. >> + dev_err(hba->dev, >> + "%s: invalid ref_clk setting = %d\n", >> + __func__, freq); >> + return; >> + } >> + >> + hba->dev_ref_clk_freq = >> + ufs_get_bref_clk_for_ref_clk_freq_hz(freq); >> +} >> + >> +static int ufshcd_set_dev_ref_clk(struct ufs_hba *hba) >> +{ >> + int err = 0; > You don't need to initialize this since you immediately assign it below. Done. >> + int ref_clk = -1; >> + u32 freq = (u32)hba->dev_ref_clk_freq; > Is the cast necessary? Not necessary. Will be removed. >> + >> + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_READ_ATTR, >> + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &ref_clk); >> + >> + if (err) { >> + dev_err(hba->dev, "%s: failed reading bRefClkFreq. err = %d\n", >> + __func__, err); >> + goto out; >> + } >> + >> + if (ref_clk == hba->dev_ref_clk_freq) >> + goto out; /* nothing to update */ >> + >> + err = ufshcd_query_attr_retry(hba, UPIU_QUERY_OPCODE_WRITE_ATTR, >> + QUERY_ATTR_IDN_REF_CLK_FREQ, 0, 0, &freq); >> + >> + if (err) >> + dev_err(hba->dev, "%s: bRefClkFreq setting to %u Hz failed\n", >> + __func__, ufs_ref_clk_freqs[freq].freq_hz); >> + /* >> + * It is good to print this out here to debug any later failures >> + * related to gear switch. >> + */ >> + dev_dbg(hba->dev, "%s: bRefClkFreq setting to %u Hz succeeded\n", >> + __func__, ufs_ref_clk_freqs[freq].freq_hz); > In the error case you print out both the failed message and the success message? Agree. Will add goto out; in error case above. >> + >> +out: >> + return err; >> +} >> + >> /** >> * ufshcd_probe_hba - probe hba to detect device and initialize >> * @hba: per-adapter instance >> @@ -6361,6 +6446,12 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) >> "%s: Failed getting max supported power mode\n", >> __func__); >> } else { >> + /* >> + * Set the right value to bRefClkFreq before attempting to >> + * switch to HS gears. >> + */ >> + if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL) >> + ufshcd_set_dev_ref_clk(hba); >> ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info); >> if (ret) { >> dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n", >> @@ -7693,6 +7784,7 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) >> >> INIT_LIST_HEAD(&hba->clk_list_head); >> >> + ufshcd_parse_dev_ref_clk_freq(hba); > I get an uncomfortable feeling about calling this function from > alloc_host, given that everybody else calls their parse functions from > ufshcd_pltfrm_init. I wonder if you should just initialize the new > member here in alloc_host to the invalid value, and then move the call > to the parse function where you had it before in ufshcd_pltfrm_init. > That way you don't have the problems in the previous series with > leaving the value uninitialized, but you're also not calling of_ > functions from alloc_host, which seems like an abuse of alloc_host. Agree. Will only initialize the ref_clk in alloc_host() and move the actual parse() call in pltfrm_init as before. > -Evan ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V9 2/2] scsi: ufs: Add configfs support for UFS provisioning [not found] <1534846649-2456-1-git-send-email-sayalil@codeaurora.org> @ 2018-08-21 10:17 ` Sayali Lokhande 2018-08-21 10:17 ` Sayali Lokhande 1 sibling, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-21 10:17 UTC (permalink / raw) To: subhashj, cang, vivek.gautam, rnayak, vinholikatti, jejb, martin.petersen, asutoshd, evgreen, riteshh Cc: adrian.hunter, linux-scsi, Sayali Lokhande, open list This patch adds configfs support to provision UFS device at runtime. This feature can be primarily useful in factory or assembly line as some devices may be required to be configured multiple times during initial system development phase. Configuration Descriptors can be written multiple times until bConfigDescrLock attribute is zero. Configuration descriptor buffer consists of Device and Unit descriptor configurable parameters which are parsed from vendor specific provisioning file and then passed via configfs node at runtime to provision ufs device. CONFIG_CONFIGFS_FS needs to be enabled for using this feature. Usage: 1) To read current configuration descriptor : cat /config/XXXX.ufshc/ufs_provision 2) To provision ufs device: echo <config_desc_buf> > /config/XXXX.ufshc/ufs_provision Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> --- Documentation/ABI/testing/configfs-driver-ufs | 18 +++ drivers/scsi/ufs/Kconfig | 10 ++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufs-configfs.c | 157 ++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.c | 3 +- drivers/scsi/ufs/ufshcd.h | 18 +++ 6 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/configfs-driver-ufs create mode 100644 drivers/scsi/ufs/ufs-configfs.c diff --git a/Documentation/ABI/testing/configfs-driver-ufs b/Documentation/ABI/testing/configfs-driver-ufs new file mode 100644 index 0000000..eeee499c --- /dev/null +++ b/Documentation/ABI/testing/configfs-driver-ufs @@ -0,0 +1,18 @@ +What: /config/ufshcd/ufs_provision +Date: Jun 2018 +KernelVersion: 4.14 +Description: + This file shows the current ufs configuration descriptor set in device. + This can be used to provision ufs device if bConfigDescrLock is 0. + For more details, refer 14.1.6.3 Configuration Descriptor and + Table 14-12 - Unit Descriptor configurable parameters from specs for + description of each configuration descriptor parameter. + Configuration descriptor buffer needs to be passed in space separated + format specificied as below: + echo <bLength> <bDescriptorIDN> <bConfDescContinue> <bBootEnable> + <bDescrAccessEn> <bInitPowerMode> <bHighPriorityLUN> + <bSecureRemovalType> <bInitActiveICCLevel> <wPeriodicRTCUpdate> + <0Bh:0Fh_ReservedAs_0> <bLUEnable> <bBootLunID> <bLUWriteProtect> + <bMemoryType> <dNumAllocUnits> <bDataReliability> <bLogicalBlockSize> + <bProvisioningType> <wContextCapabilities> <0Dh:0Fh_ReservedAs_0> + > /config/XXXX.ufshc/ufs_provision diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4..a9a0a58 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -100,3 +100,13 @@ config SCSI_UFS_QCOM Select this if you have UFS controller on QCOM chipset. If unsure, say N. + +config UFS_PROVISION + tristate "Runtime UFS Provisioning support" + depends on SCSI_UFSHCD && CONFIGFS_FS + help + This enables runtime UFS provisioning support. This can be used + primarily during assembly line as some devices may be required to + be configured multiple times during initial development phase. + + If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 918f579..00110ea 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -5,5 +5,6 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o ufshcd-core-objs := ufshcd.o ufs-sysfs.o +obj-$(CONFIG_UFS_PROVISION) += ufs-configfs.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufs-configfs.c b/drivers/scsi/ufs/ufs-configfs.c new file mode 100644 index 0000000..09607e5 --- /dev/null +++ b/drivers/scsi/ufs/ufs-configfs.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (c) 2018, Linux Foundation. + +#include <linux/configfs.h> +#include <linux/err.h> +#include <linux/string.h> + +#include "ufs.h" +#include "ufshcd.h" + +static inline struct ufs_hba *config_item_to_hba(struct config_item *item) +{ + struct config_group *group = to_config_group(item); + struct configfs_subsystem *subsys = to_configfs_subsystem(group); + struct ufs_hba *hba = container_of(subsys, struct ufs_hba, subsys); + + return subsys ? hba : NULL; +} + +static ssize_t ufs_provision_show(struct config_item *item, char *buf) +{ + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + int i, ret, curr_len = 0; + struct ufs_hba *hba = config_item_to_hba(item); + + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (ret) + return ret; + + for (i = 0; i < buff_len; i++) + curr_len += snprintf((buf + curr_len), (PAGE_SIZE - curr_len), + "0x%x ", desc_buf[i]); + + return curr_len; +} + +ssize_t ufshcd_desc_configfs_store(struct ufs_hba *hba, + const char *buf, size_t count) +{ + char *strbuf; + char *strbuf_copy; + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + char *token; + int i, ret, value; + u32 config_desc_lock = 0; + + /* reserve one byte for null termination */ + strbuf = kmalloc(count + 1, GFP_KERNEL); + if (!strbuf) + return -ENOMEM; + + strbuf_copy = strbuf; + strlcpy(strbuf, buf, count + 1); + + /* Just return if bConfigDescrLock is already set */ + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &config_desc_lock); + if (ret) + goto out; + + if (config_desc_lock) { + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", + __func__, config_desc_lock); + ret = -EINVAL; + goto out; + } + + for (i = 0; i < QUERY_DESC_CONFIGURATION_DEF_SIZE; i++) { + token = strsep(&strbuf, " "); + if (!token && i) + break; + + ret = kstrtoint(token, 0, &value); + if (ret) { + dev_err(hba->dev, "%s: kstrtoint failed %d %s\n", + __func__, ret, token); + ret = -EINVAL; + goto out; + } + desc_buf[i] = (u8)value; + } + + /* Write configuration descriptor to provision ufs */ + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (!ret) + dev_err(hba->dev, "%s: UFS Provisioning done, reboot now!\n", + __func__); + +out: + kfree(strbuf_copy); + if (ret) + return ret; + return count; +} + +static ssize_t ufs_provision_store(struct config_item *item, + const char *buf, size_t count) +{ + struct ufs_hba *hba = config_item_to_hba(item); + + return ufshcd_desc_configfs_store(hba, buf, count); +} + +static struct configfs_attribute ufshcd_attr_provision = { + .ca_name = "ufs_provision", + .ca_mode = 0644, + .ca_owner = THIS_MODULE, + .show = ufs_provision_show, + .store = ufs_provision_store, +}; + +static struct configfs_attribute *ufshcd_attrs[] = { + &ufshcd_attr_provision, + NULL, +}; + +static struct config_item_type ufscfg_type = { + .ct_attrs = ufshcd_attrs, + .ct_owner = THIS_MODULE, +}; + +static struct configfs_subsystem ufscfg_subsys = { + .su_group = { + .cg_item = { + .ci_type = &ufscfg_type, + }, + }, +}; + +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + int ret; + struct configfs_subsystem *subsys = &hba->subsys; + + strncpy(ufscfg_subsys.su_group.cg_item.ci_namebuf, name, strlen(name)); + subsys->su_group = ufscfg_subsys.su_group; + config_group_init(&subsys->su_group); + mutex_init(&subsys->su_mutex); + ret = configfs_register_subsystem(subsys); + if (ret) + pr_err("Error %d while registering subsystem %s\n", + ret, + subsys->su_group.cg_item.ci_namebuf); + + return ret; +} + +void ufshcd_configfs_exit(void) +{ + configfs_unregister_subsystem(&ufscfg_subsys); +} diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e946844..11b28bf 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7713,6 +7713,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) void ufshcd_remove(struct ufs_hba *hba) { ufs_sysfs_remove_nodes(hba->dev); + ufshcd_configfs_exit(); scsi_remove_host(hba->host); /* disable interrupts */ ufshcd_disable_intr(hba, hba->intr_mask); @@ -7967,7 +7968,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) async_schedule(ufshcd_async_scan, hba); ufs_sysfs_add_nodes(hba->dev); - + ufshcd_configfs_init(hba, dev_name(hba->dev)); return 0; out_remove_scsi_host: diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 45013b6..c5956b2 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -37,6 +37,7 @@ #ifndef _UFSHCD_H #define _UFSHCD_H +#include <linux/configfs.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> @@ -515,6 +516,9 @@ struct ufs_hba { struct Scsi_Host *host; struct device *dev; +#ifdef CONFIG_UFS_PROVISION + struct configfs_subsystem subsys; +#endif /* * This field is to keep a reference to "scsi_device" corresponding to * "UFS device" W-LU. @@ -868,6 +872,20 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, int ufshcd_hold(struct ufs_hba *hba, bool async); void ufshcd_release(struct ufs_hba *hba); +/* Expose UFS configfs API's */ +#ifndef CONFIG_UFS_PROVISION +static inline int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + return 0; +} +static inline void ufshcd_configfs_exit(void) +{ +} +#else +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name); +void ufshcd_configfs_exit(void); +#endif + int ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, int *desc_length); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V9 2/2] scsi: ufs: Add configfs support for UFS provisioning @ 2018-08-21 10:17 ` Sayali Lokhande 0 siblings, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-21 10:17 UTC (permalink / raw) To: subhashj, cang, vivek.gautam, rnayak, vinholikatti, jejb, martin.petersen, asutoshd, evgreen, riteshh Cc: adrian.hunter, linux-scsi, Sayali Lokhande, open list This patch adds configfs support to provision UFS device at runtime. This feature can be primarily useful in factory or assembly line as some devices may be required to be configured multiple times during initial system development phase. Configuration Descriptors can be written multiple times until bConfigDescrLock attribute is zero. Configuration descriptor buffer consists of Device and Unit descriptor configurable parameters which are parsed from vendor specific provisioning file and then passed via configfs node at runtime to provision ufs device. CONFIG_CONFIGFS_FS needs to be enabled for using this feature. Usage: 1) To read current configuration descriptor : cat /config/XXXX.ufshc/ufs_provision 2) To provision ufs device: echo <config_desc_buf> > /config/XXXX.ufshc/ufs_provision Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> --- Documentation/ABI/testing/configfs-driver-ufs | 18 +++ drivers/scsi/ufs/Kconfig | 10 ++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufs-configfs.c | 157 ++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd.c | 3 +- drivers/scsi/ufs/ufshcd.h | 18 +++ 6 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/configfs-driver-ufs create mode 100644 drivers/scsi/ufs/ufs-configfs.c diff --git a/Documentation/ABI/testing/configfs-driver-ufs b/Documentation/ABI/testing/configfs-driver-ufs new file mode 100644 index 0000000..eeee499c --- /dev/null +++ b/Documentation/ABI/testing/configfs-driver-ufs @@ -0,0 +1,18 @@ +What: /config/ufshcd/ufs_provision +Date: Jun 2018 +KernelVersion: 4.14 +Description: + This file shows the current ufs configuration descriptor set in device. + This can be used to provision ufs device if bConfigDescrLock is 0. + For more details, refer 14.1.6.3 Configuration Descriptor and + Table 14-12 - Unit Descriptor configurable parameters from specs for + description of each configuration descriptor parameter. + Configuration descriptor buffer needs to be passed in space separated + format specificied as below: + echo <bLength> <bDescriptorIDN> <bConfDescContinue> <bBootEnable> + <bDescrAccessEn> <bInitPowerMode> <bHighPriorityLUN> + <bSecureRemovalType> <bInitActiveICCLevel> <wPeriodicRTCUpdate> + <0Bh:0Fh_ReservedAs_0> <bLUEnable> <bBootLunID> <bLUWriteProtect> + <bMemoryType> <dNumAllocUnits> <bDataReliability> <bLogicalBlockSize> + <bProvisioningType> <wContextCapabilities> <0Dh:0Fh_ReservedAs_0> + > /config/XXXX.ufshc/ufs_provision diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4..a9a0a58 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -100,3 +100,13 @@ config SCSI_UFS_QCOM Select this if you have UFS controller on QCOM chipset. If unsure, say N. + +config UFS_PROVISION + tristate "Runtime UFS Provisioning support" + depends on SCSI_UFSHCD && CONFIGFS_FS + help + This enables runtime UFS provisioning support. This can be used + primarily during assembly line as some devices may be required to + be configured multiple times during initial development phase. + + If unsure, say N. diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 918f579..00110ea 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -5,5 +5,6 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o ufshcd-core-objs := ufshcd.o ufs-sysfs.o +obj-$(CONFIG_UFS_PROVISION) += ufs-configfs.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufs-configfs.c b/drivers/scsi/ufs/ufs-configfs.c new file mode 100644 index 0000000..09607e5 --- /dev/null +++ b/drivers/scsi/ufs/ufs-configfs.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright (c) 2018, Linux Foundation. + +#include <linux/configfs.h> +#include <linux/err.h> +#include <linux/string.h> + +#include "ufs.h" +#include "ufshcd.h" + +static inline struct ufs_hba *config_item_to_hba(struct config_item *item) +{ + struct config_group *group = to_config_group(item); + struct configfs_subsystem *subsys = to_configfs_subsystem(group); + struct ufs_hba *hba = container_of(subsys, struct ufs_hba, subsys); + + return subsys ? hba : NULL; +} + +static ssize_t ufs_provision_show(struct config_item *item, char *buf) +{ + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + int i, ret, curr_len = 0; + struct ufs_hba *hba = config_item_to_hba(item); + + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (ret) + return ret; + + for (i = 0; i < buff_len; i++) + curr_len += snprintf((buf + curr_len), (PAGE_SIZE - curr_len), + "0x%x ", desc_buf[i]); + + return curr_len; +} + +ssize_t ufshcd_desc_configfs_store(struct ufs_hba *hba, + const char *buf, size_t count) +{ + char *strbuf; + char *strbuf_copy; + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; + char *token; + int i, ret, value; + u32 config_desc_lock = 0; + + /* reserve one byte for null termination */ + strbuf = kmalloc(count + 1, GFP_KERNEL); + if (!strbuf) + return -ENOMEM; + + strbuf_copy = strbuf; + strlcpy(strbuf, buf, count + 1); + + /* Just return if bConfigDescrLock is already set */ + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &config_desc_lock); + if (ret) + goto out; + + if (config_desc_lock) { + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", + __func__, config_desc_lock); + ret = -EINVAL; + goto out; + } + + for (i = 0; i < QUERY_DESC_CONFIGURATION_DEF_SIZE; i++) { + token = strsep(&strbuf, " "); + if (!token && i) + break; + + ret = kstrtoint(token, 0, &value); + if (ret) { + dev_err(hba->dev, "%s: kstrtoint failed %d %s\n", + __func__, ret, token); + ret = -EINVAL; + goto out; + } + desc_buf[i] = (u8)value; + } + + /* Write configuration descriptor to provision ufs */ + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); + + if (!ret) + dev_err(hba->dev, "%s: UFS Provisioning done, reboot now!\n", + __func__); + +out: + kfree(strbuf_copy); + if (ret) + return ret; + return count; +} + +static ssize_t ufs_provision_store(struct config_item *item, + const char *buf, size_t count) +{ + struct ufs_hba *hba = config_item_to_hba(item); + + return ufshcd_desc_configfs_store(hba, buf, count); +} + +static struct configfs_attribute ufshcd_attr_provision = { + .ca_name = "ufs_provision", + .ca_mode = 0644, + .ca_owner = THIS_MODULE, + .show = ufs_provision_show, + .store = ufs_provision_store, +}; + +static struct configfs_attribute *ufshcd_attrs[] = { + &ufshcd_attr_provision, + NULL, +}; + +static struct config_item_type ufscfg_type = { + .ct_attrs = ufshcd_attrs, + .ct_owner = THIS_MODULE, +}; + +static struct configfs_subsystem ufscfg_subsys = { + .su_group = { + .cg_item = { + .ci_type = &ufscfg_type, + }, + }, +}; + +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + int ret; + struct configfs_subsystem *subsys = &hba->subsys; + + strncpy(ufscfg_subsys.su_group.cg_item.ci_namebuf, name, strlen(name)); + subsys->su_group = ufscfg_subsys.su_group; + config_group_init(&subsys->su_group); + mutex_init(&subsys->su_mutex); + ret = configfs_register_subsystem(subsys); + if (ret) + pr_err("Error %d while registering subsystem %s\n", + ret, + subsys->su_group.cg_item.ci_namebuf); + + return ret; +} + +void ufshcd_configfs_exit(void) +{ + configfs_unregister_subsystem(&ufscfg_subsys); +} diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e946844..11b28bf 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7713,6 +7713,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) void ufshcd_remove(struct ufs_hba *hba) { ufs_sysfs_remove_nodes(hba->dev); + ufshcd_configfs_exit(); scsi_remove_host(hba->host); /* disable interrupts */ ufshcd_disable_intr(hba, hba->intr_mask); @@ -7967,7 +7968,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) async_schedule(ufshcd_async_scan, hba); ufs_sysfs_add_nodes(hba->dev); - + ufshcd_configfs_init(hba, dev_name(hba->dev)); return 0; out_remove_scsi_host: diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 45013b6..c5956b2 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -37,6 +37,7 @@ #ifndef _UFSHCD_H #define _UFSHCD_H +#include <linux/configfs.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/init.h> @@ -515,6 +516,9 @@ struct ufs_hba { struct Scsi_Host *host; struct device *dev; +#ifdef CONFIG_UFS_PROVISION + struct configfs_subsystem subsys; +#endif /* * This field is to keep a reference to "scsi_device" corresponding to * "UFS device" W-LU. @@ -868,6 +872,20 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, int ufshcd_hold(struct ufs_hba *hba, bool async); void ufshcd_release(struct ufs_hba *hba); +/* Expose UFS configfs API's */ +#ifndef CONFIG_UFS_PROVISION +static inline int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) +{ + return 0; +} +static inline void ufshcd_configfs_exit(void) +{ +} +#else +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name); +void ufshcd_configfs_exit(void); +#endif + int ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, int *desc_length); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH V9 2/2] scsi: ufs: Add configfs support for UFS provisioning 2018-08-21 10:17 ` Sayali Lokhande (?) @ 2018-08-23 17:19 ` Evan Green 2018-08-24 5:25 ` Sayali Lokhande -1 siblings, 1 reply; 8+ messages in thread From: Evan Green @ 2018-08-23 17:19 UTC (permalink / raw) To: sayalil Cc: subhashj, cang, vivek.gautam, Rajendra Nayak, Vinayak Holikatti, jejb, martin.petersen, asutoshd, riteshh, adrian.hunter, linux-scsi, linux-kernel On Tue, Aug 21, 2018 at 3:19 AM Sayali Lokhande <sayalil@codeaurora.org> wrote: > > This patch adds configfs support to provision UFS device at > runtime. This feature can be primarily useful in factory or > assembly line as some devices may be required to be configured > multiple times during initial system development phase. > Configuration Descriptors can be written multiple times until > bConfigDescrLock attribute is zero. > > Configuration descriptor buffer consists of Device and Unit > descriptor configurable parameters which are parsed from vendor > specific provisioning file and then passed via configfs node at > runtime to provision ufs device. > CONFIG_CONFIGFS_FS needs to be enabled for using this feature. > > Usage: > 1) To read current configuration descriptor : > cat /config/XXXX.ufshc/ufs_provision > 2) To provision ufs device: > echo <config_desc_buf> > /config/XXXX.ufshc/ufs_provision > > Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> > --- > Documentation/ABI/testing/configfs-driver-ufs | 18 +++ > drivers/scsi/ufs/Kconfig | 10 ++ > drivers/scsi/ufs/Makefile | 1 + > drivers/scsi/ufs/ufs-configfs.c | 157 ++++++++++++++++++++++++++ > drivers/scsi/ufs/ufshcd.c | 3 +- > drivers/scsi/ufs/ufshcd.h | 18 +++ > 6 files changed, 206 insertions(+), 1 deletion(-) > create mode 100644 Documentation/ABI/testing/configfs-driver-ufs > create mode 100644 drivers/scsi/ufs/ufs-configfs.c > > diff --git a/Documentation/ABI/testing/configfs-driver-ufs b/Documentation/ABI/testing/configfs-driver-ufs > new file mode 100644 > index 0000000..eeee499c > --- /dev/null > +++ b/Documentation/ABI/testing/configfs-driver-ufs > @@ -0,0 +1,18 @@ > +What: /config/ufshcd/ufs_provision > +Date: Jun 2018 > +KernelVersion: 4.14 > +Description: > + This file shows the current ufs configuration descriptor set in device. > + This can be used to provision ufs device if bConfigDescrLock is 0. > + For more details, refer 14.1.6.3 Configuration Descriptor and > + Table 14-12 - Unit Descriptor configurable parameters from specs for > + description of each configuration descriptor parameter. > + Configuration descriptor buffer needs to be passed in space separated > + format specificied as below: > + echo <bLength> <bDescriptorIDN> <bConfDescContinue> <bBootEnable> > + <bDescrAccessEn> <bInitPowerMode> <bHighPriorityLUN> > + <bSecureRemovalType> <bInitActiveICCLevel> <wPeriodicRTCUpdate> > + <0Bh:0Fh_ReservedAs_0> <bLUEnable> <bBootLunID> <bLUWriteProtect> > + <bMemoryType> <dNumAllocUnits> <bDataReliability> <bLogicalBlockSize> > + <bProvisioningType> <wContextCapabilities> <0Dh:0Fh_ReservedAs_0> > + > /config/XXXX.ufshc/ufs_provision > diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig > index e27b4d4..a9a0a58 100644 > --- a/drivers/scsi/ufs/Kconfig > +++ b/drivers/scsi/ufs/Kconfig > @@ -100,3 +100,13 @@ config SCSI_UFS_QCOM > > Select this if you have UFS controller on QCOM chipset. > If unsure, say N. > + > +config UFS_PROVISION > + tristate "Runtime UFS Provisioning support" > + depends on SCSI_UFSHCD && CONFIGFS_FS > + help > + This enables runtime UFS provisioning support. This can be used > + primarily during assembly line as some devices may be required to > + be configured multiple times during initial development phase. > + > + If unsure, say N. > diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile > index 918f579..00110ea 100644 > --- a/drivers/scsi/ufs/Makefile > +++ b/drivers/scsi/ufs/Makefile > @@ -5,5 +5,6 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d > obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o > obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o > ufshcd-core-objs := ufshcd.o ufs-sysfs.o > +obj-$(CONFIG_UFS_PROVISION) += ufs-configfs.o > obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o > obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o > diff --git a/drivers/scsi/ufs/ufs-configfs.c b/drivers/scsi/ufs/ufs-configfs.c > new file mode 100644 > index 0000000..09607e5 > --- /dev/null > +++ b/drivers/scsi/ufs/ufs-configfs.c > @@ -0,0 +1,157 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright (c) 2018, Linux Foundation. > + > +#include <linux/configfs.h> > +#include <linux/err.h> > +#include <linux/string.h> > + > +#include "ufs.h" > +#include "ufshcd.h" > + > +static inline struct ufs_hba *config_item_to_hba(struct config_item *item) > +{ > + struct config_group *group = to_config_group(item); > + struct configfs_subsystem *subsys = to_configfs_subsystem(group); > + struct ufs_hba *hba = container_of(subsys, struct ufs_hba, subsys); > + > + return subsys ? hba : NULL; > +} > + > +static ssize_t ufs_provision_show(struct config_item *item, char *buf) > +{ > + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; > + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; This is a nit, but buff_len is really desc_buf_len. It's confusing because you also do have a buffer named buf, which this variable is not the length of. > + int i, ret, curr_len = 0; > + struct ufs_hba *hba = config_item_to_hba(item); > + > + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, > + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); > + > + if (ret) > + return ret; > + > + for (i = 0; i < buff_len; i++) > + curr_len += snprintf((buf + curr_len), (PAGE_SIZE - curr_len), > + "0x%x ", desc_buf[i]); > + > + return curr_len; > +} > + > +ssize_t ufshcd_desc_configfs_store(struct ufs_hba *hba, > + const char *buf, size_t count) > +{ > + char *strbuf; > + char *strbuf_copy; > + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; > + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; Same thing here, I suppose. > + char *token; > + int i, ret, value; > + u32 config_desc_lock = 0; > + > + /* reserve one byte for null termination */ > + strbuf = kmalloc(count + 1, GFP_KERNEL); > + if (!strbuf) > + return -ENOMEM; > + > + strbuf_copy = strbuf; > + strlcpy(strbuf, buf, count + 1); > + > + /* Just return if bConfigDescrLock is already set */ > + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, > + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &config_desc_lock); > + if (ret) > + goto out; > + > + if (config_desc_lock) { > + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", > + __func__, config_desc_lock); > + ret = -EINVAL; > + goto out; > + } > + > + for (i = 0; i < QUERY_DESC_CONFIGURATION_DEF_SIZE; i++) { > + token = strsep(&strbuf, " "); > + if (!token && i) > + break; What happens if you pass an empty buffer (eg !token && !i)? I just tried it. kstrtoint seems to fail gracefully, and I get the print below. Fine. > + > + ret = kstrtoint(token, 0, &value); > + if (ret) { > + dev_err(hba->dev, "%s: kstrtoint failed %d %s\n", > + __func__, ret, token); > + ret = -EINVAL; > + goto out; > + } > + desc_buf[i] = (u8)value; > + } > + > + /* Write configuration descriptor to provision ufs */ > + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, > + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); > + > + if (!ret) > + dev_err(hba->dev, "%s: UFS Provisioning done, reboot now!\n", > + __func__); I wonder if this should maybe just be an info or debug message. It's really not an error, it's a celebration! > + > +out: > + kfree(strbuf_copy); > + if (ret) > + return ret; > + return count; > +} > + > +static ssize_t ufs_provision_store(struct config_item *item, > + const char *buf, size_t count) > +{ > + struct ufs_hba *hba = config_item_to_hba(item); > + > + return ufshcd_desc_configfs_store(hba, buf, count); > +} > + > +static struct configfs_attribute ufshcd_attr_provision = { > + .ca_name = "ufs_provision", > + .ca_mode = 0644, > + .ca_owner = THIS_MODULE, > + .show = ufs_provision_show, > + .store = ufs_provision_store, > +}; > + > +static struct configfs_attribute *ufshcd_attrs[] = { > + &ufshcd_attr_provision, > + NULL, > +}; > + > +static struct config_item_type ufscfg_type = { > + .ct_attrs = ufshcd_attrs, > + .ct_owner = THIS_MODULE, > +}; > + > +static struct configfs_subsystem ufscfg_subsys = { > + .su_group = { > + .cg_item = { > + .ci_type = &ufscfg_type, > + }, > + }, > +}; > + > +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) > +{ > + int ret; > + struct configfs_subsystem *subsys = &hba->subsys; > + > + strncpy(ufscfg_subsys.su_group.cg_item.ci_namebuf, name, strlen(name)); > + subsys->su_group = ufscfg_subsys.su_group; > + config_group_init(&subsys->su_group); > + mutex_init(&subsys->su_mutex); > + ret = configfs_register_subsystem(subsys); > + if (ret) > + pr_err("Error %d while registering subsystem %s\n", > + ret, > + subsys->su_group.cg_item.ci_namebuf); > + > + return ret; > +} > + > +void ufshcd_configfs_exit(void) > +{ > + configfs_unregister_subsystem(&ufscfg_subsys); > +} > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index e946844..11b28bf 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -7713,6 +7713,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) > void ufshcd_remove(struct ufs_hba *hba) > { > ufs_sysfs_remove_nodes(hba->dev); > + ufshcd_configfs_exit(); > scsi_remove_host(hba->host); > /* disable interrupts */ > ufshcd_disable_intr(hba, hba->intr_mask); > @@ -7967,7 +7968,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > > async_schedule(ufshcd_async_scan, hba); > ufs_sysfs_add_nodes(hba->dev); > - > + ufshcd_configfs_init(hba, dev_name(hba->dev)); You init function has a return int, but you never check it. Either remove the return type if you consider configfs initialization errors non-fatal, or check the error here. > return 0; > > out_remove_scsi_host: > diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h > index 45013b6..c5956b2 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -37,6 +37,7 @@ > #ifndef _UFSHCD_H > #define _UFSHCD_H > > +#include <linux/configfs.h> > #include <linux/module.h> > #include <linux/kernel.h> > #include <linux/init.h> > @@ -515,6 +516,9 @@ struct ufs_hba { > > struct Scsi_Host *host; > struct device *dev; > +#ifdef CONFIG_UFS_PROVISION > + struct configfs_subsystem subsys; > +#endif > /* > * This field is to keep a reference to "scsi_device" corresponding to > * "UFS device" W-LU. > @@ -868,6 +872,20 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, > int ufshcd_hold(struct ufs_hba *hba, bool async); > void ufshcd_release(struct ufs_hba *hba); > > +/* Expose UFS configfs API's */ > +#ifndef CONFIG_UFS_PROVISION > +static inline int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) > +{ > + return 0; > +} > +static inline void ufshcd_configfs_exit(void) > +{ > +} > +#else > +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name); > +void ufshcd_configfs_exit(void); > +#endif > + > int ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, > int *desc_length); > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V9 2/2] scsi: ufs: Add configfs support for UFS provisioning 2018-08-23 17:19 ` Evan Green @ 2018-08-24 5:25 ` Sayali Lokhande 0 siblings, 0 replies; 8+ messages in thread From: Sayali Lokhande @ 2018-08-24 5:25 UTC (permalink / raw) To: Evan Green Cc: subhashj, cang, vivek.gautam, Rajendra Nayak, Vinayak Holikatti, jejb, martin.petersen, asutoshd, riteshh, adrian.hunter, linux-scsi, linux-kernel On 8/23/2018 10:49 PM, Evan Green wrote: > On Tue, Aug 21, 2018 at 3:19 AM Sayali Lokhande <sayalil@codeaurora.org> wrote: >> This patch adds configfs support to provision UFS device at >> runtime. This feature can be primarily useful in factory or >> assembly line as some devices may be required to be configured >> multiple times during initial system development phase. >> Configuration Descriptors can be written multiple times until >> bConfigDescrLock attribute is zero. >> >> Configuration descriptor buffer consists of Device and Unit >> descriptor configurable parameters which are parsed from vendor >> specific provisioning file and then passed via configfs node at >> runtime to provision ufs device. >> CONFIG_CONFIGFS_FS needs to be enabled for using this feature. >> >> Usage: >> 1) To read current configuration descriptor : >> cat /config/XXXX.ufshc/ufs_provision >> 2) To provision ufs device: >> echo <config_desc_buf> > /config/XXXX.ufshc/ufs_provision >> >> Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org> >> --- >> Documentation/ABI/testing/configfs-driver-ufs | 18 +++ >> drivers/scsi/ufs/Kconfig | 10 ++ >> drivers/scsi/ufs/Makefile | 1 + >> drivers/scsi/ufs/ufs-configfs.c | 157 ++++++++++++++++++++++++++ >> drivers/scsi/ufs/ufshcd.c | 3 +- >> drivers/scsi/ufs/ufshcd.h | 18 +++ >> 6 files changed, 206 insertions(+), 1 deletion(-) >> create mode 100644 Documentation/ABI/testing/configfs-driver-ufs >> create mode 100644 drivers/scsi/ufs/ufs-configfs.c >> >> diff --git a/Documentation/ABI/testing/configfs-driver-ufs b/Documentation/ABI/testing/configfs-driver-ufs >> new file mode 100644 >> index 0000000..eeee499c >> --- /dev/null >> +++ b/Documentation/ABI/testing/configfs-driver-ufs >> @@ -0,0 +1,18 @@ >> +What: /config/ufshcd/ufs_provision >> +Date: Jun 2018 >> +KernelVersion: 4.14 >> +Description: >> + This file shows the current ufs configuration descriptor set in device. >> + This can be used to provision ufs device if bConfigDescrLock is 0. >> + For more details, refer 14.1.6.3 Configuration Descriptor and >> + Table 14-12 - Unit Descriptor configurable parameters from specs for >> + description of each configuration descriptor parameter. >> + Configuration descriptor buffer needs to be passed in space separated >> + format specificied as below: >> + echo <bLength> <bDescriptorIDN> <bConfDescContinue> <bBootEnable> >> + <bDescrAccessEn> <bInitPowerMode> <bHighPriorityLUN> >> + <bSecureRemovalType> <bInitActiveICCLevel> <wPeriodicRTCUpdate> >> + <0Bh:0Fh_ReservedAs_0> <bLUEnable> <bBootLunID> <bLUWriteProtect> >> + <bMemoryType> <dNumAllocUnits> <bDataReliability> <bLogicalBlockSize> >> + <bProvisioningType> <wContextCapabilities> <0Dh:0Fh_ReservedAs_0> >> + > /config/XXXX.ufshc/ufs_provision >> diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig >> index e27b4d4..a9a0a58 100644 >> --- a/drivers/scsi/ufs/Kconfig >> +++ b/drivers/scsi/ufs/Kconfig >> @@ -100,3 +100,13 @@ config SCSI_UFS_QCOM >> >> Select this if you have UFS controller on QCOM chipset. >> If unsure, say N. >> + >> +config UFS_PROVISION >> + tristate "Runtime UFS Provisioning support" >> + depends on SCSI_UFSHCD && CONFIGFS_FS >> + help >> + This enables runtime UFS provisioning support. This can be used >> + primarily during assembly line as some devices may be required to >> + be configured multiple times during initial development phase. >> + >> + If unsure, say N. >> diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile >> index 918f579..00110ea 100644 >> --- a/drivers/scsi/ufs/Makefile >> +++ b/drivers/scsi/ufs/Makefile >> @@ -5,5 +5,6 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d >> obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o >> obj-$(CONFIG_SCSI_UFSHCD) += ufshcd-core.o >> ufshcd-core-objs := ufshcd.o ufs-sysfs.o >> +obj-$(CONFIG_UFS_PROVISION) += ufs-configfs.o >> obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o >> obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o >> diff --git a/drivers/scsi/ufs/ufs-configfs.c b/drivers/scsi/ufs/ufs-configfs.c >> new file mode 100644 >> index 0000000..09607e5 >> --- /dev/null >> +++ b/drivers/scsi/ufs/ufs-configfs.c >> @@ -0,0 +1,157 @@ >> +// SPDX-License-Identifier: GPL-2.0+ >> +// Copyright (c) 2018, Linux Foundation. >> + >> +#include <linux/configfs.h> >> +#include <linux/err.h> >> +#include <linux/string.h> >> + >> +#include "ufs.h" >> +#include "ufshcd.h" >> + >> +static inline struct ufs_hba *config_item_to_hba(struct config_item *item) >> +{ >> + struct config_group *group = to_config_group(item); >> + struct configfs_subsystem *subsys = to_configfs_subsystem(group); >> + struct ufs_hba *hba = container_of(subsys, struct ufs_hba, subsys); >> + >> + return subsys ? hba : NULL; >> +} >> + >> +static ssize_t ufs_provision_show(struct config_item *item, char *buf) >> +{ >> + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; >> + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; > This is a nit, but buff_len is really desc_buf_len. It's confusing > because you also do have a buffer named buf, which this variable is > not the length of. Agree. Will rename it to desc_buf_len to avoid confusion. >> + int i, ret, curr_len = 0; >> + struct ufs_hba *hba = config_item_to_hba(item); >> + >> + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC, >> + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); >> + >> + if (ret) >> + return ret; >> + >> + for (i = 0; i < buff_len; i++) >> + curr_len += snprintf((buf + curr_len), (PAGE_SIZE - curr_len), >> + "0x%x ", desc_buf[i]); >> + >> + return curr_len; >> +} >> + >> +ssize_t ufshcd_desc_configfs_store(struct ufs_hba *hba, >> + const char *buf, size_t count) >> +{ >> + char *strbuf; >> + char *strbuf_copy; >> + u8 desc_buf[QUERY_DESC_CONFIGURATION_DEF_SIZE] = {0}; >> + int buff_len = QUERY_DESC_CONFIGURATION_DEF_SIZE; > Same thing here, I suppose. Done. >> + char *token; >> + int i, ret, value; >> + u32 config_desc_lock = 0; >> + >> + /* reserve one byte for null termination */ >> + strbuf = kmalloc(count + 1, GFP_KERNEL); >> + if (!strbuf) >> + return -ENOMEM; >> + >> + strbuf_copy = strbuf; >> + strlcpy(strbuf, buf, count + 1); >> + >> + /* Just return if bConfigDescrLock is already set */ >> + ret = ufshcd_query_attr(hba, UPIU_QUERY_OPCODE_READ_ATTR, >> + QUERY_ATTR_IDN_CONF_DESC_LOCK, 0, 0, &config_desc_lock); >> + if (ret) >> + goto out; >> + >> + if (config_desc_lock) { >> + dev_err(hba->dev, "%s: bConfigDescrLock already set to %u, cannot re-provision device!\n", >> + __func__, config_desc_lock); >> + ret = -EINVAL; >> + goto out; >> + } >> + >> + for (i = 0; i < QUERY_DESC_CONFIGURATION_DEF_SIZE; i++) { >> + token = strsep(&strbuf, " "); >> + if (!token && i) >> + break; > What happens if you pass an empty buffer (eg !token && !i)? > I just tried it. kstrtoint seems to fail gracefully, and I get the > print below. Fine. Ok . it looks Fine. >> + >> + ret = kstrtoint(token, 0, &value); >> + if (ret) { >> + dev_err(hba->dev, "%s: kstrtoint failed %d %s\n", >> + __func__, ret, token); >> + ret = -EINVAL; >> + goto out; >> + } >> + desc_buf[i] = (u8)value; >> + } >> + >> + /* Write configuration descriptor to provision ufs */ >> + ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_WRITE_DESC, >> + QUERY_DESC_IDN_CONFIGURATION, 0, 0, desc_buf, &buff_len); >> + >> + if (!ret) >> + dev_err(hba->dev, "%s: UFS Provisioning done, reboot now!\n", >> + __func__); > I wonder if this should maybe just be an info or debug message. It's > really not an error, it's a celebration! Agree. :) >> + >> +out: >> + kfree(strbuf_copy); >> + if (ret) >> + return ret; >> + return count; >> +} >> + >> +static ssize_t ufs_provision_store(struct config_item *item, >> + const char *buf, size_t count) >> +{ >> + struct ufs_hba *hba = config_item_to_hba(item); >> + >> + return ufshcd_desc_configfs_store(hba, buf, count); >> +} >> + >> +static struct configfs_attribute ufshcd_attr_provision = { >> + .ca_name = "ufs_provision", >> + .ca_mode = 0644, >> + .ca_owner = THIS_MODULE, >> + .show = ufs_provision_show, >> + .store = ufs_provision_store, >> +}; >> + >> +static struct configfs_attribute *ufshcd_attrs[] = { >> + &ufshcd_attr_provision, >> + NULL, >> +}; >> + >> +static struct config_item_type ufscfg_type = { >> + .ct_attrs = ufshcd_attrs, >> + .ct_owner = THIS_MODULE, >> +}; >> + >> +static struct configfs_subsystem ufscfg_subsys = { >> + .su_group = { >> + .cg_item = { >> + .ci_type = &ufscfg_type, >> + }, >> + }, >> +}; >> + >> +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) >> +{ >> + int ret; >> + struct configfs_subsystem *subsys = &hba->subsys; >> + >> + strncpy(ufscfg_subsys.su_group.cg_item.ci_namebuf, name, strlen(name)); >> + subsys->su_group = ufscfg_subsys.su_group; >> + config_group_init(&subsys->su_group); >> + mutex_init(&subsys->su_mutex); >> + ret = configfs_register_subsystem(subsys); >> + if (ret) >> + pr_err("Error %d while registering subsystem %s\n", >> + ret, >> + subsys->su_group.cg_item.ci_namebuf); >> + >> + return ret; >> +} >> + >> +void ufshcd_configfs_exit(void) >> +{ >> + configfs_unregister_subsystem(&ufscfg_subsys); >> +} >> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c >> index e946844..11b28bf 100644 >> --- a/drivers/scsi/ufs/ufshcd.c >> +++ b/drivers/scsi/ufs/ufshcd.c >> @@ -7713,6 +7713,7 @@ int ufshcd_shutdown(struct ufs_hba *hba) >> void ufshcd_remove(struct ufs_hba *hba) >> { >> ufs_sysfs_remove_nodes(hba->dev); >> + ufshcd_configfs_exit(); >> scsi_remove_host(hba->host); >> /* disable interrupts */ >> ufshcd_disable_intr(hba, hba->intr_mask); >> @@ -7967,7 +7968,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) >> >> async_schedule(ufshcd_async_scan, hba); >> ufs_sysfs_add_nodes(hba->dev); >> - >> + ufshcd_configfs_init(hba, dev_name(hba->dev)); > You init function has a return int, but you never check it. Either > remove the return type if you consider configfs initialization errors > non-fatal, or check the error here. Agree. It should be void type. >> return 0; >> >> out_remove_scsi_host: >> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h >> index 45013b6..c5956b2 100644 >> --- a/drivers/scsi/ufs/ufshcd.h >> +++ b/drivers/scsi/ufs/ufshcd.h >> @@ -37,6 +37,7 @@ >> #ifndef _UFSHCD_H >> #define _UFSHCD_H >> >> +#include <linux/configfs.h> >> #include <linux/module.h> >> #include <linux/kernel.h> >> #include <linux/init.h> >> @@ -515,6 +516,9 @@ struct ufs_hba { >> >> struct Scsi_Host *host; >> struct device *dev; >> +#ifdef CONFIG_UFS_PROVISION >> + struct configfs_subsystem subsys; >> +#endif >> /* >> * This field is to keep a reference to "scsi_device" corresponding to >> * "UFS device" W-LU. >> @@ -868,6 +872,20 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, >> int ufshcd_hold(struct ufs_hba *hba, bool async); >> void ufshcd_release(struct ufs_hba *hba); >> >> +/* Expose UFS configfs API's */ >> +#ifndef CONFIG_UFS_PROVISION >> +static inline int ufshcd_configfs_init(struct ufs_hba *hba, const char *name) >> +{ >> + return 0; >> +} >> +static inline void ufshcd_configfs_exit(void) >> +{ >> +} >> +#else >> +int ufshcd_configfs_init(struct ufs_hba *hba, const char *name); >> +void ufshcd_configfs_exit(void); >> +#endif >> + >> int ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id, >> int *desc_length); >> >> -- >> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, >> a Linux Foundation Collaborative Project >> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-08-24 5:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1534846649-2456-1-git-send-email-sayalil@codeaurora.org>
2018-08-21 10:17 ` [PATCH V9 1/2] scsi: ufs: set the device reference clock setting Sayali Lokhande
2018-08-21 10:17 ` Sayali Lokhande
2018-08-23 17:19 ` Evan Green
2018-08-24 5:24 ` Sayali Lokhande
2018-08-21 10:17 ` [PATCH V9 2/2] scsi: ufs: Add configfs support for UFS provisioning Sayali Lokhande
2018-08-21 10:17 ` Sayali Lokhande
2018-08-23 17:19 ` Evan Green
2018-08-24 5:25 ` Sayali Lokhande
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.