Stoney SoC provides oscout clock. This clock can support 25Mhz and
48Mhz of frequency.
The clock is available for general system use.
Signed-off-by: Akshu Agrawal <[email protected]>
---
v2: config change, added SPDX tag and used clk_hw_register_.
v3: Fix kbuild warning for checking of NULL pointer
drivers/clk/x86/Makefile | 1 +
drivers/clk/x86/clk-st.c | 88 ++++++++++++++++++++++++++++++++++++
include/linux/platform_data/clk-st.h | 35 ++++++++++++++
3 files changed, 124 insertions(+)
create mode 100644 drivers/clk/x86/clk-st.c
create mode 100644 include/linux/platform_data/clk-st.h
diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
index 1367afb..2aee002 100644
--- a/drivers/clk/x86/Makefile
+++ b/drivers/clk/x86/Makefile
@@ -1,3 +1,4 @@
clk-x86-lpss-objs := clk-lpt.o
obj-$(CONFIG_X86_INTEL_LPSS) += clk-x86-lpss.o
obj-$(CONFIG_PMC_ATOM) += clk-pmc-atom.o
+obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE) += clk-st.o
diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-st.c
new file mode 100644
index 0000000..c3d5b84
--- /dev/null
+++ b/drivers/clk/x86/clk-st.c
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * clock framework for AMD Stoney based clocks
+ *
+ * Copyright 2018 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <linux/clk.h>
+#include <linux/clkdev.h>
+#include <linux/clk-provider.h>
+#include <linux/platform_data/clk-st.h>
+#include <linux/platform_device.h>
+
+/* Clock Driving Strength 2 register */
+#define CLKDRVSTR2 0x28
+/* Clock Control 1 register */
+#define MISCCLKCNTL1 0x40
+/* Auxiliary clock1 enable bit */
+#define OSCCLKENB 2
+/* 25Mhz auxiliary output clock freq bit */
+#define OSCOUT1CLK25MHZ 16
+
+#define ST_CLK_48M 0
+#define ST_CLK_25M 1
+#define ST_CLK_MUX 2
+#define ST_CLK_GATE 3
+#define ST_MAX_CLKS 4
+
+static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
+
+static int st_clk_probe(struct platform_device *pdev)
+{
+ struct st_clk_data *st_data;
+ struct clk_hw **hws;
+
+ st_data = dev_get_platdata(&pdev->dev);
+ if (!st_data || !st_data->base)
+ return -EINVAL;
+
+ hws = kzalloc(sizeof(*hws) * ST_MAX_CLKS, GFP_KERNEL);
+ if (!hws)
+ return -ENOMEM;
+
+ 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", NULL, 0,
+ 25000000);
+
+ hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
+ clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
+ 0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
+
+ clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_25M]->clk);
+
+ hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
+ 0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
+ CLK_GATE_SET_TO_DISABLE, NULL);
+
+ clk_hw_register_clkdev(hws[ST_CLK_GATE], "oscout1", NULL);
+
+ return 0;
+}
+
+static struct platform_driver st_clk_driver = {
+ .driver = {
+ .name = "clk-st",
+ },
+ .probe = st_clk_probe,
+};
+builtin_platform_driver(st_clk_driver);
diff --git a/include/linux/platform_data/clk-st.h b/include/linux/platform_data/clk-st.h
new file mode 100644
index 0000000..6a992e9
--- /dev/null
+++ b/include/linux/platform_data/clk-st.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * clock framework for AMD Stoney based clock
+ *
+ * Copyright 2018 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __CLK_ST_H
+#define __CLK_ST_H
+
+#include <linux/compiler.h>
+
+struct st_clk_data {
+ void __iomem *base;
+};
+
+#endif /* __CLK_ST_H */
--
1.9.1
AMD SoC exposes clock for general purpose use. The clock registration
is done in clk-st driver. The MMIO mapping are passed on to the
clock driver for accessing the registers.
The misc clock handler will create MMIO mappings to access the
clock registers and enable the clock driver to expose the clock
for use of drivers which will connect to it.
Signed-off-by: Akshu Agrawal <[email protected]>
---
v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
drivers/acpi/acpi_apd.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c
index d553b00..88b8a3e 100644
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -11,6 +11,7 @@
*/
#include <linux/clk-provider.h>
+#include <linux/platform_data/clk-st.h>
#include <linux/platform_device.h>
#include <linux/pm_domain.h>
#include <linux/clkdev.h>
@@ -72,6 +73,50 @@ static int acpi_apd_setup(struct apd_private_data *pdata)
}
#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE
+
+static int misc_check_res(struct acpi_resource *ares, void *data)
+{
+ struct resource res;
+
+ return !acpi_dev_resource_memory(ares, &res);
+}
+
+static int st_misc_setup(struct apd_private_data *pdata)
+{
+ struct acpi_device *adev = pdata->adev;
+ struct platform_device *clkdev;
+ struct st_clk_data *clk_data;
+ struct resource_entry *rentry;
+ struct list_head resource_list;
+ int ret;
+
+ clk_data = devm_kzalloc(&adev->dev, sizeof(*clk_data), GFP_KERNEL);
+ if (!clk_data)
+ return -ENOMEM;
+
+ INIT_LIST_HEAD(&resource_list);
+ ret = acpi_dev_get_resources(adev, &resource_list, misc_check_res,
+ NULL);
+ if (ret < 0)
+ return -ENOMEM;
+
+ list_for_each_entry(rentry, &resource_list, node) {
+ clk_data->base = ioremap(rentry->res->start,
+ resource_size(rentry->res));
+ break;
+ }
+
+ acpi_dev_free_resource_list(&resource_list);
+
+ clkdev = platform_device_register_data(&adev->dev, "clk-st",
+ PLATFORM_DEVID_NONE, clk_data,
+ sizeof(*clk_data));
+ if (IS_ERR(clkdev))
+ return PTR_ERR(clkdev);
+
+ return 0;
+}
+
static const struct apd_device_desc cz_i2c_desc = {
.setup = acpi_apd_setup,
.fixed_clk_rate = 133000000,
@@ -94,6 +139,10 @@ static int acpi_apd_setup(struct apd_private_data *pdata)
.fixed_clk_rate = 48000000,
.properties = uart_properties,
};
+
+static const struct apd_device_desc st_misc_desc = {
+ .setup = st_misc_setup,
+};
#endif
#ifdef CONFIG_ARM64
@@ -179,6 +228,7 @@ static int acpi_apd_create_device(struct acpi_device *adev,
{ "AMD0020", APD_ADDR(cz_uart_desc) },
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
{ "AMD0030", },
+ { "AMD0040", APD_ADDR(st_misc_desc)},
#endif
#ifdef CONFIG_ARM64
{ "APMC0D0F", APD_ADDR(xgene_i2c_desc) },
--
1.9.1
On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
> AMD SoC exposes clock for general purpose use. The clock registration
> is done in clk-st driver. The MMIO mapping are passed on to the
> clock driver for accessing the registers.
> The misc clock handler will create MMIO mappings to access the
> clock registers and enable the clock driver to expose the clock
> for use of drivers which will connect to it.
>
> Signed-off-by: Akshu Agrawal <[email protected]>
> ---
> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
Well, where's patch [1/2]?
Thanks,
Rafael
On 5/4/2018 3:36 PM, Rafael J. Wysocki wrote:
> On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
>> AMD SoC exposes clock for general purpose use. The clock registration
>> is done in clk-st driver. The MMIO mapping are passed on to the
>> clock driver for accessing the registers.
>> The misc clock handler will create MMIO mappings to access the
>> clock registers and enable the clock driver to expose the clock
>> for use of drivers which will connect to it.
>>
>> Signed-off-by: Akshu Agrawal <[email protected]>
>> ---
>> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
>
> Well, where's patch [1/2]?
>
It's here:
https://patchwork.kernel.org/patch/10380207/
Regards,
Akshu
> Thanks,
> Rafael
>
On Fri, May 4, 2018 at 12:09 PM, Agrawal, Akshu <[email protected]> wrote:
>
>
> On 5/4/2018 3:36 PM, Rafael J. Wysocki wrote:
>> On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
>>> AMD SoC exposes clock for general purpose use. The clock registration
>>> is done in clk-st driver. The MMIO mapping are passed on to the
>>> clock driver for accessing the registers.
>>> The misc clock handler will create MMIO mappings to access the
>>> clock registers and enable the clock driver to expose the clock
>>> for use of drivers which will connect to it.
>>>
>>> Signed-off-by: Akshu Agrawal <[email protected]>
>>> ---
>>> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
>>
>> Well, where's patch [1/2]?
>>
>
> It's here:
> https://patchwork.kernel.org/patch/10380207/
So can you please send them both as a series with the same CC list,
add all of the relevant maintainers to that CC list and indicate whom
you expect to take care of these patches?
I think that they should go in together as they are clearly related to
each other.
Thanks,
Rafael
On 5/4/2018 3:45 PM, Rafael J. Wysocki wrote:
> On Fri, May 4, 2018 at 12:09 PM, Agrawal, Akshu <[email protected]> wrote:
>>
>>
>> On 5/4/2018 3:36 PM, Rafael J. Wysocki wrote:
>>> On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
>>>> AMD SoC exposes clock for general purpose use. The clock registration
>>>> is done in clk-st driver. The MMIO mapping are passed on to the
>>>> clock driver for accessing the registers.
>>>> The misc clock handler will create MMIO mappings to access the
>>>> clock registers and enable the clock driver to expose the clock
>>>> for use of drivers which will connect to it.
>>>>
>>>> Signed-off-by: Akshu Agrawal <[email protected]>
>>>> ---
>>>> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
>>>
>>> Well, where's patch [1/2]?
>>>
>>
>> It's here:
>> https://patchwork.kernel.org/patch/10380207/
>
> So can you please send them both as a series with the same CC list,
> add all of the relevant maintainers to that CC list and indicate whom
> you expect to take care of these patches?
>
Ok sure, I will send both the patches to combined cc list from
./scripts/get_maintainer.pl for each patch.
Regards,
Akshu
> I think that they should go in together as they are clearly related to
> each other.
>
> Thanks,
> Rafael
>
On Fri, May 4, 2018 at 12:23 PM, Agrawal, Akshu <[email protected]> wrote:
>
>
> On 5/4/2018 3:45 PM, Rafael J. Wysocki wrote:
>> On Fri, May 4, 2018 at 12:09 PM, Agrawal, Akshu <[email protected]> wrote:
>>>
>>>
>>> On 5/4/2018 3:36 PM, Rafael J. Wysocki wrote:
>>>> On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
>>>>> AMD SoC exposes clock for general purpose use. The clock registration
>>>>> is done in clk-st driver. The MMIO mapping are passed on to the
>>>>> clock driver for accessing the registers.
>>>>> The misc clock handler will create MMIO mappings to access the
>>>>> clock registers and enable the clock driver to expose the clock
>>>>> for use of drivers which will connect to it.
>>>>>
>>>>> Signed-off-by: Akshu Agrawal <[email protected]>
>>>>> ---
>>>>> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
>>>>
>>>> Well, where's patch [1/2]?
>>>>
>>>
>>> It's here:
>>> https://patchwork.kernel.org/patch/10380207/
>>
>> So can you please send them both as a series with the same CC list,
>> add all of the relevant maintainers to that CC list and indicate whom
>> you expect to take care of these patches?
>>
>
> Ok sure, I will send both the patches to combined cc list from
> ./scripts/get_maintainer.pl for each patch.
It also would be good to add a cover letter with an outline of all of
the changes together.
Thanks,
Rafael
On 5/4/2018 4:37 PM, Rafael J. Wysocki wrote:
> On Fri, May 4, 2018 at 12:23 PM, Agrawal, Akshu <[email protected]> wrote:
>>
>>
>> On 5/4/2018 3:45 PM, Rafael J. Wysocki wrote:
>>> On Fri, May 4, 2018 at 12:09 PM, Agrawal, Akshu <[email protected]> wrote:
>>>>
>>>>
>>>> On 5/4/2018 3:36 PM, Rafael J. Wysocki wrote:
>>>>> On Friday, May 4, 2018 10:34:44 AM CEST Akshu Agrawal wrote:
>>>>>> AMD SoC exposes clock for general purpose use. The clock registration
>>>>>> is done in clk-st driver. The MMIO mapping are passed on to the
>>>>>> clock driver for accessing the registers.
>>>>>> The misc clock handler will create MMIO mappings to access the
>>>>>> clock registers and enable the clock driver to expose the clock
>>>>>> for use of drivers which will connect to it.
>>>>>>
>>>>>> Signed-off-by: Akshu Agrawal <[email protected]>
>>>>>> ---
>>>>>> v2: Submitted with dependent patch, removed unneeded kfree for devm_kzalloc
>>>>>
>>>>> Well, where's patch [1/2]?
>>>>>
>>>>
>>>> It's here:
>>>> https://patchwork.kernel.org/patch/10380207/
>>>
>>> So can you please send them both as a series with the same CC list,
>>> add all of the relevant maintainers to that CC list and indicate whom
>>> you expect to take care of these patches?
>>>
>>
>> Ok sure, I will send both the patches to combined cc list from
>> ./scripts/get_maintainer.pl for each patch.
>
> It also would be good to add a cover letter with an outline of all of
> the changes together.
>
Done. I have sent the patches to combined mailing list, with a
supporting cover letter.
Regards,
Akshu
Hi Akshu,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on clk/clk-next]
[also build test WARNING on v4.17-rc3 next-20180504]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Akshu-Agrawal/clk-x86-Add-ST-oscout-platform-clock/20180504-220653
base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next
coccinelle warnings: (new ones prefixed by >>)
>> drivers/acpi/acpi_apd.c:114:1-3: WARNING: PTR_ERR_OR_ZERO can be used
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
From: Fengguang Wu <[email protected]>
drivers/acpi/acpi_apd.c:114:1-3: WARNING: PTR_ERR_OR_ZERO can be used
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
Generated by: scripts/coccinelle/api/ptr_ret.cocci
Fixes: 451cec30ec2b ("ACPI: APD: Add AMD misc clock handler support")
CC: Akshu Agrawal <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---
acpi_apd.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@ -111,10 +111,7 @@ static int st_misc_setup(struct apd_priv
clkdev = platform_device_register_data(&adev->dev, "clk-st",
PLATFORM_DEVID_NONE, clk_data,
sizeof(*clk_data));
- if (IS_ERR(clkdev))
- return PTR_ERR(clkdev);
-
- return 0;
+ return PTR_ERR_OR_ZERO(clkdev);
}
static const struct apd_device_desc cz_i2c_desc = {