mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
9aa196e0f2
Refresh patches, following required reworking: ar71xx/patches-4.9/930-chipidea-pullup.patch layerscape/patches-4.9/302-dts-support-layercape.patch sunxi/patches-4.9/0052-stmmac-form-4-12.patch Fixes for CVEs: CVE-2018-1108 CVE-2018-1092 Tested on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Tested-by: Arjen de Korte <build+openwrt@de-korte.org>
29 lines
907 B
Diff
29 lines
907 B
Diff
From a2ca8b47db0d08735e1c0ebeaf34e88522091662 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 13 Feb 2017 17:20:08 +0000
|
|
Subject: [PATCH] clk-bcm2835: Mark used PLLs and dividers CRITICAL
|
|
|
|
The VPU configures and relies on several PLLs and dividers. Mark all
|
|
enabled dividers and their PLLs as CRITICAL to prevent the kernel from
|
|
switching them off.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -1372,6 +1372,11 @@ bcm2835_register_pll_divider(struct bcm2
|
|
divider->div.hw.init = &init;
|
|
divider->div.table = NULL;
|
|
|
|
+ if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) {
|
|
+ init.flags |= CLK_IS_CRITICAL;
|
|
+ divider->div.flags |= CLK_IS_CRITICAL;
|
|
+ }
|
|
+
|
|
divider->cprman = cprman;
|
|
divider->data = data;
|
|
|