Skip to contentSkip to conversation

Add support for newer family of AMD's SOC.

PATCH Superseded Ajit Kumar Pandey 3 participants 10 messages Nov 25, 2021 – Dec 10, 2021

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add support for newer family of AMD's SOC.

changes since v3:
- Update driver description
- Add pci_dev_put() to avoid leak
- changed variable name for pci device

Ajit Kumar Pandey (7):
x86: clk: clk-fch: Add support for newer family of AMD's SOC
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: x86: clk-fch: Add 48MHz fixed clk support on Renoir platform
drivers: x86: clk-fch: Add 48MHz fixed clk support on Stoneyridge

 drivers/acpi/acpi_apd.c               | 11 ++++--
 drivers/clk/x86/clk-fch.c             | 49 +++++++++++++++++++++------
 include/linux/platform_data/clk-fch.h |  2 +-
 3 files changed, 48 insertions(+), 14 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/7 x86: clk: clk-fch: Add support for newer family of AMD's SOC

FCH controller clock configuration slightly differs across AMD's SOC architectures. Newer family of SOC only support a 48MHz fixed clock while older family has a clk_mux to choose 48MHz and 25MHz. At present fixed 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 pci_device_id table with Raven platform id and replace "is-rv" device property check with pci id match to support 48MHz fixed clk support. This enhanced flexibility to enable fixed 48MHz fch clock framework on other architectures by simply adding new entries into pci_device_id table. Also replace RV with FIXED as generic naming convention across all platforms.

---
 drivers/clk/x86/clk-fch.c | 41 ++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)
drivers/clk/x86/clk-fch.c +32 -9
index 8f7c5142b0f0..de556b03e184 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 /*
- * clock framework for AMD Stoney based clocks
+ * clock framework for AMD FCH controller block
  *
  * Copyright 2018 Advanced Micro Devices, Inc.
  */
@@ -8,6 +8,7 @@
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
+#include <linux/pci.h>
 #include <linux/platform_data/clk-fch.h>
 #include <linux/platform_device.h>
 
@@ -26,22 +27,37 @@
 #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	2
+
+/* List of supported CPU ids for fixed clk */
+#define AMD_CPU_ID_RV			0x15D0
 
 static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
 static struct clk_hw *hws[ST_MAX_CLKS];
 
+static const struct pci_device_id soc_pci_ids[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
+	{ }
+};
+
 static int fch_clk_probe(struct platform_device *pdev)
 {
 	struct fch_clk_data *fch_data;
+	struct pci_dev *rdev;
 
 	fch_data = dev_get_platdata(&pdev->dev);
 	if (!fch_data || !fch_data->base)
 		return -EINVAL;
 
-	if (!fch_data->is_rv) {
+	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+	if (!rdev) {
+		dev_err(&pdev->dev, "FCH device not found\n");
+		return -ENODEV;
+	}
+
+	if (!pci_match_id(soc_pci_ids, rdev)) {
 		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,17 +77,18 @@ 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);
 	}
 
+	pci_dev_put(rdev);
 	return 0;
 }
 
@@ -79,14 +96,20 @@ static int fch_clk_remove(struct platform_device *pdev)
 {
 	int i, clks;
 	struct fch_clk_data *fch_data;
+	struct pci_dev *rdev;
 
 	fch_data = dev_get_platdata(&pdev->dev);
 
-	clks = fch_data->is_rv ? RV_MAX_CLKS : ST_MAX_CLKS;
+	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+	if (!rdev)
+		return -ENODEV;
+
+	clks = pci_match_id(soc_pci_ids, rdev) ? CLK_MAX_FIXED : ST_MAX_CLKS;
 
 	for (i = 0; i < clks; i++)
 		clk_hw_unregister(hws[i]);
 
+	pci_dev_put(rdev);
 	return 0;
 }
 
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v4 1/7] x86: clk: clk-fch: Add support for newer family of AMD's SOC

Quoted 52 lines · Ajit Kumar Pandey

FCH controller clock configuration slightly differs across AMD's SOC architectures. Newer family of SOC only support a 48MHz fixed clock while older family has a clk_mux to choose 48MHz and 25MHz. At present fixed 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 pci_device_id table with Raven platform id and replace "is-rv" device property check with pci id match to support 48MHz fixed clk support. This enhanced flexibility to enable fixed 48MHz fch clock framework on other architectures by simply adding new entries into pci_device_id table. Also replace RV with FIXED as generic naming convention across all platforms.

---
  drivers/clk/x86/clk-fch.c | 41 ++++++++++++++++++++++++++++++---------
  1 file changed, 32 insertions(+), 9 deletions(-)
drivers/clk/x86/clk-fch.c +7 -4
index 8f7c5142b0f0..de556b03e184 100644
@@ -1,6 +1,6 @@
  // SPDX-License-Identifier: MIT
  /*
- * clock framework for AMD Stoney based clocks
+ * clock framework for AMD FCH controller block
   *
   * Copyright 2018 Advanced Micro Devices, Inc.
   */
@@ -8,6 +8,7 @@
  #include <linux/clk.h>
  #include <linux/clkdev.h>
  #include <linux/clk-provider.h>
+#include <linux/pci.h>
  #include <linux/platform_data/clk-fch.h>
  #include <linux/platform_device.h>
 
@@ -26,22 +27,37 @@
  #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	2
+
+/* List of supported CPU ids for fixed clk */

drivers/clk/x86/clk-fch.c line 44

Quoted 10 lines
drivers/clk/x86/clk-fch.c +6 -0
+#define AMD_CPU_ID_RV			0x15D0
 
  static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
  static struct clk_hw *hws[ST_MAX_CLKS];
 
+static const struct pci_device_id soc_pci_ids[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
+	{ }
+};
+

Have you considered inverting it? The number of ASICs using the "older" design with the mux and multiple clock sources is a fixed value, but we'll keep adding new ASICs in the "new" design of just 48Mhz.

Notably; I see that this series is missing the Yellow Carp ID for example. We'll keep having more designs with the 48Mhz that need to be added to this list.

Quoted 65 lines
drivers/clk/x86/clk-fch.c +19 -5
  static int fch_clk_probe(struct platform_device *pdev)
  {
  	struct fch_clk_data *fch_data;
+	struct pci_dev *rdev;
 
  	fch_data = dev_get_platdata(&pdev->dev);
  	if (!fch_data || !fch_data->base)
  		return -EINVAL;
 
-	if (!fch_data->is_rv) {
+	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+	if (!rdev) {
+		dev_err(&pdev->dev, "FCH device not found\n");
+		return -ENODEV;
+	}
+
+	if (!pci_match_id(soc_pci_ids, rdev)) {
  		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,17 +77,18 @@ 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);
  	}
 
+	pci_dev_put(rdev);
  	return 0;
  }
 
@@ -79,14 +96,20 @@ static int fch_clk_remove(struct platform_device *pdev)
  {
  	int i, clks;
  	struct fch_clk_data *fch_data;
+	struct pci_dev *rdev;
 
  	fch_data = dev_get_platdata(&pdev->dev);
 
-	clks = fch_data->is_rv ? RV_MAX_CLKS : ST_MAX_CLKS;
+	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
+	if (!rdev)
+		return -ENODEV;
+
+	clks = pci_match_id(soc_pci_ids, rdev) ? CLK_MAX_FIXED : ST_MAX_CLKS;
 
  	for (i = 0; i < clks; i++)
  		clk_hw_unregister(hws[i]);
 
+	pci_dev_put(rdev);
  	return 0;
  }
 
maintainer
#3 lore raw

Re: [PATCH v4 1/7] x86: clk: clk-fch: Add support for newer family of AMD's SOC

Quoting Limonciello, Mario (2021-11-30 11:41:30)

Quoted 28 lines · Ajit Kumar Pandey
Quoted 12 lines
drivers/clk/x86/clk-fch.c +5 -3
@@ -26,22 +27,37 @@
  #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        2
+
+/* List of supported CPU ids for fixed clk */

drivers/clk/x86/clk-fch.c line 44

Quoted 10 lines
drivers/clk/x86/clk-fch.c +6 -0
+#define AMD_CPU_ID_RV                        0x15D0
 
  static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
  static struct clk_hw *hws[ST_MAX_CLKS];
 
+static const struct pci_device_id soc_pci_ids[] = {
+     { PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
+     { }
+};
+

Have you considered inverting it? The number of ASICs using the "older" design with the mux and multiple clock sources is a fixed value, but we'll keep adding new ASICs in the "new" design of just 48Mhz.

Quoted 3 lines

Notably; I see that this series is missing the Yellow Carp ID for example. We'll keep having more designs with the 48Mhz that need to be added to this list.

+1 Let's not keep adding to a list.

#4 lore raw

PATCH v4 2/7 drivers: acpi: acpi_apd: Remove unused device property "is-rv"

In reply to Ajit Kumar Pandey

Initially "is-rv" device property is added for 48MHz fixed clock support on Raven or RV architecture. It's unused now as we moved to pci device_id based selection to extend such support on other architectures. 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
index 6e02448d15d9..6913e9712852 100644
@@ -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
index b9f682459f08..850ca776156d 100644
@@ -12,7 +12,6 @@
 
 struct fch_clk_data {
 	void __iomem *base;
-	u32 is_rv;
 };
 
 #endif /* __CLK_FCH_H */
Signature · 1 line
2.25.1
#5 lore raw

PATCH v4 3/7 ACPI: APD: Add a fmw property clk-name

In reply to Ajit Kumar Pandey

Add 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
index 6913e9712852..2b958b426b03 100644
@@ -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
index 850ca776156d..11a2a23fd9b2 100644
@@ -12,6 +12,7 @@
 
 struct fch_clk_data {
 	void __iomem *base;
+	char *name;
 };
 
 #endif /* __CLK_FCH_H */
Signature · 1 line
2.25.1
#6 lore raw

PATCH v4 4/7 clk: x86: Use dynamic con_id string during clk registration

In reply to Ajit Kumar Pandey

Replace 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
index de556b03e184..7c55e129779a 100644
@@ -85,7 +85,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);
 	}
 
 	pci_dev_put(rdev);
Signature · 1 line
2.25.1
#7 lore raw

PATCH v4 5/7 clk: x86: Fix clk_gate_flags for RV_CLK_GATE

In reply to Ajit Kumar Pandey

In newer 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
index 7c55e129779a..484fbb158e5b 100644
@@ -82,7 +82,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
#8 lore raw

PATCH v4 6/7 drivers: x86: clk-fch: Add 48MHz fixed clk support on Renoir platform

In reply to Ajit Kumar Pandey

Add renoir SOC pci root port id into pci_device_id table to enable 48 MHz fixed fch clock support on renoir platforms.

---
 drivers/clk/x86/clk-fch.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/x86/clk-fch.c +2 -0
index 484fbb158e5b..8747212cd289 100644
@@ -33,12 +33,14 @@
 
 /* List of supported CPU ids for fixed clk */
 #define AMD_CPU_ID_RV			0x15D0
+#define AMD_CPU_ID_RN			0x1630
 
 static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
 static struct clk_hw *hws[ST_MAX_CLKS];
 
 static const struct pci_device_id fch_pci_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) },
 	{ }
 };
 
Signature · 1 line
2.25.1
#9 lore raw

PATCH v4 7/7 drivers: x86: clk-fch: Add 48MHz fixed clk support on Stoneyridge

In reply to Ajit Kumar Pandey

Add stoney ridge SOC pci root port id into pci_device_id table to enable 48 MHz fixed fch clock support on Stoneyridge platforms.

---
 drivers/clk/x86/clk-fch.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/x86/clk-fch.c +2 -0
index 8747212cd289..e3cd176a49e8 100644
@@ -34,6 +34,7 @@
 /* List of supported CPU ids for fixed clk */
 #define AMD_CPU_ID_RV			0x15D0
 #define AMD_CPU_ID_RN			0x1630
+#define AMD_CPU_ID_ST			0x1576
 
 static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
 static struct clk_hw *hws[ST_MAX_CLKS];
@@ -41,6 +42,7 @@ static struct clk_hw *hws[ST_MAX_CLKS];
 static const struct pci_device_id fch_pci_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_ST) },
 	{ }
 };
 
Signature · 1 line
2.25.1