5.15.121-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 133/532 arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 0f6b380d580cd081d5e385d349f55dfc52e3d68c ]
The firmware for the modem and WiFi subsystems platform specific and is signed with a OEM specific key (or a test key). In order to support more than a single device it is therefor not possible to rely on the default path and stash these files directly in the firmware directory.
This has already been addressed for other platforms, but the APQ8016 SBC (aka db410c) was never finished upstream.
Stable-dep-of: e27654df20d7 ("arm64: dts: qcom: apq8016-sbc: Fix regulator constraints")
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 12 ++++++++++++ arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +12 -0
@@ -305,6 +305,12 @@ &mdss { status = "okay"; }; +&mpss { + status = "okay"; + + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn"; +}; + &pm8916_resin { status = "okay"; linux,code = <KEY_VOLUMEDOWN>;
@@ -312,6 +318,8 @@ &pm8916_resin { &pronto { status = "okay"; + + firmware-name = "qcom/msm8916/wcnss.mbn"; }; &sdhc_1 {
@@ -394,6 +402,10 @@ &wcd_codec { qcom,mbhc-vthreshold-high = <75 150 237 450 500>; }; +&wcnss_ctrl { + firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin"; +}; + /* Enable CoreSight */ &cti0 { status = "okay"; }; &cti1 { status = "okay"; };
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1771,7 +1771,7 @@ smd-edge { label = "pronto"; - wcnss { + wcnss_ctrl: wcnss { compatible = "qcom,wcnss"; qcom,smd-channels = "WCNSS_CTRL";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 134/532 arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 2533786f46d074d67a4bca04c2d44d3825594415 ]
Commit 0f6b380d580c ("arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path") added "firmware-name"s to the APQ8016 SBC (DB410c) device tree to separate the (test key)-signed firmware from other devices.
However, the added names are a bit confusing. The "modem" firmware used by DB410c is actually a simplified version for APQ8016 that lacks most of the modem functionality (phone calls, SMS etc) that is available on MSM8916. Placing it in "qcom/msm8916/modem.mbn" suggests that it supports all functionality for MSM and not just the reduced functionality for APQ.
Request the firmware from "qcom/apq8016/modem.mbn" instead to clarify this. Do the same for "wcnss.mbn" for consistency (although the WCNSS firmware works just fine on MSM8916).
Finally, add a "_sbc" suffix to the WCNSS_qcom_wlan_nv.bin firmware file. It seems like the nv.bin firmware is somewhat board specific and can therefore vary a bit from device to device. This makes it more clear which board it is intended to be used for.
Stable-dep-of: e27654df20d7 ("arm64: dts: qcom: apq8016-sbc: Fix regulator constraints")
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +3 -3
@@ -308,7 +308,7 @@ &mdss { &mpss { status = "okay"; - firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn"; + firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; }; &pm8916_resin {
@@ -319,7 +319,7 @@ &pm8916_resin { &pronto { status = "okay"; - firmware-name = "qcom/msm8916/wcnss.mbn"; + firmware-name = "qcom/apq8016/wcnss.mbn"; }; &sdhc_1 {
@@ -403,7 +403,7 @@ &wcd_codec { }; &wcnss_ctrl { - firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin"; + firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; }; /* Enable CoreSight */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 135/532 arm64: dts: qcom: apq8016-sbc: fix mpps state names
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit a4344427eadd6caf0dc9e5384b023083e567221d ]
The majority of device tree nodes for mpps use xxxx-state as pinctrl nodes. Change names of mpps pinctrl nodes for the apq8016-sbc board to follow that pattern.
Stable-dep-of: e27654df20d7 ("arm64: dts: qcom: apq8016-sbc: Fix regulator constraints")
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +2 -2
@@ -821,7 +821,7 @@ &pm8916_mpps { pinctrl-names = "default"; pinctrl-0 = <&ls_exp_gpio_f>; - ls_exp_gpio_f: pm8916-mpp4 { + ls_exp_gpio_f: pm8916-mpp4-state { pins = "mpp4"; function = "digital";
@@ -829,7 +829,7 @@ ls_exp_gpio_f: pm8916-mpp4 { power-source = <PM8916_MPP_L5>; // 1.8V }; - pm8916_mpps_leds: pm8916-mpps-leds { + pm8916_mpps_leds: pm8916-mpps-state { pins = "mpp2", "mpp3"; function = "digital";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 136/532 arm64: dts: qcom: Drop unneeded extra device-specific includes
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 442ee1fc60c47539253fafd4cbbe2f1ec22e2a46 ]
For some reason apq8016-sbc, apq8096-db820c, msm8916-mtp and msm8996-mtp were added as separate .dts and .dtsi files where the first only contains the model name and the latter contains most of the actual definitions. Perhaps this was done with the expectation that there would be other devices also making use of exactly the same. However, this has not been the case until now and it also seems unlikely in the future. Having the extra .dtsi only clutters the file list and provides little benefit.
Move the contents of the .dtsi into the .dts file to make this consistent with most other devices that simply define everything in the .dts.
There are no functional changes introduced by this patch:
The compiled ".dtb"s are completely identical.
Stable-dep-of: e27654df20d7 ("arm64: dts: qcom: apq8016-sbc: Fix regulator constraints")
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 832 +++++++++++++- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 838 -------------- arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 1070 ++++++++++++++++- arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1076 ------------------ arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 15 +- arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 21 - arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 24 +- arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 - 8 files changed, 1937 insertions(+), 1969 deletions(-) delete mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi delete mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi delete mode 100644 arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +831 -1
@@ -5,9 +5,839 @@ /dts-v1/; -#include "apq8016-sbc.dtsi" +#include "msm8916-pm8916.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> +#include <dt-bindings/pinctrl/qcom,pmic-mpp.h> +#include <dt-bindings/sound/apq8016-lpass.h> / { model = "Qualcomm Technologies, Inc. APQ 8016 SBC"; compatible = "qcom,apq8016-sbc", "qcom,apq8016"; + + aliases { + serial0 = &blsp1_uart2; + serial1 = &blsp1_uart1; + usid0 = &pm8916_0; + i2c0 = &blsp_i2c2; + i2c1 = &blsp_i2c6; + i2c3 = &blsp_i2c4; + spi0 = &blsp_spi5; + spi1 = &blsp_spi3; + }; + + chosen { + stdout-path = "serial0"; + }; + + camera_vdddo_1v8: camera-vdddo-1v8 { + compatible = "regulator-fixed"; + regulator-name = "camera_vdddo"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + camera_vdda_2v8: camera-vdda-2v8 { + compatible = "regulator-fixed"; + regulator-name = "camera_vdda"; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-always-on; + }; + + camera_vddd_1v5: camera-vddd-1v5 { + compatible = "regulator-fixed"; + regulator-name = "camera_vddd"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-always-on; + }; + + reserved-memory { + ramoops@bff00000 { + compatible = "ramoops"; + reg = <0x0 0xbff00000 0x0 0x100000>; + + record-size = <0x20000>; + console-size = <0x20000>; + ftrace-size = <0x20000>; + }; + }; + + usb2513 { + compatible = "smsc,usb3503"; + reset-gpios = <&pm8916_gpios 3 GPIO_ACTIVE_LOW>; + initial-mode = <1>; + }; + + usb_id: usb-id { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_id_default>; + }; + + hdmi-out { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con: endpoint { + remote-endpoint = <&adv7533_out>; + }; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + autorepeat; + + pinctrl-names = "default"; + pinctrl-0 = <&msm_key_volp_n_default>; + + button@0 { + label = "Volume Up"; + linux,code = <KEY_VOLUMEUP>; + gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + pinctrl-names = "default"; + pinctrl-0 = <&msmgpio_leds>, + <&pm8916_gpios_leds>, + <&pm8916_mpps_leds>; + + compatible = "gpio-leds"; + + led@1 { + label = "apq8016-sbc:green:user1"; + gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + + led@2 { + label = "apq8016-sbc:green:user2"; + gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + + led@3 { + label = "apq8016-sbc:green:user3"; + gpios = <&pm8916_gpios 1 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc1"; + default-state = "off"; + }; + + led@4 { + label = "apq8016-sbc:green:user4"; + gpios = <&pm8916_gpios 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "none"; + panic-indicator; + default-state = "off"; + }; + + led@5 { + label = "apq8016-sbc:yellow:wlan"; + gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tx"; + default-state = "off"; + }; + + led@6 { + label = "apq8016-sbc:blue:bt"; + gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "bluetooth-power"; + default-state = "off"; + }; + }; +}; + +&blsp_dma { + status = "okay"; +}; + +&blsp_i2c2 { + /* On Low speed expansion */ + status = "okay"; + label = "LS-I2C0"; +}; + +&blsp_i2c4 { + /* On High speed expansion */ + status = "okay"; + label = "HS-I2C2"; + + adv_bridge: bridge@39 { + status = "okay"; + + compatible = "adi,adv7533"; + reg = <0x39>; + + interrupt-parent = <&msmgpio>; + interrupts = <31 IRQ_TYPE_EDGE_FALLING>; + + adi,dsi-lanes = <4>; + clocks = <&rpmcc RPM_SMD_BB_CLK2>; + clock-names = "cec"; + + pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>; + + avdd-supply = <&pm8916_l6>; + v1p2-supply = <&pm8916_l6>; + v3p3-supply = <&pm8916_l17>; + + pinctrl-names = "default","sleep"; + pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>; + pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>; + #sound-dai-cells = <1>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + adv7533_in: endpoint { + remote-endpoint = <&dsi0_out>; + }; + }; + + port@1 { + reg = <1>; + adv7533_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + }; + }; +}; + +&blsp_i2c6 { + /* On Low speed expansion */ + status = "okay"; + label = "LS-I2C1"; +}; + +&blsp_spi3 { + /* On High speed expansion */ + status = "okay"; + label = "HS-SPI1"; +}; + +&blsp_spi5 { + /* On Low speed expansion */ + status = "okay"; + label = "LS-SPI0"; +}; + +&blsp1_uart1 { + status = "okay"; + label = "LS-UART0"; +}; + +&blsp1_uart2 { + status = "okay"; + label = "LS-UART1"; +}; + +&camss { + status = "okay"; + ports { + port@0 { + reg = <0>; + csiphy0_ep: endpoint { + clock-lanes = <1>; + data-lanes = <0 2>; + remote-endpoint = <&ov5640_ep>; + status = "okay"; + }; + }; + }; +}; + +&cci { + status = "okay"; +}; + +&cci_i2c0 { + camera_rear@3b { + compatible = "ovti,ov5640"; + reg = <0x3b>; + + enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>; + reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&camera_rear_default>; + + clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; + clock-names = "xclk"; + clock-frequency = <23880000>; + + vdddo-supply = <&camera_vdddo_1v8>; + vdda-supply = <&camera_vdda_2v8>; + vddd-supply = <&camera_vddd_1v5>; + + /* No camera mezzanine by default */ + status = "disabled"; + + port { + ov5640_ep: endpoint { + clock-lanes = <1>; + data-lanes = <0 2>; + remote-endpoint = <&csiphy0_ep>; + }; + }; + }; +}; + +&dsi0_out { + data-lanes = <0 1 2 3>; + remote-endpoint = <&adv7533_in>; +}; + +&lpass { + status = "okay"; +}; + +&mdss { + status = "okay"; +}; + +&mpss { + status = "okay"; + + firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; +}; + +&pm8916_resin { + status = "okay"; + linux,code = <KEY_VOLUMEDOWN>; +}; + +&pronto { + status = "okay"; + + firmware-name = "qcom/apq8016/wcnss.mbn"; +}; + +&sdhc_1 { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>; + pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>; +}; + +&sdhc_2 { + status = "okay"; + + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>; + pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>; + + cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>; +}; + +&sound { + status = "okay"; + + pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>; + pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>; + pinctrl-names = "default", "sleep"; + qcom,model = "DB410c"; + qcom,audio-routing = + "AMIC2", "MIC BIAS Internal2", + "AMIC3", "MIC BIAS External1"; + + external-dai-link@0 { + link-name = "ADV7533"; + cpu { + sound-dai = <&lpass MI2S_QUATERNARY>; + }; + codec { + sound-dai = <&adv_bridge 0>; + }; + }; + + internal-codec-playback-dai-link@0 { + link-name = "WCD"; + cpu { + sound-dai = <&lpass MI2S_PRIMARY>; + }; + codec { + sound-dai = <&lpass_codec 0>, <&wcd_codec 0>; + }; + }; + + internal-codec-capture-dai-link@0 { + link-name = "WCD-Capture"; + cpu { + sound-dai = <&lpass MI2S_TERTIARY>; + }; + codec { + sound-dai = <&lpass_codec 1>, <&wcd_codec 1>; + }; + }; +}; + +&usb { + status = "okay"; + extcon = <&usb_id>, <&usb_id>; + + pinctrl-names = "default", "device"; + pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>; + pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>; +}; + +&usb_hs_phy { + extcon = <&usb_id>; +}; + +&wcd_codec { + clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>; + clock-names = "mclk"; + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; +}; + +&wcnss_ctrl { + firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; +}; + +/* Enable CoreSight */ +&cti0 { status = "okay"; }; +&cti1 { status = "okay"; }; +&cti12 { status = "okay"; }; +&cti13 { status = "okay"; }; +&cti14 { status = "okay"; }; +&cti15 { status = "okay"; }; +&debug0 { status = "okay"; }; +&debug1 { status = "okay"; }; +&debug2 { status = "okay"; }; +&debug3 { status = "okay"; }; +&etf { status = "okay"; }; +&etm0 { status = "okay"; }; +&etm1 { status = "okay"; }; +&etm2 { status = "okay"; }; +&etm3 { status = "okay"; }; +&etr { status = "okay"; }; +&funnel0 { status = "okay"; }; +&funnel1 { status = "okay"; }; +&replicator { status = "okay"; }; +&stm { status = "okay"; }; +&tpiu { status = "okay"; }; + +&smd_rpm_regulators { + vdd_l1_l2_l3-supply = <&pm8916_s3>; + vdd_l4_l5_l6-supply = <&pm8916_s4>; + vdd_l7-supply = <&pm8916_s4>; + + s3 { + regulator-min-microvolt = <375000>; + regulator-max-microvolt = <1562000>; + }; + + s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-always-on; + regulator-boot-on; + }; + + l1 { + regulator-min-microvolt = <375000>; + regulator-max-microvolt = <1525000>; + }; + + l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + l4 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l5 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + l7 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l8 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l9 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l10 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l11 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + regulator-allow-set-load; + regulator-system-load = <200000>; + }; + + l12 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l13 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l14 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + /** + * 1.8v required on LS expansion + * for mezzanine boards + */ + l15 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + regulator-always-on; + }; + + l16 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; + + l17 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + l18 { + regulator-min-microvolt = <1750000>; + regulator-max-microvolt = <3337000>; + }; +}; + +/* + * 2mA drive strength is not enough when connecting multiple + * I2C devices with different pull up resistors. + */ +&i2c2_default { + drive-strength = <16>; +}; + +&i2c4_default { + drive-strength = <16>; +}; + +&i2c6_default { + drive-strength = <16>; +}; + +/* + * GPIO name legend: proper name = the GPIO line is used as GPIO + * NC = not connected (pin out but not routed from the chip to + * anything the board) + * "[PER]" = pin is muxed for [peripheral] (not GPIO) + * LSEC = Low Speed External Connector + * HSEC = High Speed External Connector + * + * Line names are taken from the schematic "DragonBoard410c" + * dated monday, august 31, 2015. Page 5 in particular. + * + * For the lines routed to the external connectors the + * lines are named after the 96Boards CE Specification 1.0, + * Appendix "Expansion Connector Signal Description". + * + * When the 96Board naming of a line and the schematic name of + * the same line are in conflict, the 96Board specification + * takes precedence, which means that the external UART on the + * LSEC is named UART0 while the schematic and SoC names this + * UART3. This is only for the informational lines i.e. "[FOO]", + * the GPIO named lines "GPIO-A" thru "GPIO-L" are the only + * ones actually used for GPIO. + */ + +&msmgpio { + gpio-line-names = + "[UART0_TX]", /* GPIO_0, LSEC pin 5 */ + "[UART0_RX]", /* GPIO_1, LSEC pin 7 */ + "[UART0_CTS_N]", /* GPIO_2, LSEC pin 3 */ + "[UART0_RTS_N]", /* GPIO_3, LSEC pin 9 */ + "[UART1_TX]", /* GPIO_4, LSEC pin 11 */ + "[UART1_RX]", /* GPIO_5, LSEC pin 13 */ + "[I2C0_SDA]", /* GPIO_8, LSEC pin 17 */ + "[I2C0_SCL]", /* GPIO_7, LSEC pin 15 */ + "[SPI1_DOUT]", /* SPI1_MOSI, HSEC pin 1 */ + "[SPI1_DIN]", /* SPI1_MISO, HSEC pin 11 */ + "[SPI1_CS]", /* SPI1_CS_N, HSEC pin 7 */ + "[SPI1_SCLK]", /* SPI1_CLK, HSEC pin 9 */ + "GPIO-B", /* LS_EXP_GPIO_B, LSEC pin 24 */ + "GPIO-C", /* LS_EXP_GPIO_C, LSEC pin 25 */ + "[I2C3_SDA]", /* HSEC pin 38 */ + "[I2C3_SCL]", /* HSEC pin 36 */ + "[SPI0_MOSI]", /* LSEC pin 14 */ + "[SPI0_MISO]", /* LSEC pin 10 */ + "[SPI0_CS_N]", /* LSEC pin 12 */ + "[SPI0_CLK]", /* LSEC pin 8 */ + "HDMI_HPD_N", /* GPIO 20 */ + "USR_LED_1_CTRL", + "[I2C1_SDA]", /* GPIO_22, LSEC pin 21 */ + "[I2C1_SCL]", /* GPIO_23, LSEC pin 19 */ + "GPIO-G", /* LS_EXP_GPIO_G, LSEC pin 29 */ + "GPIO-H", /* LS_EXP_GPIO_H, LSEC pin 30 */ + "[CSI0_MCLK]", /* HSEC pin 15 */ + "[CSI1_MCLK]", /* HSEC pin 17 */ + "GPIO-K", /* LS_EXP_GPIO_K, LSEC pin 33 */ + "[I2C2_SDA]", /* HSEC pin 34 */ + "[I2C2_SCL]", /* HSEC pin 32 */ + "DSI2HDMI_INT_N", + "DSI_SW_SEL_APQ", + "GPIO-L", /* LS_EXP_GPIO_L, LSEC pin 34 */ + "GPIO-J", /* LS_EXP_GPIO_J, LSEC pin 32 */ + "GPIO-I", /* LS_EXP_GPIO_I, LSEC pin 31 */ + "GPIO-A", /* LS_EXP_GPIO_A, LSEC pin 23 */ + "FORCED_USB_BOOT", + "SD_CARD_DET_N", + "[WCSS_BT_SSBI]", + "[WCSS_WLAN_DATA_2]", /* GPIO 40 */ + "[WCSS_WLAN_DATA_1]", + "[WCSS_WLAN_DATA_0]", + "[WCSS_WLAN_SET]", + "[WCSS_WLAN_CLK]", + "[WCSS_FM_SSBI]", + "[WCSS_FM_SDI]", + "[WCSS_BT_DAT_CTL]", + "[WCSS_BT_DAT_STB]", + "NC", + "NC", /* GPIO 50 */ + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", /* GPIO 60 */ + "NC", + "NC", + "[CDC_PDM0_CLK]", + "[CDC_PDM0_SYNC]", + "[CDC_PDM0_TX0]", + "[CDC_PDM0_RX0]", + "[CDC_PDM0_RX1]", + "[CDC_PDM0_RX2]", + "GPIO-D", /* LS_EXP_GPIO_D, LSEC pin 26 */ + "NC", /* GPIO 70 */ + "NC", + "NC", + "NC", + "NC", /* GPIO 74 */ + "NC", + "NC", + "NC", + "NC", + "NC", + "BOOT_CONFIG_0", /* GPIO 80 */ + "BOOT_CONFIG_1", + "BOOT_CONFIG_2", + "BOOT_CONFIG_3", + "NC", + "NC", + "BOOT_CONFIG_5", + "NC", + "NC", + "NC", + "NC", /* GPIO 90 */ + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", + "NC", /* GPIO 100 */ + "NC", + "NC", + "NC", + "SSBI_GPS", + "NC", + "NC", + "KEY_VOLP_N", + "NC", + "NC", + "[LS_EXP_MI2S_WS]", /* GPIO 110 */ + "NC", + "NC", + "[LS_EXP_MI2S_SCK]", + "[LS_EXP_MI2S_DATA0]", + "GPIO-E", /* LS_EXP_GPIO_E, LSEC pin 27 */ + "NC", + "[DSI2HDMI_MI2S_WS]", + "[DSI2HDMI_MI2S_SCK]", + "[DSI2HDMI_MI2S_DATA0]", + "USR_LED_2_CTRL", /* GPIO 120 */ + "SB_HS_ID"; + + msmgpio_leds: msmgpio-leds { + pins = "gpio21", "gpio120"; + function = "gpio"; + + output-low; + }; + + usb_id_default: usb-id-default { + pins = "gpio121"; + function = "gpio"; + + drive-strength = <8>; + input-enable; + bias-pull-up; + }; + + adv7533_int_active: adv533-int-active { + pins = "gpio31"; + function = "gpio"; + + drive-strength = <16>; + bias-disable; + }; + + adv7533_int_suspend: adv7533-int-suspend { + pins = "gpio31"; + function = "gpio"; + + drive-strength = <2>; + bias-disable; + }; + + adv7533_switch_active: adv7533-switch-active { + pins = "gpio32"; + function = "gpio"; + + drive-strength = <16>; + bias-disable; + }; + + adv7533_switch_suspend: adv7533-switch-suspend { + pins = "gpio32"; + function = "gpio"; + + drive-strength = <2>; + bias-disable; + }; + + msm_key_volp_n_default: msm-key-volp-n-default { + pins = "gpio107"; + function = "gpio"; + + drive-strength = <8>; + input-enable; + bias-pull-up; + }; +}; + +&pm8916_gpios { + gpio-line-names = + "USR_LED_3_CTRL", + "USR_LED_4_CTRL", + "USB_HUB_RESET_N_PM", + "USB_SW_SEL_PM"; + + usb_hub_reset_pm: usb-hub-reset-pm { + pins = "gpio3"; + function = PMIC_GPIO_FUNC_NORMAL; + + input-disable; + output-high; + }; + + usb_hub_reset_pm_device: usb-hub-reset-pm-device { + pins = "gpio3"; + function = PMIC_GPIO_FUNC_NORMAL; + + output-low; + }; + + usb_sw_sel_pm: usb-sw-sel-pm { + pins = "gpio4"; + function = PMIC_GPIO_FUNC_NORMAL; + + power-source = <PM8916_GPIO_VPH>; + input-disable; + output-high; + }; + + usb_sw_sel_pm_device: usb-sw-sel-pm-device { + pins = "gpio4"; + function = PMIC_GPIO_FUNC_NORMAL; + + power-source = <PM8916_GPIO_VPH>; + input-disable; + output-low; + }; + + pm8916_gpios_leds: pm8916-gpios-leds { + pins = "gpio1", "gpio2"; + function = PMIC_GPIO_FUNC_NORMAL; + + output-low; + }; +}; + +&pm8916_mpps { + gpio-line-names = + "VDD_PX_BIAS", + "WLAN_LED_CTRL", + "BT_LED_CTRL", + "GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */ + + pinctrl-names = "default"; + pinctrl-0 = <&ls_exp_gpio_f>; + + ls_exp_gpio_f: pm8916-mpp4-state { + pins = "mpp4"; + function = "digital"; + + output-low; + power-source = <PM8916_MPP_L5>; // 1.8V + }; + + pm8916_mpps_leds: pm8916-mpps-state { + pins = "mpp2", "mpp3"; + function = "digital"; + + output-low; + }; };
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi deleted +0 -838
838 lines not on this page · raw message
arch/arm64/boot/dts/qcom/apq8096-db820c.dts +1069 -1
1,078 lines not on this page · raw message
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi deleted +0 -1076
244 lines not on this page · raw message
arch/arm64/boot/dts/qcom/msm8916-mtp.dts +14 -1
Lines of this file are not shown. View the raw message.
arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi deleted +0 -21
Lines of this file are not shown. View the raw message.
arch/arm64/boot/dts/qcom/msm8996-mtp.dts +23 -1
Lines of this file are not shown. View the raw message.
arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi deleted +0 -30
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.2
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 137/532 arm64: dts: qcom: apq8016-sbc: Fix regulator constraints
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit e27654df20d77ad7549a3cf6739ebaa3aa59a088 ]
For some reason DB410c has completely bogus regulator constraints that actually just correspond to the programmable voltages which are already provided by the regulator driver. Some of them are not just outside the recommended operating conditions of the APQ8016E SoC but even exceed the absolute maximum ratings, potentially risking permanent device damage.
In practice it's not quite as dangerous thanks to the RPM firmware:
It turns out that it has its own voltage constraints and silently clamps all regulator requests. For example, requesting 3.3V for L5 (allowed by the current regulator constraints!) still results in 1.8V being programmed in the actual regulator hardware.
Experimentation with various voltages shows that the internal RPM voltage constraints roughly correspond to the safe "specified range" in the PM8916 Device Specification (rather than the "programmable range" used inside apq8016-sbc.dtsi right now).
Combine those together with some fixed voltages used in the old msm-3.10 device tree from Qualcomm to give DB410c some actually valid voltage constraints.
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +32 -32
@@ -440,21 +440,21 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; s3 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1562000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; regulator-always-on; regulator-boot-on; }; l1 { - regulator-min-microvolt = <375000>; - regulator-max-microvolt = <1525000>; + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; }; l2 {
@@ -463,13 +463,13 @@ l2 { }; l4 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; }; l5 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l6 {
@@ -478,45 +478,45 @@ l6 { }; l7 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; }; l8 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; }; l9 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; }; l10 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; }; l11 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; regulator-allow-set-load; regulator-system-load = <200000>; }; l12 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; }; l13 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; }; l14 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; /**
@@ -524,14 +524,14 @@ l14 { * for mezzanine boards */ l15 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; regulator-always-on; }; l16 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; }; l17 {
@@ -540,8 +540,8 @@ l17 { }; l18 { - regulator-min-microvolt = <1750000>; - regulator-max-microvolt = <3337000>; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 138/532 arm64: dts: qcom: apq8016-sbc: Fix 1.8V power rail on LS expansion
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 5500f823db38db073d30557af159b77fb1f2bf26 ]
The 96Boards specification expects a 1.8V power rail on the low-speed expansion connector that is able to provide at least 0.18W / 100 mA. According to the DB410c hardware user manual this is done by connecting both L15 and L16 in parallel with up to 55mA each (for 110 mA total) [1].
Unfortunately the current regulator setup in the DB410c device tree does not implement the specification correctly and only provides 5 mA:
- Only L15 is marked always-on, so L16 is never enabled.
- Without specifying a load the regulator is put into LPM where it can only provide 5 mA.
Fix this by:
- Adding proper voltage constraints for L16.
- Making L16 always-on.
- Adding regulator-system-load for both L15 and L16. 100 mA should be available in total, so specify 50 mA for each. (The regulator hardware can only be in normal (55 mA) or low-power mode (5 mA) so this will actually result in the expected 110 mA total...)
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +12 -4
@@ -519,19 +519,27 @@ l14 { regulator-max-microvolt = <3300000>; }; - /** - * 1.8v required on LS expansion - * for mezzanine boards + /* + * The 96Boards specification expects a 1.8V power rail on the low-speed + * expansion connector that is able to provide at least 0.18W / 100 mA. + * L15/L16 are connected in parallel to provide 55 mA each. A minimum load + * must be specified to ensure the regulators are not put in LPM where they + * would only provide 5 mA. */ l15 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; regulator-always-on; }; l16 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <1800000>; + regulator-system-load = <50000>; + regulator-allow-set-load; + regulator-always-on; }; l17 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 139/532 drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit f24b49550814fdee4a98b9552e35e243ccafd4a8 ]
The previous setting was related to the overall dimension and not to the active display area.
In the "PHYSICAL SPECIFICATIONS" section, the datasheet shows the following parameters:
----------------------------------------------------------
| Item | Specifications | unit |
----------------------------------------------------------
| Display area | 98.7 (W) x 57.5 (H) | mm |
----------------------------------------------------------
| Overall dimension | 105.5(W) x 67.2(H) x 4.96(D) | mm |
----------------------------------------------------------
--- drivers/gpu/drm/panel/panel-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +2 -2
@@ -890,8 +890,8 @@ static const struct panel_desc ampire_am_480272h3tmqw_t01h = { .num_modes = 1, .bpc = 8, .size = { - .width = 105, - .height = 67, + .width = 99, + .height = 58, }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 140/532 ARM: ep93xx: fix missing-prototype warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 419013740ea1e4343d8ade535d999f59fa28e460 ]
ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.
arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'
--- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +2 -1
@@ -9,6 +9,7 @@#include <linux/io.h> #include <asm/mach/time.h> #include "soc.h" +#include "platform.h" /************************************************************************* * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)return ret; } -u64 ep93xx_clocksource_read (struct clocksource *c) +static u64 ep93xx_clocksource_read (struct clocksource *c) {u64 ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 141/532 ARM: omap2: fix missing tick_broadcast() prototype
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 861bc1d2886d47bd57a2cbf2cda87fdbe3eb9d08 ]
omap2 contains a hack to define tick_broadcast() on non-SMP configurations in place of the normal SMP definition. This one causes a warning because of a missing prototype:
arch/arm/mach-omap2/board-generic.c:44:6: error: no previous prototype for 'tick_broadcast'
Make sure to always include the header with the declaration.
--- arch/arm/mach-omap2/board-generic.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-omap2/board-generic.c +1 -0
@@ -13,6 +13,7 @@#include <linux/of_platform.h> #include <linux/irqdomain.h> #include <linux/clocksource.h> +#include <linux/clockchips.h> #include <asm/setup.h> #include <asm/mach/arch.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 142/532 arm64: dts: qcom: apq8096: fix fixed regulator name property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c77612a07d18d4425fd8ddd532a8a9b8e1970c53 ]
Correct the typo in 'regulator-name' property.
apq8096-ifc6640.dtb: v1p05-regulator: 'regulator-name' is a required property apq8096-ifc6640.dtb: v1p05-regulator: Unevaluated properties are not allowed ('reglator-name' was unexpected)
--- arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts +2 -2
@@ -26,7 +26,7 @@ chosen { v1p05: v1p05-regulator { compatible = "regulator-fixed"; - reglator-name = "v1p05"; + regulator-name = "v1p05"; regulator-always-on; regulator-boot-on;
@@ -38,7 +38,7 @@ v1p05: v1p05-regulator { v12_poe: v12-poe-regulator { compatible = "regulator-fixed"; - reglator-name = "v12_poe"; + regulator-name = "v12_poe"; regulator-always-on; regulator-boot-on;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 143/532 arm64: dts: mediatek: mt8183: Add mediatek,broken-save-restore-fw to kukui
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 42127f578ebde652d1373e0233356fbd351675c4 ]
Firmware shipped on mt8183 Chromebooks is affected by the GICR save/restore issue as described by the patch ("dt-bindings:
interrupt-controller: arm,gic-v3: Add quirk for Mediatek SoCs w/ broken FW"). Add the quirk property.
--- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +4 -0
@@ -281,6 +281,10 @@ dsi_out: endpoint { }; }; +&gic { + mediatek,broken-save-restore-fw; +}; + &gpu { mali-supply = <&mt6358_vgpu_reg>; sram-supply = <&mt6358_vsram_gpu_reg>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 144/532 ARM: dts: stm32: Shorten the AV96 HDMI sound card name
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0cf765e598712addec34d0208cc1418c151fefb2 ]
Fix the following error in kernel log due to too long sound card name:
"
asoc-audio-graph-card sound: ASoC: driver name too long 'STM32MP1-AV96-HDMI' -> 'STM32MP1-AV96-H' "
--- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +1 -1
@@ -88,7 +88,7 @@ sd_switch: regulator-sd_switch { sound { compatible = "audio-graph-card"; - label = "STM32MP1-AV96-HDMI"; + label = "STM32-AV96-HDMI"; dais = <&sai2a_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 145/532 memory: brcmstb_dpfe: fix testing array offset after use
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1d9e93fad549bc38f593147479ee063f2872c170 ]
Code should first check for valid value of array offset, then use it as the index. Fixes smatch warning:
drivers/memory/brcmstb_dpfe.c:443 __send_command() error: testing array offset 'cmd' after use.
--- drivers/memory/brcmstb_dpfe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/memory/brcmstb_dpfe.c +3 -1
@@ -434,15 +434,17 @@ static void __finalize_command(struct brcmstb_dpfe_priv *priv)static int __send_command (struct brcmstb_dpfe_priv *priv,unsigned int cmd,u32 result[]) { -const u32 *msg = priv->dpfe_api->command[cmd];void __iomem *regs = priv->regs;unsigned int i, chksum, chksum_idx; +const u32 *msg;int ret =0 ;u32 resp;if (cmd >=DPFE_CMD_MAX )return -1 ; + msg = priv->dpfe_api->command[cmd]; +mutex_lock (&priv->lock);/* Wait for DCPU to become ready */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 146/532 ASoC: es8316: Increment max value for ALC Capture Target Volume control
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 6f073429037cd79d7311cd8236311c53f5ea8f01 ]
The following error occurs when trying to restore a previously saved ALSA mixer state (tested on a Rock 5B board):
$ alsactl --no-ucm -f /tmp/asound.state store hw:Analog $ alsactl --no-ucm -I -f /tmp/asound.state restore hw:Analog alsactl: set_control:1475: Cannot write control '2:0:0:ALC Capture Target Volume:0' : Invalid argument
According to ES8316 datasheet, the register at address 0x2B, which is related to the above mixer control, contains by default the value 0xB0. Considering the corresponding ALC target bits (ALCLVL) are 7:4, the control is initialized with 11, which is one step above the maximum value allowed by the driver:
ALCLVL | dB gain
-------+--------
0000 | -16.5 0001 | -15.0 0010 | -13.5 .... | ..... 0111 | -6.0 1000 | -4.5 1001 | -3.0 1010 | -1.5 .... | ..... 1111 | -1.5
The tests performed using the VU meter feature (--vumeter=TYPE) of arecord/aplay confirm the specs are correct and there is no measured gain if the 1011-1111 range would have been mapped to 0 dB:
dB gain | VU meter %
--------+-----------
-6.0 | 30-31
-4.5 | 35-36
-3.0 | 42-43
-1.5 | 50-51
0.0 | 50-51Increment the max value allowed for ALC Capture Target Volume control, so that it matches the hardware default. Additionally, update the related TLV to prevent an artificial extension of the dB gain range.
--- sound/soc/codecs/es8316.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +7 -2
@@ -52,7 +52,12 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); + +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(alc_target_tlv, +0 ,10 ,TLV_DB_SCALE_ITEM (-1650 ,150 ,0 ), + 11, 11, TLV_DB_SCALE_ITEM(-150, 0, 0), +); + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
@@ -115,7 +120,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { alc_max_gain_tlv),SOC_SINGLE_TLV ("ALC Capture Min Volume" ,ES8316_ADC_ALC2 ,0 ,28 ,0 , alc_min_gain_tlv), -SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,10 ,0 , +SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,11 ,0 , alc_target_tlv),SOC_SINGLE ("ALC Capture Hold Time" ,ES8316_ADC_ALC3 ,0 ,10 ,0 ), SOC_SINGLE("ALC Capture Decay Time", ES8316_ADC_ALC4, 4, 10, 0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 147/532 ASoC: es8316: Do not set rate constraints for unsupported MCLKs
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 60413129ee2b38a80347489270af7f6e1c1de4d0 ]
When using the codec through the generic audio graph card, there are at least two calls of es8316_set_dai_sysclk(), with the effect of limiting the allowed sample rates according to the MCLK/LRCK ratios supported by the codec:
1. During audio card setup, to set the initial MCLK - see asoc_simple_init_dai().
2. Before opening a stream, to update MCLK, according to the stream sample rate and the multiplication factor - see asoc_simple_hw_params().
In some cases the initial MCLK might be set to a frequency that doesn't match any of the supported ratios, e.g. 12287999 instead of 12288000, which is only 1 Hz below the supported clock, as that is what the hardware reports. This creates an empty list of rate constraints, which is further passed to snd_pcm_hw_constraint_list() via es8316_pcm_startup(), and causes the following error on the very first access of the sound card:
$ speaker-test -D hw:Analog,0 -F S16_LE -c 2 -t wav Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
Note that all subsequent retries succeed thanks to the updated MCLK set at point 2 above, which uses a computed frequency value instead of a reading from the hardware registers. Normally this would have mitigated the issue, but es8316_pcm_startup() executes before the 2nd call to es8316_set_dai_sysclk(), hence it cannot make use of the updated constraints.
Since es8316_pcm_hw_params() performs anyway a final validation of MCLK against the stream sample rate and the supported MCLK/LRCK ratios, fix the issue by ensuring that sysclk_constraints list is only set when at least one supported sample rate is autodetected by the codec.
--- sound/soc/codecs/es8316.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/es8316.c +7 -7
@@ -369,13 +369,11 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,int count =0 ; es8316->sysclk = freq; + es8316->sysclk_constraints.list =NULL ; + es8316->sysclk_constraints.count =0 ; -if (freq ==0 ) { - es8316->sysclk_constraints.list =NULL ; - es8316->sysclk_constraints.count =0 ; - +if (freq ==0 )return 0 ; - } ret =clk_set_rate (es8316->mclk, freq);if (ret)
@@ -391,8 +389,10 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai, es8316->allowed_rates[count++] = freq / ratio; } - es8316->sysclk_constraints.list = es8316->allowed_rates; - es8316->sysclk_constraints.count = count; +if (count) { + es8316->sysclk_constraints.list = es8316->allowed_rates; + es8316->sysclk_constraints.count = count; + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 148/532 ARM: dts: meson8: correct uart_B and uart_C clock references
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 98b503c7fb13a17a47d8ebf15fa8f7c10118e75c ]
On Meson8 uart_B and uart_C do not work, because they are relying on incorrect clocks. Change the references of pclk to the correct CLKID (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
This was originally reported by Hans-Frieder Vogt for Meson8b [0], but the same bug is also present in meson8.dtsi
--- arch/arm/boot/dts/meson8.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/meson8.dtsi +2 -2
@@ -749,13 +749,13 @@ &uart_A { &uart_B { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; }; &uart_C { compatible = "amlogic,meson8-uart"; - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>; clock-names = "xtal", "pclk", "baud"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 149/532 soc/fsl/qe: fix usb.c build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 ]
Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set. This happens when PPC_EP88XC is set, which selects CPM1 & CPM. When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set. When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
Fixes these build errors:
drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
--- drivers/soc/fsl/qe/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/soc/fsl/qe/Kconfig +1 -0
@@ -39,6 +39,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 150/532 RDMA/irdma: avoid fortify-string warning in irdma_clr_wqes
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit b002760f877c0d91ecd3c78565b52f4bbac379dd ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") triggers a warning for fortified memset():
In function 'fortify_memset_chk',
inlined from 'irdma_clr_wqes' at drivers/infiniband/hw/irdma/uk.c:103:4:include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
493 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The problem here isthat the inner array only has four 8-byte elements, so clearing 4096 bytes overflows that. As this structure is part of an outer array, change the code to pass a pointer to the irdma_qp_quanta instead, and change the size argument for readability, matching the comment above it.
--- drivers/infiniband/hw/irdma/uk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/infiniband/hw/irdma/uk.c +6 -4
@@ -94,16 +94,18 @@ static enum irdma_status_code irdma_nop_1(struct irdma_qp_uk *qp)*/ void irdma_clr_wqes (struct irdma_qp_uk *qp,u32 qp_wqe_idx) { -__le64 *wqe; +struct irdma_qp_quanta *sq;u32 wqe_idx;if (!(qp_wqe_idx &0x7F )) { wqe_idx = (qp_wqe_idx +128 ) % qp->sq_ring.size; - wqe = qp->sq_base[wqe_idx].elem; + sq = qp->sq_base + wqe_idx;if (wqe_idx) -memset (wqe, qp->swqe_polarity ?0 :0xFF ,0x1000 ); +memset (sq, qp->swqe_polarity ?0 :0xFF , +128 *sizeof (*sq));else -memset (wqe, qp->swqe_polarity ?0xFF :0 ,0x1000 ); +memset (sq, qp->swqe_polarity ?0xFF :0 , +128 *sizeof (*sq)); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 151/532 IB/hfi1: Use bitmap_zalloc() when applicable
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit f86dbc9fc5d83384eae7eda0de17f823e8c81ca0 ]
Use 'bitmap_zalloc()' to simplify code, improve the semantic and avoid some open-coded arithmetic in allocator arguments.
Also change the corresponding 'kfree()' into 'bitmap_free()' to keep consistency.
Stable-dep-of: c9358de193ec ("IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate")
--- drivers/infiniband/hw/hfi1/user_sdma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hfi1/user_sdma.c +3 -5
@@ -161,9 +161,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt,if (!pq->reqs) goto pq_reqs_nomem; - pq->req_in_use =kcalloc (BITS_TO_LONGS (hfi1_sdma_comp_ring_size), -sizeof (*pq->req_in_use), -GFP_KERNEL ); + pq->req_in_use =bitmap_zalloc (hfi1_sdma_comp_ring_size,GFP_KERNEL );if (!pq->req_in_use) goto pq_reqs_no_in_use;
@@ -210,7 +208,7 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, cq_nomem:kmem_cache_destroy (pq->txreq_cache); pq_txreq_nomem: -kfree (pq->req_in_use); +bitmap_free (pq->req_in_use); pq_reqs_no_in_use:kfree (pq->reqs); pq_reqs_nomem:
@@ -257,7 +255,7 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd, pq->wait, !atomic_read(&pq->n_reqs));kfree (pq->reqs); -kfree (pq->req_in_use); +bitmap_free (pq->req_in_use);kmem_cache_destroy (pq->txreq_cache);flush_pq_iowait (pq);kfree (pq);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 152/532 IB/hfi1: Fix wrong mmu_node used for user SDMA packet after invalidate
In reply to Greg Kroah-HartmanFrom: Brendan Cunningham <[email protected]>
[ Upstream commit c9358de193ecfb360c3ce75f27ce839ca0b0bc8c ]
The hfi1 user SDMA pinned-page cache will leave a stale cache entry when the cache-entry's virtual address range is invalidated but that cache entry is in-use by an outstanding SDMA request.
Subsequent user SDMA requests with buffers in or spanning the virtual address range of the stale cache entry will result in packets constructed from the wrong memory, the physical pages pointed to by the stale cache entry.
To fix this, remove mmu_rb_node cache entries from the mmu_rb_handler cache independent of the cache entry's refcount. Add 'struct kref refcount' to struct mmu_rb_node and manage mmu_rb_node lifetime with kref_get() and kref_put().
mmu_rb_node.refcount makes sdma_mmu_node.refcount redundant. Remove 'atomic_t refcount' from struct sdma_mmu_node and change sdma_mmu_node code to use mmu_rb_node.refcount.
Move the mmu_rb_handler destructor call after a wait-for-SDMA-request-completion call so mmu_rb_nodes that need mmu_rb_handler's workqueue to queue themselves up for destruction from an interrupt context may do so.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 4 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 101 ++++++++++------- drivers/infiniband/hw/hfi1/mmu_rb.h | 3 + drivers/infiniband/hw/hfi1/sdma.c | 23 +++- drivers/infiniband/hw/hfi1/sdma.h | 47 +++++--- drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 + drivers/infiniband/hw/hfi1/user_sdma.c | 137 ++++++++++-------------- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/infiniband/hw/hfi1/vnic_sdma.c | 4 +- 9 files changed, 177 insertions(+), 145 deletions(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +2 -2
@@ -251,11 +251,11 @@ static int hfi1_ipoib_build_ulp_payload(struct ipoib_txreq *tx,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; ret =sdma_txadd_page (dd, -NULL , txreq,skb_frag_page (frag), frag->bv_offset, -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret))break ; }
drivers/infiniband/hw/hfi1/mmu_rb.c +63 -38
165 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mmu_rb.h +3 -0
@@ -16,6 +16,7 @@ struct mmu_rb_node {struct rb_node node;struct mmu_rb_handler *handler;struct list_head list; +struct kref refcount; };/*
@@ -51,6 +52,8 @@ int hfi1_mmu_rb_register(void *ops_arg,void hfi1_mmu_rb_unregister (struct mmu_rb_handler *handler);int hfi1_mmu_rb_insert (struct mmu_rb_handler *handler,struct mmu_rb_node *mnode); +void hfi1_mmu_rb_release (struct kref *refcount); +void hfi1_mmu_rb_evict (struct mmu_rb_handler *handler,void *evict_arg); struct mmu_rb_node *hfi1_mmu_rb_get_first(struct mmu_rb_handler *handler, unsigned long addr,
drivers/infiniband/hw/hfi1/sdma.c +18 -5
@@ -1593,7 +1593,20 @@ static inline void sdma_unmap_desc(struct hfi1_devdata *dd, struct sdma_desc *descp) { -system_descriptor_complete (dd ,descp ); + switch (sdma_mapping_type(descp)) { + case SDMA_MAP_SINGLE: + dma_unmap_single(&dd->pcidev->dev, sdma_mapping_addr(descp), +sdma_mapping_len (descp ),DMA_TO_DEVICE ); +break ; +case SDMA_MAP_PAGE : +dma_unmap_page (&dd->pcidev->dev,sdma_mapping_addr (descp), +sdma_mapping_len (descp),DMA_TO_DEVICE ); +break ; + } + +if (descp->pinning_ctx && descp->ctx_put) + descp->ctx_put (descp->pinning_ctx); + descp->pinning_ctx =NULL ; }/*
@@ -3113,8 +3126,8 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,/* Add descriptor for coalesce buffer */ tx->desc_limit =MAX_DESC ; -return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, - addr, tx->tlen); +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE , tx, + addr, tx->tlen,NULL ,NULL ,NULL ); }return 1 ;
@@ -3157,9 +3170,9 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)make_tx_sdma_desc ( tx,SDMA_MAP_NONE , -NULL , dd->sdma_pad_phys, -sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 ))); +sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 )), +NULL ,NULL ,NULL ); tx->num_desc++;_sdma_close_tx (dd, tx);return rval;
drivers/infiniband/hw/hfi1/sdma.h +32 -15
116 lines not on this page · raw message
drivers/infiniband/hw/hfi1/sdma_txreq.h +2 -0
@@ -20,6 +20,8 @@ struct sdma_desc {/* private: don't use directly */ u64 qw[2 ];void *pinning_ctx; +/* Release reference to @pinning_ctx. May be called in interrupt context. Must not sleep. */ +void (*ctx_put)(void *ctx); };/**
drivers/infiniband/hw/hfi1/user_sdma.c +55 -82
253 lines not on this page · raw message
drivers/infiniband/hw/hfi1/user_sdma.h +0 -1
@@ -104,7 +104,6 @@ struct hfi1_user_sdma_comp_q {struct sdma_mmu_node {struct mmu_rb_node rb;struct hfi1_user_sdma_pkt_q *pq; -atomic_t refcount;struct page **pages;unsigned int npages; };
drivers/infiniband/hw/hfi1/vnic_sdma.c +2 -2
@@ -64,11 +64,11 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde,/* combine physically continuous fragments later? */ ret =sdma_txadd_page (sde->dd, -NULL , &tx->txreq,skb_frag_page (frag),skb_frag_off (frag), -skb_frag_size (frag)); +skb_frag_size (frag), +NULL ,NULL ,NULL );if (unlikely (ret)) goto bail_txadd; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 153/532 RDMA/hns: Fix hns_roce_table_get return value
In reply to Greg Kroah-HartmanFrom: Chengchang Tang <[email protected]>
[ Upstream commit cf5b608fb0e369c473a8303cad6ddb386505e5b8 ]
The return value of set_hem has been fixed to ENODEV, which will lead a diagnostic information missing.
--- drivers/infiniband/hw/hns/hns_roce_hem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hem.c +4 -3
@@ -597,11 +597,12 @@ int hns_roce_table_get(struct hns_roce_dev *hr_dev, }/* Set HEM base address(128K/page, pa) to Hardware */ -if (hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT )) { + ret = hr_dev->hw->set_hem (hr_dev, table, obj,HEM_HOP_STEP_DIRECT ); +if (ret) {hns_roce_free_hem (hr_dev, table->hem[i]); table->hem[i] =NULL ; - ret = -ENODEV ; -dev_err (dev,"set HEM base address to HW failed.\n" ); +dev_err (dev,"set HEM base address to HW failed, ret = %d.\n" , + ret); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 154/532 ARM: dts: iwg20d-q7-common: Fix backlight pwm specifier
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0501fdec106a291c43b3c1b525cf22ab4c24b2d8 ]
make dtbs_check:
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7743-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7-dbcm-ca.dtb: backlight: pwms: [[67, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
arch/arm/boot/dts/renesas/r8a7744-iwg20d-q7.dtb: backlight: pwms: [[58, 0, 5000000], [0]] is too long
From schema: Documentation/devicetree/bindings/leds/backlight/pwm-backlight.yaml
PWM specifiers referring to R-Car PWM Timer Controllers should contain only two cells.
Fix this by dropping the bogus third cell.
--- arch/arm/boot/dts/iwg20d-q7-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/iwg20d-q7-common.dtsi +1 -1
@@ -49,7 +49,7 @@ audio_clock: audio_clock { lcd_backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm3 0 5000000 0>; + pwms = <&pwm3 0 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <7>; enable-gpios = <&gpio5 14 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 155/532 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -270,7 +270,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -330,7 +330,6 @@ rsnd_for_pcm3168a_capture: endpoint { &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 156/532 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a ]
If 'mipid_detect()' fails, we must free 'md' to avoid a memory leak.
--- drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap/lcd_mipid.c +5 -1
@@ -563,11 +563,15 @@ static int mipid_spi_probe(struct spi_device *spi) r =mipid_detect (md);if (r <0 ) -return r; + goto free_md;omapfb_register_panel (&md->panel);return 0 ; + +free_md: +kfree (md); +return r; }static int mipid_spi_remove (struct spi_device *spi)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 157/532 arm64: dts: ti: k3-j7200: Fix physical address of pin
In reply to Greg Kroah-HartmanFrom: Keerthy <[email protected]>
[ Upstream commit 3d011933000ed9054c649952d83162d24f020a93 ]
wkup_pmx splits into multiple regions. Like
wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12)
wkup_pmx1 -> 2 pins (WKUP_PADCONFIG 14 - 15)
wkup_pmx2 -> 59 pins (WKUP_PADCONFIG 26 - 84)
wkup_pmx3 -> 8 pins (WKUP_PADCONFIG 93 - 100)With this split, pin offset needs to be adjusted to match with new pmx for all pins above wkup_pmx0.
Example a pin under wkup_pmx1 should start from 0 instead of old offset(0x38 WKUP_PADCONFIG 14 offset)
J7200 Datasheet (Table 6-106, Section 6.4 Pin Multiplexing) :
https://www.ti.com/lit/ds/symlink/dra821u.pdf
--- .../dts/ti/k3-j7200-common-proc-board.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +14 -14
@@ -80,25 +80,25 @@ vdd_sd_dv: gpio-regulator-TLV71033 { &wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ - J721E_WKUP_IOPAD(0x006c, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ - J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ - J721E_WKUP_IOPAD(0x0074, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ - J721E_WKUP_IOPAD(0x0078, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ - J721E_WKUP_IOPAD(0x007c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ - J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ - J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ - J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ - J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ - J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ + J721E_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* MCU_RGMII1_TX_CTL */ + J721E_WKUP_IOPAD(0x0004, PIN_INPUT, 0) /* MCU_RGMII1_RX_CTL */ + J721E_WKUP_IOPAD(0x0008, PIN_OUTPUT, 0) /* MCU_RGMII1_TD3 */ + J721E_WKUP_IOPAD(0x000c, PIN_OUTPUT, 0) /* MCU_RGMII1_TD2 */ + J721E_WKUP_IOPAD(0x0010, PIN_OUTPUT, 0) /* MCU_RGMII1_TD1 */ + J721E_WKUP_IOPAD(0x0014, PIN_OUTPUT, 0) /* MCU_RGMII1_TD0 */ + J721E_WKUP_IOPAD(0x0020, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ + J721E_WKUP_IOPAD(0x0024, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ + J721E_WKUP_IOPAD(0x0028, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ + J721E_WKUP_IOPAD(0x002c, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ + J721E_WKUP_IOPAD(0x0018, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x001c, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; }; mcu_mdio_pins_default: mcu-mdio1-pins-default { pinctrl-single,pins = < - J721E_WKUP_IOPAD(0x009c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ - J721E_WKUP_IOPAD(0x0098, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ + J721E_WKUP_IOPAD(0x0034, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ + J721E_WKUP_IOPAD(0x0030, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ >; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 158/532 ARM: dts: stm32: Fix audio routing on STM32MP15xx DHCOM PDK2
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e3f2778b1b6ced649bffdc7cbb05b80bb92f2108 ]
The audio routing flow is not correct, the flow should be from source (second element in the pair) to sink (first element in the pair). The flow now is from "HP_OUT" to "Playback", where "Playback" is source and "HP_OUT" is sink, i.e. the direction is swapped and there is no direct link between the two either.
Fill in the correct routing, where "HP_OUT" supplies the "Headphone Jack", "Line In Jack" supplies "LINE_IN" input, "Microphone Jack" supplies "MIC_IN" input and "Mic Bias" supplies "Microphone Jack".
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +7 -4
@@ -137,10 +137,13 @@ reg_panel_supply: regulator-panel-supply { sound { compatible = "audio-graph-card"; - routing = - "MIC_IN", "Capture", - "Capture", "Mic Bias", - "Playback", "HP_OUT"; + widgets = "Headphone", "Headphone Jack", + "Line", "Line In Jack", + "Microphone", "Microphone Jack"; + routing = "Headphone Jack", "HP_OUT", + "LINE_IN", "Line In Jack", + "MIC_IN", "Microphone Jack", + "Microphone Jack", "Mic Bias"; dais = <&sai2a_port &sai2b_port>; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 159/532 ARM: dts: stm32: fix i2s endpoint format property for stm32mp15xx-dkx
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 076c74c592cabe4a47537fe5205b5b678bed010d ]
Use "dai-format" to configure DAI audio format as specified in audio-graph-port.yaml bindings.
--- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +1 -1
@@ -438,7 +438,7 @@ &i2s2 { i2s2_port: port { i2s2_endpoint: endpoint { remote-endpoint = <&sii9022_tx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 160/532 hwmon: (gsc-hwmon) fix fan pwm temperature scaling
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
[ Upstream commit a6d80df47ee2c69db99e4f2f8871aa4db154620b ]
The GSC fan pwm temperature register is in centidegrees celcius but the Linux hwmon convention is to use milidegrees celcius. Fix the scaling.
--- drivers/hwmon/gsc-hwmon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/gsc-hwmon.c +3 -3
@@ -82,8 +82,8 @@ static ssize_t pwm_auto_point_temp_store(struct device *dev,if (kstrtol (buf,10 , &temp))return -EINVAL ; - temp =clamp_val (temp,0 ,10000 ); - temp =DIV_ROUND_CLOSEST (temp,10 ); + temp =clamp_val (temp,0 ,100000 ); + temp =DIV_ROUND_CLOSEST (temp,100 ); regs[0 ] = temp &0xff ; regs[1 ] = (temp >>8 ) &0xff ;
@@ -100,7 +100,7 @@ static ssize_t pwm_auto_point_pwm_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (devattr); -return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 )) /100 ); +return sprintf (buf,"%d\n" ,255 * (50 + (attr->index *10 ))); } static SENSOR_DEVICE_ATTR_RO(pwm1_auto_point1_pwm, pwm_auto_point_pwm, 0);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 161/532 hwmon: (adm1275) Allow setting sample averaging
In reply to Greg Kroah-HartmanFrom: Potin Lai <[email protected]>
[ Upstream commit a3cd66d7cbadcc0c29884f25b754fd22699c719c ]
Current driver assume PWR_AVG and VI_AVG as 1 by default, and user needs to set sample averaging via sysfs manually.
This patch parses the properties "adi,power-sample-average" and "adi,volt-curr-sample-average" from device tree, and setting sample averaging during probe. Input value must be one of value in the list [1, 2, 4, 8, 16, 32, 64, 128].
Stable-dep-of: b153a0bb4199 ("hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272")
--- drivers/hwmon/pmbus/adm1275.c | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1275.c +39 -1
@@ -475,6 +475,7 @@ static int adm1275_probe(struct i2c_client *client)int vindex =-1 , voindex =-1 , cindex =-1 , pindex =-1 ;int tindex =-1 ;u32 shunt; +u32 avg; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA
@@ -687,7 +688,7 @@ static int adm1275_probe(struct i2c_client *client)if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_byte_data (client, + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config);if (ret <0 ) {
@@ -756,6 +757,43 @@ static int adm1275_probe(struct i2c_client *client)return -ENODEV ; } +if (data->have_power_sampling && +of_property_read_u32 (client->dev.of_node, +"adi,power-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of power samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, true, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting power sample averaging failed with error %d" , + ret); +return ret; + } + } + +if (of_property_read_u32 (client->dev.of_node, +"adi,volt-curr-sample-average" , &avg) ==0 ) { +if (!avg || avg >ADM1275_SAMPLES_AVG_MAX || +BIT (__fls (avg)) != avg) { +dev_err (&client->dev, +"Invalid number of voltage/current samples" ); +return -EINVAL ; + } + ret =adm1275_write_pmon_config (data, client, false, +ilog2 (avg)); +if (ret <0 ) { +dev_err (&client->dev, +"Setting voltage and current sample averaging failed with error %d" , + ret); +return ret; + } + } +if (voindex <0 ) voindex = vindex;if (vindex >=0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 162/532 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272
In reply to Greg Kroah-HartmanFrom: Guenter Roeck <[email protected]>
[ Upstream commit b153a0bb4199566abd337119207f82b59a8cd1ca ]
The PMON_CONFIG register on ADM1272 is a 16 bit register. Writing a 8 bit value into it clears the upper 8 bits of the register, resulting in unexpected side effects. Fix by writing the 16 bit register value.
Also, it has been reported that temperature readings are sometimes widely inaccurate, to the point where readings may result in device shutdown due to errant overtemperature faults. Improve by enabling temperature sampling.
While at it, move the common code for ADM1272 and ADM1278 into a separate function, and clarify in the error message that an attempt was made to enable both VOUT and temperature monitoring.
Last but not least, return the error code reported by the underlying I2C controller and not -ENODEV if updating the PMON_CONFIG register fails. After all, this does not indicate that the chip is not present, but an error in the communication with the chip.
--- drivers/hwmon/pmbus/adm1275.c | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/hwmon/pmbus/adm1275.c +26 -26
@@ -37,10 +37,13 @@ enum chips { adm1075, adm1272, adm1275, adm1276, adm1278, adm1293, adm1294 };#define ADM1272_IRANGE BIT(0) +#define ADM1278_TSFILT BIT(15)#define ADM1278_TEMP1_EN BIT(3)#define ADM1278_VIN_EN BIT(2)#define ADM1278_VOUT_EN BIT(1) +#define ADM1278_PMON_DEFCONFIG (ADM1278_VOUT_EN | ADM1278_TEMP1_EN | ADM1278_TSFILT) +#define ADM1293_IRANGE_25 0#define ADM1293_IRANGE_50 BIT(6)#define ADM1293_IRANGE_100 BIT(7)
@@ -462,6 +465,22 @@ static const struct i2c_device_id adm1275_id[] = { };MODULE_DEVICE_TABLE (i2c, adm1275_id); +/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ +static int adm1275_enable_vout_temp (struct i2c_client *client,int config) +{ +int ret; + +if ((config &ADM1278_PMON_DEFCONFIG ) !=ADM1278_PMON_DEFCONFIG ) { + config |=ADM1278_PMON_DEFCONFIG ; + ret =i2c_smbus_write_word_data (client,ADM1275_PMON_CONFIG , config); +if (ret <0 ) { +dev_err (&client->dev,"Failed to enable VOUT/TEMP1 monitoring\n" ); +return ret; + } + } +return 0 ; +} +static int adm1275_probe (struct i2c_client *client) {s32 (*config_read_fn)(const struct i2c_client *client,u8 reg);
@@ -615,19 +634,10 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; -/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ -if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != - (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { - config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_byte_data (client, -ADM1275_PMON_CONFIG , - config); -if (ret <0 ) { -dev_err (&client->dev, -"Failed to enable VOUT monitoring\n" ); -return -ENODEV ; - } - } + ret =adm1275_enable_vout_temp (client, config); +if (ret) +return ret; +if (config &ADM1278_VIN_EN ) info->func[0 ] |=PMBUS_HAVE_VIN ;break ;
@@ -684,19 +694,9 @@ static int adm1275_probe(struct i2c_client *client)PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP ; -/* Enable VOUT & TEMP1 if not enabled (disabled by default) */ -if ((config & (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) != - (ADM1278_VOUT_EN |ADM1278_TEMP1_EN )) { - config |=ADM1278_VOUT_EN |ADM1278_TEMP1_EN ; - ret =i2c_smbus_write_word_data (client, -ADM1275_PMON_CONFIG , - config); -if (ret <0 ) { -dev_err (&client->dev, -"Failed to enable VOUT monitoring\n" ); -return -ENODEV ; - } - } + ret =adm1275_enable_vout_temp (client, config); +if (ret) +return ret;if (config &ADM1278_VIN_EN ) info->func[0 ] |=PMBUS_HAVE_VIN ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 163/532 ARM: dts: BCM5301X: fix duplex-full => full-duplex
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit fd274b733bfdde3ca72f0fa2a37f032f3a8c402c ]
this typo was found by the dtbs_check
| ports:port@5:fixed-link: 'oneOf' conditional failed,
| {'speed': [[1000]], 'duplex-full': True} is not of type 'array'
| 'duplex-full' does not match any of the regexes: 'pinctrl-[0-]..."this should have been full-duplex;
--- arch/arm/boot/dts/bcm53015-meraki-mr26.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm53015-meraki-mr26.dts +1 -1
@@ -128,7 +128,7 @@ port@5 { fixed-link { speed = <1000>; - duplex-full; + full-duplex; }; }; };
arch/arm/boot/dts/bcm53016-meraki-mr32.dts +1 -1
@@ -212,7 +212,7 @@ port@5 { fixed-link { speed = <1000>; - duplex-full; + full-duplex; }; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 164/532 drm/amdkfd: Fix potential deallocation of previously deallocated memory.
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit cabbdea1f1861098991768d7bbf5a49ed1608213 ]
Pointer mqd_mem_obj can be deallocated in kfd_gtt_sa_allocate(). The function then returns non-zero value, which causes the second deallocation.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +7 -6
@@ -113,18 +113,19 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, &(mqd_mem_obj->gtt_mem), &(mqd_mem_obj->gpu_addr), (void *)&(mqd_mem_obj->cpu_ptr), true); + +if (retval) { +kfree (mqd_mem_obj); +return NULL ; + } }else { retval =kfd_gtt_sa_allocate (kfd,sizeof (struct v9_mqd ), &mqd_mem_obj); - } - -if (retval) { -kfree (mqd_mem_obj); -return NULL ; +if (retval) +return NULL ; }return mqd_mem_obj; - } static void init_mqd(struct mqd_manager *mm, void **mqd,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 165/532 drm/amd/display: Fix artifacting on eDP panels when engaging freesync video mode
In reply to Greg Kroah-HartmanFrom: Aurabindo Pillai <[email protected]>
[ Upstream commit b18f05a0666aecd5cb19c26a8305bcfa4e9d6502 ]
[Why]
When freesync video mode is enabled, switching resolution from native mode to one of the freesync video compatible modes can trigger continous artifacts on some eDP panels when running under KDE. The articating can be seen in the attached bug report.
[How]
Fix this by restricting updates that require full commit by using the same checks for stream and scaling changes in the the enable pass of dm_update_crtc_state() along with the check for compatible timings for freesync vide mode.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -10209,6 +10209,8 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,/* Now check if we should set freesync video mode */ if (amdgpu_freesync_vid_mode && dm_new_crtc_state->stream && +dc_is_stream_unchanged (new_stream, dm_old_crtc_state->stream) && +dc_is_stream_scaling_unchanged (new_stream, dm_old_crtc_state->stream) &&is_timing_unchanged_for_freesync (new_crtc_state, old_crtc_state)) { new_crtc_state->mode_changed = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 166/532 drm/radeon: fix possible division-by-zero errors
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 1becc57cd1a905e2aa0e1eca60d2a37744525c4a ]
Function rv740_get_decoded_reference_divider() may return 0 due to unpredictable reference divider value calculated in radeon_atom_get_clock_dividers(). This will lead to division-by-zero error once that value is used as a divider in calculating 'clk_s'.
While unlikely, this issue should nonetheless be prevented so add a sanity check for such cases by testing 'decoded_ref' value against 0.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
v2: minor coding style fixes (Alex)
In practice this should actually happen as the vbios should be properly populated.
--- drivers/gpu/drm/radeon/cypress_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/ni_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/rv740_dpm.c | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cypress_dpm.c +6 -2
@@ -557,8 +557,12 @@ static int cypress_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/ni_dpm.c +6 -2
@@ -2241,8 +2241,12 @@ static int ni_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/rv740_dpm.c +6 -2
@@ -249,8 +249,12 @@ int rv740_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v =0x40000 * ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v =0x40000 * ss.percentage * (dividers.whole_fb_div + (dividers.frac_fb_div /8 )) / (clk_s *10000 ); mpll_ss1 &= ~CLKV_MASK ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 167/532 amdgpu: validate offset_in_bo of drm_amdgpu_gem_va
In reply to Greg Kroah-HartmanFrom: Chia-I Wu <[email protected]>
[ Upstream commit 9f0bcf49e9895cb005d78b33a5eebfa11711b425 ]
This is motivated by OOB access in amdgpu_vm_update_range when offset_in_bo+map_size overflows.
v2: keep the validations in amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
rather than to amdgpu_gem_va_ioctl
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +8 -8
@@ -2334,14 +2334,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev,uint64_t eaddr;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
@@ -2400,14 +2400,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,int r;/* validate the parameters */ -if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size ==0 || size & ~PAGE_MASK ) +if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK ) +return -EINVAL ; +if (saddr + size <= saddr || offset + size <= offset)return -EINVAL ;/* make sure object fit at this offset */ eaddr = saddr + size -1 ; -if (saddr >= eaddr || - (bo && offset + size >amdgpu_bo_size (bo)) || +if ((bo && offset + size >amdgpu_bo_size (bo)) || (eaddr >= adev->vm_manager.max_pfn <<AMDGPU_GPU_PAGE_SHIFT ))return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 168/532 drm/msm/a5xx: really check for A510 in a5xx_gpu_init
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 736a9327365644b460e4498b1ce172ca411efcbc ]
The commit 010c8bbad2cb ("drm: msm: adreno: Disable preemption on Adreno 510") added special handling for a510 (this SKU doesn't seem to support preemption, so the driver should clamp nr_rings to 1). However the gpu->revn is not yet set (it is set later, in adreno_gpu_init()) and thus the condition is always false. Check config->rev instead.
Patchwork: https://patchwork.freedesktop.org/patch/531511/
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2 -1
@@ -1746,6 +1746,7 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) {struct msm_drm_private *priv = dev->dev_private;struct platform_device *pdev = priv->gpu_pdev; +struct adreno_platform_config *config = pdev->dev.platform_data;struct a5xx_gpu *a5xx_gpu =NULL ;struct adreno_gpu *adreno_gpu;struct msm_gpu *gpu;
@@ -1772,7 +1773,7 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev) nr_rings =4 ; -if (adreno_is_a510 (adreno_gpu)) +if (adreno_cmp_rev (ADRENO_REV (5 ,1 ,0 ,ANY_ID ), config->rev)) nr_rings =1 ; ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs, nr_rings);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 169/532 RDMA/bnxt_re: wraparound mbox producer index
In reply to Greg Kroah-HartmanFrom: Kashyap Desai <[email protected]>
[ Upstream commit 0af91306e17ef3d18e5f100aa58aa787869118af ]
Driver is not handling the wraparound of the mbox producer index correctly. Currently the wraparound happens once u32 max is reached.
Bit 31 of the producer index register is special and should be set only once for the first command. Because the producer index overflow setting bit31 after a long time, FW goes to initialization sequence and this causes FW hang.
Fix is to wraparound the mbox producer index once it reaches u16 max.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +2 -2
@@ -181,7 +181,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, struct cmdq_base *req, }while (size >0 ); cmdq->seq_num++; - cmdq_prod = hwq->prod; + cmdq_prod = hwq->prod &0xFFFF ;if (test_bit (FIRMWARE_FIRST_FLAG , &cmdq->flags)) {/* The very first doorbell write * is required to set this flag
@@ -599,7 +599,7 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, rcfw->cmdq_depth =BNXT_QPLIB_CMDQE_MAX_CNT_8192 ; sginfo.pgsize =bnxt_qplib_cmdqe_page_size (rcfw->cmdq_depth); - hwq_attr.depth = rcfw->cmdq_depth; + hwq_attr.depth = rcfw->cmdq_depth &0x7FFFFFFF ; hwq_attr.stride =BNXT_QPLIB_CMDQE_UNITS ; hwq_attr.type =HWQ_TYPE_CTX ;if (bnxt_qplib_alloc_init_hwq (&cmdq->hwq, &hwq_attr)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 170/532 RDMA/bnxt_re: Avoid calling wake_up threads from spin_lock context
In reply to Greg Kroah-HartmanFrom: Kashyap Desai <[email protected]>
[ Upstream commit 3099bcdc19b701f732f638ee45679858c08559bb ]
bnxt_qplib_service_creq can be called from interrupt or tasklet or process context. So the function take irq variant of spin_lock. But when wake_up is invoked with the lock held, it is putting the calling context to sleep.
[exception RIP: __wake_up_common+190]
RIP: ffffffffb7539d7e RSP: ffffa73300207ad8 RFLAGS: 00000083 RAX: 0000000000000001 RBX: ffff91fa295f69b8 RCX: dead000000000200 RDX: ffffa733344af940 RSI: ffffa73336527940 RDI: ffffa73336527940 RBP: 000000000000001c R8: 0000000000000002 R9: 00000000000299c0 R10: 0000017230de82c5 R11: 0000000000000002 R12: ffffa73300207b28 R13: 0000000000000000 R14: ffffa733341bf928 R15: 0000000000000000 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
Call the wakeup after releasing the lock.
--- drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c +10 -3
@@ -299,7 +299,8 @@ static int bnxt_qplib_process_func_event(struct bnxt_qplib_rcfw *rcfw, }static int bnxt_qplib_process_qp_event (struct bnxt_qplib_rcfw *rcfw, -struct creq_qp_event *qp_event) +struct creq_qp_event *qp_event, +u32 *num_wait) {struct creq_qp_error_notification *err_event;struct bnxt_qplib_hwq *hwq = &rcfw->cmdq.hwq;
@@ -308,6 +309,7 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw,u16 cbit, blocked =0 ;struct pci_dev *pdev;unsigned long flags; +u32 wait_cmds =0 ;__le16 mcookie;u16 cookie;int rc =0 ;
@@ -367,9 +369,10 @@ static int bnxt_qplib_process_qp_event(struct bnxt_qplib_rcfw *rcfw, crsqe->req_size =0 ;if (!blocked) -wake_up (&rcfw->cmdq.waitq); + wait_cmds++;spin_unlock_irqrestore (&hwq->lock, flags); } + *num_wait += wait_cmds;return rc; }
@@ -383,6 +386,7 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)struct creq_base *creqe;u32 sw_cons, raw_cons;unsigned long flags; +u32 num_wakeup =0 ;/* Service the CREQ until budget is over */ spin_lock_irqsave (&hwq->lock, flags);
@@ -401,7 +405,8 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t)switch (type) {case CREQ_BASE_TYPE_QP_EVENT :bnxt_qplib_process_qp_event - (rcfw, (struct creq_qp_event *)creqe); + (rcfw, (struct creq_qp_event *)creqe, + &num_wakeup); creq->stats.creq_qp_event_processed++;break ;case CREQ_BASE_TYPE_FUNC_EVENT :
@@ -429,6 +434,8 @@ static void bnxt_qplib_service_creq(struct tasklet_struct *t) rcfw->res->cctx, true); }spin_unlock_irqrestore (&hwq->lock, flags); +if (num_wakeup) +wake_up_nr (&rcfw->cmdq.waitq, num_wakeup); }static irqreturn_t bnxt_qplib_creq_irq (int irq,void *dev_instance)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 171/532 clk: imx: clk-imx8mn: fix memory leak in imx8mn_clocks_probe
In reply to Greg Kroah-HartmanFrom: Hao Luo <[email protected]>
[ Upstream commit 188d070de9132667956f5aadd98d2bd87d3eac89 ]
Use devm_of_iomap() instead of of_iomap() to automatically handle the unused ioremap region.
If any error occurs, regions allocated by kzalloc() will leak, but using devm_kzalloc() instead will automatically free the memory using devm_kfree().
--- drivers/clk/imx/clk-imx8mn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/imx/clk-imx8mn.c +4 -4
@@ -299,7 +299,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)void __iomem *base;int ret; - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws, + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMX8MN_CLK_END ),GFP_KERNEL );if (WARN_ON (!clk_hw_data))return -ENOMEM ;
@@ -316,10 +316,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_EXT4 ] =imx_obtain_fixed_clk_hw (np,"clk_ext4" ); np =of_find_compatible_node (NULL ,NULL ,"fsl,imx8mn-anatop" ); - base =of_iomap (np,0 ); + base =devm_of_iomap (dev, np,0 ,NULL );of_node_put (np); -if (WARN_ON (!base)) { - ret = -ENOMEM ; +if (WARN_ON (IS_ERR (base))) { + ret =PTR_ERR (base); goto unregister_hws; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 172/532 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()
In reply to Greg Kroah-HartmanFrom: Yuxing Liu <[email protected]>
[ Upstream commit 878b02d5f3b56cb090dbe2c70c89273be144087f ]
Replace of_iomap() and kzalloc() with devm_of_iomap() and devm_kzalloc() which can automatically release the related memory when the device or driver is removed or unloaded to avoid potential memory leak.
In this case, iounmap(anatop_base) in line 427,433 are removed as manual release is not required.
Besides, referring to clk-imx8mq.c, check the return code of of_clk_add_hw_provider, if it returns negtive, print error info and unregister hws, which makes the program more robust.
--- drivers/clk/imx/clk-imx8mp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/clk/imx/clk-imx8mp.c +13 -11
@@ -407,25 +407,22 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct device_node *np;void __iomem *anatop_base, *ccm_base; +int err; np =of_find_compatible_node (NULL ,NULL ,"fsl,imx8mp-anatop" ); - anatop_base =of_iomap (np,0 ); + anatop_base =devm_of_iomap (dev, np,0 ,NULL );of_node_put (np); -if (WARN_ON (!anatop_base)) -return -ENOMEM ; +if (WARN_ON (IS_ERR (anatop_base))) +return PTR_ERR (anatop_base); np = dev->of_node; ccm_base =devm_platform_ioremap_resource (pdev,0 ); -if (WARN_ON (IS_ERR (ccm_base))) { -iounmap (anatop_base); +if (WARN_ON (IS_ERR (ccm_base)))return PTR_ERR (ccm_base); - } - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws,IMX8MP_CLK_END ),GFP_KERNEL ); -if (WARN_ON (!clk_hw_data)) { -iounmap (anatop_base); + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMX8MP_CLK_END ),GFP_KERNEL ); +if (WARN_ON (!clk_hw_data))return -ENOMEM ; - } clk_hw_data->num =IMX8MP_CLK_END ; hws = clk_hw_data->hws;
@@ -710,7 +707,12 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)imx_check_clk_hws (hws,IMX8MP_CLK_END ); -of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data); + err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data); +if (err <0 ) { +dev_err (dev,"failed to register hws for i.MX8MP\n" ); +imx_unregister_hw_clocks (hws,IMX8MP_CLK_END ); +return err; + }imx_register_uart_clocks (4 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 173/532 arm64: dts: qcom: sm8250-edo: Panel framebuffer is 2.5k instead of 4k
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 223ce29c8b7e5b00f01a68387aabeefd77d97f06 ]
The framebuffer configuration for edo pdx203, written in edo dtsi (which is overwritten in pdx206 dts for its smaller panel) has to use a 1096x2560 configuration as this is what the panel (and framebuffer area) has been initialized to. Downstream userspace also has access to (and uses) this 2.5k mode by default, and only switches the panel to 4k when requested.
This is similar to commit be8de06dc397 ("arm64: dts: qcom:
sm8150-kumano: Panel framebuffer is 2.5k instead of 4k") which fixed the same for the previous generation Sony platform.
--- arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +4 -3
@@ -26,9 +26,10 @@ chosen { framebuffer: framebuffer@9c000000 { compatible = "simple-framebuffer"; reg = <0 0x9c000000 0 0x2300000>; - width = <1644>; - height = <3840>; - stride = <(1644 * 4)>; + /* pdx203 BL initializes in 2.5k mode, not 4k */ + width = <1096>; + height = <2560>; + stride = <(1096 * 4)>; format = "a8r8g8b8"; /* * That's a lot of clocks, but it's necessary due
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 174/532 clk: clocking-wizard: Fix Oops in clk_wzrd_register_divider()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9c632a6396505a019ea6d12b5ab45e659a542a93 ]
Smatch detected this potential error pointer dereference clk_wzrd_register_divider(). If devm_clk_hw_register() fails then it sets "hw" to an error pointer and then dereferences it on the next line. Return the error directly instead.
--- drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c +1 -1
@@ -347,7 +347,7 @@ static struct clk *clk_wzrd_register_divider(struct device *dev, hw = &div->hw; ret =devm_clk_hw_register (dev, hw);if (ret) - hw =ERR_PTR (ret); +return ERR_PTR (ret);return hw->clk; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 175/532 clk: tegra: tegra124-emc: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 53a06e5924c0d43c11379a08c5a78529c3e61595 ]
The tegra and tegra needs to be freed in the error handling path, otherwise it will be leaked.
--- drivers/clk/tegra/clk-tegra124-emc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/tegra/clk-tegra124-emc.c +2 -0
@@ -464,6 +464,7 @@ static int load_timings_from_dt(struct tegra_clk_emc *tegra, err =load_one_timing_from_dt (tegra, timing, child);if (err) {of_node_put (child); +kfree (tegra->timings);return err; }
@@ -515,6 +516,7 @@ struct clk *tegra124_clk_register_emc(void __iomem *base, struct device_node *np err =load_timings_from_dt (tegra, node, node_ram_code);if (err) {of_node_put (node); +kfree (tegra);return ERR_PTR (err); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 176/532 ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
In reply to Greg Kroah-HartmanFrom: Su Hui <[email protected]>
[ Upstream commit 79597c8bf64ca99eab385115743131d260339da5 ]
smatch error:sound/pci/ac97/ac97_codec.c:2354 snd_ac97_mixer() error:
we previously assumed 'rac97' could be null (see line 2072)
remove redundant assignment, return error if rac97 is NULL.
--- sound/pci/ac97/ac97_codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/ac97/ac97_codec.c +2 -2
@@ -2070,8 +2070,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, .dev_disconnect = snd_ac97_dev_disconnect, }; -if (rac97) - *rac97 =NULL ; +if (!rac97) +return -EINVAL ;if (snd_BUG_ON (!bus || !template))return -EINVAL ;if (snd_BUG_ON (template->num >=4 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 177/532 drm/msm/dpu: do not enable color-management if DSPPs are not available
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 3bcfc7b90465efd337d39b91b43972162f0d1908 ]
We can not support color management without DSPP blocks being provided in the HW catalog. Do not enable color management for CRTCs if num_dspps is 0.
Patchwork: https://patchwork.freedesktop.org/patch/542141/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -1
@@ -1380,6 +1380,8 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = {struct drm_crtc *dpu_crtc_init (struct drm_device *dev,struct drm_plane *plane,struct drm_plane *cursor) { +struct msm_drm_private *priv = dev->dev_private; +struct dpu_kms *dpu_kms =to_dpu_kms (priv->kms);struct drm_crtc *crtc =NULL ;struct dpu_crtc *dpu_crtc =NULL ;int i;
@@ -1411,7 +1413,8 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane,drm_crtc_helper_add (crtc, &dpu_crtc_helper_funcs); -drm_crtc_enable_color_mgmt (crtc,0 , true,0 ); +if (dpu_kms->catalog->dspp_count) +drm_crtc_enable_color_mgmt (crtc,0 , true,0 );/* save user friendly CRTC name for later */ snprintf (dpu_crtc->name,DPU_CRTC_NAME_SIZE ,"crtc%u" , crtc->base.id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 178/532 drm/msm/dp: Free resources after unregistering them
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit fa0048a4b1fa7a50c8b0e514f5b428abdf69a6f8 ]
The DP component's unbind operation walks through the submodules to unregister and clean things up. But if the unbind happens because the DP controller itself is being removed, all the memory for those submodules has just been freed.
Change the order of these operations to avoid the many use-after-free that otherwise happens in this code path.
Patchwork: https://patchwork.freedesktop.org/patch/542166/
--- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -1
@@ -1295,9 +1295,9 @@ static int dp_display_remove(struct platform_device *pdev) dp =container_of (g_dp_display, struct dp_display_private, dp_display); +component_del (&pdev->dev, &dp_display_comp_ops);dp_display_deinit_sub_modules (dp); -component_del (&pdev->dev, &dp_display_comp_ops);platform_set_drvdata (pdev,NULL );return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 179/532 arm64: dts: mediatek: Add cpufreq nodes for MT8192
In reply to Greg Kroah-HartmanFrom: Allen-KH Cheng <[email protected]>
[ Upstream commit 9d498cce9298a71e3896e2d1aee24a1a4c531d81 ]
Add the cpufreq nodes for MT8192 SoC.
Stable-dep-of: a4366b5695c9 ("arm64: dts: mediatek: mt8192: Fix CPUs capacity-dmips-mhz")
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +14 -0
@@ -41,6 +41,7 @@ cpu0: cpu@0 { clock-frequency = <1701000000>; cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -52,6 +53,7 @@ cpu1: cpu@100 { clock-frequency = <1701000000>; cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -63,6 +65,7 @@ cpu2: cpu@200 { clock-frequency = <1701000000>; cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -74,6 +77,7 @@ cpu3: cpu@300 { clock-frequency = <1701000000>; cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -85,6 +89,7 @@ cpu4: cpu@400 { clock-frequency = <2171000000>; cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -96,6 +101,7 @@ cpu5: cpu@500 { clock-frequency = <2171000000>; cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -107,6 +113,7 @@ cpu6: cpu@600 { clock-frequency = <2171000000>; cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -118,6 +125,7 @@ cpu7: cpu@700 { clock-frequency = <2171000000>; cpu-idle-states = <&cpu_sleep_b &cluster_sleep_b>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -234,6 +242,12 @@ soc { compatible = "simple-bus"; ranges; + performance: performance-controller@11bc10 { + compatible = "mediatek,cpufreq-hw"; + reg = <0 0x0011bc10 0 0x120>, <0 0x0011bd30 0 0x120>; + #performance-domain-cells = <1>; + }; + gic: interrupt-controller@c000000 { compatible = "arm,gic-v3"; #interrupt-cells = <4>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 180/532 arm64: dts: mediatek: mt8192: Fix CPUs capacity-dmips-mhz
In reply to Greg Kroah-HartmanFrom: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit a4366b5695c984b8a3fc8b31de9e758c8f6d1aed ]
The capacity-dmips-mhz parameter was miscalculated: this SoC runs the first (Cortex-A55) cluster at a maximum of 2000MHz and the second (Cortex-A76) cluster at a maximum of 2200MHz.
In order to calculate the right capacity-dmips-mhz, the following test was performed:
1. CPUFREQ governor was set to 'performance' on both clusters
2. Ran dhrystone with 500000000 iterations for 10 times on each cluster
3. Calculated the mean result for each cluster
4. Calculated DMIPS/MHz: dmips_mhz = dmips_per_second / cpu_mhz
5. Scaled results to 1024:
result_c0 = dmips_mhz_c0 / dmips_mhz_c1 * 1024
The mean results for this SoC are:
Cluster 0 (LITTLE): 12016411 Dhry/s
Cluster 1 (BIG): 31702034 Dhry/s
The calculated scaled results are:
Cluster 0: 426.953226899238 (rounded to 427)
Cluster 1: 1024
--- arch/arm64/boot/dts/mediatek/mt8192.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/mediatek/mt8192.dtsi +4 -4
@@ -42,7 +42,7 @@ cpu0: cpu@0 { cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu1: cpu@100 {
@@ -54,7 +54,7 @@ cpu1: cpu@100 { cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu2: cpu@200 {
@@ -66,7 +66,7 @@ cpu2: cpu@200 { cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu3: cpu@300 {
@@ -78,7 +78,7 @@ cpu3: cpu@300 { cpu-idle-states = <&cpu_sleep_l &cluster_sleep_l>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu4: cpu@400 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 181/532 drm/msm/dpu: correct MERGE_3D length
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 9a6c13b847d61b0c3796820ca6e976789df59cd8 ]
Each MERGE_3D block has just two registers. Correct the block length accordingly.
Patchwork: https://patchwork.freedesktop.org/patch/542177/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +1 -1
@@ -808,7 +808,7 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = {#define MERGE_3D_BLK (_name, _id, _base) \ {\ .name = _name, .id = _id, \ - .base = _base, .len = 0x100, \ + .base = _base, .len = 0x8, \ .features = MERGE_3D_SM8150_MASK, \ .sblk = NULL \ }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 182/532 clk: vc5: check memory returned by kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 144601f6228de5598f03e693822b60a95c367a17 ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/clk-versaclock5.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/clk/clk-versaclock5.c +29 -0
@@ -992,6 +992,11 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id) } init.name =kasprintf (GFP_KERNEL ,"%pOFn.mux" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } + init.ops = &vc5_mux_ops; init.flags =0 ; init.parent_names = parent_names;
@@ -1006,6 +1011,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.dbl" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_dbl_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1021,6 +1030,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)/* Register PFD */ memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.pfd" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_pfd_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1038,6 +1051,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)/* Register PLL */ memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.pll" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_pll_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1057,6 +1074,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.fod%d" , client->dev.of_node, idx); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_fod_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1075,6 +1096,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.out0_sel_i2cb" , client->dev.of_node); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_clk_out_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
@@ -1101,6 +1126,10 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)memset (&init,0 ,sizeof (init)); init.name =kasprintf (GFP_KERNEL ,"%pOFn.out%d" , client->dev.of_node, idx +1 ); +if (!init.name) { + ret = -ENOMEM ; + goto err_clk; + } init.ops = &vc5_clk_out_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = parent_names;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 183/532 clk: cdce925: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit bb7d09ddbf361d51eae46f38e7c8a2b85914ea2a ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: e665f029a283 ("clk: Convert to using %pOFn instead of device_node.name")
--- drivers/clk/clk-cdce925.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/clk/clk-cdce925.c +12 -0
@@ -705,6 +705,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =0 ; i < data->chip_info->num_plls; ++i) { pll_clk_name[i] =kasprintf (GFP_KERNEL ,"%pOFn.pll%d" , client->dev.of_node, i); +if (!pll_clk_name[i]) { + err = -ENOMEM ; + goto error; + } init.name = pll_clk_name[i]; data->pll[i].chip = data; data->pll[i].hw.init = &init;
@@ -746,6 +750,10 @@ static int cdce925_probe(struct i2c_client *client, init.num_parents =1 ; init.parent_names = &parent_name;/* Mux Y1 to input */ init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y1" , client->dev.of_node); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[0 ].chip = data; data->clk[0 ].hw.init = &init; data->clk[0 ].index =0 ;
@@ -764,6 +772,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =1 ; i < data->chip_info->num_outputs; ++i) { init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y%d" , client->dev.of_node, i+1 ); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[i].chip = data; data->clk[i].hw.init = &init; data->clk[i].index = i;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 184/532 clk: si5341: return error if one synth clock registration fails
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 2560114c06d7a752b3f4639f28cece58fed11267 ]
In case devm_clk_hw_register() fails for one of synth clocks the probe continues. Later on, when registering output clocks which have as parents all the synth clocks, in case there is registration failure for at least one synth clock the information passed to clk core for registering output clock is not right: init.num_parents is fixed but init.parents may contain an array with less parents.
--- drivers/clk/clk-si5341.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/clk/clk-si5341.c +8 -6
@@ -1554,7 +1554,7 @@ static int si5341_probe(struct i2c_client *client,struct clk_init_data init;struct clk *input;const char *root_clock_name; -const char *synth_clock_names[SI5341_NUM_SYNTH ]; +const char *synth_clock_names[SI5341_NUM_SYNTH ] = {NULL };int err;unsigned int i;struct clk_si5341_output_config config[SI5341_MAX_NUM_OUTPUTS ];
@@ -1706,6 +1706,7 @@ static int si5341_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"synth N%u registration failed\n" , i); + goto free_clk_names; } }
@@ -1783,16 +1784,17 @@ static int si5341_probe(struct i2c_client *client, goto cleanup; } +free_clk_names:/* Free the names, clk framework makes copies */ for (i =0 ; i < data->num_synth; ++i)devm_kfree (&client->dev, (void *)synth_clock_names[i]); -return 0 ; - cleanup: -for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { -if (data->clk[i].vddo_reg) -regulator_disable (data->clk[i].vddo_reg); +if (err) { +for (i =0 ; i <SI5341_MAX_NUM_OUTPUTS ; ++i) { +if (data->clk[i].vddo_reg) +regulator_disable (data->clk[i].vddo_reg); + } }return err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 185/532 clk: si5341: check return value of {devm_}kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 36e4ef82016a2b785cf2317eade77e76699b7bff ]
{devm_}kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/clk-si5341.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/clk-si5341.c +8 -0
@@ -1698,6 +1698,10 @@ static int si5341_probe(struct i2c_client *client,for (i =0 ; i < data->num_synth; ++i) { synth_clock_names[i] =devm_kasprintf (&client->dev,GFP_KERNEL ,"%s.N%u" , client->dev.of_node->name, i); +if (!synth_clock_names[i]) { + err = -ENOMEM ; + goto free_clk_names; + } init.name = synth_clock_names[i]; data->synth[i].index = i; data->synth[i].data = data;
@@ -1716,6 +1720,10 @@ static int si5341_probe(struct i2c_client *client,for (i =0 ; i < data->num_outputs; ++i) { init.name =kasprintf (GFP_KERNEL ,"%s.%d" , client->dev.of_node->name, i); +if (!init.name) { + err = -ENOMEM ; + goto free_clk_names; + } init.flags = config[i].synth_master ?CLK_SET_RATE_PARENT :0 ; data->clk[i].index = i; data->clk[i].data = data;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 186/532 clk: si5341: free unused memory on probe failure
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 267ad94b13c53d8c99a336f0841b1fa1595b1d0f ]
Pointers from synth_clock_names[] should be freed at the end of probe either on probe success or failure path.
--- drivers/clk/clk-si5341.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/clk/clk-si5341.c +7 -9
@@ -1745,7 +1745,7 @@ static int si5341_probe(struct i2c_client *client,if (err) {dev_err (&client->dev,"output %u registration failed\n" , i); - goto cleanup; + goto free_clk_names; }if (config[i].always_on)clk_prepare (data->clk[i].hw.clk);
@@ -1755,7 +1755,7 @@ static int si5341_probe(struct i2c_client *client, data);if (err) {dev_err (&client->dev,"unable to add clk provider\n" ); - goto cleanup; + goto free_clk_names; }if (initialization_required) {
@@ -1763,11 +1763,11 @@ static int si5341_probe(struct i2c_client *client,regcache_cache_only (data->regmap, false); err =regcache_sync (data->regmap);if (err <0 ) - goto cleanup; + goto free_clk_names; err =si5341_finalize_defaults (data);if (err <0 ) - goto cleanup; + goto free_clk_names; }/* wait for device to report input clock present and PLL lock */
@@ -1776,21 +1776,19 @@ static int si5341_probe(struct i2c_client *client, 10000, 250000);if (err) {dev_err (&client->dev,"Error waiting for input clock or PLL lock\n" ); - goto cleanup; + goto free_clk_names; }/* clear sticky alarm bits from initialization */ err =regmap_write (data->regmap,SI5341_STATUS_STICKY ,0 );if (err) {dev_err (&client->dev,"unable to clear sticky status\n" ); - goto cleanup; + goto free_clk_names; } err =sysfs_create_files (&client->dev.kobj, si5341_attributes); -if (err) { +if (err)dev_err (&client->dev,"unable to create sysfs files\n" ); - goto cleanup; - } free_clk_names:/* Free the names, clk framework makes copies */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 187/532 clk: keystone: sci-clk: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit b73ed981da6d25c921aaefa7ca3df85bbd85b7fc ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 96488c09b0f4 ("clk: keystone: sci-clk: cut down the clock name length")
--- drivers/clk/keystone/sci-clk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/keystone/sci-clk.c +2 -0
@@ -302,6 +302,8 @@ static int _sci_clk_build(struct sci_clk_provider *provider, name =kasprintf (GFP_KERNEL ,"clk:%d:%d" , sci_clk->dev_id, sci_clk->clk_id); +if (!name) +return -ENOMEM ; init.name = name;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 188/532 clk: ti: clkctrl: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit bd46cd0b802d9c9576ca78007aa084ae3e74907b ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/clk/ti/clkctrl.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/clk/ti/clkctrl.c +7 -0
@@ -267,6 +267,9 @@ static const char * __init clkctrl_get_clock_name(struct device_node *np,if (clkctrl_name && !legacy_naming) { clock_name =kasprintf (GFP_KERNEL ,"%s-clkctrl:%04x:%d" , clkctrl_name, offset, index); +if (!clock_name) +return NULL ; +strreplace (clock_name,'_' ,'-' );return clock_name;
@@ -598,6 +601,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)if (clkctrl_name) { provider->clkdm_name =kasprintf (GFP_KERNEL ,"%s_clkdm" , clkctrl_name); +if (!provider->clkdm_name) { +kfree (provider); +return ; + } goto clkdm_found; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 189/532 drivers: meson: secure-pwrc: always enable DMA domain
In reply to Greg Kroah-HartmanFrom: Alexey Romanov <[email protected]>
[ Upstream commit 0bb4644d583789c97e74d3e3047189f0c59c4742 ]
Starting from commit e45f243409db ("firmware: meson_sm:
populate platform devices from sm device tree data") pwrc is probed successfully and disables unused pwr domains. By A1 SoC family design, any TEE requires DMA pwr domain always enabled.
--- drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/amlogic/meson-secure-pwrc.c +1 -1
@@ -104,7 +104,7 @@ static struct meson_secure_pwrc_domain_desc a1_pwrc_domains[] = {SEC_PD (ACODEC ,0 ),SEC_PD (AUDIO ,0 ),SEC_PD (OTP ,0 ), -SEC_PD (DMA ,0 ), +SEC_PD (DMA ,GENPD_FLAG_ALWAYS_ON |GENPD_FLAG_IRQ_SAFE ),SEC_PD (SD_EMMC ,0 ), SEC_PD(RAMA, 0),/* SRAMB is used as ATF runtime memory, and should be always on */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 190/532 ovl: update of dentry revalidate flags after copy up
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
[ Upstream commit b07d5cc93e1b28df47a72c519d09d0a836043613 ]
After copy up, we may need to update d_flags if upper dentry is on a remote fs and lower dentries are not.
Add helpers to allow incremental update of the revalidate flags.
--- fs/overlayfs/copy_up.c | 2 ++ fs/overlayfs/dir.c | 3 +-- fs/overlayfs/export.c | 3 +-- fs/overlayfs/namei.c | 3 +-- fs/overlayfs/overlayfs.h | 6 ++++-- fs/overlayfs/super.c | 2 +- fs/overlayfs/util.c | 24 ++++++++++++++++++++---- 7 files changed, 30 insertions(+), 13 deletions(-)
fs/overlayfs/copy_up.c +2 -0
@@ -542,6 +542,7 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)/* Restore timestamps on parent (best effort) */ ovl_set_timestamps (upperdir, &c->pstat);ovl_dentry_set_upper_alias (c->dentry); +ovl_dentry_update_reval (c->dentry, upper); } }inode_unlock (udir);
@@ -840,6 +841,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)inode_unlock (udir);ovl_dentry_set_upper_alias (c->dentry); +ovl_dentry_update_reval (c->dentry,ovl_dentry_upper (c->dentry)); } out:
fs/overlayfs/dir.c +1 -2
@@ -267,8 +267,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,ovl_dir_modified (dentry->d_parent, false);ovl_dentry_set_upper_alias (dentry); -ovl_dentry_update_reval (dentry, newdentry, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, newdentry);if (!hardlink) {/*
fs/overlayfs/export.c +1 -2
@@ -326,8 +326,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,if (upper_alias)ovl_dentry_set_upper_alias (dentry); -ovl_dentry_update_reval (dentry, upper, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, upper);return d_instantiate_anon (dentry, inode);
fs/overlayfs/namei.c +1 -2
@@ -1103,8 +1103,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,ovl_set_flag (OVL_UPPERDATA , inode); } -ovl_dentry_update_reval (dentry, upperdentry, -DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_reval (dentry, upperdentry);revert_creds (old_cred);if (origin_path) {
fs/overlayfs/overlayfs.h +4 -2
@@ -286,8 +286,10 @@ bool ovl_index_all(struct super_block *sb);bool ovl_verify_lower (struct super_block *sb);struct ovl_entry *ovl_alloc_entry (unsigned int numlower);bool ovl_dentry_remote (struct dentry *dentry); -void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *upperdentry, -unsigned int mask); +void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *realdentry); +void ovl_dentry_init_reval (struct dentry *dentry,struct dentry *upperdentry); +void ovl_dentry_init_flags (struct dentry *dentry,struct dentry *upperdentry, +unsigned int mask);bool ovl_dentry_weird (struct dentry *dentry);enum ovl_path_type ovl_path_type (struct dentry *dentry);void ovl_path_upper (struct dentry *dentry,struct path *path);
fs/overlayfs/super.c +1 -1
@@ -1965,7 +1965,7 @@ static struct dentry *ovl_get_root(struct super_block *sb,ovl_dentry_set_flag (OVL_E_CONNECTED , root);ovl_set_upperdata (d_inode (root));ovl_inode_init (d_inode (root), &oip, ino, fsid); -ovl_dentry_update_reval (root, upperdentry,DCACHE_OP_WEAK_REVALIDATE ); +ovl_dentry_init_flags (root, upperdentry,DCACHE_OP_WEAK_REVALIDATE );return root; }
fs/overlayfs/util.c +20 -4
@@ -94,14 +94,30 @@ struct ovl_entry *ovl_alloc_entry(unsigned int numlower)return oe; } +#define OVL_D_REVALIDATE (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE) +bool ovl_dentry_remote (struct dentry *dentry) { -return dentry->d_flags & - (DCACHE_OP_REVALIDATE |DCACHE_OP_WEAK_REVALIDATE ); +return dentry->d_flags &OVL_D_REVALIDATE ; +} + +void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *realdentry) +{ +if (!ovl_dentry_remote (realdentry)) +return ; + +spin_lock (&dentry->d_lock); + dentry->d_flags |= realdentry->d_flags &OVL_D_REVALIDATE ; +spin_unlock (&dentry->d_lock); +} + +void ovl_dentry_init_reval (struct dentry *dentry,struct dentry *upperdentry) +{ +return ovl_dentry_init_flags (dentry, upperdentry,OVL_D_REVALIDATE ); } -void ovl_dentry_update_reval (struct dentry *dentry,struct dentry *upperdentry, -unsigned int mask) +void ovl_dentry_init_flags (struct dentry *dentry,struct dentry *upperdentry, +unsigned int mask) {struct ovl_entry *oe =OVL_E (dentry);unsigned int i, flags =0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 191/532 ASoC: imx-audmix: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 2f76e1d6ca524a888d29aafe29f2ad2003857971 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- sound/soc/fsl/imx-audmix.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/fsl/imx-audmix.c +9 -0
@@ -228,6 +228,8 @@ static int imx_audmix_probe(struct platform_device *pdev) dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s%s" , fe_name_pref, args.np->full_name +1 ); +if (!dai_name) +return -ENOMEM ;dev_info (pdev->dev.parent,"DAI FE name:%s\n" , dai_name);
@@ -236,6 +238,8 @@ static int imx_audmix_probe(struct platform_device *pdev) capture_dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Capture" ); +if (!capture_dai_name) +return -ENOMEM ; } priv->dai[i].cpus = &dlc[0 ];
@@ -266,6 +270,8 @@ static int imx_audmix_probe(struct platform_device *pdev) "AUDMIX-Playback-%d", i); be_cp =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"AUDMIX-Capture-%d" , i); +if (!be_name || !be_pb || !be_cp) +return -ENOMEM ; priv->dai[num_dai + i].cpus = &dlc[3 ]; priv->dai[num_dai + i].codecs = &dlc[4 ];
@@ -293,6 +299,9 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dapm_routes[i].source =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Playback" ); +if (!priv->dapm_routes[i].source) +return -ENOMEM ; + priv->dapm_routes[i].sink = be_pb; priv->dapm_routes[num_dai + i].source = be_pb; priv->dapm_routes[num_dai + i].sink = be_cp;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 192/532 clk: Fix memory leak in devm_clk_notifier_register()
In reply to Greg Kroah-HartmanFrom: Fei Shao <[email protected]>
[ Upstream commit 7fb933e56f77a57ef7cfc59fc34cbbf1b1fa31ff ]
devm_clk_notifier_register() allocates a devres resource for clk notifier but didn't register that to the device, so the notifier didn't get unregistered on device detach and the allocated resource was leaked.
Fix the issue by registering the resource through devres_add().
This issue was found with kmemleak on a Chromebook.
--- drivers/clk/clk.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk.c +1 -0
@@ -4504,6 +4504,7 @@ int devm_clk_notifier_register(struct device *dev, struct clk *clk,if (!ret) { devres->clk = clk; devres->nb = nb; +devres_add (dev, devres); }else {devres_free (devres); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 193/532 PCI: cadence: Fix Gen2 Link Retraining process
In reply to Greg Kroah-HartmanFrom: Siddharth Vadapalli <[email protected]>
[ Upstream commit 0e12f830236928b6fadf40d917a7527f0a048d2f ]
The Link Retraining process is initiated to account for the Gen2 defect in the Cadence PCIe controller in J721E SoC. The errata corresponding to this is i2085, documented at:
https://www.ti.com/lit/er/sprz455c/sprz455c.pdf
The existing workaround implemented for the errata waits for the Data Link initialization to complete and assumes that the link retraining process at the Physical Layer has completed. However, it is possible that the Physical Layer training might be ongoing as indicated by the PCI_EXP_LNKSTA_LT bit in the PCI_EXP_LNKSTA register.
Fix the existing workaround, to ensure that the Physical Layer training has also completed, in addition to the Data Link initialization.
--- .../controller/cadence/pcie-cadence-host.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/pci/controller/cadence/pcie-cadence-host.c +27 -0
@@ -12,6 +12,8 @@#include "pcie-cadence.h" +#define LINK_RETRAIN_TIMEOUT HZ +static u64 bar_max_size[] = { [RP_BAR0 ] =_ULL (128 *SZ_2G ), [RP_BAR1 ] =SZ_2G ,
@@ -77,6 +79,27 @@ static struct pci_ops cdns_pcie_host_ops = { .write = pci_generic_config_write, }; +static int cdns_pcie_host_training_complete (struct cdns_pcie *pcie) +{ +u32 pcie_cap_off =CDNS_PCIE_RP_CAP_OFFSET ; +unsigned long end_jiffies; +u16 lnk_stat; + +/* Wait for link training to complete. Exit after timeout. */ + end_jiffies = jiffies +LINK_RETRAIN_TIMEOUT ; +do { + lnk_stat =cdns_pcie_rp_readw (pcie, pcie_cap_off +PCI_EXP_LNKSTA ); +if (!(lnk_stat &PCI_EXP_LNKSTA_LT )) +break ; +usleep_range (0 ,1000 ); + }while (time_before (jiffies, end_jiffies)); + +if (!(lnk_stat &PCI_EXP_LNKSTA_LT )) +return 0 ; + +return -ETIMEDOUT ; +} +static int cdns_pcie_host_wait_for_link (struct cdns_pcie *pcie) {struct device *dev = pcie->dev;
@@ -118,6 +141,10 @@ static int cdns_pcie_retrain(struct cdns_pcie *pcie)cdns_pcie_rp_writew (pcie, pcie_cap_off +PCI_EXP_LNKCTL , lnk_ctl); + ret =cdns_pcie_host_training_complete (pcie); +if (ret) +return ret; + ret =cdns_pcie_host_wait_for_link (pcie); }return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 194/532 PCI: vmd: Reset VMD config register between soft reboots
In reply to Greg Kroah-HartmanFrom: Nirmal Patel <[email protected]>
[ Upstream commit b61cf04c49c3dfa70a0d6725d3eb40bf9b35cf71 ]
VMD driver can disable or enable MSI remapping by changing VMCONFIG_MSI_REMAP register. This register needs to be set to the default value during soft reboots. Drives failed to enumerate when Windows boots after performing a soft reboot from Linux. Windows doesn't support MSI remapping disable feature and stale register value hinders Windows VMD driver initialization process. Adding vmd_shutdown function to make sure to set the VMCONFIG register to the default value.
--- drivers/pci/controller/vmd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/controller/vmd.c +8 -0
@@ -881,6 +881,13 @@ static void vmd_remove(struct pci_dev *dev)vmd_remove_irq_domain (vmd); } +static void vmd_shutdown (struct pci_dev *dev) +{ +struct vmd_dev *vmd =pci_get_drvdata (dev); + +vmd_remove_irq_domain (vmd); +} +#ifdef CONFIG_PM_SLEEP static int vmd_suspend (struct device *dev) {
@@ -946,6 +953,7 @@ static struct pci_driver vmd_drv = { .id_table = vmd_ids, .probe = vmd_probe, .remove = vmd_remove, + .shutdown = vmd_shutdown, .driver = { .pm = &vmd_dev_pm_ops, },
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 195/532 scsi: qedf: Fix NULL dereference in error handling
In reply to Greg Kroah-HartmanFrom: Jinhong Zhu <[email protected]>
[ Upstream commit f025312b089474a54e4859f3453771314d9e3d4f ]
Smatch reported:
drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
warn: missing unwind goto?
At this point in the function, nothing has been allocated so we can return directly. In particular the "qedf->global_queues" have not been allocated so calling qedf_free_global_queues() will lead to a NULL dereference when we check if (!gl[i]) and "gl" is NULL.
--- drivers/scsi/qedf/qedf_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/qedf/qedf_main.c +1 -2
@@ -3046,9 +3046,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)* addresses of our queues */ if (!qedf->p_cpuq) { - status = -EINVAL ;QEDF_ERR (&qedf->dbg_ctx,"p_cpuq is NULL.\n" ); - goto mem_alloc_failure; +return -EINVAL ; } qedf->global_queues = kzalloc((sizeof(struct global_queue *)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 196/532 pinctrl: bcm2835: Handle gpiochip_add_pin_range() errors
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit cdf7e616120065007687fe1df0412154f259daec ]
gpiochip_add_pin_range() can fail, so better return its error code than a hard coded '0'.
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +2 -4
@@ -359,10 +359,8 @@ static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc,if (!pctldev)return 0 ; -gpiochip_add_pin_range (gc,pinctrl_dev_get_devname (pctldev),0 ,0 , - gc->ngpio); - -return 0 ; +return gpiochip_add_pin_range (gc,pinctrl_dev_get_devname (pctldev),0 ,0 , + gc->ngpio); }static const struct gpio_chip bcm2835_gpio_chip = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 197/532 PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
[ Upstream commit 456d8aa37d0f56fc9e985e812496e861dcd6f2f2 ]
Struct pcie_link_state->downstream is a pointer to the pci_dev of function
0. Previously we retained that pointer when removing function 0, and subsequent ASPM policy changes dereferenced it, resulting in a use-after-free warning from KASAN, e.g.:
# echo 1 > /sys/bus/pci/devices/0000:03:00.0/remove # echo powersave > /sys/module/pcie_aspm/parameters/policy
BUG: KASAN: slab-use-after-free in pcie_config_aspm_link+0x42d/0x500 Call Trace: kasan_report+0xae/0xe0 pcie_config_aspm_link+0x42d/0x500 pcie_aspm_set_policy+0x8e/0x1a0 param_attr_store+0x162/0x2c0 module_attr_store+0x3e/0x80
PCIe spec r6.0, sec 7.5.3.7, recommends that software program the same ASPM Control value in all functions of multi-function devices.
Disable ASPM and free the pcie_link_state when any child function is removed so we can discard the dangling pcie_link_state->downstream pointer and maintain the same ASPM Control configuration for all functions.
--- drivers/pci/pcie/aspm.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/pci/pcie/aspm.c +12 -9
@@ -993,21 +993,24 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)down_read (&pci_bus_sem);mutex_lock (&aspm_lock); -/* -* All PCIe functions are in one slot, remove one function will remove -* the whole slot, so just wait until we are the last function left. -*/ -if (!list_empty (&parent->subordinate->devices)) - goto out; link = parent->link_state; root = link->root; parent_link = link->parent; -/* All functions are removed, so just disable ASPM for the link */ +/* +* link->downstream is a pointer to the pci_dev of function 0. If +* we remove that function, the pci_dev is about to be deallocated, +* so we can't use link->downstream again. Free the link state to +* avoid this. +* +* If we're removing a non-0 function, it's possible we could +* retain the link state, but PCIe r6.0, sec 7.5.3.7, recommends +* programming the same ASPM Control value for all functions of +* multi-function devices, so disable ASPM for all of them. +*/ pcie_config_aspm_link (link,0 );list_del (&link->sibling); -/* Clock PM is for endpoint device */ free_link_state (link);/* Recheck latencies and configure upstream links */
@@ -1015,7 +1018,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)pcie_update_aspm_capable (root);pcie_config_aspm_path (parent_link); } -out: +mutex_unlock (&aspm_lock);up_read (&pci_bus_sem); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 198/532 scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
In reply to Greg Kroah-HartmanFrom: Yuchen Yang <[email protected]>
[ Upstream commit 2e2fe5ac695a00ab03cab4db1f4d6be07168ed9d ]
Smatch complains that:
tw_probe() warn: missing error code 'retval'
This patch adds error checking to tw_probe() to handle initialization failure. If tw_reset_sequence() function returns a non-zero value, the function will return -EINVAL to indicate initialization failure.
--- drivers/scsi/3w-xxxx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/3w-xxxx.c +3 -1
@@ -2305,8 +2305,10 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)TW_DISABLE_INTERRUPTS (tw_dev);/* Initialize the card */ -if (tw_reset_sequence (tw_dev)) +if (tw_reset_sequence (tw_dev)) { + retval = -EINVAL ; goto out_release_mem_region; + }/* Set host specific parameters */ host->max_id =TW_MAX_UNITS ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 199/532 PCI: pciehp: Cancel bringup sequence if card is not present
In reply to Greg Kroah-HartmanFrom: Rongguang Wei <[email protected]>
[ Upstream commit e8afd0d9fccc27c8ad263db5cf5952cfcf72d6fe ]
If a PCIe hotplug slot has an Attention Button, the normal hot-add flow is:
- Slot is empty and slot power is off
- User inserts card in slot and presses Attention Button
- OS blinks Power Indicator for 5 seconds
- After 5 seconds, OS turns on Power Indicator, turns on slot power, and enumerates the device
Previously, if a user pressed the Attention Button on an *empty* slot, pciehp logged the following messages and blinked the Power Indicator until a second button press:
[0.000] pciehp: Button press: will power on in 5 sec
[0.001] # Power Indicator starts blinking
[5.001] # 5 second timeout; slot is empty, so we should cancel the
request to power on and turn off Power Indicator[7.000] # Power Indicator still blinking [8.000] # possible card insertion [9.000] pciehp: Button press: canceling request to power on
The first button press incorrectly left the slot in BLINKINGON_STATE, so the second was interpreted as a "cancel power on" event regardless of whether a card was present.
If the slot is empty, turn off the Power Indicator and return from BLINKINGON_STATE to OFF_STATE after 5 seconds, effectively canceling the request to power on. Putting the slot in OFF_STATE also means the second button press will correctly request a slot power on if the slot is occupied.
--- drivers/pci/hotplug/pciehp_ctrl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/hotplug/pciehp_ctrl.c +8 -0
@@ -256,6 +256,14 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) present =pciehp_card_present (ctrl); link_active =pciehp_check_link_active (ctrl);if (present <=0 && link_active <=0 ) { +if (ctrl->state ==BLINKINGON_STATE ) { + ctrl->state =OFF_STATE ; +cancel_delayed_work (&ctrl->button_work); +pciehp_set_indicators (ctrl,PCI_EXP_SLTCTL_PWR_IND_OFF , +INDICATOR_NOOP ); +ctrl_info (ctrl,"Slot(%s): Card not present\n" , +slot_name (ctrl)); + }mutex_unlock (&ctrl->state_lock);return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 200/532 PCI: ftpci100: Release the clock resources
In reply to Greg Kroah-HartmanFrom: Junyan Ye <[email protected]>
[ Upstream commit c60738de85f40b0b9f5cb23c21f9246e5a47908c ]
Smatch reported:
1. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'clk' from clk_prepare_enable() not released on lines: 442,451,462,478,512,517.
2. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'p->bus_clk' from clk_prepare_enable() not released on lines: 451,462,478,512,517.
The clock resource is obtained by devm_clk_get(), and then clk_prepare_enable() makes the clock resource ready for use. After that, clk_disable_unprepare() should be called to release the clock resource when it is no longer needed. However, while doing some error handling in faraday_pci_probe(), clk_disable_unprepare() is not called to release clk and p->bus_clk before returning. These return lines are exactly 442, 451, 462, 478, 512, 517.
Fix this warning by replacing devm_clk_get() with devm_clk_get_enabled(), which is equivalent to devm_clk_get() + clk_prepare_enable(). And with devm_clk_get_enabled(), the clock will automatically be disabled, unprepared and freed when the device is unbound from the bus.
--- drivers/pci/controller/pci-ftpci100.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/pci/controller/pci-ftpci100.c +2 -12
@@ -442,22 +442,12 @@ static int faraday_pci_probe(struct platform_device *pdev) p->dev = dev;/* Retrieve and enable optional clocks */ - clk =devm_clk_get (dev,"PCLK" ); + clk =devm_clk_get_enabled (dev,"PCLK" );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) { -dev_err (dev,"could not prepare PCLK\n" ); -return ret; - } - p->bus_clk =devm_clk_get (dev,"PCICLK" ); + p->bus_clk =devm_clk_get_enabled (dev,"PCICLK" );if (IS_ERR (p->bus_clk))return PTR_ERR (p->bus_clk); - ret =clk_prepare_enable (p->bus_clk); -if (ret) { -dev_err (dev,"could not prepare PCICLK\n" ); -return ret; - } p->base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (p->base))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 201/532 PCI: Add pci_clear_master() stub for non-CONFIG_PCI
In reply to Greg Kroah-HartmanFrom: Sui Jingfeng <[email protected]>
[ Upstream commit 2aa5ac633259843f656eb6ecff4cf01e8e810c5e ]
Add a pci_clear_master() stub when CONFIG_PCI is not set so drivers that support both PCI and platform devices don't need #ifdefs or extra Kconfig symbols for the PCI parts.
--- include/linux/pci.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci.h +1 -0
@@ -1787,6 +1787,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,#define pci_dev_put (dev) do { } while (0)static inline void pci_set_master (struct pci_dev *dev) { } +static inline void pci_clear_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 202/532 perf bench: Use unbuffered output when pipe/teeing to a file
In reply to Greg Kroah-HartmanFrom: Sohaib Mohamed <[email protected]>
[ Upstream commit f0a29c9647ff8bbb424641f79bc1894e83dec218 ]
The output of 'perf bench' gets buffered when I pipe it to a file or to tee, in such a way that I can see it only at the end.
E.g.
$ perf bench internals synthesize -t < output comes out fine after each test run >
$ perf bench internals synthesize -t | tee file.txt < output comes out only at the end of all tests >
This patch resolves this issue for 'bench' and 'test' subcommands.
See, also:
$ perf bench mem all | tee file.txt $ perf bench sched all | tee file.txt $ perf bench internals all -t | tee file.txt $ perf bench internals all | tee file.txt
Committer testing:
It really gets staggered, i.e. outputs in bursts, when the buffer fills up and has to be drained to make up space for more output.
Stable-dep-of: 16203e9cd018 ("perf bench: Add missing setlocale() call to allow usage of %'d style formatting")
--- tools/perf/builtin-bench.c | 5 +++-- tools/perf/tests/builtin-test.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)
tools/perf/builtin-bench.c +3 -2
@@ -226,7 +226,6 @@ static void run_collection(struct collection *coll)if (!bench->fn)break ;printf ("# Running %s/%s benchmark...\n" , coll->name, bench->name); -fflush (stdout); argv[1 ] = bench->name;run_bench (coll->name, bench->name, bench->fn,1 , argv);
@@ -247,6 +246,9 @@ int cmd_bench(int argc, const char **argv)struct collection *coll;int ret =0 ; +/* Unbuffered output */ +setvbuf (stdout,NULL , _IONBF,0 ); +if (argc <2 ) {/* No collection specified. */ print_usage ();
@@ -300,7 +302,6 @@ int cmd_bench(int argc, const char **argv)if (bench_format ==BENCH_FORMAT_DEFAULT )printf ("# Running '%s/%s' benchmark:\n" , coll->name, bench->name); -fflush (stdout); ret =run_bench (coll->name, bench->name, bench->fn, argc-1 , argv+1 ); goto end; }
tools/perf/tests/builtin-test.c +3 -0
@@ -828,6 +828,9 @@ int cmd_test(int argc, const char **argv)if (ret <0 )return ret; +/* Unbuffered output */ +setvbuf (stdout,NULL , _IONBF,0 ); + argc =parse_options_subcommand (argc, argv, test_options, test_subcommands, test_usage,0 );if (argc >=1 && !strcmp (argv[0 ],"list" ))return perf_test__list (argc -1 , argv +1 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 203/532 perf bench: Add missing setlocale() call to allow usage of %d style formatting
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 16203e9cd01896b4244100a8e3fb9f6e612ab2b1 ]
Without this we were not getting the thousands separator for big numbers.
Noticed while developing 'perf bench uprobe', but the use of %' predates that, for instance 'perf bench syscall' uses it.
Before:
# perf bench uprobe all
# Running uprobe/baseline benchmark...
# Executed 1000 usleep(1000) calls
Total time: 1054082243ns1054082.243000 nsecs/op
#
After:
# perf bench uprobe all
# Running uprobe/baseline benchmark...
# Executed 1,000 usleep(1000) calls
Total time: 1,053,715,144ns1,053,715.144000 nsecs/op
#
--- tools/perf/builtin-bench.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/builtin-bench.c +2 -0
@@ -21,6 +21,7 @@#include "builtin.h" #include "bench/bench.h" +#include <locale.h> #include <stdio.h> #include <stdlib.h> #include <string.h>
@@ -248,6 +249,7 @@ int cmd_bench(int argc, const char **argv)/* Unbuffered output */ setvbuf (stdout,NULL , _IONBF,0 ); +setlocale (LC_ALL ,"" );if (argc <2 ) {/* No collection specified. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 204/532 pinctrl: cherryview: Return correct value if pin in push-pull mode
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 5835196a17be5cfdcad0b617f90cf4abe16951a4 ]
Currently the getter returns ENOTSUPP on pin configured in the push-pull mode. Fix this by adding the missed switch case.
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +10 -5
@@ -945,11 +945,6 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,break ; -case PIN_CONFIG_DRIVE_OPEN_DRAIN : -if (!(ctrl1 &CHV_PADCTRL1_ODEN )) -return -EINVAL ; -break ; -case PIN_CONFIG_BIAS_HIGH_IMPEDANCE : {u32 cfg;
@@ -959,6 +954,16 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,return -EINVAL ;break ; + +case PIN_CONFIG_DRIVE_PUSH_PULL : +if (ctrl1 &CHV_PADCTRL1_ODEN ) +return -EINVAL ; +break ; + +case PIN_CONFIG_DRIVE_OPEN_DRAIN : +if (!(ctrl1 &CHV_PADCTRL1_ODEN )) +return -EINVAL ; +break ; }default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 205/532 kcsan: Dont expect 64 bits atomic builtins from 32 bits architectures
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 353e7300a1db928e427462f2745f9a2cd1625b3d ]
Activating KCSAN on a 32 bits architecture leads to the following link-time failure:
LD .tmp_vmlinux.kallsyms1
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_load':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_load_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_store':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_store_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_exchange':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_add':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_add_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_sub':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_sub_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_and':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_and_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_or':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_or_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_xor':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_xor_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_fetch_nand':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_fetch_nand_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_strong':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_weak':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
powerpc64-linux-ld: kernel/kcsan/core.o: in function `__tsan_atomic64_compare_exchange_val':
kernel/kcsan/core.c:1273: undefined reference to `__atomic_compare_exchange_8'
32 bits architectures don't have 64 bits atomic builtins. Only include DEFINE_TSAN_ATOMIC_OPS(64) on 64 bits architectures.
--- kernel/kcsan/core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/kcsan/core.c +2 -0
@@ -1050,7 +1050,9 @@ EXPORT_SYMBOL(__tsan_init);DEFINE_TSAN_ATOMIC_OPS (8 );DEFINE_TSAN_ATOMIC_OPS (16 );DEFINE_TSAN_ATOMIC_OPS (32 ); +#ifdef CONFIG_64BIT DEFINE_TSAN_ATOMIC_OPS (64 ); +#endif void __tsan_atomic_thread_fence (int memorder);void __tsan_atomic_thread_fence (int memorder)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 206/532 powerpc/interrupt: Dont read MSR from interrupt_exit_kernel_prepare()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit 0eb089a72fda3f7969e6277804bde75dc1474a14 ]
A disassembly of interrupt_exit_kernel_prepare() shows a useless read of MSR register. This is shown by r9 being re-used immediately without doing anything with the value read.
c000e0e0: 60 00 00 00 nop c000e0e4: 7d 3a c2 a6 mfmd_ap r9 c000e0e8: 7d 20 00 a6 mfmsr r9 c000e0ec: 7c 51 13 a6 mtspr 81,r2 c000e0f0: 81 3f 00 84 lwz r9,132(r31) c000e0f4: 71 29 80 00 andi. r9,r9,32768
This is due to the use of local_irq_save(). The flags read by local_irq_save() are never used, use local_irq_disable() instead.
--- arch/powerpc/kernel/interrupt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/kernel/interrupt.c +1 -2
@@ -531,7 +531,6 @@ void preempt_schedule_irq(void);notrace unsigned long interrupt_exit_kernel_prepare (struct pt_regs *regs) { -unsigned long flags;unsigned long ret =0 ;unsigned long kuap; bool stack_store = current_thread_info()->flags &
@@ -548,7 +547,7 @@ notrace unsigned long interrupt_exit_kernel_prepare(struct pt_regs *regs) kuap =kuap_get_and_assert_locked (); -local_irq_save (flags); +local_irq_disable ();if (!arch_irq_disabled_regs (regs)) {/* Returning to a kernel context with local irqs enabled. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 207/532 powerpc/signal32: Force inlining of __unsafe_save_user_regs() and save_tm_user_regs_unsafe()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit a03b1a0b19398a47489fdcef02ec19c2ba05a15d ]
Looking at generated code for handle_signal32() shows calls to a function called __unsafe_save_user_regs.constprop.0 while user access is open.
And that __unsafe_save_user_regs.constprop.0 function has two nops at the begining, allowing it to be traced, which is unexpected during user access open window.
The solution could be to mark __unsafe_save_user_regs() no trace, but to be on the safe side the most efficient is to flag it __always_inline as already done for function __unsafe_restore_general_regs(). The function is relatively small and only called twice, so the size increase will remain in the noise.
Do the same with save_tm_user_regs_unsafe() as it may suffer the same issue.
--- arch/powerpc/kernel/signal_32.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
arch/powerpc/kernel/signal_32.c +9 -6
@@ -258,8 +258,9 @@ static void prepare_save_user_regs(int ctx_has_vsx_region)#endif } -static int __unsafe_save_user_regs (struct pt_regs *regs,struct mcontext __user *frame, -struct mcontext __user *tm_frame,int ctx_has_vsx_region) +static __always_inline int +__unsafe_save_user_regs (struct pt_regs *regs,struct mcontext __user *frame, +struct mcontext __user *tm_frame,int ctx_has_vsx_region) {unsigned long msr = regs->msr;
@@ -358,8 +359,9 @@ static void prepare_save_tm_user_regs(void) current->thread.ckvrsave =mfspr (SPRN_VRSAVE ); } -static int save_tm_user_regs_unsafe (struct pt_regs *regs,struct mcontext __user *frame, -struct mcontext __user *tm_frame,unsigned long msr) +static __always_inline int +save_tm_user_regs_unsafe (struct pt_regs *regs,struct mcontext __user *frame, +struct mcontext __user *tm_frame,unsigned long msr) {/* Save both sets of general registers */ unsafe_save_general_regs (¤t->thread.ckpt_regs, frame, failed);
@@ -438,8 +440,9 @@ static int save_tm_user_regs_unsafe(struct pt_regs *regs, struct mcontext __user#else static void prepare_save_tm_user_regs (void ) { } -static int save_tm_user_regs_unsafe (struct pt_regs *regs,struct mcontext __user *frame, -struct mcontext __user *tm_frame,unsigned long msr) +static __always_inline int +save_tm_user_regs_unsafe (struct pt_regs *regs,struct mcontext __user *frame, +struct mcontext __user *tm_frame,unsigned long msr) {return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 208/532 perf script: Fix allocation of evsel->priv related to per-event dump files
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 36d3e4138e1b6cc9ab179f3f397b5548f8b1eaae ]
When printing output we may want to generate per event files, where the --per-event-dump option should be used, creating perf.data.EVENT.dump files instead of printing to stdout.
The callback thar processes event thus expects that evsel->priv->fp should point to either the per-event FILE descriptor or to stdout.
The a3af66f51bd0bca7 ("perf script: Fix crash because of missing evsel->priv") changeset fixed a case where evsel->priv wasn't setup, thus set to NULL, causing a segfault when trying to access evsel->priv->fp.
But it did it for the non --per-event-dump case by allocating a 'struct perf_evsel_script' just to set its ->fp to stdout.
Since evsel->priv is only freed when --per-event-dump is used, we ended up with a memory leak, detected using ASAN.
Fix it by using the same method as perf_script__setup_per_event_dump(), and reuse that static 'struct perf_evsel_script'.
Also check if evsel_script__new() failed.
--- tools/perf/builtin-script.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/perf/builtin-script.c +8 -8
@@ -2260,6 +2260,9 @@ static int process_sample_event(struct perf_tool *tool,return ret; } +// Used when scr->per_event_dump is not set +static struct evsel_script es_stdout; +static int process_attr (struct perf_tool *tool,union perf_event *event,struct evlist **pevlist) {
@@ -2268,7 +2271,6 @@ static int process_attr(struct perf_tool *tool, union perf_event *event,struct evsel *evsel, *pos;u64 sample_type;int err; -static struct evsel_script *es; err =perf_event__process_attr (tool, event, pevlist);if (err)
@@ -2278,14 +2280,13 @@ static int process_attr(struct perf_tool *tool, union perf_event *event, evsel =evlist__last (*pevlist);if (!evsel->priv) { -if (scr->per_event_dump) { +if (scr->per_event_dump) { evsel->priv =evsel_script__new (evsel, scr->session->data); - }else { - es =zalloc (sizeof (*es)); -if (!es) +if (!evsel->priv)return -ENOMEM ; - es->fp = stdout; - evsel->priv = es; + }else {// Replicate what is done in perf_script__setup_per_event_dump() + es_stdout.fp = stdout; + evsel->priv = &es_stdout; } }
@@ -2591,7 +2592,6 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)static int perf_script__setup_per_event_dump (struct perf_script *script) {struct evsel *evsel; -static struct evsel_script es_stdout;if (script->per_event_dump)return perf_script__fopen_per_event_dump (script);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 209/532 perf dwarf-aux: Fix off-by-one in die_get_varname()
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 3abfcfd847717d232e36963f31a361747c388fe7 ]
The die_get_varname() returns "(unknown_type)" string if it failed to find a type for the variable. But it had a space before the opening parenthesis and it made the closing parenthesis cut off due to the off-by-one in the string length (14).
--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +1 -1
@@ -1081,7 +1081,7 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf) ret =die_get_typename (vr_die, buf);if (ret <0 ) {pr_debug ("Failed to get type, make it unknown.\n" ); - ret =strbuf_add (buf," (unknown_type)" ,14 ); + ret =strbuf_add (buf,"(unknown_type)" ,14 ); }return ret <0 ? ret :strbuf_addf (buf,"\t%s" ,dwarf_diename (vr_die));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 210/532 powerpc/64s: Fix VAS mm use after free
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit b4bda59b47879cce38a6ec5a01cd3cac702b5331 ]
The refcount on mm is dropped before the coprocessor is detached.
--- arch/powerpc/platforms/powernv/vas-window.c | 2 +- arch/powerpc/platforms/pseries/vas.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/powernv/vas-window.c +1 -1
@@ -1310,8 +1310,8 @@ int vas_win_close(struct vas_window *vwin)/* if send window, drop reference to matching receive window */ if (window->tx_win) {if (window->user_win) { -put_vas_user_win_ref (&vwin->task_ref);mm_context_remove_vas_window (vwin->task_ref.mm); +put_vas_user_win_ref (&vwin->task_ref); }put_rx_win (window->rxwin); }
arch/powerpc/platforms/pseries/vas.c +1 -1
@@ -441,8 +441,8 @@ static int vas_deallocate_window(struct vas_window *vwin)atomic_dec (&caps->used_lpar_creds);mutex_unlock (&vas_pseries_mutex); -put_vas_user_win_ref (&vwin->task_ref);mm_context_remove_vas_window (vwin->task_ref.mm); +put_vas_user_win_ref (&vwin->task_ref);kfree (win);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 211/532 pinctrl: microchip-sgpio: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 310cd4c206cd04696ccbfd1927b5ab6973e8cc8e ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- drivers/pinctrl/pinctrl-microchip-sgpio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/pinctrl-microchip-sgpio.c +3 -0
@@ -729,6 +729,9 @@ static int microchip_sgpio_register_bank(struct device *dev, pctl_desc->name =devm_kasprintf (dev,GFP_KERNEL ,"%s-%sput" ,dev_name (dev), bank->is_input ?"in" :"out" ); +if (!pctl_desc->name) +return -ENOMEM ; + pctl_desc->pctlops = &sgpio_pctl_ops; pctl_desc->pmxops = &sgpio_pmx_ops; pctl_desc->confops = &sgpio_confops;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 212/532 pinctrl: at91-pio4: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit f6fd5d4ff8ca0b24cee1af4130bcb1fa96b61aa0 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 1c4e5c470a56 ("pinctrl: at91: use devm_kasprintf() to avoid potential leaks")
Depends-on: 5a8f9cf269e8 ("pinctrl: at91-pio4: use proper format specifier for unsigned int")
--- drivers/pinctrl/pinctrl-at91-pio4.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -0
@@ -1128,6 +1128,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)/* Pin naming convention: P(bank_name)(bank_pin_number). */ pin_desc[i].name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"P%c%d" , bank +'A' , line); +if (!pin_desc[i].name) +return -ENOMEM ; group->name = group_names[i] = pin_desc[i].name; group->pin = pin_desc[i].number;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 213/532 powerpc/powernv/sriov: perform null check on iov before dereferencing iov
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit f4f913c980bc6abe0ccfe88fe3909c125afe4a2d ]
Currently pointer iov is being dereferenced before the null check of iov which can lead to null pointer dereference errors. Fix this by moving the iov null check before the dereferencing.
Detected using cppcheck static analysis:linux/arch/powerpc/platforms/powernv/pci-sriov.c:597:12: warning: Either the condition '!iov' is redundant or there is possible null pointer
dereference: iov. [nullPointerRedundantCheck]
num_vfs = iov->num_vfs;
^--- arch/powerpc/platforms/powernv/pci-sriov.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/platforms/powernv/pci-sriov.c +3 -3
@@ -600,12 +600,12 @@ static void pnv_pci_sriov_disable(struct pci_dev *pdev)struct pnv_iov_data *iov; iov =pnv_iov_get (pdev); - num_vfs = iov->num_vfs; - base_pe = iov->vf_pe_arr[0 ].pe_number; -if (WARN_ON (!iov))return ; + num_vfs = iov->num_vfs; + base_pe = iov->vf_pe_arr[0 ].pe_number; +/* Release VF PEs */ pnv_ioda_release_vf_PE (pdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 214/532 powerpc: simplify ppc_save_regs
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 37195b820d32c23bdefce3f460ed7de48a57e5e4 ]
Adjust the pt_regs pointer so the interrupt frame offsets can be used to save registers.
Stable-dep-of: b684c09f09e7 ("powerpc: update ppc_save_regs to save current r1 in pt_regs")
--- arch/powerpc/kernel/ppc_save_regs.S | 57 ++++++++--------------------- 1 file changed, 15 insertions(+), 42 deletions(-)
arch/powerpc/kernel/ppc_save_regs.S +15 -42
@@ -21,60 +21,33 @@ * different ABIs, though). */ _GLOBAL(ppc_save_regs) - PPC_STL r0,0*SZL(r3) + /* This allows stack frame accessor macros and offsets to be used */ + subi r3,r3,STACK_FRAME_OVERHEAD + PPC_STL r0,GPR0(r3) #ifdef CONFIG_PPC32 - stmw r2, 2*SZL(r3) + stmw r2,GPR2(r3) #else - PPC_STL r2,2*SZL(r3) - PPC_STL r3,3*SZL(r3) - PPC_STL r4,4*SZL(r3) - PPC_STL r5,5*SZL(r3) - PPC_STL r6,6*SZL(r3) - PPC_STL r7,7*SZL(r3) - PPC_STL r8,8*SZL(r3) - PPC_STL r9,9*SZL(r3) - PPC_STL r10,10*SZL(r3) - PPC_STL r11,11*SZL(r3) - PPC_STL r12,12*SZL(r3) - PPC_STL r13,13*SZL(r3) - PPC_STL r14,14*SZL(r3) - PPC_STL r15,15*SZL(r3) - PPC_STL r16,16*SZL(r3) - PPC_STL r17,17*SZL(r3) - PPC_STL r18,18*SZL(r3) - PPC_STL r19,19*SZL(r3) - PPC_STL r20,20*SZL(r3) - PPC_STL r21,21*SZL(r3) - PPC_STL r22,22*SZL(r3) - PPC_STL r23,23*SZL(r3) - PPC_STL r24,24*SZL(r3) - PPC_STL r25,25*SZL(r3) - PPC_STL r26,26*SZL(r3) - PPC_STL r27,27*SZL(r3) - PPC_STL r28,28*SZL(r3) - PPC_STL r29,29*SZL(r3) - PPC_STL r30,30*SZL(r3) - PPC_STL r31,31*SZL(r3) + SAVE_GPRS(2, 31, r3) lbz r0,PACAIRQSOFTMASK(r13) - PPC_STL r0,SOFTE-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,SOFTE(r3) #endif /* go up one stack frame for SP */ PPC_LL r4,0(r1) - PPC_STL r4,1*SZL(r3) + PPC_STL r4,GPR1(r3) /* get caller's LR */ PPC_LL r0,LRSAVE(r4) - PPC_STL r0,_LINK-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_LINK(r3) mflr r0 - PPC_STL r0,_NIP-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_NIP(r3) mfmsr r0 - PPC_STL r0,_MSR-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_MSR(r3) mfctr r0 - PPC_STL r0,_CTR-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_CTR(r3) mfxer r0 - PPC_STL r0,_XER-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_XER(r3) mfcr r0 - PPC_STL r0,_CCR-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_CCR(r3) li r0,0 - PPC_STL r0,_TRAP-STACK_FRAME_OVERHEAD(r3) - PPC_STL r0,ORIG_GPR3-STACK_FRAME_OVERHEAD(r3) + PPC_STL r0,_TRAP(r3) + PPC_STL r0,ORIG_GPR3(r3) blr
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 215/532 powerpc: update ppc_save_regs to save current r1 in pt_regs
In reply to Greg Kroah-HartmanFrom: Aditya Gupta <[email protected]>
[ Upstream commit b684c09f09e7a6af3794d4233ef785819e72db79 ]
ppc_save_regs() skips one stack frame while saving the CPU register states. Instead of saving current R1, it pulls the previous stack frame pointer.
When vmcores caused by direct panic call (such as echo c > /proc/sysrq-trigger), are debugged with gdb, gdb fails to show the backtrace correctly. On further analysis, it was found that it was because of mismatch between r1 and NIP.
GDB uses NIP to get current function symbol and uses corresponding debug info of that function to unwind previous frames, but due to the mismatching r1 and NIP, the unwinding does not work, and it fails to unwind to the 2nd frame and hence does not show the backtrace.
GDB backtrace with vmcore of kernel without this patch:
---------
(gdb) bt
#0 0xc0000000002a53e8 in crash_setup_regs (oldregs=<optimized out>,
newregs=0xc000000004f8f8d8) at ./arch/powerpc/include/asm/kexec.h:69 #1 __crash_kexec (regs=<optimized out>) at kernel/kexec_core.c:974 #2 0x0000000000000063 in ?? () #3 0xc000000003579320 in ?? ()
---------
Further analysis revealed that the mismatch occurred because "ppc_save_regs" was saving the previous stack's SP instead of the current r1. This patch fixes this by storing current r1 in the saved pt_regs.
GDB backtrace with vmcore of patched kernel:
--------
(gdb) bt
#0 0xc0000000002a53e8 in crash_setup_regs (oldregs=0x0, newregs=0xc00000000670b8d8)
at ./arch/powerpc/include/asm/kexec.h:69
#1 __crash_kexec (regs=regs@entry=0x0) at kernel/kexec_core.c:974
#2 0xc000000000168918 in panic (fmt=fmt@entry=0xc000000001654a60 "sysrq triggered crash\n")
at kernel/panic.c:358
#3 0xc000000000b735f8 in sysrq_handle_crash (key=<optimized out>) at drivers/tty/sysrq.c:155
#4 0xc000000000b742cc in __handle_sysrq (key=key@entry=99, check_mask=check_mask@entry=false)
at drivers/tty/sysrq.c:602
#5 0xc000000000b7506c in write_sysrq_trigger (file=<optimized out>, buf=<optimized out>,
count=2, ppos=<optimized out>) at drivers/tty/sysrq.c:1163
#6 0xc00000000069a7bc in pde_write (ppos=<optimized out>, count=<optimized out>,
buf=<optimized out>, file=<optimized out>, pde=0xc00000000362cb40) at fs/proc/inode.c:340
#7 proc_reg_write (file=<optimized out>, buf=<optimized out>, count=<optimized out>,
ppos=<optimized out>) at fs/proc/inode.c:352
#8 0xc0000000005b3bbc in vfs_write (file=file@entry=0xc000000006aa6b00,
buf=buf@entry=0x61f498b4f60 <error: Cannot access memory at address 0x61f498b4f60>,
count=count@entry=2, pos=pos@entry=0xc00000000670bda0) at fs/read_write.c:582
#9 0xc0000000005b4264 in ksys_write (fd=<optimized out>,
buf=0x61f498b4f60 <error: Cannot access memory at address 0x61f498b4f60>, count=2)
at fs/read_write.c:637
#10 0xc00000000002ea2c in system_call_exception (regs=0xc00000000670be80, r0=<optimized out>)
at arch/powerpc/kernel/syscall.c:171
#11 0xc00000000000c270 in system_call_vectored_common ()
at arch/powerpc/kernel/interrupt_64.S:192--------
Nick adds:
So this now saves regs as though it was an interrupt taken in the caller, at the instruction after the call to ppc_save_regs, whereas previously the NIP was there, but R1 came from the caller's caller and that mismatch is what causes gdb's dwarf unwinder to go haywire.
--- arch/powerpc/kernel/ppc_save_regs.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/ppc_save_regs.S +3 -3
@@ -31,10 +31,10 @@ _GLOBAL(ppc_save_regs) lbz r0,PACAIRQSOFTMASK(r13) PPC_STL r0,SOFTE(r3) #endif - /* go up one stack frame for SP */ - PPC_LL r4,0(r1) - PPC_STL r4,GPR1(r3) + /* store current SP */ + PPC_STL r1,GPR1(r3) /* get caller's LR */ + PPC_LL r4,0(r1) PPC_LL r0,LRSAVE(r4) PPC_STL r0,_LINK(r3) mflr r0
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 216/532 riscv: uprobes: Restore thread.bad_cause
In reply to Greg Kroah-HartmanFrom: Tiezhu Yang <[email protected]>
[ Upstream commit 58b1294dd1d65bb62f08dddbf418f954210c2057 ]
thread.bad_cause is saved in arch_uprobe_pre_xol(), it should be restored in arch_uprobe_{post,abort}_xol() accordingly, otherwise the save operation is meaningless, this change is similar with x86 and powerpc.
--- arch/riscv/kernel/probes/uprobes.c | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/kernel/probes/uprobes.c +2 -0
@@ -67,6 +67,7 @@ int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)struct uprobe_task *utask = current->utask;WARN_ON_ONCE (current->thread.bad_cause !=UPROBE_TRAP_NR ); + current->thread.bad_cause = utask->autask.saved_cause;instruction_pointer_set (regs, utask->vaddr + auprobe->insn_size);
@@ -102,6 +103,7 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) {struct uprobe_task *utask = current->utask; + current->thread.bad_cause = utask->autask.saved_cause;/* * Task has received a fatal signal, so reset back to probbed * address.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 217/532 powerpc/book3s64/mm: Fix DirectMap stats in /proc/meminfo
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit 0da90af431abc3f497a38ec9ef6e43b0d0dabe80 ]
On memory unplug reduce DirectMap page count correctly.
root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 115343360 kB DirectMap1G: 0 kB
Before fix:
root@ubuntu-guest:# ndctl disable-namespace all disabled 1 namespace root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 115343360 kB DirectMap1G: 0 kB
After fix:
root@ubuntu-guest:# ndctl disable-namespace all disabled 1 namespace root@ubuntu-guest:# grep Direct /proc/meminfo DirectMap4k: 0 kB DirectMap64k: 0 kB DirectMap2M: 104857600 kB DirectMap1G: 0 kB
--- arch/powerpc/mm/book3s64/radix_pgtable.c | 34 +++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-)
arch/powerpc/mm/book3s64/radix_pgtable.c +22 -12
@@ -764,9 +764,9 @@ static void free_pud_table(pud_t *pud_start, p4d_t *p4d) }static void remove_pte_table (pte_t *pte_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pte_t *pte; pte = pte_start +pte_index (addr);
@@ -788,13 +788,16 @@ static void remove_pte_table(pte_t *pte_start, unsigned long addr, }pte_clear (&init_mm, addr, pte); + pages++; } +if (direct) +update_page_count (mmu_virtual_psize, -pages); }static void __meminit remove_pmd_table (pmd_t *pmd_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pte_t *pte_base;pmd_t *pmd;
@@ -812,19 +815,22 @@ static void __meminit remove_pmd_table(pmd_t *pmd_start, unsigned long addr,continue ; }pte_clear (&init_mm, addr, (pte_t *)pmd); + pages++;continue ; } pte_base = (pte_t *)pmd_page_vaddr (*pmd); -remove_pte_table (pte_base, addr, next); +remove_pte_table (pte_base, addr, next, direct);free_pte_table (pte_base, pmd); } +if (direct) +update_page_count (MMU_PAGE_2M , -pages); }static void __meminit remove_pud_table (pud_t *pud_start,unsigned long addr, -unsigned long end) +unsigned long end,bool direct) { -unsigned long next; +unsigned long next, pages =0 ;pmd_t *pmd_base;pud_t *pud;
@@ -842,16 +848,20 @@ static void __meminit remove_pud_table(pud_t *pud_start, unsigned long addr,continue ; }pte_clear (&init_mm, addr, (pte_t *)pud); + pages++;continue ; } pmd_base =pud_pgtable (*pud); -remove_pmd_table (pmd_base, addr, next); +remove_pmd_table (pmd_base, addr, next, direct);free_pmd_table (pmd_base, pud); } +if (direct) +update_page_count (MMU_PAGE_1G , -pages); } -static void __meminit remove_pagetable (unsigned long start,unsigned long end) +static void __meminit remove_pagetable (unsigned long start,unsigned long end, +bool direct) {unsigned long addr, next;pud_t *pud_base;
@@ -880,7 +890,7 @@ static void __meminit remove_pagetable(unsigned long start, unsigned long end) } pud_base =p4d_pgtable (*p4d); -remove_pud_table (pud_base, addr, next); +remove_pud_table (pud_base, addr, next, direct);free_pud_table (pud_base, p4d); }
@@ -903,7 +913,7 @@ int __meminit radix__create_section_mapping(unsigned long start,int __meminit radix__remove_section_mapping (unsigned long start,unsigned long end) { -remove_pagetable (start, end); +remove_pagetable (start, end, true);return 0 ; }#endif /* CONFIG_MEMORY_HOTPLUG */
@@ -939,7 +949,7 @@ int __meminit radix__vmemmap_create_mapping(unsigned long start,#ifdef CONFIG_MEMORY_HOTPLUG void __meminit radix__vmemmap_remove_mapping (unsigned long start,unsigned long page_size) { -remove_pagetable (start, start + page_size); +remove_pagetable (start, start + page_size, false); }#endif #endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 218/532 powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit c8eebc4a99f15280654f23e914e746c40a516e50 ]
Without this fix, the last subsection vmemmap can end up in memory even if the namespace is created with -M mem and has sufficient space in the altmap area.
--- arch/powerpc/mm/init_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/init_64.c +1 -1
@@ -188,7 +188,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long starunsigned long nr_pfn = page_size /sizeof (struct page );unsigned long start_pfn =page_to_pfn ((struct page *)start); -if ((start_pfn + nr_pfn) > altmap->end_pfn) +if ((start_pfn + nr_pfn -1 ) > altmap->end_pfn)return true;if (start_pfn < altmap->base_pfn)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 219/532 hwrng: virtio - add an internal buffer
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit bf3175bc50a3754dc427e2f5046e17a9fafc8be7 ]
hwrng core uses two buffers that can be mixed in the virtio-rng queue.
If the buffer is provided with wait=0 it is enqueued in the virtio-rng queue but unused by the caller.
On the next call, core provides another buffer but the first one is filled instead and the new one queued. And the caller reads the data from the new one that is not updated, and the data in the first one are lost.
To avoid this mix, virtio-rng needs to use its own unique internal buffer at a cost of a data copy to the caller buffer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 43 ++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-)
drivers/char/hw_random/virtio-rng.c +33 -10
@@ -18,13 +18,20 @@ static DEFINE_IDA(rng_index_ida);struct virtrng_info {struct hwrng hwrng;struct virtqueue *vq; -struct completion have_data;char name[25 ]; -unsigned int data_avail;int index;bool busy;bool hwrng_register_done;bool hwrng_removed; +/* data transfer */ +struct completion have_data; +unsigned int data_avail; +/* minimal size returned by rng_buffer_size() */ +#if SMP_CACHE_BYTES <32 +u8 data[32 ]; +#else +u8 data[SMP_CACHE_BYTES ]; +#endif };static void random_recv_done (struct virtqueue *vq)
@@ -39,14 +46,14 @@ static void random_recv_done(struct virtqueue *vq) }/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi,u8 *buf,size_t size) +static void register_buffer (struct virtrng_info *vi) {struct scatterlist sg; -sg_init_one (&sg, buf, size); +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */ -virtqueue_add_inbuf (vi->vq, &sg,1 , buf,GFP_KERNEL ); +virtqueue_add_inbuf (vi->vq, &sg,1 , vi->data,GFP_KERNEL );virtqueue_kick (vi->vq); }
@@ -55,6 +62,8 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) {int ret;struct virtrng_info *vi = (struct virtrng_info *)rng->priv; +unsigned int chunk; +size_t read;if (vi->hwrng_removed)return -ENODEV ;
@@ -62,19 +71,33 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (!vi->busy) { vi->busy = true;reinit_completion (&vi->have_data); -register_buffer (vi, buf, size); +register_buffer (vi); }if (!wait)return 0 ; - ret =wait_for_completion_killable (&vi->have_data); -if (ret <0 ) -return ret; + read =0 ; +while (size !=0 ) { + ret =wait_for_completion_killable (&vi->have_data); +if (ret <0 ) +return ret; + + chunk = min_t(unsigned int, size, vi->data_avail); +memcpy (buf + read, vi->data, chunk); + read += chunk; + size -= chunk; + vi->data_avail =0 ; + +if (size !=0 ) { +reinit_completion (&vi->have_data); +register_buffer (vi); + } + } vi->busy = false; -return vi->data_avail; +return read; }static void virtio_cleanup (struct hwrng *rng)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 220/532 hwrng: virtio - dont wait on cleanup
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 2bb31abdbe55742c89f4dc0cc26fcbc8467364f6 ]
When virtio-rng device was dropped by the hwrng core we were forced to wait the buffer to come back from the device to not have remaining ongoing operation that could spoil the buffer.
But now, as the buffer is internal to the virtio-rng we can release the waiting loop immediately, the buffer will be retrieve and use when the virtio-rng driver will be selected again.
This avoids to hang on an rng_current write command if the virtio-rng device is blocked by a lack of entropy. This allows to select another entropy source if the current one is empty.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/char/hw_random/virtio-rng.c +6 -1
@@ -82,6 +82,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret; +/* if vi->data_avail is 0, we have been interrupted +* by a cleanup, but buffer stays in the queue +*/ +if (vi->data_avail ==0 ) +return read; chunk = min_t(unsigned int, size, vi->data_avail);memcpy (buf + read, vi->data, chunk);
@@ -105,7 +110,7 @@ static void virtio_cleanup(struct hwrng *rng)struct virtrng_info *vi = (struct virtrng_info *)rng->priv;if (vi->busy) -wait_for_completion (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 221/532 hwrng: virtio - dont waste entropy
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 5c8e933050044d6dd2a000f9a5756ae73cbe7c44 ]
if we don't use all the entropy available in the buffer, keep it and use it later.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 52 +++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-)
drivers/char/hw_random/virtio-rng.c +35 -17
@@ -26,6 +26,7 @@ struct virtrng_info {/* data transfer */ struct completion have_data;unsigned int data_avail; +unsigned int data_idx;/* minimal size returned by rng_buffer_size() */ #if SMP_CACHE_BYTES <32 u8 data[32 ];
@@ -42,6 +43,9 @@ static void random_recv_done(struct virtqueue *vq)if (!virtqueue_get_buf (vi->vq, &vi->data_avail))return ; + vi->data_idx =0 ; + vi->busy = false; +complete (&vi->have_data); }
@@ -58,6 +62,16 @@ static void register_buffer(struct virtrng_info *vi)virtqueue_kick (vi->vq); } +static unsigned int copy_data (struct virtrng_info *vi,void *buf, +unsigned int size) +{ + size = min_t(unsigned int, size, vi->data_avail); +memcpy (buf, vi->data + vi->data_idx, size); + vi->data_idx += size; + vi->data_avail -= size; +return size; +} +static int virtio_read (struct hwrng *rng,void *buf,size_t size,bool wait) {int ret;
@@ -68,17 +82,29 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->hwrng_removed)return -ENODEV ; -if (!vi->busy) { - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); + read =0 ; + +/* copy available data */ +if (vi->data_avail) { + chunk =copy_data (vi, buf, size); + size -= chunk; + read += chunk; }if (!wait) -return 0 ; +return read; - read =0 ; +/* We have already copied available entropy, +* so either size is 0 or data_avail is 0 +*/ while (size !=0 ) { +/* data_avail is 0 */ +if (!vi->busy) { +/* no pending request, ask for more */ + vi->busy = true; +reinit_completion (&vi->have_data); +register_buffer (vi); + } ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -88,20 +114,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->data_avail ==0 )return read; - chunk = min_t(unsigned int, size, vi->data_avail); -memcpy (buf + read, vi->data, chunk); - read += chunk; + chunk =copy_data (vi, buf + read, size); size -= chunk; - vi->data_avail =0 ; - -if (size !=0 ) { -reinit_completion (&vi->have_data); -register_buffer (vi); - } + read += chunk; } - vi->busy = false; -return read; }
@@ -161,6 +178,7 @@ static void remove_common(struct virtio_device *vdev) vi->hwrng_removed = true; vi->data_avail =0 ; + vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); vi->busy = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 222/532 hwrng: virtio - always add a pending request
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 9a4b612d675b03f7fc9fa1957ca399c8223f3954 ]
If we ensure we have already some data available by enqueuing again the buffer once data are exhausted, we can return what we have without waiting for the device answer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/char/hw_random/virtio-rng.c +12 -14
@@ -20,7 +20,6 @@ struct virtrng_info {struct virtqueue *vq;char name[25 ];int index; -bool busy;bool hwrng_register_done;bool hwrng_removed;/* data transfer */
@@ -44,16 +43,18 @@ static void random_recv_done(struct virtqueue *vq)return ; vi->data_idx =0 ; - vi->busy = false;complete (&vi->have_data); } -/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi) +static void request_entropy (struct virtrng_info *vi) {struct scatterlist sg; +reinit_completion (&vi->have_data); + vi->data_avail =0 ; + vi->data_idx =0 ; +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */
@@ -69,6 +70,8 @@ static unsigned int copy_data(struct virtrng_info *vi, void *buf,memcpy (buf, vi->data + vi->data_idx, size); vi->data_idx += size; vi->data_avail -= size; +if (vi->data_avail ==0 ) +request_entropy (vi);return size; }
@@ -98,13 +101,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)* so either size is 0 or data_avail is 0 */ while (size !=0 ) { -/* data_avail is 0 */ -if (!vi->busy) { -/* no pending request, ask for more */ - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); - } +/* data_avail is 0 but a request is pending */ ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -126,8 +123,7 @@ static void virtio_cleanup(struct hwrng *rng) {struct virtrng_info *vi = (struct virtrng_info *)rng->priv; -if (vi->busy) -complete (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
@@ -163,6 +159,9 @@ static int probe_common(struct virtio_device *vdev) goto err_find; } +/* we always have a pending entropy request */ +request_entropy (vi); +return 0 ; err_find:
@@ -181,7 +180,6 @@ static void remove_common(struct virtio_device *vdev) vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); - vi->busy = false;if (vi->hwrng_register_done)hwrng_unregister (&vi->hwrng); vdev->config->del_vqs (vdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 223/532 hwrng: virtio - Fix race on data_avail and actual data
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit ac52578d6e8d300dd50f790f29a24169b1edd26c ]
The virtio rng device kicks off a new entropy request whenever the data available reaches zero. When a new request occurs at the end of a read operation, that is, when the result of that request is only needed by the next reader, then there is a race between the writing of the new data and the next reader.
This is because there is no synchronisation whatsoever between the writer and the reader.
Fix this by writing data_avail with smp_store_release and reading it with smp_load_acquire when we first enter read. The subsequent reads are safe because they're either protected by the first load acquire, or by the completion mechanism.
Also remove the redundant zeroing of data_idx in random_recv_done (data_idx must already be zero at this point) and data_avail in request_entropy (ditto).
--- drivers/char/hw_random/virtio-rng.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/char/hw_random/virtio-rng.c +5 -5
@@ -4,6 +4,7 @@* Copyright (C) 2007, 2008 Rusty Russell IBM Corporation */ +#include <asm/barrier.h> #include <linux/err.h> #include <linux/hw_random.h> #include <linux/scatterlist.h>
@@ -37,13 +38,13 @@ struct virtrng_info {static void random_recv_done (struct virtqueue *vq) {struct virtrng_info *vi = vq->vdev->priv; +unsigned int len;/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */ -if (!virtqueue_get_buf (vi->vq, &vi->data_avail)) +if (!virtqueue_get_buf (vi->vq, &len))return ; - vi->data_idx =0 ; - +smp_store_release (&vi->data_avail, len);complete (&vi->have_data); }
@@ -52,7 +53,6 @@ static void request_entropy(struct virtrng_info *vi)struct scatterlist sg;reinit_completion (&vi->have_data); - vi->data_avail =0 ; vi->data_idx =0 ;sg_init_one (&sg, vi->data,sizeof (vi->data));
@@ -88,7 +88,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) read =0 ;/* copy available data */ -if (vi->data_avail) { +if (smp_load_acquire (&vi->data_avail)) { chunk =copy_data (vi, buf, size); size -= chunk; read += chunk;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 224/532 modpost: remove broken calculation of exception_table_entry size
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit d0acc76a49aa917c1a455d11d32d34a01e8b2835 ]
find_extable_entry_size() is completely broken. It has awesome comments about how to calculate sizeof(struct exception_table_entry).
It was based on these assumptions:
- struct exception_table_entry has two fields
- both of the fields have the same size
Then, we came up with this equation:
(offset of the second field) * 2 == (size of struct)
It was true for all architectures when commit 52dc0595d540 ("modpost:
handle relocations mismatch in __ex_table.") was applied.
Our mathematics broke when commit 548acf19234d ("x86/mm: Expand the exception table logic to allow new handling options") introduced the third field.
Now, the definition of exception_table_entry is highly arch-dependent.
For x86, sizeof(struct exception_table_entry) is apparently 12, but find_extable_entry_size() sets extable_entry_size to 8.
I could fix it, but I do not see much value in this code.
extable_entry_size is used just for selecting a slightly different error message.
If the first field ("insn") references to a non-executable section,
The relocation at %s+0x%lx references section "%s" which is not executable, IOW it is not possible for the kernel to fault at that address. Something is seriously wrong and should be fixed.
If the second field ("fixup") references to a non-executable section,
The relocation at %s+0x%lx references
section "%s" which is not executable, IOW
the kernel will fault if it ever tries to
jump to it. Something is seriously wrong
and should be fixed.
Merge the two error messages rather than adding even more complexity.
Change fatal() to error() to make it continue running and catch more possible errors.
--- scripts/mod/modpost.c | 60 +++---------------------------------------- 1 file changed, 3 insertions(+), 57 deletions(-)
scripts/mod/modpost.c +3 -57
@@ -1612,43 +1612,6 @@ static int is_executable_section(struct elf_info* elf, unsigned int section_indereturn ((elf->sechdrs[section_index].sh_flags &SHF_EXECINSTR ) ==SHF_EXECINSTR ); } -/* -* We rely on a gross hack in section_rel[a]() calling find_extable_entry_size() -* to know the sizeof(struct exception_table_entry) for the target architecture. -*/ -static unsigned int extable_entry_size =0 ; -static void find_extable_entry_size (const char *const sec,const Elf_Rela * r) -{ -/* -* If we're currently checking the second relocation within __ex_table, -* that relocation offset tells us the offsetof(struct -* exception_table_entry, fixup) which is equal to sizeof(struct -* exception_table_entry) divided by two. We use that to our advantage -* since there's no portable way to get that size as every architecture -* seems to go with different sized types. Not pretty but better than -* hard-coding the size for every architecture.. -*/ -if (!extable_entry_size) - extable_entry_size = r->r_offset *2 ; -} - -static inline bool is_extable_fault_address (Elf_Rela *r) -{ -/* -* extable_entry_size is only discovered after we've handled the -* _second_ relocation in __ex_table, so only abort when we're not -* handling the first reloc and extable_entry_size is zero. -*/ -if (r->r_offset && extable_entry_size ==0 ) -fatal ("extable_entry size hasn't been discovered!\n" ); - -return ((r->r_offset ==0 ) || - (r->r_offset % extable_entry_size ==0 )); -} - -#define is_second_extable_reloc (Start, Cur, Sec) \ - (((Cur) == (Start) + 1) && (strcmp("__ex_table", (Sec)) == 0)) - static void report_extable_warnings(const char* modname, struct elf_info* elf, const struct sectioncheck* const mismatch, Elf_Rela* r, Elf_Sym* sym,
@@ -1705,22 +1668,9 @@ static void extable_mismatch_handler(const char* modname, struct elf_info *elf,"You might get more information about where this is\n" "coming from by using scripts/check_extable.sh %s\n" , fromsec, (long)r->r_offset, tosec, modname); - else if (!is_executable_section(elf, get_secindex(elf, sym))) { -if (is_extable_fault_address (r)) -fatal ("The relocation at %s+0x%lx references\n" -"section \"%s\" which is not executable, IOW\n" -"it is not possible for the kernel to fault\n" -"at that address. Something is seriously wrong\n" -"and should be fixed.\n" , - fromsec, (long )r->r_offset, tosec); -else -fatal ("The relocation at %s+0x%lx references\n" -"section \"%s\" which is not executable, IOW\n" -"the kernel will fault if it ever tries to\n" -"jump to it. Something is seriously wrong\n" -"and should be fixed.\n" , - fromsec, (long )r->r_offset, tosec); - } + else if (!is_executable_section(elf, get_secindex(elf, sym))) + error("%s+0x%lx references non-executable section '%s'\n", + fromsec, (long)r->r_offset, tosec); } static void check_section_mismatch(const char *modname, struct elf_info *elf,
@@ -1871,8 +1821,6 @@ static void section_rela(const char *modname, struct elf_info *elf,/* Skip special sections */ if (is_shndx_special (sym->st_shndx))continue ; -if (is_second_extable_reloc (start, rela, fromsec)) -find_extable_entry_size (fromsec, &r);check_section_mismatch (modname, elf, &r, sym, fromsec); } }
@@ -1931,8 +1879,6 @@ static void section_rel(const char *modname, struct elf_info *elf,/* Skip special sections */ if (is_shndx_special (sym->st_shndx))continue ; -if (is_second_extable_reloc (start, rel, fromsec)) -find_extable_entry_size (fromsec, &r);check_section_mismatch (modname, elf, &r, sym, fromsec); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 225/532 crypto: nx - fix build warnings when DEBUG_FS is not enabled
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b04b076fb56560b39d695ac3744db457e12278fd ]
Fix build warnings when DEBUG_FS is not enabled by using an empty do-while loop instead of a value:
In file included from ../drivers/crypto/nx/nx.c:27:../drivers/crypto/nx/nx.c: In function 'nx_register_algs':../drivers/crypto/nx/nx.h:173:33: warning: statement with no effect [-Wunused-value]
173 | #define NX_DEBUGFS_INIT(drv) (0)../drivers/crypto/nx/nx.c:573:9: note: in expansion of macro 'NX_DEBUGFS_INIT'
573 | NX_DEBUGFS_INIT(&nx_driver);../drivers/crypto/nx/nx.c: In function 'nx_remove':../drivers/crypto/nx/nx.h:174:33: warning: statement with no effect [-Wunused-value]
174 | #define NX_DEBUGFS_FINI(drv) (0)../drivers/crypto/nx/nx.c:793:17: note: in expansion of macro 'NX_DEBUGFS_FINI'
793 | NX_DEBUGFS_FINI(&nx_driver);
Also, there is no need to build nx_debugfs.o when DEBUG_FS is not enabled, so change the Makefile to accommodate that.
--- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/nx/Makefile +1 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o nx-crypto-objs := nx.o \ - nx_debugfs.o \ nx-aes-cbc.o \ nx-aes-ecb.o \ nx-aes-gcm.o \
@@ -11,6 +10,7 @@ nx-crypto-objs := nx.o \ nx-sha256.o \ nx-sha512.o +nx-crypto-$(CONFIG_DEBUG_FS) += nx_debugfs.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES) += nx-compress-pseries.o nx-compress.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV) += nx-compress-powernv.o nx-compress.o nx-compress-objs := nx-842.o
drivers/crypto/nx/nx.h +2 -2
@@ -170,8 +170,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,void nx_debugfs_init (struct nx_crypto_driver *);void nx_debugfs_fini (struct nx_crypto_driver *);#else -#define NX_DEBUGFS_INIT (drv) (0) -#define NX_DEBUGFS_FINI (drv) (0) +#define NX_DEBUGFS_INIT (drv) do {} while (0) +#define NX_DEBUGFS_FINI (drv) do {} while (0)#endif #define NX_PAGE_NUM (x) ((u64)(x) & 0xfffffffffffff000ULL)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 226/532 modpost: fix section mismatch message for R_ARM_ABS32
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit b7c63520f6703a25eebb4f8138fed764fcae1c6f ]
addend_arm_rel() processes R_ARM_ABS32 in a wrong way.
Here, test code.
[test code 1]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }If you compile it with ARM versatile_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> (unknown) (section: .init.data)
(You need to use GNU linker instead of LLD to reproduce it.)
If you compile it for other architectures, modpost will show the correct symbol name.
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
For R_ARM_ABS32, addend_arm_rel() sets r->r_addend to a wrong value.
I just mimicked the code in arch/arm/kernel/module.c.
However, there is more difficulty for ARM.
Here, test code.
[test code 2]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }
int __initdata bar;
int get_bar(void) { return bar; }With this commit applied, modpost will show the following messages for ARM versatile_defconfig:
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
WARNING: modpost: vmlinux.o: section mismatch in reference: get_bar (section: .text) -> foo (section: .init.data)
The reference from 'get_bar' to 'foo' seems wrong.
I have no solution for this because it is true in assembly level.
In the following output, relocation at 0x1c is no longer associated with 'bar'. The two relocation entries point to the same symbol, and the offset to 'bar' is encoded in the instruction 'r0, [r3, #4]'.
Disassembly of section .text:
00000000 <get_foo>:
0: e59f3004 ldr r3, [pc, #4] @ c <get_foo+0xc>
4: e5930000 ldr r0, [r3]
8: e12fff1e bx lr
c: 00000000 .word 0x00000000 00000010 <get_bar>:
10: e59f3004 ldr r3, [pc, #4] @ 1c <get_bar+0xc>
14: e5930004 ldr r0, [r3, #4]
18: e12fff1e bx lr
1c: 00000000 .word 0x00000000 Relocation section '.rel.text' at offset 0x244 contains 2 entries:
Offset Info Type Sym.Value Sym. Name
0000000c 00000c02 R_ARM_ABS32 00000000 .init.data 0000001c 00000c02 R_ARM_ABS32 00000000 .init.data
When find_elf_symbol() gets into a situation where relsym->st_name is zero, there is no guarantee to get the symbol name as written in C.
I am keeping the current logic because it is useful in many architectures, but the symbol name is not always correct depending on the optimization. I left some comments in find_tosym().
--- scripts/mod/modpost.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
scripts/mod/modpost.c +9 -3
@@ -1302,6 +1302,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,if (relsym->st_name !=0 )return relsym; +/* +* Strive to find a better symbol name, but the resulting name may not +* match the symbol referenced in the original code. +*/ relsym_secindex =get_secindex (elf, relsym);for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {if (get_secindex (elf, sym) != relsym_secindex)
@@ -1734,12 +1738,14 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info); +Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info); +void *loc =reloc_location (elf, sechdr, r); +uint32_t inst;switch (r_typ) {case R_ARM_ABS32 : -/* From ARM ABI: (S + A) | T */ - r->r_addend = (int )(long ) - (elf->symtab_start +ELF_R_SYM (r->r_info)); + inst =TO_NATIVE (*(uint32_t *)loc); + r->r_addend = inst + sym->st_value;break ;case R_ARM_PC24 :case R_ARM_CALL :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 227/532 modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 56a24b8ce6a7f9c4a21b2276a8644f6f3d8fc14d ]
addend_arm_rel() processes R_ARM_PC24, R_ARM_CALL, R_ARM_JUMP24 in a wrong way.
Here, test code.
[test code for R_ARM_JUMP24]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
b bar
[test code for R_ARM_CALL]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
push {lr}
bl bar
pop {pc}If you compile it with ARM multi_v7_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: foo (section: .text) -> (unknown) (section: .init.text)
(You need to use GNU linker instead of LLD to reproduce it.)
Fix the code to make modpost show the correct symbol name.
I imported (with adjustment) sign_extend32() from include/linux/bitops.h.
The '+8' is the compensation for pc-relative instruction. It is documented in "ELF for the Arm Architecture" [1].
"If the relocation is pc-relative then compensation for the PC bias (the PC value is 8 bytes ahead of the executing instruction in Arm state and 4 bytes in Thumb state) must be encoded in the relocation by the object producer."
[1]: https://github.com/ARM-software/abi-aa/blob/main/aaelf32/aaelf32.rst
--- scripts/mod/modpost.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
scripts/mod/modpost.c +12 -0
@@ -1735,12 +1735,20 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)#define R_ARM_THM_JUMP19 51#endif +static int32_t sign_extend32 (int32_t value,int index) +{ +uint8_t shift =31 - index; + +return (int32_t )(value << shift) >> shift; +} +static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info);Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info);void *loc =reloc_location (elf, sechdr, r);uint32_t inst; +int32_t offset;switch (r_typ) {case R_ARM_ABS32 :
@@ -1750,6 +1758,10 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)case R_ARM_PC24 :case R_ARM_CALL :case R_ARM_JUMP24 : + inst =TO_NATIVE (*(uint32_t *)loc); + offset =sign_extend32 ((inst &0x00ffffff ) <<2 ,25 ); + r->r_addend = offset + sym->st_value +8 ; +break ;case R_ARM_THM_CALL :case R_ARM_THM_JUMP24 :case R_ARM_THM_JUMP19 :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 228/532 crypto: marvell/cesa - Fix type mismatch warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit efbc7764c4446566edb76ca05e903b5905673d2e ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") uncovered a type mismatch in cesa 3des support that leads to a memcpy beyond the end of a structure:
In function 'fortify_memcpy_chk',
inlined from 'mv_cesa_des3_ede_setkey' at drivers/crypto/marvell/cesa/cipher.c:307:2:include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
583 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This is probably harmless as the actual data that is copied has the correct type, but clearly worth fixing nonetheless.
--- drivers/crypto/marvell/cesa/cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/cesa/cipher.c +1 -1
@@ -297,7 +297,7 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,static int mv_cesa_des3_ede_setkey (struct crypto_skcipher *cipher,const u8 *key,unsigned int len) { -struct mv_cesa_des_ctx *ctx =crypto_skcipher_ctx (cipher); +struct mv_cesa_des3_ctx *ctx =crypto_skcipher_ctx (cipher);int err; err =verify_skcipher_des3_key (cipher, key);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 229/532 modpost: fix off by one in is_executable_section()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3a3f1e573a105328a2cca45a7cfbebabbf5e3192 ]
The > comparison should be >= to prevent an out of bounds array access.
--- scripts/mod/modpost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mod/modpost.c +1 -1
@@ -1610,7 +1610,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,static int is_executable_section (struct elf_info * elf,unsigned int section_index) { -if (section_index > elf->num_sections) +if (section_index >= elf->num_sections)fatal ("section_index is outside elf->num_sections!\n" );return ((elf->sechdrs[section_index].sh_flags &SHF_EXECINSTR ) ==SHF_EXECINSTR );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 230/532 ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 92e2921eeafdfca9acd9b83f07d2b7ca099bac24 ]
ASM_NL is useful not only in *.S files but also in .c files for using inline assembler in C code.
On ARC, however, ASM_NL is evaluated inconsistently. It is expanded to a backquote (`) in *.S files, but a semicolon (;) in *.c files because arch/arc/include/asm/linkage.h defines it inside #ifdef __ASSEMBLY__, so the definition for C code falls back to the default value defined in include/linux/linkage.h.
If ASM_NL is used in inline assembler in .c files, it will result in wrong assembly code because a semicolon is not an instruction separator, but the start of a comment for ARC.
Move ASM_NL (also __ALIGN and __ALIGN_STR) out of the #ifdef.
--- arch/arc/include/asm/linkage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arc/include/asm/linkage.h +4 -4
@@ -8,6 +8,10 @@#include <asm/dwarf.h> +#define ASM_NL `/* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN) +#ifdef __ASSEMBLY__ .macro ST2 e, o, off
@@ -28,10 +32,6 @@#endif .endm -#define ASM_NL `/* use '`' to mark new line in macro */ -#define __ALIGN .align 4 -#define __ALIGN_STR __stringify(__ALIGN) - /* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm #ifdef CONFIG_ARC_HAS_DCCM
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 231/532 crypto: qat - honor CRYPTO_TFM_REQ_MAY_SLEEP flag
In reply to Greg Kroah-HartmanFrom: Giovanni Cabiddu <[email protected]>
[ Upstream commit 8fb203c65a795b96faa1836b5086a5d6eb5c5e99 ]
If a request has the flag CRYPTO_TFM_REQ_MAY_SLEEP set, allocate memory using the flag GFP_KERNEL otherwise use GFP_ATOMIC.
Stable-dep-of: eb7713f5ca97 ("crypto: qat - unmap buffer before free for DH")
--- drivers/crypto/qat/qat_common/qat_algs.c | 19 ++++++++++++------- drivers/crypto/qat/qat_common/qat_asym_algs.c | 17 ++++++++++------- drivers/crypto/qat/qat_common/qat_crypto.h | 5 +++++ 3 files changed, 27 insertions(+), 14 deletions(-)
drivers/crypto/qat/qat_common/qat_algs.c +12 -7
@@ -706,7 +706,8 @@ static void qat_alg_free_bufl(struct qat_crypto_instance *inst,static int qat_alg_sgl_to_bufl (struct qat_crypto_instance *inst,struct scatterlist *sgl,struct scatterlist *sglout, -struct qat_crypto_request *qat_req) +struct qat_crypto_request *qat_req, +gfp_t flags) {struct device *dev = &GET_DEV (inst->accel_dev);int i, sg_nctr =0 ;
@@ -727,7 +728,7 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst, qat_req->buf.sgl_dst_valid = false;if (n >QAT_MAX_BUFF_DESC ) { - bufl =kzalloc_node (sz,GFP_ATOMIC , node); + bufl =kzalloc_node (sz, flags, node);if (unlikely (!bufl))return -ENOMEM ; }else {
@@ -771,7 +772,7 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst, sg_nctr =0 ;if (n >QAT_MAX_BUFF_DESC ) { - buflout =kzalloc_node (sz_out,GFP_ATOMIC , node); + buflout =kzalloc_node (sz_out, flags, node);if (unlikely (!buflout)) goto err_in; }else {
@@ -972,6 +973,7 @@ static int qat_alg_aead_dec(struct aead_request *areq)struct icp_qat_fw_la_auth_req_params *auth_param;struct icp_qat_fw_la_bulk_req *msg;int digst_size =crypto_aead_authsize (aead_tfm); +gfp_t f =qat_algs_alloc_flags (&areq->base);int ret;u32 cipher_len;
@@ -979,7 +981,7 @@ static int qat_alg_aead_dec(struct aead_request *areq)if (cipher_len %AES_BLOCK_SIZE !=0 )return -EINVAL ; - ret =qat_alg_sgl_to_bufl (ctx->inst, areq->src, areq->dst, qat_req); + ret =qat_alg_sgl_to_bufl (ctx->inst, areq->src, areq->dst, qat_req, f);if (unlikely (ret))return ret;
@@ -1014,6 +1016,7 @@ static int qat_alg_aead_enc(struct aead_request *areq)struct qat_crypto_request *qat_req =aead_request_ctx (areq);struct icp_qat_fw_la_cipher_req_params *cipher_param;struct icp_qat_fw_la_auth_req_params *auth_param; +gfp_t f =qat_algs_alloc_flags (&areq->base);struct icp_qat_fw_la_bulk_req *msg;u8 *iv = areq->iv;int ret;
@@ -1021,7 +1024,7 @@ static int qat_alg_aead_enc(struct aead_request *areq)if (areq->cryptlen %AES_BLOCK_SIZE !=0 )return -EINVAL ; - ret =qat_alg_sgl_to_bufl (ctx->inst, areq->src, areq->dst, qat_req); + ret =qat_alg_sgl_to_bufl (ctx->inst, areq->src, areq->dst, qat_req, f);if (unlikely (ret))return ret;
@@ -1199,13 +1202,14 @@ static int qat_alg_skcipher_encrypt(struct skcipher_request *req)struct qat_alg_skcipher_ctx *ctx =crypto_tfm_ctx (tfm);struct qat_crypto_request *qat_req =skcipher_request_ctx (req);struct icp_qat_fw_la_cipher_req_params *cipher_param; +gfp_t f =qat_algs_alloc_flags (&req->base);struct icp_qat_fw_la_bulk_req *msg;int ret;if (req->cryptlen ==0 )return 0 ; - ret =qat_alg_sgl_to_bufl (ctx->inst, req->src, req->dst, qat_req); + ret =qat_alg_sgl_to_bufl (ctx->inst, req->src, req->dst, qat_req, f);if (unlikely (ret))return ret;
@@ -1264,13 +1268,14 @@ static int qat_alg_skcipher_decrypt(struct skcipher_request *req)struct qat_alg_skcipher_ctx *ctx =crypto_tfm_ctx (tfm);struct qat_crypto_request *qat_req =skcipher_request_ctx (req);struct icp_qat_fw_la_cipher_req_params *cipher_param; +gfp_t f =qat_algs_alloc_flags (&req->base);struct icp_qat_fw_la_bulk_req *msg;int ret;if (req->cryptlen ==0 )return 0 ; - ret =qat_alg_sgl_to_bufl (ctx->inst, req->src, req->dst, qat_req); + ret =qat_alg_sgl_to_bufl (ctx->inst, req->src, req->dst, qat_req, f);if (unlikely (ret))return ret;
drivers/crypto/qat/qat_common/qat_asym_algs.c +10 -7
@@ -224,9 +224,10 @@ static int qat_dh_compute_value(struct kpp_request *req)struct qat_asym_request *qat_req =PTR_ALIGN (kpp_request_ctx (req),64 );struct icp_qat_fw_pke_request *msg = &qat_req->req; -int ret; +gfp_t flags =qat_algs_alloc_flags (&req->base);int n_input_params =0 ;u8 *vaddr; +int ret;if (unlikely (!ctx->xa))return -EINVAL ;
@@ -291,7 +292,7 @@ static int qat_dh_compute_value(struct kpp_request *req) }else {int shift = ctx->p_size - req->src_len; - qat_req->src_align =kzalloc (ctx->p_size,GFP_KERNEL ); + qat_req->src_align =kzalloc (ctx->p_size, flags);if (unlikely (!qat_req->src_align))return ret;
@@ -317,7 +318,7 @@ static int qat_dh_compute_value(struct kpp_request *req) qat_req->dst_align =NULL ; vaddr =sg_virt (req->dst); }else { - qat_req->dst_align =kzalloc (ctx->p_size,GFP_KERNEL ); + qat_req->dst_align =kzalloc (ctx->p_size, flags);if (unlikely (!qat_req->dst_align)) goto unmap_src;
@@ -650,6 +651,7 @@ static int qat_rsa_enc(struct akcipher_request *req)struct qat_asym_request *qat_req =PTR_ALIGN (akcipher_request_ctx (req),64 );struct icp_qat_fw_pke_request *msg = &qat_req->req; +gfp_t flags =qat_algs_alloc_flags (&req->base);u8 *vaddr;int ret;
@@ -696,7 +698,7 @@ static int qat_rsa_enc(struct akcipher_request *req) }else {int shift = ctx->key_sz - req->src_len; - qat_req->src_align =kzalloc (ctx->key_sz,GFP_KERNEL ); + qat_req->src_align =kzalloc (ctx->key_sz, flags);if (unlikely (!qat_req->src_align))return ret;
@@ -714,7 +716,7 @@ static int qat_rsa_enc(struct akcipher_request *req) qat_req->dst_align =NULL ; vaddr =sg_virt (req->dst); }else { - qat_req->dst_align =kzalloc (ctx->key_sz,GFP_KERNEL ); + qat_req->dst_align =kzalloc (ctx->key_sz, flags);if (unlikely (!qat_req->dst_align)) goto unmap_src; vaddr = qat_req->dst_align;
@@ -783,6 +785,7 @@ static int qat_rsa_dec(struct akcipher_request *req)struct qat_asym_request *qat_req =PTR_ALIGN (akcipher_request_ctx (req),64 );struct icp_qat_fw_pke_request *msg = &qat_req->req; +gfp_t flags =qat_algs_alloc_flags (&req->base);u8 *vaddr;int ret;
@@ -839,7 +842,7 @@ static int qat_rsa_dec(struct akcipher_request *req) }else {int shift = ctx->key_sz - req->src_len; - qat_req->src_align =kzalloc (ctx->key_sz,GFP_KERNEL ); + qat_req->src_align =kzalloc (ctx->key_sz, flags);if (unlikely (!qat_req->src_align))return ret;
@@ -857,7 +860,7 @@ static int qat_rsa_dec(struct akcipher_request *req) qat_req->dst_align =NULL ; vaddr =sg_virt (req->dst); }else { - qat_req->dst_align =kzalloc (ctx->key_sz,GFP_KERNEL ); + qat_req->dst_align =kzalloc (ctx->key_sz, flags);if (unlikely (!qat_req->dst_align)) goto unmap_src; vaddr = qat_req->dst_align;
drivers/crypto/qat/qat_common/qat_crypto.h +5 -0
@@ -109,4 +109,9 @@ static inline bool adf_hw_dev_has_crypto(struct adf_accel_dev *accel_dev) return true; } +static inline gfp_t qat_algs_alloc_flags (struct crypto_async_request *req) +{ +return req->flags &CRYPTO_TFM_REQ_MAY_SLEEP ?GFP_KERNEL :GFP_ATOMIC ; +} +#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 232/532 crypto: qat - replace get_current_node() with numa_node_id()
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit c2a1b91e47984e477298912ffd55570095d67318 ]
Currently the QAT driver code uses a self-defined wrapper function called get_current_node() when it wants to learn the current NUMA node. This implementation references the topology_physical_package_id[] array, which more or less coincidentally contains the NUMA node id, at least on x86.
Because this is not universal, and Linux offers a direct function to learn the NUMA node ID, replace that function with a call to numa_node_id(), which would work everywhere.
This fixes the QAT driver operation on arm64 machines.
Stable-dep-of: eb7713f5ca97 ("crypto: qat - unmap buffer before free for DH")
--- drivers/crypto/qat/qat_common/adf_common_drv.h | 5 ----- drivers/crypto/qat/qat_common/qat_algs.c | 4 ++-- drivers/crypto/qat/qat_common/qat_asym_algs.c | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-)
drivers/crypto/qat/qat_common/adf_common_drv.h +0 -5
@@ -49,11 +49,6 @@ struct service_hndl {struct list_head list; }; -static inline int get_current_node (void ) -{ -return topology_physical_package_id (raw_smp_processor_id ()); -} -int adf_service_register (struct service_hndl *service);int adf_service_unregister (struct service_hndl *service);
drivers/crypto/qat/qat_common/qat_algs.c +2 -2
@@ -605,7 +605,7 @@ static int qat_alg_aead_newkey(struct crypto_aead *tfm, const u8 *key, {struct qat_alg_aead_ctx *ctx =crypto_aead_ctx (tfm);struct qat_crypto_instance *inst =NULL ; -int node =get_current_node (); +int node =numa_node_id ();struct device *dev;int ret;
@@ -1071,7 +1071,7 @@ static int qat_alg_skcipher_newkey(struct qat_alg_skcipher_ctx *ctx, {struct qat_crypto_instance *inst =NULL ;struct device *dev; -int node =get_current_node (); +int node =numa_node_id ();int ret; inst =qat_crypto_get_instance_node (node);
drivers/crypto/qat/qat_common/qat_asym_algs.c +2 -2
@@ -489,7 +489,7 @@ static int qat_dh_init_tfm(struct crypto_kpp *tfm) {struct qat_dh_ctx *ctx =kpp_tfm_ctx (tfm);struct qat_crypto_instance *inst = -qat_crypto_get_instance_node (get_current_node ()); +qat_crypto_get_instance_node (numa_node_id ());if (!inst)return -EINVAL ;
@@ -1225,7 +1225,7 @@ static int qat_rsa_init_tfm(struct crypto_akcipher *tfm) {struct qat_rsa_ctx *ctx =akcipher_tfm_ctx (tfm);struct qat_crypto_instance *inst = -qat_crypto_get_instance_node (get_current_node ()); +qat_crypto_get_instance_node (numa_node_id ());if (!inst)return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 233/532 crypto: qat - use reference to structure in dma_map_single()
In reply to Greg Kroah-HartmanFrom: Damian Muszynski <[email protected]>
[ Upstream commit 072d36eefd6fde17928d214df64fdac32f60b4f4 ]
When mapping the input and output parameters, the implementations of RSA and DH pass to the function dma_map_single() a pointer to the first member of the structure they want to map instead of a pointer to the actual structure.
This results in set of warnings reported by the static analyser Smatch:
drivers/crypto/qat/qat_common/qat_asym_algs.c:335 qat_dh_compute_value() error: dma_map_single_attrs() '&qat_req->in.dh.in.b' too small (8 vs 64)
drivers/crypto/qat/qat_common/qat_asym_algs.c:341 qat_dh_compute_value() error: dma_map_single_attrs() '&qat_req->out.dh.r' too small (8 vs 64)
drivers/crypto/qat/qat_common/qat_asym_algs.c:732 qat_rsa_enc() error: dma_map_single_attrs() '&qat_req->in.rsa.enc.m' too small (8 vs 64)
drivers/crypto/qat/qat_common/qat_asym_algs.c:738 qat_rsa_enc() error: dma_map_single_attrs() '&qat_req->out.rsa.enc.c' too small (8 vs 64)
drivers/crypto/qat/qat_common/qat_asym_algs.c:878 qat_rsa_dec() error: dma_map_single_attrs() '&qat_req->in.rsa.dec.c' too small (8 vs 64)
drivers/crypto/qat/qat_common/qat_asym_algs.c:884 qat_rsa_dec() error: dma_map_single_attrs() '&qat_req->out.rsa.dec.m' too small (8 vs 64)Where the address of the first element of a structure is used as an input for the function dma_map_single(), replace it with the address of the structure. This fix does not introduce any functional change as the addresses are the same.
Stable-dep-of: eb7713f5ca97 ("crypto: qat - unmap buffer before free for DH")
--- drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/crypto/qat/qat_common/qat_asym_algs.c +6 -6
@@ -332,13 +332,13 @@ static int qat_dh_compute_value(struct kpp_request *req) qat_req->in.dh.in_tab[n_input_params] =0 ; qat_req->out.dh.out_tab[1 ] =0 ;/* Mapping in.in.b or in.in_g2.xa is the same */ - qat_req->phy_in =dma_map_single (dev, &qat_req->in.dh.in.b, + qat_req->phy_in =dma_map_single (dev, &qat_req->in.dh,sizeof (struct qat_dh_input_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_in))) goto unmap_dst; - qat_req->phy_out =dma_map_single (dev, &qat_req->out.dh.r, + qat_req->phy_out =dma_map_single (dev, &qat_req->out.dh,sizeof (struct qat_dh_output_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_out)))
@@ -729,13 +729,13 @@ static int qat_rsa_enc(struct akcipher_request *req) qat_req->in.rsa.in_tab[3 ] =0 ; qat_req->out.rsa.out_tab[1 ] =0 ; - qat_req->phy_in =dma_map_single (dev, &qat_req->in.rsa.enc.m, + qat_req->phy_in =dma_map_single (dev, &qat_req->in.rsa,sizeof (struct qat_rsa_input_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_in))) goto unmap_dst; - qat_req->phy_out =dma_map_single (dev, &qat_req->out.rsa.enc.c, + qat_req->phy_out =dma_map_single (dev, &qat_req->out.rsa,sizeof (struct qat_rsa_output_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_out)))
@@ -875,13 +875,13 @@ static int qat_rsa_dec(struct akcipher_request *req)else qat_req->in.rsa.in_tab[3 ] =0 ; qat_req->out.rsa.out_tab[1 ] =0 ; - qat_req->phy_in =dma_map_single (dev, &qat_req->in.rsa.dec.c, + qat_req->phy_in =dma_map_single (dev, &qat_req->in.rsa,sizeof (struct qat_rsa_input_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_in))) goto unmap_dst; - qat_req->phy_out =dma_map_single (dev, &qat_req->out.rsa.dec.m, + qat_req->phy_out =dma_map_single (dev, &qat_req->out.rsa,sizeof (struct qat_rsa_output_params ),DMA_TO_DEVICE );if (unlikely (dma_mapping_error (dev, qat_req->phy_out)))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 234/532 crypto: kpp - Add helper to set reqsize
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 56861cbde1b9f3b34d300e6ba87f2c3de1a9c309 ]
The value of reqsize should only be changed through a helper. To do so we need to first add a helper for this.
Stable-dep-of: eb7713f5ca97 ("crypto: qat - unmap buffer before free for DH")
--- include/crypto/internal/kpp.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/crypto/internal/kpp.h +6 -0
@@ -18,6 +18,12 @@ static inline void *kpp_request_ctx(struct kpp_request *req)return req->__ctx; } +static inline void kpp_set_reqsize (struct crypto_kpp *kpp, +unsigned int reqsize) +{ +crypto_kpp_alg (kpp)->reqsize = reqsize; +} +static inline void *kpp_tfm_ctx (struct crypto_kpp *tfm) {return tfm->base.__crt_ctx;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 235/532 crypto: qat - Use helper to set reqsize
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 80e62ad58db084920d8cf23323b713391e09f374 ]
The value of reqsize must only be changed through the helper.
Stable-dep-of: eb7713f5ca97 ("crypto: qat - unmap buffer before free for DH")
--- drivers/crypto/qat/qat_common/qat_asym_algs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/crypto/qat/qat_common/qat_asym_algs.c +4 -2
@@ -494,6 +494,8 @@ static int qat_dh_init_tfm(struct crypto_kpp *tfm)if (!inst)return -EINVAL ; +kpp_set_reqsize (tfm,sizeof (struct qat_asym_request ) +64 ); + ctx->p_size =0 ; ctx->g2 = false; ctx->inst = inst;
@@ -1230,6 +1232,8 @@ static int qat_rsa_init_tfm(struct crypto_akcipher *tfm)if (!inst)return -EINVAL ; +akcipher_set_reqsize (tfm,sizeof (struct qat_asym_request ) +64 ); + ctx->key_sz =0 ; ctx->inst = inst;return 0 ;
@@ -1252,7 +1256,6 @@ static struct akcipher_alg rsa = { .max_size = qat_rsa_max_size, .init = qat_rsa_init_tfm, .exit = qat_rsa_exit_tfm, - .reqsize = sizeof(struct qat_asym_request) + 64, .base = { .cra_name = "rsa", .cra_driver_name = "qat-rsa",
@@ -1269,7 +1272,6 @@ static struct kpp_alg dh = { .max_size = qat_dh_max_size, .init = qat_dh_init_tfm, .exit = qat_dh_exit_tfm, - .reqsize = sizeof(struct qat_asym_request) + 64, .base = { .cra_name = "dh", .cra_driver_name = "qat-dh",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 236/532 crypto: qat - unmap buffer before free for DH
In reply to Greg Kroah-HartmanFrom: Hareshx Sankar Raj <[email protected]>
[ Upstream commit eb7713f5ca97697b92f225127440d1525119b8de ]
The callback function for DH frees the memory allocated for the destination buffer before unmapping it.
This sequence is wrong.
Change the cleanup sequence to unmap the buffer before freeing it.
--- drivers/crypto/qat/qat_common/qat_asym_algs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/crypto/qat/qat_common/qat_asym_algs.c +2 -3
@@ -170,15 +170,14 @@ static void qat_dh_cb(struct icp_qat_fw_pke_resp *resp) } areq->dst_len = req->ctx.dh->p_size; +dma_unmap_single (dev, req->out.dh.r, req->ctx.dh->p_size, +DMA_FROM_DEVICE );if (req->dst_align) {scatterwalk_map_and_copy (req->dst_align, areq->dst,0 , areq->dst_len,1 );kfree_sensitive (req->dst_align); } -dma_unmap_single (dev, req->out.dh.r, req->ctx.dh->p_size, -DMA_FROM_DEVICE ); -dma_unmap_single (dev, req->phy_in,sizeof (struct qat_dh_input_params ),DMA_TO_DEVICE ); dma_unmap_single(dev, req->phy_out,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 237/532 crypto: qat - unmap buffers before free for RSA
In reply to Greg Kroah-HartmanFrom: Hareshx Sankar Raj <[email protected]>
[ Upstream commit d776b25495f2c71b9dbf1f5e53b642215ba72f3c ]
The callback function for RSA frees the memory allocated for the source and destination buffers before unmapping them.
This sequence is wrong.
Change the cleanup sequence to unmap the buffers before freeing them.
--- drivers/crypto/qat/qat_common/qat_asym_algs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/crypto/qat/qat_common/qat_asym_algs.c +4 -5
@@ -520,12 +520,14 @@ static void qat_rsa_cb(struct icp_qat_fw_pke_resp *resp) err = (err ==ICP_QAT_FW_COMN_STATUS_FLAG_OK ) ?0 : -EINVAL ; -kfree_sensitive (req->src_align); -dma_unmap_single (dev, req->in.rsa.enc.m, req->ctx.rsa->key_sz,DMA_TO_DEVICE ); +kfree_sensitive (req->src_align); + areq->dst_len = req->ctx.rsa->key_sz; +dma_unmap_single (dev, req->out.rsa.enc.c, req->ctx.rsa->key_sz, +DMA_FROM_DEVICE );if (req->dst_align) {scatterwalk_map_and_copy (req->dst_align, areq->dst,0 , areq->dst_len,1 );
@@ -533,9 +535,6 @@ static void qat_rsa_cb(struct icp_qat_fw_pke_resp *resp)kfree_sensitive (req->dst_align); } -dma_unmap_single (dev, req->out.rsa.enc.c, req->ctx.rsa->key_sz, -DMA_FROM_DEVICE ); -dma_unmap_single (dev, req->phy_in,sizeof (struct qat_rsa_input_params ),DMA_TO_DEVICE ); dma_unmap_single(dev, req->phy_out,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 238/532 NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit c907e72f58ed979a24a9fdcadfbc447c51d5e509 ]
When the client received NFS4ERR_BADSESSION, it schedules recovery and start the state manager thread which in turn freezes the session table and does not allow for any new requests to use the no-longer valid session. However, it is possible that before the state manager thread runs, a new operation would use the released slot that received BADSESSION and was therefore not updated its sequence number. Such re-use of the slot can lead the application errors.
--- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/nfs4proc.c +1 -0
@@ -923,6 +923,7 @@ static int nfs41_sequence_process(struct rpc_task *task, out_noaction:return ret; session_recover: +set_bit (NFS4_SLOT_TBL_DRAINING , &session->fc_slot_table.slot_tbl_state);nfs4_schedule_session_recovery (session, status);dprintk ("%s ERROR: %d Reset session\n" , __func__, status);nfs41_sequence_free_slot (res);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 239/532 SMB3: Do not send lease break acknowledgment if all file handles have been closed
In reply to Greg Kroah-HartmanFrom: Bharath SM <[email protected]>
[ Upstream commit da787d5b74983f7525d1eb4b9c0b4aff2821511a ]
In case if all existing file handles are deferred handles and if all of them gets closed due to handle lease break then we dont need to send lease break acknowledgment to server, because last handle close will be considered as lease break ack.
After closing deferred handels, we check for openfile list of inode, if its empty then we skip sending lease break ack.
--- fs/cifs/file.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
fs/cifs/file.c +12 -13
@@ -4923,20 +4923,19 @@ void cifs_oplock_break(struct work_struct *work)_cifsFileInfo_put (cfile, false/* do not wait for ourself */ , false);/* -* releasing stale oplock after recent reconnect of smb session using -* a now incorrect file handle is not a data integrity issue but do -* not bother sending an oplock release if session to server still is -* disconnected since oplock already released by the server +* MS-SMB2 3.2.5.19.1 and 3.2.5.19.2 (and MS-CIFS 3.2.5.42) do not require +* an acknowledgment to be sent when the file has already been closed. +* check for server null, since can race with kill_sb calling tree disconnect. */ -if (!oplock_break_cancelled) { -/* check for server null since can race with kill_sb calling tree disconnect */ -if (tcon->ses && tcon->ses->server) { - rc = tcon->ses->server->ops->oplock_response (tcon, persistent_fid, - volatile_fid, net_fid, cinode); -cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); - }else -pr_warn_once ("lease break not sent for unmounted share\n" ); - } +spin_lock (&cinode->open_file_lock); +if (tcon->ses && tcon->ses->server && !oplock_break_cancelled && + !list_empty (&cinode->openFileList)) { +spin_unlock (&cinode->open_file_lock); + rc = tcon->ses->server->ops->oplock_response (tcon, persistent_fid, + volatile_fid, net_fid, cinode); +cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); + }else +spin_unlock (&cinode->open_file_lock);cifs_done_oplock_break (cinode); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 240/532 dax: Fix dax_mapping_release() use after free
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit 6d24b170a9db0456f577b1ab01226a2254c016a8 ]
A CONFIG_DEBUG_KOBJECT_RELEASE test of removing a device-dax region provider (like modprobe -r dax_hmem) yields:
kobject: 'mapping0' (ffff93eb460e8800): kobject_release, parent 0000000000000000 (delayed 2000) [..]
DEBUG_LOCKS_WARN_ON(1)
WARNING: CPU: 23 PID: 282 at kernel/locking/lockdep.c:232 __lock_acquire+0x9fc/0x2260 [..] RIP: 0010:__lock_acquire+0x9fc/0x2260 [..] Call Trace: <TASK> [..] lock_acquire+0xd4/0x2c0 ? ida_free+0x62/0x130 _raw_spin_lock_irqsave+0x47/0x70 ? ida_free+0x62/0x130 ida_free+0x62/0x130 dax_mapping_release+0x1f/0x30 device_release+0x36/0x90 kobject_delayed_cleanup+0x46/0x150
Due to attempting ida_free() on an ida object that has already been freed. Devices typically only hold a reference on their parent while registered. If a child needs a parent object to complete its release it needs to hold a reference that it drops from its release callback. Arrange for a dax_mapping to pin its parent dev_dax instance until dax_mapping_release().
--- drivers/dax/bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dax/bus.c +4 -1
@@ -591,10 +591,12 @@ EXPORT_SYMBOL_GPL(alloc_dax_region);static void dax_mapping_release (struct device *dev) {struct dax_mapping *mapping =to_dax_mapping (dev); -struct dev_dax *dev_dax =to_dev_dax (dev->parent); +struct device *parent = dev->parent; +struct dev_dax *dev_dax =to_dev_dax (parent);ida_free (&dev_dax->ida, mapping->id);kfree (mapping); +put_device (parent); }static void unregister_dax_mapping (void *data)
@@ -734,6 +736,7 @@ static int devm_register_dax_mapping(struct dev_dax *dev_dax, int range_id) dev = &mapping->dev;device_initialize (dev); dev->parent = &dev_dax->dev; +get_device (dev->parent); dev->type = &dax_mapping_type;dev_set_name (dev,"mapping%d" , mapping->id); rc =device_add (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 241/532 dax: Introduce alloc_dev_dax_id()
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit 70aab281e18c68a1284bc387de127c2fc0bed3f8 ]
The reference counting of dax_region objects is needlessly complicated, has lead to confusion [1], and has hidden a bug [2]. Towards cleaning up that mess introduce alloc_dev_dax_id() to minimize the holding of a dax_region reference to only what dev_dax_release() needs, the dax_region->ida.
Part of the reason for the mess was the design to dereference a dax_region in all cases in free_dev_dax_id() even if the id was statically assigned by the upper level dax_region driver. Remove the need to call "is_static(dax_region)" by tracking whether the id is dynamic directly in the dev_dax instance itself.
With that flag the dax_region pinning and release per dev_dax instance can move to alloc_dev_dax_id() and free_dev_dax_id() respectively.
A follow-on cleanup address the unnecessary references in the dax_region setup and drivers.
--- drivers/dax/bus.c | 56 ++++++++++++++++++++++++--------------- drivers/dax/dax-private.h | 4 ++- 2 files changed, 37 insertions(+), 23 deletions(-)
drivers/dax/bus.c +34 -22
@@ -402,18 +402,34 @@ static void unregister_dev_dax(void *dev)put_device (dev); } +static void dax_region_free (struct kref *kref) +{ +struct dax_region *dax_region; + + dax_region = container_of(kref, struct dax_region, kref); +kfree (dax_region); +} + +void dax_region_put (struct dax_region *dax_region) +{ +kref_put (&dax_region->kref, dax_region_free); +} +EXPORT_SYMBOL_GPL (dax_region_put); +/* a return value >= 0 indicates this invocation invalidated the id */ static int __free_dev_dax_id (struct dev_dax *dev_dax) { -struct dax_region *dax_region = dev_dax->region;struct device *dev = &dev_dax->dev; +struct dax_region *dax_region;int rc = dev_dax->id;device_lock_assert (dev); -if (is_static (dax_region) || dev_dax->id <0 ) +if (!dev_dax->dyn_id || dev_dax->id <0 )return -1 ; + dax_region = dev_dax->region;ida_free (&dax_region->ida, dev_dax->id); +dax_region_put (dax_region); dev_dax->id =-1 ;return rc; }
@@ -429,6 +445,20 @@ static int free_dev_dax_id(struct dev_dax *dev_dax)return rc; } +static int alloc_dev_dax_id (struct dev_dax *dev_dax) +{ +struct dax_region *dax_region = dev_dax->region; +int id; + + id =ida_alloc (&dax_region->ida,GFP_KERNEL ); +if (id <0 ) +return id; +kref_get (&dax_region->kref); + dev_dax->dyn_id = true; + dev_dax->id = id; +return id; +} +static ssize_t delete_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t len) {
@@ -516,20 +546,6 @@ static const struct attribute_group *dax_region_attribute_groups[] = { NULL, }; -static void dax_region_free (struct kref *kref) -{ -struct dax_region *dax_region; - - dax_region = container_of(kref, struct dax_region, kref); -kfree (dax_region); -} - -void dax_region_put (struct dax_region *dax_region) -{ -kref_put (&dax_region->kref, dax_region_free); -} -EXPORT_SYMBOL_GPL (dax_region_put); -static void dax_region_unregister (void *region) {struct dax_region *dax_region = region;
@@ -1254,12 +1270,10 @@ static const struct attribute_group *dax_attribute_groups[] = {static void dev_dax_release (struct device *dev) {struct dev_dax *dev_dax =to_dev_dax (dev); -struct dax_region *dax_region = dev_dax->region;struct dax_device *dax_dev = dev_dax->dax_dev;put_dax (dax_dev);free_dev_dax_id (dev_dax); -dax_region_put (dax_region);kfree (dev_dax->pgmap);kfree (dev_dax); }
@@ -1283,6 +1297,7 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data)if (!dev_dax)return ERR_PTR (-ENOMEM ); + dev_dax->region = dax_region;if (is_static (dax_region)) {if (dev_WARN_ONCE (parent, data->id <0 ,"dynamic id specified to static region\n" )) {
@@ -1298,13 +1313,11 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) goto err_id; } - rc =ida_alloc (&dax_region->ida,GFP_KERNEL ); + rc =alloc_dev_dax_id (dev_dax);if (rc <0 ) goto err_id; - dev_dax->id = rc; } - dev_dax->region = dax_region; dev = &dev_dax->dev;device_initialize (dev);dev_set_name (dev,"dax%d.%d" , dax_region->id, dev_dax->id);
@@ -1342,7 +1355,6 @@ struct dev_dax *devm_create_dev_dax(struct dev_dax_data *data) dev_dax->target_node = dax_region->target_node; dev_dax->align = dax_region->align;ida_init (&dev_dax->ida); -kref_get (&dax_region->kref); inode =dax_inode (dax_dev); dev->devt = inode->i_rdev;
drivers/dax/dax-private.h +3 -1
@@ -52,7 +52,8 @@ struct dax_mapping {* @region - parent region * @dax_dev - core dax functionality * @target_node: effective numa node if dev_dax memory range is onlined -* @id: ida allocated id +* @dyn_id: is this a dynamic or statically created instance +* @id: ida allocated id when the dax_region is not static * @ida: mapping id allocator * @dev - device core * @pgmap - pgmap for memmap setup / lifetime (driver owned)
@@ -64,6 +65,7 @@ struct dev_dax {struct dax_device *dax_dev;unsigned int align;int target_node; +bool dyn_id;int id;struct ida ida;struct device dev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 242/532 dax/kmem: Pass valid argument to memory_group_register_static
In reply to Greg Kroah-HartmanFrom: Tarun Sahu <[email protected]>
[ Upstream commit 46e66dab8565f742374e9cc4ff7d35f344d774e2 ]
memory_group_register_static takes maximum number of pages as the argument while dev_dax_kmem_probe passes total_len (in bytes) as the argument.
IIUC, I don't see any crash/panic impact as such. As, memory_group_register_static just set the max_pages limit which is used in auto_movable_zone_for_pfn to determine the zone.
which might cause these condition to behave differently,
This will be true always so jump will happen to kernel_zone
...
if (!auto_movable_can_online_movable(NUMA_NO_NODE, group, nr_pages))
goto kernel_zone;
...
kernel_zone:
return default_kernel_zone_for_pfn(nid, pfn, nr_pages);Here, In below, zone_intersects compare range will be larger as nr_pages will be higher (derived from total_len passed in dev_dax_kmem_probe).
...
static struct zone *default_kernel_zone_for_pfn(int nid, unsigned long start_pfn,
unsigned long nr_pages)
{
struct pglist_data *pgdat = NODE_DATA(nid);
int zid;
for (zid = 0; zid < ZONE_NORMAL; zid++) {
struct zone *zone = &pgdat->node_zones[zid];
if (zone_intersects(zone, start_pfn, nr_pages))
return zone;
}
return &pgdat->node_zones[ZONE_NORMAL];
}Incorrect zone will be returned here, which in later time might cause bigger problem.
--- drivers/dax/kmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dax/kmem.c +1 -1
@@ -88,7 +88,7 @@ static int dev_dax_kmem_probe(struct dev_dax *dev_dax)if (!data->res_name) goto err_res_name; - rc =memory_group_register_static (numa_node, total_len); + rc =memory_group_register_static (numa_node,PFN_UP (total_len));if (rc <0 ) goto err_reg_mgid; data->mgid = rc;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 243/532 hwrng: st - keep clock enabled while hwrng is registered
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
[ Upstream commit 501e197a02d4aef157f53ba3a0b9049c3e52fedc ]
The st-rng driver uses devres to register itself with the hwrng core, the driver will be unregistered from hwrng when its device goes out of scope. This happens after the driver's remove function is called.
However, st-rng's clock is disabled in the remove function. There's a short timeframe where st-rng is still registered with the hwrng core although its clock is disabled. I suppose the clock must be active to access the hardware and serve requests from the hwrng core.
Switch to devm_clk_get_enabled and let devres disable the clock and unregister the hwrng. This avoids the race condition.
--- drivers/char/hw_random/st-rng.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/char/hw_random/st-rng.c +1 -20
@@ -42,7 +42,6 @@struct st_rng_data {void __iomem *base; -struct clk *clk;struct hwrng ops; };
@@ -85,26 +84,18 @@ static int st_rng_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); - clk =devm_clk_get (&pdev->dev,NULL ); + clk =devm_clk_get_enabled (&pdev->dev,NULL );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) -return ret; - ddata->ops.priv = (unsigned long )ddata; ddata->ops.read = st_rng_read; ddata->ops.name = pdev->name; ddata->base = base; - ddata->clk = clk; - -dev_set_drvdata (&pdev->dev, ddata); ret =devm_hwrng_register (&pdev->dev, &ddata->ops);if (ret) {dev_err (&pdev->dev,"Failed to register HW RNG\n" ); -clk_disable_unprepare (clk);return ret; }
@@ -113,15 +104,6 @@ static int st_rng_probe(struct platform_device *pdev)return 0 ; } -static int st_rng_remove (struct platform_device *pdev) -{ -struct st_rng_data *ddata =dev_get_drvdata (&pdev->dev); - -clk_disable_unprepare (ddata->clk); - -return 0 ; -} -static const struct of_device_id st_rng_match[]__maybe_unused = { { .compatible ="st,rng" }, {},
@@ -134,7 +116,6 @@ static struct platform_driver st_rng_driver = { .of_match_table = of_match_ptr(st_rng_match), }, .probe = st_rng_probe, - .remove = st_rng_remove };module_platform_driver (st_rng_driver);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 244/532 kbuild: Disable GCOV for *.mod.o
In reply to Greg Kroah-HartmanFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 25a21fbb934a0d989e1858f83c2ddf4cfb2ebe30 ]
With GCOV_PROFILE_ALL, Clang injects __llvm_gcov_* functions to each object file, including the *.mod.o. As we filter out CC_FLAGS_CFI for *.mod.o, the compiler won't generate type hashes for the injected functions, and therefore indirectly calling them during module loading trips indirect call checking.
Enabling CFI for *.mod.o isn't sufficient to fix this issue after commit 0c3e806ec0f9 ("x86/cfi: Add boot time hash randomization"), as *.mod.o aren't processed by objtool, which means any hashes emitted there won't be randomized. Therefore, in addition to disabling CFI for *.mod.o, also disable GCOV, as the object files don't otherwise contain any executable code.
--- scripts/Makefile.modfinal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.modfinal +1 -1
@@ -23,7 +23,7 @@ modname = $(notdir $(@:.mod.o=)) part-of-module = y quiet_cmd_cc_o_c = CC [M] $@ - cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI), $(c_flags)) -c -o $@ $< + cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI) $(CFLAGS_GCOV), $(c_flags)) -c -o $@ $< %.mod.o: %.mod.c FORCE $(call if_changed_dep,cc_o_c)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 245/532 efi/libstub: Disable PCI DMA before grabbing the EFI memory map
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit 2e28a798c3092ea42b968fa16ac835969d124898 ]
Currently, the EFI stub will disable PCI DMA as the very last thing it does before calling ExitBootServices(), to avoid interfering with the firmware's normal operation as much as possible.
However, the stub will invoke DisconnectController() on all endpoints downstream of the PCI bridges it disables, and this may affect the layout of the EFI memory map, making it substantially more likely that ExitBootServices() will fail the first time around, and that the EFI memory map needs to be reloaded.
This, in turn, increases the likelihood that the slack space we allocated is insufficient (and we can no longer allocate memory via boot services after having called ExitBootServices() once), causing the second call to GetMemoryMap (and therefore the boot) to fail. This makes the PCI DMA disable feature a bit more fragile than it already is, so let's make it more robust, by allocating the space for the EFI memory map after disabling PCI DMA.
--- drivers/firmware/efi/libstub/efi-stub-helper.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/firmware/efi/libstub/efi-stub-helper.c +3 -4
@@ -439,8 +439,10 @@ efi_status_t efi_exit_boot_services(void *handle, {efi_status_t status; - status =efi_get_memory_map (map); +if (efi_disable_pci_dma) +efi_pci_disable_bridge_busmaster (); + status =efi_get_memory_map (map);if (status !=EFI_SUCCESS ) goto fail;
@@ -448,9 +450,6 @@ efi_status_t efi_exit_boot_services(void *handle,if (status !=EFI_SUCCESS ) goto free_map; -if (efi_disable_pci_dma) -efi_pci_disable_bridge_busmaster (); - status =efi_bs_call (exit_boot_services, handle, *map->key_ptr);if (status ==EFI_INVALID_PARAMETER ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 246/532 ksmbd: avoid field overflow warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9cedc58bdbe9fff9aacd0ca19ee5777659f28fd7 ]
clang warns about a possible field overflow in a memcpy:
In file included from fs/smb/server/smb_common.c:7:include/linux/fortify-string.h:583:4: error: call to '__write_overflow_field' declared with 'warning' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
__write_overflow_field(p_size_field, size);
It appears to interpret the "&out[baselen + 4]" as referring to a single byte of the character array, while the equivalen "out + baselen + 4" is seen as an offset into the array.
I don't see that kind of warning elsewhere, so just go with the simple rework.
--- fs/ksmbd/smb_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ksmbd/smb_common.c +1 -1
@@ -423,7 +423,7 @@ int ksmbd_extract_shortname(struct ksmbd_conn *conn, const char *longname, out[baselen +3 ] =PERIOD ;if (dot_present) -memcpy (&out[baselen +4 ], extension,4 ); +memcpy (out + baselen +4 , extension,4 );else out[baselen +4 ] ='\0' ; smbConvertToUTF16((__le16 *)shortname, out, PATH_MAX,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 247/532 ACPI: utils: Fix acpi_evaluate_dsm_typed() redefinition error
In reply to Greg Kroah-HartmanFrom: Kiran K <[email protected]>
[ Upstream commit 2c5a06e5505a716387a4d86f1f39de506836435a ]
acpi_evaluate_dsm_typed() needs to be gaurded with CONFIG_ACPI to avoid a redefintion error when the stub is also enabled.
In file included from ../drivers/bluetooth/btintel.c:13:../include/acpi/acpi_bus.h:57:1: error: redefinition of 'acpi_evaluate_dsm_typed'
57 | acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid,..
| ^~~~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/bluetooth/btintel.c:12:../include/linux/acpi.h:967:34: note: previous definition of 'acpi_evaluate_dsm_typed' with type 'union acpi_object *(void *, const guid_t *, u64, u64, union acpi_object *, acpi_object_type)' {aka 'union acpi_object *(void *, const guid_t *, long long unsigned int, long long unsigned int, union acpi_object *, unsigned int)'}
967 | static inline union acpi_object
*acpi_evaluate_dsm_typed(acpi_handle handle,
--- include/acpi/acpi_bus.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/acpi/acpi_bus.h +2 -1
@@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);bool acpi_check_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 funcs);union acpi_object *acpi_evaluate_dsm (acpi_handle handle,const guid_t *guid,u64 rev,u64 func,union acpi_object *argv4); - +#ifdef CONFIG_ACPI static inline union acpi_object * acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev, u64 func, union acpi_object *argv4,
@@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,return obj; } +#endif #define ACPI_INIT_DSM_ARGV4 (cnt, eles) \ { \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 248/532 bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
commit 028725e73375a1ff080bbdf9fb503306d0116f28 upstream.
commit dd0ff4d12dd2 ("bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem") fix an overlaps existing problem of kmemleak. But the problem still existed when HAVE_BOOTMEM_INFO_NODE is disabled, because in this case, free_bootmem_page() will call free_reserved_page() directly.
Fix the problem by adding kmemleak_free_part() in free_bootmem_page() when HAVE_BOOTMEM_INFO_NODE is disabled.
--- include/linux/bootmem_info.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/bootmem_info.h +2 -0
@@ -3,6 +3,7 @@#define __LINUX_BOOTMEM_INFO_H#include <linux/mm.h> +#include <linux/kmemleak.h> /* * Types for free bootmem stored in page->lru.next. These have to be in
@@ -59,6 +60,7 @@ static inline void get_page_bootmem(unsigned long info, struct page *page,static inline void free_bootmem_page (struct page *page) { +kmemleak_free_part (page_to_virt (page),PAGE_SIZE );free_reserved_page (page); }#endif
Signature · 1 line
2.41.0
Greg Kroah-Hartman
maintainerPATCH 249/532 io_uring: ensure IOPOLL locks around deferred work
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
No direct upstream commit exists for this issue. It was fixed in 5.18 as part of a larger rework of the completion side.
io_commit_cqring() writes the CQ ring tail to make it visible, but it also kicks off any deferred work we have. A ring setup with IOPOLL does not need any locking around the CQ ring updates, as we're always under the ctx uring_lock. But if we have deferred work that needs processing, then io_queue_deferred() assumes that the completion_lock is held, as it is for !IOPOLL.
Add a lockdep assertion to check and document this fact, and have io_iopoll_complete() check if we have deferred work and run that separately with the appropriate lock grabbed.
--- io_uring/io_uring.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
io_uring/io_uring.c +21 -4
@@ -1524,6 +1524,8 @@ static void io_kill_timeout(struct io_kistatic void io_queue_deferred (struct io_ring_ctx *ctx) { +lockdep_assert_held (&ctx->completion_lock); +while (!list_empty (&ctx->defer_list)) {struct io_defer_entry *de =list_first_entry (&ctx->defer_list, struct io_defer_entry, list);
@@ -1575,14 +1577,24 @@ static void __io_commit_cqring_flush(strio_queue_deferred (ctx); } -static inline void io_commit_cqring (struct io_ring_ctx *ctx) +static inline bool io_commit_needs_flush (struct io_ring_ctx *ctx) +{ +return ctx->off_timeout_used || ctx->drain_active; +} + +static inline void __io_commit_cqring (struct io_ring_ctx *ctx) { -if (unlikely (ctx->off_timeout_used || ctx->drain_active)) -__io_commit_cqring_flush (ctx);/* order cqe stores with ring update */ smp_store_release (&ctx->rings->cq.tail, ctx->cached_cq_tail); } +static inline void io_commit_cqring (struct io_ring_ctx *ctx) +{ +if (unlikely (io_commit_needs_flush (ctx))) +__io_commit_cqring_flush (ctx); +__io_commit_cqring (ctx); +} +static inline bool io_sqring_full (struct io_ring_ctx *ctx) {struct io_rings *r = ctx->rings;
@@ -2521,7 +2533,12 @@ static void io_iopoll_complete(struct ioio_req_free_batch (&rb, req, &ctx->submit_state); } -io_commit_cqring (ctx); +if (io_commit_needs_flush (ctx)) { +spin_lock (&ctx->completion_lock); +__io_commit_cqring_flush (ctx); +spin_unlock (&ctx->completion_lock); + } +__io_commit_cqring (ctx);io_cqring_ev_posted_iopoll (ctx);io_req_free_batch_finish (ctx, &rb); }
Greg Kroah-Hartman
maintainerPATCH 250/532 USB: serial: option: add LARA-R6 01B PIDs
In reply to Greg Kroah-HartmanFrom: Davide Tronchin <[email protected]>
commit ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 upstream.
The new LARA-R6 product variant identified by the "01B" string can be configured (by AT interface) in three different USB modes:
* Default mode (Vendor ID: 0x1546 Product ID: 0x1311) with 4 serial interfaces
* RmNet mode (Vendor ID: 0x1546 Product ID: 0x1312) with 4 serial interfaces and 1 RmNet virtual network interface
* CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1313) with 4 serial interface and 1 CDC-ECM virtual network interface
The first 4 interfaces of all the 3 USB configurations (default, RmNet, CDC-ECM) are the same.
In default mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
In RmNet mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: RMNET interface
In CDC-ECM mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: CDC-ECM interface
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1151,6 +1151,10 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), .driver_info = RSVD(3) },/* u-blox products */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1311) }, /* u-blox LARA-R6 01B */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1312), /* u-blox LARA-R6 01B (RMNET) */ + .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(UBLOX_VENDOR_ID, 0x1313, 0xff) }, /* u-blox LARA-R6 01B (ECM) */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) }, /* u-blox LARA-L6 */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1342), /* u-blox LARA-L6 (RMNET) */ .driver_info = RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 251/532 usb: dwc3: gadget: Propagate core init errors to UDC during pullup
In reply to Greg Kroah-HartmanFrom: Krishna Kurapati <[email protected]>
commit c0aabed9cabe057309779a9e26fe86a113d24dad upstream.
In scenarios where pullup relies on resume (get sync) to initialize the controller and set the run stop bit, then core_init is followed by gadget_resume which will eventually set run stop bit.
But in cases where the core_init fails, the return value is not sent back to udc appropriately. So according to UDC the controller has started but in reality we never set the run stop bit.
On systems like Android, there are uevents sent to HAL depending on whether the configfs_bind / configfs_disconnect were invoked. In the above mentioned scnenario, if the core init fails, the run stop won't be set and the cable plug-out won't result in generation of any disconnect event and userspace would never get any uevent regarding cable plug out and we never call pullup(0) again. Furthermore none of the next Plug-In/Plug-Out's would be known to configfs.
Return back the appropriate result to UDC to let the userspace/ configfs know that the pullup failed so they can take appropriate action.
Message-ID: <[email protected]>
--- drivers/usb/dwc3/gadget.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +3 -1
@@ -2530,7 +2530,9 @@ static int dwc3_gadget_pullup(struct usb ret =pm_runtime_get_sync (dwc->dev);if (!ret || ret <0 ) {pm_runtime_put (dwc->dev); -return 0 ; +if (ret <0 ) +pm_runtime_set_suspended (dwc->dev); +return ret; }if (dwc->pullups_connected == is_on) {
Greg Kroah-Hartman
maintainerPATCH 252/532 phy: tegra: xusb: Clear the driver reference in usb-phy dev
In reply to Greg Kroah-HartmanFrom: EJ Hsu <[email protected]>
commit c0c2fcb1325d0d4f3b322b5ee49385f8eca2560d upstream.
For the dual-role port, it will assign the phy dev to usb-phy dev and use the port dev driver as the dev driver of usb-phy.
When we try to destroy the port dev, it will destroy its dev driver as well. But we did not remove the reference from usb-phy dev. This might cause the use-after-free issue in KASAN.
--- drivers/phy/tegra/xusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/tegra/xusb.c +1 -0
@@ -562,6 +562,7 @@ static void tegra_xusb_port_unregister(susb_role_switch_unregister (port->usb_role_sw);cancel_work_sync (&port->usb_phy_work);usb_remove_phy (&port->usb_phy); + port->usb_phy.dev->driver =NULL ; }if (port->ops->remove)
Greg Kroah-Hartman
maintainerPATCH 253/532 iio: adc: ad7192: Fix null ad7192_state pointer access
In reply to Greg Kroah-HartmanFrom: Fabrizio Lamarque <[email protected]>
commit 9e58e3a6f8e1c483c86a04903b7b7aa0923e4426 upstream.
Pointer to indio_dev structure is obtained via spi_get_drvdata() at the beginning of function ad7192_setup(), but the spi->dev->driver_data member is not initialized, hence a NULL pointer is returned.
Fix by changing ad7192_setup() signature to take pointer to struct iio_dev, and get ad7192_state pointer via st = iio_priv(indio_dev);
--- drivers/iio/adc/ad7192.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/adc/ad7192.c +3 -3
@@ -340,9 +340,9 @@ static int ad7192_of_clock_select(structreturn clock_sel; } -static int ad7192_setup (struct ad7192_state *st,struct device_node *np) +static int ad7192_setup (struct iio_dev *indio_dev,struct device_node *np) { -struct iio_dev *indio_dev =spi_get_drvdata (st->sd.spi); +struct ad7192_state *st =iio_priv (indio_dev);bool rej60_en, refin2_en;bool buf_en, bipolar, burnout_curr_en;unsigned long long scale_uv;
@@ -1015,7 +1015,7 @@ static int ad7192_probe(struct spi_devic } } - ret =ad7192_setup (st, spi->dev.of_node); + ret =ad7192_setup (indio_dev, spi->dev.of_node);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 254/532 iio: adc: ad7192: Fix internal/external clock selection
In reply to Greg Kroah-HartmanFrom: Fabrizio Lamarque <[email protected]>
commit f7d9e21dd274b97dc0a8dbc136a2ea8506063a96 upstream.
Fix wrong selection of internal clock when mclk is defined.
Resolve a logical inversion introduced in c9ec2cb328e3.
--- drivers/iio/adc/ad7192.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7192.c +1 -1
@@ -327,7 +327,7 @@ static int ad7192_of_clock_select(struct clock_sel =AD7192_CLK_INT ;/* use internal clock */ -if (st->mclk) { +if (!st->mclk) {if (of_property_read_bool (np,"adi,int-clock-output-enable" )) clock_sel =AD7192_CLK_INT_CO ; }else {
Greg Kroah-Hartman
maintainerPATCH 255/532 iio: accel: fxls8962af: errata bug only applicable for FXLS8962AF
In reply to Greg Kroah-HartmanFrom: Sean Nyekjaer <[email protected]>
commit b410a9307bc3a7cdee3c930c98f6fc9cf1d2c484 upstream.
Remove special errata handling if FXLS8964AF is used.
--- drivers/iio/accel/fxls8962af-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iio/accel/fxls8962af-core.c +3 -2
@@ -656,9 +656,10 @@ static int fxls8962af_fifo_transfer(struint total_length = samples * sample_length;int ret; -if (i2c_verify_client (dev)) +if (i2c_verify_client (dev) && + data->chip_info->chip_id ==FXLS8962AF_DEVICE_ID )/* -* Due to errata bug: +* Due to errata bug (only applicable on fxls8962af): * E3: FIFO burst read operation error using I2C interface * We have to avoid burst reads on I2C.. */
Greg Kroah-Hartman
maintainerPATCH 256/532 iio: accel: fxls8962af: fixup buffer scan element type
In reply to Greg Kroah-HartmanFrom: Sean Nyekjaer <[email protected]>
commit d1cfbd52ede5e5fabc09992894c5733b4057f159 upstream.
Scan elements for x,y,z channels is little endian and requires no bit shifts. LE vs. BE is controlled in register SENS_CONFIG2 and bit LE_BE, default value is LE.
--- drivers/iio/accel/fxls8962af-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/accel/fxls8962af-core.c +1 -2
@@ -486,8 +486,7 @@ static int fxls8962af_set_watermark(stru .sign = 's', \ .realbits = 12, \ .storagebits = 16, \ - .shift = 4, \ - .endianness = IIO_BE, \ + .endianness = IIO_LE, \ }, \ }
Greg Kroah-Hartman
maintainerPATCH 257/532 ALSA: hda/realtek: Add quirk for Clevo NPx0SNx
In reply to Greg Kroah-HartmanFrom: Werner Sembach <[email protected]>
commit 22065e4214c1196b54fc164892c2e193a743caf3 upstream.
This applies a SND_PCI_QUIRK(...) to the Clevo NPx0SNx barebones fixing the microphone not being detected on the headset combo port.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9242,6 +9242,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x971d ,"Clevo N970T[CDF]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xa500 ,"Clevo NL5[03]RU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xa600 ,"Clevo NL50NU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0xa650 ,"Clevo NP[567]0SN[CD]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xa671 ,"Clevo NP70SN[CDE]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xb018 ,"Clevo NP50D[BE]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0xb019, "Clevo NH77D[BE]Q", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 258/532 ALSA: jack: Fix mutex call in snd_jack_report()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 89dbb335cb6a627a4067bc42caa09c8bc3326d40 upstream.
snd_jack_report() is supposed to be callable from an IRQ context, too, and it's indeed used in that way from virtsnd driver. The fix for input_dev race in commit 1b6a6fc5280e ("ALSA: jack: Access input_dev under mutex"), however, introduced a mutex lock in snd_jack_report(), and this resulted in a potential sleep-in-atomic.
For addressing that problem, this patch changes the relevant code to use the object get/put and removes the mutex usage. That is, snd_jack_report(), it takes input_get_device() and leaves with input_put_device() for assuring the input_dev being assigned.
Although the whole mutex could be reduced, we keep it because it can be still a protection for potential races between creation and deletion.
--- sound/core/jack.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
sound/core/jack.c +7 -8
@@ -654,6 +654,7 @@ void snd_jack_report(struct snd_jack *jastruct snd_jack_kctl *jack_kctl;unsigned int mask_bits =0 ;#ifdef CONFIG_SND_JACK_INPUT_DEV +struct input_dev *idev;int i;#endif
@@ -670,17 +671,15 @@ void snd_jack_report(struct snd_jack *ja status & jack_kctl->mask_bits);#ifdef CONFIG_SND_JACK_INPUT_DEV -mutex_lock (&jack->input_dev_lock); -if (!jack->input_dev) { -mutex_unlock (&jack->input_dev_lock); + idev =input_get_device (jack->input_dev); +if (!idev)return ; - }for (i =0 ; i <ARRAY_SIZE (jack->key); i++) {int testbit = ((SND_JACK_BTN_0 >> i) & ~mask_bits);if (jack->type & testbit) -input_report_key (jack->input_dev, jack->key[i], +input_report_key (idev, jack->key[i], status & testbit); }
@@ -688,13 +687,13 @@ void snd_jack_report(struct snd_jack *jaint testbit = ((1 << i) & ~mask_bits);if (jack->type & testbit) -input_report_switch (jack->input_dev, +input_report_switch (idev, jack_switch_types[i], status & testbit); } -input_sync (jack->input_dev); -mutex_unlock (&jack->input_dev_lock); +input_sync (idev); +input_put_device (idev);#endif /* CONFIG_SND_JACK_INPUT_DEV */ }EXPORT_SYMBOL (snd_jack_report);
Greg Kroah-Hartman
maintainerPATCH 259/532 block: fix signed int overflow in Amiga partition support
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit fc3d092c6bb48d5865fec15ed5b333c12f36288c upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use sector_t as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted. This patch differs from Joanne's patch only in its use of sector_t instead of unsigned int. No checking for overflows is done (see patch 3 of this series for that).
Message-ID: <[email protected]>
--- block/partitions/amiga.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/partitions/amiga.c +5 -4
@@ -31,7 +31,8 @@ int amiga_partition(struct parsed_partitunsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -int start_sect, nr_sects, blk, part, res =0 ; +sector_t start_sect, nr_sects; +int blk, part, res =0 ;int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;
@@ -96,14 +97,14 @@ int amiga_partition(struct parsed_partit/* Tell Kernel about it */ - nr_sects = (be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * + nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - +be32_to_cpu (pb->pb_Environment[9 ])) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;if (!nr_sects)continue ; - start_sect =be32_to_cpu (pb->pb_Environment[9 ]) * + start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;
Greg Kroah-Hartman
maintainerPATCH 260/532 block: add overflow checks for Amiga partition support
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit b6f3f28f604ba3de4724ad82bea6adb1300c0b5f upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
Bail out if sector addresses overflow 32 bits on kernels without LBD support.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 in this series).
This patch adds additional error checking and warning messages.
Message-ID: <[email protected]>
--- block/partitions/amiga.c | 103 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 18 deletions(-)
block/partitions/amiga.c +85 -18
@@ -11,10 +11,18 @@#define pr_fmt (fmt) fmt#include <linux/types.h> +#include <linux/mm_types.h> +#include <linux/overflow.h> #include <linux/affs_hardblocks.h> #include "check.h" +/* magic offsets in partition DosEnvVec */ +#define NR_HD 3 +#define NR_SECT 5 +#define LO_CYL 9 +#define HI_CYL 10 +static __inline__u32 checksum_block (__be32 *m,int size) {
@@ -31,9 +39,12 @@ int amiga_partition(struct parsed_partitunsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -sector_t start_sect, nr_sects; -int blk, part, res =0 ; -int blksize =1 ;/* Multiplier for disk block size */ +u64 start_sect, nr_sects; +sector_t blk, end_sect; +u32 cylblk;/* rdb_CylBlocks = nr_heads*sect_per_track */ +u32 nr_hd, nr_sect, lo_cyl, hi_cyl; +int part, res =0 ; +unsigned int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;for (blk =0 ; ; blk++,put_dev_sector (sect)) {
@@ -41,7 +52,7 @@ int amiga_partition(struct parsed_partit goto rdb_done; data =read_part_sector (state, blk, §);if (!data) { -pr_err ("Dev %s: unable to read RDB block %d\n" , +pr_err ("Dev %s: unable to read RDB block %llu\n" , state->disk->disk_name, blk); res =-1 ; goto rdb_done;
@@ -58,12 +69,12 @@ int amiga_partition(struct parsed_partit *(__be32 *)(data+0xdc ) =0 ;if (checksum_block ((__be32 *)data,be32_to_cpu (rdb->rdb_SummedLongs) &0x7F )==0 ) { -pr_err ("Trashed word at 0xd0 in block %d ignored in checksum calculation\n" , +pr_err ("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n" , blk);break ; } -pr_err ("Dev %s: RDB in block %d has bad checksum\n" , +pr_err ("Dev %s: RDB in block %llu has bad checksum\n" , state->disk->disk_name, blk); }
@@ -80,10 +91,15 @@ int amiga_partition(struct parsed_partit blk =be32_to_cpu (rdb->rdb_PartitionList);put_dev_sector (sect);for (part =1 ; blk>0 && part<=16 ; part++,put_dev_sector (sect)) { - blk *= blksize;/* Read in terms partition table understands */ +/* Read in terms partition table understands */ +if (check_mul_overflow (blk, (sector_t ) blksize, &blk)) { +pr_err ("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n" , + state->disk->disk_name, blk, part); +break ; + } data =read_part_sector (state, blk, §);if (!data) { -pr_err ("Dev %s: unable to read partition block %d\n" , +pr_err ("Dev %s: unable to read partition block %llu\n" , state->disk->disk_name, blk); res =-1 ; goto rdb_done;
@@ -95,19 +111,70 @@ int amiga_partition(struct parsed_partitif (checksum_block ((__be32 *)pb,be32_to_cpu (pb->pb_SummedLongs) &0x7F ) !=0 )continue ; -/* Tell Kernel about it */ +/* RDB gives us more than enough rope to hang ourselves with, +* many times over (2^128 bytes if all fields max out). +* Some careful checks are in order, so check for potential +* overflows. +* We are multiplying four 32 bit numbers to one sector_t! +*/ + + nr_hd =be32_to_cpu (pb->pb_Environment[NR_HD ]); + nr_sect =be32_to_cpu (pb->pb_Environment[NR_SECT ]); + +/* CylBlocks is total number of blocks per cylinder */ +if (check_mul_overflow (nr_hd, nr_sect, &cylblk)) { +pr_err ("Dev %s: heads*sects %u overflows u32, skipping partition!\n" , + state->disk->disk_name, cylblk); +continue ; + } + +/* check for consistency with RDB defined CylBlocks */ +if (cylblk >be32_to_cpu (rdb->rdb_CylBlocks)) { +pr_warn ("Dev %s: cylblk %u > rdb_CylBlocks %u!\n" , + state->disk->disk_name, cylblk, +be32_to_cpu (rdb->rdb_CylBlocks)); + } + +/* RDB allows for variable logical block size - +* normalize to 512 byte blocks and check result. +*/ + +if (check_mul_overflow (cylblk, blksize, &cylblk)) { +pr_err ("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n" , + state->disk->disk_name, part); +continue ; + } + +/* Calculate partition start and end. Limit of 32 bit on cylblk +* guarantees no overflow occurs if LBD support is enabled. +*/ + + lo_cyl =be32_to_cpu (pb->pb_Environment[LO_CYL ]); + start_sect = ((u64 ) lo_cyl * cylblk); + + hi_cyl =be32_to_cpu (pb->pb_Environment[HI_CYL ]); + nr_sects = (((u64 ) hi_cyl - lo_cyl +1 ) * cylblk); - nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize;if (!nr_sects)continue ; - start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize; + +/* Warn user if partition end overflows u32 (AmigaDOS limit) */ + +if ((start_sect + nr_sects) >UINT_MAX ) { +pr_warn ("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n" , + state->disk->disk_name, part, + start_sect, start_sect + nr_sects); + } + +if (check_add_overflow (start_sect, nr_sects, &end_sect)) { +pr_err ("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n" , + state->disk->disk_name, part, + start_sect, end_sect); +continue ; + } + +/* Tell Kernel about it */ +put_partition (state,slot++,start_sect,nr_sects); {/* Be even more informative to aid mounting */
Greg Kroah-Hartman
maintainerPATCH 261/532 block: change all __u32 annotations to __be32 in affs_hardblocks.h
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit 95a55437dc49fb3342c82e61f5472a71c63d9ed0 upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 of this series).
Patch 3 (this series) adds additional error checking and warning messages. One of the error checks now makes use of the previously unused rdb_CylBlocks field, which causes a 'sparse' warning (cast to restricted __be32).
Annotate all 32 bit fields in affs_hardblocks.h as __be32, as the on-disk format of RDB and partition blocks is always big endian.
Message-ID: <[email protected]>
--- include/uapi/linux/affs_hardblocks.h | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-)
include/uapi/linux/affs_hardblocks.h +34 -34
@@ -7,42 +7,42 @@/* Just the needed definitions for the RDB of an Amiga HD. */ struct RigidDiskBlock { -__u32 rdb_ID; +__be32 rdb_ID;__be32 rdb_SummedLongs; -__s32 rdb_ChkSum; -__u32 rdb_HostID; +__be32 rdb_ChkSum; +__be32 rdb_HostID;__be32 rdb_BlockBytes; -__u32 rdb_Flags; -__u32 rdb_BadBlockList; +__be32 rdb_Flags; +__be32 rdb_BadBlockList;__be32 rdb_PartitionList; -__u32 rdb_FileSysHeaderList; -__u32 rdb_DriveInit; -__u32 rdb_Reserved1[6 ]; -__u32 rdb_Cylinders; -__u32 rdb_Sectors; -__u32 rdb_Heads; -__u32 rdb_Interleave; -__u32 rdb_Park; -__u32 rdb_Reserved2[3 ]; -__u32 rdb_WritePreComp; -__u32 rdb_ReducedWrite; -__u32 rdb_StepRate; -__u32 rdb_Reserved3[5 ]; -__u32 rdb_RDBBlocksLo; -__u32 rdb_RDBBlocksHi; -__u32 rdb_LoCylinder; -__u32 rdb_HiCylinder; -__u32 rdb_CylBlocks; -__u32 rdb_AutoParkSeconds; -__u32 rdb_HighRDSKBlock; -__u32 rdb_Reserved4; +__be32 rdb_FileSysHeaderList; +__be32 rdb_DriveInit; +__be32 rdb_Reserved1[6 ]; +__be32 rdb_Cylinders; +__be32 rdb_Sectors; +__be32 rdb_Heads; +__be32 rdb_Interleave; +__be32 rdb_Park; +__be32 rdb_Reserved2[3 ]; +__be32 rdb_WritePreComp; +__be32 rdb_ReducedWrite; +__be32 rdb_StepRate; +__be32 rdb_Reserved3[5 ]; +__be32 rdb_RDBBlocksLo; +__be32 rdb_RDBBlocksHi; +__be32 rdb_LoCylinder; +__be32 rdb_HiCylinder; +__be32 rdb_CylBlocks; +__be32 rdb_AutoParkSeconds; +__be32 rdb_HighRDSKBlock; +__be32 rdb_Reserved4;char rdb_DiskVendor[8 ];char rdb_DiskProduct[16 ];char rdb_DiskRevision[4 ];char rdb_ControllerVendor[8 ];char rdb_ControllerProduct[16 ];char rdb_ControllerRevision[4 ]; -__u32 rdb_Reserved5[10 ]; +__be32 rdb_Reserved5[10 ]; };#define IDNAME_RIGIDDISK 0x5244534B/* "RDSK" */
@@ -50,16 +50,16 @@ struct RigidDiskBlock {struct PartitionBlock {__be32 pb_ID;__be32 pb_SummedLongs; -__s32 pb_ChkSum; -__u32 pb_HostID; +__be32 pb_ChkSum; +__be32 pb_HostID;__be32 pb_Next; -__u32 pb_Flags; -__u32 pb_Reserved1[2 ]; -__u32 pb_DevFlags; +__be32 pb_Flags; +__be32 pb_Reserved1[2 ]; +__be32 pb_DevFlags;__u8 pb_DriveName[32 ]; -__u32 pb_Reserved2[15 ]; +__be32 pb_Reserved2[15 ];__be32 pb_Environment[17 ]; -__u32 pb_EReserved[15 ]; +__be32 pb_EReserved[15 ]; };#define IDNAME_PARTITION 0x50415254/* "PART" */
Greg Kroah-Hartman
maintainerPATCH 262/532 block: increment diskseq on all media change events
In reply to Greg Kroah-HartmanFrom: Demi Marie Obenour <[email protected]>
commit b90ecc0379eb7bbe79337b0c7289390a98752646 upstream.
Currently, associating a loop device with a different file descriptor does not increment its diskseq. This allows the following race condition:
1. Program X opens a loop device
2. Program X gets the diskseq of the loop device.
3. Program X associates a file with the loop device.
4. Program X passes the loop device major, minor, and diskseq to something.
5. Program X exits.
6. Program Y detaches the file from the loop device.
7. Program Y attaches a different file to the loop device.
8. The opener finally gets around to opening the loop device and checks that the diskseq is what it expects it to be. Even though the diskseq is the expected value, the result is that the opener is accessing the wrong file.
Quoted 1 line
From discussions with Christoph Hellwig, it appears that
disk_force_media_change() was supposed to call inc_diskseq(), but in fact it does not. Adding a Fixes: tag to indicate this. Christoph's Reported-by is because he stated that disk_force_media_change() calls inc_diskseq(), which is what led me to discover that it should but does not.
--- block/disk-events.c | 1 + 1 file changed, 1 insertion(+)
block/disk-events.c +1 -0
@@ -307,6 +307,7 @@ bool disk_force_media_change(struct gendisk *disk, unsigned int events)if (!(events &DISK_EVENT_MEDIA_CHANGE ))return false; +inc_diskseq (disk);if (__invalidate_device (disk->part0, true))pr_warn ("VFS: busy inodes on changed media %s\n" , disk->disk_name);
Signature · 1 line
2.41.0
Greg Kroah-Hartman
maintainerPATCH 263/532 SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
commit fc80fc2d4e39137869da3150ee169b40bf879287 upstream.
After the listener svc_sock is freed, and before invoking svc_tcp_accept() for the established child sock, there is a window that the newsock retaining a freed listener svc_sock in sk_user_data which cloning from parent. In the race window, if data is received on the newsock, we will observe use-after-free report in svc_tcp_listen_data_ready().
Reproduce by two tasks:
1. while :; do rpc.nfsd 0 ; rpc.nfsd; done
2. while :; do echo "" | ncat -4 127.0.0.1 2049 ; done
KASAN report:
==================================================================
BUG: KASAN: slab-use-after-free in svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] Read of size 8 at addr ffff888139d96228 by task nc/102553 CPU: 7 PID: 102553 Comm: nc Not tainted 6.3.0+ #18 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: <IRQ> dump_stack_lvl+0x33/0x50 print_address_description.constprop.0+0x27/0x310 print_report+0x3e/0x70 kasan_report+0xae/0xe0 svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] tcp_data_queue+0x9f4/0x20e0 tcp_rcv_established+0x666/0x1f60 tcp_v4_do_rcv+0x51c/0x850 tcp_v4_rcv+0x23fc/0x2e80 ip_protocol_deliver_rcu+0x62/0x300 ip_local_deliver_finish+0x267/0x350 ip_local_deliver+0x18b/0x2d0 ip_rcv+0x2fb/0x370 __netif_receive_skb_one_core+0x166/0x1b0 process_backlog+0x24c/0x5e0 __napi_poll+0xa2/0x500 net_rx_action+0x854/0xc90 __do_softirq+0x1bb/0x5de do_softirq+0xcb/0x100 </IRQ> <TASK> ... </TASK> Allocated by task 102371: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x7b/0x90 svc_setup_socket+0x52/0x4f0 [sunrpc] svc_addsock+0x20d/0x400 [sunrpc] __write_ports_addfd+0x209/0x390 [nfsd] write_ports+0x239/0x2c0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 102551: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0x106/0x190 __kmem_cache_free+0x133/0x270 svc_xprt_free+0x1e2/0x350 [sunrpc] svc_xprt_destroy_all+0x25a/0x440 [sunrpc] nfsd_put+0x125/0x240 [nfsd] nfsd_svc+0x2cb/0x3c0 [nfsd] write_threads+0x1ac/0x2a0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc
Fix the UAF by simply doing nothing in svc_tcp_listen_data_ready() if state != TCP_LISTEN, that will avoid dereferencing svsk for all child socket.
--- net/sunrpc/svcsock.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
net/sunrpc/svcsock.c +11 -12
@@ -685,12 +685,6 @@ static void svc_tcp_listen_data_ready(st {struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; -if (svsk) { -/* Refer to svc_setup_socket() for details. */ -rmb (); - svsk->sk_odata (sk); - } -/* * This callback may called twice when a new connection * is established as a child socket inherits everything
@@ -699,13 +693,18 @@ static void svc_tcp_listen_data_ready(st* when one of child sockets become ESTABLISHED. * 2) data_ready method of the child socket may be called * when it receives data before the socket is accepted. -* In case of 2, we should ignore it silently. +* In case of 2, we should ignore it silently and DO NOT +* dereference svsk. */ -if (sk->sk_state ==TCP_LISTEN ) { -if (svsk) { -set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); - } +if (sk->sk_state !=TCP_LISTEN ) +return ; + +if (svsk) { +/* Refer to svc_setup_socket() for details. */ +rmb (); + svsk->sk_odata (sk); +set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); +svc_xprt_enqueue (&svsk->sk_xprt); } }
Greg Kroah-Hartman
maintainerPATCH 264/532 w1: w1_therm: fix locking behavior in convert_t
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit dca5480ab7b77a889088ab7cac81934604510ac7 ]
The commit 67b392f7b8ed ("w1_therm: optimizing temperature read timings") accidentially inverted the logic for lock handling of the bus mutex.
Before:
pullup -> release lock before sleep
no pullup -> release lock after sleep
After:
pullup -> release lock after sleep
no pullup -> release lock before sleep
This cause spurious measurements of 85 degree (powerup value) on the Tarragon board with connected 1-w temperature sensor (w1_therm.w1_strong_pull=0).
In the meantime a new feature for polling the conversion completion has been integrated in these branches with commit 021da53e65fd ("w1: w1_therm: Add sysfs entries to control conversion time and driver features"). But this feature isn't available for parasite power mode, so handle this separately.
--- drivers/w1/slaves/w1_therm.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
drivers/w1/slaves/w1_therm.c +14 -17
@@ -1093,29 +1093,26 @@ static int convert_t(struct w1_slave *sl, struct therm_info *info)w1_write_8 (dev_master,W1_CONVERT_TEMP ); -if (strong_pullup) {/*some device need pullup */ +if (SLAVE_FEATURES (sl) &W1_THERM_POLL_COMPLETION ) { + ret =w1_poll_completion (dev_master,W1_POLL_CONVERT_TEMP ); +if (ret) { +dev_dbg (&sl->dev,"%s: Timeout\n" , __func__); + goto mt_unlock; + } +mutex_unlock (&dev_master->bus_mutex); + }else if (!strong_pullup) {/*no device need pullup */ sleep_rem =msleep_interruptible (t_conv);if (sleep_rem !=0 ) { ret = -EINTR ; goto mt_unlock; }mutex_unlock (&dev_master->bus_mutex); - }else {/*no device need pullup */ -if (SLAVE_FEATURES (sl) &W1_THERM_POLL_COMPLETION ) { - ret =w1_poll_completion (dev_master,W1_POLL_CONVERT_TEMP ); -if (ret) { -dev_dbg (&sl->dev,"%s: Timeout\n" , __func__); - goto mt_unlock; - } -mutex_unlock (&dev_master->bus_mutex); - }else { -/* Fixed delay */ -mutex_unlock (&dev_master->bus_mutex); - sleep_rem =msleep_interruptible (t_conv); -if (sleep_rem !=0 ) { - ret = -EINTR ; - goto dec_refcnt; - } + }else {/*some device need pullup */ +mutex_unlock (&dev_master->bus_mutex); + sleep_rem =msleep_interruptible (t_conv); +if (sleep_rem !=0 ) { + ret = -EINTR ; + goto dec_refcnt; } } ret =read_scratchpad (sl, info);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 265/532 w1: fix loop in w1_fini()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 83f3fcf96fcc7e5405b37d9424c7ef26bfa203f8 ]
The __w1_remove_master_device() function calls:
list_del(&dev->w1_master_entry);
So presumably this can cause an endless loop.
--- drivers/w1/w1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/w1.c +2 -2
@@ -1263,10 +1263,10 @@ static int __init w1_init(void) static void __exit w1_fini(void) { -struct w1_master *dev; +struct w1_master *dev, *n;/* Set netlink removal messages and some cleanup */ -list_for_each_entry (dev, &w1_masters, w1_master_entry) +list_for_each_entry_safe (dev, n, &w1_masters, w1_master_entry)__w1_remove_master_device (dev);w1_fini_netlink ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 266/532 sh: j2: Use ioremap() to translate device tree address into kernel memory
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit bc9d1f0cecd2407cfb2364a7d4be2f52d1d46a9d ]
Addresses the following warning when building j2_defconfig:
arch/sh/kernel/cpu/sh2/probe.c: In function 'scan_cache':arch/sh/kernel/cpu/sh2/probe.c:24:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
24 | j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address(node);
|--- arch/sh/kernel/cpu/sh2/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/cpu/sh2/probe.c +1 -1
@@ -21,7 +21,7 @@ static int __init scan_cache(unsigned long node, const char *uname,if (!of_flat_dt_is_compatible (node,"jcore,cache" ))return 0 ; - j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address (node); + j2_ccr_base =ioremap (of_flat_dt_translate_address (node),4 );return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 267/532 usb: dwc2: platform: Improve error reporting for problems during .remove()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 55f223b8b408cbfd85fb1c5b74ab85ccab319a69 ]
Returning an error value in a platform driver's remove callback results in a generic error message being emitted by the driver core, but otherwise it doesn't make a difference. The device goes away anyhow.
For each case where ret is non-zero the driver already emits an error message, so suppress the generic error message by returning zero unconditionally. (Side note: The return value handling was unreliable anyhow as the value returned by dwc2_exit_hibernation() was overwritten anyhow if hsotg->in_ppd was non-zero.)
Stable-dep-of: ada050c69108 ("usb: dwc2: Fix some error handling paths")
--- drivers/usb/dwc2/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc2/platform.c +1 -1
@@ -355,7 +355,7 @@ static int dwc2_driver_remove(struct platform_device *dev)reset_control_assert (hsotg->reset);reset_control_assert (hsotg->reset_ecc); -return ret; +return 0 ; }/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 268/532 usb: dwc2: Fix some error handling paths
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit ada050c69108bc34be13ecc11f7fad0f20ebadc4 ]
dwc2_driver_probe() calls dwc2_lowlevel_hw_init() which deassert some reset lines.
Should an error happen in dwc2_lowlevel_hw_init() after calling reset_control_deassert() or in the probe after calling dwc2_lowlevel_hw_init(), the reset lines remain deasserted.
Add some devm_add_action_or_reset() calls to re-assert the lines if needed.
Update the remove function accordingly.
This change is compile-tested only.
--- drivers/usb/dwc2/platform.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/usb/dwc2/platform.c +13 -3
@@ -205,6 +205,11 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg)return ret; } +static void dwc2_reset_control_assert (void *data) +{ +reset_control_assert (data); +} +static int dwc2_lowlevel_hw_init (struct dwc2_hsotg *hsotg) {int i, ret;
@@ -217,6 +222,10 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) }reset_control_deassert (hsotg->reset); + ret =devm_add_action_or_reset (hsotg->dev, dwc2_reset_control_assert, + hsotg->reset); +if (ret) +return ret; hsotg->reset_ecc =devm_reset_control_get_optional (hsotg->dev,"dwc2-ecc" );if (IS_ERR (hsotg->reset_ecc)) {
@@ -226,6 +235,10 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) }reset_control_deassert (hsotg->reset_ecc); + ret =devm_add_action_or_reset (hsotg->dev, dwc2_reset_control_assert, + hsotg->reset_ecc); +if (ret) +return ret;/* * Attempt to find a generic PHY, then look for an old style
@@ -352,9 +365,6 @@ static int dwc2_driver_remove(struct platform_device *dev)if (hsotg->ll_hw_enabled)dwc2_lowlevel_hw_disable (hsotg); -reset_control_assert (hsotg->reset); -reset_control_assert (hsotg->reset_ecc); -return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 269/532 serial: 8250: omap: Fix freeing of resources on failed register
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit b9ab22c2bc8652324a803b3e2be69838920b4025 ]
If serial8250_register_8250_port() fails, the SoC can hang as the deferred PMQoS work will still run as is not flushed and removed.
--- drivers/tty/serial/8250/8250_omap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/tty/serial/8250/8250_omap.c +2 -0
@@ -1469,7 +1469,9 @@ static int omap8250_probe(struct platform_device *pdev) err:pm_runtime_dont_use_autosuspend (&pdev->dev);pm_runtime_put_sync (&pdev->dev); +flush_work (&priv->qos_work);pm_runtime_disable (&pdev->dev); +cpu_latency_qos_remove_request (&priv->pm_qos_request);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 270/532 clk: qcom: camcc-sc7180: Add parent dependency to all camera GDSCs
In reply to Greg Kroah-HartmanFrom: Taniya Das <[email protected]>
[ Upstream commit 3e4d179532423f299554cd0dedabdd9d2fdd238d ]
Camera titan top GDSC is a parent supply to all other camera GDSCs. Titan top GDSC is required to be enabled before enabling any other camera GDSCs and it should be disabled only after all other camera GDSCs are disabled. Ensure this behavior by marking titan top GDSC as parent of all other camera GDSCs.
--- drivers/clk/qcom/camcc-sc7180.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/clk/qcom/camcc-sc7180.c +12 -7
@@ -1493,12 +1493,21 @@ static struct clk_branch cam_cc_sys_tmr_clk = { }, }; +static struct gdsc titan_top_gdsc = { + .gdscr =0xb134 , + .pd = { + .name ="titan_top_gdsc" , + }, + .pwrsts =PWRSTS_OFF_ON , +}; +static struct gdsc bps_gdsc = { .gdscr =0x6004 , .pd = { .name ="bps_gdsc" , }, .pwrsts =PWRSTS_OFF_ON , + .parent = &titan_top_gdsc.pd, .flags =HW_CTRL , };
@@ -1508,6 +1517,7 @@ static struct gdsc ife_0_gdsc = { .name = "ife_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &titan_top_gdsc.pd, }; static struct gdsc ife_1_gdsc = {
@@ -1516,6 +1526,7 @@ static struct gdsc ife_1_gdsc = { .name = "ife_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &titan_top_gdsc.pd, }; static struct gdsc ipe_0_gdsc = {
@@ -1525,15 +1536,9 @@ static struct gdsc ipe_0_gdsc = { }, .pwrsts = PWRSTS_OFF_ON, .flags = HW_CTRL, + .parent = &titan_top_gdsc.pd, }; -static struct gdsc titan_top_gdsc = { - .gdscr =0xb134 , - .pd = { - .name ="titan_top_gdsc" , - }, - .pwrsts =PWRSTS_OFF_ON , -};static struct clk_hw *cam_cc_sc7180_hws[] = { [CAM_CC_PLL2_OUT_EARLY ] = &cam_cc_pll2_out_early.hw,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 271/532 clk: qcom: gcc-ipq6018: Use floor ops for sdcc clocks
In reply to Greg Kroah-HartmanFrom: Mantas Pucka <[email protected]>
[ Upstream commit 56e5ae0116aef87273cf1812d608645b076e4f02 ]
SDCC clocks must be rounded down to avoid overclocking the controller.
--- drivers/clk/qcom/gcc-ipq6018.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-ipq6018.c +1 -1
@@ -1654,7 +1654,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = { .name = "sdcc1_apps_clk_src", .parent_data = gcc_xo_gpll0_gpll2_gpll0_out_main_div2, .num_parents = 4, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 272/532 media: usb: Check az6007_read() return value
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit fdaca63186f59fc664b346c45b76576624b48e57 ]
If az6007_read() returns error, there is no sence to continue.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/usb/dvb-usb-v2/az6007.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/az6007.c +2 -1
@@ -202,7 +202,8 @@ static int az6007_rc_query(struct dvb_usb_device *d)unsigned code;enum rc_proto proto; -az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ); +if (az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ) <0 ) +return -EIO ;if (st->data[1 ] ==0x44 )return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 273/532 media: videodev2.h: Fix struct v4l2_input tuner index comment
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 26ae58f65e64fa7ba61d64bae752e59e08380c6a ]
VIDIOC_ENUMINPUT documentation describes the tuner field of struct v4l2_input as index:
Documentation/userspace-api/media/v4l/vidioc-enuminput.rst "
* - __u32
- ``tuner``
- Capture devices can have zero or more tuners (RF demodulators). When the ``type`` is set to ``V4L2_INPUT_TYPE_TUNER`` this is an RF connector and this field identifies the tuner. It corresponds to struct :c:type:v4l2_tuner field ``index``. For details on tuners see :ref:tuner.
"
Drivers I could find also use the 'tuner' field as an index, e.g.:drivers/media/pci/bt8xx/bttv-driver.c bttv_enum_input() drivers/media/usb/go7007/go7007-v4l2.c vidioc_enum_input()
However, the UAPI comment claims this field is 'enum v4l2_tuner_type':include/uapi/linux/videodev2.h
This field being 'enum v4l2_tuner_type' is unlikely as it seems to be never used that way in drivers, and documentation confirms it. It seem this comment got in accidentally in the commit which this patch fixes. Fix the UAPI comment to stop confusion.
This was pointed out by Dmitry while reviewing VIDIOC_ENUMINPUT support for strace.
--- include/uapi/linux/videodev2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/videodev2.h +1 -1
@@ -1652,7 +1652,7 @@ struct v4l2_input {__u8 name[32 ];/* Label */ __u32 type;/* Type of input */ __u32 audioset;/* Associated audios (bitfield) */ -__u32 tuner;/* enum v4l2_tuner_type */ +__u32 tuner;/* Tuner index */ v4l2_std_id std;__u32 status;__u32 capabilities;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 274/532 media: usb: siano: Fix warning due to null work_func_t function pointer
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 6f489a966fbeb0da63d45c2c66a8957eab604bf6 ]
The previous commit ebad8e731c1c ("media: usb: siano: Fix use after free bugs caused by do_submit_urb") adds cancel_work_sync() in smsusb_stop_streaming(). But smsusb_stop_streaming() may be called, even if the work_struct surb->wq has not been initialized. As a result, the warning will occur. One of the processes that could lead to warning is shown below:
smsusb_probe()
smsusb_init_device()
if (!dev->in_ep || !dev->out_ep || align < 0) {
smsusb_term_device(intf);
smsusb_stop_streaming()
cancel_work_sync(&dev->surbs[i].wq);
__cancel_work_timer()
__flush_work()
if (WARN_ON(!work->func)) // work->func is nullThe log reported by syzbot is shown below:
WARNING: CPU: 0 PID: 897 at kernel/workqueue.c:3066 __flush_work+0x798/0xa80 kernel/workqueue.c:3063 Modules linked in: CPU: 0 PID: 897 Comm: kworker/0:2 Not tainted 6.2.0-rc1-syzkaller #0 RIP: 0010:__flush_work+0x798/0xa80 kernel/workqueue.c:3066 ... RSP: 0018:ffffc9000464ebf8 EFLAGS: 00010246 RAX: 1ffff11002dbb420 RBX: 0000000000000021 RCX: 1ffffffff204fa4e RDX: dffffc0000000000 RSI: 0000000000000001 RDI: ffff888016dda0e8 RBP: ffffc9000464ed98 R08: 0000000000000001 R09: ffffffff90253b2f R10: 0000000000000001 R11: 0000000000000000 R12: ffff888016dda0e8 R13: ffff888016dda0e8 R14: ffff888016dda100 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffd4331efe8 CR3: 000000000b48e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __cancel_work_timer+0x315/0x460 kernel/workqueue.c:3160 smsusb_stop_streaming drivers/media/usb/siano/smsusb.c:182 [inline] smsusb_term_device+0xda/0x2d0 drivers/media/usb/siano/smsusb.c:344 smsusb_init_device+0x400/0x9ce drivers/media/usb/siano/smsusb.c:419 smsusb_probe+0xbbd/0xc55 drivers/media/usb/siano/smsusb.c:567
...
This patch adds check before cancel_work_sync(). If surb->wq has not been initialized, the cancel_work_sync() will not be executed.
--- drivers/media/usb/siano/smsusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/siano/smsusb.c +2 -1
@@ -179,7 +179,8 @@ static void smsusb_stop_streaming(struct smsusb_device_t *dev)for (i =0 ; i <MAX_URBS ; i++) {usb_kill_urb (&dev->surbs[i].urb); -cancel_work_sync (&dev->surbs[i].wq); +if (dev->surbs[i].wq.func) +cancel_work_sync (&dev->surbs[i].wq);if (dev->surbs[i].cb) {smscore_putbuffer (dev->coredev, dev->surbs[i].cb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 275/532 media: i2c: Correct format propagation for st-mipid02
In reply to Greg Kroah-HartmanFrom: Daniel Scally <[email protected]>
[ Upstream commit 306c3190b30d4d6a098888b9d7d4cefaa0ddcb91 ]
Format propagation in the st-mipid02 driver is incorrect in that when setting format for V4L2_SUBDEV_FORMAT_TRY on the source pad, the _active_ rather than _try_ format from the sink pad is propagated. This causes problems with format negotiation - update the function to propagate the correct format.
--- drivers/media/i2c/st-mipid02.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/i2c/st-mipid02.c +7 -2
@@ -710,8 +710,13 @@ static void mipid02_set_fmt_source(struct v4l2_subdev *sd, {struct mipid02_dev *bridge =to_mipid02_dev (sd); -/* source pad mirror active sink pad */ - format->format = bridge->fmt; +/* source pad mirror sink pad */ +if (format->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) + format->format = bridge->fmt; +else + format->format = *v4l2_subdev_get_try_format (sd, sd_state, +MIPID02_SINK_0 ); +/* but code may need to be converted */ format->format.code =serial_to_parallel_code (format->format.code);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 276/532 clk: qcom: reset: Allow specifying custom reset delay
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 2cb8a39b6781ea23accd1fa93b3ad000d0948aec ]
The amount of time required between asserting and deasserting the reset signal can vary depending on the involved hardware component. Sometimes 1 us might not be enough and a larger delay is necessary to conform to the specifications.
Usually this is worked around in the consuming drivers, by replacing reset_control_reset() with a sequence of reset_control_assert(), waiting for a custom delay, followed by reset_control_deassert().
However, in some cases the driver making use of the reset is generic and can be used with different reset controllers. In this case the reset time requirement is better handled directly by the reset controller driver.
Make this possible by adding an "udelay" field to the qcom_reset_map that allows setting a different reset delay (in microseconds).
Stable-dep-of: 349b5bed539b ("clk: qcom: ipq6018: fix networking resets")
--- drivers/clk/qcom/reset.c | 4 +++- drivers/clk/qcom/reset.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/clk/qcom/reset.c +3 -1
@@ -13,8 +13,10 @@static int qcom_reset (struct reset_controller_dev *rcdev,unsigned long id) { +struct qcom_reset_controller *rst =to_qcom_reset_controller (rcdev); + rcdev->ops->assert (rcdev, id); -udelay (1 ); +udelay (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ rcdev->ops->deassert (rcdev, id);return 0 ; }
drivers/clk/qcom/reset.h +1 -0
@@ -11,6 +11,7 @@struct qcom_reset_map {unsigned int reg;u8 bit; +u8 udelay; };struct regmap ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 277/532 clk: qcom: reset: support resetting multiple bits
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 4a5210893625f89723ea210d7c630b730abb37ad ]
This patch adds the support for giving the complete bitmask in reset structure and reset operation will use this bitmask for all reset operations.
Currently, reset structure only takes a single bit for each reset and then calculates the bitmask by using the BIT() macro.
However, this is not sufficient anymore for newer SoC-s like IPQ8074, IPQ6018 and more, since their networking resets require multiple bits to be asserted in order to properly reset the HW block completely.
So, in order to allow asserting multiple bits add "bitmask" field to qcom_reset_map, and then use that bitmask value if its populated in the driver, if its not populated, then we just default to existing behaviour and calculate the bitmask on the fly.
Stable-dep-of: 349b5bed539b ("clk: qcom: ipq6018: fix networking resets")
--- drivers/clk/qcom/reset.c | 4 ++-- drivers/clk/qcom/reset.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/clk/qcom/reset.c +2 -2
@@ -30,7 +30,7 @@ qcom_reset_assert(struct reset_controller_dev *rcdev, unsigned long id) rst =to_qcom_reset_controller (rcdev); map = &rst->reset_map[id]; - mask =BIT (map->bit); + mask = map->bitmask ? map->bitmask :BIT (map->bit);return regmap_update_bits (rst->regmap, map->reg, mask, mask); }
@@ -44,7 +44,7 @@ qcom_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id) rst =to_qcom_reset_controller (rcdev); map = &rst->reset_map[id]; - mask =BIT (map->bit); + mask = map->bitmask ? map->bitmask :BIT (map->bit);return regmap_update_bits (rst->regmap, map->reg, mask,0 ); }
drivers/clk/qcom/reset.h +1 -0
@@ -12,6 +12,7 @@ struct qcom_reset_map {unsigned int reg;u8 bit;u8 udelay; +u32 bitmask; };struct regmap ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 278/532 clk: qcom: ipq6018: fix networking resets
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit 349b5bed539b491b7894a5186a895751fd8ba6c7 ]
Networking resets in IPQ6018 all use bitmask as they require multiple bits to be set and cleared instead of a single bit.
So, current networking resets have the same register and bit 0 set which is clearly incorrect.
--- drivers/clk/qcom/gcc-ipq6018.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +16 -16
@@ -4517,24 +4517,24 @@ static const struct qcom_reset_map gcc_ipq6018_resets[] = { [GCC_PCIE0_AHB_ARES] = { 0x75040, 5 }, [GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 }, [GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 }, - [GCC_PPE_FULL_RESET] = { 0x68014, 0 }, - [GCC_UNIPHY0_SOFT_RESET] = { 0x56004, 0 }, + [GCC_PPE_FULL_RESET] = { .reg = 0x68014, .bitmask = 0xf0000 }, + [GCC_UNIPHY0_SOFT_RESET] = { .reg = 0x56004, .bitmask = 0x3ff2 }, [GCC_UNIPHY0_XPCS_RESET] = { 0x56004, 2 }, - [GCC_UNIPHY1_SOFT_RESET] = { 0x56104, 0 }, + [GCC_UNIPHY1_SOFT_RESET] = { .reg = 0x56104, .bitmask = 0x32 }, [GCC_UNIPHY1_XPCS_RESET] = { 0x56104, 2 }, - [GCC_EDMA_HW_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT1_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT2_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT3_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT4_RESET] = { 0x68014, 0 }, - [GCC_NSSPORT5_RESET] = { 0x68014, 0 }, - [GCC_UNIPHY0_PORT1_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT2_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT3_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT4_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT5_ARES] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT_4_5_RESET] = { 0x56004, 0 }, - [GCC_UNIPHY0_PORT_4_RESET] = { 0x56004, 0 }, + [GCC_EDMA_HW_RESET] = { .reg = 0x68014, .bitmask = 0x300000 }, + [GCC_NSSPORT1_RESET] = { .reg = 0x68014, .bitmask = 0x1000003 }, + [GCC_NSSPORT2_RESET] = { .reg = 0x68014, .bitmask = 0x200000c }, + [GCC_NSSPORT3_RESET] = { .reg = 0x68014, .bitmask = 0x4000030 }, + [GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = 0x8000300 }, + [GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = 0x10000c00 }, + [GCC_UNIPHY0_PORT1_ARES] = { .reg = 0x56004, .bitmask = 0x30 }, + [GCC_UNIPHY0_PORT2_ARES] = { .reg = 0x56004, .bitmask = 0xc0 }, + [GCC_UNIPHY0_PORT3_ARES] = { .reg = 0x56004, .bitmask = 0x300 }, + [GCC_UNIPHY0_PORT4_ARES] = { .reg = 0x56004, .bitmask = 0xc00 }, + [GCC_UNIPHY0_PORT5_ARES] = { .reg = 0x56004, .bitmask = 0x3000 }, + [GCC_UNIPHY0_PORT_4_5_RESET] = { .reg = 0x56004, .bitmask = 0x3c02 }, + [GCC_UNIPHY0_PORT_4_RESET] = { .reg = 0x56004, .bitmask = 0xc02 }, [GCC_LPASS_BCR] = {0x1F000, 0}, [GCC_UBI32_TBU_BCR] = {0x65000, 0}, [GCC_LPASS_TBU_BCR] = {0x6C000, 0},
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 279/532 usb: dwc3: qcom: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Vladislav Efanov <[email protected]>
[ Upstream commit 097fb3ee710d4de83b8d4f5589e8ee13e0f0541e ]
Function dwc3_qcom_probe() allocates memory for resource structure which is pointed by parent_res pointer. This memory is not freed. This leads to memory leak. Use stack memory to prevent memory leak.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/usb/dwc3/dwc3-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +3 -3
@@ -727,6 +727,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct dwc3_qcom *qcom;struct resource *res, *parent_res =NULL ; +struct resource local_res;int ret, i;bool ignore_pipe_clk;
@@ -777,9 +778,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)if (np) { parent_res = res; }else { - parent_res =kmemdup (res,sizeof (struct resource ),GFP_KERNEL ); -if (!parent_res) -return -ENOMEM ; +memcpy (&local_res, res,sizeof (struct resource )); + parent_res = &local_res; parent_res->start = res->start + qcom->acpi_pdata->qscratch_base_offset;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 280/532 usb: gadget: u_serial: Add null pointer check in gserial_suspend
In reply to Greg Kroah-HartmanFrom: Prashanth K <[email protected]>
[ Upstream commit 2f6ecb89fe8feb2b60a53325b0eeb9866d88909a ]
Consider a case where gserial_disconnect has already cleared gser->ioport. And if gserial_suspend gets called afterwards, it will lead to accessing of gser->ioport and thus causing null pointer dereference.
Avoid this by adding a null pointer check. Added a static spinlock to prevent gser->ioport from becoming null after the newly added null pointer check.
--- drivers/usb/gadget/function/u_serial.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/u_serial.c +11 -2
@@ -1419,10 +1419,19 @@ EXPORT_SYMBOL_GPL(gserial_disconnect);void gserial_suspend (struct gserial *gser) { -struct gs_port *port = gser->ioport; +struct gs_port *port;unsigned long flags; -spin_lock_irqsave (&port->port_lock, flags); +spin_lock_irqsave (&serial_port_lock, flags); + port = gser->ioport; + +if (!port) { +spin_unlock_irqrestore (&serial_port_lock, flags); +return ; + } + +spin_lock (&port->port_lock); +spin_unlock (&serial_port_lock); port->suspended = true;spin_unlock_irqrestore (&port->port_lock, flags); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 281/532 extcon: Fix kernel doc of property fields to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7e77e0b7a9f4cdf91cb0950749b40c840ea63efc ]
Kernel documentation has to be synchronized with a code, otherwise the validator is not happy:
Function parameter or member 'usb_propval' not described in 'extcon_cable' Function parameter or member 'chg_propval' not described in 'extcon_cable' Function parameter or member 'jack_propval' not described in 'extcon_cable' Function parameter or member 'disp_propval' not described in 'extcon_cable'
Describe the fields added in the past.
--- drivers/extcon/extcon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/extcon/extcon.c +4 -0
@@ -196,6 +196,10 @@ static const struct __extcon_info {* @attr_name: "name" sysfs entry * @attr_state: "state" sysfs entry * @attrs: the array pointing to attr_name and attr_state for attr_g +* @usb_propval: the array of USB connector properties +* @chg_propval: the array of charger connector properties +* @jack_propval: the array of jack connector properties +* @disp_propval: the array of display connector properties */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2