Merge tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

71e7ff25 · Linus Torvalds <[email protected]> · 2012-03-20 11:23:18 -07:00

Pull big staging driver updates from Greg KH:
 "Here is the big drivers/staging/ merge for 3.4-rc1

  Lots of new driver updates here, with the addition of a few new ones,
  and only one moving out of the staging tree to the "real" part of the
  kernel (the hyperv scsi driver, acked by the scsi maintainer).

  There are also loads of cleanups, fixes, and other minor things in
  here, all self-contained in the drivers/staging/ tree.

  Overall we reversed the recent trend by adding more lines than we
  removed:
   379 files changed, 37952 insertions(+), 14153 deletions(-)"

* tag 'staging-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (360 commits)
  staging/zmem: Use lockdep_assert_held instead of spin_is_locked
  Staging: rtl8187se: r8180_wx.c: Cleaned up comments
  Staging: rtl8187se: r8180_wx.c: Removed old comments
  Staging: rtl8187se: r8180_dm.c: Removed old comments
  Staging: android: ram_console.c:
  Staging: rtl8187se: r8180_dm.c: Fix comments
  Staging: rtl8187se: r8180_dm.c: Fix spacing issues
  Staging: rtl8187se: r8180_dm.c Fixed indentation issues
  Staging: rtl8187se: r8180_dm.c: Fix brackets
  Staging: rtl8187se: r8180_dm.c: Removed spaces before tab stop
  staging: vme: fix section mismatches in linux-next 20120314
  Staging: rtl8187se: r8180_core.c: Fix some long line issues
  Staging: rtl8187se: r8180_core.c: Fix some spacing issues
  Staging: rtl8187se: r8180_core.c: Removed trailing spaces
  staging: mei: remove driver internal versioning
  Staging: rtl8187se: r8180_core.c: Cleaned up if statement
  staging: ozwpan depends on NET
  staging: ozwpan: added maintainer for ozwpan driver
  staging/mei: propagate error codes up in the write flow
  drivers:staging:mei Fix some typos in staging/mei
  ...

Commit: 71e7ff2578c3bc67fd893a9ba7f69fd563f271de
Parents: 4a522463 · bc01caf5

Merge commit. Changes below are compared with the first parent: 4a522463.

Changes

379 files changed · +37952 −14153

