mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-23 16:17:28 +02:00
kernel: bump 5.10 to 5.10.201
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.10.201 Removed upstreamed: x86/patches-5.10/120-hwrng-geode-fix-accessing-registers.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.201&id=ffb3483c4b0bff1951e4020b9d73e4c13bf7fe93 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
parent
e7b3414fd5
commit
f85a79bcb4
|
@ -1,2 +1,2 @@
|
||||||
LINUX_VERSION-5.10 = .200
|
LINUX_VERSION-5.10 = .201
|
||||||
LINUX_KERNEL_HASH-5.10.200 = 9d2d961fbf87486e48b0087326ee35cb0af4dec03c770737b098652457205104
|
LINUX_KERNEL_HASH-5.10.201 = 6afc06598fa8e3bc907cff75f995f372df51d40a284e260de78a3421b1f18218
|
||||||
|
|
|
@ -567,7 +567,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef1
|
||||||
unsigned int var;
|
unsigned int var;
|
||||||
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
@@ -517,7 +517,7 @@ void mtk_drm_crtc_async_update(struct dr
|
@@ -520,7 +520,7 @@ void mtk_drm_crtc_async_update(struct dr
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
|
static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||||
|
@ -576,7 +576,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef1
|
||||||
{
|
{
|
||||||
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
|
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
|
||||||
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
|
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
|
||||||
@@ -542,7 +542,7 @@ static void mtk_drm_crtc_atomic_enable(s
|
@@ -545,7 +545,7 @@ static void mtk_drm_crtc_atomic_enable(s
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
|
static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
|
||||||
|
|
|
@ -574,7 +574,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-max
|
||||||
if (drm_crtc_vblank_get(crtc) == 0)
|
if (drm_crtc_vblank_get(crtc) == 0)
|
||||||
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
@@ -575,24 +575,24 @@ static void mtk_drm_crtc_atomic_disable(
|
@@ -578,24 +578,24 @@ static void mtk_drm_crtc_atomic_disable(
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
|
static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
|
||||||
|
|
|
@ -357,7 +357,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
|
||||||
static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = {
|
static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = {
|
||||||
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
|
||||||
@@ -614,7 +614,6 @@ static const struct drm_crtc_funcs mtk_c
|
@@ -617,7 +617,6 @@ static const struct drm_crtc_funcs mtk_c
|
||||||
.reset = mtk_drm_crtc_reset,
|
.reset = mtk_drm_crtc_reset,
|
||||||
.atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
|
.atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
|
||||||
.atomic_destroy_state = mtk_drm_crtc_destroy_state,
|
.atomic_destroy_state = mtk_drm_crtc_destroy_state,
|
||||||
|
@ -405,7 +405,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
|
||||||
/* -----------------------------------------------------------------------------
|
/* -----------------------------------------------------------------------------
|
||||||
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
||||||
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
||||||
@@ -1645,7 +1645,6 @@ static const struct drm_crtc_funcs vop_c
|
@@ -1649,7 +1649,6 @@ static const struct drm_crtc_funcs vop_c
|
||||||
.disable_vblank = vop_crtc_disable_vblank,
|
.disable_vblank = vop_crtc_disable_vblank,
|
||||||
.set_crc_source = vop_crtc_set_crc_source,
|
.set_crc_source = vop_crtc_set_crc_source,
|
||||||
.verify_crc_source = vop_crtc_verify_crc_source,
|
.verify_crc_source = vop_crtc_verify_crc_source,
|
||||||
|
|
|
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/property.h>
|
#include <linux/property.h>
|
||||||
@@ -3298,3 +3299,5 @@ static int __init regmap_initcall(void)
|
@@ -3300,3 +3301,5 @@ static int __init regmap_initcall(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
postcore_initcall(regmap_initcall);
|
postcore_initcall(regmap_initcall);
|
||||||
|
|
|
@ -1,47 +0,0 @@
|
||||||
From 859bd2e0c0052967536f3f902716f204d5a978b1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
||||||
Date: Fri, 8 Sep 2023 22:48:33 +0200
|
|
||||||
Subject: [PATCH] hwrng: geode: fix accessing registers
|
|
||||||
|
|
||||||
When the membase and pci_dev pointer were moved to a new struct in priv,
|
|
||||||
the actual membase users were left untouched, and they started reading
|
|
||||||
out arbitrary memory behind the struct instead of registers. This
|
|
||||||
unfortunately turned the RNG into a constant number generator, depending
|
|
||||||
on the content of what was at that offset.
|
|
||||||
|
|
||||||
To fix this, update geode_rng_data_{read,present}() to also get the
|
|
||||||
membase via amd_geode_priv, and properly read from the right addresses
|
|
||||||
again.
|
|
||||||
|
|
||||||
Fixes: 9f6ec8dc574e ("hwrng: geode - Fix PCI device refcount leak")
|
|
||||||
Reported-by: Timur I. Davletshin <timur.davletshin@gmail.com>
|
|
||||||
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217882
|
|
||||||
Tested-by: Timur I. Davletshin <timur.davletshin@gmail.com>
|
|
||||||
Suggested-by: Jo-Philipp Wich <jo@mein.io>
|
|
||||||
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/char/hw_random/geode-rng.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/char/hw_random/geode-rng.c
|
|
||||||
+++ b/drivers/char/hw_random/geode-rng.c
|
|
||||||
@@ -58,7 +58,8 @@ struct amd_geode_priv {
|
|
||||||
|
|
||||||
static int geode_rng_data_read(struct hwrng *rng, u32 *data)
|
|
||||||
{
|
|
||||||
- void __iomem *mem = (void __iomem *)rng->priv;
|
|
||||||
+ struct amd_geode_priv *priv = (struct amd_geode_priv *)rng->priv;
|
|
||||||
+ void __iomem *mem = priv->membase;
|
|
||||||
|
|
||||||
*data = readl(mem + GEODE_RNG_DATA_REG);
|
|
||||||
|
|
||||||
@@ -67,7 +68,8 @@ static int geode_rng_data_read(struct hw
|
|
||||||
|
|
||||||
static int geode_rng_data_present(struct hwrng *rng, int wait)
|
|
||||||
{
|
|
||||||
- void __iomem *mem = (void __iomem *)rng->priv;
|
|
||||||
+ struct amd_geode_priv *priv = (struct amd_geode_priv *)rng->priv;
|
|
||||||
+ void __iomem *mem = priv->membase;
|
|
||||||
int data, i;
|
|
||||||
|
|
||||||
for (i = 0; i < 20; i++) {
|
|
Loading…
Reference in New Issue
Block a user