From owner-freebsd-mobile@FreeBSD.ORG Sun Jun 22 16:34:15 2003 Return-Path: Delivered-To: freebsd-mobile@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D44D37B401 for ; Sun, 22 Jun 2003 16:34:15 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD3F43F3F for ; Sun, 22 Jun 2003 16:34:14 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h5MNYAE1023202; Sun, 22 Jun 2003 17:34:11 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 22 Jun 2003 17:33:41 -0600 (MDT) Message-Id: <20030622.173341.79763346.imp@bsdimp.com> To: marius@marius.org, mobile@freebsd.org From: "M. Warner Losh" In-Reply-To: <20030622202141.GV87417@marius.org> References: <20030622172655.GR87417@marius.org> <20030622.140921.43008036.imp@bsdimp.com> <20030622202141.GV87417@marius.org> X-Mailer: Mew version 2.1 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Subject: Re: TI-1420 PCMCIA Chipset Problems X-BeenThere: freebsd-mobile@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Mobile computing with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jun 2003 23:34:15 -0000 [[ Private email cc'd to mobile to make things into the archive, hope it is OK with marius ]] In message: <20030622202141.GV87417@marius.org> Marius Strom writes: : Where can I get the o2micro workaround code? I have no problem merging : existing patch code in to see if that fixes the cbb problems. Right now it is in sys/dev/pccbb/pccbb.c. There are two places where it is relevant. Rather than try to describe what to do, here's a patch. It isn't good enough to commit, but it might help you out none the less. Warner Index: pccbb.c =================================================================== RCS file: /home/ncvs/src/sys/dev/pccbb/pccbb.c,v retrieving revision 1.78 diff -u -r1.78 pccbb.c --- pccbb.c 12 Jun 2003 06:06:14 -0000 1.78 +++ pccbb.c 22 Jun 2003 23:32:29 -0000 @@ -486,7 +486,7 @@ * on some machines. */ pci_write_config(sc->dev, CBBR_MMCTRL, 0, 4); - break; +/* break; */ case CB_O2MICRO: /* * Issue #1: INT# generated at the same time as @@ -1206,7 +1206,7 @@ if (cbb_get(sc, CBB_SOCKET_CONTROL) == sock_ctrl) return (1); /* no change necessary */ DEVPRINTF((sc->dev, "cbb_power: %dV\n", volts)); - if (volts != 0 && sc->chipset == CB_O2MICRO) + if (volts != 0 /* && sc->chipset == CB_O2MICRO*/ ) reg = cbb_o2micro_power_hack(sc); cbb_set(sc, CBB_SOCKET_CONTROL, sock_ctrl); @@ -1248,7 +1248,7 @@ } retval = 1; done:; - if (volts != 0 && sc->chipset == CB_O2MICRO) + if (volts != 0 /* && sc->chipset == CB_O2MICRO */) cbb_o2micro_power_hack2(sc, reg); return (retval); }