TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

irqchip/gic: add the parameter of gic version for rockchip amp

Browse Source 
Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Idf679a2e91a62a90de4059f09451c58d6d56ecd4
This commit is contained in:
Tony Xie
2023-09-12 14:56:48 +08:00
committed by tony.xie
parent 5c09e33a23
commit cb753cddaa
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/irqchip/irq-gic-common.c
+1 -1
View File
@@ -122,7 +122,7 @@ void gic_dist_config(void __iomem *base, int gic_irqs,
amp_pri = 0;
for (j = 0; j < 4; j++) {
if (rockchip_amp_check_amp_irq(i + j)) {
if (rockchip_amp_need_init_amp_irq(i + j)) {
amp_pri |= rockchip_amp_get_irq_prio(i + j) <<
(j * 8);
} else {
drivers/irqchip/irq-gic.c
+4 -5
View File
@@ -534,7 +534,7 @@ static void gic_dist_init(struct gic_chip_data *gic)
maskval = 0;
for (j = 0; j < 4; j++) {
if (rockchip_amp_check_amp_irq(i + j)) {
if (rockchip_amp_need_init_amp_irq(i + j)) {
maskval |= rockchip_amp_get_irq_cpumask(i + j) <<
(j * 8);
} else {
@@ -1349,6 +1349,9 @@ static int gic_init_bases(struct gic_chip_data *gic,
goto error;
}
#ifdef CONFIG_ROCKCHIP_AMP
rockchip_amp_get_gic_info(gic->gic_irqs, GIC_V2);
#endif
gic_dist_init(gic);
ret = gic_cpu_init(gic);
if (ret)
@@ -1567,10 +1570,6 @@ static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node)
gic_enable_of_quirks(node, gic_quirks, gic);
#ifdef CONFIG_ROCKCHIP_AMP
rockchip_amp_get_gic_info();
#endif
return 0;
error: