Add additional EHL PCI info and PCI ID
Subsystems (4)
v2 cover Add additional EHL PCI info and PCI ID
Thanks Jose Miguel Abreu for the feedback. Summary of v2 patches:
1/3: As suggested to keep the stmmac_pci.c file simple. So created a new
file dwmac-intel.c and moved all the Intel specific PCI device out of stmmac_pci.c.
2/3: Added Intel(R) Programmable Services Engine (Intel(R) PSE) MAC PCI ID
and PCI info
3/3: Added EHL 2.5Gbps PCI ID and info
Changes from v1:
-Added a patch to move all Intel specific PCI device from stmmac_pci.c to
a new file named dwmac-intel.c.
-Combine v1 patch 1/3 and 2/3 into single patch.
Voon Weifeng (3):
net: stmmac: create dwmac-intel.c to contain all Intel platform
net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID
net: stmmac: add EHL 2.5Gbps PCI info and PCI ID
drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 592 ++++++++++++++++++ .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 313 --------- 4 files changed, 602 insertions(+), 313 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
Signature · 1 line
2.17.1
PATCH v2 1/3 net: stmmac: create dwmac-intel.c to contain all Intel platform
As stmmac_pci.c file is getting bigger and more complex, it is reasonable to separate all the Intel specific dwmac pci device to a different file. This move includes Intel Quark, TGL and EHL. A new kernel config CONFIG_DWMAC_INTEL is introduced and depends on X86. For this initial patch, all the necessary function such as probe() and exit() are identical besides the function name.
--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 509 ++++++++++++++++++ .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 313 ----------- 4 files changed, 519 insertions(+), 313 deletions(-) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
drivers/net/ethernet/stmicro/stmmac/Kconfig +9 -0
@@ -198,6 +198,15 @@ config DWMAC_SUN8I EMAC ethernet controller. endif +config DWMAC_INTEL + tristate "Intel GMAC support" + default X86 + depends on X86 && STMMAC_ETH && PCI + depends on COMMON_CLK + ---help--- + This selects the Intel platform specific bus support for the + stmmac driver. This driver is used for Intel Quark/EHL/TGL. + config STMMAC_PCI tristate "STMMAC PCI bus support" depends on STMMAC_ETH && PCI
drivers/net/ethernet/stmicro/stmmac/Makefile +1 -0
@@ -30,5 +30,6 @@ obj-$(CONFIG_DWMAC_GENERIC) += dwmac-generic.o stmmac-platform-objs:= stmmac_platform.o dwmac-altr-socfpga-objs := altr_tse_pcs.o dwmac-socfpga.o +obj-$(CONFIG_DWMAC_INTEL) += dwmac-intel.o obj-$(CONFIG_STMMAC_PCI) += stmmac-pci.o stmmac-pci-objs:= stmmac_pci.o
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c new file +509 -0
509 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +0 -313
340 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 2/3 net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID
In reply to Voon WeifengAdd EHL PSE0/1 RGMII & SGMII 1Gbps PCI info and PCI ID
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +75 -0
@@ -210,6 +210,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) {
@@ -480,12 +540,27 @@ static SIMPLE_DEV_PM_OPS(intel_eth_pm_ops, intel_eth_pci_suspend,#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 +/* Intel(R) Programmable Services Engine (Intel(R) PSE) consist of 2 MAC +* which are named PSE0 and PSE1 +*/ +#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 0xa0acstatic const struct pci_device_id intel_eth_pci_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) }, {} };
Signature · 1 line
2.17.1
PATCH v2 3/3 net: stmmac: add EHL 2.5Gbps PCI info and PCI ID
In reply to Voon WeifengAdd EHL SGMII 2.5Gbps PCI info and PCI ID
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +16 -8
@@ -537,30 +537,38 @@ static int __maybe_unused intel_eth_pci_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(intel_eth_pm_ops, intel_eth_pci_suspend, intel_eth_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_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/* Intel(R) Programmable Services Engine (Intel(R) PSE) consist of 2 MAC * which are named PSE0 and PSE1 */ -#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_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 0xa0acstatic const struct pci_device_id intel_eth_pci_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 , &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) }, {} };
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Voon Weifeng <[email protected]>
Date: Tue, 31 Mar 2020 01:05:09 +0800
Quoted 12 lines
Thanks Jose Miguel Abreu for the feedback. Summary of v2 patches:
1/3: As suggested to keep the
stmmac_pci.cfile simple. So created a new
filedwmac-intel.cand moved all the Intel specific PCI device out ofstmmac_pci.c.2/3: Added Intel(R) Programmable Services Engine (Intel(R) PSE) MAC PCI ID
and PCI info3/3: Added EHL 2.5Gbps PCI ID and info
Changes from v1:
Review
Quoted 3 lines
(quoted diff) +0
-2-Added a patch to move all Intel specific PCI device from stmmac_pci.c to a new file named dwmac-intel.c. -Combine v1 patch 1/3 and 2/3 into single patch.
Series applied, thanks.