diff --git a/Makefile b/Makefile index 42a9841d4..40234343f 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ endif PREFIX?=/usr/local/ MOBY_REPO=https://github.com/moby/tool.git -MOBY_COMMIT=70c6aebd260e1e38a43ef953c37e89a8bf45718f +MOBY_COMMIT=57c6720356a8ede6758d60c5d66752d8e19b9ecf MOBY_VERSION=0.0 bin/moby: tmp_moby_bin.tar | bin tar xf $< diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 250854559..969774449 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -1,6 +1,6 @@ # This is a blueprint for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:0832f0cfdfc02214680588a5018619cd1eb4b93f # install vpnkit-expose-port and vpnkit-iptables-wrapper on host diff --git a/docs/kernels.md b/docs/kernels.md index bcefed010..405ee4ac1 100644 --- a/docs/kernels.md +++ b/docs/kernels.md @@ -339,7 +339,7 @@ file: ``` kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - /zfs-kmod:4.9.47 diff --git a/examples/aws.yml b/examples/aws.yml index b999c66f2..4e58a40ae 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/azure.yml b/examples/azure.yml index 5a1b3709b..e3517aa43 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/docker.yml b/examples/docker.yml index f35afd0db..753fe97cc 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/gcp.yml b/examples/gcp.yml index 7a5b31c8a..618e691fb 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/getty.yml b/examples/getty.yml index aeec3d275..2533f696f 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/minimal.yml b/examples/minimal.yml index 14e9c610e..f3cb9837b 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index bdd73dd0d..2d45255f9 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/openstack.yml b/examples/openstack.yml index 455cc5ef5..d9c7f76ee 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/packet.yml b/examples/packet.yml index 3d7bc2a60..c3639c2da 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 085c52e11..051883439 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -1,7 +1,7 @@ # Minimal YAML to run a redis server (used at DockerCon'17) # connect: nc localhost 6379 kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/sshd.yml b/examples/sshd.yml index ac22faf90..9d40b1c03 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/swap.yml b/examples/swap.yml index 5456d26a8..90e01649c 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/vmware.yml b/examples/vmware.yml index b9e900b12..3d81d1f35 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 6f6121b11..79af93e4b 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 7fdd30223..5bf1cf879 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/vultr.yml b/examples/vultr.yml index 5bdfffbf5..cf6817111 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 87d7df270..c67ce320e 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/kernel/Dockerfile b/kernel/Dockerfile index f2cc9d542..c4bc1e8b8 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -110,7 +110,7 @@ RUN curl -sSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \ tar -C / --one-top-level=wireguard --strip-components=2 -xJf /wireguard.tar.xz "WireGuard-${WIREGUARD_VERSION}/src" && \ make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules -# Modules +# Modules and Device Tree binaries RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \ make INSTALL_MOD_PATH=/tmp/kernel-modules firmware_install && \ make INSTALL_MOD_PATH=/tmp/kernel-modules M="/wireguard" modules_install && \ @@ -118,7 +118,12 @@ RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \ cd /tmp/kernel-modules/lib/modules/$DVER && \ rm build source && \ ln -s /usr/src/linux-headers-$DVER build ) && \ - ( cd /tmp/kernel-modules && tar cf /out/kernel.tar lib ) + case $(uname -m) in \ + aarch64) \ + make INSTALL_DTBS_PATH=/tmp/kernel-modules/boot/dtb dtbs_install; \ + ;; \ + esac && \ + ( cd /tmp/kernel-modules && tar cf /out/kernel.tar . ) # Headers (userspace API) RUN mkdir -p /tmp/kernel-headers/usr && \ diff --git a/kernel/Makefile b/kernel/Makefile index 694cf41bd..70c245cc5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -172,11 +172,11 @@ endef # Build Targets # Debug targets only for latest stable and LTS stable # -$(eval $(call kernel,4.13.5,4.13.x,$(EXTRA))) -$(eval $(call kernel,4.13.5,4.13.x,-dbg)) -$(eval $(call kernel,4.9.54,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.54,4.9.x,-dbg)) -$(eval $(call kernel,4.4.91,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.13.6,4.13.x,$(EXTRA))) +$(eval $(call kernel,4.13.6,4.13.x,-dbg)) +$(eval $(call kernel,4.9.56,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.56,4.9.x,-dbg)) +$(eval $(call kernel,4.4.92,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/kernel_config-4.13.x-aarch64 b/kernel/kernel_config-4.13.x-aarch64 index 095524a0f..56e7ba396 100644 --- a/kernel/kernel_config-4.13.x-aarch64 +++ b/kernel/kernel_config-4.13.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.13.5 Kernel Configuration +# Linux/arm64 4.13.6 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -367,7 +367,7 @@ CONFIG_FREEZER=y # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_BCM2835 is not set +CONFIG_ARCH_BCM2835=y # CONFIG_ARCH_BCM_IPROC is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_BRCMSTB is not set @@ -1335,6 +1335,7 @@ CONFIG_OF=y # CONFIG_OF_UNITTEST is not set CONFIG_OF_FLATTREE=y CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS_PCI=y CONFIG_OF_IRQ=y @@ -1343,7 +1344,8 @@ CONFIG_OF_MDIO=m CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set +CONFIG_OF_RESOLVE=y +CONFIG_OF_OVERLAY=y # CONFIG_PARPORT is not set CONFIG_PNP=y CONFIG_PNP_DEBUG_MESSAGES=y @@ -1587,6 +1589,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # # CONFIG_ATA_PIIX is not set +# CONFIG_SATA_DWC is not set # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set # CONFIG_SATA_PROMISE is not set @@ -1694,7 +1697,7 @@ CONFIG_FUSION_MAX_SGE=128 # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set CONFIG_NETDEVICES=y -CONFIG_MII=m +CONFIG_MII=y CONFIG_NET_CORE=y CONFIG_BONDING=m CONFIG_DUMMY=m @@ -1906,7 +1909,40 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_USB_NET_DRIVERS is not set +CONFIG_USB_NET_DRIVERS=y +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set +# CONFIG_USB_LAN78XX is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set +# CONFIG_USB_NET_CDC_MBIM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SR9700 is not set +# CONFIG_USB_NET_SR9800 is not set +# CONFIG_USB_NET_SMSC75XX is not set +CONFIG_USB_NET_SMSC95XX=m +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set +# CONFIG_USB_NET_QMI_WWAN is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_USB_NET_CH9200 is not set # CONFIG_WLAN is not set # @@ -1990,6 +2026,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_CMA3000 is not set @@ -2042,12 +2079,18 @@ CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_PNP=y # CONFIG_SERIAL_8250_FINTEK is not set CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_EXAR=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_EXTENDED=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set # CONFIG_SERIAL_8250_ASPEED_VUART is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA is not set +CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_RT288X is not set @@ -2090,6 +2133,7 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_HISI=y @@ -2177,6 +2221,7 @@ CONFIG_I2C_ALGOBIT=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_BCM2835=m # CONFIG_I2C_CADENCE is not set # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set @@ -2251,6 +2296,7 @@ CONFIG_PINCONF=y # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_SINGLE is not set # CONFIG_PINCTRL_SX150X is not set +CONFIG_PINCTRL_BCM2835=y # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_CHERRYVIEW is not set # CONFIG_PINCTRL_BROXTON is not set @@ -2277,6 +2323,7 @@ CONFIG_PINCTRL_EXYNOS_ARM64=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIO_ACPI=y +CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set # CONFIG_GPIO_SYSFS is not set CONFIG_GPIO_GENERIC=y @@ -2353,12 +2400,14 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_LTC3651 is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set # CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_BQ24257 is not set # CONFIG_CHARGER_BQ24735 is not set # CONFIG_CHARGER_BQ25890 is not set @@ -2447,6 +2496,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_PWM_FAN is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHT3x is not set @@ -2659,9 +2709,9 @@ CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -# CONFIG_FB_CFB_FILLRECT is not set -# CONFIG_FB_CFB_COPYAREA is not set -# CONFIG_FB_CFB_IMAGEBLIT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y @@ -2717,7 +2767,7 @@ CONFIG_XEN_FBDEV_FRONTEND=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set -# CONFIG_FB_SIMPLE is not set +CONFIG_FB_SIMPLE=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -2832,16 +2882,17 @@ CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y CONFIG_USB_PCI=y -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set +CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_OTG_FSM is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2897,7 +2948,15 @@ CONFIG_USB_UHCI_HCD=m # CONFIG_USBIP_CORE is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set -# CONFIG_USB_DWC2 is not set +CONFIG_USB_DWC2=m +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PCI is not set +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set # CONFIG_USB_CHIPIDEA is not set # CONFIG_USB_ISP1760 is not set @@ -2939,8 +2998,8 @@ CONFIG_USB_UHCI_HCD=m # # USB Physical Layer drivers # -# CONFIG_USB_PHY is not set -# CONFIG_NOP_USB_XCEIV is not set +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_MSM_OTG is not set @@ -2954,7 +3013,43 @@ CONFIG_USB_UHCI_HCD=m # CONFIG_TYPEC_UCSI is not set # CONFIG_USB_ULPI_BUS is not set # CONFIG_UWB is not set -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_ARMMMCI is not set +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +# CONFIG_MMC_SDHCI_PCI is not set +# CONFIG_MMC_SDHCI_ACPI is not set +CONFIG_MMC_SDHCI_PLTFM=m +# CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_ESDHC is not set +# CONFIG_MMC_SDHCI_CADENCE is not set +# CONFIG_MMC_SDHCI_F_SDH30 is not set +CONFIG_MMC_SDHCI_IPROC=m +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_CB710 is not set +# CONFIG_MMC_VIA_SDMMC is not set +# CONFIG_MMC_CAVIUM_THUNDERX is not set +# CONFIG_MMC_DW is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_TOSHIBA_PCI is not set +CONFIG_MMC_BCM2835=m +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_SDHCI_XENON is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set @@ -3054,7 +3149,37 @@ CONFIG_RTC_DRV_PL031=y # HID Sensor RTC drivers # # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -# CONFIG_DMADEVICES is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_DMA_OF=y +# CONFIG_AMBA_PL08X is not set +# CONFIG_BCM_SBA_RAID is not set +CONFIG_DMA_BCM2835=m +# CONFIG_FSL_EDMA is not set +# CONFIG_INTEL_IDMA64 is not set +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR_V2 is not set +# CONFIG_PL330_DMA is not set +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set +# CONFIG_QCOM_BAM_DMA is not set +# CONFIG_QCOM_HIDMA_MGMT is not set +# CONFIG_QCOM_HIDMA is not set +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set + +# +# DMA Clients +# +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set # # DMABUF options @@ -3128,6 +3253,7 @@ CONFIG_CLK_VEXPRESS_OSC=y # CONFIG_CLK_QORIQ is not set # CONFIG_COMMON_CLK_XGENE is not set # CONFIG_COMMON_CLK_NXP is not set +# CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PIC32 is not set # CONFIG_COMMON_CLK_VC5 is not set @@ -3163,7 +3289,17 @@ CONFIG_ARM_TIMER_SP804=y # CONFIG_SH_TIMER_TMU is not set # CONFIG_EM_TIMER_STI is not set CONFIG_CLKSRC_VERSATILE=y -# CONFIG_MAILBOX is not set +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +# CONFIG_PLATFORM_MHU is not set +# CONFIG_PL320_MBOX is not set +# CONFIG_PCC is not set +# CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y +# CONFIG_HI6220_MBOX is not set +# CONFIG_MAILBOX_TEST is not set +# CONFIG_QCOM_APCS_IPC is not set +# CONFIG_BCM_FLEXRM_MBOX is not set # CONFIG_IOMMU_SUPPORT is not set # @@ -3174,6 +3310,7 @@ CONFIG_CLKSRC_VERSATILE=y # # Rpmsg drivers # +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set # # SOC (System On Chip) specific Drivers @@ -3182,6 +3319,7 @@ CONFIG_CLKSRC_VERSATILE=y # # Broadcom SoC drivers # +CONFIG_RASPBERRYPI_POWER=y # CONFIG_SOC_BRCMSTB is not set # @@ -3209,12 +3347,28 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # # CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set # CONFIG_PM_DEVFREQ_EVENT is not set -# CONFIG_EXTCON is not set +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +# CONFIG_EXTCON_QCOM_SPMI_MISC is not set +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +# CONFIG_EXTCON_USB_GPIO is not set # CONFIG_MEMORY is not set # CONFIG_IIO is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set -# CONFIG_PWM is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_HIBVT is not set +# CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_SAMSUNG is not set CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 @@ -3261,6 +3415,7 @@ CONFIG_GENERIC_PHY=y # CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set # CONFIG_PHY_EXYNOS_PCIE is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_POWERCAP is not set # CONFIG_MCB is not set @@ -3301,9 +3456,11 @@ CONFIG_NVMEM=y # CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set +# CONFIG_ARM_SCPI_PROTOCOL is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y +CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y # CONFIG_GOOGLE_FIRMWARE is not set diff --git a/kernel/kernel_config-4.13.x-x86_64 b/kernel/kernel_config-4.13.x-x86_64 index aa33ed1df..658af6a18 100644 --- a/kernel/kernel_config-4.13.x-x86_64 +++ b/kernel/kernel_config-4.13.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.13.5 Kernel Configuration +# Linux/x86 4.13.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/kernel_config-4.4.x-aarch64 b/kernel/kernel_config-4.4.x-aarch64 index c210e4b1f..542756a71 100644 --- a/kernel/kernel_config-4.4.x-aarch64 +++ b/kernel/kernel_config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.91 Kernel Configuration +# Linux/arm64 4.4.92 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/kernel_config-4.4.x-x86_64 b/kernel/kernel_config-4.4.x-x86_64 index 6f0237e2f..945d3fcfc 100644 --- a/kernel/kernel_config-4.4.x-x86_64 +++ b/kernel/kernel_config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.91 Kernel Configuration +# Linux/x86 4.4.92 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/kernel_config-4.9.x-aarch64 b/kernel/kernel_config-4.9.x-aarch64 index 973759f77..c1cae68ed 100644 --- a/kernel/kernel_config-4.9.x-aarch64 +++ b/kernel/kernel_config-4.9.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.54 Kernel Configuration +# Linux/arm64 4.9.56 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -336,7 +336,7 @@ CONFIG_FREEZER=y # # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_BCM2835 is not set +CONFIG_ARCH_BCM2835=y # CONFIG_ARCH_BCM_IPROC is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_BRCMSTB is not set @@ -1247,6 +1247,7 @@ CONFIG_OF=y # CONFIG_OF_UNITTEST is not set CONFIG_OF_FLATTREE=y CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_ADDRESS_PCI=y CONFIG_OF_IRQ=y @@ -1255,7 +1256,8 @@ CONFIG_OF_MDIO=m CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set +CONFIG_OF_RESOLVE=y +CONFIG_OF_OVERLAY=y # CONFIG_PARPORT is not set CONFIG_PNP=y CONFIG_PNP_DEBUG_MESSAGES=y @@ -1494,6 +1496,7 @@ CONFIG_ATA_BMDMA=y # SATA SFF controllers with BMDMA # # CONFIG_ATA_PIIX is not set +# CONFIG_SATA_DWC is not set # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set # CONFIG_SATA_PROMISE is not set @@ -1600,7 +1603,7 @@ CONFIG_FUSION_MAX_SGE=128 # CONFIG_FIREWIRE is not set # CONFIG_FIREWIRE_NOSY is not set CONFIG_NETDEVICES=y -CONFIG_MII=m +CONFIG_MII=y CONFIG_NET_CORE=y CONFIG_BONDING=m CONFIG_DUMMY=m @@ -1802,7 +1805,40 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m # CONFIG_SLIP is not set CONFIG_SLHC=m -# CONFIG_USB_NET_DRIVERS is not set +CONFIG_USB_NET_DRIVERS=y +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set +# CONFIG_USB_LAN78XX is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_AX88179_178A is not set +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set +# CONFIG_USB_NET_CDC_MBIM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SR9700 is not set +# CONFIG_USB_NET_SR9800 is not set +# CONFIG_USB_NET_SMSC75XX is not set +CONFIG_USB_NET_SMSC95XX=m +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set +# CONFIG_USB_NET_QMI_WWAN is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_USB_NET_CH9200 is not set # CONFIG_WLAN is not set # @@ -1886,6 +1922,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_CM109 is not set CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_PWM_BEEPER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_CMA3000 is not set @@ -1939,10 +1976,16 @@ CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_PNP=y # CONFIG_SERIAL_8250_FINTEK is not set CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_EXTENDED=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA is not set +CONFIG_SERIAL_8250_BCM2835AUX=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_RT288X is not set @@ -1984,6 +2027,7 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BCM2835=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_EXYNOS=y CONFIG_HW_RANDOM_TPM=y @@ -2065,6 +2109,7 @@ CONFIG_I2C_ALGOBIT=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_BCM2835=m # CONFIG_I2C_CADENCE is not set # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_DESIGNWARE_PLATFORM is not set @@ -2140,6 +2185,7 @@ CONFIG_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_AMD is not set # CONFIG_PINCTRL_SINGLE is not set +CONFIG_PINCTRL_BCM2835=y # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_CHERRYVIEW is not set # CONFIG_PINCTRL_BROXTON is not set @@ -2241,6 +2287,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set @@ -2332,6 +2379,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set +# CONFIG_SENSORS_PWM_FAN is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHT3x is not set @@ -2538,9 +2586,9 @@ CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y # CONFIG_FB_DDC is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -# CONFIG_FB_CFB_FILLRECT is not set -# CONFIG_FB_CFB_COPYAREA is not set -# CONFIG_FB_CFB_IMAGEBLIT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_COPYAREA=y @@ -2595,7 +2643,7 @@ CONFIG_XEN_FBDEV_FRONTEND=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set -# CONFIG_FB_SIMPLE is not set +CONFIG_FB_SIMPLE=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -2703,16 +2751,17 @@ CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB=y -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # # Miscellaneous USB options # CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set +CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_OTG_FSM is not set # CONFIG_USB_MON is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2768,7 +2817,15 @@ CONFIG_USB_UHCI_HCD=m # CONFIG_USBIP_CORE is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_DWC3 is not set -# CONFIG_USB_DWC2 is not set +CONFIG_USB_DWC2=m +CONFIG_USB_DWC2_HOST=y + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PCI is not set +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set # CONFIG_USB_CHIPIDEA is not set # CONFIG_USB_ISP1760 is not set @@ -2810,15 +2867,52 @@ CONFIG_USB_UHCI_HCD=m # # USB Physical Layer drivers # -# CONFIG_USB_PHY is not set -# CONFIG_NOP_USB_XCEIV is not set +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_ULPI is not set # CONFIG_USB_GADGET is not set # CONFIG_USB_ULPI_BUS is not set # CONFIG_UWB is not set -# CONFIG_MMC is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_PWRSEQ_EMMC=m +CONFIG_PWRSEQ_SIMPLE=m + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_ARMMMCI is not set +CONFIG_MMC_SDHCI=m +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +# CONFIG_MMC_SDHCI_PCI is not set +# CONFIG_MMC_SDHCI_ACPI is not set +CONFIG_MMC_SDHCI_PLTFM=m +# CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_ESDHC is not set +# CONFIG_MMC_SDHCI_F_SDH30 is not set +CONFIG_MMC_SDHCI_IPROC=m +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_CB710 is not set +# CONFIG_MMC_VIA_SDMMC is not set +# CONFIG_MMC_DW is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_TOSHIBA_PCI is not set +# CONFIG_MMC_MTK is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set @@ -2915,7 +3009,36 @@ CONFIG_RTC_DRV_PL031=y # HID Sensor RTC drivers # # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -# CONFIG_DMADEVICES is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_VIRTUAL_CHANNELS=m +CONFIG_DMA_ACPI=y +CONFIG_DMA_OF=y +# CONFIG_AMBA_PL08X is not set +CONFIG_DMA_BCM2835=m +# CONFIG_FSL_EDMA is not set +# CONFIG_INTEL_IDMA64 is not set +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR_V2 is not set +# CONFIG_PL330_DMA is not set +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set +# CONFIG_QCOM_BAM_DMA is not set +# CONFIG_QCOM_HIDMA_MGMT is not set +# CONFIG_QCOM_HIDMA is not set +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set + +# +# DMA Clients +# +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set # # DMABUF options @@ -2988,6 +3111,7 @@ CONFIG_CLK_VEXPRESS_OSC=y # CONFIG_CLK_QORIQ is not set # CONFIG_COMMON_CLK_XGENE is not set # CONFIG_COMMON_CLK_NXP is not set +# CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_PXA is not set # CONFIG_COMMON_CLK_PIC32 is not set # CONFIG_COMMON_CLK_HI3519 is not set @@ -3020,7 +3144,16 @@ CONFIG_ARM_TIMER_SP804=y # CONFIG_SH_TIMER_TMU is not set # CONFIG_EM_TIMER_STI is not set CONFIG_CLKSRC_VERSATILE=y -# CONFIG_MAILBOX is not set +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +# CONFIG_PLATFORM_MHU is not set +# CONFIG_PL320_MBOX is not set +# CONFIG_PCC is not set +# CONFIG_ALTERA_MBOX is not set +CONFIG_BCM2835_MBOX=y +# CONFIG_HI6220_MBOX is not set +# CONFIG_MAILBOX_TEST is not set +# CONFIG_BCM_PDC_MBOX is not set # CONFIG_IOMMU_SUPPORT is not set # @@ -3039,6 +3172,7 @@ CONFIG_CLKSRC_VERSATILE=y # # Broadcom SoC drivers # +CONFIG_RASPBERRYPI_POWER=y # CONFIG_QCOM_GSBI is not set CONFIG_SOC_SAMSUNG=y # CONFIG_SUNXI_SRAM is not set @@ -3064,7 +3198,12 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # CONFIG_IIO is not set # CONFIG_NTB is not set # CONFIG_VME_BUS is not set -# CONFIG_PWM is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_PCA9685 is not set +# CONFIG_PWM_SAMSUNG is not set CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 @@ -3099,6 +3238,7 @@ CONFIG_GENERIC_PHY=y # CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_HI6220_USB is not set +# CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_PHY_QCOM_APQ8064_SATA is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set # CONFIG_PHY_XGENE is not set @@ -3132,9 +3272,11 @@ CONFIG_ARM_PMU=y # Firmware Drivers # CONFIG_ARM_PSCI_FW=y +# CONFIG_ARM_SCPI_PROTOCOL is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y +CONFIG_RASPBERRYPI_FIRMWARE=y # CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y diff --git a/kernel/kernel_config-4.9.x-x86_64 b/kernel/kernel_config-4.9.x-x86_64 index fad231d82..ea821667f 100644 --- a/kernel/kernel_config-4.9.x-x86_64 +++ b/kernel/kernel_config-4.9.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.54 Kernel Configuration +# Linux/x86 4.9.56 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch index 8e51903f1..ceb11b8cc 100644 --- a/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch +++ b/kernel/patches-4.13.x/0001-vmbus-vmbus_open-reset-onchannel_callback-on-error.patch @@ -1,7 +1,7 @@ -From c53376e0635d39e3037ce5a2b4874a50800d32e1 Mon Sep 17 00:00:00 2001 +From 88649f9b578f9d4a00f624e18c0524440ce97a0b Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:12 -0600 -Subject: [PATCH 01/17] vmbus: vmbus_open(): reset onchannel_callback on error +Subject: [PATCH 01/14] vmbus: vmbus_open(): reset onchannel_callback on error No real issue is observed without the patch, but let's add this just in case. diff --git a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index e3c6cc736..be5de35e8 100644 --- a/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.13.x/0002-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,7 +1,7 @@ -From c6a481781fa76c095abe74bdc1083df2789d12a1 Mon Sep 17 00:00:00 2001 +From 443c87acb6c5a538e3e3065fced1e3e5a5c0aae3 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:20 -0600 -Subject: [PATCH 02/17] vmbus: remove "goto error_clean_msglist" in +Subject: [PATCH 02/14] vmbus: remove "goto error_clean_msglist" in vmbus_open() This is just a cleanup patch to simplify the code a little. diff --git a/kernel/patches-4.13.x/0003-vmbus-dynamically-enqueue-dequeue-a-channel-on-vmbus.patch b/kernel/patches-4.13.x/0003-vmbus-dynamically-enqueue-dequeue-a-channel-on-vmbus.patch index 6b7a66c24..fc87f5877 100644 --- a/kernel/patches-4.13.x/0003-vmbus-dynamically-enqueue-dequeue-a-channel-on-vmbus.patch +++ b/kernel/patches-4.13.x/0003-vmbus-dynamically-enqueue-dequeue-a-channel-on-vmbus.patch @@ -1,7 +1,7 @@ -From 12b46dafed31d8083e4352e91fb16d71b1b10fa9 Mon Sep 17 00:00:00 2001 +From dc99fa02f640b5f7719727e62d2f81f0d1c93868 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:23 -0600 -Subject: [PATCH 03/17] vmbus: dynamically enqueue/dequeue a channel on +Subject: [PATCH 03/14] vmbus: dynamically enqueue/dequeue a channel on vmbus_open/close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -82,7 +82,7 @@ index 42498ecd0f02..d4243b5c39b7 100644 channel->sc_creation_callback = NULL; /* Stop callback and cancel the timer asap */ diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c -index 4bbb8dea4727..1afa7a699dd2 100644 +index 037361158074..415c69aeb32c 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -362,6 +362,17 @@ static void percpu_channel_enq(void *arg) diff --git a/kernel/patches-4.13.x/0004-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch b/kernel/patches-4.13.x/0004-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch index edfa07e89..21152092b 100644 --- a/kernel/patches-4.13.x/0004-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch +++ b/kernel/patches-4.13.x/0004-hv_sock-implements-Hyper-V-transport-for-Virtual-Soc.patch @@ -1,7 +1,7 @@ -From 31717efbd97bd61cddd19f9fee2972325d3e52e8 Mon Sep 17 00:00:00 2001 +From fcb3e7f94e485a5bcd730784f056d6650093149c Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:26 -0600 -Subject: [PATCH 04/17] hv_sock: implements Hyper-V transport for Virtual +Subject: [PATCH 04/14] hv_sock: implements Hyper-V transport for Virtual Sockets (AF_VSOCK) Hyper-V Sockets (hv_sock) supplies a byte-stream based communication diff --git a/kernel/patches-4.13.x/0005-VMCI-only-try-to-load-on-VMware-hypervisor.patch b/kernel/patches-4.13.x/0005-VMCI-only-try-to-load-on-VMware-hypervisor.patch index a220485da..969cc73b7 100644 --- a/kernel/patches-4.13.x/0005-VMCI-only-try-to-load-on-VMware-hypervisor.patch +++ b/kernel/patches-4.13.x/0005-VMCI-only-try-to-load-on-VMware-hypervisor.patch @@ -1,7 +1,7 @@ -From 5a08fb06df9c3b5275fb04a619ce9c05d1fe2b68 Mon Sep 17 00:00:00 2001 +From 215417da38c0a88d9b2468304b414c8faa88cd10 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:29 -0600 -Subject: [PATCH 05/17] VMCI: only try to load on VMware hypervisor +Subject: [PATCH 05/14] VMCI: only try to load on VMware hypervisor Without the patch, vmw_vsock_vmci_transport.ko and vmw_vmci.ko can automatically load when an application creates an AF_VSOCK socket. diff --git a/kernel/patches-4.13.x/0006-hv_sock-add-the-support-of-auto-loading.patch b/kernel/patches-4.13.x/0006-hv_sock-add-the-support-of-auto-loading.patch index 0eb30a7b0..d3ed7f584 100644 --- a/kernel/patches-4.13.x/0006-hv_sock-add-the-support-of-auto-loading.patch +++ b/kernel/patches-4.13.x/0006-hv_sock-add-the-support-of-auto-loading.patch @@ -1,7 +1,7 @@ -From 80833dd5a4b84db420395096d72b45d08bc99acc Mon Sep 17 00:00:00 2001 +From 31695355b51ff9351e1beb1d334a3eeb996896f4 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 16:57:35 -0600 -Subject: [PATCH 06/17] hv_sock: add the support of auto-loading +Subject: [PATCH 06/14] hv_sock: add the support of auto-loading After we disable VMWare virtual sockets driver's auto-loading on Hyper-V, we can enable hv_sock's auto-loading now. diff --git a/kernel/patches-4.13.x/0007-tools-hv_sock-2-simple-test-cases.patch b/kernel/patches-4.13.x/0007-tools-hv_sock-2-simple-test-cases.patch index 7ea8e20b4..996eb5f89 100644 --- a/kernel/patches-4.13.x/0007-tools-hv_sock-2-simple-test-cases.patch +++ b/kernel/patches-4.13.x/0007-tools-hv_sock-2-simple-test-cases.patch @@ -1,7 +1,7 @@ -From accbae2f5975f31044abff1c346b7962467a0725 Mon Sep 17 00:00:00 2001 +From d351b5ed3eafffe7dc31c2c75180782ca455ae31 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 5 May 2017 18:52:02 -0600 -Subject: [PATCH 07/17] tools: hv_sock: 2 simple test cases. +Subject: [PATCH 07/14] tools: hv_sock: 2 simple test cases. Please read this document first: https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/user-guide/make-integration-service diff --git a/kernel/patches-4.13.x/0008-hvsock-fix-a-race-in-hvs_stream_dequeue.patch b/kernel/patches-4.13.x/0008-hvsock-fix-a-race-in-hvs_stream_dequeue.patch index 1bf7992b0..addd92cb3 100644 --- a/kernel/patches-4.13.x/0008-hvsock-fix-a-race-in-hvs_stream_dequeue.patch +++ b/kernel/patches-4.13.x/0008-hvsock-fix-a-race-in-hvs_stream_dequeue.patch @@ -1,7 +1,7 @@ -From a45342433ece86ac489d2ff4a2be1902e900c5fe Mon Sep 17 00:00:00 2001 +From 0fe8cb7ac4a6fb02e267b4e87b0e9102aa7bb92f Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 May 2017 22:14:03 +0800 -Subject: [PATCH 08/17] hvsock: fix a race in hvs_stream_dequeue() +Subject: [PATCH 08/14] hvsock: fix a race in hvs_stream_dequeue() If hv_pkt_iter_next() returns a non-NULL pointer, we must update the recv_data_len/data_off info, otherwise the received data will diff --git a/kernel/patches-4.13.x/0009-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch b/kernel/patches-4.13.x/0009-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch index 395d889a8..b11743534 100644 --- a/kernel/patches-4.13.x/0009-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch +++ b/kernel/patches-4.13.x/0009-hvsock-fix-vsock_dequeue-enqueue_accept-race.patch @@ -1,7 +1,7 @@ -From d8edba7c4945f311c2d8f844365d18e6160d9c34 Mon Sep 17 00:00:00 2001 +From 8b8cd3d7e407fcd39648cea2fe030f4c2e505855 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 19 May 2017 21:49:59 +0800 -Subject: [PATCH 09/17] hvsock: fix vsock_dequeue/enqueue_accept race +Subject: [PATCH 09/14] hvsock: fix vsock_dequeue/enqueue_accept race Signed-off-by: Dexuan Cui Origin: git@github.com:dcui/linux.git diff --git a/kernel/patches-4.13.x/0012-hv-sock-a-temporary-workaround-for-the-pending_send_.patch b/kernel/patches-4.13.x/0010-hv-sock-a-temporary-workaround-for-the-pending_send_.patch similarity index 97% rename from kernel/patches-4.13.x/0012-hv-sock-a-temporary-workaround-for-the-pending_send_.patch rename to kernel/patches-4.13.x/0010-hv-sock-a-temporary-workaround-for-the-pending_send_.patch index d5e591eed..7d25d8f87 100644 --- a/kernel/patches-4.13.x/0012-hv-sock-a-temporary-workaround-for-the-pending_send_.patch +++ b/kernel/patches-4.13.x/0010-hv-sock-a-temporary-workaround-for-the-pending_send_.patch @@ -1,7 +1,7 @@ -From 49f51e99f1a39957fd276f528f2b0bb85ab86a5c Mon Sep 17 00:00:00 2001 +From aaa233991131d32aaa04bb4bc5a2ebd6516fa992 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 21 Jun 2017 22:30:42 +0800 -Subject: [PATCH 12/17] hv-sock: a temporary workaround for the +Subject: [PATCH 10/14] hv-sock: a temporary workaround for the pending_send_size issue While I'm trying to find out the root cause, I believe this can work diff --git a/kernel/patches-4.13.x/0010-vmbus-fix-hv_percpu_channel_deq-enq-race.patch b/kernel/patches-4.13.x/0010-vmbus-fix-hv_percpu_channel_deq-enq-race.patch deleted file mode 100644 index 304eeb31c..000000000 --- a/kernel/patches-4.13.x/0010-vmbus-fix-hv_percpu_channel_deq-enq-race.patch +++ /dev/null @@ -1,246 +0,0 @@ -From ed9c64d1bb5a40058a00fbedc5c4978dbda772ff Mon Sep 17 00:00:00 2001 -From: Dexuan Cui -Date: Mon, 5 Jun 2017 16:13:18 +0800 -Subject: [PATCH 10/17] vmbus: fix hv_percpu_channel_deq/enq race - -Signed-off-by: Dexuan Cui -Origin: git@github.com:dcui/linux.git -(cherry picked from commit db40d92a09ff6b84b6c47e96d0a8d1cb1f83cd36) ---- - drivers/hv/channel_mgmt.c | 32 +++++++++++++++++++++---- - drivers/hv/connection.c | 11 +++++++++ - drivers/hv/hyperv_vmbus.h | 1 + - drivers/hv/vmbus_drv.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--- - 4 files changed, 95 insertions(+), 8 deletions(-) - -diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c -index 1afa7a699dd2..117157c8e284 100644 ---- a/drivers/hv/channel_mgmt.c -+++ b/drivers/hv/channel_mgmt.c -@@ -364,11 +364,16 @@ static void percpu_channel_enq(void *arg) - - void hv_percpu_channel_enq(struct vmbus_channel *channel) - { -+ unsigned long flags; -+ - if (channel->target_cpu != get_cpu()) - smp_call_function_single(channel->target_cpu, - percpu_channel_enq, channel, true); -- else -+ else { -+ local_irq_save(flags); - percpu_channel_enq(channel); -+ local_irq_restore(flags); -+ } - - put_cpu(); - } -@@ -382,11 +387,16 @@ static void percpu_channel_deq(void *arg) - - void hv_percpu_channel_deq(struct vmbus_channel *channel) - { -+ unsigned long flags; -+ - if (channel->target_cpu != get_cpu()) - smp_call_function_single(channel->target_cpu, - percpu_channel_deq, channel, true); -- else -+ else { -+ local_irq_save(flags); - percpu_channel_deq(channel); -+ local_irq_restore(flags); -+ } - - put_cpu(); - } -@@ -494,7 +504,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) - channel->num_sc++; - spin_unlock_irqrestore(&channel->lock, flags); - } else { -- atomic_dec(&vmbus_connection.offer_in_progress); - goto err_free_chan; - } - } -@@ -548,6 +557,7 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) - return; - - err_deq_chan: -+ atomic_dec(&vmbus_connection.offer_in_progress); - mutex_lock(&vmbus_connection.channel_mutex); - list_del(&newchannel->listentry); - mutex_unlock(&vmbus_connection.channel_mutex); -@@ -914,16 +924,28 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) - } - } - -+static void vmbus_stop_rescind_handling_work(struct work_struct *work) -+{ -+ atomic_inc(&vmbus_connection.offer_in_progress); -+} -+ - void vmbus_hvsock_device_unregister(struct vmbus_channel *channel) - { -- mutex_lock(&vmbus_connection.channel_mutex); -+ struct work_struct work; - - BUG_ON(!is_hvsock_channel(channel)); - -+ /* Prevent chn_rescind_callback from running in the rescind path */ -+ INIT_WORK(&work, vmbus_stop_rescind_handling_work); -+ queue_work_on(vmbus_connection.connect_cpu, -+ vmbus_connection.work_queue_rescind, &work); -+ flush_work(&work); -+ - channel->rescind = true; - vmbus_device_unregister(channel->device_obj); - -- mutex_unlock(&vmbus_connection.channel_mutex); -+ /* Unblock the rescind handling */ -+ atomic_dec(&vmbus_connection.offer_in_progress); - } - EXPORT_SYMBOL_GPL(vmbus_hvsock_device_unregister); - -diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c -index 59c11ff90d12..a79b615b2d98 100644 ---- a/drivers/hv/connection.c -+++ b/drivers/hv/connection.c -@@ -156,6 +156,12 @@ int vmbus_connect(void) - goto cleanup; - } - -+ vmbus_connection.work_queue_rescind = create_workqueue("hv_vmbus_rsd"); -+ if (!vmbus_connection.work_queue_rescind) { -+ ret = -ENOMEM; -+ goto cleanup; -+ } -+ - INIT_LIST_HEAD(&vmbus_connection.chn_msg_list); - spin_lock_init(&vmbus_connection.channelmsg_lock); - -@@ -246,6 +252,11 @@ void vmbus_disconnect(void) - */ - vmbus_initiate_unload(false); - -+ if (vmbus_connection.work_queue_rescind) { -+ drain_workqueue(vmbus_connection.work_queue_rescind); -+ destroy_workqueue(vmbus_connection.work_queue_rescind); -+ } -+ - if (vmbus_connection.work_queue) { - drain_workqueue(vmbus_connection.work_queue); - destroy_workqueue(vmbus_connection.work_queue); -diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h -index 1b6a5e0dfa75..80270384053e 100644 ---- a/drivers/hv/hyperv_vmbus.h -+++ b/drivers/hv/hyperv_vmbus.h -@@ -339,6 +339,7 @@ struct vmbus_connection { - struct mutex channel_mutex; - - struct workqueue_struct *work_queue; -+ struct workqueue_struct *work_queue_rescind; - }; - - -diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index ed84e96715a0..fb50edf6ad17 100644 ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -806,6 +806,52 @@ static void vmbus_onmessage_work(struct work_struct *work) - kfree(ctx); - } - -+static void vmbus_dispatch_msg_work(struct work_struct *work) -+{ -+ struct vmbus_channel_message_header *hdr; -+ struct onmessage_work_context *ctx, *context; -+ -+ ctx = container_of(work, struct onmessage_work_context, work); -+ hdr = (struct vmbus_channel_message_header *)ctx->msg.u.payload; -+ -+ context = kmalloc(sizeof(*context), GFP_KERNEL | __GFP_NOFAIL); -+ INIT_WORK(&context->work, vmbus_onmessage_work); -+ memcpy(&context->msg, &ctx->msg, sizeof(struct hv_message)); -+ -+ /* -+ * The host can generate a rescind message while we -+ * may still be handling the original offer. We deal with -+ * this condition by ensuring the processing is done on the -+ * same CPU. -+ */ -+ switch (hdr->msgtype) { -+ case CHANNELMSG_RESCIND_CHANNELOFFER: -+ /* -+ * If we are handling the rescind message; -+ * schedule the work on the global work queue. -+ */ -+ queue_work_on(vmbus_connection.connect_cpu, -+ vmbus_connection.work_queue_rescind, -+ &context->work); -+ break; -+ -+ case CHANNELMSG_OFFERCHANNEL: -+ /* XXX */ -+ flush_workqueue(vmbus_connection.work_queue_rescind); -+ -+ atomic_inc(&vmbus_connection.offer_in_progress); -+ queue_work_on(vmbus_connection.connect_cpu, -+ vmbus_connection.work_queue, -+ &context->work); -+ break; -+ -+ default: -+ queue_work(vmbus_connection.work_queue, &context->work); -+ } -+ -+ kfree(ctx); -+} -+ - static void hv_process_timer_expiration(struct hv_message *msg, - struct hv_per_cpu_context *hv_cpu) - { -@@ -845,9 +891,10 @@ void vmbus_on_msg_dpc(unsigned long data) - if (ctx == NULL) - return; - -- INIT_WORK(&ctx->work, vmbus_onmessage_work); -+ INIT_WORK(&ctx->work, vmbus_dispatch_msg_work); - memcpy(&ctx->msg, msg, sizeof(*msg)); - -+#if 0 - /* - * The host can generate a rescind message while we - * may still be handling the original offer. We deal with -@@ -860,8 +907,9 @@ void vmbus_on_msg_dpc(unsigned long data) - * If we are handling the rescind message; - * schedule the work on the global work queue. - */ -- schedule_work_on(vmbus_connection.connect_cpu, -- &ctx->work); -+ queue_work_on(vmbus_connection.connect_cpu, -+ vmbus_connection.work_queue_rescind, -+ &ctx->work); - break; - - case CHANNELMSG_OFFERCHANNEL: -@@ -874,6 +922,9 @@ void vmbus_on_msg_dpc(unsigned long data) - default: - queue_work(vmbus_connection.work_queue, &ctx->work); - } -+#else -+ schedule_work(&ctx->work); -+#endif - } else - entry->message_handler(hdr); - -@@ -1171,6 +1222,8 @@ int vmbus_device_register(struct hv_device *child_device_obj) - child_device_obj->device.parent = &hv_acpi_dev->dev; - child_device_obj->device.release = vmbus_device_release; - -+ if (is_hvsock_channel(child_device_obj->channel)) -+ dev_set_uevent_suppress(&child_device_obj->device, 1); - /* - * Register with the LDM. This will kick off the driver/device - * binding...which will eventually call vmbus_match() and vmbus_probe() --- -2.14.1 - diff --git a/kernel/patches-4.13.x/0011-vmbus-add-vmbus-onoffer-onoffer_rescind-sync.patch b/kernel/patches-4.13.x/0011-vmbus-add-vmbus-onoffer-onoffer_rescind-sync.patch deleted file mode 100644 index ab4f66db6..000000000 --- a/kernel/patches-4.13.x/0011-vmbus-add-vmbus-onoffer-onoffer_rescind-sync.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 2d22cdc2fd0b6c09544354e463cc26da329b60af Mon Sep 17 00:00:00 2001 -From: Dexuan Cui -Date: Mon, 5 Jun 2017 21:32:00 +0800 -Subject: [PATCH 11/17] vmbus: add vmbus onoffer/onoffer_rescind sync. - -Signed-off-by: Dexuan Cui -Origin: git@github.com:dcui/linux.git -(cherry picked from commit 0465d97030768485eec5a69a98963e3da7402826) ---- - drivers/hv/channel_mgmt.c | 25 +++++++++++++++++++------ - drivers/hv/hyperv_vmbus.h | 1 + - drivers/hv/vmbus_drv.c | 1 + - 3 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c -index 117157c8e284..c524ca967d8f 100644 ---- a/drivers/hv/channel_mgmt.c -+++ b/drivers/hv/channel_mgmt.c -@@ -466,6 +466,7 @@ void vmbus_free_channels(void) - static void vmbus_process_offer(struct vmbus_channel *newchannel) - { - struct vmbus_channel *channel; -+ struct hv_device *device_obj; - bool fnew = true; - unsigned long flags; - u16 dev_type; -@@ -523,6 +524,7 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) - if (channel->sc_creation_callback != NULL) - channel->sc_creation_callback(newchannel); - atomic_dec(&vmbus_connection.offer_in_progress); -+ atomic_dec(&vmbus_connection.register_in_progress); - return; - } - -@@ -531,33 +533,36 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) - * We need to set the DeviceObject field before calling - * vmbus_child_dev_add() - */ -- newchannel->device_obj = vmbus_device_create( -+ device_obj = vmbus_device_create( - &newchannel->offermsg.offer.if_type, - &newchannel->offermsg.offer.if_instance, - newchannel); -- if (!newchannel->device_obj) -+ if (!device_obj) - goto err_deq_chan; - -- newchannel->device_obj->device_id = dev_type; -+ device_obj->device_id = dev_type; - /* - * Add the new device to the bus. This will kick off device-driver - * binding which eventually invokes the device driver's AddDevice() - * method. - */ -- ret = vmbus_device_register(newchannel->device_obj); -+ atomic_dec(&vmbus_connection.offer_in_progress); -+ ret = vmbus_device_register(device_obj); - - if (ret != 0) { - pr_err("unable to add child device object (relid %d)\n", - newchannel->offermsg.child_relid); -- kfree(newchannel->device_obj); -+ kfree(device_obj); - goto err_deq_chan; - } -+ newchannel->device_obj = device_obj; -+ atomic_dec(&vmbus_connection.register_in_progress); - -- atomic_dec(&vmbus_connection.offer_in_progress); - return; - - err_deq_chan: - atomic_dec(&vmbus_connection.offer_in_progress); -+ atomic_dec(&vmbus_connection.register_in_progress); - mutex_lock(&vmbus_connection.channel_mutex); - list_del(&newchannel->listentry); - mutex_unlock(&vmbus_connection.channel_mutex); -@@ -888,6 +893,14 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) - - vmbus_rescind_cleanup(channel); - -+ while (atomic_read(&vmbus_connection.register_in_progress) != 0) { -+ /* -+ * We wait here until any channel offer is currently -+ * being processed. -+ */ -+ msleep(1); -+ } -+ - if (channel->device_obj) { - if (channel->chn_rescind_callback) { - channel->chn_rescind_callback(channel); -diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h -index 80270384053e..5b8234994155 100644 ---- a/drivers/hv/hyperv_vmbus.h -+++ b/drivers/hv/hyperv_vmbus.h -@@ -309,6 +309,7 @@ struct vmbus_connection { - int connect_cpu; - - atomic_t offer_in_progress; -+ atomic_t register_in_progress; - - enum vmbus_connect_state conn_state; - -diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index fb50edf6ad17..1647f534a1bf 100644 ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -840,6 +840,7 @@ static void vmbus_dispatch_msg_work(struct work_struct *work) - flush_workqueue(vmbus_connection.work_queue_rescind); - - atomic_inc(&vmbus_connection.offer_in_progress); -+ atomic_inc(&vmbus_connection.register_in_progress); - queue_work_on(vmbus_connection.connect_cpu, - vmbus_connection.work_queue, - &context->work); --- -2.14.1 - diff --git a/kernel/patches-4.13.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch b/kernel/patches-4.13.x/0011-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch similarity index 90% rename from kernel/patches-4.13.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch rename to kernel/patches-4.13.x/0011-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch index b41712a53..46578e1fe 100644 --- a/kernel/patches-4.13.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch +++ b/kernel/patches-4.13.x/0011-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch @@ -1,7 +1,7 @@ -From c5be4b5ee53d41b3cab9cc767ae6148a0196af43 Mon Sep 17 00:00:00 2001 +From 463ca8fab7225ac87f3b20915e45e44dfb5af592 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 28 Jun 2017 23:50:38 +0800 -Subject: [PATCH 13/17] vmbus: fix the missed signaling in hv_signal_on_read() +Subject: [PATCH 11/14] vmbus: fix the missed signaling in hv_signal_on_read() There is an off-by-one bug here, which can cause host-to-guest write to stall. diff --git a/kernel/patches-4.13.x/0014-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch b/kernel/patches-4.13.x/0012-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch similarity index 89% rename from kernel/patches-4.13.x/0014-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch rename to kernel/patches-4.13.x/0012-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch index 5294b4ae2..df836b6a0 100644 --- a/kernel/patches-4.13.x/0014-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch +++ b/kernel/patches-4.13.x/0012-hv-sock-avoid-double-FINs-if-shutdown-is-called.patch @@ -1,7 +1,7 @@ -From 955db677c804636847dc706721b04f597dfceccc Mon Sep 17 00:00:00 2001 +From d8592f2252894b71e4494f0ff88e44b6bcea3dca Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 7 Jul 2017 09:15:29 +0800 -Subject: [PATCH 14/17] hv-sock: avoid double FINs if shutdown() is called +Subject: [PATCH 12/14] hv-sock: avoid double FINs if shutdown() is called The host expects a single FIN. diff --git a/kernel/patches-4.13.x/0016-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch b/kernel/patches-4.13.x/0013-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch similarity index 94% rename from kernel/patches-4.13.x/0016-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch rename to kernel/patches-4.13.x/0013-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch index 00848fe65..893fa464d 100644 --- a/kernel/patches-4.13.x/0016-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch +++ b/kernel/patches-4.13.x/0013-ext4-fix-fault-handling-when-mounted-with-o-dax-ro.patch @@ -1,7 +1,7 @@ -From f9e403624b67fbf283205ed1709066723289996c Mon Sep 17 00:00:00 2001 +From 1f090eed1aaf9f1181e45a338b99878c6e494996 Mon Sep 17 00:00:00 2001 From: Randy Dodgen Date: Thu, 24 Aug 2017 15:26:01 -0400 -Subject: [PATCH 16/17] ext4: fix fault handling when mounted with -o dax,ro +Subject: [PATCH 13/14] ext4: fix fault handling when mounted with -o dax,ro If an ext4 filesystem is mounted with both the DAX and read-only options, executables on that filesystem will fail to start (claiming diff --git a/kernel/patches-4.13.x/0017-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.13.x/0014-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch similarity index 84% rename from kernel/patches-4.13.x/0017-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch rename to kernel/patches-4.13.x/0014-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index 940ebac14..51298c9a6 100644 --- a/kernel/patches-4.13.x/0017-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.13.x/0014-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,7 +1,7 @@ -From b49a4ebca4f743318bdc46c9be23755a184276b3 Mon Sep 17 00:00:00 2001 +From f0591ec41208c6e0d2a12334a6c846f01f2f4007 Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 -Subject: [PATCH 17/17] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB +Subject: [PATCH 14/14] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page size) Signed-off-by: Cheng-mean Liu diff --git a/kernel/patches-4.13.x/0015-vmbus-hvsock-add-proper-sync-for-vmbus_hvsock_device.patch b/kernel/patches-4.13.x/0015-vmbus-hvsock-add-proper-sync-for-vmbus_hvsock_device.patch deleted file mode 100644 index 33b18f7e2..000000000 --- a/kernel/patches-4.13.x/0015-vmbus-hvsock-add-proper-sync-for-vmbus_hvsock_device.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 36cc16a4c8f927c2bff8e8711df396843ae04cc5 Mon Sep 17 00:00:00 2001 -From: Dexuan Cui -Date: Tue, 19 Sep 2017 20:05:31 -0700 -Subject: [PATCH 15/17] vmbus: hvsock: add proper sync for - vmbus_hvsock_device_unregister() - -Without the patch, vmbus_hvsock_device_unregister() can destroy the device -prematurely. - -Signed-off-by: Dexuan Cui -Origin: git@github.com:dcui/linux.git -(cherry picked from commit b6ffb4393fb266711b37ed056487665d8650f31a) ---- - drivers/hv/channel_mgmt.c | 20 ++++++-------------- - include/linux/hyperv.h | 2 ++ - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c -index c524ca967d8f..7437385738ac 100644 ---- a/drivers/hv/channel_mgmt.c -+++ b/drivers/hv/channel_mgmt.c -@@ -558,6 +558,8 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) - newchannel->device_obj = device_obj; - atomic_dec(&vmbus_connection.register_in_progress); - -+ newchannel->probe_done = true; -+ - return; - - err_deq_chan: -@@ -904,6 +906,8 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) - if (channel->device_obj) { - if (channel->chn_rescind_callback) { - channel->chn_rescind_callback(channel); -+ channel->rescind_done = true; -+ - return; - } - /* -@@ -937,28 +941,16 @@ static void vmbus_onoffer_rescind(struct vmbus_channel_message_header *hdr) - } - } - --static void vmbus_stop_rescind_handling_work(struct work_struct *work) --{ -- atomic_inc(&vmbus_connection.offer_in_progress); --} -- - void vmbus_hvsock_device_unregister(struct vmbus_channel *channel) - { - struct work_struct work; - - BUG_ON(!is_hvsock_channel(channel)); - -- /* Prevent chn_rescind_callback from running in the rescind path */ -- INIT_WORK(&work, vmbus_stop_rescind_handling_work); -- queue_work_on(vmbus_connection.connect_cpu, -- vmbus_connection.work_queue_rescind, &work); -- flush_work(&work); -+ while (!READ_ONCE(channel->probe_done) || !READ_ONCE(channel->rescind_done)) -+ msleep(1); - -- channel->rescind = true; - vmbus_device_unregister(channel->device_obj); -- -- /* Unblock the rescind handling */ -- atomic_dec(&vmbus_connection.offer_in_progress); - } - EXPORT_SYMBOL_GPL(vmbus_hvsock_device_unregister); - -diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h -index cc28cd20256f..28d8cd3655ce 100644 ---- a/include/linux/hyperv.h -+++ b/include/linux/hyperv.h -@@ -895,6 +895,8 @@ struct vmbus_channel { - */ - enum hv_numa_policy affinity_policy; - -+ bool probe_done; -+ bool rescind_done; - }; - - static inline bool is_hvsock_channel(const struct vmbus_channel *c) --- -2.14.1 - diff --git a/kernel/patches-4.4.x/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch b/kernel/patches-4.4.x/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch index 9a6f1c5a1..ca79f346f 100644 --- a/kernel/patches-4.4.x/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch +++ b/kernel/patches-4.4.x/0001-virtio-make-find_vqs-checkpatch.pl-friendly.patch @@ -1,4 +1,4 @@ -From 9c525bad72585462bde7c1020e624d3a104762b8 Mon Sep 17 00:00:00 2001 +From 856bd4391b1d1ef570c41a04af1e6569b0e6ae56 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 17 Dec 2015 16:53:43 +0800 Subject: [PATCH 01/44] virtio: make find_vqs() checkpatch.pl-friendly diff --git a/kernel/patches-4.4.x/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch b/kernel/patches-4.4.x/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch index 87b3addae..cfd881a4c 100644 --- a/kernel/patches-4.4.x/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch +++ b/kernel/patches-4.4.x/0002-VSOCK-constify-vmci_transport_notify_ops-structures.patch @@ -1,4 +1,4 @@ -From cee5913aff11acd8fa84292a08d0d7d910464dd4 Mon Sep 17 00:00:00 2001 +From e5e81c9b625e8bef7d9f568c11a183a0d943d616 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 21 Nov 2015 18:39:17 +0100 Subject: [PATCH 02/44] VSOCK: constify vmci_transport_notify_ops structures diff --git a/kernel/patches-4.4.x/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch b/kernel/patches-4.4.x/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch index 6cda102de..b1f0a2bfd 100644 --- a/kernel/patches-4.4.x/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch +++ b/kernel/patches-4.4.x/0003-AF_VSOCK-Shrink-the-area-influenced-by-prepare_to_wa.patch @@ -1,4 +1,4 @@ -From caa08130b07dd06a5676ad7acbac669bba03805a Mon Sep 17 00:00:00 2001 +From cdfe5217991da9a36667d8bd2035dac485323f32 Mon Sep 17 00:00:00 2001 From: Claudio Imbrenda Date: Tue, 22 Mar 2016 17:05:52 +0100 Subject: [PATCH 03/44] AF_VSOCK: Shrink the area influenced by prepare_to_wait diff --git a/kernel/patches-4.4.x/0004-vsock-make-listener-child-lock-ordering-explicit.patch b/kernel/patches-4.4.x/0004-vsock-make-listener-child-lock-ordering-explicit.patch index 8caaba494..e510ae282 100644 --- a/kernel/patches-4.4.x/0004-vsock-make-listener-child-lock-ordering-explicit.patch +++ b/kernel/patches-4.4.x/0004-vsock-make-listener-child-lock-ordering-explicit.patch @@ -1,4 +1,4 @@ -From 6b6299a0198bb094f0f7837cdf4257a615bf678d Mon Sep 17 00:00:00 2001 +From 5629f181052f3b9f81e6a5cb3e27909ec1f06fa2 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 23 Jun 2016 16:28:58 +0100 Subject: [PATCH 04/44] vsock: make listener child lock ordering explicit diff --git a/kernel/patches-4.4.x/0005-VSOCK-transport-specific-vsock_transport-functions.patch b/kernel/patches-4.4.x/0005-VSOCK-transport-specific-vsock_transport-functions.patch index 781aebfa9..0c25533cf 100644 --- a/kernel/patches-4.4.x/0005-VSOCK-transport-specific-vsock_transport-functions.patch +++ b/kernel/patches-4.4.x/0005-VSOCK-transport-specific-vsock_transport-functions.patch @@ -1,4 +1,4 @@ -From 1949e1aff6e049d5b4cffa536ab2412dc22a1e8e Mon Sep 17 00:00:00 2001 +From 219cd6dc1429ef0805b586a7b9f274d274214f64 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 28 Jul 2016 15:36:30 +0100 Subject: [PATCH 05/44] VSOCK: transport-specific vsock_transport functions diff --git a/kernel/patches-4.4.x/0006-VSOCK-defer-sock-removal-to-transports.patch b/kernel/patches-4.4.x/0006-VSOCK-defer-sock-removal-to-transports.patch index a1c2fc1e3..c5114b112 100644 --- a/kernel/patches-4.4.x/0006-VSOCK-defer-sock-removal-to-transports.patch +++ b/kernel/patches-4.4.x/0006-VSOCK-defer-sock-removal-to-transports.patch @@ -1,4 +1,4 @@ -From e390194183e0dc248210c09333fc2e8a15c694c7 Mon Sep 17 00:00:00 2001 +From d3cc1a7d00e67576dbccc862e2f6a4093fb1619e Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 28 Jul 2016 15:36:31 +0100 Subject: [PATCH 06/44] VSOCK: defer sock removal to transports diff --git a/kernel/patches-4.4.x/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch b/kernel/patches-4.4.x/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch index 6332a7fad..ee30eb2e5 100644 --- a/kernel/patches-4.4.x/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch +++ b/kernel/patches-4.4.x/0007-VSOCK-Introduce-virtio_vsock_common.ko.patch @@ -1,4 +1,4 @@ -From 281ba6830be1843048a9f8e0ff4ef63039d3fbc3 Mon Sep 17 00:00:00 2001 +From cc3ba5ac51c7f21272f81b04c857e81e0385ce92 Mon Sep 17 00:00:00 2001 From: Asias He Date: Thu, 28 Jul 2016 15:36:32 +0100 Subject: [PATCH 07/44] VSOCK: Introduce virtio_vsock_common.ko diff --git a/kernel/patches-4.4.x/0008-VSOCK-Introduce-virtio_transport.ko.patch b/kernel/patches-4.4.x/0008-VSOCK-Introduce-virtio_transport.ko.patch index c2d5d8d03..54b890f6c 100644 --- a/kernel/patches-4.4.x/0008-VSOCK-Introduce-virtio_transport.ko.patch +++ b/kernel/patches-4.4.x/0008-VSOCK-Introduce-virtio_transport.ko.patch @@ -1,4 +1,4 @@ -From e6d5755d8f62281666add5d43beb2151655b46e7 Mon Sep 17 00:00:00 2001 +From 5493c8c9039db93d887149fe390c97c62b7de3e9 Mon Sep 17 00:00:00 2001 From: Asias He Date: Thu, 28 Jul 2016 15:36:33 +0100 Subject: [PATCH 08/44] VSOCK: Introduce virtio_transport.ko diff --git a/kernel/patches-4.4.x/0009-VSOCK-Introduce-vhost_vsock.ko.patch b/kernel/patches-4.4.x/0009-VSOCK-Introduce-vhost_vsock.ko.patch index e14cc370e..f9f7ecedf 100644 --- a/kernel/patches-4.4.x/0009-VSOCK-Introduce-vhost_vsock.ko.patch +++ b/kernel/patches-4.4.x/0009-VSOCK-Introduce-vhost_vsock.ko.patch @@ -1,4 +1,4 @@ -From 189ba1fcc324a75d9757c3d2bdef13185e73f75c Mon Sep 17 00:00:00 2001 +From 9d6607037faab1c8a53001d8b259ac4a80b427e8 Mon Sep 17 00:00:00 2001 From: Asias He Date: Thu, 28 Jul 2016 15:36:34 +0100 Subject: [PATCH 09/44] VSOCK: Introduce vhost_vsock.ko diff --git a/kernel/patches-4.4.x/0010-VSOCK-Add-Makefile-and-Kconfig.patch b/kernel/patches-4.4.x/0010-VSOCK-Add-Makefile-and-Kconfig.patch index 8b4560a82..50f31558c 100644 --- a/kernel/patches-4.4.x/0010-VSOCK-Add-Makefile-and-Kconfig.patch +++ b/kernel/patches-4.4.x/0010-VSOCK-Add-Makefile-and-Kconfig.patch @@ -1,4 +1,4 @@ -From be972771b3bbee4d940ec5bde1bacbde7668604a Mon Sep 17 00:00:00 2001 +From 2a53a98986e77f240013b679bdd5080b84f47d72 Mon Sep 17 00:00:00 2001 From: Asias He Date: Thu, 28 Jul 2016 15:36:35 +0100 Subject: [PATCH 10/44] VSOCK: Add Makefile and Kconfig diff --git a/kernel/patches-4.4.x/0011-VSOCK-Use-kvfree.patch b/kernel/patches-4.4.x/0011-VSOCK-Use-kvfree.patch index 6f73062a0..a2c1db831 100644 --- a/kernel/patches-4.4.x/0011-VSOCK-Use-kvfree.patch +++ b/kernel/patches-4.4.x/0011-VSOCK-Use-kvfree.patch @@ -1,4 +1,4 @@ -From 86c0d5452c7c835065cf40949d39684ce558776a Mon Sep 17 00:00:00 2001 +From 1047f5e89fec6c09e4174acb5561782954f2fc4b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 2 Aug 2016 13:50:42 +0000 Subject: [PATCH 11/44] VSOCK: Use kvfree() diff --git a/kernel/patches-4.4.x/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch b/kernel/patches-4.4.x/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch index 64b88a27c..54f95a61a 100644 --- a/kernel/patches-4.4.x/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch +++ b/kernel/patches-4.4.x/0012-vhost-vsock-fix-vhost-virtio_vsock_pkt-use-after-fre.patch @@ -1,4 +1,4 @@ -From 7a4fd008b1ec73fdbacde5bdb915e75fea7c5c72 Mon Sep 17 00:00:00 2001 +From 657e8991b110a87c0df324f4d27e2398df81e870 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 4 Aug 2016 14:52:53 +0100 Subject: [PATCH 12/44] vhost/vsock: fix vhost virtio_vsock_pkt use-after-free diff --git a/kernel/patches-4.4.x/0013-virtio-vsock-fix-include-guard-typo.patch b/kernel/patches-4.4.x/0013-virtio-vsock-fix-include-guard-typo.patch index a04f316de..a9e5fc2a3 100644 --- a/kernel/patches-4.4.x/0013-virtio-vsock-fix-include-guard-typo.patch +++ b/kernel/patches-4.4.x/0013-virtio-vsock-fix-include-guard-typo.patch @@ -1,4 +1,4 @@ -From 1612a88bb5d6c7723fb30a223310fd340e29af6b Mon Sep 17 00:00:00 2001 +From 4ff9eab3a8e61a8307e76570bcec31472fc3b090 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 5 Aug 2016 13:52:09 +0100 Subject: [PATCH 13/44] virtio-vsock: fix include guard typo diff --git a/kernel/patches-4.4.x/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch b/kernel/patches-4.4.x/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch index 7e446ae8c..cd54345e2 100644 --- a/kernel/patches-4.4.x/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch +++ b/kernel/patches-4.4.x/0014-vhost-vsock-drop-space-available-check-for-TX-vq.patch @@ -1,4 +1,4 @@ -From fc451311252b88bd8dc0a8feb8aaeccb34eb7bb4 Mon Sep 17 00:00:00 2001 +From c17a67f9b7015fb4d3a15a0d783486d770a23eca Mon Sep 17 00:00:00 2001 From: Gerard Garcia Date: Wed, 10 Aug 2016 17:24:34 +0200 Subject: [PATCH 14/44] vhost/vsock: drop space available check for TX vq diff --git a/kernel/patches-4.4.x/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch b/kernel/patches-4.4.x/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch index 76cb0e0a5..7f5317ccb 100644 --- a/kernel/patches-4.4.x/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch +++ b/kernel/patches-4.4.x/0015-VSOCK-Only-allow-host-network-namespace-to-use-AF_VS.patch @@ -1,4 +1,4 @@ -From cd8349140465c950e9e73118eacea013b1a1dc65 Mon Sep 17 00:00:00 2001 +From 1acbbfced43f6219f3f1596cf4070d738625979c Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 4 Apr 2016 14:50:10 +0100 Subject: [PATCH 15/44] VSOCK: Only allow host network namespace to use diff --git a/kernel/patches-4.4.x/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch b/kernel/patches-4.4.x/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch index b80e4b1c9..d432b3abf 100644 --- a/kernel/patches-4.4.x/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch +++ b/kernel/patches-4.4.x/0016-drivers-hv-Define-the-channel-type-for-Hyper-V-PCI-E.patch @@ -1,4 +1,4 @@ -From b7f0d8ce16008a09934126ae654e333484756131 Mon Sep 17 00:00:00 2001 +From ad1f53a263777b329fe0ce5bcd356aca29fa8708 Mon Sep 17 00:00:00 2001 From: Jake Oshins Date: Mon, 14 Dec 2015 16:01:41 -0800 Subject: [PATCH 16/44] drivers:hv: Define the channel type for Hyper-V PCI diff --git a/kernel/patches-4.4.x/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch b/kernel/patches-4.4.x/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch index 7b2ab6234..0f01fef85 100644 --- a/kernel/patches-4.4.x/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch +++ b/kernel/patches-4.4.x/0017-Drivers-hv-vmbus-Use-uuid_le-type-consistently.patch @@ -1,4 +1,4 @@ -From 3143aee86df2ea144ad62f55c2b5d7f6de8556ac Mon Sep 17 00:00:00 2001 +From 18e5bb427d8f7b5b07529fcc4dace32a4120a964 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Mon, 14 Dec 2015 16:01:43 -0800 Subject: [PATCH 17/44] Drivers: hv: vmbus: Use uuid_le type consistently diff --git a/kernel/patches-4.4.x/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch b/kernel/patches-4.4.x/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch index b95f242d0..858e1b4e4 100644 --- a/kernel/patches-4.4.x/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch +++ b/kernel/patches-4.4.x/0018-Drivers-hv-vmbus-Use-uuid_le_cmp-for-comparing-GUIDs.patch @@ -1,4 +1,4 @@ -From 54dfb86272aacb4446da7f0bda5df261071bb276 Mon Sep 17 00:00:00 2001 +From b5447ef6e9e46f644b5d7d31d4557fae93d0de61 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Mon, 14 Dec 2015 16:01:44 -0800 Subject: [PATCH 18/44] Drivers: hv: vmbus: Use uuid_le_cmp() for comparing diff --git a/kernel/patches-4.4.x/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch b/kernel/patches-4.4.x/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch index ca2b89587..56f1d391c 100644 --- a/kernel/patches-4.4.x/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch +++ b/kernel/patches-4.4.x/0019-Drivers-hv-vmbus-do-sanity-check-of-channel-state-in.patch @@ -1,4 +1,4 @@ -From dee0e4fc0cba39f04050b5c1fd56dff929c35be1 Mon Sep 17 00:00:00 2001 +From efcba5fd10440c87e32b1e1c761821828850a8d6 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 14 Dec 2015 16:01:48 -0800 Subject: [PATCH 19/44] Drivers: hv: vmbus: do sanity check of channel state in diff --git a/kernel/patches-4.4.x/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch b/kernel/patches-4.4.x/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch index 6c4cf4694..b03e04236 100644 --- a/kernel/patches-4.4.x/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch +++ b/kernel/patches-4.4.x/0020-Drivers-hv-vmbus-release-relid-on-error-in-vmbus_pro.patch @@ -1,4 +1,4 @@ -From 0c2f2e200967569493f3f24bad543804d1d56b09 Mon Sep 17 00:00:00 2001 +From 5978b66f3462754c88616070a6f41f9f8ff6c3d0 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 14 Dec 2015 16:01:50 -0800 Subject: [PATCH 20/44] Drivers: hv: vmbus: release relid on error in diff --git a/kernel/patches-4.4.x/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch b/kernel/patches-4.4.x/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch index 0e4178494..ee9b6d14d 100644 --- a/kernel/patches-4.4.x/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch +++ b/kernel/patches-4.4.x/0021-Drivers-hv-vmbus-channge-vmbus_connection.channel_lo.patch @@ -1,4 +1,4 @@ -From 051da99bcdb3e9d293a16a4869b22a942bedc238 Mon Sep 17 00:00:00 2001 +From 965725635521dbba2a4a82f8ab40a343bd46e018 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 14 Dec 2015 16:01:51 -0800 Subject: [PATCH 21/44] Drivers: hv: vmbus: channge diff --git a/kernel/patches-4.4.x/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch b/kernel/patches-4.4.x/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch index 5af436712..d4cc98f59 100644 --- a/kernel/patches-4.4.x/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch +++ b/kernel/patches-4.4.x/0022-Drivers-hv-remove-code-duplication-between-vmbus_rec.patch @@ -1,4 +1,4 @@ -From 47b9d3789c347cfa0f877aaf67463db2505a2100 Mon Sep 17 00:00:00 2001 +From 658b7c7c06ede2e0211c8accfecaae4cec85add4 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Mon, 14 Dec 2015 19:02:00 -0800 Subject: [PATCH 22/44] Drivers: hv: remove code duplication between diff --git a/kernel/patches-4.4.x/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch b/kernel/patches-4.4.x/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch index 4289959d2..7ecdbbc50 100644 --- a/kernel/patches-4.4.x/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch +++ b/kernel/patches-4.4.x/0023-Drivers-hv-vmbus-fix-the-building-warning-with-hyper.patch @@ -1,4 +1,4 @@ -From e627bc3c9a955294227500e746566ac6f7381184 Mon Sep 17 00:00:00 2001 +From 899f16803bb388cfc959a28368723e63c07beb09 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 21 Dec 2015 12:21:22 -0800 Subject: [PATCH 23/44] Drivers: hv: vmbus: fix the building warning with diff --git a/kernel/patches-4.4.x/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch b/kernel/patches-4.4.x/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch index 2d2f047c8..ecd745759 100644 --- a/kernel/patches-4.4.x/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch +++ b/kernel/patches-4.4.x/0024-Drivers-hv-vmbus-Treat-Fibre-Channel-devices-as-perf.patch @@ -1,4 +1,4 @@ -From 60c4e94e520937042d641f4259938bc79048a4dc Mon Sep 17 00:00:00 2001 +From 234561ebf27f49a8ec564f28ec7a16f38cfa812b Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 15 Dec 2015 16:27:27 -0800 Subject: [PATCH 24/44] Drivers: hv: vmbus: Treat Fibre Channel devices as diff --git a/kernel/patches-4.4.x/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch b/kernel/patches-4.4.x/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch index b035b5b6c..234efe587 100644 --- a/kernel/patches-4.4.x/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch +++ b/kernel/patches-4.4.x/0025-Drivers-hv-vmbus-Add-vendor-and-device-atttributes.patch @@ -1,4 +1,4 @@ -From 74ba26637e7faacb4e3f8c61104dec21187c6a6d Mon Sep 17 00:00:00 2001 +From 1469a802b8bfbb817986cca9e7c8904524c5fd32 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 25 Dec 2015 20:00:30 -0800 Subject: [PATCH 25/44] Drivers: hv: vmbus: Add vendor and device atttributes diff --git a/kernel/patches-4.4.x/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch b/kernel/patches-4.4.x/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch index 43a82dc7c..0d198c0c4 100644 --- a/kernel/patches-4.4.x/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch +++ b/kernel/patches-4.4.x/0026-Drivers-hv-vmbus-add-a-helper-function-to-set-a-chan.patch @@ -1,4 +1,4 @@ -From ca28d5c4b32b123bba73f6e32981f2de6293a91b Mon Sep 17 00:00:00 2001 +From 2ed4bc4174ebc1dd73a7f8db67a82779f88d5566 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:37 -0800 Subject: [PATCH 26/44] Drivers: hv: vmbus: add a helper function to set a diff --git a/kernel/patches-4.4.x/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch b/kernel/patches-4.4.x/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch index bbc726202..52f141080 100644 --- a/kernel/patches-4.4.x/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch +++ b/kernel/patches-4.4.x/0027-Drivers-hv-vmbus-define-the-new-offer-type-for-Hyper.patch @@ -1,4 +1,4 @@ -From 6fd962ab3e213febc9bcf8bc7ead7422f2013d98 Mon Sep 17 00:00:00 2001 +From a970930ec2236429f979d92d6a2c03420437fa82 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:38 -0800 Subject: [PATCH 27/44] Drivers: hv: vmbus: define the new offer type for diff --git a/kernel/patches-4.4.x/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch b/kernel/patches-4.4.x/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch index 46088ba35..cfbf098d9 100644 --- a/kernel/patches-4.4.x/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch +++ b/kernel/patches-4.4.x/0028-Drivers-hv-vmbus-vmbus_sendpacket_ctl-hvsock-avoid-u.patch @@ -1,4 +1,4 @@ -From a0123329ac16e12f299d180bbd49a71c94c8152e Mon Sep 17 00:00:00 2001 +From 617883388dc298c729f278d67560f5084a6b3383 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:39 -0800 Subject: [PATCH 28/44] Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid diff --git a/kernel/patches-4.4.x/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch b/kernel/patches-4.4.x/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch index 1449ec893..c47ca3cee 100644 --- a/kernel/patches-4.4.x/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch +++ b/kernel/patches-4.4.x/0029-Drivers-hv-vmbus-define-a-new-VMBus-message-type-for.patch @@ -1,4 +1,4 @@ -From 19f5409bc3117d429b6ea065be7126e76243af17 Mon Sep 17 00:00:00 2001 +From 9c7846299cb55ed7743d7706094bf83f5a9df447 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:40 -0800 Subject: [PATCH 29/44] Drivers: hv: vmbus: define a new VMBus message type for diff --git a/kernel/patches-4.4.x/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch b/kernel/patches-4.4.x/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch index 7e5ba0638..8588639e7 100644 --- a/kernel/patches-4.4.x/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch +++ b/kernel/patches-4.4.x/0030-Drivers-hv-vmbus-add-a-hvsock-flag-in-struct-hv_driv.patch @@ -1,4 +1,4 @@ -From 13ea161d8416049014cade656cd71047a82d9f8b Mon Sep 17 00:00:00 2001 +From 332af068b03da4500f78879c376ffde6337be19c Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:41 -0800 Subject: [PATCH 30/44] Drivers: hv: vmbus: add a hvsock flag in struct diff --git a/kernel/patches-4.4.x/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch b/kernel/patches-4.4.x/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch index 1c56eaeb2..fef2a9514 100644 --- a/kernel/patches-4.4.x/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch +++ b/kernel/patches-4.4.x/0031-Drivers-hv-vmbus-add-a-per-channel-rescind-callback.patch @@ -1,4 +1,4 @@ -From 790b0bb6b791142129460dbd0affb7ea6f7973f1 Mon Sep 17 00:00:00 2001 +From acda69845b33f53f2dca9f79e59d45361797cd23 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:42 -0800 Subject: [PATCH 31/44] Drivers: hv: vmbus: add a per-channel rescind callback diff --git a/kernel/patches-4.4.x/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch b/kernel/patches-4.4.x/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch index be0a641f2..197a2fe96 100644 --- a/kernel/patches-4.4.x/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch +++ b/kernel/patches-4.4.x/0032-Drivers-hv-vmbus-add-an-API-vmbus_hvsock_device_unre.patch @@ -1,4 +1,4 @@ -From 9164bb9c92983efdc7c18462ccef32889d7a7c1c Mon Sep 17 00:00:00 2001 +From db167d0152627bbfa667ca2ad8a80fcd67c83530 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 27 Jan 2016 22:29:43 -0800 Subject: [PATCH 32/44] Drivers: hv: vmbus: add an API diff --git a/kernel/patches-4.4.x/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch b/kernel/patches-4.4.x/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch index ef65584c8..af2bab77e 100644 --- a/kernel/patches-4.4.x/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch +++ b/kernel/patches-4.4.x/0033-Drivers-hv-vmbus-Give-control-over-how-the-ring-acce.patch @@ -1,4 +1,4 @@ -From 02035c58c11f5cd2752760cc7d92a44c7075b766 Mon Sep 17 00:00:00 2001 +From ec8df15f6500c5c8df2eaccf30a3e881361775e5 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Wed, 27 Jan 2016 22:29:45 -0800 Subject: [PATCH 33/44] Drivers: hv: vmbus: Give control over how the ring diff --git a/kernel/patches-4.4.x/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch b/kernel/patches-4.4.x/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch index 0ef82b454..65d23ab55 100644 --- a/kernel/patches-4.4.x/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch +++ b/kernel/patches-4.4.x/0034-Drivers-hv-vmbus-avoid-wait_for_completion-on-crash.patch @@ -1,4 +1,4 @@ -From 4340b100726f86cf3d03a9d158026931758a1076 Mon Sep 17 00:00:00 2001 +From 62a87e03ec7cc707ac0df489b2a5b36b015441af Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Fri, 26 Feb 2016 15:13:16 -0800 Subject: [PATCH 34/44] Drivers: hv: vmbus: avoid wait_for_completion() on diff --git a/kernel/patches-4.4.x/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch b/kernel/patches-4.4.x/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch index 209b95c03..d9dd920ff 100644 --- a/kernel/patches-4.4.x/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch +++ b/kernel/patches-4.4.x/0035-Drivers-hv-vmbus-avoid-unneeded-compiler-optimizatio.patch @@ -1,4 +1,4 @@ -From a6ee753b96c9625804e2345e1ecbacd9230a567f Mon Sep 17 00:00:00 2001 +From c3fdfcfb86581b96bf0e0afc501be497fe84303f Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Fri, 26 Feb 2016 15:13:18 -0800 Subject: [PATCH 35/44] Drivers: hv: vmbus: avoid unneeded compiler diff --git a/kernel/patches-4.4.x/0036-kcm-Kernel-Connection-Multiplexor-module.patch b/kernel/patches-4.4.x/0036-kcm-Kernel-Connection-Multiplexor-module.patch index 14f318719..b030b9a9e 100644 --- a/kernel/patches-4.4.x/0036-kcm-Kernel-Connection-Multiplexor-module.patch +++ b/kernel/patches-4.4.x/0036-kcm-Kernel-Connection-Multiplexor-module.patch @@ -1,4 +1,4 @@ -From c6d6d8d4b710d89fdcd3e44b5c82cf4bc4a24164 Mon Sep 17 00:00:00 2001 +From 1c021b50e0614cb9ac189ba3a15e31ad4c2c57fb Mon Sep 17 00:00:00 2001 From: Tom Herbert Date: Mon, 7 Mar 2016 14:11:06 -0800 Subject: [PATCH 36/44] kcm: Kernel Connection Multiplexor module diff --git a/kernel/patches-4.4.x/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch b/kernel/patches-4.4.x/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch index acdf66b6f..41100eae6 100644 --- a/kernel/patches-4.4.x/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch +++ b/kernel/patches-4.4.x/0037-net-add-the-AF_KCM-entries-to-family-name-tables.patch @@ -1,4 +1,4 @@ -From 943574cc6cdc27ca4265c806237557fa32ff9cb0 Mon Sep 17 00:00:00 2001 +From 2852eb182a89c29873cd945e0b8346a92dc075d9 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 21 Mar 2016 02:51:09 -0700 Subject: [PATCH 37/44] net: add the AF_KCM entries to family name tables diff --git a/kernel/patches-4.4.x/0038-net-Add-Qualcomm-IPC-router.patch b/kernel/patches-4.4.x/0038-net-Add-Qualcomm-IPC-router.patch index b7ca0a49f..cbe4501d9 100644 --- a/kernel/patches-4.4.x/0038-net-Add-Qualcomm-IPC-router.patch +++ b/kernel/patches-4.4.x/0038-net-Add-Qualcomm-IPC-router.patch @@ -1,4 +1,4 @@ -From b010dccdccf4bf33f69c0ba451e0fb307a282625 Mon Sep 17 00:00:00 2001 +From aae3913b1b73c83de6fe5113ecc27453bfcb790b Mon Sep 17 00:00:00 2001 From: Courtney Cavin Date: Wed, 27 Apr 2016 12:13:03 -0700 Subject: [PATCH 38/44] net: Add Qualcomm IPC router diff --git a/kernel/patches-4.4.x/0039-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.4.x/0039-hv_sock-introduce-Hyper-V-Sockets.patch index 7e77f6733..4a1c9b1ab 100644 --- a/kernel/patches-4.4.x/0039-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.4.x/0039-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From ba061bce70c08890db03b795ed6d17cecdaa18c7 Mon Sep 17 00:00:00 2001 +From 400f7f589396ced3306669e1541fbe41094cc40f Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 15 May 2016 09:53:11 -0700 Subject: [PATCH 39/44] hv_sock: introduce Hyper-V Sockets diff --git a/kernel/patches-4.4.x/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch b/kernel/patches-4.4.x/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch index 5c5195824..5d1a6e7d1 100644 --- a/kernel/patches-4.4.x/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch +++ b/kernel/patches-4.4.x/0040-net-add-the-AF_HYPERV-entries-to-family-name-tables.patch @@ -1,4 +1,4 @@ -From 0166df0b9bd95bbea442803bb68de9336a729b0e Mon Sep 17 00:00:00 2001 +From e5c30fb666d82e76150f0900582fba80260b9830 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Mon, 21 Mar 2016 02:53:08 -0700 Subject: [PATCH 40/44] net: add the AF_HYPERV entries to family name tables diff --git a/kernel/patches-4.4.x/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch b/kernel/patches-4.4.x/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch index eebb68907..a7c43c5ea 100644 --- a/kernel/patches-4.4.x/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch +++ b/kernel/patches-4.4.x/0041-Drivers-hv-vmbus-fix-the-race-when-querying-updating.patch @@ -1,4 +1,4 @@ -From 6cbfc60c1ecac5b8407d533e8d925fa37bd346b1 Mon Sep 17 00:00:00 2001 +From 52ee595fee2bde973189e1425247c60173ae2e3a Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 21 May 2016 16:55:50 +0800 Subject: [PATCH 41/44] Drivers: hv: vmbus: fix the race when querying & diff --git a/kernel/patches-4.4.x/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.4.x/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index 346656243..c2206e1b8 100644 --- a/kernel/patches-4.4.x/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.4.x/0042-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From 0f15cc9d520f0aaf5ef6169a566063b4b3a2c9c5 Mon Sep 17 00:00:00 2001 +From 0f526c73b5a9e6f2ce3e0a74fe6382942b6d74df Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 42/44] vmbus: Don't spam the logs with unknown GUIDs diff --git a/kernel/patches-4.4.x/0043-fs-add-filp_clone_open-API.patch b/kernel/patches-4.4.x/0043-fs-add-filp_clone_open-API.patch index 6dbaf0eb6..5e9933eb5 100644 --- a/kernel/patches-4.4.x/0043-fs-add-filp_clone_open-API.patch +++ b/kernel/patches-4.4.x/0043-fs-add-filp_clone_open-API.patch @@ -1,4 +1,4 @@ -From 5bdb96b09825d6357ef664bdde7d912467184d51 Mon Sep 17 00:00:00 2001 +From eaf798827fd58aa7d7270f9702883207fcbbf4f2 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 17 Feb 2016 16:49:38 -0800 Subject: [PATCH 43/44] fs: add filp_clone_open API diff --git a/kernel/patches-4.4.x/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch b/kernel/patches-4.4.x/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch index 8f0fd49b6..9418ccf19 100644 --- a/kernel/patches-4.4.x/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch +++ b/kernel/patches-4.4.x/0044-binfmt_misc-add-persistent-opened-binary-handler-for.patch @@ -1,4 +1,4 @@ -From d3da4c2f631482a6def5df8e0a992c1ccb8c248b Mon Sep 17 00:00:00 2001 +From 4a5519e5f46c0ae55f8be683a1bdd2363869403b Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 17 Feb 2016 16:51:16 -0800 Subject: [PATCH 44/44] binfmt_misc: add persistent opened binary handler for diff --git a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch index 2da83477e..ccccaba7c 100644 --- a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch +++ b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch @@ -1,4 +1,4 @@ -From 2d794b59850518c195e81378f3e99fe2286f9f2e Mon Sep 17 00:00:00 2001 +From b29fe48363585d8c4d96a979d43482a67dd1481f Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/13] tools build: Add test for sched_getcpu() diff --git a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch index 9905af9c8..242b88cb5 100644 --- a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch +++ b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch @@ -1,4 +1,4 @@ -From b47068bf36385d90d79645decd2b576030c659de Mon Sep 17 00:00:00 2001 +From 9a4dde19bae9797ea632a414b02f43d27a747cc6 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/13] perf jit: Avoid returning garbage for a ret variable diff --git a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch index ac53c56a6..db3f53798 100644 --- a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From 353983d821535cb59fb02f73eb14afdeaffb8504 Mon Sep 17 00:00:00 2001 +From 65cc9fceae5c27ea9069c375c5daa7d5e28462ee Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/13] hv_sock: introduce Hyper-V Sockets diff --git a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index 19ebac903..9ab10a1c4 100644 --- a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From 1cb4f1aeaae27bef56a94354960a959aed24843b Mon Sep 17 00:00:00 2001 +From 5b76dda785edf1415657f81fe50962635a54b352 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/13] vmbus: Don't spam the logs with unknown GUIDs diff --git a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch index 96d404d99..3f94c6887 100644 --- a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch +++ b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch @@ -1,4 +1,4 @@ -From bb06f2c3c572c027f4cc77011280999c746a1c68 Mon Sep 17 00:00:00 2001 +From d1a4c8e21b750ee6c6c9f28b3498015d65f0a453 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/13] Drivers: hv: utils: Fix the mapping between host diff --git a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch index 4ed32b005..158692733 100644 --- a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch +++ b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch @@ -1,4 +1,4 @@ -From 837687e9168750d28b876c893e8edcd2fd7929e0 Mon Sep 17 00:00:00 2001 +From d9646498544d50814410b3e9fdaee0ddcd386c07 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/13] Drivers: hv: vss: Improve log messages. diff --git a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch index 43a0a84b1..ca5cf3199 100644 --- a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch +++ b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch @@ -1,4 +1,4 @@ -From dbb2c04f33078cf7cad755e884f2b88484265310 Mon Sep 17 00:00:00 2001 +From 6308212197e4682beb468c40036d846c8cf93dad Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/13] Drivers: hv: vss: Operation timeouts should match host diff --git a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch index 1bfedfc33..1d66cc8ff 100644 --- a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch +++ b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch @@ -1,4 +1,4 @@ -From c2aa56946189ede4b7bef8774240e27b966a1264 Mon Sep 17 00:00:00 2001 +From 3a796dc6d04e0cfff5e1b553ce14434c8991b73a Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/13] Drivers: hv: vmbus: Use all supported IC versions to @@ -162,7 +162,7 @@ index 8df02f3ca0b2..e7949b64bfbc 100644 negop->icversion_data[0].minor = icframe_minor; negop->icversion_data[1].major = icmsg_major; diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index e47d8c9db03a..0a315e6aa589 100644 +index 75126e4e3f05..0713c6aaa33a 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c @@ -31,6 +31,16 @@ @@ -182,7 +182,7 @@ index e47d8c9db03a..0a315e6aa589 100644 /* * Global state maintained for transaction that is being processed. * For a class of integration services, including the "file copy service", -@@ -228,8 +238,6 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -232,8 +242,6 @@ void hv_fcopy_onchannelcallback(void *context) u64 requestid; struct hv_fcopy_hdr *fcopy_msg; struct icmsg_hdr *icmsghdr; @@ -191,7 +191,7 @@ index e47d8c9db03a..0a315e6aa589 100644 int fcopy_srv_version; if (fcopy_transaction.state > HVUTIL_READY) -@@ -243,10 +251,10 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -247,10 +255,10 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { diff --git a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch index aef06fdb6..d118ec006 100644 --- a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch +++ b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch @@ -1,4 +1,4 @@ -From 6956c0e80e2acba1b1acd3a0ce085a6b12686215 Mon Sep 17 00:00:00 2001 +From 34379e682d26011f993a2121ed833699eb413873 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/13] Drivers: hv: Log the negotiated IC versions. @@ -18,10 +18,10 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index 0a315e6aa589..9aee6014339d 100644 +index 0713c6aaa33a..94f4f090ceea 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c -@@ -251,10 +251,15 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -255,10 +255,15 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { diff --git a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch index 9423432c1..9aca30603 100644 --- a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch +++ b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch @@ -1,4 +1,4 @@ -From 096af08e44d92ff7805468b27c763ed5ba6256c3 Mon Sep 17 00:00:00 2001 +From 4579acf1773e70b59674bc8ce03abf265d5a05ba Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/13] vmbus: fix missed ring events on boot diff --git a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index 0cad942af..38aab375d 100644 --- a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From d9650f068d4abcbccf1f7d104c8e41d578a77a78 Mon Sep 17 00:00:00 2001 +From a487d91e06c48b99d8c92835e13a184ced75fe00 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/13] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch index 934fa43e4..706b5b261 100644 --- a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch +++ b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch @@ -1,4 +1,4 @@ -From c6c0851ec1ee4855b09665977f50d2644c0122c7 Mon Sep 17 00:00:00 2001 +From 05f50ab2f943d79d26b2d5ca0db8021699253a08 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/13] vmbus: dynamically enqueue/dequeue the channel on diff --git a/kernel/patches-4.9.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch b/kernel/patches-4.9.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch index 832a8795a..2b242ca1f 100644 --- a/kernel/patches-4.9.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch +++ b/kernel/patches-4.9.x/0013-vmbus-fix-the-missed-signaling-in-hv_signal_on_read.patch @@ -1,4 +1,4 @@ -From e88145df57457180bf8cdb840d4edcab44404a09 Mon Sep 17 00:00:00 2001 +From d1ded41ea339dfec68868f2311780aa46390f069 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Thu, 6 Jul 2017 21:37:11 +0000 Subject: [PATCH 13/13] vmbus: fix the missed signaling in hv_signal_on_read() diff --git a/linuxkit.yml b/linuxkit.yml index 285bc9ed9..89312e8bf 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index f01fafbc4..d374154d0 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 4d35446c3..474de2951 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 5ca504dbb..ceddcf159 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index b872e6259..194369def 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 14011a79b..288f054e6 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 # with runc, logwrite, startmemlogd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 4bb82922c..be4c79baf 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 0daacb7b5..6508689b7 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 07f168c55..df71b34d0 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index d7bf3f40f..864fc8d06 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 08df5fe48..b1f36888d 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index d7bf3f40f..864fc8d06 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index d7bf3f40f..864fc8d06 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index d7bf3f40f..864fc8d06 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index dfc54a8cf..f7f33789a 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index d7bf3f40f..864fc8d06 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index b4df46738..426c827f5 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 965592f78..8c0e6e8ef 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.91 + image: linuxkit/kernel:4.4.92 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 7be6ae4e2..c21fa5a0d 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/005_config_4.13.x/test.yml b/test/cases/020_kernel/005_config_4.13.x/test.yml index 0200fcf18..b4a4ce5d4 100644 --- a/test/cases/020_kernel/005_config_4.13.x/test.yml +++ b/test/cases/020_kernel/005_config_4.13.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.5 + image: linuxkit/kernel:4.13.6 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile index 36fa721d1..d197571c7 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.9.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.9.54 AS ksrc +FROM linuxkit/kernel:4.9.56 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d AS build diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.sh b/test/cases/020_kernel/010_kmod_4.9.x/test.sh index cebfdfb3c..1ff4fc3a2 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.54 +docker pull linuxkit/kernel:4.9.56 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/010_kmod_4.9.x/test.yml b/test/cases/020_kernel/010_kmod_4.9.x/test.yml index 3bb6ec356..7aeb0504f 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 750b8c038..8b60aa8da 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.91 + image: linuxkit/kernel:4.4.92 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 32e360a9d..2d4a5a194 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml index 677b64841..85cc6b72c 100644 --- a/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml +++ b/test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.13.5 + image: linuxkit/kernel:4.13.6 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index f581e4249..a123e0986 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 6b4d6ca44..cfb077a5d 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 3e8a401cb..afc2fc5f8 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index f3c87a5bf..61c02cb9b 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index c97d1b643..5c07a4870 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 7879d8b04..66c2dc179 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 428ab523f..6b7b8068d 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 693872a12..74cef7525 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 5395a8a1f..de76d8a55 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index eb69ba4e8..8e438f9c2 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 4bcb93dbe..d291bfd40 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 145a5bb65..45e384d44 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index c466aa194..fc8074420 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index c1d2d1b8d..80f641584 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 431702d59..77cfe9b31 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 6d9cb4c44..2e195285b 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 3c687aeaa..284f7bec1 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 80758b1a5..2eef73790 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 04e96d5ee..3a4bf0eca 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index a075556b4..c3a99605f 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 7c9fc6be0..b1096da5f 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 2ef939eab..d2d0e2b84 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/test/hack/test.yml b/test/hack/test.yml index 7673368d3..76204d853 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:4.9.54 + image: linuxkit/kernel:4.9.56 cmdline: "console=ttyS0" init: - linuxkit/init:6b3755e47f00d6027321d3fca99a19af6504be75 diff --git a/tools/mkimage-rpi3/Dockerfile b/tools/mkimage-rpi3/Dockerfile new file mode 100644 index 000000000..6bc3fbbc8 --- /dev/null +++ b/tools/mkimage-rpi3/Dockerfile @@ -0,0 +1,56 @@ +FROM linuxkit/alpine:b3f8da6c6f02440ee9c4c72bbf4dabdf500b1d8c as build +RUN apk add \ + bc \ + dtc \ + curl \ + make \ + gcc \ + git \ + musl-dev \ + patch + +# Create small rootfs +RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ +RUN apk add --no-cache --initdb -p /out \ + alpine-baselayout \ + busybox \ + libarchive-tools \ + musl \ + tar +RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache + +# u-boot compile. The patch is needed to handle larger kernels +ENV UBOOT_COMMIT=v2017.09 +COPY u-boot.patch . +RUN git clone https://github.com/u-boot/u-boot.git && \ + cd /u-boot && \ + git checkout $UBOOT_COMMIT +WORKDIR /u-boot +RUN patch -p 1 < /u-boot.patch && \ + make rpi_3_defconfig all && \ + mkdir -p /out/boot && \ + cp u-boot.bin /out/boot && \ + mkdir -p /out/bin && \ + cp tools/mkimage /out/bin + +# fetch the Raspberry Pi 3 firmware (latest master) +ENV RPI_COMMIT=478d637c476e838ffcfa8535232ff0b86daf5918 +RUN mkdir -p /out/boot && \ + cd /out/boot && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/bootcode.bin && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/bootcode.bin && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/fixup_cd.dat && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/fixup.dat && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/fixup_x.dat && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/start_cd.elf && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/start.elf && \ + curl -fsSLO https://github.com/raspberrypi/firmware/raw/$RPI_COMMIT/boot/start_x.elf + +FROM scratch +ENTRYPOINT [] +CMD [] +WORKDIR / +COPY --from=build /out/ / +COPY config.txt boot.script /boot/ +COPY make-rpi3 / +ENTRYPOINT [ "/make-rpi3" ] diff --git a/tools/mkimage-rpi3/boot.script b/tools/mkimage-rpi3/boot.script new file mode 100644 index 000000000..c717ccb8a --- /dev/null +++ b/tools/mkimage-rpi3/boot.script @@ -0,0 +1,9 @@ +setenv bootargs "dwc_otg.lpm_enable=0 earlyprintk console=tty1 console=ttyS0,115200 root=/dev/ram0 rw" +setenv dtbfile bcm2837-rpi-3-b.dtb +setenv machid 0x00000c42 +saveenv + +fatload mmc 0:1 ${kernel_addr_r} kernel.uimg +fatload mmc 0:1 ${fdt_addr_r} ${dtbfile} +fatload mmc 0:1 ${ramdisk_addr_r} initrd.uimg +bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} diff --git a/tools/mkimage-rpi3/build.yml b/tools/mkimage-rpi3/build.yml new file mode 100644 index 000000000..b38e9c82b --- /dev/null +++ b/tools/mkimage-rpi3/build.yml @@ -0,0 +1,4 @@ +image: mkimage-rpi3 +network: true +arches: + - arm64 diff --git a/tools/mkimage-rpi3/config.txt b/tools/mkimage-rpi3/config.txt new file mode 100644 index 000000000..95400f34a --- /dev/null +++ b/tools/mkimage-rpi3/config.txt @@ -0,0 +1,5 @@ +avoid_warnings=2 +# 64bit mode, serial and kernel +arm_control=0x200 +enable_uart=1 +kernel=u-boot.bin diff --git a/tools/mkimage-rpi3/make-rpi3 b/tools/mkimage-rpi3/make-rpi3 new file mode 100755 index 000000000..d41818d9a --- /dev/null +++ b/tools/mkimage-rpi3/make-rpi3 @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e + +# input is a tarball on stdin with kernel, dtbs and cmdline in /boot +# output is an tar to be extracted onto a SD card + +mkdir -p /files +cd /files + +# extract. BSD tar auto recognises compression +[ -t 0 ] || bsdtar xzf - + +cd / + +# copy/convert files +cp /files/boot/dtb/broadcom/bcm2837-rpi-3-b.dtb /boot +/bin/mkimage -A arm64 -O linux -T kernel -C gzip -a 0x80000 -e 0x80000 \ + -d /files/boot/kernel /boot/kernel.uimg >> /boot/uboot.log +/bin/mkimage -A arm64 -O linux -T script -C none -a 0x00000000 -e 0x00000000 -n RPi3 \ + -d /boot/boot.script /boot/boot.scr >> /boot/uboot.log + +# build an initrd and convert it +rm -rf /files/boot +cd /files && find . | cpio -o -H newc | gzip > /initrd.img +/bin/mkimage -A arm64 -O linux -T ramdisk -d /initrd.img /boot/initrd.uimg >> /boot/uboot.log + +# now everything is setup in /boot just need to tar it +cd /boot && tar cf - . diff --git a/tools/mkimage-rpi3/u-boot.patch b/tools/mkimage-rpi3/u-boot.patch new file mode 100644 index 000000000..709b0f8f6 --- /dev/null +++ b/tools/mkimage-rpi3/u-boot.patch @@ -0,0 +1,11 @@ +diff --git a/include/configs/rpi.h b/include/configs/rpi.h +index c499b45..1faae3c 100644 +--- a/include/configs/rpi.h ++++ b/include/configs/rpi.h +@@ -161,4 +161,6 @@ + BOOTENV + + ++#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) ++ + #endif