xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8210659 from b83feee7bb to android12-5.10-keystone-qcom-release

Browse Source 
Change-Id: If1679d1f422198925b4ef6920b3ac605ba5e7348
This commit is contained in:
Android Build Coastguard Worker
2022-02-23 01:00:34 +00:00
parent ecea9e1e32 b83feee7bb
commit be18d0c127
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/base/regmap/regmap-irq.c
View File

@@ -170,11 +170,9 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
ret = regmap_write(map, reg, d->mask_buf[i]); ret = regmap_write(map, reg, d->mask_buf[i]);
if (d->chip->clear_ack) { if (d->chip->clear_ack) {
if (d->chip->ack_invert && !ret) if (d->chip->ack_invert && !ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, UINT_MAX);
d->mask_buf[i]);
else if (!ret) else if (!ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, 0);
~d->mask_buf[i]);
} }
if (ret != 0) if (ret != 0)
dev_err(d->map->dev, "Failed to ack 0x%x: %d\n", dev_err(d->map->dev, "Failed to ack 0x%x: %d\n",
@@ -509,11 +507,9 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
data->status_buf[i]); data->status_buf[i]);
if (chip->clear_ack) { if (chip->clear_ack) {
if (chip->ack_invert && !ret) if (chip->ack_invert && !ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, UINT_MAX);
data->status_buf[i]);
else if (!ret) else if (!ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, 0);
~data->status_buf[i]);
} }
if (ret != 0) if (ret != 0)
dev_err(map->dev, "Failed to ack 0x%x: %d\n", dev_err(map->dev, "Failed to ack 0x%x: %d\n",
@@ -745,13 +741,9 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
d->status_buf[i] & d->mask_buf[i]); d->status_buf[i] & d->mask_buf[i]);
if (chip->clear_ack) { if (chip->clear_ack) {
if (chip->ack_invert && !ret) if (chip->ack_invert && !ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, UINT_MAX);
(d->status_buf[i] &
d->mask_buf[i]));
else if (!ret) else if (!ret)
ret = regmap_write(map, reg, ret = regmap_write(map, reg, 0);
~(d->status_buf[i] &
d->mask_buf[i]));
} }
if (ret != 0) { if (ret != 0) {
dev_err(map->dev, "Failed to ack 0x%x: %d\n", dev_err(map->dev, "Failed to ack 0x%x: %d\n",

9
drivers/iommu/iommu.c
View File

@@ -186,9 +186,14 @@ static struct dev_iommu *dev_iommu_get(struct device *dev)
static void dev_iommu_free(struct device *dev) static void dev_iommu_free(struct device *dev)
{ {
iommu_fwspec_free(dev); struct dev_iommu *param = dev->iommu;
kfree(dev->iommu);
dev->iommu = NULL; dev->iommu = NULL;
if (param->fwspec) {
fwnode_handle_put(param->fwspec->iommu_fwnode);
kfree(param->fwspec);
}
kfree(param);
} }
static int __iommu_probe_device(struct device *dev, struct list_head *group_list) static int __iommu_probe_device(struct device *dev, struct list_head *group_list)

11
kernel/sched/core.c
View File

@@ -880,8 +880,9 @@ int tg_nop(struct task_group *tg, void *data)
} }
#endif #endif
static void set_load_weight(struct task_struct *p, bool update_load) static void set_load_weight(struct task_struct *p)
{ {
bool update_load = !(READ_ONCE(p->state) & TASK_NEW);
int prio = p->static_prio - MAX_RT_PRIO; int prio = p->static_prio - MAX_RT_PRIO;
struct load_weight *load = &p->se.load; struct load_weight *load = &p->se.load;
@@ -3484,7 +3485,7 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
p->static_prio = NICE_TO_PRIO(0); p->static_prio = NICE_TO_PRIO(0);
p->prio = p->normal_prio = p->static_prio; p->prio = p->normal_prio = p->static_prio;
set_load_weight(p, false); set_load_weight(p);
/* /*
* We don't need the reset flag anymore after the fork. It has * We don't need the reset flag anymore after the fork. It has
@@ -5252,7 +5253,7 @@ void set_user_nice(struct task_struct *p, long nice)
put_prev_task(rq, p); put_prev_task(rq, p);
p->static_prio = NICE_TO_PRIO(nice); p->static_prio = NICE_TO_PRIO(nice);
set_load_weight(p, true); set_load_weight(p);
old_prio = p->prio; old_prio = p->prio;
p->prio = effective_prio(p); p->prio = effective_prio(p);
@@ -5426,7 +5427,7 @@ static void __setscheduler_params(struct task_struct *p,
*/ */
p->rt_priority = attr->sched_priority; p->rt_priority = attr->sched_priority;
p->normal_prio = normal_prio(p); p->normal_prio = normal_prio(p);
set_load_weight(p, true); set_load_weight(p);
} }
/* /*
@@ -7569,7 +7570,7 @@ void __init sched_init(void)
atomic_set(&rq->nr_iowait, 0); atomic_set(&rq->nr_iowait, 0);
} }
set_load_weight(&init_task, false); set_load_weight(&init_task);
/* /*
* The boot idle thread does lazy MMU switching as well: * The boot idle thread does lazy MMU switching as well: