Re: 2.6 kernel on aranym?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Any recent updates to those patches?

Not since I sent the bunch to Christian for inclusion in the Debian
kernels. I thought I had sent them to debian-68k as well at the same time,
but I may be wrong there. The last stuff was the EtherNEC; I did some more
dead code cleanup on atafb but there's the modedb cleanup I'd like to get
done before posting a final patch.

I see Roman updated CVS to 2.6.19 so I'll pull a fresh copy and start on
that now.

Well, I've spent a little time to update my Atari patches to 2.6.19-m68k.
There's two details I'd need some advice on - lockdep for the case where
CONFIG_GENERIC_HARDIRQS is not set, and a small fix for scsi_lib. First
lockdep:

drivers/net/8390.c calls disable_irq_nosync_lockdep_irqsave and
enable_irq_lockdep_irqrestore in 2.6.19 now. The EtherNEC driver uses
8390.c so we need these functions on m68k now. I've just added dummy
declarations to make them behave as their non-lockdep counterparts for
now. Can m68k set CONFIG_GENERIC_HARDIRQS?

--- include/linux/interrupt.h.ms-lockdep.org	2006-12-09 17:45:21.000000000 +0100
+++ include/linux/interrupt.h	2006-12-09 17:45:21.000000000 +0100
@@ -179,6 +179,8 @@
 #  define disable_irq_nosync_lockdep(irq)	disable_irq_nosync(irq)
 #  define disable_irq_lockdep(irq)		disable_irq(irq)
 #  define enable_irq_lockdep(irq)		enable_irq(irq)
+#  define disable_irq_nosync_lockdep_irqsave(irq,flags)	disable_irq_nosync(irq)
+#  define enable_irq_lockdep_irqrestore(irq,flags)	enable_irq(irq)
 # endif

 #endif /* CONFIG_GENERIC_HARDIRQS */

The second item concerns a warning given for each SCSI target scanned on
the Falcon, where sg_tablesize is set to SG_NONE (aka zero). The
blk_queue_max_hw_segments() call should set a minimum size of one
regardless of the sg_tablesize value (blk_queue_max_hw_segments() corrects
this and gives a warning).

--- drivers/scsi/scsi_lib.c.ms-maxhwseg.org	2006-12-09 16:49:29.000000000 +0100
+++ drivers/scsi/scsi_lib.c	2006-12-09 16:49:29.000000000 +0100
@@ -1559,7 +1559,7 @@

 	blk_queue_prep_rq(q, scsi_prep_fn);

-	blk_queue_max_hw_segments(q, shost->sg_tablesize);
+	blk_queue_max_hw_segments(q, (shost->sg_tablesize ? shost->sg_tablesize : 1));
 	blk_queue_max_phys_segments(q, SCSI_MAX_PHYS_SEGMENTS);
 	blk_queue_max_sectors(q, shost->max_sectors);
 	blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));

This one should go directly upstream, I think.

Comments, anyone?

	Michael
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Video for Linux]     [Yosemite News]     [Linux S/390]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux