Skip to content

Commit 45a5ac7

Browse files
committed
Merge tag 'mips_fixes_5.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Thomas Bogendoerfer: - fix for missing hazard barrier - DT fix for ingenic - DT fix of GPHY names for lantiq - fix usage of smp_processor_id() while preemption is enabled * tag 'mips_fixes_5.8_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: MIPS: Do not use smp_processor_id() in preemptible code MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen MIPS: ingenic: gcw0: Fix HP detection GPIO. MIPS: lantiq: xway: sysctrl: fix the GPHY clock alias names
2 parents 9bc0b02 + 5868347 commit 45a5ac7

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

arch/mips/boot/dts/ingenic/gcw0.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"MIC1N", "Built-in Mic";
9393
simple-audio-card,pin-switches = "Speaker", "Headphones";
9494

95-
simple-audio-card,hp-det-gpio = <&gpf 21 GPIO_ACTIVE_HIGH>;
95+
simple-audio-card,hp-det-gpio = <&gpf 21 GPIO_ACTIVE_LOW>;
9696
simple-audio-card,aux-devs = <&speaker_amp>, <&headphones_amp>;
9797

9898
simple-audio-card,bitclock-master = <&dai_codec>;

arch/mips/kernel/traps.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,12 +723,14 @@ static int simulate_loongson3_cpucfg(struct pt_regs *regs,
723723
perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0);
724724

725725
/* Do not emulate on unsupported core models. */
726-
if (!loongson3_cpucfg_emulation_enabled(&current_cpu_data))
726+
preempt_disable();
727+
if (!loongson3_cpucfg_emulation_enabled(&current_cpu_data)) {
728+
preempt_enable();
727729
return -1;
728-
730+
}
729731
regs->regs[rd] = loongson3_cpucfg_read_synthesized(
730732
&current_cpu_data, sel);
731-
733+
preempt_enable();
732734
return 0;
733735
}
734736

@@ -2169,6 +2171,7 @@ static void configure_status(void)
21692171

21702172
change_c0_status(ST0_CU|ST0_MX|ST0_RE|ST0_FR|ST0_BEV|ST0_TS|ST0_KX|ST0_SX|ST0_UX,
21712173
status_set);
2174+
back_to_back_c0_hazard();
21722175
}
21732176

21742177
unsigned int hwrena;

arch/mips/lantiq/xway/sysctrl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,8 +514,8 @@ void __init ltq_soc_init(void)
514514
clkdev_add_pmu("1e10b308.eth", NULL, 0, 0, PMU_SWITCH |
515515
PMU_PPE_DP | PMU_PPE_TC);
516516
clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);
517-
clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);
518-
clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);
517+
clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);
518+
clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);
519519
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
520520
clkdev_add_pmu("1e116000.mei", "afe", 1, 2, PMU_ANALOG_DSL_AFE);
521521
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
@@ -538,8 +538,8 @@ void __init ltq_soc_init(void)
538538
PMU_SWITCH | PMU_PPE_DPLUS | PMU_PPE_DPLUM |
539539
PMU_PPE_EMA | PMU_PPE_TC | PMU_PPE_SLL01 |
540540
PMU_PPE_QSB | PMU_PPE_TOP);
541-
clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);
542-
clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);
541+
clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);
542+
clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);
543543
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
544544
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
545545
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

0 commit comments

Comments
 (0)