[Deepin-Kernel-SIG] [linux 6.6.y] [Upstream] Sync stable fix from upstream - #2146
Conversation
…okup Enabling any of the powerpc:rtas_* tracepoints at boot is likely to result in an oops on RTAS platforms. For example, booting a QEMU pseries model with 'trace_event=powerpc:rtas_input' in the command line leads to: BUG: Kernel NULL pointer dereference on read at 0x00000008 Oops: Kernel access of bad area, sig: 7 [#1] NIP [c00000000004231c] do_enter_rtas+0x1bc/0x460 LR [c00000000004231c] do_enter_rtas+0x1bc/0x460 Call Trace: do_enter_rtas+0x1bc/0x460 (unreliable) rtas_call+0x22c/0x4a0 rtas_get_boot_time+0x80/0x14c read_persistent_clock64+0x124/0x150 read_persistent_wall_and_boot_offset+0x28/0x58 timekeeping_init+0x70/0x348 start_kernel+0xa0c/0xc1c start_here_common+0x1c/0x20 (This is preceded by a warning for the failed lookup in rtas_token_to_function().) This happens when __do_enter_rtas_trace() attempts a token to function descriptor lookup before the xarray containing the mappings has been set up. Fall back to linear scan of the table if rtas_token_to_function_xarray is empty. Fixes: 24098f5 ("powerpc/rtas: add tracepoints around RTAS entry") Reviewed-by: "Aneesh Kumar K.V (IBM)" <aneesh.kumar@kernel.org> Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20231212-papr-sys_rtas-vs-lockdown-v6-3-e9eafd0c8c6c@linux.ibm.com (cherry picked from commit 669acc7) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Originally was in the panel-simple, but belongs to panel-simple-dsi.
See arch/arm/boot/dts/nvidia/tegra114-roth.dts for more details.
Resolves the following warning:
```
arch/arm/boot/dts/tegra114-roth.dt.yaml: panel@0: 'reg' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: Documentation/devicetree/bindings/display/panel/panel-simple.yaml
```
Fixes: 310abce ("dt-bindings: display: convert simple lg panels to DT Schema")
Signed-off-by: David Heidelberg <david@ixit.cz>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Jessica Zhang <quic_jesszhan@quicinc.com>
Link: https://lore.kernel.org/r/20231212200934.99262-1-david@ixit.cz
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231212200934.99262-1-david@ixit.cz
(cherry picked from commit fa97e21)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Reviewer's GuideThis stable-upstream synchronization combines device-tree schema and board-description corrections with targeted fixes across Arm64 KVM, RTAS, s390 virtualization, storage, clocks, GPIO/LCD, DRM, UFS, wireless, NAND, tracing, audio, documentation, selftests, and build configuration; review should verify each hardware-specific change against its corresponding binding or upstream fix and check that renamed APIs and exported symbols preserve dependent builds. Sequence diagram for HX8357 GPIO acquisition and display resetsequenceDiagram
participant SPI as SPI device
participant Driver as hx8357_probe
participant GPIO as GPIO consumer API
participant LCD as HX8357 display
SPI->>Driver: hx8357_probe
Driver->>GPIO: devm_gpiod_get(reset)
GPIO-->>Driver: reset descriptor
Driver->>GPIO: devm_gpiod_get_array_optional(im)
GPIO-->>Driver: IM GPIO descriptors
Driver->>LCD: gpiod_set_value(reset, 0)
Driver->>LCD: gpiod_set_value(reset, 1)
Driver->>LCD: gpiod_set_value(reset, 0)
Driver->>LCD: hx8357_spi_write_array
Sequence diagram for UFS Qualcomm host reset IRQ handlingsequenceDiagram
participant Host as UFS Qualcomm host
participant Core as UFS core
participant IRQ as Host IRQ
participant Reset as Core reset controller
Host->>Core: ufshcd_disable_irq
Core->>IRQ: disable_irq
Host->>Reset: reset_control_assert
Host->>Reset: reset_control_deassert
alt IRQ was enabled before reset
Host->>Core: ufshcd_enable_irq
Core->>IRQ: enable_irq
end
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
🟡 Changes recommended
Missing backported APIs cause build failures, while several Devicetree schemas contain invalid or contradictory constraints.
Get a fresh assessment by requesting another Copilot review.
Pull request overview
Synchronizes upstream Linux 6.6 stable fixes across architecture code, drivers, Devicetree bindings, and documentation.
Changes:
- Updates hardware support and Devicetree descriptions.
- Fixes KVM, UFS, GPIO, DRM, clock, storage, and network behavior.
- Corrects documentation and kernel selftests.
File summaries
| File | Description |
|---|---|
usr/Kconfig |
Corrects LZO help grammar. |
tools/testing/selftests/kvm/get-reg-list.c |
Fixes configuration-name construction. |
sound/soc/amd/acp/acp-mach-common.c |
Adds module description. |
scripts/kernel-doc |
Extends warning option and member checks. |
kernel/trace/trace_events_synth.c |
Corrects variadic kernel-doc parameters. |
include/ufs/ufshcd.h |
Exposes UFS IRQ helpers. |
drivers/video/backlight/hx8357.c |
Migrates GPIO handling to descriptors. |
drivers/ufs/host/ufs-qcom.c |
Uses shared UFS IRQ helpers. |
drivers/ufs/core/ufshcd.c |
Exports UFS IRQ helpers. |
drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h |
Removes redundant helper declaration. |
drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c |
Uses common bit-shift helper. |
drivers/mtd/nand/raw/rockchip-nand-controller.c |
Improves structure naming and documentation. |
drivers/mtd/nand/raw/pl35x-nand-controller.c |
Corrects NAND structure documentation. |
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c |
Updates writeback validation and naming. |
drivers/gpio/gpiolib-of.c |
Enables HX8357 legacy GPIO fixups. |
drivers/gpio/gpio-xilinx.c |
Removes obsolete documentation. |
drivers/clk/qcom/dispcc-sm8550.c |
Selects the Lucid OLE PLL configuration path. |
drivers/char/ipmi/ipmi_si_hardcode.c |
Initializes IPMI register spacing. |
drivers/block/virtio_blk.c |
Removes redundant zone revalidation. |
Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst |
Clarifies routing documentation. |
Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml |
Corrects watchdog interrupt trigger. |
Documentation/devicetree/bindings/power/reset/qcom,pon.yaml |
Fixes PON example structure. |
Documentation/devicetree/bindings/pci/qcom,pcie.yaml |
Corrects reset property name. |
Documentation/devicetree/bindings/media/i2c/ov8856.yaml |
Allows supported lane configurations. |
Documentation/devicetree/bindings/leds/awinic,aw200xx.yaml |
Adds per-device LED constraints. |
Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml |
Updates Versal clock example. |
Documentation/devicetree/bindings/display/panel/panel-simple.yaml |
Removes misplaced DSI panel. |
Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml |
Adds LG DSI panel compatible. |
Documentation/devicetree/bindings/crypto/qcom-qce.yaml |
Adds IPQ9574 condition coverage. |
Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml |
Revises Versal clock inputs. |
Documentation/devicetree/bindings/arm/stm32/stm32.yaml |
Corrects SCMI compatible chains. |
arch/s390/kvm/vsie.c |
Fixes facility-list masking order. |
arch/powerpc/kernel/rtas.c |
Adds early RTAS token fallback. |
arch/arm64/include/asm/kvm_arm.h |
Updates KVM register masks. |
arch/arm64/boot/dts/qcom/sc8180x.dtsi |
Adds UFS, display, and GIC properties. |
arch/arm64/boot/dts/qcom/sc8180x-primus.dts |
Enables regulator mode switching. |
arch/arm64/boot/dts/qcom/msm8939.dtsi |
Specifies timer clock frequency. |
arch/arm/boot/dts/rockchip/rk3036.dtsi |
Removes incorrect sampling phase. |
arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts |
Enables remote processors. |
arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts |
Removes unsupported panel GPIO. |
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi |
Removes misplaced card-detect pins. |
arch/arm/boot/dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi |
Enables remote processors. |
arch/arm/boot/dts/qcom/qcom-msm8974-lge-nexus5-hammerhead.dts |
Enables remote processors. |
Review details
Suppressed comments (2)
Documentation/devicetree/bindings/leds/awinic,aw200xx.yaml:94
- The AW20054 has 54 channels and the driver rejects
reg >= channels, so accepting 54 permits a DT value that the driver will discard. The inclusive maximum must be 53.
maximum: 54
Documentation/devicetree/bindings/leds/awinic,aw200xx.yaml:108
- The AW20072 driver accepts channel indices 0–71, while this constraint also accepts 72. Set the inclusive maximum to 71 so schema validation matches runtime validation.
maximum: 72
- Files reviewed: 43/43 changed files
- Comments generated: 7
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
…iver The data lanes and link frequency were set to match existing Linux driver limitations, however bindings should be independent of chosen Linux driver support. Decouple these properties from the driver to match what is actually supported by the hardware. This also fixes DTS example: ov8856.example.dtb: camera@10: port:endpoint:link-frequencies:0: [360000000] is too short Fixes: 066a94e ("media: dt-bindings: media: Use graph and video-interfaces schemas") Acked-by: Conor Dooley <conor.dooley@microchip.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> (cherry picked from commit 458492e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
When we dynamically generate a name for a configuration in get-reg-list we use strcat() to append to a buffer allocated using malloc() but we never initialise that buffer. Since malloc() offers no guarantees regarding the contents of the memory it returns this can lead to us corrupting, and likely overflowing, the buffer: vregs: PASS vregs+pmu: PASS sve: PASS sve+pmu: PASS vregs+pauth_address+pauth_generic: PASS X?vr+gspauth_addre+spauth_generi+pmu: PASS The bug is that strcat() should have been strcpy(), and that replacement would be enough to fix it, but there are other things in the function that leave something to be desired. In particular, an (incorrectly) empty config would cause an out of bounds access to c->name[-1]. Since the strcpy() call relies on c->name[0..len-1] being initialized, enforce that invariant throughout the function. Fixes: 2f9ace5 ("KVM: arm64: selftests: get-reg-list: Introduce vcpu configs") Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Co-developed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org> Message-Id: <20231211-kvm-get-reg-list-str-init-v3-1-6554c71c77b1@kernel.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit e39120a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The of_gpio.h is going to be removed. In preparation of that convert the driver to the agnostic API. Fixes: fbbbcd1 ("gpiolib: of: add quirk for locating reset lines with legacy bindings") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20231207161513.3195509-2-andriy.shevchenko@linux.intel.com Signed-off-by: Lee Jones <lee@kernel.org> (cherry picked from commit 7d84a63) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The routing ioctls documentation incorrectly describes the 'which' field, due to a bad copy & paste. Fix it. Fixes: ea73eda ("media: Documentation: Add GS_ROUTING documentation") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> (cherry picked from commit 95e802a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…use of them Instead of duplicating the enable/disable IRQ part, let's export the helpers available in ufshcd driver and make use of them. This also fixes the possible redundant IRQ disable before asserting reset (when IRQ was already disabled). Fixes: 4a79157 ("scsi: ufs: ufs-qcom: Disable interrupt in reset path") Reviewed-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/r/20231208065902.11006-7-manivannan.sadhasivam@linaro.org Tested-by: Andrew Halaney <ahalaney@redhat.com> # sa8775p-ride Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit 0ae7a02) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…onality dpu_encoder_phys_wb_setup_cdp() is not programming the chroma down prefetch block. Its setting up the display ctl path for writeback. Hence rename it to dpu_encoder_phys_wb_setup_ctl() to match what its actually doing. Fixes: d7d0e73 ("drm/msm/dpu: introduce the dpu_encoder_phys_* for writeback") Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/571812/ Link: https://lore.kernel.org/r/20231212205254.12422-3-quic_abhinavk@quicinc.com Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> (cherry picked from commit ecf5944) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
SCMI-enabled boards may restrict access to resources like clocks, resets and regulators to the secure world. A normal world bootloader or kernel compatible with the non-SCMI-enabled board is thus not guaranteed to be able to deal with the SCMI variant. It follows, that the SCMI-enabled board is not compatible with the non-SCMI enabled board, so drop that compatible. This change is motivated by the barebox' bootloader's use of bootloader specification files[1][2]: barebox for non-SCMI DK2 will compare its own top-level "stm32mp157c-dk2" compatible with all compatibles listed in the device tree referenced by each bootloader spec file. If the boot medium contains a configuration with compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157c-dk2", "st,stm32mp157"; it will match, because of the second compatible and boot a kernel with SCMI enabled, although no SCMI may exist on the platform. [1]: https://uapi-group.org/specifications/specs/boot_loader_specification/ [2]: https://www.barebox.org/doc/latest/user/booting-linux.html#boot-loader-specification Fixes: 8e14ebb ("dt-bindings: arm: stm32: Add SCMI version of STM32 boards (DK1/DK2/ED1/EV1)") Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com> (cherry picked from commit a55383d) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Both the "chip" kernel doc member and description are wrong. This field is called "chips" and describes the list of NAND chips connected to the controller. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202312102130.geZ4dqyN-lkp@intel.com/ Fixes: 08d8c62 ("mtd: rawnand: pl353: Add support for the ARM PL353 SMC NAND controller") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20231211150524.108803-1-miquel.raynal@bootlin.com (cherry picked from commit 199d140) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Robots are unhappy with the ecc_cnt_status structure because the kernel doc says it should be called rk_ecc_cnt_status. In general, it is considered a better practice to prefix all symbols in a file with the same prexif, and thus it seems more relevant to rename the structure rather than changing the kernel doc header. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202312102130.geZ4dqyN-lkp@intel.com/ Fixes: 058e0e8 ("mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20231211150704.109138-1-miquel.raynal@bootlin.com (cherry picked from commit 2ca8718) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
All fields of the nfc_cfg structure are documented but the name, which leads to a W=1 warning. Add a title. Fixes: 058e0e8 ("mtd: rawnand: rockchip: NFC driver for RK3308, RK2928 and others") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20231211150704.109138-2-miquel.raynal@bootlin.com (cherry picked from commit b6c985d) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
17d2e88 to
b19c0f0
Compare
There is no "resets-names" property, but "reset-names". Fixes: 075a9d5 ("dt-bindings: PCI: qcom: Convert to YAML") Link: https://lore.kernel.org/linux-pci/20231111142006.51883-1-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Acked-by: Conor Dooley <conor.dooley@microchip.com> (cherry picked from commit 3b74713) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Looks like not all firmware versions used for MSM8939 program the timer frequency for both broadcast/MMIO timers, causing a WARNING at runtime: WARNING: CPU: 0 PID: 0 at kernel/time/clockevents.c:38 cev_delta2ns+0x74/0x90 pc : cev_delta2ns+0x74/0x90 lr : clockevents_config.part.0+0x64/0x8c Call trace: cev_delta2ns+0x74/0x90 clockevents_config_and_register+0x20/0x34 arch_timer_mem_of_init+0x374/0x534 timer_probe+0x88/0x110 time_init+0x14/0x4c start_kernel+0x2c0/0x640 Unfortunately there is no way to fix the firmware on most of these devices since it's proprietary and signed. As a workaround, specify the clock-frequency explicitly in the DT to fix the warning. Fixes: 61550c6 ("arm64: dts: qcom: Add msm8939 SoC") Reported-by: Vincent Knecht <vincent.knecht@mailoo.org> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231204-msm8939-timer-v1-1-a2486c625786@gerhold.net Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 12844ac) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…gered
As described in the patch ("arm64: dts: qcom: sc7180: Make watchdog
bark interrupt edge triggered"), the Qualcomm watchdog timer's bark
interrupt should be configured as edge triggered.
Update the example in the bindings.
Fixes: 7c631cd ("dt-bindings: watchdog: qcom-wdt: allow interrupts")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20231106144335.v2.9.Ie30c1d3f780666f6906fd2fd7c437632c229d987@changeid
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
(cherry picked from commit eaea10a)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Panel driver samsung,s6e3fa2 does not use te-gpios. The pin is already configured properly through pinctrl. Fixes: 3657b67 ("ARM: dts: qcom: msm8974-klte: add support for display") Signed-off-by: Alexey Minnekhanov <alexeymin@postmarketos.org> [luca: adjust commit message, add Fixes tag] Signed-off-by: Luca Weiss <luca@z3ntu.xyz> Link: https://lore.kernel.org/r/20231217-msm8974-misc-v1-1-bece1ba2667d@z3ntu.xyz Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 32b075f) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
No board in mainline uses GPIO 54 for card-detect on sdhc_2, and this also causes conflict when both sdhc_2 and blsp2_uart4 are used, such as on qcom-msm8974-lge-nexus5-hammerhead. Fixes: 1dfe967 ("ARM: dts: qcom-msm8974*: Consolidate I2C/UART/SDHCI") Signed-off-by: Luca Weiss <luca@z3ntu.xyz> Link: https://lore.kernel.org/r/20231217-msm8974-misc-v1-2-bece1ba2667d@z3ntu.xyz Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 1522b3b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Even though a previous patch re-added the supplies to the adsp and modem remoteprocs, due to timing differences in the meantime the remoteprocs were disabled by default, but the commit re-adding the supplies didn't enable them. Enable them now to hopefully properly resolve the fallout now. Fixes: 6d933c0 ("ARM: dts: qcom: msm8974-*: re-add remoteproc supplies") Signed-off-by: Luca Weiss <luca@z3ntu.xyz> Link: https://lore.kernel.org/r/20231217-msm8974-misc-v1-3-bece1ba2667d@z3ntu.xyz Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 648002a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
To make sure the UFS controller and some relevant clocks have power flowing to them, hook up the forgotten-about GDSC. Fixes: 8575f19 ("arm64: dts: qcom: Introduce the SC8180x platform") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231214-topic-sc8180_fixes-v1-2-421904863006@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 2564209) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The ROT clock is required for the MDP block to function (looks like some others depend on it), and whike the LUT clock's purpose is not clear, it's likely better to turn on all of MDP's dependencies rather than not doing so. Add these clocks under the MDP node. This also makes Primus work without clk_ignore_unused (as far as the dmesg-visible errors go, anyway). Fixes: 494dec9 ("arm64: dts: qcom: sc8180x: Add display and gpu nodes") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231214-topic-sc8180_fixes-v1-3-421904863006@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 4978dfd) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
To ensure the required paths don't collapse, add interconnect properties to the UFS controller. Fixes: 8575f19 ("arm64: dts: qcom: Introduce the SC8180x platform") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231214-topic-sc8180_fixes-v1-4-421904863006@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit 384ea2a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The redistributor properties were absent in the initial submission, add them. Fixes: 8575f19 ("arm64: dts: qcom: Introduce the SC8180x platform") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231214-topic-sc8180_fixes-v1-5-421904863006@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit c879ee1) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The UFS driver expects to be able to set load (and by extension, mode) on the supplied regulators. Add the necessary properties to make that possible. Fixes: 2ce38cc ("arm64: dts: qcom: sc8180x: Introduce Primus") Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20231214-topic-sc8180_fixes-v1-6-421904863006@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> (cherry picked from commit b7b9a6a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The irqchip field has been removed from struct xgpio_instance so remove the doc as well. Fixes: b4510f8 ("gpio: xilinx: Convert to immutable irq_chip") Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202312150239.IyuTVvrL-lkp@intel.com/ Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Reviewed-by: Michal Simek <michal.simek@amd.com> Reviewed-by: Randy Dunlap <rdunlap@infradead.org> (cherry picked from commit 4c7fcbf) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
New trap bits have been defined since the latest update to this patch. Moreover, the existing definitions of some of the mask and the RES0 bits overlap, which could be wrong, confusing, or both. Update the bits based on DDI0601 2023-09, and ensure that the existing bits are consistent. Subsequent patches will use the generated RES0 fields instead of specifying them manually. This patch keeps the manual encoding of the bits to make it easier to review the series. Fixes: 0fd7686 ("KVM: arm64: Add nPIR{E0}_EL1 to HFG traps") Signed-off-by: Fuad Tabba <tabba@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20231214100158.2305400-11-tabba@google.com (cherry picked from commit fc04838) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Add a MODULE_DESCRIPTION() in the generic ACP machine driver to avoid the following warning when building with W=1: WARNING: modpost: missing MODULE_DESCRIPTION() in sound/soc/amd/acp/snd-acp-mach.o Fixes: d4c750f ("ASoC: amd: acp: Add generic machine driver support for ACP cards") Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Link: https://msgid.link/r/20231209203229.878730-6-cristian.ciocaltea@collabora.com Signed-off-by: Mark Brown <broonie@kernel.org> (cherry picked from commit 576f3ae) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
regspacings parameter is currently ignored and the platform data uses a default value of 0, this has been fixed by setting the appropriate field in the platform data. Fixes: 3cd83ba ("ipmi: Consolidate the adding of platform devices") Signed-off-by: Emilio Perez <emiliopeju@gmail.com> Message-Id: <20231122203433.443098-1-emiliopeju@gmail.com> Signed-off-by: Corey Minyard <minyard@acm.org> (cherry picked from commit 242c6fd) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
virtblk_revalidate_zones is called unconditionally from virtblk_config_changed_work from the virtio config_changed callback. virtblk_revalidate_zones is a bit odd in that it re-clears the zoned state for host aware or non-zoned devices, which isn't needed unless the zoned mode changed - but a zone mode change to a host managed model isn't handled at all, and virtio_blk also doesn't handle any other config change except for a capacity change is handled (and even if it was the upper layers above virtio_blk wouldn't handle it very well). But even the useful case of a size change that would add or remove zones isn't handled properly as blk_revalidate_disk_zones expects the device capacity to cover all zones, but the capacity is only updated after virtblk_revalidate_zones. As this code appears to be entirely untested and is getting in the way remove it for now, but it can be readded in a fixed version with proper test coverage if needed. Fixes: 95bfec4 ("virtio-blk: add support for zoned block devices") Fixes: f1ba4e6 ("virtio-blk: fix to match virtio spec") Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20231217165359.604246-3-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk> (cherry picked from commit a971ed8) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
scripts/kernel-doc warns about using @Args: for variadic arguments to functions. Documentation/doc-guide/kernel-doc.rst says that this should be written as @...: instead, so update the source code to match that, preventing the warnings. trace_events_synth.c:1165: warning: Excess function parameter 'args' description in '__synth_event_gen_cmd_start' trace_events_synth.c:1714: warning: Excess function parameter 'args' description in 'synth_event_trace' Link: https://lore.kernel.org/linux-trace-kernel/20231220061226.30962-1-rdunlap@infradead.org Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Fixes: 35ca520 ("tracing: Add synthetic event command generation functions") Fixes: 8dcc53a ("tracing: Add synth_event_trace() and related functions") Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> (cherry picked from commit 7beb82b) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Use "Its" or "its" for possessive instead of "it's" (contraction for "it is"). Link: https://lkml.kernel.org/r/20231210053429.23146-1-rdunlap@infradead.org Fixes: db2aa7f ("initramfs: allow again choice of the embedded initram compression algorithm") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Acked-by: "Francisco Blas Izquierdo Riera (klondike)" <klondike@klondike.es> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit e95d392) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Using calculate_bit_shift() to replace rtl8723_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem. Fixes: 0a168b4 ("rtlwifi: rtl8723ae: rtl8723-common: Create new driver for common code") Signed-off-by: Su Hui <suhui@nfschina.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://msgid.link/20231219065739.1895666-11-suhui@nfschina.com (cherry picked from commit 98d9c77) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Binding marks several devices as compatible with IPQ4019 QCE. They have different number of clocks, thus the fallback does not define the clock constraints per variant and each specific compatible should have its clocks in if:then: section. Add missing clocks description for IPQ9574 QCE. Fixes: 1f5ce01 ("dt-bindings: crypto: qcom-qce: add SoC compatible string for ipq9574") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 03b0248) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
STFLE can be interpretively executed. This occurs when the facility list designation is unequal to zero. Perform the check before applying the address mask instead of after. Fixes: 66b630d ("KVM: s390: vsie: support STFLE interpretation") Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Acked-by: David Hildenbrand <david@redhat.com> Signed-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com> Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Link: https://lore.kernel.org/r/20231219140854.1042599-2-nsg@linux.ibm.com Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Message-ID: <20231219140854.1042599-2-nsg@linux.ibm.com> (cherry picked from commit 2731d60) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
…dtsi This should be a per board property, should not be put in a soc core dtsi. And when this property convert from default-sample-phase in linux-5.7 by commit 8a385eb ("ARM: dts: rockchip: fix rockchip,default-sample-phase property names"), the emmc on rk3036 kylin board get a initialising error: [ 4.512797] Freeing unused kernel memory: 8192K [ 4.519500] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) [ 4.530971] mmc1: error -84 whilst initialising MMC card [ 4.537277] Run /init as init process [ 4.550932] mmc_host mmc1: Bus speed (slot 0) = 300000Hz (slot req 300000Hz, actual 300000HZ div = 0) [ 4.664717] mmc_host mmc1: Bus speed (slot 0) = 37125000Hz (slot req 37500000Hz, actual 37125000HZ div = 0) [ 4.676156] mmc1: error -84 whilst initialising MMC card I think the reason why the emmc on rk3036 kylin board was able to work before linux-5.7 was that the illegal property was not correctly identified by the rockchip dw_mmc driver. Fixes: faea098 ("ARM: dts: rockchip: add core rk3036 dtsi") Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> Link: https://lore.kernel.org/r/20231218105523.2478315-4-andyshrk@163.com Signed-off-by: Heiko Stuebner <heiko@sntech.de> (cherry picked from commit bb0b255) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The current PON example is a bit of a mess after converting the binding document to yaml and in the process updating parts of the example to match the pmk8350 binding while leaving parts from the older pm8998 example in place. Clean up the example and make it consistent by adding some newline separators; dropping labels; removing stray spaces; fixing the PON node name; and fixing the unit address so that it matches the interrupt specifiers (which re-encodes the PON base address, 0x800 => 0x8). Fixes: 76ba190 ("dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20231130173017.12723-1-johan+linaro@kernel.org Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> (cherry picked from commit 5231002) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
The "im" pins are optional. Add missing check in the hx8357_probe(). Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/642e1230-3358-4006-a17f-3f297897ae74@moroto.mountain Fixes: 7d84a63 ("backlight: hx8357: Convert to agnostic GPIO API") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Link: https://lore.kernel.org/r/20240114143921.550736-1-andriy.shevchenko@linux.intel.com Signed-off-by: Lee Jones <lee@kernel.org> (cherry picked from commit b1ba8bc) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Swarup reported a "make htmldocs" warning: Variable length lookbehind is experimental in regex; marked by <-- HERE in m/(?<=^|\s)-Werror(?=$|\s) <-- HERE / at ./scripts/kernel-doc line 188. Akira managed to reproduce it by perl v5.34.0. On second thought, it is not necessary to have the complicated "lookahead and lookbehind" things, and the regex can be simplified. Generally, the kernel-doc warnings should be considered as errors only when "-Werror" flag is set in KCFLAGS, but not when "-Werror=<diagnostic-type>" is set, which means there needs to be a space or start of string before "-Werror", and a space or end of string after "-Werror". The following cases have been tested to work as expected: * kernel-doc warnings are considered as errors: $ KCFLAGS="-Werror" make W=1 $ KCFLAGS="-Wcomment -Werror" make W=1 $ KCFLAGS="-Werror -Wundef" make W=1 $ KCFLAGS="-Wcomment -Werror -Wundef" make W=1 * kernel-doc warnings remain as warnings: $ KCFLAGS="-Werror=return-type" make W=1 $ KCFLAGS="-Wcomment -Werror=return-type" make W=1 $ KCFLAGS="-Werror=return-type -Wundef" make W=1 $ KCFLAGS="-Wcomment -Werror=return-type -Wundef" make W=1 The "Variable length lookbehind is experimental in regex" warning is also resolved by this patch. Fixes: 91f950e ("scripts/kernel-doc: match -Werror flag strictly") Reported-by: Swarup Laxman Kotiaklapudi <swarupkotikalapudi@gmail.com> Signed-off-by: Yujie Liu <yujie.liu@intel.com> Closes: https://lore.kernel.org/r/20231028182231.123996-1-swarupkotikalapudi@gmail.com/ Reviewed-by: Akira Yokosawa <akiyks@gmail.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20231030085404.3343403-1-yujie.liu@intel.com (cherry picked from commit cf63348) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
b19c0f0 to
29f8a65
Compare
Summary by Sourcery
Sync a broad set of upstream stable fixes and binding corrections into the 6.6 kernel tree.
Bug Fixes:
Enhancements:
Documentation:
Tests: