linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Sam Creasey <sammy@sammy.net>
Cc: Jeff Garzik <jgarzik@pobox.com>,
	netdev@oss.sgi.com, Linux Kernel <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@osdl.org>,
	Al Viro <viro@parcelfarce.linux.theplanet.co.uk>,
	Linux/m68k <linux-m68k@lists.linux-m68k.org>
Subject: Re: [BK PATCHES] 2.6.x experimental net driver queue
Date: Wed, 19 Nov 2003 10:37:35 +0100 (MET)	[thread overview]
Message-ID: <Pine.GSO.4.21.0311191035500.7852-100000@waterleaf.sonytel.be> (raw)
In-Reply-To: <Pine.LNX.4.40.0311191703120.6278-100000@sun3>

On Wed, 19 Nov 2003, Sam Creasey wrote:
> On Tue, 18 Nov 2003, Geert Uytterhoeven wrote:
> > On Mon, 17 Nov 2003, Geert Uytterhoeven wrote:
> > > On Sun, 16 Nov 2003, Jeff Garzik wrote:
> > > > Yet more updates.  Syncing with Andrew Morton, and more syncing with Al
> > > > Viro.
> > > >
> > > > No users of init_etherdev remain in the tree.  (yay!)
> > >
> > > Here are some (untested, except for cross-gcc) fixes for the m68k-related
> > > drivers:
> >
> > I forget to test the Sun-3 drivers:
> >   - sun3_82586.c:
> >       o add missing casts to iounmap() calls
> >       o fix parameter of free_netdev()
> >   - sun3lance.c: add missing casts to iounmap() calls
> >
> > Note that sun3_82586.c no longer compiles since SUN3_82586_TOTAL_SIZE is not
> > defined. Sammy, is it OK to use PAGE_SIZE for that, since that's what's passed
> > to ioremap()?
> 
> Should be...  I looked back through a few versions of the code, and I'm
> not even sure what SUN3_82586_TOTAL_SIZE even was (appears I commented
> that line out long ago anyway).  (I'm also amazed just how much of that
> driver I've forgotten in the last year or two :)

OK, so here's a additional patch that fixes that:

--- linux/drivers/net/sun3_82586.c.orig	2003-11-19 10:32:09.000000000 +0100
+++ linux/drivers/net/sun3_82586.c	2003-11-19 10:33:44.000000000 +0100
@@ -55,6 +55,7 @@
 
 #define DEBUG       /* debug on */
 #define SYSBUSVAL 0 /* 16 Bit */
+#define SUN3_82586_TOTAL_SIZE	PAGE_SIZE
 
 #define sun3_attn586()  {*(volatile unsigned char *)(dev->base_addr) |= IEOB_ATTEN; *(volatile unsigned char *)(dev->base_addr) &= ~IEOB_ATTEN;}
 #define sun3_reset586() {*(volatile unsigned char *)(dev->base_addr) = 0; udelay(100); *(volatile unsigned char *)(dev->base_addr) = IEOB_NORSET;}
@@ -298,7 +299,7 @@
 	if (found)
 		return ERR_PTR(-ENODEV);
 	
-	ioaddr = (unsigned long)ioremap(IE_OBIO, PAGE_SIZE);
+	ioaddr = (unsigned long)ioremap(IE_OBIO, SUN3_82586_TOTAL_SIZE);
 	if (!ioaddr)
 		return ERR_PTR(-ENOMEM);
 	found = 1;


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


  reply	other threads:[~2003-11-19  9:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-17  0:36 [BK PATCHES] 2.6.x experimental net driver queue Jeff Garzik
2003-11-17 17:58 ` Geert Uytterhoeven
2003-11-18 12:27   ` Geert Uytterhoeven
2003-11-18 21:42     ` Jeff Garzik
2003-11-19 22:08     ` Sam Creasey
2003-11-19  9:37       ` Geert Uytterhoeven [this message]
  -- strict thread matches above, loose matches on Subject: below --
2003-12-07 20:36 Jeff Garzik
2003-12-05 19:28 Jeff Garzik
2003-11-22 18:30 Jeff Garzik
2003-11-16 18:16 Jeff Garzik
2003-10-29 23:34 Jeff Garzik
2003-10-29 21:23 Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.GSO.4.21.0311191035500.7852-100000@waterleaf.sonytel.be \
    --to=geert@linux-m68k.org \
    --cc=akpm@osdl.org \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-m68k@lists.linux-m68k.org \
    --cc=netdev@oss.sgi.com \
    --cc=sammy@sammy.net \
    --cc=viro@parcelfarce.linux.theplanet.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).