forked from rpms/kernel
Linux v4.16-rc6-75-g3215b9d57a2c
This commit is contained in:
Jeremy Cline
parent
842f170f35
commit
29d2089ad6
@ -1,122 +1,3 @@
|
||||
From patchwork Thu Feb 8 13:43:35 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [1/4] clk: bcm2835: Fix ana->maskX definitions
|
||||
From: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
X-Patchwork-Id: 10207161
|
||||
Message-Id: <20180208134338.24590-1-boris.brezillon@bootlin.com>
|
||||
To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Scott Branden <sbranden@broadcom.com>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
Stephen Warren <swarren@wwwdotorg.org>,
|
||||
Lee Jones <lee@kernel.org>, Eric Anholt <eric@anholt.net>,
|
||||
linux-rpi-kernel@lists.infradead.org,
|
||||
Mike Turquette <mturquette@baylibre.com>,
|
||||
Stephen Boyd <sboyd@codeaurora.org>, linux-clk@vger.kernel.org
|
||||
Cc: Boris Brezillon <boris.brezillon@bootlin.com>, stable@vger.kernel.org
|
||||
Date: Thu, 8 Feb 2018 14:43:35 +0100
|
||||
|
||||
ana->maskX values are already '~'-ed in bcm2835_pll_set_rate(). Remove
|
||||
the '~' in the definition to fix ANA setup.
|
||||
|
||||
Note that this commit fixes a long standing bug preventing one from
|
||||
using an HDMI display if it's plugged after the FW has booted Linux.
|
||||
This is because PLLH is used by the HDMI encoder to generate the pixel
|
||||
clock.
|
||||
|
||||
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks")
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/clk/bcm/clk-bcm2835.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
|
||||
index 44301a3d9963..2108a274185a 100644
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -449,17 +449,17 @@ struct bcm2835_pll_ana_bits {
|
||||
static const struct bcm2835_pll_ana_bits bcm2835_ana_default = {
|
||||
.mask0 = 0,
|
||||
.set0 = 0,
|
||||
- .mask1 = (u32)~(A2W_PLL_KI_MASK | A2W_PLL_KP_MASK),
|
||||
+ .mask1 = A2W_PLL_KI_MASK | A2W_PLL_KP_MASK,
|
||||
.set1 = (2 << A2W_PLL_KI_SHIFT) | (8 << A2W_PLL_KP_SHIFT),
|
||||
- .mask3 = (u32)~A2W_PLL_KA_MASK,
|
||||
+ .mask3 = A2W_PLL_KA_MASK,
|
||||
.set3 = (2 << A2W_PLL_KA_SHIFT),
|
||||
.fb_prediv_mask = BIT(14),
|
||||
};
|
||||
|
||||
static const struct bcm2835_pll_ana_bits bcm2835_ana_pllh = {
|
||||
- .mask0 = (u32)~(A2W_PLLH_KA_MASK | A2W_PLLH_KI_LOW_MASK),
|
||||
+ .mask0 = A2W_PLLH_KA_MASK | A2W_PLLH_KI_LOW_MASK,
|
||||
.set0 = (2 << A2W_PLLH_KA_SHIFT) | (2 << A2W_PLLH_KI_LOW_SHIFT),
|
||||
- .mask1 = (u32)~(A2W_PLLH_KI_HIGH_MASK | A2W_PLLH_KP_MASK),
|
||||
+ .mask1 = A2W_PLLH_KI_HIGH_MASK | A2W_PLLH_KP_MASK,
|
||||
.set1 = (6 << A2W_PLLH_KP_SHIFT),
|
||||
.mask3 = 0,
|
||||
.set3 = 0,
|
||||
From patchwork Thu Feb 8 13:43:36 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [2/4] clk: bcm2835: Protect sections updating shared registers
|
||||
From: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
X-Patchwork-Id: 10207155
|
||||
Message-Id: <20180208134338.24590-2-boris.brezillon@bootlin.com>
|
||||
To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>,
|
||||
Scott Branden <sbranden@broadcom.com>,
|
||||
bcm-kernel-feedback-list@broadcom.com,
|
||||
Stephen Warren <swarren@wwwdotorg.org>,
|
||||
Lee Jones <lee@kernel.org>, Eric Anholt <eric@anholt.net>,
|
||||
linux-rpi-kernel@lists.infradead.org,
|
||||
Mike Turquette <mturquette@baylibre.com>,
|
||||
Stephen Boyd <sboyd@codeaurora.org>, linux-clk@vger.kernel.org
|
||||
Cc: Boris Brezillon <boris.brezillon@bootlin.com>, stable@vger.kernel.org
|
||||
Date: Thu, 8 Feb 2018 14:43:36 +0100
|
||||
|
||||
CM_PLLx and A2W_XOSC_CTRL registers are accessed by different clock
|
||||
handlers and must be accessed with ->regs_lock held.
|
||||
Update the sections where this protection is missing.
|
||||
|
||||
Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks")
|
||||
Cc: <stable@vger.kernel.org>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
drivers/clk/bcm/clk-bcm2835.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
|
||||
index 2108a274185a..a07f6451694a 100644
|
||||
--- a/drivers/clk/bcm/clk-bcm2835.c
|
||||
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
||||
@@ -623,8 +623,10 @@ static int bcm2835_pll_on(struct clk_hw *hw)
|
||||
~A2W_PLL_CTRL_PWRDN);
|
||||
|
||||
/* Take the PLL out of reset. */
|
||||
+ spin_lock(&cprman->regs_lock);
|
||||
cprman_write(cprman, data->cm_ctrl_reg,
|
||||
cprman_read(cprman, data->cm_ctrl_reg) & ~CM_PLL_ANARST);
|
||||
+ spin_unlock(&cprman->regs_lock);
|
||||
|
||||
/* Wait for the PLL to lock. */
|
||||
timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
|
||||
@@ -701,9 +703,11 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw,
|
||||
}
|
||||
|
||||
/* Unmask the reference clock from the oscillator. */
|
||||
+ spin_lock(&cprman->regs_lock);
|
||||
cprman_write(cprman, A2W_XOSC_CTRL,
|
||||
cprman_read(cprman, A2W_XOSC_CTRL) |
|
||||
data->reference_enable_mask);
|
||||
+ spin_unlock(&cprman->regs_lock);
|
||||
|
||||
if (do_ana_setup_first)
|
||||
bcm2835_pll_write_ana(cprman, data->ana_reg_base, ana);
|
||||
From patchwork Thu Feb 8 13:43:37 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From b209bf23bc97b7758b9dc8f68d2a835295960226 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Belleville <bbellevi@uci.edu>
|
||||
Date: Tue, 20 Feb 2018 14:54:25 -0800
|
||||
Subject: [PATCH] floppy: Don't print kernel addresses to log in show_floppy
|
||||
|
||||
Outputting kernel addresses will reveal the locations of kernel code
|
||||
and data. Change the cases in show_floppy that print
|
||||
fd_timer.work.func and fd_timeout.work.func to use the %pf format
|
||||
specifier, which will print the symbol name, like what is done for the
|
||||
other function pointers printed by show_floppy. No longer output the
|
||||
value of cont. The variable cont is a pointer that can hold the
|
||||
address of kernel global variables.
|
||||
|
||||
Signed-off-by: Brian Belleville <bbellevi@uci.edu>
|
||||
---
|
||||
drivers/block/floppy.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
|
||||
index eae484acfbbc..e29d4174ea2c 100644
|
||||
--- a/drivers/block/floppy.c
|
||||
+++ b/drivers/block/floppy.c
|
||||
@@ -1819,15 +1819,14 @@ static void show_floppy(void)
|
||||
if (work_pending(&floppy_work))
|
||||
pr_info("floppy_work.func=%pf\n", floppy_work.func);
|
||||
if (delayed_work_pending(&fd_timer))
|
||||
- pr_info("delayed work.function=%p expires=%ld\n",
|
||||
+ pr_info("delayed work.function=%pf expires=%ld\n",
|
||||
fd_timer.work.func,
|
||||
fd_timer.timer.expires - jiffies);
|
||||
if (delayed_work_pending(&fd_timeout))
|
||||
- pr_info("timer_function=%p expires=%ld\n",
|
||||
+ pr_info("timer_function=%pf expires=%ld\n",
|
||||
fd_timeout.work.func,
|
||||
fd_timeout.timer.expires - jiffies);
|
||||
|
||||
- pr_info("cont=%p\n", cont);
|
||||
pr_info("current_req=%p\n", current_req);
|
||||
pr_info("command_status=%d\n", command_status);
|
||||
pr_info("\n");
|
||||
--
|
||||
2.16.2
|
||||
|
||||
2
gitrev
2
gitrev
@ -1 +1 @@
|
||||
1b5f3ba415fe4cf8b8b39c8d104ed44cde330658
|
||||
3215b9d57a2c75c4305a3956ca303d7004485200
|
||||
|
||||
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%global rcrev 6
|
||||
# The git snapshot level
|
||||
%define gitrev 1
|
||||
%define gitrev 2
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -614,9 +614,6 @@ Patch318: bcm2837-rpi-initial-support-for-the-3.patch
|
||||
|
||||
# 500 - Temp fixes/CVEs etc
|
||||
|
||||
# CVE-2018-7273 rhbz 1547384 1547386
|
||||
Patch500: floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch
|
||||
|
||||
# rhbz 1476467
|
||||
Patch501: Fix-for-module-sig-verification.patch
|
||||
|
||||
@ -1927,6 +1924,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Mar 21 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc6.git2.1
|
||||
- Linux v4.16-rc6-75-g3215b9d57a2c
|
||||
|
||||
* Tue Mar 20 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc6.git1.1
|
||||
- Linux v4.16-rc6-35-g1b5f3ba415fe
|
||||
- Re-enable debugging options
|
||||
|
||||
2
sources
2
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
|
||||
SHA512 (patch-4.16-rc6.xz) = c052f570e1792f26c989a87a772b4628d2e6a7a3ea9d133f8738135ea26286b51ec0c248022d1edf6bb565dc07002129ed75da31a3e64951d3978da7e262010b
|
||||
SHA512 (patch-4.16-rc6-git1.xz) = bd10300abfa972f5f3a3c78302dade89abe778948bbb486c46a41e576c5e2229230b961bab4825de9e2984f0cee27bce0b8699647ae4764b43f9e24d0556c4e9
|
||||
SHA512 (patch-4.16-rc6-git2.xz) = 3b15e7396c68cd718fd54e00554b558d2677f21d0f8e8fa307f4ad9d31aad7cbb0c5b18bd22737084d3be36d0a3d411d704685e6082f78d9d5e2a2f67d40ba13
|
||||
|
||||
Loading…
Reference in New Issue
Block a user