kernel: bump 5.10 to 5.10.168

Manually rebased:
  backport-5.10/804-v5.14-0001-nvmem-core-allow-specifying-of_node.patch

Removed upstreamed:
  generic-backport/807-v5.17-0003-nvmem-core-Fix-a-conflict-between-MTD-and-NVMEM-on-w.patch[1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.168&id=34ec4c7831c416ac56619477f1701986634a7efc

Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 461072fc7b)
[Refresh on OpenWrt 22.03]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
John Audia 2023-02-15 14:05:27 -05:00 committed by Hauke Mehrtens
parent a66e53d8ed
commit 55a48b0957
16 changed files with 37 additions and 37 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .167 LINUX_VERSION-5.10 = .168
LINUX_KERNEL_HASH-5.10.167 = d807f97812e566410cd13b3170009e0d7552748d4f22d608ffd4dbd7f85bf9c6 LINUX_KERNEL_HASH-5.10.168 = b67d2596ba8d30510f743f31899c94c43eaf006a254ff44d7fc6ea26e7ab359c

View File

@ -118,7 +118,7 @@
--- a/include/uapi/linux/ip.h --- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h
@@ -105,7 +105,7 @@ struct iphdr { @@ -106,7 +106,7 @@ struct iphdr {
__be32 daddr; __be32 daddr;
); );
/*The options start here. */ /*The options start here. */
@ -129,7 +129,7 @@
struct ip_auth_hdr { struct ip_auth_hdr {
--- a/include/uapi/linux/ipv6.h --- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h
@@ -134,7 +134,7 @@ struct ipv6hdr { @@ -135,7 +135,7 @@ struct ipv6hdr {
struct in6_addr saddr; struct in6_addr saddr;
struct in6_addr daddr; struct in6_addr daddr;
); );

View File

@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -8652,8 +8652,6 @@ int alloc_contig_range(unsigned long sta @@ -8655,8 +8655,6 @@ int alloc_contig_range(unsigned long sta
/* Make sure the range is really isolated. */ /* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, 0)) { if (test_pages_isolated(outer_start, end, 0)) {

View File

@ -20,9 +20,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
- return 0; - return 0;
- -
vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
vc4_hdmi, "vc4", vc4_hdmi,
CEC_CAP_DEFAULTS | vc4_hdmi->variant->card_name,
@@ -1922,7 +1919,6 @@ static const struct vc4_hdmi_variant bcm @@ -1923,7 +1920,6 @@ static const struct vc4_hdmi_variant bcm
.debugfs_name = "hdmi_regs", .debugfs_name = "hdmi_regs",
.card_name = "vc4-hdmi", .card_name = "vc4-hdmi",
.max_pixel_clock = 162000000, .max_pixel_clock = 162000000,

View File

@ -29,7 +29,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
return 0; return 0;
} }
@@ -1736,6 +1742,7 @@ static int vc5_hdmi_init_resources(struc @@ -1737,6 +1743,7 @@ static int vc5_hdmi_init_resources(struc
struct platform_device *pdev = vc4_hdmi->pdev; struct platform_device *pdev = vc4_hdmi->pdev;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *res; struct resource *res;
@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi");
if (!res) if (!res)
@@ -1826,6 +1833,38 @@ static int vc5_hdmi_init_resources(struc @@ -1827,6 +1834,38 @@ static int vc5_hdmi_init_resources(struc
return PTR_ERR(vc4_hdmi->reset); return PTR_ERR(vc4_hdmi->reset);
} }

View File

@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT; value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT;
HDMI_WRITE(HDMI_CEC_CNTRL_1, value); HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
} }
@@ -1869,6 +1869,7 @@ static int vc4_hdmi_init_resources(struc @@ -1870,6 +1870,7 @@ static int vc4_hdmi_init_resources(struc
return PTR_ERR(vc4_hdmi->hsm_clock); return PTR_ERR(vc4_hdmi->hsm_clock);
} }
vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock; vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock;
@ -35,7 +35,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return 0; return 0;
} }
@@ -1963,6 +1964,12 @@ static int vc5_hdmi_init_resources(struc @@ -1964,6 +1965,12 @@ static int vc5_hdmi_init_resources(struc
return PTR_ERR(vc4_hdmi->audio_clock); return PTR_ERR(vc4_hdmi->audio_clock);
} }

View File

@ -34,7 +34,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
HDMI_WRITE(HDMI_CEC_CNTRL_5, val | HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET); VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
} }
@@ -1799,8 +1801,6 @@ static int vc4_hdmi_cec_init(struct vc4_ @@ -1800,8 +1802,6 @@ static int vc4_hdmi_cec_init(struct vc4_
cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);
@ -43,7 +43,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
value = HDMI_READ(HDMI_CEC_CNTRL_1); value = HDMI_READ(HDMI_CEC_CNTRL_1);
/* Set the logical address to Unregistered */ /* Set the logical address to Unregistered */
value |= VC4_HDMI_CEC_ADDR_MASK; value |= VC4_HDMI_CEC_ADDR_MASK;
@@ -1808,12 +1808,32 @@ static int vc4_hdmi_cec_init(struct vc4_ @@ -1809,12 +1809,32 @@ static int vc4_hdmi_cec_init(struct vc4_
vc4_hdmi_cec_update_clk_div(vc4_hdmi); vc4_hdmi_cec_update_clk_div(vc4_hdmi);
@ -82,7 +82,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev); ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev);
if (ret < 0) if (ret < 0)
@@ -2288,6 +2308,7 @@ static const struct vc4_hdmi_variant bcm @@ -2289,6 +2309,7 @@ static const struct vc4_hdmi_variant bcm
PHY_LANE_CK, PHY_LANE_CK,
}, },
.unsupported_odd_h_timings = true, .unsupported_odd_h_timings = true,
@ -90,7 +90,7 @@ Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
.init_resources = vc5_hdmi_init_resources, .init_resources = vc5_hdmi_init_resources,
.csc_setup = vc5_hdmi_csc_setup, .csc_setup = vc5_hdmi_csc_setup,
@@ -2314,6 +2335,7 @@ static const struct vc4_hdmi_variant bcm @@ -2315,6 +2336,7 @@ static const struct vc4_hdmi_variant bcm
PHY_LANE_2, PHY_LANE_2,
}, },
.unsupported_odd_h_timings = true, .unsupported_odd_h_timings = true,

