| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20231121151733.2015384-3-tmaimon77@gmail.com>
Date: Tue, 21 Nov 2023 17:17:33 +0200
From: Tomer Maimon <tmaimon77@...il.com>
To: <davem@...emloft.net>, <edumazet@...gle.com>, <robh+dt@...nel.org>,
<krzysztof.kozlowski+dt@...aro.org>,
<alexandre.torgue@...s.st.com>, <peppe.cavallaro@...com>,
<joabreu@...opsys.com>, <mcoquelin.stm32@...il.com>,
<avifishman70@...il.com>, <tali.perry1@...il.com>,
<joel@....id.au>, <andrew@...econstruct.com.au>,
<venture@...gle.com>, <yuenn@...gle.com>,
<benjaminfair@...gle.com>, <j.neuschaefer@....net>
CC: <openbmc@...ts.ozlabs.org>, <netdev@...r.kernel.org>,
<devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-stm32@...md-mailman.stormreply.com>,
<linux-arm-kernel@...ts.infradead.org>,
Tomer Maimon <tmaimon77@...il.com>
Subject: [PATCH v1 2/2] net: stmmac: Add NPCM support
Add Nuvoton NPCM BMC SoCs support to STMMAC dwmac driver.
And modify MAINTAINERS to add a new F: entry for this driver.
Signed-off-by: Tomer Maimon <tmaimon77@...il.com>
---
MAINTAINERS | 1 +
drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 ++
drivers/net/ethernet/stmicro/stmmac/Makefile | 1 +
.../net/ethernet/stmicro/stmmac/dwmac-npcm.c | 121 ++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-npcm.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 5c9f868e13b6..43059c7d00c7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2507,6 +2507,7 @@ F: arch/arm64/boot/dts/nuvoton/
F: drivers/*/*/*npcm*
F: drivers/*/*npcm*
F: drivers/rtc/rtc-nct3018y.c
+F: drivers/net/ethernet/stmicro/stmmac/dwmac-npcm.c
F: include/dt-bindings/clock/nuvoton,npcm7xx-clock.h
F: include/dt-bindings/clock/nuvoton,npcm845-clk.h
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index a2b9e289aa36..2487a674d0d3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -121,6 +121,15 @@ config DWMAC_MESON
the stmmac device driver. This driver is used for Meson6,
Meson8, Meson8b and GXBB SoCs.
+config DWMAC_NPCM
+ tristate "Nuvoton NPCM dwmac support"
+ depends on OF && (ARCH_NPCM || COMPILE_TEST)
+ help
+ Support for Ethernet controller on Nuvoton NPCM BMC SoCs.
+
+ This selects the Nuvoton NPCM BMC SoC glue layer support for
+ the stmmac device driver. This driver is used for NPCM8xx SoCs.
+
config DWMAC_QCOM_ETHQOS
tristate "Qualcomm ETHQOS support"
default ARCH_QCOM
diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
index 80e598bd4255..1c86c8ca39f0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o
obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o
obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o
obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o dwmac-meson8b.o
+obj-$(CONFIG_DWMAC_NPCM) += dwmac-npcm.o
obj-$(CONFIG_DWMAC_QCOM_ETHQOS) += dwmac-qcom-ethqos.o
obj-$(CONFIG_DWMAC_ROCKCHIP) += dwmac-rk.o
obj-$(CONFIG_DWMAC_SOCFPGA) += dwmac-altr-socfpga.o
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-npcm.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-npcm.c
new file mode 100644
index 000000000000..dbb857661142
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-npcm.c
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Copyright (c) 2023 Nuvoton Technology corporation.
+
+#include <linux/device.h>
+#include <linux/ethtool.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/stmmac.h>
+
+#include "stmmac_platform.h"
+
+#define IND_AC_BA_REG 0x1FE
+#define SR_MII_CTRL 0x3E0000
+
+#define PCS_SR_MII_CTRL_REG 0x0
+#define PCS_SPEED_SELECT6 BIT(6)
+#define PCS_AN_ENABLE BIT(12)
+#define PCS_SPEED_SELECT13 BIT(13)
+#define PCS_RST BIT(15)
+
+#define PCS_MASK_SPEED 0xDFBF
+
+struct npcm_dwmac {
+ void __iomem *reg;
+};
+
+static void npcm_dwmac_fix_mac_speed(void *priv, unsigned int speed,
+ unsigned int mode)
+{
+ struct npcm_dwmac *dwmac = priv;
+ u16 val;
+
+ iowrite16((u16)(SR_MII_CTRL >> 9), dwmac->reg + IND_AC_BA_REG);
+ val = ioread16(dwmac->reg + PCS_SR_MII_CTRL_REG);
+ val &= PCS_MASK_SPEED;
+
+ switch (speed) {
+ case SPEED_1000:
+ val |= PCS_SPEED_SELECT6;
+ break;
+ case SPEED_100:
+ val |= PCS_SPEED_SELECT13;
+ break;
+ case SPEED_10:
+ break;
+ }
+
+ iowrite16(val, dwmac->reg + PCS_SR_MII_CTRL_REG);
+}
+
+void npcm_dwmac_pcs_init(struct npcm_dwmac *dwmac, struct device *dev,
+ struct plat_stmmacenet_data *plat_dat)
+{
+ u16 val;
+
+ iowrite16((u16)(SR_MII_CTRL >> 9), dwmac->reg + IND_AC_BA_REG);
+ val = ioread16(dwmac->reg + PCS_SR_MII_CTRL_REG);
+ val |= PCS_RST;
+ iowrite16(val, dwmac->reg + PCS_SR_MII_CTRL_REG);
+
+ while (val & PCS_RST)
+ val = ioread16(dwmac->reg + PCS_SR_MII_CTRL_REG);
+
+ val &= ~(PCS_AN_ENABLE);
+ iowrite16(val, dwmac->reg + PCS_SR_MII_CTRL_REG);
+}
+
+static int npcm_dwmac_probe(struct platform_device *pdev)
+{
+ struct plat_stmmacenet_data *plat_dat;
+ struct stmmac_resources stmmac_res;
+ struct npcm_dwmac *dwmac;
+ int ret;
+
+ ret = stmmac_get_platform_resources(pdev, &stmmac_res);
+ if (ret)
+ return ret;
+
+ plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);
+ if (IS_ERR(plat_dat))
+ return PTR_ERR(plat_dat);
+
+ dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);
+ if (!dwmac)
+ ret = -ENOMEM;
+
+ dwmac->reg = devm_platform_ioremap_resource(pdev, 1);
+ if (IS_ERR(dwmac->reg))
+ ret = PTR_ERR(dwmac->reg);
+
+ npcm_dwmac_pcs_init(dwmac, &pdev->dev, plat_dat);
+
+ plat_dat->has_gmac = true;
+ plat_dat->bsp_priv = dwmac;
+ plat_dat->fix_mac_speed = npcm_dwmac_fix_mac_speed;
+
+ return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+}
+
+static const struct of_device_id npcm_dwmac_match[] = {
+ { .compatible = "nuvoton,npcm8xx-sgmii" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, npcm_dwmac_match);
+
+static struct platform_driver npcm_dwmac_driver = {
+ .probe = npcm_dwmac_probe,
+ .remove_new = stmmac_pltfr_remove,
+ .driver = {
+ .name = "npcm-dwmac",
+ .pm = &stmmac_pltfr_pm_ops,
+ .of_match_table = npcm_dwmac_match,
+ },
+};
+module_platform_driver(npcm_dwmac_driver);
+
+MODULE_AUTHOR("Tomer Maimon <tomer.maimon@...oton.com>");
+MODULE_DESCRIPTION("Nuvoton NPCM DWMAC glue layer");
+MODULE_LICENSE("GPL v2");
--
2.33.0
Powered by blists - more mailing lists