* [PATCH v5 0/2] Add APNE PCMCIA 100 Mbit support @ 2021-06-19 0:34 Michael Schmitz 2021-06-19 0:34 ` [PATCH v5 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz 2021-06-19 0:34 ` [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 0 siblings, 2 replies; 9+ messages in thread From: Michael Schmitz @ 2021-06-19 0:34 UTC (permalink / raw) To: linux-m68k, geert; +Cc: alex Add another ISA type for these cards, and try to autoprobe for that type early in the device probe. As a fallback, it is possible to switch to the new type through a module parameter. Support for the 16 bit 10/100 Mbit cards is now included by default. Compile tested only - I hope Alex can test the autoprobe bit now that we know mode selection by module parameter works. Cheers, Michael ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v5 1/2] m68k: io_mm.h - add APNE 100 MBit support 2021-06-19 0:34 [PATCH v5 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz @ 2021-06-19 0:34 ` Michael Schmitz 2021-06-19 0:34 ` [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 1 sibling, 0 replies; 9+ messages in thread From: Michael Schmitz @ 2021-06-19 0:34 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> -- 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 9c521b0..68922ef 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -65,12 +65,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 @@ -101,6 +99,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 @@ -136,6 +136,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 @@ -155,6 +156,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 @@ -171,6 +173,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 } @@ -184,6 +187,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 @@ -203,6 +207,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 @@ -216,7 +221,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)) @@ -270,6 +275,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.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 0:34 [PATCH v5 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz 2021-06-19 0:34 ` [PATCH v5 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz @ 2021-06-19 0:34 ` Michael Schmitz 2021-06-19 0:56 ` Finn Thain 2021-06-19 9:08 ` Geert Uytterhoeven 1 sibling, 2 replies; 9+ messages in thread From: Michael Schmitz @ 2021-06-19 0:34 UTC (permalink / raw) To: linux-m68k, geert; +Cc: alex, Michael Schmitz, netdev 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 <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 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 | 4 ++++ drivers/net/ethernet/8390/apne.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index 9f4b302..cf0d8b3 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig @@ -143,6 +143,10 @@ 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 at runtime or + from the kernel command line, use the apne.100mbit module parameter. + 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 fe6c834..8223e15 100644 --- a/drivers/net/ethernet/8390/apne.c +++ b/drivers/net/ethernet/8390/apne.c @@ -120,6 +120,10 @@ 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 bool apne_100_mbit; +module_param_named(100_mbit, apne_100_mbit, bool, 0644); +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); + struct net_device * __init apne_probe(int unit) { struct net_device *dev; @@ -139,6 +143,11 @@ struct net_device * __init apne_probe(int unit) if ( !(AMIGAHW_PRESENT(PCMCIA)) ) return ERR_PTR(-ENODEV); + if (apne_100_mbit) + isa_type = ISA_TYPE_AG16; + else + isa_type = ISA_TYPE_AG; + pr_info("Looking for PCMCIA ethernet card : "); /* check if a card is inserted */ @@ -147,6 +156,20 @@ struct net_device * __init apne_probe(int unit) return ERR_PTR(-ENODEV); } + /* Reset card. Who knows what dain-bramaged state it was left in. */ + { unsigned long reset_start_time = jiffies; + + outb(inb(IOBASE + NE_RESET), IOBASE + NE_RESET); + + while ((inb(IOBASE + NE_EN0_ISR) & ENISR_RESET) == 0) + if (time_after(jiffies, reset_start_time + 2*HZ/100)) { + pr_info("Card not found (no reset ack).\n"); + isa_type=ISA_TYPE_AG16; + } + + outb(0xff, IOBASE + NE_EN0_ISR); /* Ack all intr. */ + } + dev = alloc_ei_netdev(); if (!dev) return ERR_PTR(-ENOMEM); @@ -590,6 +613,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.7.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 0:34 ` [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz @ 2021-06-19 0:56 ` Finn Thain 2021-06-19 3:13 ` Michael Schmitz 2021-06-19 9:08 ` Geert Uytterhoeven 1 sibling, 1 reply; 9+ messages in thread From: Finn Thain @ 2021-06-19 0:56 UTC (permalink / raw) To: Michael Schmitz; +Cc: linux-m68k, geert, alex, netdev On Sat, 19 Jun 2021, Michael Schmitz wrote: > 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 <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 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 | 4 ++++ > drivers/net/ethernet/8390/apne.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 37 insertions(+) > > diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig > index 9f4b302..cf0d8b3 100644 > --- a/drivers/net/ethernet/8390/Kconfig > +++ b/drivers/net/ethernet/8390/Kconfig > @@ -143,6 +143,10 @@ 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 at runtime or > + from the kernel command line, use the apne.100mbit module parameter. > + > 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 fe6c834..8223e15 100644 > --- a/drivers/net/ethernet/8390/apne.c > +++ b/drivers/net/ethernet/8390/apne.c > @@ -120,6 +120,10 @@ 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 bool apne_100_mbit; > +module_param_named(100_mbit, apne_100_mbit, bool, 0644); > +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); > + > struct net_device * __init apne_probe(int unit) > { > struct net_device *dev; > @@ -139,6 +143,11 @@ struct net_device * __init apne_probe(int unit) > if ( !(AMIGAHW_PRESENT(PCMCIA)) ) > return ERR_PTR(-ENODEV); > > + if (apne_100_mbit) > + isa_type = ISA_TYPE_AG16; > + else > + isa_type = ISA_TYPE_AG; > + > pr_info("Looking for PCMCIA ethernet card : "); > > /* check if a card is inserted */ > @@ -147,6 +156,20 @@ struct net_device * __init apne_probe(int unit) > return ERR_PTR(-ENODEV); > } > > + /* Reset card. Who knows what dain-bramaged state it was left in. */ > + { unsigned long reset_start_time = jiffies; There's a missing line break here. > + > + outb(inb(IOBASE + NE_RESET), IOBASE + NE_RESET); > + > + while ((inb(IOBASE + NE_EN0_ISR) & ENISR_RESET) == 0) > + if (time_after(jiffies, reset_start_time + 2*HZ/100)) { You could use msecs_to_jiffies(20) here. > + pr_info("Card not found (no reset ack).\n"); > + isa_type=ISA_TYPE_AG16; Whitespace is needed around the '='. > + } Missing a break statement? > + > + outb(0xff, IOBASE + NE_EN0_ISR); /* Ack all intr. */ > + } > + > dev = alloc_ei_netdev(); > if (!dev) > return ERR_PTR(-ENOMEM); > @@ -590,6 +613,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; > + Extra whitespace. > + gayle.intreq = 0xff; > + mdelay(1); > + gayle.intreq = tmp; > + mdelay(300); > + } > + > pcmcia_reset(); > pcmcia_program_voltage(PCMCIA_0V); > pcmcia_access_speed(PCMCIA_SPEED_250NS); > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 0:56 ` Finn Thain @ 2021-06-19 3:13 ` Michael Schmitz 0 siblings, 0 replies; 9+ messages in thread From: Michael Schmitz @ 2021-06-19 3:13 UTC (permalink / raw) To: Finn Thain; +Cc: linux-m68k, geert, alex, netdev Hi Finn, thanks for reviewing again! Am 19.06.2021 um 12:56 schrieb Finn Thain: >> >> + /* Reset card. Who knows what dain-bramaged state it was left in. */ >> + { unsigned long reset_start_time = jiffies; > > There's a missing line break here. Straight copy from apne_probe1() below, but you're right about style of course. > >> + >> + outb(inb(IOBASE + NE_RESET), IOBASE + NE_RESET); >> + >> + while ((inb(IOBASE + NE_EN0_ISR) & ENISR_RESET) == 0) >> + if (time_after(jiffies, reset_start_time + 2*HZ/100)) { > > You could use msecs_to_jiffies(20) here. > >> + pr_info("Card not found (no reset ack).\n"); >> + isa_type=ISA_TYPE_AG16; > > Whitespace is needed around the '='. > >> + } > > Missing a break statement? Ouch. > >> + >> + outb(0xff, IOBASE + NE_EN0_ISR); /* Ack all intr. */ >> + } >> + >> dev = alloc_ei_netdev(); >> if (!dev) >> return ERR_PTR(-ENOMEM); >> @@ -590,6 +613,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; >> + > > Extra whitespace. > >> + gayle.intreq = 0xff; >> + mdelay(1); >> + gayle.intreq = tmp; >> + mdelay(300); >> + } >> + >> pcmcia_reset(); >> pcmcia_program_voltage(PCMCIA_0V); >> pcmcia_access_speed(PCMCIA_SPEED_250NS); >> Thanks, will fix in v6 (and correct the commit message). Might split off the autoprobe bit so that can be easily dropped if need be. Cheers, Michael ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 0:34 ` [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2021-06-19 0:56 ` Finn Thain @ 2021-06-19 9:08 ` Geert Uytterhoeven 2021-06-19 19:31 ` Michael Schmitz 1 sibling, 1 reply; 9+ messages in thread From: Geert Uytterhoeven @ 2021-06-19 9:08 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Michael, On Sat, Jun 19, 2021 at 2:35 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > 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 <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! Note that this patch has a hard dependency on "[PATCH v5 1/2] m68k: io_mm.h - add APNE 100 MBit support" in the series, so it must not be applied to the netdev tree yet. > --- a/drivers/net/ethernet/8390/Kconfig > +++ b/drivers/net/ethernet/8390/Kconfig > @@ -143,6 +143,10 @@ 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 at runtime or > + from the kernel command line, use the apne.100mbit module parameter. According to the recent discussion about that, "at runtime" is not really possible? So that limits it to kernel command line (for the builtin case) or module parameter (for the modular case). > + > 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 fe6c834..8223e15 100644 > --- a/drivers/net/ethernet/8390/apne.c > +++ b/drivers/net/ethernet/8390/apne.c > @@ -120,6 +120,10 @@ 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 bool apne_100_mbit; > +module_param_named(100_mbit, apne_100_mbit, bool, 0644); > +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); 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] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 9:08 ` Geert Uytterhoeven @ 2021-06-19 19:31 ` Michael Schmitz 2021-06-20 11:47 ` Geert Uytterhoeven 0 siblings, 1 reply; 9+ messages in thread From: Michael Schmitz @ 2021-06-19 19:31 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Geert, thanks for your review! Am 19.06.2021 um 21:08 schrieb Geert Uytterhoeven: > Hi Michael, > > On Sat, Jun 19, 2021 at 2:35 AM Michael Schmitz <schmitzmic@gmail.com> wrote: >> 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 <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! > > Note that this patch has a hard dependency on "[PATCH v5 1/2] m68k: > io_mm.h - add APNE 100 MBit support" in the series, so it must not > be applied to the netdev tree yet. Hmm - so we ought to protect the new code by #ifdef ARCH_HAVE_16BIT_PCMCIA and set that in the m68k machine Kconfig in the first patch? (It's almost, but not quite like a config option :-) > >> --- a/drivers/net/ethernet/8390/Kconfig >> +++ b/drivers/net/ethernet/8390/Kconfig >> @@ -143,6 +143,10 @@ 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 at runtime or >> + from the kernel command line, use the apne.100mbit module parameter. > > According to the recent discussion about that, "at runtime" is not > really possible? So that limits it to kernel command line (for the > builtin case) > or module parameter (for the modular case). True - I'll reword that. Cheers, Michael > >> + >> 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 fe6c834..8223e15 100644 >> --- a/drivers/net/ethernet/8390/apne.c >> +++ b/drivers/net/ethernet/8390/apne.c >> @@ -120,6 +120,10 @@ 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 bool apne_100_mbit; >> +module_param_named(100_mbit, apne_100_mbit, bool, 0644); >> +MODULE_PARM_DESC(100_mbit, "Enable 100 Mbit support"); > > Gr{oetje,eeting}s, > > Geert > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-19 19:31 ` Michael Schmitz @ 2021-06-20 11:47 ` Geert Uytterhoeven 2021-06-20 19:36 ` Michael Schmitz 0 siblings, 1 reply; 9+ messages in thread From: Geert Uytterhoeven @ 2021-06-20 11:47 UTC (permalink / raw) To: Michael Schmitz; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Michael, On Sat, Jun 19, 2021 at 9:31 PM Michael Schmitz <schmitzmic@gmail.com> wrote: > Am 19.06.2021 um 21:08 schrieb Geert Uytterhoeven: > > On Sat, Jun 19, 2021 at 2:35 AM Michael Schmitz <schmitzmic@gmail.com> wrote: > >> 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 <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! > > > > Note that this patch has a hard dependency on "[PATCH v5 1/2] m68k: > > io_mm.h - add APNE 100 MBit support" in the series, so it must not > > be applied to the netdev tree yet. > > Hmm - so we ought to protect the new code by > > #ifdef ARCH_HAVE_16BIT_PCMCIA > > and set that in the m68k machine Kconfig in the first patch? > > (It's almost, but not quite like a config option :-) No, we just manage dependencies, so either: 1. Patch 2 cannot go in until patch 1 is upstream, 2. One subsystem maintainer gives an Acked-by for one patch,so the other subsystem maintainer can apply both patches. 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] 9+ messages in thread
* Re: [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver 2021-06-20 11:47 ` Geert Uytterhoeven @ 2021-06-20 19:36 ` Michael Schmitz 0 siblings, 0 replies; 9+ messages in thread From: Michael Schmitz @ 2021-06-20 19:36 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Linux/m68k, ALeX Kazik, netdev Hi Geert, On 20/06/21 11:47 pm, Geert Uytterhoeven wrote: > >>> Thanks for your patch! >>> >>> Note that this patch has a hard dependency on "[PATCH v5 1/2] m68k: >>> io_mm.h - add APNE 100 MBit support" in the series, so it must not >>> be applied to the netdev tree yet. >> Hmm - so we ought to protect the new code by >> >> #ifdef ARCH_HAVE_16BIT_PCMCIA >> >> and set that in the m68k machine Kconfig in the first patch? >> >> (It's almost, but not quite like a config option :-) > No, we just manage dependencies, so either: > 1. Patch 2 cannot go in until patch 1 is upstream, > 2. One subsystem maintainer gives an Acked-by for one patch,so > the other subsystem maintainer can apply both patches. I haven't had any review from netdev yet - option 1 looks more feasible (if you want to carry a patch that's useless without its follow-up). And with the autoprobe failing (if I understood Alex right), I'll have to think of something else or drop that patch again. Is there anything (aside from linking to the e-mail thread) that I can do to help netdev maintainers locate the first patch? The commit ID won't remain the same once accepted upstream, am I right? Cheers, Michael > > Gr{oetje,eeting}s, > > Geert > ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-06-20 19:36 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-06-19 0:34 [PATCH v5 0/2] Add APNE PCMCIA 100 Mbit support Michael Schmitz 2021-06-19 0:34 ` [PATCH v5 1/2] m68k: io_mm.h - add APNE 100 MBit support Michael Schmitz 2021-06-19 0:34 ` [PATCH net-next v5 2/2] net/8390: apne.c - add 100 Mbit support to apne.c driver Michael Schmitz 2021-06-19 0:56 ` Finn Thain 2021-06-19 3:13 ` Michael Schmitz 2021-06-19 9:08 ` Geert Uytterhoeven 2021-06-19 19:31 ` Michael Schmitz 2021-06-20 11:47 ` Geert Uytterhoeven 2021-06-20 19:36 ` 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.