Re: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

Re: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

[Vee Khee Wong]

What is the purpose of this patch?

The function definition looks exactly the same as ‘tgl_sgmii_phy0_data’.


Regards,
Vee Khee

RE: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

[Sit, Michael Wei Hong]

This is to allow finer control on platform specific features for ADL and RPL.
There are some features that ADL and RPL doesn’t support and TGL supports vice versa.

Regards,
Michael

> -----Original Message-----
> From: Vee Khee Wong <veekhee@apple.com>
> Sent: Friday, October 28, 2022 5:58 PM
> To: Sit, Michael Wei Hong <michael.wei.hong.sit@intel.com>
> Cc: alexandre.torgue@foss.st.com; davem@davemloft.net;
> edumazet@google.com; Looi, Hong Aun
> <hong.aun.looi@intel.com>; joabreu@synopsys.com;
> kuba@kernel.org; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; linux-stm32@st-md-
> mailman.stormreply.com; mcoquelin.stm32@gmail.com; Zulkifli,
> Muhammad Husaini <muhammad.husaini.zulkifli@intel.com>;
> netdev@vger.kernel.org; pabeni@redhat.com;
> peppe.cavallaro@st.com; Tan, Tee Min <tee.min.tan@intel.com>;
> Voon, Weifeng <weifeng.voon@intel.com>; Gan, Yi Fang
> <yi.fang.gan@intel.com>; Song, Yoong Siang
> <yoong.siang.song@intel.com>
> Subject: Re: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N
> and RPL-P device ID from TGL
> 
> What is the purpose of this patch?
> 
> The function definition looks exactly the same as
> ‘tgl_sgmii_phy0_data’.
> 
> 
> Regards,
> Vee Khee

Re: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

[Jakub Kicinski]

On Fri, 28 Oct 2022 10:44:24 +0000 Sit, Michael Wei Hong wrote:
> This is to allow finer control on platform specific features for ADL and RPL.
> There are some features that ADL and RPL doesn’t support and TGL supports vice versa.

But if they are the same _right_ _now_ what's the point?
Please repost as part of a series which actually modifies
the contents.

Please remember not to top post on the ML.

RE: [PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

[Looi, Hong Aun]

> On Fri, 28 Oct 2022 10:44:24 +0000 Sit, Michael Wei Hong wrote:
> > This is to allow finer control on platform specific features for ADL and RPL.
> > There are some features that ADL and RPL doesn’t support and TGL
> supports vice versa.
> 
> But if they are the same _right_ _now_ what's the point?
> Please repost as part of a series which actually modifies the contents.
> 
> Please remember not to top post on the ML.

Noted. Thanks Vee Khee and Jakub for the comments. There is some work in progress as part of ADL-N development. We'll submit a complete patchset when it is completed in the future. Let's close the review for this patch for now.

[PATCH net-next 1/1] stmmac: intel: Separate ADL-N and RPL-P device ID from TGL

[Michael Sit Wei Hong]

Separating the ADL-N and RPL-P device IDs from TGL to handle the
differences from TGL.

Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
---
 .../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);
-- 
2.34.1