File	Status	Add	Del	Content
MAINTAINERS	modified	+5	−0	View file
drivers/Kconfig	modified	+0	−2	View file
drivers/Makefile	modified	+0	−1	View file
drivers/scsi/Kconfig	modified	+7	−0	View file
drivers/scsi/Makefile	modified	+3	−0	View file
drivers/staging/hv/storvsc_drv.c → drivers/scsi/storvsc_drv.c	renamed	+631	−669	View file
drivers/staging/Kconfig	modified	+8	−2	View file
drivers/staging/Makefile	modified	+4	−2	View file
drivers/staging/android/Kconfig	modified	+32	−54	View file
drivers/staging/android/Makefile	modified	+3	−0	View file
drivers/staging/android/TODO	modified	+1	−1	View file
drivers/staging/android/alarm-dev.c	added	+297	−0	View file
drivers/staging/android/alarm.c	added	+601	−0	View file
drivers/staging/android/android_alarm.h	added	+121	−0	View file
drivers/staging/android/ashmem.c	modified	+2	−2	View file
drivers/staging/android/binder.c	modified	+6	−3	View file
drivers/staging/android/logger.c	modified	+55	−23	View file
drivers/staging/android/lowmemorykiller.c	modified	+46	−45	View file
drivers/staging/android/persistent_ram.c	added	+470	−0	View file
drivers/staging/android/persistent_ram.h	added	+78	−0	View file
drivers/staging/android/ram_console.c	modified	+78	−342	View file
drivers/staging/android/timed_gpio.c	modified	+3	−3	View file
drivers/staging/android/timed_gpio.h	modified	+3	−3	View file
drivers/staging/asus_oled/asus_oled.c	modified	+8	−11	View file
drivers/staging/bcm/Bcmchar.c	modified	+15	−26	View file
drivers/staging/bcm/CmHost.c	modified	+1370	−1743	View file
drivers/staging/bcm/led_control.h	modified	+38	−42	View file
drivers/staging/comedi/Kconfig	modified	+3	−2	View file
drivers/staging/comedi/drivers/adv_pci_dio.c	modified	+25	−4	View file
drivers/staging/comedi/drivers/dt2801.c	modified	+10	−2	View file
drivers/staging/comedi/drivers/dt9812.c	modified	+2	−2	View file
drivers/staging/comedi/drivers/me4000.c	modified	+9	−3	View file
drivers/staging/comedi/drivers/ni_pcidio.c	modified	+50	−11	View file
drivers/staging/comedi/drivers/ni_pcimio.c	modified	+24	−3	View file
drivers/staging/comedi/drivers/unioxx5.c	modified	+1	−1	View file
drivers/staging/comedi/drivers/usbduxsigma.c	modified	+21	−21	View file
drivers/staging/crystalhd/bc_dts_glob_lnx.h	modified	+1	−2	View file
drivers/staging/crystalhd/bc_dts_types.h	deleted	+0	−40	View before deletion
drivers/staging/crystalhd/crystalhd.h	added	+14	−0	View file
drivers/staging/crystalhd/crystalhd_cmds.c	modified	+1	−2	View file
drivers/staging/crystalhd/crystalhd_cmds.h	modified	+2	−2	View file
drivers/staging/crystalhd/crystalhd_hw.c	modified	+4	−7	View file
drivers/staging/crystalhd/crystalhd_hw.h	modified	+1	−2	View file
drivers/staging/crystalhd/crystalhd_lnx.c	modified	+2	−5	View file
drivers/staging/crystalhd/crystalhd_lnx.h	modified	+2	−3	View file
drivers/staging/crystalhd/crystalhd_misc.c	modified	+2	−3	View file
drivers/staging/crystalhd/crystalhd_misc.h	modified	+13	−21	View file
drivers/staging/et131x/README	modified	+1	−1	View file
drivers/staging/et131x/et131x.c	modified	+5	−5	View file
drivers/staging/et131x/et131x.h	modified	+2	−2	View file
drivers/staging/frontier/alphatrack.c	modified	+1	−1	View file
drivers/staging/frontier/tranzport.c	modified	+1	−1	View file
drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c	modified	+3	−3	View file
drivers/staging/hv/Kconfig	deleted	+0	−5	View before deletion
drivers/staging/hv/Makefile	deleted	+0	−3	View before deletion
drivers/staging/hv/TODO	deleted	+0	−5	View before deletion
drivers/staging/iio/Documentation/device.txt	modified	+1	−1	View file
drivers/staging/iio/Documentation/iio_event_monitor.c	added	+241	−0	View file
drivers/staging/iio/Documentation/inkernel.txt	added	+58	−0	View file
drivers/staging/iio/Kconfig	modified	+8	−1	View file
drivers/staging/iio/Makefile	modified	+3	−1	View file
drivers/staging/iio/accel/adis16201_ring.c	modified	+0	−2	View file
drivers/staging/iio/accel/adis16203_ring.c	modified	+0	−2	View file
drivers/staging/iio/accel/adis16204_ring.c	modified	+0	−2	View file
drivers/staging/iio/accel/adis16209_ring.c	modified	+0	−2	View file
drivers/staging/iio/accel/adis16240_ring.c	modified	+0	−2	View file
drivers/staging/iio/accel/lis3l02dq.h	modified	+0	−2	View file
drivers/staging/iio/accel/lis3l02dq_ring.c	modified	+1	−3	View file
drivers/staging/iio/accel/sca3000.h	modified	+1	−1	View file
drivers/staging/iio/adc/Kconfig	modified	+9	−0	View file
drivers/staging/iio/adc/Makefile	modified	+1	−0	View file
drivers/staging/iio/adc/ad7192.c	modified	+25	−20	View file
drivers/staging/iio/adc/ad7291.c	modified	+7	−7	View file
drivers/staging/iio/adc/ad7298_ring.c	modified	+0	−3	View file
drivers/staging/iio/adc/ad7476_ring.c	modified	+1	−3	View file
drivers/staging/iio/adc/ad7606_core.c	modified	+53	−30	View file
drivers/staging/iio/adc/ad7606_par.c	modified	+1	−12	View file
drivers/staging/iio/adc/ad7606_ring.c	modified	+0	−2	View file
drivers/staging/iio/adc/ad7793.c	modified	+0	−2	View file
drivers/staging/iio/adc/ad7887_ring.c	modified	+0	−2	View file
drivers/staging/iio/adc/ad799x_core.c	modified	+2	−2	View file
drivers/staging/iio/adc/ad799x_ring.c	modified	+1	−3	View file
drivers/staging/iio/adc/adt7310.c	modified	+4	−17	View file
drivers/staging/iio/adc/adt7410.c	modified	+4	−17	View file
drivers/staging/iio/adc/lpc32xx_adc.c	added	+237	−0	View file
drivers/staging/iio/adc/max1363_core.c	modified	+31	−19	View file
drivers/staging/iio/adc/max1363_ring.c	modified	+0	−2	View file
drivers/staging/iio/addac/adt7316-i2c.c	modified	+1	−17	View file
drivers/staging/iio/addac/adt7316-spi.c	modified	+1	−17	View file
drivers/staging/iio/addac/adt7316.c	modified	+6	−5	View file
drivers/staging/iio/addac/adt7316.h	modified	+6	−3	View file
drivers/staging/iio/buffer.h	modified	+0	−2	View file
drivers/staging/iio/cdc/ad7150.c	modified	+5	−5	View file
drivers/staging/iio/consumer.h	added	+96	−0	View file
drivers/staging/iio/dac/Kconfig	modified	+4	−3	View file
drivers/staging/iio/dac/ad5064.c	modified	+238	−131	View file
drivers/staging/iio/dac/ad5360.c	modified	+2	−2	View file
drivers/staging/iio/dac/ad5380.c	modified	+2	−2	View file
drivers/staging/iio/dac/ad5421.c	modified	+1	−12	View file
drivers/staging/iio/dac/ad5446.c	modified	+11	−24	View file
drivers/staging/iio/dac/ad5764.c	modified	+1	−12	View file
drivers/staging/iio/dac/max517.c	modified	+12	−6	View file
drivers/staging/iio/dds/ad9834.c	modified	+32	−21	View file
drivers/staging/iio/driver.h	added	+34	−0	View file
drivers/staging/iio/events.h	modified	+3	−1	View file
drivers/staging/iio/gyro/adis16260_ring.c	modified	+0	−2	View file
drivers/staging/iio/iio.h	modified	+57	−13	View file
drivers/staging/iio/iio_core.h	modified	+4	−0	View file
drivers/staging/iio/iio_dummy_evgen.c	modified	+1	−1	View file
drivers/staging/iio/iio_hwmon.c	added	+232	−0	View file
drivers/staging/iio/iio_simple_dummy_buffer.c	modified	+0	−2	View file
drivers/staging/iio/impedance-analyzer/ad5933.c	modified	+0	−3	View file
drivers/staging/iio/imu/adis16400_ring.c	modified	+0	−2	View file
drivers/staging/iio/industrialio-buffer.c	modified	+3	−3	View file
drivers/staging/iio/industrialio-core.c	modified	+199	−459	View file
drivers/staging/iio/industrialio-event.c	added	+453	−0	View file
drivers/staging/iio/inkern.c	added	+292	−0	View file
drivers/staging/iio/kfifo_buf.c	modified	+23	−23	View file
drivers/staging/iio/kfifo_buf.h	modified	+0	−2	View file
drivers/staging/iio/light/isl29018.c	modified	+7	−0	View file
drivers/staging/iio/light/tsl2563.c	modified	+42	−23	View file
drivers/staging/iio/light/tsl2583.c	modified	+12	−7	View file
drivers/staging/iio/machine.h	added	+24	−0	View file
drivers/staging/iio/magnetometer/ak8975.c	modified	+8	−0	View file
drivers/staging/iio/magnetometer/hmc5843.c	modified	+16	−10	View file
drivers/staging/iio/meter/ade7758_ring.c	modified	+1	−3	View file
drivers/staging/iio/meter/meter.h	modified	+1	−1	View file
drivers/staging/iio/ring_sw.c	modified	+13	−13	View file
drivers/staging/iio/ring_sw.h	modified	+0	−5	View file
drivers/staging/iio/trigger/iio-trig-bfin-timer.c	modified	+1	−11	View file
drivers/staging/iio/trigger/iio-trig-gpio.c	modified	+1	−11	View file
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c	modified	+1	−11	View file
drivers/staging/iio/types.h	modified	+4	−0	View file
drivers/staging/keucr/TODO	modified	+1	−1	View file
drivers/staging/line6/capture.c	modified	+15	−39	View file
drivers/staging/line6/capture.h	modified	+1	−1	View file
drivers/staging/line6/driver.c	modified	+1	−1	View file
drivers/staging/line6/pcm.c	modified	+73	−36	View file
drivers/staging/line6/pcm.h	modified	+116	−51	View file
drivers/staging/line6/playback.c	modified	+22	−46	View file
drivers/staging/line6/playback.h	modified	+1	−1	View file
drivers/staging/line6/toneport.c	modified	+8	−4	View file
drivers/staging/line6/usbdefs.h	modified	+21	−23	View file
drivers/staging/media/easycap/easycap_main.c	modified	+1	−0	View file
drivers/staging/media/lirc/lirc_sasem.c	modified	+9	−8	View file
drivers/staging/mei/TODO	modified	+3	−0	View file
drivers/staging/mei/hw.h	modified	+23	−24	View file
drivers/staging/mei/init.c	modified	+11	−13	View file
drivers/staging/mei/interface.c	modified	+27	−45	View file
drivers/staging/mei/interface.h	modified	+4	−3	View file
drivers/staging/mei/interrupt.c	modified	+48	−58	View file
drivers/staging/mei/iorw.c	modified	+7	−10	View file
drivers/staging/mei/main.c	modified	+5	−9	View file
drivers/staging/mei/mei-amt-version.c	added	+481	−0	View file
drivers/staging/mei/mei.h	modified	+66	−61	View file
drivers/staging/mei/mei.txt	modified	+3	−3	View file
drivers/staging/mei/mei_dev.h	modified	+6	−4	View file
drivers/staging/mei/mei_version.h	deleted	+0	−31	View before deletion
drivers/staging/mei/wd.c	modified	+3	−5	View file
drivers/staging/nvec/Kconfig	modified	+3	−3	View file
drivers/staging/nvec/nvec.c	modified	+9	−10	View file
drivers/staging/nvec/nvec_ps2.c	modified	+44	−9	View file
drivers/staging/octeon/ethernet-mdio.c	modified	+2	−2	View file
drivers/staging/omapdrm/omap_crtc.c	modified	+30	−7	View file
drivers/staging/omapdrm/omap_debugfs.c	modified	+96	−1	View file
drivers/staging/omapdrm/omap_dmm_tiler.c	modified	+67	−24	View file
drivers/staging/omapdrm/omap_dmm_tiler.h	modified	+7	−8	View file
drivers/staging/omapdrm/omap_drv.c	modified	+16	−0	View file
drivers/staging/omapdrm/omap_drv.h	modified	+17	−2	View file
drivers/staging/omapdrm/omap_fb.c	modified	+85	−39	View file
drivers/staging/omapdrm/omap_fbdev.c	modified	+22	−4	View file
drivers/staging/omapdrm/omap_gem.c	modified	+127	−45	View file
drivers/staging/omapdrm/omap_gem_helpers.c	modified	+1	−1	View file
drivers/staging/omapdrm/omap_plane.c	modified	+170	−27	View file
drivers/staging/ozwpan/Kbuild	added	+19	−0	View file
drivers/staging/ozwpan/Kconfig	added	+9	−0	View file
drivers/staging/ozwpan/README	added	+25	−0	View file
drivers/staging/ozwpan/TODO	added	+12	−0	View file
drivers/staging/ozwpan/ozappif.h	added	+46	−0	View file
drivers/staging/ozwpan/ozcdev.c	added	+521	−0	View file
drivers/staging/ozwpan/ozcdev.h	added	+18	−0	View file
drivers/staging/ozwpan/ozconfig.h	added	+27	−0	View file
drivers/staging/ozwpan/ozeltbuf.c	added	+339	−0	View file
drivers/staging/ozwpan/ozeltbuf.h	added	+70	−0	View file
drivers/staging/ozwpan/ozevent.c	added	+116	−0	View file
drivers/staging/ozwpan/ozevent.h	added	+31	−0	View file
drivers/staging/ozwpan/ozeventdef.h	added	+47	−0	View file
drivers/staging/ozwpan/ozhcd.c	added	+2256	−0	View file
drivers/staging/ozwpan/ozhcd.h	added	+15	−0	View file
drivers/staging/ozwpan/ozmain.c	added	+58	−0	View file
drivers/staging/ozwpan/ozpd.c	added	+832	−0	View file
drivers/staging/ozwpan/ozpd.h	added	+121	−0	View file
drivers/staging/ozwpan/ozproto.c	added	+957	−0	View file
drivers/staging/ozwpan/ozproto.h	added	+69	−0	View file
drivers/staging/ozwpan/ozprotocol.h	added	+372	−0	View file
drivers/staging/ozwpan/oztrace.c	added	+36	−0	View file
drivers/staging/ozwpan/oztrace.h	added	+35	−0	View file
drivers/staging/ozwpan/ozurbparanoia.c	added	+53	−0	View file
drivers/staging/ozwpan/ozurbparanoia.h	added	+19	−0	View file
drivers/staging/ozwpan/ozusbif.h	added	+43	−0	View file
drivers/staging/ozwpan/ozusbsvc.c	added	+245	−0	View file
drivers/staging/ozwpan/ozusbsvc.h	added	+32	−0	View file
drivers/staging/ozwpan/ozusbsvc1.c	added	+437	−0	View file
drivers/staging/quickstart/quickstart.c	modified	+178	−192	View file
drivers/staging/ramster/Kconfig	added	+17	−0	View file
drivers/staging/ramster/Makefile	added	+1	−0	View file
drivers/staging/ramster/TODO	added	+13	−0	View file
drivers/staging/ramster/cluster/Makefile	added	+3	−0	View file
drivers/staging/ramster/cluster/heartbeat.c	added	+464	−0	View file
drivers/staging/ramster/cluster/heartbeat.h	added	+87	−0	View file
drivers/staging/ramster/cluster/masklog.c	added	+155	−0	View file
drivers/staging/ramster/cluster/masklog.h	added	+220	−0	View file
drivers/staging/ramster/cluster/nodemanager.c	added	+992	−0	View file
drivers/staging/ramster/cluster/nodemanager.h	added	+88	−0	View file
drivers/staging/ramster/cluster/ramster_nodemanager.h	added	+39	−0	View file
drivers/staging/ramster/cluster/tcp.c	added	+2256	−0	View file
drivers/staging/ramster/cluster/tcp.h	added	+159	−0	View file
drivers/staging/ramster/cluster/tcp_internal.h	added	+248	−0	View file
drivers/staging/ramster/r2net.c	added	+401	−0	View file
drivers/staging/ramster/ramster.h	added	+118	−0	View file
drivers/staging/ramster/tmem.c	added	+851	−0	View file
drivers/staging/ramster/tmem.h	added	+244	−0	View file
drivers/staging/zram/xvmalloc.c → drivers/staging/ramster/xvmalloc.c	renamed	+0	−0	View file
drivers/staging/zram/xvmalloc.h → drivers/staging/ramster/xvmalloc.h	renamed	+0	−0	View file
drivers/staging/zram/xvmalloc_int.h → drivers/staging/ramster/xvmalloc_int.h	renamed	+0	−0	View file
drivers/staging/ramster/zcache-main.c	added	+3320	−0	View file
drivers/staging/ramster/zcache.h	added	+22	−0	View file
drivers/staging/rtl8187se/r8180_core.c	modified	+63	−48	View file
drivers/staging/rtl8187se/r8180_dm.c	modified	+652	−1140	View file
drivers/staging/rtl8187se/r8180_wx.c	modified	+61	−225	View file
drivers/staging/rtl8192e/rtllib_rx.c	modified	+1	−1	View file
drivers/staging/rtl8192e/rtllib_softmac.c	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c	modified	+1	−1	View file
drivers/staging/rtl8192u/r8192U_core.c	modified	+0	−1	View file
drivers/staging/rtl8712/Kconfig	modified	+0	−7	View file
drivers/staging/rtl8712/drv_types.h	modified	+0	−1	View file
drivers/staging/rtl8712/os_intfs.c	modified	+0	−6	View file
drivers/staging/rtl8712/osdep_service.h	modified	+0	−17	View file
drivers/staging/rtl8712/rtl8712_recv.c	modified	+0	−2	View file
drivers/staging/rtl8712/rtl871x_io.c	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_io.h	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_ioctl_linux.c	modified	+1	−7	View file
drivers/staging/rtl8712/rtl871x_pwrctrl.c	modified	+4	−7	View file
drivers/staging/rtl8712/rtl871x_pwrctrl.h	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_recv.c	modified	+0	−1	View file
drivers/staging/rtl8712/rtl871x_recv.h	modified	+0	−3	View file
drivers/staging/rtl8712/rtl871x_sta_mgt.c	modified	+0	−4	View file
drivers/staging/rtl8712/rtl871x_xmit.c	modified	+0	−3	View file
drivers/staging/rtl8712/rtl871x_xmit.h	modified	+0	−3	View file
drivers/staging/rtl8712/sta_info.h	modified	+0	−4	View file
drivers/staging/rtl8712/usb_intf.c	modified	+6	−3	View file
drivers/staging/rts5139/TODO	modified	+5	−1	View file
drivers/staging/rts5139/ms.h	modified	+2	−2	View file
drivers/staging/rts5139/rts51x_chip.c	modified	+7	−7	View file
drivers/staging/rts5139/rts51x_chip.h	modified	+3	−3	View file
drivers/staging/rts5139/rts51x_fop.h	modified	+1	−1	View file
drivers/staging/rts5139/rts51x_transport.c	modified	+1	−1	View file
drivers/staging/rts5139/rts51x_transport.h	modified	+1	−1	View file
drivers/staging/rts5139/sd_cprm.c	modified	+1	−1	View file
drivers/staging/rts_pstor/TODO	modified	+5	−1	View file
drivers/staging/sbe-2t3e3/intr.c	modified	+1	−1	View file
drivers/staging/sep/Kconfig	modified	+2	−1	View file
drivers/staging/sep/Makefile	modified	+3	−2	View file
drivers/staging/sep/TODO	modified	+2	−3	View file
drivers/staging/sep/sep_crypto.c	added	+4058	−0	View file
drivers/staging/sep/sep_crypto.h	added	+359	−0	View file
drivers/staging/sep/sep_dev.h	modified	+64	−34	View file
drivers/staging/sep/sep_driver.c	deleted	+0	−2932	View before deletion
drivers/staging/sep/sep_driver_api.h	modified	+240	−53	View file
drivers/staging/sep/sep_driver_config.h	modified	+67	−12	View file
drivers/staging/sep/sep_driver_hw_defs.h	modified	+4	−181	View file
drivers/staging/sep/sep_main.c	added	+4518	−0	View file
drivers/staging/sep/sep_trace_events.h	added	+188	−0	View file
drivers/staging/slicoss/README	modified	+1	−1	View file
drivers/staging/sm7xx/smtcfb.c	modified	+1	−2	View file
drivers/staging/sm7xx/smtcfb.h	modified	+1	−1	View file
drivers/telephony/Kconfig → drivers/staging/telephony/Kconfig	renamed	+0	−0	View file
drivers/telephony/Makefile → drivers/staging/telephony/Makefile	renamed	+0	−0	View file
drivers/staging/telephony/TODO	added	+10	−0	View file
drivers/telephony/ixj-ver.h → drivers/staging/telephony/ixj-ver.h	renamed	+0	−0	View file
drivers/telephony/ixj.c → drivers/staging/telephony/ixj.c	renamed	+0	−0	View file
drivers/telephony/ixj.h → drivers/staging/telephony/ixj.h	renamed	+0	−0	View file
drivers/telephony/ixj_pcmcia.c → drivers/staging/telephony/ixj_pcmcia.c	renamed	+0	−0	View file
drivers/telephony/phonedev.c → drivers/staging/telephony/phonedev.c	renamed	+0	−0	View file
drivers/staging/tidspbridge/Kconfig	modified	+0	−22	View file
drivers/staging/tidspbridge/Makefile	modified	+2	−2	View file
drivers/staging/tidspbridge/core/chnl_sm.c	modified	+1	−33	View file
drivers/staging/tidspbridge/core/dsp-clock.c	modified	+0	−3	View file
drivers/staging/tidspbridge/core/io_sm.c	modified	+6	−23	View file
drivers/staging/tidspbridge/core/msg_sm.c	modified	+0	−3	View file
drivers/staging/tidspbridge/core/tiomap3430.c	modified	+7	−12	View file
drivers/staging/tidspbridge/core/tiomap3430_pwr.c	modified	+0	−1	View file
drivers/staging/tidspbridge/core/tiomap_io.c	modified	+0	−18	View file
drivers/staging/tidspbridge/core/wdt.c	modified	+1	−23	View file
drivers/staging/tidspbridge/gen/gh.c	modified	+0	−18	View file
drivers/staging/tidspbridge/gen/uuidutil.c	modified	+0	−7	View file
drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h	modified	+0	−4	View file
drivers/staging/tidspbridge/include/dspbridge/chnl.h	modified	+0	−29	View file
drivers/staging/tidspbridge/include/dspbridge/cmm.h	modified	+0	−30	View file
drivers/staging/tidspbridge/include/dspbridge/cod.h	modified	+0	−29	View file
drivers/staging/tidspbridge/include/dspbridge/dbc.h	deleted	+0	−46	View before deletion
drivers/staging/tidspbridge/include/dspbridge/dev.h	modified	+0	−27	View file
drivers/staging/tidspbridge/include/dspbridge/disp.h	modified	+0	−31	View file
drivers/staging/tidspbridge/include/dspbridge/dmm.h	modified	+0	−4	View file
drivers/staging/tidspbridge/include/dspbridge/drv.h	modified	+0	−23	View file
drivers/staging/tidspbridge/include/dspbridge/gh.h	modified	+0	−2	View file
drivers/staging/tidspbridge/include/dspbridge/io.h	modified	+0	−29	View file
drivers/staging/tidspbridge/include/dspbridge/io_sm.h	modified	+0	−2	View file
drivers/staging/tidspbridge/include/dspbridge/msg.h	modified	+0	−27	View file
drivers/staging/tidspbridge/include/dspbridge/nldr.h	modified	+0	−2	View file
drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h	modified	+0	−34	View file
drivers/staging/tidspbridge/include/dspbridge/node.h	modified	+0	−41	View file
drivers/staging/tidspbridge/include/dspbridge/nodepriv.h	modified	+0	−1	View file
drivers/staging/tidspbridge/include/dspbridge/proc.h	modified	+0	−28	View file
drivers/staging/tidspbridge/include/dspbridge/rmm.h	modified	+0	−25	View file
drivers/staging/tidspbridge/include/dspbridge/strm.h	modified	+1	−37	View file
drivers/staging/tidspbridge/pmgr/chnl.c	modified	+0	−47	View file
drivers/staging/tidspbridge/pmgr/cmm.c	modified	+2	−95	View file
drivers/staging/tidspbridge/pmgr/cod.c	modified	+0	−103	View file
drivers/staging/tidspbridge/pmgr/dbll.c	modified	+3	−122	View file
drivers/staging/tidspbridge/pmgr/dev.c	modified	+0	−182	View file
drivers/staging/tidspbridge/pmgr/dmm.c	modified	+0	−46	View file
drivers/staging/tidspbridge/pmgr/dspapi.c	modified	+4	−78	View file
drivers/staging/tidspbridge/pmgr/io.c	modified	+0	−45	View file
drivers/staging/tidspbridge/pmgr/msg.c	modified	+0	−38	View file
drivers/staging/tidspbridge/rmgr/dbdcd.c	modified	+1	−102	View file
drivers/staging/tidspbridge/rmgr/disp.c	modified	+0	−69	View file
drivers/staging/tidspbridge/rmgr/drv.c	modified	+0	−74	View file
drivers/staging/tidspbridge/rmgr/drv_interface.c	modified	+172	−194	View file
drivers/staging/tidspbridge/rmgr/drv_interface.h	deleted	+0	−28	View before deletion
drivers/staging/tidspbridge/rmgr/dspdrv.c	modified	+0	−5	View file
drivers/staging/tidspbridge/rmgr/mgr.c	modified	+2	−43	View file
drivers/staging/tidspbridge/rmgr/nldr.c	modified	+0	−99	View file
drivers/staging/tidspbridge/rmgr/node.c	modified	+0	−129	View file
drivers/staging/tidspbridge/rmgr/proc.c	modified	+0	−119	View file
drivers/staging/tidspbridge/rmgr/rmm.c	modified	+0	−56	View file
drivers/staging/tidspbridge/rmgr/strm.c	modified	+1	−113	View file
drivers/staging/usbip/stub.h	modified	+0	−1	View file
drivers/staging/usbip/stub_dev.c	modified	+0	−2	View file
drivers/staging/usbip/stub_rx.c	modified	+0	−9	View file
drivers/staging/usbip/usbip_common.c	modified	+4	−7	View file
drivers/staging/usbip/usbip_common.h	modified	+1	−1	View file
drivers/staging/usbip/vhci_hcd.c	modified	+0	−41	View file
drivers/staging/usbip/vhci_rx.c	modified	+1	−2	View file
drivers/staging/vme/devices/vme_pio2.h	modified	+2	−2	View file
drivers/staging/vme/devices/vme_pio2_gpio.c	modified	+2	−2	View file
drivers/staging/vme/vme.h	modified	+1	−1	View file
drivers/staging/vt6655/bssdb.c	modified	+2	−2	View file
drivers/staging/vt6655/ioctl.c	modified	+11	−12	View file
drivers/staging/vt6656/bssdb.c	modified	+2	−2	View file
drivers/staging/vt6656/iwctl.c	modified	+14	−216	View file
drivers/staging/vt6656/iwctl.h	modified	+5	−8	View file
drivers/staging/vt6656/main_usb.c	modified	+6	−7	View file
drivers/staging/vt6656/wpactl.c	modified	+419	−518	View file
drivers/staging/wlan-ng/cfg80211.c	modified	+1	−1	View file
drivers/staging/wlan-ng/p80211netdev.c	modified	+1	−1	View file
drivers/staging/wlan-ng/prism2mgmt.c	modified	+1	−0	View file
drivers/staging/xgifb/XGI_main.h	modified	+11	−67	View file
drivers/staging/xgifb/XGI_main_26.c	modified	+97	−111	View file
drivers/staging/xgifb/XGIfb.h	modified	+1	−1	View file
drivers/staging/xgifb/vb_def.h	modified	+13	−165	View file
drivers/staging/xgifb/vb_init.c	modified	+10	−10	View file
drivers/staging/xgifb/vb_setmode.c	modified	+418	−418	View file
drivers/staging/xgifb/vb_struct.h	modified	+7	−72	View file
drivers/staging/xgifb/vb_table.h	modified	+173	−173	View file
drivers/staging/xgifb/vgatypes.h	modified	+9	−0	View file
drivers/staging/zcache/Kconfig	modified	+7	−6	View file
drivers/staging/zcache/tmem.h	modified	+1	−1	View file
drivers/staging/zcache/zcache-main.c	modified	+167	−70	View file
drivers/staging/zram/Kconfig	modified	+4	−6	View file
drivers/staging/zram/Makefile	modified	+0	−1	View file
drivers/staging/zram/zram_drv.c	modified	+55	−61	View file
drivers/staging/zram/zram_drv.h	modified	+6	−6	View file
drivers/staging/zram/zram_sysfs.c	modified	+2	−2	View file
drivers/staging/zsmalloc/Kconfig	added	+14	−0	View file
drivers/staging/zsmalloc/Makefile	added	+3	−0	View file
drivers/staging/zsmalloc/zsmalloc-main.c	added	+745	−0	View file
drivers/staging/zsmalloc/zsmalloc.h	added	+31	−0	View file
drivers/staging/zsmalloc/zsmalloc_int.h	added	+155	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c63a43..71514d2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6395,6 +6395,11 @@ W:	http://wiki.laptop.org/go/DCON
 S:	Odd Fixes
 F:	drivers/staging/olpc_dcon/
 
+STAGING - OZMO DEVICES USB OVER WIFI DRIVER
+M:	Chris Kelly <[email protected]>
+S:	Maintained
+F:	drivers/staging/ozwpan/
+
 STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 M:	Willy Tarreau <[email protected]>
 S:	Odd Fixes

drivers/Kconfig

View file

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 5afe5d1..decf8e4 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -40,8 +40,6 @@ source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
-source "drivers/telephony/Kconfig"
-
 # input before char - char/joystick depends on it. As does USB.
 
 source "drivers/input/Kconfig"

drivers/Makefile

View file

diff --git a/drivers/Makefile b/drivers/Makefile
index c07be02..932e8bf 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -86,7 +86,6 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power/
 obj-$(CONFIG_HWMON)		+= hwmon/
 obj-$(CONFIG_THERMAL)		+= thermal/
 obj-$(CONFIG_WATCHDOG)		+= watchdog/
-obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
 obj-$(CONFIG_ACCESSIBILITY)	+= accessibility/

drivers/scsi/Kconfig

View file

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa..d3d18e8 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -662,6 +662,13 @@ config VMWARE_PVSCSI
 	  To compile this driver as a module, choose M here: the
 	  module will be called vmw_pvscsi.
 
+config HYPERV_STORAGE
+	tristate "Microsoft Hyper-V virtual storage driver"
+	depends on SCSI && HYPERV
+	default HYPERV
+	help
+	  Select this option to enable the Hyper-V virtual storage driver.
+
 config LIBFC
 	tristate "LibFC module"
 	select SCSI_FC_ATTRS

