From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1E4BC433E1 for ; Fri, 17 Jul 2020 01:19:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B72902076D for ; Fri, 17 Jul 2020 01:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594948741; bh=NonWiGdMXBcYO7bWSPT/d0+vLEuL6p0OznyGZ4JRNg8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=cBSE0oZZBkUB2BxZv6AcAcr5BkrxOZCjyJwTit7OH7EdKS++TQA/QmghPIbJATAIa l8glWXp7GAZQmcCTzGy1U6aKU2/hpoWPcNmNIVTHWhoh2Hv0eRVyx/DJGRLBgVhN5r qa+oOy2mTp0hxxNCVqkSYGXqW3IX3copARP6Z//s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726817AbgGQBTA (ORCPT ); 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;