6.4.4-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 351/800 drm/i915/display: Make display responsible for probing its own IP
In reply to Greg Kroah-HartmanFrom: Matt Roper <[email protected]>
[ Upstream commit 69d439818fe501e8c9e50d963a53cb596e36f9f7 ]
Rather than selecting the display IP and feature flags at the same time the general PCI probing happens, move this step into the display code itself so that it can be more easily re-used outside of i915 (i.e., by the Xe driver).
v2:
- Make intel_display_device_probe() always return a non-NULL pointer and simplify copying of runtime_defaults. (Andrzej)
v3:
- Redefine INTEL_VGA_DEVICE/INTEL_QUANTA_DEVICE to eliminate a cast and an include of linux/mod_devicetable.h. (Jani)
- Keep explicit memcpy for runtime defaults. (Jani)
Stable-dep-of: 19db2062094c ("drm/i915: No 10bit gamma on desktop gen3 parts")
--- drivers/gpu/drm/i915/Makefile | 2 + .../drm/i915/display/intel_display_device.c | 718 ++++++++++++++++++ .../drm/i915/display/intel_display_device.h | 3 + drivers/gpu/drm/i915/i915_pci.c | 665 ---------------- drivers/gpu/drm/i915/i915_reg.h | 33 - drivers/gpu/drm/i915/intel_device_info.c | 10 +- 6 files changed, 729 insertions(+), 702 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_device.c
drivers/gpu/drm/i915/Makefile +2 -0
@@ -25,6 +25,7 @@ subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror # Fine grained warnings disable CFLAGS_i915_pci.o = $(call cc-disable-warning, override-init) +CFLAGS_display/intel_display_device.o = $(call cc-disable-warning, override-init) CFLAGS_display/intel_fbdev.o = $(call cc-disable-warning, override-init) subdir-ccflags-y += -I$(srctree)/$(src)
@@ -300,6 +301,7 @@ i915-y += \ display/intel_crt.o \ display/intel_ddi.o \ display/intel_ddi_buf_trans.o \ + display/intel_display_device.o \ display/intel_display_trace.o \ display/intel_dkl_phy.o \ display/intel_dp.o \
drivers/gpu/drm/i915/display/intel_display_device.c new file +718 -0
718 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_device.h +3 -0
@@ -80,4 +80,7 @@ struct intel_display_device_info { } color; }; +const struct intel_display_device_info * +intel_display_device_probe (u16 pci_devid); +#endif
drivers/gpu/drm/i915/i915_pci.c +0 -665
1,086 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +0 -33
@@ -1961,15 +1961,6 @@#define _TRANS_VSYNC_DSI1 0x6b814#define _TRANS_VSYNCSHIFT_DSI1 0x6b828 -#define TRANSCODER_A_OFFSET 0x60000 -#define TRANSCODER_B_OFFSET 0x61000 -#define TRANSCODER_C_OFFSET 0x62000 -#define CHV_TRANSCODER_C_OFFSET 0x63000 -#define TRANSCODER_D_OFFSET 0x63000 -#define TRANSCODER_EDP_OFFSET 0x6f000 -#define TRANSCODER_DSI0_OFFSET 0x6b000 -#define TRANSCODER_DSI1_OFFSET 0x6b800 -#define TRANS_HTOTAL (trans) _MMIO_TRANS2((trans), _TRANS_HTOTAL_A)#define TRANS_HBLANK (trans) _MMIO_TRANS2((trans), _TRANS_HBLANK_A)#define TRANS_HSYNC (trans) _MMIO_TRANS2((trans), _TRANS_HSYNC_A)
@@ -2619,23 +2610,6 @@#define PIPESTAT_INT_ENABLE_MASK 0x7fff0000#define PIPESTAT_INT_STATUS_MASK 0x0000ffff -#define PIPE_A_OFFSET 0x70000 -#define PIPE_B_OFFSET 0x71000 -#define PIPE_C_OFFSET 0x72000 -#define PIPE_D_OFFSET 0x73000 -#define CHV_PIPE_C_OFFSET 0x74000 -/* -* There's actually no pipe EDP. Some pipe registers have -* simply shifted from the pipe to the transcoder, while -* keeping their original offset. Thus we need PIPE_EDP_OFFSET -* to access such registers in transcoder EDP. -*/ -#define PIPE_EDP_OFFSET 0x7f000 - -/* ICL DSI 0 and 1 */ -#define PIPE_DSI0_OFFSET 0x7b000 -#define PIPE_DSI1_OFFSET 0x7b800 -#define TRANSCONF (trans) _MMIO_PIPE2((trans), _TRANSACONF)#define PIPEDSL (pipe) _MMIO_PIPE2(pipe, _PIPEADSL)#define PIPEFRAME (pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEHIGH)
@@ -3091,13 +3065,6 @@#define CUR_CHICKEN (pipe) _MMIO_CURSOR2(pipe, _CUR_CHICKEN_A)#define CURSURFLIVE (pipe) _MMIO_CURSOR2(pipe, _CURASURFLIVE) -#define CURSOR_A_OFFSET 0x70080 -#define CURSOR_B_OFFSET 0x700c0 -#define CHV_CURSOR_C_OFFSET 0x700e0 -#define IVB_CURSOR_B_OFFSET 0x71080 -#define IVB_CURSOR_C_OFFSET 0x72080 -#define TGL_CURSOR_D_OFFSET 0x73080 -/* Display A control */ #define _DSPAADDR_VLV 0x7017C/* vlv/chv */ #define _DSPACNTR 0x70180
drivers/gpu/drm/i915/intel_device_info.c +6 -4
@@ -574,7 +574,6 @@ void intel_device_info_driver_create(struct drm_i915_private *i915, {struct intel_device_info *info;struct intel_runtime_info *runtime; -struct intel_display_runtime_info *display_runtime;/* Setup the write-once "constant" device info */ info =mkwrite_device_info (i915);
@@ -583,9 +582,12 @@ void intel_device_info_driver_create(struct drm_i915_private *i915,/* Initialize initial runtime info from static const data and pdev. */ runtime =RUNTIME_INFO (i915);memcpy (runtime, &INTEL_INFO (i915)->__runtime,sizeof (*runtime)); - display_runtime =DISPLAY_RUNTIME_INFO (i915); -memcpy (display_runtime, &DISPLAY_INFO (i915)->__runtime_defaults, -sizeof (*display_runtime)); + +/* Probe display support */ + info->display =intel_display_device_probe (device_id); +memcpy (DISPLAY_RUNTIME_INFO (i915), + &DISPLAY_INFO (i915)->__runtime_defaults, +sizeof (*DISPLAY_RUNTIME_INFO (i915))); runtime->device_id = device_id; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 352/800 drm/i915: No 10bit gamma on desktop gen3 parts
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit 19db2062094c75c64039d820c2547aad4dcfd905 ]
Apparently desktop gen3 parts don't support the
10bit gamma mode at all. Stop claiming otherwise.
As is the case with pipe A on gen3 mobile parts, the PIPECONF gamma mode bit can be set but it has no effect on the output.
PNV seems to be the only slight exception, but generally the desktop PNV variant looks more like a mobile part so this is not entirely surprising.
--- .../gpu/drm/i915/display/intel_display_device.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display_device.c +13 -3
@@ -216,7 +216,6 @@ static const struct intel_display_device_info i865g_display = { .has_overlay = 1, \I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ -I9XX_COLORS , \ \ .__runtime_defaults.ip.ver = 3, \ .__runtime_defaults.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B), \
@@ -225,12 +224,14 @@ static const struct intel_display_device_info i865g_display = {static const struct intel_display_device_info i915g_display = {GEN3_DISPLAY , +I845_COLORS , .cursor_needs_physical =1 , .overlay_needs_physical =1 , };static const struct intel_display_device_info i915gm_display = {GEN3_DISPLAY , +I9XX_COLORS , .cursor_needs_physical =1 , .overlay_needs_physical =1 , .supports_tv =1 ,
@@ -240,6 +241,7 @@ static const struct intel_display_device_info i915gm_display = {static const struct intel_display_device_info i945g_display = {GEN3_DISPLAY , +I845_COLORS , .has_hotplug =1 , .cursor_needs_physical =1 , .overlay_needs_physical =1 ,
@@ -247,6 +249,7 @@ static const struct intel_display_device_info i945g_display = {static const struct intel_display_device_info i945gm_display = {GEN3_DISPLAY , +I9XX_COLORS , .has_hotplug =1 , .cursor_needs_physical =1 , .overlay_needs_physical =1 ,
@@ -257,6 +260,13 @@ static const struct intel_display_device_info i945gm_display = {static const struct intel_display_device_info g33_display = {GEN3_DISPLAY , +I845_COLORS , + .has_hotplug =1 , +}; + +static const struct intel_display_device_info pnv_display = { +GEN3_DISPLAY , +I9XX_COLORS , .has_hotplug =1 , };
@@ -669,8 +679,8 @@ static const struct {INTEL_I965GM_IDS (&i965gm_display),INTEL_GM45_IDS (&gm45_display),INTEL_G45_IDS (&g45_display), -INTEL_PINEVIEW_G_IDS (&g33_display), -INTEL_PINEVIEW_M_IDS (&g33_display), +INTEL_PINEVIEW_G_IDS (&pnv_display), +INTEL_PINEVIEW_M_IDS (&pnv_display),INTEL_IRONLAKE_D_IDS (&ilk_d_display),INTEL_IRONLAKE_M_IDS (&ilk_m_display), INTEL_SNB_D_IDS(&snb_display),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 353/800 arm64: dts: rockchip: Assign ES8316 MCLK rate on rk3588-rock-5b
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 28ee08cef4f838c343013330a3cd12674c4dd113 ]
The I2S0_8CH_MCLKOUT clock rate on Rock 5B board defaults to 12 MHz and it is used to provide the master clock (MCLK) for the ES8316 audio codec.
On sound card initialization, this limits the allowed sample rates according to the MCLK/LRCK ratios supported by the codec, which results in the following non-standard rates: 15625, 30000, 31250, 46875.
Hence, the very first access of the sound card fails:
Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
However, all subsequent attempts will succeed, as the audio graph card will request a correct clock frequency, based on the stream sample rate and the multiplication factor.
Assign MCLK to 12.288 MHz, which allows the codec to advertise most of the standard sample rates.
--- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +2 -0
@@ -133,6 +133,8 @@ es8316: audio-codec@11 { reg = <0x11>; clocks = <&cru I2S0_8CH_MCLKOUT>; clock-names = "mclk"; + assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clock-rates = <12288000>; #sound-dai-cells = <0>; port {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 354/800 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
@@ -83,25 +83,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 355/800 Input: pm8941-powerkey - fix debounce on gen2+ PMICs
In reply to Greg Kroah-HartmanFrom: Caleb Connolly <[email protected]>
[ Upstream commit 8c9cce9cb81b5fdc6e66bf3f129727b89e8daab7 ]
Since PM8998/PM660, the power key debounce register was redefined to support shorter debounce times. On PM8941 the shortest debounce time (represented by register value 0) was 15625us, on PM8998 the shortest debounce time is 62us, with the default being 2ms.
Adjust the bit shift to correctly program debounce on PM8998 and newer.
--- drivers/input/misc/pm8941-pwrkey.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/input/misc/pm8941-pwrkey.c +15 -4
@@ -50,7 +50,10 @@#define PON_RESIN_PULL_UP BIT(0)#define PON_DBC_CTL 0x71 -#define PON_DBC_DELAY_MASK 0x7 +#define PON_DBC_DELAY_MASK_GEN1 0x7 +#define PON_DBC_DELAY_MASK_GEN2 0xf +#define PON_DBC_SHIFT_GEN1 6 +#define PON_DBC_SHIFT_GEN2 14struct pm8941_data {unsigned int pull_up_bit;
@@ -247,7 +250,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev)struct device *parent;struct device_node *regmap_node;const __be32 *addr; -u32 req_delay; +u32 req_delay, mask, delay_shift;int error;if (of_property_read_u32 (pdev->dev.of_node,"debounce" , &req_delay))
@@ -336,12 +339,20 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) pwrkey->input->phys = pwrkey->data->phys;if (pwrkey->data->supports_debounce_config) { - req_delay = (req_delay <<6 ) /USEC_PER_SEC ; +if (pwrkey->subtype >=PON_SUBTYPE_GEN2_PRIMARY ) { + mask =PON_DBC_DELAY_MASK_GEN2 ; + delay_shift =PON_DBC_SHIFT_GEN2 ; + }else { + mask =PON_DBC_DELAY_MASK_GEN1 ; + delay_shift =PON_DBC_SHIFT_GEN1 ; + } + + req_delay = (req_delay << delay_shift) /USEC_PER_SEC ; req_delay =ilog2 (req_delay); error =regmap_update_bits (pwrkey->regmap, pwrkey->baseaddr +PON_DBC_CTL , -PON_DBC_DELAY_MASK , + mask, req_delay);if (error) { dev_err(&pdev->dev, "failed to set debounce: %d\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 356/800 arm64: dts: rockchip: Fix compatible for Bluetooth on rk3566-anbernic
In reply to Greg Kroah-HartmanFrom: Chris Morgan <[email protected]>
[ Upstream commit a325956fa7048906e26a4535ac2e87e111788fe8 ]
The realtek Bluetooth module uses the same driver as the realtek,rtl8822cs-bt and the realtek,rtl8723bs-bt, however by selecting the 8723bs advanced power saving features are disabled that appear to interfere with normal operation of the bluetooth module. This change switches the compatible string to disable power saving. Without this patch evtest of a paired bluetooth controller fails, with this patch the controller operates as expected.
--- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi +1 -1
@@ -716,7 +716,7 @@ &uart1 { status = "okay"; bluetooth { - compatible = "realtek,rtl8821cs-bt", "realtek,rtl8822cs-bt"; + compatible = "realtek,rtl8821cs-bt", "realtek,rtl8723bs-bt"; device-wake-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>; host-wake-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 357/800 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 358/800 accel/habanalabs: fix gaudi2_get_tpc_idle_status() return
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 9ec7639b5e124f273db20555cc38bd40057157b3 ]
The gaudi2_get_tpc_idle_status() function returned the incorrect variable so it always returned true.
--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accel/habanalabs/gaudi2/gaudi2.c +1 -1
@@ -7231,7 +7231,7 @@ static bool gaudi2_get_tpc_idle_status(struct hl_device *hdev, u64 *mask_arr, u8gaudi2_iterate_tpcs (hdev, &tpc_iter); -return tpc_idle_data.is_idle; +return *tpc_idle_data.is_idle; } static bool gaudi2_get_decoder_idle_status(struct hl_device *hdev, u64 *mask_arr, u8 mask_len,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 359/800 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
@@ -435,7 +435,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 360/800 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 361/800 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 362/800 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
@@ -187,7 +187,7 @@ port@5 { fixed-link { speed = <1000>; - duplex-full; + full-duplex; }; }; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 363/800 clk: Export clk_hw_forward_rate_request()
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit ed046ac74da0b5602566073023a1519b5ae657b7 ]
Commit 262ca38f4b6e ("clk: Stop forwarding clk_rate_requests to the parent") introduced the public clk_hw_forward_rate_request() function, but didn't export the symbol. Make sure it's the case.
--- drivers/clk/clk.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk.c +1 -0
@@ -1549,6 +1549,7 @@ void clk_hw_forward_rate_request(const struct clk_hw *hw, parent->core, req, parent_rate); } +EXPORT_SYMBOL_GPL (clk_hw_forward_rate_request);static bool clk_core_can_round (struct clk_core *const core) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 364/800 MIPS: DTS: CI20: Fix ACT8600 regulator node names
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 08384e80a70fb1942510ab5f0ce27bad134e634e ]
The Device Tree was using invalid node names for the ACT8600 regulators. To be fair, it is not the original committer's fault, as the documentation did gives invalid names as well.
In theory, the fix should have been to modify the driver to accept the alternative names. However, even though the act8865 driver spits warnings, the kernel seemed to work fine with what is currently supported upstream. For that reason, I think it is okay to just update the DTS.
I removed the "regulator-name" too, since they really didn't bring any information. The node names are enough.
--- arch/mips/boot/dts/ingenic/ci20.dts | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +8 -19
@@ -237,59 +237,49 @@ &i2c0 { act8600: act8600@5a { compatible = "active-semi,act8600"; reg = <0x5a>; - status = "okay"; regulators { - vddcore: SUDCDC1 { - regulator-name = "DCDC_REG1"; + vddcore: DCDC1 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; regulator-always-on; }; - vddmem: SUDCDC2 { - regulator-name = "DCDC_REG2"; + vddmem: DCDC2 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; - vcc_33: SUDCDC3 { - regulator-name = "DCDC_REG3"; + vcc_33: DCDC3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - vcc_50: SUDCDC4 { - regulator-name = "SUDCDC_REG4"; + vcc_50: SUDCDC_REG4 { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - vcc_25: LDO_REG5 { - regulator-name = "LDO_REG5"; + vcc_25: LDO5 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - wifi_io: LDO_REG6 { - regulator-name = "LDO_REG6"; + wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - vcc_28: LDO_REG7 { - regulator-name = "LDO_REG7"; + cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; regulator-always-on; }; - vcc_15: LDO_REG8 { - regulator-name = "LDO_REG8"; + cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; regulator-always-on; }; vrtc_18: LDO_REG9 { - regulator-name = "LDO_REG9"; /* Despite the datasheet stating 3.3V * for REG9 and the driver expecting that, * REG9 outputs 1.8V.
@@ -303,7 +293,6 @@ vrtc_18: LDO_REG9 { regulator-always-on; }; vcc_11: LDO_REG10 { - regulator-name = "LDO_REG10"; regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1200000>; regulator-always-on;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 365/800 drm/amd/display: Fix a test CalculatePrefetchSchedule()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 960e27a5741cd3001996ff6ddfb3eb0ed3a4909d ]
It is likely Height was expected here, instead of Width.
Test the correct variable.
--- drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +1 -1
@@ -810,7 +810,7 @@ static bool CalculatePrefetchSchedule( *swath_width_chroma_ub =dml_ceil (SwathWidthY /2 -1 , myPipe->BlockWidth256BytesC) + myPipe->BlockWidth256BytesC; }else { *swath_width_luma_ub =dml_ceil (SwathWidthY -1 , myPipe->BlockHeight256BytesY) + myPipe->BlockHeight256BytesY; -if (myPipe->BlockWidth256BytesC >0 ) +if (myPipe->BlockHeight256BytesC >0 ) *swath_width_chroma_ub =dml_ceil (SwathWidthY /2 -1 , myPipe->BlockHeight256BytesC) + myPipe->BlockHeight256BytesC; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 366/800 drm/amd/display: Fix a test dml32_rq_dlg_get_rq_reg()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit bafc31166aa7df5fa26ae0ad8196d1717e6cdea9 ]
It is likely p1_min_meta_chunk_bytes was expected here, instead of min_meta_chunk_bytes.
Test the correct variable.
--- .../gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_rq_dlg_calc_32.c +1 -1
@@ -116,7 +116,7 @@ void dml32_rq_dlg_get_rq_reg(display_rq_regs_st *rq_regs,else rq_regs->rq_regs_l.min_meta_chunk_size =dml_log2 (min_meta_chunk_bytes) -6 +1 ; -if (min_meta_chunk_bytes ==0 ) +if (p1_min_meta_chunk_bytes ==0 ) rq_regs->rq_regs_c.min_meta_chunk_size =0 ;else rq_regs->rq_regs_c.min_meta_chunk_size =dml_log2 (p1_min_meta_chunk_bytes) -6 +1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 367/800 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
@@ -115,18 +115,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 368/800 soc: mediatek: SVS: Fix MT8192 GPU node name
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 95094495401bdf6a0649d220dfd095e6079b5e39 ]
Device tree node names should be generic. The planned device node name for the GPU, according to the bindings and posted DT changes, is "gpu", not "mali".
Fix the GPU node name in the SVS driver to follow.
--- drivers/soc/mediatek/mtk-svs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-svs.c +2 -2
@@ -2061,9 +2061,9 @@ static int svs_mt8192_platform_probe(struct svs_platform *svsp) svsb = &svsp->banks[idx];if (svsb->type ==SVSB_HIGH ) - svsb->opp_dev =svs_add_device_link (svsp,"mali" ); + svsb->opp_dev =svs_add_device_link (svsp,"gpu" );else if (svsb->type ==SVSB_LOW ) - svsb->opp_dev =svs_get_subsys_device (svsp,"mali" ); + svsb->opp_dev =svs_get_subsys_device (svsp,"gpu" );if (IS_ERR (svsb->opp_dev)) return dev_err_probe(svsp->dev, PTR_ERR(svsb->opp_dev),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 369/800 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
@@ -9259,6 +9259,8 @@ static int dm_update_crtc_state(struct a/* 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;
Greg Kroah-Hartman
maintainerPATCH 370/800 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 371/800 HID: uclogic: Modular KUnit tests should not depend on KUNIT=y
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 49904a0ebf23b15aad288a10f5354e7cd8193121 ]
While KUnit tests that cannot be built as a loadable module must depend on "KUNIT=y", this is not true for modular tests, where it adds an unnecessary limitation.
Fix this by relaxing the dependency to "KUNIT".
--- drivers/hid/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/Kconfig +1 -1
@@ -1285,7 +1285,7 @@ config HID_MCP2221 config HID_KUNIT_TEST tristate "KUnit tests for HID" if !KUNIT_ALL_TESTS - depends on KUNIT=y + depends on KUNIT depends on HID_BATTERY_STRENGTH depends on HID_UCLOGIC default KUNIT_ALL_TESTS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 372/800 RDMA/rxe: Fix access checks in rxe_check_bind_mw
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 425e1c9018fdf25cb4531606cc92d9d01a55534f ]
The subroutine rxe_check_bind_mw() in rxe_mw.c performs checks on the mw access flags before they are set so they always succeed. This patch instead checks the access flags passed in the send wqe.
--- drivers/infiniband/sw/rxe/rxe_mw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/infiniband/sw/rxe/rxe_mw.c +9 -8
@@ -48,7 +48,7 @@ int rxe_dealloc_mw(struct ib_mw *ibmw) }static int rxe_check_bind_mw (struct rxe_qp *qp,struct rxe_send_wqe *wqe, -struct rxe_mw *mw,struct rxe_mr *mr) +struct rxe_mw *mw,struct rxe_mr *mr,int access) {if (mw->ibmw.type ==IB_MW_TYPE_1 ) {if (unlikely (mw->state !=RXE_MW_STATE_VALID )) {
@@ -58,7 +58,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe, }/* o10-36.2.2 */ -if (unlikely ((mw->access &IB_ZERO_BASED ))) { +if (unlikely ((access &IB_ZERO_BASED ))) {rxe_dbg_mw (mw,"attempt to bind a zero based type 1 MW\n" );return -EINVAL ; }
@@ -104,7 +104,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe, }/* C10-74 */ -if (unlikely ((mw->access & +if (unlikely ((access & (IB_ACCESS_REMOTE_WRITE |IB_ACCESS_REMOTE_ATOMIC )) && !(mr->access &IB_ACCESS_LOCAL_WRITE ))) { rxe_dbg_mw(mw,
@@ -113,7 +113,7 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe, }/* C10-75 */ -if (mw->access &IB_ZERO_BASED ) { +if (access &IB_ZERO_BASED ) {if (unlikely (wqe->wr.wr.mw.length > mr->ibmr.length)) {rxe_dbg_mw (mw,"attempt to bind a ZB MW outside of the MR\n" );
@@ -133,12 +133,12 @@ static int rxe_check_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe, }static void rxe_do_bind_mw (struct rxe_qp *qp,struct rxe_send_wqe *wqe, -struct rxe_mw *mw,struct rxe_mr *mr) +struct rxe_mw *mw,struct rxe_mr *mr,int access) {u32 key = wqe->wr.wr.mw.rkey &0xff ; mw->rkey = (mw->rkey & ~0xff ) | key; - mw->access = wqe->wr.wr.mw.access; + mw->access = access; mw->state =RXE_MW_STATE_VALID ; mw->addr = wqe->wr.wr.mw.addr; mw->length = wqe->wr.wr.mw.length;
@@ -169,6 +169,7 @@ int rxe_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe)struct rxe_dev *rxe =to_rdev (qp->ibqp.device);u32 mw_rkey = wqe->wr.wr.mw.mw_rkey;u32 mr_lkey = wqe->wr.wr.mw.mr_lkey; +int access = wqe->wr.wr.mw.access; mw =rxe_pool_get_index (&rxe->mw_pool, mw_rkey >>8 );if (unlikely (!mw)) {
@@ -198,11 +199,11 @@ int rxe_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe)spin_lock_bh (&mw->lock); - ret =rxe_check_bind_mw (qp, wqe, mw, mr); + ret =rxe_check_bind_mw (qp, wqe, mw, mr, access);if (ret) goto err_unlock; -rxe_do_bind_mw (qp, wqe, mw, mr); +rxe_do_bind_mw (qp, wqe, mw, mr, access); err_unlock:spin_unlock_bh (&mw->lock); err_drop_mr:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 373/800 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
@@ -1433,14 +1433,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 ;
@@ -1499,14 +1499,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 374/800 drm/msm/a6xx: dont set IO_PGTABLE_QUIRK_ARM_OUTER_WBWA with coherent SMMU
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 38e27a6fbf2206b18417c5985dbcdeca0f2026b8 ]
If the Adreno SMMU is dma-coherent, allocation will fail unless we disable IO_PGTABLE_QUIRK_ARM_OUTER_WBWA. Skip setting this quirk for the coherent SMMUs (like we have on sm8350 platform).
Patchwork: https://patchwork.freedesktop.org/patch/531562/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -1
@@ -1744,7 +1744,8 @@ a6xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev)* This allows GPU to set the bus attributes required to use system * cache on behalf of the iommu page table walker. */ -if (!IS_ERR_OR_NULL (a6xx_gpu->htw_llc_slice)) +if (!IS_ERR_OR_NULL (a6xx_gpu->htw_llc_slice) && + !device_iommu_capable (&pdev->dev,IOMMU_CAP_CACHE_COHERENCY )) quirks |=IO_PGTABLE_QUIRK_ARM_OUTER_WBWA ;return adreno_iommu_create_address_space (gpu, pdev, quirks);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 375/800 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
@@ -1743,6 +1743,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;
@@ -1769,7 +1770,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 376/800 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
@@ -180,7 +180,7 @@ static int __send_message(struct bnxt_qplib_rcfw *rcfw, }while (bsize >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 377/800 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
@@ -295,7 +295,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;
@@ -304,6 +305,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 ;
@@ -363,9 +365,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; }
@@ -379,6 +382,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);
@@ -397,7 +401,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 :
@@ -425,6 +430,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 378/800 clk: imx: composite-8m: Add imx8m_divider_determine_rate
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 8208181fe536bba3b411508f81c4426fc9c71d9a ]
Currently, certain clocks are derrived as a divider from their parent clock. For some clocks, even when CLK_SET_RATE_PARENT is set, the parent clock is not properly set which can lead to some relatively inaccurate clock values.
Unlike imx/clk-composite-93 and imx/clk-divider-gate, it cannot rely on calling a standard determine_rate function, because the 8m composite clocks have a pre-divider and post-divider. Because of this, a custom determine_rate function is necessary to determine the maximum clock division which is equivalent to pre-divider * the post-divider.
With this added, the system can attempt to adjust the parent rate when the proper flags are set which can lead to a more precise clock value.
On the imx8mplus, no clock changes are present.
On the Mini and Nano, this can help achieve more accurate lcdif clocks. When trying to get a pixel clock of 31.500MHz on an imx8m Nano, the clocks divided the 594MHz down, but left the parent rate untouched which caused a calulation error.
Before:
video_pll 594000000
video_pll_bypass 594000000
video_pll_out 594000000
disp_pixel 31263158
disp_pixel_clk 31263158Variance = -236842 Hz
After this patch:
video_pll 31500000
video_pll_bypass 31500000
video_pll_out 31500000
disp_pixel 31500000
disp_pixel_clk 31500000Variance = 0 Hz
All other clocks rates and parent were the same.
Similar results on imx8mm were found.
--- drivers/clk/imx/clk-composite-8m.c | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/clk/imx/clk-composite-8m.c +31 -0
@@ -119,10 +119,41 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,return ret; } +static int imx8m_divider_determine_rate (struct clk_hw *hw, +struct clk_rate_request *req) +{ +struct clk_divider *divider =to_clk_divider (hw); +int prediv_value; +int div_value; + +/* if read only, just return current value */ +if (divider->flags &CLK_DIVIDER_READ_ONLY ) { +u32 val; + + val =readl (divider->reg); + prediv_value = val >> divider->shift; + prediv_value &=clk_div_mask (divider->width); + prediv_value++; + + div_value = val >>PCG_DIV_SHIFT ; + div_value &=clk_div_mask (PCG_DIV_WIDTH ); + div_value++; + +return divider_ro_determine_rate (hw, req, divider->table, +PCG_PREDIV_WIDTH +PCG_DIV_WIDTH , + divider->flags, prediv_value * div_value); + } + +return divider_determine_rate (hw, req, divider->table, +PCG_PREDIV_WIDTH +PCG_DIV_WIDTH , + divider->flags); +} +static const struct clk_ops imx8m_clk_composite_divider_ops = { .recalc_rate = imx8m_clk_composite_divider_recalc_rate, .round_rate = imx8m_clk_composite_divider_round_rate, .set_rate = imx8m_clk_composite_divider_set_rate, + .determine_rate = imx8m_divider_determine_rate, };static u8 imx8m_clk_composite_mux_get_parent (struct clk_hw *hw)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 379/800 clk: imx: clk-imxrt1050: fix memory leak in imxrt1050_clocks_probe
In reply to Greg Kroah-HartmanFrom: Kai Ma <[email protected]>
[ Upstream commit 1b280598ab3bd8a2dc8b96a12530d5b1ee7a8f4a ]
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().
Also, fix error handling of hws by adding unregister_hws label, which unregisters remaining hws when iomap failed.
--- drivers/clk/imx/clk-imxrt1050.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/clk/imx/clk-imxrt1050.c +15 -7
@@ -42,7 +42,7 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)struct device_node *anp;int ret; - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws, + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMXRT1050_CLK_END ),GFP_KERNEL );if (WARN_ON (!clk_hw_data))return -ENOMEM ;
@@ -53,10 +53,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) hws[IMXRT1050_CLK_OSC ] =imx_get_clk_hw_by_name (np,"osc" ); anp =of_find_compatible_node (NULL ,NULL ,"fsl,imxrt-anatop" ); - pll_base =of_iomap (anp,0 ); + pll_base =devm_of_iomap (dev, anp,0 ,NULL );of_node_put (anp); -if (WARN_ON (!pll_base)) -return -ENOMEM ; +if (WARN_ON (IS_ERR (pll_base))) { + ret =PTR_ERR (pll_base); + goto unregister_hws; + }/* Anatop clocks */ hws[IMXRT1050_CLK_DUMMY ] =imx_clk_hw_fixed ("dummy" ,0UL );
@@ -104,8 +106,10 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev)/* CCM clocks */ ccm_base =devm_platform_ioremap_resource (pdev,0 ); -if (WARN_ON (IS_ERR (ccm_base))) -return PTR_ERR (ccm_base); +if (WARN_ON (IS_ERR (ccm_base))) { + ret =PTR_ERR (ccm_base); + goto unregister_hws; + } hws[IMXRT1050_CLK_ARM_PODF ] =imx_clk_hw_divider ("arm_podf" ,"pll1_arm" , ccm_base +0x10 ,0 ,3 ); hws[IMXRT1050_CLK_PRE_PERIPH_SEL] = imx_clk_hw_mux("pre_periph_sel", ccm_base + 0x18, 18, 2,
@@ -149,8 +153,12 @@ static int imxrt1050_clocks_probe(struct platform_device *pdev) ret =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, clk_hw_data);if (ret <0 ) {dev_err (dev,"Failed to register clks for i.MXRT1050.\n" ); -imx_unregister_hw_clocks (hws,IMXRT1050_CLK_END ); + goto unregister_hws; } +return 0 ; + +unregister_hws: +imx_unregister_hw_clocks (hws,IMXRT1050_CLK_END );return ret; }static const struct of_device_id imxrt1050_clk_of_match[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 380/800 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
@@ -323,7 +323,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 ;
@@ -340,10 +340,10 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_CLK_EXT4 ] =imx_get_clk_hw_by_name (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 381/800 clk: imx93: fix memory leak and missing unwind goto in imx93_clocks_probe
In reply to Greg Kroah-HartmanFrom: Zhanhao Hu <[email protected]>
[ Upstream commit e02ba11b457647050cb16e7cad16cec3c252fade ]
In function probe(), it returns directly without unregistered hws when error occurs.
Fix this by adding 'goto unregister_hws;' on line 295 and line 310.
Use devm_kzalloc() instead of kzalloc() to automatically free the memory using devm_kfree() when error occurs.
Replace of_iomap() with devm_of_iomap() to automatically handle the unused ioremap region and delete 'iounmap(anatop_base);' in unregister_hws.
--- drivers/clk/imx/clk-imx93.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/clk/imx/clk-imx93.c +8 -7
@@ -264,7 +264,7 @@ static int imx93_clocks_probe(struct platform_device *pdev)void __iomem *base, *anatop_base;int i, ret; - clk_hw_data =kzalloc (struct_size (clk_hw_data, hws, + clk_hw_data =devm_kzalloc (dev,struct_size (clk_hw_data, hws,IMX93_CLK_END ),GFP_KERNEL );if (!clk_hw_data)return -ENOMEM ;
@@ -288,10 +288,12 @@ static int imx93_clocks_probe(struct platform_device *pdev) "sys_pll_pfd2", 1, 2); np =of_find_compatible_node (NULL ,NULL ,"fsl,imx93-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))) { + ret =PTR_ERR (base); + goto unregister_hws; + } clks[IMX93_CLK_ARM_PLL] = imx_clk_fracn_gppll_integer("arm_pll", "osc_24m", anatop_base + 0x1000,
@@ -304,8 +306,8 @@ static int imx93_clocks_probe(struct platform_device *pdev) np = dev->of_node; base =devm_platform_ioremap_resource (pdev,0 );if (WARN_ON (IS_ERR (base))) { -iounmap (anatop_base); -return PTR_ERR (base); + ret =PTR_ERR (base); + goto unregister_hws; }for (i =0 ; i <ARRAY_SIZE (root_array); i++) {
@@ -345,7 +347,6 @@ static int imx93_clocks_probe(struct platform_device *pdev) unregister_hws:imx_unregister_hw_clocks (clks,IMX93_CLK_END ); -iounmap (anatop_base);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 382/800 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
@@ -414,25 +414,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;
@@ -722,7 +719,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 ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 383/800 clk: mediatek: fix of_iomap memory leak
In reply to Greg Kroah-HartmanFrom: Bosi Zhang <[email protected]>
[ Upstream commit 3db7285e044144fd88a356f5b641b9cd4b231a77 ]
Smatch reports:drivers/clk/mediatek/clk-mtk.c:583 mtk_clk_simple_probe() warn:
'base' from of_iomap() not released on lines: 496.
This problem was also found in linux-next. In mtk_clk_simple_probe(), base is not released when handling errors
if clk_data is not existed, which may cause a leak.
So free_base should be added here to release base.
--- drivers/clk/mediatek/clk-mtk.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-mtk.c +5 -2
@@ -500,8 +500,10 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, num_clks += mcd->num_mux_clks + mcd->num_divider_clks; clk_data =mtk_alloc_clk_data (num_clks); -if (!clk_data) -return -ENOMEM ; +if (!clk_data) { + r = -ENOMEM ; + goto free_base; + }if (mcd->fixed_clks) { r = mtk_clk_register_fixed_clks(mcd->fixed_clks,
@@ -599,6 +601,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, mcd->num_fixed_clks, clk_data); free_data:mtk_free_clk_data (clk_data); +free_base:if (mcd->shared_io && base)iounmap (base);return r;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 384/800 arm64: dts: qcom: qdu1000: Flush RSC sleep & wake votes
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit ab033e7846f91953244d0626b28ce66412b813b3 ]
The rpmh driver will cache sleep and wake votes until the cluster power-domain is about to enter idle, to avoid unnecessary writes. So associate the apps_rsc with the cluster pd, so that it can be notified about this event.
Without this, only AMC votes are being commited.
--- arch/arm64/boot/dts/qcom/qdu1000.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/qdu1000.dtsi +1 -0
@@ -1252,6 +1252,7 @@ apps_rsc: rsc@17a00000 { qcom,tcs-config = <ACTIVE_TCS 2>, <SLEEP_TCS 3>, <WAKE_TCS 3>, <CONTROL_TCS 0>; label = "apps_rsc"; + power-domains = <&CLUSTER_PD>; apps_bcm_voter: bcm-voter { compatible = "qcom,bcm-voter";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 385/800 arm64: dts: qcom: sdm670: Flush RSC sleep & wake votes
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 7b04cbd81b0e60c5151a310e7b730dc4a951a211 ]
The rpmh driver will cache sleep and wake votes until the cluster power-domain is about to enter idle, to avoid unnecessary writes. So associate the apps_rsc with the cluster pd, so that it can be notified about this event.
Without this, only AMC votes are being commited.
--- arch/arm64/boot/dts/qcom/sdm670.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm670.dtsi +1 -0
@@ -1282,6 +1282,7 @@ apps_rsc: rsc@179c0000 { <SLEEP_TCS 3>, <WAKE_TCS 3>, <CONTROL_TCS 1>; + power-domains = <&CLUSTER_PD>; apps_bcm_voter: bcm-voter { compatible = "qcom,bcm-voter";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 386/800 arm64: dts: qcom: sdm845: Flush RSC sleep & wake votes
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 91e83140b5dd5598fbcfada3ee1f8b2b410c3731 ]
The rpmh driver will cache sleep and wake votes until the cluster power-domain is about to enter idle, to avoid unnecessary writes. So associate the apps_rsc with the cluster pd, so that it can be notified about this event.
Without this, only AMC votes are being commited.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -0
@@ -5137,6 +5137,7 @@ apps_rsc: rsc@179c0000 { <SLEEP_TCS 3>, <WAKE_TCS 3>, <CONTROL_TCS 1>; + power-domains = <&CLUSTER_PD>; apps_bcm_voter: bcm-voter { compatible = "qcom,bcm-voter";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 387/800 arm64: dts: qcom: sm8550: Flush RSC sleep & wake votes
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 4b2c7ac8e469ab7f92e50c34ad4012a77e79d078 ]
The rpmh driver will cache sleep and wake votes until the cluster power-domain is about to enter idle, to avoid unnecessary writes. So associate the apps_rsc with the cluster pd, so that it can be notified about this event.
Without this, only AMC votes are being commited.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sm8550.dtsi +1 -0
@@ -3597,6 +3597,7 @@ apps_rsc: rsc@17a00000 { qcom,drv-id = <2>; qcom,tcs-config = <ACTIVE_TCS 3>, <SLEEP_TCS 2>, <WAKE_TCS 2>, <CONTROL_TCS 0>; + power-domains = <&CLUSTER_PD>; apps_bcm_voter: bcm-voter { compatible = "qcom,bcm-voter";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 388/800 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 389/800 arm64: dts: qcom: sm8550: Add missing interconnect path to USB HC
In reply to Greg Kroah-HartmanFrom: Abel Vesa <[email protected]>
[ Upstream commit 11a1397bbf69e408223bb691858a0fcd295a8f76 ]
The USB HC node is missing the interconnect paths, so add them.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sm8550.dtsi +4 -0
@@ -2769,6 +2769,10 @@ usb_1: usb@a6f8800 { resets = <&gcc GCC_USB30_PRIM_BCR>; + interconnects = <&aggre1_noc MASTER_USB3_0 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>; + interconnect-names = "usb-ddr", "apps-usb"; + status = "disabled"; usb_1_dwc3: usb@a600000 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 390/800 clk: bcm: rpi: Fix off by one in raspberrypi_discover_clocks()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit da2edb3e3c09fd1451b7f400ccd1070ef086619a ]
Smatch detected an off by one in this code:
drivers/clk/bcm/clk-raspberrypi.c:374 raspberrypi_discover_clocks()
error: buffer overflow 'data->hws' 16 <= 16The data->hws[] array has RPI_FIRMWARE_NUM_CLK_ID elements so the > comparison needs to changed to >=.
--- drivers/clk/bcm/clk-raspberrypi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/bcm/clk-raspberrypi.c +2 -2
@@ -356,9 +356,9 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,while (clks->id) {struct raspberrypi_clk_variant *variant; -if (clks->id >RPI_FIRMWARE_NUM_CLK_ID ) { +if (clks->id >=RPI_FIRMWARE_NUM_CLK_ID ) {dev_err (rpi->dev,"Unknown clock id: %u (max: %u)\n" , - clks->id,RPI_FIRMWARE_NUM_CLK_ID ); + clks->id,RPI_FIRMWARE_NUM_CLK_ID -1 );return -EINVAL ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 391/800 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/clk/xilinx/clk-xlnx-clock-wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/xilinx/clk-xlnx-clock-wizard.c +1 -1
@@ -525,7 +525,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 392/800 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 393/800 arm64: dts: ti: k3-j721e-beagleboneai64: Fix mailbox node status
In reply to Greg Kroah-HartmanFrom: Andrew Davis <[email protected]>
[ Upstream commit 155e7635ed1f3814d94d12556a3a0fed41d05b76 ]
Mailbox nodes are now disabled by default. The BeagleBoard AI64 DT addition went in at around the same time and must have missed that change so the mailboxes are not re-enabled. Do that here.
--- arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts +5 -0
@@ -936,6 +936,7 @@ &ufs_wrapper { }; &mailbox0_cluster0 { + status = "okay"; interrupts = <436>; mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
@@ -950,6 +951,7 @@ mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 { }; &mailbox0_cluster1 { + status = "okay"; interrupts = <432>; mbox_main_r5fss0_core0: mbox-main-r5fss0-core0 {
@@ -964,6 +966,7 @@ mbox_main_r5fss0_core1: mbox-main-r5fss0-core1 { }; &mailbox0_cluster2 { + status = "okay"; interrupts = <428>; mbox_main_r5fss1_core0: mbox-main-r5fss1-core0 {
@@ -978,6 +981,7 @@ mbox_main_r5fss1_core1: mbox-main-r5fss1-core1 { }; &mailbox0_cluster3 { + status = "okay"; interrupts = <424>; mbox_c66_0: mbox-c66-0 {
@@ -992,6 +996,7 @@ mbox_c66_1: mbox-c66-1 { }; &mailbox0_cluster4 { + status = "okay"; interrupts = <420>; mbox_c71_0: mbox-c71-0 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 394/800 arm64: dts: ti: k3-j784s4-evm: Fix main_i2c0 alias
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit c10a9df30e3401bd5a5ee43f1afd6c2b2ca75ad7 ]
main_i2c0 is aliased as i2c0 which creates a problem for u-boot R5 SPL attempting to reuse the same definition in the common board detection logic as it looks for the first i2c instance as the bus on which to detect the eeprom to understand the board variant involved. Switch main_i2c0 to i2c3 alias allowing us to introduce wkup_i2c0 and potentially space for mcu_i2c instances in the gap for follow on patches.
--- arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +1 -1
@@ -23,7 +23,7 @@ aliases { serial2 = &main_uart8; mmc0 = &main_sdhci0; mmc1 = &main_sdhci1; - i2c0 = &main_i2c0; + i2c3 = &main_i2c0; }; memory@80000000 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 395/800 arm64: dts: ti: k3-j784s4: Fix wakeup pinmux range and pinctrl node offsets
In reply to Greg Kroah-HartmanFrom: Thejasvi Konduru <[email protected]>
[ Upstream commit 14462bd0b247d05070d48d0f02eb7ca2680ab7bd ]
The wkup_pmx register region in j784s4 has multiple non-addressable regions, hence the existing wkup_pmx region is split as follows to avoid the non-addressable regions. The pinctrl node offsets are also corrected as per the newly split wkup_pmx* nodes.
wkup_pmx0 -> 13 pins (WKUP_PADCONFIG 0 - 12)wkup_pmx1 -> 11 pins (WKUP_PADCONFIG 14 - 24)wkup_pmx2 -> 72 pins (WKUP_PADCONFIG 26 - 97)wkup_pmx3 -> 1 pin (WKUP_PADCONFIG 100)
--- arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 30 +++++++++---------- .../boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 29 +++++++++++++++++- 2 files changed, 43 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/ti/k3-j784s4-evm.dts +15 -15
@@ -141,28 +141,28 @@ J784S4_IOPAD(0x020, PIN_INPUT, 7) /* (AJ35) MCAN15_RX.GPIO0_8 */ }; }; -&wkup_pmx0 { +&wkup_pmx2 { mcu_cpsw_pins_default: mcu-cpsw-pins-default { pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x094, PIN_INPUT, 0) /* (A35) MCU_RGMII1_RD0 */ - J784S4_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (B36) MCU_RGMII1_RD1 */ - J784S4_WKUP_IOPAD(0x08c, PIN_INPUT, 0) /* (C36) MCU_RGMII1_RD2 */ - J784S4_WKUP_IOPAD(0x088, PIN_INPUT, 0) /* (D36) MCU_RGMII1_RD3 */ - J784S4_WKUP_IOPAD(0x084, PIN_INPUT, 0) /* (B37) MCU_RGMII1_RXC */ - J784S4_WKUP_IOPAD(0x06c, PIN_INPUT, 0) /* (C37) MCU_RGMII1_RX_CTL */ - J784S4_WKUP_IOPAD(0x07c, PIN_OUTPUT, 0) /* (D37) MCU_RGMII1_TD0 */ - J784S4_WKUP_IOPAD(0x078, PIN_OUTPUT, 0) /* (D38) MCU_RGMII1_TD1 */ - J784S4_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (E37) MCU_RGMII1_TD2 */ - J784S4_WKUP_IOPAD(0x070, PIN_OUTPUT, 0) /* (E38) MCU_RGMII1_TD3 */ - J784S4_WKUP_IOPAD(0x080, PIN_OUTPUT, 0) /* (E36) MCU_RGMII1_TXC */ - J784S4_WKUP_IOPAD(0x068, PIN_OUTPUT, 0) /* (C38) MCU_RGMII1_TX_CTL */ + J784S4_WKUP_IOPAD(0x02c, PIN_INPUT, 0) /* (A35) MCU_RGMII1_RD0 */ + J784S4_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (B36) MCU_RGMII1_RD1 */ + J784S4_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (C36) MCU_RGMII1_RD2 */ + J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D36) MCU_RGMII1_RD3 */ + J784S4_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (B37) MCU_RGMII1_RXC */ + J784S4_WKUP_IOPAD(0x004, PIN_INPUT, 0) /* (C37) MCU_RGMII1_RX_CTL */ + J784S4_WKUP_IOPAD(0x014, PIN_OUTPUT, 0) /* (D37) MCU_RGMII1_TD0 */ + J784S4_WKUP_IOPAD(0x010, PIN_OUTPUT, 0) /* (D38) MCU_RGMII1_TD1 */ + J784S4_WKUP_IOPAD(0x00c, PIN_OUTPUT, 0) /* (E37) MCU_RGMII1_TD2 */ + J784S4_WKUP_IOPAD(0x008, PIN_OUTPUT, 0) /* (E38) MCU_RGMII1_TD3 */ + J784S4_WKUP_IOPAD(0x018, PIN_OUTPUT, 0) /* (E36) MCU_RGMII1_TXC */ + J784S4_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (C38) MCU_RGMII1_TX_CTL */ >; }; mcu_mdio_pins_default: mcu-mdio-pins-default { pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x09c, PIN_OUTPUT, 0) /* (A36) MCU_MDIO0_MDC */ - J784S4_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (B35) MCU_MDIO0_MDIO */ + J784S4_WKUP_IOPAD(0x034, PIN_OUTPUT, 0) /* (A36) MCU_MDIO0_MDC */ + J784S4_WKUP_IOPAD(0x030, PIN_INPUT, 0) /* (B35) MCU_MDIO0_MDIO */ >; }; };
arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi +28 -1
@@ -50,7 +50,34 @@ mcu_ram: sram@41c00000 { wkup_pmx0: pinctrl@4301c000 { compatible = "pinctrl-single"; /* Proxy 0 addressing */ - reg = <0x00 0x4301c000 0x00 0x178>; + reg = <0x00 0x4301c000 0x00 0x034>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx1: pinctrl@4301c038 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c038 0x00 0x02c>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx2: pinctrl@4301c068 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c068 0x00 0x120>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <32>; + pinctrl-single,function-mask = <0xffffffff>; + }; + + wkup_pmx3: pinctrl@4301c190 { + compatible = "pinctrl-single"; + /* Proxy 0 addressing */ + reg = <0x00 0x4301c190 0x00 0x004>; #pinctrl-cells = <1>; pinctrl-single,register-width = <32>; pinctrl-single,function-mask = <0xffffffff>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 396/800 arm64: dts: ti: k3-am69-sk: Fix main_i2c0 alias
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit b38c6ced4ec5b3f6260ff6cc2b71e8a3d8c897d7 ]
main_i2c0 is aliased as i2c0 which creates a problem for u-boot R5 SPL attempting to reuse the same definition in the common board detection logic as it looks for the first i2c instance as the bus on which to detect the eeprom to understand the board variant involved. Switch main_i2c0 to i2c3 alias allowing us to introduce wkup_i2c0 and potentially space for mcu_i2c instances in the gap for follow on patches.
--- arch/arm64/boot/dts/ti/k3-am69-sk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am69-sk.dts +1 -1
@@ -23,7 +23,7 @@ chosen { aliases { serial2 = &main_uart8; mmc1 = &main_sdhci1; - i2c0 = &main_i2c0; + i2c3 = &main_i2c0; }; memory@80000000 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 397/800 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
@@ -2069,8 +2069,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 398/800 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
@@ -1463,6 +1463,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, ret;
@@ -1494,7 +1496,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 399/800 drm/msm/dpu: Fix slice_last_group_size calculation
In reply to Greg Kroah-HartmanFrom: Jessica Zhang <[email protected]>
[ Upstream commit c223059e6f8340f7eac2319470984cbfc39c433b ]
Correct the math for slice_last_group_size so that it matches the calculations downstream.
Patchwork: https://patchwork.freedesktop.org/patch/539269/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c +3 -2
@@ -54,9 +54,10 @@ static void dpu_hw_dsc_config(struct dpu_hw_dsc *hw_dsc,if (is_cmd_mode) initial_lines +=1 ; - slice_last_group_size =3 - (dsc->slice_width %3 ); + slice_last_group_size = (dsc->slice_width +2 ) %3 ; + data = (initial_lines <<20 ); - data |= ((slice_last_group_size -1 ) <<18 ); + data |= (slice_last_group_size <<18 );/* bpp is 6.4 format, 4 LSBs bits are for fractional part */ data |= (dsc->bits_per_pixel <<8 ); data |= (dsc->block_pred_enable <<7 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 400/800 drm/msm/dsi: Remove incorrect references to slice_count
In reply to Greg Kroah-HartmanFrom: Jessica Zhang <[email protected]>
[ Upstream commit 155fa3a91d64221eb0885fd221cc8085dbef908f ]
Currently, slice_count is being used to calculate word count and pkt_per_line. Instead, these values should be calculated using slice per packet, which is not the same as slice_count.
Slice count represents the number of slices per interface, and its value will not always match that of slice per packet. For example, it is possible to have cases where there are multiple slices per interface but the panel specifies only one slice per packet.
Thus, use the default value of one slice per packet and remove slice_count from the aforementioned calculations.
Patchwork: https://patchwork.freedesktop.org/patch/541965/
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +16 -10
@@ -850,18 +850,17 @@ static void dsi_update_dsc_timing(struct msm_dsi_host *msm_host, bool is_cmd_mod*/ slice_per_intf =DIV_ROUND_UP (hdisplay, dsc->slice_width); -/* -* If slice_count is greater than slice_per_intf -* then default to 1. This can happen during partial -* update. -*/ -if (dsc->slice_count > slice_per_intf) - dsc->slice_count =1 ; - total_bytes_per_intf = dsc->slice_chunk_size * slice_per_intf; eol_byte_num = total_bytes_per_intf %3 ; - pkt_per_line = slice_per_intf / dsc->slice_count; + +/* +* Typically, pkt_per_line = slice_per_intf * slice_per_pkt. +* +* Since the current driver only supports slice_per_pkt = 1, +* pkt_per_line will be equal to slice per intf for now. +*/ + pkt_per_line = slice_per_intf;if (is_cmd_mode)/* packet data type */ reg =DSI_COMMAND_COMPRESSION_MODE_CTRL_STREAM0_DATATYPE (MIPI_DSI_DCS_LONG_WRITE );
@@ -985,7 +984,14 @@ static void dsi_timing_setup(struct msm_dsi_host *msm_host, bool is_bonded_dsi)if (!msm_host->dsc) wc = hdisplay *dsi_get_bpp (msm_host->format) /8 +1 ;else - wc = msm_host->dsc->slice_chunk_size * msm_host->dsc->slice_count +1 ; +/* +* When DSC is enabled, WC = slice_chunk_size * slice_per_pkt + 1. +* Currently, the driver only supports default value of slice_per_pkt = 1 +* +* TODO: Expand mipi_dsi_device struct to hold slice_per_pkt info +* and adjust DSC math to account for slice_per_pkt. +*/ + wc = msm_host->dsc->slice_chunk_size +1 ; dsi_write(msm_host, REG_DSI_CMD_MDP_STREAM0_CTRL, DSI_CMD_MDP_STREAM0_CTRL_WORD_COUNT(wc) |
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 401/800 drm/msm/dp: Drop aux devices together with DP controller
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit a7bfb2ad2184a1fba78be35209b6019aa8cc8d4d ]
Using devres to depopulate the aux bus made sure that upon a probe deferral the EDP panel device would be destroyed and recreated upon next attempt.
But the struct device which the devres is tied to is the DPUs (drm_dev->dev), which may be happen after the DP controller is torn down.
Indications of this can be seen in the commonly seen EDID-hexdump full of zeros in the log, or the occasional/rare KASAN fault where the panel's attempt to read the EDID information causes a use after free on DP resources.
It's tempting to move the devres to the DP controller's struct device, but the resources used by the device(s) on the aux bus are explicitly torn down in the error path. The KASAN-reported use-after-free also remains, as the DP aux "module" explicitly frees its devres-allocated memory in this code path.
As such, explicitly depopulate the aux bus in the error path, and in the component unbind path, to avoid these issues.
Patchwork: https://patchwork.freedesktop.org/patch/542163/
--- drivers/gpu/drm/msm/dp/dp_display.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +3 -11
@@ -329,6 +329,8 @@ static void dp_display_unbind(struct device *dev, struct device *master,kthread_stop (dp->ev_tsk); +of_dp_aux_depopulate_bus (dp->aux); +dp_power_client_deinit (dp->power);dp_unregister_audio_driver (dev, dp->audio);dp_aux_unregister (dp->aux);
@@ -1509,11 +1511,6 @@ void msm_dp_debugfs_init(struct msm_dp *dp_display, struct drm_minor *minor) } } -static void of_dp_aux_depopulate_bus_void (void *data) -{ -of_dp_aux_depopulate_bus (data); -} -static int dp_display_get_next_bridge (struct msm_dp *dp) {int rc;
@@ -1541,12 +1538,6 @@ static int dp_display_get_next_bridge(struct msm_dp *dp)of_node_put (aux_bus);if (rc) goto error; - - rc =devm_add_action_or_reset (dp->drm_dev->dev, - of_dp_aux_depopulate_bus_void, - dp_priv->aux); -if (rc) - goto error; }else if (dp->is_edp) {DRM_ERROR ("eDP aux_bus not found\n" );return -ENODEV ;
@@ -1570,6 +1561,7 @@ static int dp_display_get_next_bridge(struct msm_dp *dp) error:if (dp->is_edp) { +of_dp_aux_depopulate_bus (dp_priv->aux);dp_display_host_phy_exit (dp_priv);dp_display_host_deinit (dp_priv); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 402/800 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
@@ -1330,9 +1330,9 @@ static int dp_display_remove(struct platform_device *pdev) {struct dp_display_private *dp =dev_get_dp_display_private (&pdev->dev); +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 403/800 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
@@ -70,6 +70,7 @@ cpu0: cpu@0 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -87,6 +88,7 @@ cpu1: cpu@100 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -104,6 +106,7 @@ cpu2: cpu@200 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -121,6 +124,7 @@ cpu3: cpu@300 { d-cache-line-size = <64>; d-cache-sets = <128>; next-level-cache = <&l2_0>; + performance-domains = <&performance 0>; capacity-dmips-mhz = <530>; };
@@ -138,6 +142,7 @@ cpu4: cpu@400 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -155,6 +160,7 @@ cpu5: cpu@500 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -172,6 +178,7 @@ cpu6: cpu@600 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -189,6 +196,7 @@ cpu7: cpu@700 { d-cache-line-size = <64>; d-cache-sets = <256>; next-level-cache = <&l2_1>; + performance-domains = <&performance 1>; capacity-dmips-mhz = <1024>; };
@@ -403,6 +411,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 404/800 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
@@ -71,7 +71,7 @@ cpu0: cpu@0 { d-cache-sets = <128>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu1: cpu@100 {
@@ -89,7 +89,7 @@ cpu1: cpu@100 { d-cache-sets = <128>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu2: cpu@200 {
@@ -107,7 +107,7 @@ cpu2: cpu@200 { d-cache-sets = <128>; next-level-cache = <&l2_0>; performance-domains = <&performance 0>; - capacity-dmips-mhz = <530>; + capacity-dmips-mhz = <427>; }; cpu3: cpu@300 {
@@ -125,7 +125,7 @@ cpu3: cpu@300 { d-cache-sets = <128>; 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 405/800 arm64: dts: mt7986: increase bl2 partition on NAND of Bananapi R3
In reply to Greg Kroah-HartmanFrom: Daniel Golle <[email protected]>
[ Upstream commit 3bfbff9b461e3506dfb5b2904e8c15a0aea39e07 ]
The bootrom burned into the MT7986 SoC will try multiple locations on the SPI-NAND flash to load bl2 in case the bl2 image located at the the previously attempted offset is corrupt.
Use 0x100000 instead of 0x80000 as partition size for bl2 on SPI-NAND, allowing for up to four redundant copies of bl2 (typically sized a bit less than 0x40000).
--- .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso +3 -3
@@ -29,13 +29,13 @@ partitions { partition@0 { label = "bl2"; - reg = <0x0 0x80000>; + reg = <0x0 0x100000>; read-only; }; - partition@80000 { + partition@100000 { label = "reserved"; - reg = <0x80000 0x300000>; + reg = <0x100000 0x280000>; }; partition@380000 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 406/800 drm/amdgpu: Fix memcpy() in sienna_cichlid_append_powerplay_table function.
In reply to Greg Kroah-HartmanFrom: Srinivasan Shanmugam <[email protected]>
[ Upstream commit d50dc746ff72b9c48812dac3344fa87fbde940a3 ]
Fixes the following gcc with W=1:
In file included from ./include/linux/string.h:253,
from ./include/linux/bitmap.h:11,
from ./include/linux/cpumask.h:12,
from ./arch/x86/include/asm/cpumask.h:5,
from ./arch/x86/include/asm/msr.h:11,
from ./arch/x86/include/asm/processor.h:22,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:60,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:56,
from ./include/linux/mmzone.h:8,
from ./include/linux/gfp.h:7,
from ./include/linux/firmware.h:7,
from drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/sienna_cichlid_ppt.c:26:In function ‘fortify_memcpy_chk’,
inlined from ‘sienna_cichlid_append_powerplay_table’ at drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/sienna_cichlid_ppt.c:444:2,
inlined from ‘sienna_cichlid_setup_pptable’ at drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/sienna_cichlid_ppt.c:506:8,
inlined from ‘sienna_cichlid_setup_pptable’ at drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/sienna_cichlid_ppt.c:494:12:./include/linux/fortify-string.h:413:4: warning: call to ‘__read_overflow2_field’ declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Wattribute-warning]
413 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~the compiler complains about the size calculation in the memcpy() - "sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header)" is much larger than what fits into table_member.
Hence, reuse 'smu_memcpy_trailing' for nv1x
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +14 -4
@@ -431,7 +431,13 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu) {struct atom_smc_dpm_info_v4_9 *smc_dpm_table;int index, ret; -I2cControllerConfig_t *table_member; +PPTable_beige_goby_t *ppt_beige_goby; +PPTable_t *ppt; + +if (smu->adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (11 ,0 ,13 )) + ppt_beige_goby = smu->smu_table.driver_pptable; +else + ppt = smu->smu_table.driver_pptable; index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info);
@@ -440,9 +446,13 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu) (uint8_t **)&smc_dpm_table);if (ret)return ret; -GET_PPTABLE_MEMBER (I2cControllers, &table_member); -memcpy (table_member, smc_dpm_table->I2cControllers, -sizeof (*smc_dpm_table) -sizeof (smc_dpm_table->table_header)); + +if (smu->adev->ip_versions[MP1_HWIP ][0 ] ==IP_VERSION (11 ,0 ,13 )) +smu_memcpy_trailing (ppt_beige_goby, I2cControllers, BoardReserved, + smc_dpm_table, I2cControllers); +else +smu_memcpy_trailing (ppt, I2cControllers, BoardReserved, + smc_dpm_table, I2cControllers);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 407/800 drm/amdgpu: Fix usage of UMC fill record in RAS
In reply to Greg Kroah-HartmanFrom: Luben Tuikov <[email protected]>
[ Upstream commit 71344a718a9fda8c551cdc4381d354f9a9907f6f ]
The fixed commit listed in the Fixes tag below, introduced a bug in amdgpu_ras.c::amdgpu_reserve_page_direct(), in that when introducing the new amdgpu_umc_fill_error_record() and internally in that new function the physical address (argument "uint64_t retired_page"--wrong name) is right-shifted by AMDGPU_GPU_PAGE_SHIFT. Thus, in amdgpu_reserve_page_direct() when we pass "address" to that new function, we should NOT right-shift it, since this results, erroneously, in the page address to be 0 for first 2^(2*AMDGPU_GPU_PAGE_SHIFT) memory addresses.
This commit fixes this bug.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -2
@@ -171,8 +171,7 @@ static int amdgpu_reserve_page_direct(struct amdgpu_device *adev, uint64_t addrememset (&err_rec,0x0 ,sizeof (struct eeprom_table_record )); err_data.err_addr = &err_rec; -amdgpu_umc_fill_error_record (&err_data, address, - (address >>AMDGPU_GPU_PAGE_SHIFT ),0 ,0 ); +amdgpu_umc_fill_error_record (&err_data, address, address,0 ,0 );if (amdgpu_bad_page_threshold !=0 ) { amdgpu_ras_add_bad_pages(adev, err_data.err_addr,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 408/800 drm/msm/dpu: Drop unused poll_timeout_wr_ptr PINGPONG callback
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit a2623e72c52b2cf258b34675a8ff38c66e7d26fb ]
This callback was migrated from downstream when DPU1 was first introduced to mainline, but never used by any component. Drop it to save some lines and unnecessary confusion.
Patchwork: https://patchwork.freedesktop.org/patch/534215/
Stable-dep-of: 0b78be614c50 ("drm/msm/dpu: fix sc7280 and sc7180 PINGPONG done interrupts")
--- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 18 ------------------ .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 6 ------ 2 files changed, 24 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +0 -18
@@ -144,23 +144,6 @@ static bool dpu_hw_pp_get_autorefresh_config(struct dpu_hw_pingpong *pp,return !!((val &BIT (31 )) >>31 ); } -static int dpu_hw_pp_poll_timeout_wr_ptr (struct dpu_hw_pingpong *pp, -u32 timeout_us) -{ -struct dpu_hw_blk_reg_map *c; -u32 val; -int rc; - -if (!pp) -return -EINVAL ; - - c = &pp->hw; - rc =readl_poll_timeout (c->blk_addr +PP_LINE_COUNT , - val, (val &0xffff ) >=1 ,10 , timeout_us); - -return rc; -} -static int dpu_hw_pp_enable_te (struct dpu_hw_pingpong *pp,bool enable) {struct dpu_hw_blk_reg_map *c;
@@ -280,7 +263,6 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c, c->ops.get_vsync_info = dpu_hw_pp_get_vsync_info; c->ops.setup_autorefresh = dpu_hw_pp_setup_autorefresh_config; c->ops.get_autorefresh = dpu_hw_pp_get_autorefresh_config; - c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr; c->ops.get_line_count = dpu_hw_pp_get_line_count; c->ops.setup_dsc = dpu_hw_pp_setup_dsc; c->ops.enable_dsc = dpu_hw_pp_dsc_enable;
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h +0 -6
@@ -107,12 +107,6 @@ struct dpu_hw_pingpong_ops {bool (*get_autorefresh)(struct dpu_hw_pingpong *pp,u32 *frame_count); -/** -* poll until write pointer transmission starts -* @Return: 0 on success, -ETIMEDOUT on timeout -*/ -int (*poll_timeout_wr_ptr)(struct dpu_hw_pingpong *pp,u32 timeout_us); -/** * Obtain current vertical line counter */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 409/800 drm/msm/dpu: Move autorefresh disable from CMD encoder to pingpong
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit 4a7c38ec7d8efe96c4d8b4d5fc0efb5b06db58e9 ]
This autorefresh disable logic in the physical command-mode encoder consumes three callbacks to the pingpong block, and will explode in unnecessary complexity when the same callbacks need to be called on the interface block instead to accommodate INTF TE support. To clean this up, move the logic into the pingpong block under a disable_autorefresh callback, replacing the aforementioned three get_autorefresh, setup_autorefresh and get_vsync_info callbacks.
The same logic will have to be replicated to the interface block when it receives INTF TE support, but it is less complex than constantly switching on a "has_intf_te" boolean to choose a callback.
Patchwork: https://patchwork.freedesktop.org/patch/534230/
Stable-dep-of: 0b78be614c50 ("drm/msm/dpu: fix sc7280 and sc7180 PINGPONG done interrupts")
--- .../drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 60 ++----------------- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 47 ++++++++++++++- .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 25 ++------ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++ 4 files changed, 57 insertions(+), 79 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +5 -55
@@ -36,10 +36,6 @@#define DEFAULT_TEARCHECK_SYNC_THRESH_START 4#define DEFAULT_TEARCHECK_SYNC_THRESH_CONTINUE 4 -#define DPU_ENC_WR_PTR_START_TIMEOUT_US 20000 - -#define DPU_ENC_MAX_POLL_TIMEOUT_US 2000 -static void dpu_encoder_phys_cmd_enable_te (struct dpu_encoder_phys *phys_enc);static bool dpu_encoder_phys_cmd_is_master (struct dpu_encoder_phys *phys_enc)
@@ -574,28 +570,8 @@ static void dpu_encoder_phys_cmd_prepare_for_kickoff( atomic_read(&phys_enc->pending_kickoff_cnt)); } -static bool dpu_encoder_phys_cmd_is_ongoing_pptx ( -struct dpu_encoder_phys *phys_enc) -{ -struct dpu_hw_pp_vsync_info info; - -if (!phys_enc) -return false; - - phys_enc->hw_pp->ops.get_vsync_info (phys_enc->hw_pp, &info); -if (info.wr_ptr_line_count >0 && - info.wr_ptr_line_count < phys_enc->cached_mode.vdisplay) -return true; - -return false; -} -static void dpu_encoder_phys_cmd_enable_te (struct dpu_encoder_phys *phys_enc) { -struct dpu_encoder_phys_cmd *cmd_enc = -to_dpu_encoder_phys_cmd (phys_enc); -int trial =0 ; -if (!phys_enc)return ;if (!phys_enc->hw_pp)
@@ -603,37 +579,11 @@ static void dpu_encoder_phys_cmd_enable_te(struct dpu_encoder_phys *phys_enc)if (!dpu_encoder_phys_cmd_is_master (phys_enc))return ; -/* If autorefresh is already disabled, we have nothing to do */ -if (!phys_enc->hw_pp->ops.get_autorefresh (phys_enc->hw_pp,NULL )) -return ; - -/* -* If autorefresh is enabled, disable it and make sure it is safe to -* proceed with current frame commit/push. Sequence fallowed is, -* 1. Disable TE -* 2. Disable autorefresh config -* 4. Poll for frame transfer ongoing to be false -* 5. Enable TE back -*/ -_dpu_encoder_phys_cmd_connect_te (phys_enc, false); - phys_enc->hw_pp->ops.setup_autorefresh (phys_enc->hw_pp,0 , false); - -do { -udelay (DPU_ENC_MAX_POLL_TIMEOUT_US ); -if ((trial *DPU_ENC_MAX_POLL_TIMEOUT_US ) - > (KICKOFF_TIMEOUT_MS *USEC_PER_MSEC )) { -DPU_ERROR_CMDENC (cmd_enc, -"disable autorefresh failed\n" ); -break ; - } - - trial++; - }while (dpu_encoder_phys_cmd_is_ongoing_pptx (phys_enc)); - -_dpu_encoder_phys_cmd_connect_te (phys_enc, true); - -DPU_DEBUG_CMDENC (to_dpu_encoder_phys_cmd (phys_enc), -"disabled autorefresh\n" ); +if (phys_enc->hw_pp->ops.disable_autorefresh) { + phys_enc->hw_pp->ops.disable_autorefresh (phys_enc->hw_pp, +DRMID (phys_enc->parent), + phys_enc->cached_mode.vdisplay); + } } static int _dpu_encoder_phys_cmd_wait_for_ctl_start(
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +44 -3
60 lines not on this page · raw message
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h +4 -21
@@ -61,9 +61,6 @@ struct dpu_hw_dither_cfg {* Assumption is these functions will be called after clocks are enabled * @setup_tearcheck : program tear check values * @enable_tearcheck : enables tear check -* @get_vsync_info : retries timing info of the panel -* @setup_autorefresh : configure and enable the autorefresh config -* @get_autorefresh : retrieve autorefresh config from hardware * @setup_dither : function to program the dither hw block * @get_line_count: obtain current vertical line counter */
@@ -89,28 +86,14 @@ struct dpu_hw_pingpong_ops { bool enable_external_te);/** -* provides the programmed and current -* line_count -*/ -int (*get_vsync_info)(struct dpu_hw_pingpong *pp, -struct dpu_hw_pp_vsync_info *info); - -/** -* configure and enable the autorefresh config -*/ -void (*setup_autorefresh)(struct dpu_hw_pingpong *pp, -u32 frame_count,bool enable); - -/** -* retrieve autorefresh config from hardware +* Obtain current vertical line counter */ -bool (*get_autorefresh)(struct dpu_hw_pingpong *pp, -u32 *frame_count); +u32 (*get_line_count)(struct dpu_hw_pingpong *pp);/** -* Obtain current vertical line counter +* Disable autorefresh if enabled */ -u32 (*get_line_count)(struct dpu_hw_pingpong *pp); +void (*disable_autorefresh)(struct dpu_hw_pingpong *pp,uint32_t encoder_id,u16 vdisplay);/** * Setup dither matix for pingpong block
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4 -0
@@ -118,6 +118,10 @@ struct vsync_info {u32 line_count; }; +#define DPU_ENC_WR_PTR_START_TIMEOUT_US 20000 + +#define DPU_ENC_MAX_POLL_TIMEOUT_US 2000 +#define to_dpu_kms (x) container_of(x, struct dpu_kms, base)#define to_dpu_global_state (x) container_of(x, struct dpu_global_state, base)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 410/800 drm/msm/dpu: Disable pingpong TE on DPU 5.0.0 and above
In reply to Greg Kroah-HartmanFrom: Marijn Suijten <[email protected]>
[ Upstream commit fe9d66cf6e8d2f6651e55ae57026464a080c2f2a ]
Since hardware revision 5.0.0 the TE configuration moved out of the PINGPONG block into the INTF block. Writing these registers has no effect, and is omitted downstream via the DPU/SDE_PINGPONG_TE feature flag. This flag is only added to PINGPONG blocks used by hardware prior to 5.0.0.
The existing PP_BLK_TE macro has been removed in favour of directly passing this feature flag, which has thus far been the only difference with PP_BLK. PP_BLK_DITHER has been left in place as its embedded feature flag already excludes this DPU_PINGPONG_TE bit and differs by setting the block length to zero, as it only contains a DITHER subblock.
The code that writes to these registers in the INTF block will follow in subsequent patches.
Patchwork: https://patchwork.freedesktop.org/patch/534240/
Stable-dep-of: 0b78be614c50 ("drm/msm/dpu: fix sc7280 and sc7180 PINGPONG done interrupts")
--- .../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 8 +++---- .../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 +++---- .../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 12 +++++----- .../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 12 +++++----- .../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 12 +++++----- .../msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 ++-- .../msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 2 +- .../msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 22 +++++++------------ .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 12 +++++----- 10 files changed, 45 insertions(+), 49 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +4 -4
@@ -112,16 +112,16 @@ static const struct dpu_lm_cfg msm8998_lm[] = { };static const struct dpu_pingpong_cfg msm8998_pp[] = { -PP_BLK_TE ("pingpong_0" ,PINGPONG_0 ,0x70000 ,0 , sdm845_pp_sblk_te, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SDM845_TE2_MASK ,0 , sdm845_pp_sblk_te,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), -PP_BLK_TE ("pingpong_1" ,PINGPONG_1 ,0x70800 ,0 , sdm845_pp_sblk_te, +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SDM845_TE2_MASK ,0 , sdm845_pp_sblk_te,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,13 )), -PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,PINGPONG_SDM845_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,14 )), -PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,PINGPONG_SDM845_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,15 )), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +4 -4
@@ -110,16 +110,16 @@ static const struct dpu_lm_cfg sdm845_lm[] = { };static const struct dpu_pingpong_cfg sdm845_pp[] = { -PP_BLK_TE ("pingpong_0" ,PINGPONG_0 ,0x70000 ,0 , sdm845_pp_sblk_te, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SDM845_TE2_MASK ,0 , sdm845_pp_sblk_te,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), -PP_BLK_TE ("pingpong_1" ,PINGPONG_1 ,0x70800 ,0 , sdm845_pp_sblk_te, +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SDM845_TE2_MASK ,0 , sdm845_pp_sblk_te,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,13 )), -PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,PINGPONG_SDM845_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,14 )), -PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,PINGPONG_SDM845_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,15 )), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +6 -6
@@ -128,22 +128,22 @@ static const struct dpu_dspp_cfg sm8150_dspp[] = { };static const struct dpu_pingpong_cfg sm8150_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), -PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,13 )), -PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,14 )), -PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,15 )), -PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,30 ),-1 ), -PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,31 ),-1 ), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +6 -6
@@ -116,22 +116,22 @@ static const struct dpu_lm_cfg sc8180x_lm[] = { };static const struct dpu_pingpong_cfg sc8180x_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), -PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,13 )), -PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,14 )), -PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,15 )), -PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,30 ),-1 ), -PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,31 ),-1 ), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +6 -6
@@ -129,22 +129,22 @@ static const struct dpu_dspp_cfg sm8250_dspp[] = { };static const struct dpu_pingpong_cfg sm8250_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), -PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,MERGE_3D_0 , sdm845_pp_sblk, +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,MERGE_3D_0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,13 )), -PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_2" ,PINGPONG_2 ,0x71000 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,14 )), -PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,MERGE_3D_1 , sdm845_pp_sblk, +PP_BLK ("pingpong_3" ,PINGPONG_3 ,0x71800 ,PINGPONG_SM8150_MASK ,MERGE_3D_1 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,15 )), -PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_4" ,PINGPONG_4 ,0x72000 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,30 ),-1 ), -PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,MERGE_3D_2 , sdm845_pp_sblk, +PP_BLK ("pingpong_5" ,PINGPONG_5 ,0x72800 ,PINGPONG_SM8150_MASK ,MERGE_3D_2 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR2 ,31 ),-1 ), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +2 -2
@@ -80,8 +80,8 @@ static const struct dpu_dspp_cfg sc7180_dspp[] = { };static const struct dpu_pingpong_cfg sc7180_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,0 , sdm845_pp_sblk,-1 ,-1 ), -PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,0 , sdm845_pp_sblk,-1 ,-1 ), +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,-1 ,-1 ), +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,-1 ,-1 ), };static const struct dpu_intf_cfg sc7180_intf[] = {
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +1 -1
@@ -60,7 +60,7 @@ static const struct dpu_dspp_cfg sm6115_dspp[] = { };static const struct dpu_pingpong_cfg sm6115_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +1 -1
@@ -57,7 +57,7 @@ static const struct dpu_dspp_cfg qcm2290_dspp[] = { };static const struct dpu_pingpong_cfg qcm2290_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,0 , sdm845_pp_sblk, +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ),DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,12 )), };
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +8 -14
@@ -75,11 +75,15 @@#define MIXER_QCM2290_MASK \ (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) -#define PINGPONG_SDM845_MASK BIT(DPU_PINGPONG_DITHER) +#define PINGPONG_SDM845_MASK \ + (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_TE)) -#define PINGPONG_SDM845_SPLIT_MASK \ +#define PINGPONG_SDM845_TE2_MASK \ (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2)) +#define PINGPONG_SM8150_MASK \ + (BIT(DPU_PINGPONG_DITHER)) +#define CTL_SC7280_MASK \ (BIT(DPU_CTL_ACTIVE_CFG) | \ BIT(DPU_CTL_FETCH_ACTIVE) | \
@@ -499,21 +503,11 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = { .intr_done = _done, \ .intr_rdptr = _rdptr, \ } -#define PP_BLK_TE (_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \ - {\ - .name = _name, .id = _id, \ - .base = _base, .len = 0xd4, \ - .features = PINGPONG_SDM845_SPLIT_MASK, \ - .merge_3d = _merge_3d, \ - .sblk = &_sblk, \ - .intr_done = _done, \ - .intr_rdptr = _rdptr, \ - } -#define PP_BLK (_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \ +#define PP_BLK (_name, _id, _base, _features, _merge_3d, _sblk, _done, _rdptr) \ {\ .name = _name, .id = _id, \ .base = _base, .len = 0xd4, \ - .features = PINGPONG_SDM845_MASK, \ + .features = _features, \ .merge_3d = _merge_3d, \ .sblk = &_sblk, \ .intr_done = _done, \
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +7 -5
@@ -300,11 +300,13 @@ static int dpu_hw_pp_setup_dsc(struct dpu_hw_pingpong *pp)static void _setup_pingpong_ops (struct dpu_hw_pingpong *c,unsigned long features) { - c->ops.setup_tearcheck = dpu_hw_pp_setup_te_config; - c->ops.enable_tearcheck = dpu_hw_pp_enable_te; - c->ops.connect_external_te = dpu_hw_pp_connect_external_te; - c->ops.get_line_count = dpu_hw_pp_get_line_count; - c->ops.disable_autorefresh = dpu_hw_pp_disable_autorefresh; +if (test_bit (DPU_PINGPONG_TE , &features)) { + c->ops.setup_tearcheck = dpu_hw_pp_setup_te_config; + c->ops.enable_tearcheck = dpu_hw_pp_enable_te; + c->ops.connect_external_te = dpu_hw_pp_connect_external_te; + c->ops.get_line_count = dpu_hw_pp_get_line_count; + c->ops.disable_autorefresh = dpu_hw_pp_disable_autorefresh; + } c->ops.setup_dsc = dpu_hw_pp_setup_dsc; c->ops.enable_dsc = dpu_hw_pp_dsc_enable; c->ops.disable_dsc = dpu_hw_pp_dsc_disable;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 411/800 drm/msm/dpu: fix sc7280 and sc7180 PINGPONG done interrupts
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 0b78be614c503ec03636f82cea52ad735c5085e7 ]
During IRQ conversion we have lost the PP_DONE interrupts for sc7280 platform. This was left unnoticed, because this interrupt is only used for CMD outputs and probably no sc7[12]80 systems use DSI CMD panels.
Patchwork: https://patchwork.freedesktop.org/patch/542175/
--- .../drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 8 ++++++-- .../drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +6 -2
@@ -80,8 +80,12 @@ static const struct dpu_dspp_cfg sc7180_dspp[] = { };static const struct dpu_pingpong_cfg sc7180_pp[] = { -PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,-1 ,-1 ), -PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk,-1 ,-1 ), +PP_BLK ("pingpong_0" ,PINGPONG_0 ,0x70000 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ), +-1 ), +PP_BLK ("pingpong_1" ,PINGPONG_1 ,0x70800 ,PINGPONG_SM8150_MASK ,0 , sdm845_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ), +-1 ), };static const struct dpu_intf_cfg sc7180_intf[] = {
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +12 -4
@@ -87,10 +87,18 @@ static const struct dpu_dspp_cfg sc7280_dspp[] = { };static const struct dpu_pingpong_cfg sc7280_pp[] = { -PP_BLK_DITHER ("pingpong_0" ,PINGPONG_0 ,0x69000 ,0 , sc7280_pp_sblk,-1 ,-1 ), -PP_BLK_DITHER ("pingpong_1" ,PINGPONG_1 ,0x6a000 ,0 , sc7280_pp_sblk,-1 ,-1 ), -PP_BLK_DITHER ("pingpong_2" ,PINGPONG_2 ,0x6b000 ,0 , sc7280_pp_sblk,-1 ,-1 ), -PP_BLK_DITHER ("pingpong_3" ,PINGPONG_3 ,0x6c000 ,0 , sc7280_pp_sblk,-1 ,-1 ), +PP_BLK_DITHER ("pingpong_0" ,PINGPONG_0 ,0x69000 ,0 , sc7280_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,8 ), +-1 ), +PP_BLK_DITHER ("pingpong_1" ,PINGPONG_1 ,0x6a000 ,0 , sc7280_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,9 ), +-1 ), +PP_BLK_DITHER ("pingpong_2" ,PINGPONG_2 ,0x6b000 ,0 , sc7280_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,10 ), +-1 ), +PP_BLK_DITHER ("pingpong_3" ,PINGPONG_3 ,0x6c000 ,0 , sc7280_pp_sblk, +DPU_IRQ_IDX (MDP_SSPP_TOP0_INTR ,11 ), +-1 ), };static const struct dpu_intf_cfg sc7280_intf[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 412/800 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
@@ -520,7 +520,7 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = {#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 413/800 clk: mediatek: clk-mtk: Grab iomem pointer for divider clocks
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 51821765e89906090753421580a61d25a4668186 ]
In the rare case in which one of the clock drivers has divider clocks but not composite clocks, mtk_clk_simple_probe() would not io(re)map, hence passing a NULL pointer to mtk_clk_register_dividers().
To fix this issue, extend the if conditional to also check if any divider clocks are present. While at it, also make sure the iomem pointer is NULL if no composite/divider clocks are declared, as we are checking for that when iounmapping it in the error path.
This hasn't been seen on any MediaTek clock driver as the current ones always declare composite clocks along with divider clocks, but this is still an important fix for a future potential KP.
--- drivers/clk/mediatek/clk-mtk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/mediatek/clk-mtk.c +3 -3
@@ -469,7 +469,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,const struct platform_device_id *id;const struct mtk_clk_desc *mcd;struct clk_hw_onecell_data *clk_data; -void __iomem *base; +void __iomem *base =NULL ;int num_clks, r; mcd =device_get_match_data (&pdev->dev);
@@ -483,8 +483,8 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,return -EINVAL ; } -/* Composite clocks needs us to pass iomem pointer */ -if (mcd->composite_clks) { +/* Composite and divider clocks needs us to pass iomem pointer */ +if (mcd->composite_clks || mcd->divider_clks) {if (!mcd->shared_io) base =devm_platform_ioremap_resource (pdev,0 );else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 414/800 clk: mediatek: clk-mt8173-apmixedsys: Fix return value for of_iomap() error
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 3dc265b369ee61db999d6d1588e888eb21dc421e ]
The of_iomap() function returns NULL in case of error so usage of PTR_ERR() is wrong!
Change that to return -ENOMEM in case of failure.
--- drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt8173-apmixedsys.c +1 -1
@@ -148,7 +148,7 @@ static int clk_mt8173_apmixed_probe(struct platform_device *pdev) base =of_iomap (node,0 );if (!base) -return PTR_ERR (base); +return -ENOMEM ; clk_data =mtk_alloc_clk_data (CLK_APMIXED_NR_CLK );if (IS_ERR_OR_NULL (clk_data))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 415/800 clk: mediatek: clk-mt8173-apmixedsys: Fix iomap not released issue
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit b270ae61730e0ebccee39a21dd3311d6896a38ae ]
In case of error after of_ioremap() the resource must be released:
call iounmap() where appropriate to fix that.
--- drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt8173-apmixedsys.c +4 -1
@@ -151,8 +151,10 @@ static int clk_mt8173_apmixed_probe(struct platform_device *pdev)return -ENOMEM ; clk_data =mtk_alloc_clk_data (CLK_APMIXED_NR_CLK ); -if (IS_ERR_OR_NULL (clk_data)) +if (IS_ERR_OR_NULL (clk_data)) { +iounmap (base);return -ENOMEM ; + }fhctl_parse_dt (fhctl_node, pllfhs,ARRAY_SIZE (pllfhs)); r = mtk_clk_register_pllfhs(node, plls, ARRAY_SIZE(plls),
@@ -186,6 +188,7 @@ static int clk_mt8173_apmixed_probe(struct platform_device *pdev) ARRAY_SIZE(pllfhs), clk_data); free_clk_data:mtk_free_clk_data (clk_data); +iounmap (base);return r; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 416/800 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
@@ -1028,6 +1028,11 @@ static int vc5_probe(struct i2c_client *client) } 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;
@@ -1042,6 +1047,10 @@ static int vc5_probe(struct i2c_client *client)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;
@@ -1057,6 +1066,10 @@ static int vc5_probe(struct i2c_client *client)/* 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;
@@ -1074,6 +1087,10 @@ static int vc5_probe(struct i2c_client *client)/* 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;
@@ -1093,6 +1110,10 @@ static int vc5_probe(struct i2c_client *client)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;
@@ -1111,6 +1132,10 @@ static int vc5_probe(struct i2c_client *client)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;
@@ -1137,6 +1162,10 @@ static int vc5_probe(struct i2c_client *client)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 417/800 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
@@ -701,6 +701,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;
@@ -742,6 +746,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 ;
@@ -760,6 +768,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 418/800 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
@@ -1553,7 +1553,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 ];
@@ -1705,6 +1705,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; } }
@@ -1782,16 +1783,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 419/800 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
@@ -1697,6 +1697,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;
@@ -1715,6 +1719,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 420/800 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
@@ -1744,7 +1744,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);
@@ -1754,7 +1754,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) {
@@ -1762,11 +1762,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 */
@@ -1775,21 +1775,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 421/800 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
@@ -294,6 +294,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 422/800 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
@@ -258,6 +258,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;
@@ -586,6 +589,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 423/800 clk: clocking-wizard: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit b1356ed1a4461de06dfdc02bf549c3e8750162e5 ]
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/xilinx/clk-xlnx-clock-wizard.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/clk/xilinx/clk-xlnx-clock-wizard.c +5 -0
@@ -648,6 +648,11 @@ static int clk_wzrd_probe(struct platform_device *pdev) } clkout_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s_out0" ,dev_name (&pdev->dev)); +if (!clkout_name) { + ret = -ENOMEM ; + goto err_disable_clk; + } +if (nr_outputs ==1 ) { clk_wzrd->clkout[0 ] = clk_wzrd_register_divider (&pdev->dev, clkout_name,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 424/800 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
@@ -105,7 +105,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 425/800 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
@@ -575,6 +575,7 @@ static int ovl_link_up(struct ovl_copy_up_ctx *c)/* Restore timestamps on parent (best effort) */ ovl_set_timestamps (ofs, upperdir, &c->pstat);ovl_dentry_set_upper_alias (c->dentry); +ovl_dentry_update_reval (c->dentry, upper); } }inode_unlock (udir);
@@ -894,6 +895,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
@@ -269,8 +269,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
@@ -1122,8 +1122,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
@@ -375,8 +375,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
@@ -1877,7 +1877,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 426/800 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 ; }/*
@@ -269,6 +273,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[2 ]; priv->dai[num_dai + i].codecs = &dlc[3 ];
@@ -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 427/800 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
@@ -4696,6 +4696,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 428/800 ARM: dts: lan966x: kontron-d10: fix board reset
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit bfcd5714f6424c03e385e0e9296dcd69855cfea7 ]
The pinctrl node was missing which change the pin mux to GPIO mode. Add it.
--- arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +8 -0
@@ -18,6 +18,8 @@ chosen { gpio-restart { compatible = "gpio-restart"; + pinctrl-0 = <&reset_pins>; + pinctrl-names = "default"; gpios = <&gpio 56 GPIO_ACTIVE_LOW>; priority = <200>; };
@@ -59,6 +61,12 @@ miim_c_pins: miim-c-pins { function = "miim_c"; }; + reset_pins: reset-pins { + /* SYS_RST# */ + pins = "GPIO_56"; + function = "gpio"; + }; + sgpio_a_pins: sgpio-a-pins { /* SCK, D0, D1 */ pins = "GPIO_32", "GPIO_33", "GPIO_34";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 429/800 ARM: dts: lan966x: kontron-d10: fix SPI CS
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
[ Upstream commit fcb79ee3f0b15ed15f35eca5f24e952fdced9c61 ]
The pinctrl node was missing which change the pin mux to GPIO mode. Add it so we don't have to rely on the bootloader to set the correct mode.
--- arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi +7 -1
@@ -41,7 +41,7 @@ &flx3 { status = "okay"; spi3: spi@400 { - pinctrl-0 = <&fc3_b_pins>; + pinctrl-0 = <&fc3_b_pins>, <&spi3_cs_pins>; pinctrl-names = "default"; status = "okay"; cs-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
@@ -79,6 +79,12 @@ sgpio_b_pins: sgpio-b-pins { function = "sgpio_b"; }; + spi3_cs_pins: spi3-cs-pins { + /* CS# */ + pins = "GPIO_46"; + function = "gpio"; + }; + usart0_pins: usart0-pins { /* RXD, TXD */ pins = "GPIO_25", "GPIO_26";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 430/800 ASoC: amd: acp: clear pdm dma interrupt mask
In reply to Greg Kroah-HartmanFrom: Syed Saba Kareem <[email protected]>
[ Upstream commit ad60672394bd1f95c58d3d9336902f47e05126fc ]
Clear pdm dma interrupt mask in acp_dmic_shutdown().
'Fixes: c32bd332ce5c9 ("ASoC: amd: acp: Add generic support for PDM controller on ACP")'
--- sound/soc/amd/acp/acp-pdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/acp/acp-pdm.c +1 -1
@@ -176,7 +176,7 @@ static void acp_dmic_dai_shutdown(struct snd_pcm_substream *substream,/* Disable DMIC interrupts */ ext_int_ctrl =readl (ACP_EXTERNAL_INTR_CNTL (adata,0 )); - ext_int_ctrl |= ~PDM_DMA_INTR_MASK ; + ext_int_ctrl &= ~PDM_DMA_INTR_MASK ;writel (ext_int_ctrl,ACP_EXTERNAL_INTR_CNTL (adata,0 )); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 431/800 MIPS: DTS: CI20: Add parent supplies to ACT8600 regulators
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit fbf1e42093f8d6346baf17079585fbcebb2ff284 ]
Provide parent regulators to the ACT8600 regulators that need one.
Stable-dep-of: 944520f85d5b ("MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts")
--- arch/mips/boot/dts/ingenic/ci20.dts | 7 +++++++ 1 file changed, 7 insertions(+)
arch/mips/boot/dts/ingenic/ci20.dts +7 -0
@@ -242,16 +242,19 @@ regulators { vddcore: DCDC1 { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1100000>; + vp1-supply = <&vcc_33v>; regulator-always-on; }; vddmem: DCDC2 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + vp2-supply = <&vcc_33v>; regulator-always-on; }; vcc_33: DCDC3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + vp3-supply = <&vcc_33v>; regulator-always-on; }; vcc_50: SUDCDC_REG4 {
@@ -262,21 +265,25 @@ vcc_50: SUDCDC_REG4 { vcc_25: LDO5 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; wifi_io: LDO6 { regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; cim_io_28: LDO7 { regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; cim_io_15: LDO8 { regulator-min-microvolt = <1500000>; regulator-max-microvolt = <1500000>; + inl-supply = <&vcc_33v>; regulator-always-on; }; vrtc_18: LDO_REG9 {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 432/800 MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 944520f85d5b1fb2f9ea243be41f9c9af3d4cef3 ]
Commit 08384e80a70f ("MIPS: DTS: CI20: Fix ACT8600 regulator node names") caused the VDDCORE power supply (regulated by the ACT8600's DCDC1 output) to drop from a voltage of 1.2V configured by the bootloader, to the 1.1V set in the Device Tree.
According to the documentation, the VDDCORE supply should be between 0.99V and 1.21V; both values are therefore within the supported range.
However, VDDCORE being 1.1V results in the CI20 being very unstable, with corrupted memory, failures to boot, or reboots at random. The reason might be succint drops of the voltage below the minimum required.
Raising the minimum voltage to 1.125 volts seems to be enough to address this issue, while still keeping a relatively low core voltage which helps for power consumption and thermals.
--- arch/mips/boot/dts/ingenic/ci20.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/boot/dts/ingenic/ci20.dts +2 -2
@@ -240,8 +240,8 @@ act8600: act8600@5a { regulators { vddcore: DCDC1 { - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; + regulator-min-microvolt = <1125000>; + regulator-max-microvolt = <1125000>; vp1-supply = <&vcc_33v>; regulator-always-on; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 433/800 iommufd: Do not access the area pointer after unlocking
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit 804ca14d04df09bf7924bacc5ad22a4bed80c94f ]
A concurrent unmap can trigger freeing of the area pointers while we are generating an unmapping notification for accesses.
syzkaller reports:
BUG: KASAN: slab-use-after-free in iopt_unmap_iova_range+0x5ba/0x5f0 Read of size 4 at addr ffff888075996184 by task syz-executor.2/31160 CPU: 1 PID: 31160 Comm: syz-executor.2 Not tainted 6.4.0-rc5-syzkaller-00313-g4c605260bc60 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/25/2023 Call Trace: <TASK> dump_stack_lvl+0xd9/0x150 print_address_description.constprop.0+0x2c/0x3c0 kasan_report+0x11c/0x130 iopt_unmap_iova_range+0x5ba/0x5f0 iopt_unmap_all+0x27/0x50 iommufd_ioas_unmap+0x3d0/0x490 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f0812c8c169 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 f1 19 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f0813914168 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f0812dabf80 RCX: 00007f0812c8c169 RDX: 0000000020000100 RSI: 0000000000003b86 RDI: 0000000000000005 RBP: 00007f0812ce7ca1 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007f0812ecfb1f R14: 00007f0813914300 R15: 0000000000022000 </TASK> Allocated by task 31160: kasan_save_stack+0x22/0x40 kasan_set_track+0x25/0x30 __kasan_kmalloc+0xa2/0xb0 iopt_alloc_area_pages+0x94/0x560 iopt_map_user_pages+0x205/0x4e0 iommufd_ioas_map+0x329/0x5f0 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 31161: kasan_save_stack+0x22/0x40 kasan_set_track+0x25/0x30 kasan_save_free_info+0x2e/0x40 ____kasan_slab_free+0x160/0x1c0 slab_free_freelist_hook+0x8b/0x1c0 __kmem_cache_free+0xaf/0x2d0 iopt_unmap_iova_range+0x288/0x5f0 iopt_unmap_all+0x27/0x50 iommufd_ioas_unmap+0x3d0/0x490 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd The buggy address belongs to the object at ffff888075996100 which belongs to the cache kmalloc-cg-192 of size 192 The buggy address is located 132 bytes inside of freed 192-byte region [ffff888075996100, ffff8880759961c0) The buggy address belongs to the physical page: page:ffffea0001d66580 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x75996 memcg:ffff88801f1c2701 flags: 0xfff00000000200(slab|node=0|zone=1|lastcpupid=0x7ff) page_type: 0xffffffff() raw: 00fff00000000200 ffff88801244ddc0 dead000000000122 0000000000000000 raw: 0000000000000000 0000000080100010 00000001ffffffff ffff88801f1c2701 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 0, migratetype Unmovable, gfp_mask 0x112cc0(GFP_USER|__GFP_NOWARN|__GFP_NORETRY), pid 31157, tgid 31154 (syz-executor.0), ts 1984547323469, free_ts 1983933451331 post_alloc_hook+0x2db/0x350 get_page_from_freelist+0xf41/0x2c00 __alloc_pages+0x1cb/0x4a0 alloc_pages+0x1aa/0x270 allocate_slab+0x25f/0x390 ___slab_alloc+0xa91/0x1400 __slab_alloc.constprop.0+0x56/0xa0 __kmem_cache_alloc_node+0x136/0x320 kmalloc_trace+0x26/0xe0 iommufd_test+0x1328/0x2c20 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd page last free stack trace: free_unref_page_prepare+0x62e/0xcb0 free_unref_page_list+0xe3/0xa70 release_pages+0xcd8/0x1380 tlb_batch_pages_flush+0xa8/0x1a0 tlb_finish_mmu+0x14b/0x7e0 exit_mmap+0x2b2/0x930 __mmput+0x128/0x4c0 mmput+0x60/0x70 do_exit+0x9b0/0x29b0 do_group_exit+0xd4/0x2a0 get_signal+0x2318/0x25b0 arch_do_signal_or_restart+0x79/0x5c0 exit_to_user_mode_prepare+0x11f/0x240 syscall_exit_to_user_mode+0x1d/0x50 do_syscall_64+0x46/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Precompute what is needed to call the access function and do not check the area's num_accesses again as the pointer may not be valid anymore. Use a counter instead.
--- drivers/iommu/iommufd/io_pagetable.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/iommu/iommufd/io_pagetable.c +11 -3
@@ -458,6 +458,7 @@ static int iopt_unmap_iova_range(struct io_pagetable *iopt, unsigned long start, {struct iopt_area *area;unsigned long unmapped_bytes =0 ; +unsigned int tries =0 ;int rc = -ENOENT ;/*
@@ -484,19 +485,26 @@ static int iopt_unmap_iova_range(struct io_pagetable *iopt, unsigned long start, goto out_unlock_iova; } +if (area_first != start) + tries =0 ; +/* * num_accesses writers must hold the iova_rwsem too, so we can * safely read it under the write side of the iovam_rwsem * without the pages->mutex. */ if (area->num_accesses) { +size_t length =iopt_area_length (area); + start = area_first; area->prevent_access = true;up_write (&iopt->iova_rwsem);up_read (&iopt->domains_rwsem); -iommufd_access_notify_unmap (iopt, area_first, -iopt_area_length (area)); -if (WARN_ON (READ_ONCE (area->num_accesses))) + +iommufd_access_notify_unmap (iopt, area_first, length); +/* Something is not responding to unmap requests. */ + tries++; +if (WARN_ON (tries >100 ))return -EDEADLOCK ; goto again; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 434/800 iommufd: Call iopt_area_contig_done() under the lock
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit dbe245cdf5189e88d680379ed13901356628b650 ]
The iter internally holds a pointer to the area and iopt_area_contig_done() will dereference it. The pointer is not valid outside the iova_rwsem.
syzkaller reports:
BUG: KASAN: slab-use-after-free in iommufd_access_unpin_pages+0x363/0x370 Read of size 8 at addr ffff888022286e20 by task syz-executor669/5771 CPU: 0 PID: 5771 Comm: syz-executor669 Not tainted 6.4.0-rc5-syzkaller-00313-g4c605260bc60 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/25/2023 Call Trace: <TASK> dump_stack_lvl+0xd9/0x150 print_address_description.constprop.0+0x2c/0x3c0 kasan_report+0x11c/0x130 iommufd_access_unpin_pages+0x363/0x370 iommufd_test_access_unmap+0x24b/0x390 iommufd_access_notify_unmap+0x24c/0x3a0 iopt_unmap_iova_range+0x4c4/0x5f0 iopt_unmap_all+0x27/0x50 iommufd_ioas_unmap+0x3d0/0x490 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7fec1dae3b19 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 11 15 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fec1da74308 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007fec1db6b438 RCX: 00007fec1dae3b19 RDX: 0000000020000100 RSI: 0000000000003b86 RDI: 0000000000000003 RBP: 00007fec1db6b430 R08: 00007fec1da74700 R09: 0000000000000000 R10: 00007fec1da74700 R11: 0000000000000246 R12: 00007fec1db6b43c R13: 00007fec1db39074 R14: 6d6f692f7665642f R15: 0000000000022000 </TASK> Allocated by task 5770: kasan_save_stack+0x22/0x40 kasan_set_track+0x25/0x30 __kasan_kmalloc+0xa2/0xb0 iopt_alloc_area_pages+0x94/0x560 iopt_map_user_pages+0x205/0x4e0 iommufd_ioas_map+0x329/0x5f0 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 5770: kasan_save_stack+0x22/0x40 kasan_set_track+0x25/0x30 kasan_save_free_info+0x2e/0x40 ____kasan_slab_free+0x160/0x1c0 slab_free_freelist_hook+0x8b/0x1c0 __kmem_cache_free+0xaf/0x2d0 iopt_unmap_iova_range+0x288/0x5f0 iopt_unmap_all+0x27/0x50 iommufd_ioas_unmap+0x3d0/0x490 iommufd_fops_ioctl+0x317/0x4b0 __x64_sys_ioctl+0x197/0x210 do_syscall_64+0x39/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd
The parallel unmap free'd iter->area the instant the lock was released.
--- drivers/iommu/iommufd/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommufd/device.c +1 -1
@@ -553,8 +553,8 @@ void iommufd_access_unpin_pages(struct iommufd_access *access,iopt_area_iova_to_index ( area, min(last_iova, iopt_area_last_iova(area)))); -up_read (&iopt->iova_rwsem);WARN_ON (!iopt_area_contig_done (&iter)); +up_read (&iopt->iova_rwsem); }EXPORT_SYMBOL_NS_GPL (iommufd_access_unpin_pages,IOMMUFD );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 435/800 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 436/800 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
@@ -1036,6 +1036,13 @@ static void vmd_remove(struct pci_dev *dev)ida_simple_remove (&vmd_instance_ida, vmd->instance); } +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) {
@@ -1101,6 +1108,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 437/800 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
@@ -3041,9 +3041,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 438/800 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
@@ -376,10 +376,8 @@ static int bcm2835_add_pin_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 439/800 platform/x86: lenovo-yogabook: Fix work race on remove()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 9148cd2eb4450a8e9c49c8a14201fb82f651128f ]
When yogabook_wmi_remove() runs yogabook_wmi_work might still be running and using the devices which yogabook_wmi_remove() puts.
To avoid this move to explicitly cancelling the work rather then using devm_work_autocancel().
This requires also making the yogabook_backside_hall_irq handler non devm managed, so that it cannot re-queue the work while yogabook_wmi_remove() runs.
--- drivers/platform/x86/lenovo-yogabook-wmi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/platform/x86/lenovo-yogabook-wmi.c +10 -10
@@ -2,7 +2,6 @@/* WMI driver for Lenovo Yoga Book YB1-X90* / -X91* tablets */ #include <linux/acpi.h> -#include <linux/devm-helpers.h> #include <linux/gpio/consumer.h> #include <linux/gpio/machine.h> #include <linux/interrupt.h>
@@ -248,10 +247,7 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context) data->brightness =YB_KBD_BL_DEFAULT ;set_bit (YB_KBD_IS_ON , &data->flags);set_bit (YB_DIGITIZER_IS_ON , &data->flags); - - r =devm_work_autocancel (&wdev->dev, &data->work, yogabook_wmi_work); -if (r) -return r; +INIT_WORK (&data->work, yogabook_wmi_work); data->kbd_adev =acpi_dev_get_first_match_dev ("GDIX1001" ,NULL ,-1 );if (!data->kbd_adev) {
@@ -299,10 +295,9 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context) } data->backside_hall_irq = r; - r =devm_request_irq (&wdev->dev, data->backside_hall_irq, - yogabook_backside_hall_irq, -IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , -"backside_hall_sw" , data); + r =request_irq (data->backside_hall_irq, yogabook_backside_hall_irq, +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +"backside_hall_sw" , data);if (r) {dev_err_probe (&wdev->dev, r,"Requesting backside_hall_sw IRQ\n" ); goto error_put_devs;
@@ -318,11 +313,14 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context) r =devm_led_classdev_register (&wdev->dev, &data->kbd_bl_led);if (r <0 ) {dev_err_probe (&wdev->dev, r,"Registering backlight LED device\n" ); - goto error_put_devs; + goto error_free_irq; }return 0 ; +error_free_irq: +free_irq (data->backside_hall_irq, data); +cancel_work_sync (&data->work); error_put_devs:put_device (data->dig_dev);put_device (data->kbd_dev);
@@ -335,6 +333,8 @@ static void yogabook_wmi_remove(struct wmi_device *wdev) {struct yogabook_wmi *data =dev_get_drvdata (&wdev->dev); +free_irq (data->backside_hall_irq, data); +cancel_work_sync (&data->work);put_device (data->dig_dev);put_device (data->kbd_dev);acpi_dev_put (data->dig_adev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 440/800 platform/x86: lenovo-yogabook: Reprobe devices on remove()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 711bcc0cb34e96a60e88d7b0260862781de3e530 ]
Ensure that both the keyboard touchscreen and the digitizer have their driver bound after remove(). Without this modprobing lenovo-yogabook-wmi after a rmmod fails because lenovo-yogabook-wmi defers probing until both devices have their driver bound.
--- drivers/platform/x86/lenovo-yogabook-wmi.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/platform/x86/lenovo-yogabook-wmi.c +11 -0
@@ -332,9 +332,20 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context)static void yogabook_wmi_remove (struct wmi_device *wdev) {struct yogabook_wmi *data =dev_get_drvdata (&wdev->dev); +int r =0 ;free_irq (data->backside_hall_irq, data);cancel_work_sync (&data->work); + +if (!test_bit (YB_KBD_IS_ON , &data->flags)) + r |=device_reprobe (data->kbd_dev); + +if (!test_bit (YB_DIGITIZER_IS_ON , &data->flags)) + r |=device_reprobe (data->dig_dev); + +if (r) +dev_warn (&wdev->dev,"Reprobe of devices failed\n" ); +put_device (data->dig_dev);put_device (data->kbd_dev);acpi_dev_put (data->dig_adev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 441/800 platform/x86: lenovo-yogabook: Set default keyboard backligh brightness on probe()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 9e6380d6573181c555ca1b5019b08d19a9ee581c ]
Set default keyboard backlight brightness on probe(), this fixes the backlight being off after a rmmod + modprobe.
--- drivers/platform/x86/lenovo-yogabook-wmi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/platform/x86/lenovo-yogabook-wmi.c +3 -0
@@ -295,6 +295,9 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context) } data->backside_hall_irq = r; +/* Set default brightness before enabling the IRQ */ +yogabook_wmi_set_kbd_backlight (data->wdev,YB_KBD_BL_DEFAULT ); + r =request_irq (data->backside_hall_irq, yogabook_backside_hall_irq,IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"backside_hall_sw" , data);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 442/800 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
@@ -1010,21 +1010,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 */
@@ -1032,7 +1035,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 443/800 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 444/800 pinctrl: at91: fix a couple NULL vs IS_ERR() checks
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 35216718c9ac2aef934ea9cd229572d4996807b2 ]
The devm_kasprintf_strarray() function doesn't return NULL on error, it returns error pointers. Update the checks accordingly.
--- drivers/pinctrl/pinctrl-at91.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-at91.c +4 -4
@@ -1389,8 +1389,8 @@ static int at91_pinctrl_probe(struct platform_device *pdev)char **names; names =devm_kasprintf_strarray (dev,"pio" ,MAX_NB_GPIO_PER_BANK ); -if (!names) -return -ENOMEM ; +if (IS_ERR (names)) +return PTR_ERR (names);for (j =0 ; j <MAX_NB_GPIO_PER_BANK ; j++, k++) {char *name = names[j];
@@ -1870,8 +1870,8 @@ static int at91_gpio_probe(struct platform_device *pdev) } names =devm_kasprintf_strarray (dev,"pio" , chip->ngpio); -if (!names) -return -ENOMEM ; +if (IS_ERR (names)) +return PTR_ERR (names);for (i =0 ; i < chip->ngpio; i++)strreplace (names[i],'-' , alias_idx +'A' );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 445/800 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 446/800 perf evsel: Dont let for_each_group() treat the head of the list as one of its nodes
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 797b9ec8c4bc9ec89f633a9b2c710b7b64753ca4 ]
Address/memory sanitizer was reporting issues in evsel__group_pmu_name because the for_each_group_evsel loop didn't terminate when the head was reached, the head would then be cast and accessed as an evsel leading to invalid memory accesses.
Fix for_each_group_member and for_each_group_evsel to terminate at the list head. Note, evsel__group_pmu_name no longer iterates the group, but the problem is present regardless.
--- tools/perf/util/evsel.h | 24 ++++++++++++++++-------- tools/perf/util/evsel_fprintf.c | 1 + 2 files changed, 17 insertions(+), 8 deletions(-)
tools/perf/util/evsel.h +16 -8
@@ -460,16 +460,24 @@ static inline int evsel__group_idx(struct evsel *evsel) }/* Iterates group WITHOUT the leader. */ -#define for_each_group_member (_evsel, _leader) \ -for ((_evsel) = list_entry((_leader)->core.node.next, struct evsel, core.node); \ - (_evsel) && (_evsel)->core.leader == (&_leader->core); \ - (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node)) +#define for_each_group_member_head (_evsel, _leader, _head) \ +for ((_evsel) = list_entry((_leader)->core.node.next, struct evsel, core.node); \ + (_evsel) && &(_evsel)->core.node != (_head) && \ + (_evsel)->core.leader == &(_leader)->core; \ + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node)) + +#define for_each_group_member (_evsel, _leader) \ + for_each_group_member_head(_evsel, _leader, &(_leader)->evlist->core.entries)/* Iterates group WITH the leader. */ -#define for_each_group_evsel (_evsel, _leader) \ -for ((_evsel) = _leader; \ - (_evsel) && (_evsel)->core.leader == (&_leader->core); \ - (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node)) +#define for_each_group_evsel_head (_evsel, _leader, _head) \ +for ((_evsel) = _leader; \ + (_evsel) && &(_evsel)->core.node != (_head) && \ + (_evsel)->core.leader == &(_leader)->core; \ + (_evsel) = list_entry((_evsel)->core.node.next, struct evsel, core.node)) + +#define for_each_group_evsel (_evsel, _leader) \ + for_each_group_evsel_head(_evsel, _leader, &(_leader)->evlist->core.entries)static inline bool evsel__has_branch_callstack (const struct evsel *evsel) {
tools/perf/util/evsel_fprintf.c +1 -0
@@ -2,6 +2,7 @@#include <inttypes.h> #include <stdio.h> #include <stdbool.h> +#include "util/evlist.h" #include "evsel.h" #include "util/evsel_fprintf.h" #include "util/event.h"
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 447/800 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
@@ -429,22 +429,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 448/800 pinctrl: sunplus: Add check for kmalloc
In reply to Greg Kroah-HartmanFrom: Wells Lu <[email protected]>
[ Upstream commit a5961bed5429cf1134d7f539b4ed60317012f84d ]
Fix Smatch static checker warning:
potential null dereference 'configs'. (kmalloc returns null)
--- drivers/pinctrl/sunplus/sppctl.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/pinctrl/sunplus/sppctl.c +18 -6
@@ -834,11 +834,6 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_nodeint i, size =0 ; list =of_get_property (np_config,"sunplus,pins" , &size); - -if (nmG <=0 ) - nmG =0 ; - - parent =of_get_parent (np_config); *num_maps = size /sizeof (*list);/*
@@ -866,10 +861,14 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node } } +if (nmG <=0 ) + nmG =0 ; + *map =kcalloc (*num_maps + nmG,sizeof (**map),GFP_KERNEL ); -if (*map ==NULL ) +if (!(*map))return -ENOMEM ; + parent =of_get_parent (np_config);for (i =0 ; i < (*num_maps); i++) { dt_pin =be32_to_cpu (list[i]); pin_num =FIELD_GET (GENMASK (31 ,24 ), dt_pin);
@@ -883,6 +882,8 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node (*map)[i].data.configs.num_configs =1 ; (*map)[i].data.configs.group_or_pin =pin_get_name (pctldev, pin_num); configs =kmalloc (sizeof (*configs),GFP_KERNEL ); +if (!configs) + goto sppctl_map_err; *configs =FIELD_GET (GENMASK (7 ,0 ), dt_pin); (*map)[i].data.configs.configs = configs;
@@ -896,6 +897,8 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node (*map)[i].data.configs.num_configs =1 ; (*map)[i].data.configs.group_or_pin =pin_get_name (pctldev, pin_num); configs =kmalloc (sizeof (*configs),GFP_KERNEL ); +if (!configs) + goto sppctl_map_err; *configs =SPPCTL_IOP_CONFIGS ; (*map)[i].data.configs.configs = configs;
@@ -965,6 +968,15 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_nodeof_node_put (parent);dev_dbg (pctldev->dev,"%d pins mapped\n" , *num_maps);return 0 ; + +sppctl_map_err: +for (i =0 ; i < (*num_maps); i++) +if (((*map)[i].type ==PIN_MAP_TYPE_CONFIGS_PIN ) && + (*map)[i].data.configs.configs) +kfree ((*map)[i].data.configs.configs); +kfree (*map); +of_node_put (parent); +return -ENOMEM ; }static const struct pinctrl_ops sppctl_pctl_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 449/800 scsi: ufs: Declare ufshcd_{hold,release}() once
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 4b68b7f9c46d90c541d39c8b397a86ac0ca4c765 ]
ufshcd_hold() and ufshcd_release are declared twice: once in drivers/ufs/core/ufshcd-priv.h and a second time in include/ufs/ufshcd.h. Remove the declarations from ufshcd-priv.h.
--- drivers/ufs/core/ufshcd-priv.h | 3 --- 1 file changed, 3 deletions(-)
drivers/ufs/core/ufshcd-priv.h +0 -3
@@ -84,9 +84,6 @@ unsigned long ufshcd_mcq_poll_cqe_lock(struct ufs_hba *hba,int ufshcd_read_string_desc (struct ufs_hba *hba,u8 desc_index,u8 **buf,bool ascii); -int ufshcd_hold (struct ufs_hba *hba,bool async); -void ufshcd_release (struct ufs_hba *hba); -int ufshcd_send_uic_cmd (struct ufs_hba *hba,struct uic_command *uic_cmd); int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 450/800 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
@@ -1903,6 +1903,7 @@ static inline int pci_dev_present(const struct pci_device_id *ids)#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 451/800 scsi: lpfc: Revise NPIV ELS unsol rcv cmpl logic to drop ndlp based on nlp_state
In reply to Greg Kroah-HartmanFrom: Justin Tee <[email protected]>
[ Upstream commit 9914a3d033d3e1d836a43e93e9738e7dd44a096a ]
When NPIV ports are zoned to devices that support both initiator and target mode, a remote device's initiated PRLI results in unintended final kref clean up of the device's ndlp structure. This disrupts NPIV ports' discovery for target devices that support both initiator and target mode.
Modify the NPIV lpfc_drop_node clause such that we allow the ndlp to live so long as it was in NLP_STE_PLOGI_ISSUE, NLP_STE_REG_LOGIN_ISSUE, or NLP_STE_PRLI_ISSUE nlp_state. This allows lpfc's issued PRLI completion routine to determine if the final kref clean up should execute rather than a remote device's issued PRLI.
--- drivers/scsi/lpfc/lpfc_els.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +12 -2
@@ -5468,9 +5468,19 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, ndlp->nlp_flag &= ~NLP_RELEASE_RPI ;spin_unlock_irq (&ndlp->lock); } +lpfc_drop_node (vport, ndlp); + }else if (ndlp->nlp_state !=NLP_STE_PLOGI_ISSUE && + ndlp->nlp_state !=NLP_STE_REG_LOGIN_ISSUE && + ndlp->nlp_state !=NLP_STE_PRLI_ISSUE ) { +/* Drop ndlp if there is no planned or outstanding +* issued PRLI. +* +* In cases when the ndlp is acting as both an initiator +* and target function, let our issued PRLI determine +* the final ndlp kref drop. +*/ +lpfc_drop_node (vport, ndlp); } - -lpfc_drop_node (vport, ndlp); }/* Release the originating I/O reference. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 452/800 scsi: ufs: core: Increase the START STOP UNIT timeout from one to ten seconds
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit fe8637f7708c16765ecf4035813efbfdd2c9be10 ]
One UFS vendor asked to increase the UFS timeout from 1 s to 3 s. Another UFS vendor asked to increase the UFS timeout from 1 s to 10 s. Hence this patch that increases the UFS timeout to 10 s. This patch can cause the total timeout to exceed 20 s, the Android shutdown timeout. This is fine since the loop around ufshcd_execute_start_stop() exists to deal with unit attentions and because unit attentions are reported quickly.
--- drivers/ufs/core/ufshcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +2 -1
@@ -9184,7 +9184,8 @@ static int ufshcd_execute_start_stop(struct scsi_device *sdev, };return scsi_execute_cmd (sdev, cdb,REQ_OP_DRV_IN ,/*buffer=*/ NULL , -/*bufflen=*/ 0 ,/*timeout=*/ HZ ,/*retries=*/ 0 , &args); +/*bufflen=*/ 0 ,/*timeout=*/ 10 *HZ ,/*retries=*/ 0 , + &args); }/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 453/800 scsi: ufs: core: Fix handling of lrbp->cmd
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 549e91a9bbaa0ee480f59357868421a61d369770 ]
ufshcd_queuecommand() may be called two times in a row for a SCSI command before it is completed. Hence make the following changes:
- In the functions that submit a command, do not check the old value of lrbp->cmd nor clear lrbp->cmd in error paths.
- In ufshcd_release_scsi_cmd(), do not clear lrbp->cmd.
See also scsi_send_eh_cmnd().
This commit prevents that the following appears if a command times out:
WARNING: at drivers/ufs/core/ufshcd.c:2965 ufshcd_queuecommand+0x6f8/0x9a8 Call trace: ufshcd_queuecommand+0x6f8/0x9a8 scsi_send_eh_cmnd+0x2c0/0x960 scsi_eh_test_devices+0x100/0x314 scsi_eh_ready_devs+0xd90/0x114c scsi_error_handler+0x2b4/0xb70 kthread+0x16c/0x1e0
--- drivers/ufs/core/ufshcd.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/ufs/core/ufshcd.c +1 -6
@@ -2945,7 +2945,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) (hba->clk_gating.state != CLKS_ON)); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd = cmd; lrbp->task_tag = tag; lrbp->lun =ufshcd_scsi_to_upiu_lun (cmd->device->lun);
@@ -2961,7 +2960,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) err =ufshcd_map_sg (hba, lrbp);if (err) { - lrbp->cmd =NULL ;ufshcd_release (hba); goto out; }
@@ -3180,7 +3178,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); + lrbp->cmd =NULL ; err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);if (unlikely (err)) goto out;
@@ -5422,7 +5420,6 @@ static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,struct scsi_cmnd *cmd = lrbp->cmd;scsi_dma_unmap (cmd); - lrbp->cmd =NULL ;/* Mark the command as completed. */ ufshcd_release (hba);ufshcd_clk_scaling_update_busy (hba); }
@@ -7037,7 +7034,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,down_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =0 ;
@@ -7209,7 +7205,6 @@ int ufshcd_advanced_rpmb_req_handler(struct ufs_hba *hba, struct utp_upiu_req *rdown_read (&hba->clk_scaling_lock); lrbp = &hba->lrb[tag]; -WARN_ON (lrbp->cmd); lrbp->cmd =NULL ; lrbp->task_tag = tag; lrbp->lun =UFS_UPIU_RPMB_WLUN ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 454/800 pinctrl: tegra: Duplicate pinmux functions table
In reply to Greg Kroah-HartmanFrom: Thierry Reding <[email protected]>
[ Upstream commit fad57233501beb5bd25f037cb9128a533e710600 ]
The function table is filled with group information based on other instance-specific data at runtime. However, the function table can be shared between multiple instances, causing the ->probe() function for one instance to overwrite the table of a previously probed instance.
Fix this by sharing only the function names and allocating a separate function table for each instance.
--- drivers/pinctrl/tegra/pinctrl-tegra.c | 15 +++++++++++---- drivers/pinctrl/tegra/pinctrl-tegra.h | 3 ++- drivers/pinctrl/tegra/pinctrl-tegra114.c | 7 ++----- drivers/pinctrl/tegra/pinctrl-tegra124.c | 7 ++----- drivers/pinctrl/tegra/pinctrl-tegra194.c | 7 ++----- drivers/pinctrl/tegra/pinctrl-tegra20.c | 7 ++----- drivers/pinctrl/tegra/pinctrl-tegra210.c | 7 ++----- drivers/pinctrl/tegra/pinctrl-tegra30.c | 7 ++----- 8 files changed, 25 insertions(+), 35 deletions(-)
drivers/pinctrl/tegra/pinctrl-tegra.c +11 -4
@@ -232,7 +232,7 @@ static const char *tegra_pinctrl_get_func_name(struct pinctrl_dev *pctldev, {struct tegra_pmx *pmx =pinctrl_dev_get_drvdata (pctldev); -return pmx->soc->functions[function].name; +return pmx->functions[function].name; } static int tegra_pinctrl_get_func_groups(struct pinctrl_dev *pctldev,
@@ -242,8 +242,8 @@ static int tegra_pinctrl_get_func_groups(struct pinctrl_dev *pctldev, {struct tegra_pmx *pmx =pinctrl_dev_get_drvdata (pctldev); - *groups = pmx->soc->functions[function].groups; - *num_groups = pmx->soc->functions[function].ngroups; + *groups = pmx->functions[function].groups; + *num_groups = pmx->functions[function].ngroups;return 0 ; }
@@ -795,10 +795,17 @@ int tegra_pinctrl_probe(struct platform_device *pdev,if (!pmx->group_pins)return -ENOMEM ; + pmx->functions =devm_kcalloc (&pdev->dev, pmx->soc->nfunctions, +sizeof (*pmx->functions),GFP_KERNEL ); +if (!pmx->functions) +return -ENOMEM ; + group_pins = pmx->group_pins; +for (fn =0 ; fn < soc_data->nfunctions; fn++) { -struct tegra_function *func = &soc_data->functions[fn]; +struct tegra_function *func = &pmx->functions[fn]; + func->name = pmx->soc->functions[fn]; func->groups = group_pins;for (gn =0 ; gn < soc_data->ngroups; gn++) {
drivers/pinctrl/tegra/pinctrl-tegra.h +2 -1
@@ -13,6 +13,7 @@ struct tegra_pmx {struct pinctrl_dev *pctl;const struct tegra_pinctrl_soc_data *soc; +struct tegra_function *functions;const char **group_pins;struct pinctrl_gpio_range gpio_range;
@@ -191,7 +192,7 @@ struct tegra_pinctrl_soc_data {const char *gpio_compatible;const struct pinctrl_pin_desc *pins;unsigned npins; -struct tegra_function *functions; +const char *const *functions;unsigned nfunctions;const struct tegra_pingroup *groups;unsigned ngroups;
drivers/pinctrl/tegra/pinctrl-tegra114.c +2 -5
@@ -1452,12 +1452,9 @@ enum tegra_mux { TEGRA_MUX_VI_ALT3, }; -#define FUNCTION (fname) \ - { \ - .name = #fname, \ - } +#define FUNCTION (fname) #fname -static struct tegra_function tegra114_functions[] = { +static const char *const tegra114_functions[] = {FUNCTION (blink),FUNCTION (cec),FUNCTION (cldvfs),
drivers/pinctrl/tegra/pinctrl-tegra124.c +2 -5
@@ -1611,12 +1611,9 @@ enum tegra_mux { TEGRA_MUX_VIMCLK2_ALT, }; -#define FUNCTION (fname) \ - { \ - .name = #fname, \ - } +#define FUNCTION (fname) #fname -static struct tegra_function tegra124_functions[] = { +static const char *const tegra124_functions[] = {FUNCTION (blink),FUNCTION (ccla),FUNCTION (cec),
drivers/pinctrl/tegra/pinctrl-tegra194.c +2 -5
@@ -1189,12 +1189,9 @@ enum tegra_mux_dt { };/* Make list of each function name */ -#define TEGRA_PIN_FUNCTION (lid) \ - { \ - .name = #lid, \ - } +#define TEGRA_PIN_FUNCTION (lid) #lid -static struct tegra_function tegra194_functions[] = { +static const char *const tegra194_functions[] = {TEGRA_PIN_FUNCTION (rsvd0),TEGRA_PIN_FUNCTION (rsvd1),TEGRA_PIN_FUNCTION (rsvd2),
drivers/pinctrl/tegra/pinctrl-tegra20.c +2 -5
@@ -1889,12 +1889,9 @@ enum tegra_mux { TEGRA_MUX_XIO, }; -#define FUNCTION (fname) \ - { \ - .name = #fname, \ - } +#define FUNCTION (fname) #fname -static struct tegra_function tegra20_functions[] = { +static const char *const tegra20_functions[] = {FUNCTION (ahb_clk),FUNCTION (apb_clk),FUNCTION (audio_sync),
drivers/pinctrl/tegra/pinctrl-tegra210.c +2 -5
@@ -1185,12 +1185,9 @@ enum tegra_mux { TEGRA_MUX_VIMCLK2, }; -#define FUNCTION (fname) \ - { \ - .name = #fname, \ - } +#define FUNCTION (fname) #fname -static struct tegra_function tegra210_functions[] = { +static const char *const tegra210_functions[] = {FUNCTION (aud),FUNCTION (bcl),FUNCTION (blink),
drivers/pinctrl/tegra/pinctrl-tegra30.c +2 -5
@@ -2010,12 +2010,9 @@ enum tegra_mux { TEGRA_MUX_VI_ALT3, }; -#define FUNCTION (fname) \ - { \ - .name = #fname, \ - } +#define FUNCTION (fname) #fname -static struct tegra_function tegra30_functions[] = { +static const char *const tegra30_functions[] = {FUNCTION (blink),FUNCTION (cec),FUNCTION (clk_12m_out),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 455/800 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>
@@ -260,6 +261,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 456/800 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
@@ -949,11 +949,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;
@@ -963,6 +958,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 457/800 platform/x86:intel/pmc: Remove Meteor Lake S platform support
In reply to Greg Kroah-HartmanFrom: Xi Pardee <[email protected]>
[ Upstream commit 416a87c972b978d71ab828442d1d48e3bd194855 ]
commit c5ad454a12c6 ("platform/x86: intel/pmc/core: Add Meteor Lake support to pmc core driver") was supposed to add support for Meter Lake P/M and mistakenly added support for Meteor Lake S instead. Meteor Lake P/M support was added later and MTL-S support needs to be removed since its currently assigned to the wrong register maps.
--- drivers/platform/x86/intel/pmc/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/platform/x86/intel/pmc/core.c +0 -1
@@ -1039,7 +1039,6 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_P , tgl_core_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , adl_core_init),X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE_S , adl_core_init), -X86_MATCH_INTEL_FAM6_MODEL (METEORLAKE , mtl_core_init), X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, mtl_core_init), {} };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 458/800 platform/x86: think-lmi: mutex protection around multiple WMI calls
In reply to Greg Kroah-HartmanFrom: Mark Pearson <[email protected]>
[ Upstream commit c41e0121a1221894a1a9c4666156db9e1def4d6c ]
When an attribute is being changed if the Admin account is enabled, or if a password is being updated then multiple WMI calls are needed. Add mutex protection to ensure no race conditions are introduced.
--- drivers/platform/x86/think-lmi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/platform/x86/think-lmi.c +10 -0
@@ -14,6 +14,7 @@#include <linux/acpi.h> #include <linux/errno.h> #include <linux/fs.h> +#include <linux/mutex.h> #include <linux/string.h> #include <linux/types.h> #include <linux/dmi.h>
@@ -195,6 +196,7 @@ static const char * const level_options[] = { };static struct think_lmi tlmi_priv;static struct class *fw_attr_class; +static DEFINE_MUTEX (tlmi_mutex);/* ------ Utility functions ------------*/ /* Strip out CR if one is present */
@@ -437,6 +439,9 @@ static ssize_t new_password_store(struct kobject *kobj,/* Strip out CR if one is present, setting password won't work if it is present */ strip_cr (new_pwd); +/* Use lock in case multiple WMI operations needed */ +mutex_lock (&tlmi_mutex); + pwdlen =strlen (new_pwd);/* pwdlen == 0 is allowed to clear the password */ if (pwdlen && ((pwdlen < setting->minlen) || (pwdlen > setting->maxlen))) {
@@ -493,6 +498,7 @@ static ssize_t new_password_store(struct kobject *kobj,kfree (auth_str); } out: +mutex_unlock (&tlmi_mutex);kfree (new_pwd);return ret ?: count; }
@@ -981,6 +987,9 @@ static ssize_t current_value_store(struct kobject *kobj,/* Strip out CR if one is present */ strip_cr (new_setting); +/* Use lock in case multiple WMI operations needed */ +mutex_lock (&tlmi_mutex); +/* Check if certificate authentication is enabled and active */ if (tlmi_priv.certificate_support && tlmi_priv.pwd_admin->cert_installed) {if (!tlmi_priv.pwd_admin->signature || !tlmi_priv.pwd_admin->save_signature) {
@@ -1039,6 +1048,7 @@ static ssize_t current_value_store(struct kobject *kobj,kobject_uevent (&tlmi_priv.class_dev->kobj,KOBJ_CHANGE ); } out: +mutex_unlock (&tlmi_mutex);kfree (auth_str);kfree (set_str);kfree (new_setting);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 459/800 platform/x86: think-lmi: Correct System password interface
In reply to Greg Kroah-HartmanFrom: Mark Pearson <[email protected]>
[ Upstream commit 97eef5983372d7aee6549d644d788fd0c10d2b6e ]
The system password identification was incorrect. This means that if the password was enabled it wouldn't be detected correctly; and setting it would not work.
Also updated code to use TLMI_SMP_PWD instead of TLMI_SYS_PWD to be in sync with Lenovo documentation.
--- drivers/platform/x86/think-lmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/think-lmi.c +3 -3
@@ -172,7 +172,7 @@ MODULE_PARM_DESC(debug_support, "Enable debug command support");#define TLMI_POP_PWD (1 << 0)#define TLMI_PAP_PWD (1 << 1)#define TLMI_HDD_PWD (1 << 2) -#define TLMI_SYS_PWD (1 << 3) +#define TLMI_SMP_PWD (1 << 6)/* System Management */ #define TLMI_CERT (1 << 7)#define to_tlmi_pwd_setting (kobj) container_of(kobj, struct tlmi_pwd_setting, kobj)
@@ -1493,11 +1493,11 @@ static int tlmi_analyze(void) tlmi_priv.pwd_power->valid = true;if (tlmi_priv.opcode_support) { - tlmi_priv.pwd_system =tlmi_create_auth ("sys" ,"system" ); + tlmi_priv.pwd_system =tlmi_create_auth ("smp" ,"system" );if (!tlmi_priv.pwd_system) goto fail_clear_attr; -if (tlmi_priv.pwdcfg.core.password_state &TLMI_SYS_PWD ) +if (tlmi_priv.pwdcfg.core.password_state &TLMI_SMP_PWD ) tlmi_priv.pwd_system->valid = true; tlmi_priv.pwd_hdd =tlmi_create_auth ("hdd" ,"hdd" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 460/800 platform/x86: think-lmi: Correct NVME password handling
In reply to Greg Kroah-HartmanFrom: Mark Pearson <[email protected]>
[ Upstream commit 4cebb42412248d28df6de01420cfac5654428d41 ]
NVME passwords identifier have been standardised across the Lenovo systems and now use udrp and adrp (user and admin level) instead of unvp and mnvp.
This should apparently be backwards compatible.
--- drivers/platform/x86/think-lmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/think-lmi.c +2 -2
@@ -461,9 +461,9 @@ static ssize_t new_password_store(struct kobject *kobj,sprintf (pwd_type,"mhdp%d" , setting->index); }else if (setting == tlmi_priv.pwd_nvme) {if (setting->level ==TLMI_LEVEL_USER ) -sprintf (pwd_type,"unvp%d" , setting->index); +sprintf (pwd_type,"udrp%d" , setting->index);else -sprintf (pwd_type,"mnvp%d" , setting->index); +sprintf (pwd_type,"adrp%d" , setting->index); }else {sprintf (pwd_type,"%s" , setting->pwd_type); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 461/800 pinctrl:sunplus: Add check for kmalloc
In reply to Greg Kroah-HartmanFrom: Wells Lu <[email protected]>
[ Upstream commit 73f8ce7f961afcb3be49352efeb7c26cc1c00cc4 ]
Fix Smatch static checker warning:
potential null dereference 'configs'. (kmalloc returns null)
Changes in v2:
1. Add free allocated memory before returned -ENOMEM.
2. Add call of_node_put() before returned -ENOMEM.
--- drivers/pinctrl/sunplus/sppctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pinctrl/sunplus/sppctl.c +1 -2
@@ -971,8 +971,7 @@ static int sppctl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node sppctl_map_err:for (i =0 ; i < (*num_maps); i++) -if (((*map)[i].type ==PIN_MAP_TYPE_CONFIGS_PIN ) && - (*map)[i].data.configs.configs) +if ((*map)[i].type ==PIN_MAP_TYPE_CONFIGS_PIN )kfree ((*map)[i].data.configs.configs);kfree (*map);of_node_put (parent);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 462/800 pinctrl: npcm7xx: Add missing check for ioremap
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ad64639417161e90b30dda00486570eb150aeee5 ]
Add check for ioremap() and return the error if it fails in order to guarantee the success of ioremap().
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +2 -0
@@ -1884,6 +1884,8 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl) } pctrl->gpio_bank[id].base =ioremap (res.start,resource_size (&res)); +if (!pctrl->gpio_bank[id].base) +return -EINVAL ; ret = bgpio_init(&pctrl->gpio_bank[id].gc, dev, 4, pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DIN,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 463/800 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
@@ -1270,7 +1270,9 @@ static __always_inline void kcsan_atomic_builtin_memorder(int memorder)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 464/800 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
@@ -368,7 +368,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 =read_thread_flags () & _TIF_EMULATE_STACK_STORE;
@@ -392,7 +391,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 465/800 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
@@ -264,8 +264,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;
@@ -364,8 +365,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);
@@ -444,8 +446,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 466/800 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
@@ -2422,6 +2422,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) {
@@ -2430,7 +2433,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)
@@ -2440,14 +2442,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; } }
@@ -2753,7 +2754,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 467/800 platform/x86: thinkpad_acpi: Fix lkp-tests warnings for platform profiles
In reply to Greg Kroah-HartmanFrom: Mark Pearson <[email protected]>
[ Upstream commit f999e23ce66c1555d7b653fba171a88ecee53704 ]
Fix issues identified in dytc_profile_refresh identified by lkp-tests. drivers/platform/x86/thinkpad_acpi.c:10538
dytc_profile_refresh() error: uninitialized symbol 'funcmode'.drivers/platform/x86/thinkpad_acpi.c:10531
dytc_profile_refresh() error: uninitialized symbol 'output'.drivers/platform/x86/thinkpad_acpi.c:10537
dytc_profile_refresh() error: uninitialized symbol 'output'.
These issues should not lead to real problems in the field as the refresh function should only be called if MMC or PSC mode enabled. But good to fix.
Thanks to Dan Carpenter and the lkp-tests project for flagging these.
--- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -2
@@ -10524,8 +10524,8 @@ static int dytc_profile_set(struct platform_profile_handler *pprof,static void dytc_profile_refresh (void ) {enum platform_profile_option profile; -int output, err =0 ; -int perfmode, funcmode; +int output =0 , err =0 ; +int perfmode, funcmode =0 ;mutex_lock (&dytc_mutex);if (dytc_capabilities &BIT (DYTC_FC_MMC )) {
@@ -10538,6 +10538,8 @@ static void dytc_profile_refresh(void) err =dytc_command (DYTC_CMD_GET , &output);/* Check if we are PSC mode, or have AMT enabled */ funcmode = (output >>DYTC_GET_FUNCTION_BIT ) &0xF ; + }else {/* Unknown profile mode */ + err = -ENODEV ; }mutex_unlock (&dytc_mutex);if (err)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 468/800 platform/x86/intel/pmc: Add resume callback
In reply to Greg Kroah-HartmanFrom: David E. Box <[email protected]>
[ Upstream commit 801e5dc9853fcc36164c502456078145d72b23c5 ]
Add a resume callback to perform platform specific functions during resume from suspend.
Stable-dep-of: f2b689ab2f8c ("platform/x86/intel/pmc/mtl: Put devices in D3 during resume")
--- drivers/platform/x86/intel/pmc/core.c | 14 ++++++++++++-- drivers/platform/x86/intel/pmc/core.h | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/pmc/core.c +12 -2
@@ -1222,11 +1222,11 @@ static inline bool pmc_core_is_s0ix_failed(struct pmc_dev *pmcdev)return false; } -static __maybe_unused int pmc_core_resume (struct device *dev) +int pmc_core_resume_common (struct pmc_dev *pmcdev) { -struct pmc_dev *pmcdev =dev_get_drvdata (dev);const struct pmc_bit_map **maps = pmcdev->map->lpm_sts;int offset = pmcdev->map->lpm_status_offset; +struct device *dev = &pmcdev->pdev->dev;/* Check if the syspend used S0ix */ if (pm_suspend_via_firmware ())
@@ -1256,6 +1256,16 @@ static __maybe_unused int pmc_core_resume(struct device *dev)return 0 ; } +static __maybe_unused int pmc_core_resume (struct device *dev) +{ +struct pmc_dev *pmcdev =dev_get_drvdata (dev); + +if (pmcdev->resume) +return pmcdev->resume (pmcdev); + +return pmc_core_resume_common (pmcdev); +} +static const struct dev_pm_ops pmc_core_pm_ops = {SET_LATE_SYSTEM_SLEEP_PM_OPS (pmc_core_suspend, pmc_core_resume) };
drivers/platform/x86/intel/pmc/core.h +3 -0
@@ -327,6 +327,7 @@ struct pmc_reg_map {* @lpm_en_modes: Array of enabled modes from lowest to highest priority * @lpm_req_regs: List of substate requirements * @core_configure: Function pointer to configure the platform +* @resume: Function to perform platform specific resume * * pmc_dev contains info about power management controller device. */
@@ -345,6 +346,7 @@ struct pmc_dev {int lpm_en_modes[LPM_MAX_NUM_MODES ];u32 *lpm_req_regs;void (*core_configure)(struct pmc_dev *pmcdev); +int (*resume)(struct pmc_dev *pmcdev); };extern const struct pmc_bit_map msr_map[];
@@ -398,6 +400,7 @@ extern const struct pmc_reg_map mtl_reg_map;extern void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value); +int pmc_core_resume_common (struct pmc_dev *pmcdev);void spt_core_init (struct pmc_dev *pmcdev);void cnp_core_init (struct pmc_dev *pmcdev);void icl_core_init (struct pmc_dev *pmcdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 469/800 platform/x86/intel/pmc/mtl: Put devices in D3 during resume
In reply to Greg Kroah-HartmanFrom: David E. Box <[email protected]>
[ Upstream commit f2b689ab2f8cc089cc7659c323f282e6a1fb6d64 ]
An earlier commit placed some driverless devices in D3 during boot so that they don't block package cstate entry on Meteor Lake. Also place these devices in D3 after resume from suspend.
--- drivers/platform/x86/intel/pmc/mtl.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/platform/x86/intel/pmc/mtl.c +20 -7
@@ -68,16 +68,29 @@ static void mtl_set_device_d3(unsigned int device) } } +/* +* Set power state of select devices that do not have drivers to D3 +* so that they do not block Package C entry. +*/ +static void mtl_d3_fixup (void ) +{ +mtl_set_device_d3 (MTL_GNA_PCI_DEV ); +mtl_set_device_d3 (MTL_IPU_PCI_DEV ); +mtl_set_device_d3 (MTL_VPU_PCI_DEV ); +} + +static int mtl_resume (struct pmc_dev *pmcdev) +{ +mtl_d3_fixup (); +return pmc_core_resume_common (pmcdev); +} +void mtl_core_init (struct pmc_dev *pmcdev) { pmcdev->map = &mtl_reg_map; pmcdev->core_configure = mtl_core_configure; -/* -* Set power state of select devices that do not have drivers to D3 -* so that they do not block Package C entry. -*/ -mtl_set_device_d3 (MTL_GNA_PCI_DEV ); -mtl_set_device_d3 (MTL_IPU_PCI_DEV ); -mtl_set_device_d3 (MTL_VPU_PCI_DEV ); +mtl_d3_fixup (); + + pmcdev->resume = mtl_resume; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 470/800 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
@@ -1103,7 +1103,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 471/800 perf metric: Fix no group check
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
[ Upstream commit e4c4e8a538a0db071d291bc2dca487e1882a7d4f ]
The no group check fails if there is more than one meticgroup in the metricgroup_no_group.
The first parameter of the match_metric() should be the string, while the substring should be the second parameter.
--- tools/perf/util/metricgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/metricgroup.c +1 -1
@@ -1146,7 +1146,7 @@ static int metricgroup__add_metric_callback(const struct pmu_metric *pm,if (pm->metric_expr &&match_pm_metric (pm, data->metric_name)) {bool metric_no_group = data->metric_no_group || -match_metric (data->metric_name, pm->metricgroup_no_group); +match_metric (pm->metricgroup_no_group, data->metric_name); data->has_match = true; ret = add_metric(data->list, pm, data->modifier, metric_no_group,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 472/800 perf tests task_analyzer: Fix bad substitution ${$1}
In reply to Greg Kroah-HartmanFrom: Aditya Gupta <[email protected]>
[ Upstream commit 5c4396efb53ef07d046a2e9456b240880e0c3076 ]
${$1} gives bad substitution error on sh, bash, and zsh. This seems like a typo, and this patch modifies it to $1, since that is what it's usage looks like from wherever check_exec_0 is called.
This issue due to ${$1} caused all function calls to give error in find_str_or_fail line, and so no test runs completely. But 'perf test "perf script task-analyzer tests"' wrongly reports that tests passed with the status OK, which is wrong considering the tests didn't even run completely
--- tools/perf/tests/shell/test_task_analyzer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/test_task_analyzer.sh +1 -1
@@ -31,7 +31,7 @@ report() { check_exec_0() { if [ $? != 0 ]; then - report 1 "invokation of ${$1} command failed" + report 1 "invocation of $1 command failed" fi }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 473/800 perf tests task_analyzer: Skip tests if no libtraceevent support
In reply to Greg Kroah-HartmanFrom: Aditya Gupta <[email protected]>
[ Upstream commit c3ac3b0779770acd3ad7eecb5099ab4419ef2e2e ]
Test "perf script task-analyzer tests" fails in environment with missing libtraceevent support, as perf record fails to create the perf.data file, which further tests depend on.
Instead, when perf is not compiled with libtraceevent support, skip those tests instead of failing them, by checking the output of perf record --dry-run to see if it prints the error "libtraceevent is necessary for tracepoint support"
For the following output, perf compiled with: make NO_LIBTRACEEVENT=1
Before the patch:
108: perf script task-analyzer tests :
test child forked, pid 24105
failed to open perf.data: No such file or directory (try 'perf record' first)
FAIL: "invokation of perf script report task-analyzer command failed" Error message: ""
FAIL: "test_basic" Error message: "Failed to find required string:'Comm'."
failed to open perf.data: No such file or directory (try 'perf record' first)
FAIL: "invokation of perf script report task-analyzer --ns --rename-comms-by-tids 0:random command failed" Error message: ""
FAIL: "test_ns_rename" Error message: "Failed to find required string:'Comm'."
failed to open perf.data: No such file or directory (try 'perf record' first)
<...>
perf script task-analyzer tests: FAILED!
With this patch, the script instead returns 2 signifying SKIP, and after the patch:
108: perf script task-analyzer tests :
test child forked, pid 26010
libtraceevent is necessary for tracepoint support
WARN: Skipping tests. No libtraceevent support
test child finished with -2
perf script task-analyzer tests: Skip
--- tools/perf/tests/shell/test_task_analyzer.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/perf/tests/shell/test_task_analyzer.sh +18 -0
@@ -44,9 +44,20 @@ find_str_or_fail() { fi } +# check if perf is compiled with libtraceevent support +skip_no_probe_record_support() { + perf record -e "sched:sched_switch" -a -- sleep 1 2>&1 | grep "libtraceevent is necessary for tracepoint support" && return 2 + return 0 +} + prepare_perf_data() { # 1s should be sufficient to catch at least some switches perf record -e sched:sched_switch -a -- sleep 1 > /dev/null 2>&1 + # check if perf data file got created in above step. + if [ ! -e "perf.data" ]; then + printf "FAIL: perf record failed to create \"perf.data\" \n" + return 1 + fi } # check standard inkvokation with no arguments
@@ -134,6 +145,13 @@ test_csvsummary_extended() { find_str_or_fail "Out-Out;" csvsummary ${FUNCNAME[0]} } +skip_no_probe_record_support +err=$? +if [ $err -ne 0 ]; then + echo "WARN: Skipping tests. No libtraceevent support" + cleanup + exit $err +fi prepare_perf_data test_basic test_ns_rename
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 474/800 platform/x86/dell/dell-rbtn: Fix resources leaking on error path
In reply to Greg Kroah-HartmanFrom: Michal Wilczynski <[email protected]>
[ Upstream commit 966cca72ab20289083521a385fa56035d85a222d ]
Currently rbtn_add() in case of failure is leaking resources. Fix this by adding a proper rollback. Move devm_kzalloc() before rbtn_acquire(), so it doesn't require rollback in case of failure. While at it, remove unnecessary assignment of NULL to device->driver_data and unnecessary whitespace, plus add a break for the default case in a switch.
--- drivers/platform/x86/dell/dell-rbtn.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/platform/x86/dell/dell-rbtn.c +7 -6
@@ -395,16 +395,16 @@ static int rbtn_add(struct acpi_device *device)return -EINVAL ; } + rbtn_data =devm_kzalloc (&device->dev,sizeof (*rbtn_data),GFP_KERNEL ); +if (!rbtn_data) +return -ENOMEM ; + ret =rbtn_acquire (device, true);if (ret <0 ) {dev_err (&device->dev,"Cannot enable device\n" );return ret; } - rbtn_data =devm_kzalloc (&device->dev,sizeof (*rbtn_data),GFP_KERNEL ); -if (!rbtn_data) -return -ENOMEM ; - rbtn_data->type = type; device->driver_data = rbtn_data;
@@ -420,10 +420,12 @@ static int rbtn_add(struct acpi_device *device)break ;default : ret = -EINVAL ; +break ; } +if (ret) +rbtn_acquire (device, false);return ret; - }static void rbtn_remove (struct acpi_device *device)
@@ -442,7 +444,6 @@ static void rbtn_remove(struct acpi_device *device) }rbtn_acquire (device, false); - device->driver_data =NULL ; }static void rbtn_notify (struct acpi_device *device,u32 event)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 475/800 perf tool x86: Consolidate is_amd check into single function
In reply to Greg Kroah-HartmanFrom: Ravi Bangoria <[email protected]>
[ Upstream commit 0cd1ca4650c9cf5f318110f67d39cbebae3693b3 ]
There are multiple places where x86 specific code determines AMD vs Intel arch and acts based on that. Consolidate those checks into a single function.
Stable-dep-of: 99d4850062a8 ("perf tool x86: Fix perf_env memory leak")
--- tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/env.c | 19 +++++++++++++++++++ tools/perf/arch/x86/util/env.h | 7 +++++++ tools/perf/arch/x86/util/evsel.c | 16 ++-------------- tools/perf/arch/x86/util/mem-events.c | 19 ++----------------- 5 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 tools/perf/arch/x86/util/env.c create mode 100644 tools/perf/arch/x86/util/env.h
tools/perf/arch/x86/util/Build +1 -0
@@ -10,6 +10,7 @@ perf-y += evlist.o perf-y += mem-events.o perf-y += evsel.o perf-y += iostat.o +perf-y += env.o perf-$(CONFIG_DWARF) += dwarf-regs.o perf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
tools/perf/arch/x86/util/env.c new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "linux/string.h" +#include "util/env.h" +#include "env.h" + +bool x86__is_amd_cpu (void ) +{ +struct perf_env env = { .total_mem =0 , }; +static int is_amd;/* 0: Uninitialized, 1: Yes, -1: No */ + +if (is_amd) + goto ret; + +perf_env__cpuid (&env); + is_amd = env.cpuid &&strstarts (env.cpuid,"AuthenticAMD" ) ?1 :-1 ; + +ret: +return is_amd >=1 ? true : false; +}
tools/perf/arch/x86/util/env.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _X86_ENV_H +#define _X86_ENV_H + +bool x86__is_amd_cpu (void ); + +#endif /* _X86_ENV_H */
tools/perf/arch/x86/util/evsel.c +2 -14
@@ -7,6 +7,7 @@#include "linux/string.h" #include "evsel.h" #include "util/debug.h" +#include "env.h" #define IBS_FETCH_L3MISSONLY (1ULL << 59)#define IBS_OP_L3MISSONLY (1ULL << 16)
@@ -97,23 +98,10 @@ void arch__post_evsel_config(struct evsel *evsel, struct perf_event_attr *attr) {struct perf_pmu *evsel_pmu, *ibs_fetch_pmu, *ibs_op_pmu;static int warned_once; -/* 0: Uninitialized, 1: Yes, -1: No */ -static int is_amd; -if (warned_once || is_amd ==-1 ) +if (warned_once || !x86__is_amd_cpu ())return ; -if (!is_amd) { -struct perf_env *env =evsel__env (evsel); - -if (!perf_env__cpuid (env) || !env->cpuid || - !strstarts (env->cpuid,"AuthenticAMD" )) { - is_amd =-1 ; -return ; - } - is_amd =1 ; - } - evsel_pmu =evsel__find_pmu (evsel);if (!evsel_pmu)return ;
tools/perf/arch/x86/util/mem-events.c +2 -17
@@ -4,6 +4,7 @@#include "map_symbol.h" #include "mem-events.h" #include "linux/string.h" +#include "env.h" static char mem_loads_name[100 ];static bool mem_loads_name__init;
@@ -26,28 +27,12 @@ static struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { E("mem-ldst", "ibs_op//", "ibs_op"), }; -static int perf_mem_is_amd_cpu (void ) -{ -struct perf_env env = { .total_mem =0 , }; - -perf_env__cpuid (&env); -if (env.cpuid &&strstarts (env.cpuid,"AuthenticAMD" )) -return 1 ; -return -1 ; -} -struct perf_mem_event *perf_mem_events__ptr (int i) { -/* 0: Uninitialized, 1: Yes, -1: No */ -static int is_amd; -if (i >=PERF_MEM_EVENTS__MAX )return NULL ; -if (!is_amd) - is_amd =perf_mem_is_amd_cpu (); - -if (is_amd ==1 ) +if (x86__is_amd_cpu ())return &perf_mem_events_amd[i];return &perf_mem_events_intel[i];
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 476/800 perf tool x86: Fix perf_env memory leak
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 99d4850062a84564f36923764bb93935ef2ed108 ]
Found by leak sanitizer:
```
==1632594==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 21 byte(s) in 1 object(s) allocated from:
#0 0x7f2953a7077b in __interceptor_strdup ../../../../src/libsanitizer/asan/asan_interceptors.cpp:439
#1 0x556701d6fbbf in perf_env__read_cpuid util/env.c:369
#2 0x556701d70589 in perf_env__cpuid util/env.c:465
#3 0x55670204bba2 in x86__is_amd_cpu arch/x86/util/env.c:14
#4 0x5567020487a2 in arch__post_evsel_config arch/x86/util/evsel.c:83
#5 0x556701d8f78b in evsel__config util/evsel.c:1366
#6 0x556701ef5872 in evlist__config util/record.c:108
#7 0x556701cd6bcd in test__PERF_RECORD tests/perf-record.c:112
#8 0x556701cacd07 in run_test tests/builtin-test.c:236
#9 0x556701cacfac in test_and_print tests/builtin-test.c:265
#10 0x556701cadddb in __cmd_test tests/builtin-test.c:402
#11 0x556701caf2aa in cmd_test tests/builtin-test.c:559
#12 0x556701d3b557 in run_builtin tools/perf/perf.c:323
#13 0x556701d3bac8 in handle_internal_command tools/perf/perf.c:377
#14 0x556701d3be90 in run_argv tools/perf/perf.c:421
#15 0x556701d3c3f8 in main tools/perf/perf.c:537
#16 0x7f2952a46189 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
SUMMARY: AddressSanitizer: 21 byte(s) leaked in 1 allocation(s).
```--- tools/perf/arch/x86/util/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/env.c +1 -1
@@ -13,7 +13,7 @@ bool x86__is_amd_cpu(void)perf_env__cpuid (&env); is_amd = env.cpuid &&strstarts (env.cpuid,"AuthenticAMD" ) ?1 :-1 ; - +perf_env__exit (&env); ret:return is_amd >=1 ? true : false; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 477/800 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
@@ -507,8 +507,8 @@ static int vas_deallocate_window(struct vas_window *vwin) vascaps[win->win_type].nr_open_windows--;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 478/800 pinctrl: freescale: Fix a memory out of bounds when num_configs is 1
In reply to Greg Kroah-HartmanFrom: Xiaolei Wang <[email protected]>
[ Upstream commit 9063777ca1e2e895c5fdd493ee0c3f18fa710ed4 ]
The config passed in by pad wakeup is 1, when num_configs is 1, Configuration [1] should not be fetched, which will be detected by KASAN as a memory out of bounds condition. Modify to get configs[1] when num_configs is 2.
--- drivers/pinctrl/freescale/pinctrl-scu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/freescale/pinctrl-scu.c +2 -1
@@ -90,7 +90,7 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,struct imx_sc_msg_req_pad_set msg;struct imx_sc_rpc_msg *hdr = &msg.hdr;unsigned int mux = configs[0 ]; -unsigned int conf = configs[1 ]; +unsigned int conf;unsigned int val;int ret;
@@ -115,6 +115,7 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,* Set mux and conf together in one IPC call */ WARN_ON (num_configs !=2 ); + conf = configs[1 ]; val = conf |BM_PAD_CTL_IFMUX_ENABLE |BM_PAD_CTL_GP_ENABLE ; val |= mux <<BP_PAD_CTL_IFMUX ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 479/800 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
@@ -818,6 +818,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 480/800 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
@@ -1146,6 +1146,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%u" , 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 481/800 perf stat: Reset aggr stats for each run
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit ed4090a22c123b9b33368741253edddc6ff8d18f ]
When it runs multiple times with -r option, it missed to reset the aggregation counters and the values were added up. The aggregation count has the values to be printed in the end. It should reset the counters at the beginning of each run. But the current code does that only when -I/--interval-print option is given.
--- tools/perf/builtin-stat.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/builtin-stat.c +2 -0
@@ -723,6 +723,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) all_counters_use_bpf = false; } +evlist__reset_aggr_stats (evsel_list); +evlist__for_each_cpu (evlist_cpu_itr, evsel_list, affinity) { counter = evlist_cpu_itr.evsel;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 482/800 scsi: ufs: core: Remove a ufshcd_add_command_trace() call
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 72554035b9797e00e68cd866e6cefa7f0b2c6f76 ]
ufshcd_add_command_trace() traces SCSI commands. Remove a ufshcd_add_command_trace() call from a code path that is not related to SCSI commands.
Stable-dep-of: 0fef6bb730c4 ("scsi: ufs: core: mcq: Fix the incorrect OCS value for the device command")
--- drivers/ufs/core/ufshcd.c | 1 - 1 file changed, 1 deletion(-)
drivers/ufs/core/ufshcd.c +0 -1
@@ -5451,7 +5451,6 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag, lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {if (hba->dev_cmd.complete) { hba->dev_cmd.cqe = cqe; -ufshcd_add_command_trace (hba, task_tag,UFS_DEV_COMP );complete (hba->dev_cmd.complete);ufshcd_clk_scaling_update_busy (hba); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 483/800 scsi: ufs: core: mcq: Fix the incorrect OCS value for the device command
In reply to Greg Kroah-HartmanFrom: Stanley Chu <[email protected]>
[ Upstream commit 0fef6bb730c490fcdc4347dbd21646d3ffe62cf5 ]
In MCQ mode, when a device command uses a hardware queue shared with other commands, a race condition may occur in the following scenario:
1. A device command is completed in CQx with CQE entry "e".
2. The interrupt handler copies the "cqe" pointer to "hba->dev_cmd.cqe"
and completes "hba->dev_cmd.complete".
3. The "ufshcd_wait_for_dev_cmd()" function is awakened and retrieves the
OCS value from "hba->dev_cmd.cqe".
However, there is a possibility that the CQE entry "e" will be overwritten by newly completed commands in CQx, resulting in an incorrect OCS value being received by "ufshcd_wait_for_dev_cmd()".
To avoid this race condition, the OCS value should be immediately copied to the struct "lrb" of the device command. Then "ufshcd_wait_for_dev_cmd()" can retrieve the OCS value from the struct "lrb".
--- drivers/ufs/core/ufshcd.c | 10 +++++++--- include/ufs/ufshcd.h | 1 - 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/ufs/core/ufshcd.c +7 -3
@@ -3097,7 +3097,7 @@ static int ufshcd_wait_for_dev_cmd(struct ufs_hba *hba,* not trigger any race conditions. */ hba->dev_cmd.complete =NULL ; - err =ufshcd_get_tr_ocs (lrbp, hba->dev_cmd.cqe); + err =ufshcd_get_tr_ocs (lrbp,NULL );if (!err) err =ufshcd_dev_cmd_completion (hba, lrbp); }else {
@@ -3184,7 +3184,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, goto out; hba->dev_cmd.complete = &wait; - hba->dev_cmd.cqe =NULL ;ufshcd_add_query_upiu_trace (hba,UFS_QUERY_SEND , lrbp->ucd_req_ptr);
@@ -5435,6 +5434,7 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag, {struct ufshcd_lrb *lrbp;struct scsi_cmnd *cmd; +enum utp_ocs ocs; lrbp = &hba->lrb[task_tag]; lrbp->compl_time_stamp =ktime_get ();
@@ -5450,7 +5450,11 @@ void ufshcd_compl_one_cqe(struct ufs_hba *hba, int task_tag, }else if (lrbp->command_type ==UTP_CMD_TYPE_DEV_MANAGE || lrbp->command_type ==UTP_CMD_TYPE_UFS_STORAGE ) {if (hba->dev_cmd.complete) { - hba->dev_cmd.cqe = cqe; +if (cqe) { + ocs =le32_to_cpu (cqe->status) &MASK_OCS ; + lrbp->utr_descriptor_ptr->header.dword_2 = +cpu_to_le32 (ocs); + }complete (hba->dev_cmd.complete);ufshcd_clk_scaling_update_busy (hba); }
include/ufs/ufshcd.h +0 -1
@@ -225,7 +225,6 @@ struct ufs_dev_cmd {struct mutex lock;struct completion *complete;struct ufs_query query; -struct cq_entry *cqe; };/**
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 484/800 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
@@ -594,12 +594,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 485/800 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 486/800 riscv: hibernation: Remove duplicate call of suspend_restore_csrs
In reply to Greg Kroah-HartmanFrom: Song Shuai <[email protected]>
[ Upstream commit c6399b893043a5bb634de8677362f96684f1c0c8 ]
The suspend_restore_csrs is called in both __hibernate_cpu_resume and the else of subsequent swsusp_arch_suspend.
Removing the first call makes both suspend_{save,restore}_csrs left in swsusp_arch_suspend for clean code.
--- arch/riscv/kernel/hibernate-asm.S | 1 - 1 file changed, 1 deletion(-)
arch/riscv/kernel/hibernate-asm.S +0 -1
@@ -28,7 +28,6 @@ ENTRY(__hibernate_cpu_resume) REG_L a0, hibernate_cpu_context - suspend_restore_csrs suspend_restore_regs /* Return zero value. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 487/800 PCI: qcom: Use DWC helpers for modifying the read-only DBI registers
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 60f0072d7fb7996b9a524ef0d152e21205473192 ]
DWC core already exposes dw_pcie_dbi_ro_wr_{en/dis} helper APIs for enabling and disabling the write access to read only DBI registers. So let's use them instead of doing it manually.
Also, the existing code doesn't disable the write access when it's done. This is also fixed now.
--- drivers/pci/controller/dwc/pcie-qcom.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +3 -5
@@ -61,7 +61,6 @@/* DBI registers */ #define AXI_MSTR_RESP_COMP_CTRL0 0x818#define AXI_MSTR_RESP_COMP_CTRL1 0x81c -#define MISC_CONTROL_1_REG 0x8bc/* MHI registers */ #define PARF_DEBUG_CNT_PM_LINKST_IN_L2 0xc04
@@ -132,9 +131,6 @@/* AXI_MSTR_RESP_COMP_CTRL1 register fields */ #define CFG_BRIDGE_SB_INIT BIT(0) -/* MISC_CONTROL_1_REG register fields */ -#define DBI_RO_WR_EN 1 -/* PCI_EXP_SLTCAP register fields */ #define PCIE_CAP_SLOT_POWER_LIMIT_VAL FIELD_PREP(PCI_EXP_SLTCAP_SPLV, 250)#define PCIE_CAP_SLOT_POWER_LIMIT_SCALE FIELD_PREP(PCI_EXP_SLTCAP_SPLS, 1)
@@ -826,7 +822,9 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie)writel (0 , pcie->parf +PARF_Q2A_FLUSH );writel (PCI_COMMAND_MASTER , pci->dbi_base +PCI_COMMAND ); -writel (DBI_RO_WR_EN , pci->dbi_base +MISC_CONTROL_1_REG ); + +dw_pcie_dbi_ro_wr_en (pci); +writel (PCIE_CAP_SLOT_VAL , pci->dbi_base + offset +PCI_EXP_SLTCAP ); val =readl (pci->dbi_base + offset +PCI_EXP_LNKCAP );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 488/800 PCI: qcom: Disable write access to read only registers for IP v2.9.0
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 200b8f85f2021362adcc8efb575652a2aa44c099 ]
In the post init sequence of v2.9.0, write access to read only registers are not disabled after updating the registers. Fix it by disabling the access after register update.
While at it, let's also add a newline after existing dw_pcie_dbi_ro_wr_en() guard function to align with rest of the driver.
--- drivers/pci/controller/dwc/pcie-qcom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/controller/dwc/pcie-qcom.c +3 -0
@@ -1134,6 +1134,7 @@ static int qcom_pcie_post_init_2_9_0(struct qcom_pcie *pcie)writel (0 , pcie->parf +PARF_Q2A_FLUSH );dw_pcie_dbi_ro_wr_en (pci); +writel (PCIE_CAP_SLOT_VAL , pci->dbi_base + offset +PCI_EXP_SLTCAP ); val =readl (pci->dbi_base + offset +PCI_EXP_LNKCAP );
@@ -1143,6 +1144,8 @@ static int qcom_pcie_post_init_2_9_0(struct qcom_pcie *pcie)writel (PCI_EXP_DEVCTL2_COMP_TMOUT_DIS , pci->dbi_base + offset +PCI_EXP_DEVCTL2 ); +dw_pcie_dbi_ro_wr_dis (pci); +for (i =0 ; i <256 ; i++)writel (0 , pcie->parf +PARF_BDF_TO_SID_TABLE_N + (4 * i));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 489/800 platform/x86:intel/pmc: Update maps for Meteor Lake P/M platforms
In reply to Greg Kroah-HartmanFrom: Xi Pardee <[email protected]>
[ Upstream commit 9682cfd1973d01e43c2764c662e6d3291ddf770d ]
Fix the IP name errors in the register maps used by the following debugfs attributes in the Meteor Lake SOC-M PMC.
pfear_stslpm_stsltr_show
--- drivers/platform/x86/intel/pmc/core.h | 28 +- drivers/platform/x86/intel/pmc/mtl.c | 448 +++++++++++++++++++++++++- 2 files changed, 466 insertions(+), 10 deletions(-)
drivers/platform/x86/intel/pmc/core.h +27 -1
@@ -249,6 +249,14 @@ enum ppfear_regs {#define MTL_LPM_STATUS_LATCH_EN_OFFSET 0x16F8#define MTL_LPM_STATUS_OFFSET 0x1700#define MTL_LPM_LIVE_STATUS_OFFSET 0x175C +#define MTL_PMC_LTR_IOE_PMC 0x1C0C +#define MTL_PMC_LTR_ESE 0x1BAC +#define MTL_SOCM_NUM_IP_IGN_ALLOWED 25 +#define MTL_SOC_PMC_MMIO_REG_LEN 0x2708 +#define MTL_PMC_LTR_SPG 0x1B74 + +/* Meteor Lake PGD PFET Enable Ack Status */ +#define MTL_SOCM_PPFEAR_NUM_ENTRIES 8extern const char *pmc_lpm_modes[];
@@ -395,7 +403,25 @@ extern const struct pmc_bit_map adl_vnn_req_status_3_map[];extern const struct pmc_bit_map adl_vnn_misc_status_map[];extern const struct pmc_bit_map *adl_lpm_maps[];extern const struct pmc_reg_map adl_reg_map; -extern const struct pmc_reg_map mtl_reg_map; +extern const struct pmc_bit_map mtl_socm_pfear_map[]; +extern const struct pmc_bit_map *ext_mtl_socm_pfear_map[]; +extern const struct pmc_bit_map mtl_socm_ltr_show_map[]; +extern const struct pmc_bit_map mtl_socm_clocksource_status_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_power_gating_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_d3_status_3_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_0_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_1_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_2_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_req_status_3_map[]; +extern const struct pmc_bit_map mtl_socm_vnn_misc_status_map[]; +extern const struct pmc_bit_map mtl_socm_signal_status_map[]; +extern const struct pmc_bit_map *mtl_socm_lpm_maps[]; +extern const struct pmc_reg_map mtl_socm_reg_map;extern void pmc_core_get_tgl_lpm_reqs (struct platform_device *pdev);extern int pmc_core_send_ltr_ignore (struct pmc_dev *pmcdev,u32 value);
drivers/platform/x86/intel/pmc/mtl.c +439 -9
474 lines not on this page · raw message
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 490/800 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 491/800 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
@@ -745,9 +745,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);
@@ -769,13 +769,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;
@@ -793,19 +796,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;
@@ -823,16 +829,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;
@@ -861,7 +871,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); }
@@ -884,7 +894,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 */
@@ -920,7 +930,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 492/800 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
@@ -189,7 +189,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 493/800 perf test: Set PERF_EXEC_PATH for script execution
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit e4ef3ef1bc0a3d2535427da78b8095ef657eb474 ]
The task-analyzer.py script (actually every other scripts too) requires PERF_EXEC_PATH env to find dependent libraries and scripts. For scripts test to run correctly, it needs to set PERF_EXEC_PATH to the perf tool source directory.
Instead of blindly update the env, let's check the directory structure to make sure it points to the correct location.
--- tools/perf/tests/shell/test_task_analyzer.sh | 6 ++++++ 1 file changed, 6 insertions(+)
tools/perf/tests/shell/test_task_analyzer.sh +6 -0
@@ -5,6 +5,12 @@ tmpdir=$(mktemp -d /tmp/perf-script-task-analyzer-XXXXX) err=0 +# set PERF_EXEC_PATH to find scripts in the source directory +perfdir=$(dirname "$0")/../.. +if [ -e "$perfdir/scripts/python/Perf-Trace-Util" ]; then + export PERF_EXEC_PATH=$perfdir +fi + cleanup() { rm -f perf.data rm -f perf.data.old
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 494/800 riscv: hibernate: remove WARN_ON in save_processor_state
In reply to Greg Kroah-HartmanFrom: Song Shuai <[email protected]>
[ Upstream commit 91afbaafd6b1f1846520efd2b158066a25a1a316 ]
During hibernation or restoration, freeze_secondary_cpus checks num_online_cpus via BUG_ON, and the subsequent save_processor_state also does the checking with WARN_ON.
In the case of CONFIG_PM_SLEEP_SMP=n, freeze_secondary_cpus is not defined, but the sole possible condition to disable CONFIG_PM_SLEEP_SMP is !SMP where num_online_cpus is always 1. We also don't have to check it in save_processor_state.
So remove the unnecessary checking in save_processor_state.
--- arch/riscv/kernel/hibernate.c | 1 - 1 file changed, 1 deletion(-)
arch/riscv/kernel/hibernate.c +0 -1
@@ -80,7 +80,6 @@ int pfn_is_nosave(unsigned long pfn) void notrace save_processor_state(void) { -WARN_ON (num_online_cpus () !=1 ); } void notrace restore_processor_state(void)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 495/800 PCI: endpoint: Fix a Kconfig prompt of vNTB driver
In reply to Greg Kroah-HartmanFrom: Shunsuke Mie <[email protected]>
[ Upstream commit 37587673cda963ec950e4983db5023802f9b5ff2 ]
vNTB driver and NTB driver have same Kconfig prompt. Changed to make it distinguishable.
--- drivers/pci/endpoint/functions/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/Kconfig +1 -1
@@ -27,7 +27,7 @@ config PCI_EPF_NTB If in doubt, say "N" to disable Endpoint NTB driver. config PCI_EPF_VNTB - tristate "PCI Endpoint NTB driver" + tristate "PCI Endpoint Virtual NTB driver" depends on PCI_ENDPOINT depends on NTB select CONFIGFS_FS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 496/800 PCI: endpoint: functions/pci-epf-test: Fix dma_chan direction
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
[ Upstream commit 880d51c729a3fa944794feb19f605eefe55916fc ]
In pci_epf_test_init_dma_chan() epf_test->dma_chan_rx is assigned from dma_request_channel() with DMA_DEV_TO_MEM as filter.dma_mask.
However, in pci_epf_test_data_transfer() if the dir is DMA_DEV_TO_MEM, epf->dma_chan_rx should be used but instead we are using epf_test->dma_chan_tx.
Fix it.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +1 -1
@@ -112,7 +112,7 @@ static int pci_epf_test_data_transfer(struct pci_epf_test *epf_test, size_t len, dma_addr_t dma_remote, enum dma_transfer_direction dir) { - struct dma_chan *chan = (dir == DMA_DEV_TO_MEM) ? + struct dma_chan *chan = (dir == DMA_MEM_TO_DEV) ? epf_test->dma_chan_tx : epf_test->dma_chan_rx;dma_addr_t dma_local = (dir ==DMA_MEM_TO_DEV ) ? dma_src : dma_dst;enum dma_ctrl_flags flags =DMA_CTRL_ACK |DMA_PREP_INTERRUPT ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 497/800 PCI: vmd: Fix uninitialized variable usage in vmd_enable_domain()
In reply to Greg Kroah-HartmanFrom: Xinghui Li <[email protected]>
[ Upstream commit 0c0206dc4f5ba2d18b15e24d2047487d6f73916b ]
The ret variable in the vmd_enable_domain() function was used uninitialized when printing a warning message upon failure of the pci_reset_bus() function.
Thus, fix the issue by assigning ret with the value returned from pci_reset_bus() before referencing it in the warning message.
This was detected by Smatch:
drivers/pci/controller/vmd.c:931 vmd_enable_domain() error: uninitialized symbol 'ret'.
[kwilczynski: drop the second patch from the series, add missing reported by tag, commit log]
--- drivers/pci/controller/vmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/vmd.c +2 -1
@@ -927,7 +927,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)if (!list_empty (&child->devices)) { dev =list_first_entry (&child->devices, struct pci_dev, bus_list); -if (pci_reset_bus (dev)) + ret =pci_reset_bus (dev); +if (ret)pci_warn (dev,"can't reset device: %d\n" , ret);break ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 498/800 vfio/mdev: Move the compat_class initialization to module init
In reply to Greg Kroah-HartmanFrom: Eric Farman <[email protected]>
[ Upstream commit ff598081e5b9d0bdd6874bfe340811bbb75b35e4 ]
The pointer to mdev_bus_compat_class is statically defined at the top of mdev_core, and was originally (commit 7b96953bc640 ("vfio: Mediated device Core driver") serialized by the parent_list_lock. The blamed commit removed this mutex, leaving the pointer initialization unserialized. As a result, the creation of multiple MDEVs in parallel (such as during boot) can encounter errors during the creation of the sysfs entries, such as:
[ 8.337509] sysfs: cannot create duplicate filename '/class/mdev_bus' [ 8.337514] vfio_ccw 0.0.01d8: MDEV: Registered [ 8.337516] CPU: 13 PID: 946 Comm: driverctl Not tainted 6.4.0-rc7 #20 [ 8.337522] Hardware name: IBM 3906 M05 780 (LPAR) [ 8.337525] Call Trace: [ 8.337528] [<0000000162b0145a>] dump_stack_lvl+0x62/0x80 [ 8.337540] [<00000001622aeb30>] sysfs_warn_dup+0x78/0x88 [ 8.337549] [<00000001622aeca6>] sysfs_create_dir_ns+0xe6/0xf8 [ 8.337552] [<0000000162b04504>] kobject_add_internal+0xf4/0x340 [ 8.337557] [<0000000162b04d48>] kobject_add+0x78/0xd0 [ 8.337561] [<0000000162b04e0a>] kobject_create_and_add+0x6a/0xb8 [ 8.337565] [<00000001627a110e>] class_compat_register+0x5e/0x90 [ 8.337572] [<000003ff7fd815da>] mdev_register_parent+0x102/0x130 [mdev] [ 8.337581] [<000003ff7fdc7f2c>] vfio_ccw_sch_probe+0xe4/0x178 [vfio_ccw] [ 8.337588] [<0000000162a7833c>] css_probe+0x44/0x80 [ 8.337599] [<000000016279f4da>] really_probe+0xd2/0x460 [ 8.337603] [<000000016279fa08>] driver_probe_device+0x40/0xf0 [ 8.337606] [<000000016279fb78>] __device_attach_driver+0xc0/0x140 [ 8.337610] [<000000016279cbe0>] bus_for_each_drv+0x90/0xd8 [ 8.337618] [<00000001627a00b0>] __device_attach+0x110/0x190 [ 8.337621] [<000000016279c7c8>] bus_rescan_devices_helper+0x60/0xb0 [ 8.337626] [<000000016279cd48>] drivers_probe_store+0x48/0x80 [ 8.337632] [<00000001622ac9b0>] kernfs_fop_write_iter+0x138/0x1f0 [ 8.337635] [<00000001621e5e14>] vfs_write+0x1ac/0x2f8 [ 8.337645] [<00000001621e61d8>] ksys_write+0x70/0x100 [ 8.337650] [<0000000162b2bdc4>] __do_syscall+0x1d4/0x200 [ 8.337656] [<0000000162b3c828>] system_call+0x70/0x98 [ 8.337664] kobject: kobject_add_internal failed for mdev_bus with -EEXIST, don't try to register things with the same name in the same directory. [ 8.337668] kobject: kobject_create_and_add: kobject_add error: -17 [ 8.337674] vfio_ccw: probe of 0.0.01d9 failed with error -12 [ 8.342941] vfio_ccw_mdev aeb9ca91-10c6-42bc-a168-320023570aea: Adding to iommu group 2
Move the initialization of the mdev_bus_compat_class pointer to the init path, to match the cleanup in module exit. This way the code in mdev_register_parent() can simply link the new parent to it, rather than determining whether initialization is required first.
--- drivers/vfio/mdev/mdev_core.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/vfio/mdev/mdev_core.c +14 -9
@@ -72,12 +72,6 @@ int mdev_register_parent(struct mdev_parent *parent, struct device *dev, parent->nr_types = nr_types;atomic_set (&parent->available_instances, mdev_driver->max_instances); -if (!mdev_bus_compat_class) { - mdev_bus_compat_class =class_compat_register ("mdev_bus" ); -if (!mdev_bus_compat_class) -return -ENOMEM ; - } - ret =parent_create_sysfs_files (parent);if (ret)return ret;
@@ -251,13 +245,24 @@ int mdev_device_remove(struct mdev_device *mdev)static int __init mdev_init (void ) { -return bus_register (&mdev_bus_type); +int ret; + + ret =bus_register (&mdev_bus_type); +if (ret) +return ret; + + mdev_bus_compat_class =class_compat_register ("mdev_bus" ); +if (!mdev_bus_compat_class) { +bus_unregister (&mdev_bus_type); +return -ENOMEM ; + } + +return 0 ; } static void __exit mdev_exit(void) { -if (mdev_bus_compat_class) -class_compat_unregister (mdev_bus_compat_class); +class_compat_unregister (mdev_bus_compat_class);bus_unregister (&mdev_bus_type); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 499/800 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