CVS commit: src/sys/arch/alpha/conf

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Dec 17 18:48:53 UTC 2023

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
s/keyboad/keyboard/ in wsmux description comment.


To generate a diff of this commit:
cvs rdiff -u -r1.418 -r1.419 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.418 src/sys/arch/alpha/conf/GENERIC:1.419
--- src/sys/arch/alpha/conf/GENERIC:1.418	Thu Feb  9 14:09:47 2023
+++ src/sys/arch/alpha/conf/GENERIC	Sun Dec 17 18:48:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.418 2023/02/09 14:09:47 abs Exp $
+# $NetBSD: GENERIC,v 1.419 2023/12/17 18:48:53 andvar Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.418 $"
+ident		"GENERIC-$Revision: 1.419 $"
 
 maxusers 32
 
@@ -728,7 +728,7 @@ pseudo-device	vcoda			# coda minicache <
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	drvctl			# user control of drive subsystem
 pseudo-device	wsfont
-pseudo-device	wsmux			# mouse and keyboad multiplexing
+pseudo-device	wsmux			# mouse and keyboard multiplexing
 pseudo-device	ksyms			# /dev/ksyms
 pseudo-device	lockstat		# lock profiling
 pseudo-device	bcsp			# BlueCore Serial Protocol

CVS commit: src/sys/arch/alpha/conf

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Sun Dec 17 18:48:53 UTC 2023

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
s/keyboad/keyboard/ in wsmux description comment.


To generate a diff of this commit:
cvs rdiff -u -r1.418 -r1.419 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/alpha/conf

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Nov 19 20:01:48 UTC 2023

Modified Files:
src/sys/arch/alpha/conf: GENERIC.QEMU

Log Message:
Add some VirtIO devies.  virtio-scsi and virtio-rng are tested a bit,
virtio-blk does not work, virtio-net not yet tested.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/conf/GENERIC.QEMU

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/conf/GENERIC.QEMU
diff -u src/sys/arch/alpha/conf/GENERIC.QEMU:1.1 src/sys/arch/alpha/conf/GENERIC.QEMU:1.2
--- src/sys/arch/alpha/conf/GENERIC.QEMU:1.1	Sun May 23 01:34:17 2021
+++ src/sys/arch/alpha/conf/GENERIC.QEMU	Sun Nov 19 20:01:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.QEMU,v 1.1 2021/05/23 01:34:17 thorpej Exp $
+# $NetBSD: GENERIC.QEMU,v 1.2 2023/11/19 20:01:48 thorpej Exp $
 #
 # Generic Alpha kernel specifically configured for Qemu.
 
@@ -8,3 +8,12 @@ include	"arch/alpha/conf/GENERIC"
 # because Qemu does not load the symbol table when loading the
 # kernel.
 makeoptions	COPY_SYMTAB=1
+
+# Virtio devices
+virtio*	at pci? dev ? function ?	# Virtio PCI device
+#viomb*	at virtio?			# Virtio memory balloon device
+ld*	at virtio?			# Virtio disk device
+vioif*	at virtio?			# Virtio network device
+viornd*	at virtio?			# Virtio entropy device
+vioscsi* at virtio?			# Virtio SCSI device
+#vio9p*	at virtio?			# Virtio 9P device

CVS commit: src/sys/arch/alpha/conf

[Jason R Thorpe]

Module Name:src
Committed By:   thorpej
Date:   Sun Nov 19 20:01:48 UTC 2023

Modified Files:
src/sys/arch/alpha/conf: GENERIC.QEMU

Log Message:
Add some VirtIO devies.  virtio-scsi and virtio-rng are tested a bit,
virtio-blk does not work, virtio-net not yet tested.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/conf/GENERIC.QEMU

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/alpha/conf

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Sep  9 13:08:07 UTC 2021

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
Add optional GENERIC.local include in alpha's GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.413 src/sys/arch/alpha/conf/GENERIC:1.414
--- src/sys/arch/alpha/conf/GENERIC:1.413	Fri Jul 23 14:38:58 2021
+++ src/sys/arch/alpha/conf/GENERIC	Thu Sep  9 13:08:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.413 2021/07/23 14:38:58 thorpej Exp $
+# $NetBSD: GENERIC,v 1.414 2021/09/09 13:08:07 jakllsch Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.413 $"
+ident		"GENERIC-$Revision: 1.414 $"
 
 maxusers 32
 
@@ -737,3 +737,6 @@ include "dev/veriexec.config"
 
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 options PAX_ASLR=0			# PaX Address Space Layout Randomization
+
+# Pull in optional local configuration
+cinclude	"arch/alpha/conf/GENERIC.local"

CVS commit: src/sys/arch/alpha/conf

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Sep  9 13:08:07 UTC 2021

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
Add optional GENERIC.local include in alpha's GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/alpha/conf

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Aug  9 08:02:23 UTC 2019

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
Add xhci(4). Just working for me.


To generate a diff of this commit:
cvs rdiff -u -r1.394 -r1.395 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/alpha/conf

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Fri Aug  9 08:02:23 UTC 2019

Modified Files:
src/sys/arch/alpha/conf: GENERIC

Log Message:
Add xhci(4). Just working for me.


