ARM: dts: gemini: add device_type on pci
Subsystems (5)
Sasha Levin
maintainerPATCH 1/28 ARM: dts: gemini: add device_type on pci
From: Corentin Labbe <[email protected]>
[ Upstream commit 483f3645b3f7acfd1c78a19d51b80c0656161974 ]
Fixes DT warning on pci node by adding the missing device_type.
--- arch/arm/boot/dts/gemini.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/gemini.dtsi +1 -0
@@ -275,6 +275,7 @@ pci@50000000 { clock-names = "PCLK", "PCICLK"; pinctrl-names = "default"; pinctrl-0 = <&pci_default_pins>; + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 2/28 ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
From: Johan Jonker <[email protected]>
[ Upstream commit dfbfb86a43f9a5bbd166d88bca9e07ee4e1bff31 ]
A test with the command below aimed at powerpc generates notifications in the Rockchip ARM tree.
Fix pinctrl "sleep" nodename by renaming it to "suspend" for rk3036-kylin and rk3288
make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml
--- arch/arm/boot/dts/rk3036-kylin.dts | 2 +- arch/arm/boot/dts/rk3288.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3036-kylin.dts +1 -1
@@ -424,7 +424,7 @@ sdmmc_pwr: sdmmc-pwr { }; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; };
arch/arm/boot/dts/rk3288.dtsi +1 -1
@@ -1453,7 +1453,7 @@ pcfg_pull_none_12ma: pcfg-pull-none-12ma { drive-strength = <12>; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 3/28 arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi
In reply to Sasha LevinFrom: Johan Jonker <[email protected]>
[ Upstream commit a7ecfad495f8af63a5cb332c91f60ab2018897f5 ]
A test with the command below aimed at powerpc generates notifications in the Rockchip arm64 tree.
Fix pinctrl "sleep" nodename by renaming it to "suspend" for rk3399.dtsi
make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -2074,7 +2074,7 @@ sdmmc_wp: sdmmc-wp { }; }; - sleep { + suspend { ap_pwroff: ap-pwroff { rockchip,pins = <1 5 RK_FUNC_1 &pcfg_pull_none>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 4/28 ARM: dts: rockchip: Fix the timer clocks order
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 7b46d674ac000b101fdad92cf16cc11d90b72f86 ]
Fixed order is the device-tree convention. The timer driver currently gets clocks by name, so no changes are needed there.
--- arch/arm/boot/dts/rk3188.dtsi | 8 ++++---- arch/arm/boot/dts/rk3288.dtsi | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/rk3188.dtsi +4 -4
@@ -110,16 +110,16 @@ timer3: timer@2000e000 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x2000e000 0x20>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>; + clock-names = "pclk", "timer"; }; timer6: timer@200380a0 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x200380a0 0x20>; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>; + clock-names = "pclk", "timer"; }; i2s0: i2s@1011a000 {
arch/arm/boot/dts/rk3288.dtsi +2 -2
@@ -220,8 +220,8 @@ timer: timer@ff810000 { compatible = "rockchip,rk3288-timer"; reg = <0x0 0xff810000 0x0 0x20>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&xin24m>, <&cru PCLK_TIMER>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER>, <&xin24m>; + clock-names = "pclk", "timer"; }; display-subsystem {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 5/28 ARM: dts: rockchip: Fix power-controller node names for rk3288
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit 970cdc53cb1afa73602028c103dbfb6a230080be ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm/boot/dts/rk3288.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +4 -4
@@ -745,7 +745,7 @@ power: power-controller { * *_HDMI HDMI * *_MIPI_* MIPI */ - pd_vio@RK3288_PD_VIO { + power-domain@RK3288_PD_VIO { reg = <RK3288_PD_VIO>; clocks = <&cru ACLK_IEP>, <&cru ACLK_ISP>,
@@ -787,7 +787,7 @@ pd_vio@RK3288_PD_VIO { * Note: The following 3 are HEVC(H.265) clocks, * and on the ACLK_HEVC_NIU (NOC). */ - pd_hevc@RK3288_PD_HEVC { + power-domain@RK3288_PD_HEVC { reg = <RK3288_PD_HEVC>; clocks = <&cru ACLK_HEVC>, <&cru SCLK_HEVC_CABAC>,
@@ -801,7 +801,7 @@ pd_hevc@RK3288_PD_HEVC { * (video endecoder & decoder) clocks that on the * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC). */ - pd_video@RK3288_PD_VIDEO { + power-domain@RK3288_PD_VIDEO { reg = <RK3288_PD_VIDEO>; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
@@ -812,7 +812,7 @@ pd_video@RK3288_PD_VIDEO { * Note: ACLK_GPU is the GPU clock, * and on the ACLK_GPU_NIU (NOC). */ - pd_gpu@RK3288_PD_GPU { + power-domain@RK3288_PD_GPU { reg = <RK3288_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu_r>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 6/28 arm64: dts: rockchip: Fix power-controller node names for rk3328
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit 6e6a282b49c6db408d27231e3c709fbdf25e3c1b ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +3 -3
@@ -289,13 +289,13 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_hevc@RK3328_PD_HEVC { + power-domain@RK3328_PD_HEVC { reg = <RK3328_PD_HEVC>; }; - pd_video@RK3328_PD_VIDEO { + power-domain@RK3328_PD_VIDEO { reg = <RK3328_PD_VIDEO>; }; - pd_vpu@RK3328_PD_VPU { + power-domain@RK3328_PD_VPU { reg = <RK3328_PD_VPU>; }; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 7/28 reset: ti-syscon: fix to_ti_syscon_reset_data macro
In reply to Sasha LevinFrom: Philipp Zabel <[email protected]>
[ Upstream commit 05cf8fffcdeb47aef1203c08cbec5224fd3a0e1c ]
The to_ti_syscon_reset_data macro currently only works if the parameter passed into it is called 'rcdev'.
Fixes a checkpatch --strict issue:
CHECK: Macro argument reuse 'rcdev' - possible side-effects? #53: FILE: drivers/reset/reset-ti-syscon.c:53:
+#define to_ti_syscon_reset_data(rcdev) \
+ container_of(rcdev, struct ti_syscon_reset_data, rcdev)
--- drivers/reset/reset-ti-syscon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/reset/reset-ti-syscon.c +2 -2
@@ -58,8 +58,8 @@ struct ti_syscon_reset_data {unsigned int nr_controls; }; -#define to_ti_syscon_reset_data (rcdev) \ - container_of(rcdev, struct ti_syscon_reset_data, rcdev) +#define to_ti_syscon_reset_data (_rcdev) \ + container_of(_rcdev, struct ti_syscon_reset_data, rcdev)/** * ti_syscon_reset_assert() - assert device reset
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 8/28 ARM: brcmstb: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 ++-- arch/arm/boot/dts/bcm7445.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +2 -2
@@ -14,10 +14,10 @@ memory { }; }; -&nand { +&nand_controller { status = "okay"; - nandcs@1 { + nand@1 { compatible = "brcm,nandcs"; reg = <1>; nand-ecc-step-size = <512>;
arch/arm/boot/dts/bcm7445.dtsi +1 -1
@@ -150,7 +150,7 @@ aon-ctrl@410000 { reg-names = "aon-ctrl", "aon-sram"; }; - nand: nand@3e2800 { + nand_controller: nand-controller@3e2800 { status = "disabled"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 9/28 ARM: Cygnus: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++-- arch/arm/boot/dts/bcm958300k.dts | 4 ++-- arch/arm/boot/dts/bcm958305k.dts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +1 -1
@@ -446,7 +446,7 @@ sdhci1: sdhci@18043000 { status = "disabled"; }; - nand: nand@18046000 { + nand_controller: nand-controller@18046000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>;
arch/arm/boot/dts/bcm911360_entphn.dts +2 -2
@@ -84,8 +84,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958300k.dts +2 -2
@@ -60,8 +60,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958305k.dts +2 -2
@@ -68,8 +68,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 10/28 ARM: NSP: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958522er.dts | 4 ++-- arch/arm/boot/dts/bcm958525er.dts | 4 ++-- arch/arm/boot/dts/bcm958525xmc.dts | 4 ++-- arch/arm/boot/dts/bcm958622hr.dts | 4 ++-- arch/arm/boot/dts/bcm958623hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625k.dts | 4 ++-- arch/arm/boot/dts/bcm988312hr.dts | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -259,7 +259,7 @@ mailbox: mailbox@25c00 { dma-coherent; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x026000 0x600>, <0x11b408 0x600>,
arch/arm/boot/dts/bcm958522er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525xmc.dts +2 -2
@@ -90,8 +90,8 @@ rtc@68 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958622hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958623hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625hr.dts +2 -2
@@ -76,8 +76,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625k.dts +2 -2
@@ -69,8 +69,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm988312hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 11/28 ARM: dts: BCM63xx: Fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm63138.dtsi | 2 +- arch/arm/boot/dts/bcm963138dvt.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm63138.dtsi +1 -1
@@ -175,7 +175,7 @@ serial1: serial@620 { status = "disabled"; }; - nand: nand@2000 { + nand_controller: nand-controller@2000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
arch/arm/boot/dts/bcm963138dvt.dts +2 -2
@@ -30,10 +30,10 @@ &serial1 { status = "okay"; }; -&nand { +&nand_controller { status = "okay"; - nandcs@0 { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-ecc-strength = <4>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 12/28 ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit e0cdd26af8eb9001689a4cde4f72c61c1c4b06be ]
The pinfunc definitions used GPIO_A as function instead of GPIO_1_0 as done for all the other pins with GPIO functionality. Fix for consistency.
There are no mainline users that needs adaption.
--- arch/arm/boot/dts/imx25-pinfunc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx25-pinfunc.h +6 -6
@@ -544,31 +544,31 @@#define MX25_PAD_DE_B__DE_B 0x1f0 0x3ec 0x000 0x00 0x000#define MX25_PAD_DE_B__GPIO_2_20 0x1f0 0x3ec 0x000 0x05 0x000 -#define MX25_PAD_GPIO_A__GPIO_A 0x1f4 0x3f0 0x000 0x00 0x000 +#define MX25_PAD_GPIO_A__GPIO_1_0 0x1f4 0x3f0 0x000 0x00 0x000#define MX25_PAD_GPIO_A__CAN1_TX 0x1f4 0x3f0 0x000 0x06 0x000#define MX25_PAD_GPIO_A__USBOTG_PWR 0x1f4 0x3f0 0x000 0x02 0x000 -#define MX25_PAD_GPIO_B__GPIO_B 0x1f8 0x3f4 0x000 0x00 0x000 +#define MX25_PAD_GPIO_B__GPIO_1_1 0x1f8 0x3f4 0x000 0x00 0x000#define MX25_PAD_GPIO_B__USBOTG_OC 0x1f8 0x3f4 0x57c 0x02 0x001#define MX25_PAD_GPIO_B__CAN1_RX 0x1f8 0x3f4 0x480 0x06 0x001 -#define MX25_PAD_GPIO_C__GPIO_C 0x1fc 0x3f8 0x000 0x00 0x000 +#define MX25_PAD_GPIO_C__GPIO_1_2 0x1fc 0x3f8 0x000 0x00 0x000#define MX25_PAD_GPIO_C__PWM4_PWMO 0x1fc 0x3f8 0x000 0x01 0x000#define MX25_PAD_GPIO_C__I2C2_SCL 0x1fc 0x3f8 0x51c 0x02 0x001#define MX25_PAD_GPIO_C__KPP_COL4 0x1fc 0x3f8 0x52c 0x03 0x001#define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000 -#define MX25_PAD_GPIO_D__GPIO_D 0x200 0x3fc 0x000 0x00 0x000 +#define MX25_PAD_GPIO_D__GPIO_1_3 0x200 0x3fc 0x000 0x00 0x000#define MX25_PAD_GPIO_D__I2C2_SDA 0x200 0x3fc 0x520 0x02 0x001#define MX25_PAD_GPIO_D__CAN2_RX 0x200 0x3fc 0x484 0x06 0x001 -#define MX25_PAD_GPIO_E__GPIO_E 0x204 0x400 0x000 0x00 0x000 +#define MX25_PAD_GPIO_E__GPIO_1_4 0x204 0x400 0x000 0x00 0x000#define MX25_PAD_GPIO_E__I2C3_CLK 0x204 0x400 0x524 0x01 0x002#define MX25_PAD_GPIO_E__LD16 0x204 0x400 0x000 0x02 0x000#define MX25_PAD_GPIO_E__AUD7_TXD 0x204 0x400 0x000 0x04 0x000#define MX25_PAD_GPIO_E__UART4_RXD 0x204 0x400 0x570 0x06 0x002 -#define MX25_PAD_GPIO_F__GPIO_F 0x208 0x404 0x000 0x00 0x000 +#define MX25_PAD_GPIO_F__GPIO_1_5 0x208 0x404 0x000 0x00 0x000#define MX25_PAD_GPIO_F__LD17 0x208 0x404 0x000 0x02 0x000#define MX25_PAD_GPIO_F__AUD7_TXC 0x208 0x404 0x000 0x04 0x000#define MX25_PAD_GPIO_F__UART4_TXD 0x208 0x404 0x000 0x06 0x000
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 13/28 ARM: dts: imx6: phyFLEX: Fix UART hardware flow control
In reply to Sasha LevinFrom: Primoz Fiser <[email protected]>
[ Upstream commit 14cdc1f243d79e0b46be150502b7dba9c5a6bdfd ]
Serial interface uart3 on phyFLEX board is capable of 5-wire connection including signals RTS and CTS for hardware flow control.
Fix signals UART3_CTS_B and UART3_RTS_B padmux assignments and add missing property "uart-has-rtscts" to allow serial interface to be configured and used with the hardware flow control.
--- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +3 -2
@@ -306,8 +306,8 @@ pinctrl_uart3: uart3grp { fsl,pins = < MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 - MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1 - MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1 >; };
@@ -394,6 +394,7 @@ ®_soc { &uart3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; + uart-has-rtscts; status = "disabled"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 14/28 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info
In reply to Sasha LevinFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 89b759469d525f4d5f9c29cd3b1f490311c67f85 ]
The name of the struct, as defined in arch/arm/mach-imx/pm-imx5.c, is imx5_cpu_suspend_info.
--- arch/arm/mach-imx/suspend-imx53.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/suspend-imx53.S +2 -2
@@ -33,11 +33,11 @@ * ^ * ^ * imx53_suspend code - * PM_INFO structure(imx53_suspend_info) + * PM_INFO structure(imx5_cpu_suspend_info) * ======================== low address ======================= */ -/* Offsets of members of struct imx53_suspend_info */ +/* Offsets of members of struct imx5_cpu_suspend_info */ #define SUSPEND_INFO_MX53_M4IF_V_OFFSET 0x0 #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET 0x4 #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET 0x8
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 15/28 ARM: dts: am335x: align GPIO hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +- arch/arm/boot/dts/am335x-boneblue.dts | 2 +- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++-- arch/arm/boot/dts/am335x-icev2.dts | 4 ++-- arch/arm/boot/dts/am335x-shc.dts | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/am335x-boneblack-wireless.dts +1 -1
@@ -105,7 +105,7 @@ bluetooth { }; &gpio3 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
arch/arm/boot/dts/am335x-boneblue.dts +1 -1
@@ -451,7 +451,7 @@ &rtc { }; &gpio3 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
arch/arm/boot/dts/am335x-bonegreen-wireless.dts +2 -2
@@ -105,7 +105,7 @@ bluetooth { }; &gpio1 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <29 GPIO_ACTIVE_HIGH>; output-high;
@@ -122,7 +122,7 @@ ls_buf_en { /* an external pulldown on U21 pin 4. */ &gpio3 { - bt_aud_in { + bt-aud-in-hog { gpio-hog; gpios = <16 GPIO_ACTIVE_HIGH>; output-low;
arch/arm/boot/dts/am335x-icev2.dts +2 -2
@@ -448,14 +448,14 @@ &uart3 { }; &gpio3 { - p4 { + pr1-mii-ctl-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high; line-name = "PR1_MII_CTRL"; }; - p10 { + mux-mii-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
arch/arm/boot/dts/am335x-shc.dts +4 -4
@@ -146,14 +146,14 @@ ehrpwm1: pwm@48302200 { }; &gpio1 { - hmtc_rst { + hmtc-rst-hog { gpio-hog; gpios = <24 GPIO_ACTIVE_LOW>; output-high; line-name = "homematic_reset"; }; - hmtc_prog { + hmtc-prog-hog { gpio-hog; gpios = <27 GPIO_ACTIVE_LOW>; output-high;
@@ -162,14 +162,14 @@ hmtc_prog { }; &gpio3 { - zgb_rst { + zgb-rst-hog { gpio-hog; gpios = <18 GPIO_ACTIVE_LOW>; output-low; line-name = "zigbee_reset"; }; - zgb_boot { + zgb-boot-hog { gpio-hog; gpios = <19 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 16/28 ARM: dts: am437x: align gpio hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++-- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/am437x-gp-evm.dts +2 -2
@@ -696,7 +696,7 @@ &gpio0 { pinctrl-0 = <&gpio0_pins>; status = "okay"; - p23 { + sel-emmc-nand-hog { gpio-hog; gpios = <23 GPIO_ACTIVE_HIGH>; /* SelEMMCorNAND selects between eMMC and NAND:
@@ -729,7 +729,7 @@ &gpio5 { status = "okay"; ti,no-reset-on-init; - p8 { + sel-lcd-hdmi-hog { /* * SelLCDorHDMI selects between display and audio paths: * Low: HDMI display with audio via HDMI
arch/arm/boot/dts/am43x-epos-evm.dts +1 -1
@@ -527,7 +527,7 @@ &gpio2 { pinctrl-0 = <&display_mux_pins>; status = "okay"; - p1 { + sel-lcd-hdmi-hog { /* * SelLCDorHDMI selects between display and audio paths: * Low: HDMI display with audio via HDMI
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 17/28 ARM: dts: omap5-board-common: align gpio hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 4823117cb80eedf31ddbc126b9bd92e707bd9a26 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap5-board-common.dtsi +1 -1
@@ -146,7 +146,7 @@ sound: sound { &gpio8 { /* TI trees use GPIO instead of msecure, see also muxing */ - p234 { + msecure-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 18/28 ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/dra7-evm.dts | 2 +- arch/arm/boot/dts/dra71-evm.dts | 2 +- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +- arch/arm/boot/dts/dra76-evm.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/dra7-evm.dts +1 -1
@@ -315,7 +315,7 @@ pcf_hdmi: gpio@26 { reg = <0x26>; gpio-controller; #gpio-cells = <2>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/dra71-evm.dts +1 -1
@@ -160,7 +160,7 @@ &pcf_gpio_21 { }; &pcf_hdmi { - p0 { + hdmi-i2c-disable-hog { /* * PM_OEn to High: Disable routing I2C3 to PM_I2C * With this PM_SEL(p3) should not matter
arch/arm/boot/dts/dra72-evm-common.dtsi +1 -1
@@ -272,7 +272,7 @@ pcf_hdmi: pcf8575@26 { */ lines-initial-states = <0x0f2b>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/dra76-evm.dts +1 -1
@@ -314,7 +314,7 @@ pcf_hdmi: pcf8575@26 { reg = <0x26>; gpio-controller; #gpio-cells = <2>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 19/28 ARM: dts: stm32: fix RCC node name on stm32f429 MCU
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit e4b948415a89a219d13e454011cdcf9e63ecc529 ]
This prevent warning observed with "make dtbs_check W=1"
Warning (simple_bus_reg): /soc/rcc@40023810: simple-bus unit address format error, expected "40023800"
--- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32f429.dtsi +1 -1
@@ -597,7 +597,7 @@ crc: crc@40023000 { status = "disabled"; }; - rcc: rcc@40023810 { + rcc: rcc@40023800 { #reset-cells = <1>; #clock-cells = <2>; compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 20/28 arm64: dts: juno: Update SCPI nodes as per the YAML schema
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit 70010556b158a0fefe43415fb0c58347dcce7da0 ]
The SCPI YAML schema expects standard node names for clocks and power domain controllers. Fix those as per the schema for Juno platforms.
--- arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/arm/juno-base.dtsi +3 -3
@@ -513,13 +513,13 @@ scpi { clocks { compatible = "arm,scpi-clocks"; - scpi_dvfs: scpi-dvfs { + scpi_dvfs: clocks-0 { compatible = "arm,scpi-dvfs-clocks"; #clock-cells = <1>; clock-indices = <0>, <1>, <2>; clock-output-names = "atlclk", "aplclk","gpuclk"; }; - scpi_clk: scpi-clk { + scpi_clk: clocks-1 { compatible = "arm,scpi-variable-clocks"; #clock-cells = <1>; clock-indices = <3>;
@@ -527,7 +527,7 @@ scpi_clk: scpi-clk { }; }; - scpi_devpd: scpi-power-domains { + scpi_devpd: power-controller { compatible = "arm,scpi-power-domains"; num-domains = <2>; #power-domain-cells = <1>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 21/28 arm64: dts: ls208xa: remove bus-num from dspi node
In reply to Sasha LevinFrom: Mian Yousaf Kaukab <[email protected]>
[ Upstream commit 8240c972c1798ea013cbb407722295fc826b3584 ]
On LS2088A-RDB board, if the spi-fsl-dspi driver is built as module then its probe fails with the following warning:
[ 10.471363] couldn't get idr [ 10.471381] WARNING: CPU: 4 PID: 488 at drivers/spi/spi.c:2689 spi_register_controller+0x73c/0x8d0 ... [ 10.471651] fsl-dspi 2100000.spi: Problem registering DSPI ctlr [ 10.471708] fsl-dspi: probe of 2100000.spi failed with error -16
Reason for the failure is that bus-num property is set for dspi node. However, bus-num property is not set for the qspi node. If probe for spi-fsl-qspi happens first then id 0 is dynamically allocated to it. Call to spi_register_controller() from spi-fsl-dspi driver then fails. Since commit 29d2daf2c33c ("spi: spi-fsl-dspi: Make bus-num property optional") bus-num property is optional. Remove bus-num property from dspi node to fix the issue.
--- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +0 -1
@@ -515,7 +515,6 @@ dspi: dspi@2100000 { clocks = <&clockgen 4 3>; clock-names = "dspi"; spi-num-chipselects = <5>; - bus-num = <0>; }; esdhc: esdhc@2140000 {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 22/28 thermal/core: Correct function name thermal_zone_device_unregister()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit a052b5118f13febac1bd901fe0b7a807b9d6b51c ]
Fix the following make W=1 kernel build warning:
drivers/thermal/thermal_core.c:1376: warning: expecting prototype for thermal_device_unregister(). Prototype was for thermal_zone_device_unregister() instead
--- drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -1304,7 +1304,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,EXPORT_SYMBOL_GPL (thermal_zone_device_register);/** -* thermal_device_unregister - removes the registered thermal zone device +* thermal_zone_device_unregister - removes the registered thermal zone device * @tz: the thermal zone device to remove */ void thermal_zone_device_unregister (struct thermal_zone_device *tz)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 23/28 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
In reply to Sasha LevinFrom: Matthias Maennich <[email protected]>
[ Upstream commit a979522a1a88556e42a22ce61bccc58e304cb361 ]
To avoid unnecessary recompilations, mkcompile_h does not regenerate compile.h if just the timestamp changed.
Though, if KBUILD_BUILD_TIMESTAMP is set, an explicit timestamp for the build was requested, in which case we should not ignore it.
If a user follows the documentation for reproducible builds [1] and defines KBUILD_BUILD_TIMESTAMP as the git commit timestamp, a clean build will have the correct timestamp. A subsequent cherry-pick (or amend) changes the commit timestamp and if an incremental build is done with a different KBUILD_BUILD_TIMESTAMP now, that new value is not taken into consideration. But it should for reproducibility.
Hence, whenever KBUILD_BUILD_TIMESTAMP is explicitly set, do not ignore UTS_VERSION when making a decision about whether the regenerated version of compile.h should be moved into place.
[1] https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html
--- scripts/mkcompile_h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
scripts/mkcompile_h +11 -3
@@ -83,15 +83,23 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" # Only replace the real compile.h if the new one is different, # in order to preserve the timestamp and avoid unnecessary # recompilations. -# We don't consider the file changed if only the date/time changed. +# We don't consider the file changed if only the date/time changed, +# unless KBUILD_BUILD_TIMESTAMP was explicitly set (e.g. for +# reproducible builds with that value referring to a commit timestamp). # A kernel config change will increase the generation number, thus # causing compile.h to be updated (including date/time) due to the # changed comment in the # first line. +if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then + IGNORE_PATTERN="UTS_VERSION" +else + IGNORE_PATTERN="NOT_A_PATTERN_TO_BE_MATCHED" +fi + if [ -r $TARGET ] && \ - grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \ - grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \ + grep -v $IGNORE_PATTERN $TARGET > .tmpver.1 && \ + grep -v $IGNORE_PATTERN .tmpcompile > .tmpver.2 && \ cmp -s .tmpver.1 .tmpver.2; then rm -f .tmpcompile else
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 24/28 rtc: max77686: Do not enforce (incorrect) interrupt trigger type
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 742b0d7e15c333303daad4856de0764f4bc83601 ]
Interrupt line can be configured on different hardware in different way, even inverted. Therefore driver should not enforce specific trigger type - edge falling - but instead rely on Devicetree to configure it.
The Maxim 77686 datasheet describes the interrupt line as active low with a requirement of acknowledge from the CPU therefore the edge falling is not correct.
The interrupt line is shared between PMIC and RTC driver, so using level sensitive interrupt is here especially important to avoid races. With an edge configuration in case if first PMIC signals interrupt followed shortly after by the RTC, the interrupt might not be yet cleared/acked thus the second one would not be noticed.
--- drivers/rtc/rtc-max77686.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-max77686.c +2 -2
@@ -718,8 +718,8 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info) add_rtc_irq: ret =regmap_add_irq_chip (info->rtc_regmap, info->rtc_irq, -IRQF_TRIGGER_FALLING |IRQF_ONESHOT | -IRQF_SHARED ,0 , info->drv_data->rtc_irq_chip, +IRQF_ONESHOT |IRQF_SHARED , +0 , info->drv_data->rtc_irq_chip, &info->rtc_irq_data);if (ret <0 ) {dev_err (info->dev,"Failed to add RTC irq chip: %d\n" , ret);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 25/28 scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 332a9dd1d86f1e7203fc7f0fd7e82f0b304200fe ]
The shifting of the u8 integer returned fom ahc_inb(ahc, port+3) by 24 bits to the left will be promoted to a 32 bit signed int and then sign-extended to a u64. In the event that the top bit of the u8 is set then all then all the upper 32 bits of the u64 end up as also being set because of the sign-extension. Fix this by casting the u8 values to a u64 before the 24 bit left shift.
[ This dates back to 2002, I found the offending commit from the git history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git,
commit f58eb66c0b0a ("Update aic7xxx driver to 6.2.10...") ]
Addresses-Coverity: ("Unintended sign extension")
--- drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/aic7xxx/aic7xxx_core.c +1 -1
@@ -500,7 +500,7 @@ ahc_inq(struct ahc_softc *ahc, u_int port)return ((ahc_inb (ahc, port)) | (ahc_inb (ahc, port+1 ) <<8 ) | (ahc_inb (ahc, port+2 ) <<16 ) - | (ahc_inb (ahc, port+3 ) <<24 ) + | (((uint64_t )ahc_inb (ahc, port+3 )) <<24 ) | (((uint64_t )ahc_inb (ahc, port+4 )) <<32 ) | (((uint64_t )ahc_inb (ahc, port+5 )) <<40 ) | (((uint64_t)ahc_inb(ahc, port+6)) << 48)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 26/28 scsi: be2iscsi: Fix some missing space in some messages
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit c7fa2c855e892721bafafdf6393342c000e0ef77 ]
Fix a few style issues reported by checkpatch.pl:
- Avoid duplicated word in comment.
- Add missing space in messages.
- Unneeded continuation line character.
- Unneeded extra spaces.
- Unneeded log message after memory allocation failure.
--- drivers/scsi/be2iscsi/be_main.c | 102 ++++++++++++-------------------- 1 file changed, 38 insertions(+), 64 deletions(-)
drivers/scsi/be2iscsi/be_main.c +38 -64
@@ -132,8 +132,7 @@ DEVICE_ATTR(beiscsi_##_name, S_IRUGO | S_IWUSR,\ beiscsi_##_name##_disp, beiscsi_##_name##_store) /* - * When new log level added update the - * the MAX allowed value for log_enable + * When new log level added update MAX allowed value for log_enable */ BEISCSI_RW_ATTR(log_enable, 0x00, 0xFF, 0x00, "Enable logging Bit Mask\n"
@@ -817,9 +816,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) &phwi_context->be_eq[i]);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-Failed to" -"register msix for i = %d\n" , - i); +"BM_%d : %s-Failed to register msix for i = %d\n" , + __func__, i);kfree (phba->msi_name[i]); goto free_msix_irqs; }
@@ -834,9 +832,9 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) ret =request_irq (pci_irq_vector (pcidev, i), be_isr_mcc,0 , phba->msi_name[i], &phwi_context->be_eq[i]);if (ret) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-" -"Failed to register beiscsi_msix_mcc\n" ); +beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , +"BM_%d : %s-Failed to register beiscsi_msix_mcc\n" , + __func__);kfree (phba->msi_name[i]); goto free_msix_irqs; }
@@ -846,8 +844,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) "beiscsi", phba);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-" -"Failed to register irq\\n" ); +"BM_%d : %s-Failed to register irq\n" , + __func__);return ret; } }
@@ -1024,7 +1022,7 @@ free_wrb_handle(struct beiscsi_hba *phba, struct hwi_wrb_context *pwrb_context, phba->params.wrbs_per_cxn);beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : FREE WRB: pwrb_handle=%p free_index=0x%x" +"BM_%d : FREE WRB: pwrb_handle=%p free_index=0x%x " "wrb_handles_available=%d\n" , pwrb_handle, pwrb_context->free_index, pwrb_context->wrb_handles_available);
@@ -1368,7 +1366,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_CONFIG |BEISCSI_LOG_IO ,"BM_%d :\t\t No HWH_TYPE_LOGIN Expected in" -" hwi_complete_cmd- Solicited path\n" ); +" %s- Solicited path\n" , __func__);break ;case HWH_TYPE_NOP :
@@ -1378,8 +1376,8 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,default :beiscsi_log (phba,KERN_WARNING ,BEISCSI_LOG_CONFIG |BEISCSI_LOG_IO , -"BM_%d : In hwi_complete_cmd, unknown type = %d" -"wrb_index 0x%x CID 0x%x\n" , type, +"BM_%d : In %s, unknown type = %d " +"wrb_index 0x%x CID 0x%x\n" , __func__, type, csol_cqe.wrb_index, csol_cqe.cid);break ;
@@ -1877,9 +1875,9 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget) cid =AMAP_GET_BITS ( struct amap_i_t_dpdu_cqe_v2, cid, sol); - else - cid = AMAP_GET_BITS(struct amap_sol_cqe_v2, - cid, sol); + else + cid = AMAP_GET_BITS(struct amap_sol_cqe_v2, + cid, sol); } cri_index =BE_GET_CRI_FROM_CID (cid);
@@ -2005,8 +2003,7 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget)default :beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Invalid CQE Event Received Code : %d" -"CID 0x%x...\n" , +"BM_%d : Invalid CQE Event Received Code : %d CID 0x%x...\n" , code, cid);break ; }
@@ -2994,7 +2991,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,void *eq_vaddress;dma_addr_t paddr; - num_eq_pages =PAGES_REQUIRED (phba->params.num_eq_entries * \ + num_eq_pages =PAGES_REQUIRED (phba->params.num_eq_entries *sizeof (struct be_eq_entry ));if (phba->pcidev->msix_enabled)
@@ -3027,8 +3024,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, phwi_context->cur_eqd);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_cmd_eq_create" -"Failed for EQ\n" ); +"BM_%d : beiscsi_cmd_eq_create Failed for EQ\n" ); goto create_eq_error; }
@@ -3061,7 +3057,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,int ret = -ENOMEM ;dma_addr_t paddr; - num_cq_pages =PAGES_REQUIRED (phba->params.num_cq_entries * \ + num_cq_pages =PAGES_REQUIRED (phba->params.num_cq_entries *sizeof (struct sol_cqe ));for (i =0 ; i < phba->num_cpus; i++) {
@@ -3083,8 +3079,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, sizeof(struct sol_cqe), cq_vaddress);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : be_fill_queue Failed " -"for ISCSI CQ\n" ); +"BM_%d : be_fill_queue Failed for ISCSI CQ\n" ); goto create_cq_error; }
@@ -3093,8 +3088,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, false, 0);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_cmd_eq_create" -"Failed for ISCSI CQ\n" ); +"BM_%d : beiscsi_cmd_eq_create Failed for ISCSI CQ\n" ); goto create_cq_error; } beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
@@ -3219,8 +3213,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, phwi_context->be_def_dataq[ulp_num].id);beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : DEFAULT PDU DATA RING CREATED" -"on ULP : %d\n" , ulp_num); +"BM_%d : DEFAULT PDU DATA RING CREATED on ULP : %d\n" , + ulp_num);return 0 ; }
@@ -3246,13 +3240,13 @@ beiscsi_post_template_hdr(struct beiscsi_hba *phba)if (status !=0 ) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Post Template HDR Failed for" +"BM_%d : Post Template HDR Failed for " "ULP_%d\n" , ulp_num);return status; }beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : Template HDR Pages Posted for" +"BM_%d : Template HDR Pages Posted for " "ULP_%d\n" , ulp_num); } }
@@ -3365,18 +3359,17 @@ beiscsi_create_wrb_rings(struct beiscsi_hba *phba, }else { idx++; wrb_vaddr = mem_descr->mem_array[idx].virtual_address; - pa_addr_lo = mem_descr->mem_array[idx].\ + pa_addr_lo = mem_descr->mem_array[idx]. bus_address.u.a64.address; num_wrb_rings = mem_descr->mem_array[idx].size / (phba->params.wrbs_per_cxn *sizeof (struct iscsi_wrb )); pwrb_arr[num].virtual_address = wrb_vaddr; - pwrb_arr[num].bus_address.u.a64.address\ - = pa_addr_lo; + pwrb_arr[num].bus_address.u.a64.address = pa_addr_lo; pwrb_arr[num].size = phba->params.wrbs_per_cxn *sizeof (struct iscsi_wrb ); wrb_vaddr += pwrb_arr[num].size; - pa_addr_lo += pwrb_arr[num].size; + pa_addr_lo += pwrb_arr[num].size; num_wrb_rings--; } }
@@ -3932,7 +3925,7 @@ static int beiscsi_init_sgl_handle(struct beiscsi_hba *phba) idx++; }beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : phba->io_sgl_hndl_avbl=%d" +"BM_%d : phba->io_sgl_hndl_avbl=%d " "phba->eh_sgl_hndl_avbl=%d\n" , phba->io_sgl_hndl_avbl, phba->eh_sgl_hndl_avbl);
@@ -3990,13 +3983,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) GFP_KERNEL);if (!ptr_cid_info) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory" -"for ULP_CID_INFO for ULP : %d\n" , - ulp_num); ret = -ENOMEM ; goto free_memory; - }/* Allocate memory for CID array */
@@ -4005,10 +3993,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)sizeof (*ptr_cid_info->cid_array), GFP_KERNEL);if (!ptr_cid_info->cid_array) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory" -"for CID_ARRAY for ULP : %d\n" , - ulp_num);kfree (ptr_cid_info); ptr_cid_info =NULL ; ret = -ENOMEM ;
@@ -4025,9 +4009,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) phba->ep_array =kzalloc (sizeof (struct iscsi_endpoint *) * phba->params.cxns_per_ctrl,GFP_KERNEL );if (!phba->ep_array) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory in " -"hba_setup_cid_tbls\n" ); ret = -ENOMEM ; goto free_memory;
@@ -4036,10 +4017,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) phba->conn_table =kzalloc (sizeof (struct beiscsi_conn *) * phba->params.cxns_per_ctrl,GFP_KERNEL );if (!phba->conn_table) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory in" -"hba_setup_cid_tbls\n" ); -kfree (phba->ep_array); phba->ep_array =NULL ; ret = -ENOMEM ;
@@ -4392,7 +4369,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->psgl_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of IO_SGL_ICD Failed" +"BM_%d : Alloc of IO_SGL_ICD Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_hndls;
@@ -4403,7 +4380,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->pwrb_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_io_hndls;
@@ -4419,10 +4396,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of MGMT_SGL_ICD Failed" +"BM_%d : Alloc of MGMT_SGL_ICD Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_hndls; }
@@ -4437,10 +4413,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_mgmt_hndls; } beiscsi_conn->plogin_wrb_handle =
@@ -4458,10 +4433,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of MGMT_SGL_ICD Failed" +"BM_%d : Alloc of MGMT_SGL_ICD Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_hndls; } io_task->pwrb_handle =
@@ -4471,7 +4445,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->pwrb_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_mgmt_hndls;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 27/28 scsi: libfc: Fix array index out of bound exception
In reply to Sasha LevinFrom: Javed Hasan <[email protected]>
[ Upstream commit b27c4577557045f1ab3cdfeabfc7f3cd24aca1fe ]
Fix array index out of bound exception in fc_rport_prli_resp().
--- drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/scsi/libfc/fc_rport.c +8 -5
@@ -1174,6 +1174,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, resp_code = (pp->spp.spp_flags &FC_SPP_RESP_MASK );FC_RPORT_DBG (rdata,"PRLI spp_flags = 0x%x spp_type 0x%x\n" , pp->spp.spp_flags, pp->spp.spp_type); + rdata->spp_type = pp->spp.spp_type;if (resp_code !=FC_SPP_RESP_ACK ) {if (resp_code ==FC_SPP_RESP_CONF )
@@ -1194,11 +1195,13 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,/* * Call prli provider if we should act as a target */ - prov = fc_passive_prov[rdata->spp_type]; -if (prov) { -memset (&temp_spp,0 ,sizeof (temp_spp)); - prov->prli (rdata, pp->prli.prli_spp_len, - &pp->spp, &temp_spp); +if (rdata->spp_type <FC_FC4_PROV_SIZE ) { + prov = fc_passive_prov[rdata->spp_type]; +if (prov) { +memset (&temp_spp,0 ,sizeof (temp_spp)); + prov->prli (rdata, pp->prli.prli_spp_len, + &pp->spp, &temp_spp); + } }/* * Check if the image pair could be established
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 28/28 sched/fair: Fix CFS bandwidth hrtimer expiry type
In reply to Sasha LevinFrom: Odin Ugedal <[email protected]>
[ Upstream commit 72d0ad7cb5bad265adb2014dbe46c4ccb11afaba ]
The time remaining until expiry of the refresh_timer can be negative. Casting the type to an unsigned 64-bit value will cause integer underflow, making the runtime_refresh_within return false instead of true. These situations are rare, but they do happen.
This does not cause user-facing issues or errors; other than possibly unthrottling cfs_rq's using runtime from the previous period(s), making the CFS bandwidth enforcement less strict in those (special) situations.
--- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -4464,7 +4464,7 @@ static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC;static int runtime_refresh_within (struct cfs_bandwidth *cfs_b,u64 min_expire) {struct hrtimer *refresh_timer = &cfs_b->period_timer; -u64 remaining; +s64 remaining;/* if the call-back is running a quota refresh is already occurring */ if (hrtimer_callback_running (refresh_timer))
@@ -4472,7 +4472,7 @@ static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire)/* is a quota refresh about to occur? */ remaining =ktime_to_ns (hrtimer_expires_remaining (refresh_timer)); -if (remaining < min_expire) +if (remaining < (s64 )min_expire)return 1 ;return 0 ;
Signature · 1 line
2.30.2