i386/128931: src/sys/dev/puc/pucdata.c v1.51.2.3 breaks support for NetMos 4-port serial cards

[Darren]

>Number:         128931
>Category:       i386
>Synopsis:       src/sys/dev/puc/pucdata.c v1.51.2.3 breaks support for NetMos 4-port serial cards
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 17 01:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Darren
>Release:        RELENG_6_3
>Organization:
>Environment:
FreeBSD [REDACTED] 6.3-RELEASE-p5 FreeBSD 6.3-RELEASE-p5 #2: Sun
Nov 16 15:37:12 PST 2008     root@[REDACTED]:/usr/src/sys/i386/co
mpile/custom_i386  i386
>Description:
srv/sys/dev/puc/pucdata.c v1.51.2.3 adds support for 6-port Netmos cards to RELENG_6.  The relevant PR is kern/58953.  The commit breaks support for 4-port Netmos cards by incorrectly changing the "NetMos NM9845 Quad UART" puc_devices[] entry.

This applies to v1.51.2.4 (RELENG_6) and v1.52.2.4.2.1 (RELENG_6_4) as well, which have the same entry.  I could not confirm if the same behavior occurs in RELENG_6_4 or RELENG_6 due to lack of boxes running RELENG_6 or RELENG_6_4.
>How-To-Repeat:
Use RELENG_6_3 with a Netmos 4-port card and see puc(4) not attach.
>Fix:
The provided patch against src/sys/dev/puc/pucdata.c v1.51.2.3, taken from a post to freebsd-stable by Marcel Moolenaar on 2008-05-06, fixes the issue.

The patch also succeeds against v1.51.2.4 and v1.51.2.4.2.1 with offset.

Patch attached with submission follows:

--- pucdata.c.orig	2006-12-15 14:31:37.000000000 -0800
+++ pucdata.c	2008-11-16 15:34:50.000000000 -0800
@@ -946,7 +946,7 @@
 
 	/* NetMos 4S0P PCI: 4S, 0P */
 	{   "NetMos NM9845 Quad UART",
-	    {	0x9710,	0x9845,	0,	0x0014	},
+	    {	0x9710,	0x9845,	0,	0x0004	},
 	    {	0xffff,	0xffff,	0,	0xffff	},
 	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },


>Release-Note:
>Audit-Trail:
>Unformatted: