Skip to contentSkip to conversation

Separate out earlycon

PATCH In review Akash Asthana 2 participants 9 messages Dec 7, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover Separate out earlycon

Patch 3/3 depends on patch 1/3, Greg would it be possible to ack patch 3/3. So it could land via QCOM tree.

Akash Asthana (3):
soc: qcom-geni-se: Cleanup the code to remove proxy votes
arm64: dts: qcom: sc7180: Remove QUP-CORE ICC path
Serial: Separate out earlycon support

 arch/arm64/boot/dts/qcom/sc7180.dtsi    |   4 -
 drivers/soc/qcom/qcom-geni-se.c         |  74 ----
 drivers/tty/serial/Kconfig              |   9 +
 drivers/tty/serial/Makefile             |   1 +
 drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
 drivers/tty/serial/qcom_geni_serial.c   | 104 -----
 include/linux/qcom-geni-se.h            |   2 -
 7 files changed, 659 insertions(+), 184 deletions(-)
 create mode 100644 drivers/tty/serial/qcom_geni_earlycon.c
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
#1 lore raw

PATCH 1/3 soc: qcom-geni-se: Cleanup the code to remove proxy votes

ICC core and platforms drivers supports sync_state feature, which ensures that the default ICC BW votes from the bootloader is not removed until all it's consumers are probes.

The proxy votes were needed in case other QUP child drivers I2C, SPI probes before UART, they can turn off the QUP-CORE clock which is shared resources for all QUP driver, this causes unclocked access to HW from earlycon.

Given above support from ICC there is no longer need to maintain proxy votes on QUP-CORE ICC node from QUP wrapper driver for early console usecase, the default votes won't be removed until real console is probed.

---
 drivers/soc/qcom/qcom-geni-se.c       | 74 -----------------------------------
 drivers/tty/serial/qcom_geni_serial.c |  7 ----
 include/linux/qcom-geni-se.h          |  2 -
 3 files changed, 83 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +0 -74
index f42954e..1fd29f9 100644
@@ -3,7 +3,6 @@
 
 #include <linux/acpi.h>
 #include <linux/clk.h>
-#include <linux/console.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
@@ -92,14 +91,11 @@ struct geni_wrapper {
 	struct device *dev;
 	void __iomem *base;
 	struct clk_bulk_data ahb_clks[NUM_AHB_CLKS];
-	struct geni_icc_path to_core;
 };
 
 static const char * const icc_path_names[] = {"qup-core", "qup-config",
 						"qup-memory"};
 
-static struct geni_wrapper *earlycon_wrapper;
-
 #define QUP_HW_VER_REG			0x4
 
 /* Common SE registers */
@@ -843,44 +839,11 @@ int geni_icc_disable(struct geni_se *se)
 }
 EXPORT_SYMBOL(geni_icc_disable);
 
-void geni_remove_earlycon_icc_vote(void)
-{
-	struct platform_device *pdev;
-	struct geni_wrapper *wrapper;
-	struct device_node *parent;
-	struct device_node *child;
-
-	if (!earlycon_wrapper)
-		return;
-
-	wrapper = earlycon_wrapper;
-	parent = of_get_next_parent(wrapper->dev->of_node);
-	for_each_child_of_node(parent, child) {
-		if (!of_device_is_compatible(child, "qcom,geni-se-qup"))
-			continue;
-
-		pdev = of_find_device_by_node(child);
-		if (!pdev)
-			continue;
-
-		wrapper = platform_get_drvdata(pdev);
-		icc_put(wrapper->to_core.path);
-		wrapper->to_core.path = NULL;
-
-	}
-	of_node_put(parent);
-
-	earlycon_wrapper = NULL;
-}
-EXPORT_SYMBOL(geni_remove_earlycon_icc_vote);
-
 static int geni_se_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct resource *res;
 	struct geni_wrapper *wrapper;
-	struct console __maybe_unused *bcon;
-	bool __maybe_unused has_earlycon = false;
 	int ret;
 
 	wrapper = devm_kzalloc(dev, sizeof(*wrapper), GFP_KERNEL);
@@ -903,43 +866,6 @@ static int geni_se_probe(struct platform_device *pdev)
 		}
 	}
 
-#ifdef CONFIG_SERIAL_EARLYCON
-	for_each_console(bcon) {
-		if (!strcmp(bcon->name, "qcom_geni")) {
-			has_earlycon = true;
-			break;
-		}
-	}
-	if (!has_earlycon)
-		goto exit;
-
-	wrapper->to_core.path = devm_of_icc_get(dev, "qup-core");
-	if (IS_ERR(wrapper->to_core.path))
-		return PTR_ERR(wrapper->to_core.path);
-	/*
-	 * Put minmal BW request on core clocks on behalf of early console.
-	 * The vote will be removed earlycon exit function.
-	 *
-	 * Note: We are putting vote on each QUP wrapper instead only to which
-	 * earlycon is connected because QUP core clock of different wrapper
-	 * share same voltage domain. If core1 is put to 0, then core2 will
-	 * also run at 0, if not voted. Default ICC vote will be removed ASA
-	 * we touch any of the core clock.
-	 * core1 = core2 = max(core1, core2)
-	 */
-	ret = icc_set_bw(wrapper->to_core.path, GENI_DEFAULT_BW,
-				GENI_DEFAULT_BW);
-	if (ret) {
-		dev_err(&pdev->dev, "%s: ICC BW voting failed for core: %d\n",
-			__func__, ret);
-		return ret;
-	}
-
-	if (of_get_compatible_child(pdev->dev.of_node, "qcom,geni-debug-uart"))
-		earlycon_wrapper = wrapper;
-	of_node_put(pdev->dev.of_node);
-exit:
-#endif
 	dev_set_drvdata(dev, wrapper);
 	dev_dbg(dev, "GENI SE Driver probed\n");
 	return devm_of_platform_populate(dev);
drivers/tty/serial/qcom_geni_serial.c +0 -7
index 291649f..0d85b55 100644
@@ -1177,12 +1177,6 @@ static inline void qcom_geni_serial_enable_early_read(struct geni_se *se,
 						      struct console *con) { }
 #endif
 
