Skip to content

Commit

Permalink
rockchip-rk3588-edge: rewrite kernel patches against v6.8-rc6, no cha…
Browse files Browse the repository at this point in the history 
…nges
  • Loading branch information
@rpardini @igorpecovnik
rpardini authored and igorpecovnik committed Mar 3, 2024
1 parent d496b2a commit 92d7991
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
42 changes: 21 additions & 21 deletions patch/kernel/rockchip-rk3588-edge/0011-irqchip-fix-its-timeout-issue.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: irqchip/irq-gic-v3-its: fix its timeout issue for rk35xx boards
1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index d097001c1e3e..3108092b4219 100644
index b822752c4261..8cc290b135ab 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -163,6 +163,7 @@ struct its_device {
Expand All @@ -19,7 +19,7 @@ index d097001c1e3e..3108092b4219 100644
u32 nr_ites;
u32 device_id;
bool shared;
@@ -2200,6 +2201,9 @@ static void gic_reset_prop_table(void *va)
@@ -2205,6 +2206,9 @@ static void gic_reset_prop_table(void *va)
static struct page *its_allocate_prop_table(gfp_t gfp_flags)
{
struct page *prop_page;
Expand All @@ -29,15 +29,15 @@ index d097001c1e3e..3108092b4219 100644

prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ));
if (!prop_page)
@@ -2324,6 +2328,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2329,6 +2333,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
u32 alloc_pages, psz;
struct page *page;
void *base;
+ gfp_t gfp_flags;

psz = baser->psz;
alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz);
@@ -2335,7 +2340,11 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2340,7 +2345,11 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
order = get_order(GITS_BASER_PAGES_MAX * psz);
}

Expand All @@ -50,7 +50,7 @@ index d097001c1e3e..3108092b4219 100644
if (!page)
return -ENOMEM;

@@ -2385,6 +2394,15 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2390,6 +2399,15 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
its_write_baser(its, baser, val);
tmp = baser->val;

Expand All @@ -66,7 +66,7 @@ index d097001c1e3e..3108092b4219 100644
if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) {
/*
* Shareability didn't stick. Just use
@@ -2970,7 +2988,9 @@ static int its_alloc_collections(struct its_node *its)
@@ -2979,7 +2997,9 @@ static int its_alloc_collections(struct its_node *its)
static struct page *its_allocate_pending_table(gfp_t gfp_flags)
{
struct page *pend_page;
Expand All @@ -77,8 +77,8 @@ index d097001c1e3e..3108092b4219 100644
pend_page = alloc_pages(gfp_flags | __GFP_ZERO,
get_order(LPI_PENDBASE_SZ));
if (!pend_page)
@@ -3129,6 +3149,11 @@ static void its_cpu_init_lpis(void)
if (gic_rdists->flags & RDIST_FLAGS_FORCE_NON_SHAREABLE)
@@ -3138,6 +3158,11 @@ static void its_cpu_init_lpis(void)
if (!rdists_support_shareable())
tmp &= ~GICR_PROPBASER_SHAREABILITY_MASK;

+ if (of_machine_is_compatible("rockchip,rk3568") ||
Expand All @@ -89,8 +89,8 @@ index d097001c1e3e..3108092b4219 100644
if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) {
if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) {
/*
@@ -3156,6 +3181,11 @@ static void its_cpu_init_lpis(void)
if (gic_rdists->flags & RDIST_FLAGS_FORCE_NON_SHAREABLE)
@@ -3165,6 +3190,11 @@ static void its_cpu_init_lpis(void)
if (!rdists_support_shareable())
tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK;

+ if (of_machine_is_compatible("rockchip,rk3568") ||
Expand All @@ -101,7 +101,7 @@ index d097001c1e3e..3108092b4219 100644
if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) {
/*
* The HW reports non-shareable, we must remove the
@@ -3319,7 +3349,11 @@ static bool its_alloc_table_entry(struct its_node *its,
@@ -3328,7 +3358,11 @@ static bool its_alloc_table_entry(struct its_node *its,

/* Allocate memory for 2nd level table */
if (!table[idx]) {
Expand All @@ -114,15 +114,15 @@ index d097001c1e3e..3108092b4219 100644
get_order(baser->psz));
if (!page)
return false;
@@ -3408,6 +3442,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3417,6 +3451,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
int nr_lpis;
int nr_ites;
int sz;
+ gfp_t gfp_flags;

if (!its_alloc_device_table(its, dev_id))
return NULL;
@@ -3423,7 +3458,15 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3432,7 +3467,15 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
nr_ites = max(2, nvecs);
sz = nr_ites * (FIELD_GET(GITS_TYPER_ITT_ENTRY_SIZE, its->typer) + 1);
sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1;
Expand All @@ -139,7 +139,7 @@ index d097001c1e3e..3108092b4219 100644
if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map)
@@ -3437,7 +3480,13 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3446,7 +3489,13 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,

if (!dev || !itt || !col_map || (!lpi_map && alloc_lpis)) {
kfree(dev);
Expand All @@ -154,15 +154,15 @@ index d097001c1e3e..3108092b4219 100644
bitmap_free(lpi_map);
kfree(col_map);
return NULL;
@@ -3447,6 +3496,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3456,6 +3505,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,

dev->its = its;
dev->itt = itt;
+ dev->itt_sz = sz;
dev->nr_ites = nr_ites;
dev->event_map.lpi_map = lpi_map;
dev->event_map.col_map = col_map;
@@ -3474,7 +3524,13 @@ static void its_free_device(struct its_device *its_dev)
@@ -3483,7 +3533,13 @@ static void its_free_device(struct its_device *its_dev)
list_del(&its_dev->entry);
raw_spin_unlock_irqrestore(&its_dev->its->lock, flags);
kfree(its_dev->event_map.col_map);
Expand All @@ -177,15 +177,15 @@ index d097001c1e3e..3108092b4219 100644
kfree(its_dev);
}

@@ -5077,6 +5133,7 @@ static int __init its_probe_one(struct its_node *its)
@@ -5094,6 +5150,7 @@ static int __init its_probe_one(struct its_node *its)
struct page *page;
u32 ctlr;
int err;
+ gfp_t gfp_flags;

if (is_v4(its)) {
if (!(its->typer & GITS_TYPER_VMOVP)) {
@@ -5108,7 +5165,10 @@ static int __init its_probe_one(struct its_node *its)
its_enable_quirks(its);

@@ -5127,7 +5184,10 @@ static int __init its_probe_one(struct its_node *its)
}
}

Expand All @@ -197,7 +197,7 @@ index d097001c1e3e..3108092b4219 100644
get_order(ITS_CMD_QUEUE_SZ));
if (!page) {
err = -ENOMEM;
@@ -5137,6 +5197,11 @@ static int __init its_probe_one(struct its_node *its)
@@ -5156,6 +5216,11 @@ static int __init its_probe_one(struct its_node *its)
if (its->flags & ITS_FLAGS_FORCE_NON_SHAREABLE)
tmp &= ~GITS_CBASER_SHAREABILITY_MASK;

Expand Down
10 changes: 5 additions & 5 deletions patch/kernel/rockchip-rk3588-edge/0021-RK3588-Add-USB3-DRD-Support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 file changed, 143 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index ac7c677b0fb9..0e82dbb4c5ff 100644
index de30c2632b8e..c3746d3a9b1d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -9,6 +9,7 @@
Expand Down Expand Up @@ -2352,7 +2352,7 @@ index ac7c677b0fb9..0e82dbb4c5ff 100644
};

&pwm2 {
@@ -1040,6 +1113,22 @@ &sata0 {
@@ -1041,6 +1114,22 @@ &sata0 {
status = "okay";
};

Expand All @@ -2375,7 +2375,7 @@ index ac7c677b0fb9..0e82dbb4c5ff 100644
&u2phy2 {
status = "okay";
};
@@ -1078,3 +1167,57 @@ &usb_host1_ehci {
@@ -1079,3 +1168,57 @@ &usb_host1_ehci {
&usb_host1_ohci {
status = "okay";
};
Expand Down Expand Up @@ -2465,10 +2465,10 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 5945e3a2b0f7..99991cb666a8 100644
index 66e532edcece..31933278df77 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -6831,9 +6831,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
@@ -6828,9 +6828,9 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)

port->partner_desc.identity = &port->partner_ident;

Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/rockchip-rk3588-edge/0022-RK3588-Add-Cpufreq-Support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1294,7 +1294,7 @@ Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index 0e82dbb4c5ff..ecbbd553a31e 100644
index c3746d3a9b1d..62c05bc68042 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -249,34 +249,42 @@ &combphy2_psu {
Expand Down
28 changes: 14 additions & 14 deletions patch/kernel/rockchip-rk3588-edge/0029-Add-VOP2-Support-for-RK3588.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 85b3b4871a1d..e91e0c092002 100644
index fdd768bbd487..892b8ab02cc3 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -169,6 +169,7 @@ struct vop2_video_port {
Expand All @@ -20,7 +20,7 @@ index 85b3b4871a1d..e91e0c092002 100644
struct drm_pending_vblank_event *event;

unsigned int nlayers;
@@ -2681,12 +2682,63 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2)
@@ -2683,12 +2684,63 @@ static struct vop2_video_port *find_vp_without_primary(struct vop2 *vop2)
return NULL;
}

Expand Down Expand Up @@ -85,7 +85,7 @@ index 85b3b4871a1d..e91e0c092002 100644
struct device_node *port;
struct vop2_video_port *vp;
int i, nvp, nvps = 0;
@@ -2727,6 +2779,8 @@ static int vop2_create_crtcs(struct vop2 *vop2)
@@ -2729,6 +2781,8 @@ static int vop2_create_crtcs(struct vop2 *vop2)
nvps++;
}

Expand All @@ -94,7 +94,7 @@ index 85b3b4871a1d..e91e0c092002 100644
nvp = 0;
for (i = 0; i < vop2->registered_num_wins; i++) {
struct vop2_win *win = &vop2->win[i];
@@ -2758,6 +2812,18 @@ static int vop2_create_crtcs(struct vop2 *vop2)
@@ -2760,6 +2814,18 @@ static int vop2_create_crtcs(struct vop2 *vop2)
}
}

Expand All @@ -113,7 +113,7 @@ index 85b3b4871a1d..e91e0c092002 100644
if (win->type == DRM_PLANE_TYPE_OVERLAY)
possible_crtcs = (1 << nvps) - 1;

@@ -2775,9 +2841,13 @@ static int vop2_create_crtcs(struct vop2 *vop2)
@@ -2777,9 +2843,13 @@ static int vop2_create_crtcs(struct vop2 *vop2)
if (!vp->crtc.port)
continue;

Expand All @@ -129,7 +129,7 @@ index 85b3b4871a1d..e91e0c092002 100644
&vop2_crtc_funcs,
"video_port%d", vp->id);
if (ret) {
@@ -2790,18 +2860,6 @@ static int vop2_create_crtcs(struct vop2 *vop2)
@@ -2792,18 +2862,6 @@ static int vop2_create_crtcs(struct vop2 *vop2)
init_completion(&vp->dsp_hold_completion);
}

Expand Down Expand Up @@ -162,10 +162,10 @@ Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index e91e0c092002..3d39f0634816 100644
index 892b8ab02cc3..ae755ecb991e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2638,8 +2638,11 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win,
@@ -2640,8 +2640,11 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win,
unsigned int blend_caps = BIT(DRM_MODE_BLEND_PIXEL_NONE) |
BIT(DRM_MODE_BLEND_PREMULTI) |
BIT(DRM_MODE_BLEND_COVERAGE);
Expand All @@ -177,7 +177,7 @@ index e91e0c092002..3d39f0634816 100644
ret = drm_universal_plane_init(vop2->drm, &win->base, possible_crtcs,
&vop2_plane_funcs, win_data->formats,
win_data->nformats,
@@ -2658,7 +2661,7 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win,
@@ -2660,7 +2663,7 @@ static int vop2_plane_init(struct vop2 *vop2, struct vop2_win *win,
win->data->supported_rotations);
drm_plane_create_alpha_property(&win->base);
drm_plane_create_blend_mode_property(&win->base, blend_caps);
Expand Down Expand Up @@ -205,7 +205,7 @@ Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
1 file changed, 398 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 3d39f0634816..d3d71ffa6c55 100644
index ae755ecb991e..c4e588f234c6 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -27,6 +27,7 @@
Expand Down Expand Up @@ -269,7 +269,7 @@ index 3d39f0634816..d3d71ffa6c55 100644
static const struct regmap_config vop2_regmap_config;

static struct vop2_video_port *to_vop2_video_port(struct drm_crtc *crtc)
@@ -2510,6 +2550,362 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = {
@@ -2512,6 +2552,362 @@ static const struct drm_crtc_helper_funcs vop2_crtc_helper_funcs = {
.atomic_disable = vop2_crtc_atomic_disable,
};

Expand Down Expand Up @@ -632,15 +632,15 @@ index 3d39f0634816..d3d71ffa6c55 100644
static struct drm_crtc_state *vop2_crtc_duplicate_state(struct drm_crtc *crtc)
{
struct rockchip_crtc_state *vcstate;
@@ -2559,6 +2955,7 @@ static const struct drm_crtc_funcs vop2_crtc_funcs = {
@@ -2561,6 +2957,7 @@ static const struct drm_crtc_funcs vop2_crtc_funcs = {
.atomic_destroy_state = vop2_crtc_destroy_state,
.enable_vblank = vop2_crtc_enable_vblank,
.disable_vblank = vop2_crtc_disable_vblank,
+ .late_register = vop2_crtc_late_register,
};

static irqreturn_t vop2_isr(int irq, void *data)
@@ -3163,6 +3560,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
@@ -3165,6 +3562,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data)
return -EINVAL;
}

Expand All @@ -663,7 +663,7 @@ Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2 files changed, 123 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
index ecbbd553a31e..89c8f8f0bbd7 100644
index 62c05bc68042..e1f801bdf2dd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts
@@ -10,6 +10,7 @@
Expand Down

0 comments on commit 92d7991

Please sign in to comment.