From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE4A2E7E648 for ; Tue, 26 Sep 2023 15:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gnj7grDuQAYq0ZdLL82dbZyBiuQ9Sp8+9t369GMOBQk=; b=sUG2Bv6Ut7rlNV n+d4GC64ccTVpZGkknYUURnw2rksaoRt90Rll57W/4V1yuyigzsMlYC/jtFry5dvLrPfHH9iYBggA ILeCGW/QkD0qLPIsFd2PMGnPhWSbDXfQK1leSDMoCIt26Dy3Smvx5USX28wgMPyIccKm3HCOKobfw 7sAzUTCAtO2puV7+yiNbnQQC8Gb6gRCKiZF9b/fVlYTMHt2eyfpgASc/khTMhRS9eVB587S+x+XwD rNzc5GNWtxmzFe3HP4Oc/LB7UNkYZpiN55Kq9DeaF52A71Vrb5uYJW52/Sy8f4k3ubGJB2qN7O0qh fNwL/1lnxXGmqR7OAZTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ql9bY-00GbOu-12; Tue, 26 Sep 2023 15:04:04 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ql9bU-00GbKC-1o for linux-riscv@lists.infradead.org; Tue, 26 Sep 2023 15:04:02 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3231e138f44so694361f8f.0 for ; Tue, 26 Sep 2023 08:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1695740636; x=1696345436; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/uuvfJ5AANk2b1H7qXwiqMjtZ5fx5LwQZGgrS2bH6zQ=; b=LjC/CUImZ1EVD8Te3UjQqGebLCZ60iegHN2H9RSFYJr3w709QESFOWcowDqpoccSTQ XYfK8ereL3T29inr02CgR1V4xrjFFJmOHhKtemN9E62w+58K2YDW2fmp9jjTH8VdhECt 7h02i36seTY6t3gMHjVAq4Lm0VeTAle8bRSwu8wbQR0030NYN1r+2FP7z/9TFFt3uKPX ae9Fvtg1uZvg9ytRTt8AzVH+DOoQxEQTJpDg9QViUHlgb+diasCgpSmGy26EzF+Z3FJt sNHG/RuvSMLO9WTq7Hjxv5Z0e4U2W856N14VQvsl5GsUKoaD29j9ITMn5YpmFThu1cnm KXXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695740636; x=1696345436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/uuvfJ5AANk2b1H7qXwiqMjtZ5fx5LwQZGgrS2bH6zQ=; b=ofejT5L6+iRiZGOEKEa3UYhb/w0Ro+xUVRfr0kib5QqkKOePRQPjnBUEdTYgrBXmMS VrllbKtM+yQ309vSlbKk56A4soFtBPni17tIv0oR9lgvxoyWmTtheOjj6P6VB6masjuu 5zyNwbQ64gR7MGf0FwbmkOaNcakA7QSUitFgmSmoxYqTxnebb2xpgNT0aZlyVGTKPsrM sWtQ1CStdDyncD0t6cfac7W4OW1VRg74Z5yoaXhdmga4p2AFYG+3o47k83pNW/KihK8M 4YVDjTRcFouW3fiwOfWVsbOiHWJyYutAbQk7uKr6rsoaS87YavZRiXLM0ZRUwPqbQ3Jt uojA== X-Gm-Message-State: AOJu0Yx71Z/ojaVQ7ohB2txUta0I2BcFPQ1nzU7Jla5YQ7QHFuFcyz7G kx5ErhLI1Rmv0r26v1H8geY+JQ== X-Google-Smtp-Source: AGHT+IE8kK7m+adK60EJSFNwZFOqJSMd+4wvMQfHEfjOwfK+qxITAch3QRj6sfjlQtjyWNy3/S6QzA== X-Received: by 2002:adf:ed84:0:b0:322:c494:d481 with SMTP id c4-20020adfed84000000b00322c494d481mr9917893wro.0.1695740635757; Tue, 26 Sep 2023 08:03:55 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:2b3d:6c70:9dbf:5ede]) by smtp.gmail.com with ESMTPSA id x11-20020a5d650b000000b00318147fd2d3sm14926060wru.41.2023.09.26.08.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 08:03:55 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Atish Patra , Andrew Jones , Evan Green , =?UTF-8?q?Bj=C3=B6rn=20Topel?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Ron Minnich , Daniel Maslowski Subject: [PATCH 4/7] riscv: add floating point insn support to misaligned access emulation Date: Tue, 26 Sep 2023 17:03:13 +0200 Message-Id: <20230926150316.1129648-5-cleger@rivosinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230926150316.1129648-1-cleger@rivosinc.com> References: <20230926150316.1129648-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230926_080400_603693_1A033351 X-CRM114-Status: GOOD ( 22.52 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org VGhpcyBzdXBwb3J0IGlzIHBhcnRpYWxseSBiYXNlZCBvZiBvcGVuU0JJIG1pc2FsaWduZWQgZW11 bGF0aW9uIGZsb2F0aW5nCnBvaW50IGluc3RydWN0aW9uIHN1cHBvcnQuIEl0IHByb3ZpZGVzIHN1 cHBvcnQgZm9yIHRoZSBleGlzdGluZwpmbG9hdGluZyBwb2ludCBpbnN0cnVjdGlvbnMgKGJvdGgg Zm9yIDMyLzY0IGJpdHMgYXMgd2VsbCBhcyBjb21wcmVzc2VkCm9uZXMpLiBTaW5jZSBmbG9hdGlu ZyBwb2ludCByZWdpc3RlcnMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBwdF9yZWdzCnN0cnVjdCwgd2Ug bmVlZCB0byBtb2RpZnkgdGhlbSBkaXJlY3RseSB1c2luZyBzb21lIGFzc2VtYmx5LiBXZSBhbHNv CmRpcnR5IHRoZSBwdF9yZWdzIHN0YXR1cyBpbiBjYXNlIHdlIG1vZGlmeSB0aGVtIHRvIGJlIHN1 cmUgY29udGV4dApzd2l0Y2ggd2lsbCBzYXZlIEZQIHN0YXRlLiBXaXRoIHRoaXMgc3VwcG9ydCwg TGludXggaXMgb24gcGFyIHdpdGgKb3BlblNCSSBzdXBwb3J0LgoKU2lnbmVkLW9mZi1ieTogQ2zD qW1lbnQgTMOpZ2VyIDxjbGVnZXJAcml2b3NpbmMuY29tPgotLS0KIGFyY2gvcmlzY3Yva2VybmVs L2ZwdS5TICAgICAgICAgICAgICB8IDExNyArKysrKysrKysrKysrKysrKysrKysKIGFyY2gvcmlz Y3Yva2VybmVsL3RyYXBzX21pc2FsaWduZWQuYyB8IDE1MiArKysrKysrKysrKysrKysrKysrKysr KysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMjY1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9rZXJuZWwvZnB1LlMgYi9hcmNoL3Jpc2N2L2tlcm5l bC9mcHUuUwppbmRleCBkZDIyMDU0NzNkZTcuLjI3ODViYWRiMjQ3YyAxMDA2NDQKLS0tIGEvYXJj aC9yaXNjdi9rZXJuZWwvZnB1LlMKKysrIGIvYXJjaC9yaXNjdi9rZXJuZWwvZnB1LlMKQEAgLTEw NCwzICsxMDQsMTIwIEBAIEVOVFJZKF9fZnN0YXRlX3Jlc3RvcmUpCiAJY3NyYyBDU1JfU1RBVFVT LCB0MQogCXJldAogRU5EUFJPQyhfX2ZzdGF0ZV9yZXN0b3JlKQorCisjZGVmaW5lIGdldF9mMzIo d2hpY2gpIGZtdi54LnMgYTAsIHdoaWNoOyBqIDJmCisjZGVmaW5lIHB1dF9mMzIod2hpY2gpIGZt di5zLnggd2hpY2gsIGExOyBqIDJmCisjaWYgX19yaXNjdl94bGVuID09IDY0CisjIGRlZmluZSBn ZXRfZjY0KHdoaWNoKSBmbXYueC5kIGEwLCB3aGljaDsgaiAyZgorIyBkZWZpbmUgcHV0X2Y2NCh3 aGljaCkgZm12LmQueCB3aGljaCwgYTE7IGogMmYKKyNlbHNlCisjIGRlZmluZSBnZXRfZjY0KHdo aWNoKSBmc2Qgd2hpY2gsIDAoYTEpOyBqIDJmCisjIGRlZmluZSBwdXRfZjY0KHdoaWNoKSBmbGQg d2hpY2gsIDAoYTEpOyBqIDJmCisjZW5kaWYKKworLm1hY3JvIGZwX2FjY2Vzc19wcm9sb2d1ZQor CS8qCisJICogQ29tcHV0ZSBqdW1wIG9mZnNldCB0byBzdG9yZSB0aGUgY29ycmVjdCBGUCByZWdp c3RlciBzaW5jZSB3ZSBkb24ndAorCSAqIGhhdmUgaW5kaXJlY3QgRlAgcmVnaXN0ZXIgYWNjZXNz CisJICovCisJc2xsIHQwLCBhMCwgMworCWxhIHQyLCAxZgorCWFkZCB0MCwgdDAsIHQyCisJbGkg dDEsIFNSX0ZTCisJY3NycyBDU1JfU1RBVFVTLCB0MQorCWpyIHQwCisxOgorLmVuZG0KKworLm1h Y3JvIGZwX2FjY2Vzc19lcGlsb2d1ZQorMjoKKwljc3JjIENTUl9TVEFUVVMsIHQxCisJcmV0Cisu ZW5kbQorCisjZGVmaW5lIGZwX2FjY2Vzc19ib2R5KF9fYWNjZXNzX2Z1bmMpIFwKKwlfX2FjY2Vz c19mdW5jKGYwKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjEpOyBcCisJX19hY2Nlc3NfZnVuYyhmMik7 IFwKKwlfX2FjY2Vzc19mdW5jKGYzKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjQpOyBcCisJX19hY2Nl c3NfZnVuYyhmNSk7IFwKKwlfX2FjY2Vzc19mdW5jKGY2KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjcp OyBcCisJX19hY2Nlc3NfZnVuYyhmOCk7IFwKKwlfX2FjY2Vzc19mdW5jKGY5KTsgXAorCV9fYWNj ZXNzX2Z1bmMoZjEwKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjExKTsgXAorCV9fYWNjZXNzX2Z1bmMo ZjEyKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjEzKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjE0KTsgXAor CV9fYWNjZXNzX2Z1bmMoZjE1KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjE2KTsgXAorCV9fYWNjZXNz X2Z1bmMoZjE3KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjE4KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjE5 KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjIwKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjIxKTsgXAorCV9f YWNjZXNzX2Z1bmMoZjIyKTsgXAorCV9fYWNjZXNzX2Z1bmMoZjIzKTsgXAorCV9fYWNjZXNzX2Z1 bmMoZjI0KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjI1KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjI2KTsg XAorCV9fYWNjZXNzX2Z1bmMoZjI3KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjI4KTsgXAorCV9fYWNj ZXNzX2Z1bmMoZjI5KTsgXAorCV9fYWNjZXNzX2Z1bmMoZjMwKTsgXAorCV9fYWNjZXNzX2Z1bmMo ZjMxKQorCisKKy8qCisgKiBEaXNhYmxlIGNvbXByZXNzZWQgaW5zdHJ1Y3Rpb25zIHNldCB0byBr ZWVwIGEgY29uc3RhbnQgb2Zmc2V0IGJldHdlZW4gRlAKKyAqIGxvYWQvc3RvcmUvbW92ZSBpbnN0 cnVjdGlvbnMKKyAqLworLm9wdGlvbiBub3J2YworLyoKKyAqIHB1dF9mMzJfcmVnIC0gU2V0IGEg RlAgcmVnaXN0ZXIgZnJvbSBhIHJlZ2lzdGVyIGNvbnRhaW5pbmcgdGhlIHZhbHVlCisgKiBhMCA9 IEZQIHJlZ2lzdGVyIGluZGV4IHRvIGJlIHNldAorICogYTEgPSB2YWx1ZSB0byBiZSBsb2FkZWQg aW4gdGhlIEZQIHJlZ2lzdGVyCisgKi8KK1NZTV9GVU5DX1NUQVJUKHB1dF9mMzJfcmVnKQorCWZw X2FjY2Vzc19wcm9sb2d1ZQorCWZwX2FjY2Vzc19ib2R5KHB1dF9mMzIpCisJZnBfYWNjZXNzX2Vw aWxvZ3VlCitTWU1fRlVOQ19FTkQocHV0X2YzMl9yZWcpCisKKy8qCisgKiBnZXRfZjMyX3JlZyAt IEdldCBhIEZQIHJlZ2lzdGVyIHZhbHVlIGFuZCByZXR1cm4gaXQKKyAqIGEwID0gRlAgcmVnaXN0 ZXIgaW5kZXggdG8gYmUgcmV0cmlldmVkCisgKi8KK1NZTV9GVU5DX1NUQVJUKGdldF9mMzJfcmVn KQorCWZwX2FjY2Vzc19wcm9sb2d1ZQorCWZwX2FjY2Vzc19ib2R5KGdldF9mMzIpCisJZnBfYWNj ZXNzX2VwaWxvZ3VlCitTWU1fRlVOQ19FTkQocHV0X2YzMl9yZWcpCisKKy8qCisgKiBwdXRfZjY0 X3JlZyAtIFNldCBhIDY0IGJpdHMgRlAgcmVnaXN0ZXIgZnJvbSBhIHZhbHVlIG9yIGEgcG9pbnRl ci4KKyAqIGEwID0gRlAgcmVnaXN0ZXIgaW5kZXggdG8gYmUgc2V0CisgKiBhMSA9IHZhbHVlL3Bv aW50ZXIgdG8gYmUgbG9hZGVkIGluIHRoZSBGUCByZWdpc3RlciAod2hlbiB4bGVuID09IDMyIGJp dHMsIHdlCisgKiBsb2FkIHRoZSB2YWx1ZSB0byBhIHBvaW50ZXIpLgorICovCitTWU1fRlVOQ19T VEFSVChwdXRfZjY0X3JlZykKKwlmcF9hY2Nlc3NfcHJvbG9ndWUKKwlmcF9hY2Nlc3NfYm9keShw dXRfZjY0KQorCWZwX2FjY2Vzc19lcGlsb2d1ZQorU1lNX0ZVTkNfRU5EKHB1dF9mNjRfcmVnKQor CisvKgorICogcHV0X2Y2NF9yZWcgLSBHZXQgYSA2NCBiaXRzIEZQIHJlZ2lzdGVyIHZhbHVlIGFu ZCByZXR1cm5lZCBpdCBvciBzdG9yZSBpdCB0bworICoJIAkgYSBwb2ludGVyLgorICogYTAgPSBG UCByZWdpc3RlciBpbmRleCB0byBiZSByZXRyaWV2ZWQKKyAqIGExID0gSWYgeGxlbiA9PSAzMiwg cG9pbnRlciB3aGljaCBzaG91bGQgYmUgbG9hZGVkIHdpdGggdGhlIEZQIHJlZ2lzdGVyIHZhbHVl CisgKglvciB1bnVzZWQgaWYgeGxlbiA9PSA2NC4gSW4gd2hpY2ggY2FzZSB0aGUgRlAgcmVnaXN0 ZXIgdmFsdWUgaXMgcmV0dXJuZWQKKyAqCXRocm91Z2ggYTAKKyAqLworU1lNX0ZVTkNfU1RBUlQo Z2V0X2Y2NF9yZWcpCisJZnBfYWNjZXNzX3Byb2xvZ3VlCisJZnBfYWNjZXNzX2JvZHkoZ2V0X2Y2 NCkKKwlmcF9hY2Nlc3NfZXBpbG9ndWUKK1NZTV9GVU5DX0VORChnZXRfZjY0X3JlZykKZGlmZiAt LWdpdCBhL2FyY2gvcmlzY3Yva2VybmVsL3RyYXBzX21pc2FsaWduZWQuYyBiL2FyY2gvcmlzY3Yv a2VybmVsL3RyYXBzX21pc2FsaWduZWQuYwppbmRleCA4MDRmNmM1ZTBlNDQuLjA0MWZkMmRiZDk1 NSAxMDA2NDQKLS0tIGEvYXJjaC9yaXNjdi9rZXJuZWwvdHJhcHNfbWlzYWxpZ25lZC5jCisrKyBi L2FyY2gvcmlzY3Yva2VybmVsL3RyYXBzX21pc2FsaWduZWQuYwpAQCAtMTUzLDYgKzE1MywxMTUg QEAKICNkZWZpbmUgUFJFQ0lTSU9OX1MgMAogI2RlZmluZSBQUkVDSVNJT05fRCAxCiAKKyNpZmRl ZiBDT05GSUdfRlBVCisKKyNkZWZpbmUgRlBfR0VUX1JEKGluc24pCQkoaW5zbiA+PiA3ICYgMHgx RikKKworZXh0ZXJuIHZvaWQgcHV0X2YzMl9yZWcodW5zaWduZWQgbG9uZyBmcF9yZWcsIHVuc2ln bmVkIGxvbmcgdmFsdWUpOworCitzdGF0aWMgaW50IHNldF9mMzJfcmQodW5zaWduZWQgbG9uZyBp bnNuLCBzdHJ1Y3QgcHRfcmVncyAqcmVncywKKwkJICAgICAgdW5zaWduZWQgbG9uZyB2YWwpCit7 CisJdW5zaWduZWQgbG9uZyBmcF9yZWcgPSBGUF9HRVRfUkQoaW5zbik7CisKKwlwdXRfZjMyX3Jl ZyhmcF9yZWcsIHZhbCk7CisJcmVncy0+c3RhdHVzIHw9IFNSX0ZTX0RJUlRZOworCisJcmV0dXJu IDA7Cit9CisKK2V4dGVybiB2b2lkIHB1dF9mNjRfcmVnKHVuc2lnbmVkIGxvbmcgZnBfcmVnLCB1 bnNpZ25lZCBsb25nIHZhbHVlKTsKKworc3RhdGljIGludCBzZXRfZjY0X3JkKHVuc2lnbmVkIGxv bmcgaW5zbiwgc3RydWN0IHB0X3JlZ3MgKnJlZ3MsIHU2NCB2YWwpCit7CisJdW5zaWduZWQgbG9u ZyBmcF9yZWcgPSBGUF9HRVRfUkQoaW5zbik7CisJdW5zaWduZWQgbG9uZyB2YWx1ZTsKKworI2lm IF9fcmlzY3ZfeGxlbiA9PSAzMgorCXZhbHVlID0gKHVuc2lnbmVkIGxvbmcpICZ2YWw7CisjZWxz ZQorCXZhbHVlID0gdmFsOworI2VuZGlmCisJcHV0X2Y2NF9yZWcoZnBfcmVnLCB2YWx1ZSk7CisJ cmVncy0+c3RhdHVzIHw9IFNSX0ZTX0RJUlRZOworCisJcmV0dXJuIDA7Cit9CisKKyNpZiBfX3Jp c2N2X3hsZW4gPT0gMzIKK2V4dGVybiB2b2lkIGdldF9mNjRfcmVnKHVuc2lnbmVkIGxvbmcgZnBf cmVnLCB1NjQgKnZhbHVlKTsKKworc3RhdGljIHU2NCBnZXRfZjY0X3JzKHVuc2lnbmVkIGxvbmcg aW5zbiwgdTggZnBfcmVnX29mZnNldCwKKwkJICAgICAgc3RydWN0IHB0X3JlZ3MgKnJlZ3MpCit7 CisJdW5zaWduZWQgbG9uZyBmcF9yZWcgPSAoaW5zbiA+PiBmcF9yZWdfb2Zmc2V0KSAmIDB4MUY7 CisJdTY0IHZhbDsKKworCWdldF9mNjRfcmVnKGZwX3JlZywgJnZhbCk7CisJcmVncy0+c3RhdHVz IHw9IFNSX0ZTX0RJUlRZOworCisJcmV0dXJuIHZhbDsKK30KKyNlbHNlCisKK2V4dGVybiB1bnNp Z25lZCBsb25nIGdldF9mNjRfcmVnKHVuc2lnbmVkIGxvbmcgZnBfcmVnKTsKKworc3RhdGljIHVu c2lnbmVkIGxvbmcgZ2V0X2Y2NF9ycyh1bnNpZ25lZCBsb25nIGluc24sIHU4IGZwX3JlZ19vZmZz ZXQsCisJCQkJc3RydWN0IHB0X3JlZ3MgKnJlZ3MpCit7CisJdW5zaWduZWQgbG9uZyBmcF9yZWcg PSAoaW5zbiA+PiBmcF9yZWdfb2Zmc2V0KSAmIDB4MUY7CisJdW5zaWduZWQgbG9uZyB2YWw7CisK Kwl2YWwgPSBnZXRfZjY0X3JlZyhmcF9yZWcpOworCXJlZ3MtPnN0YXR1cyB8PSBTUl9GU19ESVJU WTsKKworCXJldHVybiB2YWw7Cit9CisKKyNlbmRpZgorCitleHRlcm4gdW5zaWduZWQgbG9uZyBn ZXRfZjMyX3JlZyh1bnNpZ25lZCBsb25nIGZwX3JlZyk7CisKK3N0YXRpYyB1bnNpZ25lZCBsb25n IGdldF9mMzJfcnModW5zaWduZWQgbG9uZyBpbnNuLCB1OCBmcF9yZWdfb2Zmc2V0LAorCQkJCXN0 cnVjdCBwdF9yZWdzICpyZWdzKQoreworCXVuc2lnbmVkIGxvbmcgZnBfcmVnID0gKGluc24gPj4g ZnBfcmVnX29mZnNldCkgJiAweDFGOworCXVuc2lnbmVkIGxvbmcgdmFsOworCisJdmFsID0gZ2V0 X2YzMl9yZWcoZnBfcmVnKTsKKwlyZWdzLT5zdGF0dXMgfD0gU1JfRlNfRElSVFk7CisKKwlyZXR1 cm4gdmFsOworfQorCisjZWxzZSAvKiBDT05GSUdfRlBVICovCitzdGF0aWMgdm9pZCBzZXRfZjMy X3JkKHVuc2lnbmVkIGxvbmcgaW5zbiwgc3RydWN0IHB0X3JlZ3MgKnJlZ3MsCisJCSAgICAgICB1 bnNpZ25lZCBsb25nIHZhbCkge30KKworc3RhdGljIHZvaWQgc2V0X2Y2NF9yZCh1bnNpZ25lZCBs b25nIGluc24sIHN0cnVjdCBwdF9yZWdzICpyZWdzLCB1NjQgdmFsKSB7fQorCitzdGF0aWMgdW5z aWduZWQgbG9uZyBnZXRfZjY0X3JzKHVuc2lnbmVkIGxvbmcgaW5zbiwgdTggZnBfcmVnX29mZnNl dCwKKwkJCQlzdHJ1Y3QgcHRfcmVncyAqcmVncykKK3sKKwlyZXR1cm4gMDsKK30KKworc3RhdGlj IHVuc2lnbmVkIGxvbmcgZ2V0X2YzMl9ycyh1bnNpZ25lZCBsb25nIGluc24sIHU4IGZwX3JlZ19v ZmZzZXQsCisJCQkJc3RydWN0IHB0X3JlZ3MgKnJlZ3MpCit7CisJcmV0dXJuIDA7Cit9CisKKyNl bmRpZgorCisjZGVmaW5lIEdFVF9GNjRfUlMyKGluc24sIHJlZ3MpIChnZXRfZjY0X3JzKGluc24s IDIwLCByZWdzKSkKKyNkZWZpbmUgR0VUX0Y2NF9SUzJDKGluc24sIHJlZ3MpIChnZXRfZjY0X3Jz KGluc24sIDIsIHJlZ3MpKQorI2RlZmluZSBHRVRfRjY0X1JTMlMoaW5zbiwgcmVncykgKGdldF9m NjRfcnMoUlZDX1JTMlMoaW5zbiksIDAsIHJlZ3MpKQorCisjZGVmaW5lIEdFVF9GMzJfUlMyKGlu c24sIHJlZ3MpIChnZXRfZjMyX3JzKGluc24sIDIwLCByZWdzKSkKKyNkZWZpbmUgR0VUX0YzMl9S UzJDKGluc24sIHJlZ3MpIChnZXRfZjMyX3JzKGluc24sIDIsIHJlZ3MpKQorI2RlZmluZSBHRVRf RjMyX1JTMlMoaW5zbiwgcmVncykgKGdldF9mMzJfcnMoUlZDX1JTMlMoaW5zbiksIDAsIHJlZ3Mp KQorCiAjaWZkZWYgQ09ORklHX1JJU0NWX01fTU9ERQogc3RhdGljIGlubGluZSBpbnQgbG9hZF91 OChzdHJ1Y3QgcHRfcmVncyAqcmVncywgY29uc3QgdTggKmFkZHIsIHU4ICpyX3ZhbCkKIHsKQEAg LTM2MiwxNSArNDcxLDIxIEBAIGludCBoYW5kbGVfbWlzYWxpZ25lZF9sb2FkKHN0cnVjdCBwdF9y ZWdzICpyZWdzKQogCQlyZXR1cm4gLTE7CiAJfQogCisJaWYgKCFJU19FTkFCTEVEKENPTkZJR19G UFUpICYmIGZwKQorCQlyZXR1cm4gLUVPUE5PVFNVUFA7CisKIAl2YWwuZGF0YV91NjQgPSAwOwog CWZvciAoaSA9IDA7IGkgPCBsZW47IGkrKykgewogCQlpZiAobG9hZF91OChyZWdzLCAodm9pZCAq KShhZGRyICsgaSksICZ2YWwuZGF0YV9ieXRlc1tpXSkpCiAJCQlyZXR1cm4gLTE7CiAJfQogCi0J aWYgKGZwKQotCQlyZXR1cm4gLTE7Ci0JU0VUX1JEKGluc24sIHJlZ3MsIHZhbC5kYXRhX3Vsb25n IDw8IHNoaWZ0ID4+IHNoaWZ0KTsKKwlpZiAoIWZwKQorCQlTRVRfUkQoaW5zbiwgcmVncywgdmFs LmRhdGFfdWxvbmcgPDwgc2hpZnQgPj4gc2hpZnQpOworCWVsc2UgaWYgKGxlbiA9PSA4KQorCQlz ZXRfZjY0X3JkKGluc24sIHJlZ3MsIHZhbC5kYXRhX3U2NCk7CisJZWxzZQorCQlzZXRfZjMyX3Jk KGluc24sIHJlZ3MsIHZhbC5kYXRhX3Vsb25nKTsKIAogCXJlZ3MtPmVwYyA9IGVwYyArIElOU05f TEVOKGluc24pOwogCkBAIC0zODMsNyArNDk4LDcgQEAgaW50IGhhbmRsZV9taXNhbGlnbmVkX3N0 b3JlKHN0cnVjdCBwdF9yZWdzICpyZWdzKQogCXVuc2lnbmVkIGxvbmcgZXBjID0gcmVncy0+ZXBj OwogCXVuc2lnbmVkIGxvbmcgaW5zbjsKIAl1bnNpZ25lZCBsb25nIGFkZHIgPSByZWdzLT5iYWRh ZGRyOwotCWludCBpLCBsZW4gPSAwOworCWludCBpLCBsZW4gPSAwLCBmcCA9IDA7CiAKIAlwZXJm X3N3X2V2ZW50KFBFUkZfQ09VTlRfU1dfQUxJR05NRU5UX0ZBVUxUUywgMSwgcmVncywgYWRkcik7 CiAKQEAgLTQwMCw2ICs1MTUsMTQgQEAgaW50IGhhbmRsZV9taXNhbGlnbmVkX3N0b3JlKHN0cnVj dCBwdF9yZWdzICpyZWdzKQogCX0gZWxzZSBpZiAoKGluc24gJiBJTlNOX01BU0tfU0QpID09IElO U05fTUFUQ0hfU0QpIHsKIAkJbGVuID0gODsKICNlbmRpZgorCX0gZWxzZSBpZiAoKGluc24gJiBJ TlNOX01BU0tfRlNEKSA9PSBJTlNOX01BVENIX0ZTRCkgeworCQlmcCA9IDE7CisJCWxlbiA9IDg7 CisJCXZhbC5kYXRhX3U2NCA9IEdFVF9GNjRfUlMyKGluc24sIHJlZ3MpOworCX0gZWxzZSBpZiAo KGluc24gJiBJTlNOX01BU0tfRlNXKSA9PSBJTlNOX01BVENIX0ZTVykgeworCQlmcCA9IDE7CisJ CWxlbiA9IDQ7CisJCXZhbC5kYXRhX3Vsb25nID0gR0VUX0YzMl9SUzIoaW5zbiwgcmVncyk7CiAJ fSBlbHNlIGlmICgoaW5zbiAmIElOU05fTUFTS19TSCkgPT0gSU5TTl9NQVRDSF9TSCkgewogCQls ZW4gPSAyOwogI2lmIGRlZmluZWQoQ09ORklHXzY0QklUKQpAQCAtNDE4LDExICs1NDEsMzIgQEAg aW50IGhhbmRsZV9taXNhbGlnbmVkX3N0b3JlKHN0cnVjdCBwdF9yZWdzICpyZWdzKQogCQkgICAo KGluc24gPj4gU0hfUkQpICYgMHgxZikpIHsKIAkJbGVuID0gNDsKIAkJdmFsLmRhdGFfdWxvbmcg PSBHRVRfUlMyQyhpbnNuLCByZWdzKTsKKwl9IGVsc2UgaWYgKChpbnNuICYgSU5TTl9NQVNLX0Nf RlNEKSA9PSBJTlNOX01BVENIX0NfRlNEKSB7CisJCWZwID0gMTsKKwkJbGVuID0gODsKKwkJdmFs LmRhdGFfdTY0ID0gR0VUX0Y2NF9SUzJTKGluc24sIHJlZ3MpOworCX0gZWxzZSBpZiAoKGluc24g JiBJTlNOX01BU0tfQ19GU0RTUCkgPT0gSU5TTl9NQVRDSF9DX0ZTRFNQKSB7CisJCWZwID0gMTsK KwkJbGVuID0gODsKKwkJdmFsLmRhdGFfdTY0ID0gR0VUX0Y2NF9SUzJDKGluc24sIHJlZ3MpOwor I2lmICFkZWZpbmVkKENPTkZJR182NEJJVCkKKwl9IGVsc2UgaWYgKChpbnNuICYgSU5TTl9NQVNL X0NfRlNXKSA9PSBJTlNOX01BVENIX0NfRlNXKSB7CisJCWZwID0gMTsKKwkJbGVuID0gNDsKKwkJ dmFsLmRhdGFfdWxvbmcgPSBHRVRfRjMyX1JTMlMoaW5zbiwgcmVncyk7CisJfSBlbHNlIGlmICgo aW5zbiAmIElOU05fTUFTS19DX0ZTV1NQKSA9PSBJTlNOX01BVENIX0NfRlNXU1ApIHsKKwkJZnAg PSAxOworCQlsZW4gPSA0OworCQl2YWwuZGF0YV91bG9uZyA9IEdFVF9GMzJfUlMyQyhpbnNuLCBy ZWdzKTsKKyNlbmRpZgogCX0gZWxzZSB7CiAJCXJlZ3MtPmVwYyA9IGVwYzsKIAkJcmV0dXJuIC0x OwogCX0KIAorCWlmICghSVNfRU5BQkxFRChDT05GSUdfRlBVKSAmJiBmcCkKKwkJcmV0dXJuIC1F T1BOT1RTVVBQOworCiAJZm9yIChpID0gMDsgaSA8IGxlbjsgaSsrKSB7CiAJCWlmIChzdG9yZV91 OChyZWdzLCAodm9pZCAqKShhZGRyICsgaSksIHZhbC5kYXRhX2J5dGVzW2ldKSkKIAkJCXJldHVy biAtMTsKLS0gCjIuNDAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZy YWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGlu dXgtcmlzY3YK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D66D7E7E64B for ; Tue, 26 Sep 2023 15:04:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234984AbjIZPEP (ORCPT ); Tue, 26 Sep 2023 11:04:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234991AbjIZPEE (ORCPT ); Tue, 26 Sep 2023 11:04:04 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6022210E for ; Tue, 26 Sep 2023 08:03:57 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-32163c3ece5so1120017f8f.1 for ; Tue, 26 Sep 2023 08:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1695740636; x=1696345436; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/uuvfJ5AANk2b1H7qXwiqMjtZ5fx5LwQZGgrS2bH6zQ=; b=IvpG+fJbcpybBzYIchFjWpENMuIq3Vx6KOoTvLMPxnr5iL1A7Zn6JQI47IWz0KtEjF rpow7Mz0NFNh95y3GcAWUoaseXtO6RoF2KGcMxppbx40JcOwrdWCI4DKoC7BEP3ETuPp rtatnnjn4BNBN5xiematBqXKl3f6NXzaSX1FfTQYaTIoRshvB5pIxfNxSNQm0r+T0OVs 6RrALLyHrQgHGLkXE0qRsPsahTIHvrnu1pubMDl/LLgs73EANRrj6rAv+eW2N94hbu6a 4DBr2RppX45l02lOoDfzkmU/g7FMbTAm6oPtEg7zziACdVR9OGIl+Gg8gM47E4DCj/YF f5VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695740636; x=1696345436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/uuvfJ5AANk2b1H7qXwiqMjtZ5fx5LwQZGgrS2bH6zQ=; b=AkREh6fLpIJJhG8sh6iY2AgaN1f9GDi/MisL9iIjuQL/NPjs7dQIlJREWJfftJCoNk llEexLa+B4+eZsVKuLneZ47K6y/aHeMegNeMEqA65q2lB/MA4j9tukNWKR0cuk4pvucO 3V+CwidZW1w8xMuwydc0F2FTb++dRJhPLuAnLSlqtyb14tjOlTCWIVnCUBdU7QmoFp4W +VSTnSwYsY5L3OT6jlQ/W2RxpwaE/P+ukwowDBtumDdLizIDrtiaEA3R8Tln7a0kMSlU 0Na3gNXj64KbhEoYXPL/rwhXeQlOWs64LfKlUobVX7Xg5TTamU1A8SVAdoq8BeaZnFfG kEcQ== X-Gm-Message-State: AOJu0YyA1yKO1mX5e4aT1JvLF8xwojZhNxtRnag/80fCCNtV3wKLBPhM EQCdk8yyF0e8e5ww6cpHwvw4Fg== X-Google-Smtp-Source: AGHT+IE8kK7m+adK60EJSFNwZFOqJSMd+4wvMQfHEfjOwfK+qxITAch3QRj6sfjlQtjyWNy3/S6QzA== X-Received: by 2002:adf:ed84:0:b0:322:c494:d481 with SMTP id c4-20020adfed84000000b00322c494d481mr9917893wro.0.1695740635757; Tue, 26 Sep 2023 08:03:55 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:2b3d:6c70:9dbf:5ede]) by smtp.gmail.com with ESMTPSA id x11-20020a5d650b000000b00318147fd2d3sm14926060wru.41.2023.09.26.08.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 08:03:55 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Atish Patra , Andrew Jones , Evan Green , =?UTF-8?q?Bj=C3=B6rn=20Topel?= , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Ron Minnich , Daniel Maslowski Subject: [PATCH 4/7] riscv: add floating point insn support to misaligned access emulation Date: Tue, 26 Sep 2023 17:03:13 +0200 Message-Id: <20230926150316.1129648-5-cleger@rivosinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230926150316.1129648-1-cleger@rivosinc.com> References: <20230926150316.1129648-1-cleger@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This support is partially based of openSBI misaligned emulation floating point instruction support. It provides support for the existing floating point instructions (both for 32/64 bits as well as compressed ones). Since floating point registers are not part of the pt_regs struct, we need to modify them directly using some assembly. We also dirty the pt_regs status in case we modify them to be sure context switch will save FP state. With this support, Linux is on par with openSBI support. Signed-off-by: Clément Léger --- arch/riscv/kernel/fpu.S | 117 +++++++++++++++++++++ arch/riscv/kernel/traps_misaligned.c | 152 ++++++++++++++++++++++++++- 2 files changed, 265 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/fpu.S b/arch/riscv/kernel/fpu.S index dd2205473de7..2785badb247c 100644 --- a/arch/riscv/kernel/fpu.S +++ b/arch/riscv/kernel/fpu.S @@ -104,3 +104,120 @@ ENTRY(__fstate_restore) csrc CSR_STATUS, t1 ret ENDPROC(__fstate_restore) + +#define get_f32(which) fmv.x.s a0, which; j 2f +#define put_f32(which) fmv.s.x which, a1; j 2f +#if __riscv_xlen == 64 +# define get_f64(which) fmv.x.d a0, which; j 2f +# define put_f64(which) fmv.d.x which, a1; j 2f +#else +# define get_f64(which) fsd which, 0(a1); j 2f +# define put_f64(which) fld which, 0(a1); j 2f +#endif + +.macro fp_access_prologue + /* + * Compute jump offset to store the correct FP register since we don't + * have indirect FP register access + */ + sll t0, a0, 3 + la t2, 1f + add t0, t0, t2 + li t1, SR_FS + csrs CSR_STATUS, t1 + jr t0 +1: +.endm + +.macro fp_access_epilogue +2: + csrc CSR_STATUS, t1 + ret +.endm + +#define fp_access_body(__access_func) \ + __access_func(f0); \ + __access_func(f1); \ + __access_func(f2); \ + __access_func(f3); \ + __access_func(f4); \ + __access_func(f5); \ + __access_func(f6); \ + __access_func(f7); \ + __access_func(f8); \ + __access_func(f9); \ + __access_func(f10); \ + __access_func(f11); \ + __access_func(f12); \ + __access_func(f13); \ + __access_func(f14); \ + __access_func(f15); \ + __access_func(f16); \ + __access_func(f17); \ + __access_func(f18); \ + __access_func(f19); \ + __access_func(f20); \ + __access_func(f21); \ + __access_func(f22); \ + __access_func(f23); \ + __access_func(f24); \ + __access_func(f25); \ + __access_func(f26); \ + __access_func(f27); \ + __access_func(f28); \ + __access_func(f29); \ + __access_func(f30); \ + __access_func(f31) + + +/* + * Disable compressed instructions set to keep a constant offset between FP + * load/store/move instructions + */ +.option norvc +/* + * put_f32_reg - Set a FP register from a register containing the value + * a0 = FP register index to be set + * a1 = value to be loaded in the FP register + */ +SYM_FUNC_START(put_f32_reg) + fp_access_prologue + fp_access_body(put_f32) + fp_access_epilogue +SYM_FUNC_END(put_f32_reg) + +/* + * get_f32_reg - Get a FP register value and return it + * a0 = FP register index to be retrieved + */ +SYM_FUNC_START(get_f32_reg) + fp_access_prologue + fp_access_body(get_f32) + fp_access_epilogue +SYM_FUNC_END(put_f32_reg) + +/* + * put_f64_reg - Set a 64 bits FP register from a value or a pointer. + * a0 = FP register index to be set + * a1 = value/pointer to be loaded in the FP register (when xlen == 32 bits, we + * load the value to a pointer). + */ +SYM_FUNC_START(put_f64_reg) + fp_access_prologue + fp_access_body(put_f64) + fp_access_epilogue +SYM_FUNC_END(put_f64_reg) + +/* + * put_f64_reg - Get a 64 bits FP register value and returned it or store it to + * a pointer. + * a0 = FP register index to be retrieved + * a1 = If xlen == 32, pointer which should be loaded with the FP register value + * or unused if xlen == 64. In which case the FP register value is returned + * through a0 + */ +SYM_FUNC_START(get_f64_reg) + fp_access_prologue + fp_access_body(get_f64) + fp_access_epilogue +SYM_FUNC_END(get_f64_reg) diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c index 804f6c5e0e44..041fd2dbd955 100644 --- a/arch/riscv/kernel/traps_misaligned.c +++ b/arch/riscv/kernel/traps_misaligned.c @@ -153,6 +153,115 @@ #define PRECISION_S 0 #define PRECISION_D 1 +#ifdef CONFIG_FPU + +#define FP_GET_RD(insn) (insn >> 7 & 0x1F) + +extern void put_f32_reg(unsigned long fp_reg, unsigned long value); + +static int set_f32_rd(unsigned long insn, struct pt_regs *regs, + unsigned long val) +{ + unsigned long fp_reg = FP_GET_RD(insn); + + put_f32_reg(fp_reg, val); + regs->status |= SR_FS_DIRTY; + + return 0; +} + +extern void put_f64_reg(unsigned long fp_reg, unsigned long value); + +static int set_f64_rd(unsigned long insn, struct pt_regs *regs, u64 val) +{ + unsigned long fp_reg = FP_GET_RD(insn); + unsigned long value; + +#if __riscv_xlen == 32 + value = (unsigned long) &val; +#else + value = val; +#endif + put_f64_reg(fp_reg, value); + regs->status |= SR_FS_DIRTY; + + return 0; +} + +#if __riscv_xlen == 32 +extern void get_f64_reg(unsigned long fp_reg, u64 *value); + +static u64 get_f64_rs(unsigned long insn, u8 fp_reg_offset, + struct pt_regs *regs) +{ + unsigned long fp_reg = (insn >> fp_reg_offset) & 0x1F; + u64 val; + + get_f64_reg(fp_reg, &val); + regs->status |= SR_FS_DIRTY; + + return val; +} +#else + +extern unsigned long get_f64_reg(unsigned long fp_reg); + +static unsigned long get_f64_rs(unsigned long insn, u8 fp_reg_offset, + struct pt_regs *regs) +{ + unsigned long fp_reg = (insn >> fp_reg_offset) & 0x1F; + unsigned long val; + + val = get_f64_reg(fp_reg); + regs->status |= SR_FS_DIRTY; + + return val; +} + +#endif + +extern unsigned long get_f32_reg(unsigned long fp_reg); + +static unsigned long get_f32_rs(unsigned long insn, u8 fp_reg_offset, + struct pt_regs *regs) +{ + unsigned long fp_reg = (insn >> fp_reg_offset) & 0x1F; + unsigned long val; + + val = get_f32_reg(fp_reg); + regs->status |= SR_FS_DIRTY; + + return val; +} + +#else /* CONFIG_FPU */ +static void set_f32_rd(unsigned long insn, struct pt_regs *regs, + unsigned long val) {} + +static void set_f64_rd(unsigned long insn, struct pt_regs *regs, u64 val) {} + +static unsigned long get_f64_rs(unsigned long insn, u8 fp_reg_offset, + struct pt_regs *regs) +{ + return 0; +} + +static unsigned long get_f32_rs(unsigned long insn, u8 fp_reg_offset, + struct pt_regs *regs) +{ + return 0; +} + +#endif + +#define GET_F64_RS2(insn, regs) (get_f64_rs(insn, 20, regs)) +#define GET_F64_RS2C(insn, regs) (get_f64_rs(insn, 2, regs)) +#define GET_F64_RS2S(insn, regs) (get_f64_rs(RVC_RS2S(insn), 0, regs)) + +#define GET_F32_RS2(insn, regs) (get_f32_rs(insn, 20, regs)) +#define GET_F32_RS2C(insn, regs) (get_f32_rs(insn, 2, regs)) +#define GET_F32_RS2S(insn, regs) (get_f32_rs(RVC_RS2S(insn), 0, regs)) + #ifdef CONFIG_RISCV_M_MODE static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val) { @@ -362,15 +471,21 @@ int handle_misaligned_load(struct pt_regs *regs) return -1; } + if (!IS_ENABLED(CONFIG_FPU) && fp) + return -EOPNOTSUPP; + val.data_u64 = 0; for (i = 0; i < len; i++) { if (load_u8(regs, (void *)(addr + i), &val.data_bytes[i])) return -1; } - if (fp) - return -1; - SET_RD(insn, regs, val.data_ulong << shift >> shift); + if (!fp) + SET_RD(insn, regs, val.data_ulong << shift >> shift); + else if (len == 8) + set_f64_rd(insn, regs, val.data_u64); + else + set_f32_rd(insn, regs, val.data_ulong); regs->epc = epc + INSN_LEN(insn); @@ -383,7 +498,7 @@ int handle_misaligned_store(struct pt_regs *regs) unsigned long epc = regs->epc; unsigned long insn; unsigned long addr = regs->badaddr; - int i, len = 0; + int i, len = 0, fp = 0; perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, 1, regs, addr); @@ -400,6 +515,14 @@ int handle_misaligned_store(struct pt_regs *regs) } else if ((insn & INSN_MASK_SD) == INSN_MATCH_SD) { len = 8; #endif + } else if ((insn & INSN_MASK_FSD) == INSN_MATCH_FSD) { + fp = 1; + len = 8; + val.data_u64 = GET_F64_RS2(insn, regs); + } else if ((insn & INSN_MASK_FSW) == INSN_MATCH_FSW) { + fp = 1; + len = 4; + val.data_ulong = GET_F32_RS2(insn, regs); } else if ((insn & INSN_MASK_SH) == INSN_MATCH_SH) { len = 2; #if defined(CONFIG_64BIT) @@ -418,11 +541,32 @@ int handle_misaligned_store(struct pt_regs *regs) ((insn >> SH_RD) & 0x1f)) { len = 4; val.data_ulong = GET_RS2C(insn, regs); + } else if ((insn & INSN_MASK_C_FSD) == INSN_MATCH_C_FSD) { + fp = 1; + len = 8; + val.data_u64 = GET_F64_RS2S(insn, regs); + } else if ((insn & INSN_MASK_C_FSDSP) == INSN_MATCH_C_FSDSP) { + fp = 1; + len = 8; + val.data_u64 = GET_F64_RS2C(insn, regs); +#if !defined(CONFIG_64BIT) + } else if ((insn & INSN_MASK_C_FSW) == INSN_MATCH_C_FSW) { + fp = 1; + len = 4; + val.data_ulong = GET_F32_RS2S(insn, regs); + } else if ((insn & INSN_MASK_C_FSWSP) == INSN_MATCH_C_FSWSP) { + fp = 1; + len = 4; + val.data_ulong = GET_F32_RS2C(insn, regs); +#endif } else { regs->epc = epc; return -1; } + if (!IS_ENABLED(CONFIG_FPU) && fp) + return -EOPNOTSUPP; + for (i = 0; i < len; i++) { if (store_u8(regs, (void *)(addr + i), val.data_bytes[i])) return -1; -- 2.40.1