-static int qcom_geni_serial_earlycon_exit(struct console *con)
-{
-	geni_remove_earlycon_icc_vote();
-	return 0;
-}
-
 static struct qcom_geni_private_data earlycon_private_data;
 
 static int __init qcom_geni_serial_earlycon_setup(struct earlycon_device *dev,
@@ -1233,7 +1227,6 @@ static int __init qcom_geni_serial_earlycon_setup(struct earlycon_device *dev,
 	writel(stop_bit_len, uport->membase + SE_UART_TX_STOP_BIT_LEN);
 
 	dev->con->write = qcom_geni_serial_earlycon_write;
-	dev->con->exit = qcom_geni_serial_earlycon_exit;
 	dev->con->setup = NULL;
 	qcom_geni_serial_enable_early_read(&se, dev->con);
 
include/linux/qcom-geni-se.h +0 -2
index ec2ad4b..c4fdb44 100644
@@ -460,7 +460,5 @@ void geni_icc_set_tag(struct geni_se *se, u32 tag);
 int geni_icc_enable(struct geni_se *se);
 
 int geni_icc_disable(struct geni_se *se);
-
-void geni_remove_earlycon_icc_vote(void);
 #endif
 #endif
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
#2 lore raw

PATCH 2/3 arm64: dts: qcom: sc7180: Remove QUP-CORE ICC path

In reply to Akash Asthana

We had introduced the QUP-CORE ICC path to put proxy votes from QUP wrapper on behalf of earlycon, if other users of QUP-CORE turn off this clock before the real console is probed, unclocked access to HW was seen from earlycon.

With ICC sync state support proxy votes are no longer need as ICC will ensure that the default bootloader votes are not removed until all it's consumer are probed.

We can safely remove ICC path for QUP-CORE clock from QUP wrapper device.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ----
 1 file changed, 4 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +0 -4
index 22b832f..cd09b67 100644
@@ -763,8 +763,6 @@
 			#size-cells = <2>;
 			ranges;
 			iommus = <&apps_smmu 0x43 0x0>;
-			interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>;
-			interconnect-names = "qup-core";
 			status = "disabled";
 
 			i2c0: i2c@880000 {
@@ -1054,8 +1052,6 @@
 			#size-cells = <2>;
 			ranges;
 			iommus = <&apps_smmu 0x4c3 0x0>;
-			interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>;
-			interconnect-names = "qup-core";
 			status = "disabled";
 
 			i2c6: i2c@a80000 {
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
#3 lore raw

PATCH 3/3 Serial: Separate out earlycon support

In reply to Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

---
 drivers/tty/serial/Kconfig              |   9 +
 drivers/tty/serial/Makefile             |   1 +
 drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
 drivers/tty/serial/qcom_geni_serial.c   |  97 -----
 4 files changed, 659 insertions(+), 97 deletions(-)
 create mode 100644 drivers/tty/serial/qcom_geni_earlycon.c
drivers/tty/serial/Kconfig +9 -0
index 3409e0b..393a017 100644
@@ -957,6 +957,15 @@ config SERIAL_QCOM_GENI
 	depends on QCOM_GENI_SE
 	select SERIAL_CORE
 
+config SERIAL_QCOM_GENI_EARLYCON
+	bool "QCOM GENI Early Console support"
+	select SERIAL_CORE
+	select SERIAL_CORE_CONSOLE
+	select SERIAL_EARLYCON
+	help
+	  Serial early console driver for Qualcomm Technologies Inc's GENI
+	  based QUP hardware.
+
 config SERIAL_QCOM_GENI_CONSOLE
 	bool "QCOM GENI Serial Console support"
 	depends on SERIAL_QCOM_GENI
drivers/tty/serial/Makefile +1 -0
index b85d53f..4f9c318 100644
@@ -55,6 +55,7 @@ obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o
 obj-$(CONFIG_SERIAL_ATMEL) += atmel_serial.o
 obj-$(CONFIG_SERIAL_UARTLITE) += uartlite.o
 obj-$(CONFIG_SERIAL_MSM) += msm_serial.o
+obj-$(CONFIG_SERIAL_QCOM_GENI_EARLYCON) += qcom_geni_earlycon.o
 obj-$(CONFIG_SERIAL_QCOM_GENI) += qcom_geni_serial.o
 obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
 obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
drivers/tty/serial/qcom_geni_earlycon.c new file +649 -0

649 lines not on this page · raw message

drivers/tty/serial/qcom_geni_serial.c +0 -97

109 lines not on this page · raw message

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
maintainer
#4 lore raw

Re: [PATCH 3/3] Serial: Separate out earlycon support

Quoted 6 lines · Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

What do you mean by "downstream" here?

Quoted 7 lines
---
 drivers/tty/serial/Kconfig              |   9 +
 drivers/tty/serial/Makefile             |   1 +
 drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
 drivers/tty/serial/qcom_geni_serial.c   |  97 -----

So you are replacing 97 lines of code with 649 lines? How is this benefiting anyone?

confused,

greg k-h

maintainer
#7 lore raw

Re: [PATCH 3/3] Serial: Separate out earlycon support

In reply to Akash Asthana
Quoted 7 lines · Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

Quoted 8 lines
---
 drivers/tty/serial/Kconfig              |   9 +
 drivers/tty/serial/Makefile             |   1 +
 drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
 drivers/tty/serial/qcom_geni_serial.c   |  97 -----
 4 files changed, 659 insertions(+), 97 deletions(-)
 create mode 100644 drivers/tty/serial/qcom_geni_earlycon.c

Nit, your subject line shoudl say somewhere that this is the qcom earlycon driver/support, not "earlycon in general".

thanks,

greg k-h

#5 lore raw

Re: [PATCH 3/3] Serial: Separate out earlycon support

In reply to Greg KH

Hi Greg,

Quoted 15 lines · Greg KH
Quoted 6 lines · Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

What do you mean by "downstream" here?

Quoted 6 lines
---
  drivers/tty/serial/Kconfig              |   9 +
  drivers/tty/serial/Makefile             |   1 +
  drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
  drivers/tty/serial/qcom_geni_serial.c   |  97 -----
Quoted 4 lines

So you are replacing 97 lines of code with 649 lines? How is this benefiting anyone?

confused,

We have 2 versions of QUP driver, upstream version(Present in linus tree, mostly used for chromium project) and downstream version(belong to vendor part of code in GKI design, used for all the other project).

There is need to enable geni earlycon in Google provided boot image for GKI to facilitate the debug until real console(belong to vendor code) is up.

Currently it won't be possible because geni earlycon cannot be enabled independently, it depends on upstream QUP wrapper driver (soc/qcom/qcom-geni-se.c) and upstream serial driver(serial/qcom_geni_serial.c).

With this patch I am trying to break any dependency btw earlycon hook and QUP kernel drivers, so it can be managed independently.

Regards,

Akash

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
#8 lore raw

Re: [PATCH 3/3] Serial: Separate out earlycon support

In reply to Greg KH

Hi Greg,

Quoted 16 lines · Greg KH
Quoted 7 lines · Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

Quoted 8 lines
---
  drivers/tty/serial/Kconfig              |   9 +
  drivers/tty/serial/Makefile             |   1 +
  drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
  drivers/tty/serial/qcom_geni_serial.c   |  97 -----
  4 files changed, 659 insertions(+), 97 deletions(-)

create mode 100644 drivers/tty/serial/qcom_geni_earlycon.c

Quoted 2 lines

Nit, your subject line shoudl say somewhere that this is the qcom earlycon driver/support, not "earlycon in general".

Thanks for feedback, I will take care of it in next post.

Quoted 4 lines

thanks,

greg k-h

Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
maintainer
#6 lore raw

Re: [PATCH 3/3] Serial: Separate out earlycon support

In reply to Akash Asthana
Quoted 18 lines · Akash Asthana

Hi Greg,

Quoted 15 lines · Greg KH
Quoted 6 lines · Akash Asthana

Separate out earlycon support from serial driver and remove it's dependency on QUP wrapper driver.

This enable us to manage earlycon independently and we can re-use the same earlycon driver for android project which currently uses downstream version of QUP drivers.

What do you mean by "downstream" here?

Quoted 6 lines
---
  drivers/tty/serial/Kconfig              |   9 +
  drivers/tty/serial/Makefile             |   1 +
  drivers/tty/serial/qcom_geni_earlycon.c | 649 ++++++++++++++++++++++++++++++++
  drivers/tty/serial/qcom_geni_serial.c   |  97 -----
Quoted 8 lines
Quoted 4 lines

So you are replacing 97 lines of code with 649 lines? How is this benefiting anyone?

confused,

We have 2 versions of QUP driver, upstream version(Present in linus tree, mostly used for chromium project) and downstream version(belong to vendor part of code in GKI design, used for all the other project).

Why do you have 2 different versions? Why not merge them both into the kernel tree? That seems like madness to try to support 2. And why would we care about any out-of-tree code? This is increasing our complexity for code that isn't even being merged here, not anything you would do if you were the maintainer of it, right?

Quoted 2 lines

There is need to enable geni earlycon in Google provided boot image for GKI to facilitate the debug until real console(belong to vendor code) is up.

Then submit the code for that here please.

Quoted 7 lines

Currently it won't be possible because geni earlycon cannot be enabled independently, it depends on upstream QUP wrapper driver (soc/qcom/qcom-geni-se.c) and upstream serial driver(serial/qcom_geni_serial.c).

With this patch I am trying to break any dependency btw earlycon hook and QUP kernel drivers, so it can be managed independently.

Please submit the code that depends on this change, and we will be glad to review it.

thanks,

greg k-h