5.15.132-rc1 review
Subsystems (13)
Greg Kroah-Hartman
maintainerPATCH 138/511 arm64: dts: qcom: pmk8350: fix ADC-TM compatible string
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 435a73d7377ceb29c1a22d2711dd85c831b40c45 ]
The commit b2de43136058 ("arm64: dts: qcom: pmk8350: Add peripherals for pmk8350") for the ADC TM (thermal monitoring device) have used the compatible string from the vendor kernel ("qcom,adc-tm7"). Use the proper compatible string that is defined in the upstream kernel ("qcom,spmi-adc-tm5-gen2").
--- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/pmk8350.dtsi +1 -1
@@ -45,7 +45,7 @@ pmk8350_vadc: adc@3100 { }; pmk8350_adc_tm: adc-tm@3400 { - compatible = "qcom,adc-tm7"; + compatible = "qcom,spmi-adc-tm5-gen2"; reg = <0x3400>; interrupts = <0x0 0x34 0x0 IRQ_TYPE_EDGE_RISING>; interrupt-names = "threshold";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 139/511 arm64: dts: qcom: sm8250: Mark PCIe hosts as DMA coherent
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 339d38a436f30d0f874815eafc7de2257346bf26 ]
The PCIe hosts on SM8250 are cache-coherent. Mark them as such.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/sm8250.dtsi +3 -0
@@ -1439,6 +1439,7 @@ pcie0: pci@1c00000 { pinctrl-names = "default"; pinctrl-0 = <&pcie0_default_state>; + dma-coherent; status = "disabled"; };
@@ -1545,6 +1546,7 @@ pcie1: pci@1c08000 { pinctrl-names = "default"; pinctrl-0 = <&pcie1_default_state>; + dma-coherent; status = "disabled"; };
@@ -1653,6 +1655,7 @@ pcie2: pci@1c10000 { pinctrl-names = "default"; pinctrl-0 = <&pcie2_default_state>; + dma-coherent; status = "disabled"; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 140/511 drm/amdgpu: avoid integer overflow warning in amdgpu_device_resize_fb_bar()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 822130b5e8834ab30ad410cf19a582e5014b9a85 ]
On 32-bit architectures comparing a resource against a value larger than U32_MAX can cause a warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1344:18: error: result of comparison of constant 4294967296 with expression of type 'resource_size_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
res->start > 0x100000000ull)
~~~~~~~~~~ ^ ~~~~~~~~~~~~~~As gcc does not warn about this in dead code, add an IS_ENABLED() check at the start of the function. This will always return success but not actually resize the BAR on 32-bit architectures without high memory, which is exactly what we want here, as the driver can fall back to bank switching the VRAM access.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
@@ -1195,6 +1195,9 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)u16 cmd;int r; +if (!IS_ENABLED (CONFIG_PHYS_ADDR_T_64BIT )) +return 0 ; +/* Bypass for VF */ if (amdgpu_sriov_vf (adev))return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 141/511 ARM: dts: BCM53573: Add cells sizes to PCIe node
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit 3392ef368d9b04622fe758b1079b512664b6110a ]
This fixes:arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#address-cells' is a required property
From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yamlarch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dtb: pcie@2000: '#size-cells' is a required property
From schema: /lib/python3.10/site-packages/dtschema/schemas/pci/pci-bus.yaml
Two properties that need to be added later are "device_type" and "ranges". Adding "device_type" on its own causes a new warning and the value of "ranges" needs to be determined yet.
--- arch/arm/boot/dts/bcm53573.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/bcm53573.dtsi +3 -0
@@ -127,6 +127,9 @@ uart0: serial@300 { pcie0: pcie@2000 { reg = <0x00002000 0x1000>; + + #address-cells = <3>; + #size-cells = <2>; }; usb2: usb2@4000 {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 142/511 ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit 2c0fd6b3d0778ceab40205315ccef74568490f17 ]
Switch away from deprecated properties.
This fixes:arch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-sck: False schema does not allow [[3, 21, 0]]
From schema: Documentation/devicetree/bindings/spi/spi-gpio.yamlarch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-miso: False schema does not allow [[3, 22, 0]]
From schema: Documentation/devicetree/bindings/spi/spi-gpio.yamlarch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: gpio-mosi: False schema does not allow [[3, 23, 0]]
From schema: Documentation/devicetree/bindings/spi/spi-gpio.yamlarch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: 'sck-gpios' is a required property
From schema: Documentation/devicetree/bindings/spi/spi-gpio.yamlarch/arm/boot/dts/broadcom/bcm947189acdbmr.dtb: spi: Unevaluated properties are not allowed ('gpio-miso', 'gpio-mosi', 'gpio-sck' were unexpected)
From schema: Documentation/devicetree/bindings/spi/spi-gpio.yaml
--- arch/arm/boot/dts/bcm947189acdbmr.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm947189acdbmr.dts +3 -3
@@ -60,9 +60,9 @@ wps { spi { compatible = "spi-gpio"; num-chipselects = <1>; - gpio-sck = <&chipcommon 21 0>; - gpio-miso = <&chipcommon 22 0>; - gpio-mosi = <&chipcommon 23 0>; + sck-gpios = <&chipcommon 21 0>; + miso-gpios = <&chipcommon 22 0>; + mosi-gpios = <&chipcommon 23 0>; cs-gpios = <&chipcommon 24 0>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 143/511 arm64: dts: qcom: sm8250-sony-xperia: correct GPIO keys wakeup again
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit b8fbeea0253211d97c579eae787274633d3eaf0d ]
gpio-keys,wakeup is a deprecated property:
m8250-sony-xperia-edo-pdx206.dtb: gpio-keys: key-camera-focus: Unevaluated properties are not allowed ('gpio-key,wakeup' was unexpected)
--- arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi +2 -2
@@ -60,7 +60,7 @@ key-camera-focus { gpios = <&pm8150b_gpios 2 GPIO_ACTIVE_LOW>; debounce-interval = <15>; linux,can-disable; - gpio-key,wakeup; + wakeup-source; }; key-camera-snapshot {
@@ -69,7 +69,7 @@ key-camera-snapshot { gpios = <&pm8150b_gpios 1 GPIO_ACTIVE_LOW>; debounce-interval = <15>; linux,can-disable; - gpio-key,wakeup; + wakeup-source; }; vol-down {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 144/511 arm64: dts: qcom: pmi8998: Add node for WLED
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 17d32c10a2880ae7702d8e56128a542d9c6e9c75 ]
The PMI8998 PMIC has a WLED backlight controller, which is used on most MSM8998 and SDM845 based devices: add a base configuration for it and keep it disabled.
This contains only the PMIC specific configuration that does not change across boards; parameters like number of strings, OVP and current limits are product specific and shall be specified in the product DT in order to achieve functionality.
Stable-dep-of: 9a4ac09db3c7 ("arm64: dts: qcom: pm660l: Add missing short interrupt")
--- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm64/boot/dts/qcom/pmi8998.dtsi +12 -0
@@ -41,5 +41,17 @@ lab: lab { interrupt-names = "sc-err", "ocp"; }; }; + + pmi8998_wled: leds@d800 { + compatible = "qcom,pmi8998-wled"; + reg = <0xd800 0xd900>; + interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, + <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ovp", "short"; + label = "backlight"; + + status = "disabled"; + }; + }; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 145/511 arm64: dts: qcom: correct SPMI WLED register range encoding
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d66b1d2e4afc0c8a9eb267740825240b67f6b1d1 ]
On PM660L, PMI8994 and PMI8998, the WLED has two address spaces and with size-cells=0, they should be encoded as two separate items.
Stable-dep-of: 9a4ac09db3c7 ("arm64: dts: qcom: pm660l: Add missing short interrupt")
--- arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi8998.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/pm660l.dtsi +1 -1
@@ -67,7 +67,7 @@ pmic@3 { pm660l_wled: leds@d800 { compatible = "qcom,pm660l-wled"; - reg = <0xd800 0xd900>; + reg = <0xd800>, <0xd900>; interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ovp"; label = "backlight";
arch/arm64/boot/dts/qcom/pmi8994.dtsi +1 -1
@@ -35,7 +35,7 @@ pmi8994_spmi_regulators: regulators { pmi8994_wled: wled@d800 { compatible = "qcom,pmi8994-wled"; - reg = <0xd800 0xd900>; + reg = <0xd800>, <0xd900>; interrupts = <3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>; interrupt-names = "short"; qcom,num-strings = <3>;
arch/arm64/boot/dts/qcom/pmi8998.dtsi +1 -1
@@ -44,7 +44,7 @@ lab: lab { pmi8998_wled: leds@d800 { compatible = "qcom,pmi8998-wled"; - reg = <0xd800 0xd900>; + reg = <0xd800>, <0xd900>; interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ovp", "short";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 146/511 arm64: dts: qcom: pm660l: Add missing short interrupt
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 9a4ac09db3c7413e334b4abd6b2f6de8930dd781 ]
Add the missing short interrupt. This fixes the schema warning:
wled@d800: interrupt-names: ['ovp'] is too short
--- arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pm660l.dtsi +3 -2
@@ -68,8 +68,9 @@ pmic@3 { pm660l_wled: leds@d800 { compatible = "qcom,pm660l-wled"; reg = <0xd800>, <0xd900>; - interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "ovp"; + interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, + <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ovp", "short"; label = "backlight"; qcom,switching-freq = <800>;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 147/511 arm64: dts: qcom: pmi8994: Remove hardcoded linear WLED enabled-strings
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marijn Suijten <[email protected]>
[ Upstream commit 9b729b0932d0e6097d9f103e9dd149ef10881f43 ]
The driver now sets an appropriate default for WLED4 (and WLED5) just like WLED3 making this linear array from 0-3 redundant. In addition the driver is now able to parse arrays of variable length solving the "all four strings *have to* be defined" comment.
Besides the driver will now warn when both properties are specified to prevent ambiguity: the length of the array is enough to imply a set number of strings.
Stable-dep-of: 8db944326903 ("arm64: dts: qcom: pmi8994: Add missing OVP interrupt")
--- arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm64/boot/dts/qcom/pmi8994.dtsi +0 -2
@@ -39,8 +39,6 @@ pmi8994_wled: wled@d800 { interrupts = <3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>; interrupt-names = "short"; qcom,num-strings = <3>; - /* Yes, all four strings *have to* be defined or things won't work. */ - qcom,enabled-strings = <0 1 2 3>; qcom,cabc; qcom,external-pfet; status = "disabled";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 148/511 arm64: dts: qcom: Move WLED num-strings from pmi8994 to sony-xperia-tone
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marijn Suijten <[email protected]>
[ Upstream commit 360f20c801f7ea2ddc9afcbc5ab74cebf8adea6b ]
The number of WLED strings used by a certain platform depend on the panel connected to that board and may not be the same for every user of pmi8994.
Stable-dep-of: 8db944326903 ("arm64: dts: qcom: pmi8994: Add missing OVP interrupt")
--- arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 1 + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi +1 -0
@@ -620,6 +620,7 @@ pmi8994_s11: s11 { &pmi8994_wled { status = "okay"; default-brightness = <512>; + qcom,num-strings = <3>; }; &rpm_requests {
arch/arm64/boot/dts/qcom/pmi8994.dtsi +0 -1
@@ -38,7 +38,6 @@ pmi8994_wled: wled@d800 { reg = <0xd800>, <0xd900>; interrupts = <3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>; interrupt-names = "short"; - qcom,num-strings = <3>; qcom,cabc; qcom,external-pfet; status = "disabled";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 149/511 arm64: dts: qcom: pmi8994: Add missing OVP interrupt
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 8db94432690371b1736e9a2566a9b3d8a73d5a97 ]
Add the missing OVP interrupt. This fixes the schema warning:
wled@d800: interrupt-names: ['short'] is too short
--- arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/pmi8994.dtsi +3 -2
@@ -36,8 +36,9 @@ pmi8994_spmi_regulators: regulators { pmi8994_wled: wled@d800 { compatible = "qcom,pmi8994-wled"; reg = <0xd800>, <0xd900>; - interrupts = <3 0xd8 0x02 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "short"; + interrupts = <0x3 0xd8 0x1 IRQ_TYPE_EDGE_RISING>, + <0x3 0xd8 0x2 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "ovp", "short"; qcom,cabc; qcom,external-pfet; status = "disabled";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 150/511 drm/etnaviv: fix dumping of active MMU context
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas Stach <[email protected]>
[ Upstream commit 20faf2005ec85fa1a6acc9a74ff27de667f90576 ]
gpu->mmu_context is the MMU context of the last job in the HW queue, which isn't necessarily the same as the context from the bad job. Dump the MMU context from the scheduler determined bad submit to make it work as intended.
--- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_dump.c +7 -7
@@ -125,9 +125,9 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)return ; etnaviv_dump_core = false; -mutex_lock (&gpu->mmu_context->lock); +mutex_lock (&submit->mmu_context->lock); - mmu_size =etnaviv_iommu_dump_size (gpu->mmu_context); + mmu_size =etnaviv_iommu_dump_size (submit->mmu_context);/* We always dump registers, mmu, ring, hanging cmdbuf and end marker */ n_obj =5 ;
@@ -157,7 +157,7 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit) iter.start =__vmalloc (file_size,GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);if (!iter.start) { -mutex_unlock (&gpu->mmu_context->lock); +mutex_unlock (&submit->mmu_context->lock);dev_warn (gpu->dev,"failed to allocate devcoredump file\n" );return ; }
@@ -169,18 +169,18 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)memset (iter.hdr,0 , iter.data - iter.start);etnaviv_core_dump_registers (&iter, gpu); -etnaviv_core_dump_mmu (&iter, gpu->mmu_context, mmu_size); +etnaviv_core_dump_mmu (&iter, submit->mmu_context, mmu_size);etnaviv_core_dump_mem (&iter,ETDUMP_BUF_RING , gpu->buffer.vaddr, gpu->buffer.size,etnaviv_cmdbuf_get_va (&gpu->buffer, - &gpu->mmu_context->cmdbuf_mapping)); + &submit->mmu_context->cmdbuf_mapping));etnaviv_core_dump_mem (&iter,ETDUMP_BUF_CMD , submit->cmdbuf.vaddr, submit->cmdbuf.size,etnaviv_cmdbuf_get_va (&submit->cmdbuf, - &gpu->mmu_context->cmdbuf_mapping)); + &submit->mmu_context->cmdbuf_mapping)); -mutex_unlock (&gpu->mmu_context->lock); +mutex_unlock (&submit->mmu_context->lock);/* Reserve space for the bomap */ if (n_bomap_pages) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 151/511 x86/mm: Fix PAT bit missing from page protection modify mask
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janusz Krzysztofik <[email protected]>
[ Upstream commit 548cb932051fb6232ac983ed6673dae7bdf3cf4c ]
Visible glitches have been observed when running graphics applications on Linux under Xen hypervisor. Those observations have been confirmed with failures from kms_pwrite_crc Intel GPU test that verifies data coherency of DRM frame buffer objects using hardware CRC checksums calculated by display controllers, exposed to userspace via debugfs. Affected processing paths have then been identified with new IGT test variants that mmap the objects using different methods and caching modes [1].
When running as a Xen PV guest, Linux uses Xen provided PAT configuration which is different from its native one. In particular, Xen specific PTE encoding of write-combining caching, likely used by graphics applications, differs from the Linux default one found among statically defined minimal set of supported modes. Since Xen defines PTE encoding of the WC mode as _PAGE_PAT, it no longer belongs to the minimal set, depends on correct handling of _PAGE_PAT bit, and can be mismatched with write-back caching.
When a user calls mmap() for a DRM buffer object, DRM device specific .mmap file operation, called from mmap_region(), takes care of setting PTE encoding bits in a vm_page_prot field of an associated virtual memory area structure. Unfortunately, _PAGE_PAT bit is not preserved when the vma's .vm_flags are then applied to .vm_page_prot via vm_set_page_prot(). Bits to be preserved are determined with _PAGE_CHG_MASK symbol that doesn't cover _PAGE_PAT. As a consequence, WB caching is requested instead of WC when running under Xen (also, WP is silently changed to WT, and UC downgraded to UC_MINUS). When running on bare metal, WC is not affected, but WP and WT extra modes are unintentionally replaced with WC and UC, respectively.
WP and WT modes, encoded with _PAGE_PAT bit set, were introduced by commit 281d4078bec3 ("x86: Make page cache mode a real type"). Care was taken to extend _PAGE_CACHE_MASK symbol with that additional bit, but that symbol has never been used for identification of bits preserved when applying page protection flags. Support for all cache modes under Xen, including the problematic WC mode, was then introduced by commit 47591df50512 ("xen: Support Xen pv-domains using PAT").
The issue needs to be fixed by including _PAGE_PAT bit into a bitmask used by pgprot_modify() for selecting bits to be preserved. We can do that either internally to pgprot_modify() (as initially proposed), or by making _PAGE_PAT a part of _PAGE_CHG_MASK. If we go for the latter then, since _PAGE_PAT is the same as _PAGE_PSE, we need to note that _HPAGE_CHG_MASK -- a huge pmds' counterpart of _PAGE_CHG_MASK, introduced by commit c489f1257b8c ("thp: add pmd_modify"), defined as (_PAGE_CHG_MASK | _PAGE_PSE) -- will no longer differ from _PAGE_CHG_MASK. If such modification of _PAGE_CHG_MASK was irrelevant to its users then one might wonder why that new _HPAGE_CHG_MASK symbol was introduced instead of reusing the existing one with that otherwise irrelevant bit (_PAGE_PSE in that case) added.
Add _PAGE_PAT to _PAGE_CHG_MASK and _PAGE_PAT_LARGE to _HPAGE_CHG_MASK for symmetry. Split out common bits from both symbols to a common symbol for clarity.
[ dhansen: tweak the solution changelog description ]
[1] https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/0f0754413f14
--- arch/x86/include/asm/pgtable_types.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/include/asm/pgtable_types.h +6 -5
@@ -123,11 +123,12 @@* instance, and is *not* included in this mask since * pte_modify() does modify it. */ -#define _PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ - _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY | \ - _PAGE_SOFT_DIRTY | _PAGE_DEVMAP | _PAGE_ENC | \ - _PAGE_UFFD_WP) -#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE) +#define _COMMON_PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ + _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY |\ + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP | _PAGE_ENC | \ + _PAGE_UFFD_WP) +#define _PAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PAT) +#define _HPAGE_CHG_MASK (_COMMON_PAGE_CHG_MASK | _PAGE_PSE | _PAGE_PAT_LARGE)/* * The cache modes defined here are used to translate between pure SW usage
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 152/511 ARM: dts: s3c64xx: align pinctrl with dtschema
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 9e47ccc01284aba7fe5fbf6ee2a7abc29bf2a740 ]
Align the pin controller related nodes with dtschema. No functional change expected.
Stable-dep-of: cf0cb2af6a18 ("ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split)")
--- arch/arm/boot/dts/s3c6410-mini6410.dts | 4 +- arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 210 ++++++++++++------------- 2 files changed, 107 insertions(+), 107 deletions(-)
arch/arm/boot/dts/s3c6410-mini6410.dts +2 -2
@@ -193,12 +193,12 @@ &uart3 { }; &pinctrl0 { - gpio_leds: gpio-leds { + gpio_leds: gpio-leds-pins { samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7"; samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>; }; - gpio_keys: gpio-keys { + gpio_keys: gpio-keys-pins { samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3", "gpn-4", "gpn-5", "gpl-11", "gpl-12"; samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
arch/arm/boot/dts/s3c64xx-pinctrl.dtsi +105 -105
754 lines not on this page · raw message
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 153/511 ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split)
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit cf0cb2af6a18f28b84f9f1416bff50ca60d6e98a ]
The davicom,dm9000 Ethernet Controller accepts two reg addresses.
--- arch/arm/boot/dts/s3c6410-mini6410.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/s3c6410-mini6410.dts +1 -1
@@ -51,7 +51,7 @@ srom-cs1-bus@18000000 { ethernet@18000000 { compatible = "davicom,dm9000"; - reg = <0x18000000 0x2 0x18000004 0x2>; + reg = <0x18000000 0x2>, <0x18000004 0x2>; interrupt-parent = <&gpn>; interrupts = <7 IRQ_TYPE_LEVEL_HIGH>; davicom,no-eeprom;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 154/511 ARM: dts: s5pv210: add dummy 5V regulator for backlight on SMDKv210
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit b77904ba177a9c67b6dbc3637fdf1faa22df6e5c ]
Backlight is supplied by DC5V regulator. The DTS has no PMIC node, so just add a regulator-fixed to solve it and fix dtbs_check warning:
s5pv210-smdkv210.dtb: backlight: 'power-supply' is a required property
Stable-dep-of: 982655cb0e7f ("ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split)")
--- arch/arm/boot/dts/s5pv210-smdkv210.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/s5pv210-smdkv210.dts +8 -0
@@ -55,6 +55,14 @@ backlight { default-brightness-level = <6>; pinctrl-names = "default"; pinctrl-0 = <&pwm3_out>; + power-supply = <&dc5v_reg>; + }; + + dc5v_reg: regulator-0 { + compatible = "regulator-fixed"; + regulator-name = "DC5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; }; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 155/511 ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split)
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 982655cb0e7f18934d7532c32366e574ad61dbd7 ]
The davicom,dm9000 Ethernet Controller accepts two reg addresses.
--- arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/s5pv210-smdkv210.dts +1 -1
@@ -41,7 +41,7 @@ pmic_ap_clk: clock-0 { ethernet@a8000000 { compatible = "davicom,dm9000"; - reg = <0xA8000000 0x2 0xA8000002 0x2>; + reg = <0xa8000000 0x2>, <0xa8000002 0x2>; interrupt-parent = <&gph1>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; local-mac-address = [00 00 de ad be ef];
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 156/511 drm: adv7511: Fix low refresh rate register for ADV7533/5
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bogdan Togorean <[email protected]>
[ Upstream commit d281eeaa4de2636ff0c8e6ae387bb07b50e5fcbb ]
For ADV7533 and ADV7535 low refresh rate is selected using bits [3:2] of 0x4a main register.
So depending on ADV model write 0xfb or 0x4a register.
--- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +7 -2
@@ -786,8 +786,13 @@ static void adv7511_mode_set(struct adv7511 *adv7511,else low_refresh_rate =ADV7511_LOW_REFRESH_RATE_NONE ; -regmap_update_bits (adv7511->regmap,0xfb , -0x6 , low_refresh_rate <<1 ); +if (adv7511->type ==ADV7511 ) +regmap_update_bits (adv7511->regmap,0xfb , +0x6 , low_refresh_rate <<1 ); +else +regmap_update_bits (adv7511->regmap,0x4a , +0xc , low_refresh_rate <<2 ); +regmap_update_bits (adv7511->regmap,0x17 ,0x60 , (vsync_polarity <<6 ) | (hsync_polarity <<5 ));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 157/511 ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <[email protected]>
[ Upstream commit 44ad8207806973f4e4f7d870fff36cc01f494250 ]
Both Luxul's XAP devices (XAP-810 and XAP-1440) are access points that use a non-default design. They don't include switch but have a single Ethernet port and BCM54210E PHY connected to the Ethernet controller's MDIO bus.
Support for those devices regressed due to two changes:
1. Describing MDIO bus with switch
After commit 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch") Linux stopped probing for MDIO devices.
2. Dropping hardcoded BCM54210E delays
In commit fea7fda7f50a ("net: phy: broadcom: Fix RGMII delays configuration for BCM54210E") support for other PHY modes was added but that requires a proper "phy-mode" value in DT.
Both above changes are correct (they don't need to be reverted or anything) but they need this fix for DT data to be correct and for Linux to work properly.
--- arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 13 +++++++++++++ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 13 +++++++++++++ 2 files changed, 26 insertions(+)
arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts +13 -0
@@ -46,3 +46,16 @@ restart { }; }; }; + +&gmac0 { + phy-mode = "rgmii"; + phy-handle = <&bcm54210e>; + + mdio { + /delete-node/ switch@1e; + + bcm54210e: ethernet-phy@0 { + reg = <0>; + }; + }; +};
arch/arm/boot/dts/bcm47189-luxul-xap-810.dts +13 -0
@@ -83,3 +83,16 @@ pcie0_chipcommon: chipcommon@0 { }; }; }; + +&gmac0 { + phy-mode = "rgmii"; + phy-handle = <&bcm54210e>; + + mdio { + /delete-node/ switch@1e; + + bcm54210e: ethernet-phy@0 { + reg = <0>; + }; + }; +};
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 158/511 arm64: dts: qcom: sdm845: Add missing RPMh power domain to GCC
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 4b6ea15c0a1122422b44bf6c47a3c22fc8d46777 ]
GCC and it's GDSCs are under the RPMh CX power domain. So let's add the missing RPMh power domain to the GCC node.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -0
@@ -1074,6 +1074,7 @@ gcc: clock-controller@100000 { #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>; + power-domains = <&rpmhpd SDM845_CX>; }; qfprom@784000 {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 159/511 arm64: dts: qcom: sdm845: Fix the min frequency of "ice_core_clk"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit bbbef6e24bc4493602df68b052f6f48d48e3184a ]
Minimum frequency of the "ice_core_clk" should be 75MHz as specified in the downstream vendor devicetree. So fix it!
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -2283,7 +2283,7 @@ ufs_mem_hc: ufshc@1d84000 { <0 0>, <0 0>, <0 0>, - <0 300000000>; + <75000000 300000000>; status = "disabled"; };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 160/511 drm/amdgpu: Update min() to min_t() in amdgpu_info_ioctl
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivasan Shanmugam <[email protected]>
[ Upstream commit a0cc8e1512ad72c9f97cdcb76d42715730adaf62 ]
Fixes the following:
WARNING: min() should probably be min_t(size_t, size, sizeof(ip))
+ ret = copy_to_user(out, &ip, min((size_t)size, sizeof(ip)));
And other style fixes:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
WARNING: Missing a blank line after declarations
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +8 -6
@@ -582,6 +582,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) crtc = (struct drm_crtc *)minfo->crtcs[i];if (crtc && crtc->base.id == info->mode_crtc.id) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); + ui32 = amdgpu_crtc->crtc_id; found =1 ;break ;
@@ -600,7 +601,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)if (ret)return ret; - ret =copy_to_user (out, &ip,min ((size_t )size,sizeof (ip))); + ret =copy_to_user (out, &ip,min_t (size_t, size,sizeof (ip)));return ret ? -EFAULT :0 ; }case AMDGPU_INFO_HW_IP_COUNT : {
@@ -748,17 +749,18 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) ? -EFAULT :0 ; }case AMDGPU_INFO_READ_MMR_REG : { -unsigned n, alloc_size; +unsigned int n, alloc_size;uint32_t *regs; -unsigned se_num = (info->read_mmr_reg.instance >> +unsigned int se_num = (info->read_mmr_reg.instance >>AMDGPU_INFO_MMR_SE_INDEX_SHIFT ) &AMDGPU_INFO_MMR_SE_INDEX_MASK ; -unsigned sh_num = (info->read_mmr_reg.instance >> +unsigned int sh_num = (info->read_mmr_reg.instance >>AMDGPU_INFO_MMR_SH_INDEX_SHIFT ) &AMDGPU_INFO_MMR_SH_INDEX_MASK ;/* set full masks if the userspace set all bits -* in the bitfields */ +* in the bitfields +*/ if (se_num ==AMDGPU_INFO_MMR_SE_INDEX_MASK ) se_num =0xffffffff ;else if (se_num >=AMDGPU_GFX_MAX_SE )
@@ -882,7 +884,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)return ret; }case AMDGPU_INFO_VCE_CLOCK_TABLE : { -unsigned i; +unsigned int i;struct drm_amdgpu_info_vce_clock_table vce_clk_table = {};struct amd_vce_state *vce_state;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 161/511 md/raid10: factor out dereference_rdev_and_rrdev()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit b99f8fd2d91eb734f13098aa1cf337edaca454b7 ]
Factor out a helper to get 'rdev' and 'replacement' from config->mirrors. Just to make code cleaner and prepare to fix the bug of io loss while 'replacement' replace 'rdev'.
There is no functional change.
Stable-dep-of: 673643490b9a ("md/raid10: use dereference_rdev_and_rrdev() to get devices")
--- drivers/md/raid10.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/md/raid10.c +20 -9
@@ -1316,6 +1316,25 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio, } } +static struct md_rdev *dereference_rdev_and_rrdev (struct raid10_info *mirror, +struct md_rdev **prrdev) +{ +struct md_rdev *rdev, *rrdev; + + rrdev =rcu_dereference (mirror->replacement); +/* +* Read replacement first to prevent reading both rdev and +* replacement as NULL during replacement replace rdev. +*/ +smp_mb (); + rdev =rcu_dereference (mirror->rdev); +if (rdev == rrdev) + rrdev =NULL ; + + *prrdev = rrdev; +return rdev; +} +static void wait_blocked_dev (struct mddev *mddev,struct r10bio *r10_bio) {int i;
@@ -1459,15 +1478,7 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,int d = r10_bio->devs[i].devnum;struct md_rdev *rdev, *rrdev; - rrdev =rcu_dereference (conf->mirrors[d].replacement); -/* -* Read replacement first to prevent reading both rdev and -* replacement as NULL during replacement replace rdev. -*/ -smp_mb (); - rdev =rcu_dereference (conf->mirrors[d].rdev); -if (rdev == rrdev) - rrdev =NULL ; + rdev =dereference_rdev_and_rrdev (&conf->mirrors[d], &rrdev);if (rdev && (test_bit (Faulty, &rdev->flags))) rdev =NULL ;if (rrdev && (test_bit (Faulty, &rrdev->flags)))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 162/511 md/raid10: use dereference_rdev_and_rrdev() to get devices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 673643490b9a0eb3b25633abe604f62b8f63dba1 ]
Commit 2ae6aaf76912 ("md/raid10: fix io loss while replacement replace rdev") reads replacement first to prevent io loss. However, there are same issue in wait_blocked_dev() and raid10_handle_discard(), too. Fix it by using dereference_rdev_and_rrdev() to get devices.
--- drivers/md/raid10.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/md/raid10.c +5 -8
@@ -1345,11 +1345,9 @@ static void wait_blocked_dev(struct mddev *mddev, struct r10bio *r10_bio) blocked_rdev =NULL ;rcu_read_lock ();for (i =0 ; i < conf->copies; i++) { -struct md_rdev *rdev =rcu_dereference (conf->mirrors[i].rdev); -struct md_rdev *rrdev =rcu_dereference ( - conf->mirrors[i].replacement); -if (rdev == rrdev) - rrdev =NULL ; +struct md_rdev *rdev, *rrdev; + + rdev =dereference_rdev_and_rrdev (&conf->mirrors[i], &rrdev);if (rdev &&unlikely (test_bit (Blocked, &rdev->flags))) {atomic_inc (&rdev->nr_pending); blocked_rdev = rdev;
@@ -1785,10 +1783,9 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio)*/ rcu_read_lock ();for (disk =0 ; disk < geo->raid_disks; disk++) { -struct md_rdev *rdev =rcu_dereference (conf->mirrors[disk].rdev); -struct md_rdev *rrdev =rcu_dereference ( - conf->mirrors[disk].replacement); +struct md_rdev *rdev, *rrdev; + rdev =dereference_rdev_and_rrdev (&conf->mirrors[disk], &rrdev); r10_bio->devs[disk].bio =NULL ; r10_bio->devs[disk].repl_bio =NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 163/511 md/bitmap: dont set max_write_behind if there is no write mostly device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guoqing Jiang <[email protected]>
[ Upstream commit 8c13ab115b577bd09097b9d77916732e97e31b7b ]
We shouldn't set it since write behind IO should only happen to write mostly device.
Stable-dep-of: 44abfa6a95df ("md/md-bitmap: hold 'reconfig_mutex' in backlog_store()")
--- drivers/md/md-bitmap.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/md/md-bitmap.c +19 -0
@@ -2476,11 +2476,30 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len) {unsigned long backlog;unsigned long old_mwb = mddev->bitmap_info.max_write_behind; +struct md_rdev *rdev; +bool has_write_mostly = false;int rv =kstrtoul (buf,10 , &backlog);if (rv)return rv;if (backlog >COUNTER_MAX )return -EINVAL ; + +/* +* Without write mostly device, it doesn't make sense to set +* backlog for max_write_behind. +*/ +rdev_for_each (rdev, mddev) { +if (test_bit (WriteMostly, &rdev->flags)) { + has_write_mostly = true; +break ; + } + } +if (!has_write_mostly) { +pr_warn_ratelimited ("%s: can't set backlog, no write mostly device available\n" , +mdname (mddev)); +return -EINVAL ; + } + mddev->bitmap_info.max_write_behind = backlog;if (!backlog && mddev->serial_info_pool) {/* serial_info_pool is not needed if backlog is zero */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 164/511 md/md-bitmap: hold reconfig_mutex in backlog_store()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 44abfa6a95df425c0660d56043020b67e6d93ab8 ]
Several reasons why 'reconfig_mutex' should be held:
1) rdev_for_each() is not safe to be called without the lock, because rdev can be removed concurrently.
2) mddev_destroy_serial_pool() and mddev_create_serial_pool() should not be called concurrently.
3) mddev_suspend() from mddev_destroy/create_serial_pool() should be protected by the lock.
--- drivers/md/md-bitmap.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/md/md-bitmap.c +7 -0
@@ -2484,6 +2484,10 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len)if (backlog >COUNTER_MAX )return -EINVAL ; + rv =mddev_lock (mddev); +if (rv) +return rv; +/* * Without write mostly device, it doesn't make sense to set * backlog for max_write_behind.
@@ -2497,6 +2501,7 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len)if (!has_write_mostly) {pr_warn_ratelimited ("%s: can't set backlog, no write mostly device available\n" ,mdname (mddev)); +mddev_unlock (mddev);return -EINVAL ; }
@@ -2514,6 +2519,8 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len) }if (old_mwb != backlog)md_bitmap_update_sb (mddev->bitmap); + +mddev_unlock (mddev);return len; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 165/511 drm/msm: Update dev core dump to not print backwards
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan McCann <[email protected]>
[ Upstream commit 903705111d863ed8ccf73465da77d232fc422ec1 ]
Device core dump add block method adds hardware blocks to dumping queue with stack behavior which causes the hardware blocks to be printed in reverse order. Change the addition to dumping queue data structure from "list_add" to "list_add_tail" for FIFO queue behavior.
Patchwork: https://patchwork.freedesktop.org/patch/546200/
--- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +1 -1
@@ -185,5 +185,5 @@ void msm_disp_snapshot_add_block(struct msm_disp_state *disp_state, u32 len, new_blk->base_addr = base_addr;msm_disp_state_dump_regs (&new_blk->state, new_blk->size, base_addr); -list_add (&new_blk->node, &disp_state->blocks); +list_add_tail (&new_blk->node, &disp_state->blocks); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 166/511 drm/tegra: dpaux: Fix incorrect return value of platform_get_irq
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yangtao Li <[email protected]>
[ Upstream commit 2a1ca44b654346cadfc538c4fb32eecd8daf3140 ]
When platform_get_irq fails, we should return dpaux->irq instead of -ENXIO.
--- drivers/gpu/drm/tegra/dpaux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tegra/dpaux.c +1 -1
@@ -468,7 +468,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev) dpaux->irq =platform_get_irq (pdev,0 );if (dpaux->irq <0 ) -return -ENXIO ; +return dpaux->irq;if (!pdev->dev.pm_domain) { dpaux->rst =devm_reset_control_get (&pdev->dev,"dpaux" );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 167/511 of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruan Jinjie <[email protected]>
[ Upstream commit d6ce4f0ea19c32f10867ed93d8386924326ab474 ]
when kmalloc() fail to allocate memory in kasprintf(), name or full_name will be NULL, strcmp() will cause null pointer dereference.
--- drivers/of/unittest.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/of/unittest.c +6 -4
@@ -70,7 +70,7 @@ static void __init of_unittest_find_node_by_name(void) np =of_find_node_by_path ("/testcase-data" ); name =kasprintf (GFP_KERNEL ,"%pOF" , np); -unittest (np && !strcmp ("/testcase-data" , name), +unittest (np && name && !strcmp ("/testcase-data" , name),"find /testcase-data failed\n" );of_node_put (np);kfree (name);
@@ -81,14 +81,14 @@ static void __init of_unittest_find_node_by_name(void) np =of_find_node_by_path ("/testcase-data/phandle-tests/consumer-a" ); name =kasprintf (GFP_KERNEL ,"%pOF" , np); -unittest (np && !strcmp ("/testcase-data/phandle-tests/consumer-a" , name), +unittest (np && name && !strcmp ("/testcase-data/phandle-tests/consumer-a" , name),"find /testcase-data/phandle-tests/consumer-a failed\n" );of_node_put (np);kfree (name); np =of_find_node_by_path ("testcase-alias" ); name =kasprintf (GFP_KERNEL ,"%pOF" , np); -unittest (np && !strcmp ("/testcase-data" , name), +unittest (np && name && !strcmp ("/testcase-data" , name),"find testcase-alias failed\n" );of_node_put (np);kfree (name);
@@ -99,7 +99,7 @@ static void __init of_unittest_find_node_by_name(void) np =of_find_node_by_path ("testcase-alias/phandle-tests/consumer-a" ); name =kasprintf (GFP_KERNEL ,"%pOF" , np); -unittest (np && !strcmp ("/testcase-data/phandle-tests/consumer-a" , name), +unittest (np && name && !strcmp ("/testcase-data/phandle-tests/consumer-a" , name),"find testcase-alias/phandle-tests/consumer-a failed\n" );of_node_put (np);kfree (name);
@@ -1373,6 +1373,8 @@ static void attach_node_and_children(struct device_node *np)const char *full_name; full_name =kasprintf (GFP_KERNEL ,"%pOF" , np); +if (!full_name) +return ;if (!strcmp (full_name,"/__local_fixups__" ) || !strcmp (full_name,"/__fixups__" )) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 168/511 arm64: dts: qcom: sm8150: Fix the I2C7 interrupt
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zeyan Li <[email protected]>
[ Upstream commit f9568d22ce06192a7e14bda3a29dc216659554ff ]
I2C6 and I2C7 use the same interrupts, which is incorrect. In the downstream kernel, I2C7 has interrupts of 608 instead of 607.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +1 -1
@@ -1131,7 +1131,7 @@ i2c7: i2c@89c000 { clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>; pinctrl-names = "default"; pinctrl-0 = <&qup_i2c7_default>; - interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; status = "disabled";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 169/511 drm/armada: Fix off-by-one error in armada_overlay_get_property()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 5f0d984053f74983a287100a9519b2fabb785fb5 ]
As ffs() returns one more than the index of the first bit set (zero means no bits set), the color key mode value is shifted one position too much.
Fix this by using FIELD_GET() instead.
--- drivers/gpu/drm/armada/armada_overlay.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/armada/armada_overlay.c +4 -2
@@ -4,6 +4,8 @@* Rewritten from the dovefb driver, and Armada510 manuals. */ +#include <linux/bitfield.h> +#include <drm/armada_drm.h> #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h>
@@ -451,8 +453,8 @@ static int armada_overlay_get_property(struct drm_plane *plane,drm_to_overlay_state (state)->colorkey_ug, drm_to_overlay_state(state)->colorkey_vb, 0); }else if (property == priv->colorkey_mode_prop) { - *val = (drm_to_overlay_state (state)->colorkey_mode & -CFG_CKMODE_MASK ) >>ffs (CFG_CKMODE_MASK ); + *val =FIELD_GET (CFG_CKMODE_MASK , +drm_to_overlay_state (state)->colorkey_mode); }else if (property == priv->brightness_prop) { *val =drm_to_overlay_state (state)->brightness +256 ; }else if (property == priv->contrast_prop) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 170/511 drm/panel: simple: Add missing connector type and pixel format for AUO T215HVN01
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 7a675a8fa598edb29a664a91adb80f0340649f6f ]
The connector type and pixel format are missing for this panel, add them to prevent various drivers from failing to determine either of those parameters.
--- drivers/gpu/drm/panel/panel-simple.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-simple.c +3 -1
@@ -1448,7 +1448,9 @@ static const struct panel_desc auo_t215hvn01 = { .delay = { .disable = 5, .unprepare = 1000, - } + }, + .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG, + .connector_type = DRM_MODE_CONNECTOR_LVDS, };static const struct drm_display_mode avic_tm070ddh03_mode = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 171/511 ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nayna Jain <[email protected]>
[ Upstream commit 5087fd9e80e539d2163accd045b73da64de7de95 ]
Time to remove "IMA_TRUSTED_KEYRING".
--- security/integrity/ima/Kconfig | 12 ------------ 1 file changed, 12 deletions(-)
security/integrity/ima/Kconfig +0 -12
@@ -248,18 +248,6 @@ config IMA_APPRAISE_MODSIG The modsig keyword can be used in the IMA policy to allow a hook to accept such signatures. -config IMA_TRUSTED_KEYRING - bool "Require all keys on the .ima keyring be signed (deprecated)" - depends on IMA_APPRAISE && SYSTEM_TRUSTED_KEYRING - depends on INTEGRITY_ASYMMETRIC_KEYS - select INTEGRITY_TRUSTED_KEYRING - default y - help - This option requires that all keys added to the .ima - keyring be signed by a key on the system trusted keyring. - - This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING - config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)" depends on SYSTEM_TRUSTED_KEYRING
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 172/511 drm: xlnx: zynqmp_dpsub: Add missing check for dma_set_mask
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
[ Upstream commit 1832fba7f9780aff67c96ad30f397c2d76141833 ]
Add check for dma_set_mask() and return the error if it fails.
--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +3 -1
@@ -200,7 +200,9 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev) dpsub->dev = &pdev->dev;platform_set_drvdata (pdev, dpsub); -dma_set_mask (dpsub->dev,DMA_BIT_MASK (ZYNQMP_DISP_MAX_DMA_BIT )); + ret =dma_set_mask (dpsub->dev,DMA_BIT_MASK (ZYNQMP_DISP_MAX_DMA_BIT )); +if (ret) +return ret;/* Try the reserved memory. Proceed if there's none. */ of_reserved_mem_device_init (&pdev->dev);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 173/511 drm/msm/mdp5: Dont leak some plane state
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit fd0ad3b2365c1c58aa5a761c18efc4817193beb6 ]
Apparently no one noticed that mdp5 plane states leak like a sieve ever since we introduced plane_state->commit refcount a few years ago in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.")
Fix it by using the right helpers.
Patchwork: https://patchwork.freedesktop.org/patch/551236/
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +1 -2
@@ -128,8 +128,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane, {struct mdp5_plane_state *pstate =to_mdp5_plane_state (state); -if (state->fb) -drm_framebuffer_put (state->fb); +__drm_atomic_helper_plane_destroy_state (state);kfree (pstate); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 174/511 firmware: meson_sm: fix to avoid potential NULL pointer dereference
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Shurong <[email protected]>
[ Upstream commit f2ed165619c16577c02b703a114a1f6b52026df4 ]
of_match_device() may fail and returns a NULL pointer.
Fix this by checking the return value of of_match_device.
--- drivers/firmware/meson/meson_sm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/meson/meson_sm.c +2 -0
@@ -292,6 +292,8 @@ static int __init meson_sm_probe(struct platform_device *pdev)return -ENOMEM ; chip =of_match_device (meson_sm_ids, dev)->data; +if (!chip) +return -EINVAL ;if (chip->cmd_shmem_in_base) { fw->sm_shmem_in_base = meson_sm_map_shmem(chip->cmd_shmem_in_base,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 175/511 smackfs: Prevent underflow in smk_set_cipso()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee ]
There is a upper bound to "catlen" but no lower bound to prevent negatives. I don't see that this necessarily causes a problem but we may as well be safe.
--- security/smack/smackfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/smack/smackfs.c +1 -1
@@ -895,7 +895,7 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, } ret =sscanf (rule,"%d" , &catlen); -if (ret !=1 || catlen >SMACK_CIPSO_MAXCATNUM ) +if (ret !=1 || catlen <0 || catlen >SMACK_CIPSO_MAXCATNUM ) goto out; if (format == SMK_FIXED24_FMT &&
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 176/511 drm/amd/pm: fix variable dereferenced issue in amdgpu_device_attr_create()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Wang <[email protected]>
[ Upstream commit 25e6373a5b8efc623443f2699d2b929bf3067d76 ]
- fix variable ('attr') dereferenced issue.
- using condition check instead of BUG_ON().
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +7 -3
@@ -2134,15 +2134,19 @@ static int amdgpu_device_attr_create(struct amdgpu_device *adev, uint32_t mask, struct list_head *attr_list) { int ret = 0; -struct device_attribute *dev_attr = &attr->dev_attr; -const char *name = dev_attr->attr.name;enum amdgpu_device_attr_states attr_states =ATTR_STATE_SUPPORTED ;struct amdgpu_device_attr_entry *attr_entry; +struct device_attribute *dev_attr; +const char *name;int (*attr_update)(struct amdgpu_device *adev,struct amdgpu_device_attr *attr,uint32_t mask,enum amdgpu_device_attr_states *states) = default_attr_update; -BUG_ON (!attr); +if (!attr) +return -EINVAL ; + + dev_attr = &attr->dev_attr; + name = dev_attr->attr.name; attr_update = attr->attr_update ? attr->attr_update : default_attr_update;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 177/511 drm/msm/a2xx: Call adreno_gpu_init() earlier
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
[ Upstream commit db07ce5da8b26bfeaf437a676ae49bd3bb1eace6 ]
The adreno_is_a20x() and adreno_is_a225() functions rely on the GPU revision, but such information is retrieved inside adreno_gpu_init(), which is called afterwards.
Fix this problem by caling adreno_gpu_init() earlier, so that the GPU information revision is available when adreno_is_a20x() and adreno_is_a225() run.
Tested on a imx53-qsb board.
Patchwork: https://patchwork.freedesktop.org/patch/543456/
--- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +4 -4
@@ -521,6 +521,10 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev) gpu->perfcntrs = perfcntrs; gpu->num_perfcntrs =ARRAY_SIZE (perfcntrs); + ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs,1 ); +if (ret) + goto fail; +if (adreno_is_a20x (adreno_gpu)) adreno_gpu->registers = a200_registers;else if (adreno_is_a225 (adreno_gpu))
@@ -528,10 +532,6 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)else adreno_gpu->registers = a220_registers; - ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs,1 ); -if (ret) - goto fail; -if (!gpu->aspace) {dev_err (dev->dev,"No memory protection without MMU\n" );if (!allow_vram_carveout) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 178/511 audit: fix possible soft lockup in __audit_inode_child()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gaosheng Cui <[email protected]>
[ Upstream commit b59bc6e37237e37eadf50cd5de369e913f524463 ]
Tracefs or debugfs maybe cause hundreds to thousands of PATH records, too many PATH records maybe cause soft lockup.
For example:
1. CONFIG_KASAN=y && CONFIG_PREEMPTION=n
2. auditctl -a exit,always -S open -k key
3. sysctl -w kernel.watchdog_thresh=5
4. mkdir /sys/kernel/debug/tracing/instances/test
There may be a soft lockup as follows:
watchdog: BUG: soft lockup - CPU#45 stuck for 7s! [mkdir:15498] Kernel panic - not syncing: softlockup: hung tasks Call trace: dump_backtrace+0x0/0x30c show_stack+0x20/0x30 dump_stack+0x11c/0x174 panic+0x27c/0x494 watchdog_timer_fn+0x2bc/0x390 __run_hrtimer+0x148/0x4fc __hrtimer_run_queues+0x154/0x210 hrtimer_interrupt+0x2c4/0x760 arch_timer_handler_phys+0x48/0x60 handle_percpu_devid_irq+0xe0/0x340 __handle_domain_irq+0xbc/0x130 gic_handle_irq+0x78/0x460 el1_irq+0xb8/0x140 __audit_inode_child+0x240/0x7bc tracefs_create_file+0x1b8/0x2a0 trace_create_file+0x18/0x50 event_create_dir+0x204/0x30c __trace_add_new_event+0xac/0x100 event_trace_add_tracer+0xa0/0x130 trace_array_create_dir+0x60/0x140 trace_array_create+0x1e0/0x370 instance_mkdir+0x90/0xd0 tracefs_syscall_mkdir+0x68/0xa0 vfs_mkdir+0x21c/0x34c do_mkdirat+0x1b4/0x1d4 __arm64_sys_mkdirat+0x4c/0x60 el0_svc_common.constprop.0+0xa8/0x240 do_el0_svc+0x8c/0xc0 el0_svc+0x20/0x30 el0_sync_handler+0xb0/0xb4 el0_sync+0x160/0x180
Therefore, we add cond_resched() to __audit_inode_child() to fix it.
--- kernel/auditsc.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/auditsc.c +2 -0
@@ -2200,6 +2200,8 @@ void __audit_inode_child(struct inode *parent, } } +cond_resched (); +/* is there a matching child entry? */ list_for_each_entry (n, &context->names_list, list) {/* can only match entries that have a name */
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 179/511 io_uring: fix drain stalls by invalid SQE
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit cfdbaa3a291d6fd2cb4a1a70d74e63b4abc2f5ec ]
cq_extra is protected by ->completion_lock, which io_get_sqe() misses. The bug is harmless as it doesn't happen in real life, requires invalid SQ index array and racing with submission, and only messes up the userspace, i.e. stall requests execution but will be cleaned up on ring destruction.
--- io_uring/io_uring.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/io_uring.c +2 -0
@@ -7531,7 +7531,9 @@ static const struct io_uring_sqe *io_get_sqe(struct io_ring_ctx *ctx)return &ctx->sq_sqes[head];/* drop invalid entries */ +spin_lock (&ctx->completion_lock); ctx->cq_extra--; +spin_unlock (&ctx->completion_lock);WRITE_ONCE (ctx->rings->sq_dropped,READ_ONCE (ctx->rings->sq_dropped) +1 );return NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 180/511 bus: ti-sysc: Fix build warning for 64-bit build
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit e1e1e9bb9d943ec690670a609a5f660ca10eaf85 ]
Fix "warning: cast from pointer to integer of different size" on 64-bit builds.
Note that this is a cosmetic fix at this point as the driver is not yet used for 64-bit systems.
--- drivers/bus/ti-sysc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/ti-sysc.c +1 -1
@@ -3055,7 +3055,7 @@ static int sysc_init_static_data(struct sysc *ddata) match =soc_device_match (sysc_soc_match);if (match && match->data) - sysc_soc->soc = (int )match->data; + sysc_soc->soc = (enum sysc_soc )match->data;/* * Check and warn about possible old incomplete dtb. We now want to see
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 181/511 drm/mediatek: Remove freeing not dynamic allocated memory
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason-JH.Lin <[email protected]>
[ Upstream commit 27b9e2ea3f2757da26bb8280e46f7fdbb1acb219 ]
Fixing the coverity issue of:mtk_drm_cmdq_pkt_destroy frees address of mtk_crtc->cmdq_handle
So remove the free function.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +2 -5
@@ -116,10 +116,9 @@ static int mtk_drm_cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *dma_addr_t dma_addr; pkt->va_base =kzalloc (size,GFP_KERNEL ); -if (!pkt->va_base) { -kfree (pkt); +if (!pkt->va_base)return -ENOMEM ; - } + pkt->buf_size = size; pkt->cl = (void *)client;
@@ -129,7 +128,6 @@ static int mtk_drm_cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *if (dma_mapping_error (dev, dma_addr)) {dev_err (dev,"dma map failed, size=%u\n" , (u32 )(u64 )size);kfree (pkt->va_base); -kfree (pkt);return -ENOMEM ; }
@@ -145,7 +143,6 @@ static void mtk_drm_cmdq_pkt_destroy(struct cmdq_pkt *pkt)dma_unmap_single (client->chan->mbox->dev, pkt->pa_base, pkt->buf_size,DMA_TO_DEVICE ); kfree(pkt->va_base); - kfree(pkt); }#endif
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 182/511 drm/mediatek: Fix potential memory leak if vmap() fail
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sui Jingfeng <[email protected]>
[ Upstream commit 379091e0f6d179d1a084c65de90fa44583b14a70 ]
Also return -ENOMEM if such a failure happens, the implement should take responsibility for the error handling.
--- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +5 -1
@@ -242,7 +242,11 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map) mtk_gem->kvaddr =vmap (mtk_gem->pages, npages,VM_MAP ,pgprot_writecombine (PAGE_KERNEL )); - +if (!mtk_gem->kvaddr) { +kfree (sgt); +kfree (mtk_gem->pages); +return -ENOMEM ; + } out:kfree (sgt);dma_buf_map_set_vaddr (map, mtk_gem->kvaddr);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 183/511 arm64: dts: qcom: apq8016-sbc: Fix ov5640 regulator supply names
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryan O'Donoghue <[email protected]>
[ Upstream commit 43a684580819e7f35b6cb38236be63c4cba26ef4 ]
The ov5640 driver expects DOVDD, AVDD and DVDD as regulator supply names.
The ov5640 has depended on these names since the driver was committed upstream in 2017. Similarly apq8016-sbc.dtsi has had completely different regulator names since its own initial commit in 2020.
Perhaps the regulators were left on in previous 410c bootloaders. In any case today on 6.5 we won't switch on the ov5640 without correctly naming the regulators.
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dts +3 -3
@@ -280,9 +280,9 @@ camera_rear@3b { clock-names = "xclk"; clock-frequency = <23880000>; - vdddo-supply = <&camera_vdddo_1v8>; - vdda-supply = <&camera_vdda_2v8>; - vddd-supply = <&camera_vddd_1v5>; + DOVDD-supply = <&camera_vdddo_1v8>; + AVDD-supply = <&camera_vdda_2v8>; + DVDD-supply = <&camera_vddd_1v5>; /* No camera mezzanine by default */ status = "disabled";
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 184/511 bus: ti-sysc: Fix cast to enum warning
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <[email protected]>
[ Upstream commit de44bf2f7683347f75690ef6cf61a1d5ba8f0891 ]
Fix warning for "cast to smaller integer type 'enum sysc_soc' from 'const void *'".
--- drivers/bus/ti-sysc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/ti-sysc.c +1 -1
@@ -3055,7 +3055,7 @@ static int sysc_init_static_data(struct sysc *ddata) match =soc_device_match (sysc_soc_match);if (match && match->data) - sysc_soc->soc = (enum sysc_soc )match->data; + sysc_soc->soc = (enum sysc_soc )(uintptr_t )match->data;/* * Check and warn about possible old incomplete dtb. We now want to see
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 185/511 md: Set MD_BROKEN for RAID1 and RAID10
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mariusz Tkaczyk <[email protected]>
[ Upstream commit 9631abdbf406c764f2a5d8305eac063bc3396a0a ]
There is no direct mechanism to determine raid failure outside personality. It is done by checking rdev->flags after executing md_error(). If "faulty" flag is not set then -EBUSY is returned to userspace. -EBUSY means that array will be failed after drive removal.
Mdadm has special routine to handle the array failure and it is executed if -EBUSY is returned by md.
There are at least two known reasons to not consider this mechanism as correct:
1. drive can be removed even if array will be failed[1].
2. -EBUSY seems to be wrong status. Array is not busy, but removal process cannot proceed safe.
-EBUSY expectation cannot be removed without breaking compatibility with userspace. In this patch first issue is resolved by adding support for MD_BROKEN flag for RAID1 and RAID10. Support for RAID456 is added in next commit.
The idea is to set the MD_BROKEN if we are sure that raid is in failed state now. This is done in each error_handler(). In md_error() MD_BROKEN flag is checked. If is set, then -EBUSY is returned to userspace.
As in previous commit, it causes that #mdadm --set-faulty is able to fail array. Previously proposed workaround is valid if optional functionality[1] is disabled.
[1] commit 9a567843f7ce("md: allow last device to be forcibly removed from
RAID1/RAID10.")
Stable-dep-of: 319ff40a5427 ("md/raid0: Fix performance regression for large sequential writes")
--- drivers/md/md.c | 27 +++++++++++--------- drivers/md/md.h | 62 +++++++++++++++++++++++++-------------------- drivers/md/raid1.c | 43 ++++++++++++++++++------------- drivers/md/raid10.c | 40 +++++++++++++++++------------ 4 files changed, 100 insertions(+), 72 deletions(-)
drivers/md/md.c +15 -12
@@ -2992,10 +2992,11 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len)if (cmd_match (buf,"faulty" ) && rdev->mddev->pers) {md_error (rdev->mddev, rdev); -if (test_bit (Faulty, &rdev->flags)) - err =0 ; -else + +if (test_bit (MD_BROKEN , &rdev->mddev->flags)) err = -EBUSY ; +else + err =0 ; }else if (cmd_match (buf,"remove" )) {if (rdev->mddev->pers) {clear_bit (Blocked, &rdev->flags);
@@ -4364,10 +4365,9 @@ __ATTR_PREALLOC(resync_start, S_IRUGO|S_IWUSR,* like active, but no writes have been seen for a while (100msec). * * broken -* RAID0/LINEAR-only: same as clean, but array is missing a member. -* It's useful because RAID0/LINEAR mounted-arrays aren't stopped -* when a member is gone, so this state will at least alert the -* user that something is wrong. +* Array is failed. It's useful because mounted-arrays aren't stopped +* when array is failed, so this state will at least alert the user that +* something is wrong. */ enum array_state { clear, inactive, suspended, readonly, read_auto, clean, active, write_pending, active_idle, broken, bad_word};
@@ -7439,7 +7439,7 @@ static int set_disk_faulty(struct mddev *mddev, dev_t dev) err = -ENODEV ; else {md_error (mddev, rdev); -if (!test_bit (Faulty, &rdev->flags)) +if (test_bit (MD_BROKEN , &mddev->flags)) err = -EBUSY ; }rcu_read_unlock ();
@@ -7985,13 +7985,16 @@ void md_error(struct mddev *mddev, struct md_rdev *rdev)if (!mddev->pers || !mddev->pers->error_handler)return ; - mddev->pers->error_handler (mddev,rdev); -if (mddev->degraded) + mddev->pers->error_handler (mddev, rdev); + +if (mddev->degraded && !test_bit (MD_BROKEN , &mddev->flags))set_bit (MD_RECOVERY_RECOVER , &mddev->recovery);sysfs_notify_dirent_safe (rdev->sysfs_state);set_bit (MD_RECOVERY_INTR , &mddev->recovery); -set_bit (MD_RECOVERY_NEEDED , &mddev->recovery); -md_wakeup_thread (mddev->thread); +if (!test_bit (MD_BROKEN , &mddev->flags)) { +set_bit (MD_RECOVERY_NEEDED , &mddev->recovery); +md_wakeup_thread (mddev->thread); + }if (mddev->event_work.func)queue_work (md_misc_wq, &mddev->event_work);md_new_event (mddev);
drivers/md/md.h +35 -27
69 lines not on this page · raw message
drivers/md/raid1.c +26 -17
56 lines not on this page · raw message
drivers/md/raid10.c +24 -16
@@ -2008,32 +2008,40 @@ static int enough(struct r10conf *conf, int ignore)_enough (conf,1 , ignore); } +/** +* raid10_error() - RAID10 error handler. +* @mddev: affected md device. +* @rdev: member device to fail. +* +* The routine acknowledges &rdev failure and determines new @mddev state. +* If it failed, then: +* - &MD_BROKEN flag is set in &mddev->flags. +* Otherwise, it must be degraded: +* - recovery is interrupted. +* - &mddev->degraded is bumped. + +* @rdev is marked as &Faulty excluding case when array is failed and +* &mddev->fail_last_dev is off. +*/ static void raid10_error (struct mddev *mddev,struct md_rdev *rdev) {char b[BDEVNAME_SIZE ];struct r10conf *conf = mddev->private;unsigned long flags; -/* -* If it is not operational, then we have already marked it as dead -* else if it is the last working disks with "fail_last_dev == false", -* ignore the error, let the next level up know. -* else mark the drive as failed -*/ spin_lock_irqsave (&conf->device_lock, flags); -if (test_bit (In_sync, &rdev->flags) && !mddev->fail_last_dev - && !enough (conf, rdev->raid_disk)) { -/* -* Don't fail the drive, just return an IO error. -*/ -spin_unlock_irqrestore (&conf->device_lock, flags); -return ; + +if (test_bit (In_sync, &rdev->flags) && !enough (conf, rdev->raid_disk)) { +set_bit (MD_BROKEN , &mddev->flags); + +if (!mddev->fail_last_dev) { +spin_unlock_irqrestore (&conf->device_lock, flags); +return ; + } }if (test_and_clear_bit (In_sync, &rdev->flags)) mddev->degraded++; -/* -* If recovery is running, make sure it aborts. -*/ +set_bit (MD_RECOVERY_INTR , &mddev->recovery);set_bit (Blocked, &rdev->flags);set_bit (Faulty, &rdev->flags);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 186/511 md: add error_handlers for raid0 and linear
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mariusz Tkaczyk <[email protected]>
[ Upstream commit c31fea2f8e2a72c817f318016bbc327095175a9f ]
After the commit 9631abdbf406c("md: Set MD_BROKEN for RAID1 and RAID10") MD_BROKEN must be set if array is failed because state_store() checks it. If it is set then -EBUSY is returned to userspace.
For raid0 and linear MD_BROKEN is not set by error_handler(). As a result mdadm is unable to trigger clean-up actions. It is a regression.
This patch adds appropriate error_handler for raid0 and linear. The error handler sets MD_BROKEN for this device.
Stable-dep-of: 319ff40a5427 ("md/raid0: Fix performance regression for large sequential writes")
--- drivers/md/md-linear.c | 14 +++++++++++++- drivers/md/md.c | 3 +++ drivers/md/md.h | 10 ++-------- drivers/md/raid0.c | 14 +++++++++++++- 4 files changed, 31 insertions(+), 10 deletions(-)
drivers/md/md-linear.c +13 -1
@@ -233,7 +233,8 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio) bio_sector < start_sector)) goto out_of_bounds; -if (unlikely (is_mddev_broken (tmp_dev->rdev,"linear" ))) { +if (unlikely (is_rdev_broken (tmp_dev->rdev))) { +md_error (mddev, tmp_dev->rdev);bio_io_error (bio);return true; }
@@ -281,6 +282,16 @@ static void linear_status (struct seq_file *seq, struct mddev *mddev)seq_printf (seq," %dk rounding" , mddev->chunk_sectors /2 ); } +static void linear_error (struct mddev *mddev,struct md_rdev *rdev) +{ +if (!test_and_set_bit (MD_BROKEN , &mddev->flags)) { +char *md_name =mdname (mddev); + +pr_crit ("md/linear%s: Disk failure on %pg detected, failing array.\n" , + md_name, rdev->bdev); + } +} +static void linear_quiesce (struct mddev *mddev,int state) { }
@@ -297,6 +308,7 @@ static struct md_personality linear_personality = .hot_add_disk = linear_add, .size = linear_size, .quiesce = linear_quiesce, + .error_handler = linear_error, };static int __init linear_init (void )
drivers/md/md.c +3 -0
@@ -7987,6 +7987,9 @@ void md_error(struct mddev *mddev, struct md_rdev *rdev)return ; mddev->pers->error_handler (mddev, rdev); +if (mddev->pers->level ==0 || mddev->pers->level ==LEVEL_LINEAR ) +return ; +if (mddev->degraded && !test_bit (MD_BROKEN , &mddev->flags))set_bit (MD_RECOVERY_RECOVER , &mddev->recovery);sysfs_notify_dirent_safe (rdev->sysfs_state);
drivers/md/md.h +2 -8
@@ -772,15 +772,9 @@ extern void mddev_destroy_serial_pool(struct mddev *mddev, struct md_rdev *rdev,struct md_rdev *md_find_rdev_nr_rcu (struct mddev *mddev,int nr);struct md_rdev *md_find_rdev_rcu (struct mddev *mddev,dev_t dev); -static inline bool is_mddev_broken (struct md_rdev *rdev,const char *md_type) +static inline bool is_rdev_broken (struct md_rdev *rdev) { -if (!disk_live (rdev->bdev->bd_disk)) { -if (!test_and_set_bit (MD_BROKEN , &rdev->mddev->flags)) -pr_warn ("md: %s: %s array has a missing/failed member\n" , -mdname (rdev->mddev), md_type); -return true; - } -return false; +return !disk_live (rdev->bdev->bd_disk); }static inline void rdev_dec_pending (struct md_rdev *rdev,struct mddev *mddev)
drivers/md/raid0.c +13 -1
@@ -628,8 +628,9 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)return true; } -if (unlikely (is_mddev_broken (tmp_dev,"raid0" ))) { +if (unlikely (is_rdev_broken (tmp_dev))) {bio_io_error (bio); +md_error (mddev, tmp_dev);return true; }
@@ -652,6 +653,16 @@ static void raid0_status(struct seq_file *seq, struct mddev *mddev)return ; } +static void raid0_error (struct mddev *mddev,struct md_rdev *rdev) +{ +if (!test_and_set_bit (MD_BROKEN , &mddev->flags)) { +char *md_name =mdname (mddev); + +pr_crit ("md/raid0%s: Disk failure on %pg detected, failing array.\n" , + md_name, rdev->bdev); + } +} +static void *raid0_takeover_raid45 (struct mddev *mddev) {struct md_rdev *rdev;
@@ -827,6 +838,7 @@ static struct md_personality raid0_personality= .size = raid0_size, .takeover = raid0_takeover, .quiesce = raid0_quiesce, + .error_handler = raid0_error, };static int __init raid0_init (void )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 187/511 md/raid0: Factor out helper for mapping and submitting a bio
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit af50e20afb401cc203bd2a9ff62ece0ae4976103 ]
Factor out helper function for mapping and submitting a bio out of raid0_make_request(). We will use it later for submitting both parts of a split bio.
Stable-dep-of: 319ff40a5427 ("md/raid0: Fix performance regression for large sequential writes")
--- drivers/md/raid0.c | 79 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 39 deletions(-)
drivers/md/raid0.c +40 -39
@@ -570,54 +570,21 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)bio_endio (bio); } -static bool raid0_make_request (struct mddev *mddev,struct bio *bio) +static void raid0_map_submit_bio (struct mddev *mddev,struct bio *bio) {struct r0conf *conf = mddev->private;struct strip_zone *zone;struct md_rdev *tmp_dev; -sector_t bio_sector; -sector_t sector; -sector_t orig_sector; -unsigned chunk_sects; -unsigned sectors; - -if (unlikely (bio->bi_opf &REQ_PREFLUSH ) - &&md_flush_request (mddev, bio)) -return true; - -if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ))) { -raid0_handle_discard (mddev, bio); -return true; - } - - bio_sector = bio->bi_iter.bi_sector; - sector = bio_sector; - chunk_sects = mddev->chunk_sectors; - - sectors = chunk_sects - - (likely (is_power_of_2 (chunk_sects)) - ? (sector & (chunk_sects-1 )) - :sector_div (sector, chunk_sects)); - -/* Restore due to sector_div */ - sector = bio_sector; - -if (sectors <bio_sectors (bio)) { -struct bio *split =bio_split (bio, sectors,GFP_NOIO , - &mddev->bio_set); -bio_chain (split, bio); -submit_bio_noacct (bio); - bio = split; - } +sector_t bio_sector = bio->bi_iter.bi_sector; +sector_t sector = bio_sector;if (bio->bi_pool != &mddev->bio_set)md_account_bio (mddev, &bio); - orig_sector = sector; zone =find_zone (mddev->private, §or);switch (conf->layout) {case RAID0_ORIG_LAYOUT : - tmp_dev =map_sector (mddev, zone, orig_sector, §or); + tmp_dev =map_sector (mddev, zone, bio_sector, §or);break ;case RAID0_ALT_MULTIZONE_LAYOUT : tmp_dev =map_sector (mddev, zone, sector, §or);
@@ -625,13 +592,13 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)default :WARN (1 ,"md/raid0:%s: Invalid layout\n" ,mdname (mddev));bio_io_error (bio); -return true; +return ; }if (unlikely (is_rdev_broken (tmp_dev))) {bio_io_error (bio);md_error (mddev, tmp_dev); -return true; +return ; }bio_set_dev (bio, tmp_dev->bdev);
@@ -644,6 +611,40 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)mddev_check_writesame (mddev, bio);mddev_check_write_zeroes (mddev, bio);submit_bio_noacct (bio); +} + +static bool raid0_make_request (struct mddev *mddev,struct bio *bio) +{ +sector_t sector; +unsigned chunk_sects; +unsigned sectors; + +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio)) +return true; + +if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ))) { +raid0_handle_discard (mddev, bio); +return true; + } + + sector = bio->bi_iter.bi_sector; + chunk_sects = mddev->chunk_sectors; + + sectors = chunk_sects - + (likely (is_power_of_2 (chunk_sects)) + ? (sector & (chunk_sects-1 )) + :sector_div (sector, chunk_sects)); + +if (sectors <bio_sectors (bio)) { +struct bio *split =bio_split (bio, sectors,GFP_NOIO , + &mddev->bio_set); +bio_chain (split, bio); +submit_bio_noacct (bio); + bio = split; + } + +raid0_map_submit_bio (mddev, bio);return true; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 188/511 md/raid0: Fix performance regression for large sequential writes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit 319ff40a542736d67e5bce18635de35d0e7a0bff ]
Commit f00d7c85be9e ("md/raid0: fix up bio splitting.") among other things changed how bio that needs to be split is submitted. Before this commit, we have split the bio, mapped and submitted each part. After this commit, we map only the first part of the split bio and submit the second part unmapped. Due to bio sorting in __submit_bio_noacct() this results in the following request ordering:
9,0 18 1181 0.525037895 15995 Q WS 1479315464 + 63392
Split off chunk-sized (1024 sectors) request:
9,0 18 1182 0.629019647 15995 X WS 1479315464 / 1479316488
Request is unaligned to the chunk so it's split in raid0_make_request(). This is the first part mapped and punted to bio_list:
8,0 18 7053 0.629020455 15995 A WS 739921928 + 1016 <- (9,0) 1479315464
Now raid0_make_request() returns, second part is postponed on bio_list. __submit_bio_noacct() resorts the bio_list, mapped request is submitted to the underlying device:
8,0 18 7054 0.629022782 15995 G WS 739921928 + 1016
Now we take another request from the bio_list which is the remainder of the original huge request. Split off another chunk-sized bit from it and the situation repeats:
9,0 18 1183 0.629024499 15995 X WS 1479316488 / 1479317512 8,16 18 6998 0.629025110 15995 A WS 739921928 + 1016 <- (9,0) 1479316488 8,16 18 6999 0.629026728 15995 G WS 739921928 + 1016 ... 9,0 18 1184 0.629032940 15995 X WS 1479317512 / 1479318536 [libnetacq-write] 8,0 18 7059 0.629033294 15995 A WS 739922952 + 1016 <- (9,0) 1479317512 8,0 18 7060 0.629033902 15995 G WS 739922952 + 1016
...
This repeats until we consume the whole original huge request. Now we finally get to processing the second parts of the split off requests (in reverse order):
8,16 18 7181 0.629161384 15995 A WS 739952640 + 8 <- (9,0) 1479377920 8,0 18 7239 0.629162140 15995 A WS 739952640 + 8 <- (9,0) 1479376896 8,16 18 7186 0.629163881 15995 A WS 739951616 + 8 <- (9,0) 1479375872 8,0 18 7242 0.629164421 15995 A WS 739951616 + 8 <- (9,0) 1479374848
...
I guess it is obvious that this IO pattern is extremely inefficient way to perform sequential IO. It also makes bio_list to grow to rather long lengths.
Change raid0_make_request() to map both parts of the split bio. Since we know we are provided with at most chunk-sized bios, we will always need to split the incoming bio at most once.
--- drivers/md/raid0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/raid0.c +1 -1
@@ -640,7 +640,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)struct bio *split =bio_split (bio, sectors,GFP_NOIO , &mddev->bio_set);bio_chain (split, bio); -submit_bio_noacct (bio); +raid0_map_submit_bio (mddev, bio); bio = split; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 189/511 md: raid0: account for split bio in iostat accounting
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
[ Upstream commit cc22b5407e9ca76adb7efeed843146510b1b72a5 ]
When a bio is split by md raid0, the newly created bio will not be tracked by md for I/O accounting. Only the portion of I/O still assigned to the original bio which was reduced by the split will be accounted for. This results in md iostat data sometimes showing I/O values far below the actual amount of data being sent through md.
md_account_bio() needs to be called for all bio generated by the bio split.
A simple example of the issue was generated using a raid0 device on partitions to the same device. Since all raid0 I/O then goes to one device, it makes it easy to see a gap between the md device and its sd storage. Reading an lvm device on top of the md device, the iostat output (some 0 columns and extra devices removed to make the data more compact) was:
Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read
md2 0.00 0.00 0.00 0.00 0 sde 0.00 0.00 0.00 0.00 0 md2 1364.00 411496.00 0.00 0.00 411496 sde 1734.00 646144.00 0.00 0.00 646144 md2 1699.00 510680.00 0.00 0.00 510680 sde 2155.00 802784.00 0.00 0.00 802784 md2 803.00 241480.00 0.00 0.00 241480 sde 1016.00 377888.00 0.00 0.00 377888 md2 0.00 0.00 0.00 0.00 0 sde 0.00 0.00 0.00 0.00 0
I/O was generated doing large direct I/O reads (12M) with dd to a linear lvm volume on top of the 4 leg raid0 device.
The md2 reads were showing as roughly 2/3 of the reads to the sde device containing all of md2's raid partitions. The sum of reads to sde was 1826816 kB, which was the expected amount as it was the amount read by dd. With the patch, the total reads from md will match the reads from sde and be consistent with the amount of I/O generated.
--- drivers/md/raid0.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/raid0.c +1 -2
@@ -578,8 +578,7 @@ static void raid0_map_submit_bio(struct mddev *mddev, struct bio *bio)sector_t bio_sector = bio->bi_iter.bi_sector;sector_t sector = bio_sector; -if (bio->bi_pool != &mddev->bio_set) -md_account_bio (mddev, &bio); +md_account_bio (mddev, &bio); zone =find_zone (mddev->private, §or);switch (conf->layout) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 190/511 of: overlay: Call of_changeset_init() early
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit a9515ff4fb142b690a0d2b58782b15903b990dba ]
When of_overlay_fdt_apply() fails, the changeset may be partially applied, and the caller is still expected to call of_overlay_remove() to clean up this partial state.
However, of_overlay_apply() calls of_resolve_phandles() before init_overlay_changeset(). Hence if the overlay fails to apply due to an unresolved symbol, the overlay_changeset.cset.entries list is still uninitialized, and cleanup will crash with a NULL-pointer dereference in overlay_removal_is_ok().
Fix this by moving the call to of_changeset_init() from init_overlay_changeset() to of_overlay_fdt_apply(), where all other early initialization is done.
--- drivers/of/overlay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/of/overlay.c +1 -2
@@ -752,8 +752,6 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs)if (!of_node_is_root (ovcs->overlay_root))pr_debug ("%s() ovcs->overlay_root is not root\n" , __func__); -of_changeset_init (&ovcs->cset); - cnt =0 ;/* fragment nodes */
@@ -995,6 +993,7 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,INIT_LIST_HEAD (&ovcs->ovcs_list);list_add_tail (&ovcs->ovcs_list, &ovcs_list); +of_changeset_init (&ovcs->cset);/* * Must create permanent copy of FDT because of_fdt_unflatten_tree()
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 191/511 of: unittest: Fix overlay type in apply/revert check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6becf8f845ae1f0b1cfed395bbeccbd23654162d ]
The removal check in of_unittest_apply_revert_overlay_check() always uses the platform device overlay type, while it should use the actual overlay type, as passed as a parameter to the function.
This has no impact on any current test, as all tests calling of_unittest_apply_revert_overlay_check() use the platform device overlay type.
--- drivers/of/unittest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/unittest.c +1 -1
@@ -2073,7 +2073,7 @@ static int __init of_unittest_apply_revert_overlay_check(int overlay_nr,of_unittest_untrack_overlay (save_id);/* unittest device must be again in before state */ -if (of_unittest_device_exists (unittest_nr,PDEV_OVERLAY ) != before) { +if (of_unittest_device_exists (unittest_nr, ovtype) != before) { unittest(0, "%s with device @\"%s\" %s\n", overlay_name_from_nr(overlay_nr), unittest_path(unittest_nr, ovtype),
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 192/511 ALSA: ac97: Fix possible error value of *rac97
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 67de40c9df94037769967ba28c7d951afb45b7fb ]
Before committing 79597c8bf64c, *rac97 always be NULL if there is an error. When error happens, make sure *rac97 is NULL is safer.
For examble, in snd_vortex_mixer():
err = snd_ac97_mixer(pbus, &ac97, &vortex->codec); vortex->isquad = ((vortex->codec == NULL) ? 0 : (vortex->codec->ext_id&0x80));
If error happened but vortex->codec isn't NULL, this may cause some problems.
Move the judgement order to be clearer and better.
--- sound/pci/ac97/ac97_codec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/pci/ac97/ac97_codec.c +2 -3
@@ -2070,10 +2070,9 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, .dev_disconnect = snd_ac97_dev_disconnect, }; -if (!rac97) -return -EINVAL ; -if (snd_BUG_ON (!bus || !template)) +if (snd_BUG_ON (!bus || !template || !rac97))return -EINVAL ; + *rac97 =NULL ;if (snd_BUG_ON (template->num >=4 ))return -EINVAL ;if (bus->codec[template->num])
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 193/511 ipmi:ssif: Add check for kstrdup
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
[ Upstream commit c5586d0f711e9744d0cade39b0c4a2d116a333ca ]
Add check for the return value of kstrdup() and return the error if it fails in order to avoid NULL pointer dereference.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_ssif.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/char/ipmi/ipmi_ssif.c +5 -0
@@ -1614,6 +1614,11 @@ static int ssif_add_infos(struct i2c_client *client) info->addr_src =SI_ACPI ; info->client = client; info->adapter_name =kstrdup (client->adapter->name,GFP_KERNEL ); +if (!info->adapter_name) { +kfree (info); +return -ENOMEM ; + } + info->binfo.addr = client->addr;list_add_tail (&info->link, &ssif_infos);return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 194/511 ipmi:ssif: Fix a memory leak when scanning for an adapter
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Corey Minyard <[email protected]>
[ Upstream commit b8d72e32e1453d37ee5c8a219f24e7eeadc471ef ]
The adapter scan ssif_info_find() sets info->adapter_name if the adapter info came from SMBIOS, as it's not set in that case. However, this function can be called more than once, and it will leak the adapter name if it had already been set. So check for NULL before setting it.
--- drivers/char/ipmi/ipmi_ssif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/ipmi/ipmi_ssif.c +1 -1
@@ -1414,7 +1414,7 @@ static struct ssif_addr_info *ssif_info_find(unsigned short addr, restart:list_for_each_entry (info, &ssif_infos, link) {if (info->binfo.addr == addr) { -if (info->addr_src ==SI_SMBIOS ) +if (info->addr_src ==SI_SMBIOS && !info->adapter_name) info->adapter_name =kstrdup (adapter_name,GFP_KERNEL );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 195/511 drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minjie Du <[email protected]>
[ Upstream commit a995c50db887ef97f3160775aef7d772635a6f6e ]
The function clk_register_pll() may return NULL or an ERR_PTR. Don't treat an ERR_PTR as valid.
--- drivers/clk/keystone/pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/keystone/pll.c +1 -1
@@ -209,7 +209,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl) } clk =clk_register_pll (NULL , node->name, parent_name, pll_data); -if (clk) { +if (!IS_ERR_OR_NULL (clk)) {of_clk_add_provider (node, of_clk_src_simple_get, clk);return ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 196/511 clk: sunxi-ng: Modify mismatched function name
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Jianhua <[email protected]>
[ Upstream commit 075d9ca5b4e17f84fd1c744a405e69ec743be7f0 ]
No functional modification involved.
drivers/clk/sunxi-ng/ccu_mmc_timing.c:54: warning: expecting prototype for sunxi_ccu_set_mmc_timing_mode(). Prototype was for sunxi_ccu_get_mmc_timing_mode() instead
--- drivers/clk/sunxi-ng/ccu_mmc_timing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu_mmc_timing.c +1 -1
@@ -43,7 +43,7 @@ int sunxi_ccu_set_mmc_timing_mode(struct clk *clk, bool new_mode)EXPORT_SYMBOL_GPL (sunxi_ccu_set_mmc_timing_mode);/** -* sunxi_ccu_set_mmc_timing_mode: Get the current MMC clock timing mode +* sunxi_ccu_get_mmc_timing_mode: Get the current MMC clock timing mode * @clk: clock to query * * Returns 0 if the clock is in old timing mode, > 0 if it is in
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 197/511 clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Wronek <[email protected]>
[ Upstream commit fd0b5ba87ad5709f0fd3d2bc4b7870494a75f96a ]
Set .flags = CLK_OPS_PARENT_ENABLE to fix "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error.
--- drivers/clk/qcom/gcc-sc7180.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sc7180.c +1 -0
@@ -667,6 +667,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_5, .num_parents = ARRAY_SIZE(gcc_parent_data_5), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 198/511 EDAC/igen6: Fix the issue of no error events
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiuxu Zhuo <[email protected]>
[ Upstream commit ce53ad81ed36c24aff075f94474adecfabfcf239 ]
Current igen6_edac checks for pending errors before the registration of the error handler. However, there is a possibility that the error occurs during the registration process, leading to unhandled pending errors and no future error events. This issue can be reproduced by repeatedly injecting errors during the loading of the igen6_edac.
Fix this issue by moving the pending error handler after the registration of the error handler, ensuring that no pending errors are left unhandled.
--- drivers/edac/igen6_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/edac/igen6_edac.c +4 -4
@@ -27,7 +27,7 @@#include "edac_mc.h" #include "edac_module.h" -#define IGEN6_REVISION "v2.5" +#define IGEN6_REVISION "v2.5.1"#define EDAC_MOD_STR "igen6_edac"#define IGEN6_NMI_NAME "igen6_ibecc"
@@ -1216,9 +1216,6 @@ static int igen6_probe(struct pci_dev *pdev, const struct pci_device_id *ent)INIT_WORK (&ecclog_work, ecclog_work_cb);init_irq_work (&ecclog_irq_work, ecclog_irq_work_cb); -/* Check if any pending errors before registering the NMI handler */ -ecclog_handler (); - rc =register_err_handler ();if (rc) goto fail3;
@@ -1230,6 +1227,9 @@ static int igen6_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto fail4; } +/* Check if any pending errors before/during the registration of the error handler */ +ecclog_handler (); +igen6_debug_setup ();return 0 ; fail4:
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 199/511 ext4: correct grp validation in ext4_mb_good_group
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kemeng Shi <[email protected]>
[ Upstream commit a9ce5993a0f5c0887c8a1b4ffa3b8046fbcfdc93 ]
Group corruption check will access memory of grp and will trigger kernel crash if grp is NULL. So do NULL check before corruption check.
--- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/mballoc.c +1 -1
@@ -2445,7 +2445,7 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac,BUG_ON (cr <0 || cr >=4 ); -if (unlikely (EXT4_MB_GRP_BBITMAP_CORRUPT (grp) || !grp)) +if (unlikely (!grp ||EXT4_MB_GRP_BBITMAP_CORRUPT (grp)))return false; free = grp->bb_free;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 200/511 ext4: avoid potential data overflow in next_linear_group
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kemeng Shi <[email protected]>
[ Upstream commit 60c672b7f2d1e5dd1774f2399b355c9314e709f8 ]
ngroups is ext4_group_t (unsigned int) while next_linear_group treat it in int. If ngroups is bigger than max number described by int, it will be treat as a negative number. Then "return group + 1 >= ngroups ? 0 :
group + 1;" may keep returning 0.
Switch int to ext4_group_t in next_linear_group to fix the overflow.
--- fs/ext4/mballoc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +3 -2
@@ -1011,8 +1011,9 @@ static inline int should_optimize_scan(struct ext4_allocation_context *ac)* Return next linear group for allocation. If linear traversal should not be * performed, this function just returns the same group */ -static int -next_linear_group (struct ext4_allocation_context *ac,int group,int ngroups) +static ext4_group_t +next_linear_group (struct ext4_allocation_context *ac,ext4_group_t group, +ext4_group_t ngroups) {if (!should_optimize_scan (ac)) goto inc_and_return;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 201/511 clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrick Whewell <[email protected]>
[ Upstream commit 783cb693828ce487cf0bc6ad16cbcf2caae6f8d9 ]
GPLL9 is not on by default, which causes a "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error when booting. Set .flags = CLK_OPS_PARENT_ENABLE to fix the error.
--- drivers/clk/qcom/gcc-sm8250.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sm8250.c +1 -0
@@ -721,6 +721,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_4, .num_parents = ARRAY_SIZE(gcc_parent_data_4), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 202/511 clk: qcom: reset: Use the correct type of sleep/delay based on length
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 181b66ee7cdd824797fc99b53bec29cf5630a04f ]
Use the fsleep() helper that (based on the length of the delay, see: [1]) chooses the correct sleep/delay functions.
[1] https://www.kernel.org/doc/Documentation/timers/timers-howto.txt
--- drivers/clk/qcom/reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/qcom/reset.c +2 -1
@@ -16,7 +16,8 @@ static int qcom_reset(struct reset_controller_dev *rcdev, unsigned long id)struct qcom_reset_controller *rst =to_qcom_reset_controller (rcdev); rcdev->ops->assert (rcdev, id); -udelay (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ +fsleep (rst->reset_map[id].udelay ?:1 );/* use 1 us as default */ + rcdev->ops->deassert (rcdev, id);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 203/511 clk: qcom: gcc-sm6350: Fix gcc_sdcc2_apps_clk_src
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit df04d166d1f346dbf740bbea64a3bed3e7f14c8d ]
GPLL7 is not on by default, which causes a "gcc_sdcc2_apps_clk_src: rcg didn't update its configuration" error when booting. Set .flags = CLK_OPS_PARENT_ENABLE to fix the error.
--- drivers/clk/qcom/gcc-sm6350.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sm6350.c +1 -0
@@ -640,6 +640,7 @@ static struct clk_rcg2 gcc_sdcc2_apps_clk_src = { .name = "gcc_sdcc2_apps_clk_src", .parent_data = gcc_parent_data_8, .num_parents = ARRAY_SIZE(gcc_parent_data_8), + .flags = CLK_OPS_PARENT_ENABLE, .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 204/511 PCI: microchip: Correct the DED and SEC interrupt bit offsets
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daire McNamara <[email protected]>
[ Upstream commit 6d473a5a26136edf55c435a1c433e52910e03926 ]
The SEC and DED interrupt bits are laid out the wrong way round so the SEC interrupt handler attempts to mask, unmask, and clear the DED interrupt and vice versa. Correct the bit offsets so that each interrupt handler operates properly.
--- drivers/pci/controller/pcie-microchip-host.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-microchip-host.c +4 -4
@@ -167,12 +167,12 @@#define EVENT_PCIE_DLUP_EXIT 2#define EVENT_SEC_TX_RAM_SEC_ERR 3#define EVENT_SEC_RX_RAM_SEC_ERR 4 -#define EVENT_SEC_AXI2PCIE_RAM_SEC_ERR 5 -#define EVENT_SEC_PCIE2AXI_RAM_SEC_ERR 6 +#define EVENT_SEC_PCIE2AXI_RAM_SEC_ERR 5 +#define EVENT_SEC_AXI2PCIE_RAM_SEC_ERR 6#define EVENT_DED_TX_RAM_DED_ERR 7#define EVENT_DED_RX_RAM_DED_ERR 8 -#define EVENT_DED_AXI2PCIE_RAM_DED_ERR 9 -#define EVENT_DED_PCIE2AXI_RAM_DED_ERR 10 +#define EVENT_DED_PCIE2AXI_RAM_DED_ERR 9 +#define EVENT_DED_AXI2PCIE_RAM_DED_ERR 10#define EVENT_LOCAL_DMA_END_ENGINE_0 11#define EVENT_LOCAL_DMA_END_ENGINE_1 12#define EVENT_LOCAL_DMA_ERROR_ENGINE_0 13
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 205/511 PCI: Mark NVIDIA T4 GPUs to avoid bus reset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wu Zongyong <[email protected]>
[ Upstream commit d5af729dc2071273f14cbb94abbc60608142fd83 ]
NVIDIA T4 GPUs do not work with SBR. This problem is found when the T4 card is direct attached to a Root Port only. Avoid bus reset by marking T4 GPUs PCI_DEV_FLAGS_NO_BUS_RESET.
--- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/quirks.c +1 -1
@@ -3606,7 +3606,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev)*/ static void quirk_nvidia_no_bus_reset (struct pci_dev *dev) { -if ((dev->device &0xffc0 ) ==0x2340 ) +if ((dev->device &0xffc0 ) ==0x2340 || dev->device ==0x1eb8 )quirk_no_bus_reset (dev); } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 206/511 pinctrl: mcp23s08: check return value of devm_kasprintf()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit f941714a7c7698eadb59bc27d34d6d6f38982705 ]
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-mcp23s08_spi.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pinctrl/pinctrl-mcp23s08_spi.c +10 -0
@@ -91,18 +91,28 @@ static int mcp23s08_spi_regmap_init(struct mcp23s08 *mcp, struct device *dev, mcp->reg_shift =0 ; mcp->chip.ngpio =8 ; mcp->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"mcp23s08.%d" , addr); +if (!mcp->chip.label) +return -ENOMEM ; config = &mcp23x08_regmap; name =devm_kasprintf (dev,GFP_KERNEL ,"%d" , addr); +if (!name) +return -ENOMEM ; +break ;case MCP_TYPE_S17 : mcp->reg_shift =1 ; mcp->chip.ngpio =16 ; mcp->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"mcp23s17.%d" , addr); +if (!mcp->chip.label) +return -ENOMEM ; config = &mcp23x17_regmap; name =devm_kasprintf (dev,GFP_KERNEL ,"%d" , addr); +if (!name) +return -ENOMEM ; +break ;case MCP_TYPE_S18 :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 207/511 PCI: pciehp: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 5f75f96c61039151c193775d776fde42477eace1 ]
As hotplug is not the only driver touching LNKCTL, use the RMW capability accessor which handles concurrent changes correctly.
--- drivers/pci/hotplug/pciehp_hpc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/pci/hotplug/pciehp_hpc.c +3 -9
@@ -332,17 +332,11 @@ int pciehp_check_link_status(struct controller *ctrl)static int __pciehp_link_set (struct controller *ctrl,bool enable) {struct pci_dev *pdev =ctrl_dev (ctrl); -u16 lnk_ctrl; -pcie_capability_read_word (pdev,PCI_EXP_LNKCTL , &lnk_ctrl); +pcie_capability_clear_and_set_word (pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_LD , + enable ?0 :PCI_EXP_LNKCTL_LD ); -if (enable) - lnk_ctrl &= ~PCI_EXP_LNKCTL_LD ; -else - lnk_ctrl |=PCI_EXP_LNKCTL_LD ; - -pcie_capability_write_word (pdev,PCI_EXP_LNKCTL , lnk_ctrl); -ctrl_dbg (ctrl,"%s: lnk_ctrl = %x\n" , __func__, lnk_ctrl);return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 208/511 PCI/ASPM: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit e09060b3b6b4661278ff8e1b7b81a37d5ea86eae ]
Don't assume that the device is fully under the control of ASPM and use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register values.
If configuration fails in pcie_aspm_configure_common_clock(), the function attempts to restore the old PCI_EXP_LNKCTL_CCC settings. Store only the old PCI_EXP_LNKCTL_CCC bit for the relevant devices rather than the content of the whole LNKCTL registers. It aligns better with how pcie_lnkctl_clear_and_set() expects its parameter and makes the code more obvious to understand.
--- drivers/pci/pcie/aspm.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/pci/pcie/aspm.c +13 -17
@@ -249,7 +249,7 @@ static int pcie_retrain_link(struct pcie_link_state *link)static void pcie_aspm_configure_common_clock (struct pcie_link_state *link) {int same_clock =1 ; -u16 reg16, parent_reg, child_reg[8 ]; +u16 reg16, ccc, parent_old_ccc, child_old_ccc[8 ];struct pci_dev *child, *parent = link->pdev;struct pci_bus *linkbus = parent->subordinate;/*
@@ -271,6 +271,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)/* Port might be already in common clock mode */ pcie_capability_read_word (parent,PCI_EXP_LNKCTL , ®16); + parent_old_ccc = reg16 &PCI_EXP_LNKCTL_CCC ;if (same_clock && (reg16 &PCI_EXP_LNKCTL_CCC )) {bool consistent = true;
@@ -287,34 +288,29 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)pci_info (parent,"ASPM: current common clock configuration is inconsistent, reconfiguring\n" ); } + ccc = same_clock ?PCI_EXP_LNKCTL_CCC :0 ;/* Configure downstream component, all functions */ list_for_each_entry (child, &linkbus->devices, bus_list) {pcie_capability_read_word (child,PCI_EXP_LNKCTL , ®16); - child_reg[PCI_FUNC (child->devfn)] = reg16; -if (same_clock) - reg16 |=PCI_EXP_LNKCTL_CCC ; -else - reg16 &= ~PCI_EXP_LNKCTL_CCC ; -pcie_capability_write_word (child,PCI_EXP_LNKCTL , reg16); + child_old_ccc[PCI_FUNC (child->devfn)] = reg16 &PCI_EXP_LNKCTL_CCC ; +pcie_capability_clear_and_set_word (child,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , ccc); }/* Configure upstream component */ -pcie_capability_read_word (parent,PCI_EXP_LNKCTL , ®16); - parent_reg = reg16; -if (same_clock) - reg16 |=PCI_EXP_LNKCTL_CCC ; -else - reg16 &= ~PCI_EXP_LNKCTL_CCC ; -pcie_capability_write_word (parent,PCI_EXP_LNKCTL , reg16); +pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , ccc);if (pcie_retrain_link (link)) {/* Training failed. Restore common clock configurations */ pci_err (parent,"ASPM: Could not configure common clock\n" );list_for_each_entry (child, &linkbus->devices, bus_list) -pcie_capability_write_word (child,PCI_EXP_LNKCTL , - child_reg[PCI_FUNC (child->devfn)]); -pcie_capability_write_word (parent,PCI_EXP_LNKCTL , parent_reg); +pcie_capability_clear_and_set_word (child,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , + child_old_ccc[PCI_FUNC (child->devfn)]); +pcie_capability_clear_and_set_word (parent,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_CCC , parent_old_ccc); } }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 209/511 clk: imx8mp: fix sai4 clock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Felsch <[email protected]>
[ Upstream commit c30f600f1f41dcf5ef0fb02e9a201f9b2e8f31bd ]
The reference manual don't mention a SAI4 hardware block. This would be clock slice 78 which is skipped (TRM, page 237). Remove any reference to this clock to align the driver with the reality.
--- drivers/clk/imx/clk-imx8mp.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/clk/imx/clk-imx8mp.c +0 -5
@@ -176,10 +176,6 @@ static const char * const imx8mp_sai3_sels[] = {"osc_24m", "audio_pll1_out", "au"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , "clk_ext3", "clk_ext4", }; -static const char *const imx8mp_sai4_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , -"clk_ext1" ,"clk_ext2" , }; -static const char *const imx8mp_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" ,"clk_ext2" ,"clk_ext3" , };
@@ -566,7 +562,6 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_SAI1 ] =imx8m_clk_hw_composite ("sai1" , imx8mp_sai1_sels, ccm_base +0xa580 ); hws[IMX8MP_CLK_SAI2 ] =imx8m_clk_hw_composite ("sai2" , imx8mp_sai2_sels, ccm_base +0xa600 ); hws[IMX8MP_CLK_SAI3 ] =imx8m_clk_hw_composite ("sai3" , imx8mp_sai3_sels, ccm_base +0xa680 ); - hws[IMX8MP_CLK_SAI4 ] =imx8m_clk_hw_composite ("sai4" , imx8mp_sai4_sels, ccm_base +0xa700 ); hws[IMX8MP_CLK_SAI5 ] =imx8m_clk_hw_composite ("sai5" , imx8mp_sai5_sels, ccm_base +0xa780 ); hws[IMX8MP_CLK_SAI6 ] =imx8m_clk_hw_composite ("sai6" , imx8mp_sai6_sels, ccm_base +0xa800 ); hws[IMX8MP_CLK_ENET_QOS ] =imx8m_clk_hw_composite ("enet_qos" , imx8mp_enet_qos_sels, ccm_base +0xa880 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 210/511 clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit 4dd432d985ef258e3bc436e568fba4b987b59171 ]
Reconfiguring the clock divider to the exact same value is observed on an i.MX8MN to often cause a longer than usual clock pause, probably because the divider restarts counting whenever the register is rewritten.
This issue doesn't show up normally, because the clock framework will take care to not call set_rate when the clock rate is the same. However, when we reconfigure an upstream clock, the common code will call set_rate with the newly calculated rate on all children, e.g.:
- sai5 is running normally and divides Audio PLL out by 16.
- Audio PLL rate is increased by 32Hz (glitch-free kdiv change)
- rates for children are recalculated and rates are set recursively
- imx8m_clk_composite_divider_set_rate(sai5) is called with
32/16 = 2Hz more
- imx8m_clk_composite_divider_set_rate computes same divider as before
- divider register is written, so it restarts counting from zero and MCLK is briefly paused, so instead of e.g. 40ns, MCLK is low for 120ns.
Some external clock consumers can be upset by such unexpected clock pauses, so let's make sure we only rewrite the divider value when the value to be written is actually different.
--- drivers/clk/imx/clk-composite-8m.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/clk/imx/clk-composite-8m.c +7 -5
@@ -97,7 +97,7 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,int prediv_value;int div_value;int ret; -u32 val; +u32 orig, val; ret =imx8m_clk_composite_compute_dividers (rate, parent_rate, &prediv_value, &div_value);
@@ -106,13 +106,15 @@ static int imx8m_clk_composite_divider_set_rate(struct clk_hw *hw,spin_lock_irqsave (divider->lock, flags); - val =readl (divider->reg); - val &= ~((clk_div_mask (divider->width) << divider->shift) | - (clk_div_mask (PCG_DIV_WIDTH ) <<PCG_DIV_SHIFT )); + orig =readl (divider->reg); + val = orig & ~((clk_div_mask (divider->width) << divider->shift) | + (clk_div_mask (PCG_DIV_WIDTH ) <<PCG_DIV_SHIFT )); val |= (u32)(prediv_value -1 ) << divider->shift; val |= (u32)(div_value -1 ) <<PCG_DIV_SHIFT ; -writel (val, divider->reg); + +if (val != orig) +writel (val, divider->reg);spin_unlock_irqrestore (divider->lock, flags);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 211/511 powerpc/radix: Move some functions into #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 4a9dd8f292efd614f0a18452e6474fe19ae17b47 ]
With skiboot_defconfig, Clang reports:
CC arch/powerpc/mm/book3s64/radix_tlb.oarch/powerpc/mm/book3s64/radix_tlb.c:419:20: error: unused function '_tlbie_pid_lpid' [-Werror,-Wunused-function] static inline void _tlbie_pid_lpid(unsigned long pid, unsigned long lpid,
^
arch/powerpc/mm/book3s64/radix_tlb.c:663:20: error: unused function '_tlbie_va_range_lpid' [-Werror,-Wunused-function]
static inline void _tlbie_va_range_lpid(unsigned long start, unsigned long end,
^This is because those functions are only called from functions enclosed in a #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
Move below functions inside that #ifdef
* __tlbie_pid_lpid(unsigned long pid,
* __tlbie_va_lpid(unsigned long va, unsigned long pid,
* fixup_tlbie_pid_lpid(unsigned long pid, unsigned long lpid)
* _tlbie_pid_lpid(unsigned long pid, unsigned long lpid,
* fixup_tlbie_va_range_lpid(unsigned long va,
* __tlbie_va_range_lpid(unsigned long start, unsigned long end,
* _tlbie_va_range_lpid(unsigned long start, unsigned long end,
--- arch/powerpc/mm/book3s64/radix_tlb.c | 240 ++++++++++++++------------- 1 file changed, 121 insertions(+), 119 deletions(-)
arch/powerpc/mm/book3s64/radix_tlb.c +121 -119
@@ -127,21 +127,6 @@ static __always_inline void __tlbie_pid(unsigned long pid, unsigned long ric)trace_tlbie (0 ,0 , rb, rs, ric, prs, r); } -static __always_inline void __tlbie_pid_lpid(unsigned long pid, -unsigned long lpid, -unsigned long ric) -{ -unsigned long rb, rs, prs, r; - - rb =PPC_BIT (53 );/* IS = 1 */ - rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); - prs =1 ;/* process scoped */ - r =1 ;/* radix format */ - - asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) - : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); - trace_tlbie(0 ,0 , rb, rs, ric, prs, r); -} static __always_inline void __tlbie_lpid(unsigned long lpid, unsigned long ric) {unsigned long rb,rs,prs,r;
@@ -202,23 +187,6 @@ static __always_inline void __tlbie_va(unsigned long va, unsigned long pid,trace_tlbie (0 ,0 , rb, rs, ric, prs, r); } -static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long pid, -unsigned long lpid, -unsigned long ap,unsigned long ric) -{ -unsigned long rb, rs, prs, r; - - rb = va & ~(PPC_BITMASK (52 ,63 )); - rb |= ap <<PPC_BITLSHIFT (58 ); - rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); - prs =1 ;/* process scoped */ - r =1 ;/* radix format */ - - asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) - : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); - trace_tlbie(0 ,0 , rb, rs, ric, prs, r); -} - static __always_inline void __tlbie_lpid_va(unsigned long va, unsigned long lpid,unsigned long ap,unsigned long ric) {
@@ -264,22 +232,6 @@ static inline void fixup_tlbie_va_range(unsigned long va, unsigned long pid, } } -static inline void fixup_tlbie_va_range_lpid (unsigned long va, -unsigned long pid, -unsigned long lpid, -unsigned long ap) -{ -if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); - } - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_va_lpid (va, pid, lpid, ap,RIC_FLUSH_TLB ); - } -} -static inline void fixup_tlbie_pid (unsigned long pid) {/*
@@ -299,26 +251,6 @@ static inline void fixup_tlbie_pid(unsigned long pid) } } -static inline void fixup_tlbie_pid_lpid (unsigned long pid,unsigned long lpid) -{ -/* -* We can use any address for the invalidation, pick one which is -* probably unused as an optimisation. -*/ -unsigned long va = ((1UL <<52 ) -1 ); - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); - } - -if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { - asmvolatile ("ptesync" : : :"memory" ); -__tlbie_va_lpid (va, pid, lpid,mmu_get_ap (MMU_PAGE_64K ), -RIC_FLUSH_TLB ); - } -} -static inline void fixup_tlbie_lpid_va (unsigned long va,unsigned long lpid,unsigned long ap) {
@@ -416,31 +348,6 @@ static inline void _tlbie_pid(unsigned long pid, unsigned long ric) asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); } -static inline void _tlbie_pid_lpid (unsigned long pid,unsigned long lpid, -unsigned long ric) -{ - asmvolatile ("ptesync" : : :"memory" ); - -/* -* Workaround the fact that the "ric" argument to __tlbie_pid -* must be a compile-time contraint to match the "i" constraint -* in the asm statement. -*/ -switch (ric) { -case RIC_FLUSH_TLB : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_TLB ); -fixup_tlbie_pid_lpid (pid, lpid); -break ; -case RIC_FLUSH_PWC : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); -break ; -case RIC_FLUSH_ALL : -default : -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_ALL ); -fixup_tlbie_pid_lpid (pid, lpid); - } - asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); -}struct tlbiel_pid {unsigned long pid;unsigned long ric;
@@ -566,20 +473,6 @@ static inline void __tlbie_va_range(unsigned long start, unsigned long end,fixup_tlbie_va_range (addr - page_size, pid, ap); } -static inline void __tlbie_va_range_lpid (unsigned long start,unsigned long end, -unsigned long pid,unsigned long lpid, -unsigned long page_size, -unsigned long psize) -{ -unsigned long addr; -unsigned long ap =mmu_get_ap (psize); - -for (addr = start; addr < end; addr += page_size) -__tlbie_va_lpid (addr, pid, lpid, ap,RIC_FLUSH_TLB ); - -fixup_tlbie_va_range_lpid (addr - page_size, pid, lpid, ap); -} - static __always_inline void _tlbie_va(unsigned long va, unsigned long pid,unsigned long psize,unsigned long ric) {
@@ -660,18 +553,6 @@ static inline void _tlbie_va_range(unsigned long start, unsigned long end, asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); } -static inline void _tlbie_va_range_lpid (unsigned long start,unsigned long end, -unsigned long pid,unsigned long lpid, -unsigned long page_size, -unsigned long psize,bool also_pwc) -{ - asmvolatile ("ptesync" : : :"memory" ); -if (also_pwc) -__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); -__tlbie_va_range_lpid (start, end, pid, lpid, page_size, psize); - asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); -} - static inline void _tlbiel_va_range_multicast(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long pid, unsigned long page_size,
@@ -1468,6 +1349,127 @@ void radix__flush_tlb_all(void) }#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +static __always_inline void __tlbie_pid_lpid(unsigned long pid, +unsigned long lpid, +unsigned long ric) +{ +unsigned long rb, rs, prs, r; + + rb =PPC_BIT (53 );/* IS = 1 */ + rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); + prs =1 ;/* process scoped */ + r =1 ;/* radix format */ + + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); + trace_tlbie(0 ,0 , rb, rs, ric, prs, r); +} + +static __always_inline void __tlbie_va_lpid(unsigned long va, unsigned long pid, +unsigned long lpid, +unsigned long ap,unsigned long ric) +{ +unsigned long rb, rs, prs, r; + + rb = va & ~(PPC_BITMASK (52 ,63 )); + rb |= ap <<PPC_BITLSHIFT (58 ); + rs = (pid <<PPC_BITLSHIFT (31 )) | (lpid & ~(PPC_BITMASK (0 ,31 ))); + prs =1 ;/* process scoped */ + r =1 ;/* radix format */ + + asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1) + : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); + trace_tlbie(0 ,0 , rb, rs, ric, prs, r); +} + +static inline void fixup_tlbie_pid_lpid (unsigned long pid,unsigned long lpid) +{ +/* +* We can use any address for the invalidation, pick one which is +* probably unused as an optimisation. +*/ +unsigned long va = ((1UL <<52 ) -1 ); + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); + } + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_va_lpid (va, pid, lpid,mmu_get_ap (MMU_PAGE_64K ), +RIC_FLUSH_TLB ); + } +} + +static inline void _tlbie_pid_lpid (unsigned long pid,unsigned long lpid, +unsigned long ric) +{ + asmvolatile ("ptesync" : : :"memory" ); + +/* +* Workaround the fact that the "ric" argument to __tlbie_pid +* must be a compile-time contraint to match the "i" constraint +* in the asm statement. +*/ +switch (ric) { +case RIC_FLUSH_TLB : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_TLB ); +fixup_tlbie_pid_lpid (pid, lpid); +break ; +case RIC_FLUSH_PWC : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); +break ; +case RIC_FLUSH_ALL : +default : +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_ALL ); +fixup_tlbie_pid_lpid (pid, lpid); + } + asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); +} + +static inline void fixup_tlbie_va_range_lpid (unsigned long va, +unsigned long pid, +unsigned long lpid, +unsigned long ap) +{ +if (cpu_has_feature (CPU_FTR_P9_TLBIE_ERAT_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_pid_lpid (0 , lpid,RIC_FLUSH_TLB ); + } + +if (cpu_has_feature (CPU_FTR_P9_TLBIE_STQ_BUG )) { + asmvolatile ("ptesync" : : :"memory" ); +__tlbie_va_lpid (va, pid, lpid, ap,RIC_FLUSH_TLB ); + } +} + +static inline void __tlbie_va_range_lpid (unsigned long start,unsigned long end, +unsigned long pid,unsigned long lpid, +unsigned long page_size, +unsigned long psize) +{ +unsigned long addr; +unsigned long ap =mmu_get_ap (psize); + +for (addr = start; addr < end; addr += page_size) +__tlbie_va_lpid (addr, pid, lpid, ap,RIC_FLUSH_TLB ); + +fixup_tlbie_va_range_lpid (addr - page_size, pid, lpid, ap); +} + +static inline void _tlbie_va_range_lpid (unsigned long start,unsigned long end, +unsigned long pid,unsigned long lpid, +unsigned long page_size, +unsigned long psize,bool also_pwc) +{ + asmvolatile ("ptesync" : : :"memory" ); +if (also_pwc) +__tlbie_pid_lpid (pid, lpid,RIC_FLUSH_PWC ); +__tlbie_va_range_lpid (start, end, pid, lpid, page_size, psize); + asmvolatile ("eieio; tlbsync; ptesync" : : :"memory" ); +} +/* * Performs process-scoped invalidations for a given LPID * as part of H_RPT_INVALIDATE hcall.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 212/511 vfio/type1: fix cap_migration information leak
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Hajnoczi <[email protected]>
[ Upstream commit cd24e2a60af633f157d7e59c0a6dba64f131c0b1 ]
Fix an information leak where an uninitialized hole in struct vfio_iommu_type1_info_cap_migration on the stack is exposed to userspace.
The definition of struct vfio_iommu_type1_info_cap_migration contains a hole as shown in this pahole(1) output:
struct vfio_iommu_type1_info_cap_migration {
struct vfio_info_cap_header header; /* 0 8 */
__u32 flags; /* 8 4 */ /* XXX 4 bytes hole, try to pack */
__u64 pgsize_bitmap; /* 16 8 */
__u64 max_dirty_bitmap_size; /* 24 8 */
/* size: 32, cachelines: 1, members: 4 */
/* sum members: 28, holes: 1, sum holes: 4 */
/* last cacheline: 32 bytes */};
The cap_mig variable is filled in without initializing the hole:
static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu,
struct vfio_info_cap *caps)
{
struct vfio_iommu_type1_info_cap_migration cap_mig;
cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION;
cap_mig.header.version = 1;
cap_mig.flags = 0;
/* support minimum pgsize */
cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap);
cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX;
return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig));}
The structure is then copied to a temporary location on the heap. At this point it's already too late and ioctl(VFIO_IOMMU_GET_INFO) copies it to userspace later:
int vfio_info_add_capability(struct vfio_info_cap *caps,
struct vfio_info_cap_header *cap, size_t size)
{
struct vfio_info_cap_header *header;
header = vfio_info_cap_add(caps, size, cap->id, cap->version);
if (IS_ERR(header))
return PTR_ERR(header);
memcpy(header + 1, cap + 1, size - sizeof(*header));
return 0;}
This issue was found by code inspection.
--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -2866,7 +2866,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu,static int vfio_iommu_migration_build_caps (struct vfio_iommu *iommu,struct vfio_info_cap *caps) { -struct vfio_iommu_type1_info_cap_migration cap_mig; +struct vfio_iommu_type1_info_cap_migration cap_mig = {}; cap_mig.header.id =VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION ; cap_mig.header.version =1 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 213/511 powerpc/fadump: reset dump area size if fadump memory reserve fails
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sourabh Jain <[email protected]>
[ Upstream commit d1eb75e0dfed80d2d85b664e28a39f65b290ab55 ]
In case fadump_reserve_mem() fails to reserve memory, the reserve_dump_area_size variable will retain the reserve area size. This will lead to /sys/kernel/fadump/mem_reserved node displaying an incorrect memory reserved by fadump.
To fix this problem, reserve dump area size variable is set to 0 if fadump failed to reserve memory.
--- arch/powerpc/kernel/fadump.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/fadump.c +1 -0
@@ -642,6 +642,7 @@ int __init fadump_reserve_mem(void)return ret; error_out: fw_dump.fadump_enabled =0 ; + fw_dump.reserve_dump_area_size =0 ;return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 214/511 powerpc/perf: Convert fsl_emb notifier to state machine callbacks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 34daf445f82bd3a4df852bb5f1dffd792ac830a0 ]
CC arch/powerpc/perf/core-fsl-emb.oarch/powerpc/perf/core-fsl-emb.c:675:6: error: no previous prototype for 'hw_perf_event_setup' [-Werror=missing-prototypes]
675 | void hw_perf_event_setup(int cpu)
| ^~~~~~~~~~~~~~~~~~~
Looks like fsl_emb was completely missed by commit 3f6da3905398 ("perf:
Rework and fix the arch CPU-hotplug hooks")
So, apply same changes as commit 3f6da3905398 ("perf: Rework and fix the arch CPU-hotplug hooks") then commit 57ecde42cc74 ("powerpc/perf:
Convert book3s notifier to state machine callbacks")
While at it, also fix following error:
arch/powerpc/perf/core-fsl-emb.c: In function 'perf_event_interrupt':arch/powerpc/perf/core-fsl-emb.c:648:13: error: variable 'found' set but not used [-Werror=unused-but-set-variable]
648 | int found = 0;
| ^~~~~--- arch/powerpc/perf/core-fsl-emb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/powerpc/perf/core-fsl-emb.c +5 -3
@@ -645,7 +645,6 @@ static void perf_event_interrupt(struct pt_regs *regs)struct cpu_hw_events *cpuhw =this_cpu_ptr (&cpu_hw_events);struct perf_event *event;unsigned long val; -int found =0 ;for (i =0 ; i < ppmu->n_counter; ++i) { event = cpuhw->event[i];
@@ -654,7 +653,6 @@ static void perf_event_interrupt(struct pt_regs *regs)if ((int )val <0 ) {if (event) {/* event has overflowed */ - found =1 ;record_and_restart (event, val, regs); }else {/*
@@ -672,11 +670,13 @@ static void perf_event_interrupt(struct pt_regs *regs)isync (); } -void hw_perf_event_setup (int cpu) +static int fsl_emb_pmu_prepare_cpu (unsigned int cpu) {struct cpu_hw_events *cpuhw = &per_cpu (cpu_hw_events, cpu);memset (cpuhw,0 ,sizeof (*cpuhw)); + +return 0 ; }int register_fsl_emb_pmu (struct fsl_emb_pmu *pmu)
@@ -689,6 +689,8 @@ int register_fsl_emb_pmu(struct fsl_emb_pmu *pmu) pmu->name);perf_pmu_register (&fsl_emb_pmu,"cpu" ,PERF_TYPE_RAW ); +cpuhp_setup_state (CPUHP_PERF_POWER ,"perf/powerpc:prepare" , + fsl_emb_pmu_prepare_cpu,NULL );return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 215/511 drm/amdgpu: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit ce7d88110b9ed5f33fe79ea6d4ed049fb0e57bce ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control. And in the case of upstream bridge, the driver does not even own the device it's changing the registers for.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 36 +++++++++----------------------- drivers/gpu/drm/amd/amdgpu/si.c | 36 +++++++++----------------------- 2 files changed, 20 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +10 -26
@@ -1574,17 +1574,8 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (adev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (ixPCIE_LC_STATUS1); max_lw = (tmp & PCIE_LC_STATUS1__LC_DETECTED_LINK_WIDTH_MASK) >>
@@ -1637,21 +1628,14 @@ static void cik_pcie_gen3_enable(struct amdgpu_device *adev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (adev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (adev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (adev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
drivers/gpu/drm/amd/amdgpu/si.c +10 -26
@@ -2276,17 +2276,8 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (adev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (adev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (adev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -2331,21 +2322,14 @@ static void si_pcie_gen3_enable(struct amdgpu_device *adev)mdelay (100 ); -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (adev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (adev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (adev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );pcie_capability_read_word (root,PCI_EXP_LNKCTL2 , &tmp16);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 216/511 drm/radeon: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 7189576e8a829130192b33c5b64e8a475369c776 ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control. And in the case of upstream bridge, the driver does not even own the device it's changing the registers for.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/gpu/drm/radeon/cik.c | 36 ++++++++++------------------------- drivers/gpu/drm/radeon/si.c | 37 ++++++++++-------------------------- 2 files changed, 20 insertions(+), 53 deletions(-)
drivers/gpu/drm/radeon/cik.c +10 -26
@@ -9534,17 +9534,8 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (rdev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE_PORT (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -9591,21 +9582,14 @@ static void cik_pcie_gen3_enable(struct radeon_device *rdev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root,PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (rdev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (rdev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (rdev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
drivers/gpu/drm/radeon/si.c +10 -27
@@ -7131,17 +7131,8 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)u16 bridge_cfg2, gpu_cfg2;u32 max_lw, current_lw, tmp; -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &bridge_cfg); -pcie_capability_read_word (rdev->pdev,PCI_EXP_LNKCTL , - &gpu_cfg); - - tmp16 = bridge_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (root,PCI_EXP_LNKCTL , tmp16); - - tmp16 = gpu_cfg |PCI_EXP_LNKCTL_HAWD ; -pcie_capability_write_word (rdev->pdev,PCI_EXP_LNKCTL , - tmp16); +pcie_capability_set_word (root,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); +pcie_capability_set_word (rdev->pdev,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_HAWD ); tmp =RREG32_PCIE (PCIE_LC_STATUS1 ); max_lw = (tmp &LC_DETECTED_LINK_WIDTH_MASK ) >>LC_DETECTED_LINK_WIDTH_SHIFT ;
@@ -7188,22 +7179,14 @@ static void si_pcie_gen3_enable(struct radeon_device *rdev)msleep (100 );/* linkctl */ -pcie_capability_read_word (root,PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (bridge_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (root, -PCI_EXP_LNKCTL , - tmp16); - -pcie_capability_read_word (rdev->pdev, -PCI_EXP_LNKCTL , - &tmp16); - tmp16 &= ~PCI_EXP_LNKCTL_HAWD ; - tmp16 |= (gpu_cfg &PCI_EXP_LNKCTL_HAWD ); -pcie_capability_write_word (rdev->pdev, -PCI_EXP_LNKCTL , - tmp16); +pcie_capability_clear_and_set_word (root,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + bridge_cfg & +PCI_EXP_LNKCTL_HAWD ); +pcie_capability_clear_and_set_word (rdev->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_HAWD , + gpu_cfg & +PCI_EXP_LNKCTL_HAWD );/* linkctl2 */ pcie_capability_read_word(root, PCI_EXP_LNKCTL2,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 217/511 net/mlx5: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 30de872537bda526664d7a20b646adfb3e7ce6e6 ]
Don't assume that only the driver would be accessing LNKCTL of the upstream bridge. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value.
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +2 -7
@@ -274,16 +274,11 @@ static int mlx5_pci_link_toggle(struct mlx5_core_dev *dev)pci_cfg_access_lock (sdev); }/* PCI link toggle */ - err =pci_read_config_word (bridge, cap +PCI_EXP_LNKCTL , ®16); -if (err) -return err; - reg16 |=PCI_EXP_LNKCTL_LD ; - err =pci_write_config_word (bridge, cap +PCI_EXP_LNKCTL , reg16); + err =pcie_capability_set_word (bridge,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_LD );if (err)return err;msleep (500 ); - reg16 &= ~PCI_EXP_LNKCTL_LD ; - err =pci_write_config_word (bridge, cap +PCI_EXP_LNKCTL , reg16); + err =pcie_capability_clear_word (bridge,PCI_EXP_LNKCTL ,PCI_EXP_LNKCTL_LD );if (err)return err;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 218/511 wifi: ath11k: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 6c1b6bdb34aaf8f94f65a9cae1d63490320c11bc ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which do proper locking to avoid losing concurrent updates to the register value. On restore, clear the ASPMC field properly.
--- drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/pci.c +6 -4
@@ -1000,8 +1000,8 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci) u16_get_bits(ab_pci->link_ctl, PCI_EXP_LNKCTL_ASPM_L1));/* disable L0s and L1 */ -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC ); +pcie_capability_clear_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC );set_bit (ATH11K_PCI_ASPM_RESTORE , &ab_pci->flags); }
@@ -1009,8 +1009,10 @@ static void ath11k_pci_aspm_disable(struct ath11k_pci *ab_pci)static void ath11k_pci_aspm_restore (struct ath11k_pci *ab_pci) {if (test_and_clear_bit (ATH11K_PCI_ASPM_RESTORE , &ab_pci->flags)) -pcie_capability_write_word (ab_pci->pdev,PCI_EXP_LNKCTL , - ab_pci->link_ctl); +pcie_capability_clear_and_set_word (ab_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + ab_pci->link_ctl & +PCI_EXP_LNKCTL_ASPMC ); }static int ath11k_pci_power_up (struct ath11k_base *ab)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 219/511 wifi: ath10k: Use RMW accessors for changing LNKCTL
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
[ Upstream commit f139492a09f15254fa261245cdbd65555cdf39e3 ]
Don't assume that only the driver would be accessing LNKCTL. ASPM policy changes can trigger write to LNKCTL outside of driver's control.
Use RMW capability accessors which does proper locking to avoid losing concurrent updates to the register value. On restore, clear the ASPMC field properly.
--- drivers/net/wireless/ath/ath10k/pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/pci.c +5 -4
@@ -1963,8 +1963,9 @@ static int ath10k_pci_hif_start(struct ath10k *ar)ath10k_pci_irq_enable (ar);ath10k_pci_rx_post (ar); -pcie_capability_write_word (ar_pci->pdev,PCI_EXP_LNKCTL , - ar_pci->link_ctl); +pcie_capability_clear_and_set_word (ar_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC , + ar_pci->link_ctl &PCI_EXP_LNKCTL_ASPMC );return 0 ; }
@@ -2821,8 +2822,8 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar,pcie_capability_read_word (ar_pci->pdev,PCI_EXP_LNKCTL , &ar_pci->link_ctl); -pcie_capability_write_word (ar_pci->pdev,PCI_EXP_LNKCTL , - ar_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC ); +pcie_capability_clear_word (ar_pci->pdev,PCI_EXP_LNKCTL , +PCI_EXP_LNKCTL_ASPMC );/* * Bring the target up cleanly.
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 220/511 PCI: dwc: Add start_link/stop_link inlines
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Serge Semin <[email protected]>
[ Upstream commit a37beefbde8802a4eab2545fee1b1780a03f2aa0 ]
Factor out this pattern:
if (!pci->ops || !pci->ops->start_link)
return -EINVAL;
return pci->ops->start_link(pci);into a new dw_pcie_start_link() wrapper and do the same for the stop_link() method.
Note that dw_pcie_ep_start() previously returned -EINVAL if there was no platform start_link() method, which didn't make much sense since that is not an error. It will now return 0 in that case.
As a side-effect, drop the empty start_link() and dummy dw_pcie_ops instances from the generic DW PCIe and Layerscape EP platform drivers.
Stable-dep-of: 17cf8661ee0f ("PCI: layerscape: Add workaround for lost link capabilities during reset")
--- drivers/pci/controller/dwc/pci-layerscape-ep.c | 12 ------------ drivers/pci/controller/dwc/pcie-designware-ep.c | 8 ++------ drivers/pci/controller/dwc/pcie-designware-host.c | 10 ++++------ drivers/pci/controller/dwc/pcie-designware-plat.c | 10 ---------- drivers/pci/controller/dwc/pcie-designware.h | 14 ++++++++++++++ 5 files changed, 20 insertions(+), 34 deletions(-)
drivers/pci/controller/dwc/pci-layerscape-ep.c +0 -12
@@ -32,15 +32,6 @@ struct ls_pcie_ep {const struct ls_pcie_ep_drvdata *drvdata; }; -static int ls_pcie_establish_link (struct dw_pcie *pci) -{ -return 0 ; -} - -static const struct dw_pcie_ops dw_ls_pcie_ep_ops = { - .start_link = ls_pcie_establish_link, -}; -static const struct pci_epc_features *ls_pcie_ep_get_features (struct dw_pcie_ep *ep) {
@@ -106,19 +97,16 @@ static const struct dw_pcie_ep_ops ls_pcie_ep_ops = {static const struct ls_pcie_ep_drvdata ls1_ep_drvdata = { .ops = &ls_pcie_ep_ops, - .dw_pcie_ops = &dw_ls_pcie_ep_ops, };static const struct ls_pcie_ep_drvdata ls2_ep_drvdata = { .func_offset =0x20000 , .ops = &ls_pcie_ep_ops, - .dw_pcie_ops = &dw_ls_pcie_ep_ops, };static const struct ls_pcie_ep_drvdata lx2_ep_drvdata = { .func_offset =0x8000 , .ops = &ls_pcie_ep_ops, - .dw_pcie_ops = &dw_ls_pcie_ep_ops, };static const struct of_device_id ls_pcie_ep_of_match[] = {
drivers/pci/controller/dwc/pcie-designware-ep.c +2 -6
@@ -434,8 +434,7 @@ static void dw_pcie_ep_stop(struct pci_epc *epc)struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep); -if (pci->ops && pci->ops->stop_link) - pci->ops->stop_link (pci); +dw_pcie_stop_link (pci); }static int dw_pcie_ep_start (struct pci_epc *epc)
@@ -443,10 +442,7 @@ static int dw_pcie_ep_start(struct pci_epc *epc)struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep); -if (!pci->ops || !pci->ops->start_link) -return -EINVAL ; - -return pci->ops->start_link (pci); +return dw_pcie_start_link (pci); } static const struct pci_epc_features*
drivers/pci/controller/dwc/pcie-designware-host.c +4 -6
@@ -402,8 +402,8 @@ int dw_pcie_host_init(struct pcie_port *pp)dw_pcie_setup_rc (pp); -if (!dw_pcie_link_up (pci) && pci->ops && pci->ops->start_link) { - ret = pci->ops->start_link (pci); +if (!dw_pcie_link_up (pci)) { + ret =dw_pcie_start_link (pci);if (ret) goto err_free_msi; }
@@ -420,8 +420,7 @@ int dw_pcie_host_init(struct pcie_port *pp)return 0 ; err_stop_link: -if (pci->ops && pci->ops->stop_link) - pci->ops->stop_link (pci); +dw_pcie_stop_link (pci); err_free_msi:if (pp->has_msi_ctrl)
@@ -437,8 +436,7 @@ void dw_pcie_host_deinit(struct pcie_port *pp)pci_stop_root_bus (pp->bridge->bus);pci_remove_root_bus (pp->bridge->bus); -if (pci->ops && pci->ops->stop_link) - pci->ops->stop_link (pci); +dw_pcie_stop_link (pci);if (pp->has_msi_ctrl)dw_pcie_free_msi (pp);
drivers/pci/controller/dwc/pcie-designware-plat.c +0 -10
@@ -36,15 +36,6 @@ static const struct of_device_id dw_plat_pcie_of_match[];static const struct dw_pcie_host_ops dw_plat_pcie_host_ops = { }; -static int dw_plat_pcie_establish_link (struct dw_pcie *pci) -{ -return 0 ; -} - -static const struct dw_pcie_ops dw_pcie_ops = { - .start_link = dw_plat_pcie_establish_link, -}; -static void dw_plat_pcie_ep_init (struct dw_pcie_ep *ep) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -142,7 +133,6 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)return -ENOMEM ; pci->dev = dev; - pci->ops = &dw_pcie_ops; dw_plat_pcie->pci = pci; dw_plat_pcie->mode = mode;
drivers/pci/controller/dwc/pcie-designware.h +14 -0
@@ -365,6 +365,20 @@ static inline void dw_pcie_dbi_ro_wr_dis(struct dw_pcie *pci)dw_pcie_writel_dbi (pci, reg, val); } +static inline int dw_pcie_start_link (struct dw_pcie *pci) +{ +if (pci->ops && pci->ops->start_link) +return pci->ops->start_link (pci); + +return 0 ; +} + +static inline void dw_pcie_stop_link (struct dw_pcie *pci) +{ +if (pci->ops && pci->ops->stop_link) + pci->ops->stop_link (pci); +} +#ifdef CONFIG_PCIE_DW_HOST irqreturn_t dw_handle_msi_irq (struct pcie_port *pp);void dw_pcie_setup_rc (struct pcie_port *pp);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 221/511 PCI: layerscape: Add the endpoint linkup notifier support
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 061cbfab09fb35898f2907d42f936cf9ae271d93 ]
Layerscape has PME interrupt, which can be used as linkup notifier. Set CFG_READY bit of PEX_PF0_CONFIG to enable accesses from root complex when linkup detected.
Stable-dep-of: 17cf8661ee0f ("PCI: layerscape: Add workaround for lost link capabilities during reset")
--- .../pci/controller/dwc/pci-layerscape-ep.c | 100 +++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pci-layerscape-ep.c +99 -1
@@ -18,6 +18,20 @@#include "pcie-designware.h" +#define PEX_PF0_CONFIG 0xC0014 +#define PEX_PF0_CFG_READY BIT(0) + +/* PEX PFa PCIE PME and message interrupt registers*/ +#define PEX_PF0_PME_MES_DR 0xC0020 +#define PEX_PF0_PME_MES_DR_LUD BIT(7) +#define PEX_PF0_PME_MES_DR_LDD BIT(9) +#define PEX_PF0_PME_MES_DR_HRD BIT(10) + +#define PEX_PF0_PME_MES_IER 0xC0028 +#define PEX_PF0_PME_MES_IER_LUDIE BIT(7) +#define PEX_PF0_PME_MES_IER_LDDIE BIT(9) +#define PEX_PF0_PME_MES_IER_HRDIE BIT(10) +#define to_ls_pcie_ep (x) dev_get_drvdata((x)->dev)struct ls_pcie_ep_drvdata {
@@ -30,8 +44,84 @@ struct ls_pcie_ep {struct dw_pcie *pci;struct pci_epc_features *ls_epc;const struct ls_pcie_ep_drvdata *drvdata; +int irq; +bool big_endian; }; +static u32 ls_lut_readl (struct ls_pcie_ep *pcie,u32 offset) +{ +struct dw_pcie *pci = pcie->pci; + +if (pcie->big_endian) +return ioread32be (pci->dbi_base + offset); +else +return ioread32 (pci->dbi_base + offset); +} + +static void ls_lut_writel (struct ls_pcie_ep *pcie,u32 offset,u32 value) +{ +struct dw_pcie *pci = pcie->pci; + +if (pcie->big_endian) +iowrite32be (value, pci->dbi_base + offset); +else +iowrite32 (value, pci->dbi_base + offset); +} + +static irqreturn_t ls_pcie_ep_event_handler (int irq,void *dev_id) +{ +struct ls_pcie_ep *pcie = dev_id; +struct dw_pcie *pci = pcie->pci; +u32 val, cfg; + + val =ls_lut_readl (pcie,PEX_PF0_PME_MES_DR ); +ls_lut_writel (pcie,PEX_PF0_PME_MES_DR , val); + +if (!val) +return IRQ_NONE ; + +if (val &PEX_PF0_PME_MES_DR_LUD ) { + cfg =ls_lut_readl (pcie,PEX_PF0_CONFIG ); + cfg |=PEX_PF0_CFG_READY ; +ls_lut_writel (pcie,PEX_PF0_CONFIG , cfg); +dw_pcie_ep_linkup (&pci->ep); + +dev_dbg (pci->dev,"Link up\n" ); + }else if (val &PEX_PF0_PME_MES_DR_LDD ) { +dev_dbg (pci->dev,"Link down\n" ); + }else if (val &PEX_PF0_PME_MES_DR_HRD ) { +dev_dbg (pci->dev,"Hot reset\n" ); + } + +return IRQ_HANDLED ; +} + +static int ls_pcie_ep_interrupt_init (struct ls_pcie_ep *pcie, +struct platform_device *pdev) +{ +u32 val; +int ret; + + pcie->irq =platform_get_irq_byname (pdev,"pme" ); +if (pcie->irq <0 ) +return pcie->irq; + + ret =devm_request_irq (&pdev->dev, pcie->irq, ls_pcie_ep_event_handler, +IRQF_SHARED , pdev->name, pcie); +if (ret) { +dev_err (&pdev->dev,"Can't register PCIe IRQ\n" ); +return ret; + } + +/* Enable interrupts */ + val =ls_lut_readl (pcie,PEX_PF0_PME_MES_IER ); + val |=PEX_PF0_PME_MES_IER_LDDIE |PEX_PF0_PME_MES_IER_HRDIE | +PEX_PF0_PME_MES_IER_LUDIE ; +ls_lut_writel (pcie,PEX_PF0_PME_MES_IER , val); + +return 0 ; +} +static const struct pci_epc_features *ls_pcie_ep_get_features (struct dw_pcie_ep *ep) {
@@ -124,6 +214,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)struct ls_pcie_ep *pcie;struct pci_epc_features *ls_epc;struct resource *dbi_base; +int ret; pcie =devm_kzalloc (dev,sizeof (*pcie),GFP_KERNEL );if (!pcie)
@@ -143,6 +234,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) pci->ops = pcie->drvdata->dw_pcie_ops; ls_epc->bar_fixed_64bit = (1 <<BAR_2 ) | (1 <<BAR_4 ); + ls_epc->linkup_notifier = true; pcie->pci = pci; pcie->ls_epc = ls_epc;
@@ -154,9 +246,15 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) pci->ep.ops = &ls_pcie_ep_ops; + pcie->big_endian =of_property_read_bool (dev->of_node,"big-endian" ); +platform_set_drvdata (pdev, pcie); -return dw_pcie_ep_init (&pci->ep); + ret =dw_pcie_ep_init (&pci->ep); +if (ret) +return ret; + +return ls_pcie_ep_interrupt_init (pcie, pdev); }static struct platform_driver ls_pcie_ep_driver = {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 222/511 PCI: layerscape: Add workaround for lost link capabilities during reset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiaowei Bao <[email protected]>
[ Upstream commit 17cf8661ee0f065c08152e611a568dd1fb0285f1 ]
The endpoint controller loses the Maximum Link Width and Supported Link Speed value from the Link Capabilities Register - initially configured by the Reset Configuration Word (RCW) - during a link-down or hot reset event.
Address this issue in the endpoint event handler.
--- .../pci/controller/dwc/pci-layerscape-ep.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/pci/controller/dwc/pci-layerscape-ep.c +19 -0
@@ -45,6 +45,7 @@ struct ls_pcie_ep {struct pci_epc_features *ls_epc;const struct ls_pcie_ep_drvdata *drvdata;int irq; +u32 lnkcap;bool big_endian; };
@@ -73,6 +74,7 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)struct ls_pcie_ep *pcie = dev_id;struct dw_pcie *pci = pcie->pci;u32 val, cfg; +u8 offset; val =ls_lut_readl (pcie,PEX_PF0_PME_MES_DR );ls_lut_writel (pcie,PEX_PF0_PME_MES_DR , val);
@@ -81,6 +83,19 @@ static irqreturn_t ls_pcie_ep_event_handler(int irq, void *dev_id)return IRQ_NONE ;if (val &PEX_PF0_PME_MES_DR_LUD ) { + + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + +/* +* The values of the Maximum Link Width and Supported Link +* Speed from the Link Capabilities Register will be lost +* during link down or hot reset. Restore initial value +* that configured by the Reset Configuration Word (RCW). +*/ +dw_pcie_dbi_ro_wr_en (pci); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , pcie->lnkcap); +dw_pcie_dbi_ro_wr_dis (pci); + cfg =ls_lut_readl (pcie,PEX_PF0_CONFIG ); cfg |=PEX_PF0_CFG_READY ;ls_lut_writel (pcie,PEX_PF0_CONFIG , cfg);
@@ -214,6 +229,7 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)struct ls_pcie_ep *pcie;struct pci_epc_features *ls_epc;struct resource *dbi_base; +u8 offset;int ret; pcie =devm_kzalloc (dev,sizeof (*pcie),GFP_KERNEL );
@@ -250,6 +266,9 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev)platform_set_drvdata (pdev, pcie); + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + pcie->lnkcap =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); + ret =dw_pcie_ep_init (&pci->ep);if (ret)return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 223/511 powerpc: Dont include lppaca.h in paca.h
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 1aa000667669fa855853decbb1c69e974d8ff716 ]
By adding a forward declaration for struct lppaca we can untangle paca.h and lppaca.h. Also move get_lppaca() into lppaca.h for consistency.
Add includes of lppaca.h to some files that need it.
Stable-dep-of: eac030b22ea1 ("powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT")
--- arch/powerpc/include/asm/lppaca.h | 4 ++++ arch/powerpc/include/asm/paca.h | 6 +----- arch/powerpc/include/asm/paravirt.h | 1 + arch/powerpc/include/asm/plpar_wrappers.h | 1 + arch/powerpc/kvm/book3s_hv_ras.c | 1 + arch/powerpc/mm/book3s64/slb.c | 1 + arch/powerpc/xmon/xmon.c | 1 + 7 files changed, 10 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/lppaca.h +4 -0
@@ -130,6 +130,10 @@ static inline bool lppaca_shared_proc(struct lppaca *l)return !!(l->__old_status &LPPACA_OLD_SHARED_PROC ); } +#ifdef CONFIG_PPC_PSERIES +#define get_lppaca () (get_paca()->lppaca_ptr) +#endif +/* * SLB shadow buffer structure as defined in the PAPR. The save_area * contains adjacent ESID and VSID pairs for each shadowed SLB. The
arch/powerpc/include/asm/paca.h +1 -5
@@ -14,7 +14,6 @@#include <linux/string.h> #include <asm/types.h> -#include <asm/lppaca.h> #include <asm/mmu.h> #include <asm/page.h> #ifdef CONFIG_PPC_BOOK3E
@@ -46,14 +45,11 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */#define get_paca () local_paca#endif -#ifdef CONFIG_PPC_PSERIES -#define get_lppaca () (get_paca()->lppaca_ptr) -#endif -#define get_slb_shadow () (get_paca()->slb_shadow_ptr)struct task_struct ;struct rtas_args ; +struct lppaca ;/* * Defines the layout of the paca.
arch/powerpc/include/asm/paravirt.h +1 -0
@@ -6,6 +6,7 @@#include <asm/smp.h> #ifdef CONFIG_PPC64 #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/hvcall.h> #endif
arch/powerpc/include/asm/plpar_wrappers.h +1 -0
@@ -9,6 +9,7 @@#include <asm/hvcall.h> #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/page.h> static inline long poll_pending (void )
arch/powerpc/kvm/book3s_hv_ras.c +1 -0
@@ -9,6 +9,7 @@#include <linux/kvm.h> #include <linux/kvm_host.h> #include <linux/kernel.h> +#include <asm/lppaca.h> #include <asm/opal.h> #include <asm/mce.h> #include <asm/machdep.h>
arch/powerpc/mm/book3s64/slb.c +1 -0
@@ -14,6 +14,7 @@#include <asm/mmu.h> #include <asm/mmu_context.h> #include <asm/paca.h> +#include <asm/lppaca.h> #include <asm/ppc-opcode.h> #include <asm/cputable.h> #include <asm/cacheflush.h>
arch/powerpc/xmon/xmon.c +1 -0
@@ -59,6 +59,7 @@#ifdef CONFIG_PPC64 #include <asm/hvcall.h> #include <asm/paca.h> +#include <asm/lppaca.h> #endif #include "nonstdio.h"
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 224/511 powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit eac030b22ea12cdfcbb2e941c21c03964403c63f ]
lppaca_shared_proc() takes a pointer to the lppaca which is typically accessed through get_lppaca(). With DEBUG_PREEMPT enabled, this leads to checking if preemption is enabled, for example:
BUG: using smp_processor_id() in preemptible [00000000] code: grep/10693
caller is lparcfg_data+0x408/0x19a0
CPU: 4 PID: 10693 Comm: grep Not tainted 6.5.0-rc3 #2
Call Trace:
dump_stack_lvl+0x154/0x200 (unreliable)
check_preemption_disabled+0x214/0x220
lparcfg_data+0x408/0x19a0
...This isn't actually a problem however, as it does not matter which lppaca is accessed, the shared proc state will be the same. vcpudispatch_stats_procfs_init() already works around this by disabling preemption, but the lparcfg code does not, erroring any time /proc/powerpc/lparcfg is accessed with DEBUG_PREEMPT enabled.
Instead of disabling preemption on the caller side, rework lppaca_shared_proc() to not take a pointer and instead directly access the lppaca, bypassing any potential preemption checks.
--- arch/powerpc/include/asm/lppaca.h | 11 +++++++++-- arch/powerpc/platforms/pseries/lpar.c | 10 +--------- arch/powerpc/platforms/pseries/lparcfg.c | 4 ++-- arch/powerpc/platforms/pseries/setup.c | 2 +- drivers/cpuidle/cpuidle-pseries.c | 8 +------- 5 files changed, 14 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/lppaca.h +9 -2
@@ -45,6 +45,7 @@#include <asm/types.h> #include <asm/mmu.h> #include <asm/firmware.h> +#include <asm/paca.h> /* * The lppaca is the "virtual processor area" registered with the hypervisor,
@@ -123,14 +124,20 @@ struct lppaca {*/ #define LPPACA_OLD_SHARED_PROC 2 -static inline bool lppaca_shared_proc (struct lppaca *l) +#ifdef CONFIG_PPC_PSERIES +/* +* All CPUs should have the same shared proc value, so directly access the PACA +* to avoid false positives from DEBUG_PREEMPT. +*/ +static inline bool lppaca_shared_proc (void ) { +struct lppaca *l = local_paca->lppaca_ptr; +if (!firmware_has_feature (FW_FEATURE_SPLPAR ))return false;return !!(l->__old_status &LPPACA_OLD_SHARED_PROC ); } -#ifdef CONFIG_PPC_PSERIES #define get_lppaca () (get_paca()->lppaca_ptr)#endif
arch/powerpc/platforms/pseries/lpar.c +1 -9
@@ -638,16 +638,8 @@ static const struct proc_ops vcpudispatch_stats_freq_proc_ops = {static int __init vcpudispatch_stats_procfs_init (void ) { -/* -* Avoid smp_processor_id while preemptible. All CPUs should have -* the same value for lppaca_shared_proc. -*/ -preempt_disable (); -if (!lppaca_shared_proc (get_lppaca ())) { -preempt_enable (); +if (!lppaca_shared_proc ())return 0 ; - } -preempt_enable ();if (!proc_create ("powerpc/vcpudispatch_stats" ,0600 ,NULL , &vcpudispatch_stats_proc_ops))
arch/powerpc/platforms/pseries/lparcfg.c +2 -2
@@ -205,7 +205,7 @@ static void parse_ppp_data(struct seq_file *m) ppp_data.active_system_procs);/* pool related entries are appropriate for shared configs */ -if (lppaca_shared_proc (get_lppaca ())) { +if (lppaca_shared_proc ()) {unsigned long pool_idle_time, pool_procs;seq_printf (m,"pool=%d\n" , ppp_data.pool_num);
@@ -529,7 +529,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v) partition_potential_processors);seq_printf (m,"shared_processor_mode=%d\n" , -lppaca_shared_proc (get_lppaca ())); +lppaca_shared_proc ());#ifdef CONFIG_PPC_BOOK3S_64 seq_printf (m,"slb_size=%d\n" , mmu_slb_size);
arch/powerpc/platforms/pseries/setup.c +1 -1
@@ -816,7 +816,7 @@ static void __init pSeries_setup_arch(void)if (firmware_has_feature (FW_FEATURE_LPAR )) {vpa_init (boot_cpuid); -if (lppaca_shared_proc (get_lppaca ())) { +if (lppaca_shared_proc ()) {static_branch_enable (&shared_processor);pv_spinlocks_init (); }
drivers/cpuidle/cpuidle-pseries.c +1 -7
@@ -410,13 +410,7 @@ static int __init pseries_idle_probe(void)return -ENODEV ;if (firmware_has_feature (FW_FEATURE_SPLPAR )) { -/* -* Use local_paca instead of get_lppaca() since -* preemption is not disabled, and it is not required in -* fact, since lppaca_ptr does not need to be the value -* associated to the current CPU, it can be from any CPU. -*/ -if (lppaca_shared_proc (local_paca->lppaca_ptr)) { +if (lppaca_shared_proc ()) { cpuidle_state_table = shared_states; max_idle_state =ARRAY_SIZE (shared_states); }else {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 225/511 nfs/blocklayout: Use the passed in gfp flags
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 08b45fcb2d4675f6182fe0edc0d8b1fe604051fa ]
This allocation should use the passed in GFP_ flags instead of GFP_KERNEL. One places where this matters is in filelayout_pg_init_write() which uses GFP_NOFS as the allocation flags.
--- fs/nfs/blocklayout/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/blocklayout/dev.c +2 -2
@@ -422,7 +422,7 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->concat.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
@@ -451,7 +451,7 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d,int ret, i; d->children =kcalloc (v->stripe.volumes_count, -sizeof (struct pnfs_block_dev ),GFP_KERNEL ); +sizeof (struct pnfs_block_dev ), gfp_mask);if (!d->children)return -ENOMEM ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 226/511 powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell Currey <[email protected]>
[ Upstream commit c37b6908f7b2bd24dcaaf14a180e28c9132b9c58 ]
fail_iommu_setup() registers the fail_iommu_bus_notifier struct to both PCI and VIO buses. struct notifier_block is a linked list node, so this causes any notifiers later registered to either bus type to also be registered to the other since they share the same node.
This causes issues in (at least) the vgaarb code, which registers a notifier for PCI buses. pci_notify() ends up being called on a vio device, converted with to_pci_dev() even though it's not a PCI device, and finally makes a bad access in vga_arbiter_add_pci_device() as discovered with KASAN:
BUG: KASAN: slab-out-of-bounds in vga_arbiter_add_pci_device+0x60/0xe00 Read of size 4 at addr c000000264c26fdc by task swapper/0/1 Call Trace: dump_stack_lvl+0x1bc/0x2b8 (unreliable) print_report+0x3f4/0xc60 kasan_report+0x244/0x698 __asan_load4+0xe8/0x250 vga_arbiter_add_pci_device+0x60/0xe00 pci_notify+0x88/0x444 notifier_call_chain+0x104/0x320 blocking_notifier_call_chain+0xa0/0x140 device_add+0xac8/0x1d30 device_register+0x58/0x80 vio_register_device_node+0x9ac/0xce0 vio_bus_scan_register_devices+0xc4/0x13c __machine_initcall_pseries_vio_device_init+0x94/0xf0 do_one_initcall+0x12c/0xaa8 kernel_init_freeable+0xa48/0xba8 kernel_init+0x64/0x400 ret_from_kernel_thread+0x5c/0x64
Fix this by creating separate notifier_block structs for each bus type.
--- arch/powerpc/kernel/iommu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/powerpc/kernel/iommu.c +14 -3
@@ -172,17 +172,28 @@ static int fail_iommu_bus_notify(struct notifier_block *nb,return 0 ; } -static struct notifier_block fail_iommu_bus_notifier = { +/* +* PCI and VIO buses need separate notifier_block structs, since they're linked +* list nodes. Sharing a notifier_block would mean that any notifiers later +* registered for PCI buses would also get called by VIO buses and vice versa. +*/ +static struct notifier_block fail_iommu_pci_bus_notifier = { .notifier_call = fail_iommu_bus_notify }; +#ifdef CONFIG_IBMVIO +static struct notifier_block fail_iommu_vio_bus_notifier = { + .notifier_call = fail_iommu_bus_notify +}; +#endif +static int __init fail_iommu_setup (void ) {#ifdef CONFIG_PCI -bus_register_notifier (&pci_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&pci_bus_type, &fail_iommu_pci_bus_notifier);#endif #ifdef CONFIG_IBMVIO -bus_register_notifier (&vio_bus_type, &fail_iommu_bus_notifier); +bus_register_notifier (&vio_bus_type, &fail_iommu_vio_bus_notifier);#endif return 0 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 227/511 ext4: fix unttached inode after power cut with orphan file feature enabled
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhihao Cheng <[email protected]>
[ Upstream commit 1524773425ae8113b0b782886366e68656b34e53 ]
Running generic/475(filesystem consistent tests after power cut) could easily trigger unattached inode error while doing fsck:
Unattached zero-length inode 39405. Clear? no
Unattached inode 39405
Connect to /lost+found? no
Above inconsistence is caused by following process:
P1 P2ext4_create
inode = ext4_new_inode_start_handle // itable records nlink=1 ext4_add_nondir
err = ext4_add_entry // ENOSPC
ext4_append
ext4_bread
ext4_getblk
ext4_map_blocks // returns ENOSPC
drop_nlink(inode) // won't be updated into disk inode ext4_orphan_add(handle, inode)
ext4_orphan_file_add
ext4_journal_stop(handle)
jbd2_journal_commit_transaction // commit success
>> power cut <<ext4_fill_super
ext4_load_and_init_journal // itable records nlink=1
ext4_orphan_cleanup
ext4_process_orphan
if (inode->i_nlink) // true, inode won't be deleted
Then, allocated inode will be reserved on disk and corresponds to no dentries, so e2fsck reports 'unattached inode' problem.
The problem won't happen if orphan file feature is disabled, because ext4_orphan_add() will update disk inode in orphan list mode. There are several places not updating disk inode while putting inode into orphan area, such as ext4_add_nondir(), ext4_symlink() and whiteout in ext4_rename(). Fix it by updating inode into disk in all error branches of these places.
--- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/namei.c +3 -0
@@ -2799,6 +2799,7 @@ static int ext4_add_nondir(handle_t *handle,return err; }drop_nlink (inode); +ext4_mark_inode_dirty (handle, inode);ext4_orphan_add (handle, inode);unlock_new_inode (inode);return err;
@@ -3455,6 +3456,7 @@ static int ext4_symlink(struct user_namespace *mnt_userns, struct inode *dir,if (handle)ext4_journal_stop (handle);clear_nlink (inode); +ext4_mark_inode_dirty (handle, inode);unlock_new_inode (inode);iput (inode); out_free_encrypted_link:
@@ -4028,6 +4030,7 @@ static int ext4_rename(struct user_namespace *mnt_userns, struct inode *old_dir,ext4_resetent (handle, &old, old.inode->i_ino, old_file_type);drop_nlink (whiteout); +ext4_mark_inode_dirty (handle, whiteout);ext4_orphan_add (handle, whiteout); }unlock_new_inode (whiteout);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 228/511 jfs: validate max amount of blocks before allocation.
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Filippov <[email protected]>
[ Upstream commit 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 ]
The lack of checking bmp->db_max_freebud in extBalloc() can lead to shift out of bounds, so this patch prevents undefined behavior, because bmp->db_max_freebud == -1 only if there is no free space.
--- fs/jfs/jfs_extent.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/jfs/jfs_extent.c +5 -0
@@ -508,6 +508,11 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno)* blocks in the map. in that case, we'll start off with the * maximum free. */ + +/* give up if no space left */ +if (bmp->db_maxfreebud ==-1 ) +return -ENOSPC ; + max = (s64 )1 << bmp->db_maxfreebud;if (*nblocks >= max && *nblocks > nbperpage) nb = nblks = (max > nbperpage) ? max : nbperpage;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 229/511 fs: lockd: avoid possible wrong NULL parameter
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit de8d38cf44bac43e83bad28357ba84784c412752 ]
clang's static analysis warning: fs/lockd/mon.c: line 293, column 2:
Null pointer passed as 2nd argument to memory copy function.
Assuming 'hostname' is NULL and calling 'nsm_create_handle()', this will pass NULL as 2nd argument to memory copy function 'memcpy()'. So return NULL if 'hostname' is invalid.
--- fs/lockd/mon.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/mon.c +3 -0
@@ -276,6 +276,9 @@ static struct nsm_handle *nsm_create_handle(const struct sockaddr *sap, {struct nsm_handle *new; +if (!hostname) +return NULL ; + new =kzalloc (sizeof (*new) + hostname_len +1 ,GFP_KERNEL );if (unlikely (new ==NULL ))return NULL ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 230/511 NFSD: da_addr_body field missing in some GETDEVICEINFO replies
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 6372e2ee629894433fe6107d7048536a3280a284 ]
The XDR specification in RFC 8881 looks like this:
struct device_addr4 {
layouttype4 da_layout_type;
opaque da_addr_body<>;
};struct GETDEVICEINFO4resok {
device_addr4 gdir_device_addr;
bitmap4 gdir_notification;
};union GETDEVICEINFO4res switch (nfsstat4 gdir_status) { case NFS4_OK:
GETDEVICEINFO4resok gdir_resok4; case NFS4ERR_TOOSMALL: count4 gdir_mincount; default: void; };
Looking at nfsd4_encode_getdeviceinfo() ....
When the client provides a zero gd_maxcount, then the Linux NFS server implementation encodes the da_layout_type field and then skips the da_addr_body field completely, proceeding directly to encode gdir_notification field.
There does not appear to be an option in the specification to skip encoding da_addr_body. Moreover, Section 18.40.3 says:
Quoted 4 lines
If the client wants to just update or turn off notifications, it MAY send a GETDEVICEINFO operation with
gdia_maxcountset to zero. In that event, if the device ID is valid, the reply'sda_addr_bodyfield of thegdir_device_addrfield will be of zero length.
Since the layout drivers are responsible for encoding the da_addr_body field, put this fix inside the ->encode_getdeviceinfo methods.
--- fs/nfsd/blocklayoutxdr.c | 9 +++++++++ fs/nfsd/flexfilelayoutxdr.c | 9 +++++++++ fs/nfsd/nfs4xdr.c | 25 +++++++++++-------------- 3 files changed, 29 insertions(+), 14 deletions(-)
fs/nfsd/blocklayoutxdr.c +9 -0
@@ -82,6 +82,15 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,int len =sizeof (__be32), ret, i;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } + p =xdr_reserve_space (xdr, len +sizeof (__be32));if (!p)return nfserr_resource;
fs/nfsd/flexfilelayoutxdr.c +9 -0
@@ -85,6 +85,15 @@ nfsd4_ff_encode_getdeviceinfo(struct xdr_stream *xdr,int addr_len;__be32 *p; +/* +* See paragraph 5 of RFC 8881 S18.40.3. +*/ +if (!gdp->gd_maxcount) { +if (xdr_stream_encode_u32 (xdr,0 ) !=XDR_UNIT ) +return nfserr_resource; +return nfs_ok; + } +/* len + padding for two strings */ addr_len =16 + da->netaddr.netid_len + da->netaddr.addr_len; ver_len =20 ;
fs/nfsd/nfs4xdr.c +11 -14
@@ -4533,20 +4533,17 @@ nfsd4_encode_getdeviceinfo(struct nfsd4_compoundres *resp, __be32 nfserr, *p++ =cpu_to_be32 (gdev->gd_layout_type); -/* If maxcount is 0 then just update notifications */ -if (gdev->gd_maxcount !=0 ) { - ops = nfsd4_layout_ops[gdev->gd_layout_type]; - nfserr = ops->encode_getdeviceinfo (xdr, gdev); -if (nfserr) { -/* -* We don't bother to burden the layout drivers with -* enforcing gd_maxcount, just tell the client to -* come back with a bigger buffer if it's not enough. -*/ -if (xdr->buf->len +4 > gdev->gd_maxcount) - goto toosmall; -return nfserr; - } + ops = nfsd4_layout_ops[gdev->gd_layout_type]; + nfserr = ops->encode_getdeviceinfo (xdr, gdev); +if (nfserr) { +/* +* We don't bother to burden the layout drivers with +* enforcing gd_maxcount, just tell the client to +* come back with a bigger buffer if it's not enough. +*/ +if (xdr->buf->len +4 > gdev->gd_maxcount) + goto toosmall; +return nfserr; }if (gdev->gd_notify_types) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 231/511 NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit f67b55b6588bcf9316a1e6e8d529100a5aa3ebe6 ]
Commit 64cfca85bacd asserts the only valid return values for nfs2/3_decode_dirent should not include -ENAMETOOLONG, but for a server that sends a filename3 which exceeds MAXNAMELEN in a READDIR response the client's behavior will be to endlessly retry the operation.
We could map -ENAMETOOLONG into -EBADCOOKIE, but that would produce truncated listings without any error. The client should return an error for this case to clearly assert that the server implementation must be corrected.
--- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs2xdr.c +1 -1
@@ -949,7 +949,7 @@ int nfs2_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_filename_inline (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ;/* * The type (size and byte order) of nfscookie isn't defined in
fs/nfs/nfs3xdr.c +1 -1
@@ -1990,7 +1990,7 @@ int nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, error =decode_inline_filename3 (xdr, &entry->name, &entry->len);if (unlikely (error)) -return -EAGAIN ; +return error == -ENAMETOOLONG ? -ENAMETOOLONG : -EAGAIN ; error =decode_cookie3 (xdr, &new_cookie);if (unlikely (error))
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 232/511 NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 5690eed941ab7e33c3c3d6b850100cabf740f075 ]
If the client sent a synchronous copy and the server replied with ERR_OFFLOAD_NO_REQ indicating that it wants an asynchronous copy instead, the client should retry with asynchronous copy.
--- fs/nfs/nfs42proc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/nfs/nfs42proc.c +3 -2
@@ -462,8 +462,9 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,continue ; }break ; - }else if (err == -NFS4ERR_OFFLOAD_NO_REQS && !args.sync) { - args.sync = true; + }else if (err == -NFS4ERR_OFFLOAD_NO_REQS && + args.sync != res.synchronous) { + args.sync = res.synchronous; dst_exception.retry =1 ;continue ; } else if ((err == -ESTALE ||
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 233/511 pNFS: Fix assignment of xprtdata.cred
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anna Schumaker <[email protected]>
[ Upstream commit c4a123d2e8c4dc91d581ee7d05c0cd51a0273fab ]
The comma at the end of the line was leftover from an earlier refactor of the _nfs4_pnfs_v3_ds_connect() function. This is technically valid C, so the compilers didn't catch it, but if I'm understanding how it works correctly it assigns the return value of rpc_clnt_add_xprtr() to xprtdata.cred.
--- fs/nfs/pnfs_nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs_nfs.c +1 -1
@@ -943,7 +943,7 @@ static int _nfs4_pnfs_v4_ds_connect(struct nfs_server *mds_srv,* Test this address for session trunking and * add as an alias */ - xprtdata.cred =nfs4_get_clid_cred (clp), + xprtdata.cred =nfs4_get_clid_cred (clp);rpc_clnt_add_xprt (clp->cl_rpcclient, &xprt_args, rpc_clnt_setup_test_and_add_xprt, &rpcdata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 234/511 RDMA/qedr: Remove a duplicate assignment in irdma_query_ah()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minjie Du <[email protected]>
[ Upstream commit 65e02e840847158c7ee48ca8e6e91062b0f78662 ]
Delete a duplicate statement from this function implementation.
--- drivers/infiniband/hw/irdma/verbs.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/irdma/verbs.c +0 -1
@@ -4310,7 +4310,6 @@ static int irdma_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr) ah_attr->grh.traffic_class = ah->sc_ah.ah_info.tc_tos; ah_attr->grh.hop_limit = ah->sc_ah.ah_info.hop_ttl; ah_attr->grh.sgid_index = ah->sgid_index; - ah_attr->grh.sgid_index = ah->sgid_index;memcpy (&ah_attr->grh.dgid, &ah->dgid,sizeof (ah_attr->grh.dgid)); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 235/511 media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit f126ff7e4024f6704e6ec0d4137037568708a3c7 ]
The supported ad5820 and ad5821 VCMs both use a single 16 bit register which is written by sending 2 bytes with the data directly after sending the i2c-client address.
The ad5823 OTOH has a more typical i2c / smbus device setup with multiple 8 bit registers where the first byte send after the i2c-client address is the register address and the actual data only starts from the second byte after the i2c-client address.
The ad5823 i2c_ and of_device_id-s was added at the same time as the ad5821 ids with as rationale:
"""
Some camera modules also refer that AD5823 is a replacement of AD5820:
https://download.kamami.com/p564094-OV8865_DS.pdf
"""
The AD5823 may be an electrical and functional replacement of the AD5820, but from a software pov it is not compatible at all and it is going to need its own driver, drop its id from the ad5820 driver.
--- drivers/media/i2c/ad5820.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/i2c/ad5820.c +0 -2
@@ -357,7 +357,6 @@ static int ad5820_remove(struct i2c_client *client)static const struct i2c_device_id ad5820_id_table[] = { {"ad5820" ,0 }, {"ad5821" ,0 }, - {"ad5823" ,0 }, { } };MODULE_DEVICE_TABLE (i2c, ad5820_id_table);
@@ -365,7 +364,6 @@ MODULE_DEVICE_TABLE(i2c, ad5820_id_table);static const struct of_device_id ad5820_of_table[] = { { .compatible ="adi,ad5820" }, { .compatible ="adi,ad5821" }, - { .compatible ="adi,ad5823" }, { } };MODULE_DEVICE_TABLE (of, ad5820_of_table);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 236/511 media: i2c: tvp5150: check return value of devm_kasprintf()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 26ce7054d804be73935b9268d6e0ecf2fbbc8aef ]
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/media/i2c/tvp5150.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/tvp5150.c +4 -0
@@ -2066,6 +2066,10 @@ static int tvp5150_parse_dt(struct tvp5150 *decoder, struct device_node *np) tvpc->ent.name =devm_kasprintf (dev,GFP_KERNEL ,"%s %s" , v4l2c->name, v4l2c->label ? v4l2c->label :"" ); +if (!tvpc->ent.name) { + ret = -ENOMEM ; + goto err_free; + } } ep_np =of_graph_get_endpoint_by_regs (np,TVP5150_PAD_VID_OUT ,0 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 237/511 media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit d7b13edd4cb4bfa335b6008ab867ac28582d3e5c ]
If fwnode_graph_get_remote_endpoint() fails, 'fwnode' is known to be NULL, so fwnode_handle_put() is a no-op.
Release the reference taken from a previous fwnode_graph_get_port_parent() call instead.
Also handle fwnode_graph_get_port_parent() failures.
In order to fix these issues, add an error handling path to the function and the needed gotos.
--- drivers/media/v4l2-core/v4l2-fwnode.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-fwnode.c +14 -4
@@ -549,19 +549,29 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode, link->local_id = fwep.id; link->local_port = fwep.port; link->local_node =fwnode_graph_get_port_parent (fwnode); +if (!link->local_node) +return -ENOLINK ; fwnode =fwnode_graph_get_remote_endpoint (fwnode); -if (!fwnode) { -fwnode_handle_put (fwnode); -return -ENOLINK ; - } +if (!fwnode) + goto err_put_local_node;fwnode_graph_parse_endpoint (fwnode, &fwep); link->remote_id = fwep.id; link->remote_port = fwep.port; link->remote_node =fwnode_graph_get_port_parent (fwnode); +if (!link->remote_node) + goto err_put_remote_endpoint;return 0 ; + +err_put_remote_endpoint: +fwnode_handle_put (fwnode); + +err_put_local_node: +fwnode_handle_put (link->local_node); + +return -ENOLINK ; }EXPORT_SYMBOL_GPL (v4l2_fwnode_parse_link);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 238/511 iommu/amd/iommu_v2: Fix pasid_state refcount dec hit 0 warning on pasid unbind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Marcovitch <[email protected]>
[ Upstream commit 534103bcd52ca9c1fecbc70e717b4a538dc4ded8 ]
When unbinding pasid - a race condition exists vs outstanding page faults.
To prevent this, the pasid_state object contains a refcount.
* set to 1 on pasid bind
* incremented on each ppr notification start
* decremented on each ppr notification done
* decremented on pasid unbind
Since refcount_dec assumes that refcount will never reach 0:
the current implementation causes the following to be invoked on pasid unbind:
REFCOUNT_WARN("decrement hit 0; leaking memory")
Fix this issue by changing refcount_dec to refcount_dec_and_test to explicitly handle refcount=1.
--- drivers/iommu/amd/iommu_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/amd/iommu_v2.c +2 -2
@@ -264,8 +264,8 @@ static void put_pasid_state(struct pasid_state *pasid_state)static void put_pasid_state_wait (struct pasid_state *pasid_state) { -refcount_dec (&pasid_state->count); -wait_event (pasid_state->wq, !refcount_read (&pasid_state->count)); +if (!refcount_dec_and_test (&pasid_state->count)) +wait_event (pasid_state->wq, !refcount_read (&pasid_state->count));free_pasid_state (pasid_state); }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 239/511 iommu: rockchip: Fix directory table address encoding
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Karlman <[email protected]>
[ Upstream commit 6df63b7ebdaf5fcd75dceedf6967d0761e56eca1 ]
The physical address to the directory table is currently encoded using the following bit layout for IOMMU v2.
31:12 - Address bit 31:0
11: 4 - Address bit 39:32
This is also the bit layout used by the vendor kernel.
However, testing has shown that addresses to the directory/page tables and memory pages are all encoded using the same bit layout.
IOMMU v1:
31:12 - Address bit 31:0
IOMMU v2:
31:12 - Address bit 31:0
11: 8 - Address bit 35:32
7: 4 - Address bit 39:36
Change to use the mk_dtentries ops to encode the directory table address correctly. The value written to DTE_ADDR may include the valid bit set, a bit that is ignored and DTE_ADDR reg read it back as 0.
This also update the bit layout comment for the page address and the number of nybbles that are read back for DTE_ADDR comment.
These changes render the dte_addr_phys and dma_addr_dte ops unused and is removed.
--- drivers/iommu/rockchip-iommu.c | 43 ++++------------------------------ 1 file changed, 5 insertions(+), 38 deletions(-)
drivers/iommu/rockchip-iommu.c +5 -38
@@ -98,8 +98,6 @@ struct rk_iommu_ops {phys_addr_t (*pt_address)(u32 dte);u32 (*mk_dtentries)(dma_addr_t pt_dma);u32 (*mk_ptentries)(phys_addr_t page,int prot); -phys_addr_t (*dte_addr_phys)(u32 addr); -u32 (*dma_addr_dte)(dma_addr_t dt_dma);u64 dma_bit_mask; };
@@ -277,8 +275,8 @@ static u32 rk_mk_pte(phys_addr_t page, int prot)/* * In v2: * 31:12 - Page address bit 31:0 -* 11:9 - Page address bit 34:32 -* 8:4 - Page address bit 39:35 +* 11: 8 - Page address bit 35:32 +* 7: 4 - Page address bit 39:36 * 3 - Security * 2 - Writable * 1 - Readable
@@ -505,7 +503,7 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)/* * Check if register DTE_ADDR is working by writing DTE_ADDR_DUMMY -* and verifying that upper 5 nybbles are read back. +* and verifying that upper 5 (v1) or 7 (v2) nybbles are read back. */ for (i =0 ; i < iommu->num_mmu; i++) { dte_addr = rk_ops->pt_address (DTE_ADDR_DUMMY );
@@ -530,33 +528,6 @@ static int rk_iommu_force_reset(struct rk_iommu *iommu)return 0 ; } -static inline phys_addr_t rk_dte_addr_phys (u32 addr) -{ -return (phys_addr_t )addr; -} - -static inline u32 rk_dma_addr_dte (dma_addr_t dt_dma) -{ -return dt_dma; -} - -#define DT_HI_MASK GENMASK_ULL(39, 32) -#define DTE_BASE_HI_MASK GENMASK(11, 4) -#define DT_SHIFT 28 - -static inline phys_addr_t rk_dte_addr_phys_v2 (u32 addr) -{ -u64 addr64 = addr; -return (phys_addr_t)(addr64 &RK_DTE_PT_ADDRESS_MASK ) | - ((addr64 &DTE_BASE_HI_MASK ) <<DT_SHIFT ); -} - -static inline u32 rk_dma_addr_dte_v2 (dma_addr_t dt_dma) -{ -return (dt_dma &RK_DTE_PT_ADDRESS_MASK ) | - ((dt_dma &DT_HI_MASK ) >>DT_SHIFT ); -} -static void log_iova (struct rk_iommu *iommu,int index,dma_addr_t iova) {void __iomem *base = iommu->bases[index];
@@ -576,7 +547,7 @@ static void log_iova(struct rk_iommu *iommu, int index, dma_addr_t iova) page_offset =rk_iova_page_offset (iova); mmu_dte_addr =rk_iommu_read (base,RK_MMU_DTE_ADDR ); - mmu_dte_addr_phys = rk_ops->dte_addr_phys (mmu_dte_addr); + mmu_dte_addr_phys = rk_ops->pt_address (mmu_dte_addr); dte_addr_phys = mmu_dte_addr_phys + (4 * dte_index); dte_addr =phys_to_virt (dte_addr_phys);
@@ -966,7 +937,7 @@ static int rk_iommu_enable(struct rk_iommu *iommu)for (i =0 ; i < iommu->num_mmu; i++) {rk_iommu_write (iommu->bases[i],RK_MMU_DTE_ADDR , - rk_ops->dma_addr_dte (rk_domain->dt_dma)); + rk_ops->mk_dtentries (rk_domain->dt_dma));rk_iommu_base_command (iommu->bases[i],RK_MMU_CMD_ZAP_CACHE );rk_iommu_write (iommu->bases[i],RK_MMU_INT_MASK ,RK_MMU_IRQ_MASK ); }
@@ -1373,8 +1344,6 @@ static struct rk_iommu_ops iommu_data_ops_v1 = { .pt_address = &rk_dte_pt_address, .mk_dtentries = &rk_mk_dte, .mk_ptentries = &rk_mk_pte, - .dte_addr_phys = &rk_dte_addr_phys, - .dma_addr_dte = &rk_dma_addr_dte, .dma_bit_mask = DMA_BIT_MASK(32), };
@@ -1382,8 +1351,6 @@ static struct rk_iommu_ops iommu_data_ops_v2 = { .pt_address = &rk_dte_pt_address_v2, .mk_dtentries = &rk_mk_dte_v2, .mk_ptentries = &rk_mk_pte_v2, - .dte_addr_phys = &rk_dte_addr_phys_v2, - .dma_addr_dte = &rk_dma_addr_dte_v2, .dma_bit_mask = DMA_BIT_MASK(40), };
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 240/511 drivers: usb: smsusb: fix error handling code in smsusb_init_device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongliang Mu <[email protected]>
[ Upstream commit b9c7141f384097fa4fa67d2f72e5731d628aef7c ]
The previous commit 4b208f8b561f ("[media] siano: register media controller earlier")moves siano_media_device_register before smscore_register_device, and adds corresponding error handling code if smscore_register_device fails. However, it misses the following error handling code of smsusb_init_device.
Fix this by moving error handling code at the end of smsusb_init_device and adding a goto statement in the following error handling parts.
--- drivers/media/usb/siano/smsusb.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/media/usb/siano/smsusb.c +11 -10
@@ -455,12 +455,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_register_device (¶ms, &dev->coredev,0 , mdev);if (rc <0 ) {pr_err ("smscore_register_device(...) failed, rc %d\n" , rc); -smsusb_term_device (intf); -#ifdef CONFIG_MEDIA_CONTROLLER_DVB -media_device_unregister (mdev); -#endif -kfree (mdev); -return rc; + goto err_unregister_device; }smscore_set_board_id (dev->coredev, board_id);
@@ -477,8 +472,7 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smsusb_start_streaming (dev);if (rc <0 ) {pr_err ("smsusb_start_streaming(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; } dev->state =SMSUSB_ACTIVE ;
@@ -486,13 +480,20 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) rc =smscore_start_device (dev->coredev);if (rc <0 ) {pr_err ("smscore_start_device(...) failed\n" ); -smsusb_term_device (intf); -return rc; + goto err_unregister_device; }pr_debug ("device 0x%p created\n" , dev);return rc; + +err_unregister_device: +smsusb_term_device (intf); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB +media_device_unregister (mdev); +#endif +kfree (mdev); +return rc; } static int smsusb_probe(struct usb_interface *intf,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 241/511 media: dib7000p: Fix potential division by zero
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit a1db7b2c5533fc67e2681eb5efc921a67bc7d5b8 ]
Variable loopdiv can be assigned 0, then it is used as a denominator, without checking it for 0.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/dib7000p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/dvb-frontends/dib7000p.c +1 -1
@@ -497,7 +497,7 @@ static int dib7000p_update_pll(struct dvb_frontend *fe, struct dibx000_bandwidth prediv = reg_1856 &0x3f ; loopdiv = (reg_1856 >>6 ) &0x3f ; -if ((bw !=NULL ) && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) { +if (loopdiv && bw && (bw->pll_prediv != prediv || bw->pll_ratio != loopdiv)) {dprintk ("Updating pll (prediv: old = %d new = %d ; loopdiv : old = %d new = %d)\n" , prediv, bw->pll_prediv, loopdiv, bw->pll_ratio); reg_1856 &=0xf000 ; reg_1857 =dib7000p_read_word (state,1857 );
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 242/511 media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit ea9ef6c2e001c5dc94bee35ebd1c8a98621cf7b8 ]
'read' is freed when it is known to be NULL, but not when a read error occurs.
Revert the logic to avoid a small leak, should a m920x_read() call fail.
--- drivers/media/usb/dvb-usb/m920x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/m920x.c +3 -2
@@ -277,7 +277,6 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuchar *read =kmalloc (1 ,GFP_KERNEL );if (!read) { ret = -ENOMEM ; -kfree (read); goto unlock; }
@@ -288,8 +287,10 @@ static int m920x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int nuif ((ret =m920x_read (d->udev,M9206_I2C ,0x0 ,0x20 | stop, - read,1 )) !=0 ) + read,1 )) !=0 ) { +kfree (read); goto unlock; + } msg[i].buf[j] = read[0 ]; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 243/511 media: cx24120: Add retval check for cx24120_message_send()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniil Dulov <[email protected]>
[ Upstream commit 96002c0ac824e1773d3f706b1f92e2a9f2988047 ]
If cx24120_message_send() returns error, we should keep local struct unchanged.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/dvb-frontends/cx24120.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/cx24120.c +3 -1
@@ -973,7 +973,9 @@ static void cx24120_set_clock_ratios(struct dvb_frontend *fe) cmd.arg[8 ] = (clock_ratios_table[idx].rate >>8 ) &0xff ; cmd.arg[9 ] = (clock_ratios_table[idx].rate >>0 ) &0xff ; -cx24120_message_send (state, &cmd); + ret =cx24120_message_send (state, &cmd); +if (ret !=0 ) +return ;/* Calculate ber window rates for stat work */ cx24120_calculate_ber_window (state, clock_ratios_table[idx].rate);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 244/511 scsi: hisi_sas: Modify v3 HW SSP underflow error processing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit 62413199cd6d2906c121c2dfa3d7b82fd05f08db ]
In case of SSP underflow allow the response frame IU to be examined for setting the response stat value rather than always setting SAS_DATA_UNDERRUN.
This will mean that we call sas_ssp_task_response() in those scenarios and may send sense data to upper layer.
Such a condition would be for bad blocks were we just reporting an underflow error to upper layer, but now the sense data will tell immediately that the media is faulty.
Stable-dep-of: f5393a5602ca ("scsi: hisi_sas: Fix normally completed I/O analysed as failed")
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 39 +++++++++++++++++--------- 1 file changed, 26 insertions(+), 13 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +26 -13
@@ -405,6 +405,8 @@#define CMPLT_HDR_ERROR_PHASE_MSK (0xff << CMPLT_HDR_ERROR_PHASE_OFF)#define CMPLT_HDR_RSPNS_XFRD_OFF 10#define CMPLT_HDR_RSPNS_XFRD_MSK (0x1 << CMPLT_HDR_RSPNS_XFRD_OFF) +#define CMPLT_HDR_RSPNS_GOOD_OFF 11 +#define CMPLT_HDR_RSPNS_GOOD_MSK (0x1 << CMPLT_HDR_RSPNS_GOOD_OFF)#define CMPLT_HDR_ERX_OFF 12#define CMPLT_HDR_ERX_MSK (0x1 << CMPLT_HDR_ERX_OFF)#define CMPLT_HDR_ABORT_STAT_OFF 13
@@ -2136,7 +2138,7 @@ static irqreturn_t fatal_axi_int_v3_hw(int irq_no, void *p)return IRQ_HANDLED ; } -static void +static bool slot_err_v3_hw (struct hisi_hba *hisi_hba,struct sas_task *task,struct hisi_sas_slot *slot) {
@@ -2154,6 +2156,15 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,switch (task->task_proto) {case SAS_PROTOCOL_SSP :if (dma_rx_err_type &RX_DATA_LEN_UNDERFLOW_MSK ) { +/* +* If returned response frame is incorrect because of data underflow, +* but I/O information has been written to the host memory, we examine +* response IU. +*/ +if (!(complete_hdr->dw0 &CMPLT_HDR_RSPNS_GOOD_MSK ) && + (complete_hdr->dw0 &CMPLT_HDR_RSPNS_XFRD_MSK )) +return false; + ts->residual = trans_tx_fail_type; ts->stat =SAS_DATA_UNDERRUN ; }else if (dw3 &CMPLT_HDR_IO_IN_TARGET_MSK ) {
@@ -2185,6 +2196,7 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,default :break ; } +return true; } static void slot_complete_v3_hw(struct hisi_hba *hisi_hba,
@@ -2259,19 +2271,20 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba,if ((dw0 &CMPLT_HDR_CMPLT_MSK ) ==0x3 ) {u32 *error_info =hisi_sas_status_buf_addr_mem (slot); -slot_err_v3_hw (hisi_hba, task, slot); -if (ts->stat !=SAS_DATA_UNDERRUN ) -dev_info (dev,"erroneous completion iptt=%d task=%pK dev id=%d addr=%016llx CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n" , - slot->idx, task, sas_dev->device_id, -SAS_ADDR (device->sas_addr), - dw0, dw1, complete_hdr->act, dw3, - error_info[0 ], error_info[1 ], - error_info[2 ], error_info[3 ]); -if (unlikely (slot->abort)) { -sas_task_abort (task); -return ; +if (slot_err_v3_hw (hisi_hba, task, slot)) { +if (ts->stat !=SAS_DATA_UNDERRUN ) +dev_info (dev,"erroneous completion iptt=%d task=%pK dev id=%d addr=%016llx CQ hdr: 0x%x 0x%x 0x%x 0x%x Error info: 0x%x 0x%x 0x%x 0x%x\n" , + slot->idx, task, sas_dev->device_id, +SAS_ADDR (device->sas_addr), + dw0, dw1, complete_hdr->act, dw3, + error_info[0 ], error_info[1 ], + error_info[2 ], error_info[3 ]); +if (unlikely (slot->abort)) { +sas_task_abort (task); +return ; + } + goto out; } - goto out; }switch (task->task_proto) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 245/511 scsi: hisi_sas: Modify v3 HW SATA completion error processing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit 7e15334f5d256367fb4c77f4ee0003e1e3d9bf9d ]
If the I/O completion response frame returned by the target device has been written to the host memory and the err bit in the status field of the received fis is 1, ts->stat should set to SAS_PROTO_RESPONSE, and this will let EH analyze and further determine cause of failure.
Stable-dep-of: f5393a5602ca ("scsi: hisi_sas: Fix normally completed I/O analysed as failed")
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +8 -1
@@ -480,6 +480,9 @@ struct hisi_sas_err_record_v3 {#define RX_DATA_LEN_UNDERFLOW_OFF 6#define RX_DATA_LEN_UNDERFLOW_MSK (1 << RX_DATA_LEN_UNDERFLOW_OFF) +#define RX_FIS_STATUS_ERR_OFF 0 +#define RX_FIS_STATUS_ERR_MSK (1 << RX_FIS_STATUS_ERR_OFF) +#define HISI_SAS_COMMAND_ENTRIES_V3_HW 4096#define HISI_SAS_MSI_COUNT_V3_HW 32
@@ -2151,6 +2154,7 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,hisi_sas_status_buf_addr_mem (slot);u32 dma_rx_err_type =le32_to_cpu (record->dma_rx_err_type);u32 trans_tx_fail_type =le32_to_cpu (record->trans_tx_fail_type); +u16 sipc_rx_err_type =le16_to_cpu (record->sipc_rx_err_type);u32 dw3 =le32_to_cpu (complete_hdr->dw3);switch (task->task_proto) {
@@ -2178,7 +2182,10 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,case SAS_PROTOCOL_SATA :case SAS_PROTOCOL_STP :case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : -if (dma_rx_err_type &RX_DATA_LEN_UNDERFLOW_MSK ) { +if ((complete_hdr->dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) && + (sipc_rx_err_type &RX_FIS_STATUS_ERR_MSK )) { + ts->stat =SAS_PROTO_RESPONSE ; + }else if (dma_rx_err_type &RX_DATA_LEN_UNDERFLOW_MSK ) { ts->residual = trans_tx_fail_type; ts->stat =SAS_DATA_UNDERRUN ; }else if (dw3 &CMPLT_HDR_IO_IN_TARGET_MSK ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 246/511 scsi: hisi_sas: Fix warnings detected by sparse
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit c0328cc595124579328462fc45d7a29a084cf357 ]
This patch fixes the following warning:
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c:2168:43: sparse: sparse: restricted __le32 degrades to integer
Stable-dep-of: f5393a5602ca ("scsi: hisi_sas: Fix normally completed I/O analysed as failed")
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 -3
@@ -2156,6 +2156,7 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,u32 trans_tx_fail_type =le32_to_cpu (record->trans_tx_fail_type);u16 sipc_rx_err_type =le16_to_cpu (record->sipc_rx_err_type);u32 dw3 =le32_to_cpu (complete_hdr->dw3); +u32 dw0 =le32_to_cpu (complete_hdr->dw0);switch (task->task_proto) {case SAS_PROTOCOL_SSP :
@@ -2165,8 +2166,8 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,* but I/O information has been written to the host memory, we examine * response IU. */ -if (!(complete_hdr->dw0 &CMPLT_HDR_RSPNS_GOOD_MSK ) && - (complete_hdr->dw0 &CMPLT_HDR_RSPNS_XFRD_MSK )) +if (!(dw0 &CMPLT_HDR_RSPNS_GOOD_MSK ) && + (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ))return false; ts->residual = trans_tx_fail_type;
@@ -2182,7 +2183,7 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,case SAS_PROTOCOL_SATA :case SAS_PROTOCOL_STP :case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : -if ((complete_hdr->dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) && +if ((dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) && (sipc_rx_err_type &RX_FIS_STATUS_ERR_MSK )) { ts->stat =SAS_PROTO_RESPONSE ; }else if (dma_rx_err_type &RX_DATA_LEN_UNDERFLOW_MSK ) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 247/511 scsi: hisi_sas: Fix normally completed I/O analysed as failed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit f5393a5602cacfda2014e0ff8220e5a7564e7cd1 ]
The PIO read command has no response frame and the struct iu[1024] won't be filled. I/Os which are normally completed will be treated as failed in sas_ata_task_done() when iu contains abnormal dirty data.
Consequently ending_fis should not be filled by iu when the response frame hasn't been written to memory.
--- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 11 +++++++++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +9 -2
@@ -2026,6 +2026,11 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,u16 dma_tx_err_type =le16_to_cpu (err_record->dma_tx_err_type);u16 sipc_rx_err_type =le16_to_cpu (err_record->sipc_rx_err_type);u32 dma_rx_err_type =le32_to_cpu (err_record->dma_rx_err_type); +struct hisi_sas_complete_v2_hdr *complete_queue = + hisi_hba->complete_hdr[slot->cmplt_queue]; +struct hisi_sas_complete_v2_hdr *complete_hdr = + &complete_queue[slot->cmplt_queue_slot]; +u32 dw0 =le32_to_cpu (complete_hdr->dw0);int error =-1 ;if (err_phase ==1 ) {
@@ -2310,7 +2315,8 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,break ; } } -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot); }break ;default :
@@ -2442,7 +2448,8 @@ static void slot_complete_v2_hw(struct hisi_hba *hisi_hba,case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : { ts->stat =SAS_SAM_STAT_GOOD ; -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ; }default :
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +4 -2
@@ -2196,7 +2196,8 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task, ts->stat =SAS_OPEN_REJECT ; ts->open_rej_reason =SAS_OREJ_RSVD_RETRY ; } -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ;case SAS_PROTOCOL_SMP : ts->stat =SAS_SAM_STAT_CHECK_CONDITION ;
@@ -2322,7 +2323,8 @@ static void slot_complete_v3_hw(struct hisi_hba *hisi_hba,case SAS_PROTOCOL_STP :case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP : ts->stat =SAS_SAM_STAT_GOOD ; -hisi_sas_sata_done (task, slot); +if (dw0 &CMPLT_HDR_RSPNS_XFRD_MSK ) +hisi_sas_sata_done (task, slot);break ;default : ts->stat =SAS_SAM_STAT_CHECK_CONDITION ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 248/511 media: rkvdec: increase max supported height for H.264
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Gaignard <[email protected]>
[ Upstream commit f000e6ca2d60fefd02a180a57df2c4162fa0c1b7 ]
After testing it is possible for the hardware to decode H264 bistream with a height up to 2560.
--- drivers/staging/media/rkvdec/rkvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/rkvdec/rkvdec.c +1 -1
@@ -111,7 +111,7 @@ static const struct rkvdec_coded_fmt_desc rkvdec_coded_fmts[] = { .max_width = 4096, .step_width = 16, .min_height = 48, - .max_height = 2304, + .max_height = 2560, .step_height = 16, }, .ctrls = &rkvdec_h264_ctrls,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 249/511 media: mediatek: vcodec: Return NULL if no vdec_fb is found
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Irui Wang <[email protected]>
[ Upstream commit dfa2d6e07432270330ae191f50a0e70636a4cd2b ]
"fb_use_list" is used to store used or referenced frame buffers for vp9 stateful decoder. "NULL" should be returned when getting target frame buffer failed from "fb_use_list", not a random unexpected one.
--- drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +3 -2
@@ -226,10 +226,11 @@ static struct vdec_fb *vp9_rm_from_fb_use_list(struct vdec_vp9_instif (fb->base_y.va == addr) {list_move_tail (&node->list, &inst->available_fb_node_list); -break ; +return fb; } } -return fb; + +return NULL ; } static void vp9_add_to_fb_free_list(struct vdec_vp9_inst *inst,
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 250/511 usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
[ Upstream commit 5eda42aebb7668b4dcff025cd3ccb0d3d7c53da6 ]
The function mxs_phy_is_otg_host() will return true if OTG_ID_VALUE is 0 at USBPHY_CTRL register. However, OTG_ID_VALUE will not reflect the real state if the ID pin is float, such as Host-only or Type-C cases. The value of OTG_ID_VALUE is always 1 which means device mode.
This patch will fix the issue by judging the current mode based on last_event. The controller will update last_event in time.
--- drivers/usb/phy/phy-mxs-usb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +2 -8
@@ -388,14 +388,8 @@ static void __mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool disconnect)static bool mxs_phy_is_otg_host (struct mxs_phy *mxs_phy) { -void __iomem *base = mxs_phy->phy.io_priv; -u32 phyctrl =readl (base +HW_USBPHY_CTRL ); - -if (IS_ENABLED (CONFIG_USB_OTG ) && - !(phyctrl &BM_USBPHY_CTRL_OTG_ID_VALUE )) -return true; - -return false; +return IS_ENABLED (CONFIG_USB_OTG ) && + mxs_phy->phy.last_event ==USB_EVENT_ID ; }static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 251/511 scsi: RDMA/srp: Fix residual handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 89e637c19b2441aabc8dbf22a8745b932fd6996e ]
Although the code for residual handling in the SRP initiator follows the SCSI documentation, that documentation has never been correct. Because scsi_finish_command() starts from the data buffer length and subtracts the residual, scsi_set_resid() must not be called if a residual overflow occurs. Hence remove the scsi_set_resid() calls from the SRP initiator if a residual overflow occurrs.
--- drivers/infiniband/ulp/srp/ib_srp.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/infiniband/ulp/srp/ib_srp.c +0 -4
@@ -1978,12 +1978,8 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp)if (unlikely (rsp->flags &SRP_RSP_FLAG_DIUNDER ))scsi_set_resid (scmnd,be32_to_cpu (rsp->data_in_res_cnt)); -else if (unlikely (rsp->flags &SRP_RSP_FLAG_DIOVER )) -scsi_set_resid (scmnd, -be32_to_cpu (rsp->data_in_res_cnt));else if (unlikely (rsp->flags &SRP_RSP_FLAG_DOUNDER ))scsi_set_resid (scmnd,be32_to_cpu (rsp->data_out_res_cnt)); -else if (unlikely (rsp->flags &SRP_RSP_FLAG_DOOVER )) -scsi_set_resid (scmnd, -be32_to_cpu (rsp->data_out_res_cnt));srp_free_req (ch, req, scmnd,be32_to_cpu (rsp->req_lim_delta));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 252/511 scsi: iscsi: Rename iscsi_set_param() to iscsi_if_set_param()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenchao Hao <[email protected]>
[ Upstream commit 0c26a2d7c98039e913e63f9250fde738a3f88a60 ]
There are two iscsi_set_param() functions defined in libiscsi.c and scsi_transport_iscsi.c respectively which is confusing.
Rename the one in scsi_transport_iscsi.c to iscsi_if_set_param().
Stable-dep-of: 971dfcb74a80 ("scsi: iscsi: Add length check for nlattr payload")
--- drivers/scsi/scsi_transport_iscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +2 -2
@@ -3034,7 +3034,7 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev }static int -iscsi_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_if_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev) {char *data = (char *)ev +sizeof (*ev);struct iscsi_cls_conn *conn;
@@ -3988,7 +3988,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err = -EINVAL ;break ;case ISCSI_UEVENT_SET_PARAM : - err =iscsi_set_param (transport, ev); + err =iscsi_if_set_param (transport, ev);break ;case ISCSI_UEVENT_CREATE_CONN :case ISCSI_UEVENT_DESTROY_CONN :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 253/511 scsi: iscsi: Add length check for nlattr payload
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 971dfcb74a800047952f5288512b9c7ddedb050a ]
The current NETLINK_ISCSI netlink parsing loop checks every nlmsg to make sure the length is bigger than sizeof(struct iscsi_uevent) and then calls iscsi_if_recv_msg().
nlh = nlmsg_hdr(skb);
if (nlh->nlmsg_len < sizeof(*nlh) + sizeof(*ev) ||
skb->len < nlh->nlmsg_len) {
break;
}
...
err = iscsi_if_recv_msg(skb, nlh, &group);Hence, in iscsi_if_recv_msg() the nlmsg_data can be safely converted to iscsi_uevent as the length is already checked.
However, in other cases the length of nlattr payload is not checked before the payload is converted to other data structures. One example is iscsi_set_path() which converts the payload to type iscsi_path without any checks:
params = (struct iscsi_path *)((char *)ev + sizeof(*ev));
Whereas iscsi_if_transport_conn() correctly checks the pdu_len:
pdu_len = nlh->nlmsg_len - sizeof(*nlh) - sizeof(*ev);
if ((ev->u.send_pdu.hdr_size > pdu_len) ..
err = -EINVAL;To sum up, some code paths called in iscsi_if_recv_msg() do not check the length of the data (see below picture) and directly convert the data to another data structure. This could result in an out-of-bound reads and heap dirty data leakage.
_________ nlmsg_len(nlh) _______________
/ \
+----------+--------------+---------------------------+
| nlmsghdr | iscsi_uevent | data |
+----------+--------------+---------------------------+
\ /
iscsi_uevent->u.set_param.lenFix the issue by adding the length check before accessing it. To clean up the code, an additional parameter named rlen is added. The rlen is calculated at the beginning of iscsi_if_recv_msg() which avoids duplicated calculation.
--- drivers/scsi/scsi_transport_iscsi.c | 72 +++++++++++++++++------------ 1 file changed, 43 insertions(+), 29 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +43 -29
@@ -3034,14 +3034,15 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev }static int -iscsi_if_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_if_set_param (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {char *data = (char *)ev +sizeof (*ev);struct iscsi_cls_conn *conn;struct iscsi_cls_session *session;int err =0 , value =0 , state; -if (ev->u.set_param.len >PAGE_SIZE ) +if (ev->u.set_param.len > rlen || + ev->u.set_param.len >PAGE_SIZE )return -EINVAL ; session =iscsi_session_lookup (ev->u.set_param.sid);
@@ -3138,7 +3139,7 @@ static int iscsi_if_ep_disconnect(struct iscsi_transport *transport,static int iscsi_if_transport_ep (struct iscsi_transport *transport, -struct iscsi_uevent *ev,int msg_type) +struct iscsi_uevent *ev,int msg_type,u32 rlen) {struct iscsi_endpoint *ep;int rc =0 ;
@@ -3146,7 +3147,10 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,switch (msg_type) {case ISCSI_UEVENT_TRANSPORT_EP_CONNECT_THROUGH_HOST :case ISCSI_UEVENT_TRANSPORT_EP_CONNECT : - rc =iscsi_if_ep_connect (transport, ev, msg_type); +if (rlen <sizeof (struct sockaddr )) + rc = -EINVAL ; +else + rc =iscsi_if_ep_connect (transport, ev, msg_type);break ;case ISCSI_UEVENT_TRANSPORT_EP_POLL :if (!transport->ep_poll)
@@ -3170,12 +3174,15 @@ iscsi_if_transport_ep(struct iscsi_transport *transport,static int iscsi_tgt_dscvr (struct iscsi_transport *transport, -struct iscsi_uevent *ev) +struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct sockaddr *dst_addr;int err; +if (rlen <sizeof (*dst_addr)) +return -EINVAL ; +if (!transport->tgt_dscvr)return -EINVAL ;
@@ -3196,7 +3203,7 @@ iscsi_tgt_dscvr(struct iscsi_transport *transport,static int iscsi_set_host_param (struct iscsi_transport *transport, -struct iscsi_uevent *ev) +struct iscsi_uevent *ev,u32 rlen) {char *data = (char *)ev +sizeof (*ev);struct Scsi_Host *shost;
@@ -3205,7 +3212,8 @@ iscsi_set_host_param(struct iscsi_transport *transport,if (!transport->set_host_param)return -ENOSYS ; -if (ev->u.set_host_param.len >PAGE_SIZE ) +if (ev->u.set_host_param.len > rlen || + ev->u.set_host_param.len >PAGE_SIZE )return -EINVAL ; shost =scsi_host_lookup (ev->u.set_host_param.host_no);
@@ -3222,12 +3230,15 @@ iscsi_set_host_param(struct iscsi_transport *transport, }static int -iscsi_set_path (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_set_path (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct iscsi_path *params;int err; +if (rlen <sizeof (*params)) +return -EINVAL ; +if (!transport->set_path)return -ENOSYS ;
@@ -3287,12 +3298,15 @@ iscsi_set_iface_params(struct iscsi_transport *transport, }static int -iscsi_send_ping (struct iscsi_transport *transport,struct iscsi_uevent *ev) +iscsi_send_ping (struct iscsi_transport *transport,struct iscsi_uevent *ev,u32 rlen) {struct Scsi_Host *shost;struct sockaddr *dst_addr;int err; +if (rlen <sizeof (*dst_addr)) +return -EINVAL ; +if (!transport->send_ping)return -ENOSYS ;
@@ -3790,13 +3804,12 @@ iscsi_get_host_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) }static int iscsi_if_transport_conn (struct iscsi_transport *transport, -struct nlmsghdr *nlh) +struct nlmsghdr *nlh,u32 pdu_len) {struct iscsi_uevent *ev =nlmsg_data (nlh);struct iscsi_cls_session *session;struct iscsi_cls_conn *conn =NULL ;struct iscsi_endpoint *ep; -uint32_t pdu_len;int err =0 ;switch (nlh->nlmsg_type) {
@@ -3881,8 +3894,6 @@ static int iscsi_if_transport_conn(struct iscsi_transport *transport,break ;case ISCSI_UEVENT_SEND_PDU : - pdu_len = nlh->nlmsg_len -sizeof (*nlh) -sizeof (*ev); -if ((ev->u.send_pdu.hdr_size > pdu_len) || (ev->u.send_pdu.data_size > (pdu_len - ev->u.send_pdu.hdr_size))) { err = -EINVAL ;
@@ -3912,6 +3923,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)struct iscsi_internal *priv;struct iscsi_cls_session *session;struct iscsi_endpoint *ep =NULL ; +u32 rlen;if (!netlink_capable (skb,CAP_SYS_ADMIN ))return -EPERM ;
@@ -3931,6 +3943,13 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) portid =NETLINK_CB (skb).portid; +/* +* Even though the remaining payload may not be regarded as nlattr, +* (like address or something else), calculate the remaining length +* here to ease following length checks. +*/ + rlen =nlmsg_attrlen (nlh,sizeof (*ev)); +switch (nlh->nlmsg_type) {case ISCSI_UEVENT_CREATE_SESSION : err = iscsi_if_create_session(priv, ep, ev,
@@ -3988,7 +4007,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err = -EINVAL ;break ;case ISCSI_UEVENT_SET_PARAM : - err =iscsi_if_set_param (transport, ev); + err =iscsi_if_set_param (transport, ev, rlen);break ;case ISCSI_UEVENT_CREATE_CONN :case ISCSI_UEVENT_DESTROY_CONN :
@@ -3996,7 +4015,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)case ISCSI_UEVENT_START_CONN :case ISCSI_UEVENT_BIND_CONN :case ISCSI_UEVENT_SEND_PDU : - err =iscsi_if_transport_conn (transport, nlh); + err =iscsi_if_transport_conn (transport, nlh, rlen);break ;case ISCSI_UEVENT_GET_STATS : err =iscsi_if_get_stats (transport, nlh);
@@ -4005,23 +4024,22 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group)case ISCSI_UEVENT_TRANSPORT_EP_POLL :case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT :case ISCSI_UEVENT_TRANSPORT_EP_CONNECT_THROUGH_HOST : - err =iscsi_if_transport_ep (transport, ev, nlh->nlmsg_type); + err =iscsi_if_transport_ep (transport, ev, nlh->nlmsg_type, rlen);break ;case ISCSI_UEVENT_TGT_DSCVR : - err =iscsi_tgt_dscvr (transport, ev); + err =iscsi_tgt_dscvr (transport, ev, rlen);break ;case ISCSI_UEVENT_SET_HOST_PARAM : - err =iscsi_set_host_param (transport, ev); + err =iscsi_set_host_param (transport, ev, rlen);break ;case ISCSI_UEVENT_PATH_UPDATE : - err =iscsi_set_path (transport, ev); + err =iscsi_set_path (transport, ev, rlen);break ;case ISCSI_UEVENT_SET_IFACE_PARAMS : - err =iscsi_set_iface_params (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_set_iface_params (transport, ev, rlen);break ;case ISCSI_UEVENT_PING : - err =iscsi_send_ping (transport, ev); + err =iscsi_send_ping (transport, ev, rlen);break ;case ISCSI_UEVENT_GET_CHAP : err =iscsi_get_chap (transport, nlh);
@@ -4030,13 +4048,10 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err =iscsi_delete_chap (transport, ev);break ;case ISCSI_UEVENT_SET_FLASHNODE_PARAMS : - err =iscsi_set_flashnode_param (transport, ev, -nlmsg_attrlen (nlh, -sizeof (*ev))); + err =iscsi_set_flashnode_param (transport, ev, rlen);break ;case ISCSI_UEVENT_NEW_FLASHNODE : - err =iscsi_new_flashnode (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_new_flashnode (transport, ev, rlen);break ;case ISCSI_UEVENT_DEL_FLASHNODE : err =iscsi_del_flashnode (transport, ev);
@@ -4051,8 +4066,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err =iscsi_logout_flashnode_sid (transport, ev);break ;case ISCSI_UEVENT_SET_CHAP : - err =iscsi_set_chap (transport, ev, -nlmsg_attrlen (nlh,sizeof (*ev))); + err =iscsi_set_chap (transport, ev, rlen);break ;case ISCSI_UEVENT_GET_HOST_STATS : err =iscsi_get_host_stats (transport, nlh);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 254/511 scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ce51c817008450ef4188471db31639d42d37a5e1 ]
The functions iscsi_if_set_param() and iscsi_if_set_host_param() convert an nlattr payload to type char* and then call C string handling functions like sscanf and kstrdup:
char *data = (char*)ev + sizeof(*ev); ... sscanf(data, "%d", &value);
However, since the nlattr is provided by the user-space program and the nlmsg skb is allocated with GFP_KERNEL instead of GFP_ZERO flag (see netlink_alloc_large_skb() in netlink_sendmsg()), dirty data on the heap can lead to an OOB access for those string handling functions.
By investigating how the bug is introduced, we find it is really interesting as the old version parsing code starting from commit fd7255f51a13 ("[SCSI] iscsi: add sysfs attrs for uspace sync up") treated the nlattr as integer bytes instead of string and had length check in iscsi_copy_param():
if (ev->u.set_param.len != sizeof(uint32_t))
BUG();But, since the commit a54a52caad4b ("[SCSI] iscsi: fixup set/get param functions"), the code treated the nlattr as C string while forgetting to add any strlen checks(), opening the possibility of an OOB access.
Fix the potential OOB by adding the strlen() check before accessing the buf. If the data passes this check, all low-level set_param handlers can safely treat this buf as legal C string.
--- drivers/scsi/scsi_transport_iscsi.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +8 -0
@@ -3050,6 +3050,10 @@ iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev, uif (!conn || !session)return -EINVAL ; +/* data will be regarded as NULL-ended string, do length check */ +if (strlen (data) > ev->u.set_param.len) +return -EINVAL ; +switch (ev->u.set_param.param) {case ISCSI_PARAM_SESS_RECOVERY_TMO :sscanf (data,"%d" , &value);
@@ -3223,6 +3227,10 @@ iscsi_set_host_param(struct iscsi_transport *transport,return -ENODEV ; } +/* see similar check in iscsi_if_set_param() */ +if (strlen (data) > ev->u.set_host_param.len) +return -EINVAL ; + err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len);scsi_host_put (shost);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 255/511 scsi: be2iscsi: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit ee0268f230f66cb472df3424f380ea668da2749a ]
beiscsi_iface_set_param() parses nlattr with nla_for_each_attr and assumes every attributes can be viewed as struct iscsi_iface_param_info.
This is not true because there is no any nla_policy to validate the attributes passed from the upper function iscsi_set_iface_params().
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/be2iscsi/be_iscsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/be2iscsi/be_iscsi.c +4 -0
@@ -450,6 +450,10 @@ int beiscsi_iface_set_param(struct Scsi_Host *shost, }nla_for_each_attr (attrib, data, dt_len, rm_len) { +/* ignore nla_type as it is never used */ +if (nla_len (attrib) <sizeof (*iface_param)) +return -EINVAL ; + iface_param =nla_data (attrib);if (iface_param->param_type !=ISCSI_NET_PARAM )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 256/511 scsi: qla4xxx: Add length check when parsing nlattrs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Ma <[email protected]>
[ Upstream commit 47cd3770e31df942e2bb925a9a855c79ed0662eb ]
There are three places that qla4xxx parses nlattrs:
- qla4xxx_set_chap_entry()
- qla4xxx_iface_set_param()
- qla4xxx_sysfs_ddb_set_param()
and each of them directly converts the nlattr to specific pointer of structure without length checking. This could be dangerous as those attributes are not validated and a malformed nlattr (e.g., length 0) could result in an OOB read that leaks heap dirty data.
Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails.
--- drivers/scsi/qla4xxx/ql4_os.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +15 -0
@@ -968,6 +968,11 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)memset (&chap_rec,0 ,sizeof (chap_rec));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*param_info)) { + rc = -EINVAL ; + goto exit_set_chap; + } + param_info =nla_data (attr);switch (param_info->param) {
@@ -2750,6 +2755,11 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len) }nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*iface_param)) { + rval = -EINVAL ; + goto exit_init_fw_cb; + } + iface_param =nla_data (attr);if (iface_param->param_type ==ISCSI_NET_PARAM ) {
@@ -8105,6 +8115,11 @@ qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess,memset ((void *)&chap_tbl,0 ,sizeof (chap_tbl));nla_for_each_attr (attr, data, len, rem) { +if (nla_len (attr) <sizeof (*fnode_param)) { + rc = -EINVAL ; + goto exit_set_param; + } + fnode_param =nla_data (attr);switch (fnode_param->param) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 257/511 serial: sprd: Assign sprd_port after initialized to avoid wrong access
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit f9608f1887568b728839d006024585ab02ef29e5 ]
The global pointer 'sprd_port' may not zero when sprd_probe returns failure, that is a risk for sprd_port to be accessed afterward, and may lead to unexpected errors.
For example:
There are two UART ports, UART1 is used for console and configured in kernel command line, i.e. "console=";
The UART1 probe failed and the memory allocated to sprd_port[1] was released, but sprd_port[1] was not set to NULL;
In UART2 probe, the same virtual address was allocated to sprd_port[2], and UART2 probe process finally will go into sprd_console_setup() to register UART1 as console since it is configured as preferred console (filled to console_cmdline[]), but the console parameters (sprd_port[1]) belong to UART2.
So move the sprd_port[] assignment to where the port already initialized can avoid the above issue.
--- drivers/tty/serial/sprd_serial.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/tty/serial/sprd_serial.c +17 -8
@@ -1133,7 +1133,7 @@ static bool sprd_uart_is_console(struct uart_port *uport)static int sprd_clk_init (struct uart_port *uport) {struct clk *clk_uart, *clk_parent; -struct sprd_uart_port *u = sprd_port[uport->line]; + struct sprd_uart_port *u = container_of(uport, struct sprd_uart_port, port); clk_uart =devm_clk_get (uport->dev,"uart" );if (IS_ERR (clk_uart)) {
@@ -1176,22 +1176,22 @@ static int sprd_probe(struct platform_device *pdev) {struct resource *res;struct uart_port *up; +struct sprd_uart_port *sport;int irq;int index;int ret; index =of_alias_get_id (pdev->dev.of_node,"serial" ); -if (index <0 || index >=ARRAY_SIZE (sprd_port)) { +if (index <0 || index >=UART_NR_MAX ) {dev_err (&pdev->dev,"got a wrong serial alias id %d\n" , index);return -EINVAL ; } - sprd_port[index] =devm_kzalloc (&pdev->dev,sizeof (*sprd_port[index]), -GFP_KERNEL ); -if (!sprd_port[index]) + sport =devm_kzalloc (&pdev->dev,sizeof (*sport),GFP_KERNEL ); +if (!sport)return -ENOMEM ; - up = &sprd_port[index]->port; + up = &sport->port; up->dev = &pdev->dev; up->line = index; up->type =PORT_SPRD ;
@@ -1222,7 +1222,7 @@ static int sprd_probe(struct platform_device *pdev)* Allocate one dma buffer to prepare for receive transfer, in case * memory allocation failure at runtime. */ - ret =sprd_rx_alloc_buf (sprd_port[index]); + ret =sprd_rx_alloc_buf (sport);if (ret)return ret;
@@ -1233,14 +1233,23 @@ static int sprd_probe(struct platform_device *pdev)return ret; } } + sprd_ports_num++; + sprd_port[index] = sport; ret =uart_add_one_port (&sprd_uart_driver, up);if (ret) -sprd_remove (pdev); + goto clean_port;platform_set_drvdata (pdev, up); +return 0 ; + +clean_port: + sprd_port[index] =NULL ; +if (--sprd_ports_num ==0 ) +uart_unregister_driver (&sprd_uart_driver); +sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 258/511 serial: sprd: Fix DMA buffer leak issue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunyan Zhang <[email protected]>
[ Upstream commit cd119fdc3ee1450fbf7f78862b5de44c42b6e47f ]
Release DMA buffer when _probe() returns failure to avoid memory leak.
--- drivers/tty/serial/sprd_serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/sprd_serial.c +3 -2
@@ -367,7 +367,7 @@ static void sprd_rx_free_buf(struct sprd_uart_port *sp)if (sp->rx_dma.virt)dma_free_coherent (sp->port.dev,SPRD_UART_RX_SIZE , sp->rx_dma.virt, sp->rx_dma.phys_addr); - + sp->rx_dma.virt =NULL ; }static int sprd_rx_dma_config (struct uart_port *port,u32 burst)
@@ -1230,7 +1230,7 @@ static int sprd_probe(struct platform_device *pdev) ret =uart_register_driver (&sprd_uart_driver);if (ret <0 ) {pr_err ("Failed to register SPRD-UART driver\n" ); -return ret; + goto free_rx_buf; } }
@@ -1249,6 +1249,7 @@ static int sprd_probe(struct platform_device *pdev) sprd_port[index] =NULL ;if (--sprd_ports_num ==0 )uart_unregister_driver (&sprd_uart_driver); +free_rx_buf:sprd_rx_free_buf (sport);return ret; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 259/511 x86/APM: drop the duplicate APM_MINOR_DEV macro
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 4ba2909638a29630a346d6c4907a3105409bee7d ]
This source file already includes <linux/miscdevice.h>, which contains the same macro. It doesn't need to be defined here again.
--- arch/x86/kernel/apm_32.c | 6 ------ 1 file changed, 6 deletions(-)
arch/x86/kernel/apm_32.c +0 -6
@@ -237,12 +237,6 @@extern int (*console_blank_hook)(int );#endif -/* -* The apm_bios device is one of the misc char devices. -* This is its minor number. -*/ -#define APM_MINOR_DEV 134 -/* * Various options can be changed at boot time as follows: * (We allow underscores for compatibility with the modules code)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 260/511 scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 7d3d20dee4f648ec44e9717d5f647d594d184433 ]
The qedf_dbg_stop_io_on_error_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -185,18 +185,17 @@ qedf_dbg_stop_io_on_error_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { int cnt; +char cbuf[7 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;struct qedf_ctx *qedf =container_of (qedf_dbg, struct qedf_ctx, dbg_ctx);QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"%s\n" , + cnt =scnprintf (cbuf,sizeof (cbuf),"%s\n" , qedf->stop_io_on_error ?"true" :"false" ); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 261/511 scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 31b5991a9a91ba97237ac9da509d78eec453ff72 ]
The qedf_dbg_debug_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by using a small on-stack buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_debugfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/qedf/qedf_debugfs.c +3 -4
@@ -138,15 +138,14 @@ qedf_dbg_debug_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) {int cnt; +char cbuf[32 ];struct qedf_dbg_ctx *qedf_dbg = (struct qedf_dbg_ctx *)filp->private_data;QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"debug mask=0x%x\n" , qedf_debug); - cnt =sprintf (buffer,"debug mask = 0x%x\n" , qedf_debug); + cnt =scnprintf (cbuf,sizeof (cbuf),"debug mask = 0x%x\n" , qedf_debug); - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; +return simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 262/511 scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksandr Natalenko <[email protected]>
[ Upstream commit 25dbc20deab5165f847b4eb42f376f725a986ee8 ]
The qedf_dbg_fp_int_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel.
Avoid doing that by vmalloc()'ating a buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call.
--- drivers/scsi/qedf/qedf_dbg.h | 2 ++ drivers/scsi/qedf/qedf_debugfs.c | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-)
drivers/scsi/qedf/qedf_dbg.h +2 -0
@@ -59,6 +59,8 @@ extern uint qedf_debug;#define QEDF_LOG_NOTICE 0x40000000/* Notice logs */ #define QEDF_LOG_WARN 0x80000000/* Warning logs */ +#define QEDF_DEBUGFS_LOG_LEN (2 * PAGE_SIZE) +/* Debug context structure */ struct qedf_dbg_ctx {unsigned int host_no;
drivers/scsi/qedf/qedf_debugfs.c +15 -6
@@ -8,6 +8,7 @@#include <linux/uaccess.h> #include <linux/debugfs.h> #include <linux/module.h> +#include <linux/vmalloc.h> #include "qedf.h" #include "qedf_dbg.h"
@@ -98,7 +99,9 @@ static ssize_t qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count, loff_t *ppos) { + ssize_t ret;size_t cnt =0 ; +char *cbuf;int id;struct qedf_fastpath *fp =NULL ; struct qedf_dbg_ctx *qedf_dbg =
@@ -108,19 +111,25 @@ qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count,QEDF_INFO (qedf_dbg,QEDF_LOG_DEBUGFS ,"entered\n" ); - cnt =sprintf (buffer,"\nFastpath I/O completions\n\n" ); + cbuf =vmalloc (QEDF_DEBUGFS_LOG_LEN ); +if (!cbuf) +return 0 ; + + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt,"\nFastpath I/O completions\n\n" );for (id =0 ; id < qedf->num_queues; id++) { fp = &(qedf->fp_array[id]);if (fp->sb_id ==QEDF_SB_ID_NULL )continue ; - cnt +=sprintf ((buffer + cnt),"#%d: %lu\n" , id, - fp->completions); + cnt +=scnprintf (cbuf + cnt,QEDF_DEBUGFS_LOG_LEN - cnt, +"#%d: %lu\n" , id, fp->completions); } - cnt =min_t (int, count, cnt - *ppos); - *ppos += cnt; -return cnt; + ret =simple_read_from_buffer (buffer, count, ppos, cbuf, cnt); + +vfree (cbuf); + +return ret; } static ssize_t
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 263/511 RDMA/irdma: Replace one-element array with flexible-array member
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 38313c6d2a02c28162e06753b01bd885caf9386d ]
One-element and zero-length arrays are deprecated. So, replace one-element array in struct irdma_qvlist_info with flexible-array member.
A patch for this was sent a while ago[1]. However, it seems that, at the time, the changes were partially folded[2][3], and the actual flexible-array transformation was omitted. This patch fixes that.
The only binary difference seen before/after changes is shown below:
| drivers/infiniband/hw/irdma/hw.o | @@ -868,7 +868,7 @@ | drivers/infiniband/hw/irdma/hw.c:484 (discriminator 2) | size += struct_size(iw_qvlist, qv_info, rf->msix_count); | 55b: imul $0x45c,%rdi,%rdi |- 562: add $0x10,%rdi |+ 562: add $0x4,%rdi
which is, of course, expected as it reflects the mistake made while folding the patch I've mentioned above.
Worth mentioning is the fact that with this change we save 12 bytes of memory, as can be inferred from the diff snapshot above. Notice that:
$ pahole -C rdma_qv_info idrivers/infiniband/hw/irdma/hw.o
struct irdma_qv_info {
u32 v_idx; /* 0 4 */
u16 ceq_idx; /* 4 2 */
u16 aeq_idx; /* 6 2 */
u8 itr_idx; /* 8 1 *//* size: 12, cachelines: 1, members: 4 */ /* padding: 3 */ /* last cacheline: 12 bytes */ };
--- drivers/infiniband/hw/irdma/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/irdma/main.h +1 -1
@@ -237,7 +237,7 @@ struct irdma_qv_info {struct irdma_qvlist_info {u32 num_vectors; -struct irdma_qv_info qv_info[1 ]; +struct irdma_qv_info qv_info[]; };struct irdma_gen_ops {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 264/511 coresight: tmc: Explicit type conversions to prevent integer overflow
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ruidong Tian <[email protected]>
[ Upstream commit fd380097cdb305582b7a1f9476391330299d2c59 ]
Perf cs_etm session executed unexpectedly when AUX buffer > 1G.
perf record -C 0 -m ,2G -e cs_etm// -- <workload> [ perf record: Captured and wrote 2.615 MB perf.data ]
Perf only collect about 2M perf data rather than 2G. This is becasuse the operation, "nr_pages << PAGE_SHIFT", in coresight tmc driver, will overflow when nr_pages >= 0x80000(correspond to 1G AUX buffer). The overflow cause buffer allocation to fail, and TMC driver will alloc minimal buffer size(1M). You can just get about 2M perf data(1M AUX buffer + perf data header) at least.
Explicit convert nr_pages to 64 bit to avoid overflow.
--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +++-- drivers/hwtracing/coresight/coresight-tmc.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -428,7 +428,7 @@ static int tmc_set_etf_buffer(struct coresight_device *csdev,return -EINVAL ;/* wrap head around to the amount of space we have */ - head = handle->head & ((buf->nr_pages <<PAGE_SHIFT ) -1 ); + head = handle->head & (((unsigned long )buf->nr_pages <<PAGE_SHIFT ) -1 );/* find the page to write to */ buf->cur = head /PAGE_SIZE ;
drivers/hwtracing/coresight/coresight-tmc-etr.c +3 -2
@@ -47,7 +47,8 @@ struct etr_perf_buffer { };/* Convert the perf index to an offset within the ETR buffer */ -#define PERF_IDX2OFF (idx, buf) ((idx) % ((buf)->nr_pages << PAGE_SHIFT)) +#define PERF_IDX2OFF (idx, buf) \ + ((idx) % ((unsigned long)(buf)->nr_pages << PAGE_SHIFT))/* Lower limit for ETR hardware buffer */ #define TMC_ETR_PERF_MIN_BUF_SIZE SZ_1M
@@ -1232,7 +1233,7 @@ alloc_etr_buf(struct tmc_drvdata *drvdata, struct perf_event *event,* than the size requested via sysfs. */ if ((nr_pages <<PAGE_SHIFT ) > drvdata->size) { - etr_buf =tmc_alloc_etr_buf (drvdata, (nr_pages <<PAGE_SHIFT ), + etr_buf =tmc_alloc_etr_buf (drvdata, ((ssize_t )nr_pages <<PAGE_SHIFT ),0 , node,NULL );if (!IS_ERR (etr_buf)) goto done;
drivers/hwtracing/coresight/coresight-tmc.h +1 -1
@@ -321,7 +321,7 @@ ssize_t tmc_sg_table_get_data(struct tmc_sg_table *sg_table,static inline unsigned long tmc_sg_table_buf_size (struct tmc_sg_table *sg_table) { -return sg_table->data_pages.nr_pages <<PAGE_SHIFT ; +return (unsigned long )sg_table->data_pages.nr_pages <<PAGE_SHIFT ; }struct coresight_device *tmc_etr_get_catu_device (struct tmc_drvdata *drvdata);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 265/511 dma-buf/sync_file: Fix docs syntax
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 05d56d8079d510a2994039470f65bea85f0075ee ]
Fixes the warning:
include/uapi/linux/sync_file.h:77: warning: Function parameter or member 'num_fences' not described in 'sync_file_info'
--- include/uapi/linux/sync_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/sync_file.h +1 -1
@@ -52,7 +52,7 @@ struct sync_fence_info {* @name: name of fence * @status: status of fence. 1: signaled 0:active <0:error * @flags: sync_file_info flags -* @num_fences number of fences in the sync_file +* @num_fences: number of fences in the sync_file * @pad: padding for 64-bit alignment, should always be zero * @sync_fence_info: pointer to array of structs sync_fence_info with all * fences in the sync_file
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 266/511 driver core: test_async: fix an error code
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 22d2381bbd70a5853c2ee77522f4965139672db9 ]
The test_platform_device_register_node() function should return error pointers instead of NULL. That is what the callers are expecting.
--- drivers/base/test/test_async_driver_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/test/test_async_driver_probe.c +1 -1
@@ -84,7 +84,7 @@ test_platform_device_register_node(char *name, int id, int nid) pdev =platform_device_alloc (name, id);if (!pdev) -return NULL ; +return ERR_PTR (-ENOMEM );if (nid !=NUMA_NO_NODE )set_dev_node (&pdev->dev, nid);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 267/511 iommu/sprd: Add missing force_aperture
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
[ Upstream commit d48a51286c698f7fe8efc688f23a532f4fe9a904 ]
force_aperture was intended to false only by GART drivers that have an identity translation outside the aperture. This does not describe sprd, so add the missing 'force_aperture = true'.
--- drivers/iommu/sprd-iommu.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/sprd-iommu.c +1 -0
@@ -147,6 +147,7 @@ static struct iommu_domain *sprd_iommu_domain_alloc(unsigned int domain_type) dom->domain.geometry.aperture_start =0 ; dom->domain.geometry.aperture_end =SZ_256M -1 ; + dom->domain.geometry.force_aperture = true;return &dom->domain; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 268/511 RDMA/hns: Fix port active speed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengchang Tang <[email protected]>
[ Upstream commit df1bcf90a66a10967a3a43510b42cb3566208011 ]
HW supports a variety of different speed, but the current speed is fixed.
The real speed should be querried from ethernet.
--- drivers/infiniband/hw/hns/hns_roce_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_main.c +5 -2
@@ -222,6 +222,7 @@ static int hns_roce_query_port(struct ib_device *ib_dev, u32 port_num,unsigned long flags;enum ib_mtu mtu;u32 port; +int ret; port = port_num -1 ;
@@ -234,8 +235,10 @@ static int hns_roce_query_port(struct ib_device *ib_dev, u32 port_num,IB_PORT_BOOT_MGMT_SUP ; props->max_msg_sz =HNS_ROCE_MAX_MSG_LEN ; props->pkey_tbl_len =1 ; - props->active_width =IB_WIDTH_4X ; - props->active_speed =1 ; + ret =ib_get_eth_speed (ib_dev, port_num, &props->active_speed, + &props->active_width); +if (ret) +ibdev_warn (ib_dev,"failed to get speed, ret = %d.\n" , ret);spin_lock_irqsave (&hr_dev->iboe.lock, flags);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 269/511 RDMA/hns: Fix incorrect post-send with direct wqe of wr-list
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxian Huang <[email protected]>
[ Upstream commit 706efac4477cdb8be857f6322457de524acc02ff ]
Currently, direct wqe is not supported for wr-list. RoCE driver excludes direct wqe for wr-list by judging whether the number of wr is 1.
For a wr-list where the second wr is a length-error atomic wr, the post-send driver handles the first wr and adds 1 to the wr number counter firstly. While handling the second wr, the driver finds out a length error and terminates the wr handle process, remaining the counter at 1. This causes the driver mistakenly judges there is only 1 wr and thus enters the direct wqe process, carrying the current length-error atomic wqe.
This patch fixes the error by adding a judgement whether the current wr is a bad wr. If so, use the normal doorbell process but not direct wqe despite the wr number is 1.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +2 -1
@@ -731,7 +731,8 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp, qp->sq.head += nreq; qp->next_sge = sge_idx; -if (nreq ==1 && (qp->en_flags &HNS_ROCE_QP_CAP_DIRECT_WQE )) +if (nreq ==1 && !ret && + (qp->en_flags &HNS_ROCE_QP_CAP_DIRECT_WQE ))write_dwqe (hr_dev, qp, wqe);else update_sq_db (hr_dev, qp);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 270/511 RDMA/hns: Fix CQ and QP cache affinity
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengchang Tang <[email protected]>
[ Upstream commit 9e03dbea2b0634b21a45946b4f8097e0dc86ebe1 ]
Currently, the affinity between QP cache and CQ cache is not considered when assigning QPN, it will affect the message rate of HW.
Allocate QPN from QP cache with better CQ affinity to get better performance.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 1 + drivers/infiniband/hw/hns/hns_roce_qp.c | 28 ++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +1 -0
@@ -121,6 +121,7 @@#define HNS_ROCE_CQ_BANK_NUM 4#define CQ_BANKID_SHIFT 2 +#define CQ_BANKID_MASK GENMASK(1, 0)/* The chip implementation of the consumer index is calculated * according to twice the actual EQ depth
drivers/infiniband/hw/hns/hns_roce_qp.c +22 -6
@@ -172,14 +172,29 @@ static void hns_roce_ib_qp_event(struct hns_roce_qp *hr_qp, } } -static u8 get_least_load_bankid_for_qp (struct hns_roce_bank *bank) +static u8 get_affinity_cq_bank (u8 qp_bank) { -u32 least_load = bank[0 ].inuse; +return (qp_bank >>1 ) &CQ_BANKID_MASK ; +} + +static u8 get_least_load_bankid_for_qp (struct ib_qp_init_attr *init_attr, +struct hns_roce_bank *bank) +{ +#define INVALID_LOAD_QPNUM 0xFFFFFFFF +struct ib_cq *scq = init_attr->send_cq; +u32 least_load =INVALID_LOAD_QPNUM ; +unsigned long cqn =0 ;u8 bankid =0 ;u32 bankcnt;u8 i; -for (i =1 ; i <HNS_ROCE_QP_BANK_NUM ; i++) { +if (scq) + cqn =to_hr_cq (scq)->cqn; + +for (i =0 ; i <HNS_ROCE_QP_BANK_NUM ; i++) { +if (scq && (get_affinity_cq_bank (i) != (cqn &CQ_BANKID_MASK ))) +continue ; + bankcnt = bank[i].inuse;if (bankcnt < least_load) { least_load = bankcnt;
@@ -211,7 +226,8 @@ static int alloc_qpn_with_bankid(struct hns_roce_bank *bank, u8 bankid,return 0 ; } -static int alloc_qpn (struct hns_roce_dev *hr_dev,struct hns_roce_qp *hr_qp) +static int alloc_qpn (struct hns_roce_dev *hr_dev,struct hns_roce_qp *hr_qp, +struct ib_qp_init_attr *init_attr) {struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;unsigned long num =0 ;
@@ -229,7 +245,7 @@ static int alloc_qpn(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp) hr_qp->doorbell_qpn =1 ; }else {mutex_lock (&qp_table->bank_mutex); - bankid =get_least_load_bankid_for_qp (qp_table->bank); + bankid =get_least_load_bankid_for_qp (init_attr, qp_table->bank); ret =alloc_qpn_with_bankid (&qp_table->bank[bankid], bankid, &num);
@@ -1067,7 +1083,7 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, goto err_buf; } - ret =alloc_qpn (hr_dev, hr_qp); + ret =alloc_qpn (hr_dev, hr_qp, init_attr);if (ret) {ibdev_err (ibdev,"failed to alloc QPN, ret = %d.\n" , ret); goto err_qpn;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 271/511 IB/uverbs: Fix an potential error pointer dereference
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Yang <[email protected]>
[ Upstream commit 26b7d1a27167e7adf75b150755e05d2bc123ce55 ]
smatch reports the warning below:drivers/infiniband/core/uverbs_std_types_counters.c:110 ib_uverbs_handler_UVERBS_METHOD_COUNTERS_READ() error: 'uattr' dereferencing possible ERR_PTR()
The return value of uattr maybe ERR_PTR(-ENOENT), fix this by checking the value of uattr before using it.
--- drivers/infiniband/core/uverbs_std_types_counters.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/core/uverbs_std_types_counters.c +2 -0
@@ -107,6 +107,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_COUNTERS_READ)(return ret; uattr =uverbs_attr_get (attrs,UVERBS_ATTR_READ_COUNTERS_BUFF ); +if (IS_ERR (uattr)) +return PTR_ERR (uattr); read_attr.ncounters = uattr->ptr_attr.len /sizeof (u64); read_attr.counters_buff =uverbs_zalloc ( attrs,array_size (read_attr.ncounters,sizeof (u64)));
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 272/511 fsi: aspeed: Reset master errors after CFAM reset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eddie James <[email protected]>
[ Upstream commit 52300909f4670ac552bfeb33c1355b896eac8c06 ]
It has been observed that sometimes the FSI master will return all 0xffs after a CFAM has been taken out of reset, without presenting any error. Resetting the FSI master errors resolves the issue.
--- drivers/fsi/fsi-master-aspeed.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/fsi/fsi-master-aspeed.c +2 -0
@@ -453,6 +453,8 @@ static ssize_t cfam_reset_store(struct device *dev, struct device_attribute *attgpiod_set_value (aspeed->cfam_reset_gpio,1 );usleep_range (900 ,1000 );gpiod_set_value (aspeed->cfam_reset_gpio,0 ); +usleep_range (900 ,1000 ); +opb_writel (aspeed, ctrl_base +FSI_MRESP0 ,cpu_to_be32 (FSI_MRESP_RST_ALL_MASTER ));mutex_unlock (&aspeed->lock);return count;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 273/511 iommu/qcom: Disable and reset context bank before programming
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 9f3fef23d9b5a858a6e6d5f478bb1b6b76265e76 ]
Writing the new TTBRs, TCRs and MAIRs on a previously enabled
context bank may trigger a context fault, resulting in firmware driven AP resets: change the domain initialization programming sequence to disable the context bank(s) and to also clear the related fault address (CB_FAR) and fault status (CB_FSR) registers before writing new values to TTBR0/1, TCR/TCR2, MAIR0/1.
--- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/iommu/arm/arm-smmu/qcom_iommu.c +7 -0
@@ -273,6 +273,13 @@ static int qcom_iommu_init_domain(struct iommu_domain *domain, ctx->secure_init = true; } +/* Disable context bank before programming */ +iommu_writel (ctx,ARM_SMMU_CB_SCTLR ,0 ); + +/* Clear context bank fault address fault status registers */ +iommu_writel (ctx,ARM_SMMU_CB_FAR ,0 ); +iommu_writel (ctx,ARM_SMMU_CB_FSR ,ARM_SMMU_FSR_FAULT ); +/* TTBRs */ iommu_writeq(ctx, ARM_SMMU_CB_TTBR0, pgtbl_cfg.arm_lpae_s1_cfg.ttbr |
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 274/511 iommu/vt-d: Fix to flush cache of PASID directory table
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yanfei Xu <[email protected]>
[ Upstream commit 8a3b8e63f8371c1247b7aa24ff9c5312f1a6948b ]
Even the PCI devices don't support pasid capability, PASID table is mandatory for a PCI device in scalable mode. However flushing cache of pasid directory table for these devices are not taken after pasid table is allocated as the "size" of table is zero. Fix it by calculating the size by page order.
Found this when reading the code, no real problem encountered for now.
--- drivers/iommu/intel/pasid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/pasid.c +1 -1
@@ -187,7 +187,7 @@ int intel_pasid_alloc_table(struct device *dev)device_attach_pasid_table (info, pasid_table);if (!ecap_coherent (info->iommu->ecap)) -clflush_cache_range (pasid_table->table, size); +clflush_cache_range (pasid_table->table, (1 << order) *PAGE_SIZE );return 0 ; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 275/511 platform/x86: dell-sysman: Fix reference leak
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Armin Wolf <[email protected]>
[ Upstream commit 7295a996fdab7bf83dc3d4078fa8b139b8e0a1bf ]
If a duplicate attribute is found using kset_find_obj(), a reference to that attribute is returned. This means that we need to dispose it accordingly. Use kobject_put() to dispose the duplicate attribute in such a case.
Compile-tested only.
--- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +6 -3
@@ -396,6 +396,7 @@ static int init_bios_attributes(int attr_type, const char *guid)struct kobject *attr_name_kobj;//individual attribute names union acpi_object *obj =NULL ;union acpi_object *elements; +struct kobject *duplicate;struct kset *tmp_set;int min_elements;
@@ -454,9 +455,11 @@ static int init_bios_attributes(int attr_type, const char *guid)else tmp_set = wmi_priv.main_dir_kset; -if (kset_find_obj (tmp_set, elements[ATTR_NAME ].string.pointer)) { -pr_debug ("duplicate attribute name found - %s\n" , - elements[ATTR_NAME ].string.pointer); + duplicate =kset_find_obj (tmp_set, elements[ATTR_NAME ].string.pointer); +if (duplicate) { +pr_debug ("Duplicate attribute name found - %s\n" , + elements[ATTR_NAME ].string.pointer); +kobject_put (duplicate); goto nextobj; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 276/511 media: go7007: Remove redundant if statement
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Colin Ian King <[email protected]>
[ Upstream commit f33cb49081da0ec5af0888f8ecbd566bd326eed1 ]
The if statement that compares msgs[i].len != 3 is always false because it is in a code block where msg[i].len is equal to 3. The check is redundant and can be removed.
As detected by cppcheck static analysis:drivers/media/usb/go7007/go7007-i2c.c:168:20: warning: Opposite inner 'if' condition leads to a dead code block. [oppositeInnerCondition]
--- drivers/media/usb/go7007/go7007-i2c.c | 2 -- 1 file changed, 2 deletions(-)
drivers/media/usb/go7007/go7007-i2c.c +0 -2
@@ -165,8 +165,6 @@ static int go7007_i2c_master_xfer(struct i2c_adapter *adapter, }else if (msgs[i].len ==3 ) {if (msgs[i].flags &I2C_M_RD )return -EIO ; -if (msgs[i].len !=3 ) -return -EIO ;if (go7007_i2c_xfer (go, msgs[i].addr,0 , (msgs[i].buf[0 ] <<8 ) | msgs[i].buf[1 ],0x01 , &msgs[i].buf[2 ]) <0 )
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 277/511 media: venus: hfi_venus: Only consider sys_idle_indicator on V1
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 6283e4834c69fa93a108efa18c6aa09c7e626f49 ]
As per information from Qualcomm [1], this property is not really supported beyond msm8916 (HFI V1) and some newer HFI versions really dislike receiving it, going as far as crashing the device.
Only consider toggling it (via the module option) on HFIV1. While at it, get rid of the global static variable (which defaulted to zero) which was never explicitly assigned to for V1.
Note: [1] is a reply to the actual message in question, as lore did not properly receive some of the emails..
[1] https://lore.kernel.org/lkml/[email protected]/
--- drivers/media/platform/qcom/venus/hfi_venus.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/media/platform/qcom/venus/hfi_venus.c +6 -12
@@ -131,7 +131,6 @@ struct venus_hfi_device {static bool venus_pkt_debug;int venus_fw_debug =HFI_DEBUG_MSG_ERROR |HFI_DEBUG_MSG_FATAL ; -static bool venus_sys_idle_indicator;static bool venus_fw_low_power_mode = true;static int venus_hw_rsp_timeout =1000 ;static bool venus_fw_coverage;
@@ -924,17 +923,12 @@ static int venus_sys_set_default_properties(struct venus_hfi_device *hdev)if (ret)dev_warn (dev,"setting fw debug msg ON failed (%d)\n" , ret); -/* -* Idle indicator is disabled by default on some 4xx firmware versions, -* enable it explicitly in order to make suspend functional by checking -* WFI (wait-for-interrupt) bit. -*/ -if (IS_V4 (hdev->core) ||IS_V6 (hdev->core)) - venus_sys_idle_indicator = true; - - ret =venus_sys_set_idle_message (hdev, venus_sys_idle_indicator); -if (ret) -dev_warn (dev,"setting idle response ON failed (%d)\n" , ret); +/* HFI_PROPERTY_SYS_IDLE_INDICATOR is not supported beyond 8916 (HFI V1) */ +if (IS_V1 (hdev->core)) { + ret =venus_sys_set_idle_message (hdev, false); +if (ret) +dev_warn (dev,"setting idle response ON failed (%d)\n" , ret); + } ret =venus_sys_set_power_control (hdev, venus_fw_low_power_mode);if (ret)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 278/511 USB: gadget: f_mass_storage: Fix unused variable warning
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
[ Upstream commit 55c3e571d2a0aabef4f1354604443f1c415d2e85 ]
Fix a "variable set but not used" warning in f_mass_storage.c. rc is
used if verbose debugging is enabled but not otherwise.
--- drivers/usb/gadget/function/f_mass_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_mass_storage.c +1 -1
@@ -919,7 +919,7 @@ static void invalidate_sub(struct fsg_lun *curlun) {struct file *filp = curlun->filp;struct inode *inode =file_inode (filp); -unsigned long rc; +unsigned long __maybe_unused rc; rc =invalidate_mapping_pages (inode->i_mapping,0 ,-1 );VLDBG (curlun,"invalidate_mapping_pages -> %ld\n" , rc);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 279/511 media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Vasut <[email protected]>
[ Upstream commit 98cb72d3b9c5e03b10fa993752ecfcbd9c572d8c ]
Set OV5640_REG_IO_MIPI_CTRL00 bit 2 to 1 instead of 0, since 1 means MIPI CSI2 interface, while 0 means CPI parallel interface.
In the ov5640_set_power_mipi() the interface should obviously be set to MIPI CSI2 since this functions is used to power up the sensor when operated in MIPI CSI2 mode. The sensor should not be in CPI mode in that case.
This fixes a corner case where capturing the first frame on i.MX8MN with CSI/ISI resulted in corrupted frame.
--- drivers/media/i2c/ov5640.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/ov5640.c +2 -2
@@ -1968,9 +1968,9 @@ static int ov5640_set_power_mipi(struct ov5640_dev *sensor, bool on)* "ov5640_set_stream_mipi()") * [4] = 0 : Power up MIPI HS Tx * [3] = 0 : Power up MIPI LS Rx -* [2] = 0 : MIPI interface disabled +* [2] = 1 : MIPI interface enabled */ - ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x40 ); + ret =ov5640_write_reg (sensor,OV5640_REG_IO_MIPI_CTRL00 ,0x44 );if (ret)return ret;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 280/511 media: i2c: ov2680: Set V4L2_CTRL_FLAG_MODIFY_LAYOUT on flips
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Stevenson <[email protected]>
[ Upstream commit 66274280b2c745d380508dc27b9a4dfd736e5eda ]
The driver changes the Bayer order based on the flips, but does not define the control correctly with the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.
Add the V4L2_CTRL_FLAG_MODIFY_LAYOUT flag.
Stable-dep-of: 7b5a42e6ae71 ("media: ov2680: Remove auto-gain and auto-exposure controls")
--- drivers/media/i2c/ov2680.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov2680.c +2 -0
@@ -967,6 +967,8 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) ctrls->gain->flags |=V4L2_CTRL_FLAG_VOLATILE ; ctrls->exposure->flags |=V4L2_CTRL_FLAG_VOLATILE ; + ctrls->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; + ctrls->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ;v4l2_ctrl_auto_cluster (2 , &ctrls->auto_gain,0 , true);v4l2_ctrl_auto_cluster (2 , &ctrls->auto_exp,1 , true);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 281/511 media: ov2680: Remove auto-gain and auto-exposure controls
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 7b5a42e6ae71927359ea67a2c22570ba97fa4059 ]
Quoting the OV2680 datasheet:
"3.2 exposure and gain control
In the OV2680, the exposure time and gain are set manually from an external controller. The OV2680 supports manual gain and exposure control only for normal applications, no auto mode."
And indeed testing with the atomisp_ov2680 fork of ov2680.c has shown that auto-exposure and auto-gain do not work.
Note that the code setting the auto-exposure flag was broken, callers of ov2680_exposure_set() were directly passing !!ctrls->auto_exp->val as "bool auto_exp" value, but ctrls->auto_exp is a menu control with:
enum v4l2_exposure_auto_type {
V4L2_EXPOSURE_AUTO = 0,
V4L2_EXPOSURE_MANUAL = 1,
...So instead of passing !!ctrls->auto_exp->val they should have been passing ctrls->auto_exp->val == V4L2_EXPOSURE_AUTO, iow the passed value was inverted of what it should have been.
Also remove ov2680_g_volatile_ctrl() since without auto support the gain and exposure controls are not volatile.
This also fixes the control values not being properly applied in ov2680_mode_set(). The 800x600 mode register-list also sets gain, exposure and vflip overriding the last set ctrl values.
ov2680_mode_set() does call ov2680_gain_set() and ov2680_exposure_set() but did this before writing the mode register-list, so these values would still be overridden by the mode register-list.
Add a v4l2_ctrl_handler_setup() call after writing the mode register-list to restore all ctrl values. Also remove the ctrls->gain->is_new check from ov2680_gain_set() so that the gain always gets restored properly.
Last since ov2680_mode_set() now calls v4l2_ctrl_handler_setup(), remove the v4l2_ctrl_handler_setup() call after ov2680_mode_restore() since ov2680_mode_restore() calls ov2680_mode_set().
--- drivers/media/i2c/ov2680.c | 161 ++++--------------------------------- 1 file changed, 17 insertions(+), 144 deletions(-)
drivers/media/i2c/ov2680.c +17 -144
@@ -85,15 +85,8 @@ struct ov2680_mode_info {struct ov2680_ctrls {struct v4l2_ctrl_handler handler; -struct { -struct v4l2_ctrl *auto_exp; -struct v4l2_ctrl *exposure; - }; -struct { -struct v4l2_ctrl *auto_gain; -struct v4l2_ctrl *gain; - }; - +struct v4l2_ctrl *exposure; +struct v4l2_ctrl *gain;struct v4l2_ctrl *hflip;struct v4l2_ctrl *vflip;struct v4l2_ctrl *test_pattern;
@@ -143,6 +136,7 @@ static const struct reg_value ov2680_setting_30fps_QUXGA_800_600[] = { {0x380e, 0x02}, {0x380f, 0x84}, {0x3811, 0x04}, {0x3813, 0x04}, {0x3814, 0x31}, {0x3815, 0x31}, {0x3820, 0xc0}, {0x4008, 0x00}, {0x4009, 0x03}, {0x4837, 0x1e}, {0x3501, 0x4e}, {0x3502, 0xe0}, + {0x3503, 0x03}, }; static const struct reg_value ov2680_setting_30fps_720P_1280_720[] = {
@@ -405,69 +399,15 @@ static int ov2680_test_pattern_set(struct ov2680_dev *sensor, int value)return 0 ; } -static int ov2680_gain_set (struct ov2680_dev *sensor,bool auto_gain) -{ -struct ov2680_ctrls *ctrls = &sensor->ctrls; -u32 gain; -int ret; - - ret =ov2680_mod_reg (sensor,OV2680_REG_R_MANUAL ,BIT (1 ), - auto_gain ?0 :BIT (1 )); -if (ret <0 ) -return ret; - -if (auto_gain || !ctrls->gain->is_new) -return 0 ; - - gain = ctrls->gain->val; - - ret =ov2680_write_reg16 (sensor,OV2680_REG_GAIN_PK , gain); - -return 0 ; -} - -static int ov2680_gain_get (struct ov2680_dev *sensor) -{ -u32 gain; -int ret; - - ret =ov2680_read_reg16 (sensor,OV2680_REG_GAIN_PK , &gain); -if (ret) -return ret; - -return gain; -} - -static int ov2680_exposure_set (struct ov2680_dev *sensor,bool auto_exp) +static int ov2680_gain_set (struct ov2680_dev *sensor,u32 gain) { -struct ov2680_ctrls *ctrls = &sensor->ctrls; -u32 exp; -int ret; - - ret =ov2680_mod_reg (sensor,OV2680_REG_R_MANUAL ,BIT (0 ), - auto_exp ?0 :BIT (0 )); -if (ret <0 ) -return ret; - -if (auto_exp || !ctrls->exposure->is_new) -return 0 ; - - exp = (u32 )ctrls->exposure->val; - exp <<=4 ; - -return ov2680_write_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , exp); +return ov2680_write_reg16 (sensor,OV2680_REG_GAIN_PK , gain); } -static int ov2680_exposure_get (struct ov2680_dev *sensor) +static int ov2680_exposure_set (struct ov2680_dev *sensor,u32 exp) { -int ret; -u32 exp; - - ret =ov2680_read_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , &exp); -if (ret) -return ret; - -return exp >>4 ; +return ov2680_write_reg24 (sensor,OV2680_REG_EXPOSURE_PK_HIGH , + exp <<4 ); }static int ov2680_stream_enable (struct ov2680_dev *sensor)
@@ -482,33 +422,17 @@ static int ov2680_stream_disable(struct ov2680_dev *sensor)static int ov2680_mode_set (struct ov2680_dev *sensor) { -struct ov2680_ctrls *ctrls = &sensor->ctrls;int ret; - ret =ov2680_gain_set (sensor, false); -if (ret <0 ) -return ret; - - ret =ov2680_exposure_set (sensor, false); + ret =ov2680_load_regs (sensor, sensor->current_mode);if (ret <0 )return ret; - ret =ov2680_load_regs (sensor, sensor->current_mode); +/* Restore value of all ctrls */ + ret =__v4l2_ctrl_handler_setup (&sensor->ctrls.handler);if (ret <0 )return ret; -if (ctrls->auto_gain->val) { - ret =ov2680_gain_set (sensor, true); -if (ret <0 ) -return ret; - } - -if (ctrls->auto_exp->val ==V4L2_EXPOSURE_AUTO ) { - ret =ov2680_exposure_set (sensor, true); -if (ret <0 ) -return ret; - } - sensor->mode_pending_changes = false;return 0 ;
@@ -590,15 +514,10 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on)else ret =ov2680_power_off (sensor); -mutex_unlock (&sensor->lock); - -if (on && ret ==0 ) { - ret =v4l2_ctrl_handler_setup (&sensor->ctrls.handler); -if (ret <0 ) -return ret; - +if (on && ret ==0 ) ret =ov2680_mode_restore (sensor); - } + +mutex_unlock (&sensor->lock);return ret; }
@@ -794,52 +713,19 @@ static int ov2680_enum_frame_interval(struct v4l2_subdev *sd,return 0 ; } -static int ov2680_g_volatile_ctrl (struct v4l2_ctrl *ctrl) -{ -struct v4l2_subdev *sd =ctrl_to_sd (ctrl); -struct ov2680_dev *sensor =to_ov2680_dev (sd); -struct ov2680_ctrls *ctrls = &sensor->ctrls; -int val; - -if (!sensor->is_enabled) -return 0 ; - -switch (ctrl->id) { -case V4L2_CID_GAIN : - val =ov2680_gain_get (sensor); -if (val <0 ) -return val; - ctrls->gain->val = val; -break ; -case V4L2_CID_EXPOSURE : - val =ov2680_exposure_get (sensor); -if (val <0 ) -return val; - ctrls->exposure->val = val; -break ; - } - -return 0 ; -} -static int ov2680_s_ctrl (struct v4l2_ctrl *ctrl) {struct v4l2_subdev *sd =ctrl_to_sd (ctrl);struct ov2680_dev *sensor =to_ov2680_dev (sd); -struct ov2680_ctrls *ctrls = &sensor->ctrls;if (!sensor->is_enabled)return 0 ;switch (ctrl->id) { -case V4L2_CID_AUTOGAIN : -return ov2680_gain_set (sensor, !!ctrl->val);case V4L2_CID_GAIN : -return ov2680_gain_set (sensor, !!ctrls->auto_gain->val); -case V4L2_CID_EXPOSURE_AUTO : -return ov2680_exposure_set (sensor, !!ctrl->val); +return ov2680_gain_set (sensor, ctrl->val);case V4L2_CID_EXPOSURE : -return ov2680_exposure_set (sensor, !!ctrls->auto_exp->val); +return ov2680_exposure_set (sensor, ctrl->val);case V4L2_CID_VFLIP :if (sensor->is_streaming)return -EBUSY ;
@@ -864,7 +750,6 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl) }static const struct v4l2_ctrl_ops ov2680_ctrl_ops = { - .g_volatile_ctrl = ov2680_g_volatile_ctrl, .s_ctrl = ov2680_s_ctrl, };
@@ -936,7 +821,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)if (ret <0 )return ret; -v4l2_ctrl_handler_init (hdl,7 ); +v4l2_ctrl_handler_init (hdl,5 ); hdl->lock = &sensor->lock;
@@ -948,16 +833,9 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)ARRAY_SIZE (test_pattern_menu) -1 , 0, 0, test_pattern_menu); - ctrls->auto_exp =v4l2_ctrl_new_std_menu (hdl, ops, -V4L2_CID_EXPOSURE_AUTO , -V4L2_EXPOSURE_MANUAL ,0 , -V4L2_EXPOSURE_AUTO ); - ctrls->exposure =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_EXPOSURE ,0 ,32767 ,1 ,0 ); - ctrls->auto_gain =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_AUTOGAIN , -0 ,1 ,1 ,1 ); ctrls->gain =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_GAIN ,0 ,2047 ,1 ,0 );if (hdl->error) {
@@ -965,14 +843,9 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) goto cleanup_entity; } - ctrls->gain->flags |=V4L2_CTRL_FLAG_VOLATILE ; - ctrls->exposure->flags |=V4L2_CTRL_FLAG_VOLATILE ; ctrls->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; ctrls->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; -v4l2_ctrl_auto_cluster (2 , &ctrls->auto_gain,0 , true); -v4l2_ctrl_auto_cluster (2 , &ctrls->auto_exp,1 , true); - sensor->sd.ctrl_handler = hdl; ret =v4l2_async_register_subdev (&sensor->sd);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 282/511 media: ov2680: Fix ov2680_bayer_order()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 50a7bad4e0a37d7018ab6fe843dd84bc6b2ecf72 ]
The index into ov2680_hv_flip_bayer_order[] should be 0-3, but ov2680_bayer_order() was using 0 + BIT(2) + (BIT(2) << 1) as max index, while the intention was to use: 0 + 1 + 2 as max index.
Fix the index calculation in ov2680_bayer_order(), while at it also just use the ctrl values rather then reading them back using a slow i2c-read transaction.
This also allows making the function void, since there now are no more i2c-reads to error check.
Note the check for the ctrls being NULL is there to allow adding an ov2680_fill_format() helper later, which will call ov2680_set_bayer_order() during probe() before the ctrls are created.
[Sakari Ailus: Change all users of ov2680_set_bayer_order() here]
--- drivers/media/i2c/ov2680.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)
drivers/media/i2c/ov2680.c +14 -19
@@ -315,26 +315,17 @@ static void ov2680_power_down(struct ov2680_dev *sensor)usleep_range (5000 ,10000 ); } -static int ov2680_bayer_order (struct ov2680_dev *sensor) +static void ov2680_set_bayer_order (struct ov2680_dev *sensor) { -u32 format1; -u32 format2; -u32 hv_flip; -int ret; - - ret =ov2680_read_reg (sensor,OV2680_REG_FORMAT1 , &format1); -if (ret <0 ) -return ret; +int hv_flip =0 ; - ret =ov2680_read_reg (sensor,OV2680_REG_FORMAT2 , &format2); -if (ret <0 ) -return ret; +if (sensor->ctrls.vflip && sensor->ctrls.vflip->val) + hv_flip +=1 ; - hv_flip = (format2 &BIT (2 ) <<1 ) | (format1 &BIT (2 )); +if (sensor->ctrls.hflip && sensor->ctrls.hflip->val) + hv_flip +=2 ; sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip]; - -return 0 ; }static int ov2680_vflip_enable (struct ov2680_dev *sensor)
@@ -345,7 +336,8 @@ static int ov2680_vflip_enable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_vflip_disable (struct ov2680_dev *sensor)
@@ -356,7 +348,8 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_hflip_enable (struct ov2680_dev *sensor)
@@ -367,7 +360,8 @@ static int ov2680_hflip_enable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_hflip_disable (struct ov2680_dev *sensor)
@@ -378,7 +372,8 @@ static int ov2680_hflip_disable(struct ov2680_dev *sensor)if (ret <0 )return ret; -return ov2680_bayer_order (sensor); +ov2680_set_bayer_order (sensor); +return 0 ; }static int ov2680_test_pattern_set (struct ov2680_dev *sensor,int value)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 283/511 media: ov2680: Fix vflip / hflip set functions
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit d5d08ad330c9ccebc5e066fda815423a290f48b0 ]
ov2680_vflip_disable() / ov2680_hflip_disable() pass BIT(0) instead of 0 as value to ov2680_mod_reg().
While fixing this also:
1. Stop having separate enable/disable functions for hflip / vflip
2. Move the is_streaming check, which is unique to hflip / vflip into the ov2680_set_?flip() functions.
for a nice code cleanup.
--- drivers/media/i2c/ov2680.c | 50 +++++++++----------------------------- 1 file changed, 12 insertions(+), 38 deletions(-)
drivers/media/i2c/ov2680.c +12 -38
@@ -328,23 +328,15 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor) sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip]; } -static int ov2680_vflip_enable (struct ov2680_dev *sensor) +static int ov2680_set_vflip (struct ov2680_dev *sensor,s32 val) {int ret; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 ,BIT (2 ),BIT (2 )); -if (ret <0 ) -return ret; - -ov2680_set_bayer_order (sensor); -return 0 ; -} - -static int ov2680_vflip_disable (struct ov2680_dev *sensor) -{ -int ret; +if (sensor->is_streaming) +return -EBUSY ; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 ,BIT (2 ),BIT (0 )); + ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT1 , +BIT (2 ), val ?BIT (2 ) :0 );if (ret <0 )return ret;
@@ -352,23 +344,15 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)return 0 ; } -static int ov2680_hflip_enable (struct ov2680_dev *sensor) +static int ov2680_set_hflip (struct ov2680_dev *sensor,s32 val) {int ret; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 ,BIT (2 ),BIT (2 )); -if (ret <0 ) -return ret; - -ov2680_set_bayer_order (sensor); -return 0 ; -} - -static int ov2680_hflip_disable (struct ov2680_dev *sensor) -{ -int ret; +if (sensor->is_streaming) +return -EBUSY ; - ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 ,BIT (2 ),BIT (0 )); + ret =ov2680_mod_reg (sensor,OV2680_REG_FORMAT2 , +BIT (2 ), val ?BIT (2 ) :0 );if (ret <0 )return ret;
@@ -722,19 +706,9 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_EXPOSURE :return ov2680_exposure_set (sensor, ctrl->val);case V4L2_CID_VFLIP : -if (sensor->is_streaming) -return -EBUSY ; -if (ctrl->val) -return ov2680_vflip_enable (sensor); -else -return ov2680_vflip_disable (sensor); +return ov2680_set_vflip (sensor, ctrl->val);case V4L2_CID_HFLIP : -if (sensor->is_streaming) -return -EBUSY ; -if (ctrl->val) -return ov2680_hflip_enable (sensor); -else -return ov2680_hflip_disable (sensor); +return ov2680_set_hflip (sensor, ctrl->val);case V4L2_CID_TEST_PATTERN :return ov2680_test_pattern_set (sensor, ctrl->val);default :
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 284/511 media: ov2680: Remove VIDEO_V4L2_SUBDEV_API ifdef-s
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 49c282d5a8c5f4d1d9088622bec792294c716010 ]
VIDEO_V4L2_SUBDEV_API is now automatically selected in Kconfig for all sensor drivers. Remove the ifdef CONFIG_VIDEO_V4L2_SUBDEV_API checks.
This is a preparation patch for fixing ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY calls not properly filling in the passed in v4l2_mbus_framefmt struct.
--- drivers/media/i2c/ov2680.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/media/i2c/ov2680.c +2 -14
@@ -562,7 +562,6 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd, {struct ov2680_dev *sensor =to_ov2680_dev (sd);struct v4l2_mbus_framefmt *fmt =NULL ; -int ret =0 ;if (format->pad !=0 )return -EINVAL ;
@@ -570,22 +569,17 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd,mutex_lock (&sensor->lock);if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API fmt =v4l2_subdev_get_try_format (&sensor->sd, sd_state, format->pad); -#else - ret = -EINVAL ; -#endif }else { fmt = &sensor->fmt; } -if (fmt) - format->format = *fmt; + format->format = *fmt;mutex_unlock (&sensor->lock); -return ret; +return 0 ; } static int ov2680_set_fmt(struct v4l2_subdev *sd,
@@ -594,9 +588,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, {struct ov2680_dev *sensor =to_ov2680_dev (sd);struct v4l2_mbus_framefmt *fmt = &format->format; -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API struct v4l2_mbus_framefmt *try_fmt; -#endif const struct ov2680_mode_info *mode;int ret =0 ;
@@ -619,10 +611,8 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, }if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API try_fmt =v4l2_subdev_get_try_format (sd, sd_state,0 ); format->format = *try_fmt; -#endif goto unlock; }
@@ -780,9 +770,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)v4l2_i2c_subdev_init (&sensor->sd, sensor->i2c_client, &ov2680_subdev_ops); -#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API sensor->sd.flags =V4L2_SUBDEV_FL_HAS_DEVNODE ; -#endif sensor->pad.flags =MEDIA_PAD_FL_SOURCE ; sensor->sd.entity.function =MEDIA_ENT_F_CAM_SENSOR ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 285/511 media: ov2680: Dont take the lock for try_fmt calls
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit e521b9cc1a49de677f4fc65909ce4877fbf7b113 ]
On ov2680_set_fmt() calls with format->which == V4L2_SUBDEV_FORMAT_TRY, ov2680_set_fmt() does not talk to the sensor.
So in this case there is no need to lock the sensor->lock mutex or to check that the sensor is streaming.
--- drivers/media/i2c/ov2680.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/media/i2c/ov2680.c +9 -11
@@ -595,24 +595,22 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,if (format->pad !=0 )return -EINVAL ; -mutex_lock (&sensor->lock); - -if (sensor->is_streaming) { - ret = -EBUSY ; - goto unlock; - } - mode =v4l2_find_nearest_size (ov2680_mode_data,ARRAY_SIZE (ov2680_mode_data), width, height, fmt->width, fmt->height); -if (!mode) { - ret = -EINVAL ; - goto unlock; - } +if (!mode) +return -EINVAL ;if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { try_fmt =v4l2_subdev_get_try_format (sd, sd_state,0 ); format->format = *try_fmt; +return 0 ; + } + +mutex_lock (&sensor->lock); + +if (sensor->is_streaming) { + ret = -EBUSY ; goto unlock; }
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 286/511 media: ov2680: Add ov2680_fill_format() helper function
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 6d6849b2203f3244b575ba01d3e41ee19aa2cadf ]
Add a ov2680_fill_format() helper function and use this everywhere were a v4l2_mbus_framefmt struct needs to be filled in so that the driver always fills it consistently.
This is a preparation patch for fixing ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY calls not properly filling in the passed in v4l2_mbus_framefmt struct.
Note that for ov2680_init_cfg() this now simply always fills the try_fmt struct of the passed in sd_state. This is correct because ov2680_init_cfg() is never called with a NULL sd_state so the old sd_state check is not necessary.
--- drivers/media/i2c/ov2680.c | 49 +++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/media/i2c/ov2680.c +27 -22
@@ -54,6 +54,9 @@#define OV2680_WIDTH_MAX 1600#define OV2680_HEIGHT_MAX 1200 +#define OV2680_DEFAULT_WIDTH 800 +#define OV2680_DEFAULT_HEIGHT 600 +enum ov2680_mode_id {OV2680_MODE_QUXGA_800_600 ,OV2680_MODE_720P_1280_720 ,
@@ -315,7 +318,8 @@ static void ov2680_power_down(struct ov2680_dev *sensor)usleep_range (5000 ,10000 ); } -static void ov2680_set_bayer_order (struct ov2680_dev *sensor) +static void ov2680_set_bayer_order (struct ov2680_dev *sensor, +struct v4l2_mbus_framefmt *fmt) {int hv_flip =0 ;
@@ -325,7 +329,19 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor)if (sensor->ctrls.hflip && sensor->ctrls.hflip->val) hv_flip +=2 ; - sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip]; + fmt->code = ov2680_hv_flip_bayer_order[hv_flip]; +} + +static void ov2680_fill_format (struct ov2680_dev *sensor, +struct v4l2_mbus_framefmt *fmt, +unsigned int width,unsigned int height) +{ +memset (fmt,0 ,sizeof (*fmt)); + fmt->width = width; + fmt->height = height; + fmt->field =V4L2_FIELD_NONE ; + fmt->colorspace =V4L2_COLORSPACE_SRGB ; +ov2680_set_bayer_order (sensor, fmt); }static int ov2680_set_vflip (struct ov2680_dev *sensor,s32 val)
@@ -340,7 +356,7 @@ static int ov2680_set_vflip(struct ov2680_dev *sensor, s32 val)if (ret <0 )return ret; -ov2680_set_bayer_order (sensor); +ov2680_set_bayer_order (sensor, &sensor->fmt);return 0 ; }
@@ -356,7 +372,7 @@ static int ov2680_set_hflip(struct ov2680_dev *sensor, s32 val)if (ret <0 )return ret; -ov2680_set_bayer_order (sensor); +ov2680_set_bayer_order (sensor, &sensor->fmt);return 0 ; }
@@ -614,10 +630,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, goto unlock; } - fmt->width = mode->width; - fmt->height = mode->height; - fmt->code = sensor->fmt.code; - fmt->colorspace = sensor->fmt.colorspace; +ov2680_fill_format (sensor, fmt, mode->width, mode->height); sensor->current_mode = mode; sensor->fmt = format->format;
@@ -632,16 +645,11 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,static int ov2680_init_cfg (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state) { -struct v4l2_subdev_format fmt = { - .which = sd_state ?V4L2_SUBDEV_FORMAT_TRY - :V4L2_SUBDEV_FORMAT_ACTIVE , - .format = { - .width =800 , - .height =600 , - } - }; +struct ov2680_dev *sensor =to_ov2680_dev (sd); -return ov2680_set_fmt (sd, sd_state, &fmt); +ov2680_fill_format (sensor, &sd_state->pads[0 ].try_fmt, +OV2680_DEFAULT_WIDTH ,OV2680_DEFAULT_HEIGHT ); +return 0 ; } static int ov2680_enum_frame_size(struct v4l2_subdev *sd,
@@ -740,11 +748,8 @@ static int ov2680_mode_init(struct ov2680_dev *sensor)const struct ov2680_mode_info *init_mode;/* set initial mode */ - sensor->fmt.code =MEDIA_BUS_FMT_SBGGR10_1X10 ; - sensor->fmt.width =800 ; - sensor->fmt.height =600 ; - sensor->fmt.field =V4L2_FIELD_NONE ; - sensor->fmt.colorspace =V4L2_COLORSPACE_SRGB ; +ov2680_fill_format (sensor, &sensor->fmt, +OV2680_DEFAULT_WIDTH ,OV2680_DEFAULT_HEIGHT ); sensor->frame_interval.denominator =OV2680_FRAME_RATE ; sensor->frame_interval.numerator =1 ;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 287/511 media: ov2680: Fix ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY not working
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit c0e97a4b4f20639f74cd5809b42ba6cbf9736a7d ]
ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY was getting the try_fmt v4l2_mbus_framefmt struct from the passed in sd_state and then storing the contents of that into the return by reference format->format struct.
While the right thing to do would be filling format->format based on the just looked up mode and then store the results of that in sd_state->pads[0].try_fmt .
Before the previous change introducing ov2680_fill_format() this resulted in ov2680_set_fmt() which == V4L2_SUBDEV_FORMAT_TRY always returning the zero-ed out sd_state->pads[0].try_fmt in format->format breaking callers using this.
After the introduction of ov2680_fill_format() which at least initializes sd_state->pads[0].try_fmt properly, format->format is now always being filled with the default 800x600 mode set by ov2680_init_cfg() independent of the actual requested mode.
Move the filling of format->format with ov2680_fill_format() to before the if (which == V4L2_SUBDEV_FORMAT_TRY) and then store the filled in format->format in sd_state->pads[0].try_fmt to fix this.
Note this removes the fmt local variable because IMHO having a local variable which points to a sub-struct of one of the function arguments just leads to confusion when reading the code.
--- drivers/media/i2c/ov2680.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/media/i2c/ov2680.c +7 -6
@@ -603,7 +603,6 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_format *format) {struct ov2680_dev *sensor =to_ov2680_dev (sd); -struct v4l2_mbus_framefmt *fmt = &format->format;struct v4l2_mbus_framefmt *try_fmt;const struct ov2680_mode_info *mode;int ret =0 ;
@@ -612,14 +611,18 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,return -EINVAL ; mode =v4l2_find_nearest_size (ov2680_mode_data, -ARRAY_SIZE (ov2680_mode_data), width, - height, fmt->width, fmt->height); +ARRAY_SIZE (ov2680_mode_data), + width, height, + format->format.width, + format->format.height);if (!mode)return -EINVAL ; +ov2680_fill_format (sensor, &format->format, mode->width, mode->height); +if (format->which ==V4L2_SUBDEV_FORMAT_TRY ) { try_fmt =v4l2_subdev_get_try_format (sd, sd_state,0 ); - format->format = *try_fmt; + *try_fmt = format->format;return 0 ; }
@@ -630,8 +633,6 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, goto unlock; } -ov2680_fill_format (sensor, fmt, mode->width, mode->height); - sensor->current_mode = mode; sensor->fmt = format->format; sensor->mode_pending_changes = true;
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 288/511 media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 84b4bd7e0d98166aa32fd470e672721190492eae ]
When the ov2680_power_on() "sensor soft reset failed" path is hit during probe() the WARN() about putting an enabled regulator at drivers/regulator/core.c:2398 triggers 3 times (once for each regulator), filling dmesg with backtraces.
Fix this by properly disabling the regulators on ov2680_power_on() errors.
--- drivers/media/i2c/ov2680.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2680.c +6 -2
@@ -475,7 +475,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) ret =ov2680_write_reg (sensor,OV2680_REG_SOFT_RESET ,0x01 );if (ret !=0 ) {dev_err (dev,"sensor soft reset failed\n" ); -return ret; + goto err_disable_regulators; }usleep_range (1000 ,2000 ); }else {
@@ -485,7 +485,7 @@ static int ov2680_power_on(struct ov2680_dev *sensor) ret =clk_prepare_enable (sensor->xvclk);if (ret <0 ) -return ret; + goto err_disable_regulators; sensor->is_enabled = true;
@@ -495,6 +495,10 @@ static int ov2680_power_on(struct ov2680_dev *sensor)ov2680_stream_disable (sensor);return 0 ; + +err_disable_regulators: +regulator_bulk_disable (OV2680_NUM_SUPPLIES , sensor->supplies); +return ret; }static int ov2680_s_power (struct v4l2_subdev *sd,int on)
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 289/511 media: i2c: rdacm21: Fix uninitialized value
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacopo Mondi <[email protected]>
[ Upstream commit 33c7ae8f49e3413c81e879e1fdfcea4c5516e37b ]
Fix the following smatch warning:
drivers/media/i2c/rdacm21.c:373 ov10640_check_id() error: uninitialized symbol 'val'.
Initialize 'val' to 0 in the ov10640_check_id() function.
--- drivers/media/i2c/rdacm21.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/rdacm21.c +1 -1
@@ -351,7 +351,7 @@ static void ov10640_power_up(struct rdacm21_device *dev)static int ov10640_check_id (struct rdacm21_device *dev) {unsigned int i; -u8 val; +u8 val =0 ;/* Read OV10640 ID to test communications. */ for (i =0 ; i <OV10640_PID_TIMEOUT ; ++i) {
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 290/511 cgroup:namespace: Remove unused cgroup_namespaces_init()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lu Jialin <[email protected]>
[ Upstream commit 82b90b6c5b38e457c7081d50dff11ecbafc1e61a ]
cgroup_namspace_init() just return 0. Therefore, there is no need to call it during start_kernel. Just remove it.
--- kernel/cgroup/namespace.c | 6 ------ 1 file changed, 6 deletions(-)
kernel/cgroup/namespace.c +0 -6
@@ -149,9 +149,3 @@ const struct proc_ns_operations cgroupns_operations = { .install = cgroupns_install, .owner = cgroupns_owner, }; - -static __init int cgroup_namespaces_init (void ) -{ -return 0 ; -} -subsys_initcall (cgroup_namespaces_init);
Signature · 1 line
2.40.1
Greg Kroah-Hartman
maintainerPATCH 291/511 scsi: core: Use 32-bit hostnum in scsi_host_lookup()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Battersby <[email protected]>
[ Upstream commit 62ec2092095b678ff89ce4ba51c2938cd1e8e630 ]
Change scsi_host_lookup() hostnum argument type from unsigned short to unsigned int to match the type used everywhere else.
--- drivers/scsi/hosts.c | 4 ++-- include/scsi/scsi_host.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/hosts.c +2 -2
@@ -518,7 +518,7 @@ EXPORT_SYMBOL(scsi_host_alloc);static int __scsi_host_match (struct device *dev,const void *data) {struct Scsi_Host *p; -const unsigned short *hostnum = data; +const unsigned int *hostnum = data; p =class_to_shost (dev);return p->host_no == *hostnum;
@@ -535,7 +535,7 @@ static int __scsi_host_match(struct device *dev, const void *data)* that scsi_host_get() took. The put_device() below dropped * the reference from class_find_device(). **/ -struct Scsi_Host *scsi_host_lookup (unsigned short hostnum) +struct Scsi_Host *scsi_host_lookup (unsigned int hostnum) {struct device *cdev;struct Scsi_Host *shost =NULL ;
include/scsi/scsi_host.h +1 -1
@@ -762,7 +762,7 @@ extern void scsi_remove_host(struct Scsi_Host *);extern struct Scsi_Host *scsi_host_get (struct Scsi_Host *);extern int scsi_host_busy (struct Scsi_Host *shost);extern void scsi_host_put (struct Scsi_Host *t); -extern struct Scsi_Host *scsi_host_lookup (unsigned short ); +extern struct Scsi_Host *scsi_host_lookup (unsigned int hostnum);extern const char *scsi_host_state_name (enum scsi_host_state );extern void scsi_host_complete_all_commands (struct Scsi_Host *shost,enum scsi_host_status status);
Signature · 1 line
2.40.1