Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
0ebe98255d
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -1,63 +0,0 @@
|
|||
From b0b46a5b622fdbe69207675c5d50b77cb8ae43b7 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Carstens <heiko.carstens@de.ibm.com>
|
||||
Date: Tue, 5 Feb 2019 13:43:49 +0100
|
||||
Subject: [PATCH] s390/jump_label: Correct asm contraint
|
||||
|
||||
On Tue, Jan 29, 2019 at 08:25:58AM +0100, Laura Abbott wrote:
|
||||
> On 1/23/19 5:24 AM, Heiko Carstens wrote:
|
||||
> >On Wed, Jan 23, 2019 at 01:55:13PM +0100, Laura Abbott wrote:
|
||||
> >>There's a build failure with gcc9:
|
||||
> >>
|
||||
> >> ./arch/s390/include/asm/jump_label.h: Assembler messages:
|
||||
> >> ./arch/s390/include/asm/jump_label.h:23: Error: bad expression
|
||||
> >> ./arch/s390/include/asm/jump_label.h:23: Error: junk at end of line, first unrecognized character is `r'
|
||||
> >> make[1]: *** [scripts/Makefile.build:277: init/main.o] Error 1
|
||||
...
|
||||
> I've had to turn off s390 in Fedora until this gets fixed :(
|
||||
|
||||
Laura, the patch below should fix this (temporarily). If possible,
|
||||
could you give it a try? It seems to work for me.
|
||||
|
||||
rom 4067027c2ccc8d3f1dc3bb19fe2d00da0c65bcd8 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Carstens <heiko.carstens@de.ibm.com>
|
||||
Date: Tue, 5 Feb 2019 13:21:56 +0100
|
||||
Subject: [PATCH] s390: disable section anchors
|
||||
|
||||
Disable section anchors to allow to compile with the current gcc 9
|
||||
experimental version. The section anchors is a new feature for s390
|
||||
with gcc 9, however it breaks our current usage of the 'X' constraint
|
||||
within the asm goto construct within our jump label implementation.
|
||||
|
||||
Fixing this seems to be non-trivial, therefore (hopefully) temporarily
|
||||
disable section anchors. We will hopefully have a better solution
|
||||
before gcc 9 is released, so that this can be removed again.
|
||||
|
||||
Reported-by: Laura Abbott <labbott@redhat.com>
|
||||
Suggested-by: Ilya Leoshkevich <iii@linux.ibm.com>
|
||||
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
|
||||
---
|
||||
arch/s390/Makefile | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
|
||||
index e21053e5e0da..1eac75bc3a29 100644
|
||||
--- a/arch/s390/Makefile
|
||||
+++ b/arch/s390/Makefile
|
||||
@@ -62,6 +62,14 @@ cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include
|
||||
#
|
||||
cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls
|
||||
|
||||
+#
|
||||
+# Disable section anchors. This gcc 9 feature currently breaks the 'X'
|
||||
+# constraint like it is used in the asm goto construct.
|
||||
+#
|
||||
+ifeq ($(call cc-option-yn,-fno-section-anchors),y)
|
||||
+cflags-y += -fno-section-anchors
|
||||
+endif
|
||||
+
|
||||
ifeq ($(call cc-option-yn,-mpacked-stack),y)
|
||||
cflags-$(CONFIG_PACK_STACK) += -mpacked-stack -D__PACK_STACK
|
||||
aflags-$(CONFIG_PACK_STACK) += -D__PACK_STACK
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -470,173 +470,6 @@ index 61be15d9df7d..da26a584dca0 100644
|
|||
--
|
||||
2.21.0
|
||||
|
||||
From a94ed1abc52b51c55454b3f1a7181af9d91d9d73 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Tue, 11 Jun 2019 19:58:40 +0200
|
||||
Subject: [PATCH 4/5] cpufreq: add driver for Raspbery Pi
|
||||
|
||||
Raspberry Pi's firmware offers and interface though which update it's
|
||||
performance requirements. It allows us to request for specific runtime
|
||||
frequencies, which the firmware might or might not respect, depending on
|
||||
the firmware configuration and thermals.
|
||||
|
||||
As the maximum and minimum frequencies are configurable in the firmware
|
||||
there is no way to know in advance their values. So the Raspberry Pi
|
||||
cpufreq driver queries them, builds an opp frequency table to then
|
||||
launch cpufreq-dt.
|
||||
|
||||
Also, as the firmware interface might be configured as a module, making
|
||||
the cpu clock unavailable during init, this implements a full fledged
|
||||
driver, as opposed to most drivers registering cpufreq-dt, which only
|
||||
make use of an init routine.
|
||||
|
||||
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Acked-by: Eric Anholt <eric@anholt.net>
|
||||
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
|
||||
---
|
||||
drivers/cpufreq/Kconfig.arm | 8 +++
|
||||
drivers/cpufreq/Makefile | 1 +
|
||||
drivers/cpufreq/raspberrypi-cpufreq.c | 97 +++++++++++++++++++++++++++
|
||||
3 files changed, 106 insertions(+)
|
||||
create mode 100644 drivers/cpufreq/raspberrypi-cpufreq.c
|
||||
|
||||
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
|
||||
index f8129edc145e..5e9204d443ff 100644
|
||||
--- a/drivers/cpufreq/Kconfig.arm
|
||||
+++ b/drivers/cpufreq/Kconfig.arm
|
||||
@@ -133,6 +133,14 @@ config ARM_QCOM_CPUFREQ_HW
|
||||
The driver implements the cpufreq interface for this HW engine.
|
||||
Say Y if you want to support CPUFreq HW.
|
||||
|
||||
+config ARM_RASPBERRYPI_CPUFREQ
|
||||
+ tristate "Raspberry Pi cpufreq support"
|
||||
+ depends on CLK_RASPBERRYPI || COMPILE_TEST
|
||||
+ help
|
||||
+ This adds the CPUFreq driver for Raspberry Pi
|
||||
+
|
||||
+ If in doubt, say N.
|
||||
+
|
||||
config ARM_S3C_CPUFREQ
|
||||
bool
|
||||
help
|
||||
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
|
||||
index 689b26c6f949..121c1acb66c0 100644
|
||||
--- a/drivers/cpufreq/Makefile
|
||||
+++ b/drivers/cpufreq/Makefile
|
||||
@@ -64,6 +64,7 @@ obj-$(CONFIG_ARM_PXA2xx_CPUFREQ) += pxa2xx-cpufreq.o
|
||||
obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o
|
||||
obj-$(CONFIG_ARM_QCOM_CPUFREQ_HW) += qcom-cpufreq-hw.o
|
||||
obj-$(CONFIG_ARM_QCOM_CPUFREQ_KRYO) += qcom-cpufreq-kryo.o
|
||||
+obj-$(CONFIG_ARM_RASPBERRYPI_CPUFREQ) += raspberrypi-cpufreq.o
|
||||
obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o
|
||||
obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o
|
||||
obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o
|
||||
diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c
|
||||
new file mode 100644
|
||||
index 000000000000..2bc7d9734272
|
||||
--- /dev/null
|
||||
+++ b/drivers/cpufreq/raspberrypi-cpufreq.c
|
||||
@@ -0,0 +1,97 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * Raspberry Pi cpufreq driver
|
||||
+ *
|
||||
+ * Copyright (C) 2019, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/cpu.h>
|
||||
+#include <linux/cpufreq.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/pm_opp.h>
|
||||
+
|
||||
+#define RASPBERRYPI_FREQ_INTERVAL 100000000
|
||||
+
|
||||
+static struct platform_device *cpufreq_dt;
|
||||
+
|
||||
+static int raspberrypi_cpufreq_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device *cpu_dev;
|
||||
+ unsigned long min, max;
|
||||
+ unsigned long rate;
|
||||
+ struct clk *clk;
|
||||
+ int ret;
|
||||
+
|
||||
+ cpu_dev = get_cpu_device(0);
|
||||
+ if (!cpu_dev) {
|
||||
+ pr_err("Cannot get CPU for cpufreq driver\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ clk = clk_get(cpu_dev, NULL);
|
||||
+ if (IS_ERR(clk)) {
|
||||
+ dev_err(cpu_dev, "Cannot get clock for CPU0\n");
|
||||
+ return PTR_ERR(clk);
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * The max and min frequencies are configurable in the Raspberry Pi
|
||||
+ * firmware, so we query them at runtime.
|
||||
+ */
|
||||
+ min = roundup(clk_round_rate(clk, 0), RASPBERRYPI_FREQ_INTERVAL);
|
||||
+ max = roundup(clk_round_rate(clk, ULONG_MAX), RASPBERRYPI_FREQ_INTERVAL);
|
||||
+ clk_put(clk);
|
||||
+
|
||||
+ for (rate = min; rate <= max; rate += RASPBERRYPI_FREQ_INTERVAL) {
|
||||
+ ret = dev_pm_opp_add(cpu_dev, rate, 0);
|
||||
+ if (ret)
|
||||
+ goto remove_opp;
|
||||
+ }
|
||||
+
|
||||
+ cpufreq_dt = platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
|
||||
+ ret = PTR_ERR_OR_ZERO(cpufreq_dt);
|
||||
+ if (ret) {
|
||||
+ dev_err(cpu_dev, "Failed to create platform device, %d\n", ret);
|
||||
+ goto remove_opp;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+
|
||||
+remove_opp:
|
||||
+ dev_pm_opp_remove_all_dynamic(cpu_dev);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_cpufreq_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device *cpu_dev;
|
||||
+
|
||||
+ cpu_dev = get_cpu_device(0);
|
||||
+ if (cpu_dev)
|
||||
+ dev_pm_opp_remove_all_dynamic(cpu_dev);
|
||||
+
|
||||
+ platform_device_unregister(cpufreq_dt);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Since the driver depends on clk-raspberrypi, which may return EPROBE_DEFER,
|
||||
+ * all the activity is performed in the probe, which may be defered as well.
|
||||
+ */
|
||||
+static struct platform_driver raspberrypi_cpufreq_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "raspberrypi-cpufreq",
|
||||
+ },
|
||||
+ .probe = raspberrypi_cpufreq_probe,
|
||||
+ .remove = raspberrypi_cpufreq_remove,
|
||||
+};
|
||||
+module_platform_driver(raspberrypi_cpufreq_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Nicolas Saenz Julienne <nsaenzjulienne@suse.de");
|
||||
+MODULE_DESCRIPTION("Raspberry Pi cpufreq driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:raspberrypi-cpufreq");
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From af32d83d10976ff357c56adba79fa3cb06e1c32d Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Tue, 11 Jun 2019 19:58:42 +0200
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
From 19908e5fe3e63ed2d39f0a8a9135f35fd428d766 Mon Sep 17 00:00:00 2001
|
||||
From: Jon Masters <jcm@redhat.com>
|
||||
Date: Thu, 18 Jul 2019 15:47:26 -0400
|
||||
Subject: [PATCH] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
|
||||
|
||||
We will use this to force CONFIG_HIGHPTE off on LPAE for now
|
||||
|
||||
Signed-off-by: Jon Masters <jcm@redhat.com>
|
||||
---
|
||||
arch/arm/Kconfig | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||
index 2bf1ce39a96d..e792b3e60095 100644
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1644,9 +1644,9 @@ config HIGHMEM
|
||||
If unsure, say n.
|
||||
|
||||
config HIGHPTE
|
||||
- bool "Allocate 2nd-level pagetables from highmem" if EXPERT
|
||||
+ bool "Allocate 2nd-level pagetables from highmem"
|
||||
depends on HIGHMEM
|
||||
- default y
|
||||
+ default n
|
||||
help
|
||||
The VM uses one page of physical memory for each page table.
|
||||
For systems with a lot of processes, this can use a lot of
|
||||
--
|
||||
2.17.2
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From a7edc17544709d20f800dc0898096365a3d68613 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Sun, 2 Jun 2019 16:36:15 +0200
|
||||
Subject: [PATCH] acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
|
||||
|
||||
Some Qualcomm Snapdragon based laptops built to run Microsoft Windows
|
||||
are clearly ACPI 5.1 based, given that that is the first ACPI revision
|
||||
that supports ARM, and introduced the FADT 'arm_boot_flags' field,
|
||||
which has a non-zero field on those systems.
|
||||
|
||||
So in these cases, infer from the ARM boot flags that the FADT must be
|
||||
5.1 or later, and treat it as 5.1.
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
arch/arm64/kernel/acpi.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
|
||||
index 803f0494dd3e3..7722e85fb69c3 100644
|
||||
--- a/arch/arm64/kernel/acpi.c
|
||||
+++ b/arch/arm64/kernel/acpi.c
|
||||
@@ -155,10 +155,14 @@ static int __init acpi_fadt_sanity_check(void)
|
||||
*/
|
||||
if (table->revision < 5 ||
|
||||
(table->revision == 5 && fadt->minor_revision < 1)) {
|
||||
- pr_err("Unsupported FADT revision %d.%d, should be 5.1+\n",
|
||||
+ pr_err(FW_BUG "Unsupported FADT revision %d.%d, should be 5.1+\n",
|
||||
table->revision, fadt->minor_revision);
|
||||
- ret = -EINVAL;
|
||||
- goto out;
|
||||
+
|
||||
+ if (!fadt->arm_boot_flags) {
|
||||
+ ret = -EINVAL;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ pr_err("FADT has ARM boot flags set, assuming 5.1\n");
|
||||
}
|
||||
|
||||
if (!(fadt->flags & ACPI_FADT_HW_REDUCED)) {
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From 7b87bc98ab598ae40ef1818fb0c420d61dd87ed1 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Mon, 3 Jun 2019 08:37:11 +0200
|
||||
Subject: [PATCH] acpi: make AC and battery drivers available on !X86
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/acpi/Kconfig | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
|
||||
index e016f7a6ed136..3c8011e7b0d7c 100644
|
||||
--- a/drivers/acpi/Kconfig
|
||||
+++ b/drivers/acpi/Kconfig
|
||||
@@ -155,7 +155,6 @@ config ACPI_EC_DEBUGFS
|
||||
|
||||
config ACPI_AC
|
||||
tristate "AC Adapter"
|
||||
- depends on X86
|
||||
select POWER_SUPPLY
|
||||
default y
|
||||
help
|
||||
@@ -168,7 +167,6 @@ config ACPI_AC
|
||||
|
||||
config ACPI_BATTERY
|
||||
tristate "Battery"
|
||||
- depends on X86
|
||||
select POWER_SUPPLY
|
||||
default y
|
||||
help
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,293 +0,0 @@
|
|||
From 0ab5b9df0c9f07ae747ddc678d4e423c42f69624 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:06 +0100
|
||||
Subject: [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI
|
||||
|
||||
Add a match table to allow automatic probing of ACPI device
|
||||
QCOM0220. Ignore clock attainment errors. Set default clock
|
||||
frequency value.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index db075bc0d952..9e3b8a98688d 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.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/dma-mapping.h>
|
||||
#include <linux/err.h>
|
||||
@@ -483,6 +484,14 @@ static const struct i2c_algorithm geni_i2c_algo = {
|
||||
.functionality = geni_i2c_func,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id geni_i2c_acpi_match[] = {
|
||||
+ { "QCOM0220"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static int geni_i2c_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct geni_i2c_dev *gi2c;
|
||||
@@ -502,7 +511,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return PTR_ERR(gi2c->se.base);
|
||||
|
||||
gi2c->se.clk = devm_clk_get(&pdev->dev, "se");
|
||||
- if (IS_ERR(gi2c->se.clk)) {
|
||||
+ if (IS_ERR(gi2c->se.clk) && !has_acpi_companion(&pdev->dev)) {
|
||||
ret = PTR_ERR(gi2c->se.clk);
|
||||
dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret);
|
||||
return ret;
|
||||
@@ -516,6 +525,9 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
gi2c->clk_freq_out = KHZ(100);
|
||||
}
|
||||
|
||||
+ if (has_acpi_companion(&pdev->dev))
|
||||
+ ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev));
|
||||
+
|
||||
gi2c->irq = platform_get_irq(pdev, 0);
|
||||
if (gi2c->irq < 0) {
|
||||
dev_err(&pdev->dev, "IRQ error for i2c-geni\n");
|
||||
@@ -660,6 +672,7 @@ static struct platform_driver geni_i2c_driver = {
|
||||
.name = "geni_i2c",
|
||||
.pm = &geni_i2c_pm_ops,
|
||||
.of_match_table = geni_i2c_dt_match,
|
||||
+ .acpi_match_table = ACPI_PTR(geni_i2c_acpi_match),
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 5a0639fed6e05977d85c4824354e73d0a2fa92ef Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:07 +0100
|
||||
Subject: [PATCH 2/8] i2c: i2c-qcom-geni: Signify successful driver probe
|
||||
|
||||
The Qualcomm Geni I2C driver currently probes silently which can be
|
||||
confusing when debugging potential issues. Add a low level (INFO)
|
||||
print when each I2C controller is successfully initially set-up.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index 9e3b8a98688d..a89bfce5388e 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
@@ -596,6 +596,8 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ dev_dbg(&pdev->dev, "Geni-I2C adaptor successfully added\n");
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 6f202eb6dbccf3172616a620faf934bf6195a0f9 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:08 +0100
|
||||
Subject: [PATCH 3/8] pinctrl: msm: Add ability for drivers to supply a
|
||||
reserved GPIO list
|
||||
|
||||
When booting MSM based platforms with Device Tree or some ACPI
|
||||
implementations, it is possible to provide a list of reserved pins
|
||||
via the 'gpio-reserved-ranges' and 'gpios' properties respectively.
|
||||
However some ACPI tables are not populated with this information,
|
||||
thus it has to come from a knowledgable device driver instead.
|
||||
|
||||
Here we provide the MSM common driver with additional support to
|
||||
parse this informtion and correctly populate the widely used
|
||||
'valid_mask'.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/pinctrl-msm.c | 18 ++++++++++++++++++
|
||||
drivers/pinctrl/qcom/pinctrl-msm.h | 1 +
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
index 6e319bcc2326..80682b017a47 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
@@ -599,8 +599,23 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip)
|
||||
int ret;
|
||||
unsigned int len, i;
|
||||
unsigned int max_gpios = pctrl->soc->ngpios;
|
||||
+ const int *reserved = pctrl->soc->reserved_gpios;
|
||||
u16 *tmp;
|
||||
|
||||
+ /* Driver provided reserved list overrides DT and ACPI */
|
||||
+ if (reserved) {
|
||||
+ bitmap_fill(chip->valid_mask, max_gpios);
|
||||
+ for (i = 0; reserved[i] >= 0; i++) {
|
||||
+ if (i >= max_gpios || reserved[i] >= max_gpios) {
|
||||
+ dev_err(pctrl->dev, "invalid list of reserved GPIOs\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ clear_bit(reserved[i], chip->valid_mask);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
/* The number of GPIOs in the ACPI tables */
|
||||
len = ret = device_property_read_u16_array(pctrl->dev, "gpios", NULL,
|
||||
0);
|
||||
@@ -956,6 +971,9 @@ static void msm_gpio_irq_handler(struct irq_desc *desc)
|
||||
|
||||
static bool msm_gpio_needs_valid_mask(struct msm_pinctrl *pctrl)
|
||||
{
|
||||
+ if (pctrl->soc->reserved_gpios)
|
||||
+ return true;
|
||||
+
|
||||
return device_property_read_u16_array(pctrl->dev, "gpios", NULL, 0) > 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
index b724581c605c..48569cda8471 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
@@ -113,6 +113,7 @@ struct msm_pinctrl_soc_data {
|
||||
bool pull_no_keeper;
|
||||
const char *const *tiles;
|
||||
unsigned int ntiles;
|
||||
+ const int *reserved_gpios;
|
||||
};
|
||||
|
||||
extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 568ff4c9723d761164416fdf876232f5b14cf3ad Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:09 +0100
|
||||
Subject: [PATCH 4/8] pinctrl: qcom: sdm845: Provide ACPI support
|
||||
|
||||
This patch provides basic support for booting with ACPI instead
|
||||
of the currently supported Device Tree. When doing so there are a
|
||||
couple of differences which we need to taken into consideration.
|
||||
|
||||
Firstly, the SDM850 ACPI tables omit information pertaining to the
|
||||
4 reserved GPIOs on the platform. If Linux attempts to touch/
|
||||
initialise any of these lines, the firmware will restart the
|
||||
platform.
|
||||
|
||||
Secondly, when booting with ACPI, it is expected that the firmware
|
||||
will set-up things like; Regulators, Clocks, Pin Functions, etc in
|
||||
their ideal configuration. Thus, the possible Pin Functions
|
||||
available to this platform are not advertised when providing the
|
||||
higher GPIOD/Pinctrl APIs with pin information.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/Kconfig | 2 +-
|
||||
drivers/pinctrl/qcom/pinctrl-sdm845.c | 36 ++++++++++++++++++++++++++-
|
||||
2 files changed, 36 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
|
||||
index 890d0a3a790b..27ab585a639c 100644
|
||||
--- a/drivers/pinctrl/qcom/Kconfig
|
||||
+++ b/drivers/pinctrl/qcom/Kconfig
|
||||
@@ -169,7 +169,7 @@ config PINCTRL_SDM660
|
||||
|
||||
config PINCTRL_SDM845
|
||||
tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
|
||||
- depends on GPIOLIB && OF
|
||||
+ depends on GPIOLIB && (OF || ACPI)
|
||||
select PINCTRL_MSM
|
||||
help
|
||||
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
index c97f20fca5fd..98a438dba711 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
@@ -1277,6 +1278,10 @@ static const struct msm_pingroup sdm845_groups[] = {
|
||||
UFS_RESET(ufs_reset, 0x99f000),
|
||||
};
|
||||
|
||||
+static const int sdm845_acpi_reserved_gpios[] = {
|
||||
+ 0, 1, 2, 3, 81, 82, 83, 84, -1
|
||||
+};
|
||||
+
|
||||
static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.pins = sdm845_pins,
|
||||
.npins = ARRAY_SIZE(sdm845_pins),
|
||||
@@ -1287,11 +1292,39 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.ngpios = 150,
|
||||
};
|
||||
|
||||
+static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = {
|
||||
+ .pins = sdm845_pins,
|
||||
+ .npins = ARRAY_SIZE(sdm845_pins),
|
||||
+ .groups = sdm845_groups,
|
||||
+ .ngroups = ARRAY_SIZE(sdm845_groups),
|
||||
+ .reserved_gpios = sdm845_acpi_reserved_gpios,
|
||||
+ .ngpios = 150,
|
||||
+};
|
||||
+
|
||||
static int sdm845_pinctrl_probe(struct platform_device *pdev)
|
||||
{
|
||||
- return msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ int ret;
|
||||
+
|
||||
+ if (pdev->dev.of_node) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ } else if (has_acpi_companion(&pdev->dev)) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_acpi_pinctrl);
|
||||
+ } else {
|
||||
+ dev_err(&pdev->dev, "DT and ACPI disabled\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = {
|
||||
+ { "QCOM0217"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sdm845_pinctrl_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static const struct of_device_id sdm845_pinctrl_of_match[] = {
|
||||
{ .compatible = "qcom,sdm845-pinctrl", },
|
||||
{ },
|
||||
@@ -1302,6 +1335,7 @@ static struct platform_driver sdm845_pinctrl_driver = {
|
||||
.name = "sdm845-pinctrl",
|
||||
.pm = &msm_pinctrl_dev_pm_ops,
|
||||
.of_match_table = sdm845_pinctrl_of_match,
|
||||
+ .acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match),
|
||||
},
|
||||
.probe = sdm845_pinctrl_probe,
|
||||
.remove = msm_pinctrl_remove,
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 59780095ba35a49946e726c88caff6f65f3e433a Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 30 Jul 2019 14:22:36 +0100
|
||||
Subject: [PATCH] arm64: tegra: Jetson TX2: Allow bootloader to configure
|
||||
Ethernet MAC
|
||||
|
||||
Add an ethernet alias so that a stable MAC address is added to the
|
||||
device tree for the wired ethernet interface.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
|
||||
index 5e18acf5cfad..947744d0f04c 100644
|
||||
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
|
||||
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
|
||||
@@ -8,6 +8,7 @@
|
||||
compatible = "nvidia,p3310", "nvidia,tegra186";
|
||||
|
||||
aliases {
|
||||
+ ethernet0 = "/ethernet@2490000";
|
||||
sdhci0 = "/sdhci@3460000";
|
||||
sdhci1 = "/sdhci@3400000";
|
||||
serial0 = &uarta;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
From 9ceb22fbffbad710db2c91ed32e4e73503f13301 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 25 Jun 2019 19:12:10 +0100
|
||||
Subject: [PATCH] scsi: ufs-qcom: Add support for platforms booting ACPI
|
||||
|
||||
New Qualcomm AArch64 based laptops are now available which use UFS
|
||||
as their primary data storage medium. These devices are supplied
|
||||
with ACPI support out of the box. This patch ensures the Qualcomm
|
||||
UFS driver will be bound when the "QCOM24A5" H/W device is
|
||||
advertised as present.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/scsi/ufs/ufs-qcom.c | 23 ++++++++++++++++++++---
|
||||
1 file changed, 20 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
|
||||
index b4d1b5c22987..ee4b1da1e223 100644
|
||||
--- a/drivers/scsi/ufs/ufs-qcom.c
|
||||
+++ b/drivers/scsi/ufs/ufs-qcom.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (c) 2013-2016, Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
@@ -161,6 +162,9 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
|
||||
int err = 0;
|
||||
struct device *dev = host->hba->dev;
|
||||
|
||||
+ if (has_acpi_companion(dev))
|
||||
+ return 0;
|
||||
+
|
||||
err = ufs_qcom_host_clk_get(dev, "rx_lane0_sync_clk",
|
||||
&host->rx_l0_sync_clk, false);
|
||||
if (err)
|
||||
@@ -1127,9 +1131,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
|
||||
__func__, err);
|
||||
goto out_variant_clear;
|
||||
} else if (IS_ERR(host->generic_phy)) {
|
||||
- err = PTR_ERR(host->generic_phy);
|
||||
- dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
|
||||
- goto out_variant_clear;
|
||||
+ if (has_acpi_companion(dev)) {
|
||||
+ host->generic_phy = NULL;
|
||||
+ } else {
|
||||
+ err = PTR_ERR(host->generic_phy);
|
||||
+ dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
|
||||
+ goto out_variant_clear;
|
||||
+ }
|
||||
}
|
||||
|
||||
err = ufs_qcom_bus_register(host);
|
||||
@@ -1599,6 +1607,14 @@ static const struct of_device_id ufs_qcom_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ufs_qcom_of_match);
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id ufs_qcom_acpi_match[] = {
|
||||
+ { "QCOM24A5" },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, ufs_qcom_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static const struct dev_pm_ops ufs_qcom_pm_ops = {
|
||||
.suspend = ufshcd_pltfrm_suspend,
|
||||
.resume = ufshcd_pltfrm_resume,
|
||||
@@ -1615,6 +1631,7 @@ static struct platform_driver ufs_qcom_pltform = {
|
||||
.name = "ufshcd-qcom",
|
||||
.pm = &ufs_qcom_pm_ops,
|
||||
.of_match_table = of_match_ptr(ufs_qcom_of_match),
|
||||
+ .acpi_match_table = ACPI_PTR(ufs_qcom_acpi_match),
|
||||
},
|
||||
};
|
||||
module_platform_driver(ufs_qcom_pltform);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
|
@ -1,185 +0,0 @@
|
|||
From patchwork Wed Jun 26 15:48:11 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Stefan Wahren <wahrenst@gmx.net>
|
||||
X-Patchwork-Id: 11018115
|
||||
Return-Path:
|
||||
<linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
|
||||
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
|
||||
[172.30.200.125])
|
||||
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0546514BB
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Wed, 26 Jun 2019 15:49:02 +0000 (UTC)
|
||||
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
|
||||
by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6FEC288DC
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
|
||||
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
|
||||
id DADF9288E5; Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
|
||||
pdx-wl-mail.web.codeaurora.org
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
|
||||
DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham
|
||||
version=3.3.1
|
||||
Received: from bombadil.infradead.org (bombadil.infradead.org
|
||||
[198.137.202.133])
|
||||
(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73ADC288DC
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
||||
d=lists.infradead.org; s=bombadil.20170209; h=Sender:
|
||||
Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:
|
||||
List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
|
||||
Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
|
||||
Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
|
||||
References:List-Owner; bh=qjzvJkBweFVGZWCHd7cHawZMDpcLTzSf2CjoVEIv+0Q=; b=eu5
|
||||
ABKzcpImxwkRcYCdHG/4eTgYM8nrpBaJqeKW2TNWEhNUjvnfU8TgkbD4nsIXkBXSb/riyKYzEcGJo
|
||||
91zXHR6clQ6yf7eRtaHSX9IMfiwGPTC2YQvr6vQ+CrVJs+xDhlH/1V1+9myF4ySIX+mLOnm+w3pgi
|
||||
j1JeP7vd7fpr8iyG29kaFoDH7FdC5Sw66TINVyaE5igT9yKcrFoAITGfRZevp1dd3uq5EKxs/+oo3
|
||||
9BvpwHZ3Bdb+bWzFc9kS4udjL8V4+u7aesLq8tOOPLZab+W8ZW1iq4PHENzdHblrJyrK/2pGEECPx
|
||||
bVAV7MIHqms4tvAAyXSlPai0wU/j12A==;
|
||||
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
|
||||
by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
|
||||
id 1hgAAK-00030G-Ny; Wed, 26 Jun 2019 15:48:56 +0000
|
||||
Received: from mout.gmx.net ([212.227.17.20])
|
||||
by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
|
||||
id 1hgAAH-0002yg-2E; Wed, 26 Jun 2019 15:48:54 +0000
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
|
||||
s=badeba3b8450; t=1561564113;
|
||||
bh=mWLTbdtxGfwZ13vnfxlQDfv6DzwTGycBEng3zNk/XaE=;
|
||||
h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
|
||||
b=KYHDR8XZmzxft+7qC8J8cyQ71BSi6JkTsAhWvd+vK2f+YjWqjT42uTfrjNGCcQfdV
|
||||
Z9gkAVPhUJWqXcu/GipMjVfx/QmxN65eJI1oHCOZ/vhkhzCqY9CuiJjHWnxF6jmydK
|
||||
5QSqYnKAOWM3NXmd6pWkd6wlKwIFV9zX8+x8R0gE=
|
||||
X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
|
||||
Received: from localhost.localdomain ([37.4.249.111]) by mail.gmx.com
|
||||
(mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id
|
||||
0LyS5K-1ibrK32soI-015u60; Wed, 26 Jun 2019 17:48:33 +0200
|
||||
From: Stefan Wahren <wahrenst@gmx.net>
|
||||
To: Eric Anholt <eric@anholt.net>,
|
||||
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
|
||||
Madhumitha Prabakaran <madhumithabiw@gmail.com>
|
||||
Subject: [PATCH V2] staging: bcm2835-camera: Restore return behavior of
|
||||
ctrl_set_bitrate()
|
||||
Date: Wed, 26 Jun 2019 17:48:11 +0200
|
||||
Message-Id: <1561564091-14248-1-git-send-email-wahrenst@gmx.net>
|
||||
X-Mailer: git-send-email 2.7.4
|
||||
X-Provags-ID: V03:K1:oGZaaF0VyX9aU1B2KlshIgSdbA6j0aZLN7PhhBatNb+3vHD/bim
|
||||
IAE1eOdpYqQunHD6Pg0lTq7WJELowblFluMBHzPg8LdD02e6QUAOnsxpP9+ZsegmN4310bJ
|
||||
qbWyOk73ZUf0L+ErExAilg9x9ygGjCdTujEDRrk0vloZc12lmdHMEA8VQs/4HDu6WGeOoac
|
||||
M59q+7daHAsSTIgJrRUuA==
|
||||
X-UI-Out-Filterresults: notjunk:1;V03:K0:+5QZJxEbxD4=:fxpwesVoxYf61efHxmcTKK
|
||||
BddiAtw8+v4csO9cTNV4qSFAebPmgWlPv8KyLXPbOQdcjOl72FUcevKvhsznxi/uv5leFw9uX
|
||||
Sr99W78EPj3EmJmQT1KZ8GMPWcB/hQa1h/t4bhjHByFu4VQ2xaIdpsJfZlFcR2poK1E6dEFT6
|
||||
jHlzWYjt2kP7anvsjMJvdSVILf9+ei6ysWz1aaMCKFLhxNUNmXH9onDdO8WOanGVr15zb+cVv
|
||||
N4ecxzj0SonMoADsz1UJqgwb8Pi5/me809KQd8pQ/GhKDeLPNwQPXJMMhRbyPgmg5bJVCRUgp
|
||||
MaMwDNiIn3qPl6t4jPx9uiSL5n47PAyt6vVlyufqp1lOr4EqgQFWp+2hknWJYJ8hzkBLgXrdZ
|
||||
gfNGAtlqG9MdHsJds/KNtpjNvF3iCuOWcIyBEGAYKZL78LQggOcIFSlHn+KZ9JU2t9jGJHKF7
|
||||
0E7pkZuWJIQjaWnt7WTAiO/Pv3tNhKukGVQXG7OTxkwS3+BsXI+vBB+xtOP+syI1QFkP3h+5c
|
||||
9HVQLB7CA73bkyul1AwmrHNV+OqITaTatTPFXsDojt54X59pz2G3SkQI5z8JZ2aq40Z3vwI6u
|
||||
lyMT+gPPFDx2aNm460FX8Gm+2BisA5xrkpjxb4KIDZvTRDCexntK3cadXRyX7GZQWc6poIcVf
|
||||
atWNWiKYv6KN6vA+lc2Ffl5FM8p7BFtkX4GA0GZ/XhMTvCqDtgxBdQ4sevKJ4riNMAvRuswrM
|
||||
BUrlhaRg3ElFPF3x+S73QaRmNmtv34L7puWW57WxrkKKSJS7Td0oZd1ktx6eAW1CA+I8RmOn3
|
||||
A+rcm/ZfBf00TXqxsq3/t9h4mL3cP4KhBAxtyYg4z4yjuWt8AmXR6GfvTwCxk+qioygsV6KyY
|
||||
6yh532oUizARrL8gUwZBauRwgH5rk7e2BWINY86y8vr3nSBzocuIFAekTK42reIsJ+qq9OSD5
|
||||
IcQroenV1LixMtStvb6CiyHMHMqpxb+Buu+0bdl5qjKcUB4JxBA6KWMPC6Orj+Yf/GKaQlk+k
|
||||
VsgZBuZAUHsZFuULBdIsUg//MyQJ0q/13WL31BSqJX9SAMgHFgsGeDo4yAg4YSF2Mbh1EgZu7
|
||||
a3+bklRX7SG3Ts=
|
||||
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
|
||||
X-CRM114-CacheID: sfid-20190626_084853_443115_5EF1DFC7
|
||||
X-CRM114-Status: GOOD ( 11.55 )
|
||||
X-BeenThere: linux-arm-kernel@lists.infradead.org
|
||||
X-Mailman-Version: 2.1.29
|
||||
Precedence: list
|
||||
List-Id: <linux-arm-kernel.lists.infradead.org>
|
||||
List-Unsubscribe:
|
||||
<http://lists.infradead.org/mailman/options/linux-arm-kernel>,
|
||||
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
|
||||
List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
|
||||
List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
|
||||
List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
|
||||
List-Subscribe:
|
||||
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
|
||||
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
|
||||
Cc: devel@driverdev.osuosl.org, Stefan Wahren <wahrenst@gmx.net>,
|
||||
Dave Stevenson <dave.stevenson@raspberrypi.org>,
|
||||
Dan Carpenter <dan.carpenter@oracle.com>,
|
||||
linux-arm-kernel@lists.infradead.org,
|
||||
linux-rpi-kernel@lists.infradead.org
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="us-ascii"
|
||||
Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
|
||||
Errors-To:
|
||||
linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
|
||||
X-Virus-Scanned: ClamAV using ClamSMTP
|
||||
|
||||
The commit 52c4dfcead49 ("Staging: vc04_services: Cleanup in
|
||||
ctrl_set_bitrate()") changed the return behavior of ctrl_set_bitrate().
|
||||
We cannot do this because of a bug in the firmware, which breaks probing
|
||||
of bcm2835-camera:
|
||||
|
||||
bcm2835-v4l2: mmal_init: failed to set all camera controls: -3
|
||||
Cleanup: Destroy video encoder
|
||||
Cleanup: Destroy image encoder
|
||||
Cleanup: Destroy video render
|
||||
Cleanup: Destroy camera
|
||||
bcm2835-v4l2: bcm2835_mmal_probe: mmal init failed: -3
|
||||
bcm2835-camera: probe of bcm2835-camera failed with error -3
|
||||
|
||||
So restore the old behavior, add an explaining comment and a debug message
|
||||
to verify that the bug has been fixed in firmware.
|
||||
|
||||
Fixes: 52c4dfcead49 ("Staging: vc04_services: Cleanup in ctrl_set_bitrate()")
|
||||
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
|
||||
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
|
||||
---
|
||||
.../staging/vc04_services/bcm2835-camera/controls.c | 19 ++++++++++++++++---
|
||||
1 file changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
Changes in V2:
|
||||
- add an explaining comment as suggest by Dan and Dave
|
||||
- add a debug message to verify the firmware behavior
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
||||
index d60e378..c251164 100644
|
||||
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
||||
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
||||
@@ -604,15 +604,28 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
|
||||
struct v4l2_ctrl *ctrl,
|
||||
const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
|
||||
{
|
||||
+ int ret;
|
||||
struct vchiq_mmal_port *encoder_out;
|
||||
|
||||
dev->capture.encode_bitrate = ctrl->val;
|
||||
|
||||
encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
|
||||
|
||||
- return vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
|
||||
- mmal_ctrl->mmal_id, &ctrl->val,
|
||||
- sizeof(ctrl->val));
|
||||
+ ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
|
||||
+ mmal_ctrl->mmal_id, &ctrl->val,
|
||||
+ sizeof(ctrl->val));
|
||||
+
|
||||
+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
|
||||
+ "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
|
||||
+ __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
|
||||
+ (ret == 0 ? 0 : -EINVAL));
|
||||
+
|
||||
+ /*
|
||||
+ * Older firmware versions (pre July 2019) have a bug in handling
|
||||
+ * MMAL_PARAMETER_VIDEO_BIT_RATE that result in the call
|
||||
+ * returning -MMAL_MSG_STATUS_EINVAL. So ignore errors from this call.
|
||||
+ */
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +0,0 @@
|
|||
CONFIG_DEBUG_BLK_CGROUP=y
|
||||
|
|
@ -1 +1 @@
|
|||
CONFIG_DMADEVICES_DEBUG=y
|
||||
# CONFIG_DMADEVICES_DEBUG is not set
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_ADF4371 is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_AL_FIC is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_ARCH_NETX is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_ASIX_PHY is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_BFQ_CGROUP_DEBUG is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_BT_HCIBTUSB_MTK is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CEPH_FS_SECURITY_LABEL=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_CHR_DEV_OSST=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_CIFS_ACL=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_COMMON_CLK_SI5341 is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CROS_EC_ISHTP=m
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CRYPTO_XXHASH=m
|
||||
|
|
@ -1 +1 @@
|
|||
# CONFIG_CRYPTO_ZSTD is not set
|
||||
CONFIG_CRYPTO_ZSTD=m
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_DEBUG_BLK_CGROUP is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_DE_AOC=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DPS310 is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DVB_USB_CXUSB_ANALOG=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DW_EDMA=m
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DW_EDMA_PCIE=m
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_EXTCON_FSA9480 is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_FMC=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_FMC_CHARDEV=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_FMC_FAKEDEV=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_FMC_TRIVIAL=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_FMC_WRITE_EEPROM=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_FSL_ENETC is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_FSL_ENETC_VF is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_FW_LOADER_COMPRESS=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_GVE=m
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_HEADERS_INSTALL is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_HEADER_TEST is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_16_3=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_1TR6=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_AVM_A1_CS=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_AVM_A1_PCMCIA=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_BKM_A4T=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_HISAX_DEBUG is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_DIEHLDIVA=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_ELSA=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_ELSA_CS=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_ENTERNOW_PCI=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_EURO=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_FRITZPCI=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_FRITZ_PCIPNP=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_GAZEL=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_HFC4S8S=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_HISAX_HFCUSB is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_HFC_PCI=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_HFC_SX=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_MAX_CARDS=8
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NETJET=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NETJET_U=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NI1=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NICCY=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NO_KEYPAD=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NO_LLC=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_NO_SENDCOMPLETE=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_S0BOX=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_SCT_QUADRO=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_SEDLBAUER=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_SEDLBAUER_CS=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_ST5481=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_TELESPCI=y
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_TELES_CS=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_HISAX_W6692=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
|
||||
|
|
@ -1 +1 @@
|
|||
# CONFIG_IMA_APPRAISE is not set
|
||||
CONFIG_IMA_APPRAISE=y
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_IMA_APPRAISE_BOOTPARAM=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IMA_BLACKLIST_KEYRING is not set
|
||||
|
|
@ -1 +1 @@
|
|||
CONFIG_IMA_DEFAULT_HASH_SHA1=y
|
||||
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
|
||||
CONFIG_IMA_DEFAULT_HASH_SHA256=y
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_IMA_KEXEC=y
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IMA_LOAD_X509 is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IMA_TRUSTED_KEYRING is not set
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INFINIBAND_NES=m
|
||||
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_INFINIBAND_NES_DEBUG is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_INTEGRITY_TRUSTED_KEYRING=y
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue