Merge remote-tracking branch 'up/master' into master-riscv64
This commit is contained in:
commit
0be8868348
|
@ -0,0 +1,46 @@
|
|||
From 3b6df7e8130719b6bd83be241eb455f2aa862e9f Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri, 14 Jun 2019 09:28:32 +0200
|
||||
Subject: [PATCH] HID: logitech-dj: Fix forwarding of very long HID++ reports
|
||||
|
||||
The HID++ spec also defines very long HID++ reports, with a reportid of
|
||||
0x12. The MX5000 and MX5500 keyboards use 0x12 output reports for sending
|
||||
messages to display on their buildin LCD.
|
||||
|
||||
Userspace (libmx5000) supports this, in order for this to work when talking
|
||||
to the HID devices instantiated for the keyboard by hid-logitech-dj,
|
||||
we need to properly forward these reports to the device.
|
||||
|
||||
This commit fixes logi_dj_ll_raw_request not forwarding these reports.
|
||||
|
||||
Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/hid/hid-logitech-dj.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
|
||||
index 865b179d0a62..aedbe18182db 100644
|
||||
--- a/drivers/hid/hid-logitech-dj.c
|
||||
+++ b/drivers/hid/hid-logitech-dj.c
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#define REPORT_ID_HIDPP_SHORT 0x10
|
||||
#define REPORT_ID_HIDPP_LONG 0x11
|
||||
+#define REPORT_ID_HIDPP_VERY_LONG 0x12
|
||||
|
||||
#define HIDPP_REPORT_SHORT_LENGTH 7
|
||||
#define HIDPP_REPORT_LONG_LENGTH 20
|
||||
@@ -1242,7 +1243,8 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,
|
||||
int ret;
|
||||
|
||||
if ((buf[0] == REPORT_ID_HIDPP_SHORT) ||
|
||||
- (buf[0] == REPORT_ID_HIDPP_LONG)) {
|
||||
+ (buf[0] == REPORT_ID_HIDPP_LONG) ||
|
||||
+ (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) {
|
||||
if (count < 2)
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -1,400 +0,0 @@
|
|||
From 4ef7fb944ba1e4ca9ccfbd7a43afda5a1cc884c1 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Mon, 29 Apr 2019 15:11:26 +0200
|
||||
Subject: [PATCH] platform/x86: ideapad-laptop: Remove no_hw_rfkill_list
|
||||
|
||||
When the ideapad-laptop driver was first written it was written for laptops
|
||||
which had a hardware rfkill switch. So when the first ideapad laptops
|
||||
showed up without a hw rfkill switch and it turned out that in this case
|
||||
the ideapad firmware interface would always report the wifi being hardware-
|
||||
blocked, a DMI id list of models which lack a hw rfkill switch was started
|
||||
(by yours truly). Things were done this way to avoid regressing existing
|
||||
models with a hw rfkill switch. In hindsight this was a mistake.
|
||||
|
||||
Lenovo releases a lot of ideapad models every year and even the latest
|
||||
models still use the "VPC2004" ACPI interface the ideapad-laptop driver
|
||||
binds to. Having a hw rfkill switch is quite rare on modern hardware, so
|
||||
all these new models need to be added to the no_hw_rfkill_list, leading
|
||||
to a never ending game of whack a mole.
|
||||
|
||||
Worse the failure mode when not present on the list, is very bad. In this
|
||||
case the ideapad-laptop driver will report the wifi as being hw-blocked,
|
||||
at which points NetworkManager does not even try to use it and the user
|
||||
ends up with non working wifi.
|
||||
|
||||
This leads to various Linux fora on the internet being filled with
|
||||
wifi not working on ideapad laptops stories, which does not make Linux
|
||||
look good.
|
||||
|
||||
The failure mode when we flip the default to assuming that a hw rfkill
|
||||
switch is not present OTOH is quite benign. When we properly report the
|
||||
wifi as being hw-blocked on ideapads which do have the hw-switch; and it
|
||||
is in the wifi-off position, then at least when using NetworkManager +
|
||||
GNOME3 the user will get a "wifi disabled in hardware" message when trying
|
||||
to connect to the wifi from the UI. If OTOH we assume there is no hardware
|
||||
rfkill switch, then the user will get an empty list for the list of
|
||||
available networks. Although the empty list vs the "wifi disabled in
|
||||
hardware" message is a regression, it is a very minor regression and it
|
||||
can easily be fixed on a model by model basis by filling the new
|
||||
hw_rfkill_list this commit introduces.
|
||||
|
||||
Therefor this commit removes the ever growing no_hw_rfkill_list, flipping
|
||||
the default to assuming there is no hw rfkill switch and adding a new
|
||||
hw_rfkill_list. Thereby fixing the wifi not working on all the current
|
||||
ideapad and yoga models which are not on the list yet and also fixing it
|
||||
for all future ideapad and yoga models using the "VPC2004" ACPI interface.
|
||||
|
||||
Note once this patch has been accepted upstream. I plan to write a blog
|
||||
post asking for users of ideapads and yoga's with a hw rfkill switch to
|
||||
step forward, so that we can populate the new hw_rfkill_list with the few
|
||||
older yoga and ideapad models which actually have a hw rfkill switch.
|
||||
|
||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1703338
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/platform/x86/ideapad-laptop.c | 321 ++------------------------
|
||||
1 file changed, 15 insertions(+), 306 deletions(-)
|
||||
|
||||
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
|
||||
index c53ae86b59c7..2d94536dea88 100644
|
||||
--- a/drivers/platform/x86/ideapad-laptop.c
|
||||
+++ b/drivers/platform/x86/ideapad-laptop.c
|
||||
@@ -980,312 +980,21 @@ static void ideapad_wmi_notify(u32 value, void *context)
|
||||
#endif
|
||||
|
||||
/*
|
||||
- * Some ideapads don't have a hardware rfkill switch, reading VPCCMD_R_RF
|
||||
- * always results in 0 on these models, causing ideapad_laptop to wrongly
|
||||
- * report all radios as hardware-blocked.
|
||||
+ * Some ideapads have a hardware rfkill switch, but most do not have one.
|
||||
+ * Reading VPCCMD_R_RF always results in 0 on models without a hardware rfkill,
|
||||
+ * switch causing ideapad_laptop to wrongly report all radios as hw-blocked.
|
||||
+ * There used to be a long list of DMI ids for models without a hw rfkill
|
||||
+ * switch here, but that resulted in playing whack a mole.
|
||||
+ * More importantly wrongly reporting the wifi radio as hw-blocked, results in
|
||||
+ * non working wifi. Whereas not reporting it hw-blocked, when it actually is
|
||||
+ * hw-blocked results in an empty SSID list, which is a much more benign
|
||||
+ * failure mode.
|
||||
+ * So the default now is the much safer option of assuming there is no
|
||||
+ * hardware rfkill switch. This default also actually matches most hardware,
|
||||
+ * since having a hw rfkill switch is quite rare on modern hardware, so this
|
||||
+ * also leads to a much shorter list.
|
||||
*/
|
||||
-static const struct dmi_system_id no_hw_rfkill_list[] = {
|
||||
- {
|
||||
- .ident = "Lenovo RESCUER R720-15IKBN",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo R720-15IKBN"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo G40-30",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G40-30"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo G50-30",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo G50-30"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo V310-14IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo V310-14ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-14ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo V310-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo V310-15ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V310-15ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo V510-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo V510-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 300-15IBR",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IBR"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 300-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 300S-11IBR",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 300S-11BR"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 310-15ABR",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ABR"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 310-15IAP",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15IAP"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 310-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 310-15ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 310-15ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 330-15ICH",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 330-15ICH"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad 530S-14ARR",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 530S-14ARR"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad S130-14IGM",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad S130-14IGM"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad Y700-14ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-14ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad Y700-15ACZ",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-15ACZ"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad Y700-15ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-15ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad Y700 Touch-15ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700 Touch-15ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad Y700-17ISK",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad Y700-17ISK"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo ideapad MIIX 720-12IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "MIIX 720-12IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Legion Y520-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Y520-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Y520-15IKBM",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Y520-15IKBM"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Legion Y530-15ICH",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Legion Y530-15ICH"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Legion Y530-15ICH-1060",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Legion Y530-15ICH-1060"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Legion Y720-15IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Y720-15IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Legion Y720-15IKBN",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Y720-15IKBN"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Y720-15IKBM",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Y720-15IKBM"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 2 11 / 13 / Pro",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 2"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 2 11 / 13 / Pro",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_BOARD_NAME, "Yoga2"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 2 13",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Yoga 2 13"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 3 1170 / 1470",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Yoga 3"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 3 Pro 1370",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 700",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 700"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 900",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 900"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Yoga 900",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_BOARD_NAME, "VIUU4"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo YOGA 910-13IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 910-13IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo YOGA 920-13IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 920-13IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo YOGA C930-13IKB",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA C930-13IKB"),
|
||||
- },
|
||||
- },
|
||||
- {
|
||||
- .ident = "Lenovo Zhaoyang E42-80",
|
||||
- .matches = {
|
||||
- DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
- DMI_MATCH(DMI_PRODUCT_VERSION, "ZHAOYANG E42-80"),
|
||||
- },
|
||||
- },
|
||||
+static const struct dmi_system_id hw_rfkill_list[] = {
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -1311,7 +1020,7 @@ static int ideapad_acpi_add(struct platform_device *pdev)
|
||||
priv->cfg = cfg;
|
||||
priv->adev = adev;
|
||||
priv->platform_device = pdev;
|
||||
- priv->has_hw_rfkill_switch = !dmi_check_system(no_hw_rfkill_list);
|
||||
+ priv->has_hw_rfkill_switch = dmi_check_system(hw_rfkill_list);
|
||||
|
||||
ret = ideapad_sysfs_init(priv);
|
||||
if (ret)
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -0,0 +1,706 @@
|
|||
From ba60a01e02086b0a242cf5ea3c59419108ada40b Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Tue, 11 Jun 2019 19:58:34 +0200
|
||||
Subject: [PATCH 1/5] clk: bcm2835: remove pllb
|
||||
|
||||
Raspberry Pi's firmware controls this pll, we should use the firmware
|
||||
interface to access it.
|
||||
|
||||
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Acked-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/clk/bcm/clk-bcm2835.c | 28 ++++------------------------
|
||||
1 file changed, 4 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
|
||||
index 770bb01f523e..867ae3c20041 100644
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -1651,30 +1651,10 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
|
||||
.fixed_divider = 1,
|
||||
.flags = CLK_SET_RATE_PARENT),
|
||||
|
||||
- /* PLLB is used for the ARM's clock. */
|
||||
- [BCM2835_PLLB] = REGISTER_PLL(
|
||||
- .name = "pllb",
|
||||
- .cm_ctrl_reg = CM_PLLB,
|
||||
- .a2w_ctrl_reg = A2W_PLLB_CTRL,
|
||||
- .frac_reg = A2W_PLLB_FRAC,
|
||||
- .ana_reg_base = A2W_PLLB_ANA0,
|
||||
- .reference_enable_mask = A2W_XOSC_CTRL_PLLB_ENABLE,
|
||||
- .lock_mask = CM_LOCK_FLOCKB,
|
||||
-
|
||||
- .ana = &bcm2835_ana_default,
|
||||
-
|
||||
- .min_rate = 600000000u,
|
||||
- .max_rate = 3000000000u,
|
||||
- .max_fb_rate = BCM2835_MAX_FB_RATE),
|
||||
- [BCM2835_PLLB_ARM] = REGISTER_PLL_DIV(
|
||||
- .name = "pllb_arm",
|
||||
- .source_pll = "pllb",
|
||||
- .cm_reg = CM_PLLB,
|
||||
- .a2w_reg = A2W_PLLB_ARM,
|
||||
- .load_mask = CM_PLLB_LOADARM,
|
||||
- .hold_mask = CM_PLLB_HOLDARM,
|
||||
- .fixed_divider = 1,
|
||||
- .flags = CLK_SET_RATE_PARENT),
|
||||
+ /*
|
||||
+ * PLLB is used for the ARM's clock. Controlled by firmware, see
|
||||
+ * clk-raspberrypi.c.
|
||||
+ */
|
||||
|
||||
/*
|
||||
* PLLC is the core PLL, used to drive the core VPU clock.
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 64482a97a0a2f14ebdbfe80a8eb0e063d293807b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Wed, 12 Jun 2019 17:23:12 +0100
|
||||
Subject: [PATCH 2/5] clk: bcm283x: add driver interfacing with Raspberry Pi's
|
||||
firmware
|
||||
|
||||
Raspberry Pi's firmware offers an interface though which update it's
|
||||
clock's frequencies. This is specially useful in order to change the CPU
|
||||
clock (pllb_arm) which is 'owned' by the firmware and we're unable to
|
||||
scale using the register interface provided by clk-bcm2835.
|
||||
|
||||
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Acked-by: Eric Anholt <eric@anholt.net>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/clk/bcm/Kconfig | 7 +
|
||||
drivers/clk/bcm/Makefile | 1 +
|
||||
drivers/clk/bcm/clk-raspberrypi.c | 300 ++++++++++++++++++++++++++++++
|
||||
3 files changed, 308 insertions(+)
|
||||
create mode 100644 drivers/clk/bcm/clk-raspberrypi.c
|
||||
|
||||
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
|
||||
index 29ee7b776cd4..a4a2775d65e1 100644
|
||||
--- a/drivers/clk/bcm/Kconfig
|
||||
+++ b/drivers/clk/bcm/Kconfig
|
||||
@@ -64,3 +64,10 @@ config CLK_BCM_SR
|
||||
default ARCH_BCM_IPROC
|
||||
help
|
||||
Enable common clock framework support for the Broadcom Stingray SoC
|
||||
+
|
||||
+config CLK_RASPBERRYPI
|
||||
+ tristate "Raspberry Pi firmware based clock support"
|
||||
+ depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
|
||||
+ help
|
||||
+ Enable common clock framework support for Raspberry Pi's firmware
|
||||
+ dependent clocks
|
||||
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
|
||||
index 002661d39128..eb7159099d82 100644
|
||||
--- a/drivers/clk/bcm/Makefile
|
||||
+++ b/drivers/clk/bcm/Makefile
|
||||
@@ -7,6 +7,7 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o
|
||||
obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-asiu.o
|
||||
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o
|
||||
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835-aux.o
|
||||
+obj-$(CONFIG_CLK_RASPBERRYPI) += clk-raspberrypi.o
|
||||
obj-$(CONFIG_ARCH_BCM_53573) += clk-bcm53573-ilp.o
|
||||
obj-$(CONFIG_CLK_BCM_CYGNUS) += clk-cygnus.o
|
||||
obj-$(CONFIG_CLK_BCM_HR2) += clk-hr2.o
|
||||
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
new file mode 100644
|
||||
index 000000000000..467933767106
|
||||
--- /dev/null
|
||||
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
@@ -0,0 +1,300 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Raspberry Pi driver for firmware controlled clocks
|
||||
+ *
|
||||
+ * Even though clk-bcm2835 provides an interface to the hardware registers for
|
||||
+ * the system clocks we've had to factor out 'pllb' as the firmware 'owns' it.
|
||||
+ * We're not allowed to change it directly as we might race with the
|
||||
+ * over-temperature and under-voltage protections provided by the firmware.
|
||||
+ *
|
||||
+ * Copyright (C) 2019 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/clkdev.h>
|
||||
+#include <linux/clk-provider.h>
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+#include <soc/bcm2835/raspberrypi-firmware.h>
|
||||
+
|
||||
+#define RPI_FIRMWARE_ARM_CLK_ID 0x000000003
|
||||
+
|
||||
+#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0)
|
||||
+#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1)
|
||||
+
|
||||
+/*
|
||||
+ * Even though the firmware interface alters 'pllb' the frequencies are
|
||||
+ * provided as per 'pllb_arm'. We need to scale before passing them trough.
|
||||
+ */
|
||||
+#define RPI_FIRMWARE_PLLB_ARM_DIV_RATE 2
|
||||
+
|
||||
+#define A2W_PLL_FRAC_BITS 20
|
||||
+
|
||||
+struct raspberrypi_clk {
|
||||
+ struct device *dev;
|
||||
+ struct rpi_firmware *firmware;
|
||||
+
|
||||
+ unsigned long min_rate;
|
||||
+ unsigned long max_rate;
|
||||
+
|
||||
+ struct clk_hw pllb;
|
||||
+ struct clk_hw *pllb_arm;
|
||||
+ struct clk_lookup *pllb_arm_lookup;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Structure of the message passed to Raspberry Pi's firmware in order to
|
||||
+ * change clock rates. The 'disable_turbo' option is only available to the ARM
|
||||
+ * clock (pllb) which we enable by default as turbo mode will alter multiple
|
||||
+ * clocks at once.
|
||||
+ *
|
||||
+ * Even though we're able to access the clock registers directly we're bound to
|
||||
+ * use the firmware interface as the firmware ultimately takes care of
|
||||
+ * mitigating overheating/undervoltage situations and we would be changing
|
||||
+ * frequencies behind his back.
|
||||
+ *
|
||||
+ * For more information on the firmware interface check:
|
||||
+ * https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface
|
||||
+ */
|
||||
+struct raspberrypi_firmware_prop {
|
||||
+ __le32 id;
|
||||
+ __le32 val;
|
||||
+ __le32 disable_turbo;
|
||||
+} __packed;
|
||||
+
|
||||
+static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag,
|
||||
+ u32 clk, u32 *val)
|
||||
+{
|
||||
+ struct raspberrypi_firmware_prop msg = {
|
||||
+ .id = clk,
|
||||
+ .val = *val,
|
||||
+ .disable_turbo = 1,
|
||||
+ };
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = rpi_firmware_property(firmware, tag, &msg, sizeof(msg));
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ *val = msg.val;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_fw_pll_is_on(struct clk_hw *hw)
|
||||
+{
|
||||
+ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk,
|
||||
+ pllb);
|
||||
+ u32 val = 0;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = raspberrypi_clock_property(rpi->firmware,
|
||||
+ RPI_FIRMWARE_GET_CLOCK_STATE,
|
||||
+ RPI_FIRMWARE_ARM_CLK_ID, &val);
|
||||
+ if (ret)
|
||||
+ return 0;
|
||||
+
|
||||
+ return !!(val & RPI_FIRMWARE_STATE_ENABLE_BIT);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw,
|
||||
+ unsigned long parent_rate)
|
||||
+{
|
||||
+ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk,
|
||||
+ pllb);
|
||||
+ u32 val = 0;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = raspberrypi_clock_property(rpi->firmware,
|
||||
+ RPI_FIRMWARE_GET_CLOCK_RATE,
|
||||
+ RPI_FIRMWARE_ARM_CLK_ID,
|
||||
+ &val);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ return val * RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_fw_pll_set_rate(struct clk_hw *hw, unsigned long rate,
|
||||
+ unsigned long parent_rate)
|
||||
+{
|
||||
+ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk,
|
||||
+ pllb);
|
||||
+ u32 new_rate = rate / RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = raspberrypi_clock_property(rpi->firmware,
|
||||
+ RPI_FIRMWARE_SET_CLOCK_RATE,
|
||||
+ RPI_FIRMWARE_ARM_CLK_ID,
|
||||
+ &new_rate);
|
||||
+ if (ret)
|
||||
+ dev_err_ratelimited(rpi->dev, "Failed to change %s frequency: %d",
|
||||
+ clk_hw_get_name(hw), ret);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Sadly there is no firmware rate rounding interface. We borrowed it from
|
||||
+ * clk-bcm2835.
|
||||
+ */
|
||||
+static int raspberrypi_pll_determine_rate(struct clk_hw *hw,
|
||||
+ struct clk_rate_request *req)
|
||||
+{
|
||||
+ struct raspberrypi_clk *rpi = container_of(hw, struct raspberrypi_clk,
|
||||
+ pllb);
|
||||
+ u64 div, final_rate;
|
||||
+ u32 ndiv, fdiv;
|
||||
+
|
||||
+ /* We can't use req->rate directly as it would overflow */
|
||||
+ final_rate = clamp(req->rate, rpi->min_rate, rpi->max_rate);
|
||||
+
|
||||
+ div = (u64)final_rate << A2W_PLL_FRAC_BITS;
|
||||
+ do_div(div, req->best_parent_rate);
|
||||
+
|
||||
+ ndiv = div >> A2W_PLL_FRAC_BITS;
|
||||
+ fdiv = div & ((1 << A2W_PLL_FRAC_BITS) - 1);
|
||||
+
|
||||
+ final_rate = ((u64)req->best_parent_rate *
|
||||
+ ((ndiv << A2W_PLL_FRAC_BITS) + fdiv));
|
||||
+
|
||||
+ req->rate = final_rate >> A2W_PLL_FRAC_BITS;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct clk_ops raspberrypi_firmware_pll_clk_ops = {
|
||||
+ .is_prepared = raspberrypi_fw_pll_is_on,
|
||||
+ .recalc_rate = raspberrypi_fw_pll_get_rate,
|
||||
+ .set_rate = raspberrypi_fw_pll_set_rate,
|
||||
+ .determine_rate = raspberrypi_pll_determine_rate,
|
||||
+};
|
||||
+
|
||||
+static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi)
|
||||
+{
|
||||
+ u32 min_rate = 0, max_rate = 0;
|
||||
+ struct clk_init_data init;
|
||||
+ int ret;
|
||||
+
|
||||
+ memset(&init, 0, sizeof(init));
|
||||
+
|
||||
+ /* All of the PLLs derive from the external oscillator. */
|
||||
+ init.parent_names = (const char *[]){ "osc" };
|
||||
+ init.num_parents = 1;
|
||||
+ init.name = "pllb";
|
||||
+ init.ops = &raspberrypi_firmware_pll_clk_ops;
|
||||
+ init.flags = CLK_GET_RATE_NOCACHE | CLK_IGNORE_UNUSED;
|
||||
+
|
||||
+ /* Get min & max rates set by the firmware */
|
||||
+ ret = raspberrypi_clock_property(rpi->firmware,
|
||||
+ RPI_FIRMWARE_GET_MIN_CLOCK_RATE,
|
||||
+ RPI_FIRMWARE_ARM_CLK_ID,
|
||||
+ &min_rate);
|
||||
+ if (ret) {
|
||||
+ dev_err(rpi->dev, "Failed to get %s min freq: %d\n",
|
||||
+ init.name, ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ ret = raspberrypi_clock_property(rpi->firmware,
|
||||
+ RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
|
||||
+ RPI_FIRMWARE_ARM_CLK_ID,
|
||||
+ &max_rate);
|
||||
+ if (ret) {
|
||||
+ dev_err(rpi->dev, "Failed to get %s max freq: %d\n",
|
||||
+ init.name, ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ if (!min_rate || !max_rate) {
|
||||
+ dev_err(rpi->dev, "Unexpected frequency range: min %u, max %u\n",
|
||||
+ min_rate, max_rate);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ dev_info(rpi->dev, "CPU frequency range: min %u, max %u\n",
|
||||
+ min_rate, max_rate);
|
||||
+
|
||||
+ rpi->min_rate = min_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
|
||||
+ rpi->max_rate = max_rate * RPI_FIRMWARE_PLLB_ARM_DIV_RATE;
|
||||
+
|
||||
+ rpi->pllb.init = &init;
|
||||
+
|
||||
+ return devm_clk_hw_register(rpi->dev, &rpi->pllb);
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
|
||||
+{
|
||||
+ rpi->pllb_arm = clk_hw_register_fixed_factor(rpi->dev,
|
||||
+ "pllb_arm", "pllb",
|
||||
+ CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE,
|
||||
+ 1, 2);
|
||||
+ if (IS_ERR(rpi->pllb_arm)) {
|
||||
+ dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
|
||||
+ return PTR_ERR(rpi->pllb_arm);
|
||||
+ }
|
||||
+
|
||||
+ rpi->pllb_arm_lookup = clkdev_hw_create(rpi->pllb_arm, NULL, "cpu0");
|
||||
+ if (!rpi->pllb_arm_lookup) {
|
||||
+ dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
|
||||
+ clk_hw_unregister_fixed_factor(rpi->pllb_arm);
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_clk_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device_node *firmware_node;
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct rpi_firmware *firmware;
|
||||
+ struct raspberrypi_clk *rpi;
|
||||
+ int ret;
|
||||
+
|
||||
+ firmware_node = of_find_compatible_node(NULL, NULL,
|
||||
+ "raspberrypi,bcm2835-firmware");
|
||||
+ if (!firmware_node) {
|
||||
+ dev_err(dev, "Missing firmware node\n");
|
||||
+ return -ENOENT;
|
||||
+ }
|
||||
+
|
||||
+ firmware = rpi_firmware_get(firmware_node);
|
||||
+ of_node_put(firmware_node);
|
||||
+ if (!firmware)
|
||||
+ return -EPROBE_DEFER;
|
||||
+
|
||||
+ rpi = devm_kzalloc(dev, sizeof(*rpi), GFP_KERNEL);
|
||||
+ if (!rpi)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ rpi->dev = dev;
|
||||
+ rpi->firmware = firmware;
|
||||
+
|
||||
+ ret = raspberrypi_register_pllb(rpi);
|
||||
+ if (ret) {
|
||||
+ dev_err(dev, "Failed to initialize pllb, %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ ret = raspberrypi_register_pllb_arm(rpi);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static struct platform_driver raspberrypi_clk_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "raspberrypi-clk",
|
||||
+ },
|
||||
+ .probe = raspberrypi_clk_probe,
|
||||
+};
|
||||
+module_platform_driver(raspberrypi_clk_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Nicolas Saenz Julienne <nsaenzjulienne@suse.de>");
|
||||
+MODULE_DESCRIPTION("Raspberry Pi firmware clock driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_ALIAS("platform:raspberrypi-clk");
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From e750e62addb9ee00f47ab4a73c0645d44172ab12 Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Date: Tue, 11 Jun 2019 19:58:38 +0200
|
||||
Subject: [PATCH 3/5] firmware: raspberrypi: register clk device
|
||||
|
||||
Since clk-raspberrypi is tied to the VC4 firmware instead of particular
|
||||
hardware it's registration should be performed by the firmware driver.
|
||||
|
||||
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Acked-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/firmware/raspberrypi.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
|
||||
index 61be15d9df7d..da26a584dca0 100644
|
||||
--- a/drivers/firmware/raspberrypi.c
|
||||
+++ b/drivers/firmware/raspberrypi.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#define MBOX_CHAN_PROPERTY 8
|
||||
|
||||
static struct platform_device *rpi_hwmon;
|
||||
+static struct platform_device *rpi_clk;
|
||||
|
||||
struct rpi_firmware {
|
||||
struct mbox_client cl;
|
||||
@@ -207,6 +208,12 @@ rpi_register_hwmon_driver(struct device *dev, struct rpi_firmware *fw)
|
||||
-1, NULL, 0);
|
||||
}
|
||||
|
||||
+static void rpi_register_clk_driver(struct device *dev)
|
||||
+{
|
||||
+ rpi_clk = platform_device_register_data(dev, "raspberrypi-clk",
|
||||
+ -1, NULL, 0);
|
||||
+}
|
||||
+
|
||||
static int rpi_firmware_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
@@ -234,6 +241,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
|
||||
|
||||
rpi_firmware_print_firmware_revision(fw);
|
||||
rpi_register_hwmon_driver(dev, fw);
|
||||
+ rpi_register_clk_driver(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -254,6 +262,8 @@ static int rpi_firmware_remove(struct platform_device *pdev)
|
||||
|
||||
platform_device_unregister(rpi_hwmon);
|
||||
rpi_hwmon = NULL;
|
||||
+ platform_device_unregister(rpi_clk);
|
||||
+ rpi_clk = NULL;
|
||||
mbox_free_channel(fw->chan);
|
||||
|
||||
return 0;
|
||||
--
|
||||
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
|
||||
Subject: [PATCH 5/5] clk: raspberrypi: register platform device for
|
||||
raspberrypi-cpufreq
|
||||
|
||||
As 'clk-raspberrypi' depends on RPi's firmware interface, which might be
|
||||
configured as a module, the cpu clock might not be available for the
|
||||
cpufreq driver during it's init process. So we register the
|
||||
'raspberrypi-cpufreq' platform device after the probe sequence succeeds.
|
||||
|
||||
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||||
Acked-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/clk/bcm/clk-raspberrypi.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
index 467933767106..7f9b001f8d70 100644
|
||||
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
||||
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
@@ -34,6 +34,7 @@
|
||||
struct raspberrypi_clk {
|
||||
struct device *dev;
|
||||
struct rpi_firmware *firmware;
|
||||
+ struct platform_device *cpufreq;
|
||||
|
||||
unsigned long min_rate;
|
||||
unsigned long max_rate;
|
||||
@@ -272,6 +273,7 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
|
||||
|
||||
rpi->dev = dev;
|
||||
rpi->firmware = firmware;
|
||||
+ platform_set_drvdata(pdev, rpi);
|
||||
|
||||
ret = raspberrypi_register_pllb(rpi);
|
||||
if (ret) {
|
||||
@@ -283,6 +285,18 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+ rpi->cpufreq = platform_device_register_data(dev, "raspberrypi-cpufreq",
|
||||
+ -1, NULL, 0);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int raspberrypi_clk_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct raspberrypi_clk *rpi = platform_get_drvdata(pdev);
|
||||
+
|
||||
+ platform_device_unregister(rpi->cpufreq);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -291,6 +305,7 @@ static struct platform_driver raspberrypi_clk_driver = {
|
||||
.name = "raspberrypi-clk",
|
||||
},
|
||||
.probe = raspberrypi_clk_probe,
|
||||
+ .remove = raspberrypi_clk_remove,
|
||||
};
|
||||
module_platform_driver(raspberrypi_clk_driver);
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -49,11 +49,11 @@ index 9ef547fc7ffe..5777d902f8f3 100644
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -735,7 +735,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer
|
||||
endif
|
||||
KBUILD_CFLAGS += -ftrivial-auto-var-init=pattern
|
||||
endif
|
||||
|
||||
+ifdef CONFIG_DEBUG_INFO_VTA
|
||||
+DEBUG_CFLAGS += $(call cc-option, -fvar-tracking-assignments)
|
||||
+DEBUG_CFLAGS += $(call cc-option, -fvar-tracking-assignments)
|
||||
+else
|
||||
DEBUG_CFLAGS := $(call cc-option, -fno-var-tracking-assignments)
|
||||
+endif
|
||||
|
@ -87,8 +87,8 @@ index 0d9e81779e37..424206212931 100644
|
|||
+ environment to automatically compile everything both ways,
|
||||
+ generating an error if anything differs.
|
||||
|
||||
config GDB_SCRIPTS
|
||||
bool "Provide GDB scripts for kernel debugging"
|
||||
config DEBUG_INFO_BTF
|
||||
bool "Generate BTF typeinfo"
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
From c8f57936ab21a1430ae2209fa874e842d13552d3 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Cline <jcline@redhat.com>
|
||||
Date: Tue, 11 Jun 2019 14:59:23 +0000
|
||||
Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE
|
||||
and BR/EDR connections"
|
||||
|
||||
This reverts commit d5bb334a8e171b262e48f378bd2096c0ea458265.
|
||||
|
||||
This patch broke a number of older bluetooth devices and while an RFC
|
||||
that fixes this patch has been posted upstream, it has not been merged
|
||||
and there are still a few folks reporting problems.
|
||||
|
||||
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
||||
---
|
||||
include/net/bluetooth/hci_core.h | 3 ---
|
||||
net/bluetooth/hci_conn.c | 8 --------
|
||||
2 files changed, 11 deletions(-)
|
||||
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index 05b1b96f4d9e..094e61e07030 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -190,9 +190,6 @@ struct adv_info {
|
||||
|
||||
#define HCI_MAX_SHORT_NAME_LENGTH 10
|
||||
|
||||
-/* Min encryption key size to match with SMP */
|
||||
-#define HCI_MIN_ENC_KEY_SIZE 7
|
||||
-
|
||||
/* Default LE RPA expiry time, 15 minutes */
|
||||
#define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
|
||||
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index 3cf0764d5793..bd4978ce8c45 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
|
||||
- /* The minimum encryption key size needs to be enforced by the
|
||||
- * host stack before establishing any L2CAP connections. The
|
||||
- * specification in theory allows a minimum of 1, but to align
|
||||
- * BR/EDR and LE transports, a minimum of 7 is chosen.
|
||||
- */
|
||||
- if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
|
||||
- return 0;
|
||||
-
|
||||
return 1;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -1,399 +0,0 @@
|
|||
From fbdb31e061b67941342fc5afa714488f75174632 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 31 May 2018 19:08:12 +0100
|
||||
Subject: [PATCH 1/3] bcm2835: cpufreq: add CPU frequency control driver
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 ++
|
||||
arch/arm/boot/dts/bcm2837.dtsi | 33 +++++++
|
||||
drivers/clk/bcm/Kconfig | 8 ++
|
||||
drivers/clk/bcm/Makefile | 1 +
|
||||
drivers/clk/bcm/clk-raspberrypi.c | 138 +++++++++++++++++++++++++++++
|
||||
5 files changed, 187 insertions(+)
|
||||
create mode 100644 drivers/clk/bcm/clk-raspberrypi.c
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
index 29f970f864dc..6d0f43957af4 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||||
@@ -35,6 +35,13 @@
|
||||
reg = <0x7e00b840 0x3c>;
|
||||
interrupts = <0 2>;
|
||||
};
|
||||
+
|
||||
+ arm_clk: arm_clk {
|
||||
+ compatible = "raspberrypi,bcm2835-cpu";
|
||||
+ clocks = <&clocks BCM2835_CLOCK_VPU>;
|
||||
+ #clock-cells = <0>;
|
||||
+ clock-output-names = "arm";
|
||||
+ };
|
||||
};
|
||||
};
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
|
||||
index beb6c502dadc..9cfc553a3633 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm2837.dtsi
|
||||
@@ -44,6 +44,9 @@
|
||||
reg = <0>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x000000d8>;
|
||||
+ clocks = <&arm_clk>;
|
||||
+ clock-names = "cpu";
|
||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
||||
};
|
||||
|
||||
cpu1: cpu@1 {
|
||||
@@ -52,6 +55,9 @@
|
||||
reg = <1>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x000000e0>;
|
||||
+ clocks = <&arm_clk>;
|
||||
+ clock-names = "cpu";
|
||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
||||
};
|
||||
|
||||
cpu2: cpu@2 {
|
||||
@@ -60,6 +66,9 @@
|
||||
reg = <2>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x000000e8>;
|
||||
+ clocks = <&arm_clk>;
|
||||
+ clock-names = "cpu";
|
||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
||||
};
|
||||
|
||||
cpu3: cpu@3 {
|
||||
@@ -68,6 +77,30 @@
|
||||
reg = <3>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x000000f0>;
|
||||
+ clocks = <&arm_clk>;
|
||||
+ clock-names = "cpu";
|
||||
+ operating-points-v2 = <&cpu0_opp_table>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cpu0_opp_table: opp_table0 {
|
||||
+ compatible = "operating-points-v2";
|
||||
+ opp-shared;
|
||||
+
|
||||
+ opp@600000000 {
|
||||
+ opp-hz = /bits/ 64 <600000000>;
|
||||
+ clock-latency-ns = <355000>;
|
||||
+ opp-suspend;
|
||||
+ };
|
||||
+
|
||||
+ opp@900000000 {
|
||||
+ opp-hz = /bits/ 64 <900000000>;
|
||||
+ clock-latency-ns = <355000>;
|
||||
+ };
|
||||
+
|
||||
+ opp@1200000000 {
|
||||
+ opp-hz = /bits/ 64 <1200000000>;
|
||||
+ clock-latency-ns = <355000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
|
||||
index 4c4bd85f707c..e40bd19da22b 100644
|
||||
--- a/drivers/clk/bcm/Kconfig
|
||||
+++ b/drivers/clk/bcm/Kconfig
|
||||
@@ -63,3 +63,11 @@ config CLK_BCM_SR
|
||||
default ARCH_BCM_IPROC
|
||||
help
|
||||
Enable common clock framework support for the Broadcom Stingray SoC
|
||||
+
|
||||
+config CLK_RASPBERRYPI_CPU
|
||||
+ bool "Raspberry Pi CPU clock driver"
|
||||
+ depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
|
||||
+ depends on RASPBERRYPI_FIRMWARE=y
|
||||
+ help
|
||||
+ This enables support for the RPi CPU clock which can be adjusted
|
||||
+ via the RPi firmware.
|
||||
diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
|
||||
index 002661d39128..a028b0a90b6e 100644
|
||||
--- a/drivers/clk/bcm/Makefile
|
||||
+++ b/drivers/clk/bcm/Makefile
|
||||
@@ -8,6 +8,7 @@ obj-$(CONFIG_COMMON_CLK_IPROC) += clk-iproc-armpll.o clk-iproc-pll.o clk-iproc-a
|
||||
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o
|
||||
obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835-aux.o
|
||||
obj-$(CONFIG_ARCH_BCM_53573) += clk-bcm53573-ilp.o
|
||||
+obj-$(CONFIG_CLK_RASPBERRYPI_CPU) += clk-raspberrypi.o
|
||||
obj-$(CONFIG_CLK_BCM_CYGNUS) += clk-cygnus.o
|
||||
obj-$(CONFIG_CLK_BCM_HR2) += clk-hr2.o
|
||||
obj-$(CONFIG_CLK_BCM_NSP) += clk-nsp.o
|
||||
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
new file mode 100644
|
||||
index 000000000000..046efc822a59
|
||||
--- /dev/null
|
||||
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
||||
@@ -0,0 +1,138 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Raspberry Pi CPU clock driver
|
||||
+ *
|
||||
+ * Copyright (C) 2018 Stefan Wahren <stefan.wahren@i2se.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/clk-provider.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/err.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/of_device.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/slab.h>
|
||||
+#include <soc/bcm2835/raspberrypi-firmware.h>
|
||||
+
|
||||
+#define VCMSG_ID_ARM_CLOCK 0x000000003 /* Clock/Voltage ID's */
|
||||
+
|
||||
+struct rpi_cpu_clkgen {
|
||||
+ struct clk_hw hw;
|
||||
+ struct rpi_firmware *fw;
|
||||
+};
|
||||
+
|
||||
+/* tag part of the message */
|
||||
+struct prop {
|
||||
+ u32 id; /* the ID of the clock/voltage to get or set */
|
||||
+ u32 val; /* the value (e.g. rate (in Hz)) to set */
|
||||
+} __packed;
|
||||
+
|
||||
+static int rpi_cpu_clock_property(struct rpi_firmware *fw, u32 tag, u32 *val)
|
||||
+{
|
||||
+ int ret;
|
||||
+ struct prop msg = {
|
||||
+ .id = VCMSG_ID_ARM_CLOCK,
|
||||
+ .val = *val,
|
||||
+ };
|
||||
+
|
||||
+ ret = rpi_firmware_property(fw, tag, &msg, sizeof(msg));
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ *val = msg.val;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static unsigned long rpi_cpu_get_rate(struct clk_hw *hw,
|
||||
+ unsigned long parent_rate)
|
||||
+{
|
||||
+ struct rpi_cpu_clkgen *cpu = container_of(hw, struct rpi_cpu_clkgen, hw);
|
||||
+ u32 rate = 0;
|
||||
+
|
||||
+ rpi_cpu_clock_property(cpu->fw, RPI_FIRMWARE_GET_CLOCK_RATE, &rate);
|
||||
+
|
||||
+ return rate;
|
||||
+}
|
||||
+
|
||||
+static long rpi_cpu_round_rate(struct clk_hw *hw, unsigned long rate,
|
||||
+ unsigned long *parent_rate)
|
||||
+{
|
||||
+ return rate;
|
||||
+}
|
||||
+
|
||||
+static int rpi_cpu_set_rate(struct clk_hw *hw, unsigned long rate,
|
||||
+ unsigned long parent_rate)
|
||||
+{
|
||||
+ struct rpi_cpu_clkgen *cpu = container_of(hw, struct rpi_cpu_clkgen, hw);
|
||||
+ u32 new_rate = rate;
|
||||
+
|
||||
+ return rpi_cpu_clock_property(cpu->fw, RPI_FIRMWARE_SET_CLOCK_RATE,
|
||||
+ &new_rate);
|
||||
+}
|
||||
+
|
||||
+static const struct clk_ops rpi_cpu_ops = {
|
||||
+ .recalc_rate = rpi_cpu_get_rate,
|
||||
+ .round_rate = rpi_cpu_round_rate,
|
||||
+ .set_rate = rpi_cpu_set_rate,
|
||||
+};
|
||||
+
|
||||
+static int rpi_cpu_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct device_node *fw_node;
|
||||
+ struct rpi_cpu_clkgen *cpu;
|
||||
+ struct clk_init_data *init;
|
||||
+ int ret;
|
||||
+
|
||||
+ cpu = devm_kzalloc(dev, sizeof(*cpu), GFP_KERNEL);
|
||||
+ if (!cpu)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ init = devm_kzalloc(dev, sizeof(*init), GFP_KERNEL);
|
||||
+ if (!init)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ fw_node = of_find_compatible_node(NULL, NULL,
|
||||
+ "raspberrypi,bcm2835-firmware");
|
||||
+ if (!fw_node) {
|
||||
+ dev_err(dev, "Missing firmware node\n");
|
||||
+ return -ENOENT;
|
||||
+ }
|
||||
+
|
||||
+ cpu->fw = rpi_firmware_get(fw_node);
|
||||
+ of_node_put(fw_node);
|
||||
+ if (!cpu->fw)
|
||||
+ return -EPROBE_DEFER;
|
||||
+
|
||||
+ init->name = dev->of_node->name;
|
||||
+ init->ops = &rpi_cpu_ops;
|
||||
+
|
||||
+ cpu->hw.init = init;
|
||||
+ ret = devm_clk_hw_register(dev, &cpu->hw);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ return of_clk_add_hw_provider(dev->of_node, of_clk_hw_simple_get,
|
||||
+ &cpu->hw);
|
||||
+}
|
||||
+
|
||||
+static const struct of_device_id rpi_cpu_of_match[] = {
|
||||
+ { .compatible = "raspberrypi,bcm2835-cpu", },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, rpi_cpu_of_match);
|
||||
+
|
||||
+static struct platform_driver rpi_cpu_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "raspberrypi-cpu",
|
||||
+ .of_match_table = rpi_cpu_of_match,
|
||||
+ },
|
||||
+ .probe = rpi_cpu_probe,
|
||||
+};
|
||||
+builtin_platform_driver(rpi_cpu_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Stefan Wahren <stefan.wahren@i2se.com>");
|
||||
+MODULE_DESCRIPTION("Raspberry Pi CPU clock driver");
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
From 0681db63db37cf9015ef9b667c237c3974de04e6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Mon, 4 Jun 2018 09:14:10 +0100
|
||||
Subject: [PATCH 2/3] add 1.4 ghz OPP for the 3B+
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
index 42bb09044cc7..3333c080696c 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
|
||||
@@ -106,3 +106,10 @@
|
||||
pinctrl-0 = <&uart1_gpio14>;
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&cpu0_opp_table {
|
||||
+ opp@1400000000 {
|
||||
+ opp-hz = /bits/ 64 <1400000000>;
|
||||
+ clock-latency-ns = <355000>;
|
||||
+ };
|
||||
+};
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
From 65f821f03ac635f28c8c79c5e436b398194521f2 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
Date: Wed, 26 Sep 2018 21:13:22 +0200
|
||||
Subject: [PATCH 3/3] ARM: bcm2837: Use CPU0 as cooling device
|
||||
|
||||
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||||
---
|
||||
arch/arm/boot/dts/bcm2837.dtsi | 25 +++++++++++++++++++++++++
|
||||
arch/arm/boot/dts/bcm283x.dtsi | 2 +-
|
||||
2 files changed, 26 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
|
||||
index 9cfc553a3633..1590d94b618e 100644
|
||||
--- a/arch/arm/boot/dts/bcm2837.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm2837.dtsi
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "bcm283x.dtsi"
|
||||
+#include <dt-bindings/thermal/thermal.h>
|
||||
|
||||
/ {
|
||||
compatible = "brcm,bcm2837";
|
||||
@@ -47,6 +48,7 @@
|
||||
clocks = <&arm_clk>;
|
||||
clock-names = "cpu";
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu1: cpu@1 {
|
||||
@@ -58,6 +60,7 @@
|
||||
clocks = <&arm_clk>;
|
||||
clock-names = "cpu";
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu2: cpu@2 {
|
||||
@@ -69,6 +72,7 @@
|
||||
clocks = <&arm_clk>;
|
||||
clock-names = "cpu";
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu3: cpu@3 {
|
||||
@@ -80,6 +84,7 @@
|
||||
clocks = <&arm_clk>;
|
||||
clock-names = "cpu";
|
||||
operating-points-v2 = <&cpu0_opp_table>;
|
||||
+ #cooling-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -117,6 +122,26 @@
|
||||
|
||||
&cpu_thermal {
|
||||
coefficients = <(-538) 412000>;
|
||||
+
|
||||
+ trips {
|
||||
+ cpu_alert0: cpu-alert0 {
|
||||
+ temperature = <70000>;
|
||||
+ hysteresis = <0>;
|
||||
+ type = "passive";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ cooling-maps {
|
||||
+ map0 {
|
||||
+ trip = <&cpu_alert0>;
|
||||
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
+ };
|
||||
+
|
||||
+ map1 {
|
||||
+ trip = <&cpu_crit>;
|
||||
+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
|
||||
/* enable thermal sensor with the correct compatible property set */
|
||||
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
||||
index 31b29646b14c..2def0684d198 100644
|
||||
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
||||
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
||||
@@ -38,7 +38,7 @@
|
||||
thermal-sensors = <&thermal>;
|
||||
|
||||
trips {
|
||||
- cpu-crit {
|
||||
+ cpu_crit: cpu-crit {
|
||||
temperature = <80000>;
|
||||
hysteresis = <0>;
|
||||
type = "critical";
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DEBUG_MISC=y
|
|
@ -1 +0,0 @@
|
|||
CONFIG_DEBUG_PI_LIST=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_LOCK_EVENT_COUNTS=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_ACPI_HMAT=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_AX88796B_PHY=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_BATMAN_ADV_SYSFS=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_BT_MTKSDIO=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CHARGER_LT3651=m
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_CHARGER_LTC3651 is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CHARGER_MAX77650=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CHARGER_UCS1002=m
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_CHASH_SELFTEST is not set
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_CHASH_STATS is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SIFIVE is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SUNXI is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SUNXI_CLOCKS is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SUNXI_PRCM_SUN6I is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SUNXI_PRCM_SUN8I is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_CLK_SUNXI_PRCM_SUN9I is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_COUNTER is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CROS_EC_RPMSG=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CROS_USBPD_LOGGER=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_CRYPTO_ECRDSA=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DEBUG_INFO_BTF is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DEBUG_MISC is not set
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_DEBUG_PI_LIST is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DEBUG_PLIST is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DM_DUST=m
|
|
@ -1 +1 @@
|
|||
# CONFIG_DM_WRITECACHE is not set
|
||||
CONFIG_DM_WRITECACHE=m
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_MGA is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DRM_PANEL_ROCKTECH_JH057N00900=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_DRM_PANEL_RONBO_RB070D30=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_R128 is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_SAVAGE is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_TDFX=n is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_DRM_VIA is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_FIELDBUS_DEV is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_FXAS21002C=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_GPIO_MAX77650=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_HID_MACALLY=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_HID_U2FZERO=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_I2C_AMD_MP2=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_IKHEADERS=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET6_XFRM_MODE_BEET=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET6_XFRM_MODE_TUNNEL=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET_XFRM_MODE_BEET=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET_XFRM_MODE_TRANSPORT=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_INET_XFRM_MODE_TUNNEL=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_INFINIBAND_EFA=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_INIT_STACK_NONE=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_INPUT_GPIO_VIBRA=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_INPUT_MAX77650_ONKEY=m
|
|
@ -1 +1 @@
|
|||
CONFIG_IOSCHED_BFQ=m
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IXP4XX_NPE is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_IXP4XX_QMGR is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_KEYBOARD_QT1050=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_KPC2000 is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_LEDS_LM3532=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_LEDS_MAX77650=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_LOCK_EVENT_COUNTS is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MAX31856=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MB1232=m
|
|
@ -1 +1 @@
|
|||
# CONFIG_MEDIA_CONTROLLER_DVB is not set
|
||||
CONFIG_MEDIA_CONTROLLER_DVB=y
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MFD_MAX77650=m
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MFD_STMFX is not set
|
|
@ -1 +1 @@
|
|||
CONFIG_MQ_IOSCHED_KYBER=m
|
||||
CONFIG_MQ_IOSCHED_KYBER=y
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MT7615E=m
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_MTD_NAND is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_BRCMNAND is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_CAFE is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_CS553X is not set
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_MTD_NAND_ECC_BCH is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_ECC_SW_BCH is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_FSL_IFC is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_GPIO is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_HISI504 is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_MXC is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_NANDSIM is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_PLATFORM is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_QCOM is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_RICOH is not set
|
|
@ -0,0 +1 @@
|
|||
# CONFIG_MTD_NAND_SUNXI is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MTD_RAW_NAND=m
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue