* [net-next,v1, 1/3] net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID
2020-03-20 16:48 [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID Voon Weifeng
@ 2020-03-20 16:48 ` Voon Weifeng
2020-03-20 16:48 ` [net-next,v1, 2/3] net: stmmac: add EHL PSE0 & PSE1 2.5Gbps " Voon Weifeng
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Voon Weifeng @ 2020-03-20 16:48 UTC (permalink / raw)
To: David S . Miller, Maxime Coquelin
Cc: netdev, linux-kernel, Jose Abreu, Giuseppe Cavallaro,
Andrew Lunn, Alexandre Torgue, Ong Boon Leong, Voon Weifeng
Add EHL PSE0/1 RGMII & SGMII 1Gbps PCI info and PCI ID
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
.../net/ethernet/stmicro/stmmac/stmmac_pci.c | 72 +++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 7acbac73c29c..47f589968e66 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -240,6 +240,66 @@ static struct stmmac_pci_info ehl_rgmii1g_pci_info = {
.setup = ehl_rgmii_data,
};
+static int ehl_pse0_common_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->bus_id = 2;
+ plat->phy_addr = 1;
+ return ehl_common_data(pdev, plat);
+}
+
+static int ehl_pse0_rgmii1g_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->phy_interface = PHY_INTERFACE_MODE_RGMII_ID;
+ return ehl_pse0_common_data(pdev, plat);
+}
+
+static struct stmmac_pci_info ehl_pse0_rgmii1g_pci_info = {
+ .setup = ehl_pse0_rgmii1g_data,
+};
+
+static int ehl_pse0_sgmii1g_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
+ return ehl_pse0_common_data(pdev, plat);
+}
+
+static struct stmmac_pci_info ehl_pse0_sgmii1g_pci_info = {
+ .setup = ehl_pse0_sgmii1g_data,
+};
+
+static int ehl_pse1_common_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->bus_id = 3;
+ plat->phy_addr = 1;
+ return ehl_common_data(pdev, plat);
+}
+
+static int ehl_pse1_rgmii1g_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->phy_interface = PHY_INTERFACE_MODE_RGMII_ID;
+ return ehl_pse1_common_data(pdev, plat);
+}
+
+static struct stmmac_pci_info ehl_pse1_rgmii1g_pci_info = {
+ .setup = ehl_pse1_rgmii1g_data,
+};
+
+static int ehl_pse1_sgmii1g_data(struct pci_dev *pdev,
+ struct plat_stmmacenet_data *plat)
+{
+ plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
+ return ehl_pse1_common_data(pdev, plat);
+}
+
+static struct stmmac_pci_info ehl_pse1_sgmii1g_pci_info = {
+ .setup = ehl_pse1_sgmii1g_data,
+};
+
static int tgl_common_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
@@ -585,6 +645,10 @@ static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937
#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30
#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G_ID 0x4ba0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G_ID 0x4ba1
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G_ID 0x4bb0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G_ID 0x4bb1
#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0ac
#define PCI_DEVICE_ID_SYNOPSYS_GMAC5_ID 0x7102
@@ -594,6 +658,14 @@ static const struct pci_device_id stmmac_id_table[] = {
{ PCI_DEVICE_DATA(INTEL, QUARK_ID, &quark_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_RGMII1G_ID, &ehl_rgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_SGMII1G_ID, &ehl_sgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE0_RGMII1G_ID,
+ &ehl_pse0_rgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII1G_ID,
+ &ehl_pse0_sgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE1_RGMII1G_ID,
+ &ehl_pse1_rgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII1G_ID,
+ &ehl_pse1_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, TGL_SGMII1G_ID, &tgl_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(SYNOPSYS, GMAC5_ID, &snps_gmac5_pci_info) },
{}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net-next,v1, 2/3] net: stmmac: add EHL PSE0 & PSE1 2.5Gbps PCI info and PCI ID
2020-03-20 16:48 [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID Voon Weifeng
2020-03-20 16:48 ` [net-next,v1, 1/3] net: stmmac: add EHL PSE0 & PSE1 1Gbps " Voon Weifeng
@ 2020-03-20 16:48 ` Voon Weifeng
2020-03-20 16:48 ` [net-next,v1, 3/3] net: stmmac: add EHL SGMII " Voon Weifeng
2020-03-23 9:54 ` [net-next,v1, 0/3] Add additional EHL " Jose Abreu
3 siblings, 0 replies; 6+ messages in thread
From: Voon Weifeng @ 2020-03-20 16:48 UTC (permalink / raw)
To: David S . Miller, Maxime Coquelin
Cc: netdev, linux-kernel, Jose Abreu, Giuseppe Cavallaro,
Andrew Lunn, Alexandre Torgue, Ong Boon Leong, Voon Weifeng
Add EHL PSE0/1 SGMII 2.5Gbps PCI info and PCI ID
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
.../net/ethernet/stmicro/stmmac/stmmac_pci.c | 26 ++++++++++++-------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 47f589968e66..3f0f7cc7342f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -641,16 +641,18 @@ static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
/* synthetic ID, no official vendor */
#define PCI_VENDOR_ID_STMMAC 0x0700
-#define PCI_DEVICE_ID_STMMAC_STMMAC 0x1108
-#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937
-#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30
-#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31
-#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G_ID 0x4ba0
-#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G_ID 0x4ba1
-#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G_ID 0x4bb0
-#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G_ID 0x4bb1
-#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0ac
-#define PCI_DEVICE_ID_SYNOPSYS_GMAC5_ID 0x7102
+#define PCI_DEVICE_ID_STMMAC_STMMAC 0x1108
+#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937
+#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30
+#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G_ID 0x4ba0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G_ID 0x4ba1
+#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5_ID 0x4ba2
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_RGMII1G_ID 0x4bb0
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII1G_ID 0x4bb1
+#define PCI_DEVICE_ID_INTEL_EHL_PSE1_SGMII2G5_ID 0x4bb2
+#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0ac
+#define PCI_DEVICE_ID_SYNOPSYS_GMAC5_ID 0x7102
static const struct pci_device_id stmmac_id_table[] = {
{ PCI_DEVICE_DATA(STMMAC, STMMAC, &stmmac_pci_info) },
@@ -662,10 +664,14 @@ static const struct pci_device_id stmmac_id_table[] = {
&ehl_pse0_rgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII1G_ID,
&ehl_pse0_sgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII2G5_ID,
+ &ehl_pse0_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_PSE1_RGMII1G_ID,
&ehl_pse1_rgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII1G_ID,
&ehl_pse1_sgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_PSE1_SGMII2G5_ID,
+ &ehl_pse1_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, TGL_SGMII1G_ID, &tgl_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(SYNOPSYS, GMAC5_ID, &snps_gmac5_pci_info) },
{}
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [net-next,v1, 3/3] net: stmmac: add EHL SGMII 2.5Gbps PCI info and PCI ID
2020-03-20 16:48 [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID Voon Weifeng
2020-03-20 16:48 ` [net-next,v1, 1/3] net: stmmac: add EHL PSE0 & PSE1 1Gbps " Voon Weifeng
2020-03-20 16:48 ` [net-next,v1, 2/3] net: stmmac: add EHL PSE0 & PSE1 2.5Gbps " Voon Weifeng
@ 2020-03-20 16:48 ` Voon Weifeng
2020-03-23 9:54 ` [net-next,v1, 0/3] Add additional EHL " Jose Abreu
3 siblings, 0 replies; 6+ messages in thread
From: Voon Weifeng @ 2020-03-20 16:48 UTC (permalink / raw)
To: David S . Miller, Maxime Coquelin
Cc: netdev, linux-kernel, Jose Abreu, Giuseppe Cavallaro,
Andrew Lunn, Alexandre Torgue, Ong Boon Leong, Voon Weifeng
Add EHL SGMII 2.5Gbps PCI info and PCI ID
Signed-off-by: Voon Weifeng <weifeng.voon@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 3f0f7cc7342f..b4a18075e372 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -645,6 +645,7 @@ static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
#define PCI_DEVICE_ID_INTEL_QUARK_ID 0x0937
#define PCI_DEVICE_ID_INTEL_EHL_RGMII1G_ID 0x4b30
#define PCI_DEVICE_ID_INTEL_EHL_SGMII1G_ID 0x4b31
+#define PCI_DEVICE_ID_INTEL_EHL_SGMII2G5_ID 0x4b32
#define PCI_DEVICE_ID_INTEL_EHL_PSE0_RGMII1G_ID 0x4ba0
#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII1G_ID 0x4ba1
#define PCI_DEVICE_ID_INTEL_EHL_PSE0_SGMII2G5_ID 0x4ba2
@@ -660,6 +661,7 @@ static const struct pci_device_id stmmac_id_table[] = {
{ PCI_DEVICE_DATA(INTEL, QUARK_ID, &quark_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_RGMII1G_ID, &ehl_rgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_SGMII1G_ID, &ehl_sgmii1g_pci_info) },
+ { PCI_DEVICE_DATA(INTEL, EHL_SGMII2G5_ID, &ehl_sgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_PSE0_RGMII1G_ID,
&ehl_pse0_rgmii1g_pci_info) },
{ PCI_DEVICE_DATA(INTEL, EHL_PSE0_SGMII1G_ID,
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID
2020-03-20 16:48 [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID Voon Weifeng
` (2 preceding siblings ...)
2020-03-20 16:48 ` [net-next,v1, 3/3] net: stmmac: add EHL SGMII " Voon Weifeng
@ 2020-03-23 9:54 ` Jose Abreu
2020-03-23 15:58 ` Voon, Weifeng
3 siblings, 1 reply; 6+ messages in thread
From: Jose Abreu @ 2020-03-23 9:54 UTC (permalink / raw)
To: Voon Weifeng, David S . Miller, Maxime Coquelin
Cc: netdev, linux-kernel, Giuseppe Cavallaro, Andrew Lunn,
Alexandre Torgue, Ong Boon Leong
From: Voon Weifeng <weifeng.voon@intel.com>
Date: Mar/20/2020, 16:48:22 (UTC+00:00)
> Intel EHL consist of 3 identical MAC. 2 are located in the Intel(R)
> Programmable Services Engine (Intel(R) PSE) and 1 is located in the
> platform Controller Hub (PCH). Each MAC consist of 3 PCI IDs which are
> differentiated by MII and speed.
This stmmac_pci.c is getting bigger and bigger ... Can you consider adding
your own PCI driver (dwmac-intel.c) to stmmac tree ?
You could even submit a patch for MAINTAINERS for this particular driver
as it's already done for others.
---
Thanks,
Jose Miguel Abreu
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [net-next,v1, 0/3] Add additional EHL PCI info and PCI ID
2020-03-23 9:54 ` [net-next,v1, 0/3] Add additional EHL " Jose Abreu
@ 2020-03-23 15:58 ` Voon, Weifeng
0 siblings, 0 replies; 6+ messages in thread
From: Voon, Weifeng @ 2020-03-23 15:58 UTC (permalink / raw)
To: Jose Abreu, David S . Miller, Maxime Coquelin
Cc: netdev, linux-kernel, Giuseppe Cavallaro, Andrew Lunn,
Alexandre Torgue, Ong, Boon Leong
> > Intel EHL consist of 3 identical MAC. 2 are located in the Intel(R)
> > Programmable Services Engine (Intel(R) PSE) and 1 is located in the
> > platform Controller Hub (PCH). Each MAC consist of 3 PCI IDs which are
> > differentiated by MII and speed.
>
> This stmmac_pci.c is getting bigger and bigger ... Can you consider
> adding your own PCI driver (dwmac-intel.c) to stmmac tree ?
Good idea. I will rework on this and submit as v2. Thanks.
>
> You could even submit a patch for MAINTAINERS for this particular driver
> as it's already done for others.
Do you mean becoming the maintainer for this particular file?
Regards,
Weifeng
>
> ---
> Thanks,
> Jose Miguel Abreu
^ permalink raw reply [flat|nested] 6+ messages in thread