PERFORCE change 105436 for review
Matt Jacob
mjacob at FreeBSD.org
Fri Sep 1 04:31:35 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=105436
Change 105436 by mjacob at newisp on 2006/09/01 04:30:56
Sync with head.
Affected files ...
.. //depot/projects/newisp/arm/arm/fusu.S#3 integrate
.. //depot/projects/newisp/arm/include/asm.h#2 integrate
.. //depot/projects/newisp/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/newisp/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/newisp/dev/em/if_em.c#2 integrate
.. //depot/projects/newisp/dev/em/if_em.h#2 integrate
.. //depot/projects/newisp/dev/isp/isp.c#7 integrate
.. //depot/projects/newisp/dev/mii/brgphy.c#2 integrate
.. //depot/projects/newisp/dev/mii/miidevs#2 integrate
.. //depot/projects/newisp/kern/kern_umtx.c#3 integrate
.. //depot/projects/newisp/netinet/ip_fw2.c#2 integrate
.. //depot/projects/newisp/pci/agp_ati.c#2 integrate
Differences ...
==== //depot/projects/newisp/arm/arm/fusu.S#3 (text+ko) ====
@@ -37,7 +37,7 @@
#include <machine/asmacros.h>
#include <machine/armreg.h>
#include "assym.s"
-__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.9 2006/08/29 23:53:34 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $");
#ifdef MULTIPROCESSOR
.Lcpu_info:
@@ -52,7 +52,7 @@
* Fetch an int from the user's address space.
*/
-ENTRY(casuword32)
+ENTRY_NP(casuword32)
ENTRY(casuptr)
#ifdef MULTIPROCESSOR
/* XXX Probably not appropriate for non-Hydra SMPs */
@@ -99,7 +99,7 @@
* Fetch an int from the user's address space.
*/
-ENTRY(fuword32)
+ENTRY_NP(fuword32)
ENTRY(fuword)
#ifdef MULTIPROCESSOR
/* XXX Probably not appropriate for non-Hydra SMPs */
@@ -301,7 +301,7 @@
* Store an int in the user's address space.
*/
-ENTRY(suword32)
+ENTRY_NP(suword32)
ENTRY(suword)
#ifdef MULTIPROCESSOR
/* XXX Probably not appropriate for non-Hydra SMPs */
==== //depot/projects/newisp/arm/include/asm.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*
- * $FreeBSD: src/sys/arm/include/asm.h,v 1.4 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -55,15 +55,6 @@
#define _JB_MAGIC__SETJMP 0x4278f500
#define _JB_MAGIC_SETJMP 0x4278f501
#endif
-#if 0
-#ifdef __STDC__
-# define __CONCAT(x,y) x ## y
-# define __STRING(x) #x
-#else
-# define __CONCAT(x,y) x/**/y
-# define __STRING(x) "x"
-#endif
-#endif
#define I32_bit (1 << 7) /* IRQ disable */
#define F32_bit (1 << 6) /* FIQ disable */
==== //depot/projects/newisp/dev/arcmsr/arcmsr.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
** 1.00.00.00 3/31/2004 Erich Chen First release
** 1.20.00.02 11/29/2004 Erich Chen bug fix with arcmsr_bus_reset when PHY error
******************************************************************************************
-** $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.10 2006/05/16 14:36:22 phk Exp $
+** $FreeBSD: src/sys/dev/arcmsr/arcmsr.c,v 1.11 2006/08/31 08:45:44 rse Exp $
*/
#define ARCMSR_DEBUG0 0
/*
@@ -2026,7 +2026,7 @@
/*
**********************************************************************
**
-** start background rebulid
+** start background rebuild
**
**********************************************************************
*/
@@ -2043,7 +2043,7 @@
/*
**********************************************************************
**
-** start background rebulid
+** start background rebuild
**
**********************************************************************
*/
@@ -2065,7 +2065,7 @@
arcmsr_start_adapter_bgrb(pACB);
if(arcmsr_wait_msgint_ready(pACB)!=TRUE)
{
- printf("arcmsr_HwInitialize: wait 'start adapter background rebulid' timeout................. \n");
+ printf("arcmsr_HwInitialize: wait 'start adapter background rebuild' timeout................. \n");
}
/* clear Qbuffer if door bell ringed */
outbound_doorbell=CHIP_REG_READ32(&pACB->pmu->outbound_doorbell);
@@ -2536,7 +2536,7 @@
arcmsr_stop_adapter_bgrb(pACB);
if(arcmsr_wait_msgint_ready(pACB)!=TRUE)
{
- printf("arcmsr_pcidev_disattach: wait 'stop adapter rebulid' timeout.... \n");
+ printf("arcmsr_pcidev_disattach: wait 'stop adapter rebuild' timeout.... \n");
}
arcmsr_flush_adapter_cache(pACB);
if(arcmsr_wait_msgint_ready(pACB)!=TRUE)
==== //depot/projects/newisp/dev/ata/ata-chipset.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.171 2006/08/18 09:56:12 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.172 2006/08/30 11:50:22 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -2863,7 +2863,11 @@
ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff);
/* enable device and PHY state change interrupts */
- ATA_OUTL(ctlr->r_res2, offset + 4, 0x00dd00dd);
+ ATA_OUTL(ctlr->r_res2, offset + 4, 0x000d000d);
+
+ /* disable NCQ support */
+ ATA_OUTL(ctlr->r_res2, 0x0400,
+ ATA_INL(ctlr->r_res2, 0x0400) & 0xfffffff9);
}
else {
/* clear interrupt status */
@@ -2924,7 +2928,7 @@
/* get and clear interrupt status */
if (ctlr->chip->cfg2 & NVQ) {
status = ATA_INL(ctlr->r_res2, offset);
- ATA_OUTL(ctlr->r_res2, offset, (0x0f << shift));
+ ATA_OUTL(ctlr->r_res2, offset, (0x0f << shift) | 0x00f000f0);
}
else {
status = ATA_INB(ctlr->r_res2, offset);
@@ -2947,6 +2951,7 @@
/* check for and handle disconnect events */
if ((status & (0x08 << shift)) &&
+ !((status & (0x04 << shift) && ATA_IDX_INL(ch, ATA_SSTATUS))) &&
(tp = (struct ata_connect_task *)
malloc(sizeof(struct ata_connect_task),
M_ATA, M_NOWAIT | M_ZERO))) {
==== //depot/projects/newisp/dev/em/if_em.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.133 2006/08/22 02:32:48 yongari Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.134 2006/08/31 18:49:41 jhb Exp $*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -2118,7 +2118,7 @@
{
device_t dev = adapter->dev;
- if (adapter->res_interrupt != NULL) {
+ if (adapter->int_handler_tag != NULL) {
bus_teardown_intr(dev, adapter->res_interrupt, adapter->int_handler_tag);
adapter->int_handler_tag = NULL;
}
==== //depot/projects/newisp/dev/em/if_em.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.48 2006/08/14 01:50:54 yongari Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.49 2006/08/31 18:50:16 jhb Exp $*/
#ifndef _EM_H_DEFINED_
#define _EM_H_DEFINED_
@@ -232,9 +232,10 @@
OFFLOAD_UDP_IP
} XSUM_CONTEXT_T;
-struct adapter adapter; /* XXX: ugly forward declaration */
+struct adapter;
+
struct em_int_delay_info {
- struct adapter *adapter; /* XXX: ugly pointer */
+ struct adapter *adapter; /* Back-pointer to the adapter struct */
int offset; /* Register offset to read/write */
int value; /* Current value in usecs */
};
==== //depot/projects/newisp/dev/isp/isp.c#7 (text+ko) ====
==== //depot/projects/newisp/dev/mii/brgphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.45 2006/08/23 15:37:07 glebius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.46 2006/08/31 11:15:18 yongari Exp $");
/*
* Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
@@ -102,6 +102,7 @@
MII_PHY_DESC(xxBROADCOM, BCM5400),
MII_PHY_DESC(xxBROADCOM, BCM5401),
MII_PHY_DESC(xxBROADCOM, BCM5411),
+ MII_PHY_DESC(xxBROADCOM, BCM5752),
MII_PHY_DESC(xxBROADCOM, BCM5701),
MII_PHY_DESC(xxBROADCOM, BCM5703),
MII_PHY_DESC(xxBROADCOM, BCM5704),
@@ -607,6 +608,7 @@
bcm5704_load_dspcode(sc);
break;
case MII_MODEL_xxBROADCOM_BCM5750:
+ case MII_MODEL_xxBROADCOM_BCM5752:
case MII_MODEL_xxBROADCOM_BCM5714:
case MII_MODEL_xxBROADCOM_BCM5780:
case MII_MODEL_xxBROADCOM_BCM5706C:
==== //depot/projects/newisp/dev/mii/miidevs#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/mii/miidevs,v 1.33 2006/07/25 00:14:00 yongari Exp $
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.34 2006/08/31 11:13:51 yongari Exp $
/*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
/*-
@@ -118,6 +118,7 @@
model xxBROADCOM BCM5400 0x0004 Broadcom 1000baseTX PHY
model xxBROADCOM BCM5401 0x0005 BCM5401 10/100/1000baseTX PHY
model xxBROADCOM BCM5411 0x0007 BCM5411 10/100/1000baseTX PHY
+model xxBROADCOM BCM5752 0x0010 BCM5752 10/100/1000baseTX PHY
model xxBROADCOM BCM5701 0x0011 BCM5701 10/100/1000baseTX PHY
model xxBROADCOM BCM5703 0x0016 BCM5703 10/100/1000baseTX PHY
model xxBROADCOM BCM5704 0x0019 BCM5704 10/100/1000baseTX PHY
==== //depot/projects/newisp/kern/kern_umtx.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.41 2006/08/28 07:09:27 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_umtx.c,v 1.42 2006/08/30 23:59:45 davidxu Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -126,7 +126,7 @@
/* Thread contending with us */
TAILQ_HEAD(,umtx_pi) uq_pi_contested;
- /* Inherited prioroty from PP mutex */
+ /* Inherited priority from PP mutex */
u_char uq_inherited_pri;
};
@@ -1728,11 +1728,6 @@
if (error != 0)
break;
- /*
- * We set the contested bit, sleep. Otherwise the lock changed
- * and we need to retry or we lost a race to the thread
- * unlocking the umtx.
- */
umtxq_lock(&uq->uq_key);
umtxq_insert(uq);
umtxq_unbusy(&uq->uq_key);
@@ -1986,20 +1981,21 @@
int try)
{
uint32_t flags;
- int ret;
flags = fuword32(&m->m_flags);
if (flags == -1)
return (EFAULT);
- if ((flags & UMUTEX_PRIO_INHERIT) != 0)
- ret = do_lock_pi(td, m, flags, ts, try);
- else if ((flags & UMUTEX_PRIO_PROTECT) != 0)
- ret = do_lock_pp(td, m, flags, ts, try);
- else
- ret = do_lock_normal(td, m, flags, ts, try);
+ switch(flags & (UMUTEX_PRIO_INHERIT | UMUTEX_PRIO_PROTECT)) {
+ case 0:
+ return (do_lock_normal(td, m, flags, ts, try));
+ case UMUTEX_PRIO_INHERIT:
+ return (do_lock_pi(td, m, flags, ts, try));
+ case UMUTEX_PRIO_PROTECT:
+ return (do_lock_pp(td, m, flags, ts, try));
+ }
- return (ret);
+ return (EINVAL);
}
/*
@@ -2067,12 +2063,6 @@
case UMTX_OP_MUTEX_UNLOCK:
error = do_unlock_umutex(td, uap->obj);
break;
- case UMTX_OP_MUTEX_TRYLOCK:
- error = do_lock_umutex(td, uap->obj, NULL, 1);
- break;
- case UMTX_OP_SET_CEILING:
- error = do_set_ceiling(td, uap->obj, uap->val, uap->uaddr1);
- break;
case UMTX_OP_LOCK:
/* Allow a null timespec (wait forever). */
if (uap->uaddr2 == NULL)
@@ -2113,6 +2103,12 @@
case UMTX_OP_WAKE:
error = kern_umtx_wake(td, uap->obj, uap->val);
break;
+ case UMTX_OP_MUTEX_TRYLOCK:
+ error = do_lock_umutex(td, uap->obj, NULL, 1);
+ break;
+ case UMTX_OP_SET_CEILING:
+ error = do_set_ceiling(td, uap->obj, uap->val, uap->uaddr1);
+ break;
default:
error = EINVAL;
break;
==== //depot/projects/newisp/netinet/ip_fw2.c#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.144 2006/08/18 22:36:04 julian Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.145 2006/08/31 16:56:45 jhay Exp $
*/
#define DEB(x)
@@ -72,6 +72,7 @@
#include <netinet/ip_fw.h>
#include <netinet/ip_divert.h>
#include <netinet/ip_dummynet.h>
+#include <netinet/pim.h>
#include <netinet/tcp.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
@@ -2263,6 +2264,11 @@
PULLUP_TO(hlen, ulp, struct ip6_ext);
break;
+ case IPPROTO_PIM:
+ /* XXX PIM header check? */
+ PULLUP_TO(hlen, ulp, struct pim);
+ break;
+
case IPPROTO_IPV6: /* RFC 2893 */
PULLUP_TO(hlen, ulp, struct ip6_hdr);
break;
==== //depot/projects/newisp/pci/agp_ati.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/agp_ati.c,v 1.2 2005/12/20 21:12:26 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/agp_ati.c,v 1.3 2006/09/01 02:22:17 anholt Exp $");
#include "opt_bus.h"
@@ -89,6 +89,8 @@
return ("ATI RS100 AGP bridge");
case 0xcab21002:
return ("ATI RS200 AGP bridge");
+ case 0xcbb21002:
+ return ("ATI RS200M AGP bridge");
case 0xcab31002:
return ("ATI RS250 AGP bridge");
case 0x58301002:
@@ -181,7 +183,8 @@
switch (pci_get_devid(dev)) {
case 0xcab01002: /* ATI RS100 AGP bridge */
- case 0xcab21002: /*ATI RS200 AGP bridge */
+ case 0xcab21002: /* ATI RS200 AGP bridge */
+ case 0xcbb21002: /* ATI RS200M AGP bridge */
case 0xcab31002: /* ATI RS250 AGP bridge */
sc->is_rs300 = 0;
apsize_reg = ATI_RS100_APSIZE;
More information about the p4-projects
mailing list