From patchwork Mon Nov 6 14:41:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 834773 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UVX7fCIp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yVwJY29yjz9s7B for ; Tue, 7 Nov 2017 01:42:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753102AbdKFOly (ORCPT ); Mon, 6 Nov 2017 09:41:54 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:45430 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752646AbdKFOlw (ORCPT ); Mon, 6 Nov 2017 09:41:52 -0500 Received: by mail-pf0-f194.google.com with SMTP id d28so7886056pfe.2; Mon, 06 Nov 2017 06:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=cXE+HNxM3e28kTEeHo3lqhWICOgSE33DI+VmZWPU9Fk=; b=UVX7fCIpYnA0oD4IBEUrkqoHUAvn9pRmExO9GeP7EeXq0GOFnQYwH5QSuz0Ratxhkn h/7tl6hGXDOTiaOCzNtVgfXFUw9u0t+6e/O8Y5CET2S4bDC02srrOMefYNtFrxKH/EgJ 5Q1T0yJFuv50nIwfZSVk655NpF6oJsxaYI5Xnl+sUK8nJxR8PYdhVto+jCCgX/UUbbWf 6LCObAuCvTbaU8ZqBuDezeubSVP2v7Zb63/PL8mx5PY+6mAkeAkgaAsZfwrt8GSa/RAL VqKOAh3k4eAsygzFt9rcqY6bICf63WkIF6QV6nckWRcqYz2tVxyLPG2y23RXL3yEFe12 jpNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=cXE+HNxM3e28kTEeHo3lqhWICOgSE33DI+VmZWPU9Fk=; b=a8w9MM3S72R9DilJMZsXDeIsSYGj2tj/JJr7/y7TXVVtYIzD88WC0Z5PGdCcUfo6f6 mx9OJd5iI8cVTrF+xotvZHONJQv3c8hI08C8oVD4pv1S8yl7+kYG7UETAvZmFqZOxR38 K2LWOUtLFmgplnLElRf8EVbiwEOCn4b1tU50l1+dasNooU5rC2Om7JEkgqwucwF89PG/ +GZLDOIuQwYp8cJbOsaClUzsD55/phaZg+g3ero+ToiCQwubJS6Csomji0mpIBlw+Q61 dxXTqV+2BYt6iI6il3xaXZkOHJK68RQXYsU+UH3wqV8r5uOUr+igpmDOT7EWHLH4orXh Yyyg== X-Gm-Message-State: AMCzsaXR7MHoib1LCZUfcfHxmzgGh+zKmMqaCLiK1yLDM59j5winCeFb wy1G4fkW4Fr5JthOTZnAyg0= X-Google-Smtp-Source: ABhQp+QvlrGIjYrBUijWoHO93r7fVWfljNaDq3d7YEnemamv4IrFpwqsQ1Oama73BWwEywWSr9+myA== X-Received: by 10.98.32.212 with SMTP id m81mr16845638pfj.227.1509979312477; Mon, 06 Nov 2017 06:41:52 -0800 (PST) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id 3sm24592875pfo.17.2017.11.06.06.41.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 06:41:51 -0800 (PST) From: Guenter Roeck To: "David S . Miller" Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH v3] sparc: Provide cmpxchg64 for 32-bit builds Date: Mon, 6 Nov 2017 06:41:45 -0800 Message-Id: <1509979305-11791-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Fix the following build error, seen when building sparc32:allmodconfig. drivers/net/ethernet/intel/i40e/i40e_ethtool.c: In function 'i40e_set_priv_flags': drivers/net/ethernet/intel/i40e/i40e_ethtool.c:4150:2: error: implicit declaration of function 'cmpxchg64' Signed-off-by: Guenter Roeck --- v3: Drop extern from cmpxchg64 declaration in include file v2: Actually implement cmpxchg64 with code snippet provided by Dave Miller Note: I am aware that this doesn't pass checkpatch; I found it more important to be in line with __cmpxchg_u32(). arch/sparc/include/asm/cmpxchg_32.h | 2 ++ arch/sparc/lib/atomic32.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/sparc/include/asm/cmpxchg_32.h b/arch/sparc/include/asm/cmpxchg_32.h index 83ffb83c5397..01bb66b5d125 100644 --- a/arch/sparc/include/asm/cmpxchg_32.h +++ b/arch/sparc/include/asm/cmpxchg_32.h @@ -62,6 +62,8 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) (unsigned long)_n_, sizeof(*(ptr))); \ }) +u64 cmpxchg64(u64 *ptr, u64 old, u64 new); + #include /* diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index 2c373329d5cb..41601eb540e7 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c @@ -172,6 +172,20 @@ unsigned long __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) } EXPORT_SYMBOL(__cmpxchg_u32); +u64 cmpxchg64(u64 *ptr, u64 old, u64 new) +{ + unsigned long flags; + u64 prev; + + spin_lock_irqsave(ATOMIC_HASH(ptr), flags); + if ((prev = *ptr) == old) + *ptr = new; + spin_unlock_irqrestore(ATOMIC_HASH(ptr), flags); + + return prev; +} +EXPORT_SYMBOL(cmpxchg64); + unsigned long __xchg_u32(volatile u32 *ptr, u32 new) { unsigned long flags;