drivers/scsi/Makefile

View file

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 2b88749..e4c1a69 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI)	+= libiscsi.o bnx2i/
 obj-$(CONFIG_BE2ISCSI)		+= libiscsi.o be2iscsi/
 obj-$(CONFIG_SCSI_PMCRAID)	+= pmcraid.o
 obj-$(CONFIG_VMWARE_PVSCSI)	+= vmw_pvscsi.o
+obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
 
 obj-$(CONFIG_ARM)		+= arm/
 
@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o
 scsi_mod-y			+= scsi_trace.o
 scsi_mod-$(CONFIG_PM)		+= scsi_pm.o
 
+hv_storvsc-y			:= storvsc_drv.o
+
 scsi_tgt-y			+= scsi_tgt_lib.o scsi_tgt_if.o
 
 sd_mod-objs	:= sd.o

drivers/scsi/storvsc_drv.c

View file

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
similarity index 71%
rename from drivers/staging/hv/storvsc_drv.c
rename to drivers/scsi/storvsc_drv.c
index eb853f7..695ffc3 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -42,56 +42,23 @@
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
 
+/*
+ * All wire protocol details (storage protocol between the guest and the host)
+ * are consolidated here.
+ *
+ * Begin protocol definitions.
+ */
 
-#define STORVSC_MIN_BUF_NR				64
-#define STORVSC_RING_BUFFER_SIZE			(20*PAGE_SIZE)
-static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE;
-
-module_param(storvsc_ringbuffer_size, int, S_IRUGO);
-MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)");
-
-/* to alert the user that structure sizes may be mismatched even though the */
-/* protocol versions match. */
-
-
-#define REVISION_STRING(REVISION_) #REVISION_
-#define FILL_VMSTOR_REVISION(RESULT_LVALUE_)				\
-	do {								\
-		char *revision_string					\
-			= REVISION_STRING($Rev : 6 $) + 6;		\
-		RESULT_LVALUE_ = 0;					\
-		while (*revision_string >= '0'				\
-			&& *revision_string <= '9') {			\
-			RESULT_LVALUE_ *= 10;				\
-			RESULT_LVALUE_ += *revision_string - '0';	\
-			revision_string++;				\
-		}							\
-	} while (0)
-
-/* Major/minor macros.  Minor version is in LSB, meaning that earlier flat */
-/* version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). */
-#define VMSTOR_PROTOCOL_MAJOR(VERSION_)		(((VERSION_) >> 8) & 0xff)
-#define VMSTOR_PROTOCOL_MINOR(VERSION_)		(((VERSION_))      & 0xff)
-#define VMSTOR_PROTOCOL_VERSION(MAJOR_, MINOR_)	((((MAJOR_) & 0xff) << 8) | \
-						 (((MINOR_) & 0xff)))
-#define VMSTOR_INVALID_PROTOCOL_VERSION		(-1)
-
-/* Version history: */
-/* V1 Beta                    0.1 */
-/* V1 RC < 2008/1/31          1.0 */
-/* V1 RC > 2008/1/31          2.0 */
-#define VMSTOR_PROTOCOL_VERSION_CURRENT VMSTOR_PROTOCOL_VERSION(4, 2)
-
-
-
+/*
+ * Version history:
+ * V1 Beta: 0.1
+ * V1 RC < 2008/1/31: 1.0
+ * V1 RC > 2008/1/31:  2.0
+ * Win7: 4.2
+ */
 
