* [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable
@ 2018-10-30 9:54 Valentin-catalin Neacsu
2018-10-30 9:54 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Valentin-catalin Neacsu @ 2018-10-30 9:54 UTC (permalink / raw)
To: u-boot
If System interface protocol is USXGMII then enable USXGMII autoneg
Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
---
drivers/net/phy/aquantia.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 6678147545..603abb5a7f 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0+
*
* Copyright 2014 Freescale Semiconductor, Inc.
+ * Copyright 2018 NXP
*/
#include <config.h>
#include <common.h>
@@ -20,6 +21,13 @@
#define AQUNTIA_SPEED_LSB_MASK 0x2000
#define AQUNTIA_SPEED_MSB_MASK 0x40
+#define AQUANTIA_SYSTEM_INTERFACE_SR 0xe812
+#define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
+
+#define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
+#define AQUANTIA_SI_IN_USE_MASK 0x0078
+#define AQUANTIA_SI_USXGMII 0x0018
+
int aquantia_config(struct phy_device *phydev)
{
u32 val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
@@ -41,6 +49,16 @@ int aquantia_config(struct phy_device *phydev)
phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR,
AQUNTIA_SPEED_LSB_MASK |
AQUNTIA_SPEED_MSB_MASK);
+
+ val = phy_read(phydev, MDIO_MMD_PHYXS,
+ AQUANTIA_SYSTEM_INTERFACE_SR);
+ /* If SI is USXGMII then start USXGMII autoneg*/
+ if ((val & AQUANTIA_SI_IN_USE_MASK) == AQUANTIA_SI_USXGMII) {
+ phy_write(phydev, MDIO_MMD_PHYXS,
+ AQUANTIA_VENDOR_PROVISIONING_REG,
+ AQUANTIA_USX_AUTONEG_CONTROL_ENA);
+ }
+
} else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
/* 2.5GBASE-T mode */
phydev->advertising = SUPPORTED_1000baseT_Full;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version
2018-10-30 9:54 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
@ 2018-10-30 9:54 ` Valentin-catalin Neacsu
2018-11-05 16:25 ` Clément Péron
2018-12-06 16:35 ` [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable York Sun
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Valentin-catalin Neacsu @ 2018-10-30 9:54 UTC (permalink / raw)
To: u-boot
Print information about Aquantia firmware loaded on the phy
Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
---
drivers/net/phy/aquantia.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 603abb5a7f..eb3950092d 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -23,6 +23,11 @@
#define AQUANTIA_SYSTEM_INTERFACE_SR 0xe812
#define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
+#define AQUANTIA_FIRMWARE_ID 0x20
+#define AQUANTIA_RESERVED_STATUS 0xc885
+#define AQUANTIA_FIRMWARE_MAJOR_MASK 0xff00
+#define AQUANTIA_FIRMWARE_MINOR_MASK 0xff
+#define AQUANTIA_FIRMWARE_BUILD_MASK 0xf0
#define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
#define AQUANTIA_SI_IN_USE_MASK 0x0078
@@ -31,6 +36,7 @@
int aquantia_config(struct phy_device *phydev)
{
u32 val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
+ u32 reg_val1 = 0;
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
/* 1000BASE-T mode */
@@ -57,6 +63,11 @@ int aquantia_config(struct phy_device *phydev)
phy_write(phydev, MDIO_MMD_PHYXS,
AQUANTIA_VENDOR_PROVISIONING_REG,
AQUANTIA_USX_AUTONEG_CONTROL_ENA);
+ printf("%s: system interface USXGMII\n",
+ phydev->dev->name);
+ } else {
+ printf("%s: system interface XFI\n",
+ phydev->dev->name);
}
} else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
@@ -74,6 +85,16 @@ int aquantia_config(struct phy_device *phydev)
val = (val & ~AQUNTIA_SPEED_MSB_MASK) | AQUNTIA_SPEED_LSB_MASK;
phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR, val);
}
+
+ val = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_RESERVED_STATUS);
+ reg_val1 = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_FIRMWARE_ID);
+
+ printf("%s: %s Firmware Version %x.%x.%x\n", phydev->dev->name,
+ phydev->drv->name,
+ (reg_val1 & AQUANTIA_FIRMWARE_MAJOR_MASK) >> 8,
+ reg_val1 & AQUANTIA_FIRMWARE_MINOR_MASK,
+ (val & AQUANTIA_FIRMWARE_BUILD_MASK) >> 4);
+
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version
2018-10-30 9:54 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
@ 2018-11-05 16:25 ` Clément Péron
0 siblings, 0 replies; 7+ messages in thread
From: Clément Péron @ 2018-11-05 16:25 UTC (permalink / raw)
To: u-boot
Hi Valentin-catalin,
There is a typo in your commit title.
Regards,
Clement
On Tue, 30 Oct 2018 at 11:44, Valentin-catalin Neacsu
<valentin-catalin.neacsu@nxp.com> wrote:
>
> Print information about Aquantia firmware loaded on the phy
> Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
> ---
> drivers/net/phy/aquantia.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
> index 603abb5a7f..eb3950092d 100644
> --- a/drivers/net/phy/aquantia.c
> +++ b/drivers/net/phy/aquantia.c
> @@ -23,6 +23,11 @@
>
> #define AQUANTIA_SYSTEM_INTERFACE_SR 0xe812
> #define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
> +#define AQUANTIA_FIRMWARE_ID 0x20
> +#define AQUANTIA_RESERVED_STATUS 0xc885
> +#define AQUANTIA_FIRMWARE_MAJOR_MASK 0xff00
> +#define AQUANTIA_FIRMWARE_MINOR_MASK 0xff
> +#define AQUANTIA_FIRMWARE_BUILD_MASK 0xf0
>
> #define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
> #define AQUANTIA_SI_IN_USE_MASK 0x0078
> @@ -31,6 +36,7 @@
> int aquantia_config(struct phy_device *phydev)
> {
> u32 val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
> + u32 reg_val1 = 0;
>
> if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
> /* 1000BASE-T mode */
> @@ -57,6 +63,11 @@ int aquantia_config(struct phy_device *phydev)
> phy_write(phydev, MDIO_MMD_PHYXS,
> AQUANTIA_VENDOR_PROVISIONING_REG,
> AQUANTIA_USX_AUTONEG_CONTROL_ENA);
> + printf("%s: system interface USXGMII\n",
> + phydev->dev->name);
> + } else {
> + printf("%s: system interface XFI\n",
> + phydev->dev->name);
> }
>
> } else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
> @@ -74,6 +85,16 @@ int aquantia_config(struct phy_device *phydev)
> val = (val & ~AQUNTIA_SPEED_MSB_MASK) | AQUNTIA_SPEED_LSB_MASK;
> phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR, val);
> }
> +
> + val = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_RESERVED_STATUS);
> + reg_val1 = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_FIRMWARE_ID);
> +
> + printf("%s: %s Firmware Version %x.%x.%x\n", phydev->dev->name,
> + phydev->drv->name,
> + (reg_val1 & AQUANTIA_FIRMWARE_MAJOR_MASK) >> 8,
> + reg_val1 & AQUANTIA_FIRMWARE_MINOR_MASK,
> + (val & AQUANTIA_FIRMWARE_BUILD_MASK) >> 4);
> +
> return 0;
> }
>
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable
2018-10-30 9:54 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
2018-10-30 9:54 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
@ 2018-12-06 16:35 ` York Sun
2019-01-22 21:53 ` Joe Hershberger
2019-01-24 17:39 ` [U-Boot] net: phy: aquantia: Enable autoneg when on USXGMII Joe Hershberger
3 siblings, 0 replies; 7+ messages in thread
From: York Sun @ 2018-12-06 16:35 UTC (permalink / raw)
To: u-boot
On 10/30/18 2:54 AM, Valentin-catalin Neacsu wrote:
> If System interface protocol is USXGMII then enable USXGMII autoneg
> Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
> ---
> drivers/net/phy/aquantia.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
> index 6678147545..603abb5a7f 100644
> --- a/drivers/net/phy/aquantia.c
> +++ b/drivers/net/phy/aquantia.c
> @@ -4,6 +4,7 @@
> * SPDX-License-Identifier: GPL-2.0+
> *
> * Copyright 2014 Freescale Semiconductor, Inc.
> + * Copyright 2018 NXP
> */
> #include <config.h>
> #include <common.h>
> @@ -20,6 +21,13 @@
> #define AQUNTIA_SPEED_LSB_MASK 0x2000
> #define AQUNTIA_SPEED_MSB_MASK 0x40
>
> +#define AQUANTIA_SYSTEM_INTERFACE_SR 0xe812
> +#define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
> +
> +#define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
> +#define AQUANTIA_SI_IN_USE_MASK 0x0078
> +#define AQUANTIA_SI_USXGMII 0x0018
> +
> int aquantia_config(struct phy_device *phydev)
> {
> u32 val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
> @@ -41,6 +49,16 @@ int aquantia_config(struct phy_device *phydev)
> phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR,
> AQUNTIA_SPEED_LSB_MASK |
> AQUNTIA_SPEED_MSB_MASK);
> +
> + val = phy_read(phydev, MDIO_MMD_PHYXS,
> + AQUANTIA_SYSTEM_INTERFACE_SR);
> + /* If SI is USXGMII then start USXGMII autoneg*/
> + if ((val & AQUANTIA_SI_IN_USE_MASK) == AQUANTIA_SI_USXGMII) {
> + phy_write(phydev, MDIO_MMD_PHYXS,
> + AQUANTIA_VENDOR_PROVISIONING_REG,
> + AQUANTIA_USX_AUTONEG_CONTROL_ENA);
> + }
> +
> } else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
> /* 2.5GBASE-T mode */
> phydev->advertising = SUPPORTED_1000baseT_Full;
>
This should be sent to Joe.
York
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable
2018-10-30 9:54 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
2018-10-30 9:54 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
2018-12-06 16:35 ` [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable York Sun
@ 2019-01-22 21:53 ` Joe Hershberger
2019-01-24 17:39 ` [U-Boot] net: phy: aquantia: Enable autoneg when on USXGMII Joe Hershberger
3 siblings, 0 replies; 7+ messages in thread
From: Joe Hershberger @ 2019-01-22 21:53 UTC (permalink / raw)
To: u-boot
On Tue, Oct 30, 2018 at 5:44 AM Valentin-catalin Neacsu
<valentin-catalin.neacsu@nxp.com> wrote:
>
> If System interface protocol is USXGMII then enable USXGMII autoneg
> Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] net: phy: aquantia: Enable autoneg when on USXGMII
2018-10-30 9:54 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
` (2 preceding siblings ...)
2019-01-22 21:53 ` Joe Hershberger
@ 2019-01-24 17:39 ` Joe Hershberger
3 siblings, 0 replies; 7+ messages in thread
From: Joe Hershberger @ 2019-01-24 17:39 UTC (permalink / raw)
To: u-boot
Hi Valentin-catalin,
https://patchwork.ozlabs.org/patch/990715/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version
2018-10-29 8:57 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
@ 2018-10-29 8:57 ` Valentin-catalin Neacsu
0 siblings, 0 replies; 7+ messages in thread
From: Valentin-catalin Neacsu @ 2018-10-29 8:57 UTC (permalink / raw)
To: u-boot
Print information about Aquantia firmware loaded on the phy
Signed-off-by: Valentin Catalin Neacsu <valentin-catalin.neacsu@nxp.com>
---
drivers/net/phy/aquantia.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 57eede14ce..f4060499c3 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -22,6 +22,11 @@
#define AQUANTIA_SYSTEM_INTERFACE_SR 0xe812
#define AQUANTIA_VENDOR_PROVISIONING_REG 0xC441
+#define AQUANTIA_FIRMWARE_ID 0x20
+#define AQUANTIA_RESERVED_STATUS 0xc885
+#define AQUANTIA_FIRMWARE_MAJOR_MASK 0xff00
+#define AQUANTIA_FIRMWARE_MINOR_MASK 0xff
+#define AQUANTIA_FIRMWARE_BUILD_MASK 0xf0
#define AQUANTIA_USX_AUTONEG_CONTROL_ENA 0x0008
#define AQUANTIA_SI_IN_USE_MASK 0x0078
@@ -30,6 +35,7 @@
int aquantia_config(struct phy_device *phydev)
{
u32 val = phy_read(phydev, MDIO_MMD_PMAPMD, MII_BMCR);
+ u32 reg_val1 = 0;
if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
/* 1000BASE-T mode */
@@ -56,6 +62,11 @@ int aquantia_config(struct phy_device *phydev)
phy_write(phydev, MDIO_MMD_PHYXS,
AQUANTIA_VENDOR_PROVISIONING_REG,
AQUANTIA_USX_AUTONEG_CONTROL_ENA);
+ printf("%s: system interface USXGMII\n",
+ phydev->dev->name);
+ } else {
+ printf("%s: system interface XFI\n",
+ phydev->dev->name);
}
} else if (phydev->interface == PHY_INTERFACE_MODE_SGMII_2500) {
@@ -73,6 +84,16 @@ int aquantia_config(struct phy_device *phydev)
val = (val & ~AQUNTIA_SPEED_MSB_MASK) | AQUNTIA_SPEED_LSB_MASK;
phy_write(phydev, MDIO_MMD_PMAPMD, MII_BMCR, val);
}
+
+ val = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_RESERVED_STATUS);
+ reg_val1 = phy_read(phydev, MDIO_MMD_VEND1, AQUANTIA_FIRMWARE_ID);
+
+ printf("%s: %s Firmware Version %x.%x.%x\n", phydev->dev->name,
+ phydev->drv->name,
+ (reg_val1 & AQUANTIA_FIRMWARE_MAJOR_MASK) >> 8,
+ reg_val1 & AQUANTIA_FIRMWARE_MINOR_MASK,
+ (val & AQUANTIA_FIRMWARE_BUILD_MASK) >> 4);
+
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-01-24 17:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 9:54 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
2018-10-30 9:54 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
2018-11-05 16:25 ` Clément Péron
2018-12-06 16:35 ` [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable York Sun
2019-01-22 21:53 ` Joe Hershberger
2019-01-24 17:39 ` [U-Boot] net: phy: aquantia: Enable autoneg when on USXGMII Joe Hershberger
-- strict thread matches above, loose matches on Subject: below --
2018-10-29 8:57 [U-Boot] [PATCH 1/2] AQUANTIA USXGMII autoneg enable Valentin-catalin Neacsu
2018-10-29 8:57 ` [U-Boot] [PATCH 2/2] Aquantia: Print information about system interface and firmaware version Valentin-catalin Neacsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.