Move voltage regulator config to driver private data
Subsystems (5)
cover Move voltage regulator config to driver private data
WCN3990 voltage regulator config is varying b/w different MSM platforms ex: SDM845/ QCS404. In order to have scalable config, move regulator config to driver private data.
Tested HW: WCN3990(SDM845/QCS404)
Tested FW: WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1
Govind Singh (3):
dt: bindings: update compatible dt properties for WCN3990 wifi node
ath10k: Move regulator config to driver private data
arm64: dts: qcom: qcs404: Modify wifi dt node for SDM845/QCS404
devices
.../bindings/net/wireless/qcom,ath10k.txt | 2 + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 3 ++ arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- drivers/net/wireless/ath/ath10k/snoc.c | 38 +++++++++++++++---- drivers/net/wireless/ath/ath10k/snoc.h | 23 ++++++----- 6 files changed, 51 insertions(+), 19 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/3 dt: bindings: update compatible dt properties for WCN3990 wifi node
update compatible dt properties for WCN3990 wifi node to be compatible across different MSM platforms.
--- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt +2 -0
@@ -5,6 +5,8 @@ Required properties: * "qcom,ath10k" * "qcom,ipq4019-wifi" * "qcom,wcn3990-wifi" + * "qcom,sdm845-wcn39xx-wifi" + * "qcom,qcs40x-wcn39xx-wifi" PCI based devices uses compatible string "qcom,ath10k" and takes calibration data along with board specific data via "qcom,ath10k-calibration-data".
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 1/3] dt: bindings: update compatible dt properties for WCN3990 wifi node
Quoted 8 lines · Govind Singh
update compatible dt properties for WCN3990 wifi node to be compatible across different MSM platforms.
Signed-off-by Govind Singh <[email protected]>--- Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt | 2 ++ 1 file changed, 2 insertions(+)
PATCH 2/3 ath10k: Move regulator config to driver private data
In reply to Govind SinghWCN3990 Regulator config is varying b/w different MSM platforms. In order to have scalable config, move regulator config to driver private data.
--- drivers/net/wireless/ath/ath10k/snoc.c | 38 +++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/snoc.h | 23 +++++++++------- 2 files changed, 44 insertions(+), 17 deletions(-)
drivers/net/wireless/ath/ath10k/snoc.c +31 -7
@@ -36,13 +36,20 @@ static char *const ce_name[] = { "WLAN_CE_11", }; -static struct ath10k_vreg_info vreg_cfg[] = { +static struct ath10k_vreg_info sdm845_reg_cfg[] = { {NULL ,"vdd-0.8-cx-mx" ,800000 ,850000 ,0 ,0 , false}, {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, }; +static struct ath10k_vreg_info qcs40x_reg_cfg[] = { + {NULL ,"vdd-0.8-cx-mx" ,1224000 ,1224000 ,0 ,0 , false}, + {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, + {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, + {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, +}; +static struct ath10k_clk_info clk_cfg[] = { {NULL ,"cxo_ref_clk_pin" ,0 , false}, };
@@ -54,10 +61,20 @@ static void ath10k_snoc_htt_rx_cb(struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_htt_htc_rx_cb (struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_pktlog_rx_cb (struct ath10k_ce_pipe *ce_state); -static const struct ath10k_snoc_drv_priv drv_priv = { +static const struct ath10k_snoc_drv_priv sdm845_wcn39xx_drv_priv = { + .hw_rev =ATH10K_HW_WCN3990 , + .dma_mask =DMA_BIT_MASK (35 ), + .msa_size =0x100000 , + .vreg_cfg = sdm845_reg_cfg, + .vreg_count =ARRAY_SIZE (sdm845_reg_cfg), +}; + +static const struct ath10k_snoc_drv_priv qcs40x_wcn39xx_drv_priv = { .hw_rev =ATH10K_HW_WCN3990 , .dma_mask =DMA_BIT_MASK (35 ), .msa_size =0x100000 , + .vreg_cfg = qcs40x_reg_cfg, + .vreg_count =ARRAY_SIZE (qcs40x_reg_cfg), };#define WCN3990_SRC_WR_IDX_OFFSET 0x3C
@@ -1465,7 +1482,7 @@ static int ath10k_snoc_vreg_on(struct ath10k *ar)int ret =0 ;int i; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { +for (i =0 ; i < ar_snoc->vreg_count; i++) { vreg_info = &ar_snoc->vreg[i];if (!vreg_info->reg)
@@ -1498,7 +1515,7 @@ static int ath10k_snoc_vreg_off(struct ath10k *ar)int ret =0 ;int i; -for (i =ARRAY_SIZE (vreg_cfg) -1 ; i >=0 ; i--) { +for (i = ar_snoc->vreg_count -1 ; i >=0 ; i--) { vreg_info = &ar_snoc->vreg[i];if (!vreg_info->reg)
@@ -1616,7 +1633,13 @@ static int ath10k_hw_power_off(struct ath10k *ar)static const struct of_device_id ath10k_snoc_dt_match[] = { { .compatible ="qcom,wcn3990-wifi" , - .data = &drv_priv, + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,sdm845-wcn39xx-wifi" , + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,qcs40x-wcn39xx-wifi" , + .data = &qcs40x_wcn39xx_drv_priv, }, { } };
@@ -1680,8 +1703,9 @@ static int ath10k_snoc_probe(struct platform_device *pdev) goto err_release_resource; } - ar_snoc->vreg = vreg_cfg; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { + ar_snoc->vreg = drv_data->vreg_cfg; + ar_snoc->vreg_count = drv_data->vreg_count; +for (i =0 ; i < ar_snoc->vreg_count; i++) { ret =ath10k_get_vreg_info (ar, dev, &ar_snoc->vreg[i]);if (ret) goto err_free_irq;
drivers/net/wireless/ath/ath10k/snoc.h +12 -9
@@ -10,10 +10,22 @@#include "ce.h" #include "qmi.h" +struct ath10k_vreg_info { +struct regulator *reg; +const char *name; +u32 min_v; +u32 max_v; +u32 load_ua; +unsigned long settle_delay; +bool required; +}; +struct ath10k_snoc_drv_priv {enum ath10k_hw_rev hw_rev;u64 dma_mask;u32 msa_size; +struct ath10k_vreg_info *vreg_cfg; +u8 vreg_count; };struct snoc_state {
@@ -42,16 +54,6 @@ struct ath10k_snoc_ce_irq {u32 irq_line; }; -struct ath10k_vreg_info { -struct regulator *reg; -const char *name; -u32 min_v; -u32 max_v; -u32 load_ua; -unsigned long settle_delay; -bool required; -};
Re: [PATCH 2/3] ath10k: Move regulator config to driver private data
Quoted 4 lines · Govind Singh
WCN3990 Regulator config is varying b/w different MSM platforms. In order to have scalable config, move regulator config to driver private data.
Regulators supplying clients with fixed voltage requirements should be specified in the board devicetree with these required voltage values, rather than in the driver. So the appropriate solution is not to add and adjust these values but rather to drop this code from the driver.
I was about to send a patch that does this, because I have an SDM845 device where the voltage constraints specified on board level does not meet the ranges specified here in the driver.
Regards,
Bjorn
Quoted 155 lines
Signed-off-by Govind Singh <[email protected]>--- drivers/net/wireless/ath/ath10k/snoc.c | 38 +++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/snoc.h | 23 +++++++++------- 2 files changed, 44 insertions(+), 17 deletions(-)drivers/net/wireless/ath/ath10k/snoc.c +31
-7@@ -36,13 +36,20 @@ static char *const ce_name[] = { "WLAN_CE_11", }; -static struct ath10k_vreg_info vreg_cfg[] = { +static struct ath10k_vreg_info sdm845_reg_cfg[] = { {NULL ,"vdd-0.8-cx-mx" ,800000 ,850000 ,0 ,0 , false}, {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, }; +static struct ath10k_vreg_info qcs40x_reg_cfg[] = { + {NULL ,"vdd-0.8-cx-mx" ,1224000 ,1224000 ,0 ,0 , false}, + {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, + {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, + {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, +}; +static struct ath10k_clk_info clk_cfg[] = { {NULL ,"cxo_ref_clk_pin" ,0 , false}, };@@ -54,10 +61,20 @@ static void ath10k_snoc_htt_rx_cb(struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_htt_htc_rx_cb (struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_pktlog_rx_cb (struct ath10k_ce_pipe *ce_state); -static const struct ath10k_snoc_drv_priv drv_priv = { +static const struct ath10k_snoc_drv_priv sdm845_wcn39xx_drv_priv = { + .hw_rev =ATH10K_HW_WCN3990 , + .dma_mask =DMA_BIT_MASK (35 ), + .msa_size =0x100000 , + .vreg_cfg = sdm845_reg_cfg, + .vreg_count =ARRAY_SIZE (sdm845_reg_cfg), +}; + +static const struct ath10k_snoc_drv_priv qcs40x_wcn39xx_drv_priv = { .hw_rev =ATH10K_HW_WCN3990 , .dma_mask =DMA_BIT_MASK (35 ), .msa_size =0x100000 , + .vreg_cfg = qcs40x_reg_cfg, + .vreg_count =ARRAY_SIZE (qcs40x_reg_cfg), };#define WCN3990_SRC_WR_IDX_OFFSET 0x3C@@ -1465,7 +1482,7 @@ static int ath10k_snoc_vreg_on(struct ath10k *ar)int ret =0 ;int i; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { +for (i =0 ; i < ar_snoc->vreg_count; i++) { vreg_info = &ar_snoc->vreg[i];if (!vreg_info->reg)@@ -1498,7 +1515,7 @@ static int ath10k_snoc_vreg_off(struct ath10k *ar)int ret =0 ;int i; -for (i =ARRAY_SIZE (vreg_cfg) -1 ; i >=0 ; i--) { +for (i = ar_snoc->vreg_count -1 ; i >=0 ; i--) { vreg_info = &ar_snoc->vreg[i];if (!vreg_info->reg)@@ -1616,7 +1633,13 @@ static int ath10k_hw_power_off(struct ath10k *ar)static const struct of_device_id ath10k_snoc_dt_match[] = { { .compatible ="qcom,wcn3990-wifi" , - .data = &drv_priv, + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,sdm845-wcn39xx-wifi" , + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,qcs40x-wcn39xx-wifi" , + .data = &qcs40x_wcn39xx_drv_priv, }, { } };@@ -1680,8 +1703,9 @@ static int ath10k_snoc_probe(struct platform_device *pdev) goto err_release_resource; } - ar_snoc->vreg = vreg_cfg; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { + ar_snoc->vreg = drv_data->vreg_cfg; + ar_snoc->vreg_count = drv_data->vreg_count; +for (i =0 ; i < ar_snoc->vreg_count; i++) { ret =ath10k_get_vreg_info (ar, dev, &ar_snoc->vreg[i]);if (ret) goto err_free_irq;drivers/net/wireless/ath/ath10k/snoc.h +13
-10@@ -10,10 +10,22 @@#include "ce.h" #include "qmi.h" +struct ath10k_vreg_info { +struct regulator *reg; +const char *name; +u32 min_v; +u32 max_v; +u32 load_ua; +unsigned long settle_delay; +bool required; +}; +struct ath10k_snoc_drv_priv {enum ath10k_hw_rev hw_rev;u64 dma_mask;u32 msa_size; +struct ath10k_vreg_info *vreg_cfg; +u8 vreg_count; };struct snoc_state {@@ -42,16 +54,6 @@ struct ath10k_snoc_ce_irq {u32 irq_line; }; -struct ath10k_vreg_info { -struct regulator *reg; -const char *name; -u32 min_v; -u32 max_v; -u32 load_ua; -unsigned long settle_delay; -bool required; -}; -struct ath10k_clk_info {struct clk *handle;const char *name;@@ -77,6 +79,7 @@ struct ath10k_snoc {struct ath10k_ce ce;struct timer_list rx_post_retry;struct ath10k_vreg_info *vreg; +u8 vreg_count;struct ath10k_clk_info *clk;struct ath10k_qmi *qmi;unsigned long flags;Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 2/3] ath10k: Move regulator config to driver private data
Quoted 7 lines · Bjorn Andersson
Quoted 4 lines · Govind Singh
WCN3990 Regulator config is varying b/w different MSM platforms. In order to have scalable config, move regulator config to driver private data.
Quoted 9 lines
Regulators supplying clients with fixed voltage requirements should be specified in the board devicetree with these required voltage values, rather than in the driver. So the appropriate solution is not to add and adjust these values but rather to drop this code from the driver.
I was about to send a patch that does this, because I have an SDM845 device where the voltage constraints specified on board level does not meet the ranges specified here in the driver.
Thanks Bjorn for the feedback.
I will resend the qcs404 specific changes(dt) on top of your changes once available.
Quoted 158 lines
Regards,
BjornQuoted 155 lines
Signed-off-by Govind Singh <[email protected]>--- drivers/net/wireless/ath/ath10k/snoc.c | 38 +++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/snoc.h | 23 +++++++++------- 2 files changed, 44 insertions(+), 17 deletions(-)drivers/net/wireless/ath/ath10k/snoc.c +19
-2@@ -36,13 +36,20 @@ static char *const ce_name[] = { "WLAN_CE_11", }; -static struct ath10k_vreg_info vreg_cfg[] = { +static struct ath10k_vreg_info sdm845_reg_cfg[] = { {NULL ,"vdd-0.8-cx-mx" ,800000 ,850000 ,0 ,0 , false}, {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, }; +static struct ath10k_vreg_info qcs40x_reg_cfg[] = { + {NULL ,"vdd-0.8-cx-mx" ,1224000 ,1224000 ,0 ,0 , false}, + {NULL ,"vdd-1.8-xo" ,1800000 ,1850000 ,0 ,0 , false}, + {NULL ,"vdd-1.3-rfa" ,1300000 ,1350000 ,0 ,0 , false}, + {NULL ,"vdd-3.3-ch0" ,3300000 ,3350000 ,0 ,0 , false}, +}; +static struct ath10k_clk_info clk_cfg[] = { {NULL ,"cxo_ref_clk_pin" ,0 , false}, };@@ -54,10 +61,20 @@ static void ath10k_snoc_htt_rx_cb(struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_htt_htc_rx_cb (struct ath10k_ce_pipe *ce_state);static void ath10k_snoc_pktlog_rx_cb (struct ath10k_ce_pipe *ce_state); -static const struct ath10k_snoc_drv_priv drv_priv = { +static const struct ath10k_snoc_drv_priv sdm845_wcn39xx_drv_priv = { + .hw_rev =ATH10K_HW_WCN3990 , + .dma_mask =DMA_BIT_MASK (35 ), + .msa_size =0x100000 , + .vreg_cfg = sdm845_reg_cfg, + .vreg_count =ARRAY_SIZE (sdm845_reg_cfg), +}; + +static const struct ath10k_snoc_drv_priv qcs40x_wcn39xx_drv_priv = { .hw_rev =ATH10K_HW_WCN3990 , .dma_mask =DMA_BIT_MASK (35 ), .msa_size =0x100000 , + .vreg_cfg = qcs40x_reg_cfg, + .vreg_count =ARRAY_SIZE (qcs40x_reg_cfg),};
#define
WCN3990_SRC_WR_IDX_OFFSET0x3Cdrivers/net/wireless/ath/ath10k/snoc.c +1
-1@@ -1465,7 +1482,7 @@ static int ath10k_snoc_vreg_on(struct ath10k *ar)int ret =0 ;int i; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { +for (i =0 ; i < ar_snoc->vreg_count; i++) { vreg_info = &ar_snoc->vreg[i];drivers/net/wireless/ath/ath10k/snoc.c +1
-1if (!vreg_info->reg)@@ -1498,7 +1515,7 @@ static int ath10k_snoc_vreg_off(struct ath10k *ar)int ret =0 ;int i; -for (i =ARRAY_SIZE (vreg_cfg) -1 ; i >=0 ; i--) { +for (i = ar_snoc->vreg_count -1 ; i >=0 ; i--) { vreg_info = &ar_snoc->vreg[i];drivers/net/wireless/ath/ath10k/snoc.c +7
-1if (!vreg_info->reg)@@ -1616,7 +1633,13 @@ static int ath10k_hw_power_off(struct ath10k *ar)static const struct of_device_id ath10k_snoc_dt_match[] = { { .compatible ="qcom,wcn3990-wifi" , - .data = &drv_priv, + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,sdm845-wcn39xx-wifi" , + .data = &sdm845_wcn39xx_drv_priv, + }, + { .compatible ="qcom,qcs40x-wcn39xx-wifi" , + .data = &qcs40x_wcn39xx_drv_priv, }, { }};
drivers/net/wireless/ath/ath10k/snoc.c +3
-2@@ -1680,8 +1703,9 @@ static int ath10k_snoc_probe(struct platform_device *pdev) goto err_release_resource; } - ar_snoc->vreg = vreg_cfg; -for (i =0 ; i <ARRAY_SIZE (vreg_cfg); i++) { + ar_snoc->vreg = drv_data->vreg_cfg; + ar_snoc->vreg_count = drv_data->vreg_count; +for (i =0 ; i < ar_snoc->vreg_count; i++) { ret =ath10k_get_vreg_info (ar, dev, &ar_snoc->vreg[i]);if (ret)drivers/net/wireless/ath/ath10k/snoc.c +0
-0goto err_free_irq;drivers/net/wireless/ath/ath10k/snoc.h +12
-10@@ -10,10 +10,22 @@#include "ce.h" #include "qmi.h" +struct ath10k_vreg_info { +struct regulator *reg; +const char *name; +u32 min_v; +u32 max_v; +u32 load_ua; +unsigned long settle_delay; +bool required; +}; +struct ath10k_snoc_drv_priv {enum ath10k_hw_rev hw_rev;u64 dma_mask;u32 msa_size; +struct ath10k_vreg_info *vreg_cfg; +u8 vreg_count; };struct snoc_state {@@ -42,16 +54,6 @@ struct ath10k_snoc_ce_irq {u32 irq_line; }; -struct ath10k_vreg_info { -struct regulator *reg; -const char *name; -u32 min_v; -u32 max_v; -u32 load_ua; -unsigned long settle_delay; -bool required; -}; -struct ath10k_clk_info {struct clk *handle;const char *name;@@ -77,6 +79,7 @@ struct ath10k_snoc {struct ath10k_ce ce;struct timer_list rx_post_retry;struct ath10k_vreg_info *vreg;
Quoted 8 lines
Quoted 8 lines
drivers/net/wireless/ath/ath10k/snoc.h +1
-1+u8 vreg_count;struct ath10k_clk_info *clk;struct ath10k_qmi *qmi;unsigned long flags; --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
BR,
Govind
PATCH 3/3 arm64: dts: qcom: qcs404: Modify wifi dt node for SDM845/QCS404 devices
In reply to Govind SinghModify the compatible string of wifi node for SDM845/QCS404 devices. Add wifi regulators in qcs404 dt node for proxy vote. Proxy votes are required for handling driver recovery scenarios to prevent un-clocked register access during driver recovery.
--- arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 3 +++ arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi +3 -0
@@ -190,6 +190,9 @@ &wifi { status = "okay"; + vdd-0.8-cx-mx-supply = <&vreg_l2_1p275>; + vdd-1.8-xo-supply = <&vreg_l5_1p8>; + vdd-1.3-rfa-supply = <&vreg_l1_1p3>; }; /* PINCTRL - additions to nodes defined in qcs404.dtsi */
arch/arm64/boot/dts/qcom/qcs404.dtsi +1 -1
@@ -480,7 +480,7 @@ }; wifi: wifi@a000000 { - compatible = "qcom,wcn3990-wifi"; + compatible = "qcom,qcs40x-wcn39xx-wifi"; reg = <0xa000000 0x800000>; reg-names = "membase"; memory-region = <&wlan_msa_mem>;
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -2235,7 +2235,7 @@ }; wifi: wifi@18800000 { - compatible = "qcom,wcn3990-wifi"; + compatible = "qcom,sdm845-wcn39xx-wifi"; status = "disabled"; reg = <0 0x18800000 0 0x800000>; reg-names = "membase";
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project