diff mbox series

[net] net: phy: mscc: adjust the phy support for PTP and MACsec

Message ID 20201111095511.671539-1-steen.hegelund@microchip.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series [net] net: phy: mscc: adjust the phy support for PTP and MACsec | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present fail Series targets non-next tree, but doesn't contain any Fixes tags
netdev/patch_count success Link
netdev/tree_selection success Clearly marked for net
netdev/subject_prefix success Link
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 15 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Steen Hegelund Nov. 11, 2020, 9:55 a.m. UTC
The MSCC PHYs selected for PTP and MACSec was not correct

- PTP
    - Add VSC8572 and VSC8574

- MACsec
    - Removed VSC8575

The relevant datasheets can be found here:
  - VSC8572: https://www.microchip.com/wwwproducts/en/VSC8572
  - VSC8574: https://www.microchip.com/wwwproducts/en/VSC8574
  - VSC8575: https://www.microchip.com/wwwproducts/en/VSC8575

Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com>
---
 drivers/net/phy/mscc/mscc_macsec.c | 1 -
 drivers/net/phy/mscc/mscc_ptp.c    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

--
2.29.2

Comments

Antoine Tenart Nov. 11, 2020, 2:01 p.m. UTC | #1
Hi Steen!

Either this is a fix and it would need a Fixes: tag in addition to the
Signed-off-by: one (you can have a look at the git history to see what
is the format); or the patch is not a fix and then it should have
[net-next] in its subject instead of [net].

Please have a look at the relevant documentation,
https://www.kernel.org/doc/html/latest/networking/netdev-FAQ.html

Thanks!
Antoine

Quoting Steen Hegelund (2020-11-11 10:55:11)
> The MSCC PHYs selected for PTP and MACSec was not correct
> 
> - PTP
>     - Add VSC8572 and VSC8574
> 
> - MACsec
>     - Removed VSC8575
> 
> The relevant datasheets can be found here:
>   - VSC8572: https://www.microchip.com/wwwproducts/en/VSC8572
>   - VSC8574: https://www.microchip.com/wwwproducts/en/VSC8574
>   - VSC8575: https://www.microchip.com/wwwproducts/en/VSC8575
> 
> Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com>
> ---
>  drivers/net/phy/mscc/mscc_macsec.c | 1 -
>  drivers/net/phy/mscc/mscc_ptp.c    | 2 ++
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
> index 1d4c012194e9..72292bf6c51c 100644
> --- a/drivers/net/phy/mscc/mscc_macsec.c
> +++ b/drivers/net/phy/mscc/mscc_macsec.c
> @@ -981,7 +981,6 @@ int vsc8584_macsec_init(struct phy_device *phydev)
> 
>         switch (phydev->phy_id & phydev->drv->phy_id_mask) {
>         case PHY_ID_VSC856X:
> -       case PHY_ID_VSC8575:
>         case PHY_ID_VSC8582:
>         case PHY_ID_VSC8584:
>                 INIT_LIST_HEAD(&vsc8531->macsec_flows);
> diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c
> index b97ee79f3cdf..f0537299c441 100644
> --- a/drivers/net/phy/mscc/mscc_ptp.c
> +++ b/drivers/net/phy/mscc/mscc_ptp.c
> @@ -1510,6 +1510,8 @@ void vsc8584_config_ts_intr(struct phy_device *phydev)
>  int vsc8584_ptp_init(struct phy_device *phydev)
>  {
>         switch (phydev->phy_id & phydev->drv->phy_id_mask) {
> +       case PHY_ID_VSC8572:
> +       case PHY_ID_VSC8574:
>         case PHY_ID_VSC8575:
>         case PHY_ID_VSC8582:
>         case PHY_ID_VSC8584:
> --
> 2.29.2
>
Steen Hegelund Nov. 11, 2020, 2:30 p.m. UTC | #2
On 11.11.2020 15:01, Antoine Tenart wrote:
>EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
>Hi Steen!
>
>Either this is a fix and it would need a Fixes: tag in addition to the
>Signed-off-by: one (you can have a look at the git history to see what
>is the format); or the patch is not a fix and then it should have
>[net-next] in its subject instead of [net].
>
>Please have a look at the relevant documentation,
>https://www.kernel.org/doc/html/latest/networking/netdev-FAQ.html
>
>Thanks!
>Antoine

Hi Antoine,
Thanks for pointing this out.  It is a fix, so I will add a Fixes tag to
the commit message.

BR
Steen

>
>Quoting Steen Hegelund (2020-11-11 10:55:11)
>> The MSCC PHYs selected for PTP and MACSec was not correct
>>
>> - PTP
>>     - Add VSC8572 and VSC8574
>>
>> - MACsec
>>     - Removed VSC8575
>>
>> The relevant datasheets can be found here:
>>   - VSC8572: https://www.microchip.com/wwwproducts/en/VSC8572
>>   - VSC8574: https://www.microchip.com/wwwproducts/en/VSC8574
>>   - VSC8575: https://www.microchip.com/wwwproducts/en/VSC8575
>>
>> Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com>
>> ---
>>  drivers/net/phy/mscc/mscc_macsec.c | 1 -
>>  drivers/net/phy/mscc/mscc_ptp.c    | 2 ++
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
>> index 1d4c012194e9..72292bf6c51c 100644
>> --- a/drivers/net/phy/mscc/mscc_macsec.c
>> +++ b/drivers/net/phy/mscc/mscc_macsec.c
>> @@ -981,7 +981,6 @@ int vsc8584_macsec_init(struct phy_device *phydev)
>>
>>         switch (phydev->phy_id & phydev->drv->phy_id_mask) {
>>         case PHY_ID_VSC856X:
>> -       case PHY_ID_VSC8575:
>>         case PHY_ID_VSC8582:
>>         case PHY_ID_VSC8584:
>>                 INIT_LIST_HEAD(&vsc8531->macsec_flows);
>> diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c
>> index b97ee79f3cdf..f0537299c441 100644
>> --- a/drivers/net/phy/mscc/mscc_ptp.c
>> +++ b/drivers/net/phy/mscc/mscc_ptp.c
>> @@ -1510,6 +1510,8 @@ void vsc8584_config_ts_intr(struct phy_device *phydev)
>>  int vsc8584_ptp_init(struct phy_device *phydev)
>>  {
>>         switch (phydev->phy_id & phydev->drv->phy_id_mask) {
>> +       case PHY_ID_VSC8572:
>> +       case PHY_ID_VSC8574:
>>         case PHY_ID_VSC8575:
>>         case PHY_ID_VSC8582:
>>         case PHY_ID_VSC8584:
>> --
>> 2.29.2
>>

BR
Steen

---------------------------------------
Steen Hegelund
steen.hegelund@microchip.com
diff mbox series

Patch

diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c
index 1d4c012194e9..72292bf6c51c 100644
--- a/drivers/net/phy/mscc/mscc_macsec.c
+++ b/drivers/net/phy/mscc/mscc_macsec.c
@@ -981,7 +981,6 @@  int vsc8584_macsec_init(struct phy_device *phydev)

 	switch (phydev->phy_id & phydev->drv->phy_id_mask) {
 	case PHY_ID_VSC856X:
-	case PHY_ID_VSC8575:
 	case PHY_ID_VSC8582:
 	case PHY_ID_VSC8584:
 		INIT_LIST_HEAD(&vsc8531->macsec_flows);
diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c
index b97ee79f3cdf..f0537299c441 100644
--- a/drivers/net/phy/mscc/mscc_ptp.c
+++ b/drivers/net/phy/mscc/mscc_ptp.c
@@ -1510,6 +1510,8 @@  void vsc8584_config_ts_intr(struct phy_device *phydev)
 int vsc8584_ptp_init(struct phy_device *phydev)
 {
 	switch (phydev->phy_id & phydev->drv->phy_id_mask) {
+	case PHY_ID_VSC8572:
+	case PHY_ID_VSC8574:
 	case PHY_ID_VSC8575:
 	case PHY_ID_VSC8582:
 	case PHY_ID_VSC8584: