Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3617881pxb; Mon, 24 Jan 2022 13:37:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyp0Fb0d+mt4RG/st+4MYqGBjGWQtCTcvVQdLLTCM6E3uoeyyutOgeax2nBEpo8JKUnN4CT X-Received: by 2002:a17:902:a501:b0:14a:4ed2:2a01 with SMTP id s1-20020a170902a50100b0014a4ed22a01mr16161014plq.49.1643060272669; Mon, 24 Jan 2022 13:37:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643060272; cv=none; d=google.com; s=arc-20160816; b=SYVxKTq8bVcNGoTLAZwlPRbHHE0s+AGQNVA19DgaH5PuPiWyAqZibL/D1fLwh0yvJN yfzg0sKkB5wOSMMhCTUkDWswLpYiayD+skGZe6v9crMGBW8rUpVPSf0H/FoGOSBO8Kcs oQJsSChmuzIK/Y5lFFmAJ5+NFpv9O7xYP3HSKqmQAWAYV1xyV4SxMlhu++3oXZSMR6jo dgUf9rTj/wuYZALrqgf1/QVWJ4tHBskJ4d7nra/nSAZVF36SLaz/oQv243czwBEpfeWL 2lgmgGS0Y4oGMDoTIBsM4U2F7lAGlplSPwAquMxCMk4UdL6DBDErLUi/j76soFnEakpK DysA== 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=PvavpO5AwOSmNtBxQIbbpYJU9NqT7teO8bl8tqRqBNE=; b=JNOzRTJLVjXceCIu2GfD1XRwIYO2IgcxGd9rPI4OwxMmOxgEzADr7CAo+72jxi0TPb fbv0T4vEh7ZipeNxSy2TwXd26U854ZPtV63YFcoaBuTLV3XwHLW02Db+rNQQcnIQhSF3 OXUU6C94oe80XpXVwzLBs3vdbs2DvXLjNfd+iLn8/q8ENQNle+53aIPO9oBeL05VbPh4 +qCaCBTQZ+kHzqSy/cE2d2KhZcEeiNUyIaGEwECtPyLcYa4YCMmhnKJk/yjrFbwQYOGB 433KikCVq+LpjJGOMcR/KvmErPToWO826bE1aBQzmjYRU8VFuhZ+2293p44J5TjVkJhm 1oRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="hRof/DEk"; 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 g21si2588123pfv.356.2022.01.24.13.37.40; Mon, 24 Jan 2022 13:37:52 -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="hRof/DEk"; 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 S1346426AbiAXVQU (ORCPT + 99 others); Mon, 24 Jan 2022 16:16:20 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:43884 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1391988AbiAXUuL (ORCPT ); Mon, 24 Jan 2022 15:50:11 -0500 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 dfw.source.kernel.org (Postfix) with ESMTPS id CB05860C2A; Mon, 24 Jan 2022 20:50:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAB58C340E5; Mon, 24 Jan 2022 20:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057410; bh=rTzjsPOM+kVOAAhf7w4z3TQ9XVsck917kVkeBLIXDsM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hRof/DEkF/7ryjJKdcOfyk8T6sz09DFgp5FAiAwJI44xEoIQF3bChx5itjwTrA+kb SMFd1cp05+Cz0gA2HbJVdq+SMfo9Bv3yYrmhDnv/kWnk3dmBDUIeCkg1UgJ5fznG19 AxwSlsmli4HbEODkUMzJhQrqBmE40qLJO25b/PQ4= 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.15 804/846] vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 Date: Mon, 24 Jan 2022 19:45:21 +0100 Message-Id: <20220124184128.673051881@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@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 @@ -873,8 +873,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)