x86/platform/uv: Remove support for UV1 platform from uv_time (8b3c9b16) · Commits · 戴 / test

arch/x86/platform/uv/uv_time.c

+4 −12

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ static void uv_rtc_send_IPI(int cpu)

		apicid = cpu_physical_id(cpu);
		pnode = uv_apicid_to_pnode(apicid);
		apicid \|= uv_apicid_hibits;
		val = (1UL << UVH_IPI_INT_SEND_SHFT) \|
		(apicid << UVH_IPI_INT_APIC_ID_SHFT) \|
		(X86_PLATFORM_IPI_VECTOR << UVH_IPI_INT_VECTOR_SHFT);
		@@ -85,10 +84,7 @@ static void uv_rtc_send_IPI(int cpu)
		/* Check for an RTC interrupt pending */
		static int uv_intr_pending(int pnode)
		{
		if (is_uv1_hub())
		return uv_read_global_mmr64(pnode, UVH_EVENT_OCCURRED0) &
		UV1H_EVENT_OCCURRED0_RTC1_MASK;
		else if (is_uvx_hub())
		if (is_uvx_hub())
		return uv_read_global_mmr64(pnode, UVXH_EVENT_OCCURRED2) &
		UVXH_EVENT_OCCURRED2_RTC_1_MASK;
		return 0;
		@@ -98,17 +94,13 @@ static int uv_intr_pending(int pnode)
		static int uv_setup_intr(int cpu, u64 expires)
		{
		u64 val;
		unsigned long apicid = cpu_physical_id(cpu) \| uv_apicid_hibits;
		unsigned long apicid = cpu_physical_id(cpu);
		int pnode = uv_cpu_to_pnode(cpu);

		uv_write_global_mmr64(pnode, UVH_RTC1_INT_CONFIG,
		UVH_RTC1_INT_CONFIG_M_MASK);
		uv_write_global_mmr64(pnode, UVH_INT_CMPB, -1L);

		if (is_uv1_hub())
		uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED0_ALIAS,
		UV1H_EVENT_OCCURRED0_RTC1_MASK);
		else
		uv_write_global_mmr64(pnode, UVXH_EVENT_OCCURRED2_ALIAS,
		UVXH_EVENT_OCCURRED2_RTC_1_MASK);