From nobody Mon Feb 9 08:11:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610964151; cv=none; d=zohomail.com; s=zohoarc; b=WcTS4V0+HtfiuLKPDFgEyD2QQeybC1l/X0jgj6OqZa57cOVdXYXtGBxB2SjDp+2GkLp0NLc9+/z4Pg+Ipon5PqSshrpeKGFPLMzMT5+DNzBhaef1Pr0VlnuGFP9GmBbbSjSUzKZIAMr2R6ZbaeowGMK/C6g24YdZcXFeGShaMl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610964151; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V3wtdgABk8VyuhYVIxZbuF3R8610D5En464gP+b4gnE=; b=cG8v2j+Mt+QZH3NEHvzh6ijhp2uoqYcJTGGCULUewxy9yW1WccaWokys/czybRFp3WvzXQ3sBxGBH8hc/cmsg8AJD/a78RrI1agMYCg3VwGw9PMGEbhfPXSHDjm23ZJmy2BpgbIDLGCPwA6U1CQlZBGzJyjwz1DFhV/zlmbRG5o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161096415095690.60406192205232; Mon, 18 Jan 2021 02:02:30 -0800 (PST) Received: from localhost ([::1]:37328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1RMj-0001CK-9F for importer@patchew.org; Mon, 18 Jan 2021 05:02:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1R86-0000oK-AR; Mon, 18 Jan 2021 04:47:22 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:39685) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1R84-00017s-On; Mon, 18 Jan 2021 04:47:22 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0A80B5C0097; Mon, 18 Jan 2021 04:47:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 18 Jan 2021 04:47:20 -0500 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id BA69824005A; Mon, 18 Jan 2021 04:47:18 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=V3wtdgABk8Vyu hYVIxZbuF3R8610D5En464gP+b4gnE=; b=V1hWvyTQqsB09Uyl2zBr9rDCHwWr4 7GDffY67OiUoG2LyYVdBHxbZX8VzOc4DAav5ccGGm5OXxjdSCXJsZdSmCUwb9YO7 NHwnDg7CTIHd24q/jUI42pQJufNyqhe4Hn+x0+mQQ7AF1CF0WNPxgb1XeyxjP2aB epbE+anxwnTwkgRYWjJPg5sWVeGlSGhXhTLNy5cgr0YMX6ZKfI3Z3Y9nHwAn90LC QCrKoQkoEpVh3JI03VpaCyxl8i/XB0o5/kBFsBCexkdJhrTOZCtz1Xk1fEb+EKxf U7Or0jp9ank28bAVy38RgIOkmSWbp5zxO3TWbZGxCakQT43DaIK3XsNYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=V3wtdgABk8VyuhYVIxZbuF3R8610D5En464gP+b4gnE=; b=jt3cdzsC iYg6b8P4UU0bvv79JLXJ2u0PBWTJXms9BWXRkXhJGU8vq9+vGXm8ylObjE5IWDGs DFnYps6FCt4u4ZulucMbv4YQKUIYa5ouQZDHGs4SwknMnpFqdncynvGO+v7TIQwD Gwe3nObrcDJY8a7ImTthd4JbCCkOs/ntV6k7Ai88PlJ0Qeo+DMjt2ejnPMrQsWPm w9oKbg95umnUeSwP3t5vupVgnQxZvLwcTM10YraGJg2Du6fC4Jps6WjwRokcBkew fp1ZzkvNEbslbVIJGpzDO6Y/cgpRK/sevDsjIhXaSjvIMkYL1ZOup7ZUyfAeJySQ OeBJ+Nih8ceE8w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrtdekgddtkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepmfhlrghushcu lfgvnhhsvghnuceoihhtshesihhrrhgvlhgvvhgrnhhtrdgukheqnecuggftrfgrthhtvg hrnhepueelteegieeuhffgkeefgfevjeeigfetkeeitdfgtdeifefhtdfhfeeuffevgfek necukfhppeektddrudeijedrleekrdduledtnecuvehluhhsthgvrhfuihiivgepfeenuc frrghrrghmpehmrghilhhfrhhomhepihhtshesihhrrhgvlhgvvhgrnhhtrdgukh X-ME-Proxy: From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v2 08/12] hw/block/nvme: disable PMR at boot up Date: Mon, 18 Jan 2021 10:47:01 +0100 Message-Id: <20210118094705.56772-9-its@irrelevant.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210118094705.56772-1-its@irrelevant.dk> References: <20210118094705.56772-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=66.111.4.29; envelope-from=its@irrelevant.dk; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Klaus Jensen , Stefan Hajnoczi , Keith Busch Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen The PMR should not be enabled at boot up. Disable the PMR MemoryRegion initially and implement MMIO for PMRCTL, allowing the host to enable the PMR explicitly. Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 9ee9570bb65c..937a6ed0a70d 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -3810,8 +3810,16 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offse= t, uint64_t data, NVME_GUEST_ERR(pci_nvme_ub_mmiowr_pmrcap_readonly, "invalid write to PMRCAP register, ignored"); return; - case 0xE04: /* TODO PMRCTL */ - break; + case 0xE04: /* PMRCTL */ + n->bar.pmrctl =3D data; + if (NVME_PMRCTL_EN(data)) { + memory_region_set_enabled(&n->pmrdev->mr, true); + n->bar.pmrsts =3D 0; + } else { + memory_region_set_enabled(&n->pmrdev->mr, false); + NVME_PMRSTS_SET_NRDY(n->bar.pmrsts, 1); + } + return; case 0xE08: /* PMRSTS */ NVME_GUEST_ERR(pci_nvme_ub_mmiowr_pmrsts_readonly, "invalid write to PMRSTS register, ignored"); @@ -4186,6 +4194,8 @@ static void nvme_init_pmr(NvmeCtrl *n, PCIDevice *pci= _dev) PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH, &n->pmrdev->mr); + + memory_region_set_enabled(&n->pmrdev->mr, false); } =20 static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) --=20 2.30.0