Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3649401pxb; Mon, 24 Jan 2022 14:24:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPa4iG6dh+YPFcPikxV1PxybIoohXNpnBvAWjimXInIc+esaNgwYKTyhOX68Okkj3qoUVo X-Received: by 2002:a63:8949:: with SMTP id v70mr7853988pgd.380.1643063081294; Mon, 24 Jan 2022 14:24:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643063081; cv=none; d=google.com; s=arc-20160816; b=ewX0VkWogqoWwEiuzsqL0ncgBq0fshPX+w+RLRTERCrL9EFkYjA75ZRB9I1O2+0vyL 3s2JKv37SBR2jOWHv+rt8okatoY6Z4eRtIHVFm37uhGxbbs1Nxf7ptILZ/DEc1aXGZHO vm7o8tqZNWdckEM/JTze8WOdJ2KF130b/EGCtHFYhLjgs1YYsxxZjJSxBQf4UUJF0Oot ybONkauSvrYSj8e6Td37uxKP90jwGc4uN8LeF8CmXH6uXkdindpJxilYi0iZ8tWyGBmr 9zu8BDjwSfqJbhzwmcoGpTQ6MJM835VrH9ISkLC2Jn/9Unfw4R9yLXhOLXSKxj/gIHwI Bi/w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UGdAP7nykridQJP7WcvUj1Ln//3x2Kv0oEaBVkqa8io=; b=Os/FoMcjZFCtBUyusQrl4KuKmJPYjjSb0vAix7CLBDzPkgFQTqch2vPB+7/iJBl2aJ Y8g1LPmrjNFvMXnSvF0Vcn8ZPR7BhkHTUHG58GGoqj8jMOVvxTDGCf94seKTGb0lGWHk tLV8lwzyAmmMp2hJEFj9fgUfVfaDnEOg80X9X3NvSqtbLBeo6DbGtnLdZzGGKVor3H86 HWaKGIS4A1M0ZmwmnffzJruVI7UoWDCdHJcUE47Noa8ICcNTiwYHcuQlHOYikWlbyr/p 4IAO9uQpyLX/oR35C1LTkgLzfoNVptmIo4gcmJ88i60KsCE+08qYPIEDZpp0MCsR6xAk 227g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rcz0PK+s; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q2si4433068pgq.79.2022.01.24.14.24.29; Mon, 24 Jan 2022 14:24:41 -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=@linuxfoundation.org header.s=korg header.b=rcz0PK+s; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1583076AbiAXWQZ (ORCPT + 99 others); Mon, 24 Jan 2022 17:16:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1390804AbiAXVM6 (ORCPT ); Mon, 24 Jan 2022 16:12:58 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92790C02980B; Mon, 24 Jan 2022 12:09:59 -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 ams.source.kernel.org (Postfix) with ESMTPS id 598C2B8119E; Mon, 24 Jan 2022 20:09:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 808C7C340E7; Mon, 24 Jan 2022 20:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643054997; bh=iVHyyH0Rl0ctyayqKyVIO5m9Sy/n8b+oFCc8GQ1GgAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcz0PK+s9cZn+dghSUMl/nkqCDgBzzglLUpAadaXZVFZ8JMQiFhF7+Y3VKweyb6sp T9QQwZ+3mhDZBYIWEdVOx/5buP6wZB3Qr4o+HZkmRXX0Y0/+tMNRPF1ZV5/H/BKvTw 5l15DbK6W4EssT2o+Ou5KJR4UMNXc5uYX2l4K/uQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eli Cohen , "Michael S. Tsirkin" , Parav Pandit , Jason Wang , Si-Wei Liu Subject: [PATCH 5.10 531/563] vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 Date: Mon, 24 Jan 2022 19:44:56 +0100 Message-Id: <20220124184042.812983165@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184024.407936072@linuxfoundation.org> References: <20220124184024.407936072@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eli Cohen commit 97143b70aa847f2b0a1f959dde126b76ff7b5376 upstream. Remove overriding of virtio_version_1_0 which forced the virtqueue object to version 1. Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") Signed-off-by: Eli Cohen Link: https://lore.kernel.org/r/20211230142024.142979-1-elic@nvidia.com Signed-off-by: Michael S. Tsirkin Reviewed-by: Parav Pandit Acked-by: Jason Wang Reviewed-by: Si-Wei Liu Signed-off-by: Greg Kroah-Hartman --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -812,8 +812,6 @@ static int create_virtqueue(struct mlx5_ MLX5_SET(virtio_q, vq_ctx, umem_3_id, mvq->umem3.id); MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem3.size); MLX5_SET(virtio_q, vq_ctx, pd, ndev->mvdev.res.pdn); - if (MLX5_CAP_DEV_VDPA_EMULATION(ndev->mvdev.mdev, eth_frame_offload_type)) - MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0, 1); err = mlx5_cmd_exec(ndev->mvdev.mdev, in, inlen, out, sizeof(out)); if (err)