Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1244503ybl; Sun, 1 Dec 2019 23:59:33 -0800 (PST) X-Google-Smtp-Source: APXvYqzt18Azk6uf9hX9w+BYv3bme+cnOAmx/jnDi5MUUS311lDRPg6lf2buZ0jyIKV3DefzTr30 X-Received: by 2002:aa7:d316:: with SMTP id p22mr17028831edq.210.1575273573186; Sun, 01 Dec 2019 23:59:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575273573; cv=none; d=google.com; s=arc-20160816; b=i5m/vTZagqIm+xbB4rxm8OEbHKtzIbyH8hnELqPaBdBP5A3Frd4TIzOS5F1jQ1cSXl Hj7xhIsI0Fq1pLotd72LVLX/jj+0Q/9wjSZbfkMRfUezq6QkN8bTdre4B6lPd3A3rTjt z9ZMmfVURaFA1bVT6n2EpJ/0uMnCMi6Q34Clb8OWy7hzcwktgwogXIpR228AWTNekkU6 o7QMNeIRCM0eIxoj/IblVr0/LcNQhO+uyzV9aeKdZ/3OXQ37fN/fYUebI5IvPcM213Zq D1FxYC/xEeXgSHQRxYviH7f/XCESb3B5G72BD2ZLcv4COmDPA3NpyfpwHo+n2TfCpyFq ilGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=0MmKxahs9w5s0ptN3HXvddrZpf6vMx3guYv2r24v18w=; b=OpCcbmP9n04tIYBAkOxdTTea2Dm3KVEU7wRVuDnOsj45//DZAY6M7xVF+YyJ9Or58J juVGqmG9/WY6FLGlVD/Viag9hQIuoH55e0mlTov7r5IqyIMvlCyjhT2mG2vhleinpKHZ OQd2J4l8AVz1rWLCnXtlG4pPTOHK+G1s00FcwO+Ti0+6gx0apQNp2vELQwY1wdOXE8Qc L5bGCjdrCbZewgLOffMEadYVLCnMOYFexyUSRECDyOSqSsiq+3e83Y9vK1gs1NDF7tPm IrrSAv8O28WkZz2KEH694tkVNXQAnWWi6ViYZMLCBILsj9Q+FeHCEDSKUNMq5qpzECFf 0zLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Sia7jOpo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h26si6366845eja.154.2019.12.01.23.58.57; Sun, 01 Dec 2019 23:59:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Sia7jOpo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727414AbfLBH5i (ORCPT + 99 others); Mon, 2 Dec 2019 02:57:38 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:24483 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727385AbfLBH5g (ORCPT ); Mon, 2 Dec 2019 02:57:36 -0500 Received: from localhost (mailhub1-ext [192.168.12.233]) by localhost (Postfix) with ESMTP id 47RHX951dRz9txt4; Mon, 2 Dec 2019 08:57:29 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Sia7jOpo; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id c4MQg7JGYr_R; Mon, 2 Dec 2019 08:57:29 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 47RHX941Jhz9txsp; Mon, 2 Dec 2019 08:57:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1575273449; bh=0MmKxahs9w5s0ptN3HXvddrZpf6vMx3guYv2r24v18w=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Sia7jOpo9VTeV69W4STD+tXHRGgE18B/8gmvhtDe2Lt0q42GppSfU5mQaNNuWpHgz Q9VZI/1uRUxFaZONUgKQI6XKd6eW1CnNjndnBrgQmDPCGgS+QXZhpAx48TmPuc/gHp PBkrLCWVH4X//N1W/FlcI86bME7lmKbp4GuUh3jE= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 295FF8B79B; Mon, 2 Dec 2019 08:57:34 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Ynv3H3G0hmCL; Mon, 2 Dec 2019 08:57:34 +0100 (CET) Received: from po16098vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.103]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 08E328B79A; Mon, 2 Dec 2019 08:57:34 +0100 (CET) Received: by po16098vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 0385463600; Mon, 2 Dec 2019 07:57:33 +0000 (UTC) Message-Id: <37f94e47c91070b7606fb3ec3fe6fd2302a475a0.1575273217.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v4 7/8] powerpc/vdso32: implement clock_getres entirely To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, arnd@arndb.de Date: Mon, 2 Dec 2019 07:57:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clock_getres returns hrtimer_res for all clocks but coarse ones for which it returns KTIME_LOW_RES. return EINVAL for unknown clocks. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/asm-offsets.c | 3 +++ arch/powerpc/kernel/vdso32/gettimeofday.S | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 0013197d89a6..90e53d432f2e 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -413,7 +413,10 @@ int main(void) DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC); DEFINE(CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE); DEFINE(CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE); + DEFINE(CLOCK_MAX, CLOCK_TAI); DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); + DEFINE(EINVAL, EINVAL); + DEFINE(KTIME_LOW_RES, KTIME_LOW_RES); #ifdef CONFIG_BUG DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 9aafacea9c4a..20ae38f3a5a3 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -196,17 +196,20 @@ V_FUNCTION_END(__kernel_clock_gettime) V_FUNCTION_BEGIN(__kernel_clock_getres) .cfi_startproc /* Check for supported clock IDs */ - cmpwi cr0,r3,CLOCK_REALTIME - cmpwi cr1,r3,CLOCK_MONOTONIC - cror cr0*4+eq,cr0*4+eq,cr1*4+eq - bne cr0,99f + cmplwi cr0, r3, CLOCK_MAX + cmpwi cr1, r3, CLOCK_REALTIME_COARSE + cmpwi cr7, r3, CLOCK_MONOTONIC_COARSE + bgt cr0, 99f + LOAD_REG_IMMEDIATE(r5, KTIME_LOW_RES) + beq cr1, 1f + beq cr7, 1f mflr r12 .cfi_register lr,r12 get_datapage r3, r0 lwz r5, CLOCK_HRTIMER_RES(r3) mtlr r12 - li r3,0 +1: li r3,0 cmpli cr0,r4,0 crclr cr0*4+so beqlr @@ -215,11 +218,11 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) blr /* - * syscall fallback + * invalid clock */ 99: - li r0,__NR_clock_getres - sc + li r3, EINVAL + crset so blr .cfi_endproc V_FUNCTION_END(__kernel_clock_getres) -- 2.13.3