~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,14 +1,10 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* Routines providing a simple monitor for use on the PowerMac.
3	4	*
4	5	* Copyright (C) 1996-2005 Paul Mackerras.
5	6	* Copyright (C) 2001 PPC64 Team, IBM Corp
6	7	* Copyrignt (C) 2006 Michael Ellerman, IBM Corp
7		- *
8		- * This program is free software; you can redistribute it and/or
9		- * modify it under the terms of the GNU General Public License
10		- * as published by the Free Software Foundation; either version
11		- * 2 of the License, or (at your option) any later version.
12	8	*/
13	9
14	10	#include <linux/kernel.h>
..	..	@@ -29,6 +25,7 @@
29	25	#include <linux/nmi.h>
30	26	#include <linux/ctype.h>
31	27	#include <linux/highmem.h>
	28	+#include <linux/security.h>
32	29
33	30	#include <asm/debugfs.h>
34	31	#include <asm/ptrace.h>
..	..	@@ -38,7 +35,6 @@
38	35	#include <asm/machdep.h>
39	36	#include <asm/xmon.h>
40	37	#include <asm/processor.h>
41		-#include <asm/pgtable.h>
42	38	#include <asm/mmu.h>
43	39	#include <asm/mmu_context.h>
44	40	#include <asm/plpar_wrappers.h>
..	..	@@ -57,6 +53,7 @@
57	53	#include <asm/firmware.h>
58	54	#include <asm/code-patching.h>
59	55	#include <asm/sections.h>
	56	+#include <asm/inst.h>
60	57
61	58	#ifdef CONFIG_PPC64
62	59	#include <asm/hvcall.h>
..	..	@@ -65,6 +62,7 @@
65	62
66	63	#include "nonstdio.h"
67	64	#include "dis-asm.h"
	65	+#include "xmon_bpts.h"
68	66
69	67	#ifdef CONFIG_SMP
70	68	static cpumask_t cpus_in_xmon = CPU_MASK_NONE;
..	..	@@ -80,11 +78,13 @@
80	78	#endif
81	79	static unsigned long in_xmon __read_mostly = 0;
82	80	static int xmon_on = IS_ENABLED(CONFIG_XMON_DEFAULT);
	81	+static bool xmon_is_ro = IS_ENABLED(CONFIG_XMON_DEFAULT_RO_MODE);
83	82
84	83	static unsigned long adrs;
85	84	static int size = 1;
86		-#define MAX_DUMP (128 * 1024)
	85	+#define MAX_DUMP (64 * 1024)
87	86	static unsigned long ndump = 64;
	87	+#define MAX_IDUMP (MAX_DUMP >> 2)
88	88	static unsigned long nidump = 16;
89	89	static unsigned long ncsum = 4096;
90	90	static int termch;
..	..	@@ -99,7 +99,7 @@
99	99	/* Breakpoint stuff */
100	100	struct bpt {
101	101	unsigned long address;
102		- unsigned int instr[2];
	102	+ struct ppc_inst *instr;
103	103	atomic_t ref_count;
104	104	int enabled;
105	105	unsigned long pad;
..	..	@@ -110,9 +110,8 @@
110	110	#define BP_TRAP 2
111	111	#define BP_DABR 4
112	112
113		-#define NBPTS 256
114	113	static struct bpt bpts[NBPTS];
115		-static struct bpt dabr;
	114	+static struct bpt dabr[HBP_NUM_MAX];
116	115	static struct bpt *iabr;
117	116	static unsigned bpinstr = 0x7fe00008; /* trap */
118	117
..	..	@@ -122,6 +121,7 @@
122	121	static int cmds(struct pt_regs *);
123	122	static int mread(unsigned long, void *, int);
124	123	static int mwrite(unsigned long, void *, int);
	124	+static int mread_instr(unsigned long, struct ppc_inst *);
125	125	static int handle_fault(struct pt_regs *);
126	126	static void byterev(unsigned char *, int);
127	127	static void memex(void);
..	..	@@ -190,6 +190,8 @@
190	190	static void dump_tlb_book3e(void);
191	191	#endif
192	192
	193	+static void clear_all_bpt(void);
	194	+
193	195	#ifdef CONFIG_PPC64
194	196	#define REG "%.16lx"
195	197	#else
..	..	@@ -201,6 +203,8 @@
201	203	#else
202	204	#define GETWORD(v) (((v)[0] << 24) + ((v)[1] << 16) + ((v)[2] << 8) + (v)[3])
203	205	#endif
	206	+
	207	+static const char *xmon_ro_msg = "Operation disabled: xmon in read-only mode\n";
204	208
205	209	static char *help_string = "\
206	210	Commands:\n\
..	..	@@ -276,7 +280,7 @@
276	280	X exit monitor and don't recover\n"
277	281	#if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_BOOK3E)
278	282	" u dump segment table or SLB\n"
279		-#elif defined(CONFIG_PPC_STD_MMU_32)
	283	+#elif defined(CONFIG_PPC_BOOK3S_32)
280	284	" u dump segment registers\n"
281	285	#elif defined(CONFIG_44x) \|\| defined(CONFIG_PPC_BOOK3E)
282	286	" u dump TLB\n"
..	..	@@ -284,20 +288,43 @@
284	288	" U show uptime information\n"
285	289	" ? help\n"
286	290	" # n limit output to n lines per page (for dp, dpa, dl)\n"
287		-" zr reboot\n\
288		- zh halt\n"
	291	+" zr reboot\n"
	292	+" zh halt\n"
289	293	;
	294	+
	295	+#ifdef CONFIG_SECURITY
	296	+static bool xmon_is_locked_down(void)
	297	+{
	298	+ static bool lockdown;
	299	+
	300	+ if (!lockdown) {
	301	+ lockdown = !!security_locked_down(LOCKDOWN_XMON_RW);
	302	+ if (lockdown) {
	303	+ printf("xmon: Disabled due to kernel lockdown\n");
	304	+ xmon_is_ro = true;
	305	+ }
	306	+ }
	307	+
	308	+ if (!xmon_is_ro) {
	309	+ xmon_is_ro = !!security_locked_down(LOCKDOWN_XMON_WR);
	310	+ if (xmon_is_ro)
	311	+ printf("xmon: Read-only due to kernel lockdown\n");
	312	+ }
	313	+
	314	+ return lockdown;
	315	+}
	316	+#else /* CONFIG_SECURITY */
	317	+static inline bool xmon_is_locked_down(void)
	318	+{
	319	+ return false;
	320	+}
	321	+#endif
290	322
291	323	static struct pt_regs *xmon_regs;
292	324
293	325	static inline void sync(void)
294	326	{
295	327	asm volatile("sync; isync");
296		-}
297		-
298		-static inline void store_inst(void *p)
299		-{
300		- asm volatile ("dcbst 0,%0; sync; icbi 0,%0; isync" : : "r" (p));
301	328	}
302	329
303	330	static inline void cflush(void *p)
..	..	@@ -439,7 +466,10 @@
439	466
440	467	return false;
441	468	}
442		-#endif /* CONFIG_SMP */
	469	+#else /* CONFIG_SMP */
	470	+static inline void get_output_lock(void) {}
	471	+static inline void release_output_lock(void) {}
	472	+#endif
