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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04012C433E7 for ; Tue, 14 Jul 2020 07:44:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE86E20890 for ; Tue, 14 Jul 2020 07:44:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sXaNTtnU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726619AbgGNHoE (ORCPT ); Tue, 14 Jul 2020 03:44:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726472AbgGNHoD (ORCPT ); Tue, 14 Jul 2020 03:44:03 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CFBC061755; Tue, 14 Jul 2020 00:44:02 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id f18so20139861wrs.0; Tue, 14 Jul 2020 00:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zTVHTrSZJQeUPRM7TFdwH3LO7vWOvPSXz5WoONveb90=; b=sXaNTtnU/MxjoUP9XZR0sBLskXc8Rq33Pf/9z8vWWDTU68j9PuUyW6Ro4dOu4+6Gza UVJZETQbShGVQZLSUbay8ccyBwO2S3KCSa/EuoNPb9d+9RESwrWKPvH3I/m1VyviStFp st/MyivuF2WPDB2yMYx5qqZ3E2Ve+sPRjELDu5SNItrbnbl4ZE1ldkbBL3yz+T6kMorx vTKOuB5rQsA2MW81AV7B72aKf7iCNDf4dQZ3JZ626nZ7VnDvi6YtntePKPaoYjMQfxnr SdLXLm99xT8nNw9OZ4dJ6bbTHUUO2CH9feCnO3agy1eYo/NREKR+Fl4kNZoxZBznsWbY nqbQ== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=zTVHTrSZJQeUPRM7TFdwH3LO7vWOvPSXz5WoONveb90=; b=WIoKmi7m75O+B0qcCt9PHFearpesiQyFxXD+wm4w3RilyJc5/kHdlRD3ZluvZyWw8r Iavai6wOpzsb6Ud07GLUTua09m+Hu1cDYtDhlbvw6rpsDhdBCV9WboUq17IuGOcjB9Xc xGq3cAzyHQFdAvTDvnrQrwd+0um91odE2kTRWYmvCyTOY3u5eTqa6sN4qNOTjaWm+oUG whPzC5kvaIuaGRTCrHQBJQ/QtqZUkRLQk7cUoeyhAISQleok8bi+Zj96n4r04s5bfRoD U1cftRHz8igT0dSIhy0Fl9BnRSFBAuoa91liYUCI1OSeQmliFjE6HUSuE7PiV6/HPxWt ubnQ== X-Gm-Message-State: AOAM5322aQMbZXzvv6PDSVA/F3KwxMsrHItC7P3stnezc7kXtd39YcsT gwf+zwTfHtmLHDG0O1Byj/Q= X-Google-Smtp-Source: ABdhPJwVMbl3PMC+ep17u+Dpeu9/Hg2sOEJE8EiKjbrAV3dzonacKFlubwOTqzQVWIAGF4cKIaJzdQ== X-Received: by 2002:adf:f350:: with SMTP id e16mr3528979wrp.43.1594712641359; Tue, 14 Jul 2020 00:44:01 -0700 (PDT) Received: from localhost.localdomain ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id l132sm3226956wmf.6.2020.07.14.00.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 00:44:00 -0700 (PDT) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org Cc: Emil Renner Berthing , Palmer Dabbelt , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Paul Walmsley , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] riscv: Add jump-label implementation Date: Tue, 14 Jul 2020 09:40:44 +0200 Message-Id: <20200714074044.10031-2-kernel@esmil.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714074044.10031-1-kernel@esmil.dk> References: <20200714074044.10031-1-kernel@esmil.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Add jump-label implementation based on the ARM64 version and add CONFIG_JUMP_LABEL=y to the defconfigs. Signed-off-by: Emil Renner Berthing Reviewed-by: Björn Töpel Tested-by: Björn Töpel --- Tested on the HiFive Unleashed board. Changes since v2: - Add missing asm/asm.h include. Reported-by: kernel test robot Changes since v1: - WARN and give up gracefully if the jump offset cannot be represented in a JAL instruction. - Add missing braces. - Add CONFIG_JUMP_LABEL=y to defconfigs. All suggested by Björn Töpel. Changes since RFC: - Use RISCV_PTR and RISCV_LGPTR macros to match struct jump_table also in 32bit kernels. - Remove unneeded branch ? 1 : 0, thanks Björn - Fix \n\n instead of \n\t mistake .../core/jump-labels/arch-support.txt | 2 +- arch/riscv/Kconfig | 2 + arch/riscv/configs/defconfig | 1 + arch/riscv/configs/nommu_k210_defconfig | 1 + arch/riscv/configs/nommu_virt_defconfig | 1 + arch/riscv/configs/rv32_defconfig | 1 + arch/riscv/include/asm/jump_label.h | 60 +++++++++++++++++++ arch/riscv/kernel/Makefile | 2 + arch/riscv/kernel/jump_label.c | 49 +++++++++++++++ 9 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/jump_label.h create mode 100644 arch/riscv/kernel/jump_label.c diff --git a/Documentation/features/core/jump-labels/arch-support.txt b/Documentation/features/core/jump-labels/arch-support.txt index 632a1c7aefa2..760243d18ed7 100644 --- a/Documentation/features/core/jump-labels/arch-support.txt +++ b/Documentation/features/core/jump-labels/arch-support.txt @@ -23,7 +23,7 @@ | openrisc: | TODO | | parisc: | ok | | powerpc: | ok | - | riscv: | TODO | + | riscv: | ok | | s390: | ok | | sh: | TODO | | sparc: | ok | diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index c6d4f7771bff..3beb844c5951 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -48,6 +48,8 @@ config RISCV select GENERIC_TIME_VSYSCALL if MMU && 64BIT select HANDLE_DOMAIN_IRQ select HAVE_ARCH_AUDITSYSCALL + select HAVE_ARCH_JUMP_LABEL + select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if MMU && 64BIT select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB_QXFER_PKT diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 4da4886246a4..d58c93efb603 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -17,6 +17,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SOC_SIFIVE=y CONFIG_SOC_VIRT=y CONFIG_SMP=y +CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_NET=y diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig index b48138e329ea..cd1df62b13c7 100644 --- a/arch/riscv/configs/nommu_k210_defconfig +++ b/arch/riscv/configs/nommu_k210_defconfig @@ -33,6 +33,7 @@ CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_CMDLINE="earlycon console=ttySIF0" CONFIG_CMDLINE_FORCE=y +CONFIG_JUMP_LABEL=y # CONFIG_BLOCK is not set CONFIG_BINFMT_FLAT=y # CONFIG_COREDUMP is not set diff --git a/arch/riscv/configs/nommu_virt_defconfig b/arch/riscv/configs/nommu_virt_defconfig index cf74e179bf90..f27596e9663e 100644 --- a/arch/riscv/configs/nommu_virt_defconfig +++ b/arch/riscv/configs/nommu_virt_defconfig @@ -30,6 +30,7 @@ CONFIG_MAXPHYSMEM_2GB=y CONFIG_SMP=y CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0" CONFIG_CMDLINE_FORCE=y +CONFIG_JUMP_LABEL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_MSDOS_PARTITION is not set diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig index 05bbf5240569..3a55f0e00d6c 100644 --- a/arch/riscv/configs/rv32_defconfig +++ b/arch/riscv/configs/rv32_defconfig @@ -17,6 +17,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_SOC_VIRT=y CONFIG_ARCH_RV32I=y CONFIG_SMP=y +CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_NET=y diff --git a/arch/riscv/include/asm/jump_label.h b/arch/riscv/include/asm/jump_label.h new file mode 100644 index 000000000000..38af2ec7b9bf --- /dev/null +++ b/arch/riscv/include/asm/jump_label.h @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2020 Emil Renner Berthing + * + * Based on arch/arm64/include/asm/jump_label.h + */ +#ifndef __ASM_JUMP_LABEL_H +#define __ASM_JUMP_LABEL_H + +#ifndef __ASSEMBLY__ + +#include +#include + +#define JUMP_LABEL_NOP_SIZE 4 + +static __always_inline bool arch_static_branch(struct static_key *key, + bool branch) +{ + asm_volatile_goto( + " .option push \n\t" + " .option norelax \n\t" + " .option norvc \n\t" + "1: nop \n\t" + " .option pop \n\t" + " .pushsection __jump_table, \"aw\" \n\t" + " .align " RISCV_LGPTR " \n\t" + " .long 1b - ., %l[label] - . \n\t" + " " RISCV_PTR " %0 - . \n\t" + " .popsection \n\t" + : : "i"(&((char *)key)[branch]) : : label); + + return false; +label: + return true; +} + +static __always_inline bool arch_static_branch_jump(struct static_key *key, + bool branch) +{ + asm_volatile_goto( + " .option push \n\t" + " .option norelax \n\t" + " .option norvc \n\t" + "1: jal zero, %l[label] \n\t" + " .option pop \n\t" + " .pushsection __jump_table, \"aw\" \n\t" + " .align " RISCV_LGPTR " \n\t" + " .long 1b - ., %l[label] - . \n\t" + " " RISCV_PTR " %0 - . \n\t" + " .popsection \n\t" + : : "i"(&((char *)key)[branch]) : : label); + + return false; +label: + return true; +} + +#endif /* __ASSEMBLY__ */ +#endif /* __ASM_JUMP_LABEL_H */ diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index b355cf485671..a5287ab9f7f2 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -53,4 +53,6 @@ endif obj-$(CONFIG_HOTPLUG_CPU) += cpu-hotplug.o obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_JUMP_LABEL) += jump_label.o + clean: diff --git a/arch/riscv/kernel/jump_label.c b/arch/riscv/kernel/jump_label.c new file mode 100644 index 000000000000..1bab1abc1aa5 --- /dev/null +++ b/arch/riscv/kernel/jump_label.c @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2020 Emil Renner Berthing + * + * Based on arch/arm64/kernel/jump_label.c + */ +#include +#include +#include +#include + +#define RISCV_INSN_NOP 0x00000013U +#define RISCV_INSN_JAL 0x0000006fU + +void arch_jump_label_transform(struct jump_entry *entry, + enum jump_label_type type) +{ + void *addr = (void *)jump_entry_code(entry); + u32 insn; + + if (type == JUMP_LABEL_JMP) { + long offset = jump_entry_target(entry) - jump_entry_code(entry); + + if (WARN_ON(offset & 1 || offset < -524288 || offset >= 524288)) + return; + + insn = RISCV_INSN_JAL | + (((u32)offset & GENMASK(19, 12)) << (12 - 12)) | + (((u32)offset & GENMASK(11, 11)) << (20 - 11)) | + (((u32)offset & GENMASK(10, 1)) << (21 - 1)) | + (((u32)offset & GENMASK(20, 20)) << (31 - 20)); + } else { + insn = RISCV_INSN_NOP; + } + + patch_text_nosync(addr, &insn, sizeof(insn)); +} + +void arch_jump_label_transform_static(struct jump_entry *entry, + enum jump_label_type type) +{ + /* + * We use the same instructions in the arch_static_branch and + * arch_static_branch_jump inline functions, so there's no + * need to patch them up here. + * The core will call arch_jump_label_transform when those + * instructions need to be replaced. + */ +} -- 2.27.0 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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0F9FC433E8 for ; Tue, 14 Jul 2020 07:44:11 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CA6021835 for ; Tue, 14 Jul 2020 07:44:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B6U1Oma4"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sXaNTtnU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CA6021835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=h3J/Nmf12LTsTWkpPbcf77uUJw8hnCInVp8k1tRF85g=; b=B6U1Oma4QL/c9y9QG6QvBOYPq DvpCekBq68J6gdlzhz3T6XHkTETDdoRSrxg8wA5CO1UNONg5wK4cZ4HewEA+LI3ma8FkZFTmcG9X+ 8ii0eDTqW/z6/OfZWGeZKdoTK6G4sB4zT+vnODS00BwMmv23NFsOmCSJ5P++4G6GBXj+TczPQq9qh KstRnUvoPkRijp/LYNtfS+oBqWGpwbTzaoUtUNgKqXgNwmRGq2g55TcjW7BUuaInarqmWaHMAHIA2 gklEeYgMeNQjLANjfTTvOmY5neXAoBOPp5fFmNHb6TvyLWv31cR8y6Sli+TJuxga9HIFPdoA/UX76 9btvVj97g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvFbj-0007Wp-2g; Tue, 14 Jul 2020 07:44:07 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvFbg-0007VM-8R for linux-riscv@lists.infradead.org; Tue, 14 Jul 2020 07:44:05 +0000 Received: by mail-wr1-x442.google.com with SMTP id a6so20108743wrm.4 for ; Tue, 14 Jul 2020 00:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zTVHTrSZJQeUPRM7TFdwH3LO7vWOvPSXz5WoONveb90=; b=sXaNTtnU/MxjoUP9XZR0sBLskXc8Rq33Pf/9z8vWWDTU68j9PuUyW6Ro4dOu4+6Gza UVJZETQbShGVQZLSUbay8ccyBwO2S3KCSa/EuoNPb9d+9RESwrWKPvH3I/m1VyviStFp st/MyivuF2WPDB2yMYx5qqZ3E2Ve+sPRjELDu5SNItrbnbl4ZE1ldkbBL3yz+T6kMorx vTKOuB5rQsA2MW81AV7B72aKf7iCNDf4dQZ3JZ626nZ7VnDvi6YtntePKPaoYjMQfxnr SdLXLm99xT8nNw9OZ4dJ6bbTHUUO2CH9feCnO3agy1eYo/NREKR+Fl4kNZoxZBznsWbY nqbQ== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=zTVHTrSZJQeUPRM7TFdwH3LO7vWOvPSXz5WoONveb90=; b=GL64ilyOfIn4TvIUYorFU73rZQCLpo+u3V9GiLqMIVuaEyL0w0ZPtRX5mxtG7L+SPF HnzYJsy75hLumsdrh5gXOk4ntub60+K6L/CrM1ClolM2fNrWDsV7dmhnd8NuKTFnBEN9 w7uEnVvJgxHYHs+CR8qtH4wvyW4rZdQLb9wXvPFzvKif4I9rlL9vRXvfmhIF90eFr71W ZefDK/Qi3N7EawfTN8SLkk5FrvoVJqs2G38sTMFJjE40/aPEwXhi5i1KbLVqSVEW2Xll r3St9BgVYm+a4+MHHeoaUm8Fef/h9wUfalrLojUf6ZTW8y4ux22PI3SatnvalQOqQXXt 5uOw== X-Gm-Message-State: AOAM5312klntGwpq9XlR8Awg39wgCbX5tg7k5D9dXc3FVlXS5TuXv1dX QCdUVoQtyZNceHvTeGNHxs/RASqdbyI//Q== X-Google-Smtp-Source: ABdhPJwVMbl3PMC+ep17u+Dpeu9/Hg2sOEJE8EiKjbrAV3dzonacKFlubwOTqzQVWIAGF4cKIaJzdQ== X-Received: by 2002:adf:f350:: with SMTP id e16mr3528979wrp.43.1594712641359; Tue, 14 Jul 2020 00:44:01 -0700 (PDT) Received: from localhost.localdomain ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id l132sm3226956wmf.6.2020.07.14.00.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 00:44:00 -0700 (PDT) From: Emil Renner Berthing To: linux-riscv@lists.infradead.org Subject: [PATCH v3 2/2] riscv: Add jump-label implementation Date: Tue, 14 Jul 2020 09:40:44 +0200 Message-Id: <20200714074044.10031-2-kernel@esmil.dk> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714074044.10031-1-kernel@esmil.dk> References: <20200714074044.10031-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200714_034404_349893_96DC247D X-CRM114-Status: GOOD ( 19.95 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Emil Renner Berthing , Jonathan Corbet , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Palmer Dabbelt , Paul Walmsley 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 QWRkIGp1bXAtbGFiZWwgaW1wbGVtZW50YXRpb24gYmFzZWQgb24gdGhlIEFSTTY0IHZlcnNpb24K YW5kIGFkZCBDT05GSUdfSlVNUF9MQUJFTD15IHRvIHRoZSBkZWZjb25maWdzLgoKU2lnbmVkLW9m Zi1ieTogRW1pbCBSZW5uZXIgQmVydGhpbmcgPGtlcm5lbEBlc21pbC5kaz4KUmV2aWV3ZWQtYnk6 IEJqw7ZybiBUw7ZwZWwgPGJqb3JuLnRvcGVsQGdtYWlsLmNvbT4KVGVzdGVkLWJ5OiBCasO2cm4g VMO2cGVsIDxiam9ybi50b3BlbEBnbWFpbC5jb20+Ci0tLQpUZXN0ZWQgb24gdGhlIEhpRml2ZSBV bmxlYXNoZWQgYm9hcmQuCgpDaGFuZ2VzIHNpbmNlIHYyOgotIEFkZCBtaXNzaW5nIGFzbS9hc20u aCBpbmNsdWRlLgogIFJlcG9ydGVkLWJ5OiBrZXJuZWwgdGVzdCByb2JvdCA8bGtwQGludGVsLmNv bT4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gV0FSTiBhbmQgZ2l2ZSB1cCBncmFjZWZ1bGx5IGlmIHRo ZSBqdW1wIG9mZnNldCBjYW5ub3QgYmUKICByZXByZXNlbnRlZCBpbiBhIEpBTCBpbnN0cnVjdGlv bi4KLSBBZGQgbWlzc2luZyBicmFjZXMuCi0gQWRkIENPTkZJR19KVU1QX0xBQkVMPXkgdG8gZGVm Y29uZmlncy4KCkFsbCBzdWdnZXN0ZWQgYnkgQmrDtnJuIFTDtnBlbC4KCkNoYW5nZXMgc2luY2Ug UkZDOgotIFVzZSBSSVNDVl9QVFIgYW5kIFJJU0NWX0xHUFRSIG1hY3JvcyB0byBtYXRjaCBzdHJ1 Y3QganVtcF90YWJsZQogIGFsc28gaW4gMzJiaXQga2VybmVscy4KLSBSZW1vdmUgdW5uZWVkZWQg YnJhbmNoID8gMSA6IDAsIHRoYW5rcyBCasO2cm4KLSBGaXggXG5cbiBpbnN0ZWFkIG9mIFxuXHQg bWlzdGFrZQoKIC4uLi9jb3JlL2p1bXAtbGFiZWxzL2FyY2gtc3VwcG9ydC50eHQgICAgICAgICB8 ICAyICstCiBhcmNoL3Jpc2N2L0tjb25maWcgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAg MiArCiBhcmNoL3Jpc2N2L2NvbmZpZ3MvZGVmY29uZmlnICAgICAgICAgICAgICAgICAgfCAgMSAr CiBhcmNoL3Jpc2N2L2NvbmZpZ3Mvbm9tbXVfazIxMF9kZWZjb25maWcgICAgICAgfCAgMSArCiBh cmNoL3Jpc2N2L2NvbmZpZ3Mvbm9tbXVfdmlydF9kZWZjb25maWcgICAgICAgfCAgMSArCiBhcmNo L3Jpc2N2L2NvbmZpZ3MvcnYzMl9kZWZjb25maWcgICAgICAgICAgICAgfCAgMSArCiBhcmNoL3Jp c2N2L2luY2x1ZGUvYXNtL2p1bXBfbGFiZWwuaCAgICAgICAgICAgfCA2MCArKysrKysrKysrKysr KysrKysrCiBhcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZSAgICAgICAgICAgICAgICAgICAgfCAg MiArCiBhcmNoL3Jpc2N2L2tlcm5lbC9qdW1wX2xhYmVsLmMgICAgICAgICAgICAgICAgfCA0OSAr KysrKysrKysrKysrKysKIDkgZmlsZXMgY2hhbmdlZCwgMTE4IGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2p1bXBf bGFiZWwuaAogY3JlYXRlIG1vZGUgMTAwNjQ0IGFyY2gvcmlzY3Yva2VybmVsL2p1bXBfbGFiZWwu YwoKZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZmVhdHVyZXMvY29yZS9qdW1wLWxhYmVscy9h cmNoLXN1cHBvcnQudHh0IGIvRG9jdW1lbnRhdGlvbi9mZWF0dXJlcy9jb3JlL2p1bXAtbGFiZWxz L2FyY2gtc3VwcG9ydC50eHQKaW5kZXggNjMyYTFjN2FlZmEyLi43NjAyNDNkMThlZDcgMTAwNjQ0 Ci0tLSBhL0RvY3VtZW50YXRpb24vZmVhdHVyZXMvY29yZS9qdW1wLWxhYmVscy9hcmNoLXN1cHBv cnQudHh0CisrKyBiL0RvY3VtZW50YXRpb24vZmVhdHVyZXMvY29yZS9qdW1wLWxhYmVscy9hcmNo LXN1cHBvcnQudHh0CkBAIC0yMyw3ICsyMyw3IEBACiAgICAgfCAgICBvcGVucmlzYzogfCBUT0RP IHwKICAgICB8ICAgICAgcGFyaXNjOiB8ICBvayAgfAogICAgIHwgICAgIHBvd2VycGM6IHwgIG9r ICB8Ci0gICAgfCAgICAgICByaXNjdjogfCBUT0RPIHwKKyAgICB8ICAgICAgIHJpc2N2OiB8ICBv ayAgfAogICAgIHwgICAgICAgIHMzOTA6IHwgIG9rICB8CiAgICAgfCAgICAgICAgICBzaDogfCBU T0RPIHwKICAgICB8ICAgICAgIHNwYXJjOiB8ICBvayAgfApkaWZmIC0tZ2l0IGEvYXJjaC9yaXNj di9LY29uZmlnIGIvYXJjaC9yaXNjdi9LY29uZmlnCmluZGV4IGM2ZDRmNzc3MWJmZi4uM2JlYjg0 NGM1OTUxIDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L0tjb25maWcKKysrIGIvYXJjaC9yaXNjdi9L Y29uZmlnCkBAIC00OCw2ICs0OCw4IEBAIGNvbmZpZyBSSVNDVgogCXNlbGVjdCBHRU5FUklDX1RJ TUVfVlNZU0NBTEwgaWYgTU1VICYmIDY0QklUCiAJc2VsZWN0IEhBTkRMRV9ET01BSU5fSVJRCiAJ c2VsZWN0IEhBVkVfQVJDSF9BVURJVFNZU0NBTEwKKwlzZWxlY3QgSEFWRV9BUkNIX0pVTVBfTEFC RUwKKwlzZWxlY3QgSEFWRV9BUkNIX0pVTVBfTEFCRUxfUkVMQVRJVkUKIAlzZWxlY3QgSEFWRV9B UkNIX0tBU0FOIGlmIE1NVSAmJiA2NEJJVAogCXNlbGVjdCBIQVZFX0FSQ0hfS0dEQgogCXNlbGVj dCBIQVZFX0FSQ0hfS0dEQl9RWEZFUl9QS1QKZGlmZiAtLWdpdCBhL2FyY2gvcmlzY3YvY29uZmln cy9kZWZjb25maWcgYi9hcmNoL3Jpc2N2L2NvbmZpZ3MvZGVmY29uZmlnCmluZGV4IDRkYTQ4ODYy NDZhNC4uZDU4YzkzZWZiNjAzIDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L2NvbmZpZ3MvZGVmY29u ZmlnCisrKyBiL2FyY2gvcmlzY3YvY29uZmlncy9kZWZjb25maWcKQEAgLTE3LDYgKzE3LDcgQEAg Q09ORklHX0JQRl9TWVNDQUxMPXkKIENPTkZJR19TT0NfU0lGSVZFPXkKIENPTkZJR19TT0NfVklS VD15CiBDT05GSUdfU01QPXkKK0NPTkZJR19KVU1QX0xBQkVMPXkKIENPTkZJR19NT0RVTEVTPXkK IENPTkZJR19NT0RVTEVfVU5MT0FEPXkKIENPTkZJR19ORVQ9eQpkaWZmIC0tZ2l0IGEvYXJjaC9y aXNjdi9jb25maWdzL25vbW11X2syMTBfZGVmY29uZmlnIGIvYXJjaC9yaXNjdi9jb25maWdzL25v bW11X2syMTBfZGVmY29uZmlnCmluZGV4IGI0ODEzOGUzMjllYS4uY2QxZGY2MmIxM2M3IDEwMDY0 NAotLS0gYS9hcmNoL3Jpc2N2L2NvbmZpZ3Mvbm9tbXVfazIxMF9kZWZjb25maWcKKysrIGIvYXJj aC9yaXNjdi9jb25maWdzL25vbW11X2syMTBfZGVmY29uZmlnCkBAIC0zMyw2ICszMyw3IEBAIENP TkZJR19TTVA9eQogQ09ORklHX05SX0NQVVM9MgogQ09ORklHX0NNRExJTkU9ImVhcmx5Y29uIGNv bnNvbGU9dHR5U0lGMCIKIENPTkZJR19DTURMSU5FX0ZPUkNFPXkKK0NPTkZJR19KVU1QX0xBQkVM PXkKICMgQ09ORklHX0JMT0NLIGlzIG5vdCBzZXQKIENPTkZJR19CSU5GTVRfRkxBVD15CiAjIENP TkZJR19DT1JFRFVNUCBpcyBub3Qgc2V0CmRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2NvbmZpZ3Mv bm9tbXVfdmlydF9kZWZjb25maWcgYi9hcmNoL3Jpc2N2L2NvbmZpZ3Mvbm9tbXVfdmlydF9kZWZj b25maWcKaW5kZXggY2Y3NGUxNzliZjkwLi5mMjc1OTZlOTY2M2UgMTAwNjQ0Ci0tLSBhL2FyY2gv cmlzY3YvY29uZmlncy9ub21tdV92aXJ0X2RlZmNvbmZpZworKysgYi9hcmNoL3Jpc2N2L2NvbmZp Z3Mvbm9tbXVfdmlydF9kZWZjb25maWcKQEAgLTMwLDYgKzMwLDcgQEAgQ09ORklHX01BWFBIWVNN RU1fMkdCPXkKIENPTkZJR19TTVA9eQogQ09ORklHX0NNRExJTkU9InJvb3Q9L2Rldi92ZGEgcncg ZWFybHljb249dWFydDgyNTAsbW1pbywweDEwMDAwMDAwLDExNTIwMG44IGNvbnNvbGU9dHR5UzAi CiBDT05GSUdfQ01ETElORV9GT1JDRT15CitDT05GSUdfSlVNUF9MQUJFTD15CiAjIENPTkZJR19C TEtfREVWX0JTRyBpcyBub3Qgc2V0CiBDT05GSUdfUEFSVElUSU9OX0FEVkFOQ0VEPXkKICMgQ09O RklHX01TRE9TX1BBUlRJVElPTiBpcyBub3Qgc2V0CmRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2Nv bmZpZ3MvcnYzMl9kZWZjb25maWcgYi9hcmNoL3Jpc2N2L2NvbmZpZ3MvcnYzMl9kZWZjb25maWcK aW5kZXggMDViYmY1MjQwNTY5Li4zYTU1ZjBlMDBkNmMgMTAwNjQ0Ci0tLSBhL2FyY2gvcmlzY3Yv Y29uZmlncy9ydjMyX2RlZmNvbmZpZworKysgYi9hcmNoL3Jpc2N2L2NvbmZpZ3MvcnYzMl9kZWZj b25maWcKQEAgLTE3LDYgKzE3LDcgQEAgQ09ORklHX0JQRl9TWVNDQUxMPXkKIENPTkZJR19TT0Nf VklSVD15CiBDT05GSUdfQVJDSF9SVjMyST15CiBDT05GSUdfU01QPXkKK0NPTkZJR19KVU1QX0xB QkVMPXkKIENPTkZJR19NT0RVTEVTPXkKIENPTkZJR19NT0RVTEVfVU5MT0FEPXkKIENPTkZJR19O RVQ9eQpkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9qdW1wX2xhYmVsLmggYi9h cmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2p1bXBfbGFiZWwuaApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAuLjM4YWYyZWM3YjliZgotLS0gL2Rldi9udWxsCisrKyBiL2FyY2gv cmlzY3YvaW5jbHVkZS9hc20vanVtcF9sYWJlbC5oCkBAIC0wLDAgKzEsNjAgQEAKKy8qIFNQRFgt TGljZW5zZS1JZGVudGlmaWVyOiBHUEwtMi4wLW9ubHkgKi8KKy8qCisgKiBDb3B5cmlnaHQgKEMp IDIwMjAgRW1pbCBSZW5uZXIgQmVydGhpbmcKKyAqCisgKiBCYXNlZCBvbiBhcmNoL2FybTY0L2lu Y2x1ZGUvYXNtL2p1bXBfbGFiZWwuaAorICovCisjaWZuZGVmIF9fQVNNX0pVTVBfTEFCRUxfSAor I2RlZmluZSBfX0FTTV9KVU1QX0xBQkVMX0gKKworI2lmbmRlZiBfX0FTU0VNQkxZX18KKworI2lu Y2x1ZGUgPGxpbnV4L3R5cGVzLmg+CisjaW5jbHVkZSA8YXNtL2FzbS5oPgorCisjZGVmaW5lIEpV TVBfTEFCRUxfTk9QX1NJWkUgNAorCitzdGF0aWMgX19hbHdheXNfaW5saW5lIGJvb2wgYXJjaF9z dGF0aWNfYnJhbmNoKHN0cnVjdCBzdGF0aWNfa2V5ICprZXksCisJCQkJCSAgICAgICBib29sIGJy YW5jaCkKK3sKKwlhc21fdm9sYXRpbGVfZ290bygKKwkJIgkub3B0aW9uIHB1c2gJCQkJXG5cdCIK KwkJIgkub3B0aW9uIG5vcmVsYXgJCQkJXG5cdCIKKwkJIgkub3B0aW9uIG5vcnZjCQkJCVxuXHQi CisJCSIxOglub3AJCQkJCVxuXHQiCisJCSIJLm9wdGlvbiBwb3AJCQkJXG5cdCIKKwkJIgkucHVz aHNlY3Rpb24JX19qdW1wX3RhYmxlLCBcImF3XCIJXG5cdCIKKwkJIgkuYWxpZ24JCSIgUklTQ1Zf TEdQVFIgIgkJXG5cdCIKKwkJIgkubG9uZwkJMWIgLSAuLCAlbFtsYWJlbF0gLSAuCVxuXHQiCisJ CSIJIiBSSVNDVl9QVFIgIgklMCAtIC4JCQlcblx0IgorCQkiCS5wb3BzZWN0aW9uCQkJCVxuXHQi CisJCTogIDogICJpIigmKChjaGFyICopa2V5KVticmFuY2hdKSA6ICA6IGxhYmVsKTsKKworCXJl dHVybiBmYWxzZTsKK2xhYmVsOgorCXJldHVybiB0cnVlOworfQorCitzdGF0aWMgX19hbHdheXNf aW5saW5lIGJvb2wgYXJjaF9zdGF0aWNfYnJhbmNoX2p1bXAoc3RydWN0IHN0YXRpY19rZXkgKmtl eSwKKwkJCQkJCSAgICBib29sIGJyYW5jaCkKK3sKKwlhc21fdm9sYXRpbGVfZ290bygKKwkJIgku b3B0aW9uIHB1c2gJCQkJXG5cdCIKKwkJIgkub3B0aW9uIG5vcmVsYXgJCQkJXG5cdCIKKwkJIgku b3B0aW9uIG5vcnZjCQkJCVxuXHQiCisJCSIxOglqYWwJCXplcm8sICVsW2xhYmVsXQkJXG5cdCIK KwkJIgkub3B0aW9uIHBvcAkJCQlcblx0IgorCQkiCS5wdXNoc2VjdGlvbglfX2p1bXBfdGFibGUs IFwiYXdcIglcblx0IgorCQkiCS5hbGlnbgkJIiBSSVNDVl9MR1BUUiAiCQlcblx0IgorCQkiCS5s b25nCQkxYiAtIC4sICVsW2xhYmVsXSAtIC4JXG5cdCIKKwkJIgkiIFJJU0NWX1BUUiAiCSUwIC0g LgkJCVxuXHQiCisJCSIJLnBvcHNlY3Rpb24JCQkJXG5cdCIKKwkJOiAgOiAgImkiKCYoKGNoYXIg KilrZXkpW2JyYW5jaF0pIDogIDogbGFiZWwpOworCisJcmV0dXJuIGZhbHNlOworbGFiZWw6CisJ cmV0dXJuIHRydWU7Cit9CisKKyNlbmRpZiAgLyogX19BU1NFTUJMWV9fICovCisjZW5kaWYJLyog X19BU01fSlVNUF9MQUJFTF9IICovCmRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2tlcm5lbC9NYWtl ZmlsZSBiL2FyY2gvcmlzY3Yva2VybmVsL01ha2VmaWxlCmluZGV4IGIzNTVjZjQ4NTY3MS4uYTUy ODdhYjlmN2YyIDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZQorKysgYi9h cmNoL3Jpc2N2L2tlcm5lbC9NYWtlZmlsZQpAQCAtNTMsNCArNTMsNiBAQCBlbmRpZgogb2JqLSQo Q09ORklHX0hPVFBMVUdfQ1BVKQkrPSBjcHUtaG90cGx1Zy5vCiBvYmotJChDT05GSUdfS0dEQikJ CSs9IGtnZGIubwogCitvYmotJChDT05GSUdfSlVNUF9MQUJFTCkJKz0ganVtcF9sYWJlbC5vCisK IGNsZWFuOgpkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9rZXJuZWwvanVtcF9sYWJlbC5jIGIvYXJj aC9yaXNjdi9rZXJuZWwvanVtcF9sYWJlbC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMC4uMWJhYjFhYmMxYWE1Ci0tLSAvZGV2L251bGwKKysrIGIvYXJjaC9yaXNjdi9r ZXJuZWwvanVtcF9sYWJlbC5jCkBAIC0wLDAgKzEsNDkgQEAKKy8vIFNQRFgtTGljZW5zZS1JZGVu dGlmaWVyOiBHUEwtMi4wLW9ubHkKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjAgRW1pbCBSZW5u ZXIgQmVydGhpbmcKKyAqCisgKiBCYXNlZCBvbiBhcmNoL2FybTY0L2tlcm5lbC9qdW1wX2xhYmVs LmMKKyAqLworI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgorI2luY2x1ZGUgPGxpbnV4L2p1bXBf bGFiZWwuaD4KKyNpbmNsdWRlIDxhc20vYnVnLmg+CisjaW5jbHVkZSA8YXNtL3BhdGNoLmg+CisK KyNkZWZpbmUgUklTQ1ZfSU5TTl9OT1AgMHgwMDAwMDAxM1UKKyNkZWZpbmUgUklTQ1ZfSU5TTl9K QUwgMHgwMDAwMDA2ZlUKKwordm9pZCBhcmNoX2p1bXBfbGFiZWxfdHJhbnNmb3JtKHN0cnVjdCBq dW1wX2VudHJ5ICplbnRyeSwKKwkJCSAgICAgICBlbnVtIGp1bXBfbGFiZWxfdHlwZSB0eXBlKQor eworCXZvaWQgKmFkZHIgPSAodm9pZCAqKWp1bXBfZW50cnlfY29kZShlbnRyeSk7CisJdTMyIGlu c247CisKKwlpZiAodHlwZSA9PSBKVU1QX0xBQkVMX0pNUCkgeworCQlsb25nIG9mZnNldCA9IGp1 bXBfZW50cnlfdGFyZ2V0KGVudHJ5KSAtIGp1bXBfZW50cnlfY29kZShlbnRyeSk7CisKKwkJaWYg KFdBUk5fT04ob2Zmc2V0ICYgMSB8fCBvZmZzZXQgPCAtNTI0Mjg4IHx8IG9mZnNldCA+PSA1MjQy ODgpKQorCQkJcmV0dXJuOworCisJCWluc24gPSBSSVNDVl9JTlNOX0pBTCB8CisJCQkoKCh1MzIp b2Zmc2V0ICYgR0VOTUFTSygxOSwgMTIpKSA8PCAoMTIgLSAxMikpIHwKKwkJCSgoKHUzMilvZmZz ZXQgJiBHRU5NQVNLKDExLCAxMSkpIDw8ICgyMCAtIDExKSkgfAorCQkJKCgodTMyKW9mZnNldCAm IEdFTk1BU0soMTAsICAxKSkgPDwgKDIxIC0gIDEpKSB8CisJCQkoKCh1MzIpb2Zmc2V0ICYgR0VO TUFTSygyMCwgMjApKSA8PCAoMzEgLSAyMCkpOworCX0gZWxzZSB7CisJCWluc24gPSBSSVNDVl9J TlNOX05PUDsKKwl9CisKKwlwYXRjaF90ZXh0X25vc3luYyhhZGRyLCAmaW5zbiwgc2l6ZW9mKGlu c24pKTsKK30KKwordm9pZCBhcmNoX2p1bXBfbGFiZWxfdHJhbnNmb3JtX3N0YXRpYyhzdHJ1Y3Qg anVtcF9lbnRyeSAqZW50cnksCisJCQkJICAgICAgZW51bSBqdW1wX2xhYmVsX3R5cGUgdHlwZSkK K3sKKwkvKgorCSAqIFdlIHVzZSB0aGUgc2FtZSBpbnN0cnVjdGlvbnMgaW4gdGhlIGFyY2hfc3Rh dGljX2JyYW5jaCBhbmQKKwkgKiBhcmNoX3N0YXRpY19icmFuY2hfanVtcCBpbmxpbmUgZnVuY3Rp b25zLCBzbyB0aGVyZSdzIG5vCisJICogbmVlZCB0byBwYXRjaCB0aGVtIHVwIGhlcmUuCisJICog VGhlIGNvcmUgd2lsbCBjYWxsIGFyY2hfanVtcF9sYWJlbF90cmFuc2Zvcm0gIHdoZW4gdGhvc2UK KwkgKiBpbnN0cnVjdGlvbnMgbmVlZCB0byBiZSByZXBsYWNlZC4KKwkgKi8KK30KLS0gCjIuMjcu MAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6 Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK