github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Set correct timer mode on Loongson64

Browse Source 
- Only request r4k clockevent interrupt on one CPU
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmbI3MMaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHABPw/9GJsxcfHDn65x0i0L/zD3
 1W5oLi77AOj92roemORw/YEqYElLqESPeIE+k7rDjpPI68WkYMVD9EEqs2x9sTlz
 Axha7Fci/3P5uZeO5uHVMNo9qD96kaeTxQgcIgSe3WL7k/qjFL2iayhc7btj1bfy
 r8HWIXZDFhFtFqMyot4T+3BzSUp4amP3E05fQ1ulf1o+hJeDMc93Dc4REWMmlc3p
 hl8vBpVSTREr9L+GL6v/vQxzINFynQaoNJbfAOqUvIakLRVYq5DKueOmbYsL7jdG
 dRmSvpUSOZNLqJm6ECc2o96d4VA54qeqD47QXzohHiJbbCG1cusrV3ZWYZjHmxHy
 kFx4BvuPpnYhmzmr9lcTv8/7QnLhCVRYao0FkhYggF5IamRut1EdjHnIo1SzzCfd
 5oeTpfPBAzSgP5Lc5aPOv35tOYeBzViIeFb1+eRV0V6h0jvKYPAaYP7F5848YXnI
 bgcIylZoNPxHXGNTEJpXTBZoQfbWBLo44R/SyY/allzA+t39dctskkOBpICXwnQZ
 HpD3gE81lhtguIkrLe6fPvrUmONoas0odlrxJudS2zrnV09D/234l+4X75C4JHdZ
 Imqk7o0UgQOXexPb5R4CTHKbCPFyomEBa0TsnnIiD6auM3elgF+Vp3i+9ipjE1KO
 tXn7vaBHFBBH5V1r+byM5wo=
 =2Ggn
 -----END PGP SIGNATURE-----

Merge tag 'mips-fixes_6.11_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

Pull MIPS fixes from Thomas Bogendoerfer:

 - Set correct timer mode on Loongson64

 - Only request r4k clockevent interrupt on one CPU

* tag 'mips-fixes_6.11_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: cevt-r4k: Don't call get_c0_compare_int if timer irq is installed
  MIPS: Loongson64: Set timer mode in cpu-probe
This commit is contained in:
Linus Torvalds 2024-08-24 10:10:43 +08:00
commit 5bd6cf0074
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/mips/kernel/cevt-r4k.c
View File

@ -303,13 +303,6 @@ int r4k_clockevent_init(void)
if (!c0_compare_int_usable())
return -ENXIO;
/*
* With vectored interrupts things are getting platform specific.
* get_c0_compare_int is a hook to allow a platform to return the
* interrupt number of its liking.
*/
irq = get_c0_compare_int();
cd = &per_cpu(mips_clockevent_device, cpu);
cd->name = "MIPS";
@ -320,7 +313,6 @@ int r4k_clockevent_init(void)
min_delta = calculate_min_delta();
cd->rating = 300;
cd->irq = irq;
cd->cpumask = cpumask_of(cpu);
cd->set_next_event = mips_next_event;
cd->event_handler = mips_event_handler;
@ -332,6 +324,13 @@ int r4k_clockevent_init(void)
cp0_timer_irq_installed = 1;
/*
* With vectored interrupts things are getting platform specific.
* get_c0_compare_int is a hook to allow a platform to return the
* interrupt number of its liking.
*/
irq = get_c0_compare_int();
if (request_irq(irq, c0_compare_interrupt, flags, "timer",
c0_compare_interrupt))
pr_err("Failed to request irq %d (timer)\n", irq);

4
arch/mips/kernel/cpu-probe.c
View File

@ -1724,12 +1724,16 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)
c->ases |= (MIPS_ASE_LOONGSON_MMI | MIPS_ASE_LOONGSON_CAM |
MIPS_ASE_LOONGSON_EXT | MIPS_ASE_LOONGSON_EXT2);
c->ases &= ~MIPS_ASE_VZ; /* VZ of Loongson-3A2000/3000 is incomplete */
change_c0_config6(LOONGSON_CONF6_EXTIMER | LOONGSON_CONF6_INTIMER,
LOONGSON_CONF6_INTIMER);
break;
case PRID_IMP_LOONGSON_64G:
__cpu_name[cpu] = "ICT Loongson-3";
set_elf_platform(cpu, "loongson3a");
set_isa(c, MIPS_CPU_ISA_M64R2);
decode_cpucfg(c);
change_c0_config6(LOONGSON_CONF6_EXTIMER | LOONGSON_CONF6_INTIMER,
LOONGSON_CONF6_INTIMER);
break;
default:
panic("Unknown Loongson Processor ID!");