From owner-freebsd-hardware@FreeBSD.ORG Thu Nov 29 21:37:48 2012 Return-Path: Delivered-To: freebsd-hardware@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5021623; Thu, 29 Nov 2012 21:37:48 +0000 (UTC) (envelope-from freebsd-hardware@dino.sk) Received: from mailhost.netlab.sk (mailhost.netlab.sk [84.245.65.10]) by mx1.freebsd.org (Postfix) with ESMTP id 27DC38FC13; Thu, 29 Nov 2012 21:37:47 +0000 (UTC) Received: from zeta.dino.sk (fw1.dino.sk [84.245.95.252]) (AUTH: LOGIN milan, TLS: TLSv1/SSLv3,128bits,AES128-SHA) by mailhost.netlab.sk with ESMTPSA; Thu, 29 Nov 2012 22:32:42 +0100 id 004F1093.50B7D47A.0000AC2A Date: Thu, 29 Nov 2012 22:32:40 +0100 From: Milan Obuch To: John Baldwin Subject: Re: PER-C40C minipci card under FreeBSD Message-ID: <20121129223240.5f6da085@zeta.dino.sk> In-Reply-To: <201202230831.09164.jhb@freebsd.org> References: <20120220220237.7474cc1e@atom.dino.sk> <201202220957.56016.jhb@freebsd.org> <20120222233536.314d7f86@atom.dino.sk> <201202230831.09164.jhb@freebsd.org> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.6; amd64-portbld-freebsd9.0) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEX+/v7++v6YOTrq8PCcuIX989UvOSj++v0BNCbpAAAAB3RJTUUHsQwfFzs7RBhzUQAAAhJJREFUOI1dU8GOqzAMNKIoV1bvwD1i0ysqrHplIdBrVSX7ATSbd03VVvn9tQNtQy0hjAdn7LED4AAcPtWm9RV+MPSfxhBLx9ajd6X/ngB6/mTwnRSZua7i7Ca+0ctZKo4Qmz+JY13X6I3nFZBxIYW1PbgfQ5RP8g0XlltEWGf3cV03joYpRnFbvYDKbXjZlXyyhEZA4lI+cN3NaVXE4VKjSwTExO10eTEkkJVqIAD5z0nUBQJluQDRSQjcrBiHAJxZlAH5CUMBMC7OcJ4LMQNnxhZ1HYPscMc6J4UlWRMNwzOpCcAHKSICd1EDn83abdREIbXsHkD1OinP1aCUCOEVRaa1lMcvywUWdYgk13JQUpYNKmvXQ8Kw5ML9YI5h8SakctBc7E/IYuLhYd/zZIk+1gM1vNweQBvHE0j+oYah3sMqAytQYlZk6+ANaaawJdu3OFzYGMZ3iGpa3qMlq9ZH0VZTgrCtw/ngdYkEIIpSbP1bWQAdFdX9vocBdkH2qVjVmuMu3gI5rjs814EUdrCZgWlPaxZZ3RiLFUtr+ud0PXwp2dnQSNXgePt6AZpBj6UMJ7VQkzN4utVeaSW1Dhn/kblGrKeMvNGnzwX4zuEDarYz1KdPtR60Gul0Gued+515SJXhCsl+Tx/3kY/UDvicPll9mfu50t3tvQ/thZpJYgeuwdSKNJ6tCD98MCgoxLDaPxbwqqwPWaWiAAAAAElFTkSuQmCC X-Face: ak5rwz4-aUa>hPFZlcg,bXxn.(TN}e9DGFrKU\.i_'B[&5=pAd9o"j)5VSUYW:BRQG#^42Ev$Il|; Ztn=,C X-Operating-System: FreeBSD/amd64 8.2-STABLE Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-hardware@freebsd.org X-BeenThere: freebsd-hardware@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: General discussion of FreeBSD hardware List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2012 21:37:48 -0000 On Thu, 23 Feb 2012 08:31:09 -0500 John Baldwin wrote: > On Wednesday, February 22, 2012 5:35:36 pm Milan Obuch wrote: > > On Wed, 22 Feb 2012 09:57:55 -0500 > > John Baldwin wrote: > > [ old patch and pciconf output snipped ] > > > Hmm, ok. Unfortunately there are other devices that need the > > > commented out entry. I've sent a followup to that original PR to > > > see if that device has a subvendor device ID. > > > > > > > Do you have some pointers to such devices? I am no real expert, but > > there must be some difference... > > Just the PR referenced in the commit that added these lines: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=65040 > Currently I have tested both two port and four port version. I used following patch: --- /usr/src/sys/dev/puc/pucdata.c 2012-11-29 21:46:09.000000000 +0100 +++ /usr/src/sys/dev/puc/pucdata.c.patched 2012-11-29 20:55:30.000000000 +0100 @@ -701,10 +701,10 @@ * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports. */ { - 0x1415, 0x9501, 0x10fc ,0xc070, - "I-O DATA RSA-PCI2/R", - DEFAULT_RCLK * 8, - PUC_PORT_2S, 0x10, 0, 8, + 0x1415, 0x9501, 0x10fc ,0xc070, + "I-O DATA RSA-PCI2/R", + DEFAULT_RCLK * 8, + PUC_PORT_2S, 0x10, 0, 8, }, { 0x1415, 0x9501, 0x131f, 0x2050, @@ -725,6 +725,12 @@ PUC_PORT_4S, 0x10, 0, 8, }, + { 0x1415, 0x9501, 0x1415, 0, + "Oxford Semiconductor OXuPCI954 UARTs", + DEFAULT_RCLK * 8, + PUC_PORT_4S, 0x10, 0, 8, + }, + { 0x1415, 0x9501, 0x14db, 0x2150, "Kuroutoshikou SERIAL4P-LPPCI2", DEFAULT_RCLK * 10, @@ -737,6 +743,12 @@ PUC_PORT_4S, 0x10, 0, 8, }, + { 0x1415, 0x9505, 0x1415, 0, + "Oxford Semiconductor OXuPCI952 UARTs (function 0)", + DEFAULT_RCLK * 8, + PUC_PORT_2S, 0x10, 4, 0, + }, + { 0x1415, 0x950a, 0x131f, 0x2030, "SIIG Cyber 2S PCIe", DEFAULT_RCLK * 10, @@ -755,6 +767,12 @@ PUC_PORT_4S, 0x10, 0, 8, }, + { 0x1415, 0x9511, 0x1415, 0, + "Oxford Semiconductor OXuPCI952/OXuPCI954 UARTs (function 1)", + DEFAULT_RCLK, + PUC_PORT_NONSTANDARD, 0, 0, 8, + }, + { 0x1415, 0x9511, 0xffff, 0, "Oxford Semiconductor OX9160/OX16PCI954 UARTs (function 1)", DEFAULT_RCLK, First chunk ist just 'normalising' - every other device uses <4xSPACE> instead of for indenting device definition data. Second chunk adds four port version, third two port version, the fourth one blocks bad definition for both cards. Without this, kernel stops booting when either card's function 1 is detected and no registers/memory responds there. I consider this a bit hacky way to enable use both devices (the one mentioned in PR you cited and AAEON miniPCI cards), however, we are not introducing a regression this way... I built 8.3-STABLE kernel for test, but I see no reason this should not work with 10-CURRENT, will test, however. Regards, Milan