To generate a diff of this commit:
cvs rdiff -u -r1.394 -r1.395 src/sys/arch/alpha/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.394 src/sys/arch/alpha/conf/GENERIC:1.395
--- src/sys/arch/alpha/conf/GENERIC:1.394	Fri Apr 26 21:40:28 2019
+++ src/sys/arch/alpha/conf/GENERIC	Fri Aug  9 08:02:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.394 2019/04/26 21:40:28 sevan Exp $
+# $NetBSD: GENERIC,v 1.395 2019/08/09 08:02:23 rin Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.394 $"
+ident		"GENERIC-$Revision: 1.395 $"
 
 maxusers 32
 
@@ -323,6 +323,7 @@ mpt*	at	pci? dev ? function ?		# LSI Fus
 ne*	at	pci? dev ? function ?		# NE2000-compatible Ethernet
 ohci*	at	pci? dev ? function ?		# USB Open Host Controller
 ehci*	at	pci? dev ? function ?		# USB-2 Host controller
+xhci*	at	pci? dev ? function ?		# eXtensible Host Controller
 pceb*	at	pci? dev ? function ?		# Intel PCI-EISA Bridges
 pciide* at	pci? dev ? function ? flags 0x	# GENERIC pciide driver
 acardide* at	pci? dev ? function ?		# Acard IDE controllers
@@ -551,6 +552,7 @@ iic* 	at alipm?
 slhci*	at pcmcia? function ?			# ScanLogic SL811HS
 
 # USB bus support
+usb*	at xhci?
 usb*	at ehci?
 usb*	at ohci?
 usb*	at slhci?

Re: CVS commit: src/sys/arch/alpha/conf

[Jason Thorpe]

Can you send me dmesg from this machine?  We should be using direct-config if 
we can.

-- thorpej
Sent from my iPhone.

> On May 15, 2018, at 11:25 AM, Julian Coleman  wrote:
> 
> Hi,
> 
>> Oh, but to be clear, the iic instances themselves would not be in conflict, 
>> because they are direct-configured by THEIR parents, and alipm and tsc wont 
>> both exist on a given machine.
> 
> Just for info, as it's fixed now.  The DS20L has both:
> 
>  alipm0 at pci0 dev 17 function 0: 74KHz clock
>  iic0 at alipm0: I2C bus
>  tsciic0 at tsc0
>  iic1 at tsciic0: I2C bus
> 
> (and I assume the CS20 is the same).
> 
> Regards,
> 
> Julian

Re: CVS commit: src/sys/arch/alpha/conf

[Julian Coleman]

Hi,

> Oh, but to be clear, the iic instances themselves would not be in conflict, 
> because they are direct-configured by THEIR parents, and alipm and tsc wont 
> both exist on a given machine.

Just for info, as it's fixed now.  The DS20L has both:

  alipm0 at pci0 dev 17 function 0: 74KHz clock
  iic0 at alipm0: I2C bus
  tsciic0 at tsc0
  iic1 at tsciic0: I2C bus

(and I assume the CS20 is the same).

Regards,

Julian

Re: CVS commit: src/sys/arch/alpha/conf

[Jason Thorpe]

Oh, but to be clear, the iic instances themselves would not be in conflict, 
because they are direct-configured by THEIR parents, and alipm and tsc wont 
both exist on a given machine.

It’s the i2c devices themselves I was referring to in my previous message.

The autoconfig system used to be able to handle “foo0” being specified at 
multiple parents (but it would only attach one of them).  Has that changed?

-- thorpej
Sent from my iPhone.

> On May 14, 2018, at 6:24 PM, Jason Thorpe  wrote:
> 
> They would have conflicted already in the old stuff.  This would be a great 
> application for using direct configuration of i2c on this platform.
> 
> -- thorpej
> Sent from my iPhone.
> 
>> On May 14, 2018, at 6:11 PM, Jonathan A. Kollasch  
>> wrote:
>> 
>> Module Name:src
>> Committed By:jakllsch
>> Date:Mon May 14 22:11:30 UTC 2018
>> 
>> Modified Files:
>>   src/sys/arch/alpha/conf: GENERIC
>> 
>> Log Message:
>> Move iic0 at alipm? to iic1.  Using iic0 will conflict with the
>> iic0 at tsciic? on the API CS20.
>> 
>> XXX: Enumerate the similar-to-DS20L I2C devices on the CS20, which
>> IIRC are not all on the tsciic(4) I2C bus, and comment GENERIC
>> accordingly.
>> 
>> 
>> To generate a diff of this commit:
>> cvs rdiff -u -r1.380 -r1.381 src/sys/arch/alpha/conf/GENERIC
>> 
>> Please note that diffs are not public domain; they are subject to the
>> copyright notices on the relevant files.
>> 

Re: CVS commit: src/sys/arch/alpha/conf

[Jason Thorpe]

They would have conflicted already in the old stuff.  This would be a great 
application for using direct configuration of i2c on this platform.

-- thorpej
Sent from my iPhone.

> On May 14, 2018, at 6:11 PM, Jonathan A. Kollasch  wrote:
> 
> Module Name:src
> Committed By:jakllsch
> Date:Mon May 14 22:11:30 UTC 2018
> 
> Modified Files:
>src/sys/arch/alpha/conf: GENERIC
> 
> Log Message:
> Move iic0 at alipm? to iic1.  Using iic0 will conflict with the
> iic0 at tsciic? on the API CS20.
> 
> XXX: Enumerate the similar-to-DS20L I2C devices on the CS20, which
> IIRC are not all on the tsciic(4) I2C bus, and comment GENERIC
> accordingly.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.380 -r1.381 src/sys/arch/alpha/conf/GENERIC
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>