Module Name: src Committed By: nonaka Date: Thu Feb 14 03:33:55 UTC 2019
Modified Files: src/sys/dev/usb: if_urndis.c Added Files: src/sys/dev/ic: rndisreg.h Removed Files: src/sys/dev/usb: if_urndisreg.h Log Message: separate RNDIS definitions from urndis(4) for use with Hyper-V NetVSC. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/rndisreg.h cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_urndis.c cvs rdiff -u -r1.4 -r0 src/sys/dev/usb/if_urndisreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/if_urndis.c diff -u src/sys/dev/usb/if_urndis.c:1.19 src/sys/dev/usb/if_urndis.c:1.20 --- src/sys/dev/usb/if_urndis.c:1.19 Fri Nov 9 21:57:09 2018 +++ src/sys/dev/usb/if_urndis.c Thu Feb 14 03:33:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urndis.c,v 1.19 2018/11/09 21:57:09 maya Exp $ */ +/* $NetBSD: if_urndis.c,v 1.20 2019/02/14 03:33:55 nonaka Exp $ */ /* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */ /* @@ -21,7 +21,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.19 2018/11/09 21:57:09 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.20 2019/02/14 03:33:55 nonaka Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -53,7 +53,56 @@ __KERNEL_RCSID(0, "$NetBSD: if_urndis.c, #include <dev/usb/usbdevs.h> #include <dev/usb/usbcdc.h> -#include <dev/usb/if_urndisreg.h> +#include <dev/ic/rndisreg.h> + +#define RNDIS_RX_LIST_CNT 1 +#define RNDIS_TX_LIST_CNT 1 +#define RNDIS_BUFSZ 1562 + +struct urndis_softc; + +struct urndis_chain { + struct urndis_softc *sc_softc; + struct usbd_xfer *sc_xfer; + char *sc_buf; + struct mbuf *sc_mbuf; + int sc_idx; +}; + +struct urndis_cdata { + struct urndis_chain sc_rx_chain[RNDIS_RX_LIST_CNT]; + struct urndis_chain sc_tx_chain[RNDIS_TX_LIST_CNT]; + int sc_tx_cnt; +}; + +#define GET_IFP(sc) (&(sc)->sc_ec.ec_if) +struct urndis_softc { + device_t sc_dev; + + char sc_attached; + int sc_dying; + struct ethercom sc_ec; + + /* RNDIS device info */ + uint32_t sc_filter; + uint32_t sc_maxppt; + uint32_t sc_maxtsz; + uint32_t sc_palign; + + /* USB goo */ + struct usbd_device * sc_udev; + int sc_ifaceno_ctl; + struct usbd_interface * sc_iface_ctl; + struct usbd_interface * sc_iface_data; + + struct timeval sc_rx_notice; + int sc_bulkin_no; + struct usbd_pipe * sc_bulkin_pipe; + int sc_bulkout_no; + struct usbd_pipe * sc_bulkout_pipe; + + struct urndis_cdata sc_data; +}; #ifdef URNDIS_DEBUG #define DPRINTF(x) do { printf x; } while (0) @@ -86,16 +135,16 @@ static void urndis_stop(struct ifnet *); static usbd_status urndis_ctrl_msg(struct urndis_softc *, uint8_t, uint8_t, uint16_t, uint16_t, void *, size_t); static usbd_status urndis_ctrl_send(struct urndis_softc *, void *, size_t); -static struct urndis_comp_hdr *urndis_ctrl_recv(struct urndis_softc *); +static struct rndis_comp_hdr *urndis_ctrl_recv(struct urndis_softc *); static uint32_t urndis_ctrl_handle(struct urndis_softc *, - struct urndis_comp_hdr *, void **, size_t *); + struct rndis_comp_hdr *, void **, size_t *); static uint32_t urndis_ctrl_handle_init(struct urndis_softc *, - const struct urndis_comp_hdr *); + const struct rndis_comp_hdr *); static uint32_t urndis_ctrl_handle_query(struct urndis_softc *, - const struct urndis_comp_hdr *, void **, size_t *); + const struct rndis_comp_hdr *, void **, size_t *); static uint32_t urndis_ctrl_handle_reset(struct urndis_softc *, - const struct urndis_comp_hdr *); + const struct rndis_comp_hdr *); static uint32_t urndis_ctrl_init(struct urndis_softc *); #if 0 @@ -164,10 +213,10 @@ urndis_ctrl_send(struct urndis_softc *sc return err; } -static struct urndis_comp_hdr * +static struct rndis_comp_hdr * urndis_ctrl_recv(struct urndis_softc *sc) { - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; char *buf; usbd_status err; @@ -181,7 +230,7 @@ urndis_ctrl_recv(struct urndis_softc *sc return NULL; } - hdr = (struct urndis_comp_hdr *)buf; + hdr = (struct rndis_comp_hdr *)buf; DPRINTF(("%s: urndis_ctrl_recv: type 0x%x len %u\n", DEVNAME(sc), le32toh(hdr->rm_type), @@ -200,7 +249,7 @@ urndis_ctrl_recv(struct urndis_softc *sc } static uint32_t -urndis_ctrl_handle(struct urndis_softc *sc, struct urndis_comp_hdr *hdr, +urndis_ctrl_handle(struct urndis_softc *sc, struct rndis_comp_hdr *hdr, void **buf, size_t *bufsz) { uint32_t rval; @@ -243,11 +292,11 @@ urndis_ctrl_handle(struct urndis_softc * static uint32_t urndis_ctrl_handle_init(struct urndis_softc *sc, - const struct urndis_comp_hdr *hdr) + const struct rndis_comp_hdr *hdr) { - const struct urndis_init_comp *msg; + const struct rndis_init_comp *msg; - msg = (const struct urndis_init_comp *) hdr; + msg = (const struct rndis_init_comp *) hdr; DPRINTF(("%s: urndis_ctrl_handle_init: len %u rid %u status 0x%x " "ver_major %u ver_minor %u devflags 0x%x medium 0x%x pktmaxcnt %u " @@ -307,11 +356,11 @@ urndis_ctrl_handle_init(struct urndis_so static uint32_t urndis_ctrl_handle_query(struct urndis_softc *sc, - const struct urndis_comp_hdr *hdr, void **buf, size_t *bufsz) + const struct rndis_comp_hdr *hdr, void **buf, size_t *bufsz) { - const struct urndis_query_comp *msg; + const struct rndis_query_comp *msg; - msg = (const struct urndis_query_comp *) hdr; + msg = (const struct rndis_query_comp *) hdr; DPRINTF(("%s: urndis_ctrl_handle_query: len %u rid %u status 0x%x " "buflen %u bufoff %u\n", @@ -365,12 +414,12 @@ urndis_ctrl_handle_query(struct urndis_s static uint32_t urndis_ctrl_handle_reset(struct urndis_softc *sc, - const struct urndis_comp_hdr *hdr) + const struct rndis_comp_hdr *hdr) { - const struct urndis_reset_comp *msg; + const struct rndis_reset_comp *msg; uint32_t rval; - msg = (const struct urndis_reset_comp *) hdr; + msg = (const struct rndis_reset_comp *) hdr; rval = le32toh(msg->rm_status); @@ -405,9 +454,9 @@ urndis_ctrl_handle_reset(struct urndis_s static uint32_t urndis_ctrl_init(struct urndis_softc *sc) { - struct urndis_init_req *msg; + struct rndis_init_req *msg; uint32_t rval; - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; msg = kmem_alloc(sizeof(*msg), KM_SLEEP); msg->rm_type = htole32(REMOTE_NDIS_INITIALIZE_MSG); @@ -448,7 +497,7 @@ urndis_ctrl_init(struct urndis_softc *sc static uint32_t urndis_ctrl_halt(struct urndis_softc *sc) { - struct urndis_halt_req *msg; + struct rndis_halt_req *msg; uint32_t rval; msg = kmem_alloc(sizeof(*msg), KM_SLEEP); @@ -477,9 +526,9 @@ urndis_ctrl_query(struct urndis_softc *s void *qbuf, size_t qlen, void **rbuf, size_t *rbufsz) { - struct urndis_query_req *msg; + struct rndis_query_req *msg; uint32_t rval; - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; msg = kmem_alloc(sizeof(*msg) + qlen, KM_SLEEP); msg->rm_type = htole32(REMOTE_NDIS_QUERY_MSG); @@ -525,9 +574,9 @@ urndis_ctrl_query(struct urndis_softc *s static uint32_t urndis_ctrl_set(struct urndis_softc *sc, uint32_t oid, void *buf, size_t len) { - struct urndis_set_req *msg; + struct rndis_set_req *msg; uint32_t rval; - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; msg = kmem_alloc(sizeof(*msg) + len, KM_SLEEP); msg->rm_type = htole32(REMOTE_NDIS_SET_MSG); @@ -580,7 +629,7 @@ urndis_ctrl_set_param(struct urndis_soft void *buf, size_t len) { - struct urndis_set_parameter *param; + struct rndis_set_parameter *param; uint32_t rval; size_t namelen, tlen; @@ -625,9 +674,9 @@ urndis_ctrl_set_param(struct urndis_soft static uint32_t urndis_ctrl_reset(struct urndis_softc *sc) { - struct urndis_reset_req *reset; + struct rndis_reset_req *reset; uint32_t rval; - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; reset = kmem_alloc(sizeof(*reset), KM_SLEEP); reset->rm_type = htole32(REMOTE_NDIS_RESET_MSG); @@ -660,9 +709,9 @@ urndis_ctrl_reset(struct urndis_softc *s static uint32_t urndis_ctrl_keepalive(struct urndis_softc *sc) { - struct urndis_keepalive_req *keep; + struct rndis_keepalive_req *keep; uint32_t rval; - struct urndis_comp_hdr *hdr; + struct rndis_comp_hdr *hdr; keep = kmem_alloc(sizeof(*keep), KM_SLEEP); keep->rm_type = htole32(REMOTE_NDIS_KEEPALIVE_MSG); @@ -702,11 +751,11 @@ urndis_encap(struct urndis_softc *sc, st { struct urndis_chain *c; usbd_status err; - struct urndis_packet_msg *msg; + struct rndis_packet_msg *msg; c = &sc->sc_data.sc_tx_chain[idx]; - msg = (struct urndis_packet_msg *)c->sc_buf; + msg = (struct rndis_packet_msg *)c->sc_buf; memset(msg, 0, sizeof(*msg)); msg->rm_type = htole32(REMOTE_NDIS_PACKET_MSG); @@ -746,7 +795,7 @@ static void urndis_decap(struct urndis_softc *sc, struct urndis_chain *c, uint32_t len) { struct mbuf *m; - struct urndis_packet_msg *msg; + struct rndis_packet_msg *msg; struct ifnet *ifp; int s; int offset; @@ -755,7 +804,7 @@ urndis_decap(struct urndis_softc *sc, st offset = 0; while (len > 1) { - msg = (struct urndis_packet_msg *)((char*)c->sc_buf + offset); + msg = (struct rndis_packet_msg *)((char*)c->sc_buf + offset); m = c->sc_mbuf; DPRINTF(("%s: urndis_decap buffer size left %u\n", DEVNAME(sc), Added files: Index: src/sys/dev/ic/rndisreg.h diff -u /dev/null src/sys/dev/ic/rndisreg.h:1.1 --- /dev/null Thu Feb 14 03:33:55 2019 +++ src/sys/dev/ic/rndisreg.h Thu Feb 14 03:33:55 2019 @@ -0,0 +1,271 @@ +/* $NetBSD: rndisreg.h,v 1.1 2019/02/14 03:33:55 nonaka Exp $ */ +/* NetBSD: if_urndisreg.h,v 1.4 2018/11/09 21:57:09 maya Exp */ +/* $OpenBSD: if_urndisreg.h,v 1.14 2010/07/08 18:22:01 ckuethe Exp $ */ + +/* + * Copyright (c) 2010 Jonathan Armani <arm...@openbsd.org> + * Copyright (c) 2010 Fabien Romano <fab...@openbsd.org> + * Copyright (c) 2010 Michael Knudsen <m...@openbsd.org> + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _DEV_IC_RNDISREG_H_ +#define _DEV_IC_RNDISREG_H_ + +#define RNDIS_STATUS_BUFFER_OVERFLOW 0x80000005L +#define RNDIS_STATUS_FAILURE 0xC0000001L +#define RNDIS_STATUS_INVALID_DATA 0xC0010015L +#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000BL +#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000CL +#define RNDIS_STATUS_NOT_SUPPORTED 0xC00000BBL +#define RNDIS_STATUS_PENDING STATUS_PENDING /* XXX */ +#define RNDIS_STATUS_RESOURCES 0xC000009AL +#define RNDIS_STATUS_SUCCESS 0x00000000L + +#define OID_GEN_SUPPORTED_LIST 0x00010101 +#define OID_GEN_HARDWARE_STATUS 0x00010102 +#define OID_GEN_MEDIA_SUPPORTED 0x00010103 +#define OID_GEN_MEDIA_IN_USE 0x00010104 +#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 +#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 +#define OID_GEN_LINK_SPEED 0x00010107 +#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 +#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 +#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A +#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B +#define OID_GEN_VENDOR_ID 0x0001010C +#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D +#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E +#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F +#define OID_GEN_DRIVER_VERSION 0x00010110 +#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 +#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 +#define OID_GEN_MAC_OPTIONS 0x00010113 +#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 +#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 +#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116 +#define OID_GEN_SUPPORTED_GUIDS 0x00010117 +#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 +#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119 +#define OID_GEN_MACHINE_NAME 0x0001021A +#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B +#define OID_GEN_VLAN_ID 0x0001021C + +#define OID_802_3_PERMANENT_ADDRESS 0x01010101 +#define OID_802_3_CURRENT_ADDRESS 0x01010102 +#define OID_802_3_MULTICAST_LIST 0x01010103 +#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 +#define OID_802_3_MAC_OPTIONS 0x01010105 +#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 +#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 +#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 +#define OID_802_3_XMIT_DEFERRED 0x01020201 +#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 +#define OID_802_3_RCV_OVERRUN 0x01020203 +#define OID_802_3_XMIT_UNDERRUN 0x01020204 +#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 +#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 +#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 + +#define RNDIS_MEDIUM_802_3 0x00000000 + +#define RNDIS_MAJOR_VERSION 0x00000001U +#define RNDIS_MINOR_VERSION 0x00000000U + +/* Device flags */ +#define RNDIS_DF_CONNECTIONLESS 0x00000001 +#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002 + +/* + * RNDIS data message + */ +#define REMOTE_NDIS_PACKET_MSG 0x00000001 + + +struct rndis_packet_msg { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_dataoffset; + uint32_t rm_datalen; + uint32_t rm_oobdataoffset; + uint32_t rm_oobdatalen; + uint32_t rm_oobdataelements; + uint32_t rm_pktinfooffset; + uint32_t rm_pktinfolen; + uint32_t rm_vchandle; + uint32_t rm_reserved; +}; + +/* + * RNDIS control messages + */ +struct rndis_comp_hdr { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_status; +}; + +/* Initialize the device. */ +#define REMOTE_NDIS_INITIALIZE_MSG 0x00000002 +#define REMOTE_NDIS_INITIALIZE_CMPLT 0x80000002 + +struct rndis_init_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_ver_major; + uint32_t rm_ver_minor; + uint32_t rm_max_xfersz; +}; + +struct rndis_init_comp { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_status; + uint32_t rm_ver_major; + uint32_t rm_ver_minor; + uint32_t rm_devflags; + uint32_t rm_medium; + uint32_t rm_pktmaxcnt; + uint32_t rm_pktmaxsz; + uint32_t rm_align; + uint32_t rm_aflistoffset; + uint32_t rm_aflistsz; +}; + +/* Halt the device. No response sent. */ +#define REMOTE_NDIS_HALT_MSG 0x00000003 + +struct rndis_halt_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; +}; + +/* Send a query object. */ +#define REMOTE_NDIS_QUERY_MSG 0x00000004 +#define REMOTE_NDIS_QUERY_CMPLT 0x80000004 + +struct rndis_query_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_oid; + uint32_t rm_infobuflen; + uint32_t rm_infobufoffset; + uint32_t rm_devicevchdl; +}; + +struct rndis_query_comp { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_status; + uint32_t rm_infobuflen; + uint32_t rm_infobufoffset; +}; + +/* Send a set object request. */ +#define REMOTE_NDIS_SET_MSG 0x00000005 +#define REMOTE_NDIS_SET_CMPLT 0x80000005 + +struct rndis_set_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_oid; + uint32_t rm_infobuflen; + uint32_t rm_infobufoffset; + uint32_t rm_devicevchdl; +}; + +struct rndis_set_comp { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_status; +}; + +#define REMOTE_NDIS_SET_PARAM_NUMERIC 0x00000000 +#define REMOTE_NDIS_SET_PARAM_STRING 0x00000002 + +struct rndis_set_parameter { + uint32_t rm_nameoffset; + uint32_t rm_namelen; + uint32_t rm_type; + uint32_t rm_valueoffset; + uint32_t rm_valuelen; +}; + +/* Perform a soft reset on the device. */ +#define REMOTE_NDIS_RESET_MSG 0x00000006 +#define REMOTE_NDIS_RESET_CMPLT 0x80000006 + +struct rndis_reset_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; +}; + +struct rndis_reset_comp { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_status; + uint32_t rm_adrreset; +}; + +/* 802.3 link-state or undefined message error. */ +#define REMOTE_NDIS_INDICATE_STATUS_MSG 0x00000007 + +/* Keepalive messsage. May be sent by device. */ +#define REMOTE_NDIS_KEEPALIVE_MSG 0x00000008 +#define REMOTE_NDIS_KEEPALIVE_CMPLT 0x80000008 + +struct rndis_keepalive_req { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; +}; + +struct rndis_keepalive_comp { + uint32_t rm_type; + uint32_t rm_len; + uint32_t rm_rid; + uint32_t rm_status; +}; + +/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */ +#define RNDIS_PACKET_TYPE_DIRECTED 0x00000001 +#define RNDIS_PACKET_TYPE_MULTICAST 0x00000002 +#define RNDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004 +#define RNDIS_PACKET_TYPE_BROADCAST 0x00000008 +#define RNDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010 +#define RNDIS_PACKET_TYPE_PROMISCUOUS 0x00000020 +#define RNDIS_PACKET_TYPE_SMT 0x00000040 +#define RNDIS_PACKET_TYPE_ALL_LOCAL 0x00000080 +#define RNDIS_PACKET_TYPE_GROUP 0x00001000 +#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00002000 +#define RNDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 +#define RNDIS_PACKET_TYPE_MAC_FRAME 0x00008000 + +/* Rndis offsets */ +#define RNDIS_HEADER_OFFSET (sizeof(uint32_t) * 2) +#define RNDIS_DATA_OFFSET (sizeof(struct rndis_packet_msg) - \ + offsetof(struct rndis_packet_msg, \ + rm_dataoffset)) + +#endif /* _DEV_IC_RNDISREG_H_ */