Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3015455ybt; Mon, 29 Jun 2020 12:59:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzupjc+VWzD/XbYcj7yKw12j4dVCOAaAy1/vDh+EG5pv9iQZ5GYPtvt45rgIjrB935rG4k/ X-Received: by 2002:a05:6402:b79:: with SMTP id cb25mr86259edb.154.1593460777924; Mon, 29 Jun 2020 12:59:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593460777; cv=none; d=google.com; s=arc-20160816; b=G6VIR89vQGjYjqnaAGivy3ew+5O6IactSKzc57cEySBm1JdemaNhXI040uI4yu6U52 N526i5eayLoAU57+jdRCpNHALZVl0Uf/IIiGQKI7ACWEWjcnNuODr2Sb1/ZLo0ZQN2b0 XiW0ouuFpxg37dE4ZjgimP11a4u7ZpZshXl+oNdwNSQ0v31c+yfqbbOcV2vhuq0qEOfP J19BqO86YDMad9KtAYuxjM7iXOEmuyk5epsqt/RcSTyrEhYK/FWrvWOWrY7lCuMe1Fjm KhPgLx6c+UfrEwRRpsM+HsVPPV/pchZOeDJawi01byEE4WXdyLEhCt+2Tij3lYZqU7Ej DA8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ODmStry6MFDFFEr+h/5zOUkuTzYxq3Wj5qEX2ZapqpY=; b=hN16DJYyIf+z5xGcBQteNfOu1pe9nSAwRYwn7VAZiZybNrLqX5ICdjNVsMlSJB6uPm qcTWlBIT6bj4ubnBZxBIb9JSDjShbuOyrkULlRSyT656X+nsu7QQ8ZDne5gwV6lO+Fdn FJJdDXyGP1nP78p06R2PETi0+MLyD1Jtj2TYUBN81JNhMdwEF0f7Sat6TWN6TKOx9eQU cC7WBvb2p6W1oMvh8uDCnRnyMKyF7TM9vXUgvCBW4YJbyveErazKhlKAfm4evJ8UTIJ3 8w29T0fjFVzqUTpfnL6Telj6euNxhOqUi5P8Jzff0t3yOhSmJ/xOvaTWJQbATSoOl6CX ltlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=flwTi2LU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v12si375594eja.379.2020.06.29.12.59.14; Mon, 29 Jun 2020 12:59:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=flwTi2LU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388298AbgF2T6b (ORCPT + 99 others); Mon, 29 Jun 2020 15:58:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:47710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387603AbgF2TkS (ORCPT ); Mon, 29 Jun 2020 15:40:18 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 134A7248EE; Mon, 29 Jun 2020 15:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444441; bh=jCXcHNF4ffgYfk2J1Ar2eqA5w3GtOFqVWiURn6wkmOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=flwTi2LUyWVUFyuPk8sDWSzDjreodRP/1kRi/eaqm0v+DNK9yta4HGZcC3Bo0IcpX NJ7dXYolvAFF2mBEnY93ZLDb77TOaYMDts7oiRIHSCLCHu3uur05h4k3iTtBDM7VVh Q87flB72smfb+cUr1jH4qRW57Gwrbcr/eE3Fp7jw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Huckleberry , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.4 120/178] riscv/atomic: Fix sign extension for RV64I Date: Mon, 29 Jun 2020 11:24:25 -0400 Message-Id: <20200629152523.2494198-121-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629152523.2494198-1-sashal@kernel.org> References: <20200629152523.2494198-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.50-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.50-rc1 X-KernelTest-Deadline: 2020-07-01T15:25+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Huckleberry [ Upstream commit 6c58f25e6938c073198af8b1e1832f83f8f0df33 ] The argument passed to cmpxchg is not guaranteed to be sign extended, but lr.w sign extends on RV64I. This makes cmpxchg fail on clang built kernels when __old is negative. To fix this, we just cast __old to long which sign extends on RV64I. With this fix, clang built RISC-V kernels now boot. Link: https://github.com/ClangBuiltLinux/linux/issues/867 Signed-off-by: Nathan Huckleberry Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/include/asm/cmpxchg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/include/asm/cmpxchg.h b/arch/riscv/include/asm/cmpxchg.h index d969bab4a26b5..262e5bbb27760 100644 --- a/arch/riscv/include/asm/cmpxchg.h +++ b/arch/riscv/include/asm/cmpxchg.h @@ -179,7 +179,7 @@ " bnez %1, 0b\n" \ "1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ - : "rJ" (__old), "rJ" (__new) \ + : "rJ" ((long)__old), "rJ" (__new) \ : "memory"); \ break; \ case 8: \ @@ -224,7 +224,7 @@ RISCV_ACQUIRE_BARRIER \ "1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ - : "rJ" (__old), "rJ" (__new) \ + : "rJ" ((long)__old), "rJ" (__new) \ : "memory"); \ break; \ case 8: \ @@ -270,7 +270,7 @@ " bnez %1, 0b\n" \ "1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ - : "rJ" (__old), "rJ" (__new) \ + : "rJ" ((long)__old), "rJ" (__new) \ : "memory"); \ break; \ case 8: \ @@ -316,7 +316,7 @@ " fence rw, rw\n" \ "1:\n" \ : "=&r" (__ret), "=&r" (__rc), "+A" (*__ptr) \ - : "rJ" (__old), "rJ" (__new) \ + : "rJ" ((long)__old), "rJ" (__new) \ : "memory"); \ break; \ case 8: \ -- 2.25.1