habanalabs: add comment for pll frequency ioctl opcode
PATCH 1/3 habanalabs: add comment for pll frequency ioctl opcode
From: Alon Mizrahi <[email protected]>
Forgot to add the comment for the opcode when it was added.
Signed-off-by Alon Mizrahi <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- include/uapi/misc/habanalabs.h | 1 + 1 file changed, 1 insertion(+)
include/uapi/misc/habanalabs.h +1 -0
@@ -279,6 +279,7 @@ enum hl_device_status {* HL_INFO_CLK_THROTTLE_REASON - Retrieve clock throttling reason * HL_INFO_SYNC_MANAGER - Retrieve sync manager info per dcore * HL_INFO_TOTAL_ENERGY - Retrieve total energy consumption +* HL_INFO_PLL_FREQUENCY - Retrieve PLL frequency */ #define HL_INFO_HW_IP_INFO 0#define HL_INFO_HW_EVENTS 1
Signature · 1 line
2.17.1
PATCH 2/3 habanalabs: fetch PSOC PLL frequency from F/W in goya
From: Alon Mizrahi <[email protected]>
When the F/W security is enabled, goya needs to fetch the PSOC pll frequency through a dedicated interface
Signed-off-by Alon Mizrahi <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/goya/goya.c | 61 ++++++++++++++++++----------- 1 file changed, 38 insertions(+), 23 deletions(-)
drivers/misc/habanalabs/goya/goya.c +38 -23
@@ -694,32 +694,47 @@ static void goya_qman0_set_security(struct hl_device *hdev, bool secure)static void goya_fetch_psoc_frequency (struct hl_device *hdev) {struct asic_fixed_properties *prop = &hdev->asic_prop; -u32 trace_freq =0 ; -u32 pll_clk =0 ; -u32 div_fctr =RREG32 (mmPSOC_PCI_PLL_DIV_FACTOR_1); -u32 div_sel =RREG32 (mmPSOC_PCI_PLL_DIV_SEL_1); -u32 nr =RREG32 (mmPSOC_PCI_PLL_NR); -u32 nf =RREG32 (mmPSOC_PCI_PLL_NF); -u32 od =RREG32 (mmPSOC_PCI_PLL_OD); - -if (div_sel ==DIV_SEL_REF_CLK || div_sel ==DIV_SEL_DIVIDED_REF ) { -if (div_sel ==DIV_SEL_REF_CLK ) - trace_freq =PLL_REF_CLK ; -else - trace_freq =PLL_REF_CLK / (div_fctr +1 ); - }else if (div_sel ==DIV_SEL_PLL_CLK || - div_sel ==DIV_SEL_DIVIDED_PLL ) { - pll_clk =PLL_REF_CLK * (nf +1 ) / ((nr +1 ) * (od +1 )); -if (div_sel ==DIV_SEL_PLL_CLK ) - trace_freq = pll_clk; -else - trace_freq = pll_clk / (div_fctr +1 ); +u32 nr =0 , nf =0 , od =0 , div_fctr =0 , pll_clk, div_sel; +u16 pll_freq_arr[HL_PLL_NUM_OUTPUTS ], freq; +int rc; + +if (hdev->asic_prop.fw_security_disabled) { + div_fctr =RREG32 (mmPSOC_PCI_PLL_DIV_FACTOR_1); + div_sel =RREG32 (mmPSOC_PCI_PLL_DIV_SEL_1); + nr =RREG32 (mmPSOC_PCI_PLL_NR); + nf =RREG32 (mmPSOC_PCI_PLL_NF); + od =RREG32 (mmPSOC_PCI_PLL_OD); + +if (div_sel ==DIV_SEL_REF_CLK || + div_sel ==DIV_SEL_DIVIDED_REF ) { +if (div_sel ==DIV_SEL_REF_CLK ) + freq =PLL_REF_CLK ; +else + freq =PLL_REF_CLK / (div_fctr +1 ); + }else if (div_sel ==DIV_SEL_PLL_CLK || + div_sel ==DIV_SEL_DIVIDED_PLL ) { + pll_clk =PLL_REF_CLK * (nf +1 ) / + ((nr +1 ) * (od +1 )); +if (div_sel ==DIV_SEL_PLL_CLK ) + freq = pll_clk; +else + freq = pll_clk / (div_fctr +1 ); + }else { +dev_warn (hdev->dev, +"Received invalid div select value: %d" , + div_sel); + freq =0 ; + } }else { -dev_warn (hdev->dev, -"Received invalid div select value: %d" , div_sel); + rc =hl_fw_cpucp_pll_info_get (hdev,PCI_PLL , pll_freq_arr); + +if (rc) +return ; + + freq = pll_freq_arr[1 ]; } - prop->psoc_timestamp_frequency = trace_freq; + prop->psoc_timestamp_frequency = freq; prop->psoc_pci_pll_nr = nr; prop->psoc_pci_pll_nf = nf; prop->psoc_pci_pll_od = od;
Signature · 1 line
2.17.1
PATCH 3/3 habanalabs: remove generic gaudi get_pll_freq function
In reply to Oded GabbayFrom: Alon Mizrahi <[email protected]>
As we only fetch the CPU_PLL frequency in gaudi, we don't need a generic get_pll_frequency function which takes a pll index as input
Signed-off-by Alon Mizrahi <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- .../misc/habanalabs/common/habanalabs_ioctl.c | 2 +- drivers/misc/habanalabs/gaudi/gaudi.c | 126 ++++++------------ drivers/misc/habanalabs/gaudi/gaudiP.h | 7 - 3 files changed, 41 insertions(+), 94 deletions(-)
drivers/misc/habanalabs/common/habanalabs_ioctl.c +1 -1
@@ -406,7 +406,7 @@ static int total_energy_consumption_info(struct hl_fpriv *hpriv,static int pll_frequency_info (struct hl_fpriv *hpriv,struct hl_info_args *args) {struct hl_device *hdev = hpriv->hdev; -struct hl_pll_frequency_info freq_info = {}; +struct hl_pll_frequency_info freq_info = { {0 } };u32 max_size = args->return_size;void __user *out = (void __user *) (uintptr_t ) args->return_pointer;int rc;
drivers/misc/habanalabs/gaudi/gaudi.c +40 -86
152 lines not on this page · raw message
drivers/misc/habanalabs/gaudi/gaudiP.h +0 -7
@@ -105,13 +105,6 @@#define MME_ACC_OFFSET (mmMME1_ACC_BASE - mmMME0_ACC_BASE)#define SRAM_BANK_OFFSET (mmSRAM_Y0_X1_RTR_BASE - mmSRAM_Y0_X0_RTR_BASE) -#define PLL_NR_OFFSET 0 -#define PLL_NF_OFFSET (mmPSOC_CPU_PLL_NF - mmPSOC_CPU_PLL_NR) -#define PLL_OD_OFFSET (mmPSOC_CPU_PLL_OD - mmPSOC_CPU_PLL_NR) -#define PLL_DIV_FACTOR_0_OFFSET (mmPSOC_CPU_PLL_DIV_FACTOR_0 - \ - mmPSOC_CPU_PLL_NR) -#define PLL_DIV_SEL_0_OFFSET (mmPSOC_CPU_PLL_DIV_SEL_0 - mmPSOC_CPU_PLL_NR) -#define NUM_OF_SOB_IN_BLOCK \ (((mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_SOB_OBJ_2047 - \ mmSYNC_MNGR_E_N_SYNC_MNGR_OBJS_SOB_OBJ_0) + 4) >> 2)
Signature · 1 line
2.17.1