Merge 4.9.232 into android-4.9-q
Linux 4.9.232
perf: Make perf able to build with latest libbfd
perf tools: Fix snprint warnings for gcc 8
perf annotate: Use asprintf when formatting objdump command line
perf probe: Fix to check blacklist address correctly
xfs: set format back to extents if xfs_bmap_extents_to_btree
* regmap: debugfs: check count when read regmap file
drivers/base/regmap/regmap-debugfs.c
drivers/net/wan/x25_asy: Fix to make it work
ip6_gre: fix null-ptr-deref in ip6gre_init_net()
* tcp: allow at most one TLP probe per flight
include/linux/tcp.h
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
AX.25: Prevent integer overflows in connect and sendmsg
rxrpc: Fix sendmsg() returning EPIPE due to recvmsg() returning ENODATA
* net: udp: Fix wrong clean up for IS_UDPLITE macro
net/ipv4/udp.c
net/ipv6/udp.c
* net-sysfs: add a newline when printing 'tx_timeout' by sysfs
net/core/net-sysfs.c
* dev: Defer free of skbs in flush_backlog
net/core/dev.c
AX.25: Prevent out-of-bounds read in ax25_sendmsg()
AX.25: Fix out-of-bounds read in ax25_connect()
ath9k: Fix regression with Atheros 9271
ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb
parisc: Add atomic64_set_release() define to avoid CPU soft lockups
io-mapping: indicate mapping failure
* mm/memcg: fix refcount error while moving and swapping
mm/memcontrol.c
* Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation
Makefile
* vt: Reject zero-sized screen buffer size.
drivers/tty/vt/vt.c
serial: 8250_mtk: Fix high-speed baud rates clamping
serial: 8250: fix null-ptr-deref in serial8250_start_tx()
staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift
staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift
staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support
staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift
staging: wlan-ng: properly check endpoint types
Revert "cifs: Fix the target file was deleted when rename failed."
* usb: xhci: Fix ASM2142/ASM3142 DMA addressing
drivers/usb/host/xhci-pci.c
usb: xhci-mtk: fix the failure of bandwidth allocation
x86: math-emu: Fix up 'cmp' insn for clang ias
* arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP
arch/arm64/kernel/debug-monitors.c
usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init()
dmaengine: ioat setting ioat timeout as module parameter
* regmap: dev_get_regmap_match(): fix string comparison
drivers/base/regmap/regmap.c
dmaengine: tegra210-adma: Fix runtime PM imbalance on error
* HID: apple: Disable Fn-key key-re-mapping on clone keyboards
drivers/hid/hid-apple.c
HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override
scripts/decode_stacktrace: strip basepath from all paths
net: smc91x: Fix possible memory leak in smc_drv_probe()
net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration
* ax88172a: fix ax88172a_unbind() failures
drivers/net/usb/ax88172a.c
hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path
bnxt_en: Fix race when modifying pause settings.
btrfs: fix mount failure caused by race with umount
btrfs: fix double free on ulist after backref resolution failure
ASoC: rt5670: Correct RT5670_LDO_SEL_MASK
* ALSA: info: Drop WARN_ON() from buffer NULL sanity check
sound/core/info.c
uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression
SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion")
drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
net: sky2: initialize return of gm_phy_read
drivers/net/wan/lapbether: Fixed the value of hard_header_len
xtensa: update *pos in cpuinfo_op.next
xtensa: fix __sync_fetch_and_{and,or}_4 declarations
scsi: scsi_transport_spi: Fix function pointer check
mac80211: allow rx of mesh eapol frames with default rx key
pinctrl: amd: fix npins for uart0 in kerncz_groups
* UPSTREAM: xtables: extend matches and targets with .usersize
net/netfilter/xt_CT.c
net/netfilter/xt_TEE.c
net/netfilter/xt_bpf.c
net/netfilter/xt_connlimit.c
net/netfilter/xt_hashlimit.c
net/netfilter/xt_limit.c
net/netfilter/xt_quota.c
net/netfilter/xt_string.c
* UPSTREAM: ip6tables: use match, target and data copy_to_user helpers
net/ipv6/netfilter/ip6_tables.c
* UPSTREAM: iptables: use match, target and data copy_to_user helpers
net/ipv4/netfilter/ip_tables.c
* UPSTREAM: xtables: add xt_match, xt_target and data copy_to_user functions
include/linux/netfilter/x_tables.h
net/netfilter/x_tables.c
Merge 4.9.231 into android-4.9-q
Linux 4.9.231
x86/cpu: Move x86_cache_bits settings
* irqchip/gic: Atomically update affinity
drivers/irqchip/irq-gic.c
* sched/fair: handle case of task_h_load() returning 0
kernel/sched/fair.c
* arm64: ptrace: Override SPSR.SS when single-stepping is enabled
arch/arm64/include/asm/debug-monitors.h
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/ptrace.c
misc: atmel-ssc: lock with mutex instead of spinlock
dmaengine: fsl-edma: Fix NULL pointer exception in fsl_edma_tx_handler
hwmon: (emc2103) fix unable to change fan pwm1_enable attribute
MIPS: Fix build for LTS kernel caused by backporting lpj adjustment
* timer: Fix wheel index calculation on last level
kernel/time/timer.c
uio_pdrv_genirq: fix use without device tree and no interrupt
Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list
mei: bus: don't clean driver pointer
* fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS
fs/fuse/file.c
virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for rproc serial
USB: serial: option: add Quectel EG95 LTE modem
USB: serial: option: add GosunCn GM500 series
USB: serial: ch341: add new Product ID for CH340
USB: serial: cypress_m8: enable Simply Automated UPB PIM
USB: serial: iuu_phoenix: fix memory corruption
usb: gadget: function: fix missing spinlock in f_uac1_legacy
usb: chipidea: core: add wakeup support for extcon
usb: dwc2: Fix shutdown callback in platform
USB: c67x00: fix use after free in c67x00_giveback_urb
* ALSA: usb-audio: Fix race against the error recovery URB submission
sound/usb/midi.c
ALSA: line6: Perform sanity check for each URB creation
* usb: core: Add a helper function to check the validity of EP type in URB
drivers/usb/core/urb.c
include/linux/usb.h
* HID: magicmouse: do not set up autorepeat
drivers/hid/hid-magicmouse.c
mtd: rawnand: brcmnand: fix CS0 layout
perf stat: Zero all the 'ena' and 'run' array slot stats for interval mode
ARM: dts: socfpga: Align L2 cache-controller nodename with dtschema
Revert "thermal: mediatek: fix register index error"
staging: comedi: verify array index is correct before using it
usb: gadget: udc: atmel: fix uninitialized read in debug printk
spi: spi-sun6i: sun6i_spi_transfer_one(): fix setting of clock rate
iio:health:afe4404 Fix timestamp alignment and prevent data leak.
Revert "usb/ohci-platform: Fix a warning when hibernating"
* Revert "usb/xhci-plat: Set PM runtime as active on resume"
drivers/usb/host/xhci-plat.c
Revert "usb/ehci-platform: Set PM runtime as active on resume"
net: dsa: bcm_sf2: Fix node reference count
spi: fix initial SPI_SR value in spi-fsl-dspi
iio:health:afe4403 Fix timestamp alignment and prevent data leak.
iio:pressure:ms5611 Fix buffer element alignment
iio: pressure: zpa2326: handle pm_runtime_get_sync failure
iio: mma8452: Add missed iio_device_unregister() call in mma8452_probe()
iio: magnetometer: ak8974: Fix runtime PM imbalance on error
iio:magnetometer:ak8974: Fix alignment and data leak issues
i2c: eg20t: Load module automatically if ID matches
* cgroup: Fix sock_cgroup_data on big-endian.
include/linux/cgroup-defs.h
* cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
include/linux/cgroup-defs.h
include/linux/cgroup.h
kernel/cgroup.c
net/core/sock.c
* tcp: md5: allow changing MD5 keys in all socket states
net/ipv4/tcp.c
* tcp: md5: do not send silly options in SYNCOOKIES
net/ipv4/tcp_output.c
* tcp: make sure listeners don't initialize congestion-control state
net/ipv4/tcp.c
net/ipv4/tcp_cong.c
* genetlink: remove genl_bind
include/net/genetlink.h
net/netlink/genetlink.c
* tcp: md5: refine tcp_md5_do_add()/tcp_md5_hash_key() barriers
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
* tcp: md5: add missing memory barriers in tcp_md5_do_add()/tcp_md5_hash_key()
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net: usb: qmi_wwan: add support for Quectel EG95 LTE modem
* net: Added pointer check for dst->ops->neigh_lookup in dst_neigh_lookup_skb
include/net/dst.h
llc: make sure applications use ARPHRD_ETHER
* l2tp: remove skb_dst_set() from l2tp_xmit_skb()
net/l2tp/l2tp_core.c
* ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg
net/ipv4/ping.c
s390/mm: fix huge pte soft dirty copying
ARC: elf: use right ELF_ARCH
ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE
drm/radeon: fix double free
btrfs: fix fatal extent_buffer readahead vs releasepage race
Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb"
KVM: x86: bit 8 of non-leaf PDPEs is not reserved
* KVM: arm64: Fix definition of PAGE_HYP_DEVICE
arch/arm64/include/asm/pgtable-prot.h
* ALSA: usb-audio: add quirk for MacroSilicon MS2109
sound/usb/quirks-table.h
ALSA: hda - let hs_mic be picked ahead of hp_mic
ALSA: opl3: fix infoleak in opl3
net: macb: mark device wake capable when "magic-packet" property present
bnxt_en: fix NULL dereference in case SR-IOV configuration fails
* arm64: kgdb: Fix single-step exception handling oops
arch/arm64/kernel/kgdb.c
* ALSA: compress: fix partial_drain completion state
include/sound/compress_driver.h
sound/core/compress_offload.c
smsc95xx: avoid memory leak in smsc95xx_bind
smsc95xx: check return value of smsc95xx_reset
net: cxgb4: fix return error value in t4_prep_fw
scsi: mptscsih: Fix read sense data size
ARM: imx6: add missing put_device() call in imx6q_suspend_init()
cifs: update ctime and mtime during truncate
s390/kasan: fix early pgm check handler execution
* spi: spidev: fix a potential use-after-free in spidev_release()
drivers/spi/spidev.c
* spi: spidev: fix a race between spidev_release and spidev_remove
drivers/spi/spidev.c
gpu: host1x: Detach driver on unregister
KVM: s390: reduce number of IO pins to 1
ANDROID: cuttlefish_defconfig: Drop built-in cmdline (except nopti)
Merge 4.9.230 into android-4.9-q
Linux 4.9.230
* efi: Make it possible to disable efivar_ssdt entirely
drivers/firmware/efi/Kconfig
* netfilter: nf_conntrack_h323: lost .data_len definition for Q.931/ipv6
net/netfilter/nf_conntrack_h323_main.c
MIPS: Add missing EHB in mtc0 -> mfc0 sequence for DSPen
cifs: Fix the target file was deleted when rename failed.
SMB3: Honor persistent/resilient handle flags for multiuser mounts
SMB3: Honor 'seal' flag for multiuser mounts
* Revert "ALSA: usb-audio: Improve frames size computation"
sound/usb/card.h
sound/usb/endpoint.c
sound/usb/endpoint.h
sound/usb/pcm.c
i2c: algo-pca: Add 0x78 as SCL stuck low status for PCA9665
virtio-blk: free vblk-vqs in error path of virtblk_probe()
hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
hwmon: (max6697) Make sure the OVERT mask is set correctly
cxgb4: parse TC-U32 key values and masks natively
* sched/rt: Show the 'sched_rr_timeslice' SCHED_RR timeslice tuning knob in milliseconds
include/linux/sched/sysctl.h
kernel/sched/core.c
kernel/sched/rt.c
kernel/sysctl.c
crypto: af_alg - fix use-after-free in af_alg_accept() due to bh_lock_sock()
* kgdb: Avoid suspicious RCU usage warning
kernel/debug/debug_core.c
usb: usbtest: fix missing kfree(dev->buf) in usbtest_disconnect
* mm/slub: fix stack overruns with SLUB_STATS
mm/slub.c
* mm/slub.c: fix corrupted freechain in deactivate_slab()
mm/slub.c
usbnet: smsc95xx: Fix use-after-free after removal
EDAC/amd64: Read back the scrub rate PCI register on F15h
* mm: fix swap cache node allocation mask
mm/swap_state.c
btrfs: fix data block group relocation failure due to concurrent scrub
btrfs: cow_file_range() num_bytes and disk_num_bytes are same
btrfs: fix a block group ref counter leak after failure to remove block group
Merge 4.9.229 into android-4.9-q
Linux 4.9.229
Revert "tty: hvc: Fix data abort due to race in hvc_open"
xfs: add agf freeblocks verify in xfs_agf_verify
NFSv4 fix CLOSE not waiting for direct IO compeletion
pNFS/flexfiles: Fix list corruption if the mirror count changes
SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()
sunrpc: fixed rollback in rpc_gssd_dummy_populate()
drm/radeon: fix fb_div check in ni_init_smc_spll_table()
* tracing: Fix event trigger to accept redundant spaces
kernel/trace/trace_events_trigger.c
* arm64: perf: Report the PC value in REGS_ABI_32 mode
arch/arm64/kernel/perf_regs.c
ocfs2: fix panic on nfs server over ocfs2
ocfs2: fix value of OCFS2_INVALID_SLOT
ocfs2: load global_inode_alloc
* mm/slab: use memzero_explicit() in kzfree()
mm/slab_common.c
KVM: X86: Fix MSR range of APIC registers in X2APIC mode
ACPI: sysfs: Fix pm_profile_attr type
ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table
* blktrace: break out of blktrace setup on concurrent calls
kernel/trace/blktrace.c
* kbuild: improve cc-option to clean up all temporary files
scripts/Kbuild.include
s390/ptrace: fix setting syscall number
net: alx: fix race condition in alx_remove
ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function
* sched/core: Fix PI boosting between RT and DEADLINE tasks
kernel/sched/core.c
netfilter: ipset: fix unaligned atomic access
usb: gadget: udc: Potential Oops in error handling code
ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
net: qed: fix excessive QM ILT lines consumption
net: qed: fix NVMe login fails over VFs
net: qed: fix left elements count calculation
RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads()
efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
cifs/smb3: Fix data inconsistent when zero file range
cifs/smb3: Fix data inconsistent when punch hole
* xhci: Poll for U0 after disabling USB2 LPM
drivers/usb/host/xhci.c
* ALSA: usb-audio: Fix OOB access of mixer element list
sound/usb/mixer.c
sound/usb/mixer.h
sound/usb/mixer_quirks.c
* ALSA: usb-audio: Clean up mixer element list traverse
sound/usb/mixer.c
sound/usb/mixer.h
sound/usb/mixer_quirks.c
sound/usb/mixer_scarlett.c
* ALSA: usb-audio: uac1: Invalidate ctl on interrupt
sound/usb/mixer.c
cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip
* xhci: Fix enumeration issue when setting max packet size for FS devices.
drivers/usb/host/xhci.c
* xhci: Fix incorrect EP_STATE_MASK
drivers/usb/host/xhci.h
* ALSA: usb-audio: add quirk for Denon DCD-1500RE
sound/usb/quirks.c
usb: host: ehci-exynos: Fix error check in exynos_ehci_probe()
USB: ehci: reopen solution for Synopsys HC bug
* usb: add USB_QUIRK_DELAY_INIT for Logitech C922
drivers/usb/core/quirks.c
usb: dwc2: Postponed gadget registration to the udc class driver
USB: ohci-sm501: Add missed iounmap() in remove
* net: core: reduce recursion limit value
include/linux/netdevice.h
* net: Do not clear the sock TX queue in sk_set_socket()
include/net/sock.h
net/core/sock.c
* net: Fix the arp error in some cases
net/ipv4/fib_semantics.c
* sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
include/net/sctp/constants.h
* tcp: grow window for OOO packets only for SACK flows
net/ipv4/tcp_input.c
ip6_gre: fix use-after-free in ip6gre_tunnel_lookup()
* tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
net/ipv4/tcp_cubic.c
* ip_tunnel: fix use-after-free in ip_tunnel_lookup()
net/ipv4/ip_tunnel.c
tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes
rxrpc: Fix notification call on completion of discarded calls
rocker: fix incorrect error handling in dma_rings_init
* net: usb: ax88179_178a: fix packet alignment padding
drivers/net/usb/ax88179_178a.c
* net: fix memleak in register_netdevice()
net/core/dev.c
* mld: fix memory leak in ipv6_mc_destroy_dev()
net/ipv6/mcast.c
fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"
* net: sched: export __netdev_watchdog_up()
net/sched/sch_generic.c
* l2tp: Allow duplicate session creation with UDP
net/l2tp/l2tp_core.c
* scsi: scsi_devinfo: handle non-terminated strings
drivers/scsi/scsi_devinfo.c
mtd: rawnand: tmio: Fix the probe error path
mtd: rawnand: mtk: Fix the probe error path
mtd: rawnand: plat_nand: Fix the probe error path
mtd: rawnand: socrates: Fix the probe error path
mtd: rawnand: orion: Fix the probe error path
mtd: rawnand: xway: Fix the probe error path
mtd: rawnand: sharpsl: Fix the probe error path
mtd: rawnand: diskonchip: Fix the probe error path
mtd: rawnand: Pass a nand_chip object to nand_release()
* media: dvb_frontend: fix return error code
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: fix wrong cast in compat_ioctl
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: Add commands implementation for compat ioct
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: Add compat_ioctl callback
drivers/media/dvb-core/dvb_frontend.c
fs/compat_ioctl.c
* media: dvb_frontend: Add unlocked_ioctl in dvb_frontend.c
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: be sure to init dvb_frontend_handle_ioctl() return code
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: dtv_property_process_set() cleanups
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: fix return values for FE_SET_PROPERTY
drivers/media/dvb-core/dvb_frontend.c
include/uapi/linux/dvb/frontend.h
* media: dvb_frontend: better document the -EPERM condition
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: get rid of property cache's state
drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb-core/dvb_frontend.h
* media: dvb_frontend: cleanup ioctl handling logic
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: cleanup dvb_frontend_ioctl_properties()
drivers/media/dvb-core/dvb_frontend.c
* media: dvb_frontend: get rid of set_property() callback
drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb-core/dvb_frontend.h
media: friio-fe: get rid of set_property()
media: stv6110: get rid of a srate dead code
media: stv0288: get rid of set_property boilerplate
* media: dvb_frontend: get rid of get_property() callback
drivers/media/dvb-core/dvb_frontend.c
drivers/media/dvb-core/dvb_frontend.h
* media: dvb/frontend.h: document the uAPI file
include/uapi/linux/dvb/frontend.h
* media: dvb/frontend.h: move out a private internal structure
drivers/media/dvb-core/dvb_frontend.c
include/uapi/linux/dvb/frontend.h
* media: dvb_frontend: initialize variable s with FE_NONE instead of 0
drivers/media/dvb-core/dvb_frontend.c
* net: core: device_rename: Use rwsem instead of a seqcount
net/core/dev.c
* sched/rt, net: Use CONFIG_PREEMPTION.patch
net/core/dev.c
e1000e: Do not wake up the system via WOL if device wakeup is disabled
* kretprobe: Prevent triggering kretprobe from within kprobe_flush_task
include/linux/kprobes.h
x86/kprobes: Avoid kretprobe recursion bug
powerpc/kprobes: Fixes for kprobe_lookup_name() on BE
kprobes: Fix to protect kick_kprobe_optimizer() by kprobe_mutex
* crypto: algboss - don't wait during notifier callback
crypto/algboss.c
drm/i915: Whitelist context-local timestamp in the gen9 cmdparser
s390: fix syscall_get_error for compat processes
* block: nr_sects_write(): Disable preemption on seqcount write
include/linux/genhd.h
x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld
* drm/dp_mst: Increase ACT retry timeout to 3s
drivers/gpu/drm/drm_dp_mst_topology.c
* ext4: fix partial cluster initialization when splitting extent
fs/ext4/extents.c
* selinux: fix double free
security/selinux/ss/services.c
drm/qxl: Use correct notify port address when creating cursor ring
* drm/dp_mst: Reformat drm_dp_check_act_status() a bit
drivers/gpu/drm/drm_dp_mst_topology.c
* drm: encoder_slave: fix refcouting error for modules
drivers/gpu/drm/drm_encoder_slave.c
libata: Use per port sync for detach
* block: Fix use-after-free in blkdev_get()
fs/block_dev.c
bcache: fix potential deadlock problem in btree_gc_coalesce
perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
usb/ehci-platform: Set PM runtime as active on resume
* usb/xhci-plat: Set PM runtime as active on resume
drivers/usb/host/xhci-plat.c
scsi: acornscsi: Fix an error handling path in acornscsi_probe()
selftests/net: in timestamping, strncpy needs to preserve null byte
selftests/vm/pkeys: fix alloc_random_pkey() to make it really random
* elfnote: mark all .note sections SHF_ALLOC
include/linux/elfnote.h
* include/linux/bitops.h: avoid clang shift-count-overflow warnings
include/linux/bitops.h
* lib/zlib: remove outdated and incorrect pre-increment optimization
lib/zlib_inflate/inffast.c
crypto: omap-sham - add proper load balancing support for multicore
pinctrl: imxl: Fix an error handling path in 'imx1_pinctrl_core_probe()'
scsi: iscsi: Fix reference count leak in iscsi_boot_create_kobj
gfs2: Allow lock_nolock mount to specify jid=X
openrisc: Fix issue with argument clobbering for clone/fork
ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed
extcon: adc-jack: Fix an error handling path in 'adc_jack_probe()'
NFSv4.1 fix rpc_call_done assignment for BIND_CONN_TO_SESSION
net: sunrpc: Fix off-by-one issues in 'rpc_ntop6'
clk: bcm2835: Fix return type of bcm2835_register_gate
* usb: gadget: Fix issue with config_ep_by_speed function
drivers/usb/gadget/composite.c
include/linux/usb/composite.h
usb: gadget: fix potential double-free in m66592_probe.
usb: gadget: lpc32xx_udc: don't dereference ep pointer before null check
USB: gadget: udc: s3c2410_udc: Remove pointless NULL check in s3c2410_udc_nuke
usb: dwc2: gadget: move gadget resume after the core is in L0 state
watchdog: da9062: No need to ping manually before setting timeout
IB/cma: Fix ports memory leak in cma_configfs
PCI/PTM: Inherit Switch Downstream Port PTM settings from Upstream Port
powerpc/64s/pgtable: fix an undefined behaviour
clk: samsung: exynos5433: Add IGNORE_UNUSED flag to sclk_i2s1
tty: n_gsm: Fix bogus i++ in gsm_data_kick
USB: host: ehci-mxc: Add error handling in ehci_mxc_drv_probe()
drm/msm/mdp5: Fix mdp5_init error path for failed mdp5_kms allocation
usb/ohci-platform: Fix a warning when hibernating
vfio-pci: Mask cap zero
powerpc/ps3: Fix kexec shutdown hang
powerpc/pseries/ras: Fix FWNMI_VALID off by one
tty: n_gsm: Fix waking up upper tty layer when room available
tty: n_gsm: Fix SOF skipping
clk: ti: composite: fix memory leak
dlm: remove BUG() before panic()
scsi: mpt3sas: Fix double free warnings
power: supply: smb347-charger: IRQSTAT_D is volatile
power: supply: lp8788: Fix an error handling path in 'lp8788_charger_probe()'
PCI/ASPM: Allow ASPM on links to PCIe-to-PCI/PCI-X Bridges
PCI: rcar: Fix incorrect programming of OB windows
* drivers: base: Fix NULL pointer exception in __platform_driver_probe() if a driver developer is foolish
drivers/base/platform.c
serial: amba-pl011: Make sure we initialize the port.lock spinlock
i2c: pxa: fix i2c_pxa_scream_blue_murder() debug output
staging: sm750fb: add missing case while setting FB_VISUAL
tty: hvc: Fix data abort due to race in hvc_open
s390/qdio: put thinint indicator after early error
* ALSA: usb-audio: Improve frames size computation
sound/usb/card.h
sound/usb/endpoint.c
sound/usb/endpoint.h
sound/usb/pcm.c
scsi: ibmvscsi: Don't send host info in adapter info MAD after LPM
scsi: sr: Fix sr_probe() missing deallocate of device minor
* mksysmap: Fix the mismatch of '.L' symbols in System.map
scripts/mksysmap
yam: fix possible memory leak in yam_init_driver
powerpc/crashkernel: Take "mem=" option into account
nfsd: Fix svc_xprt refcnt leak when setup callback client failed
powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run
clk: clk-flexgen: fix clock-critical handling
scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event
mfd: wm8994: Fix driver operation if loaded as modules
vfio/pci: fix memory leaks in alloc_perm_bits()
ps3disk: use the default segment boundary
PCI: aardvark: Don't blindly enable ASPM L0s and don't write to read-only register
usblp: poison URBs upon disconnect
i2c: pxa: clear all master action bits in i2c_pxa_stop_message()
iio: bmp280: fix compensation of humidity
scsi: qla2xxx: Fix issue with adapter's stopping state
ALSA: isa/wavefront: prevent out of bounds write in ioctl
ARM: integrator: Add some Kconfig selections
backlight: lp855x: Ensure regulators are disabled on probe failure
clk: qcom: msm8916: Fix the address location of pll->config_reg
iio: pressure: bmp280: Tolerate IRQ before registering
i2c: piix4: Detect secondary SMBus controller on AMD AM4 chipsets
clk: sunxi: Fix incorrect usage of round_down()
* power: supply: bq24257_charger: Replace depends on REGMAP_I2C with select
drivers/power/supply/Kconfig
Change-Id: I9fdac4691b013061a19d375293b7049b999830d0
Signed-off-by: lucaswei <lucaswei@google.com>
670 lines
26 KiB
C
670 lines
26 KiB
C
/*
|
|
* composite.h -- framework for usb gadgets which are composite devices
|
|
*
|
|
* Copyright (C) 2006-2008 David Brownell
|
|
*
|
|
* This program 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef __LINUX_USB_COMPOSITE_H
|
|
#define __LINUX_USB_COMPOSITE_H
|
|
|
|
/*
|
|
* This framework is an optional layer on top of the USB Gadget interface,
|
|
* making it easier to build (a) Composite devices, supporting multiple
|
|
* functions within any single configuration, and (b) Multi-configuration
|
|
* devices, also supporting multiple functions but without necessarily
|
|
* having more than one function per configuration.
|
|
*
|
|
* Example: a device with a single configuration supporting both network
|
|
* link and mass storage functions is a composite device. Those functions
|
|
* might alternatively be packaged in individual configurations, but in
|
|
* the composite model the host can use both functions at the same time.
|
|
*/
|
|
|
|
#include <linux/bcd.h>
|
|
#include <linux/version.h>
|
|
#include <linux/usb/ch9.h>
|
|
#include <linux/usb/gadget.h>
|
|
#include <linux/log2.h>
|
|
#include <linux/configfs.h>
|
|
|
|
/* FUNCTION_SUSPEND: suspend options from usb 3.0 spec Table 9-7 */
|
|
#define FUNC_SUSPEND_OPT_SUSP_MASK BIT(0)
|
|
#define FUNC_SUSPEND_OPT_RW_EN_MASK BIT(1)
|
|
|
|
#define FUNC_WAKEUP_CAPABLE_SHIFT 0
|
|
#define FUNC_WAKEUP_ENABLE_SHIFT 1
|
|
|
|
/*
|
|
* USB function drivers should return USB_GADGET_DELAYED_STATUS if they
|
|
* wish to delay the data/status stages of the control transfer till they
|
|
* are ready. The control transfer will then be kept from completing till
|
|
* all the function drivers that requested for USB_GADGET_DELAYED_STAUS
|
|
* invoke usb_composite_setup_continue().
|
|
*/
|
|
#define USB_GADGET_DELAYED_STATUS 0x7fff /* Impossibly large value */
|
|
|
|
/* big enough to hold our biggest descriptor */
|
|
#define USB_COMP_EP0_BUFSIZ 4096
|
|
|
|
/* OS feature descriptor length <= 4kB */
|
|
#define USB_COMP_EP0_OS_DESC_BUFSIZ 4096
|
|
|
|
#define USB_MS_TO_HS_INTERVAL(x) (ilog2((x * 1000 / 125)) + 1)
|
|
struct usb_configuration;
|
|
|
|
/**
|
|
* struct usb_os_desc_ext_prop - describes one "Extended Property"
|
|
* @entry: used to keep a list of extended properties
|
|
* @type: Extended Property type
|
|
* @name_len: Extended Property unicode name length, including terminating '\0'
|
|
* @name: Extended Property name
|
|
* @data_len: Length of Extended Property blob (for unicode store double len)
|
|
* @data: Extended Property blob
|
|
* @item: Represents this Extended Property in configfs
|
|
*/
|
|
struct usb_os_desc_ext_prop {
|
|
struct list_head entry;
|
|
u8 type;
|
|
int name_len;
|
|
char *name;
|
|
int data_len;
|
|
char *data;
|
|
struct config_item item;
|
|
};
|
|
|
|
/**
|
|
* struct usb_os_desc - describes OS descriptors associated with one interface
|
|
* @ext_compat_id: 16 bytes of "Compatible ID" and "Subcompatible ID"
|
|
* @ext_prop: Extended Properties list
|
|
* @ext_prop_len: Total length of Extended Properties blobs
|
|
* @ext_prop_count: Number of Extended Properties
|
|
* @opts_mutex: Optional mutex protecting config data of a usb_function_instance
|
|
* @group: Represents OS descriptors associated with an interface in configfs
|
|
* @owner: Module associated with this OS descriptor
|
|
*/
|
|
struct usb_os_desc {
|
|
char *ext_compat_id;
|
|
struct list_head ext_prop;
|
|
int ext_prop_len;
|
|
int ext_prop_count;
|
|
struct mutex *opts_mutex;
|
|
struct config_group group;
|
|
struct module *owner;
|
|
};
|
|
|
|
/**
|
|
* struct usb_os_desc_table - describes OS descriptors associated with one
|
|
* interface of a usb_function
|
|
* @if_id: Interface id
|
|
* @os_desc: "Extended Compatibility ID" and "Extended Properties" of the
|
|
* interface
|
|
*
|
|
* Each interface can have at most one "Extended Compatibility ID" and a
|
|
* number of "Extended Properties".
|
|
*/
|
|
struct usb_os_desc_table {
|
|
int if_id;
|
|
struct usb_os_desc *os_desc;
|
|
};
|
|
|
|
/**
|
|
* struct usb_function - describes one function of a configuration
|
|
* @name: For diagnostics, identifies the function.
|
|
* @intf_id: Interface ID
|
|
* @strings: tables of strings, keyed by identifiers assigned during bind()
|
|
* and by language IDs provided in control requests
|
|
* @fs_descriptors: Table of full (or low) speed descriptors, using interface and
|
|
* string identifiers assigned during @bind(). If this pointer is null,
|
|
* the function will not be available at full speed (or at low speed).
|
|
* @hs_descriptors: Table of high speed descriptors, using interface and
|
|
* string identifiers assigned during @bind(). If this pointer is null,
|
|
* the function will not be available at high speed.
|
|
* @ss_descriptors: Table of super speed descriptors, using interface and
|
|
* string identifiers assigned during @bind(). If this
|
|
* pointer is null after initiation, the function will not
|
|
* be available at super speed.
|
|
* @ssp_descriptors: Table of super speed plus descriptors, using
|
|
* interface and string identifiers assigned during @bind(). If
|
|
* this pointer is null after initiation, the function will not
|
|
* be available at super speed plus.
|
|
* @config: assigned when @usb_add_function() is called; this is the
|
|
* configuration with which this function is associated.
|
|
* @os_desc_table: Table of (interface id, os descriptors) pairs. The function
|
|
* can expose more than one interface. If an interface is a member of
|
|
* an IAD, only the first interface of IAD has its entry in the table.
|
|
* @os_desc_n: Number of entries in os_desc_table
|
|
* @bind: Before the gadget can register, all of its functions bind() to the
|
|
* available resources including string and interface identifiers used
|
|
* in interface or class descriptors; endpoints; I/O buffers; and so on.
|
|
* @unbind: Reverses @bind; called as a side effect of unregistering the
|
|
* driver which added this function.
|
|
* @free_func: free the struct usb_function.
|
|
* @mod: (internal) points to the module that created this structure.
|
|
* @set_alt: (REQUIRED) Reconfigures altsettings; function drivers may
|
|
* initialize usb_ep.driver data at this time (when it is used).
|
|
* Note that setting an interface to its current altsetting resets
|
|
* interface state, and that all interfaces have a disabled state.
|
|
* @get_alt: Returns the active altsetting. If this is not provided,
|
|
* then only altsetting zero is supported.
|
|
* @disable: (REQUIRED) Indicates the function should be disabled. Reasons
|
|
* include host resetting or reconfiguring the gadget, and disconnection.
|
|
* @setup: Used for interface-specific control requests.
|
|
* @req_match: Tests if a given class request can be handled by this function.
|
|
* @suspend: Notifies functions when the host stops sending USB traffic.
|
|
* @resume: Notifies functions when the host restarts USB traffic.
|
|
* @get_status: Returns function status as a reply to
|
|
* GetStatus() request when the recipient is Interface.
|
|
* @func_suspend: callback to be called when
|
|
* SetFeature(FUNCTION_SUSPEND) is received
|
|
* @func_is_suspended: Tells whether the function is currently in
|
|
* Function Suspend state (used in Super Speed mode only).
|
|
* @func_wakeup_allowed: Tells whether Function Remote Wakeup has been allowed
|
|
* by the USB host (used in Super Speed mode only).
|
|
* @func_wakeup_pending: Marks that the function has issued a Function Wakeup
|
|
* while the USB bus was suspended and therefore a Function Wakeup
|
|
* notification needs to be sent once the USB bus is resumed.
|
|
*
|
|
* A single USB function uses one or more interfaces, and should in most
|
|
* cases support operation at both full and high speeds. Each function is
|
|
* associated by @usb_add_function() with a one configuration; that function
|
|
* causes @bind() to be called so resources can be allocated as part of
|
|
* setting up a gadget driver. Those resources include endpoints, which
|
|
* should be allocated using @usb_ep_autoconfig().
|
|
*
|
|
* To support dual speed operation, a function driver provides descriptors
|
|
* for both high and full speed operation. Except in rare cases that don't
|
|
* involve bulk endpoints, each speed needs different endpoint descriptors.
|
|
*
|
|
* Function drivers choose their own strategies for managing instance data.
|
|
* The simplest strategy just declares it "static', which means the function
|
|
* can only be activated once. If the function needs to be exposed in more
|
|
* than one configuration at a given speed, it needs to support multiple
|
|
* usb_function structures (one for each configuration).
|
|
*
|
|
* A more complex strategy might encapsulate a @usb_function structure inside
|
|
* a driver-specific instance structure to allows multiple activations. An
|
|
* example of multiple activations might be a CDC ACM function that supports
|
|
* two or more distinct instances within the same configuration, providing
|
|
* several independent logical data links to a USB host.
|
|
*/
|
|
|
|
struct usb_function {
|
|
const char *name;
|
|
int intf_id;
|
|
struct usb_gadget_strings **strings;
|
|
struct usb_descriptor_header **fs_descriptors;
|
|
struct usb_descriptor_header **hs_descriptors;
|
|
struct usb_descriptor_header **ss_descriptors;
|
|
struct usb_descriptor_header **ssp_descriptors;
|
|
|
|
struct usb_configuration *config;
|
|
|
|
struct usb_os_desc_table *os_desc_table;
|
|
unsigned os_desc_n;
|
|
|
|
/* REVISIT: bind() functions can be marked __init, which
|
|
* makes trouble for section mismatch analysis. See if
|
|
* we can't restructure things to avoid mismatching.
|
|
* Related: unbind() may kfree() but bind() won't...
|
|
*/
|
|
|
|
/* configuration management: bind/unbind */
|
|
int (*bind)(struct usb_configuration *,
|
|
struct usb_function *);
|
|
void (*unbind)(struct usb_configuration *,
|
|
struct usb_function *);
|
|
void (*free_func)(struct usb_function *f);
|
|
struct module *mod;
|
|
|
|
/* runtime state management */
|
|
int (*set_alt)(struct usb_function *,
|
|
unsigned interface, unsigned alt);
|
|
int (*get_alt)(struct usb_function *,
|
|
unsigned interface);
|
|
void (*disable)(struct usb_function *);
|
|
int (*setup)(struct usb_function *,
|
|
const struct usb_ctrlrequest *);
|
|
bool (*req_match)(struct usb_function *,
|
|
const struct usb_ctrlrequest *,
|
|
bool config0);
|
|
void (*suspend)(struct usb_function *);
|
|
void (*resume)(struct usb_function *);
|
|
|
|
/* USB 3.0 additions */
|
|
int (*get_status)(struct usb_function *);
|
|
int (*func_suspend)(struct usb_function *,
|
|
u8 suspend_opt);
|
|
unsigned func_is_suspended:1;
|
|
unsigned func_wakeup_allowed:1;
|
|
unsigned func_wakeup_pending:1;
|
|
/* private: */
|
|
/* internals */
|
|
struct list_head list;
|
|
DECLARE_BITMAP(endpoints, 32);
|
|
const struct usb_function_instance *fi;
|
|
|
|
unsigned int bind_deactivated:1;
|
|
};
|
|
|
|
int usb_add_function(struct usb_configuration *, struct usb_function *);
|
|
|
|
int usb_function_deactivate(struct usb_function *);
|
|
int usb_function_activate(struct usb_function *);
|
|
|
|
int usb_interface_id(struct usb_configuration *, struct usb_function *);
|
|
int usb_func_wakeup(struct usb_function *func);
|
|
|
|
int usb_get_func_interface_id(struct usb_function *func);
|
|
|
|
int config_ep_by_speed_and_alt(struct usb_gadget *g, struct usb_function *f,
|
|
struct usb_ep *_ep, u8 alt);
|
|
|
|
int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
|
|
struct usb_ep *_ep);
|
|
|
|
#define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */
|
|
|
|
/**
|
|
* struct usb_configuration - represents one gadget configuration
|
|
* @label: For diagnostics, describes the configuration.
|
|
* @strings: Tables of strings, keyed by identifiers assigned during @bind()
|
|
* and by language IDs provided in control requests.
|
|
* @descriptors: Table of descriptors preceding all function descriptors.
|
|
* Examples include OTG and vendor-specific descriptors.
|
|
* @unbind: Reverses @bind; called as a side effect of unregistering the
|
|
* driver which added this configuration.
|
|
* @setup: Used to delegate control requests that aren't handled by standard
|
|
* device infrastructure or directed at a specific interface.
|
|
* @bConfigurationValue: Copied into configuration descriptor.
|
|
* @iConfiguration: Copied into configuration descriptor.
|
|
* @bmAttributes: Copied into configuration descriptor.
|
|
* @MaxPower: Power consumtion in mA. Used to compute bMaxPower in the
|
|
* configuration descriptor after considering the bus speed.
|
|
* @cdev: assigned by @usb_add_config() before calling @bind(); this is
|
|
* the device associated with this configuration.
|
|
*
|
|
* Configurations are building blocks for gadget drivers structured around
|
|
* function drivers. Simple USB gadgets require only one function and one
|
|
* configuration, and handle dual-speed hardware by always providing the same
|
|
* functionality. Slightly more complex gadgets may have more than one
|
|
* single-function configuration at a given speed; or have configurations
|
|
* that only work at one speed.
|
|
*
|
|
* Composite devices are, by definition, ones with configurations which
|
|
* include more than one function.
|
|
*
|
|
* The lifecycle of a usb_configuration includes allocation, initialization
|
|
* of the fields described above, and calling @usb_add_config() to set up
|
|
* internal data and bind it to a specific device. The configuration's
|
|
* @bind() method is then used to initialize all the functions and then
|
|
* call @usb_add_function() for them.
|
|
*
|
|
* Those functions would normally be independent of each other, but that's
|
|
* not mandatory. CDC WMC devices are an example where functions often
|
|
* depend on other functions, with some functions subsidiary to others.
|
|
* Such interdependency may be managed in any way, so long as all of the
|
|
* descriptors complete by the time the composite driver returns from
|
|
* its bind() routine.
|
|
*/
|
|
struct usb_configuration {
|
|
const char *label;
|
|
struct usb_gadget_strings **strings;
|
|
const struct usb_descriptor_header **descriptors;
|
|
|
|
/* REVISIT: bind() functions can be marked __init, which
|
|
* makes trouble for section mismatch analysis. See if
|
|
* we can't restructure things to avoid mismatching...
|
|
*/
|
|
|
|
/* configuration management: unbind/setup */
|
|
void (*unbind)(struct usb_configuration *);
|
|
int (*setup)(struct usb_configuration *,
|
|
const struct usb_ctrlrequest *);
|
|
|
|
/* fields in the config descriptor */
|
|
u8 bConfigurationValue;
|
|
u8 iConfiguration;
|
|
u8 bmAttributes;
|
|
u16 MaxPower;
|
|
|
|
struct usb_composite_dev *cdev;
|
|
|
|
/* private: */
|
|
/* internals */
|
|
struct list_head list;
|
|
struct list_head functions;
|
|
u8 next_interface_id;
|
|
unsigned superspeed:1;
|
|
unsigned highspeed:1;
|
|
unsigned fullspeed:1;
|
|
unsigned superspeed_plus:1;
|
|
struct usb_function *interface[MAX_CONFIG_INTERFACES];
|
|
|
|
/* number of in and out eps used in this configuration */
|
|
int num_ineps_used;
|
|
int num_outeps_used;
|
|
};
|
|
|
|
int usb_add_config(struct usb_composite_dev *,
|
|
struct usb_configuration *,
|
|
int (*)(struct usb_configuration *));
|
|
|
|
void usb_remove_config(struct usb_composite_dev *,
|
|
struct usb_configuration *);
|
|
|
|
/* predefined index for usb_composite_driver */
|
|
enum {
|
|
USB_GADGET_MANUFACTURER_IDX = 0,
|
|
USB_GADGET_PRODUCT_IDX,
|
|
USB_GADGET_SERIAL_IDX,
|
|
USB_GADGET_FIRST_AVAIL_IDX,
|
|
};
|
|
|
|
/**
|
|
* struct usb_composite_driver - groups configurations into a gadget
|
|
* @name: For diagnostics, identifies the driver.
|
|
* @dev: Template descriptor for the device, including default device
|
|
* identifiers.
|
|
* @strings: tables of strings, keyed by identifiers assigned during @bind
|
|
* and language IDs provided in control requests. Note: The first entries
|
|
* are predefined. The first entry that may be used is
|
|
* USB_GADGET_FIRST_AVAIL_IDX
|
|
* @max_speed: Highest speed the driver supports.
|
|
* @needs_serial: set to 1 if the gadget needs userspace to provide
|
|
* a serial number. If one is not provided, warning will be printed.
|
|
* @bind: (REQUIRED) Used to allocate resources that are shared across the
|
|
* whole device, such as string IDs, and add its configurations using
|
|
* @usb_add_config(). This may fail by returning a negative errno
|
|
* value; it should return zero on successful initialization.
|
|
* @unbind: Reverses @bind; called as a side effect of unregistering
|
|
* this driver.
|
|
* @disconnect: optional driver disconnect method
|
|
* @suspend: Notifies when the host stops sending USB traffic,
|
|
* after function notifications
|
|
* @resume: Notifies configuration when the host restarts USB traffic,
|
|
* before function notifications
|
|
* @gadget_driver: Gadget driver controlling this driver
|
|
*
|
|
* Devices default to reporting self powered operation. Devices which rely
|
|
* on bus powered operation should report this in their @bind method.
|
|
*
|
|
* Before returning from @bind, various fields in the template descriptor
|
|
* may be overridden. These include the idVendor/idProduct/bcdDevice values
|
|
* normally to bind the appropriate host side driver, and the three strings
|
|
* (iManufacturer, iProduct, iSerialNumber) normally used to provide user
|
|
* meaningful device identifiers. (The strings will not be defined unless
|
|
* they are defined in @dev and @strings.) The correct ep0 maxpacket size
|
|
* is also reported, as defined by the underlying controller driver.
|
|
*/
|
|
struct usb_composite_driver {
|
|
const char *name;
|
|
const struct usb_device_descriptor *dev;
|
|
struct usb_gadget_strings **strings;
|
|
enum usb_device_speed max_speed;
|
|
unsigned needs_serial:1;
|
|
|
|
int (*bind)(struct usb_composite_dev *cdev);
|
|
int (*unbind)(struct usb_composite_dev *);
|
|
|
|
void (*disconnect)(struct usb_composite_dev *);
|
|
|
|
/* global suspend hooks */
|
|
void (*suspend)(struct usb_composite_dev *);
|
|
void (*resume)(struct usb_composite_dev *);
|
|
struct usb_gadget_driver gadget_driver;
|
|
};
|
|
|
|
extern int usb_composite_probe(struct usb_composite_driver *driver);
|
|
extern void usb_composite_unregister(struct usb_composite_driver *driver);
|
|
|
|
/**
|
|
* module_usb_composite_driver() - Helper macro for registering a USB gadget
|
|
* composite driver
|
|
* @__usb_composite_driver: usb_composite_driver struct
|
|
*
|
|
* Helper macro for USB gadget composite drivers which do not do anything
|
|
* special in module init/exit. This eliminates a lot of boilerplate. Each
|
|
* module may only use this macro once, and calling it replaces module_init()
|
|
* and module_exit()
|
|
*/
|
|
#define module_usb_composite_driver(__usb_composite_driver) \
|
|
module_driver(__usb_composite_driver, usb_composite_probe, \
|
|
usb_composite_unregister)
|
|
|
|
extern void usb_composite_setup_continue(struct usb_composite_dev *cdev);
|
|
extern int composite_dev_prepare(struct usb_composite_driver *composite,
|
|
struct usb_composite_dev *cdev);
|
|
extern int composite_os_desc_req_prepare(struct usb_composite_dev *cdev,
|
|
struct usb_ep *ep0);
|
|
void composite_dev_cleanup(struct usb_composite_dev *cdev);
|
|
|
|
static inline struct usb_composite_driver *to_cdriver(
|
|
struct usb_gadget_driver *gdrv)
|
|
{
|
|
return container_of(gdrv, struct usb_composite_driver, gadget_driver);
|
|
}
|
|
|
|
#define OS_STRING_QW_SIGN_LEN 14
|
|
#define OS_STRING_IDX 0xEE
|
|
|
|
/**
|
|
* struct usb_composite_device - represents one composite usb gadget
|
|
* @gadget: read-only, abstracts the gadget's usb peripheral controller
|
|
* @req: used for control responses; buffer is pre-allocated
|
|
* @os_desc_req: used for OS descriptors responses; buffer is pre-allocated
|
|
* @config: the currently active configuration
|
|
* @qw_sign: qwSignature part of the OS string
|
|
* @b_vendor_code: bMS_VendorCode part of the OS string
|
|
* @use_os_string: false by default, interested gadgets set it
|
|
* @os_desc_config: the configuration to be used with OS descriptors
|
|
* @setup_pending: true when setup request is queued but not completed
|
|
* @os_desc_pending: true when os_desc request is queued but not completed
|
|
*
|
|
* One of these devices is allocated and initialized before the
|
|
* associated device driver's bind() is called.
|
|
*
|
|
* OPEN ISSUE: it appears that some WUSB devices will need to be
|
|
* built by combining a normal (wired) gadget with a wireless one.
|
|
* This revision of the gadget framework should probably try to make
|
|
* sure doing that won't hurt too much.
|
|
*
|
|
* One notion for how to handle Wireless USB devices involves:
|
|
* (a) a second gadget here, discovery mechanism TBD, but likely
|
|
* needing separate "register/unregister WUSB gadget" calls;
|
|
* (b) updates to usb_gadget to include flags "is it wireless",
|
|
* "is it wired", plus (presumably in a wrapper structure)
|
|
* bandgroup and PHY info;
|
|
* (c) presumably a wireless_ep wrapping a usb_ep, and reporting
|
|
* wireless-specific parameters like maxburst and maxsequence;
|
|
* (d) configurations that are specific to wireless links;
|
|
* (e) function drivers that understand wireless configs and will
|
|
* support wireless for (additional) function instances;
|
|
* (f) a function to support association setup (like CBAF), not
|
|
* necessarily requiring a wireless adapter;
|
|
* (g) composite device setup that can create one or more wireless
|
|
* configs, including appropriate association setup support;
|
|
* (h) more, TBD.
|
|
*/
|
|
struct usb_composite_dev {
|
|
struct usb_gadget *gadget;
|
|
struct usb_request *req;
|
|
struct usb_request *os_desc_req;
|
|
|
|
struct usb_configuration *config;
|
|
|
|
/* OS String is a custom (yet popular) extension to the USB standard. */
|
|
u8 qw_sign[OS_STRING_QW_SIGN_LEN];
|
|
u8 b_vendor_code;
|
|
struct usb_configuration *os_desc_config;
|
|
unsigned int use_os_string:1;
|
|
|
|
/* private: */
|
|
/* internals */
|
|
unsigned int suspended:1;
|
|
struct usb_device_descriptor desc;
|
|
struct list_head configs;
|
|
struct list_head gstrings;
|
|
struct usb_composite_driver *driver;
|
|
u8 next_string_id;
|
|
char *def_manufacturer;
|
|
|
|
/* the gadget driver won't enable the data pullup
|
|
* while the deactivation count is nonzero.
|
|
*/
|
|
unsigned deactivations;
|
|
|
|
/* the composite driver won't complete the control transfer's
|
|
* data/status stages till delayed_status is zero.
|
|
*/
|
|
int delayed_status;
|
|
|
|
/* protects deactivations and delayed_status counts*/
|
|
spinlock_t lock;
|
|
|
|
unsigned setup_pending:1;
|
|
unsigned os_desc_pending:1;
|
|
};
|
|
|
|
extern int usb_string_id(struct usb_composite_dev *c);
|
|
extern int usb_string_ids_tab(struct usb_composite_dev *c,
|
|
struct usb_string *str);
|
|
extern struct usb_string *usb_gstrings_attach(struct usb_composite_dev *cdev,
|
|
struct usb_gadget_strings **sp, unsigned n_strings);
|
|
|
|
extern int usb_string_ids_n(struct usb_composite_dev *c, unsigned n);
|
|
|
|
extern void composite_disconnect(struct usb_gadget *gadget);
|
|
extern int composite_setup(struct usb_gadget *gadget,
|
|
const struct usb_ctrlrequest *ctrl);
|
|
extern void composite_suspend(struct usb_gadget *gadget);
|
|
extern void composite_resume(struct usb_gadget *gadget);
|
|
|
|
/*
|
|
* Some systems will need runtime overrides for the product identifiers
|
|
* published in the device descriptor, either numbers or strings or both.
|
|
* String parameters are in UTF-8 (superset of ASCII's 7 bit characters).
|
|
*/
|
|
struct usb_composite_overwrite {
|
|
u16 idVendor;
|
|
u16 idProduct;
|
|
u16 bcdDevice;
|
|
char *serial_number;
|
|
char *manufacturer;
|
|
char *product;
|
|
};
|
|
#define USB_GADGET_COMPOSITE_OPTIONS() \
|
|
static struct usb_composite_overwrite coverwrite; \
|
|
\
|
|
module_param_named(idVendor, coverwrite.idVendor, ushort, S_IRUGO); \
|
|
MODULE_PARM_DESC(idVendor, "USB Vendor ID"); \
|
|
\
|
|
module_param_named(idProduct, coverwrite.idProduct, ushort, S_IRUGO); \
|
|
MODULE_PARM_DESC(idProduct, "USB Product ID"); \
|
|
\
|
|
module_param_named(bcdDevice, coverwrite.bcdDevice, ushort, S_IRUGO); \
|
|
MODULE_PARM_DESC(bcdDevice, "USB Device version (BCD)"); \
|
|
\
|
|
module_param_named(iSerialNumber, coverwrite.serial_number, charp, \
|
|
S_IRUGO); \
|
|
MODULE_PARM_DESC(iSerialNumber, "SerialNumber string"); \
|
|
\
|
|
module_param_named(iManufacturer, coverwrite.manufacturer, charp, \
|
|
S_IRUGO); \
|
|
MODULE_PARM_DESC(iManufacturer, "USB Manufacturer string"); \
|
|
\
|
|
module_param_named(iProduct, coverwrite.product, charp, S_IRUGO); \
|
|
MODULE_PARM_DESC(iProduct, "USB Product string")
|
|
|
|
void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
|
|
struct usb_composite_overwrite *covr);
|
|
|
|
static inline u16 get_default_bcdDevice(void)
|
|
{
|
|
u16 bcdDevice;
|
|
|
|
bcdDevice = bin2bcd((LINUX_VERSION_CODE >> 16 & 0xff)) << 8;
|
|
bcdDevice |= bin2bcd((LINUX_VERSION_CODE >> 8 & 0xff));
|
|
return bcdDevice;
|
|
}
|
|
|
|
struct usb_function_driver {
|
|
const char *name;
|
|
struct module *mod;
|
|
struct list_head list;
|
|
struct usb_function_instance *(*alloc_inst)(void);
|
|
struct usb_function *(*alloc_func)(struct usb_function_instance *inst);
|
|
};
|
|
|
|
struct usb_function_instance {
|
|
struct config_group group;
|
|
struct list_head cfs_list;
|
|
struct usb_function_driver *fd;
|
|
struct usb_function *f;
|
|
int (*set_inst_name)(struct usb_function_instance *inst,
|
|
const char *name);
|
|
void (*free_func_inst)(struct usb_function_instance *inst);
|
|
};
|
|
|
|
void usb_function_unregister(struct usb_function_driver *f);
|
|
int usb_function_register(struct usb_function_driver *newf);
|
|
void usb_put_function_instance(struct usb_function_instance *fi);
|
|
void usb_put_function(struct usb_function *f);
|
|
struct usb_function_instance *usb_get_function_instance(const char *name);
|
|
struct usb_function *usb_get_function(struct usb_function_instance *fi);
|
|
|
|
struct usb_configuration *usb_get_config(struct usb_composite_dev *cdev,
|
|
int val);
|
|
int usb_add_config_only(struct usb_composite_dev *cdev,
|
|
struct usb_configuration *config);
|
|
void usb_remove_function(struct usb_configuration *c, struct usb_function *f);
|
|
|
|
#define DECLARE_USB_FUNCTION(_name, _inst_alloc, _func_alloc) \
|
|
static struct usb_function_driver _name ## usb_func = { \
|
|
.name = __stringify(_name), \
|
|
.mod = THIS_MODULE, \
|
|
.alloc_inst = _inst_alloc, \
|
|
.alloc_func = _func_alloc, \
|
|
}; \
|
|
MODULE_ALIAS("usbfunc:"__stringify(_name));
|
|
|
|
#define DECLARE_USB_FUNCTION_INIT(_name, _inst_alloc, _func_alloc) \
|
|
DECLARE_USB_FUNCTION(_name, _inst_alloc, _func_alloc) \
|
|
static int __init _name ## mod_init(void) \
|
|
{ \
|
|
return usb_function_register(&_name ## usb_func); \
|
|
} \
|
|
static void __exit _name ## mod_exit(void) \
|
|
{ \
|
|
usb_function_unregister(&_name ## usb_func); \
|
|
} \
|
|
module_init(_name ## mod_init); \
|
|
module_exit(_name ## mod_exit)
|
|
|
|
/* messaging utils */
|
|
#define DBG(d, fmt, args...) \
|
|
dev_dbg(&(d)->gadget->dev , fmt , ## args)
|
|
#define VDBG(d, fmt, args...) \
|
|
dev_vdbg(&(d)->gadget->dev , fmt , ## args)
|
|
#define ERROR(d, fmt, args...) \
|
|
dev_err(&(d)->gadget->dev , fmt , ## args)
|
|
#define WARNING(d, fmt, args...) \
|
|
dev_warn(&(d)->gadget->dev , fmt , ## args)
|
|
#define INFO(d, fmt, args...) \
|
|
dev_info(&(d)->gadget->dev , fmt , ## args)
|
|
|
|
#endif /* __LINUX_USB_COMPOSITE_H */
|