0775a9cbc6
Modification to Kconfig, vhci_hc.c, vhci.h and vhci_sysfs.c.
1. kernel config
Followings are added.
USBIP_VHCI_HC_PORTS: Number of ports per USB/IP virtual host
controller. The default is 8 - same as current VHCI_NPORTS.
USBIP_VHCI_NR_HCS: Number of USB/IP virtual host controllers. The
default is 1. This paratmeter is replaced with USBIP_VHCI_INIT_HCS and
USBIP_VHCI_MAX_HCS included in succeeding dynamic extension patch.
2. the_controller to controllers
the_controller is changed to vhci_pdevs: array of struct
platform_device.
3. vhci_sysfs.c
Sysfs structure is changed as following.
BEFORE:
/sys/devices/platform
+-- vhci
+-- status
+-- attach
+-- detach
+-- usbip_debug
AFTER: example for CONFIG_USBIP_NR_HCS=4
/sys/devices/platform
+-- vhci
| +-- nports
| +-- status
| +-- status.1
| +-- status.2
| +-- status.3
| +-- attach
| +-- detach
| +-- usbip_debug
+-- vhci.1
+-- vhci.2
+-- vhci.3
vhci[.N] is shown for each host controller kobj. vhch.1, vhci.2, ...
are shown only when CONFIG_USBIP_NR_HCS is more than 1. Only 'vhci'
(without number) has user space interfaces. 'nports' is newly added to
give ports-per-controller and number of controlles. Before that, number
of ports is acquired by reading status lines. Status is divided for
each controller to avoid page size (4KB) limitation.
Old userspace tool binaries work with the first status within the first
controller.
Inconsistency between status header and content is fixed.
4th and 5th column are
header: "dev bus"
content(unused): "000 000"
content(used): "%08x", devid
Only 1st and 2nd column are used by program. In old version, sscanf()
in parse_status expect no bus column. And bus_id string is shown in the
last column. Then bus in the header is removed and unused content is
replaced with 8 zeros. The sscanf() expects more than 5 columns and new
has 6 columns so there's no compatibility issue in this change.
Signed-off-by: Nobuo Iwata <nobuo.iwata@fujixerox.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
164 lines
3.4 KiB
C
164 lines
3.4 KiB
C
/*
|
|
* Copyright (C) 2003-2008 Takahiro Hirofuchi
|
|
* Copyright (C) 2015 Nobuo Iwata
|
|
*
|
|
* This is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
*/
|
|
|
|
#ifndef __USBIP_VHCI_H
|
|
#define __USBIP_VHCI_H
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/list.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/types.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/hcd.h>
|
|
#include <linux/wait.h>
|
|
|
|
struct vhci_device {
|
|
struct usb_device *udev;
|
|
|
|
/*
|
|
* devid specifies a remote usb device uniquely instead
|
|
* of combination of busnum and devnum.
|
|
*/
|
|
__u32 devid;
|
|
|
|
/* speed of a remote device */
|
|
enum usb_device_speed speed;
|
|
|
|
/* vhci root-hub port to which this device is attached */
|
|
__u32 rhport;
|
|
|
|
struct usbip_device ud;
|
|
|
|
/* lock for the below link lists */
|
|
spinlock_t priv_lock;
|
|
|
|
/* vhci_priv is linked to one of them. */
|
|
struct list_head priv_tx;
|
|
struct list_head priv_rx;
|
|
|
|
/* vhci_unlink is linked to one of them */
|
|
struct list_head unlink_tx;
|
|
struct list_head unlink_rx;
|
|
|
|
/* vhci_tx thread sleeps for this queue */
|
|
wait_queue_head_t waitq_tx;
|
|
};
|
|
|
|
/* urb->hcpriv, use container_of() */
|
|
struct vhci_priv {
|
|
unsigned long seqnum;
|
|
struct list_head list;
|
|
|
|
struct vhci_device *vdev;
|
|
struct urb *urb;
|
|
};
|
|
|
|
struct vhci_unlink {
|
|
/* seqnum of this request */
|
|
unsigned long seqnum;
|
|
|
|
struct list_head list;
|
|
|
|
/* seqnum of the unlink target */
|
|
unsigned long unlink_seqnum;
|
|
};
|
|
|
|
/* Number of supported ports. Value has an upperbound of USB_MAXCHILDREN */
|
|
#ifdef CONFIG_USBIP_VHCI_HC_PORTS
|
|
#define VHCI_HC_PORTS CONFIG_USBIP_VHCI_HC_PORTS
|
|
#else
|
|
#define VHCI_HC_PORTS 8
|
|
#endif
|
|
|
|
#ifdef CONFIG_USBIP_VHCI_NR_HCS
|
|
#define VHCI_NR_HCS CONFIG_USBIP_VHCI_NR_HCS
|
|
#else
|
|
#define VHCI_NR_HCS 1
|
|
#endif
|
|
|
|
#define MAX_STATUS_NAME 16
|
|
|
|
/* for usb_bus.hcpriv */
|
|
struct vhci_hcd {
|
|
spinlock_t lock;
|
|
|
|
u32 port_status[VHCI_HC_PORTS];
|
|
|
|
unsigned resuming:1;
|
|
unsigned long re_timeout;
|
|
|
|
atomic_t seqnum;
|
|
|
|
/*
|
|
* NOTE:
|
|
* wIndex shows the port number and begins from 1.
|
|
* But, the index of this array begins from 0.
|
|
*/
|
|
struct vhci_device vdev[VHCI_HC_PORTS];
|
|
};
|
|
|
|
extern int vhci_num_controllers;
|
|
extern struct platform_device **vhci_pdevs;
|
|
extern struct attribute_group vhci_attr_group;
|
|
|
|
/* vhci_hcd.c */
|
|
void rh_port_connect(struct vhci_device *vdev, enum usb_device_speed speed);
|
|
|
|
/* vhci_sysfs.c */
|
|
int vhci_init_attr_group(void);
|
|
void vhci_finish_attr_group(void);
|
|
|
|
/* vhci_rx.c */
|
|
struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum);
|
|
int vhci_rx_loop(void *data);
|
|
|
|
/* vhci_tx.c */
|
|
int vhci_tx_loop(void *data);
|
|
|
|
static inline __u32 port_to_rhport(__u32 port)
|
|
{
|
|
return port % VHCI_HC_PORTS;
|
|
}
|
|
|
|
static inline int port_to_pdev_nr(__u32 port)
|
|
{
|
|
return port / VHCI_HC_PORTS;
|
|
}
|
|
|
|
static inline struct vhci_hcd *hcd_to_vhci(struct usb_hcd *hcd)
|
|
{
|
|
return (struct vhci_hcd *) (hcd->hcd_priv);
|
|
}
|
|
|
|
static inline struct device *hcd_dev(struct usb_hcd *hcd)
|
|
{
|
|
return (hcd)->self.controller;
|
|
}
|
|
|
|
static inline const char *hcd_name(struct usb_hcd *hcd)
|
|
{
|
|
return (hcd)->self.bus_name;
|
|
}
|
|
|
|
static inline struct usb_hcd *vhci_to_hcd(struct vhci_hcd *vhci)
|
|
{
|
|
return container_of((void *) vhci, struct usb_hcd, hcd_priv);
|
|
}
|
|
|
|
static inline struct vhci_hcd *vdev_to_vhci(struct vhci_device *vdev)
|
|
{
|
|
return container_of(
|
|
(void *)(vdev - vdev->rhport), struct vhci_hcd, vdev);
|
|
}
|
|
|
|
#endif /* __USBIP_VHCI_H */
|