Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp348482pxx; Wed, 28 Oct 2020 06:26:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybUs8rPNI/PN4JJUgs30pTF52QwS973tRcoZFA2PmCHC20iCFrAMy5AC5LEu5trJq33J85 X-Received: by 2002:a17:906:95d1:: with SMTP id n17mr7865069ejy.75.1603891591064; Wed, 28 Oct 2020 06:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603891591; cv=none; d=google.com; s=arc-20160816; b=tqImfVKZh3wGeVoj7SBJn4Tz7m0KZtylOTzyYPylhdO/T+h+0vsp/jCSagfaoBLVc+ 4KwH0fOhuajj9nkqBXgz9lMPZKnW74P9RtV7JxUS2dAWar4aGBxRrwG2qye4RwZ8axD1 cGBcz/0IawAl2HFay/krY0iqsE64DKwOCTN5A3qrIiyfxKqYoebynVA3s9f5LJvWb9gi f9c+oDV9vAaY94z10YLgBa+wJFmIDRIO8fLe22IzYI4OX8KHGhNEbdFreX38wK3axIrw Kh97zwXr9L1af/LmEmV5ntn459QZjlwuJqVnf6YdygFc1whXocx1NztUNy2TBVpa68jI YG4Q== 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=mvKDVe5ZU7siTaY66Iu8f3MnoQJGpmgVoNJgGx7EWRM=; b=dogYFtsEhLPwRiGP+XYrEmUY2aVzPjIHJ8u0UuhT9yfecKxULfOmPNENjb8CQy5zJY 3nIUB7hYD3vGcIc1RCxm2TT6r6iyR0X8jHYh9ZEBwHnSKOJOfDNkcIH+jVbhxAAzuZbO 7HOa4Xb41xB4/ICm6/ac+0+qrI8wVWyMsET8pLhm0IKMex5+FArnPgS2WQbiRS33rhfU JjOCdwYbm3Yzykm0nl6mCvw6J8IvPFC9G1TVuj27gegCEyJ3azjopIW9tVklhay9yeiL 6xEkLEShG2TqpCCwAmlothWr+JqdVK0G5sDtkqmwRwVc6LAwD+uw9G/iSw9tO3/2floV QayA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=PJufNkIl; 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=fail (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 i19si2816688ejh.153.2020.10.28.06.26.08; Wed, 28 Oct 2020 06:26:31 -0700 (PDT) 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=default header.b=PJufNkIl; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1801620AbgJ0Pm6 (ORCPT + 99 others); Tue, 27 Oct 2020 11:42:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:52714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799990AbgJ0Pec (ORCPT ); Tue, 27 Oct 2020 11:34:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3646F22264; Tue, 27 Oct 2020 15:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812871; bh=zdijcNDmgfrvW9iubKBIm0xSxXEPGMKFlZgmPVyKHBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PJufNkIlekFMOrw61DHp0shtEegmluZYnNVjzsdFnSY62jO3e6TTjap1ZRr40gj7l WcyCDUXH+XVaWLZxKjuIOsLVc6mn4M2JDcLWW8542qACE8SBbyrVC4eKOEjR9my3o6 rITHnruAE04bRzPMyWgVC8srM1IEpRqyp932q+wA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lijun Pan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.9 342/757] ibmvnic: set up 200GBPS speed Date: Tue, 27 Oct 2020 14:49:52 +0100 Message-Id: <20201027135506.618352489@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@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: Lijun Pan [ Upstream commit b9cd795b0e4860f482bf3741d12e1c8f3ec1cfc9 ] Set up the speed according to crq->query_phys_parms.rsp.speed. Fix IBMVNIC_10GBPS typo. Fixes: f8d6ae0d27ec ("ibmvnic: Report actual backing device speed and duplex values") Signed-off-by: Lijun Pan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 5 ++++- drivers/net/ethernet/ibm/ibmvnic.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 4dd3625a4fbc8..3e0aab04d86fb 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -4610,7 +4610,7 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, case IBMVNIC_1GBPS: adapter->speed = SPEED_1000; break; - case IBMVNIC_10GBP: + case IBMVNIC_10GBPS: adapter->speed = SPEED_10000; break; case IBMVNIC_25GBPS: @@ -4625,6 +4625,9 @@ static int handle_query_phys_parms_rsp(union ibmvnic_crq *crq, case IBMVNIC_100GBPS: adapter->speed = SPEED_100000; break; + case IBMVNIC_200GBPS: + adapter->speed = SPEED_200000; + break; default: if (netif_carrier_ok(netdev)) netdev_warn(netdev, "Unknown speed 0x%08x\n", rspeed); diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index f8416e1d4cf09..43feb96b0a68a 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -373,7 +373,7 @@ struct ibmvnic_phys_parms { #define IBMVNIC_10MBPS 0x40000000 #define IBMVNIC_100MBPS 0x20000000 #define IBMVNIC_1GBPS 0x10000000 -#define IBMVNIC_10GBP 0x08000000 +#define IBMVNIC_10GBPS 0x08000000 #define IBMVNIC_40GBPS 0x04000000 #define IBMVNIC_100GBPS 0x02000000 #define IBMVNIC_25GBPS 0x01000000 -- 2.25.1