View File

@ -33,5 +33,5 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+ } + }
+ +
vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
vc4_hdmi, "vc4", vc4_hdmi,
CEC_CAP_DEFAULTS | vc4_hdmi->variant->card_name,

View File

@ -61,7 +61,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
} }
static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
@@ -2298,6 +2323,7 @@ static const struct vc4_hdmi_variant bcm @@ -2299,6 +2324,7 @@ static const struct vc4_hdmi_variant bcm
.phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_enable = vc4_hdmi_phy_rng_enable,
.phy_rng_disable = vc4_hdmi_phy_rng_disable, .phy_rng_disable = vc4_hdmi_phy_rng_disable,
.channel_map = vc4_hdmi_channel_map, .channel_map = vc4_hdmi_channel_map,
@ -69,7 +69,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
}; };
static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
@@ -2325,6 +2351,7 @@ static const struct vc4_hdmi_variant bcm @@ -2326,6 +2352,7 @@ static const struct vc4_hdmi_variant bcm
.phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_enable = vc5_hdmi_phy_rng_enable,
.phy_rng_disable = vc5_hdmi_phy_rng_disable, .phy_rng_disable = vc5_hdmi_phy_rng_disable,
.channel_map = vc5_hdmi_channel_map, .channel_map = vc5_hdmi_channel_map,
@ -77,7 +77,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
}; };
static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
@@ -2352,6 +2379,7 @@ static const struct vc4_hdmi_variant bcm @@ -2353,6 +2380,7 @@ static const struct vc4_hdmi_variant bcm
.phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_enable = vc5_hdmi_phy_rng_enable,
.phy_rng_disable = vc5_hdmi_phy_rng_disable, .phy_rng_disable = vc5_hdmi_phy_rng_disable,
.channel_map = vc5_hdmi_channel_map, .channel_map = vc5_hdmi_channel_map,

