lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 01 Jul 2020 09:17:32 -0500 From: steve.wahl@....com To: Jonathan Corbet <corbet@....net>, Ard Biesheuvel <ardb@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>, x86@...nel.org, "H. Peter Anvin" <hpa@...or.com>, Darren Hart <dvhart@...radead.org>, Andy Shevchenko <andy@...radead.org>, Mauro Carvalho Chehab <mchehab+huawei@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, "Paul E. McKenney" <paulmck@...nel.org>, Pawan Gupta <pawan.kumar.gupta@...ux.intel.com>, Juergen Gross <jgross@...e.com>, Mike Kravetz <mike.kravetz@...cle.com>, Oliver Neukum <oneukum@...e.com>, Mike Travis <mike.travis@....com>, Steve Wahl <steve.wahl@....com>, Dimitri Sivanich <dimitri.sivanich@....com>, Benjamin Thiel <b.thiel@...teo.de>, Andy Lutomirski <luto@...nel.org>, Arnd Bergmann <arnd@...db.de>, James Morris <jmorris@...ei.org>, David Howells <dhowells@...hat.com>, Kees Cook <keescook@...omium.org>, Dave Young <dyoung@...hat.com>, Dan Williams <dan.j.williams@...el.com>, Logan Gunthorpe <logang@...tatee.com>, Alexandre Chartre <alexandre.chartre@...cle.com>, "Peter Zijlstra (Intel)" <peterz@...radead.org>, Austin Kim <austindh.kim@...il.com>, Alexey Dobriyan <adobriyan@...il.com>, linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org, linux-efi@...r.kernel.org Cc: Russ Anderson <rja@....com> Subject: [patch 01/13] Remove support for UV1 platform from uv_time.c arch/x86/platform/uv/uv_time.c: remove UV1 support Signed-off-by: Steve Wahl <steve.wahl@....com> --- arch/x86/platform/uv/uv_time.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c index 7af31b245636..41e982fda86c 100644 --- a/arch/x86/platform/uv/uv_time.c +++ b/arch/x86/platform/uv/uv_time.c @@ -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,19 +94,15 @@ 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); + uv_write_global_mmr64(pnode, UVXH_EVENT_OCCURRED2_ALIAS, + UVXH_EVENT_OCCURRED2_RTC_1_MASK); val = (X86_PLATFORM_IPI_VECTOR << UVH_RTC1_INT_CONFIG_VECTOR_SHFT) | ((u64)apicid << UVH_RTC1_INT_CONFIG_APIC_ID_SHFT); -- 2.12.3
Powered by blists - more mailing lists