From patchwork Wed Oct 11 11:47:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 151323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp476651vqb; Wed, 11 Oct 2023 04:47:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTfEEGn1KRg/Wf6jQCAJfubkOt4E6lcWahwSGNqTwvtv1ifi1U6hQ/wCvLikw1yDExBUir X-Received: by 2002:a17:902:ce86:b0:1c4:2b71:7dc9 with SMTP id f6-20020a170902ce8600b001c42b717dc9mr23590515plg.4.1697024861943; Wed, 11 Oct 2023 04:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697024861; cv=none; d=google.com; s=arc-20160816; b=dHivpkOBaM1cDLxgzBLqRWm/NseMYcpYXljcI8rfwz4rnilKTcFlOE2G/S5IUGUViY g/z3hzw+fqX0qHYi2cHUbWP7fVuBXannNb46uWL5iyMOBWgYJTs9UFAUChNBy77l8Xiz IrojVlJgRr36TFcwl3CWOxMrCDznoDnBRsr3fSYZPaRoqsXOZ3J9acrqma5THcyg0PMe FfIfHPpJEAojuMOwi3y3TJ77OthH8PaWrFBZ5Gc2Js8dseki0GBC1YX8Ark2LDOfpArs 7tH8me+3LT6MGPttM1I1h7SaFEdgakkKBF4IsxqqNZR8FiRPzPQeRILN/PNNhMl5+VoI Z4+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=aOLZU5l0Zj4gbebgJhCz8cV9Ome32uXq9cqjGwEYin8=; fh=Vv0QpisLh5NUbeFXdmpRlq7r/ejWbgR9Jo7KtoN3KUU=; b=BFFSeYAuWKe0ILqpaQE01ys4W5DFfhCbM5anGwZYZ0VfxzqxQP2Vah1/fwLGhCNgmt MCHY24Mfbq+WRGVYjicMH5Yxq9vlUoQPGIFJf4FSW5PvBgquVkEzG0Deo4K//Cnnp22s hGLrghvPs3gBKvla8sfGwLckGbk8f0/EGLBkJOkQJoBXXHlu0oIV/IFHmbYzjLQFepWD lcc40dqakvO+L7pCml1PpQVL/QvejlvZ6H57NYL9Gb+vNUaoZ5hH/eNpjVOZ8XfXz3H7 7GJehp0/brMQg9fzMlVPCGlpILpp1R+cQ5fN/TgGjritE6WyTwI9WTyo7y6uiArcF+pr NwAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rn63VAU0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id kq12-20020a170903284c00b001c3aed2db5dsi13676553plb.409.2023.10.11.04.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 04:47:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rn63VAU0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 486E581BDF2B; Wed, 11 Oct 2023 04:47:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234762AbjJKLrf (ORCPT + 18 others); Wed, 11 Oct 2023 07:47:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234760AbjJKLr3 (ORCPT ); Wed, 11 Oct 2023 07:47:29 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C74F398 for ; Wed, 11 Oct 2023 04:47:28 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 073EAC433C9; Wed, 11 Oct 2023 11:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697024848; bh=5eol+w9isDPPTceO0nec+Q5JC7nAOskqOPXHsIAf75Q=; h=From:To:Cc:Subject:Date:From; b=rn63VAU0/bWUAp3lCxWWpkSw9gd9a42ATMVADGPkaClKeM6rE5K2L3RtE0+uAMYeS 8tu7jbJSDzs+gLhP+5LZK8j8Gg4F8Zr4jd2pf1PuhaPXprA9XeS6lu5f/Kd20pxWTg qc5D1dnzOnztti8h0IlLDHg52+bahm8Edro1oexxTO5TnwfqWAbL8wMybH7HVghNXB 2v/XkKWu1P9WLthhCx5fxuV55ZKZZUflHJypPLIg/WT/62a/6c2Tume2Yc8hcl00S6 ptFuxGkq6EEdNl3n7SW7ygbHETur+TiHQXsOpzFXjkkqLpfLjKJmHDms62y6rfV3ts 7BAeo8HCGH/5A== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Gabriel Somlo , "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH] riscv, qemu_fw_cfg: Add support for RISC-V architecture Date: Wed, 11 Oct 2023 13:47:21 +0200 Message-Id: <20231011114721.193732-1-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 11 Oct 2023 04:47:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779459541458868748 X-GMAIL-MSGID: 1779459541458868748 From: Björn Töpel Qemu fw_cfg support was missing for RISC-V, which made it hard to do proper vmcore dumps from qemu. Add the missing RISC-V arch-defines. You can now do vmcore dumps from qemu. Add "-device vmcoreinfo" to the qemu command-line. From the qemu montior: (qemu) dump-guest-memory vmcore The vmcore can now be used, e.g., with the "crash" utility. Signed-off-by: Björn Töpel Tested-by: Clément Léger Acked-by: Alistair Francis Acked-by: Michael S. Tsirkin --- drivers/firmware/Kconfig | 2 +- drivers/firmware/qemu_fw_cfg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 1c8b86a3799f7e5be903c3f49fcdaee29fd385b5 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b59e3041fd62..f05ff56629b3 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -155,7 +155,7 @@ config RASPBERRYPI_FIRMWARE config FW_CFG_SYSFS tristate "QEMU fw_cfg device support in sysfs" - depends on SYSFS && (ARM || ARM64 || PARISC || PPC_PMAC || SPARC || X86) + depends on SYSFS && (ARM || ARM64 || PARISC || PPC_PMAC || RISCV || SPARC || X86) depends on HAS_IOPORT_MAP default n help diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index a69399a6b7c0..1448f61173b3 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -211,7 +211,7 @@ static void fw_cfg_io_cleanup(void) /* arch-specific ctrl & data register offsets are not available in ACPI, DT */ #if !(defined(FW_CFG_CTRL_OFF) && defined(FW_CFG_DATA_OFF)) -# if (defined(CONFIG_ARM) || defined(CONFIG_ARM64)) +# if (defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV)) # define FW_CFG_CTRL_OFF 0x08 # define FW_CFG_DATA_OFF 0x00 # define FW_CFG_DMA_OFF 0x10