Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
* [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
@ 2019-06-17 12:51 Lee Jones
  2019-06-17 12:51 ` [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI Lee Jones
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Lee Jones @ 2019-06-17 12:51 UTC (permalink / raw)
  To: alokc, agross, david.brown, bjorn.andersson, balbi, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb, felipe.balbi
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

This patch-set ensures the kernel is bootable on the newly released
AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
changes have been accepted, leaving only I2C (keyboard, touchpad,
touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
camera, networking, etc) enablement.

RESEND: Stripped I2C patches as they have also been merged into
        their respective subsystem.

v4:
 * Collecting Acks
 * Adding Andy Gross' new email
 * Removing applied Pinctrl patches

Lee Jones (4):
  soc: qcom: geni: Add support for ACPI
  usb: dwc3: qcom: Add support for booting with ACPI
  usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
  usb: dwc3: qcom: Improve error handling

 drivers/soc/qcom/qcom-geni-se.c |  21 ++-
 drivers/usb/dwc3/Kconfig        |   2 +-
 drivers/usb/dwc3/dwc3-qcom.c    | 221 ++++++++++++++++++++++++++++----
 3 files changed, 209 insertions(+), 35 deletions(-)

-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI
  2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
@ 2019-06-17 12:51 ` Lee Jones
  2019-06-19  5:52   ` Andy Gross
  2019-06-17 12:51 ` [RESEND v4 2/4] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Lee Jones @ 2019-06-17 12:51 UTC (permalink / raw)
  To: alokc, agross, david.brown, bjorn.andersson, balbi, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb, felipe.balbi
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

When booting with ACPI as the active set of configuration tables,
all; clocks, regulators, pin functions ect are expected to be at
their ideal values/levels/rates, thus the associated frameworks
are unavailable.  Ensure calls to these APIs are shielded when
ACPI is enabled.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/soc/qcom/qcom-geni-se.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
index 6b8ef01472e9..d5cf953b4337 100644
--- a/drivers/soc/qcom/qcom-geni-se.c
+++ b/drivers/soc/qcom/qcom-geni-se.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
 
+#include <linux/acpi.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
@@ -450,6 +451,9 @@ int geni_se_resources_off(struct geni_se *se)
 {
 	int ret;
 
+	if (has_acpi_companion(se->dev))
+		return 0;
+
 	ret = pinctrl_pm_select_sleep_state(se->dev);
 	if (ret)
 		return ret;
@@ -487,6 +491,9 @@ int geni_se_resources_on(struct geni_se *se)
 {
 	int ret;
 
+	if (has_acpi_companion(se->dev))
+		return 0;
+
 	ret = geni_se_clks_on(se);
 	if (ret)
 		return ret;
@@ -724,12 +731,14 @@ static int geni_se_probe(struct platform_device *pdev)
 	if (IS_ERR(wrapper->base))
 		return PTR_ERR(wrapper->base);
 
-	wrapper->ahb_clks[0].id = "m-ahb";
-	wrapper->ahb_clks[1].id = "s-ahb";
-	ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
-	if (ret) {
-		dev_err(dev, "Err getting AHB clks %d\n", ret);
-		return ret;
+	if (!has_acpi_companion(&pdev->dev)) {
+		wrapper->ahb_clks[0].id = "m-ahb";
+		wrapper->ahb_clks[1].id = "s-ahb";
+		ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
+		if (ret) {
+			dev_err(dev, "Err getting AHB clks %d\n", ret);
+			return ret;
+		}
 	}
 
 	dev_set_drvdata(dev, wrapper);
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [RESEND v4 2/4] usb: dwc3: qcom: Add support for booting with ACPI
  2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
  2019-06-17 12:51 ` [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI Lee Jones
@ 2019-06-17 12:51 ` Lee Jones
  2019-06-17 12:51 ` [RESEND v4 3/4] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2019-06-17 12:51 UTC (permalink / raw)
  To: alokc, agross, david.brown, bjorn.andersson, balbi, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb, felipe.balbi
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

In Linux, the DWC3 core exists as its own independent platform device.
Thus when describing relationships in Device Tree, the current default
boot configuration table option, the DWC3 core often resides as a child
of the platform specific node.  Both of which are given their own
address space descriptions and the drivers can be mostly agnostic to
each other.

However, other Operating Systems have taken a more monolithic approach,
which is evident in the configuration ACPI tables for the Qualcomm
Snapdragon SDM850, where all DWC3 (core and platform) components are
described under a single IO memory region.

To ensure successful booting using the supplied ACPI tables, we need to
devise a way to chop up the address regions provided and subsequently
register the DWC3 core with the resultant information, which is
precisely what this patch aims to achieve.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/dwc3/Kconfig     |   2 +-
 drivers/usb/dwc3/dwc3-qcom.c | 206 ++++++++++++++++++++++++++++++-----
 2 files changed, 179 insertions(+), 29 deletions(-)

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 4a62045cc812..89abc6078703 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -128,7 +128,7 @@ config USB_DWC3_QCOM
 	tristate "Qualcomm Platform"
 	depends on ARCH_QCOM || COMPILE_TEST
 	depends on EXTCON || !EXTCON
-	depends on OF
+	depends on (OF || ACPI)
 	default USB_DWC3
 	help
 	  Some Qualcomm SoCs use DesignWare Core IP for USB2/3
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 184df4daa590..0cb63f6c92d9 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -4,6 +4,7 @@
  * Inspired by dwc3-of-simple.c
  */
 
+#include <linux/acpi.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/clk.h>
@@ -38,6 +39,20 @@
 #define PWR_EVNT_LPM_IN_L2_MASK			BIT(4)
 #define PWR_EVNT_LPM_OUT_L2_MASK		BIT(5)
 
+#define SDM845_QSCRATCH_BASE_OFFSET		0xf8800
+#define SDM845_QSCRATCH_SIZE			0x400
+#define SDM845_DWC3_CORE_SIZE			0xcd00
+
+struct dwc3_acpi_pdata {
+	u32			qscratch_base_offset;
+	u32			qscratch_base_size;
+	u32			dwc3_core_base_size;
+	int			hs_phy_irq_index;
+	int			dp_hs_phy_irq_index;
+	int			dm_hs_phy_irq_index;
+	int			ss_phy_irq_index;
+};
+
 struct dwc3_qcom {
 	struct device		*dev;
 	void __iomem		*qscratch_base;
@@ -56,6 +71,8 @@ struct dwc3_qcom {
 	struct notifier_block	vbus_nb;
 	struct notifier_block	host_nb;
 
+	const struct dwc3_acpi_pdata *acpi_pdata;
+
 	enum usb_dr_mode	mode;
 	bool			is_suspended;
 	bool			pm_suspended;
@@ -300,12 +317,27 @@ static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom)
 			  PIPE_UTMI_CLK_DIS);
 }
 
+static int dwc3_qcom_get_irq(struct platform_device *pdev,
+			     const char *name, int num)
+{
+	struct device_node *np = pdev->dev.of_node;
+	int ret;
+
+	if (np)
+		ret = platform_get_irq_byname(pdev, name);
+	else
+		ret = platform_get_irq(pdev, num);
+
+	return ret;
+}
+
 static int dwc3_qcom_setup_irq(struct platform_device *pdev)
 {
 	struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
+	const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata;
 	int irq, ret;
-
-	irq = platform_get_irq_byname(pdev, "hs_phy_irq");
+	irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq",
+				pdata ? pdata->hs_phy_irq_index : -1);
 	if (irq > 0) {
 		/* Keep wakeup interrupts disabled until suspend */
 		irq_set_status_flags(irq, IRQ_NOAUTOEN);
@@ -320,7 +352,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
 		qcom->hs_phy_irq = irq;
 	}
 
-	irq = platform_get_irq_byname(pdev, "dp_hs_phy_irq");
+	irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq",
+				pdata ? pdata->dp_hs_phy_irq_index : -1);
 	if (irq > 0) {
 		irq_set_status_flags(irq, IRQ_NOAUTOEN);
 		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
@@ -334,7 +367,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
 		qcom->dp_hs_phy_irq = irq;
 	}
 
-	irq = platform_get_irq_byname(pdev, "dm_hs_phy_irq");
+	irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq",
+				pdata ? pdata->dm_hs_phy_irq_index : -1);
 	if (irq > 0) {
 		irq_set_status_flags(irq, IRQ_NOAUTOEN);
 		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
@@ -348,7 +382,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
 		qcom->dm_hs_phy_irq = irq;
 	}
 
-	irq = platform_get_irq_byname(pdev, "ss_phy_irq");
+	irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq",
+				pdata ? pdata->ss_phy_irq_index : -1);
 	if (irq > 0) {
 		irq_set_status_flags(irq, IRQ_NOAUTOEN);
 		ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
@@ -371,11 +406,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
 	struct device_node	*np = dev->of_node;
 	int			i;
 
-	qcom->num_clocks = count;
-
-	if (!count)
+	if (!np || !count)
 		return 0;
 
+	qcom->num_clocks = count;
+
 	qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
 				  sizeof(struct clk *), GFP_KERNEL);
 	if (!qcom->clks)
@@ -409,12 +444,103 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
 	return 0;
 }
 
-static int dwc3_qcom_probe(struct platform_device *pdev)
+static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
 {
+	struct dwc3_qcom 	*qcom = platform_get_drvdata(pdev);
+	struct device		*dev = &pdev->dev;
+	struct resource		*res, *child_res = NULL;
+	int			irq;
+	int			ret;
+
+	qcom->dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
+	if (!qcom->dwc3)
+		return -ENOMEM;
+
+	qcom->dwc3->dev.parent = dev;
+	qcom->dwc3->dev.type = dev->type;
+	qcom->dwc3->dev.dma_mask = dev->dma_mask;
+	qcom->dwc3->dev.dma_parms = dev->dma_parms;
+	qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
+
+	child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
+	if (!child_res)
+		return -ENOMEM;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "failed to get memory resource\n");
+		ret = -ENODEV;
+		goto out;
+	}
+
+	child_res[0].flags = res->flags;
+	child_res[0].start = res->start;
+	child_res[0].end = child_res[0].start +
+		qcom->acpi_pdata->dwc3_core_base_size;
+
+	irq = platform_get_irq(pdev, 0);
+	child_res[1].flags = IORESOURCE_IRQ;
+	child_res[1].start = child_res[1].end = irq;
+
+	ret = platform_device_add_resources(qcom->dwc3, child_res, 2);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to add resources\n");
+		goto out;
+	}
+
+	ret = platform_device_add(qcom->dwc3);
+	if (ret)
+		dev_err(&pdev->dev, "failed to add device\n");
+
+out:
+	kfree(child_res);
+	return ret;
+}
+
+static int dwc3_qcom_of_register_core(struct platform_device *pdev)
+{
+	struct dwc3_qcom 	*qcom = platform_get_drvdata(pdev);
 	struct device_node	*np = pdev->dev.of_node, *dwc3_np;
 	struct device		*dev = &pdev->dev;
+	int			ret;
+
+	dwc3_np = of_get_child_by_name(np, "dwc3");
+	if (!dwc3_np) {
+		dev_err(dev, "failed to find dwc3 core child\n");
+		return -ENODEV;
+	}
+
+	ret = of_platform_populate(np, NULL, NULL, dev);
+	if (ret) {
+		dev_err(dev, "failed to register dwc3 core - %d\n", ret);
+		return ret;
+	}
+
+	qcom->dwc3 = of_find_device_by_node(dwc3_np);
+	if (!qcom->dwc3) {
+		dev_err(dev, "failed to get dwc3 platform device\n");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
+static const struct dwc3_acpi_pdata sdm845_acpi_pdata = {
+	.qscratch_base_offset = SDM845_QSCRATCH_BASE_OFFSET,
+	.qscratch_base_size = SDM845_QSCRATCH_SIZE,
+	.dwc3_core_base_size = SDM845_DWC3_CORE_SIZE,
+	.hs_phy_irq_index = 1,
+	.dp_hs_phy_irq_index = 4,
+	.dm_hs_phy_irq_index = 3,
+	.ss_phy_irq_index = 2
+};
+
+static int dwc3_qcom_probe(struct platform_device *pdev)
+{
+	struct device_node	*np = pdev->dev.of_node;
+	struct device		*dev = &pdev->dev;
 	struct dwc3_qcom	*qcom;
-	struct resource		*res;
+	struct resource		*res, *parent_res = NULL;
 	int			ret, i;
 	bool			ignore_pipe_clk;
 
@@ -425,6 +551,14 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, qcom);
 	qcom->dev = &pdev->dev;
 
+	if (has_acpi_companion(dev)) {
+		qcom->acpi_pdata = acpi_device_get_match_data(dev);
+		if (!qcom->acpi_pdata) {
+			dev_err(&pdev->dev, "no supporting ACPI device data\n");
+			return -EINVAL;
+		}
+	}
+
 	qcom->resets = devm_reset_control_array_get_optional_exclusive(dev);
 	if (IS_ERR(qcom->resets)) {
 		ret = PTR_ERR(qcom->resets);
@@ -454,7 +588,21 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	qcom->qscratch_base = devm_ioremap_resource(dev, res);
+
+	if (np) {
+		parent_res = res;
+	} else {
+		parent_res = kmemdup(res, sizeof(struct resource), GFP_KERNEL);
+		if (!parent_res)
+			return -ENOMEM;
+
+		parent_res->start = res->start +
+			qcom->acpi_pdata->qscratch_base_offset;
+		parent_res->end = parent_res->start +
+			qcom->acpi_pdata->qscratch_base_size;
+	}
+
+	qcom->qscratch_base = devm_ioremap_resource(dev, parent_res);
 	if (IS_ERR(qcom->qscratch_base)) {
 		dev_err(dev, "failed to map qscratch, err=%d\n", ret);
 		ret = PTR_ERR(qcom->qscratch_base);
@@ -462,13 +610,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	}
 
 	ret = dwc3_qcom_setup_irq(pdev);
-	if (ret)
-		goto clk_disable;
-
-	dwc3_np = of_get_child_by_name(np, "dwc3");
-	if (!dwc3_np) {
-		dev_err(dev, "failed to find dwc3 core child\n");
-		ret = -ENODEV;
+	if (ret) {
+		dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
 		goto clk_disable;
 	}
 
@@ -481,16 +624,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	if (ignore_pipe_clk)
 		dwc3_qcom_select_utmi_clk(qcom);
 
-	ret = of_platform_populate(np, NULL, NULL, dev);
-	if (ret) {
-		dev_err(dev, "failed to register dwc3 core - %d\n", ret);
-		goto clk_disable;
-	}
+	if (np)
+		ret = dwc3_qcom_of_register_core(pdev);
+	else
+		ret = dwc3_qcom_acpi_register_core(pdev);
 
-	qcom->dwc3 = of_find_device_by_node(dwc3_np);
-	if (!qcom->dwc3) {
-		dev_err(&pdev->dev, "failed to get dwc3 platform device\n");
-		ret = -ENODEV;
+	if (ret) {
+		dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
 		goto depopulate;
 	}
 
@@ -514,7 +654,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
 	return 0;
 
 depopulate:
-	of_platform_depopulate(&pdev->dev);
+	if (np)
+		of_platform_depopulate(&pdev->dev);
+	else
+		platform_device_put(pdev);
 clk_disable:
 	for (i = qcom->num_clocks - 1; i >= 0; i--) {
 		clk_disable_unprepare(qcom->clks[i]);
@@ -601,6 +744,12 @@ static const struct of_device_id dwc3_qcom_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
 
+static const struct acpi_device_id dwc3_qcom_acpi_match[] = {
+	{ "QCOM2430", (unsigned long)&sdm845_acpi_pdata },
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
+
 static struct platform_driver dwc3_qcom_driver = {
 	.probe		= dwc3_qcom_probe,
 	.remove		= dwc3_qcom_remove,
@@ -608,6 +757,7 @@ static struct platform_driver dwc3_qcom_driver = {
 		.name	= "dwc3-qcom",
 		.pm	= &dwc3_qcom_dev_pm_ops,
 		.of_match_table	= dwc3_qcom_of_match,
+		.acpi_match_table = ACPI_PTR(dwc3_qcom_acpi_match),
 	},
 };
 
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [RESEND v4 3/4] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
  2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
  2019-06-17 12:51 ` [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI Lee Jones
  2019-06-17 12:51 ` [RESEND v4 2/4] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
@ 2019-06-17 12:51 ` Lee Jones
  2019-06-17 12:51 ` [RESEND v4 4/4] usb: dwc3: qcom: Improve error handling Lee Jones
  2019-06-17 12:55 ` [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Felipe Balbi
  4 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2019-06-17 12:51 UTC (permalink / raw)
  To: alokc, agross, david.brown, bjorn.andersson, balbi, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb, felipe.balbi
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

When booting with Device Tree, the current default boot configuration
table option, the request to boot via 'host mode' comes from the
'dr_mode' property.  A property of the same name can be used inside
ACPI tables too.  However it is missing from the SDM845's ACPI tables
so we have to supply this information using Platform Device Properties
instead.

This does not change the behaviour of any currently supported devices.
The property is only set on ACPI enabled platforms, thus for H/W
booting DT, unless a 'dr_mode' property is present, the default is
still OTG (On-The-Go) as per [0].  Any new ACPI devices added will
also be able to over-ride this implementation by providing a 'dr_mode'
property in their ACPI tables.  In cases where 'dr_mode' is omitted
from the tables AND 'host mode' should not be the default (very
unlikely), then we will have to add some way of choosing between them
at run time - most likely by ACPI HID.

[0] Documentation/devicetree/bindings/usb/generic.txt

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/dwc3/dwc3-qcom.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 0cb63f6c92d9..2d050303d564 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -444,6 +444,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
 	return 0;
 }
 
+static const struct property_entry dwc3_qcom_acpi_properties[] = {
+	PROPERTY_ENTRY_STRING("dr_mode", "host"),
+	{}
+};
+
 static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
 {
 	struct dwc3_qcom 	*qcom = platform_get_drvdata(pdev);
@@ -488,6 +493,13 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
 		goto out;
 	}
 
+	ret = platform_device_add_properties(qcom->dwc3,
+					     dwc3_qcom_acpi_properties);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "failed to add properties\n");
+		goto out;
+	}
+
 	ret = platform_device_add(qcom->dwc3);
 	if (ret)
 		dev_err(&pdev->dev, "failed to add device\n");
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [RESEND v4 4/4] usb: dwc3: qcom: Improve error handling
  2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
                   ` (2 preceding siblings ...)
  2019-06-17 12:51 ` [RESEND v4 3/4] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
@ 2019-06-17 12:51 ` Lee Jones
  2019-06-17 12:55 ` [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Felipe Balbi
  4 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2019-06-17 12:51 UTC (permalink / raw)
  To: alokc, agross, david.brown, bjorn.andersson, balbi, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb, felipe.balbi
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

dwc3_qcom_clk_init() is called with of_count_phandle_with_args() as an
argument.  If of_count_phandle_with_args() returns an error, the number
of clocks will be a negative value and will lead to undefined behaviour.

Ensure we check for an error before attempting to blindly use the value.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/usb/dwc3/dwc3-qcom.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 2d050303d564..c59e9d8e8609 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -409,6 +409,9 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
 	if (!np || !count)
 		return 0;
 
+	if (count < 0)
+		return count;
+
 	qcom->num_clocks = count;
 
 	qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
  2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
                   ` (3 preceding siblings ...)
  2019-06-17 12:51 ` [RESEND v4 4/4] usb: dwc3: qcom: Improve error handling Lee Jones
@ 2019-06-17 12:55 ` Felipe Balbi
  2019-06-17 13:23   ` Lee Jones
  4 siblings, 1 reply; 12+ messages in thread
From: Felipe Balbi @ 2019-06-17 12:55 UTC (permalink / raw)
  To: Lee Jones, alokc, agross, david.brown, bjorn.andersson, gregkh,
	ard.biesheuvel, jlhugo, linux-arm-msm, linux-usb
  Cc: Lee Jones, linux-kernel, linux-arm-kernel

[-- Attachment #1.1: Type: text/plain, Size: 848 bytes --]

Lee Jones <lee.jones@linaro.org> writes:

> This patch-set ensures the kernel is bootable on the newly released
> AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
> changes have been accepted, leaving only I2C (keyboard, touchpad,
> touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
> camera, networking, etc) enablement.
>
> RESEND: Stripped I2C patches as they have also been merged into
>         their respective subsystem.
>
> v4:
>  * Collecting Acks
>  * Adding Andy Gross' new email
>  * Removing applied Pinctrl patches
>
> Lee Jones (4):
>   soc: qcom: geni: Add support for ACPI
>   usb: dwc3: qcom: Add support for booting with ACPI
>   usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
>   usb: dwc3: qcom: Improve error handling

pushed to testing/next

-- 
balbi

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
  2019-06-17 12:55 ` [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Felipe Balbi
@ 2019-06-17 13:23   ` Lee Jones
  2019-06-18  7:23     ` Felipe Balbi
  0 siblings, 1 reply; 12+ messages in thread
From: Lee Jones @ 2019-06-17 13:23 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: linux-kernel, ard.biesheuvel, gregkh, linux-usb, agross,
	bjorn.andersson, david.brown, alokc, linux-arm-msm, jlhugo,
	linux-arm-kernel

On Mon, 17 Jun 2019, Felipe Balbi wrote:

> Lee Jones <lee.jones@linaro.org> writes:
> 
> > This patch-set ensures the kernel is bootable on the newly released
> > AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
> > changes have been accepted, leaving only I2C (keyboard, touchpad,
> > touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
> > camera, networking, etc) enablement.
> >
> > RESEND: Stripped I2C patches as they have also been merged into
> >         their respective subsystem.
> >
> > v4:
> >  * Collecting Acks
> >  * Adding Andy Gross' new email
> >  * Removing applied Pinctrl patches
> >
> > Lee Jones (4):
> >   soc: qcom: geni: Add support for ACPI
> >   usb: dwc3: qcom: Add support for booting with ACPI
> >   usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
> >   usb: dwc3: qcom: Improve error handling
> 
> pushed to testing/next

Sounds promising, thanks Felipe.

OOI, what is your process?

How does do the patches typically sit in there?

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
  2019-06-17 13:23   ` Lee Jones
@ 2019-06-18  7:23     ` Felipe Balbi
  2019-06-18  8:08       ` Lee Jones
  0 siblings, 1 reply; 12+ messages in thread
From: Felipe Balbi @ 2019-06-18  7:23 UTC (permalink / raw)
  To: Lee Jones
  Cc: linux-kernel, ard.biesheuvel, gregkh, linux-usb, agross,
	bjorn.andersson, david.brown, alokc, linux-arm-msm, jlhugo,
	linux-arm-kernel

[-- Attachment #1.1: Type: text/plain, Size: 1472 bytes --]


Hi,

Lee Jones <lee.jones@linaro.org> writes:
> On Mon, 17 Jun 2019, Felipe Balbi wrote:
>
>> Lee Jones <lee.jones@linaro.org> writes:
>> 
>> > This patch-set ensures the kernel is bootable on the newly released
>> > AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
>> > changes have been accepted, leaving only I2C (keyboard, touchpad,
>> > touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
>> > camera, networking, etc) enablement.
>> >
>> > RESEND: Stripped I2C patches as they have also been merged into
>> >         their respective subsystem.
>> >
>> > v4:
>> >  * Collecting Acks
>> >  * Adding Andy Gross' new email
>> >  * Removing applied Pinctrl patches
>> >
>> > Lee Jones (4):
>> >   soc: qcom: geni: Add support for ACPI
>> >   usb: dwc3: qcom: Add support for booting with ACPI
>> >   usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
>> >   usb: dwc3: qcom: Improve error handling
>> 
>> pushed to testing/next
>
> Sounds promising, thanks Felipe.
>
> OOI, what is your process?
>
> How does do the patches typically sit in there?

I'll probably merge to my 'next' branch today. I leave them in
testing/next for a couple days, usually, so 0-day can run its thing and
I get a chance of at least boot testing on our machines in the lab here.

Since this doesn't touch anything "generic", I don't _have_ to boot
test, so I'll probably merge to 'next' today.

-- 
balbi

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
  2019-06-18  7:23     ` Felipe Balbi
@ 2019-06-18  8:08       ` Lee Jones
  2019-06-18  8:44         ` Felipe Balbi
  0 siblings, 1 reply; 12+ messages in thread
From: Lee Jones @ 2019-06-18  8:08 UTC (permalink / raw)
  To: Felipe Balbi
  Cc: linux-kernel, ard.biesheuvel, gregkh, linux-usb, agross,
	bjorn.andersson, david.brown, alokc, linux-arm-msm, jlhugo,
	linux-arm-kernel

On Tue, 18 Jun 2019, Felipe Balbi wrote:
> Lee Jones <lee.jones@linaro.org> writes:
> > On Mon, 17 Jun 2019, Felipe Balbi wrote:
> >
> >> Lee Jones <lee.jones@linaro.org> writes:
> >> 
> >> > This patch-set ensures the kernel is bootable on the newly released
> >> > AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
> >> > changes have been accepted, leaving only I2C (keyboard, touchpad,
> >> > touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
> >> > camera, networking, etc) enablement.
> >> >
> >> > RESEND: Stripped I2C patches as they have also been merged into
> >> >         their respective subsystem.
> >> >
> >> > v4:
> >> >  * Collecting Acks
> >> >  * Adding Andy Gross' new email
> >> >  * Removing applied Pinctrl patches
> >> >
> >> > Lee Jones (4):
> >> >   soc: qcom: geni: Add support for ACPI
> >> >   usb: dwc3: qcom: Add support for booting with ACPI
> >> >   usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
> >> >   usb: dwc3: qcom: Improve error handling
> >> 
> >> pushed to testing/next
> >
> > Sounds promising, thanks Felipe.
> >
> > OOI, what is your process?
> >
> > How does do the patches typically sit in there?
> 
> I'll probably merge to my 'next' branch today. I leave them in
> testing/next for a couple days, usually, so 0-day can run its thing and
> I get a chance of at least boot testing on our machines in the lab here.
> 
> Since this doesn't touch anything "generic", I don't _have_ to boot
> test, so I'll probably merge to 'next' today.

You're a star.  Thanks Felipe.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops
  2019-06-18  8:08       ` Lee Jones
@ 2019-06-18  8:44         ` Felipe Balbi
  0 siblings, 0 replies; 12+ messages in thread
From: Felipe Balbi @ 2019-06-18  8:44 UTC (permalink / raw)
  To: Lee Jones
  Cc: linux-kernel, ard.biesheuvel, gregkh, linux-usb, agross,
	bjorn.andersson, david.brown, alokc, linux-arm-msm, jlhugo,
	linux-arm-kernel

[-- Attachment #1.1: Type: text/plain, Size: 1774 bytes --]


Hi,

Lee Jones <lee.jones@linaro.org> writes:
> On Tue, 18 Jun 2019, Felipe Balbi wrote:
>> Lee Jones <lee.jones@linaro.org> writes:
>> > On Mon, 17 Jun 2019, Felipe Balbi wrote:
>> >
>> >> Lee Jones <lee.jones@linaro.org> writes:
>> >> 
>> >> > This patch-set ensures the kernel is bootable on the newly released
>> >> > AArch64 based Laptops using ACPI configuration tables.  The Pinctrl
>> >> > changes have been accepted, leaving only I2C (keyboard, touchpad,
>> >> > touchscreen, fingerprint, etc, HID device) and USB (root filesystem,
>> >> > camera, networking, etc) enablement.
>> >> >
>> >> > RESEND: Stripped I2C patches as they have also been merged into
>> >> >         their respective subsystem.
>> >> >
>> >> > v4:
>> >> >  * Collecting Acks
>> >> >  * Adding Andy Gross' new email
>> >> >  * Removing applied Pinctrl patches
>> >> >
>> >> > Lee Jones (4):
>> >> >   soc: qcom: geni: Add support for ACPI
>> >> >   usb: dwc3: qcom: Add support for booting with ACPI
>> >> >   usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
>> >> >   usb: dwc3: qcom: Improve error handling
>> >> 
>> >> pushed to testing/next
>> >
>> > Sounds promising, thanks Felipe.
>> >
>> > OOI, what is your process?
>> >
>> > How does do the patches typically sit in there?
>> 
>> I'll probably merge to my 'next' branch today. I leave them in
>> testing/next for a couple days, usually, so 0-day can run its thing and
>> I get a chance of at least boot testing on our machines in the lab here.
>> 
>> Since this doesn't touch anything "generic", I don't _have_ to boot
>> test, so I'll probably merge to 'next' today.
>
> You're a star.  Thanks Felipe.

it's in my 'next' now. Should be in tomorrow's linux next.

-- 
balbi

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI
  2019-06-17 12:51 ` [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI Lee Jones
@ 2019-06-19  5:52   ` Andy Gross
  2019-06-19  6:05     ` Lee Jones
  0 siblings, 1 reply; 12+ messages in thread
From: Andy Gross @ 2019-06-19  5:52 UTC (permalink / raw)
  To: Lee Jones
  Cc: balbi, felipe.balbi, ard.biesheuvel, gregkh, linux-usb,
	linux-kernel, bjorn.andersson, david.brown, alokc, linux-arm-msm,
	jlhugo, linux-arm-kernel

On Mon, Jun 17, 2019 at 01:51:02PM +0100, Lee Jones wrote:
> When booting with ACPI as the active set of configuration tables,
> all; clocks, regulators, pin functions ect are expected to be at
> their ideal values/levels/rates, thus the associated frameworks
> are unavailable.  Ensure calls to these APIs are shielded when
> ACPI is enabled.
> 
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Applied.

Thanks,

Andy

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI
  2019-06-19  5:52   ` Andy Gross
@ 2019-06-19  6:05     ` Lee Jones
  0 siblings, 0 replies; 12+ messages in thread
From: Lee Jones @ 2019-06-19  6:05 UTC (permalink / raw)
  To: Andy Gross
  Cc: balbi, felipe.balbi, ard.biesheuvel, gregkh, linux-usb,
	linux-kernel, bjorn.andersson, david.brown, alokc, linux-arm-msm,
	jlhugo, linux-arm-kernel

On Wed, 19 Jun 2019, Andy Gross wrote:

> On Mon, Jun 17, 2019 at 01:51:02PM +0100, Lee Jones wrote:
> > When booting with ACPI as the active set of configuration tables,
> > all; clocks, regulators, pin functions ect are expected to be at
> > their ideal values/levels/rates, thus the associated frameworks
> > are unavailable.  Ensure calls to these APIs are shielded when
> > ACPI is enabled.
> > 
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Applied.

Thanks Bjorn and Andy.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, back to index

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-17 12:51 [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Lee Jones
2019-06-17 12:51 ` [RESEND v4 1/4] soc: qcom: geni: Add support for ACPI Lee Jones
2019-06-19  5:52   ` Andy Gross
2019-06-19  6:05     ` Lee Jones
2019-06-17 12:51 ` [RESEND v4 2/4] usb: dwc3: qcom: Add support for booting with ACPI Lee Jones
2019-06-17 12:51 ` [RESEND v4 3/4] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845 Lee Jones
2019-06-17 12:51 ` [RESEND v4 4/4] usb: dwc3: qcom: Improve error handling Lee Jones
2019-06-17 12:55 ` [RESEND v4 0/4] I2C: DWC3 USB: Add support for ACPI based AArch64 Laptops Felipe Balbi
2019-06-17 13:23   ` Lee Jones
2019-06-18  7:23     ` Felipe Balbi
2019-06-18  8:08       ` Lee Jones
2019-06-18  8:44         ` Felipe Balbi

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org infradead-linux-arm-kernel@archiver.kernel.org
	public-inbox-index linux-arm-kernel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox