From owner-p4-projects@FreeBSD.ORG Sat Jul 31 12:17:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4F831065676; Sat, 31 Jul 2010 12:17:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 792F2106566C for ; Sat, 31 Jul 2010 12:17:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2BA8FC08 for ; Sat, 31 Jul 2010 12:17:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VCH5Nv053934 for ; Sat, 31 Jul 2010 12:17:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VCH5Ue053932 for perforce@freebsd.org; Sat, 31 Jul 2010 12:17:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 31 Jul 2010 12:17:05 GMT Message-Id: <201007311217.o6VCH5Ue053932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2010 12:17:06 -0000 http://p4web.freebsd.org/@@181637?ac=10 Change 181637 by hselasky@hselasky_laptop001 on 2010/07/31 12:16:45 USB controller (XHCI): - add more register definitions Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#5 (text+ko) ==== @@ -107,7 +107,7 @@ #define XHCI_DCBAAP_LO 0x30 /* XHCI dev context BA pointer */ #define XHCI_DCBAAP_HI 0x34 /* XHCI dev context BA pointer */ #define XHCI_CONFIG 0x38 -#define XHCI_CONFIG_SLOTS_MASK 0x000000FF /* RW - number of device slot enabled */ +#define XHCI_CONFIG_SLOTS_MASK 0x000000FF /* RW - number of device slots enabled */ /* XHCI port status registers */ #define XHCI_PORTSC(n) (0x3F0 + (0x10 * (n))) /* XHCI port status */ @@ -175,13 +175,25 @@ #define XHCI_ERSTDP_LO_BUSY 0x00000008 /* RW - event handler busy */ #define XHCI_ERSTDP_HI(n) (0x003C + (0x20 * (n)) /* XHCI event ring dequeue pointer */ -/* XHCI doorbell registers. Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */ +/* XHCI doorbell registers. Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */ #define XHCI_DOORBELL 0x0000 #define XHCI_DB_TARGET_GET(x) ((x) & 0xFF) /* RW - doorbell target */ #define XHCI_DB_TARGET_SET(x) ((x) & 0xFF) /* RW - doorbell target */ #define XHCI_DB_SID_GET(x) (((x) >> 16) & 0xFFFF) /* RW - doorbell stream ID */ #define XHCI_DB_SID_SET(x) (((x) & 0xFFFF) << 16) /* RW - doorbell stream ID */ +/* XHCI interrupter registers. Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */ +#define XHCI_IMAN(i) (0x0020 + (0x20 * (i))) /* RW - interrupt management */ +#define XHCI_IMAN_IP_BIT (1U << 0) /* interrupt pending */ +#define XHCI_IMAN_IE_BIT (1U << 1) /* interrupt enable */ +#define XHCI_IMOD(i) (0x0024 + (0x20 * (i))) /* RW - interrupt moderation */ +#define XHCI_IMOD_DEFAULT 0x000001F4U /* 8000 IRQ/second */ +#define XHCI_ERSTSZ(i) (0x0028 + (0x20 * (i))) /* RW - segment table size */ +#define XHCI_ERSTBA_LO(i) (0x0030 + (0x20 * (i))) /* RW - segment base address */ +#define XHCI_ERSTBA_HI(i) (0x0034 + (0x20 * (i))) /* RW - segment base address */ +#define XHCI_ERDP_LO(i) (0x0038 + (0x20 * (i))) /* RW - dequeue pointer */ +#define XHCI_ERDP_HI(i) (0x003C + (0x20 * (i))) /* RW - dequeue pointer */ + /* XHCI register R/W wrappers */ #define XREAD1(sc, what, a) \ bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \