From owner-svn-src-projects@FreeBSD.ORG Mon Sep 1 18:25:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 344EFED4; Mon, 1 Sep 2014 18:25:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 054CE1EDD; Mon, 1 Sep 2014 18:25:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81IPkLu081504; Mon, 1 Sep 2014 18:25:46 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81IPkim081501; Mon, 1 Sep 2014 18:25:46 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201409011825.s81IPkim081501@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 1 Sep 2014 18:25:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r270939 - in projects/arm64: lib/libc/arm64/gen sys/arm64/arm64 sys/arm64/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2014 18:25:47 -0000 Author: andrew Date: Mon Sep 1 18:25:46 2014 New Revision: 270939 URL: http://svnweb.freebsd.org/changeset/base/270939 Log: Start to support tls using the tpidr_el0 register Modified: projects/arm64/lib/libc/arm64/gen/_set_tp.c projects/arm64/sys/arm64/arm64/swtch.S projects/arm64/sys/arm64/include/pcb.h Modified: projects/arm64/lib/libc/arm64/gen/_set_tp.c ============================================================================== --- projects/arm64/lib/libc/arm64/gen/_set_tp.c Mon Sep 1 18:25:41 2014 (r270938) +++ projects/arm64/lib/libc/arm64/gen/_set_tp.c Mon Sep 1 18:25:46 2014 (r270939) @@ -37,5 +37,5 @@ void _set_tp(void *tp) { - //sysarch(ARM_SET_TP, tp); + asm volatile("msr tpidr_el0, %0" : : "r"(tp)); } Modified: projects/arm64/sys/arm64/arm64/swtch.S ============================================================================== --- projects/arm64/sys/arm64/arm64/swtch.S Mon Sep 1 18:25:41 2014 (r270938) +++ projects/arm64/sys/arm64/arm64/swtch.S Mon Sep 1 18:25:46 2014 (r270939) @@ -90,9 +90,8 @@ ENTRY(cpu_switch) str x30, [x4, #PCB_REGS + 30 * 8] /* And the old stack pointer */ mov x5, sp - str x5, [x4, #PCB_SP] - - /* TODO: Save/restore the tls thread pointer */ + mrs x6, tpidr_el0 + stp x5, x6, [x4, #PCB_SP] /* * Restore the saved context. @@ -119,8 +118,9 @@ ENTRY(cpu_switch) #endif /* Restore the registers */ - ldr x5, [x4, #PCB_SP] + ldp x5, x6, [x4, #PCB_SP] mov sp, x5 + msr tpidr_el0, x6 ldp x8, x9, [x4, #PCB_REGS + 8 * 8] ldp x10, x11, [x4, #PCB_REGS + 10 * 8] ldp x12, x13, [x4, #PCB_REGS + 12 * 8] Modified: projects/arm64/sys/arm64/include/pcb.h ============================================================================== --- projects/arm64/sys/arm64/include/pcb.h Mon Sep 1 18:25:41 2014 (r270938) +++ projects/arm64/sys/arm64/include/pcb.h Mon Sep 1 18:25:46 2014 (r270939) @@ -36,7 +36,9 @@ struct trapframe; #define PCB_LR 30 struct pcb { uint64_t pcb_x[31]; + /* These need to be in order as we access them together */ uint64_t pcb_sp; + uint64_t pcb_tpidr_el0; vm_offset_t pcb_l1addr; } __aligned(64);