x86: clk: Add config option to enable 48MHz fixed fch clk
Subsystems (2)
v2 cover x86: clk: Add config option to enable 48MHz fixed fch clk
changes since v1:
- Remove unsused variable
Ajit Kumar Pandey (5):
x86: clk: Add config option to enable 48MHz fixed fch clk
drivers: acpi: acpi_apd: Remove unused device property "is-rv"
ACPI: APD: Add a fmw property clk-name
clk: x86: Use dynamic con_id string during clk registration
clk: x86: Fix clk_gate_flags for RV_CLK_GATE
drivers/acpi/acpi_apd.c | 11 +++++++++-- drivers/clk/x86/Kconfig | 5 +++++ drivers/clk/x86/clk-fch.c | 26 +++++++++++++------------- include/linux/platform_data/clk-fch.h | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/5 x86: clk: Add config option to enable 48MHz fixed fch clk
At present 48MHz clk support is only enabled for RV architecture using "is-rv" device property initialized from boot loader. This limit 48MHz fixed clock gate support to RV platform unless we add similar device property in boot loader for other architecture.
Add Kernel config option to enable 48MHz fixed clk gate registration with clock framework. This enahanced flexibility to enable 48MHz fch clock support on any platforms by simply enabling kernel config. Also replace RV with FIXED as generic naming convention across platforms.
--- drivers/clk/x86/Kconfig | 5 +++++ drivers/clk/x86/clk-fch.c | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-)
drivers/clk/x86/Kconfig +5 -0
@@ -6,3 +6,8 @@ config CLK_LGM_CGU help Clock Generation Unit(CGU) driver for Intel Lightning Mountain(LGM) network processor SoC. + +config CLK_FIXED_FCH + bool "AMD FCH controller fixed 48MHz CLK support" + help + Enable this option for 48MHz fixed mclk support on AMD platforms.
drivers/clk/x86/clk-fch.c +11 -11
@@ -26,9 +26,9 @@#define ST_CLK_GATE 3#define ST_MAX_CLKS 4 -#define RV_CLK_48M 0 -#define RV_CLK_GATE 1 -#define RV_MAX_CLKS 2 +#define CLK_48M_FIXED 0 +#define CLK_GATE_FIXED 1 +#define CLK_MAX_FIXED 2static const char *const clk_oscout1_parents[] = {"clk48MHz" ,"clk25MHz" };static struct clk_hw *hws[ST_MAX_CLKS ];
@@ -41,7 +41,7 @@ static int fch_clk_probe(struct platform_device *pdev)if (!fch_data || !fch_data->base)return -EINVAL ; -if (!fch_data->is_rv) { +if (!IS_ENABLED (CONFIG_CLK_FIXED_FCH )) { hws[ST_CLK_48M ] =clk_hw_register_fixed_rate (NULL ,"clk48MHz" ,NULL ,0 ,48000000 ); hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz",
@@ -61,14 +61,14 @@ static int fch_clk_probe(struct platform_device *pdev)devm_clk_hw_register_clkdev (&pdev->dev, hws[ST_CLK_GATE ],"oscout1" ,NULL ); }else { - hws[RV_CLK_48M ] =clk_hw_register_fixed_rate (NULL ,"clk48MHz" , + hws[CLK_48M_FIXED ] =clk_hw_register_fixed_rate (NULL ,"clk48MHz" ,NULL ,0 ,48000000 ); - hws[RV_CLK_GATE ] =clk_hw_register_gate (NULL ,"oscout1" , + hws[CLK_GATE_FIXED ] =clk_hw_register_gate (NULL ,"oscout1" ,"clk48MHz" ,0 , fch_data->base +MISCCLKCNTL1 ,OSCCLKENB ,CLK_GATE_SET_TO_DISABLE ,NULL ); -devm_clk_hw_register_clkdev (&pdev->dev, hws[RV_CLK_GATE ], +devm_clk_hw_register_clkdev (&pdev->dev, hws[CLK_GATE_FIXED ],"oscout1" ,NULL ); }
@@ -78,11 +78,11 @@ static int fch_clk_probe(struct platform_device *pdev)static int fch_clk_remove (struct platform_device *pdev) {int i, clks; -struct fch_clk_data *fch_data; - - fch_data =dev_get_platdata (&pdev->dev); - clks = fch_data->is_rv ?RV_MAX_CLKS :ST_MAX_CLKS ; +if (IS_ENABLED (CONFIG_CLK_FIXED_FCH )) + clks =CLK_MAX_FIXED ; +else + clks =ST_MAX_CLKS ;for (i =0 ; i < clks; i++)clk_hw_unregister (hws[i]);
Signature · 1 line
2.25.1
Stephen Boyd
maintainerQuoting Ajit Kumar Pandey (2021-10-12 03:36:08)
Quoted 9 lines
At present 48MHz clk support is only enabled for RV architecture using "is-rv" device property initialized from boot loader. This limit 48MHz fixed clock gate support to RV platform unless we add similar device property in boot loader for other architecture.
Add Kernel config option to enable 48MHz fixed clk gate registration with clock framework. This enahanced flexibility to enable 48MHz fch clock support on any platforms by simply enabling kernel config. Also replace RV with FIXED as generic naming convention across platforms.
What do we do if I enable CLK_FIXED_FCH in Kconfig but don't populate the 48MHz clk? It's always present so this isn't actually a problem? Why does the bootloader set an 'is-rv' property at all?
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 16 lines · Ajit Kumar Pandey
Quoted 13 lines · Stephen Boyd
[CAUTION: External Email]
Quoting Ajit Kumar Pandey (2021-10-12 03:36:08)
Quoted 9 lines
At present 48MHz clk support is only enabled for RV architecture using "is-rv" device property initialized from boot loader. This limit 48MHz fixed clock gate support to RV platform unless we add similar device property in boot loader for other architecture.
Add Kernel config option to enable 48MHz fixed clk gate registration with clock framework. This enahanced flexibility to enable 48MHz fch clock support on any platforms by simply enabling kernel config. Also replace RV with FIXED as generic naming convention across platforms.
Quoted 6 lines
Quoted 4 lines
What do we do if I enable
CLK_FIXED_FCHinKconfigbut don't populate the 48MHz clk? It's always present so this isn't actually a problem? Why does the bootloader set an 'is-rv' property at all?Yeah 48MHz clock is always present and we will select or enable
CLK_FIXED_CHconfig from
ALSA machine driver which enable/disable this 48MHz clock.
"is-rv" property is set in bootloader of RV or Raven SOC architecture resembling "is-raven". Actually we want to use existing clk-fch driver for 48MHz clock support on raven hence used an acpi property to distinguish raven platform and used check with "is-rv" flags to register 48Mhz clock with CCF. Now since we need this support on older and more platforms we moved to config selection approach for registering 48Mhz clk as changing or adding BIOS property isn't feasible on all platforms.
Stephen Boyd
maintainerQuoting Ajit Kumar Pandey (2021-10-19 11:14:56)
Quoted 25 lines · Ajit Kumar Pandey
Quoted 16 lines · Stephen Boyd
Quoted 13 lines
[CAUTION: External Email]
Quoting Ajit Kumar Pandey (2021-10-12 03:36:08)
Quoted 9 lines
At present 48MHz clk support is only enabled for RV architecture using "is-rv" device property initialized from boot loader. This limit 48MHz fixed clock gate support to RV platform unless we add similar device property in boot loader for other architecture.
Add Kernel config option to enable 48MHz fixed clk gate registration with clock framework. This enahanced flexibility to enable 48MHz fch clock support on any platforms by simply enabling kernel config. Also replace RV with FIXED as generic naming convention across platforms.
Quoted 6 lines
Quoted 4 lines
What do we do if I enable
CLK_FIXED_FCHinKconfigbut don't populate the 48MHz clk? It's always present so this isn't actually a problem? Why does the bootloader set an 'is-rv' property at all?Yeah 48MHz clock is always present and we will select or enable
CLK_FIXED_CHconfig from
Quoted 8 lines
ALSA machine driver which enable/disable this 48MHz clock. "is-rv" property is set in bootloader of RV or Raven SOC architecture resembling "is-raven". Actually we want to use existing clk-fch driver for 48MHz clock support on raven hence used an acpi property to distinguish raven platform and used check with "is-rv" flags to register 48Mhz clock with CCF. Now since we need this support on older and more platforms we moved to config selection approach for registering 48Mhz clk as changing or adding BIOS property isn't feasible on all platforms.
How do we expect distros to use the same driver on different hardware with unchanged BIOS? It seems like anyone who wants to use this driver now has to know what is wrong with their BIOS and build their kernel with the config set or not? Looks like a headache. We shouldn't be changing the kernel build configuration for something that we detect at runtime.
PATCH v2 2/5 drivers: acpi: acpi_apd: Remove unused device property "is-rv"
In reply to Ajit Kumar PandeyInitially "is-rv" device property is added for 48MHz fixed clock support on Raven or RV architecture. It's unused now as we moved to clock config based selection to extend such support on others architecture. This change removed unused code from acpi driver.
--- drivers/acpi/acpi_apd.c | 3 --- include/linux/platform_data/clk-fch.h | 1 - 2 files changed, 4 deletions(-)
drivers/acpi/acpi_apd.c +0 -3
@@ -87,9 +87,6 @@ static int fch_misc_setup(struct apd_private_data *pdata)if (ret <0 )return -ENOENT ; -if (!acpi_dev_get_property (adev,"is-rv" ,ACPI_TYPE_INTEGER , &obj)) - clk_data->is_rv = obj->integer.value; -list_for_each_entry (rentry, &resource_list, node) { clk_data->base =devm_ioremap (&adev->dev, rentry->res->start,resource_size (rentry->res));
include/linux/platform_data/clk-fch.h +0 -1
@@ -12,7 +12,6 @@struct fch_clk_data {void __iomem *base; -u32 is_rv; };#endif /* __CLK_FCH_H */
Signature · 1 line
2.25.1
PATCH v2 3/5 ACPI: APD: Add a fmw property clk-name
In reply to Ajit Kumar PandeyAdd a new device property to fetch clk-name from firmware.
--- drivers/acpi/acpi_apd.c | 10 ++++++++++ include/linux/platform_data/clk-fch.h | 1 + 2 files changed, 11 insertions(+)
drivers/acpi/acpi_apd.c +10 -0
@@ -87,6 +87,16 @@ static int fch_misc_setup(struct apd_private_data *pdata)if (ret <0 )return -ENOENT ; +if (!acpi_dev_get_property (adev,"clk-name" ,ACPI_TYPE_STRING , &obj)) { + clk_data->name =devm_kzalloc (&adev->dev, obj->string.length, +GFP_KERNEL ); + +strcpy (clk_data->name, obj->string.pointer); + }else { +/* Set default name to mclk if entry missing in firmware */ + clk_data->name ="mclk" ; + } +list_for_each_entry (rentry, &resource_list, node) { clk_data->base =devm_ioremap (&adev->dev, rentry->res->start,resource_size (rentry->res));
include/linux/platform_data/clk-fch.h +1 -0
@@ -12,6 +12,7 @@struct fch_clk_data {void __iomem *base; +char *name; };#endif /* __CLK_FCH_H */
Signature · 1 line
2.25.1
PATCH v2 4/5 clk: x86: Use dynamic con_id string during clk registration
In reply to Ajit Kumar PandeyReplace hard coded con_id string with fch_data->name. We have clk consumers looking up with different clock names, hence use dynamic con_id string during clk lookup registration. fch_data->name will be initialized in acpi driver based on fmw property value.
--- drivers/clk/x86/clk-fch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/x86/clk-fch.c +1 -1
@@ -69,7 +69,7 @@ static int fch_clk_probe(struct platform_device *pdev) OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL);devm_clk_hw_register_clkdev (&pdev->dev, hws[CLK_GATE_FIXED ], -"oscout1" ,NULL ); + fch_data->name,NULL ); }return 0 ;
Signature · 1 line
2.25.1
PATCH v2 5/5 clk: x86: Fix clk_gate_flags for RV_CLK_GATE
In reply to Ajit Kumar PandeyIn AMD's SoC we have to clear bit for disabling 48MHz oscillator clock gate. Remove CLK_GATE_SET_TO_DISABLE flag for proper enable and disable of 48MHz clock.
--- drivers/clk/x86/clk-fch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/x86/clk-fch.c +1 -1
@@ -66,7 +66,7 @@ static int fch_clk_probe(struct platform_device *pdev) hws[CLK_GATE_FIXED ] =clk_hw_register_gate (NULL ,"oscout1" ,"clk48MHz" ,0 , fch_data->base +MISCCLKCNTL1 , -OSCCLKENB ,CLK_GATE_SET_TO_DISABLE ,NULL ); +OSCCLKENB ,0 ,NULL );devm_clk_hw_register_clkdev (&pdev->dev, hws[CLK_GATE_FIXED ], fch_data->name,NULL );
Signature · 1 line
2.25.1