Remove OrangepiZero2 outdated legacy kernel v4.9
This commit is contained in:
Igor Pecovnik
Igor
parent
2b494ae46f
commit
1bf2aba67b
@ -4,7 +4,7 @@ BOARDFAMILY="sun50iw9"
|
||||
BOARD_MAINTAINER="krachlatte AGM1968"
|
||||
BOOTCONFIG="orangepi_zero2_defconfig"
|
||||
BOOT_LOGO="desktop"
|
||||
KERNEL_TARGET="legacy,current,edge"
|
||||
KERNEL_TARGET="current,edge"
|
||||
KERNEL_TEST_TARGET="current,edge"
|
||||
FORCE_BOOTSCRIPT_UPDATE="yes"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -15,50 +15,6 @@ GOVERNOR=ondemand
|
||||
|
||||
case $BRANCH in
|
||||
|
||||
legacy)
|
||||
|
||||
# Legacy kernel
|
||||
LINUXFAMILY=sun50iw9
|
||||
KERNELSOURCE='https://github.com/orangepi-xunlong/linux-orangepi.git'
|
||||
declare -g KERNEL_MAJOR_MINOR="4.9" # Major and minor versions of this kernel.
|
||||
KERNELBRANCH="branch:orange-pi-4.9-sun50iw9"
|
||||
KERNELPATCHDIR="archive/sun50iw9-4.9"
|
||||
INITRD_ARCH=arm
|
||||
ASOUND_STATE='asound.state.sun50iw9-legacy'
|
||||
|
||||
# This (legacy/vendor) kernel requires uImage manual conversion; do it via a 'pre_package_kernel_image' hook.
|
||||
declare -g NAME_KERNEL="uImage" # Even though that's a lie.
|
||||
function pre_package_kernel_image__orangepi_legacy_uImage_manual_conversion() {
|
||||
display_alert "Converting" "${BOARDFAMILY} - ${LINUXFAMILY} :: legacy :: uImage" "info"
|
||||
if [[ -z "${kernel_image_pre_package_path}" || ! -f "${kernel_image_pre_package_path}" ]]; then
|
||||
exit_with_error "kernel_image_pre_package_path ('${kernel_image_pre_package_path}') is not set or does not exist"
|
||||
fi
|
||||
run_host_command_logged mkimage -A arm -O linux -T kernel -C none -a "'0x40008000'" -e "'0x40008000'" -n "'Linux kernel'" -d "${kernel_image_pre_package_path}" "${kernel_image_pre_package_path}.uImage.tmp"
|
||||
run_host_command_logged mv -v "${kernel_image_pre_package_path}.uImage.tmp" "${kernel_image_pre_package_path}"
|
||||
}
|
||||
|
||||
# Legacy u-boot
|
||||
BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git'
|
||||
BOOTBRANCH='branch:v2018.05-sun50iw9'
|
||||
BOOTPATCHDIR="legacy"
|
||||
UBOOT_TARGET_MAP=";;dts/${BOARD}-u-boot.dts boot0_sdcard.fex boot_package.fex u-boot.bin:u-boot.fex"
|
||||
UBOOT_COMPILER="arm-linux-gnueabi-"
|
||||
UBOOT_USE_GCC='> 6.0'
|
||||
BOOTENV_FILE=sun50iw9.txt
|
||||
BOOTSCRIPT='boot-sun50iw9.cmd:boot.cmd'
|
||||
PACK_UBOOT="yes"
|
||||
OFFSET=20
|
||||
ATFSOURCE=""
|
||||
ATF_COMPILE="no"
|
||||
|
||||
# this overrides the one in sunxi64_common.inc
|
||||
function write_uboot_platform() {
|
||||
dd if=$1/boot0_sdcard.fex of=$2 bs=8k seek=1 conv=fsync
|
||||
dd if=$1/boot_package.fex of=$2 bs=8k seek=2050 conv=fsync
|
||||
}
|
||||
|
||||
;;
|
||||
|
||||
current | edge)
|
||||
ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
|
||||
ATFBRANCH='tag:lts-v2.10.2'
|
||||
@ -86,61 +42,3 @@ function family_tweaks_s() {
|
||||
fi
|
||||
}
|
||||
|
||||
function family_tweaks_bsp() {
|
||||
if [[ ${BOARD} == orangepizero2 && ${BRANCH} == legacy ]]; then
|
||||
install -m 755 $SRC/packages/blobs/bt/hciattach/hciattach_opi_$ARCH $destination/usr/bin/hciattach_opi
|
||||
cp $SRC/packages/bsp/sunxi/aw859a-bluetooth.service $destination/lib/systemd/system/
|
||||
|
||||
install -m 755 $SRC/packages/blobs/sunxi/h616/inithdmiaudio $destination/usr/bin/
|
||||
cp $SRC/packages/blobs/sunxi/h616/libtinyalsa.so $destination/usr/lib/
|
||||
cp $SRC/packages/bsp/sunxi/hdmi-audio.service $destination/lib/systemd/system/
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
function uboot_custom_postprocess() {
|
||||
if [[ ${BRANCH} == legacy ]]; then
|
||||
display_alert "Post-processing U-Boot" "$BOARD - $BRANCH" "info"
|
||||
# "Vendor" code (by Igor) is at https://raw.githubusercontent.com/orangepi-xunlong/orangepi-build/main/external/config/sources/families/sun50iw9.conf
|
||||
|
||||
run_host_command_logged rm -rfv dts/*.dts sys_config ${BOARD}-u-boot.dtb
|
||||
|
||||
run_host_command_logged cp -rpv ${SRC}/packages/pack-uboot/${BOARDFAMILY}/bin/* .
|
||||
|
||||
run_host_command_logged cp -pv sys_config/sys_config_${BOARD}.fex sys_config.fex
|
||||
run_host_command_logged cp -pv u-boot.bin u-boot.fex
|
||||
|
||||
# [[ ${BOARD} =~ orangepizero2-b|orangepizero2-lts ]] && run_host_command_logged mv -v boot0_sdcard_new.fex boot0_sdcard.fex # From vendor code, they have multiple of those boards
|
||||
|
||||
# make u-boot dtb
|
||||
run_host_command_logged dtc -p 2048 -W no-unit_address_vs_reg -@ -O dtb -o ${BOARD}-u-boot.dtb -b 0 dts/${BOARD}-u-boot.dts
|
||||
[[ ! -f "${BOARD}-u-boot.dtb" ]] && exit_with_error "dts compilation failed for ${BOARD}-u-boot.dtb"
|
||||
|
||||
run_host_command_logged busybox unix2dos sys_config.fex
|
||||
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/script sys_config.fex
|
||||
run_host_command_logged cp -pv ${BOARD}-u-boot.dtb sunxi.fex
|
||||
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/update_dtb sunxi.fex 4096
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/update_boot0 boot0_sdcard.fex sys_config.bin SDMMC_CARD
|
||||
|
||||
# rpardini: this looks wrong, but isn't. look at vendor code.
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/update_uboot -no_merge u-boot.fex sys_config.bin
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/update_uboot -no_merge u-boot.bin sys_config.bin
|
||||
|
||||
#pack boot package
|
||||
run_host_command_logged busybox unix2dos boot_package.cfg
|
||||
run_host_command_logged $SRC/packages/pack-uboot/${BOARDFAMILY}/tools/dragonsecboot -pack boot_package.cfg
|
||||
|
||||
# From vendor code, we never had this.
|
||||
#if [[ ${MERGE_UBOOT} == yes ]]; then
|
||||
# display_alert "Merge u-boot" "u-boot-${BOARD}-merged.bin" "info"
|
||||
# dd if=/dev/zero of=u-boot-${BOARD}-merged.bin bs=1M count=20 > /dev/null 2>&1
|
||||
# dd if=boot0_sdcard.fex of=u-boot-${BOARD}-merged.bin bs=8k seek=1 conv=fsync > /dev/null 2>&1
|
||||
# dd if=boot_package.fex of=u-boot-${BOARD}-merged.bin bs=8k seek=2050 conv=fsync > /dev/null 2>&1
|
||||
# mv u-boot-${BOARD}-merged.bin ${DEB_STORAGE}/u-boot/
|
||||
#fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
[package]
|
||||
item=u-boot, u-boot.fex
|
||||
item=monitor, monitor.fex
|
||||
item=dtbo, p1.dtbo
|
||||
item=dtb, sunxi.fex
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
@ -1,818 +0,0 @@
|
||||
;sunxi platform application
|
||||
;---------------------------------------------------------------------------------------------------------
|
||||
; 说明： 脚本中的字符串区分大小写，用户可以修改"="后面的数值，但是不要修改前面的字符串
|
||||
; 描述gpio的形式：Port:端口+组内序号<功能分配><内部电阻状态><驱动能力><输出电平状态>
|
||||
;---------------------------------------------------------------------------------------------------------
|
||||
|
||||
[product]
|
||||
version = "100"
|
||||
machine = "evb"
|
||||
|
||||
[platform]
|
||||
eraseflag = 1
|
||||
debug_mode = 3
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
;[target] system bootup configuration
|
||||
;boot_clock = CPU boot frequency, Unit: MHz
|
||||
;storage_type = boot medium, 0-nand, 1-card0, 2-card2, -1(defualt)auto scan
|
||||
;advert_enable = 0-close advert logo 1-open advert logo (只有多核启动下有效)
|
||||
;----------------------------------------------------------------------------------
|
||||
[target]
|
||||
boot_clock = 1008
|
||||
storage_type = -1
|
||||
advert_enable = 0
|
||||
burn_key = 1
|
||||
dragonboard_test= 0
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
; system configuration
|
||||
; ?
|
||||
;dcdc2_vol ---set dcdc2 voltage,mV,500-1200,10mV/step
|
||||
; 1220-1540,20mV/step
|
||||
;aldo1_vol ---set aldo1 voltage,mV,500-3500,100mV/step
|
||||
;dldo1_vol ---set dldo1 voltage,mV,500-3500,100mV/step
|
||||
;----------------------------------------------------------------------------------
|
||||
[power_sply]
|
||||
dcdc2_vol = 1001000
|
||||
aldo1_vol = 1001800
|
||||
dldo1_vol = 1003300
|
||||
|
||||
[axp1530_power_sply]
|
||||
dcdc2_vol = 1001000
|
||||
aldo1_vol = 1001800
|
||||
dldo1_vol = 1003300
|
||||
|
||||
[axp806_power_sply]
|
||||
dcdce_vol = 1003300
|
||||
dcdcd_vol = 1001350
|
||||
aldo1_vol = 1003300
|
||||
bldo1_vol = 1001800
|
||||
|
||||
[card_boot]
|
||||
logical_start = 40960
|
||||
sprite_gpio0 =
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
; GPIO init on uboot
|
||||
;----------------------------------------------------------------------------------
|
||||
[boot_init_gpio]
|
||||
boot_init_gpio_used = 1
|
||||
gpio0 = port:PC12<1><default><default><1>
|
||||
gpio1 = port:PC13<1><default><default><0>
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
; ir_boot_recovery_used : 1: used this function 0: not used
|
||||
; ir_work_mode : 模式选择
|
||||
; 0: 刷机,
|
||||
; 1: 一键恢复(uboot阶段),
|
||||
; 2: 安卓recovery,
|
||||
; 3: 安卓恢复出厂设置.
|
||||
; 如果不设置，默认为安卓recovery .
|
||||
; ir_press_times : ir遥控器连续按几次才生效,如果不设置默认为按1次生效
|
||||
; ir_detect_time : ir遥控检测时间,单位:ms,如果不设置默认为3000ms
|
||||
; ir_key_no_duplicate : ir遥控按键是否可重复，0：可重复(默认)，1：不可重复；
|
||||
; 不可重复表示一个按键无论被按下几次，都只算ir_press_times的一次；
|
||||
; 不可重复的应用场景为组合按键功能，如:交替按下'菜单键'和'音量-键'进入安卓recovery.
|
||||
; ir_recovery_key_code0 : ir check key code
|
||||
; ir_addr_code0 : ir key addr
|
||||
; you can increase ir support num, like:
|
||||
; ir_recovery_key_code1, or 2, 3, but limit to 16
|
||||
;----------------------------------------------------------------------------------
|
||||
|
||||
[ir_boot_recovery]
|
||||
ir_boot_recovery_used = 1
|
||||
ir_work_mode = 1
|
||||
ir_press_times = 2
|
||||
ir_detect_time = 1
|
||||
ir_key_no_duplicate = 0
|
||||
ir_recovery_key_code0 = 0x11
|
||||
ir_addr_code0 = 0xfe01
|
||||
ir_recovery_key_code1 = 0x19
|
||||
ir_addr_code1 = 0xfe01
|
||||
ir_recovery_key_code2 = 0x4c
|
||||
ir_addr_code2 = 0xfe01
|
||||
ir_recovery_key_code3 = 0x00
|
||||
ir_addr_code3 = 0xfe01
|
||||
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
; recovery_key_used : 模块使能端， 1：开启，0：关闭
|
||||
; press_mode_enable : 长短按模式使能，1：开启，0：关闭
|
||||
; a)如果开启了该模式，则key_work_mode失效，short_press_mode和long_press_mode生>效,
|
||||
; recovery按键可以通过长按和短按来触发两种不同的模式;
|
||||
; b)如果关闭了该模式，则key_work_mode生效，recovery按键只能触发一种模式.
|
||||
; key_work_mode : 模式选择
|
||||
; 0: 刷机,
|
||||
; 1: 一键恢复(uboot阶段),
|
||||
; 2: 安卓recovery,
|
||||
; 3: 安卓恢复出厂设置.
|
||||
; 如果不设置，模式为安卓recovery.
|
||||
; short_press_mode : 长按触发的模式，选项同上.
|
||||
; long_press_mode : 短按触发的模式，选项同上.
|
||||
; key_press_time : 定义长按的时间，单位:毫秒.
|
||||
; recovery_key : 按键配置.
|
||||
;----------------------------------------------------------------------------------
|
||||
[key_boot_recovery]
|
||||
recovery_key_used = 1
|
||||
press_mode_enable = 0
|
||||
key_work_mode = 0
|
||||
short_press_mode = 0
|
||||
long_press_mode = 1
|
||||
key_press_time = 2000
|
||||
recovery_key =
|
||||
|
||||
|
||||
;---------------------------------------------------------------------------------------------------------
|
||||
; if 1 == standby_mode, then support super standby;
|
||||
; else, support normal standby.
|
||||
;---------------------------------------------------------------------------------------------------------
|
||||
[pm_para]
|
||||
standby_mode = 1
|
||||
|
||||
[card0_boot_para]
|
||||
card_ctrl = 0
|
||||
card_high_speed = 1
|
||||
card_line = 4
|
||||
sdc_d1 = port:PF0<2><1><3><default>
|
||||
sdc_d0 = port:PF1<2><1><3><default>
|
||||
sdc_clk = port:PF2<2><1><3><default>
|
||||
sdc_cmd = port:PF3<2><1><3><default>
|
||||
sdc_d3 = port:PF4<2><1><3><default>
|
||||
sdc_d2 = port:PF5<2><1><3><default>
|
||||
;sdc_type = "tm1"
|
||||
|
||||
[card2_boot_para]
|
||||
card_ctrl = 2
|
||||
card_high_speed = 1
|
||||
card_line = 8
|
||||
sdc_clk = port:PC5<3><1><3><default>
|
||||
sdc_cmd = port:PC6<3><1><3><default>
|
||||
sdc_d0 = port:PC10<3><1><3><default>
|
||||
sdc_d1 = port:PC13<3><1><3><default>
|
||||
sdc_d2 = port:PC15<3><1><3><default>
|
||||
sdc_d3 = port:PC8<3><1><3><default>
|
||||
sdc_d4 = port:PC9<3><1><3><default>
|
||||
sdc_d5 = port:PC11<3><1><3><default>
|
||||
sdc_d6 = port:PC14<3><1><3><default>
|
||||
sdc_d7 = port:PC16<3><1><3><default>
|
||||
sdc_emmc_rst = port:PC1<3><1><3><default>
|
||||
sdc_ds = port:PC0<3><2><3><default>
|
||||
sdc_ex_dly_used = 2
|
||||
sdc_io_1v8 = 1
|
||||
;sdc_dis_host_caps = 0x100
|
||||
;sdc_type = "tm4"
|
||||
|
||||
[gpio_bias]
|
||||
pc_bias = 1800
|
||||
|
||||
[twi_para]
|
||||
twi_port = 0
|
||||
twi_scl = port:PH14<2><default><default><default>
|
||||
twi_sda = port:PH15<2><default><default><default>
|
||||
|
||||
[auto_print]
|
||||
auto_print_used = 1
|
||||
|
||||
[uart_para]
|
||||
uart_debug_port = 0
|
||||
uart_debug_tx = port:PH00<2><1><default><default>
|
||||
uart_debug_rx = port:PH01<2><1><default><default>
|
||||
|
||||
[jtag_para]
|
||||
jtag_enable = 0
|
||||
jtag_ms = port:PH9<3><default><default><default>
|
||||
jtag_ck = port:PH10<3><default><default><default>
|
||||
jtag_do = port:PH11<3><default><default><default>
|
||||
jtag_di = port:PH12<3><default><default><default>
|
||||
|
||||
[clock]
|
||||
pll4 = 300
|
||||
pll6 = 600
|
||||
pll8 = 360
|
||||
pll9 = 297
|
||||
pll10 = 264
|
||||
|
||||
;*****************************************************************************
|
||||
;
|
||||
;dram select configuration
|
||||
;
|
||||
;select_mode : dram模式选择, 0:不进行自动识别
|
||||
; 1:gpio识别模式(dram_para, dram_para1-15, 共16组有效)
|
||||
; 2:gpadc识别模式(dram_para, dram_para1-7, 共8组有效)
|
||||
; 3:1个IO+gpadc识别模式(dram_para, dram_para1-15, 共16组有效)。其中IO配置优先级按select_gpio0>select_gpio1>select_gpio2>select_gpio3
|
||||
;gpadc_channel : 选择gpadc通道 有效值(0-3)
|
||||
;select_gpio1-4 : 选择gpio pin
|
||||
;*****************************************************************************
|
||||
|
||||
|
||||
[dram_select_para]
|
||||
select_mode = 0
|
||||
gpadc_channel = 1
|
||||
select_gpio0 =
|
||||
select_gpio1 =
|
||||
select_gpio2 =
|
||||
select_gpio3 =
|
||||
|
||||
;*****************************************************************************
|
||||
;sdram configuration
|
||||
;
|
||||
;*****************************************************************************
|
||||
[dram_para]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
|
||||
[dram_para1]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para2]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para3]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para4]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para5]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para6]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para7]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para8]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para9]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para10]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para11]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para12]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para13]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para14]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
[dram_para15]
|
||||
|
||||
dram_clk = 720
|
||||
dram_type = 3
|
||||
dram_dx_odt = 0x08080808
|
||||
dram_dx_dri = 0x0e0e0e0e
|
||||
dram_ca_dri = 0x0e0e
|
||||
dram_odt_en = 1
|
||||
dram_para1 = 0x30FA
|
||||
dram_para2 = 0x1000
|
||||
dram_mr0 = 0x840
|
||||
dram_mr1 = 0x4
|
||||
dram_mr2 = 0x8
|
||||
dram_mr3 = 0x0
|
||||
dram_mr4 = 0x0
|
||||
dram_mr5 = 0x0
|
||||
dram_mr6 = 0x0
|
||||
dram_mr11 = 0x0
|
||||
dram_mr12 = 0x0
|
||||
dram_mr13 = 0x0
|
||||
dram_mr14 = 0x0
|
||||
dram_mr16 = 0x0
|
||||
dram_mr17 = 0x0
|
||||
dram_mr22 = 0x0
|
||||
dram_tpr0 = 0x0
|
||||
dram_tpr1 = 0x0
|
||||
dram_tpr2 = 0x0
|
||||
dram_tpr3 = 0x0
|
||||
dram_tpr6 = 0x33808080
|
||||
dram_tpr10 = 0x00f83438
|
||||
dram_tpr11 = 0x0
|
||||
dram_tpr12 = 0x0
|
||||
dram_tpr13 = 0x40
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
;os life cycle para configuration
|
||||
;----------------------------------------------------------------------------------
|
||||
|
||||
;----------------------------------------------------------------------------------
|
||||
;uart configuration
|
||||
;uart_type --- 2 (2 wire), 4 (4 wire), 8 (8 wire, full function)
|
||||
;----------------------------------------------------------------------------------
|
||||
[uart0]
|
||||
uart0_used = 1
|
||||
uart0_port = 0
|
||||
uart0_type = 2
|
||||
uart0_tx = port:PH00<2><1><default><default>
|
||||
uart0_rx = port:PH01<2><1><default><default>
|
||||
|
||||
[nand0_para]
|
||||
nand0_support_2ch = 0
|
||||
|
||||
nand0_used = 0
|
||||
nand0_we = port:PC00<2><0><1><default>
|
||||
nand0_ale = port:PC01<2><0><1><default>
|
||||
nand0_cle = port:PC02<2><0><1><default>
|
||||
nand0_ce0 = port:PC03<2><1><1><default>
|
||||
nand0_nre = port:PC04<2><0><1><default>
|
||||
nand0_rb0 = port:PC05<2><1><1><default>
|
||||
nand0_d0 = port:PC06<2><0><1><default>
|
||||
nand0_d1 = port:PC07<2><0><1><default>
|
||||
nand0_d2 = port:PC08<2><0><1><default>
|
||||
nand0_d3 = port:PC09<2><0><1><default>
|
||||
nand0_d4 = port:PC10<2><0><1><default>
|
||||
nand0_d5 = port:PC11<2><0><1><default>
|
||||
nand0_d6 = port:PC12<2><0><1><default>
|
||||
nand0_d7 = port:PC13<2><0><1><default>
|
||||
nand0_ndqs = port:PC14<2><0><1><default>
|
||||
nand0_ce1 = port:PC15<2><1><1><default>
|
||||
nand0_rb1 = port:PC16<2><1><1><default>
|
||||
|
||||
nand0_regulator1 = "vcc-nand"
|
||||
nand0_regulator2 = "none"
|
||||
nand0_cache_level = 0x55aaaa55
|
||||
nand0_flush_cache_num = 0x55aaaa55
|
||||
nand0_capacity_level = 0x55aaaa55
|
||||
nand0_id_number_ctl = 0x55aaaa55
|
||||
nand0_print_level = 0x55aaaa55
|
||||
nand0_p0 = 0x55aaaa55
|
||||
nand0_p1 = 0x55aaaa55
|
||||
nand0_p2 = 0x55aaaa55
|
||||
nand0_p3 = 0x55aaaa55
|
||||
|
||||
[secure]
|
||||
dram_region_mbytes = 80
|
||||
drm_region_mbytes = 0
|
||||
drm_region_start_mbytes = 0
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,26 +0,0 @@
|
||||
From 3a3274fe09d70fd25607eac945f5c17bd48d4e7b Mon Sep 17 00:00:00 2001
|
||||
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||||
Date: Mon, 8 Mar 2021 06:54:40 +0000
|
||||
Subject: [PATCH] fixing dtc error
|
||||
|
||||
Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
|
||||
---
|
||||
scripts/dtc/dtc-lexer.lex.c_shipped | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
|
||||
index 011bb963..c3b63163 100644
|
||||
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
|
||||
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped
|
||||
@@ -631,7 +631,7 @@ char *yytext;
|
||||
#include "srcpos.h"
|
||||
#include "dtc-parser.tab.h"
|
||||
|
||||
-YYLTYPE yylloc;
|
||||
+extern YYLTYPE yylloc;
|
||||
extern bool treesource_error;
|
||||
|
||||
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
|
||||
--
|
||||
Created with Armbian build tools https://github.com/armbian/build
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,881 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 75cba5fbdb46..a4e35453f9e4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 172
|
||||
+SUBLEVEL = 173
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
index 84df85ea6296..7efde03daadd 100644
|
||||
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||||
@@ -26,5 +26,5 @@
|
||||
};
|
||||
|
||||
&hdmi {
|
||||
- hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
|
||||
+ hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
|
||||
index e0280cac2484..fed72a5f3ffa 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
|
||||
@@ -90,6 +90,7 @@
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_enet>;
|
||||
phy-mode = "rgmii";
|
||||
+ phy-reset-duration = <10>; /* in msecs */
|
||||
phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
|
||||
phy-supply = <&vdd_eth_io_reg>;
|
||||
status = "disabled";
|
||||
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
|
||||
index 8d665f1b29f8..f0fe566a9910 100644
|
||||
--- a/arch/s390/include/asm/elf.h
|
||||
+++ b/arch/s390/include/asm/elf.h
|
||||
@@ -215,11 +215,14 @@ do { \
|
||||
|
||||
/*
|
||||
* Cache aliasing on the latest machines calls for a mapping granularity
|
||||
- * of 512KB. For 64-bit processes use a 512KB alignment and a randomization
|
||||
- * of up to 1GB. For 31-bit processes the virtual address space is limited,
|
||||
- * use no alignment and limit the randomization to 8MB.
|
||||
+ * of 512KB for the anonymous mapping base. For 64-bit processes use a
|
||||
+ * 512KB alignment and a randomization of up to 1GB. For 31-bit processes
|
||||
+ * the virtual address space is limited, use no alignment and limit the
|
||||
+ * randomization to 8MB.
|
||||
+ * For the additional randomization of the program break use 32MB for
|
||||
+ * 64-bit and 8MB for 31-bit.
|
||||
*/
|
||||
-#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ffffUL)
|
||||
+#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x1fffUL)
|
||||
#define MMAP_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ff80UL)
|
||||
#define MMAP_ALIGN_MASK (is_compat_task() ? 0 : 0x7fUL)
|
||||
#define STACK_RND_MASK MMAP_RND_MASK
|
||||
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c
|
||||
index 0ad96c647541..7017a81d53cf 100644
|
||||
--- a/drivers/ata/libata-zpodd.c
|
||||
+++ b/drivers/ata/libata-zpodd.c
|
||||
@@ -51,38 +51,52 @@ static int eject_tray(struct ata_device *dev)
|
||||
/* Per the spec, only slot type and drawer type ODD can be supported */
|
||||
static enum odd_mech_type zpodd_get_mech_type(struct ata_device *dev)
|
||||
{
|
||||
- char buf[16];
|
||||
+ char *buf;
|
||||
unsigned int ret;
|
||||
- struct rm_feature_desc *desc = (void *)(buf + 8);
|
||||
+ struct rm_feature_desc *desc;
|
||||
struct ata_taskfile tf;
|
||||
static const char cdb[] = { GPCMD_GET_CONFIGURATION,
|
||||
2, /* only 1 feature descriptor requested */
|
||||
0, 3, /* 3, removable medium feature */
|
||||
0, 0, 0,/* reserved */
|
||||
- 0, sizeof(buf),
|
||||
+ 0, 16,
|
||||
0, 0, 0,
|
||||
};
|
||||
|
||||
+ buf = kzalloc(16, GFP_KERNEL);
|
||||
+ if (!buf)
|
||||
+ return ODD_MECH_TYPE_UNSUPPORTED;
|
||||
+ desc = (void *)(buf + 8);
|
||||
+
|
||||
ata_tf_init(dev, &tf);
|
||||
tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
|
||||
tf.command = ATA_CMD_PACKET;
|
||||
tf.protocol = ATAPI_PROT_PIO;
|
||||
- tf.lbam = sizeof(buf);
|
||||
+ tf.lbam = 16;
|
||||
|
||||
ret = ata_exec_internal(dev, &tf, cdb, DMA_FROM_DEVICE,
|
||||
- buf, sizeof(buf), 0);
|
||||
- if (ret)
|
||||
+ buf, 16, 0);
|
||||
+ if (ret) {
|
||||
+ kfree(buf);
|
||||
return ODD_MECH_TYPE_UNSUPPORTED;
|
||||
+ }
|
||||
|
||||
- if (be16_to_cpu(desc->feature_code) != 3)
|
||||
+ if (be16_to_cpu(desc->feature_code) != 3) {
|
||||
+ kfree(buf);
|
||||
return ODD_MECH_TYPE_UNSUPPORTED;
|
||||
+ }
|
||||
|
||||
- if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1)
|
||||
+ if (desc->mech_type == 0 && desc->load == 0 && desc->eject == 1) {
|
||||
+ kfree(buf);
|
||||
return ODD_MECH_TYPE_SLOT;
|
||||
- else if (desc->mech_type == 1 && desc->load == 0 && desc->eject == 1)
|
||||
+ } else if (desc->mech_type == 1 && desc->load == 0 &&
|
||||
+ desc->eject == 1) {
|
||||
+ kfree(buf);
|
||||
return ODD_MECH_TYPE_DRAWER;
|
||||
- else
|
||||
+ } else {
|
||||
+ kfree(buf);
|
||||
return ODD_MECH_TYPE_UNSUPPORTED;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Test if ODD is zero power ready by sense code */
|
||||
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
|
||||
index aac84329c759..b863386be911 100644
|
||||
--- a/drivers/gpio/gpiolib-of.c
|
||||
+++ b/drivers/gpio/gpiolib-of.c
|
||||
@@ -531,7 +531,13 @@ int of_gpiochip_add(struct gpio_chip *chip)
|
||||
|
||||
of_node_get(chip->of_node);
|
||||
|
||||
- return of_gpiochip_scan_gpios(chip);
|
||||
+ status = of_gpiochip_scan_gpios(chip);
|
||||
+ if (status) {
|
||||
+ of_node_put(chip->of_node);
|
||||
+ gpiochip_remove_pin_ranges(chip);
|
||||
+ }
|
||||
+
|
||||
+ return status;
|
||||
}
|
||||
|
||||
void of_gpiochip_remove(struct gpio_chip *chip)
|
||||
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
|
||||
index 09a7cffbc46f..896b38f6f9c0 100644
|
||||
--- a/drivers/leds/leds-pca9532.c
|
||||
+++ b/drivers/leds/leds-pca9532.c
|
||||
@@ -488,6 +488,7 @@ static int pca9532_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
int devid;
|
||||
+ const struct of_device_id *of_id;
|
||||
struct pca9532_data *data = i2c_get_clientdata(client);
|
||||
struct pca9532_platform_data *pca9532_pdata =
|
||||
dev_get_platdata(&client->dev);
|
||||
@@ -503,8 +504,11 @@ static int pca9532_probe(struct i2c_client *client,
|
||||
dev_err(&client->dev, "no platform data\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
- devid = (int)(uintptr_t)of_match_device(
|
||||
- of_pca9532_leds_match, &client->dev)->data;
|
||||
+ of_id = of_match_device(of_pca9532_leds_match,
|
||||
+ &client->dev);
|
||||
+ if (unlikely(!of_id))
|
||||
+ return -EINVAL;
|
||||
+ devid = (int)(uintptr_t) of_id->data;
|
||||
} else {
|
||||
devid = id->driver_data;
|
||||
}
|
||||
diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
|
||||
index f9a810e3f521..5f052189a6c4 100644
|
||||
--- a/drivers/media/platform/vivid/vivid-vid-common.c
|
||||
+++ b/drivers/media/platform/vivid/vivid-vid-common.c
|
||||
@@ -841,6 +841,7 @@ int vidioc_g_edid(struct file *file, void *_fh,
|
||||
if (edid->start_block + edid->blocks > dev->edid_blocks)
|
||||
edid->blocks = dev->edid_blocks - edid->start_block;
|
||||
memcpy(edid->edid, dev->edid, edid->blocks * 128);
|
||||
- cec_set_edid_phys_addr(edid->edid, edid->blocks * 128, adap->phys_addr);
|
||||
+ if (adap)
|
||||
+ cec_set_edid_phys_addr(edid->edid, edid->blocks * 128, adap->phys_addr);
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
|
||||
index bd719e25dd76..2dd17e01e3a7 100644
|
||||
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
|
||||
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
|
||||
@@ -3184,6 +3184,7 @@ static ssize_t ehea_probe_port(struct device *dev,
|
||||
|
||||
if (ehea_add_adapter_mr(adapter)) {
|
||||
pr_err("creating MR failed\n");
|
||||
+ of_node_put(eth_dn);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
|
||||
index 1edc973df4c4..7377dca6eb57 100644
|
||||
--- a/drivers/net/ethernet/micrel/ks8851.c
|
||||
+++ b/drivers/net/ethernet/micrel/ks8851.c
|
||||
@@ -547,9 +547,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
|
||||
/* set dma read address */
|
||||
ks8851_wrreg16(ks, KS_RXFDPR, RXFDPR_RXFPAI | 0x00);
|
||||
|
||||
- /* start the packet dma process, and set auto-dequeue rx */
|
||||
- ks8851_wrreg16(ks, KS_RXQCR,
|
||||
- ks->rc_rxqcr | RXQCR_SDA | RXQCR_ADRFE);
|
||||
+ /* start DMA access */
|
||||
+ ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA);
|
||||
|
||||
if (rxlen > 4) {
|
||||
unsigned int rxalign;
|
||||
@@ -580,7 +579,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)
|
||||
}
|
||||
}
|
||||
|
||||
- ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr);
|
||||
+ /* end DMA access and dequeue packet */
|
||||
+ ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -797,6 +797,15 @@ static void ks8851_tx_work(struct work_struct *work)
|
||||
static int ks8851_net_open(struct net_device *dev)
|
||||
{
|
||||
struct ks8851_net *ks = netdev_priv(dev);
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = request_threaded_irq(dev->irq, NULL, ks8851_irq,
|
||||
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
|
||||
+ dev->name, ks);
|
||||
+ if (ret < 0) {
|
||||
+ netdev_err(dev, "failed to get irq\n");
|
||||
+ return ret;
|
||||
+ }
|
||||
|
||||
/* lock the card, even if we may not actually be doing anything
|
||||
* else at the moment */
|
||||
@@ -861,6 +870,7 @@ static int ks8851_net_open(struct net_device *dev)
|
||||
netif_dbg(ks, ifup, ks->netdev, "network device up\n");
|
||||
|
||||
mutex_unlock(&ks->lock);
|
||||
+ mii_check_link(&ks->mii);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -911,6 +921,8 @@ static int ks8851_net_stop(struct net_device *dev)
|
||||
dev_kfree_skb(txb);
|
||||
}
|
||||
|
||||
+ free_irq(dev->irq, ks);
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1516,6 +1528,7 @@ static int ks8851_probe(struct spi_device *spi)
|
||||
|
||||
spi_set_drvdata(spi, ks);
|
||||
|
||||
+ netif_carrier_off(ks->netdev);
|
||||
ndev->if_port = IF_PORT_100BASET;
|
||||
ndev->netdev_ops = &ks8851_netdev_ops;
|
||||
ndev->irq = spi->irq;
|
||||
@@ -1542,14 +1555,6 @@ static int ks8851_probe(struct spi_device *spi)
|
||||
ks8851_read_selftest(ks);
|
||||
ks8851_init_mac(ks);
|
||||
|
||||
- ret = request_threaded_irq(spi->irq, NULL, ks8851_irq,
|
||||
- IRQF_TRIGGER_LOW | IRQF_ONESHOT,
|
||||
- ndev->name, ks);
|
||||
- if (ret < 0) {
|
||||
- dev_err(&spi->dev, "failed to get irq\n");
|
||||
- goto err_irq;
|
||||
- }
|
||||
-
|
||||
ret = register_netdev(ndev);
|
||||
if (ret) {
|
||||
dev_err(&spi->dev, "failed to register network device\n");
|
||||
@@ -1562,14 +1567,10 @@ static int ks8851_probe(struct spi_device *spi)
|
||||
|
||||
return 0;
|
||||
|
||||
-
|
||||
err_netdev:
|
||||
- free_irq(ndev->irq, ks);
|
||||
-
|
||||
-err_irq:
|
||||
+err_id:
|
||||
if (gpio_is_valid(gpio))
|
||||
gpio_set_value(gpio, 0);
|
||||
-err_id:
|
||||
regulator_disable(ks->vdd_reg);
|
||||
err_reg:
|
||||
regulator_disable(ks->vdd_io);
|
||||
@@ -1587,7 +1588,6 @@ static int ks8851_remove(struct spi_device *spi)
|
||||
dev_info(&spi->dev, "remove\n");
|
||||
|
||||
unregister_netdev(priv->netdev);
|
||||
- free_irq(spi->irq, priv);
|
||||
if (gpio_is_valid(priv->gpio))
|
||||
gpio_set_value(priv->gpio, 0);
|
||||
regulator_disable(priv->vdd_reg);
|
||||
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
|
||||
index 0a2318cad34d..63ebc491057b 100644
|
||||
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
|
||||
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
|
||||
@@ -1038,6 +1038,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)
|
||||
|
||||
for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) {
|
||||
skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE);
|
||||
+ if (!skb)
|
||||
+ break;
|
||||
qlcnic_create_loopback_buff(skb->data, adapter->mac_addr);
|
||||
skb_put(skb, QLCNIC_ILB_PKT_SIZE);
|
||||
adapter->ahw->diag_cnt = 0;
|
||||
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
|
||||
index d543298d6750..ff24524e7f46 100644
|
||||
--- a/drivers/net/ethernet/ti/netcp_ethss.c
|
||||
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
|
||||
@@ -3122,12 +3122,16 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev,
|
||||
|
||||
ret = netcp_txpipe_init(&gbe_dev->tx_pipe, netcp_device,
|
||||
gbe_dev->dma_chan_name, gbe_dev->tx_queue_id);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ of_node_put(interfaces);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
ret = netcp_txpipe_open(&gbe_dev->tx_pipe);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ of_node_put(interfaces);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
/* Create network interfaces */
|
||||
INIT_LIST_HEAD(&gbe_dev->gbe_intf_head);
|
||||
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
||||
index c688d68c39aa..a8afc92cbfca 100644
|
||||
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
||||
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
||||
@@ -1548,12 +1548,14 @@ static int axienet_probe(struct platform_device *pdev)
|
||||
ret = of_address_to_resource(np, 0, &dmares);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "unable to get DMA resource\n");
|
||||
+ of_node_put(np);
|
||||
goto free_netdev;
|
||||
}
|
||||
lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares);
|
||||
if (IS_ERR(lp->dma_regs)) {
|
||||
dev_err(&pdev->dev, "could not map DMA regs\n");
|
||||
ret = PTR_ERR(lp->dma_regs);
|
||||
+ of_node_put(np);
|
||||
goto free_netdev;
|
||||
}
|
||||
lp->rx_irq = irq_of_parse_and_map(np, 1);
|
||||
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
|
||||
index f1f8227e7342..01f95d192d25 100644
|
||||
--- a/drivers/net/usb/ipheth.c
|
||||
+++ b/drivers/net/usb/ipheth.c
|
||||
@@ -148,6 +148,7 @@ struct ipheth_device {
|
||||
u8 bulk_in;
|
||||
u8 bulk_out;
|
||||
struct delayed_work carrier_work;
|
||||
+ bool confirmed_pairing;
|
||||
};
|
||||
|
||||
static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags);
|
||||
@@ -259,7 +260,7 @@ static void ipheth_rcvbulk_callback(struct urb *urb)
|
||||
|
||||
dev->net->stats.rx_packets++;
|
||||
dev->net->stats.rx_bytes += len;
|
||||
-
|
||||
+ dev->confirmed_pairing = true;
|
||||
netif_rx(skb);
|
||||
ipheth_rx_submit(dev, GFP_ATOMIC);
|
||||
}
|
||||
@@ -280,14 +281,24 @@ static void ipheth_sndbulk_callback(struct urb *urb)
|
||||
dev_err(&dev->intf->dev, "%s: urb status: %d\n",
|
||||
__func__, status);
|
||||
|
||||
- netif_wake_queue(dev->net);
|
||||
+ if (status == 0)
|
||||
+ netif_wake_queue(dev->net);
|
||||
+ else
|
||||
+ // on URB error, trigger immediate poll
|
||||
+ schedule_delayed_work(&dev->carrier_work, 0);
|
||||
}
|
||||
|
||||
static int ipheth_carrier_set(struct ipheth_device *dev)
|
||||
{
|
||||
- struct usb_device *udev = dev->udev;
|
||||
+ struct usb_device *udev;
|
||||
int retval;
|
||||
|
||||
+ if (!dev)
|
||||
+ return 0;
|
||||
+ if (!dev->confirmed_pairing)
|
||||
+ return 0;
|
||||
+
|
||||
+ udev = dev->udev;
|
||||
retval = usb_control_msg(udev,
|
||||
usb_rcvctrlpipe(udev, IPHETH_CTRL_ENDP),
|
||||
IPHETH_CMD_CARRIER_CHECK, /* request */
|
||||
@@ -302,11 +313,14 @@ static int ipheth_carrier_set(struct ipheth_device *dev)
|
||||
return retval;
|
||||
}
|
||||
|
||||
- if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON)
|
||||
+ if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON) {
|
||||
netif_carrier_on(dev->net);
|
||||
- else
|
||||
+ if (dev->tx_urb->status != -EINPROGRESS)
|
||||
+ netif_wake_queue(dev->net);
|
||||
+ } else {
|
||||
netif_carrier_off(dev->net);
|
||||
-
|
||||
+ netif_stop_queue(dev->net);
|
||||
+ }
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -386,7 +400,6 @@ static int ipheth_open(struct net_device *net)
|
||||
return retval;
|
||||
|
||||
schedule_delayed_work(&dev->carrier_work, IPHETH_CARRIER_CHECK_TIMEOUT);
|
||||
- netif_start_queue(net);
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -489,7 +502,7 @@ static int ipheth_probe(struct usb_interface *intf,
|
||||
dev->udev = udev;
|
||||
dev->net = netdev;
|
||||
dev->intf = intf;
|
||||
-
|
||||
+ dev->confirmed_pairing = false;
|
||||
/* Set up endpoints */
|
||||
hintf = usb_altnum_to_altsetting(intf, IPHETH_ALT_INTFNUM);
|
||||
if (hintf == NULL) {
|
||||
@@ -540,7 +553,9 @@ static int ipheth_probe(struct usb_interface *intf,
|
||||
retval = -EIO;
|
||||
goto err_register_netdev;
|
||||
}
|
||||
-
|
||||
+ // carrier down and transmit queues stopped until packet from device
|
||||
+ netif_carrier_off(netdev);
|
||||
+ netif_tx_stop_all_queues(netdev);
|
||||
dev_info(&intf->dev, "Apple iPhone USB Ethernet device attached\n");
|
||||
return 0;
|
||||
|
||||
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
|
||||
index 237688af179b..f7630cf581cd 100644
|
||||
--- a/drivers/s390/scsi/zfcp_fc.c
|
||||
+++ b/drivers/s390/scsi/zfcp_fc.c
|
||||
@@ -238,10 +238,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
|
||||
list_for_each_entry(port, &adapter->port_list, list) {
|
||||
if ((port->d_id & range) == (ntoh24(page->rscn_fid) & range))
|
||||
zfcp_fc_test_link(port);
|
||||
- if (!port->d_id)
|
||||
- zfcp_erp_port_reopen(port,
|
||||
- ZFCP_STATUS_COMMON_ERP_FAILED,
|
||||
- "fcrscn1");
|
||||
}
|
||||
read_unlock_irqrestore(&adapter->port_list_lock, flags);
|
||||
}
|
||||
@@ -249,6 +245,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
|
||||
static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)
|
||||
{
|
||||
struct fsf_status_read_buffer *status_buffer = (void *)fsf_req->data;
|
||||
+ struct zfcp_adapter *adapter = fsf_req->adapter;
|
||||
struct fc_els_rscn *head;
|
||||
struct fc_els_rscn_page *page;
|
||||
u16 i;
|
||||
@@ -261,6 +258,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req)
|
||||
/* see FC-FS */
|
||||
no_entries = head->rscn_plen / sizeof(struct fc_els_rscn_page);
|
||||
|
||||
+ if (no_entries > 1) {
|
||||
+ /* handle failed ports */
|
||||
+ unsigned long flags;
|
||||
+ struct zfcp_port *port;
|
||||
+
|
||||
+ read_lock_irqsave(&adapter->port_list_lock, flags);
|
||||
+ list_for_each_entry(port, &adapter->port_list, list) {
|
||||
+ if (port->d_id)
|
||||
+ continue;
|
||||
+ zfcp_erp_port_reopen(port,
|
||||
+ ZFCP_STATUS_COMMON_ERP_FAILED,
|
||||
+ "fcrscn1");
|
||||
+ }
|
||||
+ read_unlock_irqrestore(&adapter->port_list_lock, flags);
|
||||
+ }
|
||||
+
|
||||
for (i = 1; i < no_entries; i++) {
|
||||
/* skip head and start with 1st element */
|
||||
page++;
|
||||
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
|
||||
index f9f899ec9427..c158967b59d7 100644
|
||||
--- a/drivers/scsi/qla4xxx/ql4_os.c
|
||||
+++ b/drivers/scsi/qla4xxx/ql4_os.c
|
||||
@@ -3207,6 +3207,8 @@ static int qla4xxx_conn_bind(struct iscsi_cls_session *cls_session,
|
||||
if (iscsi_conn_bind(cls_session, cls_conn, is_leading))
|
||||
return -EINVAL;
|
||||
ep = iscsi_lookup_endpoint(transport_fd);
|
||||
+ if (!ep)
|
||||
+ return -EINVAL;
|
||||
conn = cls_conn->dd_data;
|
||||
qla_conn = conn->dd_data;
|
||||
qla_conn->qla_ep = ep->dd_data;
|
||||
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
|
||||
index 9f61583af150..41b667c8385c 100644
|
||||
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
|
||||
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
|
||||
@@ -158,17 +158,9 @@ static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)
|
||||
|
||||
static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf)
|
||||
{
|
||||
- u32 val;
|
||||
- void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd);
|
||||
struct cmd_obj *pcmd = (struct cmd_obj *)pbuf;
|
||||
|
||||
- if (pcmd->rsp && pcmd->rspsz > 0)
|
||||
- memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz);
|
||||
- pcmd_callback = cmd_callback[pcmd->cmdcode].callback;
|
||||
- if (!pcmd_callback)
|
||||
- r8712_free_cmd_obj(pcmd);
|
||||
- else
|
||||
- pcmd_callback(padapter, pcmd);
|
||||
+ r8712_free_cmd_obj(pcmd);
|
||||
return H2C_SUCCESS;
|
||||
}
|
||||
|
||||
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h
|
||||
index 67e9e910aef9..d10a59d4a550 100644
|
||||
--- a/drivers/staging/rtl8712/rtl8712_cmd.h
|
||||
+++ b/drivers/staging/rtl8712/rtl8712_cmd.h
|
||||
@@ -152,7 +152,7 @@ enum rtl8712_h2c_cmd {
|
||||
static struct _cmd_callback cmd_callback[] = {
|
||||
{GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/
|
||||
{GEN_CMD_CODE(_Write_MACREG), NULL},
|
||||
- {GEN_CMD_CODE(_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback},
|
||||
+ {GEN_CMD_CODE(_Read_BBREG), NULL},
|
||||
{GEN_CMD_CODE(_Write_BBREG), NULL},
|
||||
{GEN_CMD_CODE(_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback},
|
||||
{GEN_CMD_CODE(_Write_RFREG), NULL}, /*5*/
|
||||
diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c
|
||||
index 73137f4aac20..d4462512605b 100644
|
||||
--- a/drivers/tty/serial/ar933x_uart.c
|
||||
+++ b/drivers/tty/serial/ar933x_uart.c
|
||||
@@ -52,11 +52,6 @@ struct ar933x_uart_port {
|
||||
struct clk *clk;
|
||||
};
|
||||
|
||||
-static inline bool ar933x_uart_console_enabled(void)
|
||||
-{
|
||||
- return IS_ENABLED(CONFIG_SERIAL_AR933X_CONSOLE);
|
||||
-}
|
||||
-
|
||||
static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up,
|
||||
int offset)
|
||||
{
|
||||
@@ -511,6 +506,7 @@ static struct uart_ops ar933x_uart_ops = {
|
||||
.verify_port = ar933x_uart_verify_port,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
||||
static struct ar933x_uart_port *
|
||||
ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];
|
||||
|
||||
@@ -607,14 +603,7 @@ static struct console ar933x_uart_console = {
|
||||
.index = -1,
|
||||
.data = &ar933x_uart_driver,
|
||||
};
|
||||
-
|
||||
-static void ar933x_uart_add_console_port(struct ar933x_uart_port *up)
|
||||
-{
|
||||
- if (!ar933x_uart_console_enabled())
|
||||
- return;
|
||||
-
|
||||
- ar933x_console_ports[up->port.line] = up;
|
||||
-}
|
||||
+#endif /* CONFIG_SERIAL_AR933X_CONSOLE */
|
||||
|
||||
static struct uart_driver ar933x_uart_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
@@ -703,7 +692,9 @@ static int ar933x_uart_probe(struct platform_device *pdev)
|
||||
baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP);
|
||||
up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD);
|
||||
|
||||
- ar933x_uart_add_console_port(up);
|
||||
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
||||
+ ar933x_console_ports[up->port.line] = up;
|
||||
+#endif
|
||||
|
||||
ret = uart_add_one_port(&ar933x_uart_driver, &up->port);
|
||||
if (ret)
|
||||
@@ -752,8 +743,9 @@ static int __init ar933x_uart_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
- if (ar933x_uart_console_enabled())
|
||||
- ar933x_uart_driver.cons = &ar933x_uart_console;
|
||||
+#ifdef CONFIG_SERIAL_AR933X_CONSOLE
|
||||
+ ar933x_uart_driver.cons = &ar933x_uart_console;
|
||||
+#endif
|
||||
|
||||
ret = uart_register_driver(&ar933x_uart_driver);
|
||||
if (ret)
|
||||
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
|
||||
index ea6b62cece88..82451bb6622b 100644
|
||||
--- a/drivers/tty/serial/sc16is7xx.c
|
||||
+++ b/drivers/tty/serial/sc16is7xx.c
|
||||
@@ -1482,7 +1482,7 @@ static int __init sc16is7xx_init(void)
|
||||
ret = i2c_add_driver(&sc16is7xx_i2c_uart_driver);
|
||||
if (ret < 0) {
|
||||
pr_err("failed to init sc16is7xx i2c --> %d\n", ret);
|
||||
- return ret;
|
||||
+ goto err_i2c;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1490,10 +1490,18 @@ static int __init sc16is7xx_init(void)
|
||||
ret = spi_register_driver(&sc16is7xx_spi_uart_driver);
|
||||
if (ret < 0) {
|
||||
pr_err("failed to init sc16is7xx spi --> %d\n", ret);
|
||||
- return ret;
|
||||
+ goto err_spi;
|
||||
}
|
||||
#endif
|
||||
return ret;
|
||||
+
|
||||
+err_spi:
|
||||
+#ifdef CONFIG_SERIAL_SC16IS7XX_I2C
|
||||
+ i2c_del_driver(&sc16is7xx_i2c_uart_driver);
|
||||
+#endif
|
||||
+err_i2c:
|
||||
+ uart_unregister_driver(&sc16is7xx_uart);
|
||||
+ return ret;
|
||||
}
|
||||
module_init(sc16is7xx_init);
|
||||
|
||||
diff --git a/drivers/usb/gadget/udc/net2272.c b/drivers/usb/gadget/udc/net2272.c
|
||||
index 40396a265a3f..f57d293a1791 100644
|
||||
--- a/drivers/usb/gadget/udc/net2272.c
|
||||
+++ b/drivers/usb/gadget/udc/net2272.c
|
||||
@@ -958,6 +958,7 @@ net2272_dequeue(struct usb_ep *_ep, struct usb_request *_req)
|
||||
break;
|
||||
}
|
||||
if (&req->req != _req) {
|
||||
+ ep->stopped = stopped;
|
||||
spin_unlock_irqrestore(&ep->dev->lock, flags);
|
||||
return -EINVAL;
|
||||
}
|
||||
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
|
||||
index 7a8c36642293..dfaed8e8cc52 100644
|
||||
--- a/drivers/usb/gadget/udc/net2280.c
|
||||
+++ b/drivers/usb/gadget/udc/net2280.c
|
||||
@@ -870,9 +870,6 @@ static void start_queue(struct net2280_ep *ep, u32 dmactl, u32 td_dma)
|
||||
(void) readl(&ep->dev->pci->pcimstctl);
|
||||
|
||||
writel(BIT(DMA_START), &dma->dmastat);
|
||||
-
|
||||
- if (!ep->is_in)
|
||||
- stop_out_naking(ep);
|
||||
}
|
||||
|
||||
static void start_dma(struct net2280_ep *ep, struct net2280_request *req)
|
||||
@@ -911,6 +908,7 @@ static void start_dma(struct net2280_ep *ep, struct net2280_request *req)
|
||||
writel(BIT(DMA_START), &dma->dmastat);
|
||||
return;
|
||||
}
|
||||
+ stop_out_naking(ep);
|
||||
}
|
||||
|
||||
tmp = dmactl_default;
|
||||
@@ -1279,9 +1277,9 @@ static int net2280_dequeue(struct usb_ep *_ep, struct usb_request *_req)
|
||||
break;
|
||||
}
|
||||
if (&req->req != _req) {
|
||||
+ ep->stopped = stopped;
|
||||
spin_unlock_irqrestore(&ep->dev->lock, flags);
|
||||
- dev_err(&ep->dev->pdev->dev, "%s: Request mismatch\n",
|
||||
- __func__);
|
||||
+ ep_dbg(ep->dev, "%s: Request mismatch\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
|
||||
index 43618976d68a..3efb7b0e8269 100644
|
||||
--- a/drivers/usb/host/u132-hcd.c
|
||||
+++ b/drivers/usb/host/u132-hcd.c
|
||||
@@ -3208,6 +3208,9 @@ static int __init u132_hcd_init(void)
|
||||
printk(KERN_INFO "driver %s\n", hcd_name);
|
||||
workqueue = create_singlethread_workqueue("u132");
|
||||
retval = platform_driver_register(&u132_platform_driver);
|
||||
+ if (retval)
|
||||
+ destroy_workqueue(workqueue);
|
||||
+
|
||||
return retval;
|
||||
}
|
||||
|
||||
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
|
||||
index 1d48e62f4f52..0d5b667c0e65 100644
|
||||
--- a/drivers/vfio/vfio_iommu_type1.c
|
||||
+++ b/drivers/vfio/vfio_iommu_type1.c
|
||||
@@ -53,10 +53,16 @@ module_param_named(disable_hugepages,
|
||||
MODULE_PARM_DESC(disable_hugepages,
|
||||
"Disable VFIO IOMMU support for IOMMU hugepages.");
|
||||
|
||||
+static unsigned int dma_entry_limit __read_mostly = U16_MAX;
|
||||
+module_param_named(dma_entry_limit, dma_entry_limit, uint, 0644);
|
||||
+MODULE_PARM_DESC(dma_entry_limit,
|
||||
+ "Maximum number of user DMA mappings per container (65535).");
|
||||
+
|
||||
struct vfio_iommu {
|
||||
struct list_head domain_list;
|
||||
struct mutex lock;
|
||||
struct rb_root dma_list;
|
||||
+ unsigned int dma_avail;
|
||||
bool v2;
|
||||
bool nesting;
|
||||
};
|
||||
@@ -384,6 +390,7 @@ static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
|
||||
vfio_unmap_unpin(iommu, dma);
|
||||
vfio_unlink_dma(iommu, dma);
|
||||
kfree(dma);
|
||||
+ iommu->dma_avail++;
|
||||
}
|
||||
|
||||
static unsigned long vfio_pgsize_bitmap(struct vfio_iommu *iommu)
|
||||
@@ -584,12 +591,18 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
+ if (!iommu->dma_avail) {
|
||||
+ mutex_unlock(&iommu->lock);
|
||||
+ return -ENOSPC;
|
||||
+ }
|
||||
+
|
||||
dma = kzalloc(sizeof(*dma), GFP_KERNEL);
|
||||
if (!dma) {
|
||||
mutex_unlock(&iommu->lock);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
+ iommu->dma_avail--;
|
||||
dma->iova = iova;
|
||||
dma->vaddr = vaddr;
|
||||
dma->prot = prot;
|
||||
@@ -905,6 +918,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
|
||||
|
||||
INIT_LIST_HEAD(&iommu->domain_list);
|
||||
iommu->dma_list = RB_ROOT;
|
||||
+ iommu->dma_avail = dma_entry_limit;
|
||||
mutex_init(&iommu->lock);
|
||||
|
||||
return iommu;
|
||||
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
|
||||
index 30d9d9e7057d..7a4052501866 100644
|
||||
--- a/fs/ceph/inode.c
|
||||
+++ b/fs/ceph/inode.c
|
||||
@@ -523,6 +523,7 @@ static void ceph_i_callback(struct rcu_head *head)
|
||||
struct inode *inode = container_of(head, struct inode, i_rcu);
|
||||
struct ceph_inode_info *ci = ceph_inode(inode);
|
||||
|
||||
+ kfree(ci->i_symlink);
|
||||
kmem_cache_free(ceph_inode_cachep, ci);
|
||||
}
|
||||
|
||||
@@ -554,7 +555,6 @@ void ceph_destroy_inode(struct inode *inode)
|
||||
ceph_put_snap_realm(mdsc, realm);
|
||||
}
|
||||
|
||||
- kfree(ci->i_symlink);
|
||||
while ((n = rb_first(&ci->i_fragtree)) != NULL) {
|
||||
frag = rb_entry(n, struct ceph_inode_frag, node);
|
||||
rb_erase(n, &ci->i_fragtree);
|
||||
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
|
||||
index ebecfb8fba06..28d8a57a9908 100644
|
||||
--- a/fs/nfs/client.c
|
||||
+++ b/fs/nfs/client.c
|
||||
@@ -440,7 +440,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,
|
||||
case XPRT_TRANSPORT_RDMA:
|
||||
if (retrans == NFS_UNSPEC_RETRANS)
|
||||
to->to_retries = NFS_DEF_TCP_RETRANS;
|
||||
- if (timeo == NFS_UNSPEC_TIMEO || to->to_retries == 0)
|
||||
+ if (timeo == NFS_UNSPEC_TIMEO || to->to_initval == 0)
|
||||
to->to_initval = NFS_DEF_TCP_TIMEO * HZ / 10;
|
||||
if (to->to_initval > NFS_MAX_TCP_TIMEOUT)
|
||||
to->to_initval = NFS_MAX_TCP_TIMEOUT;
|
||||
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
|
||||
index 38865deab3ac..0c96773d1829 100644
|
||||
--- a/net/bridge/br_netfilter_hooks.c
|
||||
+++ b/net/bridge/br_netfilter_hooks.c
|
||||
@@ -512,6 +512,7 @@ static unsigned int br_nf_pre_routing(void *priv,
|
||||
nf_bridge->ipv4_daddr = ip_hdr(skb)->daddr;
|
||||
|
||||
skb->protocol = htons(ETH_P_IP);
|
||||
+ skb->transport_header = skb->network_header + ip_hdr(skb)->ihl * 4;
|
||||
|
||||
NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state->net, state->sk, skb,
|
||||
skb->dev, NULL,
|
||||
diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c
|
||||
index a1b57cb07f1e..8c08dd07419f 100644
|
||||
--- a/net/bridge/br_netfilter_ipv6.c
|
||||
+++ b/net/bridge/br_netfilter_ipv6.c
|
||||
@@ -235,6 +235,8 @@ unsigned int br_nf_pre_routing_ipv6(void *priv,
|
||||
nf_bridge->ipv6_daddr = ipv6_hdr(skb)->daddr;
|
||||
|
||||
skb->protocol = htons(ETH_P_IPV6);
|
||||
+ skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);
|
||||
+
|
||||
NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, state->net, state->sk, skb,
|
||||
skb->dev, NULL,
|
||||
br_nf_pre_routing_finish_ipv6);
|
||||
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c
|
||||
index 93820e0d8814..4ee8acded0a4 100644
|
||||
--- a/net/netfilter/nft_set_rbtree.c
|
||||
+++ b/net/netfilter/nft_set_rbtree.c
|
||||
@@ -191,10 +191,6 @@ static void *nft_rbtree_deactivate(const struct net *net,
|
||||
else if (d > 0)
|
||||
parent = parent->rb_right;
|
||||
else {
|
||||
- if (!nft_set_elem_active(&rbe->ext, genmask)) {
|
||||
- parent = parent->rb_left;
|
||||
- continue;
|
||||
- }
|
||||
if (nft_rbtree_interval_end(rbe) &&
|
||||
!nft_rbtree_interval_end(this)) {
|
||||
parent = parent->rb_left;
|
||||
@@ -203,6 +199,9 @@ static void *nft_rbtree_deactivate(const struct net *net,
|
||||
nft_rbtree_interval_end(this)) {
|
||||
parent = parent->rb_right;
|
||||
continue;
|
||||
+ } else if (!nft_set_elem_active(&rbe->ext, genmask)) {
|
||||
+ parent = parent->rb_left;
|
||||
+ continue;
|
||||
}
|
||||
nft_set_elem_change_active(net, set, &rbe->ext);
|
||||
return rbe;
|
||||
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
|
||||
index d58de1dc5360..510049a7bd1d 100644
|
||||
--- a/scripts/kconfig/lxdialog/inputbox.c
|
||||
+++ b/scripts/kconfig/lxdialog/inputbox.c
|
||||
@@ -126,7 +126,8 @@ do_resize:
|
||||
case KEY_DOWN:
|
||||
break;
|
||||
case KEY_BACKSPACE:
|
||||
- case 127:
|
||||
+ case 8: /* ^H */
|
||||
+ case 127: /* ^? */
|
||||
if (pos) {
|
||||
wattrset(dialog, dlg.inputbox.atr);
|
||||
if (input_x == 0) {
|
||||
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
|
||||
index d42d534a66cd..f7049e288e93 100644
|
||||
--- a/scripts/kconfig/nconf.c
|
||||
+++ b/scripts/kconfig/nconf.c
|
||||
@@ -1046,7 +1046,7 @@ static int do_match(int key, struct match_state *state, int *ans)
|
||||
state->match_direction = FIND_NEXT_MATCH_UP;
|
||||
*ans = get_mext_match(state->pattern,
|
||||
state->match_direction);
|
||||
- } else if (key == KEY_BACKSPACE || key == 127) {
|
||||
+ } else if (key == KEY_BACKSPACE || key == 8 || key == 127) {
|
||||
state->pattern[strlen(state->pattern)-1] = '\0';
|
||||
adj_match_dir(&state->match_direction);
|
||||
} else
|
||||
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
|
||||
index 4b2f44c20caf..9a65035cf787 100644
|
||||
--- a/scripts/kconfig/nconf.gui.c
|
||||
+++ b/scripts/kconfig/nconf.gui.c
|
||||
@@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window,
|
||||
case KEY_F(F_EXIT):
|
||||
case KEY_F(F_BACK):
|
||||
break;
|
||||
- case 127:
|
||||
+ case 8: /* ^H */
|
||||
+ case 127: /* ^? */
|
||||
case KEY_BACKSPACE:
|
||||
if (cursor_position > 0) {
|
||||
memmove(&result[cursor_position-1],
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,728 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f5836837df15..e52b0579e176 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 174
|
||||
+SUBLEVEL = 175
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S
|
||||
index 3f7d1b74c5e0..a17ca8d78656 100644
|
||||
--- a/arch/arm/boot/compressed/efi-header.S
|
||||
+++ b/arch/arm/boot/compressed/efi-header.S
|
||||
@@ -17,7 +17,8 @@
|
||||
@ there.
|
||||
.inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000
|
||||
#else
|
||||
- W(mov) r0, r0
|
||||
+ AR_CLASS( mov r0, r0 )
|
||||
+ M_CLASS( nop.w )
|
||||
#endif
|
||||
.endm
|
||||
|
||||
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
|
||||
index 098ab775135f..a30829052a00 100644
|
||||
--- a/arch/x86/events/intel/core.c
|
||||
+++ b/arch/x86/events/intel/core.c
|
||||
@@ -2867,7 +2867,7 @@ static int intel_pmu_hw_config(struct perf_event *event)
|
||||
return ret;
|
||||
|
||||
if (event->attr.precise_ip) {
|
||||
- if (!event->attr.freq) {
|
||||
+ if (!(event->attr.freq || event->attr.wakeup_events)) {
|
||||
event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;
|
||||
if (!(event->attr.sample_type &
|
||||
~intel_pmu_free_running_flags(event)))
|
||||
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
|
||||
index 10332c24f961..44ef1d66caa6 100644
|
||||
--- a/drivers/block/virtio_blk.c
|
||||
+++ b/drivers/block/virtio_blk.c
|
||||
@@ -392,6 +392,8 @@ static int init_vq(struct virtio_blk *vblk)
|
||||
if (err)
|
||||
num_vqs = 1;
|
||||
|
||||
+ num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs);
|
||||
+
|
||||
vblk->vqs = kmalloc_array(num_vqs, sizeof(*vblk->vqs), GFP_KERNEL);
|
||||
if (!vblk->vqs)
|
||||
return -ENOMEM;
|
||||
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
|
||||
index 863d030786e5..e7a6651ceeab 100644
|
||||
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
|
||||
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
|
||||
@@ -1473,7 +1473,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
|
||||
if (IS_ERR(regmap))
|
||||
ret = PTR_ERR(regmap);
|
||||
if (ret) {
|
||||
- ret = PTR_ERR(regmap);
|
||||
dev_err(dev,
|
||||
"Failed to get system configuration registers: %d\n",
|
||||
ret);
|
||||
@@ -1529,6 +1528,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
|
||||
of_node_put(remote);
|
||||
|
||||
hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);
|
||||
+ of_node_put(i2c_np);
|
||||
if (!hdmi->ddc_adpt) {
|
||||
dev_err(dev, "Failed to get ddc i2c adapter by node\n");
|
||||
return -EINVAL;
|
||||
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
|
||||
index e8e0fa58cb71..b08786614c1b 100644
|
||||
--- a/drivers/infiniband/hw/hfi1/rc.c
|
||||
+++ b/drivers/infiniband/hw/hfi1/rc.c
|
||||
@@ -2394,7 +2394,7 @@ send_last:
|
||||
update_ack_queue(qp, next);
|
||||
}
|
||||
e = &qp->s_ack_queue[qp->r_head_ack_queue];
|
||||
- if (e->opcode == OP(RDMA_READ_REQUEST) && e->rdma_sge.mr) {
|
||||
+ if (e->rdma_sge.mr) {
|
||||
rvt_put_mr(e->rdma_sge.mr);
|
||||
e->rdma_sge.mr = NULL;
|
||||
}
|
||||
@@ -2469,7 +2469,7 @@ send_last:
|
||||
update_ack_queue(qp, next);
|
||||
}
|
||||
e = &qp->s_ack_queue[qp->r_head_ack_queue];
|
||||
- if (e->opcode == OP(RDMA_READ_REQUEST) && e->rdma_sge.mr) {
|
||||
+ if (e->rdma_sge.mr) {
|
||||
rvt_put_mr(e->rdma_sge.mr);
|
||||
e->rdma_sge.mr = NULL;
|
||||
}
|
||||
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
|
||||
index 157e93421fb8..13bbe5795e4e 100644
|
||||
--- a/drivers/iommu/amd_iommu_init.c
|
||||
+++ b/drivers/iommu/amd_iommu_init.c
|
||||
@@ -318,7 +318,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val)
|
||||
static void iommu_set_exclusion_range(struct amd_iommu *iommu)
|
||||
{
|
||||
u64 start = iommu->exclusion_start & PAGE_MASK;
|
||||
- u64 limit = (start + iommu->exclusion_length) & PAGE_MASK;
|
||||
+ u64 limit = (start + iommu->exclusion_length - 1) & PAGE_MASK;
|
||||
u64 entry;
|
||||
|
||||
if (!iommu->exclusion_start)
|
||||
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
|
||||
index 89a52b941ea8..894d97e4ace5 100644
|
||||
--- a/drivers/scsi/csiostor/csio_scsi.c
|
||||
+++ b/drivers/scsi/csiostor/csio_scsi.c
|
||||
@@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req)
|
||||
}
|
||||
|
||||
out:
|
||||
- if (req->nsge > 0)
|
||||
+ if (req->nsge > 0) {
|
||||
scsi_dma_unmap(cmnd);
|
||||
+ if (req->dcopy && (host_status == DID_OK))
|
||||
+ host_status = csio_scsi_copy_to_sgl(hw, req);
|
||||
+ }
|
||||
|
||||
cmnd->result = (((host_status) << 16) | scsi_status);
|
||||
cmnd->scsi_done(cmnd);
|
||||
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
|
||||
index 7be581f7c35d..1a6f65db615e 100644
|
||||
--- a/drivers/scsi/libsas/sas_expander.c
|
||||
+++ b/drivers/scsi/libsas/sas_expander.c
|
||||
@@ -47,17 +47,16 @@ static void smp_task_timedout(unsigned long _task)
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&task->task_state_lock, flags);
|
||||
- if (!(task->task_state_flags & SAS_TASK_STATE_DONE))
|
||||
+ if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
|
||||
task->task_state_flags |= SAS_TASK_STATE_ABORTED;
|
||||
+ complete(&task->slow_task->completion);
|
||||
+ }
|
||||
spin_unlock_irqrestore(&task->task_state_lock, flags);
|
||||
-
|
||||
- complete(&task->slow_task->completion);
|
||||
}
|
||||
|
||||
static void smp_task_done(struct sas_task *task)
|
||||
{
|
||||
- if (!del_timer(&task->slow_task->timer))
|
||||
- return;
|
||||
+ del_timer(&task->slow_task->timer);
|
||||
complete(&task->slow_task->completion);
|
||||
}
|
||||
|
||||
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
|
||||
index 9a34afcb1c4c..5c3dfd92ea02 100644
|
||||
--- a/drivers/scsi/qla2xxx/qla_attr.c
|
||||
+++ b/drivers/scsi/qla2xxx/qla_attr.c
|
||||
@@ -345,7 +345,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
|
||||
}
|
||||
|
||||
ha->optrom_region_start = start;
|
||||
- ha->optrom_region_size = start + size;
|
||||
+ ha->optrom_region_size = size;
|
||||
|
||||
ha->optrom_state = QLA_SREADING;
|
||||
ha->optrom_buffer = vmalloc(ha->optrom_region_size);
|
||||
@@ -418,7 +418,7 @@ qla2x00_sysfs_write_optrom_ctl(struct file *filp, struct kobject *kobj,
|
||||
}
|
||||
|
||||
ha->optrom_region_start = start;
|
||||
- ha->optrom_region_size = start + size;
|
||||
+ ha->optrom_region_size = size;
|
||||
|
||||
ha->optrom_state = QLA_SWRITING;
|
||||
ha->optrom_buffer = vmalloc(ha->optrom_region_size);
|
||||
diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c
|
||||
index e85c988b7034..adea629b8065 100644
|
||||
--- a/drivers/staging/greybus/power_supply.c
|
||||
+++ b/drivers/staging/greybus/power_supply.c
|
||||
@@ -521,7 +521,7 @@ static int gb_power_supply_prop_descriptors_get(struct gb_power_supply *gbpsy)
|
||||
|
||||
op = gb_operation_create(connection,
|
||||
GB_POWER_SUPPLY_TYPE_GET_PROP_DESCRIPTORS,
|
||||
- sizeof(req), sizeof(*resp) + props_count *
|
||||
+ sizeof(*req), sizeof(*resp) + props_count *
|
||||
sizeof(struct gb_power_supply_props_desc),
|
||||
GFP_KERNEL);
|
||||
if (!op)
|
||||
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
|
||||
index 1e91b803ee4e..73dc5a6c6108 100644
|
||||
--- a/drivers/usb/dwc3/core.c
|
||||
+++ b/drivers/usb/dwc3/core.c
|
||||
@@ -991,7 +991,7 @@ static int dwc3_probe(struct platform_device *pdev)
|
||||
dwc->regs_size = resource_size(res);
|
||||
|
||||
/* default to highest possible threshold */
|
||||
- lpm_nyet_threshold = 0xff;
|
||||
+ lpm_nyet_threshold = 0xf;
|
||||
|
||||
/* default to -3.5dB de-emphasis */
|
||||
tx_de_emphasis = 1;
|
||||
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
|
||||
index 972f5a5fe577..1f20fa0a67c0 100644
|
||||
--- a/drivers/usb/serial/f81232.c
|
||||
+++ b/drivers/usb/serial/f81232.c
|
||||
@@ -560,9 +560,12 @@ static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
|
||||
static void f81232_close(struct usb_serial_port *port)
|
||||
{
|
||||
+ struct f81232_private *port_priv = usb_get_serial_port_data(port);
|
||||
+
|
||||
f81232_port_disable(port);
|
||||
usb_serial_generic_close(port);
|
||||
usb_kill_urb(port->interrupt_in_urb);
|
||||
+ flush_work(&port_priv->interrupt_work);
|
||||
}
|
||||
|
||||
static void f81232_dtr_rts(struct usb_serial_port *port, int on)
|
||||
@@ -656,6 +659,40 @@ static int f81232_port_remove(struct usb_serial_port *port)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int f81232_suspend(struct usb_serial *serial, pm_message_t message)
|
||||
+{
|
||||
+ struct usb_serial_port *port = serial->port[0];
|
||||
+ struct f81232_private *port_priv = usb_get_serial_port_data(port);
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i)
|
||||
+ usb_kill_urb(port->read_urbs[i]);
|
||||
+
|
||||
+ usb_kill_urb(port->interrupt_in_urb);
|
||||
+
|
||||
+ if (port_priv)
|
||||
+ flush_work(&port_priv->interrupt_work);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int f81232_resume(struct usb_serial *serial)
|
||||
+{
|
||||
+ struct usb_serial_port *port = serial->port[0];
|
||||
+ int result;
|
||||
+
|
||||
+ if (tty_port_initialized(&port->port)) {
|
||||
+ result = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
|
||||
+ if (result) {
|
||||
+ dev_err(&port->dev, "submit interrupt urb failed: %d\n",
|
||||
+ result);
|
||||
+ return result;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return usb_serial_generic_resume(serial);
|
||||
+}
|
||||
+
|
||||
static struct usb_serial_driver f81232_device = {
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
@@ -679,6 +716,8 @@ static struct usb_serial_driver f81232_device = {
|
||||
.read_int_callback = f81232_read_int_callback,
|
||||
.port_probe = f81232_port_probe,
|
||||
.port_remove = f81232_port_remove,
|
||||
+ .suspend = f81232_suspend,
|
||||
+ .resume = f81232_resume,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver * const serial_drivers[] = {
|
||||
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
|
||||
index 13f2c051dbf2..afb4b0bf47b3 100644
|
||||
--- a/drivers/usb/storage/scsiglue.c
|
||||
+++ b/drivers/usb/storage/scsiglue.c
|
||||
@@ -81,6 +81,7 @@ static const char* host_info(struct Scsi_Host *host)
|
||||
static int slave_alloc (struct scsi_device *sdev)
|
||||
{
|
||||
struct us_data *us = host_to_us(sdev->host);
|
||||
+ int maxp;
|
||||
|
||||
/*
|
||||
* Set the INQUIRY transfer length to 36. We don't use any of
|
||||
@@ -90,20 +91,17 @@ static int slave_alloc (struct scsi_device *sdev)
|
||||
sdev->inquiry_len = 36;
|
||||
|
||||
/*
|
||||
- * USB has unusual DMA-alignment requirements: Although the
|
||||
- * starting address of each scatter-gather element doesn't matter,
|
||||
- * the length of each element except the last must be divisible
|
||||
- * by the Bulk maxpacket value. There's currently no way to
|
||||
- * express this by block-layer constraints, so we'll cop out
|
||||
- * and simply require addresses to be aligned at 512-byte
|
||||
- * boundaries. This is okay since most block I/O involves
|
||||
- * hardware sectors that are multiples of 512 bytes in length,
|
||||
- * and since host controllers up through USB 2.0 have maxpacket
|
||||
- * values no larger than 512.
|
||||
- *
|
||||
- * But it doesn't suffice for Wireless USB, where Bulk maxpacket
|
||||
- * values can be as large as 2048. To make that work properly
|
||||
- * will require changes to the block layer.
|
||||
+ * USB has unusual scatter-gather requirements: the length of each
|
||||
+ * scatterlist element except the last must be divisible by the
|
||||
+ * Bulk maxpacket value. Fortunately this value is always a
|
||||
+ * power of 2. Inform the block layer about this requirement.
|
||||
+ */
|
||||
+ maxp = usb_maxpacket(us->pusb_dev, us->recv_bulk_pipe, 0);
|
||||
+ blk_queue_virt_boundary(sdev->request_queue, maxp - 1);
|
||||
+
|
||||
+ /*
|
||||
+ * Some host controllers may have alignment requirements.
|
||||
+ * We'll play it safe by requiring 512-byte alignment always.
|
||||
*/
|
||||
blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1));
|
||||
|
||||
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
|
||||
index 64af88977b03..97621e5bdad7 100644
|
||||
--- a/drivers/usb/storage/uas.c
|
||||
+++ b/drivers/usb/storage/uas.c
|
||||
@@ -796,24 +796,33 @@ static int uas_slave_alloc(struct scsi_device *sdev)
|
||||
{
|
||||
struct uas_dev_info *devinfo =
|
||||
(struct uas_dev_info *)sdev->host->hostdata;
|
||||
+ int maxp;
|
||||
|
||||
sdev->hostdata = devinfo;
|
||||
|
||||
/*
|
||||
- * USB has unusual DMA-alignment requirements: Although the
|
||||
- * starting address of each scatter-gather element doesn't matter,
|
||||
- * the length of each element except the last must be divisible
|
||||
- * by the Bulk maxpacket value. There's currently no way to
|
||||
- * express this by block-layer constraints, so we'll cop out
|
||||
- * and simply require addresses to be aligned at 512-byte
|
||||
- * boundaries. This is okay since most block I/O involves
|
||||
- * hardware sectors that are multiples of 512 bytes in length,
|
||||
- * and since host controllers up through USB 2.0 have maxpacket
|
||||
- * values no larger than 512.
|
||||
+ * We have two requirements here. We must satisfy the requirements
|
||||
+ * of the physical HC and the demands of the protocol, as we
|
||||
+ * definitely want no additional memory allocation in this path
|
||||
+ * ruling out using bounce buffers.
|
||||
*
|
||||
- * But it doesn't suffice for Wireless USB, where Bulk maxpacket
|
||||
- * values can be as large as 2048. To make that work properly
|
||||
- * will require changes to the block layer.
|
||||
+ * For a transmission on USB to continue we must never send
|
||||
+ * a package that is smaller than maxpacket. Hence the length of each
|
||||
+ * scatterlist element except the last must be divisible by the
|
||||
+ * Bulk maxpacket value.
|
||||
+ * If the HC does not ensure that through SG,
|
||||
+ * the upper layer must do that. We must assume nothing
|
||||
+ * about the capabilities off the HC, so we use the most
|
||||
+ * pessimistic requirement.
|
||||
+ */
|
||||
+
|
||||
+ maxp = usb_maxpacket(devinfo->udev, devinfo->data_in_pipe, 0);
|
||||
+ blk_queue_virt_boundary(sdev->request_queue, maxp - 1);
|
||||
+
|
||||
+ /*
|
||||
+ * The protocol has no requirements on alignment in the strict sense.
|
||||
+ * Controllers may or may not have alignment restrictions.
|
||||
+ * As this is not exported, we use an extremely conservative guess.
|
||||
*/
|
||||
blk_queue_update_dma_alignment(sdev->request_queue, (512 - 1));
|
||||
|
||||
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
|
||||
index 61054f12be7c..d83fc669eeac 100644
|
||||
--- a/include/linux/kernel.h
|
||||
+++ b/include/linux/kernel.h
|
||||
@@ -55,8 +55,8 @@
|
||||
|
||||
#define u64_to_user_ptr(x) ( \
|
||||
{ \
|
||||
- typecheck(u64, x); \
|
||||
- (void __user *)(uintptr_t)x; \
|
||||
+ typecheck(u64, (x)); \
|
||||
+ (void __user *)(uintptr_t)(x); \
|
||||
} \
|
||||
)
|
||||
|
||||
diff --git a/include/linux/mm.h b/include/linux/mm.h
|
||||
index 11a5a46ce72b..e3c8d40a18b5 100644
|
||||
--- a/include/linux/mm.h
|
||||
+++ b/include/linux/mm.h
|
||||
@@ -777,6 +777,15 @@ static inline void get_page(struct page *page)
|
||||
get_zone_device_page(page);
|
||||
}
|
||||
|
||||
+static inline __must_check bool try_get_page(struct page *page)
|
||||
+{
|
||||
+ page = compound_head(page);
|
||||
+ if (WARN_ON_ONCE(page_ref_count(page) <= 0))
|
||||
+ return false;
|
||||
+ page_ref_inc(page);
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
static inline void put_page(struct page *page)
|
||||
{
|
||||
page = compound_head(page);
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index 4931787193c3..57a7dba49d29 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -176,6 +176,9 @@ struct adv_info {
|
||||
|
||||
#define HCI_MAX_SHORT_NAME_LENGTH 10
|
||||
|
||||
+/* Min encryption key size to match with SMP */
|
||||
+#define HCI_MIN_ENC_KEY_SIZE 7
|
||||
+
|
||||
/* Default LE RPA expiry time, 15 minutes */
|
||||
#define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
|
||||
|
||||
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
|
||||
index cf94460504bb..be7f489788e2 100644
|
||||
--- a/kernel/irq/manage.c
|
||||
+++ b/kernel/irq/manage.c
|
||||
@@ -332,8 +332,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
|
||||
desc->affinity_notify = notify;
|
||||
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
||||
|
||||
- if (old_notify)
|
||||
+ if (old_notify) {
|
||||
+ cancel_work_sync(&old_notify->work);
|
||||
kref_put(&old_notify->kref, old_notify->release);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
|
||||
index 087204c733eb..c74920f318c5 100644
|
||||
--- a/kernel/time/timer_stats.c
|
||||
+++ b/kernel/time/timer_stats.c
|
||||
@@ -417,7 +417,7 @@ static int __init init_tstats_procfs(void)
|
||||
{
|
||||
struct proc_dir_entry *pe;
|
||||
|
||||
- pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
|
||||
+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
|
||||
if (!pe)
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
diff --git a/lib/ubsan.c b/lib/ubsan.c
|
||||
index 60e108c5c173..c652b4a820cc 100644
|
||||
--- a/lib/ubsan.c
|
||||
+++ b/lib/ubsan.c
|
||||
@@ -86,11 +86,13 @@ static bool is_inline_int(struct type_descriptor *type)
|
||||
return bits <= inline_bits;
|
||||
}
|
||||
|
||||
-static s_max get_signed_val(struct type_descriptor *type, unsigned long val)
|
||||
+static s_max get_signed_val(struct type_descriptor *type, void *val)
|
||||
{
|
||||
if (is_inline_int(type)) {
|
||||
unsigned extra_bits = sizeof(s_max)*8 - type_bit_width(type);
|
||||
- return ((s_max)val) << extra_bits >> extra_bits;
|
||||
+ unsigned long ulong_val = (unsigned long)val;
|
||||
+
|
||||
+ return ((s_max)ulong_val) << extra_bits >> extra_bits;
|
||||
}
|
||||
|
||||
if (type_bit_width(type) == 64)
|
||||
@@ -99,15 +101,15 @@ static s_max get_signed_val(struct type_descriptor *type, unsigned long val)
|
||||
return *(s_max *)val;
|
||||
}
|
||||
|
||||
-static bool val_is_negative(struct type_descriptor *type, unsigned long val)
|
||||
+static bool val_is_negative(struct type_descriptor *type, void *val)
|
||||
{
|
||||
return type_is_signed(type) && get_signed_val(type, val) < 0;
|
||||
}
|
||||
|
||||
-static u_max get_unsigned_val(struct type_descriptor *type, unsigned long val)
|
||||
+static u_max get_unsigned_val(struct type_descriptor *type, void *val)
|
||||
{
|
||||
if (is_inline_int(type))
|
||||
- return val;
|
||||
+ return (unsigned long)val;
|
||||
|
||||
if (type_bit_width(type) == 64)
|
||||
return *(u64 *)val;
|
||||
@@ -116,7 +118,7 @@ static u_max get_unsigned_val(struct type_descriptor *type, unsigned long val)
|
||||
}
|
||||
|
||||
static void val_to_string(char *str, size_t size, struct type_descriptor *type,
|
||||
- unsigned long value)
|
||||
+ void *value)
|
||||
{
|
||||
if (type_is_int(type)) {
|
||||
if (type_bit_width(type) == 128) {
|
||||
@@ -168,8 +170,8 @@ static void ubsan_epilogue(unsigned long *flags)
|
||||
current->in_ubsan--;
|
||||
}
|
||||
|
||||
-static void handle_overflow(struct overflow_data *data, unsigned long lhs,
|
||||
- unsigned long rhs, char op)
|
||||
+static void handle_overflow(struct overflow_data *data, void *lhs,
|
||||
+ void *rhs, char op)
|
||||
{
|
||||
|
||||
struct type_descriptor *type = data->type;
|
||||
@@ -196,8 +198,7 @@ static void handle_overflow(struct overflow_data *data, unsigned long lhs,
|
||||
}
|
||||
|
||||
void __ubsan_handle_add_overflow(struct overflow_data *data,
|
||||
- unsigned long lhs,
|
||||
- unsigned long rhs)
|
||||
+ void *lhs, void *rhs)
|
||||
{
|
||||
|
||||
handle_overflow(data, lhs, rhs, '+');
|
||||
@@ -205,23 +206,21 @@ void __ubsan_handle_add_overflow(struct overflow_data *data,
|
||||
EXPORT_SYMBOL(__ubsan_handle_add_overflow);
|
||||
|
||||
void __ubsan_handle_sub_overflow(struct overflow_data *data,
|
||||
- unsigned long lhs,
|
||||
- unsigned long rhs)
|
||||
+ void *lhs, void *rhs)
|
||||
{
|
||||
handle_overflow(data, lhs, rhs, '-');
|
||||
}
|
||||
EXPORT_SYMBOL(__ubsan_handle_sub_overflow);
|
||||
|
||||
void __ubsan_handle_mul_overflow(struct overflow_data *data,
|
||||
- unsigned long lhs,
|
||||
- unsigned long rhs)
|
||||
+ void *lhs, void *rhs)
|
||||
{
|
||||
handle_overflow(data, lhs, rhs, '*');
|
||||
}
|
||||
EXPORT_SYMBOL(__ubsan_handle_mul_overflow);
|
||||
|
||||
void __ubsan_handle_negate_overflow(struct overflow_data *data,
|
||||
- unsigned long old_val)
|
||||
+ void *old_val)
|
||||
{
|
||||
unsigned long flags;
|
||||
char old_val_str[VALUE_LENGTH];
|
||||
@@ -242,8 +241,7 @@ EXPORT_SYMBOL(__ubsan_handle_negate_overflow);
|
||||
|
||||
|
||||
void __ubsan_handle_divrem_overflow(struct overflow_data *data,
|
||||
- unsigned long lhs,
|
||||
- unsigned long rhs)
|
||||
+ void *lhs, void *rhs)
|
||||
{
|
||||
unsigned long flags;
|
||||
char rhs_val_str[VALUE_LENGTH];
|
||||
@@ -328,7 +326,7 @@ static void ubsan_type_mismatch_common(struct type_mismatch_data_common *data,
|
||||
}
|
||||
|
||||
void __ubsan_handle_type_mismatch(struct type_mismatch_data *data,
|
||||
- unsigned long ptr)
|
||||
+ void *ptr)
|
||||
{
|
||||
struct type_mismatch_data_common common_data = {
|
||||
.location = &data->location,
|
||||
@@ -337,12 +335,12 @@ void __ubsan_handle_type_mismatch(struct type_mismatch_data *data,
|
||||
.type_check_kind = data->type_check_kind
|
||||
};
|
||||
|
||||
- ubsan_type_mismatch_common(&common_data, ptr);
|
||||
+ ubsan_type_mismatch_common(&common_data, (unsigned long)ptr);
|
||||
}
|
||||
EXPORT_SYMBOL(__ubsan_handle_type_mismatch);
|
||||
|
||||
void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data,
|
||||
- unsigned long ptr)
|
||||
+ void *ptr)
|
||||
{
|
||||
|
||||
struct type_mismatch_data_common common_data = {
|
||||
@@ -352,7 +350,7 @@ void __ubsan_handle_type_mismatch_v1(struct type_mismatch_data_v1 *data,
|
||||
.type_check_kind = data->type_check_kind
|
||||
};
|
||||
|
||||
- ubsan_type_mismatch_common(&common_data, ptr);
|
||||
+ ubsan_type_mismatch_common(&common_data, (unsigned long)ptr);
|
||||
}
|
||||
EXPORT_SYMBOL(__ubsan_handle_type_mismatch_v1);
|
||||
|
||||
@@ -376,7 +374,7 @@ void __ubsan_handle_nonnull_return(struct nonnull_return_data *data)
|
||||
EXPORT_SYMBOL(__ubsan_handle_nonnull_return);
|
||||
|
||||
void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,
|
||||
- unsigned long bound)
|
||||
+ void *bound)
|
||||
{
|
||||
unsigned long flags;
|
||||
char bound_str[VALUE_LENGTH];
|
||||
@@ -393,8 +391,7 @@ void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,
|
||||
}
|
||||
EXPORT_SYMBOL(__ubsan_handle_vla_bound_not_positive);
|
||||
|
||||
-void __ubsan_handle_out_of_bounds(struct out_of_bounds_data *data,
|
||||
- unsigned long index)
|
||||
+void __ubsan_handle_out_of_bounds(struct out_of_bounds_data *data, void *index)
|
||||
{
|
||||
unsigned long flags;
|
||||
char index_str[VALUE_LENGTH];
|
||||
@@ -412,7 +409,7 @@ void __ubsan_handle_out_of_bounds(struct out_of_bounds_data *data,
|
||||
EXPORT_SYMBOL(__ubsan_handle_out_of_bounds);
|
||||
|
||||
void __ubsan_handle_shift_out_of_bounds(struct shift_out_of_bounds_data *data,
|
||||
- unsigned long lhs, unsigned long rhs)
|
||||
+ void *lhs, void *rhs)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct type_descriptor *rhs_type = data->rhs_type;
|
||||
@@ -463,7 +460,7 @@ void __ubsan_handle_builtin_unreachable(struct unreachable_data *data)
|
||||
EXPORT_SYMBOL(__ubsan_handle_builtin_unreachable);
|
||||
|
||||
void __ubsan_handle_load_invalid_value(struct invalid_value_data *data,
|
||||
- unsigned long val)
|
||||
+ void *val)
|
||||
{
|
||||
unsigned long flags;
|
||||
char val_str[VALUE_LENGTH];
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index cc061495f653..fe4fb0c1fa61 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1165,6 +1165,14 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
|
||||
+ /* The minimum encryption key size needs to be enforced by the
|
||||
+ * host stack before establishing any L2CAP connections. The
|
||||
+ * specification in theory allows a minimum of 1, but to align
|
||||
+ * BR/EDR and LE transports, a minimum of 7 is chosen.
|
||||
+ */
|
||||
+ if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
|
||||
+ return 0;
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
|
||||
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
|
||||
index 008ba439bd62..cc80c76177b6 100644
|
||||
--- a/net/bluetooth/hidp/sock.c
|
||||
+++ b/net/bluetooth/hidp/sock.c
|
||||
@@ -76,6 +76,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
|
||||
sockfd_put(csock);
|
||||
return err;
|
||||
}
|
||||
+ ca.name[sizeof(ca.name)-1] = 0;
|
||||
|
||||
err = hidp_connection_add(&ca, csock, isock);
|
||||
if (!err && copy_to_user(argp, &ca, sizeof(ca)))
|
||||
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
|
||||
index 84f86745c30e..828bc615a190 100644
|
||||
--- a/sound/soc/codecs/cs4270.c
|
||||
+++ b/sound/soc/codecs/cs4270.c
|
||||
@@ -643,6 +643,7 @@ static const struct regmap_config cs4270_regmap = {
|
||||
.reg_defaults = cs4270_reg_defaults,
|
||||
.num_reg_defaults = ARRAY_SIZE(cs4270_reg_defaults),
|
||||
.cache_type = REGCACHE_RBTREE,
|
||||
+ .write_flag_mask = CS4270_I2C_INCR,
|
||||
|
||||
.readable_reg = cs4270_reg_is_readable,
|
||||
.volatile_reg = cs4270_reg_is_volatile,
|
||||
diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c
|
||||
index e45518629968..2234d0c04165 100644
|
||||
--- a/sound/soc/codecs/nau8810.c
|
||||
+++ b/sound/soc/codecs/nau8810.c
|
||||
@@ -414,9 +414,9 @@ static const struct snd_soc_dapm_widget nau8810_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_MIXER("Mono Mixer", NAU8810_REG_POWER3,
|
||||
NAU8810_MOUTMX_EN_SFT, 0, &nau8810_mono_mixer_controls[0],
|
||||
ARRAY_SIZE(nau8810_mono_mixer_controls)),
|
||||
- SND_SOC_DAPM_DAC("DAC", "HiFi Playback", NAU8810_REG_POWER3,
|
||||
+ SND_SOC_DAPM_DAC("DAC", "Playback", NAU8810_REG_POWER3,
|
||||
NAU8810_DAC_EN_SFT, 0),
|
||||
- SND_SOC_DAPM_ADC("ADC", "HiFi Capture", NAU8810_REG_POWER2,
|
||||
+ SND_SOC_DAPM_ADC("ADC", "Capture", NAU8810_REG_POWER2,
|
||||
NAU8810_ADC_EN_SFT, 0),
|
||||
SND_SOC_DAPM_PGA("SpkN Out", NAU8810_REG_POWER3,
|
||||
NAU8810_NSPK_EN_SFT, 0, NULL, 0),
|
||||
diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
|
||||
index 28fdfc5ec544..c27e3476848a 100644
|
||||
--- a/sound/soc/codecs/tlv320aic32x4.c
|
||||
+++ b/sound/soc/codecs/tlv320aic32x4.c
|
||||
@@ -316,6 +316,8 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_INPUT("IN2_R"),
|
||||
SND_SOC_DAPM_INPUT("IN3_L"),
|
||||
SND_SOC_DAPM_INPUT("IN3_R"),
|
||||
+ SND_SOC_DAPM_INPUT("CM_L"),
|
||||
+ SND_SOC_DAPM_INPUT("CM_R"),
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {
|
||||
diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
|
||||
index 79a9fdf94d38..582b30a5118d 100644
|
||||
--- a/sound/soc/intel/common/sst-firmware.c
|
||||
+++ b/sound/soc/intel/common/sst-firmware.c
|
||||
@@ -1252,11 +1252,15 @@ struct sst_dsp *sst_dsp_new(struct device *dev,
|
||||
goto irq_err;
|
||||
|
||||
err = sst_dma_new(sst);
|
||||
- if (err)
|
||||
- dev_warn(dev, "sst_dma_new failed %d\n", err);
|
||||
+ if (err) {
|
||||
+ dev_err(dev, "sst_dma_new failed %d\n", err);
|
||||
+ goto dma_err;
|
||||
+ }
|
||||
|
||||
return sst;
|
||||
|
||||
+dma_err:
|
||||
+ free_irq(sst->irq, sst);
|
||||
irq_err:
|
||||
if (sst->ops->free)
|
||||
sst->ops->free(sst);
|
||||
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
|
||||
index b111ecda6439..1dbcdc99dbe3 100644
|
||||
--- a/sound/soc/soc-pcm.c
|
||||
+++ b/sound/soc/soc-pcm.c
|
||||
@@ -894,10 +894,13 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
codec_params = *params;
|
||||
|
||||
/* fixup params based on TDM slot masks */
|
||||
- if (codec_dai->tx_mask)
|
||||
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
|
||||
+ codec_dai->tx_mask)
|
||||
soc_pcm_codec_params_fixup(&codec_params,
|
||||
codec_dai->tx_mask);
|
||||
- if (codec_dai->rx_mask)
|
||||
+
|
||||
+ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
|
||||
+ codec_dai->rx_mask)
|
||||
soc_pcm_codec_params_fixup(&codec_params,
|
||||
codec_dai->rx_mask);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,263 +0,0 @@
|
||||
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
|
||||
index 0335285f3918..49935d5bb5c6 100644
|
||||
--- a/Documentation/networking/ip-sysctl.txt
|
||||
+++ b/Documentation/networking/ip-sysctl.txt
|
||||
@@ -230,6 +230,14 @@ tcp_base_mss - INTEGER
|
||||
Path MTU discovery (MTU probing). If MTU probing is enabled,
|
||||
this is the initial MSS used by the connection.
|
||||
|
||||
+tcp_min_snd_mss - INTEGER
|
||||
+ TCP SYN and SYNACK messages usually advertise an ADVMSS option,
|
||||
+ as described in RFC 1122 and RFC 6691.
|
||||
+ If this ADVMSS option is smaller than tcp_min_snd_mss,
|
||||
+ it is silently capped to tcp_min_snd_mss.
|
||||
+
|
||||
+ Default : 48 (at least 8 bytes of payload per segment)
|
||||
+
|
||||
tcp_congestion_control - STRING
|
||||
Set the congestion control algorithm to be used for new
|
||||
connections. The algorithm "reno" is always available, but
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 584af2e57735..f34cb9225255 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 181
|
||||
+SUBLEVEL = 182
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
|
||||
index d0c3615f9050..7f517458c64f 100644
|
||||
--- a/include/linux/tcp.h
|
||||
+++ b/include/linux/tcp.h
|
||||
@@ -433,4 +433,7 @@ static inline void tcp_saved_syn_free(struct tcp_sock *tp)
|
||||
tp->saved_syn = NULL;
|
||||
}
|
||||
|
||||
+int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount,
|
||||
+ int shiftlen);
|
||||
+
|
||||
#endif /* _LINUX_TCP_H */
|
||||
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
|
||||
index 7adf4386ac8f..bf619a67ec03 100644
|
||||
--- a/include/net/netns/ipv4.h
|
||||
+++ b/include/net/netns/ipv4.h
|
||||
@@ -94,6 +94,7 @@ struct netns_ipv4 {
|
||||
#endif
|
||||
int sysctl_tcp_mtu_probing;
|
||||
int sysctl_tcp_base_mss;
|
||||
+ int sysctl_tcp_min_snd_mss;
|
||||
int sysctl_tcp_probe_threshold;
|
||||
u32 sysctl_tcp_probe_interval;
|
||||
|
||||
diff --git a/include/net/tcp.h b/include/net/tcp.h
|
||||
index fed2a78fb8cb..d7047de952f0 100644
|
||||
--- a/include/net/tcp.h
|
||||
+++ b/include/net/tcp.h
|
||||
@@ -53,6 +53,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
|
||||
|
||||
#define MAX_TCP_HEADER (128 + MAX_HEADER)
|
||||
#define MAX_TCP_OPTION_SPACE 40
|
||||
+#define TCP_MIN_SND_MSS 48
|
||||
+#define TCP_MIN_GSO_SIZE (TCP_MIN_SND_MSS - MAX_TCP_OPTION_SPACE)
|
||||
|
||||
/*
|
||||
* Never offer a window over 32767 without using window scaling. Some
|
||||
diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
|
||||
index 3442a26d36d9..56e3460d1f9f 100644
|
||||
--- a/include/uapi/linux/snmp.h
|
||||
+++ b/include/uapi/linux/snmp.h
|
||||
@@ -282,6 +282,7 @@ enum
|
||||
LINUX_MIB_TCPKEEPALIVE, /* TCPKeepAlive */
|
||||
LINUX_MIB_TCPMTUPFAIL, /* TCPMTUPFail */
|
||||
LINUX_MIB_TCPMTUPSUCCESS, /* TCPMTUPSuccess */
|
||||
+ LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */
|
||||
__LINUX_MIB_MAX
|
||||
};
|
||||
|
||||
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
|
||||
index ec48d8eafc7e..8b221398534b 100644
|
||||
--- a/net/ipv4/proc.c
|
||||
+++ b/net/ipv4/proc.c
|
||||
@@ -306,6 +306,7 @@ static const struct snmp_mib snmp4_net_list[] = {
|
||||
SNMP_MIB_ITEM("TCPKeepAlive", LINUX_MIB_TCPKEEPALIVE),
|
||||
SNMP_MIB_ITEM("TCPMTUPFail", LINUX_MIB_TCPMTUPFAIL),
|
||||
SNMP_MIB_ITEM("TCPMTUPSuccess", LINUX_MIB_TCPMTUPSUCCESS),
|
||||
+ SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG),
|
||||
SNMP_MIB_SENTINEL
|
||||
};
|
||||
|
||||
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
|
||||
index 85713adf2770..e202babb14d6 100644
|
||||
--- a/net/ipv4/sysctl_net_ipv4.c
|
||||
+++ b/net/ipv4/sysctl_net_ipv4.c
|
||||
@@ -35,6 +35,8 @@ static int ip_local_port_range_min[] = { 1, 1 };
|
||||
static int ip_local_port_range_max[] = { 65535, 65535 };
|
||||
static int tcp_adv_win_scale_min = -31;
|
||||
static int tcp_adv_win_scale_max = 31;
|
||||
+static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS;
|
||||
+static int tcp_min_snd_mss_max = 65535;
|
||||
static int ip_ttl_min = 1;
|
||||
static int ip_ttl_max = 255;
|
||||
static int tcp_syn_retries_min = 1;
|
||||
@@ -838,6 +840,15 @@ static struct ctl_table ipv4_net_table[] = {
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
+ {
|
||||
+ .procname = "tcp_min_snd_mss",
|
||||
+ .data = &init_net.ipv4.sysctl_tcp_min_snd_mss,
|
||||
+ .maxlen = sizeof(int),
|
||||
+ .mode = 0644,
|
||||
+ .proc_handler = proc_dointvec_minmax,
|
||||
+ .extra1 = &tcp_min_snd_mss_min,
|
||||
+ .extra2 = &tcp_min_snd_mss_max,
|
||||
+ },
|
||||
{
|
||||
.procname = "tcp_probe_threshold",
|
||||
.data = &init_net.ipv4.sysctl_tcp_probe_threshold,
|
||||
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
|
||||
index 2ededb32b754..ee2822a411f9 100644
|
||||
--- a/net/ipv4/tcp.c
|
||||
+++ b/net/ipv4/tcp.c
|
||||
@@ -3307,6 +3307,7 @@ void __init tcp_init(void)
|
||||
unsigned long limit;
|
||||
unsigned int i;
|
||||
|
||||
+ BUILD_BUG_ON(TCP_MIN_SND_MSS <= MAX_TCP_OPTION_SPACE);
|
||||
BUILD_BUG_ON(sizeof(struct tcp_skb_cb) >
|
||||
FIELD_SIZEOF(struct sk_buff, cb));
|
||||
|
||||
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
|
||||
index e238539c3497..e2e58bc42ba4 100644
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -1320,7 +1320,7 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
|
||||
TCP_SKB_CB(skb)->seq += shifted;
|
||||
|
||||
tcp_skb_pcount_add(prev, pcount);
|
||||
- BUG_ON(tcp_skb_pcount(skb) < pcount);
|
||||
+ WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);
|
||||
tcp_skb_pcount_add(skb, -pcount);
|
||||
|
||||
/* When we're adding to gso_segs == 1, gso_size will be zero,
|
||||
@@ -1387,6 +1387,21 @@ static int skb_can_shift(const struct sk_buff *skb)
|
||||
return !skb_headlen(skb) && skb_is_nonlinear(skb);
|
||||
}
|
||||
|
||||
+int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from,
|
||||
+ int pcount, int shiftlen)
|
||||
+{
|
||||
+ /* TCP min gso_size is 8 bytes (TCP_MIN_GSO_SIZE)
|
||||
+ * Since TCP_SKB_CB(skb)->tcp_gso_segs is 16 bits, we need
|
||||
+ * to make sure not storing more than 65535 * 8 bytes per skb,
|
||||
+ * even if current MSS is bigger.
|
||||
+ */
|
||||
+ if (unlikely(to->len + shiftlen >= 65535 * TCP_MIN_GSO_SIZE))
|
||||
+ return 0;
|
||||
+ if (unlikely(tcp_skb_pcount(to) + pcount > 65535))
|
||||
+ return 0;
|
||||
+ return skb_shift(to, from, shiftlen);
|
||||
+}
|
||||
+
|
||||
/* Try collapsing SACK blocks spanning across multiple skbs to a single
|
||||
* skb.
|
||||
*/
|
||||
@@ -1398,6 +1413,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
|
||||
struct tcp_sock *tp = tcp_sk(sk);
|
||||
struct sk_buff *prev;
|
||||
int mss;
|
||||
+ int next_pcount;
|
||||
int pcount = 0;
|
||||
int len;
|
||||
int in_sack;
|
||||
@@ -1495,7 +1511,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
|
||||
if (!after(TCP_SKB_CB(skb)->seq + len, tp->snd_una))
|
||||
goto fallback;
|
||||
|
||||
- if (!skb_shift(prev, skb, len))
|
||||
+ if (!tcp_skb_shift(prev, skb, pcount, len))
|
||||
goto fallback;
|
||||
if (!tcp_shifted_skb(sk, skb, state, pcount, len, mss, dup_sack))
|
||||
goto out;
|
||||
@@ -1514,11 +1530,11 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
|
||||
goto out;
|
||||
|
||||
len = skb->len;
|
||||
- if (skb_shift(prev, skb, len)) {
|
||||
- pcount += tcp_skb_pcount(skb);
|
||||
- tcp_shifted_skb(sk, skb, state, tcp_skb_pcount(skb), len, mss, 0);
|
||||
+ next_pcount = tcp_skb_pcount(skb);
|
||||
+ if (tcp_skb_shift(prev, skb, next_pcount, len)) {
|
||||
+ pcount += next_pcount;
|
||||
+ tcp_shifted_skb(sk, skb, state, next_pcount, len, mss, 0);
|
||||
}
|
||||
-
|
||||
out:
|
||||
state->fack_count += pcount;
|
||||
return prev;
|
||||
@@ -2837,9 +2853,9 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked,
|
||||
bool do_lost = is_dupack || ((flag & FLAG_DATA_SACKED) &&
|
||||
(tcp_fackets_out(tp) > tp->reordering));
|
||||
|
||||
- if (WARN_ON(!tp->packets_out && tp->sacked_out))
|
||||
+ if (!tp->packets_out && tp->sacked_out)
|
||||
tp->sacked_out = 0;
|
||||
- if (WARN_ON(!tp->sacked_out && tp->fackets_out))
|
||||
+ if (!tp->sacked_out && tp->fackets_out)
|
||||
tp->fackets_out = 0;
|
||||
|
||||
/* Now state machine starts.
|
||||
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
|
||||
index 82c1064ff4aa..848f2c1da8a5 100644
|
||||
--- a/net/ipv4/tcp_ipv4.c
|
||||
+++ b/net/ipv4/tcp_ipv4.c
|
||||
@@ -2456,6 +2456,7 @@ static int __net_init tcp_sk_init(struct net *net)
|
||||
net->ipv4.sysctl_tcp_ecn_fallback = 1;
|
||||
|
||||
net->ipv4.sysctl_tcp_base_mss = TCP_BASE_MSS;
|
||||
+ net->ipv4.sysctl_tcp_min_snd_mss = TCP_MIN_SND_MSS;
|
||||
net->ipv4.sysctl_tcp_probe_threshold = TCP_PROBE_THRESHOLD;
|
||||
net->ipv4.sysctl_tcp_probe_interval = TCP_PROBE_INTERVAL;
|
||||
|
||||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
||||
index 6f35cdd5f2f0..d8c6b833f0ce 100644
|
||||
--- a/net/ipv4/tcp_output.c
|
||||
+++ b/net/ipv4/tcp_output.c
|
||||
@@ -1185,6 +1185,11 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
|
||||
if (nsize < 0)
|
||||
nsize = 0;
|
||||
|
||||
+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
|
||||
+ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+
|
||||
if (skb_unclone(skb, gfp))
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -1355,8 +1360,7 @@ static inline int __tcp_mtu_to_mss(struct sock *sk, int pmtu)
|
||||
mss_now -= icsk->icsk_ext_hdr_len;
|
||||
|
||||
/* Then reserve room for full set of TCP options and 8 bytes of data */
|
||||
- if (mss_now < 48)
|
||||
- mss_now = 48;
|
||||
+ mss_now = max(mss_now, sock_net(sk)->ipv4.sysctl_tcp_min_snd_mss);
|
||||
return mss_now;
|
||||
}
|
||||
|
||||
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
|
||||
index 69523389f067..d9e364c4863a 100644
|
||||
--- a/net/ipv4/tcp_timer.c
|
||||
+++ b/net/ipv4/tcp_timer.c
|
||||
@@ -140,6 +140,7 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
|
||||
mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
|
||||
mss = min(net->ipv4.sysctl_tcp_base_mss, mss);
|
||||
mss = max(mss, 68 - tp->tcp_header_len);
|
||||
+ mss = max(mss, net->ipv4.sysctl_tcp_min_snd_mss);
|
||||
icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
|
||||
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,25 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e63ace93b67b..3b0dd4e90c44 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 183
|
||||
+SUBLEVEL = 184
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
||||
index d8c6b833f0ce..0c195b0f4216 100644
|
||||
--- a/net/ipv4/tcp_output.c
|
||||
+++ b/net/ipv4/tcp_output.c
|
||||
@@ -1185,7 +1185,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
|
||||
if (nsize < 0)
|
||||
nsize = 0;
|
||||
|
||||
- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
|
||||
+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) {
|
||||
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
|
||||
return -ENOMEM;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,978 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b6b54e6f67e8..4fdc9d984f80 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 188
|
||||
+SUBLEVEL = 189
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
|
||||
index 876ed5f2922c..f82f193b8856 100644
|
||||
--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
|
||||
+++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
|
||||
@@ -108,16 +108,21 @@
|
||||
twl_audio: audio {
|
||||
compatible = "ti,twl4030-audio";
|
||||
codec {
|
||||
+ ti,hs_extmute_gpio = <&gpio2 25 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&i2c2 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&i2c2_pins>;
|
||||
clock-frequency = <400000>;
|
||||
};
|
||||
|
||||
&i2c3 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&i2c3_pins>;
|
||||
clock-frequency = <400000>;
|
||||
};
|
||||
|
||||
@@ -221,6 +226,7 @@
|
||||
pinctrl-single,pins = <
|
||||
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
|
||||
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
|
||||
+ OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4) /* gpmc_ncs6.gpio_57 */
|
||||
>;
|
||||
};
|
||||
};
|
||||
@@ -239,6 +245,18 @@
|
||||
OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */
|
||||
>;
|
||||
};
|
||||
+ i2c2_pins: pinmux_i2c2_pins {
|
||||
+ pinctrl-single,pins = <
|
||||
+ OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */
|
||||
+ OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */
|
||||
+ >;
|
||||
+ };
|
||||
+ i2c3_pins: pinmux_i2c3_pins {
|
||||
+ pinctrl-single,pins = <
|
||||
+ OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */
|
||||
+ OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */
|
||||
+ >;
|
||||
+ };
|
||||
};
|
||||
|
||||
&omap3_pmx_core2 {
|
||||
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
|
||||
index 08f0a35dc0d1..ceb49d15d243 100644
|
||||
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
|
||||
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
|
||||
@@ -117,10 +117,14 @@
|
||||
};
|
||||
|
||||
&i2c2 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&i2c2_pins>;
|
||||
clock-frequency = <400000>;
|
||||
};
|
||||
|
||||
&i2c3 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&i2c3_pins>;
|
||||
clock-frequency = <400000>;
|
||||
at24@50 {
|
||||
compatible = "atmel,24c64";
|
||||
@@ -215,6 +219,18 @@
|
||||
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
|
||||
>;
|
||||
};
|
||||
+ i2c2_pins: pinmux_i2c2_pins {
|
||||
+ pinctrl-single,pins = <
|
||||
+ OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */
|
||||
+ OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */
|
||||
+ >;
|
||||
+ };
|
||||
+ i2c3_pins: pinmux_i2c3_pins {
|
||||
+ pinctrl-single,pins = <
|
||||
+ OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */
|
||||
+ OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */
|
||||
+ >;
|
||||
+ };
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
|
||||
index 15868eca58de..e7bef3d936d8 100644
|
||||
--- a/arch/arm64/include/asm/cpufeature.h
|
||||
+++ b/arch/arm64/include/asm/cpufeature.h
|
||||
@@ -31,9 +31,10 @@
|
||||
|
||||
/* CPU feature register tracking */
|
||||
enum ftr_type {
|
||||
- FTR_EXACT, /* Use a predefined safe value */
|
||||
- FTR_LOWER_SAFE, /* Smaller value is safe */
|
||||
- FTR_HIGHER_SAFE,/* Bigger value is safe */
|
||||
+ FTR_EXACT, /* Use a predefined safe value */
|
||||
+ FTR_LOWER_SAFE, /* Smaller value is safe */
|
||||
+ FTR_HIGHER_SAFE, /* Bigger value is safe */
|
||||
+ FTR_HIGHER_OR_ZERO_SAFE, /* Bigger value is safe, but 0 is biggest */
|
||||
};
|
||||
|
||||
#define FTR_STRICT true /* SANITY check strict matching required */
|
||||
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
|
||||
index a3ab7dfad50a..9a8e45dc36bd 100644
|
||||
--- a/arch/arm64/kernel/cpufeature.c
|
||||
+++ b/arch/arm64/kernel/cpufeature.c
|
||||
@@ -148,10 +148,12 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = {
|
||||
};
|
||||
|
||||
static const struct arm64_ftr_bits ftr_ctr[] = {
|
||||
- ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RAO */
|
||||
- ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 28, 3, 0),
|
||||
- ARM64_FTR_BITS(FTR_STRICT, FTR_HIGHER_SAFE, 24, 4, 0), /* CWG */
|
||||
- ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 20, 4, 0), /* ERG */
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 31, 1, 1), /* RES1 */
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 30, 1, 0),
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 29, 1, 1), /* DIC */
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, 28, 1, 1), /* IDC */
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_HIGHER_OR_ZERO_SAFE, 24, 4, 0), /* CWG */
|
||||
+ ARM64_FTR_BITS(FTR_STRICT, FTR_HIGHER_OR_ZERO_SAFE, 20, 4, 0), /* ERG */
|
||||
ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, CTR_DMINLINE_SHIFT, 4, 1),
|
||||
/*
|
||||
* Linux can handle differing I-cache policies. Userspace JITs will
|
||||
@@ -390,6 +392,10 @@ static s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new,
|
||||
case FTR_LOWER_SAFE:
|
||||
ret = new < cur ? new : cur;
|
||||
break;
|
||||
+ case FTR_HIGHER_OR_ZERO_SAFE:
|
||||
+ if (!cur || !new)
|
||||
+ break;
|
||||
+ /* Fallthrough */
|
||||
case FTR_HIGHER_SAFE:
|
||||
ret = new > cur ? new : cur;
|
||||
break;
|
||||
diff --git a/block/blk-core.c b/block/blk-core.c
|
||||
index 77b99bf16c83..bdb906bbfe19 100644
|
||||
--- a/block/blk-core.c
|
||||
+++ b/block/blk-core.c
|
||||
@@ -881,6 +881,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
|
||||
|
||||
fail:
|
||||
blk_free_flush_queue(q->fq);
|
||||
+ q->fq = NULL;
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(blk_init_allocated_queue);
|
||||
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
|
||||
index b2756765950e..fe47c924dc64 100644
|
||||
--- a/drivers/atm/iphase.c
|
||||
+++ b/drivers/atm/iphase.c
|
||||
@@ -63,6 +63,7 @@
|
||||
#include <asm/byteorder.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/jiffies.h>
|
||||
+#include <linux/nospec.h>
|
||||
#include "iphase.h"
|
||||
#include "suni.h"
|
||||
#define swap_byte_order(x) (((x & 0xff) << 8) | ((x & 0xff00) >> 8))
|
||||
@@ -2760,8 +2761,11 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
|
||||
}
|
||||
if (copy_from_user(&ia_cmds, arg, sizeof ia_cmds)) return -EFAULT;
|
||||
board = ia_cmds.status;
|
||||
- if ((board < 0) || (board > iadev_count))
|
||||
- board = 0;
|
||||
+
|
||||
+ if ((board < 0) || (board > iadev_count))
|
||||
+ board = 0;
|
||||
+ board = array_index_nospec(board, iadev_count + 1);
|
||||
+
|
||||
iadev = ia_dev[board];
|
||||
switch (ia_cmds.cmd) {
|
||||
case MEMDUMP:
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 6f4c84d824e6..25c006338100 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -509,6 +509,7 @@
|
||||
#define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A 0x0a4a
|
||||
#define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A 0x0b4a
|
||||
#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE 0x134a
|
||||
+#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641 0x0641
|
||||
|
||||
#define USB_VENDOR_ID_HUION 0x256c
|
||||
#define USB_DEVICE_ID_HUION_TABLET 0x006e
|
||||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
|
||||
index 617ae294a318..e851926be8b0 100644
|
||||
--- a/drivers/hid/usbhid/hid-quirks.c
|
||||
+++ b/drivers/hid/usbhid/hid-quirks.c
|
||||
@@ -98,6 +98,7 @@ static const struct hid_blacklist {
|
||||
{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A, HID_QUIRK_ALWAYS_POLL },
|
||||
{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A, HID_QUIRK_ALWAYS_POLL },
|
||||
{ USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
|
||||
+ { USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641, HID_QUIRK_ALWAYS_POLL },
|
||||
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_C077, HID_QUIRK_ALWAYS_POLL },
|
||||
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KEYBOARD_G710_PLUS, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C01A, HID_QUIRK_ALWAYS_POLL },
|
||||
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
|
||||
index b1ad378cb2a6..6c3bf8846b52 100644
|
||||
--- a/drivers/hid/wacom_wac.c
|
||||
+++ b/drivers/hid/wacom_wac.c
|
||||
@@ -529,14 +529,14 @@ static int wacom_intuos_pad(struct wacom_wac *wacom)
|
||||
*/
|
||||
buttons = (data[4] << 1) | (data[3] & 0x01);
|
||||
} else if (features->type == CINTIQ_COMPANION_2) {
|
||||
- /* d-pad right -> data[4] & 0x10
|
||||
- * d-pad up -> data[4] & 0x20
|
||||
- * d-pad left -> data[4] & 0x40
|
||||
- * d-pad down -> data[4] & 0x80
|
||||
- * d-pad center -> data[3] & 0x01
|
||||
+ /* d-pad right -> data[2] & 0x10
|
||||
+ * d-pad up -> data[2] & 0x20
|
||||
+ * d-pad left -> data[2] & 0x40
|
||||
+ * d-pad down -> data[2] & 0x80
|
||||
+ * d-pad center -> data[1] & 0x01
|
||||
*/
|
||||
buttons = ((data[2] >> 4) << 7) |
|
||||
- ((data[1] & 0x04) << 6) |
|
||||
+ ((data[1] & 0x04) << 4) |
|
||||
((data[2] & 0x0F) << 2) |
|
||||
(data[1] & 0x03);
|
||||
} else if (features->type >= INTUOS5S && features->type <= INTUOSPL) {
|
||||
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
|
||||
index 978b8d94f9a4..1baa25e82bdd 100644
|
||||
--- a/drivers/infiniband/core/addr.c
|
||||
+++ b/drivers/infiniband/core/addr.c
|
||||
@@ -735,14 +735,13 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
|
||||
struct net_device *dev;
|
||||
|
||||
union {
|
||||
- struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} sgid_addr, dgid_addr;
|
||||
|
||||
|
||||
- rdma_gid2ip(&sgid_addr._sockaddr, sgid);
|
||||
- rdma_gid2ip(&dgid_addr._sockaddr, dgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&dgid_addr, dgid);
|
||||
|
||||
memset(&dev_addr, 0, sizeof(dev_addr));
|
||||
if (if_index)
|
||||
@@ -751,8 +750,9 @@ int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
|
||||
|
||||
ctx.addr = &dev_addr;
|
||||
init_completion(&ctx.comp);
|
||||
- ret = rdma_resolve_ip(&self, &sgid_addr._sockaddr, &dgid_addr._sockaddr,
|
||||
- &dev_addr, 1000, resolve_cb, &ctx);
|
||||
+ ret = rdma_resolve_ip(&self, (struct sockaddr *)&sgid_addr,
|
||||
+ (struct sockaddr *)&dgid_addr, &dev_addr, 1000,
|
||||
+ resolve_cb, &ctx);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -782,16 +782,15 @@ int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
|
||||
int ret = 0;
|
||||
struct rdma_dev_addr dev_addr;
|
||||
union {
|
||||
- struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} gid_addr;
|
||||
|
||||
- rdma_gid2ip(&gid_addr._sockaddr, sgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&gid_addr, sgid);
|
||||
|
||||
memset(&dev_addr, 0, sizeof(dev_addr));
|
||||
dev_addr.net = &init_net;
|
||||
- ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
|
||||
+ ret = rdma_translate_ip((struct sockaddr *)&gid_addr, &dev_addr, vlan_id);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
|
||||
index 4baf3b864a57..5879a06ada93 100644
|
||||
--- a/drivers/infiniband/core/sa_query.c
|
||||
+++ b/drivers/infiniband/core/sa_query.c
|
||||
@@ -1109,7 +1109,6 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
|
||||
.net = rec->net ? rec->net :
|
||||
&init_net};
|
||||
union {
|
||||
- struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} sgid_addr, dgid_addr;
|
||||
@@ -1117,12 +1116,13 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
|
||||
if (!device->get_netdev)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
- rdma_gid2ip(&sgid_addr._sockaddr, &rec->sgid);
|
||||
- rdma_gid2ip(&dgid_addr._sockaddr, &rec->dgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&sgid_addr, &rec->sgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&dgid_addr, &rec->dgid);
|
||||
|
||||
/* validate the route */
|
||||
- ret = rdma_resolve_ip_route(&sgid_addr._sockaddr,
|
||||
- &dgid_addr._sockaddr, &dev_addr);
|
||||
+ ret = rdma_resolve_ip_route((struct sockaddr *)&sgid_addr,
|
||||
+ (struct sockaddr *)&dgid_addr,
|
||||
+ &dev_addr);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
|
||||
index 797362a297b2..35efd40ba47f 100644
|
||||
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
|
||||
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
|
||||
@@ -82,7 +82,6 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
|
||||
u8 nxthdr = 0x11;
|
||||
struct iphdr ipv4;
|
||||
union {
|
||||
- struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} sgid_addr, dgid_addr;
|
||||
@@ -131,9 +130,9 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
|
||||
ipv4.tot_len = htons(0);
|
||||
ipv4.ttl = attr->grh.hop_limit;
|
||||
ipv4.protocol = nxthdr;
|
||||
- rdma_gid2ip(&sgid_addr._sockaddr, sgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&sgid_addr, sgid);
|
||||
ipv4.saddr = sgid_addr._sockaddr_in.sin_addr.s_addr;
|
||||
- rdma_gid2ip(&dgid_addr._sockaddr, &attr->grh.dgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&dgid_addr, &attr->grh.dgid);
|
||||
ipv4.daddr = dgid_addr._sockaddr_in.sin_addr.s_addr;
|
||||
memcpy((u8 *)ah->av + eth_sz, &ipv4, sizeof(struct iphdr));
|
||||
} else {
|
||||
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
|
||||
index 67fc0b6857e1..edfa22847724 100644
|
||||
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
|
||||
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
|
||||
@@ -2505,7 +2505,6 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
|
||||
u32 vlan_id = 0xFFFF;
|
||||
u8 mac_addr[6], hdr_type;
|
||||
union {
|
||||
- struct sockaddr _sockaddr;
|
||||
struct sockaddr_in _sockaddr_in;
|
||||
struct sockaddr_in6 _sockaddr_in6;
|
||||
} sgid_addr, dgid_addr;
|
||||
@@ -2550,8 +2549,8 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
|
||||
|
||||
hdr_type = ib_gid_to_network_type(sgid_attr.gid_type, &sgid);
|
||||
if (hdr_type == RDMA_NETWORK_IPV4) {
|
||||
- rdma_gid2ip(&sgid_addr._sockaddr, &sgid);
|
||||
- rdma_gid2ip(&dgid_addr._sockaddr, &ah_attr->grh.dgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&sgid_addr, &sgid);
|
||||
+ rdma_gid2ip((struct sockaddr *)&dgid_addr, &ah_attr->grh.dgid);
|
||||
memcpy(&cmd->params.dgid[0],
|
||||
&dgid_addr._sockaddr_in.sin_addr.s_addr, 4);
|
||||
memcpy(&cmd->params.sgid[0],
|
||||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
||||
index 6167bb0c71ed..53a71166e784 100644
|
||||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
|
||||
@@ -1939,7 +1939,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,
|
||||
}
|
||||
|
||||
/* select a non-FCoE queue */
|
||||
- return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp) * bp->max_cos);
|
||||
+ return fallback(dev, skb) % (BNX2X_NUM_ETH_QUEUES(bp));
|
||||
}
|
||||
|
||||
void bnx2x_set_num_queues(struct bnx2x *bp)
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
|
||||
index 524fff2b3dc6..2e6d6dfdcc80 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
|
||||
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
|
||||
@@ -207,7 +207,7 @@ void mlx5_unregister_device(struct mlx5_core_dev *dev)
|
||||
struct mlx5_interface *intf;
|
||||
|
||||
mutex_lock(&mlx5_intf_mutex);
|
||||
- list_for_each_entry(intf, &intf_list, list)
|
||||
+ list_for_each_entry_reverse(intf, &intf_list, list)
|
||||
mlx5_remove_device(intf, priv);
|
||||
list_del(&priv->dev_list);
|
||||
mutex_unlock(&mlx5_intf_mutex);
|
||||
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
|
||||
index 8c93ed5c9763..fa8f7c40a384 100644
|
||||
--- a/drivers/net/ppp/pppoe.c
|
||||
+++ b/drivers/net/ppp/pppoe.c
|
||||
@@ -1134,6 +1134,9 @@ static const struct proto_ops pppoe_ops = {
|
||||
.recvmsg = pppoe_recvmsg,
|
||||
.mmap = sock_no_mmap,
|
||||
.ioctl = pppox_ioctl,
|
||||
+#ifdef CONFIG_COMPAT
|
||||
+ .compat_ioctl = pppox_compat_ioctl,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static const struct pppox_proto pppoe_proto = {
|
||||
diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c
|
||||
index b9c8be6283d3..50856f9fe08a 100644
|
||||
--- a/drivers/net/ppp/pppox.c
|
||||
+++ b/drivers/net/ppp/pppox.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <linux/string.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
+#include <linux/compat.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/net.h>
|
||||
@@ -103,6 +104,18 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
||||
|
||||
EXPORT_SYMBOL(pppox_ioctl);
|
||||
|
||||
+#ifdef CONFIG_COMPAT
|
||||
+int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
||||
+{
|
||||
+ if (cmd == PPPOEIOCSFWD32)
|
||||
+ cmd = PPPOEIOCSFWD;
|
||||
+
|
||||
+ return pppox_ioctl(sock, cmd, (unsigned long)compat_ptr(arg));
|
||||
+}
|
||||
+
|
||||
+EXPORT_SYMBOL(pppox_compat_ioctl);
|
||||
+#endif
|
||||
+
|
||||
static int pppox_create(struct net *net, struct socket *sock, int protocol,
|
||||
int kern)
|
||||
{
|
||||
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
|
||||
index 5a8befdfa5e4..fa14a67fb09a 100644
|
||||
--- a/drivers/net/ppp/pptp.c
|
||||
+++ b/drivers/net/ppp/pptp.c
|
||||
@@ -638,6 +638,9 @@ static const struct proto_ops pptp_ops = {
|
||||
.recvmsg = sock_no_recvmsg,
|
||||
.mmap = sock_no_mmap,
|
||||
.ioctl = pppox_ioctl,
|
||||
+#ifdef CONFIG_COMPAT
|
||||
+ .compat_ioctl = pppox_compat_ioctl,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static const struct pppox_proto pppox_pptp_proto = {
|
||||
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
|
||||
index cc3994d4e7bc..3c2f34db937b 100644
|
||||
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
|
||||
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
|
||||
@@ -1984,7 +1984,7 @@ EXPORT_SYMBOL_GPL(fcoe_wwn_from_mac);
|
||||
*/
|
||||
static inline struct fcoe_rport *fcoe_ctlr_rport(struct fc_rport_priv *rdata)
|
||||
{
|
||||
- return (struct fcoe_rport *)(rdata + 1);
|
||||
+ return container_of(rdata, struct fcoe_rport, rdata);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2244,7 +2244,7 @@ static void fcoe_ctlr_vn_start(struct fcoe_ctlr *fip)
|
||||
*/
|
||||
static int fcoe_ctlr_vn_parse(struct fcoe_ctlr *fip,
|
||||
struct sk_buff *skb,
|
||||
- struct fc_rport_priv *rdata)
|
||||
+ struct fcoe_rport *frport)
|
||||
{
|
||||
struct fip_header *fiph;
|
||||
struct fip_desc *desc = NULL;
|
||||
@@ -2252,16 +2252,12 @@ static int fcoe_ctlr_vn_parse(struct fcoe_ctlr *fip,
|
||||
struct fip_wwn_desc *wwn = NULL;
|
||||
struct fip_vn_desc *vn = NULL;
|
||||
struct fip_size_desc *size = NULL;
|
||||
- struct fcoe_rport *frport;
|
||||
size_t rlen;
|
||||
size_t dlen;
|
||||
u32 desc_mask = 0;
|
||||
u32 dtype;
|
||||
u8 sub;
|
||||
|
||||
- memset(rdata, 0, sizeof(*rdata) + sizeof(*frport));
|
||||
- frport = fcoe_ctlr_rport(rdata);
|
||||
-
|
||||
fiph = (struct fip_header *)skb->data;
|
||||
frport->flags = ntohs(fiph->fip_flags);
|
||||
|
||||
@@ -2324,15 +2320,17 @@ static int fcoe_ctlr_vn_parse(struct fcoe_ctlr *fip,
|
||||
if (dlen != sizeof(struct fip_wwn_desc))
|
||||
goto len_err;
|
||||
wwn = (struct fip_wwn_desc *)desc;
|
||||
- rdata->ids.node_name = get_unaligned_be64(&wwn->fd_wwn);
|
||||
+ frport->rdata.ids.node_name =
|
||||
+ get_unaligned_be64(&wwn->fd_wwn);
|
||||
break;
|
||||
case FIP_DT_VN_ID:
|
||||
if (dlen != sizeof(struct fip_vn_desc))
|
||||
goto len_err;
|
||||
vn = (struct fip_vn_desc *)desc;
|
||||
memcpy(frport->vn_mac, vn->fd_mac, ETH_ALEN);
|
||||
- rdata->ids.port_id = ntoh24(vn->fd_fc_id);
|
||||
- rdata->ids.port_name = get_unaligned_be64(&vn->fd_wwpn);
|
||||
+ frport->rdata.ids.port_id = ntoh24(vn->fd_fc_id);
|
||||
+ frport->rdata.ids.port_name =
|
||||
+ get_unaligned_be64(&vn->fd_wwpn);
|
||||
break;
|
||||
case FIP_DT_FC4F:
|
||||
if (dlen != sizeof(struct fip_fc4_feat))
|
||||
@@ -2670,16 +2668,13 @@ static int fcoe_ctlr_vn_recv(struct fcoe_ctlr *fip, struct sk_buff *skb)
|
||||
{
|
||||
struct fip_header *fiph;
|
||||
enum fip_vn2vn_subcode sub;
|
||||
- struct {
|
||||
- struct fc_rport_priv rdata;
|
||||
- struct fcoe_rport frport;
|
||||
- } buf;
|
||||
+ struct fcoe_rport frport = { };
|
||||
int rc;
|
||||
|
||||
fiph = (struct fip_header *)skb->data;
|
||||
sub = fiph->fip_subcode;
|
||||
|
||||
- rc = fcoe_ctlr_vn_parse(fip, skb, &buf.rdata);
|
||||
+ rc = fcoe_ctlr_vn_parse(fip, skb, &frport);
|
||||
if (rc) {
|
||||
LIBFCOE_FIP_DBG(fip, "vn_recv vn_parse error %d\n", rc);
|
||||
goto drop;
|
||||
@@ -2688,19 +2683,19 @@ static int fcoe_ctlr_vn_recv(struct fcoe_ctlr *fip, struct sk_buff *skb)
|
||||
mutex_lock(&fip->ctlr_mutex);
|
||||
switch (sub) {
|
||||
case FIP_SC_VN_PROBE_REQ:
|
||||
- fcoe_ctlr_vn_probe_req(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vn_probe_req(fip, &frport.rdata);
|
||||
break;
|
||||
case FIP_SC_VN_PROBE_REP:
|
||||
- fcoe_ctlr_vn_probe_reply(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vn_probe_reply(fip, &frport.rdata);
|
||||
break;
|
||||
case FIP_SC_VN_CLAIM_NOTIFY:
|
||||
- fcoe_ctlr_vn_claim_notify(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vn_claim_notify(fip, &frport.rdata);
|
||||
break;
|
||||
case FIP_SC_VN_CLAIM_REP:
|
||||
- fcoe_ctlr_vn_claim_resp(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vn_claim_resp(fip, &frport.rdata);
|
||||
break;
|
||||
case FIP_SC_VN_BEACON:
|
||||
- fcoe_ctlr_vn_beacon(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vn_beacon(fip, &frport.rdata);
|
||||
break;
|
||||
default:
|
||||
LIBFCOE_FIP_DBG(fip, "vn_recv unknown subcode %d\n", sub);
|
||||
@@ -2724,22 +2719,18 @@ drop:
|
||||
*/
|
||||
static int fcoe_ctlr_vlan_parse(struct fcoe_ctlr *fip,
|
||||
struct sk_buff *skb,
|
||||
- struct fc_rport_priv *rdata)
|
||||
+ struct fcoe_rport *frport)
|
||||
{
|
||||
struct fip_header *fiph;
|
||||
struct fip_desc *desc = NULL;
|
||||
struct fip_mac_desc *macd = NULL;
|
||||
struct fip_wwn_desc *wwn = NULL;
|
||||
- struct fcoe_rport *frport;
|
||||
size_t rlen;
|
||||
size_t dlen;
|
||||
u32 desc_mask = 0;
|
||||
u32 dtype;
|
||||
u8 sub;
|
||||
|
||||
- memset(rdata, 0, sizeof(*rdata) + sizeof(*frport));
|
||||
- frport = fcoe_ctlr_rport(rdata);
|
||||
-
|
||||
fiph = (struct fip_header *)skb->data;
|
||||
frport->flags = ntohs(fiph->fip_flags);
|
||||
|
||||
@@ -2793,7 +2784,8 @@ static int fcoe_ctlr_vlan_parse(struct fcoe_ctlr *fip,
|
||||
if (dlen != sizeof(struct fip_wwn_desc))
|
||||
goto len_err;
|
||||
wwn = (struct fip_wwn_desc *)desc;
|
||||
- rdata->ids.node_name = get_unaligned_be64(&wwn->fd_wwn);
|
||||
+ frport->rdata.ids.node_name =
|
||||
+ get_unaligned_be64(&wwn->fd_wwn);
|
||||
break;
|
||||
default:
|
||||
LIBFCOE_FIP_DBG(fip, "unexpected descriptor type %x "
|
||||
@@ -2904,22 +2896,19 @@ static int fcoe_ctlr_vlan_recv(struct fcoe_ctlr *fip, struct sk_buff *skb)
|
||||
{
|
||||
struct fip_header *fiph;
|
||||
enum fip_vlan_subcode sub;
|
||||
- struct {
|
||||
- struct fc_rport_priv rdata;
|
||||
- struct fcoe_rport frport;
|
||||
- } buf;
|
||||
+ struct fcoe_rport frport = { };
|
||||
int rc;
|
||||
|
||||
fiph = (struct fip_header *)skb->data;
|
||||
sub = fiph->fip_subcode;
|
||||
- rc = fcoe_ctlr_vlan_parse(fip, skb, &buf.rdata);
|
||||
+ rc = fcoe_ctlr_vlan_parse(fip, skb, &frport);
|
||||
if (rc) {
|
||||
LIBFCOE_FIP_DBG(fip, "vlan_recv vlan_parse error %d\n", rc);
|
||||
goto drop;
|
||||
}
|
||||
mutex_lock(&fip->ctlr_mutex);
|
||||
if (sub == FIP_SC_VL_REQ)
|
||||
- fcoe_ctlr_vlan_disc_reply(fip, &buf.rdata);
|
||||
+ fcoe_ctlr_vlan_disc_reply(fip, &frport.rdata);
|
||||
mutex_unlock(&fip->ctlr_mutex);
|
||||
|
||||
drop:
|
||||
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c
|
||||
index 97aeaddd600d..70e2958a69a0 100644
|
||||
--- a/drivers/scsi/libfc/fc_rport.c
|
||||
+++ b/drivers/scsi/libfc/fc_rport.c
|
||||
@@ -127,12 +127,15 @@ static struct fc_rport_priv *fc_rport_create(struct fc_lport *lport,
|
||||
u32 port_id)
|
||||
{
|
||||
struct fc_rport_priv *rdata;
|
||||
+ size_t rport_priv_size = sizeof(*rdata);
|
||||
|
||||
rdata = lport->tt.rport_lookup(lport, port_id);
|
||||
if (rdata)
|
||||
return rdata;
|
||||
|
||||
- rdata = kzalloc(sizeof(*rdata) + lport->rport_priv_size, GFP_KERNEL);
|
||||
+ if (lport->rport_priv_size > 0)
|
||||
+ rport_priv_size = lport->rport_priv_size;
|
||||
+ rdata = kzalloc(rport_priv_size, GFP_KERNEL);
|
||||
if (!rdata)
|
||||
return NULL;
|
||||
|
||||
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
|
||||
index 25abf2d1732a..eab27d41ba83 100644
|
||||
--- a/drivers/spi/spi-bcm2835.c
|
||||
+++ b/drivers/spi/spi-bcm2835.c
|
||||
@@ -554,7 +554,8 @@ static int bcm2835_spi_transfer_one(struct spi_master *master,
|
||||
bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
|
||||
|
||||
/* handle all the 3-wire mode */
|
||||
- if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
|
||||
+ if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
|
||||
+ tfr->rx_buf != master->dummy_rx)
|
||||
cs |= BCM2835_SPI_CS_REN;
|
||||
else
|
||||
cs &= ~BCM2835_SPI_CS_REN;
|
||||
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
|
||||
index 93c8e4a4bbd3..4b7da4409c60 100644
|
||||
--- a/fs/compat_ioctl.c
|
||||
+++ b/fs/compat_ioctl.c
|
||||
@@ -1038,9 +1038,6 @@ COMPATIBLE_IOCTL(PPPIOCDISCONN)
|
||||
COMPATIBLE_IOCTL(PPPIOCATTCHAN)
|
||||
COMPATIBLE_IOCTL(PPPIOCGCHAN)
|
||||
COMPATIBLE_IOCTL(PPPIOCGL2TPSTATS)
|
||||
-/* PPPOX */
|
||||
-COMPATIBLE_IOCTL(PPPOEIOCSFWD)
|
||||
-COMPATIBLE_IOCTL(PPPOEIOCDFWD)
|
||||
/* Big A */
|
||||
/* sparc only */
|
||||
/* Big Q for sound/OSS */
|
||||
diff --git a/include/linux/ceph/ceph_debug.h b/include/linux/ceph/ceph_debug.h
|
||||
index aa2e19182d99..51c5bd64bd00 100644
|
||||
--- a/include/linux/ceph/ceph_debug.h
|
||||
+++ b/include/linux/ceph/ceph_debug.h
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
+#include <linux/string.h>
|
||||
+
|
||||
#ifdef CONFIG_CEPH_LIB_PRETTYDEBUG
|
||||
|
||||
/*
|
||||
@@ -12,12 +14,10 @@
|
||||
*/
|
||||
|
||||
# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
|
||||
-extern const char *ceph_file_part(const char *s, int len);
|
||||
# define dout(fmt, ...) \
|
||||
pr_debug("%.*s %12.12s:%-4d : " fmt, \
|
||||
8 - (int)sizeof(KBUILD_MODNAME), " ", \
|
||||
- ceph_file_part(__FILE__, sizeof(__FILE__)), \
|
||||
- __LINE__, ##__VA_ARGS__)
|
||||
+ kbasename(__FILE__), __LINE__, ##__VA_ARGS__)
|
||||
# else
|
||||
/* faux printk call just to see any compiler warnings. */
|
||||
# define dout(fmt, ...) do { \
|
||||
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
|
||||
index ba7a9b0c7c57..24e9b360da65 100644
|
||||
--- a/include/linux/if_pppox.h
|
||||
+++ b/include/linux/if_pppox.h
|
||||
@@ -84,6 +84,9 @@ extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
|
||||
extern void unregister_pppox_proto(int proto_num);
|
||||
extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */
|
||||
extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
||||
+extern int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
||||
+
|
||||
+#define PPPOEIOCSFWD32 _IOW(0xB1 ,0, compat_size_t)
|
||||
|
||||
/* PPPoX socket states */
|
||||
enum {
|
||||
diff --git a/include/net/tcp.h b/include/net/tcp.h
|
||||
index 1eda31f7f013..a474213ca015 100644
|
||||
--- a/include/net/tcp.h
|
||||
+++ b/include/net/tcp.h
|
||||
@@ -1595,6 +1595,23 @@ static inline void tcp_check_send_head(struct sock *sk, struct sk_buff *skb_unli
|
||||
tcp_sk(sk)->highest_sack = NULL;
|
||||
}
|
||||
|
||||
+static inline struct sk_buff *tcp_rtx_queue_head(const struct sock *sk)
|
||||
+{
|
||||
+ struct sk_buff *skb = tcp_write_queue_head(sk);
|
||||
+
|
||||
+ if (skb == tcp_send_head(sk))
|
||||
+ skb = NULL;
|
||||
+
|
||||
+ return skb;
|
||||
+}
|
||||
+
|
||||
+static inline struct sk_buff *tcp_rtx_queue_tail(const struct sock *sk)
|
||||
+{
|
||||
+ struct sk_buff *skb = tcp_send_head(sk);
|
||||
+
|
||||
+ return skb ? tcp_write_queue_prev(sk, skb) : tcp_write_queue_tail(sk);
|
||||
+}
|
||||
+
|
||||
static inline void __tcp_add_write_queue_tail(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
__skb_queue_tail(&sk->sk_write_queue, skb);
|
||||
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
|
||||
index 722d3264d3bf..6be92eede5c0 100644
|
||||
--- a/include/scsi/libfcoe.h
|
||||
+++ b/include/scsi/libfcoe.h
|
||||
@@ -241,6 +241,7 @@ struct fcoe_fcf {
|
||||
* @vn_mac: VN_Node assigned MAC address for data
|
||||
*/
|
||||
struct fcoe_rport {
|
||||
+ struct fc_rport_priv rdata;
|
||||
unsigned long time;
|
||||
u16 fcoe_len;
|
||||
u16 flags;
|
||||
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
|
||||
index 3626174456b7..80c81c7e3cf9 100644
|
||||
--- a/net/bridge/br_multicast.c
|
||||
+++ b/net/bridge/br_multicast.c
|
||||
@@ -1489,6 +1489,9 @@ br_multicast_leave_group(struct net_bridge *br,
|
||||
if (p->port != port)
|
||||
continue;
|
||||
|
||||
+ if (p->flags & MDB_PG_FLAGS_PERMANENT)
|
||||
+ break;
|
||||
+
|
||||
rcu_assign_pointer(*pp, p->next);
|
||||
hlist_del_init(&p->mglist);
|
||||
del_timer(&p->timer);
|
||||
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
|
||||
index b6de4f457161..5172caac645c 100644
|
||||
--- a/net/bridge/br_vlan.c
|
||||
+++ b/net/bridge/br_vlan.c
|
||||
@@ -622,6 +622,11 @@ void br_vlan_flush(struct net_bridge *br)
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
+ /* delete auto-added default pvid local fdb before flushing vlans
|
||||
+ * otherwise it will be leaked on bridge device init failure
|
||||
+ */
|
||||
+ br_fdb_delete_by_port(br, NULL, 0, 1);
|
||||
+
|
||||
vg = br_vlan_group(br);
|
||||
__vlan_flush(vg);
|
||||
RCU_INIT_POINTER(br->vlgrp, NULL);
|
||||
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
|
||||
index bf0294cf4d22..18c4b34bd6e0 100644
|
||||
--- a/net/ceph/ceph_common.c
|
||||
+++ b/net/ceph/ceph_common.c
|
||||
@@ -45,19 +45,6 @@ bool libceph_compatible(void *data)
|
||||
}
|
||||
EXPORT_SYMBOL(libceph_compatible);
|
||||
|
||||
-/*
|
||||
- * find filename portion of a path (/foo/bar/baz -> baz)
|
||||
- */
|
||||
-const char *ceph_file_part(const char *s, int len)
|
||||
-{
|
||||
- const char *e = s + len;
|
||||
-
|
||||
- while (e != s && *(e-1) != '/')
|
||||
- e--;
|
||||
- return e;
|
||||
-}
|
||||
-EXPORT_SYMBOL(ceph_file_part);
|
||||
-
|
||||
const char *ceph_msg_type_name(int type)
|
||||
{
|
||||
switch (type) {
|
||||
diff --git a/net/core/dev.c b/net/core/dev.c
|
||||
index f693afe608d7..08bcbce16e12 100644
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -8296,6 +8296,8 @@ static void __net_exit default_device_exit(struct net *net)
|
||||
|
||||
/* Push remaining network devices to init_net */
|
||||
snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
|
||||
+ if (__dev_get_by_name(&init_net, fb_name))
|
||||
+ snprintf(fb_name, IFNAMSIZ, "dev%%d");
|
||||
err = dev_change_net_namespace(dev, &init_net, fb_name);
|
||||
if (err) {
|
||||
pr_emerg("%s: failed to move %s to init_net: %d\n",
|
||||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
||||
index 0c195b0f4216..9ddb05b98312 100644
|
||||
--- a/net/ipv4/tcp_output.c
|
||||
+++ b/net/ipv4/tcp_output.c
|
||||
@@ -1175,6 +1175,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
|
||||
struct tcp_sock *tp = tcp_sk(sk);
|
||||
struct sk_buff *buff;
|
||||
int nsize, old_factor;
|
||||
+ long limit;
|
||||
int nlen;
|
||||
u8 flags;
|
||||
|
||||
@@ -1185,7 +1186,15 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,
|
||||
if (nsize < 0)
|
||||
nsize = 0;
|
||||
|
||||
- if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf + 0x20000)) {
|
||||
+ /* tcp_sendmsg() can overshoot sk_wmem_queued by one full size skb.
|
||||
+ * We need some allowance to not penalize applications setting small
|
||||
+ * SO_SNDBUF values.
|
||||
+ * Also allow first and last skb in retransmit queue to be split.
|
||||
+ */
|
||||
+ limit = sk->sk_sndbuf + 2 * SKB_TRUESIZE(GSO_MAX_SIZE);
|
||||
+ if (unlikely((sk->sk_wmem_queued >> 1) > limit &&
|
||||
+ skb != tcp_rtx_queue_head(sk) &&
|
||||
+ skb != tcp_rtx_queue_tail(sk))) {
|
||||
NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
|
||||
return -ENOMEM;
|
||||
}
|
||||
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
|
||||
index 42f363661d25..cc28b8646986 100644
|
||||
--- a/net/ipv6/ip6_tunnel.c
|
||||
+++ b/net/ipv6/ip6_tunnel.c
|
||||
@@ -1275,11 +1275,11 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
fl6.flowi6_mark = skb->mark;
|
||||
}
|
||||
|
||||
+ dsfield = INET_ECN_encapsulate(dsfield, ipv4_get_dsfield(iph));
|
||||
+
|
||||
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
||||
return -1;
|
||||
|
||||
- dsfield = INET_ECN_encapsulate(dsfield, ipv4_get_dsfield(iph));
|
||||
-
|
||||
skb_set_inner_ipproto(skb, IPPROTO_IPIP);
|
||||
|
||||
err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
|
||||
@@ -1362,11 +1362,11 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
fl6.flowi6_mark = skb->mark;
|
||||
}
|
||||
|
||||
+ dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
|
||||
+
|
||||
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
|
||||
return -1;
|
||||
|
||||
- dsfield = INET_ECN_encapsulate(dsfield, ipv6_get_dsfield(ipv6h));
|
||||
-
|
||||
skb_set_inner_ipproto(skb, IPPROTO_IPV6);
|
||||
|
||||
err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
|
||||
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
|
||||
index 9b214f313cc0..16b63e60396f 100644
|
||||
--- a/net/l2tp/l2tp_ppp.c
|
||||
+++ b/net/l2tp/l2tp_ppp.c
|
||||
@@ -1790,6 +1790,9 @@ static const struct proto_ops pppol2tp_ops = {
|
||||
.recvmsg = pppol2tp_recvmsg,
|
||||
.mmap = sock_no_mmap,
|
||||
.ioctl = pppox_ioctl,
|
||||
+#ifdef CONFIG_COMPAT
|
||||
+ .compat_ioctl = pppox_compat_ioctl,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static const struct pppox_proto pppol2tp_proto = {
|
||||
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
|
||||
index d2932dc4c83d..36e4dcdac8dc 100644
|
||||
--- a/net/sched/act_ife.c
|
||||
+++ b/net/sched/act_ife.c
|
||||
@@ -477,6 +477,9 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
|
||||
int ret = 0;
|
||||
int err;
|
||||
|
||||
+ if (!nla)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
err = nla_parse_nested(tb, TCA_IFE_MAX, nla, ife_policy);
|
||||
if (err < 0)
|
||||
return err;
|
||||
diff --git a/net/sched/sch_codel.c b/net/sched/sch_codel.c
|
||||
index 5bfa79ee657c..17a0838f8074 100644
|
||||
--- a/net/sched/sch_codel.c
|
||||
+++ b/net/sched/sch_codel.c
|
||||
@@ -71,10 +71,10 @@ static struct sk_buff *dequeue_func(struct codel_vars *vars, void *ctx)
|
||||
struct Qdisc *sch = ctx;
|
||||
struct sk_buff *skb = __qdisc_dequeue_head(&sch->q);
|
||||
|
||||
- if (skb)
|
||||
+ if (skb) {
|
||||
sch->qstats.backlog -= qdisc_pkt_len(skb);
|
||||
-
|
||||
- prefetch(&skb->end); /* we'll need skb_shinfo() */
|
||||
+ prefetch(&skb->end); /* we'll need skb_shinfo() */
|
||||
+ }
|
||||
return skb;
|
||||
}
|
||||
|
||||
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
|
||||
index b7c539a51da3..63a913b23873 100644
|
||||
--- a/net/tipc/netlink_compat.c
|
||||
+++ b/net/tipc/netlink_compat.c
|
||||
@@ -55,6 +55,7 @@ struct tipc_nl_compat_msg {
|
||||
int rep_type;
|
||||
int rep_size;
|
||||
int req_type;
|
||||
+ int req_size;
|
||||
struct net *net;
|
||||
struct sk_buff *rep;
|
||||
struct tlv_desc *req;
|
||||
@@ -252,7 +253,8 @@ static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd,
|
||||
int err;
|
||||
struct sk_buff *arg;
|
||||
|
||||
- if (msg->req_type && !TLV_CHECK_TYPE(msg->req, msg->req_type))
|
||||
+ if (msg->req_type && (!msg->req_size ||
|
||||
+ !TLV_CHECK_TYPE(msg->req, msg->req_type)))
|
||||
return -EINVAL;
|
||||
|
||||
msg->rep = tipc_tlv_alloc(msg->rep_size);
|
||||
@@ -345,7 +347,8 @@ static int tipc_nl_compat_doit(struct tipc_nl_compat_cmd_doit *cmd,
|
||||
{
|
||||
int err;
|
||||
|
||||
- if (msg->req_type && !TLV_CHECK_TYPE(msg->req, msg->req_type))
|
||||
+ if (msg->req_type && (!msg->req_size ||
|
||||
+ !TLV_CHECK_TYPE(msg->req, msg->req_type)))
|
||||
return -EINVAL;
|
||||
|
||||
err = __tipc_nl_compat_doit(cmd, msg);
|
||||
@@ -1267,8 +1270,8 @@ static int tipc_nl_compat_recv(struct sk_buff *skb, struct genl_info *info)
|
||||
goto send;
|
||||
}
|
||||
|
||||
- len = nlmsg_attrlen(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN);
|
||||
- if (!len || !TLV_OK(msg.req, len)) {
|
||||
+ msg.req_size = nlmsg_attrlen(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN);
|
||||
+ if (msg.req_size && !TLV_OK(msg.req, msg.req_size)) {
|
||||
msg.rep = tipc_get_err_tlv(TIPC_CFG_NOT_SUPPORTED);
|
||||
err = -EOPNOTSUPP;
|
||||
goto send;
|
||||
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
|
||||
index 95326c6a7a24..09782ff427d0 100644
|
||||
--- a/tools/objtool/check.c
|
||||
+++ b/tools/objtool/check.c
|
||||
@@ -165,6 +165,8 @@ static int __dead_end_function(struct objtool_file *file, struct symbol *func,
|
||||
"__reiserfs_panic",
|
||||
"lbug_with_loc",
|
||||
"fortify_panic",
|
||||
+ "machine_real_restart",
|
||||
+ "rewind_stack_do_exit",
|
||||
};
|
||||
|
||||
if (func->bind == STB_WEAK)
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,612 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 311e861afb15..946951930f62 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 191
|
||||
+SUBLEVEL = 192
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
|
||||
index 08443a15e6be..3caee91bca08 100644
|
||||
--- a/arch/arm/kvm/mmio.c
|
||||
+++ b/arch/arm/kvm/mmio.c
|
||||
@@ -98,6 +98,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
|
||||
unsigned int len;
|
||||
int mask;
|
||||
|
||||
+ /* Detect an already handled MMIO return */
|
||||
+ if (unlikely(!vcpu->mmio_needed))
|
||||
+ return 0;
|
||||
+
|
||||
+ vcpu->mmio_needed = 0;
|
||||
+
|
||||
if (!run->mmio.is_write) {
|
||||
len = run->mmio.len;
|
||||
if (len > sizeof(unsigned long))
|
||||
@@ -200,6 +206,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
|
||||
run->mmio.is_write = is_write;
|
||||
run->mmio.phys_addr = fault_ipa;
|
||||
run->mmio.len = len;
|
||||
+ vcpu->mmio_needed = 1;
|
||||
|
||||
if (!ret) {
|
||||
/* We handled the access successfully in the kernel. */
|
||||
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
|
||||
index 37666c536741..928ffdc21873 100644
|
||||
--- a/arch/x86/kernel/apic/apic.c
|
||||
+++ b/arch/x86/kernel/apic/apic.c
|
||||
@@ -1067,10 +1067,6 @@ void clear_local_APIC(void)
|
||||
apic_write(APIC_LVT0, v | APIC_LVT_MASKED);
|
||||
v = apic_read(APIC_LVT1);
|
||||
apic_write(APIC_LVT1, v | APIC_LVT_MASKED);
|
||||
- if (!x2apic_enabled()) {
|
||||
- v = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
|
||||
- apic_write(APIC_LDR, v);
|
||||
- }
|
||||
if (maxlvt >= 4) {
|
||||
v = apic_read(APIC_LVTPC);
|
||||
apic_write(APIC_LVTPC, v | APIC_LVT_MASKED);
|
||||
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
|
||||
index 28afd5d585f9..b7dfa4afd516 100644
|
||||
--- a/drivers/bluetooth/btqca.c
|
||||
+++ b/drivers/bluetooth/btqca.c
|
||||
@@ -363,6 +363,9 @@ int qca_uart_setup_rome(struct hci_dev *hdev, uint8_t baudrate)
|
||||
return err;
|
||||
}
|
||||
|
||||
+ /* Give the controller some time to get ready to receive the NVM */
|
||||
+ msleep(10);
|
||||
+
|
||||
/* Download NVM configuration */
|
||||
config.type = TLV_TYPE_NVM;
|
||||
snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin",
|
||||
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
|
||||
index d9323d7c479c..f32ffd74ec47 100644
|
||||
--- a/drivers/infiniband/hw/mlx4/mad.c
|
||||
+++ b/drivers/infiniband/hw/mlx4/mad.c
|
||||
@@ -1643,8 +1643,6 @@ tx_err:
|
||||
tx_buf_size, DMA_TO_DEVICE);
|
||||
kfree(tun_qp->tx_ring[i].buf.addr);
|
||||
}
|
||||
- kfree(tun_qp->tx_ring);
|
||||
- tun_qp->tx_ring = NULL;
|
||||
i = MLX4_NUM_TUNNEL_BUFS;
|
||||
err:
|
||||
while (i > 0) {
|
||||
@@ -1653,6 +1651,8 @@ err:
|
||||
rx_buf_size, DMA_FROM_DEVICE);
|
||||
kfree(tun_qp->ring[i].addr);
|
||||
}
|
||||
+ kfree(tun_qp->tx_ring);
|
||||
+ tun_qp->tx_ring = NULL;
|
||||
kfree(tun_qp->ring);
|
||||
tun_qp->ring = NULL;
|
||||
return -ENOMEM;
|
||||
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
|
||||
index 20455d082cb8..61c55621b958 100644
|
||||
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
|
||||
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
|
||||
@@ -2781,8 +2781,10 @@ static ssize_t blocked_fl_write(struct file *filp, const char __user *ubuf,
|
||||
return -ENOMEM;
|
||||
|
||||
err = bitmap_parse_user(ubuf, count, t, adap->sge.egr_sz);
|
||||
- if (err)
|
||||
+ if (err) {
|
||||
+ kvfree(t);
|
||||
return err;
|
||||
+ }
|
||||
|
||||
bitmap_copy(adap->sge.blocked_fl, t, adap->sge.egr_sz);
|
||||
t4_free_mem(t);
|
||||
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
|
||||
index 955f658f3b65..de9897c8e933 100644
|
||||
--- a/drivers/net/ethernet/ibm/ibmveth.c
|
||||
+++ b/drivers/net/ethernet/ibm/ibmveth.c
|
||||
@@ -1557,7 +1557,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
|
||||
struct net_device *netdev;
|
||||
struct ibmveth_adapter *adapter;
|
||||
unsigned char *mac_addr_p;
|
||||
- unsigned int *mcastFilterSize_p;
|
||||
+ __be32 *mcastFilterSize_p;
|
||||
long ret;
|
||||
unsigned long ret_attr;
|
||||
|
||||
@@ -1579,8 +1579,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev,
|
||||
- VETH_MCAST_FILTER_SIZE, NULL);
|
||||
+ mcastFilterSize_p = (__be32 *)vio_get_attribute(dev,
|
||||
+ VETH_MCAST_FILTER_SIZE,
|
||||
+ NULL);
|
||||
if (!mcastFilterSize_p) {
|
||||
dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE "
|
||||
"attribute\n");
|
||||
@@ -1597,7 +1598,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
|
||||
|
||||
adapter->vdev = dev;
|
||||
adapter->netdev = netdev;
|
||||
- adapter->mcastFilterSize = *mcastFilterSize_p;
|
||||
+ adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p);
|
||||
adapter->pool_config = 0;
|
||||
|
||||
netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16);
|
||||
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
|
||||
index 6d1a956e3f77..02ec326cb129 100644
|
||||
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
|
||||
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
|
||||
@@ -4113,7 +4113,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
* setup (if available). */
|
||||
status = myri10ge_request_irq(mgp);
|
||||
if (status != 0)
|
||||
- goto abort_with_firmware;
|
||||
+ goto abort_with_slices;
|
||||
myri10ge_free_irq(mgp);
|
||||
|
||||
/* Save configuration space to be restored if the
|
||||
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
|
||||
index 480883a7a3e5..545cb6262cff 100644
|
||||
--- a/drivers/net/ethernet/renesas/ravb_main.c
|
||||
+++ b/drivers/net/ethernet/renesas/ravb_main.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Renesas Ethernet AVB device driver
|
||||
*
|
||||
- * Copyright (C) 2014-2015 Renesas Electronics Corporation
|
||||
+ * Copyright (C) 2014-2019 Renesas Electronics Corporation
|
||||
* Copyright (C) 2015 Renesas Solutions Corp.
|
||||
* Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
|
||||
*
|
||||
@@ -512,7 +512,10 @@ static void ravb_get_tx_tstamp(struct net_device *ndev)
|
||||
kfree(ts_skb);
|
||||
if (tag == tfa_tag) {
|
||||
skb_tstamp_tx(skb, &shhwtstamps);
|
||||
+ dev_consume_skb_any(skb);
|
||||
break;
|
||||
+ } else {
|
||||
+ dev_kfree_skb_any(skb);
|
||||
}
|
||||
}
|
||||
ravb_modify(ndev, TCCR, TCCR_TFR, TCCR_TFR);
|
||||
@@ -1537,7 +1540,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
||||
DMA_TO_DEVICE);
|
||||
goto unmap;
|
||||
}
|
||||
- ts_skb->skb = skb;
|
||||
+ ts_skb->skb = skb_get(skb);
|
||||
ts_skb->tag = priv->ts_skb_tag++;
|
||||
priv->ts_skb_tag &= 0x3ff;
|
||||
list_add_tail(&ts_skb->list, &priv->ts_skb_list);
|
||||
@@ -1665,6 +1668,7 @@ static int ravb_close(struct net_device *ndev)
|
||||
/* Clear the timestamp list */
|
||||
list_for_each_entry_safe(ts_skb, ts_skb2, &priv->ts_skb_list, list) {
|
||||
list_del(&ts_skb->list);
|
||||
+ kfree_skb(ts_skb->skb);
|
||||
kfree(ts_skb);
|
||||
}
|
||||
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
index 6e61bccc90b3..15c063880f88 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
@@ -771,10 +771,8 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)
|
||||
int ret;
|
||||
struct device *dev = &bsp_priv->pdev->dev;
|
||||
|
||||
- if (!ldo) {
|
||||
- dev_err(dev, "no regulator found\n");
|
||||
- return -1;
|
||||
- }
|
||||
+ if (!ldo)
|
||||
+ return 0;
|
||||
|
||||
if (enable) {
|
||||
ret = regulator_enable(ldo);
|
||||
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
|
||||
index 5b01b3fa9fec..47ebac456ae5 100644
|
||||
--- a/drivers/net/ethernet/toshiba/tc35815.c
|
||||
+++ b/drivers/net/ethernet/toshiba/tc35815.c
|
||||
@@ -1498,7 +1498,7 @@ tc35815_rx(struct net_device *dev, int limit)
|
||||
pci_unmap_single(lp->pci_dev,
|
||||
lp->rx_skbs[cur_bd].skb_dma,
|
||||
RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
|
||||
- if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN)
|
||||
+ if (!HAVE_DMA_RXALIGN(lp) && NET_IP_ALIGN != 0)
|
||||
memmove(skb->data, skb->data - NET_IP_ALIGN,
|
||||
pkt_len);
|
||||
data = skb_put(skb, pkt_len);
|
||||
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c
|
||||
index 8fd131207ee1..499abe9108fa 100644
|
||||
--- a/drivers/net/ethernet/tundra/tsi108_eth.c
|
||||
+++ b/drivers/net/ethernet/tundra/tsi108_eth.c
|
||||
@@ -381,9 +381,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift,
|
||||
static void tsi108_stat_carry(struct net_device *dev)
|
||||
{
|
||||
struct tsi108_prv_data *data = netdev_priv(dev);
|
||||
+ unsigned long flags;
|
||||
u32 carry1, carry2;
|
||||
|
||||
- spin_lock_irq(&data->misclock);
|
||||
+ spin_lock_irqsave(&data->misclock, flags);
|
||||
|
||||
carry1 = TSI_READ(TSI108_STAT_CARRY1);
|
||||
carry2 = TSI_READ(TSI108_STAT_CARRY2);
|
||||
@@ -451,7 +452,7 @@ static void tsi108_stat_carry(struct net_device *dev)
|
||||
TSI108_STAT_TXPAUSEDROP_CARRY,
|
||||
&data->tx_pause_drop);
|
||||
|
||||
- spin_unlock_irq(&data->misclock);
|
||||
+ spin_unlock_irqrestore(&data->misclock, flags);
|
||||
}
|
||||
|
||||
/* Read a stat counter atomically with respect to carries.
|
||||
diff --git a/drivers/net/usb/cx82310_eth.c b/drivers/net/usb/cx82310_eth.c
|
||||
index 947bea81d924..dfbdea22fbad 100644
|
||||
--- a/drivers/net/usb/cx82310_eth.c
|
||||
+++ b/drivers/net/usb/cx82310_eth.c
|
||||
@@ -175,7 +175,8 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
|
||||
}
|
||||
if (!timeout) {
|
||||
dev_err(&udev->dev, "firmware not ready in time\n");
|
||||
- return -ETIMEDOUT;
|
||||
+ ret = -ETIMEDOUT;
|
||||
+ goto err;
|
||||
}
|
||||
|
||||
/* enable ethernet mode (?) */
|
||||
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c
|
||||
index 3e37724d30ae..0c4f4190c58e 100644
|
||||
--- a/drivers/net/usb/kalmia.c
|
||||
+++ b/drivers/net/usb/kalmia.c
|
||||
@@ -117,16 +117,16 @@ kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr)
|
||||
status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_1)
|
||||
/ sizeof(init_msg_1[0]), usb_buf, 24);
|
||||
if (status != 0)
|
||||
- return status;
|
||||
+ goto out;
|
||||
|
||||
memcpy(usb_buf, init_msg_2, 12);
|
||||
status = kalmia_send_init_packet(dev, usb_buf, sizeof(init_msg_2)
|
||||
/ sizeof(init_msg_2[0]), usb_buf, 28);
|
||||
if (status != 0)
|
||||
- return status;
|
||||
+ goto out;
|
||||
|
||||
memcpy(ethernet_addr, usb_buf + 10, ETH_ALEN);
|
||||
-
|
||||
+out:
|
||||
kfree(usb_buf);
|
||||
return status;
|
||||
}
|
||||
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
|
||||
index c9c711dcd0e6..0e6c665a4de8 100644
|
||||
--- a/drivers/net/wimax/i2400m/fw.c
|
||||
+++ b/drivers/net/wimax/i2400m/fw.c
|
||||
@@ -351,13 +351,15 @@ int i2400m_barker_db_init(const char *_options)
|
||||
}
|
||||
result = i2400m_barker_db_add(barker);
|
||||
if (result < 0)
|
||||
- goto error_add;
|
||||
+ goto error_parse_add;
|
||||
}
|
||||
kfree(options_orig);
|
||||
}
|
||||
return 0;
|
||||
|
||||
+error_parse_add:
|
||||
error_parse:
|
||||
+ kfree(options_orig);
|
||||
error_add:
|
||||
kfree(i2400m_barker_db);
|
||||
return result;
|
||||
diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c
|
||||
index 7428091d3f5b..5c89bbb05441 100644
|
||||
--- a/drivers/spi/spi-bcm2835aux.c
|
||||
+++ b/drivers/spi/spi-bcm2835aux.c
|
||||
@@ -178,19 +178,14 @@ static void bcm2835aux_spi_reset_hw(struct bcm2835aux_spi *bs)
|
||||
BCM2835_AUX_SPI_CNTL0_CLEARFIFO);
|
||||
}
|
||||
|
||||
-static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)
|
||||
+static void bcm2835aux_spi_transfer_helper(struct bcm2835aux_spi *bs)
|
||||
{
|
||||
- struct spi_master *master = dev_id;
|
||||
- struct bcm2835aux_spi *bs = spi_master_get_devdata(master);
|
||||
- irqreturn_t ret = IRQ_NONE;
|
||||
+ u32 stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT);
|
||||
|
||||
/* check if we have data to read */
|
||||
- while (bs->rx_len &&
|
||||
- (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &
|
||||
- BCM2835_AUX_SPI_STAT_RX_EMPTY))) {
|
||||
+ for (; bs->rx_len && (stat & BCM2835_AUX_SPI_STAT_RX_LVL);
|
||||
+ stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT))
|
||||
bcm2835aux_rd_fifo(bs);
|
||||
- ret = IRQ_HANDLED;
|
||||
- }
|
||||
|
||||
/* check if we have data to write */
|
||||
while (bs->tx_len &&
|
||||
@@ -198,16 +193,21 @@ static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)
|
||||
(!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &
|
||||
BCM2835_AUX_SPI_STAT_TX_FULL))) {
|
||||
bcm2835aux_wr_fifo(bs);
|
||||
- ret = IRQ_HANDLED;
|
||||
}
|
||||
+}
|
||||
|
||||
- /* and check if we have reached "done" */
|
||||
- while (bs->rx_len &&
|
||||
- (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT) &
|
||||
- BCM2835_AUX_SPI_STAT_BUSY))) {
|
||||
- bcm2835aux_rd_fifo(bs);
|
||||
- ret = IRQ_HANDLED;
|
||||
- }
|
||||
+static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)
|
||||
+{
|
||||
+ struct spi_master *master = dev_id;
|
||||
+ struct bcm2835aux_spi *bs = spi_master_get_devdata(master);
|
||||
+
|
||||
+ /* IRQ may be shared, so return if our interrupts are disabled */
|
||||
+ if (!(bcm2835aux_rd(bs, BCM2835_AUX_SPI_CNTL1) &
|
||||
+ (BCM2835_AUX_SPI_CNTL1_TXEMPTY | BCM2835_AUX_SPI_CNTL1_IDLE)))
|
||||
+ return IRQ_NONE;
|
||||
+
|
||||
+ /* do common fifo handling */
|
||||
+ bcm2835aux_spi_transfer_helper(bs);
|
||||
|
||||
if (!bs->tx_len) {
|
||||
/* disable tx fifo empty interrupt */
|
||||
@@ -221,8 +221,7 @@ static irqreturn_t bcm2835aux_spi_interrupt(int irq, void *dev_id)
|
||||
complete(&master->xfer_completion);
|
||||
}
|
||||
|
||||
- /* and return */
|
||||
- return ret;
|
||||
+ return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __bcm2835aux_spi_transfer_one_irq(struct spi_master *master,
|
||||
@@ -268,7 +267,6 @@ static int bcm2835aux_spi_transfer_one_poll(struct spi_master *master,
|
||||
{
|
||||
struct bcm2835aux_spi *bs = spi_master_get_devdata(master);
|
||||
unsigned long timeout;
|
||||
- u32 stat;
|
||||
|
||||
/* configure spi */
|
||||
bcm2835aux_wr(bs, BCM2835_AUX_SPI_CNTL1, bs->cntl[1]);
|
||||
@@ -279,24 +277,9 @@ static int bcm2835aux_spi_transfer_one_poll(struct spi_master *master,
|
||||
|
||||
/* loop until finished the transfer */
|
||||
while (bs->rx_len) {
|
||||
- /* read status */
|
||||
- stat = bcm2835aux_rd(bs, BCM2835_AUX_SPI_STAT);
|
||||
|
||||
- /* fill in tx fifo with remaining data */
|
||||
- if ((bs->tx_len) && (!(stat & BCM2835_AUX_SPI_STAT_TX_FULL))) {
|
||||
- bcm2835aux_wr_fifo(bs);
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- /* read data from fifo for both cases */
|
||||
- if (!(stat & BCM2835_AUX_SPI_STAT_RX_EMPTY)) {
|
||||
- bcm2835aux_rd_fifo(bs);
|
||||
- continue;
|
||||
- }
|
||||
- if (!(stat & BCM2835_AUX_SPI_STAT_BUSY)) {
|
||||
- bcm2835aux_rd_fifo(bs);
|
||||
- continue;
|
||||
- }
|
||||
+ /* do common fifo handling */
|
||||
+ bcm2835aux_spi_transfer_helper(bs);
|
||||
|
||||
/* there is still data pending to read check the timeout */
|
||||
if (bs->rx_len && time_after(jiffies, timeout)) {
|
||||
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
|
||||
index 7a4052501866..339fdf6355df 100644
|
||||
--- a/fs/ceph/inode.c
|
||||
+++ b/fs/ceph/inode.c
|
||||
@@ -741,6 +741,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
|
||||
int issued = 0, implemented, new_issued;
|
||||
struct timespec mtime, atime, ctime;
|
||||
struct ceph_buffer *xattr_blob = NULL;
|
||||
+ struct ceph_buffer *old_blob = NULL;
|
||||
struct ceph_string *pool_ns = NULL;
|
||||
struct ceph_cap *new_cap = NULL;
|
||||
int err = 0;
|
||||
@@ -858,7 +859,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
|
||||
if ((ci->i_xattrs.version == 0 || !(issued & CEPH_CAP_XATTR_EXCL)) &&
|
||||
le64_to_cpu(info->xattr_version) > ci->i_xattrs.version) {
|
||||
if (ci->i_xattrs.blob)
|
||||
- ceph_buffer_put(ci->i_xattrs.blob);
|
||||
+ old_blob = ci->i_xattrs.blob;
|
||||
ci->i_xattrs.blob = xattr_blob;
|
||||
if (xattr_blob)
|
||||
memcpy(ci->i_xattrs.blob->vec.iov_base,
|
||||
@@ -1004,8 +1005,8 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
|
||||
out:
|
||||
if (new_cap)
|
||||
ceph_put_cap(mdsc, new_cap);
|
||||
- if (xattr_blob)
|
||||
- ceph_buffer_put(xattr_blob);
|
||||
+ ceph_buffer_put(old_blob);
|
||||
+ ceph_buffer_put(xattr_blob);
|
||||
ceph_put_string(pool_ns);
|
||||
return err;
|
||||
}
|
||||
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
|
||||
index 81144a8c0927..18b999deed03 100644
|
||||
--- a/fs/ceph/xattr.c
|
||||
+++ b/fs/ceph/xattr.c
|
||||
@@ -951,6 +951,7 @@ int __ceph_setxattr(struct inode *inode, const char *name,
|
||||
struct ceph_inode_info *ci = ceph_inode(inode);
|
||||
struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;
|
||||
struct ceph_cap_flush *prealloc_cf = NULL;
|
||||
+ struct ceph_buffer *old_blob = NULL;
|
||||
int issued;
|
||||
int err;
|
||||
int dirty = 0;
|
||||
@@ -1019,13 +1020,15 @@ retry:
|
||||
struct ceph_buffer *blob;
|
||||
|
||||
spin_unlock(&ci->i_ceph_lock);
|
||||
- dout(" preaallocating new blob size=%d\n", required_blob_size);
|
||||
+ ceph_buffer_put(old_blob); /* Shouldn't be required */
|
||||
+ dout(" pre-allocating new blob size=%d\n", required_blob_size);
|
||||
blob = ceph_buffer_new(required_blob_size, GFP_NOFS);
|
||||
if (!blob)
|
||||
goto do_sync_unlocked;
|
||||
spin_lock(&ci->i_ceph_lock);
|
||||
+ /* prealloc_blob can't be released while holding i_ceph_lock */
|
||||
if (ci->i_xattrs.prealloc_blob)
|
||||
- ceph_buffer_put(ci->i_xattrs.prealloc_blob);
|
||||
+ old_blob = ci->i_xattrs.prealloc_blob;
|
||||
ci->i_xattrs.prealloc_blob = blob;
|
||||
goto retry;
|
||||
}
|
||||
@@ -1041,6 +1044,7 @@ retry:
|
||||
}
|
||||
|
||||
spin_unlock(&ci->i_ceph_lock);
|
||||
+ ceph_buffer_put(old_blob);
|
||||
if (lock_snap_rwsem)
|
||||
up_read(&mdsc->snap_rwsem);
|
||||
if (dirty)
|
||||
diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h
|
||||
index 07ca15e76100..dada47a4360f 100644
|
||||
--- a/include/linux/ceph/buffer.h
|
||||
+++ b/include/linux/ceph/buffer.h
|
||||
@@ -29,7 +29,8 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
|
||||
|
||||
static inline void ceph_buffer_put(struct ceph_buffer *b)
|
||||
{
|
||||
- kref_put(&b->kref, ceph_buffer_release);
|
||||
+ if (b)
|
||||
+ kref_put(&b->kref, ceph_buffer_release);
|
||||
}
|
||||
|
||||
extern int ceph_decode_buffer(struct ceph_buffer **b, void **p, void *end);
|
||||
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
|
||||
index d12b5d566e4b..11555bd821b7 100644
|
||||
--- a/include/linux/gpio.h
|
||||
+++ b/include/linux/gpio.h
|
||||
@@ -229,30 +229,6 @@ static inline int irq_to_gpio(unsigned irq)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
-static inline int
|
||||
-gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
|
||||
- unsigned int gpio_offset, unsigned int pin_offset,
|
||||
- unsigned int npins)
|
||||
-{
|
||||
- WARN_ON(1);
|
||||
- return -EINVAL;
|
||||
-}
|
||||
-
|
||||
-static inline int
|
||||
-gpiochip_add_pingroup_range(struct gpio_chip *chip,
|
||||
- struct pinctrl_dev *pctldev,
|
||||
- unsigned int gpio_offset, const char *pin_group)
|
||||
-{
|
||||
- WARN_ON(1);
|
||||
- return -EINVAL;
|
||||
-}
|
||||
-
|
||||
-static inline void
|
||||
-gpiochip_remove_pin_ranges(struct gpio_chip *chip)
|
||||
-{
|
||||
- WARN_ON(1);
|
||||
-}
|
||||
-
|
||||
static inline int devm_gpio_request(struct device *dev, unsigned gpio,
|
||||
const char *label)
|
||||
{
|
||||
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
|
||||
index 9b2d61120c0d..5de180a9b7f5 100644
|
||||
--- a/net/core/netpoll.c
|
||||
+++ b/net/core/netpoll.c
|
||||
@@ -122,7 +122,7 @@ static void queue_process(struct work_struct *work)
|
||||
txq = netdev_get_tx_queue(dev, q_index);
|
||||
HARD_TX_LOCK(dev, txq, smp_processor_id());
|
||||
if (netif_xmit_frozen_or_stopped(txq) ||
|
||||
- netpoll_start_xmit(skb, dev, txq) != NETDEV_TX_OK) {
|
||||
+ !dev_xmit_complete(netpoll_start_xmit(skb, dev, txq))) {
|
||||
skb_queue_head(&npinfo->txq, skb);
|
||||
HARD_TX_UNLOCK(dev, txq);
|
||||
local_irq_restore(flags);
|
||||
@@ -357,7 +357,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
|
||||
|
||||
HARD_TX_UNLOCK(dev, txq);
|
||||
|
||||
- if (status == NETDEV_TX_OK)
|
||||
+ if (dev_xmit_complete(status))
|
||||
break;
|
||||
|
||||
}
|
||||
@@ -374,7 +374,7 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
|
||||
|
||||
}
|
||||
|
||||
- if (status != NETDEV_TX_OK) {
|
||||
+ if (!dev_xmit_complete(status)) {
|
||||
skb_queue_tail(&npinfo->txq, skb);
|
||||
schedule_delayed_work(&npinfo->tx_work,0);
|
||||
}
|
||||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
|
||||
index 9ddb05b98312..2e77e78ab226 100644
|
||||
--- a/net/ipv4/tcp_output.c
|
||||
+++ b/net/ipv4/tcp_output.c
|
||||
@@ -1943,7 +1943,7 @@ static bool tcp_can_coalesce_send_queue_head(struct sock *sk, int len)
|
||||
if (len <= skb->len)
|
||||
break;
|
||||
|
||||
- if (unlikely(TCP_SKB_CB(skb)->eor))
|
||||
+ if (unlikely(TCP_SKB_CB(skb)->eor) || tcp_has_tx_tstamp(skb))
|
||||
return false;
|
||||
|
||||
len -= skb->len;
|
||||
@@ -2066,6 +2066,7 @@ static int tcp_mtu_probe(struct sock *sk)
|
||||
* we need to propagate it to the new skb.
|
||||
*/
|
||||
TCP_SKB_CB(nskb)->eor = TCP_SKB_CB(skb)->eor;
|
||||
+ tcp_skb_collapse_tstamp(nskb, skb);
|
||||
tcp_unlink_write_queue(skb, sk);
|
||||
sk_wmem_free_skb(sk, skb);
|
||||
} else {
|
||||
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
|
||||
index 40262abb15db..e065d48b31b9 100644
|
||||
--- a/net/ipv6/mcast.c
|
||||
+++ b/net/ipv6/mcast.c
|
||||
@@ -772,12 +772,13 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
|
||||
im->idev = pmc->idev;
|
||||
im->mca_crcount = idev->mc_qrv;
|
||||
if (im->mca_sfmode == MCAST_INCLUDE) {
|
||||
- im->mca_tomb = pmc->mca_tomb;
|
||||
- im->mca_sources = pmc->mca_sources;
|
||||
+ swap(im->mca_tomb, pmc->mca_tomb);
|
||||
+ swap(im->mca_sources, pmc->mca_sources);
|
||||
for (psf = im->mca_sources; psf; psf = psf->sf_next)
|
||||
psf->sf_crcount = im->mca_crcount;
|
||||
}
|
||||
in6_dev_put(pmc->idev);
|
||||
+ ip6_mc_clear_src(pmc);
|
||||
kfree(pmc);
|
||||
}
|
||||
spin_unlock_bh(&im->mca_lock);
|
||||
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
|
||||
index fffc7c418459..834008639c4b 100644
|
||||
--- a/tools/hv/hv_kvp_daemon.c
|
||||
+++ b/tools/hv/hv_kvp_daemon.c
|
||||
@@ -878,7 +878,7 @@ kvp_get_ip_info(int family, char *if_name, int op,
|
||||
int sn_offset = 0;
|
||||
int error = 0;
|
||||
char *buffer;
|
||||
- struct hv_kvp_ipaddr_value *ip_buffer;
|
||||
+ struct hv_kvp_ipaddr_value *ip_buffer = NULL;
|
||||
char cidr_mask[5]; /* /xyz */
|
||||
int weight;
|
||||
int i;
|
||||
@ -1,399 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 946951930f62..48f79c6729ad 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 192
|
||||
+SUBLEVEL = 193
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
|
||||
index 609f0e87ced7..47c6c0401b3a 100644
|
||||
--- a/arch/powerpc/kernel/process.c
|
||||
+++ b/arch/powerpc/kernel/process.c
|
||||
@@ -476,13 +476,14 @@ void giveup_all(struct task_struct *tsk)
|
||||
if (!tsk->thread.regs)
|
||||
return;
|
||||
|
||||
+ check_if_tm_restore_required(tsk);
|
||||
+
|
||||
usermsr = tsk->thread.regs->msr;
|
||||
|
||||
if ((usermsr & msr_all_available) == 0)
|
||||
return;
|
||||
|
||||
msr_check_and_set(msr_all_available);
|
||||
- check_if_tm_restore_required(tsk);
|
||||
|
||||
#ifdef CONFIG_PPC_FPU
|
||||
if (usermsr & MSR_FP)
|
||||
diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
|
||||
index 14071a57c926..f5d74e8db432 100644
|
||||
--- a/drivers/clk/clk-s2mps11.c
|
||||
+++ b/drivers/clk/clk-s2mps11.c
|
||||
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(platform, s2mps11_clk_id);
|
||||
* This requires of_device_id table. In the same time this will not change the
|
||||
* actual *device* matching so do not add .of_match_table.
|
||||
*/
|
||||
-static const struct of_device_id s2mps11_dt_match[] = {
|
||||
+static const struct of_device_id s2mps11_dt_match[] __used = {
|
||||
{
|
||||
.compatible = "samsung,s2mps11-clk",
|
||||
.data = (void *)S2MPS11X,
|
||||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
|
||||
index 77df50dd6d30..123d85de80d6 100644
|
||||
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
|
||||
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
|
||||
@@ -264,7 +264,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
|
||||
|
||||
if ((HIGH_WORD(ebx) & MESSAGE_STATUS_SUCCESS) == 0) {
|
||||
kfree(reply);
|
||||
-
|
||||
+ reply = NULL;
|
||||
if ((HIGH_WORD(ebx) & MESSAGE_STATUS_CPT) != 0) {
|
||||
/* A checkpoint occurred. Retry. */
|
||||
continue;
|
||||
@@ -288,7 +288,7 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
|
||||
|
||||
if ((HIGH_WORD(ecx) & MESSAGE_STATUS_SUCCESS) == 0) {
|
||||
kfree(reply);
|
||||
-
|
||||
+ reply = NULL;
|
||||
if ((HIGH_WORD(ecx) & MESSAGE_STATUS_CPT) != 0) {
|
||||
/* A checkpoint occurred. Retry. */
|
||||
continue;
|
||||
@@ -300,10 +300,8 @@ static int vmw_recv_msg(struct rpc_channel *channel, void **msg,
|
||||
break;
|
||||
}
|
||||
|
||||
- if (retries == RETRIES) {
|
||||
- kfree(reply);
|
||||
+ if (!reply)
|
||||
return -EINVAL;
|
||||
- }
|
||||
|
||||
*msg_len = reply_len;
|
||||
*msg = reply;
|
||||
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
|
||||
index 3cc98c07dcd3..682fc58e1f75 100644
|
||||
--- a/drivers/vhost/test.c
|
||||
+++ b/drivers/vhost/test.c
|
||||
@@ -23,6 +23,12 @@
|
||||
* Using this limit prevents one virtqueue from starving others. */
|
||||
#define VHOST_TEST_WEIGHT 0x80000
|
||||
|
||||
+/* Max number of packets transferred before requeueing the job.
|
||||
+ * Using this limit prevents one virtqueue from starving others with
|
||||
+ * pkts.
|
||||
+ */
|
||||
+#define VHOST_TEST_PKT_WEIGHT 256
|
||||
+
|
||||
enum {
|
||||
VHOST_TEST_VQ = 0,
|
||||
VHOST_TEST_VQ_MAX = 1,
|
||||
@@ -81,10 +87,8 @@ static void handle_vq(struct vhost_test *n)
|
||||
}
|
||||
vhost_add_used_and_signal(&n->dev, vq, head, 0);
|
||||
total_len += len;
|
||||
- if (unlikely(total_len >= VHOST_TEST_WEIGHT)) {
|
||||
- vhost_poll_queue(&vq->poll);
|
||||
+ if (unlikely(vhost_exceeds_weight(vq, 0, total_len)))
|
||||
break;
|
||||
- }
|
||||
}
|
||||
|
||||
mutex_unlock(&vq->mutex);
|
||||
@@ -116,7 +120,8 @@ static int vhost_test_open(struct inode *inode, struct file *f)
|
||||
dev = &n->dev;
|
||||
vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
|
||||
n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
|
||||
- vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
|
||||
+ vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX,
|
||||
+ VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);
|
||||
|
||||
f->private_data = n;
|
||||
|
||||
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
|
||||
index 8da95d4ac4b7..b14e62f11075 100644
|
||||
--- a/drivers/vhost/vhost.c
|
||||
+++ b/drivers/vhost/vhost.c
|
||||
@@ -1987,7 +1987,7 @@ static int get_indirect(struct vhost_virtqueue *vq,
|
||||
/* If this is an input descriptor, increment that count. */
|
||||
if (access == VHOST_ACCESS_WO) {
|
||||
*in_num += ret;
|
||||
- if (unlikely(log)) {
|
||||
+ if (unlikely(log && ret)) {
|
||||
log[*log_num].addr = vhost64_to_cpu(vq, desc.addr);
|
||||
log[*log_num].len = vhost32_to_cpu(vq, desc.len);
|
||||
++*log_num;
|
||||
@@ -2123,7 +2123,7 @@ int vhost_get_vq_desc(struct vhost_virtqueue *vq,
|
||||
/* If this is an input descriptor,
|
||||
* increment that count. */
|
||||
*in_num += ret;
|
||||
- if (unlikely(log)) {
|
||||
+ if (unlikely(log && ret)) {
|
||||
log[*log_num].addr = vhost64_to_cpu(vq, desc.addr);
|
||||
log[*log_num].len = vhost32_to_cpu(vq, desc.len);
|
||||
++*log_num;
|
||||
diff --git a/include/net/ipv6_frag.h b/include/net/ipv6_frag.h
|
||||
index 28aa9b30aece..1f77fb4dc79d 100644
|
||||
--- a/include/net/ipv6_frag.h
|
||||
+++ b/include/net/ipv6_frag.h
|
||||
@@ -94,7 +94,6 @@ ip6frag_expire_frag_queue(struct net *net, struct frag_queue *fq)
|
||||
goto out;
|
||||
|
||||
head->dev = dev;
|
||||
- skb_get(head);
|
||||
spin_unlock(&fq->q.lock);
|
||||
|
||||
icmpv6_send(head, ICMPV6_TIME_EXCEED, ICMPV6_EXC_FRAGTIME, 0);
|
||||
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
|
||||
index 835c30e491c8..9e2f260cbb51 100644
|
||||
--- a/include/net/xfrm.h
|
||||
+++ b/include/net/xfrm.h
|
||||
@@ -1297,6 +1297,23 @@ static inline int xfrm_state_kern(const struct xfrm_state *x)
|
||||
return atomic_read(&x->tunnel_users);
|
||||
}
|
||||
|
||||
+static inline bool xfrm_id_proto_valid(u8 proto)
|
||||
+{
|
||||
+ switch (proto) {
|
||||
+ case IPPROTO_AH:
|
||||
+ case IPPROTO_ESP:
|
||||
+ case IPPROTO_COMP:
|
||||
+#if IS_ENABLED(CONFIG_IPV6)
|
||||
+ case IPPROTO_ROUTING:
|
||||
+ case IPPROTO_DSTOPTS:
|
||||
+#endif
|
||||
+ return true;
|
||||
+ default:
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/* IPSEC_PROTO_ANY only matches 3 IPsec protocols, 0 could match all. */
|
||||
static inline int xfrm_id_proto_match(u8 proto, u8 userproto)
|
||||
{
|
||||
return (!userproto || proto == userproto ||
|
||||
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
|
||||
index 924bb307c0fa..b314feaf91f4 100644
|
||||
--- a/kernel/sched/fair.c
|
||||
+++ b/kernel/sched/fair.c
|
||||
@@ -3882,6 +3882,8 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
|
||||
if (likely(cfs_rq->runtime_remaining > 0))
|
||||
return;
|
||||
|
||||
+ if (cfs_rq->throttled)
|
||||
+ return;
|
||||
/*
|
||||
* if we're unable to extend our runtime we resched so that the active
|
||||
* hierarchy can be throttled
|
||||
@@ -4077,6 +4079,9 @@ static u64 distribute_cfs_runtime(struct cfs_bandwidth *cfs_b,
|
||||
if (!cfs_rq_throttled(cfs_rq))
|
||||
goto next;
|
||||
|
||||
+ /* By the above check, this should never be true */
|
||||
+ SCHED_WARN_ON(cfs_rq->runtime_remaining > 0);
|
||||
+
|
||||
runtime = -cfs_rq->runtime_remaining + 1;
|
||||
if (runtime > remaining)
|
||||
runtime = remaining;
|
||||
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
|
||||
index 1ae8c59fcb2d..780700fcbe63 100644
|
||||
--- a/net/batman-adv/bat_iv_ogm.c
|
||||
+++ b/net/batman-adv/bat_iv_ogm.c
|
||||
@@ -450,17 +450,23 @@ static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)
|
||||
* batadv_iv_ogm_aggr_packet - checks if there is another OGM attached
|
||||
* @buff_pos: current position in the skb
|
||||
* @packet_len: total length of the skb
|
||||
- * @tvlv_len: tvlv length of the previously considered OGM
|
||||
+ * @ogm_packet: potential OGM in buffer
|
||||
*
|
||||
* Return: true if there is enough space for another OGM, false otherwise.
|
||||
*/
|
||||
-static bool batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
|
||||
- __be16 tvlv_len)
|
||||
+static bool
|
||||
+batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len,
|
||||
+ const struct batadv_ogm_packet *ogm_packet)
|
||||
{
|
||||
int next_buff_pos = 0;
|
||||
|
||||
- next_buff_pos += buff_pos + BATADV_OGM_HLEN;
|
||||
- next_buff_pos += ntohs(tvlv_len);
|
||||
+ /* check if there is enough space for the header */
|
||||
+ next_buff_pos += buff_pos + sizeof(*ogm_packet);
|
||||
+ if (next_buff_pos > packet_len)
|
||||
+ return false;
|
||||
+
|
||||
+ /* check if there is enough space for the optional TVLV */
|
||||
+ next_buff_pos += ntohs(ogm_packet->tvlv_len);
|
||||
|
||||
return (next_buff_pos <= packet_len) &&
|
||||
(next_buff_pos <= BATADV_MAX_AGGREGATION_BYTES);
|
||||
@@ -488,7 +494,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet,
|
||||
|
||||
/* adjust all flags and log packets */
|
||||
while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,
|
||||
- batadv_ogm_packet->tvlv_len)) {
|
||||
+ batadv_ogm_packet)) {
|
||||
/* we might have aggregated direct link packets with an
|
||||
* ordinary base packet
|
||||
*/
|
||||
@@ -1841,7 +1847,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb,
|
||||
|
||||
/* unpack the aggregated packets and process them one by one */
|
||||
while (batadv_iv_ogm_aggr_packet(ogm_offset, skb_headlen(skb),
|
||||
- ogm_packet->tvlv_len)) {
|
||||
+ ogm_packet)) {
|
||||
batadv_iv_ogm_process(skb, ogm_offset, if_incoming);
|
||||
|
||||
ogm_offset += BATADV_OGM_HLEN;
|
||||
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
|
||||
index 64cb6acbe0a6..d7ba4fd24e3d 100644
|
||||
--- a/net/batman-adv/netlink.c
|
||||
+++ b/net/batman-adv/netlink.c
|
||||
@@ -114,7 +114,7 @@ batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype)
|
||||
{
|
||||
struct nlattr *attr = nlmsg_find_attr(nlh, GENL_HDRLEN, attrtype);
|
||||
|
||||
- return attr ? nla_get_u32(attr) : 0;
|
||||
+ return (attr && nla_len(attr) == sizeof(u32)) ? nla_get_u32(attr) : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/net/key/af_key.c b/net/key/af_key.c
|
||||
index 36db179d848e..d2ec620319d7 100644
|
||||
--- a/net/key/af_key.c
|
||||
+++ b/net/key/af_key.c
|
||||
@@ -1969,8 +1969,10 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq)
|
||||
|
||||
if (rq->sadb_x_ipsecrequest_mode == 0)
|
||||
return -EINVAL;
|
||||
+ if (!xfrm_id_proto_valid(rq->sadb_x_ipsecrequest_proto))
|
||||
+ return -EINVAL;
|
||||
|
||||
- t->id.proto = rq->sadb_x_ipsecrequest_proto; /* XXX check proto */
|
||||
+ t->id.proto = rq->sadb_x_ipsecrequest_proto;
|
||||
if ((mode = pfkey_mode_to_xfrm(rq->sadb_x_ipsecrequest_mode)) < 0)
|
||||
return -EINVAL;
|
||||
t->mode = mode;
|
||||
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
|
||||
index 884f2136b34b..3734ad56b456 100644
|
||||
--- a/net/xfrm/xfrm_state.c
|
||||
+++ b/net/xfrm/xfrm_state.c
|
||||
@@ -2168,7 +2168,7 @@ void xfrm_state_fini(struct net *net)
|
||||
unsigned int sz;
|
||||
|
||||
flush_work(&net->xfrm.state_hash_work);
|
||||
- xfrm_state_flush(net, IPSEC_PROTO_ANY, false);
|
||||
+ xfrm_state_flush(net, 0, false);
|
||||
flush_work(&xfrm_state_gc_work);
|
||||
|
||||
WARN_ON(!list_empty(&net->xfrm.state_all));
|
||||
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
|
||||
index f3e9d500fa5a..ff641b2e1577 100644
|
||||
--- a/net/xfrm/xfrm_user.c
|
||||
+++ b/net/xfrm/xfrm_user.c
|
||||
@@ -1452,20 +1452,8 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- switch (ut[i].id.proto) {
|
||||
- case IPPROTO_AH:
|
||||
- case IPPROTO_ESP:
|
||||
- case IPPROTO_COMP:
|
||||
-#if IS_ENABLED(CONFIG_IPV6)
|
||||
- case IPPROTO_ROUTING:
|
||||
- case IPPROTO_DSTOPTS:
|
||||
-#endif
|
||||
- case IPSEC_PROTO_ANY:
|
||||
- break;
|
||||
- default:
|
||||
+ if (!xfrm_id_proto_valid(ut[i].id.proto))
|
||||
return -EINVAL;
|
||||
- }
|
||||
-
|
||||
}
|
||||
|
||||
return 0;
|
||||
diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
|
||||
index 381acfc4c59d..98cf6343afcd 100755
|
||||
--- a/scripts/decode_stacktrace.sh
|
||||
+++ b/scripts/decode_stacktrace.sh
|
||||
@@ -77,7 +77,7 @@ parse_symbol() {
|
||||
fi
|
||||
|
||||
# Strip out the base of the path
|
||||
- code=${code//^$basepath/""}
|
||||
+ code=${code#$basepath/}
|
||||
|
||||
# In the case of inlines, move everything to same line
|
||||
code=${code//$'\n'/' '}
|
||||
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
|
||||
index a03cf68d0bcd..12d87204e373 100644
|
||||
--- a/sound/pci/hda/hda_auto_parser.c
|
||||
+++ b/sound/pci/hda/hda_auto_parser.c
|
||||
@@ -827,6 +827,8 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
|
||||
while (id >= 0) {
|
||||
const struct hda_fixup *fix = codec->fixup_list + id;
|
||||
|
||||
+ if (++depth > 10)
|
||||
+ break;
|
||||
if (fix->chained_before)
|
||||
apply_fixup(codec, fix->chain_id, action, depth + 1);
|
||||
|
||||
@@ -866,8 +868,6 @@ static void apply_fixup(struct hda_codec *codec, int id, int action, int depth)
|
||||
}
|
||||
if (!fix->chained || fix->chained_before)
|
||||
break;
|
||||
- if (++depth > 10)
|
||||
- break;
|
||||
id = fix->chain_id;
|
||||
}
|
||||
}
|
||||
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
|
||||
index 98594cbe34c8..949c90a859fa 100644
|
||||
--- a/sound/pci/hda/hda_generic.c
|
||||
+++ b/sound/pci/hda/hda_generic.c
|
||||
@@ -5807,7 +5807,8 @@ int snd_hda_gen_init(struct hda_codec *codec)
|
||||
if (spec->init_hook)
|
||||
spec->init_hook(codec);
|
||||
|
||||
- snd_hda_apply_verbs(codec);
|
||||
+ if (!spec->skip_verbs)
|
||||
+ snd_hda_apply_verbs(codec);
|
||||
|
||||
init_multi_out(codec);
|
||||
init_extra_out(codec);
|
||||
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
|
||||
index 932b533feb48..6d1cb2fb447d 100644
|
||||
--- a/sound/pci/hda/hda_generic.h
|
||||
+++ b/sound/pci/hda/hda_generic.h
|
||||
@@ -236,6 +236,7 @@ struct hda_gen_spec {
|
||||
unsigned int indep_hp_enabled:1; /* independent HP enabled */
|
||||
unsigned int have_aamix_ctl:1;
|
||||
unsigned int hp_mic_jack_modes:1;
|
||||
+ unsigned int skip_verbs:1; /* don't apply verbs at snd_hda_gen_init() */
|
||||
|
||||
/* additional mute flags (only effective with auto_mute_via_amp=1) */
|
||||
u64 mute_bits;
|
||||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
|
||||
index 8e995fb27312..31322aeebcff 100644
|
||||
--- a/sound/pci/hda/patch_realtek.c
|
||||
+++ b/sound/pci/hda/patch_realtek.c
|
||||
@@ -773,9 +773,11 @@ static int alc_init(struct hda_codec *codec)
|
||||
if (spec->init_hook)
|
||||
spec->init_hook(codec);
|
||||
|
||||
+ spec->gen.skip_verbs = 1; /* applied in below */
|
||||
snd_hda_gen_init(codec);
|
||||
alc_fix_pll(codec);
|
||||
alc_auto_init_amp(codec, spec->init_amp);
|
||||
+ snd_hda_apply_verbs(codec); /* apply verbs here after own init */
|
||||
|
||||
snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_INIT);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,31 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0234869784fa..fc1a58ef7e56 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 204
|
||||
+SUBLEVEL = 205
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/net/core/sock.c b/net/core/sock.c
|
||||
index 9178c1654375..d22493351407 100644
|
||||
--- a/net/core/sock.c
|
||||
+++ b/net/core/sock.c
|
||||
@@ -945,12 +945,10 @@ set_rcvbuf:
|
||||
clear_bit(SOCK_PASSSEC, &sock->flags);
|
||||
break;
|
||||
case SO_MARK:
|
||||
- if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN)) {
|
||||
+ if (!ns_capable(sock_net(sk)->user_ns, CAP_NET_ADMIN))
|
||||
ret = -EPERM;
|
||||
- } else if (val != sk->sk_mark) {
|
||||
+ else
|
||||
sk->sk_mark = val;
|
||||
- sk_dst_reset(sk);
|
||||
- }
|
||||
break;
|
||||
|
||||
case SO_RXQ_OVFL:
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,901 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ed9a08ab3772..aa871ec44dd9 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 209
|
||||
+SUBLEVEL = 210
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
|
||||
index f68dcf5790ad..e05dda92398c 100644
|
||||
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
|
||||
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
|
||||
@@ -272,7 +272,7 @@ static void drm_dp_encode_sideband_req(struct drm_dp_sideband_msg_req_body *req,
|
||||
memcpy(&buf[idx], req->u.i2c_read.transactions[i].bytes, req->u.i2c_read.transactions[i].num_bytes);
|
||||
idx += req->u.i2c_read.transactions[i].num_bytes;
|
||||
|
||||
- buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 5;
|
||||
+ buf[idx] = (req->u.i2c_read.transactions[i].no_stop_bit & 0x1) << 4;
|
||||
buf[idx] |= (req->u.i2c_read.transactions[i].i2c_transaction_delay & 0xf);
|
||||
idx++;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
|
||||
index 62bcc770a181..b935d62be918 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_lrc.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_lrc.c
|
||||
@@ -1017,6 +1017,8 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
|
||||
int ret;
|
||||
struct drm_i915_private *dev_priv = engine->i915;
|
||||
uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
|
||||
+ u32 scratch_addr =
|
||||
+ i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
||||
|
||||
/* WaDisableCtxRestoreArbitration:skl,bxt */
|
||||
if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
|
||||
@@ -1036,22 +1038,17 @@ static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
|
||||
GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE));
|
||||
wa_ctx_emit(batch, index, MI_NOOP);
|
||||
|
||||
- /* WaClearSlmSpaceAtContextSwitch:kbl */
|
||||
+ /* WaClearSlmSpaceAtContextSwitch:skl,bxt,kbl,glk,cfl */
|
||||
/* Actual scratch location is at 128 bytes offset */
|
||||
- if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0)) {
|
||||
- u32 scratch_addr =
|
||||
- i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
||||
-
|
||||
- wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
|
||||
- wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |
|
||||
- PIPE_CONTROL_GLOBAL_GTT_IVB |
|
||||
- PIPE_CONTROL_CS_STALL |
|
||||
- PIPE_CONTROL_QW_WRITE));
|
||||
- wa_ctx_emit(batch, index, scratch_addr);
|
||||
- wa_ctx_emit(batch, index, 0);
|
||||
- wa_ctx_emit(batch, index, 0);
|
||||
- wa_ctx_emit(batch, index, 0);
|
||||
- }
|
||||
+ wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
|
||||
+ wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |
|
||||
+ PIPE_CONTROL_GLOBAL_GTT_IVB |
|
||||
+ PIPE_CONTROL_CS_STALL |
|
||||
+ PIPE_CONTROL_QW_WRITE));
|
||||
+ wa_ctx_emit(batch, index, scratch_addr);
|
||||
+ wa_ctx_emit(batch, index, 0);
|
||||
+ wa_ctx_emit(batch, index, 0);
|
||||
+ wa_ctx_emit(batch, index, 0);
|
||||
|
||||
/* WaMediaPoolStateCmdInWABB:bxt */
|
||||
if (HAS_POOLED_EU(engine->i915)) {
|
||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||||
index c89eb3c3965c..e382d6f23097 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -269,6 +269,12 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
|
||||
offset = report->size;
|
||||
report->size += parser->global.report_size * parser->global.report_count;
|
||||
|
||||
+ /* Total size check: Allow for possible report index byte */
|
||||
+ if (report->size > (HID_MAX_BUFFER_SIZE - 1) << 3) {
|
||||
+ hid_err(parser->device, "report is too long\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
if (!parser->local.usage_index) /* Ignore padding fields */
|
||||
return 0;
|
||||
|
||||
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
|
||||
index 9f7b1cf726a8..26e967730997 100644
|
||||
--- a/drivers/hid/hid-input.c
|
||||
+++ b/drivers/hid/hid-input.c
|
||||
@@ -1026,9 +1026,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
|
||||
}
|
||||
|
||||
mapped:
|
||||
- if (device->driver->input_mapped && device->driver->input_mapped(device,
|
||||
- hidinput, field, usage, &bit, &max) < 0)
|
||||
- goto ignore;
|
||||
+ if (device->driver->input_mapped &&
|
||||
+ device->driver->input_mapped(device, hidinput, field, usage,
|
||||
+ &bit, &max) < 0) {
|
||||
+ /*
|
||||
+ * The driver indicated that no further generic handling
|
||||
+ * of the usage is desired.
|
||||
+ */
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
set_bit(usage->type, input->evbit);
|
||||
|
||||
@@ -1087,9 +1093,11 @@ mapped:
|
||||
set_bit(MSC_SCAN, input->mscbit);
|
||||
}
|
||||
|
||||
-ignore:
|
||||
return;
|
||||
|
||||
+ignore:
|
||||
+ usage->type = 0;
|
||||
+ usage->code = 0;
|
||||
}
|
||||
|
||||
void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value)
|
||||
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
|
||||
index d02ee5304217..d9b46da0e0aa 100644
|
||||
--- a/drivers/hid/uhid.c
|
||||
+++ b/drivers/hid/uhid.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <linux/uhid.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/uaccess.h>
|
||||
+#include <linux/eventpoll.h>
|
||||
|
||||
#define UHID_NAME "uhid"
|
||||
#define UHID_BUFSIZE 32
|
||||
@@ -774,7 +775,7 @@ static unsigned int uhid_char_poll(struct file *file, poll_table *wait)
|
||||
if (uhid->head != uhid->tail)
|
||||
return POLLIN | POLLRDNORM;
|
||||
|
||||
- return 0;
|
||||
+ return EPOLLOUT | EPOLLWRNORM;
|
||||
}
|
||||
|
||||
static const struct file_operations uhid_fops = {
|
||||
diff --git a/drivers/input/input.c b/drivers/input/input.c
|
||||
index d95c34ee5dc1..5d94fc3fce0b 100644
|
||||
--- a/drivers/input/input.c
|
||||
+++ b/drivers/input/input.c
|
||||
@@ -850,16 +850,18 @@ static int input_default_setkeycode(struct input_dev *dev,
|
||||
}
|
||||
}
|
||||
|
||||
- __clear_bit(*old_keycode, dev->keybit);
|
||||
- __set_bit(ke->keycode, dev->keybit);
|
||||
-
|
||||
- for (i = 0; i < dev->keycodemax; i++) {
|
||||
- if (input_fetch_keycode(dev, i) == *old_keycode) {
|
||||
- __set_bit(*old_keycode, dev->keybit);
|
||||
- break; /* Setting the bit twice is useless, so break */
|
||||
+ if (*old_keycode <= KEY_MAX) {
|
||||
+ __clear_bit(*old_keycode, dev->keybit);
|
||||
+ for (i = 0; i < dev->keycodemax; i++) {
|
||||
+ if (input_fetch_keycode(dev, i) == *old_keycode) {
|
||||
+ __set_bit(*old_keycode, dev->keybit);
|
||||
+ /* Setting the bit twice is useless, so break */
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
+ __set_bit(ke->keycode, dev->keybit);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -915,9 +917,13 @@ int input_set_keycode(struct input_dev *dev,
|
||||
* Simulate keyup event if keycode is not present
|
||||
* in the keymap anymore
|
||||
*/
|
||||
- if (test_bit(EV_KEY, dev->evbit) &&
|
||||
- !is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
|
||||
- __test_and_clear_bit(old_keycode, dev->key)) {
|
||||
+ if (old_keycode > KEY_MAX) {
|
||||
+ dev_warn(dev->dev.parent ?: &dev->dev,
|
||||
+ "%s: got too big old keycode %#x\n",
|
||||
+ __func__, old_keycode);
|
||||
+ } else if (test_bit(EV_KEY, dev->evbit) &&
|
||||
+ !is_event_supported(old_keycode, dev->keybit, KEY_MAX) &&
|
||||
+ __test_and_clear_bit(old_keycode, dev->key)) {
|
||||
struct input_value vals[] = {
|
||||
{ EV_KEY, old_keycode, 0 },
|
||||
input_value_sync
|
||||
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
|
||||
index acb708fc1463..0a7d818a06f3 100644
|
||||
--- a/drivers/net/can/mscan/mscan.c
|
||||
+++ b/drivers/net/can/mscan/mscan.c
|
||||
@@ -392,13 +392,12 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
|
||||
struct net_device *dev = napi->dev;
|
||||
struct mscan_regs __iomem *regs = priv->reg_base;
|
||||
struct net_device_stats *stats = &dev->stats;
|
||||
- int npackets = 0;
|
||||
- int ret = 1;
|
||||
+ int work_done = 0;
|
||||
struct sk_buff *skb;
|
||||
struct can_frame *frame;
|
||||
u8 canrflg;
|
||||
|
||||
- while (npackets < quota) {
|
||||
+ while (work_done < quota) {
|
||||
canrflg = in_8(®s->canrflg);
|
||||
if (!(canrflg & (MSCAN_RXF | MSCAN_ERR_IF)))
|
||||
break;
|
||||
@@ -419,18 +418,18 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
|
||||
|
||||
stats->rx_packets++;
|
||||
stats->rx_bytes += frame->can_dlc;
|
||||
- npackets++;
|
||||
+ work_done++;
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
||||
- if (!(in_8(®s->canrflg) & (MSCAN_RXF | MSCAN_ERR_IF))) {
|
||||
- napi_complete(&priv->napi);
|
||||
- clear_bit(F_RX_PROGRESS, &priv->flags);
|
||||
- if (priv->can.state < CAN_STATE_BUS_OFF)
|
||||
- out_8(®s->canrier, priv->shadow_canrier);
|
||||
- ret = 0;
|
||||
+ if (work_done < quota) {
|
||||
+ if (likely(napi_complete_done(&priv->napi, work_done))) {
|
||||
+ clear_bit(F_RX_PROGRESS, &priv->flags);
|
||||
+ if (priv->can.state < CAN_STATE_BUS_OFF)
|
||||
+ out_8(®s->canrier, priv->shadow_canrier);
|
||||
+ }
|
||||
}
|
||||
- return ret;
|
||||
+ return work_done;
|
||||
}
|
||||
|
||||
static irqreturn_t mscan_isr(int irq, void *dev_id)
|
||||
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
|
||||
index 014b9ae3dc17..a65203e6ea5f 100644
|
||||
--- a/drivers/net/can/usb/gs_usb.c
|
||||
+++ b/drivers/net/can/usb/gs_usb.c
|
||||
@@ -927,7 +927,7 @@ static int gs_usb_probe(struct usb_interface *intf,
|
||||
GS_USB_BREQ_HOST_FORMAT,
|
||||
USB_DIR_OUT|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
|
||||
1,
|
||||
- intf->altsetting[0].desc.bInterfaceNumber,
|
||||
+ intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
hconf,
|
||||
sizeof(*hconf),
|
||||
1000);
|
||||
@@ -950,7 +950,7 @@ static int gs_usb_probe(struct usb_interface *intf,
|
||||
GS_USB_BREQ_DEVICE_CONFIG,
|
||||
USB_DIR_IN|USB_TYPE_VENDOR|USB_RECIP_INTERFACE,
|
||||
1,
|
||||
- intf->altsetting[0].desc.bInterfaceNumber,
|
||||
+ intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
dconf,
|
||||
sizeof(*dconf),
|
||||
1000);
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
index 38d45a77c06b..d0743bd25ba9 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
||||
@@ -976,8 +976,10 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter)
|
||||
}
|
||||
skb_put(skb, MWIFIEX_UPLD_SIZE);
|
||||
if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
|
||||
- PCI_DMA_FROMDEVICE))
|
||||
+ PCI_DMA_FROMDEVICE)) {
|
||||
+ kfree_skb(skb);
|
||||
return -1;
|
||||
+ }
|
||||
|
||||
card->cmdrsp_buf = skb;
|
||||
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
|
||||
index 478885afb6c6..be3be7a63cf0 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
|
||||
@@ -271,6 +271,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
|
||||
"11D: skip setting domain info in FW\n");
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
+ if (country_ie_len >
|
||||
+ (IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) {
|
||||
+ mwifiex_dbg(priv->adapter, ERROR,
|
||||
+ "11D: country_ie_len overflow!, deauth AP\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
memcpy(priv->adapter->country_code, &country_ie[2], 2);
|
||||
|
||||
domain_info->country_code[0] = country_ie[2];
|
||||
@@ -314,8 +322,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
|
||||
priv->scan_block = false;
|
||||
|
||||
if (bss) {
|
||||
- if (adapter->region_code == 0x00)
|
||||
- mwifiex_process_country_ie(priv, bss);
|
||||
+ if (adapter->region_code == 0x00 &&
|
||||
+ mwifiex_process_country_ie(priv, bss))
|
||||
+ return -EINVAL;
|
||||
|
||||
/* Allocate and fill new bss descriptor */
|
||||
bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor),
|
||||
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
index 6d34d442294a..e588a0365257 100644
|
||||
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
|
||||
@@ -5422,6 +5422,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw)
|
||||
ret = usb_submit_urb(urb, GFP_KERNEL);
|
||||
if (ret) {
|
||||
usb_unanchor_urb(urb);
|
||||
+ usb_free_urb(urb);
|
||||
goto error;
|
||||
}
|
||||
|
||||
diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c
|
||||
index d0a504af5b4f..0a70d54a4df6 100644
|
||||
--- a/drivers/scsi/bfa/bfad_attr.c
|
||||
+++ b/drivers/scsi/bfa/bfad_attr.c
|
||||
@@ -283,8 +283,10 @@ bfad_im_get_stats(struct Scsi_Host *shost)
|
||||
rc = bfa_port_get_stats(BFA_FCPORT(&bfad->bfa),
|
||||
fcstats, bfad_hcb_comp, &fcomp);
|
||||
spin_unlock_irqrestore(&bfad->bfad_lock, flags);
|
||||
- if (rc != BFA_STATUS_OK)
|
||||
+ if (rc != BFA_STATUS_OK) {
|
||||
+ kfree(fcstats);
|
||||
return NULL;
|
||||
+ }
|
||||
|
||||
wait_for_completion(&fcomp.comp);
|
||||
|
||||
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
|
||||
index 2c1b6de30da8..385e14269870 100644
|
||||
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
|
||||
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
|
||||
@@ -45,8 +45,8 @@
|
||||
#define PCI171X_RANGE_UNI BIT(4)
|
||||
#define PCI171X_RANGE_GAIN(x) (((x) & 0x7) << 0)
|
||||
#define PCI171X_MUX_REG 0x04 /* W: A/D multiplexor control */
|
||||
-#define PCI171X_MUX_CHANH(x) (((x) & 0xf) << 8)
|
||||
-#define PCI171X_MUX_CHANL(x) (((x) & 0xf) << 0)
|
||||
+#define PCI171X_MUX_CHANH(x) (((x) & 0xff) << 8)
|
||||
+#define PCI171X_MUX_CHANL(x) (((x) & 0xff) << 0)
|
||||
#define PCI171X_MUX_CHAN(x) (PCI171X_MUX_CHANH(x) | PCI171X_MUX_CHANL(x))
|
||||
#define PCI171X_STATUS_REG 0x06 /* R: status register */
|
||||
#define PCI171X_STATUS_IRQ BIT(11) /* 1=IRQ occurred */
|
||||
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
|
||||
index bfcf9e55f3c6..537a99eba6af 100644
|
||||
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
|
||||
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
|
||||
@@ -45,6 +45,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
|
||||
{USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */
|
||||
{USB_DEVICE(0x2001, 0x331B)}, /* D-Link DWA-121 rev B1 */
|
||||
{USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */
|
||||
+ {USB_DEVICE(0x2357, 0x0111)}, /* TP-Link TL-WN727N v5.21 */
|
||||
{USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */
|
||||
{} /* Terminating entry */
|
||||
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
|
||||
index 4832666cc580..5422ec1222ce 100644
|
||||
--- a/drivers/staging/vt6656/device.h
|
||||
+++ b/drivers/staging/vt6656/device.h
|
||||
@@ -269,6 +269,7 @@ struct vnt_private {
|
||||
u8 mac_hw;
|
||||
/* netdev */
|
||||
struct usb_device *usb;
|
||||
+ struct usb_interface *intf;
|
||||
|
||||
u64 tsf_time;
|
||||
u8 rx_rate;
|
||||
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
|
||||
index b1955378852a..78b09640bcf0 100644
|
||||
--- a/drivers/staging/vt6656/main_usb.c
|
||||
+++ b/drivers/staging/vt6656/main_usb.c
|
||||
@@ -972,6 +972,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
||||
priv = hw->priv;
|
||||
priv->hw = hw;
|
||||
priv->usb = udev;
|
||||
+ priv->intf = intf;
|
||||
|
||||
vnt_set_options(priv);
|
||||
|
||||
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
|
||||
index 95faaeb7432a..4dc3521932ba 100644
|
||||
--- a/drivers/staging/vt6656/wcmd.c
|
||||
+++ b/drivers/staging/vt6656/wcmd.c
|
||||
@@ -110,6 +110,7 @@ void vnt_run_command(struct work_struct *work)
|
||||
if (vnt_init(priv)) {
|
||||
/* If fail all ends TODO retry */
|
||||
dev_err(&priv->usb->dev, "failed to start\n");
|
||||
+ usb_set_intfdata(priv->intf, NULL);
|
||||
ieee80211_free_hw(priv->hw);
|
||||
return;
|
||||
}
|
||||
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
|
||||
index ae118e68b406..3701b240fcb3 100644
|
||||
--- a/drivers/tty/serial/serial_core.c
|
||||
+++ b/drivers/tty/serial/serial_core.c
|
||||
@@ -2795,6 +2795,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
|
||||
if (uport->cons && uport->dev)
|
||||
of_console_check(uport->dev->of_node, uport->cons->name, uport->line);
|
||||
|
||||
+ tty_port_link_device(port, drv->tty_driver, uport->line);
|
||||
uart_configure_port(drv, state, uport);
|
||||
|
||||
port->console = uart_console(uport);
|
||||
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
|
||||
index 111b0e0b8698..2178fe7a417b 100644
|
||||
--- a/drivers/usb/chipidea/host.c
|
||||
+++ b/drivers/usb/chipidea/host.c
|
||||
@@ -37,6 +37,7 @@ static int (*orig_bus_suspend)(struct usb_hcd *hcd);
|
||||
|
||||
struct ehci_ci_priv {
|
||||
struct regulator *reg_vbus;
|
||||
+ bool enabled;
|
||||
};
|
||||
|
||||
static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
@@ -48,7 +49,7 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
int ret = 0;
|
||||
int port = HCS_N_PORTS(ehci->hcs_params);
|
||||
|
||||
- if (priv->reg_vbus) {
|
||||
+ if (priv->reg_vbus && enable != priv->enabled) {
|
||||
if (port > 1) {
|
||||
dev_warn(dev,
|
||||
"Not support multi-port regulator control\n");
|
||||
@@ -64,6 +65,7 @@ static int ehci_ci_portpower(struct usb_hcd *hcd, int portnum, bool enable)
|
||||
enable ? "enable" : "disable", ret);
|
||||
return ret;
|
||||
}
|
||||
+ priv->enabled = enable;
|
||||
}
|
||||
|
||||
if (enable && (ci->platdata->phy_mode == USBPHY_INTERFACE_MODE_HSIC)) {
|
||||
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
|
||||
index 32f5ccd5f2c7..edf66b2f916b 100644
|
||||
--- a/drivers/usb/core/config.c
|
||||
+++ b/drivers/usb/core/config.c
|
||||
@@ -387,12 +387,16 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno,
|
||||
endpoint->desc.wMaxPacketSize = cpu_to_le16(8);
|
||||
}
|
||||
|
||||
- /* Validate the wMaxPacketSize field */
|
||||
+ /*
|
||||
+ * Validate the wMaxPacketSize field.
|
||||
+ * Some devices have isochronous endpoints in altsetting 0;
|
||||
+ * the USB-2 spec requires such endpoints to have wMaxPacketSize = 0
|
||||
+ * (see the end of section 5.6.3), so don't warn about them.
|
||||
+ */
|
||||
maxp = usb_endpoint_maxp(&endpoint->desc);
|
||||
- if (maxp == 0) {
|
||||
- dev_warn(ddev, "config %d interface %d altsetting %d endpoint 0x%X has wMaxPacketSize 0, skipping\n",
|
||||
+ if (maxp == 0 && !(usb_endpoint_xfer_isoc(d) && asnum == 0)) {
|
||||
+ dev_warn(ddev, "config %d interface %d altsetting %d endpoint 0x%X has invalid wMaxPacketSize 0\n",
|
||||
cfgno, inum, asnum, d->bEndpointAddress);
|
||||
- goto skip_to_next_endpoint_or_interface_descriptor;
|
||||
}
|
||||
|
||||
/* Find the highest legal maxpacket size for this endpoint */
|
||||
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
|
||||
index 579aa9accafc..c232229162e0 100644
|
||||
--- a/drivers/usb/musb/musb_core.c
|
||||
+++ b/drivers/usb/musb/musb_core.c
|
||||
@@ -1832,6 +1832,9 @@ static const struct attribute_group musb_attr_group = {
|
||||
#define MUSB_QUIRK_B_INVALID_VBUS_91 (MUSB_DEVCTL_BDEVICE | \
|
||||
(2 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
MUSB_DEVCTL_SESSION)
|
||||
+#define MUSB_QUIRK_B_DISCONNECT_99 (MUSB_DEVCTL_BDEVICE | \
|
||||
+ (3 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
+ MUSB_DEVCTL_SESSION)
|
||||
#define MUSB_QUIRK_A_DISCONNECT_19 ((3 << MUSB_DEVCTL_VBUS_SHIFT) | \
|
||||
MUSB_DEVCTL_SESSION)
|
||||
|
||||
@@ -1854,6 +1857,11 @@ static void musb_pm_runtime_check_session(struct musb *musb)
|
||||
s = MUSB_DEVCTL_FSDEV | MUSB_DEVCTL_LSDEV |
|
||||
MUSB_DEVCTL_HR;
|
||||
switch (devctl & ~s) {
|
||||
+ case MUSB_QUIRK_B_DISCONNECT_99:
|
||||
+ musb_dbg(musb, "Poll devctl in case of suspend after disconnect\n");
|
||||
+ schedule_delayed_work(&musb->irq_work,
|
||||
+ msecs_to_jiffies(1000));
|
||||
+ break;
|
||||
case MUSB_QUIRK_B_INVALID_VBUS_91:
|
||||
if (musb->quirk_retries--) {
|
||||
musb_dbg(musb,
|
||||
@@ -2309,6 +2317,9 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
|
||||
musb_platform_disable(musb);
|
||||
musb_generic_disable(musb);
|
||||
|
||||
+ /* MUSB_POWER_SOFTCONN might be already set, JZ4740 does this. */
|
||||
+ musb_writeb(musb->mregs, MUSB_POWER, 0);
|
||||
+
|
||||
/* Init IRQ workqueue before request_irq */
|
||||
INIT_DELAYED_WORK(&musb->irq_work, musb_irq_work);
|
||||
INIT_DELAYED_WORK(&musb->deassert_reset_work, musb_deassert_reset);
|
||||
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
|
||||
index 512108e22d2b..1dc35ab31275 100644
|
||||
--- a/drivers/usb/musb/musbhsdma.c
|
||||
+++ b/drivers/usb/musb/musbhsdma.c
|
||||
@@ -399,7 +399,7 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
|
||||
controller->controller.channel_abort = dma_channel_abort;
|
||||
|
||||
if (request_irq(irq, dma_controller_irq, 0,
|
||||
- dev_name(musb->controller), &controller->controller)) {
|
||||
+ dev_name(musb->controller), controller)) {
|
||||
dev_err(dev, "request_irq %d failed!\n", irq);
|
||||
musb_dma_controller_destroy(&controller->controller);
|
||||
|
||||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
|
||||
index 2d302ff62cc1..5ea4cd10abc7 100644
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -566,6 +566,9 @@ static void option_instat_callback(struct urb *urb);
|
||||
/* Interface is reserved */
|
||||
#define RSVD(ifnum) ((BIT(ifnum) & 0xff) << 0)
|
||||
|
||||
+/* Device needs ZLP */
|
||||
+#define ZLP BIT(17)
|
||||
+
|
||||
|
||||
static const struct usb_device_id option_ids[] = {
|
||||
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
|
||||
@@ -1193,6 +1196,8 @@ static const struct usb_device_id option_ids[] = {
|
||||
.driver_info = NCTRL(0) | RSVD(1) },
|
||||
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
|
||||
.driver_info = NCTRL(0) },
|
||||
+ { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */
|
||||
+ .driver_info = NCTRL(0) | ZLP },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
|
||||
.driver_info = RSVD(1) },
|
||||
@@ -2097,6 +2102,9 @@ static int option_attach(struct usb_serial *serial)
|
||||
if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber)))
|
||||
data->use_send_setup = 1;
|
||||
|
||||
+ if (device_flags & ZLP)
|
||||
+ data->use_zlp = 1;
|
||||
+
|
||||
spin_lock_init(&data->susp_lock);
|
||||
|
||||
usb_set_serial_data(serial, data);
|
||||
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
|
||||
index 44b25c08c68a..1d0e28538346 100644
|
||||
--- a/drivers/usb/serial/usb-wwan.h
|
||||
+++ b/drivers/usb/serial/usb-wwan.h
|
||||
@@ -35,6 +35,7 @@ struct usb_wwan_intf_private {
|
||||
spinlock_t susp_lock;
|
||||
unsigned int suspended:1;
|
||||
unsigned int use_send_setup:1;
|
||||
+ unsigned int use_zlp:1;
|
||||
int in_flight;
|
||||
unsigned int open_ports;
|
||||
void *private;
|
||||
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
|
||||
index 3dfdfc81254b..93c696e2131f 100644
|
||||
--- a/drivers/usb/serial/usb_wwan.c
|
||||
+++ b/drivers/usb/serial/usb_wwan.c
|
||||
@@ -495,6 +495,7 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port,
|
||||
void (*callback) (struct urb *))
|
||||
{
|
||||
struct usb_serial *serial = port->serial;
|
||||
+ struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
|
||||
struct urb *urb;
|
||||
|
||||
urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
|
||||
@@ -505,6 +506,9 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial_port *port,
|
||||
usb_sndbulkpipe(serial->dev, endpoint) | dir,
|
||||
buf, len, callback, ctx);
|
||||
|
||||
+ if (intfdata->use_zlp && dir == USB_DIR_OUT)
|
||||
+ urb->transfer_flags |= URB_ZERO_PACKET;
|
||||
+
|
||||
return urb;
|
||||
}
|
||||
|
||||
diff --git a/fs/char_dev.c b/fs/char_dev.c
|
||||
index a112a4745d8b..23e0477edf7d 100644
|
||||
--- a/fs/char_dev.c
|
||||
+++ b/fs/char_dev.c
|
||||
@@ -336,7 +336,7 @@ static struct kobject *cdev_get(struct cdev *p)
|
||||
|
||||
if (owner && !try_module_get(owner))
|
||||
return NULL;
|
||||
- kobj = kobject_get(&p->kobj);
|
||||
+ kobj = kobject_get_unless_zero(&p->kobj);
|
||||
if (!kobj)
|
||||
module_put(owner);
|
||||
return kobj;
|
||||
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
|
||||
index f7178f44825b..d2a497950639 100644
|
||||
--- a/include/linux/can/dev.h
|
||||
+++ b/include/linux/can/dev.h
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <linux/can/error.h>
|
||||
#include <linux/can/led.h>
|
||||
#include <linux/can/netlink.h>
|
||||
+#include <linux/can/skb.h>
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
/*
|
||||
@@ -81,6 +82,36 @@ struct can_priv {
|
||||
#define get_can_dlc(i) (min_t(__u8, (i), CAN_MAX_DLC))
|
||||
#define get_canfd_dlc(i) (min_t(__u8, (i), CANFD_MAX_DLC))
|
||||
|
||||
+/* Check for outgoing skbs that have not been created by the CAN subsystem */
|
||||
+static inline bool can_skb_headroom_valid(struct net_device *dev,
|
||||
+ struct sk_buff *skb)
|
||||
+{
|
||||
+ /* af_packet creates a headroom of HH_DATA_MOD bytes which is fine */
|
||||
+ if (WARN_ON_ONCE(skb_headroom(skb) < sizeof(struct can_skb_priv)))
|
||||
+ return false;
|
||||
+
|
||||
+ /* af_packet does not apply CAN skb specific settings */
|
||||
+ if (skb->ip_summed == CHECKSUM_NONE) {
|
||||
+ /* init headroom */
|
||||
+ can_skb_prv(skb)->ifindex = dev->ifindex;
|
||||
+ can_skb_prv(skb)->skbcnt = 0;
|
||||
+
|
||||
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
|
||||
+
|
||||
+ /* preform proper loopback on capable devices */
|
||||
+ if (dev->flags & IFF_ECHO)
|
||||
+ skb->pkt_type = PACKET_LOOPBACK;
|
||||
+ else
|
||||
+ skb->pkt_type = PACKET_HOST;
|
||||
+
|
||||
+ skb_reset_mac_header(skb);
|
||||
+ skb_reset_network_header(skb);
|
||||
+ skb_reset_transport_header(skb);
|
||||
+ }
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
/* Drop a given socketbuffer if it does not contain a valid CAN frame. */
|
||||
static inline bool can_dropped_invalid_skb(struct net_device *dev,
|
||||
struct sk_buff *skb)
|
||||
@@ -98,6 +129,9 @@ static inline bool can_dropped_invalid_skb(struct net_device *dev,
|
||||
} else
|
||||
goto inval_skb;
|
||||
|
||||
+ if (!can_skb_headroom_valid(dev, skb))
|
||||
+ goto inval_skb;
|
||||
+
|
||||
return false;
|
||||
|
||||
inval_skb:
|
||||
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
|
||||
index 5957c6a3fd7f..d9d4485ebad2 100644
|
||||
--- a/include/linux/kobject.h
|
||||
+++ b/include/linux/kobject.h
|
||||
@@ -108,6 +108,8 @@ extern int __must_check kobject_rename(struct kobject *, const char *new_name);
|
||||
extern int __must_check kobject_move(struct kobject *, struct kobject *);
|
||||
|
||||
extern struct kobject *kobject_get(struct kobject *kobj);
|
||||
+extern struct kobject * __must_check kobject_get_unless_zero(
|
||||
+ struct kobject *kobj);
|
||||
extern void kobject_put(struct kobject *kobj);
|
||||
|
||||
extern const void *kobject_namespace(struct kobject *kobj);
|
||||
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
|
||||
index 9d4399b553a3..6403f45da9d5 100644
|
||||
--- a/kernel/trace/trace_sched_wakeup.c
|
||||
+++ b/kernel/trace/trace_sched_wakeup.c
|
||||
@@ -625,7 +625,7 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
||||
if (ret) {
|
||||
pr_info("wakeup trace: Couldn't activate tracepoint"
|
||||
" probe to kernel_sched_migrate_task\n");
|
||||
- return;
|
||||
+ goto fail_deprobe_sched_switch;
|
||||
}
|
||||
|
||||
wakeup_reset(tr);
|
||||
@@ -643,6 +643,8 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
||||
printk(KERN_ERR "failed to start wakeup tracer\n");
|
||||
|
||||
return;
|
||||
+fail_deprobe_sched_switch:
|
||||
+ unregister_trace_sched_switch(probe_wakeup_sched_switch, NULL);
|
||||
fail_deprobe_wake_new:
|
||||
unregister_trace_sched_wakeup_new(probe_wakeup, NULL);
|
||||
fail_deprobe:
|
||||
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
|
||||
index 2a1abbaca10e..5d2c08efd12f 100644
|
||||
--- a/kernel/trace/trace_stack.c
|
||||
+++ b/kernel/trace/trace_stack.c
|
||||
@@ -201,6 +201,11 @@ check_stack(unsigned long ip, unsigned long *stack)
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
|
||||
+/* Some archs may not define MCOUNT_INSN_SIZE */
|
||||
+#ifndef MCOUNT_INSN_SIZE
|
||||
+# define MCOUNT_INSN_SIZE 0
|
||||
+#endif
|
||||
+
|
||||
static void
|
||||
stack_trace_call(unsigned long ip, unsigned long parent_ip,
|
||||
struct ftrace_ops *op, struct pt_regs *pt_regs)
|
||||
diff --git a/lib/kobject.c b/lib/kobject.c
|
||||
index f58c7f2b229c..bbbb067de8ec 100644
|
||||
--- a/lib/kobject.c
|
||||
+++ b/lib/kobject.c
|
||||
@@ -599,12 +599,15 @@ struct kobject *kobject_get(struct kobject *kobj)
|
||||
}
|
||||
EXPORT_SYMBOL(kobject_get);
|
||||
|
||||
-static struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj)
|
||||
+struct kobject * __must_check kobject_get_unless_zero(struct kobject *kobj)
|
||||
{
|
||||
+ if (!kobj)
|
||||
+ return NULL;
|
||||
if (!kref_get_unless_zero(&kobj->kref))
|
||||
kobj = NULL;
|
||||
return kobj;
|
||||
}
|
||||
+EXPORT_SYMBOL(kobject_get_unless_zero);
|
||||
|
||||
/*
|
||||
* kobject_cleanup - free kobject resources.
|
||||
diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
|
||||
index d35815e5967b..d819e91df90d 100644
|
||||
--- a/net/ipv4/netfilter/arp_tables.c
|
||||
+++ b/net/ipv4/netfilter/arp_tables.c
|
||||
@@ -403,10 +403,11 @@ next: ;
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static inline int check_target(struct arpt_entry *e, const char *name)
|
||||
+static int check_target(struct arpt_entry *e, struct net *net, const char *name)
|
||||
{
|
||||
struct xt_entry_target *t = arpt_get_target(e);
|
||||
struct xt_tgchk_param par = {
|
||||
+ .net = net,
|
||||
.table = name,
|
||||
.entryinfo = e,
|
||||
.target = t->u.kernel.target,
|
||||
@@ -418,8 +419,9 @@ static inline int check_target(struct arpt_entry *e, const char *name)
|
||||
return xt_check_target(&par, t->u.target_size - sizeof(*t), 0, false);
|
||||
}
|
||||
|
||||
-static inline int
|
||||
-find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
|
||||
+static int
|
||||
+find_check_entry(struct arpt_entry *e, struct net *net, const char *name,
|
||||
+ unsigned int size,
|
||||
struct xt_percpu_counter_alloc_state *alloc_state)
|
||||
{
|
||||
struct xt_entry_target *t;
|
||||
@@ -438,7 +440,7 @@ find_check_entry(struct arpt_entry *e, const char *name, unsigned int size,
|
||||
}
|
||||
t->u.kernel.target = target;
|
||||
|
||||
- ret = check_target(e, name);
|
||||
+ ret = check_target(e, net, name);
|
||||
if (ret)
|
||||
goto err;
|
||||
return 0;
|
||||
@@ -531,7 +533,9 @@ static inline void cleanup_entry(struct arpt_entry *e)
|
||||
/* Checks and translates the user-supplied table segment (held in
|
||||
* newinfo).
|
||||
*/
|
||||
-static int translate_table(struct xt_table_info *newinfo, void *entry0,
|
||||
+static int translate_table(struct net *net,
|
||||
+ struct xt_table_info *newinfo,
|
||||
+ void *entry0,
|
||||
const struct arpt_replace *repl)
|
||||
{
|
||||
struct xt_percpu_counter_alloc_state alloc_state = { 0 };
|
||||
@@ -597,7 +601,7 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0,
|
||||
/* Finally, each sanity check must pass */
|
||||
i = 0;
|
||||
xt_entry_foreach(iter, entry0, newinfo->size) {
|
||||
- ret = find_check_entry(iter, repl->name, repl->size,
|
||||
+ ret = find_check_entry(iter, net, repl->name, repl->size,
|
||||
&alloc_state);
|
||||
if (ret != 0)
|
||||
break;
|
||||
@@ -987,7 +991,7 @@ static int do_replace(struct net *net, const void __user *user,
|
||||
goto free_newinfo;
|
||||
}
|
||||
|
||||
- ret = translate_table(newinfo, loc_cpu_entry, &tmp);
|
||||
+ ret = translate_table(net, newinfo, loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
@@ -1164,7 +1168,8 @@ compat_copy_entry_from_user(struct compat_arpt_entry *e, void **dstptr,
|
||||
}
|
||||
}
|
||||
|
||||
-static int translate_compat_table(struct xt_table_info **pinfo,
|
||||
+static int translate_compat_table(struct net *net,
|
||||
+ struct xt_table_info **pinfo,
|
||||
void **pentry0,
|
||||
const struct compat_arpt_replace *compatr)
|
||||
{
|
||||
@@ -1230,7 +1235,7 @@ static int translate_compat_table(struct xt_table_info **pinfo,
|
||||
repl.num_counters = 0;
|
||||
repl.counters = NULL;
|
||||
repl.size = newinfo->size;
|
||||
- ret = translate_table(newinfo, entry1, &repl);
|
||||
+ ret = translate_table(net, newinfo, entry1, &repl);
|
||||
if (ret)
|
||||
goto free_newinfo;
|
||||
|
||||
@@ -1283,7 +1288,7 @@ static int compat_do_replace(struct net *net, void __user *user,
|
||||
goto free_newinfo;
|
||||
}
|
||||
|
||||
- ret = translate_compat_table(&newinfo, &loc_cpu_entry, &tmp);
|
||||
+ ret = translate_compat_table(net, &newinfo, &loc_cpu_entry, &tmp);
|
||||
if (ret != 0)
|
||||
goto free_newinfo;
|
||||
|
||||
@@ -1559,7 +1564,7 @@ int arpt_register_table(struct net *net,
|
||||
loc_cpu_entry = newinfo->entries;
|
||||
memcpy(loc_cpu_entry, repl->entries, repl->size);
|
||||
|
||||
- ret = translate_table(newinfo, loc_cpu_entry, repl);
|
||||
+ ret = translate_table(net, newinfo, loc_cpu_entry, repl);
|
||||
if (ret != 0)
|
||||
goto out_free;
|
||||
|
||||
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
|
||||
index 4901d17a8e63..9644dcef5a2b 100644
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -129,7 +129,8 @@ int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
|
||||
#define REXMIT_LOST 1 /* retransmit packets marked lost */
|
||||
#define REXMIT_NEW 2 /* FRTO-style transmit of unsent/new packets */
|
||||
|
||||
-static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb)
|
||||
+static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb,
|
||||
+ unsigned int len)
|
||||
{
|
||||
static bool __once __read_mostly;
|
||||
|
||||
@@ -140,8 +141,9 @@ static void tcp_gro_dev_warn(struct sock *sk, const struct sk_buff *skb)
|
||||
|
||||
rcu_read_lock();
|
||||
dev = dev_get_by_index_rcu(sock_net(sk), skb->skb_iif);
|
||||
- pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n",
|
||||
- dev ? dev->name : "Unknown driver");
|
||||
+ if (!dev || len >= dev->mtu)
|
||||
+ pr_warn("%s: Driver has suspect GRO implementation, TCP performance may be compromised.\n",
|
||||
+ dev ? dev->name : "Unknown driver");
|
||||
rcu_read_unlock();
|
||||
}
|
||||
}
|
||||
@@ -164,8 +166,10 @@ static void tcp_measure_rcv_mss(struct sock *sk, const struct sk_buff *skb)
|
||||
if (len >= icsk->icsk_ack.rcv_mss) {
|
||||
icsk->icsk_ack.rcv_mss = min_t(unsigned int, len,
|
||||
tcp_sk(sk)->advmss);
|
||||
- if (unlikely(icsk->icsk_ack.rcv_mss != len))
|
||||
- tcp_gro_dev_warn(sk, skb);
|
||||
+ /* Account for possibly-removed options */
|
||||
+ if (unlikely(len > icsk->icsk_ack.rcv_mss +
|
||||
+ MAX_TCP_OPTION_SPACE))
|
||||
+ tcp_gro_dev_warn(sk, skb, len);
|
||||
} else {
|
||||
/* Otherwise, we make more careful check taking into account,
|
||||
* that SACKs block is variable.
|
||||
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
|
||||
index fa5229fd3703..f64660e9ff87 100644
|
||||
--- a/net/netfilter/ipset/ip_set_core.c
|
||||
+++ b/net/netfilter/ipset/ip_set_core.c
|
||||
@@ -1634,6 +1634,7 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
|
||||
struct ip_set *set;
|
||||
struct nlattr *tb[IPSET_ATTR_ADT_MAX + 1] = {};
|
||||
int ret = 0;
|
||||
+ u32 lineno;
|
||||
|
||||
if (unlikely(protocol_failed(attr) ||
|
||||
!attr[IPSET_ATTR_SETNAME] ||
|
||||
@@ -1650,7 +1651,7 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
|
||||
return -IPSET_ERR_PROTOCOL;
|
||||
|
||||
rcu_read_lock_bh();
|
||||
- ret = set->variant->uadt(set, tb, IPSET_TEST, NULL, 0, 0);
|
||||
+ ret = set->variant->uadt(set, tb, IPSET_TEST, &lineno, 0, 0);
|
||||
rcu_read_unlock_bh();
|
||||
/* Userspace can't trigger element to be re-added */
|
||||
if (ret == -EAGAIN)
|
||||
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
|
||||
index da9fc08b20bb..a5299cbb09ba 100644
|
||||
--- a/sound/usb/quirks.c
|
||||
+++ b/sound/usb/quirks.c
|
||||
@@ -1141,6 +1141,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip)
|
||||
case USB_ID(0x04D8, 0xFEEA): /* Benchmark DAC1 Pre */
|
||||
case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */
|
||||
case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */
|
||||
+ case USB_ID(0x05a7, 0x1020): /* Bose Companion 5 */
|
||||
case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */
|
||||
case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */
|
||||
case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,632 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b919a66788b5..67c9106594be 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 221
|
||||
+SUBLEVEL = 222
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
|
||||
index c76e4527620c..245bcdb44c64 100644
|
||||
--- a/drivers/acpi/device_pm.c
|
||||
+++ b/drivers/acpi/device_pm.c
|
||||
@@ -226,13 +226,13 @@ int acpi_device_set_power(struct acpi_device *device, int state)
|
||||
end:
|
||||
if (result) {
|
||||
dev_warn(&device->dev, "Failed to change power state to %s\n",
|
||||
- acpi_power_state_string(state));
|
||||
+ acpi_power_state_string(target_state));
|
||||
} else {
|
||||
device->power.state = target_state;
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||
"Device [%s] transitioned to %s\n",
|
||||
device->pnp.bus_id,
|
||||
- acpi_power_state_string(state)));
|
||||
+ acpi_power_state_string(target_state)));
|
||||
}
|
||||
|
||||
return result;
|
||||
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
|
||||
index 7dd46cf5ed84..7a028b57a7ef 100644
|
||||
--- a/drivers/dma/dmatest.c
|
||||
+++ b/drivers/dma/dmatest.c
|
||||
@@ -505,8 +505,8 @@ static int dmatest_func(void *data)
|
||||
flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT;
|
||||
|
||||
ktime = ktime_get();
|
||||
- while (!kthread_should_stop()
|
||||
- && !(params->iterations && total_tests >= params->iterations)) {
|
||||
+ while (!(kthread_should_stop() ||
|
||||
+ (params->iterations && total_tests >= params->iterations))) {
|
||||
struct dma_async_tx_descriptor *tx = NULL;
|
||||
struct dmaengine_unmap_data *um;
|
||||
dma_addr_t srcs[src_cnt];
|
||||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
|
||||
index a9bf02ea0a3b..5b5970f0e91d 100644
|
||||
--- a/drivers/gpu/drm/drm_edid.c
|
||||
+++ b/drivers/gpu/drm/drm_edid.c
|
||||
@@ -3970,7 +3970,7 @@ static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *d
|
||||
struct drm_display_mode *mode;
|
||||
unsigned pixel_clock = (timings->pixel_clock[0] |
|
||||
(timings->pixel_clock[1] << 8) |
|
||||
- (timings->pixel_clock[2] << 16));
|
||||
+ (timings->pixel_clock[2] << 16)) + 1;
|
||||
unsigned hactive = (timings->hactive[0] | timings->hactive[1] << 8) + 1;
|
||||
unsigned hblank = (timings->hblank[0] | timings->hblank[1] << 8) + 1;
|
||||
unsigned hsync = (timings->hsync[0] | (timings->hsync[1] & 0x7f) << 8) + 1;
|
||||
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
|
||||
index 04270f5d110c..3e6fd393da15 100644
|
||||
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
|
||||
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
|
||||
@@ -500,9 +500,10 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
|
||||
return ret;
|
||||
|
||||
ret = qxl_release_reserve_list(release, true);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ qxl_release_free(qdev, release);
|
||||
return ret;
|
||||
-
|
||||
+ }
|
||||
cmd = (struct qxl_surface_cmd *)qxl_release_map(qdev, release);
|
||||
cmd->type = QXL_SURFACE_CMD_CREATE;
|
||||
cmd->flags = QXL_SURF_FLAG_KEEP_DATA;
|
||||
@@ -528,8 +529,8 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
|
||||
/* no need to add a release to the fence for this surface bo,
|
||||
since it is only released when we ask to destroy the surface
|
||||
and it would never signal otherwise */
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
|
||||
|
||||
surf->hw_surf_alloc = true;
|
||||
spin_lock(&qdev->surf_id_idr_lock);
|
||||
@@ -571,9 +572,8 @@ int qxl_hw_surface_dealloc(struct qxl_device *qdev,
|
||||
cmd->surface_id = id;
|
||||
qxl_release_unmap(qdev, release, &cmd->release_info);
|
||||
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
|
||||
-
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
|
||||
index a61c0d460ec2..f8a1f84c8838 100644
|
||||
--- a/drivers/gpu/drm/qxl/qxl_display.c
|
||||
+++ b/drivers/gpu/drm/qxl/qxl_display.c
|
||||
@@ -292,8 +292,8 @@ qxl_hide_cursor(struct qxl_device *qdev)
|
||||
cmd->type = QXL_CURSOR_HIDE;
|
||||
qxl_release_unmap(qdev, release, &cmd->release_info);
|
||||
|
||||
- qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -333,8 +333,8 @@ static int qxl_crtc_apply_cursor(struct drm_crtc *crtc)
|
||||
cmd->u.set.visible = 1;
|
||||
qxl_release_unmap(qdev, release, &cmd->release_info);
|
||||
|
||||
- qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
|
||||
return ret;
|
||||
|
||||
@@ -436,8 +436,8 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
|
||||
cmd->u.set.visible = 1;
|
||||
qxl_release_unmap(qdev, release, &cmd->release_info);
|
||||
|
||||
- qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
|
||||
/* finish with the userspace bo */
|
||||
ret = qxl_bo_reserve(user_bo, false);
|
||||
@@ -497,8 +497,8 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
|
||||
cmd->u.position.y = qcrtc->cur_y + qcrtc->hot_spot_y;
|
||||
qxl_release_unmap(qdev, release, &cmd->release_info);
|
||||
|
||||
- qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
|
||||
index 9b728edf1b49..d1407d162877 100644
|
||||
--- a/drivers/gpu/drm/qxl/qxl_draw.c
|
||||
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
|
||||
@@ -241,8 +241,8 @@ void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image,
|
||||
qxl_bo_physical_address(qdev, dimage->bo, 0);
|
||||
qxl_release_unmap(qdev, release, &drawable->release_info);
|
||||
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
|
||||
out_free_palette:
|
||||
if (palette_bo)
|
||||
@@ -348,9 +348,10 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
|
||||
goto out_release_backoff;
|
||||
|
||||
rects = drawable_set_clipping(qdev, num_clips, clips_bo);
|
||||
- if (!rects)
|
||||
+ if (!rects) {
|
||||
+ ret = -EINVAL;
|
||||
goto out_release_backoff;
|
||||
-
|
||||
+ }
|
||||
drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
|
||||
|
||||
drawable->clip.type = SPICE_CLIP_TYPE_RECTS;
|
||||
@@ -381,8 +382,8 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
|
||||
}
|
||||
qxl_bo_kunmap(clips_bo);
|
||||
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
|
||||
out_release_backoff:
|
||||
if (ret)
|
||||
@@ -432,8 +433,8 @@ void qxl_draw_copyarea(struct qxl_device *qdev,
|
||||
drawable->u.copy_bits.src_pos.y = sy;
|
||||
qxl_release_unmap(qdev, release, &drawable->release_info);
|
||||
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
|
||||
out_free_release:
|
||||
if (ret)
|
||||
@@ -476,8 +477,8 @@ void qxl_draw_fill(struct qxl_draw_fill *qxl_draw_fill_rec)
|
||||
|
||||
qxl_release_unmap(qdev, release, &drawable->release_info);
|
||||
|
||||
- qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
qxl_release_fence_buffer_objects(release);
|
||||
+ qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
|
||||
|
||||
out_free_release:
|
||||
if (ret)
|
||||
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
|
||||
index 5a4c8c492683..db0afb0613c9 100644
|
||||
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
|
||||
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
|
||||
@@ -256,11 +256,8 @@ static int qxl_process_single_command(struct qxl_device *qdev,
|
||||
apply_surf_reloc(qdev, &reloc_info[i]);
|
||||
}
|
||||
|
||||
+ qxl_release_fence_buffer_objects(release);
|
||||
ret = qxl_push_command_ring_release(qdev, release, cmd->type, true);
|
||||
- if (ret)
|
||||
- qxl_release_backoff_reserve_list(release);
|
||||
- else
|
||||
- qxl_release_fence_buffer_objects(release);
|
||||
|
||||
out_free_bos:
|
||||
out_free_release:
|
||||
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
|
||||
index adc46b809ef2..0555c939c948 100644
|
||||
--- a/drivers/infiniband/hw/mlx4/main.c
|
||||
+++ b/drivers/infiniband/hw/mlx4/main.c
|
||||
@@ -1589,8 +1589,9 @@ static int __mlx4_ib_create_default_rules(
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(pdefault_rules->rules_create_list); i++) {
|
||||
+ union ib_flow_spec ib_spec = {};
|
||||
int ret;
|
||||
- union ib_flow_spec ib_spec;
|
||||
+
|
||||
switch (pdefault_rules->rules_create_list[i]) {
|
||||
case 0:
|
||||
/* no rule */
|
||||
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
|
||||
index c113e46fdc3a..e6ae8d123984 100644
|
||||
--- a/drivers/iommu/amd_iommu_init.c
|
||||
+++ b/drivers/iommu/amd_iommu_init.c
|
||||
@@ -2574,7 +2574,7 @@ static int __init parse_amd_iommu_intr(char *str)
|
||||
{
|
||||
for (; *str; ++str) {
|
||||
if (strncmp(str, "legacy", 6) == 0) {
|
||||
- amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY;
|
||||
+ amd_iommu_guest_ir = AMD_IOMMU_GUEST_IR_LEGACY_GA;
|
||||
break;
|
||||
}
|
||||
if (strncmp(str, "vapic", 5) == 0) {
|
||||
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c
|
||||
index 8f9957d31a3e..1640298d90fd 100644
|
||||
--- a/drivers/md/dm-verity-fec.c
|
||||
+++ b/drivers/md/dm-verity-fec.c
|
||||
@@ -447,7 +447,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,
|
||||
fio->level++;
|
||||
|
||||
if (type == DM_VERITY_BLOCK_TYPE_METADATA)
|
||||
- block += v->data_blocks;
|
||||
+ block = block - v->hash_start + v->data_blocks;
|
||||
|
||||
/*
|
||||
* For RS(M, N), the continuous FEC data is divided into blocks of N
|
||||
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
|
||||
index 0d5b667c0e65..a9f58f3867f0 100644
|
||||
--- a/drivers/vfio/vfio_iommu_type1.c
|
||||
+++ b/drivers/vfio/vfio_iommu_type1.c
|
||||
@@ -229,8 +229,8 @@ static int vaddr_get_pfn(unsigned long vaddr, int prot, unsigned long *pfn)
|
||||
vma = find_vma_intersection(current->mm, vaddr, vaddr + 1);
|
||||
|
||||
if (vma && vma->vm_flags & VM_PFNMAP) {
|
||||
- *pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
|
||||
- if (is_invalid_reserved_pfn(*pfn))
|
||||
+ if (!follow_pfn(vma, vaddr, pfn) &&
|
||||
+ is_invalid_reserved_pfn(*pfn))
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
|
||||
index 538f378eea52..a83f353e4418 100644
|
||||
--- a/fs/btrfs/extent-tree.c
|
||||
+++ b/fs/btrfs/extent-tree.c
|
||||
@@ -10645,7 +10645,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
|
||||
path = btrfs_alloc_path();
|
||||
if (!path) {
|
||||
ret = -ENOMEM;
|
||||
- goto out;
|
||||
+ goto out_put_group;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -10684,7 +10684,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
|
||||
ret = btrfs_orphan_add(trans, inode);
|
||||
if (ret) {
|
||||
btrfs_add_delayed_iput(inode);
|
||||
- goto out;
|
||||
+ goto out_put_group;
|
||||
}
|
||||
clear_nlink(inode);
|
||||
/* One for the block groups ref */
|
||||
@@ -10707,13 +10707,13 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
|
||||
|
||||
ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1);
|
||||
if (ret < 0)
|
||||
- goto out;
|
||||
+ goto out_put_group;
|
||||
if (ret > 0)
|
||||
btrfs_release_path(path);
|
||||
if (ret == 0) {
|
||||
ret = btrfs_del_item(trans, tree_root, path);
|
||||
if (ret)
|
||||
- goto out;
|
||||
+ goto out_put_group;
|
||||
btrfs_release_path(path);
|
||||
}
|
||||
|
||||
@@ -10871,9 +10871,9 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
|
||||
|
||||
ret = remove_block_group_free_space(trans, root->fs_info, block_group);
|
||||
if (ret)
|
||||
- goto out;
|
||||
+ goto out_put_group;
|
||||
|
||||
- btrfs_put_block_group(block_group);
|
||||
+ /* Once for the block groups rbtree */
|
||||
btrfs_put_block_group(block_group);
|
||||
|
||||
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
||||
@@ -10883,6 +10883,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
|
||||
goto out;
|
||||
|
||||
ret = btrfs_del_item(trans, root, path);
|
||||
+
|
||||
+out_put_group:
|
||||
+ /* Once for the lookup reference */
|
||||
+ btrfs_put_block_group(block_group);
|
||||
out:
|
||||
btrfs_free_path(path);
|
||||
return ret;
|
||||
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
|
||||
index e049dc682e57..d8780e04aaf0 100644
|
||||
--- a/fs/ext4/inode.c
|
||||
+++ b/fs/ext4/inode.c
|
||||
@@ -4494,7 +4494,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
|
||||
gid_t i_gid;
|
||||
projid_t i_projid;
|
||||
|
||||
- if (((flags & EXT4_IGET_NORMAL) &&
|
||||
+ if ((!(flags & EXT4_IGET_SPECIAL) &&
|
||||
(ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)) ||
|
||||
(ino < EXT4_ROOT_INO) ||
|
||||
(ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))) {
|
||||
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
|
||||
index 720d92f5abfb..6c378435fa29 100644
|
||||
--- a/fs/nfs/nfs3acl.c
|
||||
+++ b/fs/nfs/nfs3acl.c
|
||||
@@ -252,37 +252,45 @@ int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
|
||||
|
||||
int nfs3_set_acl(struct inode *inode, struct posix_acl *acl, int type)
|
||||
{
|
||||
- struct posix_acl *alloc = NULL, *dfacl = NULL;
|
||||
+ struct posix_acl *orig = acl, *dfacl = NULL, *alloc;
|
||||
int status;
|
||||
|
||||
if (S_ISDIR(inode->i_mode)) {
|
||||
switch(type) {
|
||||
case ACL_TYPE_ACCESS:
|
||||
- alloc = dfacl = get_acl(inode, ACL_TYPE_DEFAULT);
|
||||
+ alloc = get_acl(inode, ACL_TYPE_DEFAULT);
|
||||
if (IS_ERR(alloc))
|
||||
goto fail;
|
||||
+ dfacl = alloc;
|
||||
break;
|
||||
|
||||
case ACL_TYPE_DEFAULT:
|
||||
- dfacl = acl;
|
||||
- alloc = acl = get_acl(inode, ACL_TYPE_ACCESS);
|
||||
+ alloc = get_acl(inode, ACL_TYPE_ACCESS);
|
||||
if (IS_ERR(alloc))
|
||||
goto fail;
|
||||
+ dfacl = acl;
|
||||
+ acl = alloc;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (acl == NULL) {
|
||||
- alloc = acl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
|
||||
+ alloc = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
|
||||
if (IS_ERR(alloc))
|
||||
goto fail;
|
||||
+ acl = alloc;
|
||||
}
|
||||
status = __nfs3_proc_setacls(inode, acl, dfacl);
|
||||
- posix_acl_release(alloc);
|
||||
+out:
|
||||
+ if (acl != orig)
|
||||
+ posix_acl_release(acl);
|
||||
+ if (dfacl != orig)
|
||||
+ posix_acl_release(dfacl);
|
||||
return status;
|
||||
|
||||
fail:
|
||||
- return PTR_ERR(alloc);
|
||||
+ status = PTR_ERR(alloc);
|
||||
+ goto out;
|
||||
}
|
||||
|
||||
const struct xattr_handler *nfs3_xattr_handlers[] = {
|
||||
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
|
||||
index 81695a492ebe..3c775d6b7317 100644
|
||||
--- a/kernel/power/hibernate.c
|
||||
+++ b/kernel/power/hibernate.c
|
||||
@@ -892,6 +892,13 @@ static int software_resume(void)
|
||||
error = freeze_processes();
|
||||
if (error)
|
||||
goto Close_Finish;
|
||||
+
|
||||
+ error = freeze_kernel_threads();
|
||||
+ if (error) {
|
||||
+ thaw_processes();
|
||||
+ goto Close_Finish;
|
||||
+ }
|
||||
+
|
||||
error = load_image_and_restore();
|
||||
thaw_processes();
|
||||
Finish:
|
||||
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
|
||||
index 772df402c495..a2b63a6a33c7 100644
|
||||
--- a/security/selinux/hooks.c
|
||||
+++ b/security/selinux/hooks.c
|
||||
@@ -5002,39 +5002,59 @@ static int selinux_tun_dev_open(void *security)
|
||||
|
||||
static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
- int err = 0;
|
||||
- u32 perm;
|
||||
+ int rc = 0;
|
||||
+ unsigned int msg_len;
|
||||
+ unsigned int data_len = skb->len;
|
||||
+ unsigned char *data = skb->data;
|
||||
struct nlmsghdr *nlh;
|
||||
struct sk_security_struct *sksec = sk->sk_security;
|
||||
+ u16 sclass = sksec->sclass;
|
||||
+ u32 perm;
|
||||
|
||||
- if (skb->len < NLMSG_HDRLEN) {
|
||||
- err = -EINVAL;
|
||||
- goto out;
|
||||
- }
|
||||
- nlh = nlmsg_hdr(skb);
|
||||
+ while (data_len >= nlmsg_total_size(0)) {
|
||||
+ nlh = (struct nlmsghdr *)data;
|
||||
|
||||
- err = selinux_nlmsg_lookup(sksec->sclass, nlh->nlmsg_type, &perm);
|
||||
- if (err) {
|
||||
- if (err == -EINVAL) {
|
||||
+ /* NOTE: the nlmsg_len field isn't reliably set by some netlink
|
||||
+ * users which means we can't reject skb's with bogus
|
||||
+ * length fields; our solution is to follow what
|
||||
+ * netlink_rcv_skb() does and simply skip processing at
|
||||
+ * messages with length fields that are clearly junk
|
||||
+ */
|
||||
+ if (nlh->nlmsg_len < NLMSG_HDRLEN || nlh->nlmsg_len > data_len)
|
||||
+ return 0;
|
||||
+
|
||||
+ rc = selinux_nlmsg_lookup(sclass, nlh->nlmsg_type, &perm);
|
||||
+ if (rc == 0) {
|
||||
+ rc = sock_has_perm(current, sk, perm);
|
||||
+ if (rc)
|
||||
+ return rc;
|
||||
+ } else if (rc == -EINVAL) {
|
||||
+ /* -EINVAL is a missing msg/perm mapping */
|
||||
pr_warn_ratelimited("SELinux: unrecognized netlink"
|
||||
- " message: protocol=%hu nlmsg_type=%hu sclass=%s"
|
||||
- " pig=%d comm=%s\n",
|
||||
- sk->sk_protocol, nlh->nlmsg_type,
|
||||
- secclass_map[sksec->sclass - 1].name,
|
||||
- task_pid_nr(current), current->comm);
|
||||
- if (!selinux_enforcing || security_get_allow_unknown())
|
||||
- err = 0;
|
||||
+ " message: protocol=%hu nlmsg_type=%hu sclass=%s"
|
||||
+ " pid=%d comm=%s\n",
|
||||
+ sk->sk_protocol, nlh->nlmsg_type,
|
||||
+ secclass_map[sclass - 1].name,
|
||||
+ task_pid_nr(current), current->comm);
|
||||
+ if (selinux_enforcing && !security_get_allow_unknown())
|
||||
+ return rc;
|
||||
+ rc = 0;
|
||||
+ } else if (rc == -ENOENT) {
|
||||
+ /* -ENOENT is a missing socket/class mapping, ignore */
|
||||
+ rc = 0;
|
||||
+ } else {
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
- /* Ignore */
|
||||
- if (err == -ENOENT)
|
||||
- err = 0;
|
||||
- goto out;
|
||||
+ /* move to the next message after applying netlink padding */
|
||||
+ msg_len = NLMSG_ALIGN(nlh->nlmsg_len);
|
||||
+ if (msg_len >= data_len)
|
||||
+ return 0;
|
||||
+ data_len -= msg_len;
|
||||
+ data += msg_len;
|
||||
}
|
||||
|
||||
- err = sock_has_perm(current, sk, perm);
|
||||
-out:
|
||||
- return err;
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NETFILTER
|
||||
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
|
||||
index 7c5d124d538c..6a7cbad90222 100644
|
||||
--- a/sound/core/oss/pcm_plugin.c
|
||||
+++ b/sound/core/oss/pcm_plugin.c
|
||||
@@ -211,21 +211,23 @@ static snd_pcm_sframes_t plug_client_size(struct snd_pcm_substream *plug,
|
||||
if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||
plugin = snd_pcm_plug_last(plug);
|
||||
while (plugin && drv_frames > 0) {
|
||||
- if (check_size && drv_frames > plugin->buf_frames)
|
||||
- drv_frames = plugin->buf_frames;
|
||||
plugin_prev = plugin->prev;
|
||||
if (plugin->src_frames)
|
||||
drv_frames = plugin->src_frames(plugin, drv_frames);
|
||||
+ if (check_size && plugin->buf_frames &&
|
||||
+ drv_frames > plugin->buf_frames)
|
||||
+ drv_frames = plugin->buf_frames;
|
||||
plugin = plugin_prev;
|
||||
}
|
||||
} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {
|
||||
plugin = snd_pcm_plug_first(plug);
|
||||
while (plugin && drv_frames > 0) {
|
||||
plugin_next = plugin->next;
|
||||
+ if (check_size && plugin->buf_frames &&
|
||||
+ drv_frames > plugin->buf_frames)
|
||||
+ drv_frames = plugin->buf_frames;
|
||||
if (plugin->dst_frames)
|
||||
drv_frames = plugin->dst_frames(plugin, drv_frames);
|
||||
- if (check_size && drv_frames > plugin->buf_frames)
|
||||
- drv_frames = plugin->buf_frames;
|
||||
plugin = plugin_next;
|
||||
}
|
||||
} else
|
||||
@@ -251,26 +253,28 @@ static snd_pcm_sframes_t plug_slave_size(struct snd_pcm_substream *plug,
|
||||
plugin = snd_pcm_plug_first(plug);
|
||||
while (plugin && frames > 0) {
|
||||
plugin_next = plugin->next;
|
||||
+ if (check_size && plugin->buf_frames &&
|
||||
+ frames > plugin->buf_frames)
|
||||
+ frames = plugin->buf_frames;
|
||||
if (plugin->dst_frames) {
|
||||
frames = plugin->dst_frames(plugin, frames);
|
||||
if (frames < 0)
|
||||
return frames;
|
||||
}
|
||||
- if (check_size && frames > plugin->buf_frames)
|
||||
- frames = plugin->buf_frames;
|
||||
plugin = plugin_next;
|
||||
}
|
||||
} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {
|
||||
plugin = snd_pcm_plug_last(plug);
|
||||
while (plugin) {
|
||||
- if (check_size && frames > plugin->buf_frames)
|
||||
- frames = plugin->buf_frames;
|
||||
plugin_prev = plugin->prev;
|
||||
if (plugin->src_frames) {
|
||||
frames = plugin->src_frames(plugin, frames);
|
||||
if (frames < 0)
|
||||
return frames;
|
||||
}
|
||||
+ if (check_size && plugin->buf_frames &&
|
||||
+ frames > plugin->buf_frames)
|
||||
+ frames = plugin->buf_frames;
|
||||
plugin = plugin_prev;
|
||||
}
|
||||
} else
|
||||
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
|
||||
index 3a9067db1a84..7fbac24607bc 100644
|
||||
--- a/sound/isa/opti9xx/miro.c
|
||||
+++ b/sound/isa/opti9xx/miro.c
|
||||
@@ -875,10 +875,13 @@ static void snd_miro_write(struct snd_miro *chip, unsigned char reg,
|
||||
spin_unlock_irqrestore(&chip->lock, flags);
|
||||
}
|
||||
|
||||
+static inline void snd_miro_write_mask(struct snd_miro *chip,
|
||||
+ unsigned char reg, unsigned char value, unsigned char mask)
|
||||
+{
|
||||
+ unsigned char oldval = snd_miro_read(chip, reg);
|
||||
|
||||
-#define snd_miro_write_mask(chip, reg, value, mask) \
|
||||
- snd_miro_write(chip, reg, \
|
||||
- (snd_miro_read(chip, reg) & ~(mask)) | ((value) & (mask)))
|
||||
+ snd_miro_write(chip, reg, (oldval & ~mask) | (value & mask));
|
||||
+}
|
||||
|
||||
/*
|
||||
* Proc Interface
|
||||
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
|
||||
index 0a5266003786..6777ae84b59e 100644
|
||||
--- a/sound/isa/opti9xx/opti92x-ad1848.c
|
||||
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
|
||||
@@ -327,10 +327,13 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
|
||||
}
|
||||
|
||||
|
||||
-#define snd_opti9xx_write_mask(chip, reg, value, mask) \
|
||||
- snd_opti9xx_write(chip, reg, \
|
||||
- (snd_opti9xx_read(chip, reg) & ~(mask)) | ((value) & (mask)))
|
||||
+static inline void snd_opti9xx_write_mask(struct snd_opti9xx *chip,
|
||||
+ unsigned char reg, unsigned char value, unsigned char mask)
|
||||
+{
|
||||
+ unsigned char oldval = snd_opti9xx_read(chip, reg);
|
||||
|
||||
+ snd_opti9xx_write(chip, reg, (oldval & ~mask) | (value & mask));
|
||||
+}
|
||||
|
||||
static int snd_opti9xx_configure(struct snd_opti9xx *chip,
|
||||
long port,
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index 7a2943a338bf..e19f447e27ae 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -1699,8 +1699,10 @@ static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
|
||||
/* Add sanity check to pass klockwork check.
|
||||
* This should never happen.
|
||||
*/
|
||||
- if (WARN_ON(spdif == NULL))
|
||||
+ if (WARN_ON(spdif == NULL)) {
|
||||
+ mutex_unlock(&codec->spdif_mutex);
|
||||
return true;
|
||||
+ }
|
||||
non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
|
||||
mutex_unlock(&codec->spdif_mutex);
|
||||
return non_pcm;
|
||||
@ -1,696 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 67c9106594be..2a923301987e 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 222
|
||||
+SUBLEVEL = 223
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
|
||||
index d3ba9f4105b5..8e04fe8325db 100644
|
||||
--- a/arch/mips/kernel/perf_event_mipsxx.c
|
||||
+++ b/arch/mips/kernel/perf_event_mipsxx.c
|
||||
@@ -1605,7 +1605,6 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
|
||||
break;
|
||||
case CPU_P5600:
|
||||
case CPU_P6600:
|
||||
- case CPU_I6400:
|
||||
/* 8-bit event numbers */
|
||||
raw_id = config & 0x1ff;
|
||||
base_id = raw_id & 0xff;
|
||||
@@ -1618,6 +1617,11 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
|
||||
raw_event.range = P;
|
||||
#endif
|
||||
break;
|
||||
+ case CPU_I6400:
|
||||
+ /* 8-bit event numbers */
|
||||
+ base_id = config & 0xff;
|
||||
+ raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
|
||||
+ break;
|
||||
case CPU_1004K:
|
||||
if (IS_BOTH_COUNTERS_1004K_EVENT(base_id))
|
||||
raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
|
||||
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
|
||||
index e0648a09d9c8..194c0ab82e7c 100644
|
||||
--- a/arch/powerpc/kernel/pci_of_scan.c
|
||||
+++ b/arch/powerpc/kernel/pci_of_scan.c
|
||||
@@ -82,10 +82,16 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
|
||||
const __be32 *addrs;
|
||||
u32 i;
|
||||
int proplen;
|
||||
+ bool mark_unset = false;
|
||||
|
||||
addrs = of_get_property(node, "assigned-addresses", &proplen);
|
||||
- if (!addrs)
|
||||
- return;
|
||||
+ if (!addrs || !proplen) {
|
||||
+ addrs = of_get_property(node, "reg", &proplen);
|
||||
+ if (!addrs || !proplen)
|
||||
+ return;
|
||||
+ mark_unset = true;
|
||||
+ }
|
||||
+
|
||||
pr_debug(" parse addresses (%d bytes) @ %p\n", proplen, addrs);
|
||||
for (; proplen >= 20; proplen -= 20, addrs += 5) {
|
||||
flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
|
||||
@@ -110,6 +116,8 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
|
||||
continue;
|
||||
}
|
||||
res->flags = flags;
|
||||
+ if (mark_unset)
|
||||
+ res->flags |= IORESOURCE_UNSET;
|
||||
res->name = pci_name(dev);
|
||||
region.start = base;
|
||||
region.end = base + size - 1;
|
||||
diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
|
||||
index 47c3d7f32900..437762a1e487 100644
|
||||
--- a/drivers/iio/adc/ad7793.c
|
||||
+++ b/drivers/iio/adc/ad7793.c
|
||||
@@ -570,7 +570,7 @@ static const struct iio_info ad7797_info = {
|
||||
.read_raw = &ad7793_read_raw,
|
||||
.write_raw = &ad7793_write_raw,
|
||||
.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
|
||||
- .attrs = &ad7793_attribute_group,
|
||||
+ .attrs = &ad7797_attribute_group,
|
||||
.validate_trigger = ad_sd_validate_trigger,
|
||||
.driver_module = THIS_MODULE,
|
||||
};
|
||||
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
|
||||
index 71525950c641..060f9b176929 100644
|
||||
--- a/drivers/net/dsa/b53/b53_common.c
|
||||
+++ b/drivers/net/dsa/b53/b53_common.c
|
||||
@@ -1109,6 +1109,7 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,
|
||||
u16 vid, struct b53_arl_entry *ent, u8 *idx,
|
||||
bool is_valid)
|
||||
{
|
||||
+ DECLARE_BITMAP(free_bins, B53_ARLTBL_MAX_BIN_ENTRIES);
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
@@ -1116,6 +1117,8 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+ bitmap_zero(free_bins, dev->num_arl_entries);
|
||||
+
|
||||
/* Read the bins */
|
||||
for (i = 0; i < dev->num_arl_entries; i++) {
|
||||
u64 mac_vid;
|
||||
@@ -1127,13 +1130,21 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,
|
||||
B53_ARLTBL_DATA_ENTRY(i), &fwd_entry);
|
||||
b53_arl_to_entry(ent, mac_vid, fwd_entry);
|
||||
|
||||
- if (!(fwd_entry & ARLTBL_VALID))
|
||||
+ if (!(fwd_entry & ARLTBL_VALID)) {
|
||||
+ set_bit(i, free_bins);
|
||||
continue;
|
||||
+ }
|
||||
if ((mac_vid & ARLTBL_MAC_MASK) != mac)
|
||||
continue;
|
||||
*idx = i;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
+ if (bitmap_weight(free_bins, dev->num_arl_entries) == 0)
|
||||
+ return -ENOSPC;
|
||||
+
|
||||
+ *idx = find_first_bit(free_bins, dev->num_arl_entries);
|
||||
+
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
@@ -1163,10 +1174,21 @@ static int b53_arl_op(struct b53_device *dev, int op, int port,
|
||||
if (op)
|
||||
return ret;
|
||||
|
||||
- /* We could not find a matching MAC, so reset to a new entry */
|
||||
- if (ret) {
|
||||
+ switch (ret) {
|
||||
+ case -ENOSPC:
|
||||
+ dev_dbg(dev->dev, "{%pM,%.4d} no space left in ARL\n",
|
||||
+ addr, vid);
|
||||
+ return is_valid ? ret : 0;
|
||||
+ case -ENOENT:
|
||||
+ /* We could not find a matching MAC, so reset to a new entry */
|
||||
+ dev_dbg(dev->dev, "{%pM,%.4d} not found, using idx: %d\n",
|
||||
+ addr, vid, idx);
|
||||
fwd_entry = 0;
|
||||
- idx = 1;
|
||||
+ break;
|
||||
+ default:
|
||||
+ dev_dbg(dev->dev, "{%pM,%.4d} found, using idx: %d\n",
|
||||
+ addr, vid, idx);
|
||||
+ break;
|
||||
}
|
||||
|
||||
memset(&ent, 0, sizeof(ent));
|
||||
diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h
|
||||
index 85c44bfba55a..3cf246c6bdcc 100644
|
||||
--- a/drivers/net/dsa/b53/b53_regs.h
|
||||
+++ b/drivers/net/dsa/b53/b53_regs.h
|
||||
@@ -280,6 +280,9 @@
|
||||
#define ARLTBL_STATIC BIT(15)
|
||||
#define ARLTBL_VALID BIT(16)
|
||||
|
||||
+/* Maximum number of bin entries in the ARL for all switches */
|
||||
+#define B53_ARLTBL_MAX_BIN_ENTRIES 4
|
||||
+
|
||||
/* ARL Search Control Register (8 bit) */
|
||||
#define B53_ARL_SRCH_CTL 0x50
|
||||
#define B53_ARL_SRCH_CTL_25 0x20
|
||||
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
|
||||
index 6519dd33c7ca..5d67dbdd943d 100644
|
||||
--- a/drivers/net/ethernet/broadcom/bcmsysport.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
|
||||
@@ -504,7 +504,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv,
|
||||
dma_addr_t mapping;
|
||||
|
||||
/* Allocate a new SKB for a new packet */
|
||||
- skb = netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH);
|
||||
+ skb = __netdev_alloc_skb(priv->netdev, RX_BUF_LENGTH,
|
||||
+ GFP_ATOMIC | __GFP_NOWARN);
|
||||
if (!skb) {
|
||||
priv->mib.alloc_rx_buff_failed++;
|
||||
netif_err(priv, rx_err, ndev, "SKB alloc failed\n");
|
||||
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||
index a23404480597..5d4189c94718 100644
|
||||
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
|
||||
@@ -1596,7 +1596,8 @@ static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv,
|
||||
dma_addr_t mapping;
|
||||
|
||||
/* Allocate a new Rx skb */
|
||||
- skb = netdev_alloc_skb(priv->dev, priv->rx_buf_len + SKB_ALIGNMENT);
|
||||
+ skb = __netdev_alloc_skb(priv->dev, priv->rx_buf_len + SKB_ALIGNMENT,
|
||||
+ GFP_ATOMIC | __GFP_NOWARN);
|
||||
if (!skb) {
|
||||
priv->mib.alloc_rx_buff_failed++;
|
||||
netif_err(priv, rx_err, priv->dev,
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
|
||||
index 25136941a964..5b91a95476de 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
|
||||
@@ -40,12 +40,16 @@ static u32 stmmac_config_sub_second_increment(void __iomem *ioaddr,
|
||||
unsigned long data;
|
||||
u32 reg_value;
|
||||
|
||||
- /* For GMAC3.x, 4.x versions, convert the ptp_clock to nano second
|
||||
- * formula = (1/ptp_clock) * 1000000000
|
||||
- * where ptp_clock is 50MHz if fine method is used to update system
|
||||
+ /* For GMAC3.x, 4.x versions, in "fine adjustement mode" set sub-second
|
||||
+ * increment to twice the number of nanoseconds of a clock cycle.
|
||||
+ * The calculation of the default_addend value by the caller will set it
|
||||
+ * to mid-range = 2^31 when the remainder of this division is zero,
|
||||
+ * which will make the accumulator overflow once every 2 ptp_clock
|
||||
+ * cycles, adding twice the number of nanoseconds of a clock cycle :
|
||||
+ * 2000000000ULL / ptp_clock.
|
||||
*/
|
||||
if (value & PTP_TCR_TSCFUPDT)
|
||||
- data = (1000000000ULL / 50000000);
|
||||
+ data = (2000000000ULL / ptp_clock);
|
||||
else
|
||||
data = (1000000000ULL / ptp_clock);
|
||||
|
||||
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
|
||||
index e74664b84925..4e4167976acf 100644
|
||||
--- a/drivers/net/wimax/i2400m/usb-fw.c
|
||||
+++ b/drivers/net/wimax/i2400m/usb-fw.c
|
||||
@@ -354,6 +354,7 @@ out:
|
||||
usb_autopm_put_interface(i2400mu->usb_iface);
|
||||
d_fnend(8, dev, "(i2400m %p ack %p size %zu) = %ld\n",
|
||||
i2400m, ack, ack_size, (long) result);
|
||||
+ usb_put_urb(¬if_urb);
|
||||
return result;
|
||||
|
||||
error_exceeded:
|
||||
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
|
||||
index 2e37097916b5..2ac966400c42 100644
|
||||
--- a/drivers/vhost/vsock.c
|
||||
+++ b/drivers/vhost/vsock.c
|
||||
@@ -460,6 +460,11 @@ static int vhost_vsock_start(struct vhost_vsock *vsock)
|
||||
mutex_unlock(&vq->mutex);
|
||||
}
|
||||
|
||||
+ /* Some packets may have been queued before the device was started,
|
||||
+ * let's kick the send worker to send them.
|
||||
+ */
|
||||
+ vhost_work_queue(&vsock->dev, &vsock->send_pkt_work);
|
||||
+
|
||||
mutex_unlock(&vsock->dev.mutex);
|
||||
return 0;
|
||||
|
||||
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
|
||||
index f2707ff795d4..c018d161735c 100644
|
||||
--- a/fs/cifs/connect.c
|
||||
+++ b/fs/cifs/connect.c
|
||||
@@ -341,8 +341,10 @@ static int reconn_set_ipaddr(struct TCP_Server_Info *server)
|
||||
return rc;
|
||||
}
|
||||
|
||||
+ spin_lock(&cifs_tcp_ses_lock);
|
||||
rc = cifs_convert_address((struct sockaddr *)&server->dstaddr, ipaddr,
|
||||
strlen(ipaddr));
|
||||
+ spin_unlock(&cifs_tcp_ses_lock);
|
||||
kfree(ipaddr);
|
||||
|
||||
return !rc ? -1 : 0;
|
||||
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
|
||||
index d3417c18ee2f..dbab3036e4f5 100644
|
||||
--- a/include/linux/ieee80211.h
|
||||
+++ b/include/linux/ieee80211.h
|
||||
@@ -619,6 +619,15 @@ static inline bool ieee80211_is_qos_nullfunc(__le16 fc)
|
||||
cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_QOS_NULLFUNC);
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * ieee80211_is_any_nullfunc - check if frame is regular or QoS nullfunc frame
|
||||
+ * @fc: frame control bytes in little-endian byteorder
|
||||
+ */
|
||||
+static inline bool ieee80211_is_any_nullfunc(__le16 fc)
|
||||
+{
|
||||
+ return (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc));
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
|
||||
* @fc: frame control field in little-endian byteorder
|
||||
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
|
||||
index 0f64fcee4ccd..8f383cca6bb1 100644
|
||||
--- a/lib/mpi/longlong.h
|
||||
+++ b/lib/mpi/longlong.h
|
||||
@@ -756,22 +756,22 @@ do { \
|
||||
do { \
|
||||
if (__builtin_constant_p(bh) && (bh) == 0) \
|
||||
__asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{aze|addze} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "%r" ((USItype)(ah)), \
|
||||
"%r" ((USItype)(al)), \
|
||||
"rI" ((USItype)(bl))); \
|
||||
else if (__builtin_constant_p(bh) && (bh) == ~(USItype) 0) \
|
||||
__asm__ ("{a%I4|add%I4c} %1,%3,%4\n\t{ame|addme} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "%r" ((USItype)(ah)), \
|
||||
"%r" ((USItype)(al)), \
|
||||
"rI" ((USItype)(bl))); \
|
||||
else \
|
||||
__asm__ ("{a%I5|add%I5c} %1,%4,%5\n\t{ae|adde} %0,%2,%3" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "%r" ((USItype)(ah)), \
|
||||
"r" ((USItype)(bh)), \
|
||||
"%r" ((USItype)(al)), \
|
||||
@@ -781,36 +781,36 @@ do { \
|
||||
do { \
|
||||
if (__builtin_constant_p(ah) && (ah) == 0) \
|
||||
__asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfze|subfze} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "r" ((USItype)(bh)), \
|
||||
"rI" ((USItype)(al)), \
|
||||
"r" ((USItype)(bl))); \
|
||||
else if (__builtin_constant_p(ah) && (ah) == ~(USItype) 0) \
|
||||
__asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{sfme|subfme} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "r" ((USItype)(bh)), \
|
||||
"rI" ((USItype)(al)), \
|
||||
"r" ((USItype)(bl))); \
|
||||
else if (__builtin_constant_p(bh) && (bh) == 0) \
|
||||
__asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{ame|addme} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "r" ((USItype)(ah)), \
|
||||
"rI" ((USItype)(al)), \
|
||||
"r" ((USItype)(bl))); \
|
||||
else if (__builtin_constant_p(bh) && (bh) == ~(USItype) 0) \
|
||||
__asm__ ("{sf%I3|subf%I3c} %1,%4,%3\n\t{aze|addze} %0,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "r" ((USItype)(ah)), \
|
||||
"rI" ((USItype)(al)), \
|
||||
"r" ((USItype)(bl))); \
|
||||
else \
|
||||
__asm__ ("{sf%I4|subf%I4c} %1,%5,%4\n\t{sfe|subfe} %0,%3,%2" \
|
||||
- : "=r" ((USItype)(sh)), \
|
||||
- "=&r" ((USItype)(sl)) \
|
||||
+ : "=r" (sh), \
|
||||
+ "=&r" (sl) \
|
||||
: "r" ((USItype)(ah)), \
|
||||
"r" ((USItype)(bh)), \
|
||||
"rI" ((USItype)(al)), \
|
||||
@@ -821,7 +821,7 @@ do { \
|
||||
do { \
|
||||
USItype __m0 = (m0), __m1 = (m1); \
|
||||
__asm__ ("mulhwu %0,%1,%2" \
|
||||
- : "=r" ((USItype) ph) \
|
||||
+ : "=r" (ph) \
|
||||
: "%r" (__m0), \
|
||||
"r" (__m1)); \
|
||||
(pl) = __m0 * __m1; \
|
||||
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
|
||||
index 048389b5aa0f..58b80270e58c 100644
|
||||
--- a/net/mac80211/mlme.c
|
||||
+++ b/net/mac80211/mlme.c
|
||||
@@ -2277,7 +2277,7 @@ void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
|
||||
if (!ieee80211_is_data(hdr->frame_control))
|
||||
return;
|
||||
|
||||
- if (ieee80211_is_nullfunc(hdr->frame_control) &&
|
||||
+ if (ieee80211_is_any_nullfunc(hdr->frame_control) &&
|
||||
sdata->u.mgd.probe_send_count > 0) {
|
||||
if (ack)
|
||||
ieee80211_sta_reset_conn_monitor(sdata);
|
||||
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
|
||||
index a6f265262f15..d3334fd84ca2 100644
|
||||
--- a/net/mac80211/rx.c
|
||||
+++ b/net/mac80211/rx.c
|
||||
@@ -1231,8 +1231,7 @@ ieee80211_rx_h_check_dup(struct ieee80211_rx_data *rx)
|
||||
return RX_CONTINUE;
|
||||
|
||||
if (ieee80211_is_ctl(hdr->frame_control) ||
|
||||
- ieee80211_is_nullfunc(hdr->frame_control) ||
|
||||
- ieee80211_is_qos_nullfunc(hdr->frame_control) ||
|
||||
+ ieee80211_is_any_nullfunc(hdr->frame_control) ||
|
||||
is_multicast_ether_addr(hdr->addr1))
|
||||
return RX_CONTINUE;
|
||||
|
||||
@@ -1617,8 +1616,7 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
|
||||
* Drop (qos-)data::nullfunc frames silently, since they
|
||||
* are used only to control station power saving mode.
|
||||
*/
|
||||
- if (ieee80211_is_nullfunc(hdr->frame_control) ||
|
||||
- ieee80211_is_qos_nullfunc(hdr->frame_control)) {
|
||||
+ if (ieee80211_is_any_nullfunc(hdr->frame_control)) {
|
||||
I802_DEBUG_INC(rx->local->rx_handlers_drop_nullfunc);
|
||||
|
||||
/*
|
||||
@@ -2112,7 +2110,7 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)
|
||||
|
||||
/* Drop unencrypted frames if key is set. */
|
||||
if (unlikely(!ieee80211_has_protected(fc) &&
|
||||
- !ieee80211_is_nullfunc(fc) &&
|
||||
+ !ieee80211_is_any_nullfunc(fc) &&
|
||||
ieee80211_is_data(fc) && rx->key))
|
||||
return -EACCES;
|
||||
|
||||
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
|
||||
index 246d113bd755..1d81064b241d 100644
|
||||
--- a/net/mac80211/status.c
|
||||
+++ b/net/mac80211/status.c
|
||||
@@ -480,8 +480,7 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local,
|
||||
rcu_read_lock();
|
||||
sdata = ieee80211_sdata_from_skb(local, skb);
|
||||
if (sdata) {
|
||||
- if (ieee80211_is_nullfunc(hdr->frame_control) ||
|
||||
- ieee80211_is_qos_nullfunc(hdr->frame_control))
|
||||
+ if (ieee80211_is_any_nullfunc(hdr->frame_control))
|
||||
cfg80211_probe_status(sdata->dev, hdr->addr1,
|
||||
cookie, acked,
|
||||
GFP_ATOMIC);
|
||||
@@ -914,7 +913,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
|
||||
I802_DEBUG_INC(local->dot11FailedCount);
|
||||
}
|
||||
|
||||
- if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc) &&
|
||||
+ if (ieee80211_is_any_nullfunc(fc) && ieee80211_has_pm(fc) &&
|
||||
ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS) &&
|
||||
!(info->flags & IEEE80211_TX_CTL_INJECTED) &&
|
||||
local->ps_sdata && !(local->scanning)) {
|
||||
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
|
||||
index 850264fac378..6216279efc46 100644
|
||||
--- a/net/mac80211/tx.c
|
||||
+++ b/net/mac80211/tx.c
|
||||
@@ -294,7 +294,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
|
||||
if (unlikely(test_bit(SCAN_SW_SCANNING, &tx->local->scanning)) &&
|
||||
test_bit(SDATA_STATE_OFFCHANNEL, &tx->sdata->state) &&
|
||||
!ieee80211_is_probe_req(hdr->frame_control) &&
|
||||
- !ieee80211_is_nullfunc(hdr->frame_control))
|
||||
+ !ieee80211_is_any_nullfunc(hdr->frame_control))
|
||||
/*
|
||||
* When software scanning only nullfunc frames (to notify
|
||||
* the sleep state to the AP) and probe requests (for the
|
||||
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
|
||||
index fc67d356b5fa..acb0c2631c79 100644
|
||||
--- a/net/sctp/sm_make_chunk.c
|
||||
+++ b/net/sctp/sm_make_chunk.c
|
||||
@@ -856,7 +856,11 @@ struct sctp_chunk *sctp_make_shutdown(const struct sctp_association *asoc,
|
||||
sctp_shutdownhdr_t shut;
|
||||
__u32 ctsn;
|
||||
|
||||
- ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
|
||||
+ if (chunk && chunk->asoc)
|
||||
+ ctsn = sctp_tsnmap_get_ctsn(&chunk->asoc->peer.tsn_map);
|
||||
+ else
|
||||
+ ctsn = sctp_tsnmap_get_ctsn(&asoc->peer.tsn_map);
|
||||
+
|
||||
shut.cum_tsn_ack = htonl(ctsn);
|
||||
|
||||
retval = sctp_make_control(asoc, SCTP_CID_SHUTDOWN, 0,
|
||||
diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
|
||||
index 2c472e1b4827..a84c3b681699 100644
|
||||
--- a/net/sunrpc/xprtrdma/backchannel.c
|
||||
+++ b/net/sunrpc/xprtrdma/backchannel.c
|
||||
@@ -71,21 +71,13 @@ out_fail:
|
||||
static int rpcrdma_bc_setup_reps(struct rpcrdma_xprt *r_xprt,
|
||||
unsigned int count)
|
||||
{
|
||||
- struct rpcrdma_rep *rep;
|
||||
int rc = 0;
|
||||
|
||||
while (count--) {
|
||||
- rep = rpcrdma_create_rep(r_xprt);
|
||||
- if (IS_ERR(rep)) {
|
||||
- pr_err("RPC: %s: reply buffer alloc failed\n",
|
||||
- __func__);
|
||||
- rc = PTR_ERR(rep);
|
||||
+ rc = rpcrdma_create_rep(r_xprt);
|
||||
+ if (rc)
|
||||
break;
|
||||
- }
|
||||
-
|
||||
- rpcrdma_recv_buffer_put(rep);
|
||||
}
|
||||
-
|
||||
return rc;
|
||||
}
|
||||
|
||||
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
|
||||
index 1a2b1f61ed26..915a1ddabe03 100644
|
||||
--- a/net/sunrpc/xprtrdma/verbs.c
|
||||
+++ b/net/sunrpc/xprtrdma/verbs.c
|
||||
@@ -891,10 +891,17 @@ rpcrdma_create_req(struct rpcrdma_xprt *r_xprt)
|
||||
return req;
|
||||
}
|
||||
|
||||
-struct rpcrdma_rep *
|
||||
-rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt)
|
||||
+/**
|
||||
+ * rpcrdma_create_rep - Allocate an rpcrdma_rep object
|
||||
+ * @r_xprt: controlling transport
|
||||
+ *
|
||||
+ * Returns 0 on success or a negative errno on failure.
|
||||
+ */
|
||||
+int
|
||||
+ rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt)
|
||||
{
|
||||
struct rpcrdma_create_data_internal *cdata = &r_xprt->rx_data;
|
||||
+ struct rpcrdma_buffer *buf = &r_xprt->rx_buf;
|
||||
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
||||
struct rpcrdma_rep *rep;
|
||||
int rc;
|
||||
@@ -919,12 +926,18 @@ rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt)
|
||||
rep->rr_recv_wr.wr_cqe = &rep->rr_cqe;
|
||||
rep->rr_recv_wr.sg_list = &rep->rr_rdmabuf->rg_iov;
|
||||
rep->rr_recv_wr.num_sge = 1;
|
||||
- return rep;
|
||||
+
|
||||
+ spin_lock(&buf->rb_lock);
|
||||
+ list_add(&rep->rr_list, &buf->rb_recv_bufs);
|
||||
+ spin_unlock(&buf->rb_lock);
|
||||
+ return 0;
|
||||
|
||||
out_free:
|
||||
kfree(rep);
|
||||
out:
|
||||
- return ERR_PTR(rc);
|
||||
+ dprintk("RPC: %s: reply buffer %d alloc failed\n",
|
||||
+ __func__, rc);
|
||||
+ return rc;
|
||||
}
|
||||
|
||||
int
|
||||
@@ -967,17 +980,10 @@ rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)
|
||||
}
|
||||
|
||||
INIT_LIST_HEAD(&buf->rb_recv_bufs);
|
||||
- for (i = 0; i < buf->rb_max_requests + RPCRDMA_MAX_BC_REQUESTS; i++) {
|
||||
- struct rpcrdma_rep *rep;
|
||||
-
|
||||
- rep = rpcrdma_create_rep(r_xprt);
|
||||
- if (IS_ERR(rep)) {
|
||||
- dprintk("RPC: %s: reply buffer %d alloc failed\n",
|
||||
- __func__, i);
|
||||
- rc = PTR_ERR(rep);
|
||||
+ for (i = 0; i <= buf->rb_max_requests; i++) {
|
||||
+ rc = rpcrdma_create_rep(r_xprt);
|
||||
+ if (rc)
|
||||
goto out;
|
||||
- }
|
||||
- list_add(&rep->rr_list, &buf->rb_recv_bufs);
|
||||
}
|
||||
|
||||
return 0;
|
||||
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
|
||||
index 48989d5b2883..002305c38f7c 100644
|
||||
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
|
||||
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
|
||||
@@ -502,8 +502,8 @@ int rpcrdma_ep_post_recv(struct rpcrdma_ia *, struct rpcrdma_rep *);
|
||||
* Buffer calls - xprtrdma/verbs.c
|
||||
*/
|
||||
struct rpcrdma_req *rpcrdma_create_req(struct rpcrdma_xprt *);
|
||||
-struct rpcrdma_rep *rpcrdma_create_rep(struct rpcrdma_xprt *);
|
||||
void rpcrdma_destroy_req(struct rpcrdma_req *);
|
||||
+int rpcrdma_create_rep(struct rpcrdma_xprt *r_xprt);
|
||||
int rpcrdma_buffer_create(struct rpcrdma_xprt *);
|
||||
void rpcrdma_buffer_destroy(struct rpcrdma_buffer *);
|
||||
|
||||
diff --git a/scripts/config b/scripts/config
|
||||
index 026aeb4f32ee..73de17d39698 100755
|
||||
--- a/scripts/config
|
||||
+++ b/scripts/config
|
||||
@@ -6,6 +6,9 @@ myname=${0##*/}
|
||||
# If no prefix forced, use the default CONFIG_
|
||||
CONFIG_="${CONFIG_-CONFIG_}"
|
||||
|
||||
+# We use an uncommon delimiter for sed substitutions
|
||||
+SED_DELIM=$(echo -en "\001")
|
||||
+
|
||||
usage() {
|
||||
cat >&2 <<EOL
|
||||
Manipulate options in a .config file from the command line.
|
||||
@@ -82,7 +85,7 @@ txt_subst() {
|
||||
local infile="$3"
|
||||
local tmpfile="$infile.swp"
|
||||
|
||||
- sed -e "s:$before:$after:" "$infile" >"$tmpfile"
|
||||
+ sed -e "s$SED_DELIM$before$SED_DELIM$after$SED_DELIM" "$infile" >"$tmpfile"
|
||||
# replace original file with the edited one
|
||||
mv "$tmpfile" "$infile"
|
||||
}
|
||||
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
|
||||
index ab16b81c0c7f..16a692fc7f64 100644
|
||||
--- a/sound/pci/hda/hda_intel.c
|
||||
+++ b/sound/pci/hda/hda_intel.c
|
||||
@@ -1966,9 +1966,10 @@ static const struct hdac_io_ops pci_hda_io_ops = {
|
||||
* some HD-audio PCI entries are exposed without any codecs, and such devices
|
||||
* should be ignored from the beginning.
|
||||
*/
|
||||
-static const struct snd_pci_quirk driver_blacklist[] = {
|
||||
- SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0),
|
||||
- SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0),
|
||||
+static const struct pci_device_id driver_blacklist[] = {
|
||||
+ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */
|
||||
+ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */
|
||||
+ { PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -1991,7 +1992,7 @@ static int azx_probe(struct pci_dev *pci,
|
||||
bool schedule_probe;
|
||||
int err;
|
||||
|
||||
- if (snd_pci_quirk_lookup(pci, driver_blacklist)) {
|
||||
+ if (pci_match_id(driver_blacklist, pci)) {
|
||||
dev_info(&pci->dev, "Skipping the blacklisted device\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
|
||||
index 39810b713d5f..0c2a1413a8f5 100644
|
||||
--- a/sound/soc/codecs/sgtl5000.c
|
||||
+++ b/sound/soc/codecs/sgtl5000.c
|
||||
@@ -1464,6 +1464,40 @@ static int sgtl5000_i2c_probe(struct i2c_client *client,
|
||||
dev_err(&client->dev,
|
||||
"Error %d initializing CHIP_CLK_CTRL\n", ret);
|
||||
|
||||
+ /* Mute everything to avoid pop from the following power-up */
|
||||
+ ret = regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_CTRL,
|
||||
+ SGTL5000_CHIP_ANA_CTRL_DEFAULT);
|
||||
+ if (ret) {
|
||||
+ dev_err(&client->dev,
|
||||
+ "Error %d muting outputs via CHIP_ANA_CTRL\n", ret);
|
||||
+ goto disable_clk;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
+ * If VAG is powered-on (e.g. from previous boot), it would be disabled
|
||||
+ * by the write to ANA_POWER in later steps of the probe code. This
|
||||
+ * may create a loud pop even with all outputs muted. The proper way
|
||||
+ * to circumvent this is disabling the bit first and waiting the proper
|
||||
+ * cool-down time.
|
||||
+ */
|
||||
+ ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, &value);
|
||||
+ if (ret) {
|
||||
+ dev_err(&client->dev, "Failed to read ANA_POWER: %d\n", ret);
|
||||
+ goto disable_clk;
|
||||
+ }
|
||||
+ if (value & SGTL5000_VAG_POWERUP) {
|
||||
+ ret = regmap_update_bits(sgtl5000->regmap,
|
||||
+ SGTL5000_CHIP_ANA_POWER,
|
||||
+ SGTL5000_VAG_POWERUP,
|
||||
+ 0);
|
||||
+ if (ret) {
|
||||
+ dev_err(&client->dev, "Error %d disabling VAG\n", ret);
|
||||
+ goto disable_clk;
|
||||
+ }
|
||||
+
|
||||
+ msleep(SGTL5000_VAG_POWERDOWN_DELAY);
|
||||
+ }
|
||||
+
|
||||
/* Follow section 2.2.1.1 of AN3663 */
|
||||
ana_pwr = SGTL5000_ANA_POWER_DEFAULT;
|
||||
if (sgtl5000->num_supplies <= VDDD) {
|
||||
diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h
|
||||
index 22f3442af982..9ea41749d037 100644
|
||||
--- a/sound/soc/codecs/sgtl5000.h
|
||||
+++ b/sound/soc/codecs/sgtl5000.h
|
||||
@@ -236,6 +236,7 @@
|
||||
/*
|
||||
* SGTL5000_CHIP_ANA_CTRL
|
||||
*/
|
||||
+#define SGTL5000_CHIP_ANA_CTRL_DEFAULT 0x0133
|
||||
#define SGTL5000_LINE_OUT_MUTE 0x0100
|
||||
#define SGTL5000_HP_SEL_MASK 0x0040
|
||||
#define SGTL5000_HP_SEL_SHIFT 6
|
||||
diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c
|
||||
index 1b2ce334bb3f..47c074d73e61 100644
|
||||
--- a/tools/testing/selftests/ipc/msgque.c
|
||||
+++ b/tools/testing/selftests/ipc/msgque.c
|
||||
@@ -135,7 +135,7 @@ int dump_queue(struct msgque_data *msgque)
|
||||
for (kern_id = 0; kern_id < 256; kern_id++) {
|
||||
ret = msgctl(kern_id, MSG_STAT, &ds);
|
||||
if (ret < 0) {
|
||||
- if (errno == -EINVAL)
|
||||
+ if (errno == EINVAL)
|
||||
continue;
|
||||
printf("Failed to get stats for IPC queue with id %d\n",
|
||||
kern_id);
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,601 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 82bb1b27d2f57..a6a9d494dc18f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 239
|
||||
+SUBLEVEL = 240
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
|
||||
index 20f35df8a01fa..4f4884521a877 100644
|
||||
--- a/drivers/crypto/qat/qat_common/qat_algs.c
|
||||
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
|
||||
@@ -822,6 +822,11 @@ static int qat_alg_aead_dec(struct aead_request *areq)
|
||||
struct icp_qat_fw_la_bulk_req *msg;
|
||||
int digst_size = crypto_aead_authsize(aead_tfm);
|
||||
int ret, ctr = 0;
|
||||
+ u32 cipher_len;
|
||||
+
|
||||
+ cipher_len = areq->cryptlen - digst_size;
|
||||
+ if (cipher_len % AES_BLOCK_SIZE != 0)
|
||||
+ return -EINVAL;
|
||||
|
||||
ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req);
|
||||
if (unlikely(ret))
|
||||
@@ -836,7 +841,7 @@ static int qat_alg_aead_dec(struct aead_request *areq)
|
||||
qat_req->req.comn_mid.src_data_addr = qat_req->buf.blp;
|
||||
qat_req->req.comn_mid.dest_data_addr = qat_req->buf.bloutp;
|
||||
cipher_param = (void *)&qat_req->req.serv_specif_rqpars;
|
||||
- cipher_param->cipher_length = areq->cryptlen - digst_size;
|
||||
+ cipher_param->cipher_length = cipher_len;
|
||||
cipher_param->cipher_offset = areq->assoclen;
|
||||
memcpy(cipher_param->u.cipher_IV_array, areq->iv, AES_BLOCK_SIZE);
|
||||
auth_param = (void *)((uint8_t *)cipher_param + sizeof(*cipher_param));
|
||||
@@ -865,6 +870,9 @@ static int qat_alg_aead_enc(struct aead_request *areq)
|
||||
uint8_t *iv = areq->iv;
|
||||
int ret, ctr = 0;
|
||||
|
||||
+ if (areq->cryptlen % AES_BLOCK_SIZE != 0)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req);
|
||||
if (unlikely(ret))
|
||||
return ret;
|
||||
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
|
||||
index d8ce7d75ff187..fcbabd2a41144 100644
|
||||
--- a/drivers/media/usb/usbtv/usbtv-core.c
|
||||
+++ b/drivers/media/usb/usbtv/usbtv-core.c
|
||||
@@ -110,7 +110,8 @@ static int usbtv_probe(struct usb_interface *intf,
|
||||
|
||||
usbtv_audio_fail:
|
||||
/* we must not free at this point */
|
||||
- usb_get_dev(usbtv->udev);
|
||||
+ v4l2_device_get(&usbtv->v4l2_dev);
|
||||
+ /* this will undo the v4l2_device_get() */
|
||||
usbtv_video_free(usbtv);
|
||||
|
||||
usbtv_video_fail:
|
||||
diff --git a/drivers/staging/comedi/drivers/vmk80xx.c b/drivers/staging/comedi/drivers/vmk80xx.c
|
||||
index 1800eb3ae0176..cdf86284dd047 100644
|
||||
--- a/drivers/staging/comedi/drivers/vmk80xx.c
|
||||
+++ b/drivers/staging/comedi/drivers/vmk80xx.c
|
||||
@@ -676,6 +676,9 @@ static int vmk80xx_find_usb_endpoints(struct comedi_device *dev)
|
||||
if (!devpriv->ep_rx || !devpriv->ep_tx)
|
||||
return -ENODEV;
|
||||
|
||||
+ if (!usb_endpoint_maxp(devpriv->ep_rx) || !usb_endpoint_maxp(devpriv->ep_tx))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
|
||||
index 838123dc390ca..c9f979063af13 100644
|
||||
--- a/drivers/usb/serial/ftdi_sio.c
|
||||
+++ b/drivers/usb/serial/ftdi_sio.c
|
||||
@@ -1032,6 +1032,11 @@ static const struct usb_device_id id_table_combined[] = {
|
||||
/* U-Blox devices */
|
||||
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
|
||||
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },
|
||||
+ /* FreeCalypso USB adapters */
|
||||
+ { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID),
|
||||
+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
|
||||
+ { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID),
|
||||
+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
||||
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
|
||||
index c33e06752b5f0..f3302516a1e4f 100644
|
||||
--- a/drivers/usb/serial/ftdi_sio_ids.h
|
||||
+++ b/drivers/usb/serial/ftdi_sio_ids.h
|
||||
@@ -38,6 +38,13 @@
|
||||
|
||||
#define FTDI_LUMEL_PD12_PID 0x6002
|
||||
|
||||
+/*
|
||||
+ * Custom USB adapters made by Falconia Partners LLC
|
||||
+ * for FreeCalypso project, ID codes allocated to Falconia by FTDI.
|
||||
+ */
|
||||
+#define FTDI_FALCONIA_JTAG_BUF_PID 0x7150
|
||||
+#define FTDI_FALCONIA_JTAG_UNBUF_PID 0x7151
|
||||
+
|
||||
/* Sienna Serial Interface by Secyourit GmbH */
|
||||
#define FTDI_SIENNA_PID 0x8348
|
||||
|
||||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
|
||||
index 8cff50ef4fd14..5017d37afe392 100644
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -529,6 +529,7 @@ static void option_instat_callback(struct urb *urb);
|
||||
/* Cellient products */
|
||||
#define CELLIENT_VENDOR_ID 0x2692
|
||||
#define CELLIENT_PRODUCT_MEN200 0x9005
|
||||
+#define CELLIENT_PRODUCT_MPL200 0x9025
|
||||
|
||||
/* Hyundai Petatel Inc. products */
|
||||
#define PETATEL_VENDOR_ID 0x1ff4
|
||||
@@ -1171,6 +1172,8 @@ static const struct usb_device_id option_ids[] = {
|
||||
.driver_info = NCTRL(2) | RSVD(3) },
|
||||
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff), /* Telit FN980 (ECM) */
|
||||
.driver_info = NCTRL(0) | RSVD(1) },
|
||||
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1054, 0xff), /* Telit FT980-KS */
|
||||
+ .driver_info = NCTRL(2) | RSVD(3) },
|
||||
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
|
||||
.driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
|
||||
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
|
||||
@@ -1967,6 +1970,8 @@ static const struct usb_device_id option_ids[] = {
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
|
||||
{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
|
||||
+ { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MPL200),
|
||||
+ .driver_info = RSVD(1) | RSVD(4) },
|
||||
{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600A) },
|
||||
{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, TPLINK_PRODUCT_LTE, 0xff, 0x00, 0x00) }, /* TP-Link LTE Module */
|
||||
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
|
||||
index 4fcded2971d1d..bf5533d6d83bd 100644
|
||||
--- a/drivers/usb/serial/pl2303.c
|
||||
+++ b/drivers/usb/serial/pl2303.c
|
||||
@@ -89,6 +89,7 @@ static const struct usb_device_id id_table[] = {
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) },
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LD220TA_PRODUCT_ID) },
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LD381_PRODUCT_ID) },
|
||||
+ { USB_DEVICE(HP_VENDOR_ID, HP_LD381GC_PRODUCT_ID) },
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LD960_PRODUCT_ID) },
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LD960TA_PRODUCT_ID) },
|
||||
{ USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },
|
||||
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
|
||||
index 54d2fb974a418..9d27c076f477e 100644
|
||||
--- a/drivers/usb/serial/pl2303.h
|
||||
+++ b/drivers/usb/serial/pl2303.h
|
||||
@@ -125,6 +125,7 @@
|
||||
|
||||
/* Hewlett-Packard POS Pole Displays */
|
||||
#define HP_VENDOR_ID 0x03f0
|
||||
+#define HP_LD381GC_PRODUCT_ID 0x0183
|
||||
#define HP_LM920_PRODUCT_ID 0x026b
|
||||
#define HP_TD620_PRODUCT_ID 0x0956
|
||||
#define HP_LD960_PRODUCT_ID 0x0b39
|
||||
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
|
||||
index 9531b6c18ac7b..897154e993800 100644
|
||||
--- a/fs/reiserfs/inode.c
|
||||
+++ b/fs/reiserfs/inode.c
|
||||
@@ -1554,11 +1554,7 @@ void reiserfs_read_locked_inode(struct inode *inode,
|
||||
* set version 1, version 2 could be used too, because stat data
|
||||
* key is the same in both versions
|
||||
*/
|
||||
- key.version = KEY_FORMAT_3_5;
|
||||
- key.on_disk_key.k_dir_id = dirino;
|
||||
- key.on_disk_key.k_objectid = inode->i_ino;
|
||||
- key.on_disk_key.k_offset = 0;
|
||||
- key.on_disk_key.k_type = 0;
|
||||
+ _make_cpu_key(&key, KEY_FORMAT_3_5, dirino, inode->i_ino, 0, 0, 3);
|
||||
|
||||
/* look for the object's stat data */
|
||||
retval = search_item(inode->i_sb, &key, &path_to_sd);
|
||||
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
|
||||
index 07900105523f0..645ee1bbd0255 100644
|
||||
--- a/fs/reiserfs/xattr.c
|
||||
+++ b/fs/reiserfs/xattr.c
|
||||
@@ -664,6 +664,13 @@ reiserfs_xattr_get(struct inode *inode, const char *name, void *buffer,
|
||||
if (get_inode_sd_version(inode) == STAT_DATA_V1)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
+ /*
|
||||
+ * priv_root needn't be initialized during mount so allow initial
|
||||
+ * lookups to succeed.
|
||||
+ */
|
||||
+ if (!REISERFS_SB(inode->i_sb)->priv_root)
|
||||
+ return 0;
|
||||
+
|
||||
dentry = xattr_lookup(inode, name, XATTR_REPLACE);
|
||||
if (IS_ERR(dentry)) {
|
||||
err = PTR_ERR(dentry);
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index 57a7dba49d298..52b5352e8fe08 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -1250,16 +1250,34 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
|
||||
conn->security_cfm_cb(conn, status);
|
||||
}
|
||||
|
||||
-static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
|
||||
- __u8 encrypt)
|
||||
+static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status)
|
||||
{
|
||||
struct hci_cb *cb;
|
||||
+ __u8 encrypt;
|
||||
+
|
||||
+ if (conn->state == BT_CONFIG) {
|
||||
+ if (!status)
|
||||
+ conn->state = BT_CONNECTED;
|
||||
|
||||
- if (conn->sec_level == BT_SECURITY_SDP)
|
||||
- conn->sec_level = BT_SECURITY_LOW;
|
||||
+ hci_connect_cfm(conn, status);
|
||||
+ hci_conn_drop(conn);
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
- if (conn->pending_sec_level > conn->sec_level)
|
||||
- conn->sec_level = conn->pending_sec_level;
|
||||
+ if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
+ encrypt = 0x00;
|
||||
+ else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
|
||||
+ encrypt = 0x02;
|
||||
+ else
|
||||
+ encrypt = 0x01;
|
||||
+
|
||||
+ if (!status) {
|
||||
+ if (conn->sec_level == BT_SECURITY_SDP)
|
||||
+ conn->sec_level = BT_SECURITY_LOW;
|
||||
+
|
||||
+ if (conn->pending_sec_level > conn->sec_level)
|
||||
+ conn->sec_level = conn->pending_sec_level;
|
||||
+ }
|
||||
|
||||
mutex_lock(&hci_cb_list_lock);
|
||||
list_for_each_entry(cb, &hci_cb_list, list) {
|
||||
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
|
||||
index 5ee3c689c8637..9c50d458ee83b 100644
|
||||
--- a/include/net/bluetooth/l2cap.h
|
||||
+++ b/include/net/bluetooth/l2cap.h
|
||||
@@ -619,6 +619,8 @@ struct l2cap_ops {
|
||||
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
|
||||
unsigned long hdr_len,
|
||||
unsigned long len, int nb);
|
||||
+ int (*filter) (struct l2cap_chan * chan,
|
||||
+ struct sk_buff *skb);
|
||||
};
|
||||
|
||||
struct l2cap_conn {
|
||||
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c
|
||||
index 5f123c3320a7b..8f918155685db 100644
|
||||
--- a/net/bluetooth/a2mp.c
|
||||
+++ b/net/bluetooth/a2mp.c
|
||||
@@ -233,6 +233,9 @@ static int a2mp_discover_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
struct a2mp_info_req req;
|
||||
|
||||
found = true;
|
||||
+
|
||||
+ memset(&req, 0, sizeof(req));
|
||||
+
|
||||
req.id = cl->id;
|
||||
a2mp_send(mgr, A2MP_GETINFO_REQ, __next_ident(mgr),
|
||||
sizeof(req), &req);
|
||||
@@ -312,6 +315,8 @@ static int a2mp_getinfo_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
if (!hdev || hdev->dev_type != HCI_AMP) {
|
||||
struct a2mp_info_rsp rsp;
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
rsp.id = req->id;
|
||||
rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
|
||||
|
||||
@@ -355,6 +360,8 @@ static int a2mp_getinfo_rsp(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
if (!ctrl)
|
||||
return -ENOMEM;
|
||||
|
||||
+ memset(&req, 0, sizeof(req));
|
||||
+
|
||||
req.id = rsp->id;
|
||||
a2mp_send(mgr, A2MP_GETAMPASSOC_REQ, __next_ident(mgr), sizeof(req),
|
||||
&req);
|
||||
@@ -383,6 +390,8 @@ static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
struct a2mp_amp_assoc_rsp rsp;
|
||||
rsp.id = req->id;
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
if (tmp) {
|
||||
rsp.status = A2MP_STATUS_COLLISION_OCCURED;
|
||||
amp_mgr_put(tmp);
|
||||
@@ -471,7 +480,6 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
struct a2mp_cmd *hdr)
|
||||
{
|
||||
struct a2mp_physlink_req *req = (void *) skb->data;
|
||||
-
|
||||
struct a2mp_physlink_rsp rsp;
|
||||
struct hci_dev *hdev;
|
||||
struct hci_conn *hcon;
|
||||
@@ -482,6 +490,8 @@ static int a2mp_createphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
|
||||
BT_DBG("local_id %d, remote_id %d", req->local_id, req->remote_id);
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
rsp.local_id = req->remote_id;
|
||||
rsp.remote_id = req->local_id;
|
||||
|
||||
@@ -560,6 +570,8 @@ static int a2mp_discphyslink_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
||||
|
||||
BT_DBG("local_id %d remote_id %d", req->local_id, req->remote_id);
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
rsp.local_id = req->remote_id;
|
||||
rsp.remote_id = req->local_id;
|
||||
rsp.status = A2MP_STATUS_SUCCESS;
|
||||
@@ -682,6 +694,8 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
|
||||
if (err) {
|
||||
struct a2mp_cmd_rej rej;
|
||||
|
||||
+ memset(&rej, 0, sizeof(rej));
|
||||
+
|
||||
rej.reason = cpu_to_le16(0);
|
||||
hdr = (void *) skb->data;
|
||||
|
||||
@@ -905,6 +919,8 @@ void a2mp_send_getinfo_rsp(struct hci_dev *hdev)
|
||||
|
||||
BT_DBG("%s mgr %p", hdev->name, mgr);
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
rsp.id = hdev->id;
|
||||
rsp.status = A2MP_STATUS_INVALID_CTRL_ID;
|
||||
|
||||
@@ -1002,6 +1018,8 @@ void a2mp_send_create_phy_link_rsp(struct hci_dev *hdev, u8 status)
|
||||
if (!mgr)
|
||||
return;
|
||||
|
||||
+ memset(&rsp, 0, sizeof(rsp));
|
||||
+
|
||||
hs_hcon = hci_conn_hash_lookup_state(hdev, AMP_LINK, BT_CONNECT);
|
||||
if (!hs_hcon) {
|
||||
rsp.status = A2MP_STATUS_UNABLE_START_LINK_CREATION;
|
||||
@@ -1034,6 +1052,8 @@ void a2mp_discover_amp(struct l2cap_chan *chan)
|
||||
|
||||
mgr->bredr_chan = chan;
|
||||
|
||||
+ memset(&req, 0, sizeof(req));
|
||||
+
|
||||
req.mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
|
||||
req.ext_feat = 0;
|
||||
a2mp_send(mgr, A2MP_DISCOVER_REQ, 1, sizeof(req), &req);
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index 1d085eed72d0c..e3cd81ce2a7bb 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1163,6 +1163,23 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ /* AES encryption is required for Level 4:
|
||||
+ *
|
||||
+ * BLUETOOTH CORE SPECIFICATION Version 5.2 | Vol 3, Part C
|
||||
+ * page 1319:
|
||||
+ *
|
||||
+ * 128-bit equivalent strength for link and encryption keys
|
||||
+ * required using FIPS approved algorithms (E0 not allowed,
|
||||
+ * SAFER+ not allowed, and P-192 not allowed; encryption key
|
||||
+ * not shortened)
|
||||
+ */
|
||||
+ if (conn->sec_level == BT_SECURITY_FIPS &&
|
||||
+ !test_bit(HCI_CONN_AES_CCM, &conn->flags)) {
|
||||
+ bt_dev_err(conn->hdev,
|
||||
+ "Invalid security: Missing AES-CCM usage");
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
if (hci_conn_ssp_enabled(conn) &&
|
||||
!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
|
||||
index d6da119f5082e..1f5c48d1493c9 100644
|
||||
--- a/net/bluetooth/hci_event.c
|
||||
+++ b/net/bluetooth/hci_event.c
|
||||
@@ -1133,6 +1133,9 @@ static void store_pending_adv_report(struct hci_dev *hdev, bdaddr_t *bdaddr,
|
||||
{
|
||||
struct discovery_state *d = &hdev->discovery;
|
||||
|
||||
+ if (len > HCI_MAX_AD_LENGTH)
|
||||
+ return;
|
||||
+
|
||||
bacpy(&d->last_adv_addr, bdaddr);
|
||||
d->last_adv_addr_type = bdaddr_type;
|
||||
d->last_adv_rssi = rssi;
|
||||
@@ -2490,7 +2493,7 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
&cp);
|
||||
} else {
|
||||
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
|
||||
- hci_encrypt_cfm(conn, ev->status, 0x00);
|
||||
+ hci_encrypt_cfm(conn, ev->status);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2576,22 +2579,7 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status,
|
||||
conn->enc_key_size = rp->key_size;
|
||||
}
|
||||
|
||||
- if (conn->state == BT_CONFIG) {
|
||||
- conn->state = BT_CONNECTED;
|
||||
- hci_connect_cfm(conn, 0);
|
||||
- hci_conn_drop(conn);
|
||||
- } else {
|
||||
- u8 encrypt;
|
||||
-
|
||||
- if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
- encrypt = 0x00;
|
||||
- else if (test_bit(HCI_CONN_AES_CCM, &conn->flags))
|
||||
- encrypt = 0x02;
|
||||
- else
|
||||
- encrypt = 0x01;
|
||||
-
|
||||
- hci_encrypt_cfm(conn, 0, encrypt);
|
||||
- }
|
||||
+ hci_encrypt_cfm(conn, 0);
|
||||
|
||||
unlock:
|
||||
hci_dev_unlock(hdev);
|
||||
@@ -2638,27 +2626,23 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
|
||||
clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags);
|
||||
|
||||
+ /* Check link security requirements are met */
|
||||
+ if (!hci_conn_check_link_mode(conn))
|
||||
+ ev->status = HCI_ERROR_AUTH_FAILURE;
|
||||
+
|
||||
if (ev->status && conn->state == BT_CONNECTED) {
|
||||
if (ev->status == HCI_ERROR_PIN_OR_KEY_MISSING)
|
||||
set_bit(HCI_CONN_AUTH_FAILURE, &conn->flags);
|
||||
|
||||
+ /* Notify upper layers so they can cleanup before
|
||||
+ * disconnecting.
|
||||
+ */
|
||||
+ hci_encrypt_cfm(conn, ev->status);
|
||||
hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
|
||||
hci_conn_drop(conn);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
- /* In Secure Connections Only mode, do not allow any connections
|
||||
- * that are not encrypted with AES-CCM using a P-256 authenticated
|
||||
- * combination key.
|
||||
- */
|
||||
- if (hci_dev_test_flag(hdev, HCI_SC_ONLY) &&
|
||||
- (!test_bit(HCI_CONN_AES_CCM, &conn->flags) ||
|
||||
- conn->key_type != HCI_LK_AUTH_COMBINATION_P256)) {
|
||||
- hci_connect_cfm(conn, HCI_ERROR_AUTH_FAILURE);
|
||||
- hci_conn_drop(conn);
|
||||
- goto unlock;
|
||||
- }
|
||||
-
|
||||
/* Try reading the encryption key size for encrypted ACL links */
|
||||
if (!ev->status && ev->encrypt && conn->type == ACL_LINK) {
|
||||
struct hci_cp_read_enc_key_size cp;
|
||||
@@ -2688,14 +2672,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
}
|
||||
|
||||
notify:
|
||||
- if (conn->state == BT_CONFIG) {
|
||||
- if (!ev->status)
|
||||
- conn->state = BT_CONNECTED;
|
||||
-
|
||||
- hci_connect_cfm(conn, ev->status);
|
||||
- hci_conn_drop(conn);
|
||||
- } else
|
||||
- hci_encrypt_cfm(conn, ev->status, ev->encrypt);
|
||||
+ hci_encrypt_cfm(conn, ev->status);
|
||||
|
||||
unlock:
|
||||
hci_dev_unlock(hdev);
|
||||
@@ -4779,6 +4756,11 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
|
||||
return;
|
||||
}
|
||||
|
||||
+ if (len > HCI_MAX_AD_LENGTH) {
|
||||
+ pr_err_ratelimited("legacy adv larger than 31 bytes");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
/* Find the end of the data in case the report contains padded zero
|
||||
* bytes at the end causing an invalid length value.
|
||||
*
|
||||
@@ -4839,7 +4821,7 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,
|
||||
*/
|
||||
conn = check_pending_le_conn(hdev, bdaddr, bdaddr_type, type,
|
||||
direct_addr);
|
||||
- if (conn && type == LE_ADV_IND) {
|
||||
+ if (conn && type == LE_ADV_IND && len <= HCI_MAX_AD_LENGTH) {
|
||||
/* Store report for later inclusion by
|
||||
* mgmt_device_connected
|
||||
*/
|
||||
@@ -4964,10 +4946,14 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
||||
struct hci_ev_le_advertising_info *ev = ptr;
|
||||
s8 rssi;
|
||||
|
||||
- rssi = ev->data[ev->length];
|
||||
- process_adv_report(hdev, ev->evt_type, &ev->bdaddr,
|
||||
- ev->bdaddr_type, NULL, 0, rssi,
|
||||
- ev->data, ev->length);
|
||||
+ if (ev->length <= HCI_MAX_AD_LENGTH) {
|
||||
+ rssi = ev->data[ev->length];
|
||||
+ process_adv_report(hdev, ev->evt_type, &ev->bdaddr,
|
||||
+ ev->bdaddr_type, NULL, 0, rssi,
|
||||
+ ev->data, ev->length);
|
||||
+ } else {
|
||||
+ bt_dev_err(hdev, "Dropping invalid advertising data");
|
||||
+ }
|
||||
|
||||
ptr += sizeof(*ev) + ev->length + 1;
|
||||
}
|
||||
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
|
||||
index 5e3f5c1ba07d6..b96818cda12da 100644
|
||||
--- a/net/bluetooth/l2cap_core.c
|
||||
+++ b/net/bluetooth/l2cap_core.c
|
||||
@@ -6675,9 +6675,10 @@ static int l2cap_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
|
||||
goto drop;
|
||||
}
|
||||
|
||||
- if ((chan->mode == L2CAP_MODE_ERTM ||
|
||||
- chan->mode == L2CAP_MODE_STREAMING) && sk_filter(chan->data, skb))
|
||||
- goto drop;
|
||||
+ if (chan->ops->filter) {
|
||||
+ if (chan->ops->filter(chan, skb))
|
||||
+ goto drop;
|
||||
+ }
|
||||
|
||||
if (!control->sframe) {
|
||||
int err;
|
||||
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
|
||||
index bbf08c6092f4a..ab6b1788dbfc3 100644
|
||||
--- a/net/bluetooth/l2cap_sock.c
|
||||
+++ b/net/bluetooth/l2cap_sock.c
|
||||
@@ -1475,6 +1475,19 @@ static void l2cap_sock_suspend_cb(struct l2cap_chan *chan)
|
||||
sk->sk_state_change(sk);
|
||||
}
|
||||
|
||||
+static int l2cap_sock_filter(struct l2cap_chan *chan, struct sk_buff *skb)
|
||||
+{
|
||||
+ struct sock *sk = chan->data;
|
||||
+
|
||||
+ switch (chan->mode) {
|
||||
+ case L2CAP_MODE_ERTM:
|
||||
+ case L2CAP_MODE_STREAMING:
|
||||
+ return sk_filter(sk, skb);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static const struct l2cap_ops l2cap_chan_ops = {
|
||||
.name = "L2CAP Socket Interface",
|
||||
.new_connection = l2cap_sock_new_connection_cb,
|
||||
@@ -1489,6 +1502,7 @@ static const struct l2cap_ops l2cap_chan_ops = {
|
||||
.set_shutdown = l2cap_sock_set_shutdown_cb,
|
||||
.get_sndtimeo = l2cap_sock_get_sndtimeo_cb,
|
||||
.alloc_skb = l2cap_sock_alloc_skb_cb,
|
||||
+ .filter = l2cap_sock_filter,
|
||||
};
|
||||
|
||||
static void l2cap_sock_destruct(struct sock *sk)
|
||||
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
|
||||
index ba24f613c0fc1..bca1408f815ff 100644
|
||||
--- a/net/bluetooth/mgmt.c
|
||||
+++ b/net/bluetooth/mgmt.c
|
||||
@@ -635,7 +635,8 @@ static u32 get_supported_settings(struct hci_dev *hdev)
|
||||
|
||||
if (lmp_ssp_capable(hdev)) {
|
||||
settings |= MGMT_SETTING_SSP;
|
||||
- settings |= MGMT_SETTING_HS;
|
||||
+ if (IS_ENABLED(CONFIG_BT_HS))
|
||||
+ settings |= MGMT_SETTING_HS;
|
||||
}
|
||||
|
||||
if (lmp_sc_capable(hdev))
|
||||
@@ -1645,6 +1646,10 @@ static int set_hs(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
|
||||
|
||||
BT_DBG("request for %s", hdev->name);
|
||||
|
||||
+ if (!IS_ENABLED(CONFIG_BT_HS))
|
||||
+ return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS,
|
||||
+ MGMT_STATUS_NOT_SUPPORTED);
|
||||
+
|
||||
status = mgmt_bredr_support(hdev);
|
||||
if (status)
|
||||
return mgmt_cmd_status(sk, hdev->id, MGMT_OP_SET_HS, status);
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,28 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d41de2c1159e7..c6fcfe4bfeed5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,6 +1,6 @@
|
||||
VERSION = 4
|
||||
PATCHLEVEL = 9
|
||||
-SUBLEVEL = 242
|
||||
+SUBLEVEL = 243
|
||||
EXTRAVERSION =
|
||||
NAME = Roaring Lionus
|
||||
|
||||
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
|
||||
index 5b10b50f8686f..5c064df7d81f1 100644
|
||||
--- a/drivers/powercap/powercap_sys.c
|
||||
+++ b/drivers/powercap/powercap_sys.c
|
||||
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
|
||||
&dev_attr_max_energy_range_uj.attr;
|
||||
if (power_zone->ops->get_energy_uj) {
|
||||
if (power_zone->ops->reset_energy_uj)
|
||||
- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
|
||||
+ dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
|
||||
else
|
||||
- dev_attr_energy_uj.attr.mode = S_IRUGO;
|
||||
+ dev_attr_energy_uj.attr.mode = S_IRUSR;
|
||||
power_zone->zone_dev_attrs[count++] =
|
||||
&dev_attr_energy_uj.attr;
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user