From patchwork Thu Oct 12 10:28:52 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: 151912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1120219vqb; Thu, 12 Oct 2023 03:29:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGv7pTYZ4uzXbxy86ufWwhSUNAhL4VDKbVslcY44rWvlwUYD/QnZ2ld/udQ5bBvN09TcMQf X-Received: by 2002:a17:902:e28b:b0:1c9:e48c:7260 with SMTP id o11-20020a170902e28b00b001c9e48c7260mr594888plc.6.1697106570861; Thu, 12 Oct 2023 03:29:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697106570; cv=none; d=google.com; s=arc-20160816; b=djgMtHaHD8wQmrZB6MTlorUsFhNwfQnSZI8w2QuKYSvvG4zEEnZx1puKTYAehZpiYP jDj2CIaxS3h4CbZn18iIxAmLtnjCQnPpOQSw57jcCtxgFUVCBDOipMb2wlgYUahgXXDi c7iPmIY6alaaYoCtTM86yUBmuOOJDmJ98Vlzu8RgY4KXx/be823jh7e7H8qzjisIABtL D5adXuXvJiVruAzahINj2o7oU0p1tj1fBXNwxJISyk16Z6GVohSLwxMeHH2oGdRewE5l h2MPWuoag2bQQkClVpazNYGnJnYwYQxMYeU7rgtkivm5mBkUNfyQKGyrEkoeDp1QRfWh tR1w== 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=PviiqUEUbQaeTiS5KocMEmM4XhHcmIxCc43XM33ZiBE=; fh=g+Id2w+Q2QU39cM59LEpdW2mV8caO5ldIrDYEvQaIRw=; b=TXZxMw9p/RdKfiqXRcvNsnGGRVejUi8VJi/7oOE3ZYGo2caNSjQruSy8YuHAn4epT9 sjEsHXGwatlKI2KTIfPQzLNnpaWNnzBgmnKw4OHlrmAbrCxakmydgednX8ockIBN7kw4 UksQ/LR5Ul61z7Z98K6bK12QVvlOuNHnnZtRVISjQ8xj2y2Q8htKZL3vDxhRkuomFTth QfGeMXXcd0ZqhNqhPl+ZTSdFqkTMXAuqHo99gO9/cgnPGtorO/NdXi2YMAGWTWo3kBUs dqqOk2hhKwd6bXmeC9d/6bQ/5DmHTXYxnHWvtiKhoRwu86G6NaxPPiYaEIg+LYBFtgXA pwjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=brE3CEeT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id p18-20020a170902e75200b001c60636e426si2070276plf.432.2023.10.12.03.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 03:29:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=brE3CEeT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id ACBAE8122F05; Thu, 12 Oct 2023 03:29:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377746AbjJLK3O (ORCPT + 19 others); Thu, 12 Oct 2023 06:29:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343654AbjJLK3M (ORCPT ); Thu, 12 Oct 2023 06:29:12 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B5B1B7 for ; Thu, 12 Oct 2023 03:29:11 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C60CC433C8; Thu, 12 Oct 2023 10:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697106551; bh=pUW2UZ0iy4cmzd6/+KDXWEa/Dy0ELBQNtzS85l2Lunk=; h=From:To:Cc:Subject:Date:From; b=brE3CEeTWq27Cqw8KEMugSZoqYW30hCkl4n/stfchAv4ITSXMFJSE8EKQRRAjCFrn AdOD0ZDpihTgzC9V36GYQ23NrFGDm186yigFclM080X2lmXPpu73yTJOCX3rAzbmBQ l1dLuvqQjCAGHodCUUS6ezGo9yVtSX1IpTTySYLGav7LZkrRo3q9CJfd9UQzvl02SL z7CJvRM4J0+Mtz6iKKAn0Vkniv80Rgt41ZvAdzMMyb3hubChs9OS7W0od5/E/A6/8R /ejjo5niRARbD4QXsCST7aVe8ZeTeYpy5vs0/OzMeDSBg/iSPe2yQJuaFSDhEwK3Lv SNnXAAoc66RIg== 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, Alistair Francis , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= Subject: [PATCH v2] riscv, qemu_fw_cfg: Add support for RISC-V architecture Date: Thu, 12 Oct 2023 12:28:52 +0200 Message-Id: <20231012102852.234442-1-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email 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 (groat.vger.email [0.0.0.0]); Thu, 12 Oct 2023 03:29:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779545219846076732 X-GMAIL-MSGID: 1779545219846076732 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 monitor: (qemu) dump-guest-memory vmcore The vmcore can now be used, e.g., with the "crash" utility. Acked-by: "Michael S. Tsirkin" Acked-by: Alistair Francis Tested-by: Clément Léger Signed-off-by: Björn Töpel --- v2: Fixed typo (Clément) ...and collected A-b/T-bs --- 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