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: 12143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp685535wru; Fri, 28 Oct 2022 01:01:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7EB4SQoqQEEha9vm2QDGXGZaW6GnFNguhYhuEO9wjrc4TmA5C8nPS1KICbLDVverbergyR X-Received: by 2002:a17:907:7704:b0:780:da38:4480 with SMTP id kw4-20020a170907770400b00780da384480mr46129465ejc.64.1666944100151; Fri, 28 Oct 2022 01:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666944100; cv=none; d=google.com; s=arc-20160816; b=iD6Hya+i1zDAEofi1Q74S2bcfjZI5TPBUw2BhwM2366F4Nhbg62uVza4WxgBFXnzie ra8MXAALJAZBO6SQGwG5o0B5n9jNEl7nP86aghfvcNh4Y+x/vSPrXPiqwx7ICBL4R578 vCj1cyqn7sxs52dkWb2kUiHfThjf9LxtOM0rxo1SwqQ24tSLlKTzn0zVmWdMXUr3EtQ7 OlaS05tLZG2eb3M+pYvmRYf+vpXNmvM5ZI4XryEgZknqLjTp3V7Yi3Hu35mnCKQdSMVV CWJ4LSSFqIGwMqYoE9poKvcQRwsoSutZqMkw0+QVeJ6mmjjwEeMOozu0/bZ0KikHyN++ C+wg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=/9JNw8CUokzVaUqDko5v82RfybxWbA1htZwErQhXG1s=; b=s+YxC6mJ/jPUoPOOveF/vD367GWPckTk83ZOohhiZ78ZlMGhHyd/mYZIsuGR3zKkZI BPI65nJN7WTWg3v6QZ0YEpWr87Wla5AJHRTetDsKOzA1iRIxyt3Gb1UYZFSodjrQzZhn 6fZ+WANbpwCVvRpn9w1PgomLPHUKgvZsQqL26rkRMNDChXufZUgS4absAJEs6ucYyCSO /J4YkVUbvVGEGYRZo50gjiW8PgsQWjJtC19C9wsAPtIrB+5mdg9dmf2C+QtSgD4ejtDc 0kkhBg1KmM/sb2PmtLZ7AdS5CivB3K2CY5MgYZ9kpmpgOJe7DGZps1rp5zrFfN18WI6+ tt5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CL+I8dfi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hd9-20020a170907968900b0077f4fcfe49csi4528004ejc.905.2022.10.28.01.01.13; Fri, 28 Oct 2022 01:01:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CL+I8dfi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229510AbiJ1HjO (ORCPT + 99 others); Fri, 28 Oct 2022 03:39:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230256AbiJ1HjI (ORCPT ); Fri, 28 Oct 2022 03:39:08 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04481BE1D5; Fri, 28 Oct 2022 00:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666942747; x=1698478747; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yy8N2SDsncnaTLIJtLVtMpul3v1SLCiIy2Otfr+WZ4s=; b=CL+I8dfiiq+wu1kysWdMuV7LGvufxtGeR6fx4rB0M0ZlinH/EtWe/rG3 8vhoTeBqT+tvKIpoGojHI1EPvwnOf+KkXG7CrXl0UBq5fMjEi6IAyBmEk r/hHFCYfyLy78ILsLRjgnZ0uuOUEdTgGYRXwraH349UsFKOlYvSO848gD XD0+sxB6xjE79SQVgJQuqP6pm2SsFMnDooHwFfUbhI/LdmrdkD0eGUHik xJh9eBn6czMwDWOzqk+W67dhPwII5pDPmNNSh+/KbWdqNNAR8WJSFLKZX lQxot9t5DOLqDgykfErkQNN161WR1Trqal0tIfun62OGluUehjQOW8pWQ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10513"; a="372648535" X-IronPort-AV: E=Sophos;i="5.95,220,1661842800"; d="scan'208";a="372648535" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.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-Spam-Status: No, score=-2.6 required=5.0 tests=AC_FROM_MANY_DOTS,BAYES_00, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747917576611242757?= X-GMAIL-MSGID: =?utf-8?q?1747917576611242757?= 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);