From owner-dev-commits-src-main@freebsd.org Sun Apr 18 17:08:45 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 71CE85EECF3; Sun, 18 Apr 2021 17:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FNby52nLwz3rN6; Sun, 18 Apr 2021 17:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5279B7918; Sun, 18 Apr 2021 17:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13IH8jSb008421; Sun, 18 Apr 2021 17:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13IH8juU008420; Sun, 18 Apr 2021 17:08:45 GMT (envelope-from git) Date: Sun, 18 Apr 2021 17:08:45 GMT Message-Id: <202104181708.13IH8juU008420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 6525c2d4de8f - main - mips/octeon SDK: Fix __cvmx_cmd_queue_lock asm for clang 11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6525c2d4de8f6ddc964f2f5ba9bd41d70bf98660 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Apr 2021 17:08:45 -0000 The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=6525c2d4de8f6ddc964f2f5ba9bd41d70bf98660 commit 6525c2d4de8f6ddc964f2f5ba9bd41d70bf98660 Author: Justin Hibbits AuthorDate: 2021-04-18 16:59:04 +0000 Commit: Justin Hibbits CommitDate: 2021-04-18 17:05:55 +0000 mips/octeon SDK: Fix __cvmx_cmd_queue_lock asm for clang 11 The 'ticket' and 'my_ticket' arguments are both read and written within the same asm block. Clang is stricter with the constraints than gcc4 was, so accepts the '=r' at face value and will happily overwrite registers that "should" be preserved. Mark these operands to not clobber other operands, so they get their own registers. This fixes a panic on bringing up the octe interfaces. --- sys/contrib/octeon-sdk/cvmx-cmd-queue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/octeon-sdk/cvmx-cmd-queue.h b/sys/contrib/octeon-sdk/cvmx-cmd-queue.h index 5a7a543aae26..a97016f29b78 100644 --- a/sys/contrib/octeon-sdk/cvmx-cmd-queue.h +++ b/sys/contrib/octeon-sdk/cvmx-cmd-queue.h @@ -282,8 +282,8 @@ static inline void __cvmx_cmd_queue_lock(cvmx_cmd_queue_id_t queue_id, __cvmx_cm ".set pop\n" : [ticket_ptr] "=m" (__cvmx_cmd_queue_state_ptr->ticket[__cvmx_cmd_queue_get_index(queue_id)]), [now_serving] "=m" (qptr->now_serving), - [ticket] "=r" (tmp), - [my_ticket] "=r" (my_ticket) + [ticket] "=&r" (tmp), + [my_ticket] "=&r" (my_ticket) ); }