Commit 7c2e0713 authored by David Müller's avatar David Müller Committed by Stephen Boyd

clk: x86: Add system specific quirk to mark clocks as critical

Since commit 648e9218 ("clk: x86: Stop marking clocks as
CLK_IS_CRITICAL"), the pmc_plt_clocks of the Bay Trail SoC are
unconditionally gated off. Unfortunately this will break systems where these
clocks are used for external purposes beyond the kernel's knowledge. Fix it
by implementing a system specific quirk to mark the necessary pmc_plt_clks as
critical.

Fixes: 648e9218 ("clk: x86: Stop marking clocks as CLK_IS_CRITICAL")
Signed-off-by: default avatarDavid Müller <dave.mueller@gmx.ch>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 9f842abd
...@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops = { ...@@ -165,7 +165,7 @@ static const struct clk_ops plt_clk_ops = {
}; };
static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,
void __iomem *base, const struct pmc_clk_data *pmc_data,
const char **parent_names, const char **parent_names,
int num_parents) int num_parents)
{ {
...@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, ...@@ -184,9 +184,17 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id,
init.num_parents = num_parents; init.num_parents = num_parents;
pclk->hw.init = &init; pclk->hw.init = &init;
pclk->reg = base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE; pclk->reg = pmc_data->base + PMC_CLK_CTL_OFFSET + id * PMC_CLK_CTL_SIZE;
spin_lock_init(&pclk->lock); spin_lock_init(&pclk->lock);
/*
* On some systems, the pmc_plt_clocks already enabled by the
* firmware are being marked as critical to avoid them being
* gated by the clock framework.
*/
if (pmc_data->critical && plt_clk_is_enabled(&pclk->hw))
init.flags |= CLK_IS_CRITICAL;
ret = devm_clk_hw_register(&pdev->dev, &pclk->hw); ret = devm_clk_hw_register(&pdev->dev, &pclk->hw);
if (ret) { if (ret) {
pclk = ERR_PTR(ret); pclk = ERR_PTR(ret);
...@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platform_device *pdev) ...@@ -332,7 +340,7 @@ static int plt_clk_probe(struct platform_device *pdev)
return PTR_ERR(parent_names); return PTR_ERR(parent_names);
for (i = 0; i < PMC_CLK_NUM; i++) { for (i = 0; i < PMC_CLK_NUM; i++) {
data->clks[i] = plt_clk_register(pdev, i, pmc_data->base, data->clks[i] = plt_clk_register(pdev, i, pmc_data,
parent_names, data->nparents); parent_names, data->nparents);
if (IS_ERR(data->clks[i])) { if (IS_ERR(data->clks[i])) {
err = PTR_ERR(data->clks[i]); err = PTR_ERR(data->clks[i]);
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/dmi.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/platform_data/x86/clk-pmc-atom.h> #include <linux/platform_data/x86/clk-pmc-atom.h>
...@@ -391,11 +392,27 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc) ...@@ -391,11 +392,27 @@ static int pmc_dbgfs_register(struct pmc_dev *pmc)
} }
#endif /* CONFIG_DEBUG_FS */ #endif /* CONFIG_DEBUG_FS */
/*
* Some systems need one or more of their pmc_plt_clks to be
* marked as critical.
*/
static const struct dmi_system_id critclk_systems[] __initconst = {
{
.ident = "MPL CEC1x",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "MPL AG"),
DMI_MATCH(DMI_PRODUCT_NAME, "CEC10 Family"),
},
},
{ /*sentinel*/ }
};
static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap, static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,
const struct pmc_data *pmc_data) const struct pmc_data *pmc_data)
{ {
struct platform_device *clkdev; struct platform_device *clkdev;
struct pmc_clk_data *clk_data; struct pmc_clk_data *clk_data;
const struct dmi_system_id *d = dmi_first_match(critclk_systems);
clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
if (!clk_data) if (!clk_data)
...@@ -403,6 +420,10 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap, ...@@ -403,6 +420,10 @@ static int pmc_setup_clks(struct pci_dev *pdev, void __iomem *pmc_regmap,
clk_data->base = pmc_regmap; /* offset is added by client */ clk_data->base = pmc_regmap; /* offset is added by client */
clk_data->clks = pmc_data->clks; clk_data->clks = pmc_data->clks;
if (d) {
clk_data->critical = true;
pr_info("%s critclks quirk enabled\n", d->ident);
}
clkdev = platform_device_register_data(&pdev->dev, "clk-pmc-atom", clkdev = platform_device_register_data(&pdev->dev, "clk-pmc-atom",
PLATFORM_DEVID_NONE, PLATFORM_DEVID_NONE,
......
...@@ -35,10 +35,13 @@ struct pmc_clk { ...@@ -35,10 +35,13 @@ struct pmc_clk {
* *
* @base: PMC clock register base offset * @base: PMC clock register base offset
* @clks: pointer to set of registered clocks, typically 0..5 * @clks: pointer to set of registered clocks, typically 0..5
* @critical: flag to indicate if firmware enabled pmc_plt_clks
* should be marked as critial or not
*/ */
struct pmc_clk_data { struct pmc_clk_data {
void __iomem *base; void __iomem *base;
const struct pmc_clk *clks; const struct pmc_clk *clks;
bool critical;
}; };
#endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */ #endif /* __PLATFORM_DATA_X86_CLK_PMC_ATOM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment