[PATCH 0/2][SRU][C][D][E]AX88772A USB to Ethernet dongle doesn't work

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/2][SRU][C][D][E]AX88772A USB to Ethernet dongle doesn't work

AceLan Kao
BugLink: https://bugs.launchpad.net/bugs/1834114

[Impact]
There are 2 asix drivers in the kernel, they are drivers/net/usb/asix
and drivers/net/phy/asix. It leads to the compilation race condition
that one overwrites the other asix.mod in .tmp_version directory.
This affects the USB dongle if the "phy" one wins.

T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 7 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=0b95 ProdID=7720 Rev=00.01
S: Manufacturer=ASIX Elec. Corp.
S: Product=AX88772A
S: SerialNumber=000527
C: #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr=250mA
I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=00 Driver=asix

[Fix]
The same name asix has been introduced since v4.18-rc1 by this commit
   31dd83b96641 net-next: phy: new Asix Electronics PHY driver
the new commit fix this issue by renaming it
   a9520543b123 net: phy: rename Asix Electronics PHY driver

[Test]
Verified on my own ASIX USB Ethernet dongle.

[Regression Potential]
Low, it only rename the module name, no code change.

AceLan Kao (1):
  UBUNTU: [Config] update configs and annotations for ASIX renamed

Michael Schmitz (1):
  net: phy: rename Asix Electronics PHY driver

 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 drivers/net/ethernet/8390/Kconfig         | 2 +-
 drivers/net/phy/Kconfig                   | 2 +-
 drivers/net/phy/Makefile                  | 2 +-
 drivers/net/phy/{asix.c => ax88796b.c}    | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/net/phy/{asix.c => ax88796b.c} (100%)

--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2][SRU][C][D][E] net: phy: rename Asix Electronics PHY driver

AceLan Kao
From: Michael Schmitz <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1834114

[Resent to net instead of net-next - may clash with Anders Roxell's patch
series addressing duplicate module names]

Commit 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
introduced a new PHY driver drivers/net/phy/asix.c that causes a module
name conflict with a pre-existiting driver (drivers/net/usb/asix.c).

The PHY driver is used by the X-Surf 100 ethernet card driver, and loaded
by that driver via its PHY ID. A rename of the driver looks unproblematic.

Rename PHY driver to ax88796b.c in order to resolve name conflict.

Signed-off-by: Michael Schmitz <[hidden email]>
Tested-by: Michael Schmitz <[hidden email]>
Fixes: 31dd83b96641 ("net-next: phy: new Asix Electronics PHY driver")
Reviewed-by: Andrew Lunn <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit a9520543b123bbd7275a0ab8d0375a5412683b41)
Signed-off-by: AceLan Kao <[hidden email]>
---
 drivers/net/ethernet/8390/Kconfig      | 2 +-
 drivers/net/phy/Kconfig                | 2 +-
 drivers/net/phy/Makefile               | 2 +-
 drivers/net/phy/{asix.c => ax88796b.c} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/net/phy/{asix.c => ax88796b.c} (100%)

diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index f2f0264c58ba..443b34e2725f 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -49,7 +49,7 @@ config XSURF100
  tristate "Amiga XSurf 100 AX88796/NE2000 clone support"
  depends on ZORRO
  select AX88796
- select ASIX_PHY
+ select AX88796B_PHY
  help
   This driver is for the Individual Computers X-Surf 100 Ethernet
   card (based on the Asix AX88796 chip). If you have such a card,
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 3d187cd50eb0..5f7c2af31a25 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -227,7 +227,7 @@ config AQUANTIA_PHY
  ---help---
   Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
 
-config ASIX_PHY
+config AX88796B_PHY
  tristate "Asix PHYs"
  help
   Currently supports the Asix Electronics PHY found in the X-Surf 100
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index 5805c0b7d60e..f21cda9d865e 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -46,7 +46,7 @@ obj-y += $(sfp-obj-y) $(sfp-obj-m)
 
 obj-$(CONFIG_AMD_PHY) += amd.o
 obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o
-obj-$(CONFIG_ASIX_PHY) += asix.o
+obj-$(CONFIG_AX88796B_PHY) += ax88796b.o
 obj-$(CONFIG_AT803X_PHY) += at803x.o
 obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
 obj-$(CONFIG_BCM7XXX_PHY) += bcm7xxx.o
diff --git a/drivers/net/phy/asix.c b/drivers/net/phy/ax88796b.c
similarity index 100%
rename from drivers/net/phy/asix.c
rename to drivers/net/phy/ax88796b.c
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2][SRU][D][E] UBUNTU: [Config] update configs and annotations for ASIX renamed

AceLan Kao
In reply to this post by AceLan Kao
BugLink: https://bugs.launchpad.net/bugs/1834114

Below commit rename the asix.ko module in net/phy to ax88796b.ko,
so update configs and annotations, too.
   net: phy: rename Asix Electronics PHY driver

Signed-off-by: AceLan Kao <[hidden email]>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 008ead6f697c..fcd170365f01 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5587,7 +5587,7 @@ CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
 CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df275aa4a69d..810d4fc3b18a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -719,7 +719,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
 CONFIG_ASHMEM=m
-CONFIG_ASIX_PHY=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_ASUS_LAPTOP=m
@@ -861,6 +860,7 @@ CONFIG_AUTO_ZRELADDR=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX88796=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AX88796_93CX6 is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2][SRU][C] UBUNTU: [Config] update configs and annotations for ASIX renamed

AceLan Kao
In reply to this post by AceLan Kao
BugLink: https://bugs.launchpad.net/bugs/1834114

