Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Sep 2013 11:31:17 GMT
From:      bguan@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r257758 - soc2013/bguan/head/sys/dev/xen/usbfront
Message-ID:  <201309271131.r8RBVHF8021354@socsvn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bguan
Date: Fri Sep 27 11:31:17 2013
New Revision: 257758
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257758

Log:
  set the pipe methods for xen usb host controller

Modified:
  soc2013/bguan/head/sys/dev/xen/usbfront/xenhcireg.h

Modified: soc2013/bguan/head/sys/dev/xen/usbfront/xenhcireg.h
==============================================================================
--- soc2013/bguan/head/sys/dev/xen/usbfront/xenhcireg.h	Fri Sep 27 11:31:04 2013	(r257757)
+++ soc2013/bguan/head/sys/dev/xen/usbfront/xenhcireg.h	Fri Sep 27 11:31:17 2013	(r257758)
@@ -1,8 +1,6 @@
-/* $FreeBSD: head/sys/dev/xen/usbfront/xenhcireg.h 251252 2013-06-02 12:00:16Z hselasky $ */
-
 /*-
  * Copyright (c) 2013 Bei Guan. All rights reserved.
- * Taken from the dev/usb/controller/xhcireg.h 
+ * Take from the dev/usb/controller/xhcireg.h 
  * TODO Need to modify as required.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,89 +28,7 @@
 #ifndef _XENHCIREG_H_
 #define	_XENHCIREG_H_
 
-/* XHCI PCI config registers */
-#define	PCI_XHCI_CBMEM		0x10	/* configuration base MEM */
-#define	PCI_XHCI_USBREV		0x60	/* RO USB protocol revision */
-#define	PCI_USB_REV_3_0		0x30	/* USB 3.0 */
-#define	PCI_XHCI_FLADJ		0x61	/* RW frame length adjust */
-
-#define	PCI_XHCI_INTEL_XUSB2PR	0xD0	/* Intel USB2 Port Routing */
-#define	PCI_XHCI_INTEL_USB3_PSSEN 0xD8	/* Intel USB3 Port SuperSpeed Enable */
-
-/* XHCI capability registers */
-#define	XHCI_CAPLENGTH		0x00	/* RO capability */
-#define	XHCI_RESERVED		0x01	/* Reserved */
-#define	XHCI_HCIVERSION		0x02	/* RO Interface version number */
-#define	XHCI_HCIVERSION_0_9	0x0090	/* xHCI version 0.9 */
-#define	XHCI_HCIVERSION_1_0	0x0100	/* xHCI version 1.0 */
-#define	XHCI_HCSPARAMS1		0x04	/* RO structual parameters 1 */
-#define	XHCI_HCS1_DEVSLOT_MAX(x)((x) & 0xFF)
-#define	XHCI_HCS1_IRQ_MAX(x)	(((x) >> 8) & 0x3FF)
-#define	XHCI_HCS1_N_PORTS(x)	(((x) >> 24) & 0xFF)
-#define	XHCI_HCSPARAMS2		0x08	/* RO structual parameters 2 */
-#define	XHCI_HCS2_IST(x)	((x) & 0xF)
-#define	XHCI_HCS2_ERST_MAX(x)	(((x) >> 4) & 0xF)
-#define	XHCI_HCS2_SPR(x)	(((x) >> 24) & 0x1)
-#define	XHCI_HCS2_SPB_MAX(x)	(((x) >> 27) & 0x7F)
-#define	XHCI_HCSPARAMS3		0x0C	/* RO structual parameters 3 */
-#define	XHCI_HCS3_U1_DEL(x)	((x) & 0xFF)
-#define	XHCI_HCS3_U2_DEL(x)	(((x) >> 16) & 0xFFFF)
-#define	XHCI_HCSPARAMS0		0x10	/* RO capability parameters */
-#define	XHCI_HCS0_AC64(x)	((x) & 0x1)		/* 64-bit capable */
-#define	XHCI_HCS0_BNC(x)	(((x) >> 1) & 0x1)	/* BW negotiation */
-#define	XHCI_HCS0_CSZ(x)	(((x) >> 2) & 0x1)	/* context size */
-#define	XHCI_HCS0_PPC(x)	(((x) >> 3) & 0x1)	/* port power control */
-#define	XHCI_HCS0_PIND(x)	(((x) >> 4) & 0x1)	/* port indicators */
-#define	XHCI_HCS0_LHRC(x)	(((x) >> 5) & 0x1)	/* light HC reset */
-#define	XHCI_HCS0_LTC(x)	(((x) >> 6) & 0x1)	/* latency tolerance msg */
-#define	XHCI_HCS0_NSS(x)	(((x) >> 7) & 0x1)	/* no secondary sid */
-#define	XHCI_HCS0_PSA_SZ_MAX(x)	(((x) >> 12) & 0xF)	/* max pri. stream array size */
-#define	XHCI_HCS0_XECP(x)	(((x) >> 16) & 0xFFFF)	/* extended capabilities pointer */
-#define	XHCI_DBOFF		0x14	/* RO doorbell offset */
-#define	XHCI_RTSOFF		0x18	/* RO runtime register space offset */
-
-/* XHCI operational registers.  Offset given by XHCI_CAPLENGTH register */
-#define	XHCI_USBCMD		0x00	/* XHCI command */
-#define	XHCI_CMD_RS		0x00000001	/* RW Run/Stop */
-#define	XHCI_CMD_HCRST		0x00000002	/* RW Host Controller Reset */
-#define	XHCI_CMD_INTE		0x00000004	/* RW Interrupter Enable */
-#define	XHCI_CMD_HSEE		0x00000008	/* RW Host System Error Enable */
-#define	XHCI_CMD_LHCRST		0x00000080	/* RO/RW Light Host Controller Reset */
-#define	XHCI_CMD_CSS		0x00000100	/* RW Controller Save State */
-#define	XHCI_CMD_CRS		0x00000200	/* RW Controller Restore State */
-#define	XHCI_CMD_EWE		0x00000400	/* RW Enable Wrap Event */
-#define	XHCI_CMD_EU3S		0x00000800	/* RW Enable U3 MFINDEX Stop */
-#define	XHCI_USBSTS		0x04	/* XHCI status */
-#define	XHCI_STS_HCH		0x00000001	/* RO - Host Controller Halted */
-#define	XHCI_STS_HSE		0x00000004	/* RW - Host System Error */
-#define	XHCI_STS_EINT		0x00000008	/* RW - Event Interrupt */
-#define	XHCI_STS_PCD		0x00000010	/* RW - Port Change Detect */
-#define	XHCI_STS_SSS		0x00000100	/* RO - Save State Status */
-#define	XHCI_STS_RSS		0x00000200	/* RO - Restore State Status */
-#define	XHCI_STS_SRE		0x00000400	/* RW - Save/Restore Error */
-#define	XHCI_STS_CNR		0x00000800	/* RO - Controller Not Ready */
-#define	XHCI_STS_HCE		0x00001000	/* RO - Host Controller Error */
-#define	XHCI_PAGESIZE		0x08	/* XHCI page size mask */
-#define	XHCI_PAGESIZE_4K	0x00000001	/* 4K Page Size */
-#define	XHCI_PAGESIZE_8K	0x00000002	/* 8K Page Size */
-#define	XHCI_PAGESIZE_16K	0x00000004	/* 16K Page Size */
-#define	XHCI_PAGESIZE_32K	0x00000008	/* 32K Page Size */
-#define	XHCI_PAGESIZE_64K	0x00000010	/* 64K Page Size */
-#define	XHCI_DNCTRL		0x14	/* XHCI device notification control */
-#define	XHCI_DNCTRL_MASK(n)	(1U << (n))
-#define	XHCI_CRCR_LO		0x18	/* XHCI command ring control */
-#define	XHCI_CRCR_LO_RCS	0x00000001	/* RW - consumer cycle state */
-#define	XHCI_CRCR_LO_CS		0x00000002	/* RW - command stop */
-#define	XHCI_CRCR_LO_CA		0x00000004	/* RW - command abort */
-#define	XHCI_CRCR_LO_CRR	0x00000008	/* RW - command ring running */
-#define	XHCI_CRCR_LO_MASK	0x0000000F
-#define	XHCI_CRCR_HI		0x1C	/* XHCI command ring control */
-#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 slots enabled */
-
-/* XHCI port status registers */
+/* XENHCI port status registers */
 #define	XENHCI_PORTSC(n)	(0x3F0 + (0x10 * (n)))	/* XHCI port status */
 #define	XENHCI_PS_CCS		0x00000001	/* RO - current connect status */
 #define	XENHCI_PS_PED		0x00000002	/* RW - port enabled / disabled */
@@ -132,92 +48,15 @@
 #define	XENHCI_PS_PRC		0x00200000	/* RW - port reset change */
 #define	XENHCI_PS_PLC		0x00400000	/* RW - port link state change */
 #define	XENHCI_PS_CEC		0x00800000	/* RW - config error change */
-#define	XHCI_PS_CAS		0x01000000	/* RO - cold attach status */
-#define	XHCI_PS_WCE		0x02000000	/* RW - wake on connect enable */
-#define	XHCI_PS_WDE		0x04000000	/* RW - wake on disconnect enable */
-#define	XHCI_PS_WOE		0x08000000	/* RW - wake on over-current enable */
-#define	XHCI_PS_DR		0x40000000	/* RO - device removable */
-#define	XHCI_PS_WPR		0x80000000U	/* RW - warm port reset */
+#define	XENHCI_PS_CAS		0x01000000	/* RO - cold attach status */
+#define	XENHCI_PS_WCE		0x02000000	/* RW - wake on connect enable */
+#define	XENHCI_PS_WDE		0x04000000	/* RW - wake on disconnect enable */
+#define	XENHCI_PS_WOE		0x08000000	/* RW - wake on over-current enable */
+#define	XENHCI_PS_DR		0x40000000	/* RO - device removable */
+#define	XENHCI_PS_WPR		0x80000000U	/* RW - warm port reset */
 #define	XENHCI_PS_CLEAR		0x80FF01FFU	/* command bits */
 
-#define	XHCI_PORTPMSC(n)	(0x3F4 + (0x10 * (n)))	/* XHCI status and control */
-#define	XHCI_PM3_U1TO_GET(x)	(((x) >> 0) & 0xFF)	/* RW - U1 timeout */
-#define	XHCI_PM3_U1TO_SET(x)	(((x) & 0xFF) << 0)	/* RW - U1 timeout */
-#define	XHCI_PM3_U2TO_GET(x)	(((x) >> 8) & 0xFF)	/* RW - U2 timeout */
-#define	XHCI_PM3_U2TO_SET(x)	(((x) & 0xFF) << 8)	/* RW - U2 timeout */
-#define	XHCI_PM3_FLA		0x00010000	/* RW - Force Link PM Accept */
-#define	XHCI_PM2_L1S_GET(x)	(((x) >> 0) & 0x7)	/* RO - L1 status */
-#define	XHCI_PM2_RWE		0x00000008		/* RW - remote wakup enable */
-#define	XHCI_PM2_HIRD_GET(x)	(((x) >> 4) & 0xF)	/* RW - host initiated resume duration */
-#define	XHCI_PM2_HIRD_SET(x)	(((x) & 0xF) << 4)	/* RW - host initiated resume duration */
-#define	XHCI_PM2_L1SLOT_GET(x)	(((x) >> 8) & 0xFF)	/* RW - L1 device slot */
-#define	XHCI_PM2_L1SLOT_SET(x)	(((x) & 0xFF) << 8)	/* RW - L1 device slot */
-#define	XHCI_PM2_HLE		0x00010000		/* RW - hardware LPM enable */
-#define	XHCI_PORTLI(n)		(0x3F8 + (0x10 * (n)))	/* XHCI port link info */
-#define	XHCI_PLI3_ERR_GET(x)	(((x) >> 0) & 0xFFFF)	/* RO - port link errors */
-#define	XHCI_PORTRSV(n)		(0x3FC + (0x10 * (n)))	/* XHCI port reserved */
-
-/* XHCI runtime registers.  Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
-#define	XHCI_MFINDEX		0x0000		/* RO - microframe index */
-#define	XHCI_MFINDEX_GET(x)	((x) & 0x3FFF)
-#define	XHCI_IMAN(n)		(0x0020 + (0x20 * (n)))	/* XHCI interrupt management */
-#define	XHCI_IMAN_INTR_PEND	0x00000001	/* RW - interrupt pending */
-#define	XHCI_IMAN_INTR_ENA	0x00000002	/* RW - interrupt enable */
-#define	XHCI_IMOD(n)		(0x0024 + (0x20 * (n)))	/* XHCI interrupt moderation */
-#define	XHCI_IMOD_IVAL_GET(x)	(((x) >> 0) & 0xFFFF)	/* 250ns unit */
-#define	XHCI_IMOD_IVAL_SET(x)	(((x) & 0xFFFF) << 0)	/* 250ns unit */
-#define	XHCI_IMOD_ICNT_GET(x)	(((x) >> 16) & 0xFFFF)	/* 250ns unit */
-#define	XHCI_IMOD_ICNT_SET(x)	(((x) & 0xFFFF) << 16)	/* 250ns unit */
-#define	XHCI_IMOD_DEFAULT	0x000003E8U	/* 8000 IRQ/second */
-#define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n)))	/* XHCI event ring segment table size */
-#define	XHCI_ERSTS_GET(x)	((x) & 0xFFFF)
-#define	XHCI_ERSTS_SET(x)	((x) & 0xFFFF)
-#define	XHCI_ERSTBA_LO(n)	(0x0030 + (0x20 * (n)))	/* XHCI event ring segment table BA */
-#define	XHCI_ERSTBA_HI(n)	(0x0034 + (0x20 * (n)))	/* XHCI event ring segment table BA */
-#define	XHCI_ERDP_LO(n)	(0x0038 + (0x20 * (n)))	/* XHCI event ring dequeue pointer */
-#define	XHCI_ERDP_LO_SINDEX(x)	((x) & 0x7)	/* RO - dequeue segment index */
-#define	XHCI_ERDP_LO_BUSY	0x00000008	/* RW - event handler busy */
-#define	XHCI_ERDP_HI(n)	(0x003C + (0x20 * (n)))	/* XHCI event ring dequeue pointer */
-
-/* XHCI doorbell registers. Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */
-#define	XHCI_DOORBELL(n)	(0x0000 + (4 * (n)))
-#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 legacy support */
-#define	XHCI_XECP_ID(x)		((x) & 0xFF)
-#define	XHCI_XECP_NEXT(x)	(((x) >> 8) & 0xFF)
-#define	XHCI_XECP_BIOS_SEM	0x0002
-#define	XHCI_XECP_OS_SEM	0x0003
-
-/* XHCI capability ID's */
-#define	XHCI_ID_USB_LEGACY	0x0001
-#define	XHCI_ID_PROTOCOLS	0x0002
-#define	XHCI_ID_POWER_MGMT	0x0003
-#define	XHCI_ID_VIRTUALIZATION	0x0004
-#define	XHCI_ID_MSG_IRQ		0x0005
-#define	XHCI_ID_USB_LOCAL_MEM	0x0006
+#define	XENHCI_MFINDEX_GET(x)	((x) & 0x3FFF)
 
-/* XHCI register R/W wrappers */
-#define	XREAD1(sc, what, a) \
-	bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off)
-#define	XREAD2(sc, what, a) \
-	bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off)
-#define	XREAD4(sc, what, a) \
-	bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off)
-#define	XWRITE1(sc, what, a, x) \
-	bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off, (x))
-#define	XWRITE2(sc, what, a, x) \
-	bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off, (x))
-#define	XWRITE4(sc, what, a, x) \
-	bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, \
-		(a) + (sc)->sc_##what##_off, (x))
 
 #endif	/* _XENHCIREG_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309271131.r8RBVHF8021354>