Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp2538235pxb; Sun, 23 Jan 2022 07:51:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJyy/cfHr+Uqc1V3j2n3vQQ/9AYNlzOLgzKE6t+uWqXWqjfnt3hN5aHN3Wm2NGA44qttdC6M X-Received: by 2002:a17:902:b687:b0:149:90e2:8687 with SMTP id c7-20020a170902b68700b0014990e28687mr11295079pls.131.1642953087886; Sun, 23 Jan 2022 07:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642953087; cv=none; d=google.com; s=arc-20160816; b=yyXpIeeDYIyp52fBxy7HJq9JThQ0haYIPUFWP4QEEHMx7wnOrip70BDCavv6IPhzCV 4shZ2vdwBua/7FidK0ZKSDXbDChPRtLPx5/IlTKaZfMKbTuJoO2DC5nvVYb/MzwT8t0U qsjPY0Heeql8mLNa6W9RIHBRrR2/YSd0Ax9o2mz54YYL8YKEd+iiEqANMUlQesHRR96w 1DMrjIhXZ3EP2IBWkIPF0Eecx2WCKEbLeiOKals9Po5jV1d7o0Wz9P4ZfeKAgSxzdoZP BjiLXs5BKSH6H1232pMRQQKlJ6pMWUCLLxNl7CL+pCbJpz44I3NFaETyNoQBUgxNOENq NxUA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BsP65yxBtZNxmOfyf1bubvSDWf6TXe3LPB93g6H044k=; b=yqdNmvaj7StfLfek3EyQKS4BKhcc5XNd1TUhY22MLnxQl8CHXWe9JT5JjJYMc2Kmqu mf1EktmAPHxTmUY2qxG1XNylNlxAgSnyaWfF4lxlO6AxA/iDF4d3q4qpWzopDXrgNIPW 2lr9FirSLEs5ZsWTKbM0adbwL0KPbExiY7Uf/sAYtoEN0ofMwOpakAaPIJec6FzxNeFs SArYouD/CaJljYtcCMS1DTwFhK4KPKDeXvRDJU2KUpoHzoH3eSRuTX5EWwMTOqZM18yL 5RamIYloA/VnD8DUdz3NIdZmlTIcv0YV07aX4mRuwTZLNAuqT611bInz7fFD1HJZFPh9 vSWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lah2tImw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l5si10025688plt.395.2022.01.23.07.51.16; Sun, 23 Jan 2022 07:51:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lah2tImw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235613AbiAWAQ1 (ORCPT + 99 others); Sat, 22 Jan 2022 19:16:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235646AbiAWAOe (ORCPT ); Sat, 22 Jan 2022 19:14:34 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F70C0617BE; Sat, 22 Jan 2022 16:13:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id B5266CE0ADA; Sun, 23 Jan 2022 00:13:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C797C36AE3; Sun, 23 Jan 2022 00:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642896800; bh=r/Y07ZyV6TUV05w7OeUWXtVCO1ajHkTeHmjd4WcHEPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lah2tImwEN5LRweCSddSRhMqvIbctSlail4BN7kVdCSDn7ohrpZdVnmYPVApRqKUO Wr6Sa2tiXHG5iOr03kW9s8nlGCo57ieMBZoVGCaaqmGykEURqyqFSWZp3yCGJ/PNJE Hkw40ch1a6bHPiq19oc5KOY0zOvKZFzomFr5de4vvGwU856U6mO19WJYd8b6xqFqxn O6Oav1PsjQCf0eaUgfnGmea9vnNW6kMovgSFSwqvZ8kzYPl6ALyr95WFj8FFyxuvAg SjsvxiBu6HCTsoE+UAntiwp0m5qgZKXbnaJLZIzBPcB2mA7upoX5J6cN578DSDqAgA 6X5i3djgkeD2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?=E7=8E=8B=E8=B4=87?= , "Michael S . Tsirkin" , Sasha Levin , jasowang@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.10 7/9] virtio-pci: fix the confusing error message Date: Sat, 22 Jan 2022 19:12:56 -0500 Message-Id: <20220123001258.2460594-7-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220123001258.2460594-1-sashal@kernel.org> References: <20220123001258.2460594-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: 王贇 [ Upstream commit 6017599bb25c20b7a68cbb8e7d534bdc1c36b5e4 ] The error message on the failure of pfn check should tell virtio-pci rather than virtio-mmio, just fix it. Signed-off-by: Michael Wang Suggested-by: Michael S. Tsirkin Link: https://lore.kernel.org/r/ae5e154e-ac59-f0fa-a7c7-091a2201f581@linux.alibaba.com Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/virtio/virtio_pci_legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c index d62e9835aeeca..0ede3bf43669d 100644 --- a/drivers/virtio/virtio_pci_legacy.c +++ b/drivers/virtio/virtio_pci_legacy.c @@ -144,7 +144,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, q_pfn = virtqueue_get_desc_addr(vq) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT; if (q_pfn >> 32) { dev_err(&vp_dev->pci_dev->dev, - "platform bug: legacy virtio-mmio must not be used with RAM above 0x%llxGB\n", + "platform bug: legacy virtio-pci must not be used with RAM above 0x%llxGB\n", 0x1ULL << (32 + PAGE_SHIFT - 30)); err = -E2BIG; goto out_del_vq; -- 2.34.1