From patchwork Fri Oct 28 07:38:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sit, Michael Wei Hong" X-Patchwork-Id: 13023181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7CC3BC38A02 for ; Fri, 28 Oct 2022 07:40:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=S2HBWoCN1q2qRP0GQ/aNFqfwDuHycxCnISp+8rYcblo=; b=bsHMYSRsq2LiD8 aIacKLA8hbrJR2eZqTiEzC7DZGnIMkCBERmEPpnm8vu3OLIVy6+sIj8qfuLL2YrcaYEL478bo5I+K 9RLo6GwWCVJpfmyHUQ46HulAlpDA90Ir3qO2e/EVYxrmj9qQhKleqrxT8BYfnBVKA/WXp6T93bcQY cwtZkZ5o9nMJiYT7ZkI0ARjtqZCVuMhQsWMoJ/4bbdV/Obt2P98JhADCeCU5ZVMJmV4jfCZFNEA1m 5pzvv70XLsA29wSqRFnHxf/J8KZz82PoIdhlWXFMyC6ds6U6D49fSWAshHXCvHmwMKemjfltPSQkR n6ZiPtebxO/el9DSlVHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ooJxP-00G28c-RC; Fri, 28 Oct 2022 07:39:11 +0000 Received: from mga06b.intel.com ([134.134.136.31] helo=mga06.intel.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ooJxM-00G27g-MI for linux-arm-kernel@lists.infradead.org; Fri, 28 Oct 2022 07:39:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666942748; x=1698478748; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yy8N2SDsncnaTLIJtLVtMpul3v1SLCiIy2Otfr+WZ4s=; b=iC4xfA3yenIuX0r6GRmUTTC1sa8wkA+sIwWH3FKQMriesbHyRDfwXjGA NNGz0PCz3HtyL1xaygptvxexlI4pgArzJRa1UsQ7TbBmbHsiQfr2LcMsk kbW6cAIlxBtv/TKQfrJbpUZfIOnYQvfGwN2/ans+JgwSHijFVGnjMAb42 MXOEOnjHHJpE0WH6Thm5zJPFXdZ3OjAjnZJJtm/uJlCgdsSlcmmxr2YuD jpR2d86L3mmeJfQ66b95/6tZJRSSYmzaQ+4juYp9YhBGrRIszX2tGk7aE CLhVSe5wiqVc23m35B/w/QZiglBmNFZk9gvT4/1fnBlI7DPdFoJMF072d Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10513"; a="370500404" X-IronPort-AV: E=Sophos;i="5.95,220,1661842800"; d="scan'208";a="370500404" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2022 00:39:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10513"; a="961929242" X-IronPort-AV: E=Sophos;i="5.95,220,1661842800"; d="scan'208";a="961929242" Received: from mike-ilbpg1.png.intel.com ([10.88.227.76]) by fmsmga005.fm.intel.com with ESMTP; 28 Oct 2022 00:38:59 -0700 From: Michael Sit Wei Hong To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Looi Hong Aun , Voon Weifeng , Song Yoong Siang , Tan Tee Min , Zulkifli Muhammad Husaini , Gan Yi Fang Subject: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL Date: Fri, 28 Oct 2022 15:38:25 +0800 Message-Id: <20221028073825.2630903-1-michael.wei.hong.sit@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221028_003908_830716_AE28F270 X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Separating the ADL-N and RPL-P device IDs from TGL to handle the differences from TGL. Signed-off-by: Michael Sit Wei Hong --- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 0a2afc1a3124..2eb8e31be1a2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -830,6 +830,21 @@ static int adls_sgmii_phy1_data(struct pci_dev *pdev, static struct stmmac_pci_info adls_sgmii1g_phy1_info = { .setup = adls_sgmii_phy1_data, }; + +static int adln_sgmii_phy0_data(struct pci_dev *pdev, + struct plat_stmmacenet_data *plat) +{ + plat->bus_id = 1; + plat->phy_interface = PHY_INTERFACE_MODE_SGMII; + plat->serdes_powerup = intel_serdes_powerup; + plat->serdes_powerdown = intel_serdes_powerdown; + return tgl_common_data(pdev, plat); +} + +static struct stmmac_pci_info adln_sgmii1g_phy0_info = { + .setup = adln_sgmii_phy0_data, +}; + static const struct stmmac_pci_func_data galileo_stmmac_func_data[] = { { .func = 6, @@ -1212,8 +1227,8 @@ static const struct pci_device_id intel_eth_pci_id_table[] = { { PCI_DEVICE_DATA(INTEL, TGLH_SGMII1G_1, &tgl_sgmii1g_phy1_info) }, { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_0, &adls_sgmii1g_phy0_info) }, { PCI_DEVICE_DATA(INTEL, ADLS_SGMII1G_1, &adls_sgmii1g_phy1_info) }, - { PCI_DEVICE_DATA(INTEL, ADLN_SGMII1G, &tgl_sgmii1g_phy0_info) }, - { PCI_DEVICE_DATA(INTEL, RPLP_SGMII1G, &tgl_sgmii1g_phy0_info) }, + { PCI_DEVICE_DATA(INTEL, ADLN_SGMII1G, &adln_sgmii1g_phy0_info) }, + { PCI_DEVICE_DATA(INTEL, RPLP_SGMII1G, &adln_sgmii1g_phy0_info) }, {} }; MODULE_DEVICE_TABLE(pci, intel_eth_pci_id_table);