PCI: tegra194: Use aspm-l1-entry-delay-ns DT property for L1 entrance latency
PATCH 1/1 PCI: tegra194: Use aspm-l1-entry-delay-ns DT property for L1 entrance latency
Program ASPM L1 entrance latency from the optional aspm-l1-entry-delay-ns device tree property instead of of_data. Convert the value from nanoseconds to the hardware encoding (log2(us) + 1, 3-bit field). If the property is absent, default to 7 (maximum latency).
--- drivers/pci/controller/dwc/pcie-tegra194.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/pci/controller/dwc/pcie-tegra194.c +14 -0
@@ -18,6 +18,7 @@#include <linux/interrupt.h> #include <linux/iopoll.h> #include <linux/kernel.h> +#include <linux/log2.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_pci.h>
@@ -272,6 +273,7 @@ struct tegra_pcie_dw {u32 aspm_cmrt;u32 aspm_pwr_on_t;u32 aspm_l0s_enter_lat; +u32 aspm_l1_enter_lat;struct regulator *pex_ctl_supply;struct regulator *slot_ctl_3v3;
@@ -710,6 +712,8 @@ static void init_host_aspm(struct tegra_pcie_dw *pcie) val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); val &= ~PORT_AFR_L0S_ENTRANCE_LAT_MASK ; val |= (pcie->aspm_l0s_enter_lat <<PORT_AFR_L0S_ENTRANCE_LAT_SHIFT ); + val &= ~PORT_AFR_L1_ENTRANCE_LAT_MASK ; + val |= (pcie->aspm_l1_enter_lat <<PORT_AFR_L1_ENTRANCE_LAT_SHIFT ); val |=PORT_AFR_ENTER_ASPM ;dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); }
@@ -1110,6 +1114,7 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie) {struct platform_device *pdev =to_platform_device (pcie->dev);struct device_node *np = pcie->dev->of_node; +u32 val;int ret; pcie->dbi_res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dbi" );
@@ -1136,6 +1141,15 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)dev_info (pcie->dev,"Failed to read ASPM L0s Entrance latency: %d\n" , ret); +/* Default to max latency of 7. */ + pcie->aspm_l1_enter_lat =7 ; + ret =of_property_read_u32 (np,"aspm-l1-entry-delay-ns" , &val); +if (!ret) { +u32 us =max (val /1000 ,1U ); + + pcie->aspm_l1_enter_lat =min (ilog2 (us) +1 ,7 ); + } + ret =of_property_read_u32 (np,"num-lanes" , &pcie->num_lanes);if (ret <0 ) {dev_err (pcie->dev,"Failed to read num-lanes: %d\n" , ret);
Signature · 1 line
2.34.1
Jon Hunter
maintainerQuoted 2 lines · Manikanta Maddireddy
Program ASPM L1 entrance latency from the optional aspm-l1-entry-delay-ns device tree property instead of
of_data. Convert the value from nanoseconds
Is the 'instead of of_data' relevant here?
Quoted 1 line
to the hardware encoding (log2(us) + 1, 3-bit field). If the property is
Its says 'nanoseconds', but the equation above references uS. I see below you convert ns to uS and then take the log2. So I guess this should be 'log2(ns/1000) + 1'. Also the '3-bit field' bit is not very clear. So may be ...
"Convert the value from nanoseconds to a hardware encoded 3-bit value that is equal to log2(ns/1000) + 1. If the property is absent or greater than 7 (the maximum latency value supported), then default to 7."
Quoted 62 lines
absent, default to 7 (maximum latency).
Signed-off-by Manikanta Maddireddy <[email protected]>Signed-off-by Manivannan Sadhasivam <[email protected]>--- drivers/pci/controller/dwc/pcie-tegra194.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/pci/controller/dwc/pcie-tegra194.c +14
-0@@ -18,6 +18,7 @@#include <linux/interrupt.h> #include <linux/iopoll.h> #include <linux/kernel.h> +#include <linux/log2.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_pci.h> @@ -272,6 +273,7 @@ struct tegra_pcie_dw {u32 aspm_cmrt;u32 aspm_pwr_on_t;u32 aspm_l0s_enter_lat; +u32 aspm_l1_enter_lat;struct regulator *pex_ctl_supply;struct regulator *slot_ctl_3v3;@@ -710,6 +712,8 @@ static void init_host_aspm(struct tegra_pcie_dw *pcie) val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); val &= ~PORT_AFR_L0S_ENTRANCE_LAT_MASK ; val |= (pcie->aspm_l0s_enter_lat <<PORT_AFR_L0S_ENTRANCE_LAT_SHIFT ); + val &= ~PORT_AFR_L1_ENTRANCE_LAT_MASK ; + val |= (pcie->aspm_l1_enter_lat <<PORT_AFR_L1_ENTRANCE_LAT_SHIFT ); val |=PORT_AFR_ENTER_ASPM ;dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); }@@ -1110,6 +1114,7 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie) {struct platform_device *pdev =to_platform_device (pcie->dev);struct device_node *np = pcie->dev->of_node; +u32 val;int ret; pcie->dbi_res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dbi" );@@ -1136,6 +1141,15 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)dev_info (pcie->dev,"Failed to read ASPM L0s Entrance latency: %d\n" , ret); +/* Default to max latency of 7. */ + pcie->aspm_l1_enter_lat =7 ; + ret =of_property_read_u32 (np,"aspm-l1-entry-delay-ns" , &val); +if (!ret) { +u32 us =max (val /1000 ,1U ); + + pcie->aspm_l1_enter_lat =min (ilog2 (us) +1 ,7 ); + } + ret =of_property_read_u32 (np,"num-lanes" , &pcie->num_lanes);if (ret <0 ) {dev_err (pcie->dev,"Failed to read num-lanes: %d\n" , ret);
Signature · 1 line
nvpublic
Manivannan Sadhasivam
maintainerQuoted 2 lines · Manikanta Maddireddy
Program ASPM L1 entrance latency from the optional aspm-l1-entry-delay-ns device tree property instead of
of_data. Convert the value from nanoseconds
Which 'of_data'?
Quoted 1 line
to the hardware encoding (log2(us) + 1, 3-bit field). If the property is
As Jon noted, this expression doesn't match the code.
Quoted 4 lines
absent, default to 7 (maximum latency).
Signed-off-by Manikanta Maddireddy <[email protected]>Signed-off-by Manivannan Sadhasivam <[email protected]>
This tag from mine is wrong. I never sent this patch on my own. So drop my s-o-b and...
Quoted 1 line
also this 'Link' tag.
- Mani
Quoted 60 lines
--- drivers/pci/controller/dwc/pcie-tegra194.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/pci/controller/dwc/pcie-tegra194.c +14
-0@@ -18,6 +18,7 @@#include <linux/interrupt.h> #include <linux/iopoll.h> #include <linux/kernel.h> +#include <linux/log2.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_pci.h> @@ -272,6 +273,7 @@ struct tegra_pcie_dw {u32 aspm_cmrt;u32 aspm_pwr_on_t;u32 aspm_l0s_enter_lat; +u32 aspm_l1_enter_lat;struct regulator *pex_ctl_supply;struct regulator *slot_ctl_3v3;@@ -710,6 +712,8 @@ static void init_host_aspm(struct tegra_pcie_dw *pcie) val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); val &= ~PORT_AFR_L0S_ENTRANCE_LAT_MASK ; val |= (pcie->aspm_l0s_enter_lat <<PORT_AFR_L0S_ENTRANCE_LAT_SHIFT ); + val &= ~PORT_AFR_L1_ENTRANCE_LAT_MASK ; + val |= (pcie->aspm_l1_enter_lat <<PORT_AFR_L1_ENTRANCE_LAT_SHIFT ); val |=PORT_AFR_ENTER_ASPM ;dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); }@@ -1110,6 +1114,7 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie) {struct platform_device *pdev =to_platform_device (pcie->dev);struct device_node *np = pcie->dev->of_node; +u32 val;int ret; pcie->dbi_res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dbi" );@@ -1136,6 +1141,15 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)dev_info (pcie->dev,"Failed to read ASPM L0s Entrance latency: %d\n" , ret); +/* Default to max latency of 7. */ + pcie->aspm_l1_enter_lat =7 ; + ret =of_property_read_u32 (np,"aspm-l1-entry-delay-ns" , &val); +if (!ret) { +u32 us =max (val /1000 ,1U ); + + pcie->aspm_l1_enter_lat =min (ilog2 (us) +1 ,7 ); + } + ret =of_property_read_u32 (np,"num-lanes" , &pcie->num_lanes);if (ret <0 ) {dev_err (pcie->dev,"Failed to read num-lanes: %d\n" , ret);Signature · 1 line
2.34.1
Signature · 1 line
மணிவண்ணன் சதாசிவம்