Below commit rename the asix.ko module in net/phy to ax88796b.ko,
so update configs and annotations, too.
   net: phy: rename Asix Electronics PHY driver

Signed-off-by: AceLan Kao <[hidden email]>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 7e6b35a739b8..5a5276230836 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -5633,7 +5633,7 @@ CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
 CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1d1deec22291..8573d7253dc0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -692,7 +692,6 @@ CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
-CONFIG_ASIX_PHY=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_ASUS_LAPTOP=m
@@ -835,6 +834,7 @@ CONFIG_AUTO_ZRELADDR=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX88796=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AX88796_93CX6 is not set
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2][SRU][D][E] UBUNTU: [Config] update configs and annotations for ASIX renamed

Tyler Hicks-2
In reply to this post by AceLan Kao
On 2019-06-25 10:25:48, AceLan Kao wrote:

> BugLink: https://bugs.launchpad.net/bugs/1834114
>
> Below commit rename the asix.ko module in net/phy to ax88796b.ko,
> so update configs and annotations, too.
>    net: phy: rename Asix Electronics PHY driver
>
> Signed-off-by: AceLan Kao <[hidden email]>
> ---
>  debian.master/config/annotations          | 2 +-
>  debian.master/config/config.common.ubuntu | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

The changes that are here look good but I think you're missing required
changes in the corresponding debian.master/abi/*/*/*.modules files. I
think you need to add "ax88796b" to the files that already contain
"asix" so that the PHY module is also shipped.

Tyler

> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 008ead6f697c..fcd170365f01 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -5587,7 +5587,7 @@ CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
>  CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> -CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
>  CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index df275aa4a69d..810d4fc3b18a 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -719,7 +719,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
>  CONFIG_ARM_VIRT_EXT=y
>  CONFIG_AS3935=m
>  CONFIG_ASHMEM=m
> -CONFIG_ASIX_PHY=m
>  CONFIG_ASN1=y
>  CONFIG_ASSOCIATIVE_ARRAY=y
>  CONFIG_ASUS_LAPTOP=m
> @@ -861,6 +860,7 @@ CONFIG_AUTO_ZRELADDR=y
>  CONFIG_AX25=m
>  CONFIG_AX25_DAMA_SLAVE=y
>  CONFIG_AX88796=m
> +CONFIG_AX88796B_PHY=m
>  # CONFIG_AX88796_93CX6 is not set
>  CONFIG_AXP20X_ADC=m
>  CONFIG_AXP20X_POWER=m
> --
> 2.17.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

NACK: [PATCH 0/2][SRU][C][D][E]AX88772A USB to Ethernet dongle doesn't work

AceLan Kao
In reply to this post by AceLan Kao
Have to add ax88796b in debian.master/abi/*/*/*.modules files, will submit v2 soon.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2][SRU][D][E] UBUNTU: [Config] update configs and annotations for ASIX renamed

AceLan Kao
In reply to this post by Tyler Hicks-2
Thanks, I've submitted v2 adding that line in modules files.

Tyler Hicks <[hidden email]> 於 2019年6月25日 週二 上午11:59寫道:

>
> On 2019-06-25 10:25:48, AceLan Kao wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1834114
> >
> > Below commit rename the asix.ko module in net/phy to ax88796b.ko,
> > so update configs and annotations, too.
> >    net: phy: rename Asix Electronics PHY driver
> >
> > Signed-off-by: AceLan Kao <[hidden email]>
> > ---
> >  debian.master/config/annotations          | 2 +-
> >  debian.master/config/config.common.ubuntu | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
>
> The changes that are here look good but I think you're missing required
> changes in the corresponding debian.master/abi/*/*/*.modules files. I
> think you need to add "ax88796b" to the files that already contain
> "asix" so that the PHY module is also shipped.
>
> Tyler
>
> > diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> > index 008ead6f697c..fcd170365f01 100644
> > --- a/debian.master/config/annotations
> > +++ b/debian.master/config/annotations
> > @@ -5587,7 +5587,7 @@ CONFIG_LED_TRIGGER_PHY                          policy<{'amd64': 'y', 'arm64': '
> >  CONFIG_SFP                                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
> >  CONFIG_AMD_PHY                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> >  CONFIG_AQUANTIA_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> > -CONFIG_ASIX_PHY                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> > +CONFIG_AX88796B_PHY                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> >  CONFIG_AT803X_PHY                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> >  CONFIG_BCM7XXX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> >  CONFIG_BCM87XX_PHY                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> > index df275aa4a69d..810d4fc3b18a 100644
> > --- a/debian.master/config/config.common.ubuntu
> > +++ b/debian.master/config/config.common.ubuntu
> > @@ -719,7 +719,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
> >  CONFIG_ARM_VIRT_EXT=y
> >  CONFIG_AS3935=m
> >  CONFIG_ASHMEM=m
> > -CONFIG_ASIX_PHY=m
> >  CONFIG_ASN1=y
> >  CONFIG_ASSOCIATIVE_ARRAY=y
> >  CONFIG_ASUS_LAPTOP=m
> > @@ -861,6 +860,7 @@ CONFIG_AUTO_ZRELADDR=y
> >  CONFIG_AX25=m
> >  CONFIG_AX25_DAMA_SLAVE=y
> >  CONFIG_AX88796=m
> > +CONFIG_AX88796B_PHY=m
> >  # CONFIG_AX88796_93CX6 is not set
> >  CONFIG_AXP20X_ADC=m
> >  CONFIG_AXP20X_POWER=m
> > --
> > 2.17.1
> >
> >
> > --
> > kernel-team mailing list
> > [hidden email]
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team