From patchwork Sat Jun 12 04:31:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1491237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Xsssuox1; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=FP3ST9Nh; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-sharedspace-onmicrosoft-com header.b=kW5jssNr; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G24Yy3wzYz9sVm for ; Sat, 12 Jun 2021 14:32:22 +1000 (AEST) 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: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:In-Reply-To:References: List-Owner; bh=8eMFMprTqEuqd0j6ZrRSgeElWuZbu+EpYn5rBfsJAMY=; b=Xsssuox19ARfiu 8AOAafXWyqR1b5xWfFLYyo9EhXAHrNuWpAoqrM86ji5RVxx4kQ9KuX9wubZWmsyht+DUqjFwibw9S N+7HV/EQYtgGO0lUfNmxDSVwxjKRQNkOmTimy00uwYpqBLnezX0gn1Q2zx8jY/36obRPLgWxRjJZS RH1DKsmbXAI6hmE32Q7ChY4ncMjxw6PIkWNP9DD7J7IhfQkUCptrGnFSEYJFfhfBzku97cBlaHY6s LPhpXy2jpcd6TIGvDJpqSySgOxGY/+XgWix2+lmYl6d8TEtG2CeKEFqvUf+gasxmqBn4z709ec8Tu bWsUWzb8oNBlXIIEq4fg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrvJg-007or1-Ia; Sat, 12 Jun 2021 04:32:16 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrvJe-007oqg-4M for opensbi@lists.infradead.org; Sat, 12 Jun 2021 04:32:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1623472332; x=1655008332; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=OevYvjYvuOK/z8+qCI9tFdmG6oFnzlnkWyJ2YKvasTw=; b=FP3ST9NhtZl8l5jlfsrCDP1GZFN26gLCSMdM+Ducmahr+zEWcLmIDklP ffWCjAWHogeUaEGekARK9TdVJ8TWuy6EbK16A0BX2D2GCFAPkKOLJG2kD crGizhVqFTpy1kGJik8ABc+6Xxarf5sXW6K8L0ZKOhy4SFk6DoMMgL7jd eGZ4z+oQCC/5/pYJimsBFsah0ltC6FPrIgRKXeFKBvuMn/CknDpxSo8XF ZvwHBawWn2NnWpsUtYxOiLNW2itTrqazxI5sGTslPjRTdLpbjLUUpveJE uVEAaKP3BqbCf5iiHFXMfpAQKAODRn1IEQzCtytJ/W7K5GJlBTgtmbXnP Q==; IronPort-SDR: 9jxj65eYwNVaggTiNjmiBSP0wpOQKEUDD9FD47WlAEb/w1fG/MMe1068MXsC1RtLI9oLqsG1Lj FHyis3IO2iBrv5IciaYkU/fQF4sJwd+zIFJ6SQwmBtVlWIqsZXTcB3G7hMzHOqNlqOC/3gEZAE vvLSngUYIsPtUpr/zwmChwp9U1tkldjN3WeNueWqSjsGNNBBHyJfjNqqju30Y++DBpY9HZ1fb8 Whldjh3fMPo9uP4E6ry+W12xTAQIzVpF4M5NAaSAJl5r/IaXG6NUWe654aAa+i1JyEwBQRK9GV zXU= X-IronPort-AV: E=Sophos;i="5.83,268,1616428800"; d="scan'208";a="176452418" Received: from mail-mw2nam08lp2177.outbound.protection.outlook.com (HELO NAM04-MW2-obe.outbound.protection.outlook.com) ([104.47.73.177]) by ob1.hgst.iphmx.com with ESMTP; 12 Jun 2021 12:32:10 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XeneBzcr83Wt4D3YVC0BKJciHNrrbPddOUinqWUfQXLGdvWrooiZPFHT60XJGSd4i6YhvDwL9Uunp/a3GEKc1Fdo9VOHk1RWMh2hPTpi5rYZilmPy4ebJIbohYV9D2wJvlmMMfk5CWHcn/nvAY1rrdc5hpE8Ef089O5rgNmlPbQuiHJfU+UicOJoextENWhWI6PncpMgtJ+Evpy8Aqi2iyAgBEuHjiObJRx2jQScXDkiQ4WVTc9Vqh7ySOMG+ZZGPRILWIxCXwkpLKd+q5PCvSKxgSs9zLRh1z8vldE1AIXQf0KpjYBE2oszloMBPhKRggnlSjWQMgVb1qXF+1Ezcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XFRZbVSyInfE2GMcrVFzKrRHL4eFVx+Pyb2WJNRTdG8=; b=OOTKOHYgy4tFzbBB1h9D3e8CYStbtDKFz3y7Gnm5RC2B3+z6udp4fnME5LbKrEFX0wVYT0vj2ZG2ZU6fr3s50xsCaS/EFcMo8TwIJCZFIFH4p28EYtgAZ0bJ16ByE47b83zPfyyXYTCcnqAB+UomgSSGAvYGZ3srANahO+MHnF7qDShApzoQzDcmdyCIThwZ6LdmN7mj6m3Y4v/H3PNfR8QF8IOTJJrw7r57lyFAOjE7zTWkPEX8bWRcY28HSQ4mgSEcTXH5jXJsnVTNcAGU9FlaPnG+qR+V/RdLNTK/lERdckVofRN/VUPjtq7/gDkMPmrGMEzTN9BBCsN3KPp9+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XFRZbVSyInfE2GMcrVFzKrRHL4eFVx+Pyb2WJNRTdG8=; b=kW5jssNrFQXBmQ/eKowaLHG9bUx1Sd/y7e+oXRBoAUYJtlogklTXWPn+OtcBbMaTteUXLoKLziK13wv1mmKuwcEyCtra/xOMNhLfAV6qHEyaOLanH9AEaSofpYTYGDr9v52tc8Ty138aamsWU3oHzcxS/rldBnzuMKa/zhL2jFM= Authentication-Results: wdc.com; dkim=none (message not signed) header.d=none;wdc.com; dmarc=none action=none header.from=wdc.com; Received: from CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) by CO6PR04MB7780.namprd04.prod.outlook.com (2603:10b6:5:359::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Sat, 12 Jun 2021 04:32:11 +0000 Received: from CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8]) by CO6PR04MB7812.namprd04.prod.outlook.com ([fe80::a153:b7f8:c87f:89f8%9]) with mapi id 15.20.4219.024; Sat, 12 Jun 2021 04:32:11 +0000 From: Anup Patel To: Atish Patra , Alistair Francis Cc: Anup Patel , opensbi@lists.infradead.org, Charles Papon , Anup Patel Subject: [PATCH v3] lib: sbi: Fix GET_F64_REG inline assembly Date: Sat, 12 Jun 2021 10:01:31 +0530 Message-Id: <20210612043131.156280-1-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 X-Originating-IP: [122.167.155.82] X-ClientProxiedBy: MAXPR0101CA0024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::34) To CO6PR04MB7812.namprd04.prod.outlook.com (2603:10b6:303:138::6) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.167.155.82) by MAXPR0101CA0024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:c::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Sat, 12 Jun 2021 04:32:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d64037b6-72f1-46b7-dafc-08d92d5b0b81 X-MS-TrafficTypeDiagnostic: CO6PR04MB7780: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HjoI6YsbKHRw2f4U309bq05eTYRRnu3J3U22PU6erMAM0RRc5cgLYmDb85QrROYDLsozrxm3C3w30AD85J+9745bFbv+pPZT6IKkvkesAeUcXZhB2f3xShNxkfjnKoz5Cnc7TuA3NF5TrS63teQVEd8Qu/nwWjmcTHFlEiNsTzszmHVKwpGzZEUqO8EWrer0bRvUb9GiWev223Bp14GQRHvHrqfR0sOE2VEalfrHmpzuk08DzCQVY5yYl/eXHGW5MBBytwYQlWN6fXbLno5OYjc4Z5jY+gUQ8+O4nRB1/sEtpVeyMt/B+W+ogeXZ6F47UwQZQsCKutUGQz8rHLdtQo1RvNqAeiNbHlWLV/fkQ0oYJy0RwWB7whDjZzz2VVgEZCGhCSnL6N/aPNGbGa7PGkX3HkV/KNCjCFr1OfoTo/yfJX4TDyqEkGisLSyI64xApB4w5K5Ml1NPBW1VFozLdGbZ7Q4QuTJ14p67MrGHAbb82OfRDorgY6RWyFFzoWawWgPmH364FXtvxBNSWHxW2DEpD1MIZeV5DKVbwem+ZCw6AB7b0PADQbKe45qtzK5sMDMl9i3asLJKt1JY/BTxBDoE9esUppROXvRUkg0PMXvoIIgInjqt0BMaHHnNN8UQt2wbThspNMZAyWUsBc8Gzg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR04MB7812.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(396003)(346002)(366004)(376002)(136003)(4326008)(86362001)(6666004)(8886007)(7696005)(52116002)(2906002)(83380400001)(1076003)(5660300002)(38350700002)(38100700002)(36756003)(2616005)(8936002)(26005)(6636002)(956004)(478600001)(44832011)(186003)(16526019)(55016002)(110136005)(316002)(54906003)(66556008)(66476007)(66946007)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3Jq6eiirJLaxAM6tD4nTu8p41z6QKuaTcHHANgZoaP/33P2DQcwH38HnvZYhpjmvz0sFq4c8H+bh2nqaPpklJ8ARB12JmdEnleI2cv4VGW7mSRAZpQWIYc84cUR21/Ma5EPmEgDtKRBaMtlPiIELUxO/ndt/hN/1QDHUTjSDCYBUiQf571lhKbve0js4iH7esGe1LGaq69OUcGgXCvNVP7g/QJUBZvy+l87m29xgpIBHr6qG6vaZWeQYzVylSumqRN1yUBha8fcdBzqGVWIwDbCJNKX8v37nEixWvGQPtqMb0GI9KQDX6QmPyTXKC8CN6WeVPWFz3XiDpnSEr2bER/riT+4liJj4XzVqXu6FGVyEk45gc3k/4swj601/WPR98gp2nAW+Vy5ty5kJOP6mkhPAo+LAWUadOajQzZ2AFneJip6SWA2PobvayaiKfgnspZ4Nxi90x9PBPuAlFoDmhE2Szdd7pyZVrp6RyJHh0G4iYYlDF0lSI9UgzDh6Aqq5D7cPCXso9GkweU46BmlnTU0MWJoc7w3259w5oVYEgzn1rMwkeofkJxIGuy28trli/WkBIqh88W4KOhoGQ/up1yQXjIHaBPUhBGhyyL2+rBNYr7fBTyEQixcI+kCeI+g8sUriwmlwDqzmGD6XsqmmN2XcFANBxsEbhAElWTDbJQK79YCF6Pa+uowaNDvYIW1+1NzHbNGhxaG1VfucnTUKlX6V0WBO65HXJAjKDi2L4tyBmwSiQ5fMU9kRKviGckl3lsH8zoo1R/BBxlLOiP7CDbsThH+JNoUHOOEdP7UT1JlmJfyjP8j/1k85eYdv0PGdBiI1iseCUQZRbAdVWdZmNXLGN+RPXi+Zvvnf9DEyTtIs17qe9fnqul5b413gTiPOeluj+g4YzDDt+1FgTW6EghzuSFcZaLPZWcDssjuxdWuC4JrcfnLUqVGCARLKYcOdnWo5DyI+1AAchyO/Rsoj7gv8dxPuQDszfDSfuOQiBriDeWlJ83PpCsyOXkHq7/aQKgRhhfuFFrWhVzE/bfVRpl/SLK/Qg/rtIRupe+exUFDIL7aMh4u4heo48ZouMKaVGjN5LxG4KPXzkFbavjK/40LcoGKX6WCNEjZmuxgDjAvoqbJlqo7Dlwow2HqEaii0wINwqCj5D+itc+bhHv2+eqgLgME0v92tBIX1w0+MBCa2290hdcttDPcMX6dAhZOKMIJDwSCkPRLjK9Gsij/EsgikRbuWwQxG8Dv1bYdkWQV50IW3CiwLJZ+BMVk1wskhy+OHxcleXSO/7dqvGhOwVqVXhAvac/Oq98Ho/UGoTKB93Rwf3XpO4AQa7TQRM0j1 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: d64037b6-72f1-46b7-dafc-08d92d5b0b81 X-MS-Exchange-CrossTenant-AuthSource: CO6PR04MB7812.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2021 04:32:11.0398 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: DeGWMsN2sOUYvsuI2mBWiN7V4fpBePDMusu+fj6vbOeowo+qlcPUQhBPJckwetY5C9xNkc8p+EviNf7a+DIbCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR04MB7780 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210611_213214_269347_F4216123 X-CRM114-Status: UNSURE ( 9.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Charles Papon Current, GET_F64_REG() macro does not generate correct inline assembly for the RV32 systems. This patch provides separate definitions of GET_F64_REG() macro for RV32 and RV64 systems. Content analysis details: (-2.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.153.141 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Charles Papon Current, GET_F64_REG() macro does not generate correct inline assembly for the RV32 systems. This patch provides separate definitions of GET_F64_REG() macro for RV32 and RV64 systems. Signed-off-by: Charles Papon Signed-off-by: Anup Patel --- include/sbi/riscv_fp.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/include/sbi/riscv_fp.h b/include/sbi/riscv_fp.h index a685884..b3dc08b 100644 --- a/include/sbi/riscv_fp.h +++ b/include/sbi/riscv_fp.h @@ -42,15 +42,28 @@ : "t0"); \ }) #define init_fp_reg(i) SET_F32_REG((i) << 3, 3, 0, 0) + +#if __riscv_xlen == 64 #define GET_F64_REG(insn, pos, regs) \ ({ \ - register ulong value asm("a0") = \ - SHIFT_RIGHT(insn, (pos)-3) & 0xf8; \ + register ulong value asm("a0") = SHIFT_RIGHT(insn, (pos)-3) & 0xf8; \ ulong tmp; \ asm("1: auipc %0, %%pcrel_hi(get_f64_reg); add %0, %0, %1; jalr t0, %0, %%pcrel_lo(1b)" \ : "=&r"(tmp), "+&r"(value)::"t0"); \ - sizeof(ulong) == 4 ? *(int64_t *)value : (int64_t)value; \ + value; \ }) +#else +#define GET_F64_REG(insn, pos, regs) \ + ({ \ + u64 value; \ + ulong offset = SHIFT_RIGHT(insn, (pos)-3) & 0xf8; \ + register ulong ptr asm("a0") = (ulong)&value; \ + asm ("1: auipc t1, %%pcrel_hi(get_f64_reg); add t1, t1, %2; jalr t0, t1, %%pcrel_lo(1b)" \ + : "=m"(value) : "r"(ptr), "r"(offset) : "t0", "t1"); \ + value; \ + }) +#endif + #define SET_F64_REG(insn, pos, regs, val) \ ({ \ uint64_t __val = (val); \