-/*  This will get replaced with the max transfer length that is possible on */
-/*  the host adapter. */
-/*  The max transfer length will be published when we offer a vmbus channel. */
-#define MAX_TRANSFER_LENGTH	0x40000
-#define DEFAULT_PACKET_SIZE (sizeof(struct vmdata_gpa_direct) +	\
-			sizeof(struct vstor_packet) +		\
-			sizesizeof(u64) * (MAX_TRANSFER_LENGTH / PAGE_SIZE)))
+#define VMSTOR_CURRENT_MAJOR  4
+#define VMSTOR_CURRENT_MINOR  2
 
 
 /*  Packet structure describing virtual storage requests. */
@@ -115,35 +82,31 @@ enum vstor_packet_operation {
  * this remains the same across the write regardless of 32/64 bit
  * note: it's patterned off the SCSI_PASS_THROUGH structure
  */
-#define CDB16GENERIC_LENGTH			0x10
-
-#ifndef SENSE_BUFFER_SIZE
-#define SENSE_BUFFER_SIZE			0x12
-#endif
-
-#define MAX_DATA_BUF_LEN_WITH_PADDING		0x14
+#define STORVSC_MAX_CMD_LEN			0x10
+#define STORVSC_SENSE_BUFFER_SIZE		0x12
+#define STORVSC_MAX_BUF_LEN_WITH_PADDING	0x14
 
 struct vmscsi_request {
-	unsigned short length;
-	unsigned char srb_status;
-	unsigned char scsi_status;
+	u16 length;
+	u8 srb_status;
+	u8 scsi_status;
 
-	unsigned char port_number;
-	unsigned char path_id;
-	unsigned char target_id;
-	unsigned char lun;
+	u8  port_number;
+	u8  path_id;
+	u8  target_id;
+	u8  lun;
 
-	unsigned char cdb_length;
-	unsigned char sense_info_length;
-	unsigned char data_in;
-	unsigned char reserved;
+	u8  cdb_length;
+	u8  sense_info_length;
+	u8  data_in;
+	u8  reserved;
 
-	unsigned int data_transfer_length;
+	u32 data_transfer_length;
 
 	union {
-		unsigned char cdb[CDB16GENERIC_LENGTH];
-		unsigned char sense_data[SENSE_BUFFER_SIZE];
-		unsigned char reserved_array[MAX_DATA_BUF_LEN_WITH_PADDING];
+		u8 cdb[STORVSC_MAX_CMD_LEN];
+		u8 sense_data[STORVSC_SENSE_BUFFER_SIZE];
+		u8 reserved_array[STORVSC_MAX_BUF_LEN_WITH_PADDING];
 	};
 } __attribute((packed));
 
@@ -153,32 +116,36 @@ struct vmscsi_request {
  * properties of the channel.
  */
 struct vmstorage_channel_properties {
-	unsigned short protocol_version;
-	unsigned char path_id;
-	unsigned char target_id;
+	u16 protocol_version;
+	u8  path_id;
+	u8 target_id;
 
 	/* Note: port number is only really known on the client side */
-	unsigned int port_number;
-	unsigned int flags;
-	unsigned int max_transfer_bytes;
+	u32  port_number;
+	u32  flags;
+	u32   max_transfer_bytes;
 
-	/*  This id is unique for each channel and will correspond with */
-	/*  vendor specific data in the inquirydata */
-	unsigned long long unique_id;
+	/*
+	 * This id is unique for each channel and will correspond with
+	 * vendor specific data in the inquiry data.
+	 */
+
+	u64  unique_id;
 } __packed;
 
 /*  This structure is sent during the storage protocol negotiations. */
 struct vmstorage_protocol_version {
 	/* Major (MSW) and minor (LSW) version numbers. */
-	unsigned short major_minor;
+	u16 major_minor;
 
 	/*
 	 * Revision number is auto-incremented whenever this file is changed
 	 * (See FILL_VMSTOR_REVISION macro above).  Mismatch does not
 	 * definitely indicate incompatibility--but it does indicate mismatched
 	 * builds.
+	 * This is only used on the windows side. Just set it to 0.
 	 */
-	unsigned short revision;
+	u16 revision;
 } __packed;
 
 /* Channel Property Flags */
@@ -190,10 +157,10 @@ struct vstor_packet {
 	enum vstor_packet_operation operation;
 
 	/*  Flags - see below for values */
-	unsigned int flags;
+	u32 flags;
 
 	/* Status of the request returned from the server side. */
-	unsigned int status;
+	u32 status;
 
 	/* Data payload area */
 	union {
@@ -211,18 +178,47 @@ struct vstor_packet {
 	};
 } __packed;
 
-/* Packet flags */
 /*
+ * Packet Flags:
+ *
  * This flag indicates that the server should send back a completion for this
  * packet.
  */
+
 #define REQUEST_COMPLETION_FLAG	0x1
 
-/*  This is the set of flags that the vsc can set in any packets it sends */
-#define VSC_LEGAL_FLAGS		(REQUEST_COMPLETION_FLAG)
+/* Matches Windows-end */
+enum storvsc_request_type {
+	WRITE_TYPE = 0,
+	READ_TYPE,
+	UNKNOWN_TYPE,
+};
+
+/*
+ * SRB status codes and masks; a subset of the codes used here.
+ */
+
+#define SRB_STATUS_AUTOSENSE_VALID	0x80
+#define SRB_STATUS_INVALID_LUN	0x20
+#define SRB_STATUS_SUCCESS	0x01
+#define SRB_STATUS_ERROR	0x04
+
+/*
+ * This is the end of Protocol specific defines.
+ */
+
+
+/*
+ * We setup a mempool to allocate request structures for this driver
+ * on a per-lun basis. The following define specifies the number of
+ * elements in the pool.
+ */
 
+#define STORVSC_MIN_BUF_NR				64
+static int storvsc_ringbuffer_size = (20 * PAGE_SIZE);
 
-/* Defines */
+module_param(storvsc_ringbuffer_size, int, S_IRUGO);
+MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)");
 
 #define STORVSC_MAX_IO_REQUESTS				128
 
@@ -235,27 +231,23 @@ struct vstor_packet {
 #define STORVSC_MAX_LUNS_PER_TARGET			64
 #define STORVSC_MAX_TARGETS				1
 #define STORVSC_MAX_CHANNELS				1
-#define STORVSC_MAX_CMD_LEN				16
 
-/* Matches Windows-end */
-enum storvsc_request_type {
-	WRITE_TYPE,
-	READ_TYPE,
-	UNKNOWN_TYPE,
-};
 
 
-struct hv_storvsc_request {
+struct storvsc_cmd_request {
+	struct list_head entry;
+	struct scsi_cmnd *cmd;
+
+	unsigned int bounce_sgl_count;
+	struct scatterlist *bounce_sgl;
+
 	struct hv_device *device;
 
 	/* Synchronize the request/response if needed */
 	struct completion wait_event;
 
 	unsigned char *sense_buffer;
-	void *context;
-	void (*on_io_completion)(struct hv_storvsc_request *request);
 	struct hv_multipage_buffer data_buffer;
-
 	struct vstor_packet vstor_packet;
 };
 
@@ -281,8 +273,8 @@ struct storvsc_device {
 	unsigned char target_id;
 
 	/* Used for vsc/vsp channel reset process */
-	struct hv_storvsc_request init_request;
-	struct hv_storvsc_request reset_request;
+	struct storvsc_cmd_request init_request;
+	struct storvsc_cmd_request reset_request;
 };
 
 struct stor_mem_pools {
@@ -297,16 +289,6 @@ struct hv_host_device {
 	unsigned char target;
 };
 
-struct storvsc_cmd_request {
-	struct list_head entry;
-	struct scsi_cmnd *cmd;
-
-	unsigned int bounce_sgl_count;
-	struct scatterlist *bounce_sgl;
-
-	struct hv_storvsc_request request;
-};
-
 struct storvsc_scan_work {
 	struct work_struct work;
 	struct Scsi_Host *host;
@@ -352,6 +334,34 @@ done:
 	kfree(wrk);
 }
 
+/*
+ * Major/minor macros.  Minor version is in LSB, meaning that earlier flat
+ * version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1).
+ */
+
+static inline u16 storvsc_get_version(u8 major, u8 minor)
+{
+	u16 version;
+
+	version = ((major << 8) | minor);
+	return version;
+}
+
+/*
+ * We can get incoming messages from the host that are not in response to
+ * messages that we have sent out. An example of this would be messages
+ * received by the guest to notify dynamic addition/removal of LUNs. To
+ * deal with potential race conditions where the driver may be in the
+ * midst of being unloaded when we might receive an unsolicited message
+ * from the host, we have implemented a mechanism to gurantee sequential
+ * consistency:
+ *
+ * 1) Once the device is marked as being destroyed, we will fail all
+ *    outgoing messages.
+ * 2) We permit incoming messages when the device is being destroyed,
+ *    only to properly account for messages already sent out.
+ */
+
 static inline struct storvsc_device *get_out_stor_device(
 					struct hv_device *device)
 {
@@ -398,116 +408,342 @@ get_in_err:
 
 }
 
-static int storvsc_channel_init(struct hv_device *device)
+static void destroy_bounce_buffer(struct scatterlist *sgl,
+				  unsigned int sg_count)
 {
-	struct storvsc_device *stor_device;
-	struct hv_storvsc_request *request;
-	struct vstor_packet *vstor_packet;
-	int ret, t;
+	int i;
+	struct page *page_buf;
 
-	stor_device = get_out_stor_device(device);
-	if (!stor_device)
-		return -ENODEV;
+	for (i = 0; i < sg_count; i++) {
+		page_buf = sg_page((&sgl[i]));
+		if (page_buf != NULL)
+			__free_page(page_buf);
+	}
 
-	request = &stor_device->init_request;
-	vstor_packet = &request->vstor_packet;
+	kfree(sgl);
+}
 
-	/*
-	 * Now, initiate the vsc/vsp initialization protocol on the open
-	 * channel
-	 */
-	memset(request, 0, sizeof(struct hv_storvsc_request));
-	init_completion(&request->wait_event);
-	vstor_packet->operation = VSTOR_OPERATION_BEGIN_INITIALIZATION;
-	vstor_packet->flags = REQUEST_COMPLETION_FLAG;
+static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count)
+{
+	int i;
 
-	ret = vmbus_sendpacket(device->channel, vstor_packet,
-			       sizeof(struct vstor_packet),
-			       (unsigned long)request,
-			       VM_PKT_DATA_INBAND,
-			       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-	if (ret != 0)
-		goto cleanup;
+	/* No need to check */
+	if (sg_count < 2)
+		return -1;
 
-	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
-	if (t == 0) {
-		ret = -ETIMEDOUT;
-		goto cleanup;
+	/* We have at least 2 sg entries */
+	for (i = 0; i < sg_count; i++) {
+		if (i == 0) {
+			/* make sure 1st one does not have hole */
+			if (sgl[i].offset + sgl[i].length != PAGE_SIZE)
+				return i;
+		} else if (i == sg_count - 1) {
+			/* make sure last one does not have hole */
+			if (sgl[i].offset != 0)
+				return i;
+		} else {
+			/* make sure no hole in the middle */
+			if (sgl[i].length != PAGE_SIZE || sgl[i].offset != 0)
+				return i;
+		}
 	}
+	return -1;
+}
 
-	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
-		goto cleanup;
-
-
-	/* reuse the packet for version range supported */
-	memset(vstor_packet, 0, sizeof(struct vstor_packet));
-	vstor_packet->operation = VSTOR_OPERATION_QUERY_PROTOCOL_VERSION;
-	vstor_packet->flags = REQUEST_COMPLETION_FLAG;
+static struct scatterlist *create_bounce_buffer(struct scatterlist *sgl,
+						unsigned int sg_count,
+						unsigned int len,
+						int write)
+{
+	int i;
+	int num_pages;
+	struct scatterlist *bounce_sgl;
+	struct page *page_buf;
+	unsigned int buf_len = ((write == WRITE_TYPE) ? 0 : PAGE_SIZE);
 
-	vstor_packet->version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT;
-	FILL_VMSTOR_REVISION(vstor_packet->version.revision);
+	num_pages = ALIGN(len, PAGE_SIZE) >> PAGE_SHIFT;
 
-	ret = vmbus_sendpacket(device->channel, vstor_packet,
-			       sizeof(struct vstor_packet),
-			       (unsigned long)request,
-			       VM_PKT_DATA_INBAND,
-			       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-	if (ret != 0)
-		goto cleanup;
+	bounce_sgl = kcalloc(num_pages, sizeof(struct scatterlist), GFP_ATOMIC);
+	if (!bounce_sgl)
+		return NULL;
 
-	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
-	if (t == 0) {
-		ret = -ETIMEDOUT;
-		goto cleanup;
+	for (i = 0; i < num_pages; i++) {
+		page_buf = alloc_page(GFP_ATOMIC);
+		if (!page_buf)
+			goto cleanup;
+		sg_set_page(&bounce_sgl[i], page_buf, buf_len, 0);
 	}
 
-	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
-		goto cleanup;
-
+	return bounce_sgl;
 
-	memset(vstor_packet, 0, sizeof(struct vstor_packet));
-	vstor_packet->operation = VSTOR_OPERATION_QUERY_PROPERTIES;
-	vstor_packet->flags = REQUEST_COMPLETION_FLAG;
-	vstor_packet->storage_channel_properties.port_number =
-					stor_device->port_number;
+cleanup:
+	destroy_bounce_buffer(bounce_sgl, num_pages);
+	return NULL;
+}
 
-	ret = vmbus_sendpacket(device->channel, vstor_packet,
-			       sizeof(struct vstor_packet),
-			       (unsigned long)request,
-			       VM_PKT_DATA_INBAND,
-			       VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+/* Assume the original sgl has enough room */
+static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
+					    struct scatterlist *bounce_sgl,
+					    unsigned int orig_sgl_count,
+					    unsigned int bounce_sgl_count)
+{
+	int i;
+	int j = 0;
+	unsigned long src, dest;
+	unsigned int srclen, destlen, copylen;
+	unsigned int total_copied = 0;
+	unsigned long bounce_addr = 0;
+	unsigned long dest_addr = 0;
+	unsigned long flags;
 
-	if (ret != 0)
-		goto cleanup;
+	local_irq_save(flags);
 
-	t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
-	if (t == 0) {
-		ret = -ETIMEDOUT;
-		goto cleanup;
-	}
+	for (i = 0; i < orig_sgl_count; i++) {
+		dest_addr = (unsigned long)kmap_atomic(sg_page((&orig_sgl[i])),
+					KM_IRQ0) + orig_sgl[i].offset;
+		dest = dest_addr;
+		destlen = orig_sgl[i].length;
 
-	if (vstor_packet->operation != VSTOR_OPERATION_COMPLETE_IO ||
-	    vstor_packet->status != 0)
-		goto cleanup;
+		if (bounce_addr == 0)