View File

@ -65,7 +65,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
#ifdef CONFIG_DRM_VC4_HDMI_CEC #ifdef CONFIG_DRM_VC4_HDMI_CEC
static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv) static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv)
{ {
@@ -2317,6 +2357,10 @@ static int vc4_hdmi_bind(struct device * @@ -2318,6 +2358,10 @@ static int vc4_hdmi_bind(struct device *
if (ret) if (ret)
goto err_destroy_encoder; goto err_destroy_encoder;

View File

@ -70,7 +70,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state) struct drm_atomic_state *state)
{ {
@@ -2275,6 +2299,7 @@ static int vc4_hdmi_bind(struct device * @@ -2276,6 +2300,7 @@ static int vc4_hdmi_bind(struct device *
vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL);
if (!vc4_hdmi) if (!vc4_hdmi)
return -ENOMEM; return -ENOMEM;

View File

@ -102,7 +102,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask) static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
{ {
int i; int i;
@@ -2336,6 +2353,7 @@ static const struct vc4_hdmi_variant bcm @@ -2337,6 +2354,7 @@ static const struct vc4_hdmi_variant bcm
.phy_disable = vc4_hdmi_phy_disable, .phy_disable = vc4_hdmi_phy_disable,
.phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_enable = vc4_hdmi_phy_rng_enable,
.phy_rng_disable = vc4_hdmi_phy_rng_disable, .phy_rng_disable = vc4_hdmi_phy_rng_disable,
@ -110,7 +110,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
.channel_map = vc4_hdmi_channel_map, .channel_map = vc4_hdmi_channel_map,
.supports_hdr = false, .supports_hdr = false,
}; };
@@ -2364,6 +2382,7 @@ static const struct vc4_hdmi_variant bcm @@ -2365,6 +2383,7 @@ static const struct vc4_hdmi_variant bcm
.phy_disable = vc5_hdmi_phy_disable, .phy_disable = vc5_hdmi_phy_disable,
.phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_enable = vc5_hdmi_phy_rng_enable,
.phy_rng_disable = vc5_hdmi_phy_rng_disable, .phy_rng_disable = vc5_hdmi_phy_rng_disable,
@ -118,7 +118,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
.channel_map = vc5_hdmi_channel_map, .channel_map = vc5_hdmi_channel_map,
.supports_hdr = true, .supports_hdr = true,
}; };
@@ -2392,6 +2411,7 @@ static const struct vc4_hdmi_variant bcm @@ -2393,6 +2412,7 @@ static const struct vc4_hdmi_variant bcm
.phy_disable = vc5_hdmi_phy_disable, .phy_disable = vc5_hdmi_phy_disable,
.phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_enable = vc5_hdmi_phy_rng_enable,
.phy_rng_disable = vc5_hdmi_phy_rng_disable, .phy_rng_disable = vc5_hdmi_phy_rng_disable,

View File

@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1896,25 +1896,23 @@ static int vc4_hdmi_cec_init(struct vc4_ @@ -1897,25 +1897,23 @@ static int vc4_hdmi_cec_init(struct vc4_
vc4_hdmi_cec_update_clk_div(vc4_hdmi); vc4_hdmi_cec_update_clk_div(vc4_hdmi);
if (vc4_hdmi->variant->external_irq_controller) { if (vc4_hdmi->variant->external_irq_controller) {
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
vc4_cec_irq_handler, vc4_cec_irq_handler,
vc4_cec_irq_handler_thread, 0, vc4_cec_irq_handler_thread, 0,
"vc4 hdmi cec", vc4_hdmi); "vc4 hdmi cec", vc4_hdmi);
@@ -1924,10 +1922,20 @@ static int vc4_hdmi_cec_init(struct vc4_ @@ -1925,10 +1923,20 @@ static int vc4_hdmi_cec_init(struct vc4_
ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev); ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev);
if (ret < 0) if (ret < 0)
@ -77,7 +77,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
err_delete_cec_adap: err_delete_cec_adap:
cec_delete_adapter(vc4_hdmi->cec_adap); cec_delete_adapter(vc4_hdmi->cec_adap);
@@ -1936,6 +1944,15 @@ err_delete_cec_adap: @@ -1937,6 +1945,15 @@ err_delete_cec_adap:
static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi)
{ {

View File

@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
#ifdef CONFIG_DRM_VC4_HDMI_CEC #ifdef CONFIG_DRM_VC4_HDMI_CEC
static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv) static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv)
{ {
@@ -2305,7 +2317,7 @@ static int vc4_hdmi_bind(struct device * @@ -2306,7 +2318,7 @@ static int vc4_hdmi_bind(struct device *
ret = vc4_hdmi_cec_init(vc4_hdmi); ret = vc4_hdmi_cec_init(vc4_hdmi);
if (ret) if (ret)
@ -92,7 +92,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
ret = vc4_hdmi_audio_init(vc4_hdmi); ret = vc4_hdmi_audio_init(vc4_hdmi);
if (ret) if (ret)
@@ -2319,6 +2331,8 @@ static int vc4_hdmi_bind(struct device * @@ -2320,6 +2332,8 @@ static int vc4_hdmi_bind(struct device *
err_free_cec: err_free_cec:
vc4_hdmi_cec_exit(vc4_hdmi); vc4_hdmi_cec_exit(vc4_hdmi);
@ -101,7 +101,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
err_destroy_conn: err_destroy_conn:
vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
err_destroy_encoder: err_destroy_encoder:
@@ -2360,6 +2374,7 @@ static void vc4_hdmi_unbind(struct devic @@ -2361,6 +2375,7 @@ static void vc4_hdmi_unbind(struct devic
kfree(vc4_hdmi->hd_regset.regs); kfree(vc4_hdmi->hd_regset.regs);
vc4_hdmi_cec_exit(vc4_hdmi); vc4_hdmi_cec_exit(vc4_hdmi);

View File

@ -18,7 +18,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -2295,6 +2295,18 @@ static int vc4_hdmi_bind(struct device * @@ -2296,6 +2296,18 @@ static int vc4_hdmi_bind(struct device *
if (ret) if (ret)
goto err_put_ddc; goto err_put_ddc;
@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
if (vc4_hdmi->variant->reset) if (vc4_hdmi->variant->reset)
vc4_hdmi->variant->reset(vc4_hdmi); vc4_hdmi->variant->reset(vc4_hdmi);
@@ -2306,8 +2318,6 @@ static int vc4_hdmi_bind(struct device * @@ -2307,8 +2319,6 @@ static int vc4_hdmi_bind(struct device *
clk_prepare_enable(vc4_hdmi->pixel_bvb_clock); clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
} }
@ -46,7 +46,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
@@ -2331,6 +2341,8 @@ static int vc4_hdmi_bind(struct device * @@ -2332,6 +2342,8 @@ static int vc4_hdmi_bind(struct device *
vc4_hdmi_debugfs_regs, vc4_hdmi_debugfs_regs,
vc4_hdmi); vc4_hdmi);
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return 0; return 0;
err_free_cec: err_free_cec:
@@ -2341,6 +2353,7 @@ err_destroy_conn: @@ -2342,6 +2354,7 @@ err_destroy_conn:
vc4_hdmi_connector_destroy(&vc4_hdmi->connector); vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
err_destroy_encoder: err_destroy_encoder:
drm_encoder_cleanup(encoder); drm_encoder_cleanup(encoder);

View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -7104,7 +7104,7 @@ static void __ref alloc_node_mem_map(str @@ -7107,7 +7107,7 @@ static void __ref alloc_node_mem_map(str
if (pgdat == NODE_DATA(0)) { if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map; mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)