* [PATCH v11 0/3] Add APNE PCMCIA 100 Mbit support
@ 2021-11-14 23:40 Michael Schmitz
2021-11-14 23:40 ` [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h Michael Schmitz
` (2 more replies)
0 siblings, 3 replies; 16+ messages in thread
From: Michael Schmitz @ 2021-11-14 23:40 UTC (permalink / raw)
To: linux-m68k, geert; +Cc: alex, netdev
The first patch enables the use of core PCMCIA code to parse
config table entries in Amiga drivers. The remaining two patches
add 16 bit IO support to the m68k low-level IO access code, and
add code to the APNE driver to autoprobe for 16 bit IO on cards
that support it (the 100 Mbit cards). The core PCMCIA config
table parser is utilized for this (may be built as a module;
must be selected manually for build in order to enable autoprobe).
Tested by Alex on a 100 Mbit card. Not yet tested on 10 Mbit
cards - if any of those also have the 16 bit IO feature set
in their config table, this patch series would break on those
cards.
Note that only patch 3 has been sent to netdev. Please CC
linux-m68k when providing comments.
v11 addresses review comments by Geert.
Cheers,
Michael
CC: netdev@vger.kernel.org
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-14 23:40 [PATCH v11 0/3] Add APNE PCMCIA 100 Mbit support Michael Schmitz @ 2021-11-14 23:40 ` Michael Schmitz 2021-11-15 9:59 ` Geert Uytterhoeven 2021-11-14 23:40 ` [PATCH v11 2/3] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz 2021-11-14 23:40 ` [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2 siblings, 1 reply; 16+ messages in thread From: Michael Schmitz @ 2021-11-14 23:40 UTC (permalink / raw) To: linux-m68k, geert; +Cc: alex, Michael Schmitz Add the interface definition for 16 bit card autoprobing (using the generic PCMCIA cftable entry parser) to amipcmcia.h for use by apne.c. Include necessary cftable definitions from cistpl.h, remove locally duplicate definitions from amipcmcia.h. Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> -- Changes from v10: Geert Uytterhoeven: - include <pcmcia/ds.h> instead of explict pcmcia_parse_tuple() prototype declaration Changes from v9: Geert Uytterhoeven: - declare declare pcmcia_parse_tuple() unconditionally Changes from v8: Geert Uytterhoeven: - just include pcmcia/cistpl.h; declare pcmcia_parse_tuple() only if core PCMCIA code is included Changes from v7: - add interface definitions only, move actual code to apne.c --- arch/m68k/include/asm/amipcmcia.h | 45 ++----------------------------- 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/arch/m68k/include/asm/amipcmcia.h b/arch/m68k/include/asm/amipcmcia.h index 6f1ec1887d82..fbc80b1d853e 100644 --- a/arch/m68k/include/asm/amipcmcia.h +++ b/arch/m68k/include/asm/amipcmcia.h @@ -13,6 +13,8 @@ #ifndef __AMIGA_PCMCIA_H__ #define __AMIGA_PCMCIA_H__ +#include <pcmcia/cistpl.h> +#include <pcmcia/ds.h> #include <asm/amigayle.h> /* prototypes */ @@ -64,47 +66,4 @@ static inline void pcmcia_disable_irq(void) #define PCMCIA_SPEED_250NS 250 #define PCMCIA_SPEED_720NS 720 -/* PCMCIA Tuple codes */ - -#define CISTPL_NULL 0x00 -#define CISTPL_DEVICE 0x01 -#define CISTPL_LONGLINK_CB 0x02 -#define CISTPL_CONFIG_CB 0x04 -#define CISTPL_CFTABLE_ENTRY_CB 0x05 -#define CISTPL_LONGLINK_MFC 0x06 -#define CISTPL_BAR 0x07 -#define CISTPL_CHECKSUM 0x10 -#define CISTPL_LONGLINK_A 0x11 -#define CISTPL_LONGLINK_C 0x12 -#define CISTPL_LINKTARGET 0x13 -#define CISTPL_NO_LINK 0x14 -#define CISTPL_VERS_1 0x15 -#define CISTPL_ALTSTR 0x16 -#define CISTPL_DEVICE_A 0x17 -#define CISTPL_JEDEC_C 0x18 -#define CISTPL_JEDEC_A 0x19 -#define CISTPL_CONFIG 0x1a -#define CISTPL_CFTABLE_ENTRY 0x1b -#define CISTPL_DEVICE_OC 0x1c -#define CISTPL_DEVICE_OA 0x1d -#define CISTPL_DEVICE_GEO 0x1e -#define CISTPL_DEVICE_GEO_A 0x1f -#define CISTPL_MANFID 0x20 -#define CISTPL_FUNCID 0x21 -#define CISTPL_FUNCE 0x22 -#define CISTPL_SWIL 0x23 -#define CISTPL_END 0xff - -/* FUNCID */ - -#define CISTPL_FUNCID_MULTI 0x00 -#define CISTPL_FUNCID_MEMORY 0x01 -#define CISTPL_FUNCID_SERIAL 0x02 -#define CISTPL_FUNCID_PARALLEL 0x03 -#define CISTPL_FUNCID_FIXED 0x04 -#define CISTPL_FUNCID_VIDEO 0x05 -#define CISTPL_FUNCID_NETWORK 0x06 -#define CISTPL_FUNCID_AIMS 0x07 -#define CISTPL_FUNCID_SCSI 0x08 - #endif -- 2.17.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-14 23:40 ` [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h Michael Schmitz @ 2021-11-15 9:59 ` Geert Uytterhoeven 2021-11-17 7:15 ` Michael Schmitz 0 siblings, 1 reply; 16+ messages in thread From: Geert Uytterhoeven @ 2021-11-15 9:59 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > Add the interface definition for 16 bit card autoprobing (using > the generic PCMCIA cftable entry parser) to amipcmcia.h for use > by apne.c. Include necessary cftable definitions from cistpl.h, > remove locally duplicate definitions from amipcmcia.h. > > Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-15 9:59 ` Geert Uytterhoeven @ 2021-11-17 7:15 ` Michael Schmitz 2021-11-17 14:35 ` Geert Uytterhoeven 0 siblings, 1 reply; 16+ messages in thread From: Michael Schmitz @ 2021-11-17 7:15 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, Denis Kirjanov Thanks Geert, On 15/11/21 22:59, Geert Uytterhoeven wrote: > On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: >> Add the interface definition for 16 bit card autoprobing (using >> the generic PCMCIA cftable entry parser) to amipcmcia.h for use >> by apne.c. Include necessary cftable definitions from cistpl.h, >> remove locally duplicate definitions from amipcmcia.h. >> >> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> I may have to give this another spin, in order to address a review comment by Denis about making the apne.c 16 bit IO autoprobe module parameter ('100mbit') a sysfs parameter. I suggest to move that parameter to arch/m68k/amiga/pcmcia.c to ensure it's always visible, and rename it to better reflect its actual function (pcmcia_16bit comes to mind). apne.c would then use that parameter to autoprobe 16 bit IO support, or set isa_type according to the parameter. Would that satisfy your concerns, Denis? 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 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-17 7:15 ` Michael Schmitz @ 2021-11-17 14:35 ` Geert Uytterhoeven 2021-11-18 4:58 ` Michael Schmitz 0 siblings, 1 reply; 16+ messages in thread From: Geert Uytterhoeven @ 2021-11-17 14:35 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, Denis Kirjanov Hi Michael, On Wed, Nov 17, 2021 at 8:15 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > On 15/11/21 22:59, Geert Uytterhoeven wrote: > > On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > >> Add the interface definition for 16 bit card autoprobing (using > >> the generic PCMCIA cftable entry parser) to amipcmcia.h for use > >> by apne.c. Include necessary cftable definitions from cistpl.h, > >> remove locally duplicate definitions from amipcmcia.h. > >> > >> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> > > > > Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> > > I may have to give this another spin, in order to address a review > comment by Denis about making the apne.c 16 bit IO autoprobe module > parameter ('100mbit') a sysfs parameter. > > I suggest to move that parameter to arch/m68k/amiga/pcmcia.c to ensure > it's always visible, and rename it to better reflect its actual function > (pcmcia_16bit comes to mind). apne.c would then use that parameter to > autoprobe 16 bit IO support, or set isa_type according to the parameter. > > Would that satisfy your concerns, Denis? What's the point of the sysfs parameter, given the driver cannot be unbound and rebound, as it does not use the driver model yet? The only thing you can (try to) do is unload and reload the module, at which point you can pass the module parameter again? 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-17 14:35 ` Geert Uytterhoeven @ 2021-11-18 4:58 ` Michael Schmitz 2021-11-18 8:09 ` Geert Uytterhoeven 0 siblings, 1 reply; 16+ messages in thread From: Michael Schmitz @ 2021-11-18 4:58 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, Denis Kirjanov Hi Geert, On 18/11/21 03:35, Geert Uytterhoeven wrote: > Hi Michael, > > On Wed, Nov 17, 2021 at 8:15 AM Michael Schmitz <schmitzmic@gmail.com> wrote: >> On 15/11/21 22:59, Geert Uytterhoeven wrote: >>> On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: >>>> Add the interface definition for 16 bit card autoprobing (using >>>> the generic PCMCIA cftable entry parser) to amipcmcia.h for use >>>> by apne.c. Include necessary cftable definitions from cistpl.h, >>>> remove locally duplicate definitions from amipcmcia.h. >>>> >>>> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> >>> >>> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> >> >> I may have to give this another spin, in order to address a review >> comment by Denis about making the apne.c 16 bit IO autoprobe module >> parameter ('100mbit') a sysfs parameter. >> >> I suggest to move that parameter to arch/m68k/amiga/pcmcia.c to ensure >> it's always visible, and rename it to better reflect its actual function >> (pcmcia_16bit comes to mind). apne.c would then use that parameter to >> autoprobe 16 bit IO support, or set isa_type according to the parameter. >> >> Would that satisfy your concerns, Denis? > > What's the point of the sysfs parameter, given the driver cannot be > unbound and rebound, as it does not use the driver model yet? Pre-setting the desired IO type before loading the module - though actual setting of isa_type still has to wait until module load (or driver probe). I'd have to write a callback that validates user input if we want to set isa_type directly in pcmcia.c ... > The only thing you can (try to) do is unload and reload the module, > at which point you can pass the module parameter again? I take that as 'don't do that', then ... ? 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 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-18 4:58 ` Michael Schmitz @ 2021-11-18 8:09 ` Geert Uytterhoeven 2021-11-18 19:42 ` Michael Schmitz 0 siblings, 1 reply; 16+ messages in thread From: Geert Uytterhoeven @ 2021-11-18 8:09 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, Denis Kirjanov Hi Michael, On Thu, Nov 18, 2021 at 5:58 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > On 18/11/21 03:35, Geert Uytterhoeven wrote: > > On Wed, Nov 17, 2021 at 8:15 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > >> On 15/11/21 22:59, Geert Uytterhoeven wrote: > >>> On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > >>>> Add the interface definition for 16 bit card autoprobing (using > >>>> the generic PCMCIA cftable entry parser) to amipcmcia.h for use > >>>> by apne.c. Include necessary cftable definitions from cistpl.h, > >>>> remove locally duplicate definitions from amipcmcia.h. > >>>> > >>>> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> > >>> > >>> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> > >> > >> I may have to give this another spin, in order to address a review > >> comment by Denis about making the apne.c 16 bit IO autoprobe module > >> parameter ('100mbit') a sysfs parameter. > >> > >> I suggest to move that parameter to arch/m68k/amiga/pcmcia.c to ensure > >> it's always visible, and rename it to better reflect its actual function > >> (pcmcia_16bit comes to mind). apne.c would then use that parameter to > >> autoprobe 16 bit IO support, or set isa_type according to the parameter. > >> > >> Would that satisfy your concerns, Denis? > > > > What's the point of the sysfs parameter, given the driver cannot be > > unbound and rebound, as it does not use the driver model yet? > > Pre-setting the desired IO type before loading the module - though > actual setting of isa_type still has to wait until module load (or > driver probe). I'd have to write a callback that validates user input if > we want to set isa_type directly in pcmcia.c ... IMHO the sysfs parameter would only make sense if all of the 8/16-bit handling (and the special reset) is done in arch/m68k/amiga/pcmcia.c, so it can be shared for multiple cards. > > The only thing you can (try to) do is unload and reload the module, > > at which point you can pass the module parameter again? > > I take that as 'don't do that', then ... ? I meant you can do the above without the sysfs parameter. 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h 2021-11-18 8:09 ` Geert Uytterhoeven @ 2021-11-18 19:42 ` Michael Schmitz 0 siblings, 0 replies; 16+ messages in thread From: Michael Schmitz @ 2021-11-18 19:42 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, Denis Kirjanov Hi Geert, On 18/11/21 21:09, Geert Uytterhoeven wrote: >>>> I suggest to move that parameter to arch/m68k/amiga/pcmcia.c to ensure >>>> it's always visible, and rename it to better reflect its actual function >>>> (pcmcia_16bit comes to mind). apne.c would then use that parameter to >>>> autoprobe 16 bit IO support, or set isa_type according to the parameter. >>>> >>>> Would that satisfy your concerns, Denis? >>> >>> What's the point of the sysfs parameter, given the driver cannot be >>> unbound and rebound, as it does not use the driver model yet? >> >> Pre-setting the desired IO type before loading the module - though >> actual setting of isa_type still has to wait until module load (or >> driver probe). I'd have to write a callback that validates user input if >> we want to set isa_type directly in pcmcia.c ... > > IMHO the sysfs parameter would only make sense if all of the 8/16-bit > handling (and the special reset) is done in arch/m68k/amiga/pcmcia.c, > so it can be shared for multiple cards. Do we even have any other cards/drivers that work with the Amiga PCMCIA port? >>> The only thing you can (try to) do is unload and reload the module, >>> at which point you can pass the module parameter again? >> >> I take that as 'don't do that', then ... ? > > I meant you can do the above without the sysfs parameter. I wasn't overly clear there - what I meant is, I take your comment to mean 'don't bother adding a sysfs parameter that does not add any extra functionality'. The module parameter will appear in sysfs and can be used to read out the 16 bit IO state anyway. 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 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v11 2/3] m68k: io_mm.h - add APNE 100 MBit support 2021-11-14 23:40 [PATCH v11 0/3] Add APNE PCMCIA 100 Mbit support Michael Schmitz 2021-11-14 23:40 ` [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h Michael Schmitz @ 2021-11-14 23:40 ` Michael Schmitz 2021-11-14 23:40 ` [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2 siblings, 0 replies; 16+ messages in thread From: Michael Schmitz @ 2021-11-14 23:40 UTC (permalink / raw) To: linux-m68k, geert; +Cc: alex, Michael Schmitz Add code to support 10 Mbit and 100 Mbit mode for APNE driver. A new ISA type ISA_TYPE_AG16 dynamically switches the Amiga ISA inb accessor to word access as required by the 100 Mbit cards. Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA 100 MBit card support" submitted to netdev 2018/09/16 by Alex Kazik <alex@kazik.de>. Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> -- Changes from v4: Geert Uytterhoeven: - drop CONFIG_APNE100MBIT ifdefs Changes from v3: Finn Thain: - revert isa_inb() define reordering - omit redundant #ifdef around ISA_TYPE_AG16 case labels Changes from v1: Andreas Schwab: - remove redundant fallthrough annotations Changes from RFC: Geert Uytterhoeven: - rename ISA_TYPE_AG100 to ISA_TYPE_AG16 (16 bit cards) - move ISA_TYPE_AG16 case inside #ifdef CONFIG_AMIGA_PCMCIA - change #if defined(CONFIG_APNE_100MBIT) to #ifdef - fix parentheses in isa_inb() define - omit comment about compiler optimization - add ISA_TYPE_AG16 case to isa_delay() --- arch/m68k/include/asm/io_mm.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index d41fa488453b..abb9e5ddb012 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -61,12 +61,10 @@ #define AG_ISA_IO_B(ioaddr) ( GAYLE_IO+(ioaddr)+(((ioaddr)&1)*GAYLE_ODD) ) #define AG_ISA_IO_W(ioaddr) ( GAYLE_IO+(ioaddr) ) -#ifndef MULTI_ISA -#define MULTI_ISA 0 -#else +#ifdef MULTI_ISA #undef MULTI_ISA -#define MULTI_ISA 1 #endif +#define MULTI_ISA 1 /* Need MULTI_ISA for 16 bit PCMCIA card support ! */ #endif /* AMIGA_PCMCIA */ #ifdef CONFIG_ATARI_ROM_ISA @@ -97,6 +95,8 @@ #define ISA_TYPE_Q40 (1) #define ISA_TYPE_AG (2) #define ISA_TYPE_ENEC (3) +#define ISA_TYPE_AG16 (4) /* for 100 MBit APNE card */ + #if defined(CONFIG_Q40) && !defined(MULTI_ISA) #define ISA_TYPE ISA_TYPE_Q40 @@ -132,6 +132,7 @@ static inline u8 __iomem *isa_itb(unsigned long addr) case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr); #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -148,6 +149,7 @@ static inline u16 __iomem *isa_itw(unsigned long addr) case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr); #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -161,6 +163,7 @@ static inline u32 __iomem *isa_itl(unsigned long addr) switch(ISA_TYPE) { #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr); #endif default: return 0; /* avoid warnings, just in case */ @@ -174,6 +177,7 @@ static inline u8 __iomem *isa_mtb(unsigned long addr) case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u8 __iomem *)addr; #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -190,6 +194,7 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr); #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: case ISA_TYPE_AG: return (u16 __iomem *)addr; #endif #ifdef CONFIG_ATARI_ROM_ISA @@ -200,7 +205,7 @@ static inline u16 __iomem *isa_mtw(unsigned long addr) } -#define isa_inb(port) in_8(isa_itb(port)) +#define isa_inb(port) ((ISA_TYPE == ISA_TYPE_AG16) ? ((port) & 1 ? isa_inw((port) - 1) & 0xff : isa_inw(port) >> 8) : in_8(isa_itb(port))) #define isa_inw(port) (ISA_SEX ? in_be16(isa_itw(port)) : in_le16(isa_itw(port))) #define isa_inl(port) (ISA_SEX ? in_be32(isa_itl(port)) : in_le32(isa_itl(port))) #define isa_outb(val,port) out_8(isa_itb(port),(val)) @@ -254,6 +259,7 @@ static inline void isa_delay(void) case ISA_TYPE_Q40: isa_outb(0,0x80); break; #endif #ifdef CONFIG_AMIGA_PCMCIA + case ISA_TYPE_AG16: break; case ISA_TYPE_AG: break; #endif #ifdef CONFIG_ATARI_ROM_ISA -- 2.17.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-14 23:40 [PATCH v11 0/3] Add APNE PCMCIA 100 Mbit support Michael Schmitz 2021-11-14 23:40 ` [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h Michael Schmitz 2021-11-14 23:40 ` [PATCH v11 2/3] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz @ 2021-11-14 23:40 ` Michael Schmitz 2021-11-17 14:42 ` Geert Uytterhoeven 2021-11-18 19:18 ` Joe Perches 2 siblings, 2 replies; 16+ messages in thread From: Michael Schmitz @ 2021-11-14 23:40 UTC (permalink / raw) To: linux-m68k, geert; +Cc: alex, Michael Schmitz, netdev Add module parameter, IO mode autoprobe 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. Use the core PCMCIA cftable parser to detect 16 bit cards, and automatically enable 16 bit ISA IO access for those cards by changing isa_type at runtime. The user must select PCCARD and PCMCIA in the kernel config to make the necessary support modules available Code to reset the PCMCIA hardware required for 16 bit cards is also added to the driver probe. An optional module parameter switches Amiga ISA IO accessors to 8 or 16 bit access in case autoprobe fails. Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA 100 MBit card support" submitted to netdev 2018/09/16 by Alex Kazik <alex@kazik.de>. CC: netdev@vger.kernel.org Link: https://lore.kernel.org/r/1622958877-2026-1-git-send-email-schmitzmic@gmail.com Tested-by: Alex Kazik <alex@kazik.de> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> -- Changes from v9: - avoid pcmcia_is_16bit() forward declaration Randy Dunlap: - do not select PCCARD and PCMCIA options when selecting APNE Changes from v8: Geert Uytterhoeven: - cistpl.h definitions now provided through amipcmcia.h - really change module parameter to (signed) int Changes from v7: - move 'select' for PCCARD and PCMCIA to 8390 Kconfig, so Amiga pcmcia.c may remain built-in while core PCMCIA code can be built as modules if APNE driver is a module. - move 16 bit mode autoprobe code from amiga/pcmcia.c to this driver, to allow the core PCMCIA code we depend on to be built as modules. - change module parameter type from bool to int to allow for tri-state semantics (autoprobe, 8 bit, 16 bit). Changes from v6: - use 16 bit mode autoprobe based on PCMCIA config table data Changes from v5: - move autoprobe code to new patch in this series Geert Uytterhoeven: - reword Kconfig help text Finn Thain: - style fixes, use msec_to_jiffies in timeout calc Alex Kazik: - revert module parameter permission change Changes from v4: Geert Uytterhoeven: - remove APNE100MBIT config option, always include 16 bit support - change module parameter permissions - try autoprobing for 16 bit mode early on in device probe Changes from v3: - change module parameter name to match Kconfig help Finn Thain: - fix coding style in new card reset code block - allow reset of isa_type by module parameter 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 | 8 ++++ drivers/net/ethernet/8390/apne.c | 67 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index a4130e643342..c4f519a385f3 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig @@ -144,6 +144,14 @@ config APNE To compile this driver as a module, choose M here: the module will be called apne. + The driver also supports 10/100Mbit cards (e.g. Netgear FA411, + CNet Singlepoint). To activate 100 Mbit support, use the kernel + option apne.100mbit=1 (builtin) at boot time, or the apne.100mbit + module parameter. The driver can attempt to autoprobe 100 Mbit + mode if the PCCARD and PCMCIA kernel configuration options are + selected, so this option may not be necessary. Use apne.100mbit=0 + should autoprobe mis-detect a 100 Mbit card. + config PCMCIA_PCNET tristate "NE2000 compatible PCMCIA support" depends on PCMCIA diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c index da1ae37a9d73..6642e2f304b3 100644 --- a/drivers/net/ethernet/8390/apne.c +++ b/drivers/net/ethernet/8390/apne.c @@ -119,6 +119,48 @@ 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)"); +static int apne_100_mbit = -1; +module_param_named(100_mbit, apne_100_mbit, int, 0444); +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); + +#if IS_ENABLED(CONFIG_PCMCIA) +static int pcmcia_is_16bit(void) +{ + u_char cftuple[258]; + int cftuple_len; + tuple_t cftable_tuple; + cistpl_cftable_entry_t cftable_entry; + + cftuple_len = pcmcia_copy_tuple(CISTPL_CFTABLE_ENTRY, cftuple, 256); + if (cftuple_len < 3) + return 0; +#ifdef DEBUG + else + print_hex_dump(KERN_WARNING, "cftable: ", DUMP_PREFIX_NONE, 8, + sizeof(char), cftuple, cftuple_len, false); +#endif + + /* build tuple_t struct and call pcmcia_parse_tuple */ + cftable_tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; + cftable_tuple.TupleCode = CISTPL_CFTABLE_ENTRY; + cftable_tuple.TupleData = &cftuple[2]; + cftable_tuple.TupleDataLen = cftuple_len - 2; + cftable_tuple.TupleDataMax = cftuple_len - 2; + + if (pcmcia_parse_tuple(&cftable_tuple, (cisparse_t *)&cftable_entry)) + return 0; + +#ifdef DEBUG + pr_info("IO flags: %x\n", cftable_entry.io.flags); +#endif + + if (cftable_entry.io.flags & CISTPL_IO_16BIT) + return 1; + + return 0; +} +#endif + static struct net_device * __init apne_probe(void) { struct net_device *dev; @@ -140,6 +182,13 @@ static struct net_device * __init apne_probe(void) pr_info("Looking for PCMCIA ethernet card : "); + if (apne_100_mbit == 1) + isa_type = ISA_TYPE_AG16; + else if (apne_100_mbit == 0) + isa_type = ISA_TYPE_AG; + else + pr_cont(" (autoprobing 16 bit mode) "); + /* check if a card is inserted */ if (!(PCMCIA_INSERTED)) { pr_cont("NO PCMCIA card inserted\n"); @@ -167,6 +216,14 @@ static struct net_device * __init apne_probe(void) pr_cont("ethernet PCMCIA card inserted\n"); +#if IS_ENABLED(CONFIG_PCMCIA) + if (apne_100_mbit < 0 && pcmcia_is_16bit()) { + pr_info("16-bit PCMCIA card detected!\n"); + isa_type = ISA_TYPE_AG16; + apne_100_mbit = 1; + } +#endif + if (!init_pcmcia()) { /* XXX: shouldn't we re-enable irq here? */ free_netdev(dev); @@ -583,6 +640,16 @@ static int init_pcmcia(void) #endif u_long offset; + /* reset card (idea taken from CardReset by Artur Pogoda) */ + if (isa_type == ISA_TYPE_AG16) { + u_char tmp = gayle.intreq; + + gayle.intreq = 0xff; + mdelay(1); + gayle.intreq = tmp; + mdelay(300); + } + pcmcia_reset(); pcmcia_program_voltage(PCMCIA_0V); pcmcia_access_speed(PCMCIA_SPEED_250NS); -- 2.17.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-14 23:40 ` [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz @ 2021-11-17 14:42 ` Geert Uytterhoeven 2021-11-18 4:58 ` Michael Schmitz 2021-11-18 19:18 ` Joe Perches 1 sibling, 1 reply; 16+ messages in thread From: Geert Uytterhoeven @ 2021-11-17 14:42 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Michael, On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > Add module parameter, IO mode autoprobe 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. > Use the core PCMCIA cftable parser to detect 16 bit cards, > and automatically enable 16 bit ISA IO access for those cards > by changing isa_type at runtime. The user must select PCCARD > and PCMCIA in the kernel config to make the necessary support > modules available > > Code to reset the PCMCIA hardware required for 16 bit cards is > also added to the driver probe. > > An optional module parameter switches Amiga ISA IO accessors > to 8 or 16 bit access in case autoprobe fails. > > Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA > 100 MBit card support" submitted to netdev 2018/09/16 by Alex > Kazik <alex@kazik.de>. > > CC: netdev@vger.kernel.org > Link: https://lore.kernel.org/r/1622958877-2026-1-git-send-email-schmitzmic@gmail.com > Tested-by: Alex Kazik <alex@kazik.de> > Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> Thanks for your patch! > --- a/drivers/net/ethernet/8390/apne.c > +++ b/drivers/net/ethernet/8390/apne.c > @@ -119,6 +119,48 @@ 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)"); > > +static int apne_100_mbit = -1; > +module_param_named(100_mbit, apne_100_mbit, int, 0444); > +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); > + > +#if IS_ENABLED(CONFIG_PCMCIA) What if CONFIG_PCMIA=m, and CONFIG_APNE=y? > +static int pcmcia_is_16bit(void) > +{ > + u_char cftuple[258]; > + int cftuple_len; > + tuple_t cftable_tuple; > + cistpl_cftable_entry_t cftable_entry; > + > + cftuple_len = pcmcia_copy_tuple(CISTPL_CFTABLE_ENTRY, cftuple, 256); > + if (cftuple_len < 3) > + return 0; > +#ifdef DEBUG > + else > + print_hex_dump(KERN_WARNING, "cftable: ", DUMP_PREFIX_NONE, 8, > + sizeof(char), cftuple, cftuple_len, false); > +#endif > + > + /* build tuple_t struct and call pcmcia_parse_tuple */ > + cftable_tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; > + cftable_tuple.TupleCode = CISTPL_CFTABLE_ENTRY; > + cftable_tuple.TupleData = &cftuple[2]; > + cftable_tuple.TupleDataLen = cftuple_len - 2; > + cftable_tuple.TupleDataMax = cftuple_len - 2; > + > + if (pcmcia_parse_tuple(&cftable_tuple, (cisparse_t *)&cftable_entry)) Can't you avoid the cast, by changing the type of cftable_entry? Perhaps you don't want to do that, to avoid abusing it below, but perhaps you can use container_of() instead of the cast? > + return 0; > + > +#ifdef DEBUG > + pr_info("IO flags: %x\n", cftable_entry.io.flags); > +#endif > + > + if (cftable_entry.io.flags & CISTPL_IO_16BIT) > + return 1; > + > + return 0; > +} > +#endif > + > static struct net_device * __init apne_probe(void) > { > struct net_device *dev; > @@ -140,6 +182,13 @@ static struct net_device * __init apne_probe(void) > > pr_info("Looking for PCMCIA ethernet card : "); > > + if (apne_100_mbit == 1) > + isa_type = ISA_TYPE_AG16; > + else if (apne_100_mbit == 0) > + isa_type = ISA_TYPE_AG; > + else > + pr_cont(" (autoprobing 16 bit mode) "); > + > /* check if a card is inserted */ > if (!(PCMCIA_INSERTED)) { > pr_cont("NO PCMCIA card inserted\n"); > @@ -167,6 +216,14 @@ static struct net_device * __init apne_probe(void) > > pr_cont("ethernet PCMCIA card inserted\n"); > > +#if IS_ENABLED(CONFIG_PCMCIA) > + if (apne_100_mbit < 0 && pcmcia_is_16bit()) { > + pr_info("16-bit PCMCIA card detected!\n"); > + isa_type = ISA_TYPE_AG16; > + apne_100_mbit = 1; > + } I think you should reset apne_100_mbit to zero if apne_100_mbit < 0 && !pcmcia_is_16bit(), so rmmod + switching card + modprobe has a chance to work. > +#endif > + > if (!init_pcmcia()) { > /* XXX: shouldn't we re-enable irq here? */ > free_netdev(dev); 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-17 14:42 ` Geert Uytterhoeven @ 2021-11-18 4:58 ` Michael Schmitz 2021-11-18 8:01 ` Geert Uytterhoeven 0 siblings, 1 reply; 16+ messages in thread From: Michael Schmitz @ 2021-11-18 4:58 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Geert, thanks for your review! On 18/11/21 03:42, Geert Uytterhoeven wrote: > Hi Michael, > > On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: >> Add module parameter, IO mode autoprobe 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. >> Use the core PCMCIA cftable parser to detect 16 bit cards, >> and automatically enable 16 bit ISA IO access for those cards >> by changing isa_type at runtime. The user must select PCCARD >> and PCMCIA in the kernel config to make the necessary support >> modules available >> >> Code to reset the PCMCIA hardware required for 16 bit cards is >> also added to the driver probe. >> >> An optional module parameter switches Amiga ISA IO accessors >> to 8 or 16 bit access in case autoprobe fails. >> >> Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA >> 100 MBit card support" submitted to netdev 2018/09/16 by Alex >> Kazik <alex@kazik.de>. >> >> CC: netdev@vger.kernel.org >> Link: https://lore.kernel.org/r/1622958877-2026-1-git-send-email-schmitzmic@gmail.com >> Tested-by: Alex Kazik <alex@kazik.de> >> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> > > Thanks for your patch! > >> --- a/drivers/net/ethernet/8390/apne.c >> +++ b/drivers/net/ethernet/8390/apne.c >> @@ -119,6 +119,48 @@ 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)"); >> >> +static int apne_100_mbit = -1; >> +module_param_named(100_mbit, apne_100_mbit, int, 0444); >> +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); >> + >> +#if IS_ENABLED(CONFIG_PCMCIA) > > What if CONFIG_PCMIA=m, and CONFIG_APNE=y? Fails to build (undefined reference to `pcmcia_parse_tuple'). That's what 'select PCMCIA' was avoiding before, but got vetoed. I can add a dependency on PCMCIA in the APNE Kconfig entry which does force APNE the same as what's selected for PCMCIA, but that means we can't build APNE without PCMCIA anymore. Is there a way to express 'constrain build type if PCMCIA is enabled, else leave choice to user' ?? > >> +static int pcmcia_is_16bit(void) >> +{ >> + u_char cftuple[258]; >> + int cftuple_len; >> + tuple_t cftable_tuple; >> + cistpl_cftable_entry_t cftable_entry; >> + >> + cftuple_len = pcmcia_copy_tuple(CISTPL_CFTABLE_ENTRY, cftuple, 256); >> + if (cftuple_len < 3) >> + return 0; >> +#ifdef DEBUG >> + else >> + print_hex_dump(KERN_WARNING, "cftable: ", DUMP_PREFIX_NONE, 8, >> + sizeof(char), cftuple, cftuple_len, false); >> +#endif >> + >> + /* build tuple_t struct and call pcmcia_parse_tuple */ >> + cftable_tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; >> + cftable_tuple.TupleCode = CISTPL_CFTABLE_ENTRY; >> + cftable_tuple.TupleData = &cftuple[2]; >> + cftable_tuple.TupleDataLen = cftuple_len - 2; >> + cftable_tuple.TupleDataMax = cftuple_len - 2; >> + >> + if (pcmcia_parse_tuple(&cftable_tuple, (cisparse_t *)&cftable_entry)) > > Can't you avoid the cast, by changing the type of cftable_entry? Sure, could declare cisparse_t cfparse above, and prepend cfparse. at all uses of cftable_entry below. > Perhaps you don't want to do that, to avoid abusing it below, but > perhaps you can use container_of() instead of the cast? Wasn't sure container_of() works with unions, but that seems to avoid the cast OK as well. > >> + return 0; >> + >> +#ifdef DEBUG >> + pr_info("IO flags: %x\n", cftable_entry.io.flags); >> +#endif >> + >> + if (cftable_entry.io.flags & CISTPL_IO_16BIT) >> + return 1; >> + >> + return 0; >> +} >> +#endif >> + >> static struct net_device * __init apne_probe(void) >> { >> struct net_device *dev; >> @@ -140,6 +182,13 @@ static struct net_device * __init apne_probe(void) >> >> pr_info("Looking for PCMCIA ethernet card : "); >> >> + if (apne_100_mbit == 1) >> + isa_type = ISA_TYPE_AG16; >> + else if (apne_100_mbit == 0) >> + isa_type = ISA_TYPE_AG; >> + else >> + pr_cont(" (autoprobing 16 bit mode) "); >> + >> /* check if a card is inserted */ >> if (!(PCMCIA_INSERTED)) { >> pr_cont("NO PCMCIA card inserted\n"); >> @@ -167,6 +216,14 @@ static struct net_device * __init apne_probe(void) >> >> pr_cont("ethernet PCMCIA card inserted\n"); >> >> +#if IS_ENABLED(CONFIG_PCMCIA) >> + if (apne_100_mbit < 0 && pcmcia_is_16bit()) { >> + pr_info("16-bit PCMCIA card detected!\n"); >> + isa_type = ISA_TYPE_AG16; >> + apne_100_mbit = 1; >> + } > > I think you should reset apne_100_mbit to zero if apne_100_mbit < 0 > && !pcmcia_is_16bit(), so rmmod + switching card + modprobe > has a chance to work. Good catch - though when switching to another card using this same driver, the module parameter can be used again to select IO mode or force autoprobe. I'll wait for your response about the sysfs parameter issue before sending out v12. Cheers, Michael > >> +#endif >> + >> if (!init_pcmcia()) { >> /* XXX: shouldn't we re-enable irq here? */ >> free_netdev(dev); > > > 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 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-18 4:58 ` Michael Schmitz @ 2021-11-18 8:01 ` Geert Uytterhoeven 2021-11-18 19:09 ` Michael Schmitz 0 siblings, 1 reply; 16+ messages in thread From: Geert Uytterhoeven @ 2021-11-18 8:01 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Michael, On Thu, Nov 18, 2021 at 5:58 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > On 18/11/21 03:42, Geert Uytterhoeven wrote: > > On Mon, Nov 15, 2021 at 12:40 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > >> Add module parameter, IO mode autoprobe 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. > >> Use the core PCMCIA cftable parser to detect 16 bit cards, > >> and automatically enable 16 bit ISA IO access for those cards > >> by changing isa_type at runtime. The user must select PCCARD > >> and PCMCIA in the kernel config to make the necessary support > >> modules available > >> > >> Code to reset the PCMCIA hardware required for 16 bit cards is > >> also added to the driver probe. > >> > >> An optional module parameter switches Amiga ISA IO accessors > >> to 8 or 16 bit access in case autoprobe fails. > >> > >> Patch modified after patch "[PATCH RFC net-next] Amiga PCMCIA > >> 100 MBit card support" submitted to netdev 2018/09/16 by Alex > >> Kazik <alex@kazik.de>. > >> > >> CC: netdev@vger.kernel.org > >> Link: https://lore.kernel.org/r/1622958877-2026-1-git-send-email-schmitzmic@gmail.com > >> Tested-by: Alex Kazik <alex@kazik.de> > >> Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> > >> --- a/drivers/net/ethernet/8390/apne.c > >> +++ b/drivers/net/ethernet/8390/apne.c > >> @@ -119,6 +119,48 @@ 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)"); > >> > >> +static int apne_100_mbit = -1; > >> +module_param_named(100_mbit, apne_100_mbit, int, 0444); > >> +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); > >> + > >> +#if IS_ENABLED(CONFIG_PCMCIA) > > > > What if CONFIG_PCMIA=m, and CONFIG_APNE=y? > > Fails to build (undefined reference to `pcmcia_parse_tuple'). > > That's what 'select PCMCIA' was avoiding before, but got vetoed. I can > add a dependency on PCMCIA in the APNE Kconfig entry which does force > APNE the same as what's selected for PCMCIA, but that means we can't > build APNE without PCMCIA anymore. Is there a way to express 'constrain > build type if PCMCIA is enabled, else leave choice to user' ?? #if IS_REACHABLE(CONFIG_PCMIA) > >> @@ -140,6 +182,13 @@ static struct net_device * __init apne_probe(void) > >> > >> pr_info("Looking for PCMCIA ethernet card : "); > >> > >> + if (apne_100_mbit == 1) > >> + isa_type = ISA_TYPE_AG16; > >> + else if (apne_100_mbit == 0) > >> + isa_type = ISA_TYPE_AG; > >> + else > >> + pr_cont(" (autoprobing 16 bit mode) "); > >> + > >> /* check if a card is inserted */ > >> if (!(PCMCIA_INSERTED)) { > >> pr_cont("NO PCMCIA card inserted\n"); > >> @@ -167,6 +216,14 @@ static struct net_device * __init apne_probe(void) > >> > >> pr_cont("ethernet PCMCIA card inserted\n"); > >> > >> +#if IS_ENABLED(CONFIG_PCMCIA) > >> + if (apne_100_mbit < 0 && pcmcia_is_16bit()) { > >> + pr_info("16-bit PCMCIA card detected!\n"); > >> + isa_type = ISA_TYPE_AG16; > >> + apne_100_mbit = 1; > >> + } > > > > I think you should reset apne_100_mbit to zero if apne_100_mbit < 0 > > && !pcmcia_is_16bit(), so rmmod + switching card + modprobe > > has a chance to work. > > Good catch - though when switching to another card using this same > driver, the module parameter can be used again to select IO mode or > force autoprobe. The autoprobe won't work if the new card is 8-bit. 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 ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-18 8:01 ` Geert Uytterhoeven @ 2021-11-18 19:09 ` Michael Schmitz 0 siblings, 0 replies; 16+ messages in thread From: Michael Schmitz @ 2021-11-18 19:09 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Geert, On 18/11/21 21:01, Geert Uytterhoeven wrote: >>>> --- a/drivers/net/ethernet/8390/apne.c >>>> +++ b/drivers/net/ethernet/8390/apne.c >>>> @@ -119,6 +119,48 @@ 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)"); >>>> >>>> +static int apne_100_mbit = -1; >>>> +module_param_named(100_mbit, apne_100_mbit, int, 0444); >>>> +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); >>>> + >>>> +#if IS_ENABLED(CONFIG_PCMCIA) >>> >>> What if CONFIG_PCMIA=m, and CONFIG_APNE=y? >> >> Fails to build (undefined reference to `pcmcia_parse_tuple'). >> >> That's what 'select PCMCIA' was avoiding before, but got vetoed. I can >> add a dependency on PCMCIA in the APNE Kconfig entry which does force >> APNE the same as what's selected for PCMCIA, but that means we can't >> build APNE without PCMCIA anymore. Is there a way to express 'constrain >> build type if PCMCIA is enabled, else leave choice to user' ?? > > #if IS_REACHABLE(CONFIG_PCMIA) Thanks, I'll use that then. >>>> @@ -140,6 +182,13 @@ static struct net_device * __init apne_probe(void) >>>> >>>> pr_info("Looking for PCMCIA ethernet card : "); >>>> >>>> + if (apne_100_mbit == 1) >>>> + isa_type = ISA_TYPE_AG16; >>>> + else if (apne_100_mbit == 0) >>>> + isa_type = ISA_TYPE_AG; >>>> + else >>>> + pr_cont(" (autoprobing 16 bit mode) "); >>>> + >>>> /* check if a card is inserted */ >>>> if (!(PCMCIA_INSERTED)) { >>>> pr_cont("NO PCMCIA card inserted\n"); >>>> @@ -167,6 +216,14 @@ static struct net_device * __init apne_probe(void) >>>> >>>> pr_cont("ethernet PCMCIA card inserted\n"); >>>> >>>> +#if IS_ENABLED(CONFIG_PCMCIA) >>>> + if (apne_100_mbit < 0 && pcmcia_is_16bit()) { >>>> + pr_info("16-bit PCMCIA card detected!\n"); >>>> + isa_type = ISA_TYPE_AG16; >>>> + apne_100_mbit = 1; >>>> + } >>> >>> I think you should reset apne_100_mbit to zero if apne_100_mbit < 0 >>> && !pcmcia_is_16bit(), so rmmod + switching card + modprobe >>> has a chance to work. >> >> Good catch - though when switching to another card using this same >> driver, the module parameter can be used again to select IO mode or >> force autoprobe. > > The autoprobe won't work if the new card is 8-bit. I see now - adding code to set isa_type to 8 bit if the autoprobe fails, and reset isa_type and apne_100_mbit to defaults in module exit and the probe error return path ... 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 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-14 23:40 ` [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2021-11-17 14:42 ` Geert Uytterhoeven @ 2021-11-18 19:18 ` Joe Perches 2021-11-18 19:35 ` Michael Schmitz 1 sibling, 1 reply; 16+ messages in thread From: Joe Perches @ 2021-11-18 19:18 UTC (permalink / raw) To: Michael Schmitz, linux-m68k, geert; +Cc: alex, netdev On Mon, 2021-11-15 at 12:40 +1300, Michael Schmitz wrote: > Add module parameter, IO mode autoprobe and PCMCIA reset code > required to support 100 Mbit PCMCIA ethernet cards on Amiga. [] > diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c [] > @@ -119,6 +119,48 @@ static u32 apne_msg_enable; [] > + cftuple_len = pcmcia_copy_tuple(CISTPL_CFTABLE_ENTRY, cftuple, 256); > + if (cftuple_len < 3) > + return 0; > +#ifdef DEBUG > + else > + print_hex_dump(KERN_WARNING, "cftable: ", DUMP_PREFIX_NONE, 8, > + sizeof(char), cftuple, cftuple_len, false); > +#endif Why KERN_WARNING and why not use print_hex_dump_debug without the #ifdef [] > +#ifdef DEBUG > + pr_info("IO flags: %x\n", cftable_entry.io.flags); pr_debug ? ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-11-18 19:18 ` Joe Perches @ 2021-11-18 19:35 ` Michael Schmitz 0 siblings, 0 replies; 16+ messages in thread From: Michael Schmitz @ 2021-11-18 19:35 UTC (permalink / raw) To: Joe Perches, linux-m68k, geert; +Cc: alex, netdev Hi Joe, thanks for your review! On 19/11/21 08:18, Joe Perches wrote: > On Mon, 2021-11-15 at 12:40 +1300, Michael Schmitz wrote: >> Add module parameter, IO mode autoprobe and PCMCIA reset code >> required to support 100 Mbit PCMCIA ethernet cards on Amiga. > [] >> diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c > [] >> @@ -119,6 +119,48 @@ static u32 apne_msg_enable; > [] >> + cftuple_len = pcmcia_copy_tuple(CISTPL_CFTABLE_ENTRY, cftuple, 256); >> + if (cftuple_len < 3) >> + return 0; >> +#ifdef DEBUG >> + else >> + print_hex_dump(KERN_WARNING, "cftable: ", DUMP_PREFIX_NONE, 8, >> + sizeof(char), cftuple, cftuple_len, false); >> +#endif > > Why KERN_WARNING and why not use print_hex_dump_debug without the #ifdef No particular reason - head still stuck in the '90 perhaps. > [] >> +#ifdef DEBUG >> + pr_info("IO flags: %x\n", cftable_entry.io.flags); > > pr_debug ? Both changed now, thanks! Regards, Michael Schmitz > ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2021-11-18 19:43 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-11-14 23:40 [PATCH v11 0/3] Add APNE PCMCIA 100 Mbit support Michael Schmitz 2021-11-14 23:40 ` [PATCH v11 1/3] m68k: amiga/pcmcia - add 16 bit detection interface to amipcmcia.h Michael Schmitz 2021-11-15 9:59 ` Geert Uytterhoeven 2021-11-17 7:15 ` Michael Schmitz 2021-11-17 14:35 ` Geert Uytterhoeven 2021-11-18 4:58 ` Michael Schmitz 2021-11-18 8:09 ` Geert Uytterhoeven 2021-11-18 19:42 ` Michael Schmitz 2021-11-14 23:40 ` [PATCH v11 2/3] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz 2021-11-14 23:40 ` [PATCH net v11 3/3] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2021-11-17 14:42 ` Geert Uytterhoeven 2021-11-18 4:58 ` Michael Schmitz 2021-11-18 8:01 ` Geert Uytterhoeven 2021-11-18 19:09 ` Michael Schmitz 2021-11-18 19:18 ` Joe Perches 2021-11-18 19:35 ` Michael Schmitz
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.