443	473
444	474	static inline int unrecoverable_excp(struct pt_regs *regs)
445	475	{
..	..	@@ -451,11 +481,19 @@
451	481	#endif
452	482	}
453	483
	484	+static void xmon_touch_watchdogs(void)
	485	+{
	486	+ touch_softlockup_watchdog_sync();
	487	+ rcu_cpu_stall_reset();
	488	+ touch_nmi_watchdog();
	489	+}
	490	+
454	491	static int xmon_core(struct pt_regs *regs, int fromipi)
455	492	{
456	493	int cmd = 0;
457	494	struct bpt *bp;
458	495	long recurse_jmp[JMP_BUF_LEN];
	496	+ bool locked_down;
459	497	unsigned long offset;
460	498	unsigned long flags;
461	499	#ifdef CONFIG_SMP
..	..	@@ -465,6 +503,8 @@
465	503
466	504	local_irq_save(flags);
467	505	hard_irq_disable();
	506	+
	507	+ locked_down = xmon_is_locked_down();
468	508
469	509	if (!fromipi) {
470	510	tracing_enabled = tracing_is_on();
..	..	@@ -519,7 +559,8 @@
519	559
520	560	if (!fromipi) {
521	561	get_output_lock();
522		- excprint(regs);
	562	+ if (!locked_down)
	563	+ excprint(regs);
523	564	if (bp) {
524	565	printf("cpu 0x%x stopped at breakpoint 0x%tx (",
525	566	cpu, BP_NUM(bp));
..	..	@@ -571,10 +612,14 @@
571	612	}
572	613	remove_bpts();
573	614	disable_surveillance();
574		- /* for breakpoint or single step, print the current instr. */
575		- if (bp \|\| TRAP(regs) == 0xd00)
576		- ppc_inst_dump(regs->nip, 1, 0);
577		- printf("enter ? for help\n");
	615	+
	616	+ if (!locked_down) {
	617	+ /* for breakpoint or single step, print curr insn */
	618	+ if (bp \|\| TRAP(regs) == 0xd00)
	619	+ ppc_inst_dump(regs->nip, 1, 0);
	620	+ printf("enter ? for help\n");
	621	+ }
	622	+
578	623	mb();
579	624	xmon_gate = 1;
580	625	barrier();
..	..	@@ -598,8 +643,9 @@
598	643	spin_cpu_relax();
599	644	touch_nmi_watchdog();
600	645	} else {
601		- cmd = cmds(regs);
602		- if (cmd != 0) {
	646	+ if (!locked_down)
	647	+ cmd = cmds(regs);
	648	+ if (locked_down \|\| cmd != 0) {
603	649	/* exiting xmon */
604	650	insert_bpts();
605	651	xmon_gate = 0;
..	..	@@ -636,13 +682,16 @@
636	682	"can't continue\n");
637	683	remove_bpts();
638	684	disable_surveillance();
639		- /* for breakpoint or single step, print the current instr. */
640		- if (bp \|\| TRAP(regs) == 0xd00)
641		- ppc_inst_dump(regs->nip, 1, 0);
642		- printf("enter ? for help\n");
	685	+ if (!locked_down) {
	686	+ /* for breakpoint or single step, print current insn */
	687	+ if (bp \|\| TRAP(regs) == 0xd00)
	688	+ ppc_inst_dump(regs->nip, 1, 0);
	689	+ printf("enter ? for help\n");
	690	+ }
643	691	}
644	692
645		- cmd = cmds(regs);
	693	+ if (!locked_down)
	694	+ cmd = cmds(regs);
646	695
647	696	insert_bpts();
648	697	in_xmon = 0;
..	..	@@ -660,20 +709,23 @@
660	709	if ((regs->msr & (MSR_IR\|MSR_PR\|MSR_64BIT)) == (MSR_IR\|MSR_64BIT)) {
661	710	bp = at_breakpoint(regs->nip);
662	711	if (bp != NULL) {
663		- int stepped = emulate_step(regs, bp->instr[0]);
	712	+ int stepped = emulate_step(regs, ppc_inst_read(bp->instr));
664	713	if (stepped == 0) {
665	714	regs->nip = (unsigned long) &bp->instr[0];
666	715	atomic_inc(&bp->ref_count);
667	716	} else if (stepped < 0) {
668	717	printf("Couldn't single-step %s instruction\n",
669		- (IS_RFID(bp->instr[0])? "rfid": "mtmsrd"));
	718	+ IS_RFID(ppc_inst_read(bp->instr))? "rfid": "mtmsrd");
670	719	}
671	720	}
672	721	}
673	722	#endif
674		- insert_cpu_bpts();
	723	+ if (locked_down)
	724	+ clear_all_bpt();
	725	+ else
	726	+ insert_cpu_bpts();
675	727
676		- touch_nmi_watchdog();
	728	+ xmon_touch_watchdogs();
677	729	local_irq_restore(flags);
678	730
679	731	return cmd != 'X' && cmd != EOF;
..	..	@@ -712,8 +764,8 @@
712	764
713	765	/* Are we at the trap at bp->instr[1] for some bp? */
714	766	bp = in_breakpoint_table(regs->nip, &offset);
715		- if (bp != NULL && offset == 4) {
716		- regs->nip = bp->address + 4;
	767	+ if (bp != NULL && (offset == 4 \|\| offset == 8)) {
	768	+ regs->nip = bp->address + offset;
717	769	atomic_dec(&bp->ref_count);
718	770	return 1;
719	771	}
..	..	@@ -738,10 +790,17 @@
738	790
739	791	static int xmon_break_match(struct pt_regs *regs)
740	792	{
	793	+ int i;
	794	+
741	795	if ((regs->msr & (MSR_IR\|MSR_PR\|MSR_64BIT)) != (MSR_IR\|MSR_64BIT))
742	796	return 0;
743		- if (dabr.enabled == 0)
744		- return 0;
	797	+ for (i = 0; i < nr_wp_slots(); i++) {
	798	+ if (dabr[i].enabled)
	799	+ goto found;
	800	+ }
	801	+ return 0;
	802	+
	803	+found:
745	804	xmon_core(regs, 0);
746	805	return 1;
747	806	}
..	..	@@ -810,15 +869,13 @@
810	869	{
811	870	unsigned long off;
812	871
813		- off = nip - (unsigned long) bpts;
814		- if (off >= sizeof(bpts))
	872	+ off = nip - (unsigned long)bpt_table;
	873	+ if (off >= sizeof(bpt_table))
815	874	return NULL;
816		- off %= sizeof(struct bpt);
817		- if (off != offsetof(struct bpt, instr[0])
818		- && off != offsetof(struct bpt, instr[1]))
	875	+ *offp = off & (BPT_SIZE - 1);
	876	+ if (off & 3)
819	877	return NULL;
820		- *offp = off - offsetof(struct bpt, instr[0]);
821		- return (struct bpt *) (nip - off);
	878	+ return bpts + (off / BPT_SIZE);
822	879	}
823	880
824	881	static struct bpt *new_breakpoint(unsigned long a)
..	..	@@ -833,8 +890,7 @@
833	890	for (bp = bpts; bp < &bpts[NBPTS]; ++bp) {
834	891	if (!bp->enabled && atomic_read(&bp->ref_count) == 0) {
835	892	bp->address = a;
836		- bp->instr[1] = bpinstr;
837		- store_inst(&bp->instr[1]);
	893	+ bp->instr = (void )(bpt_table + ((bp - bpts) BPT_WORDS));
838	894	return bp;
839	895	}
840	896	}
..	..	@@ -846,47 +902,76 @@
846	902	static void insert_bpts(void)
847	903	{
848	904	int i;
849		- struct bpt *bp;
	905	+ struct ppc_inst instr, instr2;
	906	+ struct bpt bp, bp2;
850	907
851	908	bp = bpts;
852	909	for (i = 0; i < NBPTS; ++i, ++bp) {
853	910	if ((bp->enabled & (BP_TRAP\|BP_CIABR)) == 0)
854	911	continue;
855		- if (mread(bp->address, &bp->instr[0], 4) != 4) {
	912	+ if (!mread_instr(bp->address, &instr)) {
856	913	printf("Couldn't read instruction at %lx, "
857	914	"disabling breakpoint there\n", bp->address);
858	915	bp->enabled = 0;
859	916	continue;
860	917	}
861		- if (IS_MTMSRD(bp->instr[0]) \|\| IS_RFID(bp->instr[0])) {
	918	+ if (IS_MTMSRD(instr) \|\| IS_RFID(instr)) {
862	919	printf("Breakpoint at %lx is on an mtmsrd or rfid "
863	920	"instruction, disabling it\n", bp->address);
864	921	bp->enabled = 0;
865	922	continue;
866	923	}
867		- store_inst(&bp->instr[0]);
	924	+ /*
	925	+ * Check the address is not a suffix by looking for a prefix in
	926	+ * front of it.
	927	+ */
	928	+ if (mread_instr(bp->address - 4, &instr2) == 8) {
	929	+ printf("Breakpoint at %lx is on the second word of a prefixed instruction, disabling it\n",
	930	+ bp->address);
	931	+ bp->enabled = 0;
	932	+ continue;
	933	+ }
	934	+ /*
	935	+ * We might still be a suffix - if the prefix has already been
	936	+ * replaced by a breakpoint we won't catch it with the above
	937	+ * test.
	938	+ */
	939	+ bp2 = at_breakpoint(bp->address - 4);
	940	+ if (bp2 && ppc_inst_prefixed(ppc_inst_read(bp2->instr))) {
	941	+ printf("Breakpoint at %lx is on the second word of a prefixed instruction, disabling it\n",
	942	+ bp->address);
	943	+ bp->enabled = 0;
	944	+ continue;
	945	+ }
	946	+
	947	+ patch_instruction(bp->instr, instr);
	948	+ patch_instruction(ppc_inst_next(bp->instr, &instr),
	949	+ ppc_inst(bpinstr));
868	950	if (bp->enabled & BP_CIABR)
869	951	continue;
870		- if (patch_instruction((unsigned int *)bp->address,
871		- bpinstr) != 0) {
	952	+ if (patch_instruction((struct ppc_inst *)bp->address,
	953	+ ppc_inst(bpinstr)) != 0) {
872	954	printf("Couldn't write instruction at %lx, "
873	955	"disabling breakpoint there\n", bp->address);
874	956	bp->enabled &= ~BP_TRAP;
875	957	continue;
876	958	}
877		- store_inst((void *)bp->address);
878	959	}
879	960	}
880	961
881	962	static void insert_cpu_bpts(void)
882	963	{
	964	+ int i;
883	965	struct arch_hw_breakpoint brk;
884	966
885		- if (dabr.enabled) {
886		- brk.address = dabr.address;
887		- brk.type = (dabr.enabled & HW_BRK_TYPE_DABR) \| HW_BRK_TYPE_PRIV_ALL;
888		- brk.len = 8;
889		- __set_breakpoint(&brk);
	967	+ for (i = 0; i < nr_wp_slots(); i++) {
	968	+ if (dabr[i].enabled) {
	969	+ brk.address = dabr[i].address;
	970	+ brk.type = (dabr[i].enabled & HW_BRK_TYPE_DABR) \| HW_BRK_TYPE_PRIV_ALL;
	971	+ brk.len = 8;
	972	+ brk.hw_len = 8;
	973	+ __set_breakpoint(i, &brk);
	974	+ }
890	975	}
891	976
892	977	if (iabr)
..	..	@@ -897,20 +982,18 @@
897	982	{
898	983	int i;
899	984	struct bpt *bp;
900		- unsigned instr;
	985	+ struct ppc_inst instr;
901	986
902	987	bp = bpts;
903	988	for (i = 0; i < NBPTS; ++i, ++bp) {
904	989	if ((bp->enabled & (BP_TRAP\|BP_CIABR)) != BP_TRAP)
905	990	continue;
906		- if (mread(bp->address, &instr, 4) == 4
907		- && instr == bpinstr
	991	+ if (mread_instr(bp->address, &instr)
	992	+ && ppc_inst_equal(instr, ppc_inst(bpinstr))
908	993	&& patch_instruction(
909		- (unsigned int *)bp->address, bp->instr[0]) != 0)
	994	+ (struct ppc_inst *)bp->address, ppc_inst_read(bp->instr)) != 0)
910	995	printf("Couldn't remove breakpoint at %lx\n",
911	996	bp->address);
912		- else
913		- store_inst((void *)bp->address);
914	997	}
915	998	}
916	999
..	..	@@ -991,6 +1074,10 @@
991	1074	memlocate();
992	1075	break;
993	1076	case 'z':
	1077	+ if (xmon_is_ro) {
	1078	+ printf(xmon_ro_msg);
	1079	+ break;
	1080	+ }
994	1081	memzcan();
995	1082	break;
996	1083	case 'i':
..	..	@@ -1057,12 +1144,16 @@
1057	1144	bootcmds();
1058	1145	break;
1059	1146	case 'p':
	1147	+ if (xmon_is_ro) {
	1148	+ printf(xmon_ro_msg);
	1149	+ break;
	1150	+ }
1060	1151	proccall();
1061	1152	break;
1062	1153	case 'P':
1063	1154	show_tasks();
1064	1155	break;
1065		-#ifdef CONFIG_PPC_STD_MMU
	1156	+#ifdef CONFIG_PPC_BOOK3S
1066	1157	case 'u':
1067	1158	dump_segments();
1068	1159	break;
..	..	@@ -1107,13 +1198,13 @@
1107	1198	*/
1108	1199	static int do_step(struct pt_regs *regs)
1109	1200	{
1110		- unsigned int instr;
	1201	+ struct ppc_inst instr;
1111	1202	int stepped;
1112	1203
1113	1204	force_enable_xmon();
1114	1205	/* check we are in 64-bit kernel mode, translation enabled */
1115	1206	if ((regs->msr & (MSR_64BIT\|MSR_PR\|MSR_IR)) == (MSR_64BIT\|MSR_IR)) {
1116		- if (mread(regs->nip, &instr, 4) == 4) {
	1207	+ if (mread_instr(regs->nip, &instr)) {
1117	1208	stepped = emulate_step(regs, instr);
1118	1209	if (stepped < 0) {
1119	1210	printf("Couldn't single-step %s instruction\n",
..	..	@@ -1121,7 +1212,7 @@
1121	1212	return 0;
1122	1213	}
1123	1214	if (stepped > 0) {
1124		- regs->trap = 0xd00 \| (regs->trap & 1);
	1215	+ set_trap(regs, 0xd00);
1125	1216	printf("stepped to ");
1126	1217	xmon_print_symbol(regs->nip, " ", "\n");
1127	1218	ppc_inst_dump(regs->nip, 1, 0);
..	..	@@ -1136,16 +1227,19 @@
1136	1227
1137	1228	static void bootcmds(void)
1138	1229	{
	1230	+ char tmp[64];
1139	1231	int cmd;
1140	1232
1141	1233	cmd = inchar();
1142		- if (cmd == 'r')
1143		- ppc_md.restart(NULL);
1144		- else if (cmd == 'h')
	1234	+ if (cmd == 'r') {
	1235	+ getstring(tmp, 64);
	1236	+ ppc_md.restart(tmp);
	1237	+ } else if (cmd == 'h') {
1145	1238	ppc_md.halt();
1146		- else if (cmd == 'p')
	1239	+ } else if (cmd == 'p') {
1147	1240	if (pm_power_off)
1148	1241	pm_power_off();
	1242	+ }
1149	1243	}
1150	1244
1151	1245	static int cpu_cmd(void)
..	..	@@ -1270,14 +1364,14 @@
1270	1364	*/
1271	1365	static long check_bp_loc(unsigned long addr)
1272	1366	{
1273		- unsigned int instr;
	1367	+ struct ppc_inst instr;
1274	1368
1275	1369	addr &= ~3;
1276	1370	if (!is_kernel_addr(addr)) {
1277	1371	printf("Breakpoints may only be placed at kernel addresses\n");
1278	1372	return 0;
1279	1373	}
1280		- if (!mread(addr, &instr, sizeof(instr))) {
	1374	+ if (!mread_instr(addr, &instr)) {
1281	1375	printf("Can't read instruction at address %lx\n", addr);
1282	1376	return 0;
1283	1377	}
..	..	@@ -1287,6 +1381,37 @@
1287	1381	return 0;
1288	1382	}
1289	1383	return 1;
	1384	+}
	1385	+
	1386	+#ifndef CONFIG_PPC_8xx
	1387	+static int find_free_data_bpt(void)
	1388	+{
	1389	+ int i;
	1390	+
	1391	+ for (i = 0; i < nr_wp_slots(); i++) {
	1392	+ if (!dabr[i].enabled)
	1393	+ return i;
	1394	+ }
	1395	+ printf("Couldn't find free breakpoint register\n");
	1396	+ return -1;
	1397	+}
	1398	+#endif
	1399	+
	1400	+static void print_data_bpts(void)
	1401	+{
	1402	+ int i;
	1403	+
	1404	+ for (i = 0; i < nr_wp_slots(); i++) {
	1405	+ if (!dabr[i].enabled)
	1406	+ continue;
	1407	+
	1408	+ printf(" data "REG" [", dabr[i].address);
	1409	+ if (dabr[i].enabled & 1)
	1410	+ printf("r");
	1411	+ if (dabr[i].enabled & 2)
	1412	+ printf("w");
	1413	+ printf("]\n");
	1414	+ }
1290	1415	}
1291	1416
1292	1417	static char *breakpoint_help_string =
..	..	@@ -1308,15 +1433,23 @@
1308	1433	struct bpt *bp;
1309	1434
1310	1435	cmd = inchar();
	1436	+
1311	1437	switch (cmd) {
1312	1438	#ifndef CONFIG_PPC_8xx
1313	1439	static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n";
1314	1440	int mode;
1315	1441	case 'd': /* bd - hardware data breakpoint */
	1442	+ if (xmon_is_ro) {
	1443	+ printf(xmon_ro_msg);
	1444	+ break;
	1445	+ }
1316	1446	if (!ppc_breakpoint_available()) {
1317	1447	printf("Hardware data breakpoint not supported on this cpu\n");
1318	1448	break;
1319	1449	}
	1450	+ i = find_free_data_bpt();
	1451	+ if (i < 0)
	1452	+ break;
1320	1453	mode = 7;
1321	1454	cmd = inchar();
1322	1455	if (cmd == 'r')
..	..	@@ -1325,21 +1458,25 @@
1325	1458	mode = 6;
1326	1459	else
1327	1460	termch = cmd;
1328		- dabr.address = 0;
1329		- dabr.enabled = 0;
1330		- if (scanhex(&dabr.address)) {
1331		- if (!is_kernel_addr(dabr.address)) {
	1461	+ dabr[i].address = 0;
	1462	+ dabr[i].enabled = 0;
	1463	+ if (scanhex(&dabr[i].address)) {
	1464	+ if (!is_kernel_addr(dabr[i].address)) {
1332	1465	printf(badaddr);
1333	1466	break;
1334	1467	}
1335		- dabr.address &= ~HW_BRK_TYPE_DABR;
1336		- dabr.enabled = mode \| BP_DABR;
	1468	+ dabr[i].address &= ~HW_BRK_TYPE_DABR;
	1469	+ dabr[i].enabled = mode \| BP_DABR;
1337	1470	}
1338	1471
1339	1472	force_enable_xmon();
1340	1473	break;
1341	1474
1342	1475	case 'i': /* bi - hardware instr breakpoint */
	1476	+ if (xmon_is_ro) {
	1477	+ printf(xmon_ro_msg);
	1478	+ break;
	1479	+ }
1343	1480	if (!cpu_has_feature(CPU_FTR_ARCH_207S)) {
1344	1481	printf("Hardware instruction breakpoint "
1345	1482	"not supported on this cpu\n");
..	..	@@ -1368,7 +1505,9 @@
1368	1505	for (i = 0; i < NBPTS; ++i)
1369	1506	bpts[i].enabled = 0;
1370	1507	iabr = NULL;
1371		- dabr.enabled = 0;
	1508	+ for (i = 0; i < nr_wp_slots(); i++)
	1509	+ dabr[i].enabled = 0;
	1510	+
1372	1511	printf("All breakpoints cleared\n");
1373	1512	break;
1374	1513	}
..	..	@@ -1398,17 +1537,11 @@
1398	1537	break;
1399	1538	}
1400	1539	termch = cmd;
1401		- if (!scanhex(&a)) {
	1540	+
	1541	+ if (xmon_is_ro \|\| !scanhex(&a)) {
1402	1542	/* print all breakpoints */
1403	1543	printf(" type address\n");
1404		- if (dabr.enabled) {
1405		- printf(" data "REG" [", dabr.address);
1406		- if (dabr.enabled & 1)
1407		- printf("r");
1408		- if (dabr.enabled & 2)
1409		- printf("w");
1410		- printf("]\n");
1411		- }
	1544	+ print_data_bpts();
1412	1545	for (bp = bpts; bp < &bpts[NBPTS]; ++bp) {
1413	1546	if (!bp->enabled)
1414	1547	continue;
..	..	@@ -1470,6 +1603,7 @@
1470	1603	case 0x1300: ret = "(Instruction Breakpoint)"; break;
1471	1604	case 0x1500: ret = "(Denormalisation)"; break;
1472	1605	case 0x1700: ret = "(Altivec Assist)"; break;
	1606	+ case 0x3000: ret = "(System Call Vectored)"; break;
1473	1607	default: ret = "";
1474	1608	}
1475	1609	return ret;
..	..	@@ -1706,7 +1840,7 @@
1706	1840	#endif
1707	1841	printf("pc = ");
1708	1842	xmon_print_symbol(fp->nip, " ", "\n");
1709		- if (TRAP(fp) != 0xc00 && cpu_has_feature(CPU_FTR_CFAR)) {
	1843	+ if (!trap_is_syscall(fp) && cpu_has_feature(CPU_FTR_CFAR)) {
1710	1844	printf("cfar= ");
1711	1845	xmon_print_symbol(fp->orig_gpr3, " ", "\n");
1712	1846	}
..	..	@@ -1738,7 +1872,7 @@
1738	1872	catch_memory_errors = 1;
1739	1873	sync();
1740	1874
1741		- if (cmd != 'i') {
	1875	+ if (cmd != 'i' \|\| IS_ENABLED(CONFIG_PPC_BOOK3S_64)) {
1742	1876	for (; nflush > 0; --nflush, adrs += L1_CACHE_BYTES)
1743	1877	cflush((void *) adrs);
1744	1878	} else {
..	..	@@ -1779,6 +1913,11 @@
1779	1913	static void
1780	1914	write_spr(int n, unsigned long val)
1781	1915	{
	1916	+ if (xmon_is_ro) {
	1917	+ printf(xmon_ro_msg);
	1918	+ return;
	1919	+ }
	1920	+
1782	1921	if (setjmp(bus_error_jmp) == 0) {
1783	1922	catch_spr_faults = 1;
1784	1923	sync();
..	..	@@ -1863,8 +2002,13 @@
1863	2002
1864	2003	printf("hfscr = %.16lx dhdes = %.16lx rpr = %.16lx\n",
1865	2004	mfspr(SPRN_HFSCR), mfspr(SPRN_DHDES), mfspr(SPRN_RPR));
1866		- printf("dawr = %.16lx dawrx = %.16lx ciabr = %.16lx\n",
1867		- mfspr(SPRN_DAWR), mfspr(SPRN_DAWRX), mfspr(SPRN_CIABR));
	2005	+ printf("dawr0 = %.16lx dawrx0 = %.16lx\n",
	2006	+ mfspr(SPRN_DAWR0), mfspr(SPRN_DAWRX0));
	2007	+ if (nr_wp_slots() > 1) {
	2008	+ printf("dawr1 = %.16lx dawrx1 = %.16lx\n",
	2009	+ mfspr(SPRN_DAWR1), mfspr(SPRN_DAWRX1));
	2010	+ }
	2011	+ printf("ciabr = %.16lx\n", mfspr(SPRN_CIABR));
1868	2012	#endif
1869	2013	}
1870	2014
..	..	@@ -1886,6 +2030,18 @@
1886	2030
1887	2031	printf("ptcr = %.16lx asdr = %.16lx\n",
1888	2032	mfspr(SPRN_PTCR), mfspr(SPRN_ASDR));
	2033	+#endif
	2034	+}
	2035	+
	2036	+static void dump_310_sprs(void)
	2037	+{
	2038	+#ifdef CONFIG_PPC64
	2039	+ if (!cpu_has_feature(CPU_FTR_ARCH_31))
	2040	+ return;
	2041	+
	2042	+ printf("mmcr3 = %.16lx, sier2 = %.16lx, sier3 = %.16lx\n",
	2043	+ mfspr(SPRN_MMCR3), mfspr(SPRN_SIER2), mfspr(SPRN_SIER3));
	2044	+
1889	2045	#endif
1890	2046	}
1891	2047
..	..	@@ -1943,6 +2099,7 @@
1943	2099	dump_206_sprs();
1944	2100	dump_207_sprs();
1945	2101	dump_300_sprs();
	2102	+ dump_310_sprs();
1946	2103
1947	2104	return;
1948	2105	}
..	..	@@ -2017,6 +2174,12 @@
2017	2174	char p, q;
2018	2175
2019	2176	n = 0;
	2177	+
	2178	+ if (xmon_is_ro) {
	2179	+ printf(xmon_ro_msg);
	2180	+ return n;
	2181	+ }
	2182	+
2020	2183	if (setjmp(bus_error_jmp) == 0) {
2021	2184	catch_memory_errors = 1;
2022	2185	sync();
..	..	@@ -2044,6 +2207,25 @@
2044	2207	n = size;
2045	2208	} else {
2046	2209	printf("*** Error writing address "REG"\n", adrs + n);
	2210	+ }
	2211	+ catch_memory_errors = 0;
	2212	+ return n;
	2213	+}
	2214	+
	2215	+static int
	2216	+mread_instr(unsigned long adrs, struct ppc_inst *instr)
	2217	+{
	2218	+ volatile int n;
	2219	+
	2220	+ n = 0;
	2221	+ if (setjmp(bus_error_jmp) == 0) {
	2222	+ catch_memory_errors = 1;
	2223	+ sync();
	2224	+ instr = ppc_inst_read((struct ppc_inst )adrs);
	2225	+ sync();
	2226	+ /* wait a little while to see if we get a machine check */
	2227	+ __delay(200);
	2228	+ n = ppc_inst_len(*instr);
2047	2229	}
2048	2230	catch_memory_errors = 0;
2049	2231	return n;
..	..	@@ -2381,25 +2563,33 @@
2381	2563	DUMP(p, cpu_start, "%#-*x");
2382	2564	DUMP(p, kexec_state, "%#-*x");
2383	2565	#ifdef CONFIG_PPC_BOOK3S_64
2384		- for (i = 0; i < SLB_NUM_BOLTED; i++) {
2385		- u64 esid, vsid;
	2566	+ if (!early_radix_enabled()) {
	2567	+ for (i = 0; i < SLB_NUM_BOLTED; i++) {
	2568	+ u64 esid, vsid;
2386	2569
2387		- if (!p->slb_shadow_ptr)
2388		- continue;
	2570	+ if (!p->slb_shadow_ptr)
	2571	+ continue;
2389	2572
2390		- esid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].esid);
2391		- vsid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].vsid);
	2573	+ esid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].esid);
	2574	+ vsid = be64_to_cpu(p->slb_shadow_ptr->save_area[i].vsid);
2392	2575
2393		- if (esid \|\| vsid) {
2394		- printf(" %-*s[%d] = 0x%016llx 0x%016llx\n",
2395		- 22, "slb_shadow", i, esid, vsid);
	2576	+ if (esid \|\| vsid) {
	2577	+ printf(" %-*s[%d] = 0x%016llx 0x%016llx\n",
	2578	+ 22, "slb_shadow", i, esid, vsid);
	2579	+ }
	2580	+ }
	2581	+ DUMP(p, vmalloc_sllp, "%#-*x");
	2582	+ DUMP(p, stab_rr, "%#-*x");
	2583	+ DUMP(p, slb_used_bitmap, "%#-*x");
	2584	+ DUMP(p, slb_kern_bitmap, "%#-*x");
	2585	+
	2586	+ if (!early_cpu_has_feature(CPU_FTR_ARCH_300)) {
	2587	+ DUMP(p, slb_cache_ptr, "%#-*x");
	2588	+ for (i = 0; i < SLB_CACHE_ENTRIES; i++)
	2589	+ printf(" %-*s[%d] = 0x%016x\n",
	2590	+ 22, "slb_cache", i, p->slb_cache[i]);
2396	2591	}
2397	2592	}
2398		- DUMP(p, vmalloc_sllp, "%#-*x");
2399		- DUMP(p, slb_cache_ptr, "%#-*x");
2400		- for (i = 0; i < SLB_CACHE_ENTRIES; i++)
2401		- printf(" %-*s[%d] = 0x%016x\n",
2402		- 22, "slb_cache", i, p->slb_cache[i]);
2403	2593
2404	2594	DUMP(p, rfi_flush_fallback_area, "%-*px");
2405	2595	#endif
..	..	@@ -2415,14 +2605,20 @@
2415	2605	DUMP(p, __current, "%-*px");
2416	2606	DUMP(p, kstack, "%#-*llx");
2417	2607	printf(" %-*s = 0x%016llx\n", 25, "kstack_base", p->kstack & ~(THREAD_SIZE - 1));
2418		- DUMP(p, stab_rr, "%#-*llx");
	2608	+#ifdef CONFIG_STACKPROTECTOR
	2609	+ DUMP(p, canary, "%#-*lx");
	2610	+#endif
2419	2611	DUMP(p, saved_r1, "%#-*llx");
	2612	+#ifdef CONFIG_PPC_BOOK3E
2420	2613	DUMP(p, trap_save, "%#-*x");
	2614	+#endif
2421	2615	DUMP(p, irq_soft_mask, "%#-*x");
2422	2616	DUMP(p, irq_happened, "%#-*x");
2423		- DUMP(p, io_sync, "%#-*x");
	2617	+#ifdef CONFIG_MMIOWB
	2618	+ DUMP(p, mmiowb_state.nesting_count, "%#-*x");
	2619	+ DUMP(p, mmiowb_state.mmiowb_pending, "%#-*x");
	2620	+#endif
2424	2621	DUMP(p, irq_work_pending, "%#-*x");
2425		- DUMP(p, nap_state_lost, "%#-*x");
2426	2622	DUMP(p, sprg_vdso, "%#-*llx");
2427	2623
2428	2624	#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
..	..	@@ -2430,28 +2626,29 @@
2430	2626	#endif
2431	2627
2432	2628	#ifdef CONFIG_PPC_POWERNV
2433		- DUMP(p, core_idle_state_ptr, "%-*px");
2434		- DUMP(p, thread_idle_state, "%#-*x");
2435		- DUMP(p, thread_mask, "%#-*x");
2436		- DUMP(p, subcore_sibling_mask, "%#-*x");
2437		- DUMP(p, requested_psscr, "%#-*llx");
2438		- DUMP(p, stop_sprs.pid, "%#-*llx");
2439		- DUMP(p, stop_sprs.ldbar, "%#-*llx");
2440		- DUMP(p, stop_sprs.fscr, "%#-*llx");
2441		- DUMP(p, stop_sprs.hfscr, "%#-*llx");
2442		- DUMP(p, stop_sprs.mmcr1, "%#-*llx");
2443		- DUMP(p, stop_sprs.mmcr2, "%#-*llx");
2444		- DUMP(p, stop_sprs.mmcra, "%#-*llx");
2445		- DUMP(p, dont_stop.counter, "%#-*x");
	2629	+ DUMP(p, idle_state, "%#-*lx");
	2630	+ if (!early_cpu_has_feature(CPU_FTR_ARCH_300)) {
	2631	+ DUMP(p, thread_idle_state, "%#-*x");
	2632	+ DUMP(p, subcore_sibling_mask, "%#-*x");
	2633	+ } else {
	2634	+#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
	2635	+ DUMP(p, requested_psscr, "%#-*llx");
	2636	+ DUMP(p, dont_stop.counter, "%#-*x");
	2637	+#endif
	2638	+ }
2446	2639	#endif
2447	2640
2448	2641	DUMP(p, accounting.utime, "%#-*lx");
2449	2642	DUMP(p, accounting.stime, "%#-*lx");
	2643	+#ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME
2450	2644	DUMP(p, accounting.utime_scaled, "%#-*lx");
	2645	+#endif
2451	2646	DUMP(p, accounting.starttime, "%#-*lx");
2452	2647	DUMP(p, accounting.starttime_user, "%#-*lx");
	2648	+#ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME
2453	2649	DUMP(p, accounting.startspurr, "%#-*lx");
2454	2650	DUMP(p, accounting.utime_sspurr, "%#-*lx");
	2651	+#endif
2455	2652	DUMP(p, accounting.steal_time, "%#-*lx");
2456	2653	#undef DUMP
2457	2654
..	..	@@ -2534,16 +2731,28 @@
2534	2731	dump_one_xive(cpu);
2535	2732	}
2536	2733
2537		-static void dump_one_xive_irq(u32 num)
	2734	+static void dump_one_xive_irq(u32 num, struct irq_data *d)
2538	2735	{
2539		- s64 rc;
2540		- __be64 vp;
2541		- u8 prio;
2542		- __be32 lirq;
	2736	+ xmon_xive_get_irq_config(num, d);
	2737	+}
2543	2738
2544		- rc = opal_xive_get_irq_config(num, &vp, &prio, &lirq);
2545		- xmon_printf("IRQ 0x%x config: vp=0x%llx prio=%d lirq=0x%x (rc=%lld)\n",
2546		- num, be64_to_cpu(vp), prio, be32_to_cpu(lirq), rc);
	2739	+static void dump_all_xive_irq(void)
	2740	+{
	2741	+ unsigned int i;
	2742	+ struct irq_desc *desc;
	2743	+
	2744	+ for_each_irq_desc(i, desc) {
	2745	+ struct irq_data *d = irq_desc_get_irq_data(desc);
	2746	+ unsigned int hwirq;
	2747	+
	2748	+ if (!d)
	2749	+ continue;
	2750	+
	2751	+ hwirq = (unsigned int)irqd_to_hwirq(d);
	2752	+ /* IPIs are special (HW number 0) */
	2753	+ if (hwirq)
	2754	+ dump_one_xive_irq(hwirq, d);
	2755	+ }
2547	2756	}
2548	2757
2549	2758	static void dump_xives(void)
..	..	@@ -2562,7 +2771,9 @@
2562	2771	return;
2563	2772	} else if (c == 'i') {
2564	2773	if (scanhex(&num))
2565		- dump_one_xive_irq(num);
	2774	+ dump_one_xive_irq(num, NULL);
	2775	+ else
	2776	+ dump_all_xive_irq();
2566	2777	return;
2567	2778	}
2568	2779
..	..	@@ -2603,7 +2814,12 @@
2603	2814
2604	2815	printf("%0llx", size 2, val);
2605	2816	}
2606		- printf("\n");
	2817	+ printf(" \|");
	2818	+ for (j = 0; j < 16; ++j) {
	2819	+ val = temp[j];
	2820	+ putchar(' ' <= val && val <= '~' ? val : '.');
	2821	+ }
	2822	+ printf("\|\n");
2607	2823	}
2608	2824	}
2609	2825
..	..	@@ -2647,8 +2863,8 @@
2647	2863	scanhex(&nidump);
2648	2864	if (nidump == 0)
2649	2865	nidump = 16;
2650		- else if (nidump > MAX_DUMP)
2651		- nidump = MAX_DUMP;
	2866	+ else if (nidump > MAX_IDUMP)
	2867	+ nidump = MAX_IDUMP;
2652	2868	adrs += ppc_inst_dump(adrs, nidump, 1);
2653	2869	last_cmd = "di\n";
2654	2870	} else if (c == 'l') {
..	..	@@ -2741,12 +2957,11 @@
2741	2957	{
2742	2958	int nr, dotted;
2743	2959	unsigned long first_adr;
2744		- unsigned int inst, last_inst = 0;
2745		- unsigned char val[4];
	2960	+ struct ppc_inst inst, last_inst = ppc_inst(0);
2746	2961
2747	2962	dotted = 0;
2748		- for (first_adr = adr; count > 0; --count, adr += 4) {
2749		- nr = mread(adr, val, 4);
	2963	+ for (first_adr = adr; count > 0; --count, adr += ppc_inst_len(inst)) {
	2964	+ nr = mread_instr(adr, &inst);
2750	2965	if (nr == 0) {
2751	2966	if (praddr) {
2752	2967	const char *x = fault_chars[fault_type];
..	..	@@ -2754,8 +2969,7 @@
2754	2969	}
2755	2970	break;
2756	2971	}
2757		- inst = GETWORD(val);
2758		- if (adr > first_adr && inst == last_inst) {
	2972	+ if (adr > first_adr && ppc_inst_equal(inst, last_inst)) {
2759	2973	if (!dotted) {
2760	2974	printf(" ...\n");
2761	2975	dotted = 1;
..	..	@@ -2765,9 +2979,12 @@
2765	2979	dotted = 0;
2766	2980	last_inst = inst;
2767	2981	if (praddr)
2768		- printf(REG" %.8x", adr, inst);
	2982	+ printf(REG" %s", adr, ppc_inst_as_str(inst));
2769	2983	printf("\t");
2770		- dump_func(inst, adr);
	2984	+ if (!ppc_inst_prefixed(inst))
	2985	+ dump_func(ppc_inst_val(inst), adr);
	2986	+ else
	2987	+ dump_func(ppc_inst_as_u64(inst), adr);
2771	2988	printf("\n");
2772	2989	}
2773	2990	return adr - first_adr;
..	..	@@ -2785,10 +3002,10 @@
2785	3002	xmon_print_symbol(addr, "\t# ", "");
2786	3003	}
2787	3004
2788		-void
	3005	+static void
2789	3006	dump_log_buf(void)
2790	3007	{
2791		- struct kmsg_dumper dumper = { .active = 1 };
	3008	+ struct kmsg_dumper_iter iter = { .active = 1 };
2792	3009	unsigned char buf[128];
2793	3010	size_t len;
2794	3011
..	..	@@ -2800,9 +3017,9 @@
2800	3017	catch_memory_errors = 1;
2801	3018	sync();
2802	3019
2803		- kmsg_dump_rewind_nolock(&dumper);
	3020	+ kmsg_dump_rewind(&iter);
2804	3021	xmon_start_pagination();
2805		- while (kmsg_dump_get_line_nolock(&dumper, false, buf, sizeof(buf), &len)) {
	3022	+ while (kmsg_dump_get_line(&iter, false, buf, sizeof(buf), &len)) {
2806	3023	buf[len] = '\0';
2807	3024	printf("%s", buf);
2808	3025	}
..	..	@@ -2874,9 +3091,17 @@
2874	3091	scanhex((void *)&mcount);
2875	3092	switch( cmd ){
2876	3093	case 'm':
	3094	+ if (xmon_is_ro) {
	3095	+ printf(xmon_ro_msg);
	3096	+ break;
	3097	+ }
2877	3098	memmove((void )mdest, (void )msrc, mcount);
2878	3099	break;
2879	3100	case 's':
	3101	+ if (xmon_is_ro) {
	3102	+ printf(xmon_ro_msg);
	3103	+ break;
	3104	+ }
2880	3105	memset((void *)mdest, mval, mcount);
2881	3106	break;
2882	3107	case 'd':
..	..	@@ -2984,25 +3209,27 @@
2984	3209	(tsk->exit_state & EXIT_DEAD) ? 'E' :
2985	3210	(tsk->state & TASK_INTERRUPTIBLE) ? 'S' : '?';
2986	3211
2987		- printf("%px %016lx %6d %6d %c %2d %s\n", tsk,
2988		- tsk->thread.ksp,
2989		- tsk->pid, tsk->parent->pid,
2990		- state, task_thread_info(tsk)->cpu,
	3212	+ printf("%16px %16lx %16px %6d %6d %c %2d %s\n", tsk,
	3213	+ tsk->thread.ksp, tsk->thread.regs,
	3214	+ tsk->pid, rcu_dereference(tsk->parent)->pid,
	3215	+ state, task_cpu(tsk),
2991	3216	tsk->comm);
2992	3217	}
2993	3218
2994	3219	#ifdef CONFIG_PPC_BOOK3S_64
2995		-void format_pte(void *ptep, unsigned long pte)
	3220	+static void format_pte(void *ptep, unsigned long pte)
2996	3221	{
	3222	+ pte_t entry = __pte(pte);
	3223	+
2997	3224	printf("ptep @ 0x%016lx = 0x%016lx\n", (unsigned long)ptep, pte);
2998	3225	printf("Maps physical address = 0x%016lx\n", pte & PTE_RPN_MASK);
2999	3226
3000	3227	printf("Flags = %s%s%s%s%s\n",
3001		- (pte & _PAGE_ACCESSED) ? "Accessed " : "",
3002		- (pte & _PAGE_DIRTY) ? "Dirty " : "",
3003		- (pte & _PAGE_READ) ? "Read " : "",
3004		- (pte & _PAGE_WRITE) ? "Write " : "",
3005		- (pte & _PAGE_EXEC) ? "Exec " : "");
	3228	+ pte_young(entry) ? "Accessed " : "",
	3229	+ pte_dirty(entry) ? "Dirty " : "",
	3230	+ pte_read(entry) ? "Read " : "",
	3231	+ pte_write(entry) ? "Write " : "",
	3232	+ pte_exec(entry) ? "Exec " : "");
3006	3233	}
3007	3234
3008	3235	static void show_pte(unsigned long addr)
..	..	@@ -3010,7 +3237,8 @@
3010	3237	unsigned long tskv = 0;
3011	3238	struct task_struct *tsk = NULL;
3012	3239	struct mm_struct *mm;
3013		- pgd_t pgdp, pgdir;
	3240	+ pgd_t *pgdp;
	3241	+ p4d_t *p4dp;
3014	3242	pud_t *pudp;
3015	3243	pmd_t *pmdp;
3016	3244	pte_t *ptep;
..	..	@@ -3034,35 +3262,33 @@
3034	3262	catch_memory_errors = 1;
3035	3263	sync();
3036	3264
3037		- if (mm == &init_mm) {
	3265	+ if (mm == &init_mm)
3038	3266	pgdp = pgd_offset_k(addr);
3039		- pgdir = pgd_offset_k(0);
3040		- } else {
	3267	+ else
3041	3268	pgdp = pgd_offset(mm, addr);
3042		- pgdir = pgd_offset(mm, 0);
3043		- }
3044	3269
3045		- if (pgd_none(*pgdp)) {
3046		- printf("no linux page table for address\n");
	3270	+ p4dp = p4d_offset(pgdp, addr);
	3271	+
	3272	+ if (p4d_none(*p4dp)) {
	3273	+ printf("No valid P4D\n");
3047	3274	return;
3048	3275	}
3049	3276
3050		- printf("pgd @ 0x%px\n", pgdir);
3051		-
3052		- if (pgd_huge(*pgdp)) {
3053		- format_pte(pgdp, pgd_val(*pgdp));
	3277	+ if (p4d_is_leaf(*p4dp)) {
	3278	+ format_pte(p4dp, p4d_val(*p4dp));
3054	3279	return;
3055	3280	}
3056		- printf("pgdp @ 0x%px = 0x%016lx\n", pgdp, pgd_val(*pgdp));
3057	3281
3058		- pudp = pud_offset(pgdp, addr);
	3282	+ printf("p4dp @ 0x%px = 0x%016lx\n", p4dp, p4d_val(*p4dp));
	3283	+
	3284	+ pudp = pud_offset(p4dp, addr);
3059	3285
3060	3286	if (pud_none(*pudp)) {
3061	3287	printf("No valid PUD\n");
3062	3288	return;
3063	3289	}
3064	3290
3065		- if (pud_huge(*pudp)) {
	3291	+ if (pud_is_leaf(*pudp)) {
3066	3292	format_pte(pudp, pud_val(*pudp));
3067	3293	return;
3068	3294	}
..	..	@@ -3076,7 +3302,7 @@
3076	3302	return;
3077	3303	}
3078	3304
3079		- if (pmd_huge(*pmdp)) {
	3305	+ if (pmd_is_leaf(*pmdp)) {
3080	3306	format_pte(pmdp, pmd_val(*pmdp));
3081	3307	return;
3082	3308	}
..	..	@@ -3106,7 +3332,7 @@
3106	3332	unsigned long tskv;
3107	3333	struct task_struct *tsk = NULL;
3108	3334
3109		- printf(" task_struct ->thread.ksp PID PPID S P CMD\n");
	3335	+ printf(" task_struct ->thread.ksp ->thread.regs PID PPID S P CMD\n");
3110	3336
3111	3337	if (scanhex(&tskv))
3112	3338	tsk = (struct task_struct *)tskv;
..	..	@@ -3316,6 +3542,11 @@
3316	3542	int c;
3317	3543
3318	3544	c = skipbl();
	3545	+ if (c == '\n') {
	3546	+ *s = 0;
	3547	+ return;
	3548	+ }
	3549	+
3319	3550	do {
3320	3551	if( size > 1 ){
3321	3552	*s++ = c;
..	..	@@ -3485,7 +3716,7 @@
3485	3716	}
3486	3717	#endif
3487	3718
3488		-#ifdef CONFIG_PPC_STD_MMU_32
	3719	+#ifdef CONFIG_PPC_BOOK3S_32
3489	3720	void dump_segments(void)
3490	3721	{
3491	3722	int i;
..	..	@@ -3700,6 +3931,11 @@
3700	3931	#ifdef CONFIG_MAGIC_SYSRQ
3701	3932	static void sysrq_handle_xmon(int key)
3702	3933	{
	3934	+ if (xmon_is_locked_down()) {
	3935	+ clear_all_bpt();
	3936	+ xmon_init(0);
	3937	+ return;
	3938	+ }
3703	3939	/* ensure xmon is enabled */
3704	3940	xmon_init(1);
3705	3941	debugger(get_irq_regs());
..	..	@@ -3707,7 +3943,7 @@
3707	3943	xmon_init(0);
3708	3944	}
3709	3945
3710		-static struct sysrq_key_op sysrq_xmon_op = {
	3946	+static const struct sysrq_key_op sysrq_xmon_op = {
3711	3947	.handler = sysrq_handle_xmon,
3712	3948	.help_msg = "xmon(x)",
3713	3949	.action_msg = "Entering xmon",
..	..	@@ -3721,7 +3957,6 @@
3721	3957	device_initcall(setup_xmon_sysrq);
3722	3958	#endif /* CONFIG_MAGIC_SYSRQ */
3723	3959
3724		-#ifdef CONFIG_DEBUG_FS
3725	3960	static void clear_all_bpt(void)
3726	3961	{
3727	3962	int i;
..	..	@@ -3735,22 +3970,25 @@
3735	3970	bpts[i].enabled = 0;
3736	3971
3737	3972	/* Clear any data or iabr breakpoints */
3738		- if (iabr \|\| dabr.enabled) {
3739		- iabr = NULL;
3740		- dabr.enabled = 0;
3741		- }
3742		-
3743		- printf("xmon: All breakpoints cleared\n");
	3973	+ iabr = NULL;
	3974	+ for (i = 0; i < nr_wp_slots(); i++)
	3975	+ dabr[i].enabled = 0;
3744	3976	}
3745	3977
	3978	+#ifdef CONFIG_DEBUG_FS
3746	3979	static int xmon_dbgfs_set(void *data, u64 val)
3747	3980	{
3748	3981	xmon_on = !!val;
3749	3982	xmon_init(xmon_on);
3750	3983
3751	3984	/* make sure all breakpoints removed when disabling */
3752		- if (!xmon_on)
	3985	+ if (!xmon_on) {
3753	3986	clear_all_bpt();
	3987	+ get_output_lock();
	3988	+ printf("xmon: All breakpoints cleared\n");
	3989	+ release_output_lock();
	3990	+ }
	3991	+
3754	3992	return 0;
3755	3993	}
3756	3994
..	..	@@ -3776,7 +4014,11 @@
3776	4014
3777	4015	static int __init early_parse_xmon(char *p)
3778	4016	{
3779		- if (!p \|\| strncmp(p, "early", 5) == 0) {
	4017	+ if (xmon_is_locked_down()) {
	4018	+ xmon_init(0);
	4019	+ xmon_early = 0;
	4020	+ xmon_on = 0;
	4021	+ } else if (!p \|\| strncmp(p, "early", 5) == 0) {
3780	4022	/* just "xmon" is equivalent to "xmon=early" */
3781	4023	xmon_init(1);
3782	4024	xmon_early = 1;
..	..	@@ -3784,6 +4026,14 @@
3784	4026	} else if (strncmp(p, "on", 2) == 0) {
3785	4027	xmon_init(1);
3786	4028	xmon_on = 1;
	4029	+ } else if (strncmp(p, "rw", 2) == 0) {
	4030	+ xmon_init(1);
	4031	+ xmon_on = 1;
	4032	+ xmon_is_ro = false;
	4033	+ } else if (strncmp(p, "ro", 2) == 0) {
	4034	+ xmon_init(1);
	4035	+ xmon_on = 1;
	4036	+ xmon_is_ro = true;
3787	4037	} else if (strncmp(p, "off", 3) == 0)
3788	4038	xmon_on = 0;
3789	4039	else
..	..	@@ -4031,6 +4281,7 @@
4031	4281	subcmd = inchar();
4032	4282	if (isxdigit(subcmd) \|\| subcmd == '\n')
4033	4283	termch = subcmd;
	4284	+ fallthrough;
4034	4285	case 'f':
4035	4286	scanhex(&num);
4036	4287	if (num >= XMON_NUM_SPUS \|\| !spu_info[num].spu) {