Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1624952ybh; Thu, 16 Jul 2020 18:19:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6giJ+dg98oiSAuF1fQ1pF/nun/bSQObgLFKAQxZg9MKcMQ94sT+BhGMYMofSyltH+c0hg X-Received: by 2002:a17:907:41dc:: with SMTP id og20mr6631421ejb.183.1594948769492; Thu, 16 Jul 2020 18:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594948769; cv=none; d=google.com; s=arc-20160816; b=aajn/IEqvK9jMxfR5whQ0gh6T9bB6GmXyT0nJ6KWo6sbIh9rhXCo6bPTcb8A/MkyA7 E3g/uqD7q3+MglWtpDrH8UGF5dfSWnM+5EDOuiJS+xf1wKUWmgvjFDKcJUzGJQ3+rVh4 HSX6CtFlCrCVH95AdRraHgfARqEVsr38kdfhcNVJyqO5MdPI3xkiM0KDyu1Ul9dOxN5c 85OUoUtMh6EwazzZhMI1NPWougU/kWS7mEcIykcOjUAxvjeUoneLkQnNAY5GjljLY3+E O9CWE932PRXbcuEym/XgdcPdSAIfz3DTwf3rbPSPdHoycx0UEDQpymTCvcRJuqIXgbDD mv4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=FxoZhAX0wzqulQaoMTLA2RxGQNfKRCZUisSsrXnBMIo=; b=Mma5Q+XMHPaQM4D5iqyj/1TnspBvXX0kaERa8CJKUJf2l/GJHNBOlm8M223z47hwo/ 0Bx2o6EhTgO1K7HfUagBlSzlGIQTGtrtrKmFNCbavtw7Cbg/8zUE7tNx2YlEgDf/BHbW q++8YMP822Az+iA8WUxbi6YPW07tz9/y902k1KJIajecmE0y7V6f0i0euHZv/BhS31Fb MlrQrM6YT5ZYpLRauv3rEcbiQUO+Z6RPeaGcxl/41mNBYJjtODKb4WRfwXDIkTp/SYRT pmSy0iypPHv4Q26WR2e5f71CKPDwGJapsG4t6mmMjJ1MQkZkryc/O1HNU62gE7bEvgH/ EGgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wLNSbKJu; 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 t3si4199363edw.327.2020.07.16.18.19.05; Thu, 16 Jul 2020 18:19:29 -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=wLNSbKJu; 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 S1726782AbgGQBTA (ORCPT + 99 others); Thu, 16 Jul 2020 21:19:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:32934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726238AbgGQBS7 (ORCPT ); Thu, 16 Jul 2020 21:18:59 -0400 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.6]) (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 97E1A2076D; Fri, 17 Jul 2020 01:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594948739; bh=NonWiGdMXBcYO7bWSPT/d0+vLEuL6p0OznyGZ4JRNg8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=wLNSbKJuXu2gU44Wip5RB1t3arpafQeXwPErwULlOi53l4EKzKsjmcyHpxpxWlvtf godzagC2Xsf1gJmcMJnKm833izrEo/4f4EV0loz6FPIr55Szw9JKA32EdunA4UhEg5 LSMIJI1UgY/ry/F3+Rz4ERu0RfeN3cgTLjK9CGRs= Date: Thu, 16 Jul 2020 18:18:57 -0700 From: Jakub Kicinski To: Alexander Lobakin , , Cc: "David S. Miller" , Igor Russkikh , Michal Kalderon , "Ariel Elior" , Denis Bolotin , "James E.J. Bottomley" , "Martin K. Petersen" , , , Subject: Re: [PATCH net-next 10/13] qed: add support for new port modes Message-ID: <20200716181853.502dd619@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20200716115446.994-11-alobakin@marvell.com> References: <20200716115446.994-1-alobakin@marvell.com> <20200716115446.994-11-alobakin@marvell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 16 Jul 2020 14:54:43 +0300 Alexander Lobakin wrote: > These ports ship on new boards revisions and are supported by newer > firmware versions. > > Signed-off-by: Alexander Lobakin > Signed-off-by: Igor Russkikh What is the driver actually doing with them, tho? Looks like you translate some firmware specific field to a driver specific field, but I can't figure out what part of the code cares about hw_info.port_mode > diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h > index 6a1d12da7910..63fcbd5a295a 100644 > --- a/drivers/net/ethernet/qlogic/qed/qed.h > +++ b/drivers/net/ethernet/qlogic/qed/qed.h > @@ -257,6 +257,11 @@ enum QED_PORT_MODE { > QED_PORT_MODE_DE_1X25G, > QED_PORT_MODE_DE_4X25G, > QED_PORT_MODE_DE_2X10G, > + QED_PORT_MODE_DE_2X50G_R1, > + QED_PORT_MODE_DE_4X50G_R1, > + QED_PORT_MODE_DE_1X100G_R2, > + QED_PORT_MODE_DE_2X100G_R2, > + QED_PORT_MODE_DE_1X100G_R4, > }; > > enum qed_dev_cap { > diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c > index d929556247a5..4bad836d0f74 100644 > --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c > +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c > @@ -4026,6 +4026,21 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) > case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G: > p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X25G; > break; > + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1: > + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X50G_R1; > + break; > + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1: > + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X50G_R1; > + break; > + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2: > + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G_R2; > + break; > + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2: > + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X100G_R2; > + break; > + case NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4: > + p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G_R4; > + break; > default: > DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg); > break; > diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h > index a4a845579fd2..debc55923251 100644 > --- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h > +++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h > @@ -13015,6 +13015,11 @@ struct nvm_cfg1_glob { > #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G 0xd > #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G 0xe > #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G 0xf > +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X50G_R1 0x11 > +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_4X50G_R1 0x12 > +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R2 0x13 > +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_2X100G_R2 0x14 > +#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_AHP_1X100G_R4 0x15 > > u32 e_lane_cfg1; > u32 e_lane_cfg2;