x86/platform/uv: Update UV5 TSC checking (6a7cf55e) · Commits · 戴 / test

arch/x86/include/asm/uv/uv_hub.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -726,7 +726,7 @@ extern void uv_nmi_setup_hubless(void);
		#define UVH_TSC_SYNC_SHIFT_UV2K 16 /* UV2/3k have different bits */
		#define UVH_TSC_SYNC_MASK 3 /* 0011 */
		#define UVH_TSC_SYNC_VALID 3 /* 0011 */
		#define UVH_TSC_SYNC_INVALID 2 /* 0010 */
		#define UVH_TSC_SYNC_UNKNOWN 0 /* 0000 */

		/* BMC sets a bit this MMR non-zero before sending an NMI */
		#define UVH_NMI_MMR UVH_BIOS_KERNEL_MMR

+10 −14

Original line number	Diff line number	Diff line
		@@ -197,36 +197,32 @@ static void __init uv_tsc_check_sync(void)
		int sync_state;
		int mmr_shift;
		char *state;
		bool valid;

		/* Accommodate different UV arch BIOSes */
		/* Different returns from different UV BIOS versions */
		mmr = uv_early_read_mmr(UVH_TSC_SYNC_MMR);
		mmr_shift =
		is_uv2_hub() ? UVH_TSC_SYNC_SHIFT_UV2K : UVH_TSC_SYNC_SHIFT;
		sync_state = (mmr >> mmr_shift) & UVH_TSC_SYNC_MASK;

		/* Check if TSC is valid for all sockets */
		switch (sync_state) {
		case UVH_TSC_SYNC_VALID:
		state = "in sync";
		valid = true;
		mark_tsc_async_resets("UV BIOS");
		break;

		case UVH_TSC_SYNC_INVALID:
		state = "unstable";
		valid = false;
		/* If BIOS state unknown, don't do anything */
		case UVH_TSC_SYNC_UNKNOWN:
		state = "unknown";
		break;

		/* Otherwise, BIOS indicates problem with TSC */
		default:
		state = "unknown: assuming valid";
		valid = true;
		state = "unstable";
		mark_tsc_unstable("UV BIOS");
		break;
		}
		pr_info("UV: TSC sync state from BIOS:0%d(%s)\n", sync_state, state);

		/* Mark flag that says TSC != 0 is valid for socket 0 */
		if (valid)
		mark_tsc_async_resets("UV BIOS");
		else
		mark_tsc_unstable("UV BIOS");
		}

		/* Selector for (4\|4A\|5) structs */