From: Michael Schmitz <schmitzmic@gmail.com> Date: 2021-06-17 05:28:57
Add Kconfig option, module parameter and PCMCIA reset code
required to support 100 Mbit PCMCIA ethernet cards on Amiga.
10 Mbit and 100 Mbit mode are supported by the same module.
A module parameter switches Amiga ISA IO accessors to word
access by changing isa_type at runtime. Additional code to
reset the PCMCIA hardware is also added to the driver probe.
Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA
100 MBit card support" submitted to netdev 2018/09/16 by Alex
Kazik [off-list ref].
CC: netdev@vger.kernel.org
Tested-by: Alex Kazik <redacted>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
--
Changes from v1:
- fix module parameter name in Kconfig help text
Alex Kazik:
- change module parameter type to bool, fix module parameter
permission
Changes from RFC:
Geert Uytterhoeven:
- change APNE_100MBIT to depend on APNE
- change '---help---' to 'help' (former no longer supported)
- fix whitespace errors
- fix module_param_named() arg count
- protect all added code by #ifdef CONFIG_APNE_100MBIT
---
drivers/net/ethernet/8390/Kconfig | 12 ++++++++++++
drivers/net/ethernet/8390/apne.c | 21 +++++++++++++++++++++
2 files changed, 33 insertions(+)
@@ -120,6 +120,12 @@ static u32 apne_msg_enable;module_param_named(msg_enable,apne_msg_enable,uint,0444);MODULE_PARM_DESC(msg_enable,"Debug message level (see linux/netdevice.h for bitmap)");+#ifdef CONFIG_APNE100MBIT+staticboolapne_100_mbit;+module_param_named(apne_100_mbit_msg,apne_100_mbit,bool,0444);+MODULE_PARM_DESC(apne_100_mbit_msg,"Enable 100 Mbit support");+#endif+structnet_device*__initapne_probe(intunit){structnet_device*dev;
@@ -139,6 +145,11 @@ struct net_device * __init apne_probe(int unit)if(!(AMIGAHW_PRESENT(PCMCIA)))returnERR_PTR(-ENODEV);+#ifdef CONFIG_APNE100MBIT+if(apne_100_mbit)+isa_type=ISA_TYPE_AG16;+#endif+pr_info("Looking for PCMCIA ethernet card : ");/* check if a card is inserted */
@@ -590,6 +601,16 @@ static int init_pcmcia(void)#endifu_longoffset;+#ifdef CONFIG_APNE100MBIT+/* reset card (idea taken from CardReset by Artur Pogoda) */+{+u_chartmp=gayle.intreq;++gayle.intreq=0xff;mdelay(1);+gayle.intreq=tmp;mdelay(300);+}+#endif+pcmcia_reset();pcmcia_program_voltage(PCMCIA_0V);pcmcia_access_speed(PCMCIA_SPEED_250NS);
From: Finn Thain <fthain@linux-m68k.org> Date: 2021-06-17 06:51:48
On Thu, 17 Jun 2021, Michael Schmitz wrote:
quoted hunk
Add Kconfig option, module parameter and PCMCIA reset code
required to support 100 Mbit PCMCIA ethernet cards on Amiga.
10 Mbit and 100 Mbit mode are supported by the same module.
A module parameter switches Amiga ISA IO accessors to word
access by changing isa_type at runtime. Additional code to
reset the PCMCIA hardware is also added to the driver probe.
Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA
100 MBit card support" submitted to netdev 2018/09/16 by Alex
Kazik [off-list ref].
CC: netdev@vger.kernel.org
Tested-by: Alex Kazik <redacted>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
--
Changes from v1:
- fix module parameter name in Kconfig help text
Alex Kazik:
- change module parameter type to bool, fix module parameter
permission
Changes from RFC:
Geert Uytterhoeven:
- change APNE_100MBIT to depend on APNE
- change '---help---' to 'help' (former no longer supported)
- fix whitespace errors
- fix module_param_named() arg count
- protect all added code by #ifdef CONFIG_APNE_100MBIT
---
drivers/net/ethernet/8390/Kconfig | 12 ++++++++++++
drivers/net/ethernet/8390/apne.c | 21 +++++++++++++++++++++
2 files changed, 33 insertions(+)
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
quoted hunk
pr_info("Looking for PCMCIA ethernet card : ");
/* check if a card is inserted */
@@ -590,6 +601,16 @@ static int init_pcmcia(void) #endif u_long offset;+#ifdef CONFIG_APNE100MBIT+ /* reset card (idea taken from CardReset by Artur Pogoda) */+ {+ u_char tmp = gayle.intreq;++ gayle.intreq = 0xff; mdelay(1);+ gayle.intreq = tmp; mdelay(300);+ }+#endif+
The indentation/alignment here doesn't conform to the kernel coding style.
From: Michael Schmitz <schmitzmic@gmail.com> Date: 2021-06-17 19:33:45
Hi Finn,
thanks for your review!
On 17/06/21 6:51 pm, Finn Thain wrote:
On Thu, 17 Jun 2021, Michael Schmitz wrote:
quoted
Add Kconfig option, module parameter and PCMCIA reset code
required to support 100 Mbit PCMCIA ethernet cards on Amiga.
10 Mbit and 100 Mbit mode are supported by the same module.
A module parameter switches Amiga ISA IO accessors to word
access by changing isa_type at runtime. Additional code to
reset the PCMCIA hardware is also added to the driver probe.
Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA
100 MBit card support" submitted to netdev 2018/09/16 by Alex
Kazik [off-list ref].
CC: netdev@vger.kernel.org
Tested-by: Alex Kazik <redacted>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
--
Changes from v1:
- fix module parameter name in Kconfig help text
Alex Kazik:
- change module parameter type to bool, fix module parameter
permission
Changes from RFC:
Geert Uytterhoeven:
- change APNE_100MBIT to depend on APNE
- change '---help---' to 'help' (former no longer supported)
- fix whitespace errors
- fix module_param_named() arg count
- protect all added code by #ifdef CONFIG_APNE_100MBIT
---
drivers/net/ethernet/8390/Kconfig | 12 ++++++++++++
drivers/net/ethernet/8390/apne.c | 21 +++++++++++++++++++++
2 files changed, 33 insertions(+)
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
Good catch! I am uncertain though as to whether replacing a 100 Mbit
card by a 10 Mbit one at run time is a common use case (or even
possible, given constraints of the Amiga PCMCIA interface?), but it
ought to work even if rarely used.
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
quoted
pr_info("Looking for PCMCIA ethernet card : ");
/* check if a card is inserted */
@@ -590,6 +601,16 @@ static int init_pcmcia(void) #endif u_long offset;+#ifdef CONFIG_APNE100MBIT+ /* reset card (idea taken from CardReset by Artur Pogoda) */+ {+ u_char tmp = gayle.intreq;++ gayle.intreq = 0xff; mdelay(1);+ gayle.intreq = tmp; mdelay(300);+ }+#endif+
The indentation/alignment here doesn't conform to the kernel coding style.
Good one. Checkpatch missed that for some reason...
I'll respin ...
Cheers,
Michael
Hi Michael,
On Thu, Jun 17, 2021 at 9:33 PM Michael Schmitz [off-list ref] wrote:
On 17/06/21 6:51 pm, Finn Thain wrote:
quoted
On Thu, 17 Jun 2021, Michael Schmitz wrote:
quoted
Add Kconfig option, module parameter and PCMCIA reset code
required to support 100 Mbit PCMCIA ethernet cards on Amiga.
10 Mbit and 100 Mbit mode are supported by the same module.
A module parameter switches Amiga ISA IO accessors to word
access by changing isa_type at runtime. Additional code to
reset the PCMCIA hardware is also added to the driver probe.
Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA
100 MBit card support" submitted to netdev 2018/09/16 by Alex
Kazik [off-list ref].
CC: netdev@vger.kernel.org
Tested-by: Alex Kazik <redacted>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
Good catch! I am uncertain though as to whether replacing a 100 Mbit
card by a 10 Mbit one at run time is a common use case (or even
possible, given constraints of the Amiga PCMCIA interface?), but it
ought to work even if rarely used.
Given it's PCMCIA, I guess that's a possibility.
Furthermore, always setting isa_type means the user can recover from
a mistake by unloading the module, and modprobe'ing again with the
correct parameter.
For the builtin-case, that needs a s/0444/0644/ change, though.
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
Indeed.
Still, can we autodetect in the driver?
I'm wondering how this is handled on PCs with PCMCIA, or if there
really is something special about Amiga PCMCIA hardware...
And I'd really like to get rid of the CONFIG_APNE100MBIT option,
i.e. always include the support, if possible.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
Good catch! I am uncertain though as to whether replacing a 100 Mbit
card by a 10 Mbit one at run time is a common use case (or even
possible, given constraints of the Amiga PCMCIA interface?), but it
ought to work even if rarely used.
Given it's PCMCIA, I guess that's a possibility.
Furthermore, always setting isa_type means the user can recover from
a mistake by unloading the module, and modprobe'ing again with the
correct parameter.
For the builtin-case, that needs a s/0444/0644/ change, though.
How does re-probing after a card change for a builtin driver work?
Changing the permission bits is a minor issue.
quoted
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
Indeed.
The only downside I can see is that setting isa_type needs to be done
ahead of modprobe, through sysfs. That might be a little error prone.
Still, can we autodetect in the driver?
Guess we'll have to find out how the 16 bit cards behave if first poked
in 8 bit mode, attempting to force a reset of the 8390 chip, and
switching to 16 bit mode if this fails. That's normally done in
apne_probe1() which runs after init_pcmcia(), so we can't rely on the
result of a 8390 reset autoprobe to do the PCMCIA software reset there.
The 8390 reset part does not rely on anything else in apne_probe1(), so
that code can be lifted out of apne_probe1() and run early in
apne_probe() (after the check for an inserted PCMCIA card). I'll try and
prepare a patch for Alex to test that method.
I'm wondering how this is handled on PCs with PCMCIA, or if there
really is something special about Amiga PCMCIA hardware...
What's special about Amiga PCMCIA hardware is that the card reset isn't
connected for those 16 bit cards, so pcmcia_reset() does not work.
Whether the software reset workaround hurts for 8 bit cards is something
I don't know and cannot test. But
And I'd really like to get rid of the CONFIG_APNE100MBIT option,
i.e. always include the support, if possible.
I can't see why that wouldn't be possible - the only downside is that we
force MULTI_ISA=1 always for Amiga, and lose the optimizations done for
MUTLI_ISA=0 in io_mm.h. Unless we autoprobe, we can use isa_type to
guard against running a software reset on 8 bit cards ...
Cheers,
Michael
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
I think isa_type has to be assigned unconditionally otherwise it can't be
reset for 10 mbit cards. Therefore, the AMIGAHW_PRESENT(PCMCIA) logic in
arch/m68k/kernel/setup_mm.c probably should move here.
Good catch! I am uncertain though as to whether replacing a 100 Mbit
card by a 10 Mbit one at run time is a common use case (or even
possible, given constraints of the Amiga PCMCIA interface?), but it
ought to work even if rarely used.
Given it's PCMCIA, I guess that's a possibility.
Furthermore, always setting isa_type means the user can recover from
a mistake by unloading the module, and modprobe'ing again with the
correct parameter.
For the builtin-case, that needs a s/0444/0644/ change, though.
How does re-probing after a card change for a builtin driver work?
Changing the permission bits is a minor issue.
Oh right, this driver predates the driver framework, and doesn't support
PCMCIA hotplug. So auto-unregister on removal doesn't work.
Even using unbind/bind in sysfs won't work.
So rmmod/modprobe is the only thing that has a chance to work...
quoted
quoted
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
Indeed.
The only downside I can see is that setting isa_type needs to be done
ahead of modprobe, through sysfs. That might be a little error prone.
quoted
Still, can we autodetect in the driver?
Guess we'll have to find out how the 16 bit cards behave if first poked
in 8 bit mode, attempting to force a reset of the 8390 chip, and
switching to 16 bit mode if this fails. That's normally done in
apne_probe1() which runs after init_pcmcia(), so we can't rely on the
result of a 8390 reset autoprobe to do the PCMCIA software reset there.
The 8390 reset part does not rely on anything else in apne_probe1(), so
that code can be lifted out of apne_probe1() and run early in
apne_probe() (after the check for an inserted PCMCIA card). I'll try and
prepare a patch for Alex to test that method.
quoted
I'm wondering how this is handled on PCs with PCMCIA, or if there
really is something special about Amiga PCMCIA hardware...
What's special about Amiga PCMCIA hardware is that the card reset isn't
connected for those 16 bit cards, so pcmcia_reset() does not work.
I was mostly thinking about the difference between 8-bit and 16-bit
accesses.
Whether the software reset workaround hurts for 8 bit cards is something
I don't know and cannot test. But
quoted
And I'd really like to get rid of the CONFIG_APNE100MBIT option,
i.e. always include the support, if possible.
I can't see why that wouldn't be possible - the only downside is that we
force MULTI_ISA=1 always for Amiga, and lose the optimizations done for
MUTLI_ISA=0 in io_mm.h. Unless we autoprobe, we can use isa_type to
guard against running a software reset on 8 bit cards ...
The latter sounds like a neat trick...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
From: Michael Schmitz <schmitzmic@gmail.com> Date: 2021-06-18 08:28:50
Hi Geert,
Am 18.06.2021 um 20:13 schrieb Geert Uytterhoeven:
quoted
How does re-probing after a card change for a builtin driver work?
Changing the permission bits is a minor issue.
Oh right, this driver predates the driver framework, and doesn't support
PCMCIA hotplug. So auto-unregister on removal doesn't work.
Even using unbind/bind in sysfs won't work.
So rmmod/modprobe is the only thing that has a chance to work...
quoted
quoted
quoted
The comment there says isa_type must be set as early as possible, so I'd
rather leave that alone, and add an 'else' clause here.
This of course raise the question whether we ought to move the entire
isa_type handling into arch code instead - make it a generic
amiga_pcmcia_16bit option settable via sysfs. There may be other 16 bit
cards that require the same treatment, and duplicating PCMCIA mode
switching all over the place could be avoided. Opinions?
Indeed.
The only downside I can see is that setting isa_type needs to be done
ahead of modprobe, through sysfs. That might be a little error prone.
quoted
Still, can we autodetect in the driver?
Guess we'll have to find out how the 16 bit cards behave if first poked
in 8 bit mode, attempting to force a reset of the 8390 chip, and
switching to 16 bit mode if this fails. That's normally done in
apne_probe1() which runs after init_pcmcia(), so we can't rely on the
result of a 8390 reset autoprobe to do the PCMCIA software reset there.
The 8390 reset part does not rely on anything else in apne_probe1(), so
that code can be lifted out of apne_probe1() and run early in
apne_probe() (after the check for an inserted PCMCIA card). I'll try and
prepare a patch for Alex to test that method.
I just realized that might not work - ínit_pcmcia() enables the PCMCIA
interface for us, so the early 8390 reset may not go through at all...
The module parameter may have to stay as a fallback option at least.
quoted
quoted
I'm wondering how this is handled on PCs with PCMCIA, or if there
really is something special about Amiga PCMCIA hardware...
What's special about Amiga PCMCIA hardware is that the card reset isn't
connected for those 16 bit cards, so pcmcia_reset() does not work.
I was mostly thinking about the difference between 8-bit and 16-bit
accesses.
No idea. I've never even seen an 8 bit PCMCIA card - I have a few old
16/32 bit ones around that were great for crashing my PowerBook, nothing
else...
quoted
quoted
And I'd really like to get rid of the CONFIG_APNE100MBIT option,
i.e. always include the support, if possible.
I can't see why that wouldn't be possible - the only downside is that we
force MULTI_ISA=1 always for Amiga, and lose the optimizations done for
MUTLI_ISA=0 in io_mm.h. Unless we autoprobe, we can use isa_type to
guard against running a software reset on 8 bit cards ...
The latter sounds like a neat trick...
Yes, we can at least get rid of the APNE100MBIT option that way. I'll
have to think about the autoprobe a bit more.
Cheers,
Michael