Skip to content

Commit

Permalink
rockchip-rk3588-6.10: rewrite patches against v6.10-rc3, no changes
Browse files Browse the repository at this point in the history 
- interesting that with stable index stanzas, we get to clearly see patches that actually changed only in position during rewrites
  • Loading branch information
@rpardini
rpardini committed Jun 11, 2024
1 parent 31ca10a commit 16b0fb6
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions patch/kernel/archive/rockchip-rk3588-6.10/0011-irqchip-fix-its-timeout-issue.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index 111111111111..222222222222 100644
u32 nr_ites;
u32 device_id;
bool shared;
@@ -2211,6 +2212,9 @@ static void gic_reset_prop_table(void *va)
@@ -2191,6 +2192,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 111111111111..222222222222 100644

prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ));
if (!prop_page)
@@ -2335,6 +2339,7 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2315,6 +2319,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);
@@ -2346,7 +2351,11 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2326,7 +2331,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 111111111111..222222222222 100644
if (!page)
return -ENOMEM;

@@ -2396,6 +2405,15 @@ static int its_setup_baser(struct its_node *its, struct its_baser *baser,
@@ -2376,6 +2385,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 111111111111..222222222222 100644
if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) {
/*
* Shareability didn't stick. Just use
@@ -2985,7 +3003,9 @@ static int its_alloc_collections(struct its_node *its)
@@ -2965,7 +2983,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,7 +77,7 @@ index 111111111111..222222222222 100644
pend_page = alloc_pages(gfp_flags | __GFP_ZERO,
get_order(LPI_PENDBASE_SZ));
if (!pend_page)
@@ -3144,6 +3164,11 @@ static void its_cpu_init_lpis(void)
@@ -3124,6 +3144,11 @@ static void its_cpu_init_lpis(void)
if (!rdists_support_shareable())
tmp &= ~GICR_PROPBASER_SHAREABILITY_MASK;

Expand All @@ -89,7 +89,7 @@ index 111111111111..222222222222 100644
if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) {
if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) {
/*
@@ -3171,6 +3196,11 @@ static void its_cpu_init_lpis(void)
@@ -3151,6 +3176,11 @@ static void its_cpu_init_lpis(void)
if (!rdists_support_shareable())
tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK;

Expand All @@ -101,7 +101,7 @@ index 111111111111..222222222222 100644
if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) {
/*
* The HW reports non-shareable, we must remove the
@@ -3334,7 +3364,11 @@ static bool its_alloc_table_entry(struct its_node *its,
@@ -3314,7 +3344,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 111111111111..222222222222 100644
get_order(baser->psz));
if (!page)
return false;
@@ -3423,6 +3457,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3403,6 +3437,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;
@@ -3438,7 +3473,15 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3418,7 +3453,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 111111111111..222222222222 100644
if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map)
@@ -3452,7 +3495,13 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3432,7 +3475,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 111111111111..222222222222 100644
bitmap_free(lpi_map);
kfree(col_map);
return NULL;
@@ -3462,6 +3511,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
@@ -3442,6 +3491,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;
@@ -3489,7 +3539,13 @@ static void its_free_device(struct its_device *its_dev)
@@ -3469,7 +3519,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 111111111111..222222222222 100644
kfree(its_dev);
}

@@ -5098,6 +5154,7 @@ static int __init its_probe_one(struct its_node *its)
@@ -5078,6 +5134,7 @@ static int __init its_probe_one(struct its_node *its)
struct page *page;
u32 ctlr;
int err;
+ gfp_t gfp_flags;

its_enable_quirks(its);

@@ -5131,7 +5188,10 @@ static int __init its_probe_one(struct its_node *its)
@@ -5111,7 +5168,10 @@ static int __init its_probe_one(struct its_node *its)
}
}

Expand All @@ -197,7 +197,7 @@ index 111111111111..222222222222 100644
get_order(ITS_CMD_QUEUE_SZ));
if (!page) {
err = -ENOMEM;
@@ -5160,6 +5220,11 @@ static int __init its_probe_one(struct its_node *its)
@@ -5140,6 +5200,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

0 comments on commit 16b0fb6

Please sign in to comment.