* [PATCH] net: phy: tja11xx: Add IRQ support to the driver
@ 2019-05-28 18:16 Marek Vasut
2019-05-28 18:21 ` Florian Fainelli
2019-05-28 18:29 ` Heiner Kallweit
0 siblings, 2 replies; 5+ messages in thread
From: Marek Vasut @ 2019-05-28 18:16 UTC (permalink / raw)
To: netdev
Cc: Marek Vasut, Andrew Lunn, Florian Fainelli, Guenter Roeck,
Heiner Kallweit, Jean Delvare, linux-hwmon
Add support for handling the TJA11xx PHY IRQ signal.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: linux-hwmon@vger.kernel.org
---
drivers/net/phy/nxp-tja11xx.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
index b705d0bd798b..0be9fe9a9604 100644
--- a/drivers/net/phy/nxp-tja11xx.c
+++ b/drivers/net/phy/nxp-tja11xx.c
@@ -40,6 +40,8 @@
#define MII_INTSRC_TEMP_ERR BIT(1)
#define MII_INTSRC_UV_ERR BIT(3)
+#define MII_INTEN 22
+
#define MII_COMMSTAT 23
#define MII_COMMSTAT_LINK_UP BIT(15)
@@ -239,6 +241,30 @@ static int tja11xx_read_status(struct phy_device *phydev)
return 0;
}
+static int tja11xx_config_intr(struct phy_device *phydev)
+{
+ int ret;
+
+ if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
+ ret = phy_write(phydev, MII_INTEN, 0xcfef);
+ else
+ ret = phy_write(phydev, MII_INTEN, 0);
+
+ if (ret < 0)
+ return ret;
+
+ ret = phy_read(phydev, MII_INTSRC);
+
+ return ret < 0 ? ret : 0;
+}
+
+static int tja11xx_ack_interrupt(struct phy_device *phydev)
+{
+ int ret = phy_read(phydev, MII_INTSRC);
+
+ return ret < 0 ? ret : 0;
+}
+
static int tja11xx_get_sset_count(struct phy_device *phydev)
{
return ARRAY_SIZE(tja11xx_hw_stats);
@@ -366,6 +392,9 @@ static struct phy_driver tja11xx_driver[] = {
.suspend = genphy_suspend,
.resume = genphy_resume,
.set_loopback = genphy_loopback,
+ /* IRQ related */
+ .config_intr = tja11xx_config_intr,
+ .ack_interrupt = tja11xx_ack_interrupt,
/* Statistics */
.get_sset_count = tja11xx_get_sset_count,
.get_strings = tja11xx_get_strings,
@@ -381,6 +410,9 @@ static struct phy_driver tja11xx_driver[] = {
.suspend = genphy_suspend,
.resume = genphy_resume,
.set_loopback = genphy_loopback,
+ /* IRQ related */
+ .config_intr = tja11xx_config_intr,
+ .ack_interrupt = tja11xx_ack_interrupt,
/* Statistics */
.get_sset_count = tja11xx_get_sset_count,
.get_strings = tja11xx_get_strings,
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: phy: tja11xx: Add IRQ support to the driver
2019-05-28 18:16 [PATCH] net: phy: tja11xx: Add IRQ support to the driver Marek Vasut
@ 2019-05-28 18:21 ` Florian Fainelli
2019-05-28 19:13 ` Marek Vasut
2019-05-28 18:29 ` Heiner Kallweit
1 sibling, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2019-05-28 18:21 UTC (permalink / raw)
To: Marek Vasut, netdev
Cc: Andrew Lunn, Guenter Roeck, Heiner Kallweit, Jean Delvare, linux-hwmon
On 5/28/19 11:16 AM, Marek Vasut wrote:
> Add support for handling the TJA11xx PHY IRQ signal.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Heiner Kallweit <hkallweit1@gmail.com>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: linux-hwmon@vger.kernel.org
> ---
> drivers/net/phy/nxp-tja11xx.c | 32 ++++++++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
> index b705d0bd798b..0be9fe9a9604 100644
> --- a/drivers/net/phy/nxp-tja11xx.c
> +++ b/drivers/net/phy/nxp-tja11xx.c
> @@ -40,6 +40,8 @@
> #define MII_INTSRC_TEMP_ERR BIT(1)
> #define MII_INTSRC_UV_ERR BIT(3)
>
> +#define MII_INTEN 22
> +
> #define MII_COMMSTAT 23
> #define MII_COMMSTAT_LINK_UP BIT(15)
>
> @@ -239,6 +241,30 @@ static int tja11xx_read_status(struct phy_device *phydev)
> return 0;
> }
>
> +static int tja11xx_config_intr(struct phy_device *phydev)
> +{
> + int ret;
> +
> + if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
> + ret = phy_write(phydev, MII_INTEN, 0xcfef);
It would be nice to define the shifts and masks being used here. Other
than that, this looks good.
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: phy: tja11xx: Add IRQ support to the driver
2019-05-28 18:16 [PATCH] net: phy: tja11xx: Add IRQ support to the driver Marek Vasut
2019-05-28 18:21 ` Florian Fainelli
@ 2019-05-28 18:29 ` Heiner Kallweit
2019-05-28 19:14 ` Marek Vasut
1 sibling, 1 reply; 5+ messages in thread
From: Heiner Kallweit @ 2019-05-28 18:29 UTC (permalink / raw)
To: Marek Vasut, netdev
Cc: Andrew Lunn, Florian Fainelli, Guenter Roeck, Jean Delvare, linux-hwmon
On 28.05.2019 20:16, Marek Vasut wrote:
> Add support for handling the TJA11xx PHY IRQ signal.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Heiner Kallweit <hkallweit1@gmail.com>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: linux-hwmon@vger.kernel.org
> ---
> drivers/net/phy/nxp-tja11xx.c | 32 ++++++++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
> index b705d0bd798b..0be9fe9a9604 100644
> --- a/drivers/net/phy/nxp-tja11xx.c
> +++ b/drivers/net/phy/nxp-tja11xx.c
> @@ -40,6 +40,8 @@
> #define MII_INTSRC_TEMP_ERR BIT(1)
> #define MII_INTSRC_UV_ERR BIT(3)
>
> +#define MII_INTEN 22
> +
> #define MII_COMMSTAT 23
> #define MII_COMMSTAT_LINK_UP BIT(15)
>
> @@ -239,6 +241,30 @@ static int tja11xx_read_status(struct phy_device *phydev)
> return 0;
> }
>
> +static int tja11xx_config_intr(struct phy_device *phydev)
> +{
> + int ret;
> +
> + if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
> + ret = phy_write(phydev, MII_INTEN, 0xcfef);
As Florian commented already, such magic numbers are not nice.
Better add a constant for each bit representing an interrupt
source. Please note that phylib is interested in the link
change event only. Therefore typically only one bit is set.
> + else
> + ret = phy_write(phydev, MII_INTEN, 0);
> +
> + if (ret < 0)
> + return ret;
> +
> + ret = phy_read(phydev, MII_INTSRC);
> +
This IRQ ACK can be removed. It's done by phylib, see
phy_enable_interrupts().
> + return ret < 0 ? ret : 0;
> +}
> +
> +static int tja11xx_ack_interrupt(struct phy_device *phydev)
> +{
> + int ret = phy_read(phydev, MII_INTSRC);
> +
> + return ret < 0 ? ret : 0;
> +}
> +
> static int tja11xx_get_sset_count(struct phy_device *phydev)
> {
> return ARRAY_SIZE(tja11xx_hw_stats);
> @@ -366,6 +392,9 @@ static struct phy_driver tja11xx_driver[] = {
> .suspend = genphy_suspend,
> .resume = genphy_resume,
> .set_loopback = genphy_loopback,
> + /* IRQ related */
> + .config_intr = tja11xx_config_intr,
> + .ack_interrupt = tja11xx_ack_interrupt,
> /* Statistics */
> .get_sset_count = tja11xx_get_sset_count,
> .get_strings = tja11xx_get_strings,
> @@ -381,6 +410,9 @@ static struct phy_driver tja11xx_driver[] = {
> .suspend = genphy_suspend,
> .resume = genphy_resume,
> .set_loopback = genphy_loopback,
> + /* IRQ related */
> + .config_intr = tja11xx_config_intr,
> + .ack_interrupt = tja11xx_ack_interrupt,
> /* Statistics */
> .get_sset_count = tja11xx_get_sset_count,
> .get_strings = tja11xx_get_strings,
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: phy: tja11xx: Add IRQ support to the driver
2019-05-28 18:21 ` Florian Fainelli
@ 2019-05-28 19:13 ` Marek Vasut
0 siblings, 0 replies; 5+ messages in thread
From: Marek Vasut @ 2019-05-28 19:13 UTC (permalink / raw)
To: Florian Fainelli, netdev
Cc: Andrew Lunn, Guenter Roeck, Heiner Kallweit, Jean Delvare, linux-hwmon
On 5/28/19 8:21 PM, Florian Fainelli wrote:
> On 5/28/19 11:16 AM, Marek Vasut wrote:
>> Add support for handling the TJA11xx PHY IRQ signal.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Andrew Lunn <andrew@lunn.ch>
>> Cc: Florian Fainelli <f.fainelli@gmail.com>
>> Cc: Guenter Roeck <linux@roeck-us.net>
>> Cc: Heiner Kallweit <hkallweit1@gmail.com>
>> Cc: Jean Delvare <jdelvare@suse.com>
>> Cc: linux-hwmon@vger.kernel.org
>> ---
>> drivers/net/phy/nxp-tja11xx.c | 32 ++++++++++++++++++++++++++++++++
>> 1 file changed, 32 insertions(+)
>>
>> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
>> index b705d0bd798b..0be9fe9a9604 100644
>> --- a/drivers/net/phy/nxp-tja11xx.c
>> +++ b/drivers/net/phy/nxp-tja11xx.c
>> @@ -40,6 +40,8 @@
>> #define MII_INTSRC_TEMP_ERR BIT(1)
>> #define MII_INTSRC_UV_ERR BIT(3)
>>
>> +#define MII_INTEN 22
>> +
>> #define MII_COMMSTAT 23
>> #define MII_COMMSTAT_LINK_UP BIT(15)
>>
>> @@ -239,6 +241,30 @@ static int tja11xx_read_status(struct phy_device *phydev)
>> return 0;
>> }
>>
>> +static int tja11xx_config_intr(struct phy_device *phydev)
>> +{
>> + int ret;
>> +
>> + if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
>> + ret = phy_write(phydev, MII_INTEN, 0xcfef);
>
> It would be nice to define the shifts and masks being used here. Other
> than that, this looks good.
OK
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: phy: tja11xx: Add IRQ support to the driver
2019-05-28 18:29 ` Heiner Kallweit
@ 2019-05-28 19:14 ` Marek Vasut
0 siblings, 0 replies; 5+ messages in thread
From: Marek Vasut @ 2019-05-28 19:14 UTC (permalink / raw)
To: Heiner Kallweit, netdev
Cc: Andrew Lunn, Florian Fainelli, Guenter Roeck, Jean Delvare, linux-hwmon
On 5/28/19 8:29 PM, Heiner Kallweit wrote:
> On 28.05.2019 20:16, Marek Vasut wrote:
>> Add support for handling the TJA11xx PHY IRQ signal.
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> Cc: Andrew Lunn <andrew@lunn.ch>
>> Cc: Florian Fainelli <f.fainelli@gmail.com>
>> Cc: Guenter Roeck <linux@roeck-us.net>
>> Cc: Heiner Kallweit <hkallweit1@gmail.com>
>> Cc: Jean Delvare <jdelvare@suse.com>
>> Cc: linux-hwmon@vger.kernel.org
>> ---
>> drivers/net/phy/nxp-tja11xx.c | 32 ++++++++++++++++++++++++++++++++
>> 1 file changed, 32 insertions(+)
>>
>> diff --git a/drivers/net/phy/nxp-tja11xx.c b/drivers/net/phy/nxp-tja11xx.c
>> index b705d0bd798b..0be9fe9a9604 100644
>> --- a/drivers/net/phy/nxp-tja11xx.c
>> +++ b/drivers/net/phy/nxp-tja11xx.c
>> @@ -40,6 +40,8 @@
>> #define MII_INTSRC_TEMP_ERR BIT(1)
>> #define MII_INTSRC_UV_ERR BIT(3)
>>
>> +#define MII_INTEN 22
>> +
>> #define MII_COMMSTAT 23
>> #define MII_COMMSTAT_LINK_UP BIT(15)
>>
>> @@ -239,6 +241,30 @@ static int tja11xx_read_status(struct phy_device *phydev)
>> return 0;
>> }
>>
>> +static int tja11xx_config_intr(struct phy_device *phydev)
>> +{
>> + int ret;
>> +
>> + if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
>> + ret = phy_write(phydev, MII_INTEN, 0xcfef);
>
> As Florian commented already, such magic numbers are not nice.
> Better add a constant for each bit representing an interrupt
> source. Please note that phylib is interested in the link
> change event only. Therefore typically only one bit is set.
With this PHY, it seems all of those bits have impact on the link.
>> + else
>> + ret = phy_write(phydev, MII_INTEN, 0);
>> +
>> + if (ret < 0)
>> + return ret;
>> +
>> + ret = phy_read(phydev, MII_INTSRC);
>> +
>
> This IRQ ACK can be removed. It's done by phylib, see
> phy_enable_interrupts().
OK
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-28 19:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-28 18:16 [PATCH] net: phy: tja11xx: Add IRQ support to the driver Marek Vasut
2019-05-28 18:21 ` Florian Fainelli
2019-05-28 19:13 ` Marek Vasut
2019-05-28 18:29 ` Heiner Kallweit
2019-05-28 19:14 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).