e21e82b546
* Upgrading sunxi and sunxi64 EDGE to 5.13 Both variants tested for building * Bump imx6 to 5.13.y Tested * Bump Jetson nano kernel to 5.13.y * Move mvebu and mvebu64 edge to 5.13.y
18728 lines
652 KiB
Diff
18728 lines
652 KiB
Diff
diff --git a/Documentation/devicetree/bindings/i2c/i2c-at91.txt b/Documentation/devicetree/bindings/i2c/i2c-at91.txt
|
|
index 96c914e048f59..2015f50aed0f9 100644
|
|
--- a/Documentation/devicetree/bindings/i2c/i2c-at91.txt
|
|
+++ b/Documentation/devicetree/bindings/i2c/i2c-at91.txt
|
|
@@ -73,7 +73,7 @@ i2c0: i2c@f8034600 {
|
|
pinctrl-0 = <&pinctrl_i2c0>;
|
|
pinctrl-1 = <&pinctrl_i2c0_gpio>;
|
|
sda-gpios = <&pioA 30 GPIO_ACTIVE_HIGH>;
|
|
- scl-gpios = <&pioA 31 GPIO_ACTIVE_HIGH>;
|
|
+ scl-gpios = <&pioA 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
|
|
wm8731: wm8731@1a {
|
|
compatible = "wm8731";
|
|
diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
|
|
index de91cf3f058cc..f792d06db413f 100644
|
|
--- a/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
|
|
+++ b/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
|
|
@@ -89,7 +89,7 @@ examples:
|
|
reg = <0x36>;
|
|
maxim,alert-low-soc-level = <10>;
|
|
interrupt-parent = <&gpio7>;
|
|
- interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
|
|
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
|
|
wakeup-source;
|
|
};
|
|
};
|
|
diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
|
|
index 992bf91eeec82..53d396650afbe 100644
|
|
--- a/Documentation/filesystems/f2fs.rst
|
|
+++ b/Documentation/filesystems/f2fs.rst
|
|
@@ -717,10 +717,10 @@ users.
|
|
===================== ======================== ===================
|
|
User F2FS Block
|
|
===================== ======================== ===================
|
|
- META WRITE_LIFE_NOT_SET
|
|
- HOT_NODE "
|
|
- WARM_NODE "
|
|
- COLD_NODE "
|
|
+N/A META WRITE_LIFE_NOT_SET
|
|
+N/A HOT_NODE "
|
|
+N/A WARM_NODE "
|
|
+N/A COLD_NODE "
|
|
ioctl(COLD) COLD_DATA WRITE_LIFE_EXTREME
|
|
extension list " "
|
|
|
|
@@ -746,10 +746,10 @@ WRITE_LIFE_LONG " WRITE_LIFE_LONG
|
|
===================== ======================== ===================
|
|
User F2FS Block
|
|
===================== ======================== ===================
|
|
- META WRITE_LIFE_MEDIUM;
|
|
- HOT_NODE WRITE_LIFE_NOT_SET
|
|
- WARM_NODE "
|
|
- COLD_NODE WRITE_LIFE_NONE
|
|
+N/A META WRITE_LIFE_MEDIUM;
|
|
+N/A HOT_NODE WRITE_LIFE_NOT_SET
|
|
+N/A WARM_NODE "
|
|
+N/A COLD_NODE WRITE_LIFE_NONE
|
|
ioctl(COLD) COLD_DATA WRITE_LIFE_EXTREME
|
|
extension list " "
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 83f4212e004f1..975acb16046d2 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,7 +1,7 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
VERSION = 5
|
|
PATCHLEVEL = 13
|
|
-SUBLEVEL = 3
|
|
+SUBLEVEL = 4
|
|
EXTRAVERSION =
|
|
NAME = Opossums on Parade
|
|
|
|
@@ -129,6 +129,11 @@ endif
|
|
$(if $(word 2, $(KBUILD_EXTMOD)), \
|
|
$(error building multiple external modules is not supported))
|
|
|
|
+# Remove trailing slashes
|
|
+ifneq ($(filter %/, $(KBUILD_EXTMOD)),)
|
|
+KBUILD_EXTMOD := $(shell dirname $(KBUILD_EXTMOD).)
|
|
+endif
|
|
+
|
|
export KBUILD_EXTMOD
|
|
|
|
# Kbuild will save output files in the current working directory.
|
|
diff --git a/arch/arm/boot/dts/am335x-cm-t335.dts b/arch/arm/boot/dts/am335x-cm-t335.dts
|
|
index 36d963db40266..ec4730c82d398 100644
|
|
--- a/arch/arm/boot/dts/am335x-cm-t335.dts
|
|
+++ b/arch/arm/boot/dts/am335x-cm-t335.dts
|
|
@@ -496,7 +496,7 @@ status = "okay";
|
|
status = "okay";
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&spi0_pins>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
/* WLS1271 WiFi */
|
|
wlcore: wlcore@1 {
|
|
compatible = "ti,wl1271";
|
|
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
|
|
index f517d1e843cf4..8b696107eef8c 100644
|
|
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
|
|
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
|
|
@@ -860,7 +860,7 @@
|
|
pinctrl-names = "default", "sleep";
|
|
pinctrl-0 = <&spi0_pins_default>;
|
|
pinctrl-1 = <&spi0_pins_sleep>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
};
|
|
|
|
&spi1 {
|
|
@@ -868,7 +868,7 @@
|
|
pinctrl-names = "default", "sleep";
|
|
pinctrl-0 = <&spi1_pins_default>;
|
|
pinctrl-1 = <&spi1_pins_sleep>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
};
|
|
|
|
&usb2_phy1 {
|
|
diff --git a/arch/arm/boot/dts/am5718.dtsi b/arch/arm/boot/dts/am5718.dtsi
|
|
index ebf4d3cc1cfbe..6d7530a48c73f 100644
|
|
--- a/arch/arm/boot/dts/am5718.dtsi
|
|
+++ b/arch/arm/boot/dts/am5718.dtsi
|
|
@@ -17,17 +17,13 @@
|
|
* VCP1, VCP2
|
|
* MLB
|
|
* ISS
|
|
- * USB3, USB4
|
|
+ * USB3
|
|
*/
|
|
|
|
&usb3_tm {
|
|
status = "disabled";
|
|
};
|
|
|
|
-&usb4_tm {
|
|
- status = "disabled";
|
|
-};
|
|
-
|
|
&atl_tm {
|
|
status = "disabled";
|
|
};
|
|
diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
|
|
index 20322de2f8bf1..e2fd9610e1252 100644
|
|
--- a/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
|
|
@@ -1,7 +1,7 @@
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
&usb {
|
|
dr_mode = "otg";
|
|
- g-rx-fifo-size = <558>;
|
|
+ g-rx-fifo-size = <256>;
|
|
g-np-tx-fifo-size = <32>;
|
|
/*
|
|
* According to dwc2 the sum of all device EP
|
|
diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
|
|
index 1409d1b559c18..0ff0e9e253272 100644
|
|
--- a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
|
|
@@ -1,7 +1,7 @@
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
&usb {
|
|
dr_mode = "peripheral";
|
|
- g-rx-fifo-size = <558>;
|
|
+ g-rx-fifo-size = <256>;
|
|
g-np-tx-fifo-size = <32>;
|
|
g-tx-fifo-size = <256 256 512 512 512 768 768>;
|
|
};
|
|
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
index 7db72a2f1020d..86872e12c355e 100644
|
|
--- a/arch/arm/boot/dts/bcm5301x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
|
|
@@ -520,27 +520,27 @@
|
|
<0x1811b408 0x004>,
|
|
<0x180293a0 0x01c>;
|
|
reg-names = "mspi", "bspi", "intr_regs", "intr_status_reg";
|
|
- interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
|
|
<GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
|
|
<GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
|
|
<GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
|
|
- <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
|
|
- <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
|
|
- <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
|
|
- interrupt-names = "spi_lr_fullness_reached",
|
|
+ <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ interrupt-names = "mspi_done",
|
|
+ "mspi_halted",
|
|
+ "spi_lr_fullness_reached",
|
|
"spi_lr_session_aborted",
|
|
"spi_lr_impatient",
|
|
"spi_lr_session_done",
|
|
- "spi_lr_overhead",
|
|
- "mspi_done",
|
|
- "mspi_halted";
|
|
+ "spi_lr_overread";
|
|
clocks = <&iprocmed>;
|
|
clock-names = "iprocmed";
|
|
num-cs = <2>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
- spi_nor: spi-nor@0 {
|
|
+ spi_nor: flash@0 {
|
|
compatible = "jedec,spi-nor";
|
|
reg = <0>;
|
|
spi-max-frequency = <20000000>;
|
|
diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
|
|
index 149144cdff35a..648d23f7f7481 100644
|
|
--- a/arch/arm/boot/dts/dra7-l4.dtsi
|
|
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
|
|
@@ -4129,28 +4129,6 @@
|
|
};
|
|
};
|
|
|
|
- usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
|
|
- compatible = "ti,sysc-omap4", "ti,sysc";
|
|
- reg = <0x140000 0x4>,
|
|
- <0x140010 0x4>;
|
|
- reg-names = "rev", "sysc";
|
|
- ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
|
|
- ti,sysc-midle = <SYSC_IDLE_FORCE>,
|
|
- <SYSC_IDLE_NO>,
|
|
- <SYSC_IDLE_SMART>,
|
|
- <SYSC_IDLE_SMART_WKUP>;
|
|
- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
|
|
- <SYSC_IDLE_NO>,
|
|
- <SYSC_IDLE_SMART>,
|
|
- <SYSC_IDLE_SMART_WKUP>;
|
|
- /* Domains (P, C): l3init_pwrdm, l3init_clkdm */
|
|
- clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
|
|
- clock-names = "fck";
|
|
- #address-cells = <1>;
|
|
- #size-cells = <1>;
|
|
- ranges = <0x0 0x140000 0x20000>;
|
|
- };
|
|
-
|
|
target-module@170000 { /* 0x48970000, ap 21 0a.0 */
|
|
compatible = "ti,sysc-omap4", "ti,sysc";
|
|
reg = <0x170010 0x4>;
|
|
diff --git a/arch/arm/boot/dts/dra71x.dtsi b/arch/arm/boot/dts/dra71x.dtsi
|
|
index cad0e4a2bd8df..9c270d8f75d5b 100644
|
|
--- a/arch/arm/boot/dts/dra71x.dtsi
|
|
+++ b/arch/arm/boot/dts/dra71x.dtsi
|
|
@@ -11,7 +11,3 @@
|
|
&rtctarget {
|
|
status = "disabled";
|
|
};
|
|
-
|
|
-&usb4_tm {
|
|
- status = "disabled";
|
|
-};
|
|
diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
|
|
index d403acc754b68..f3e934ef7d3e2 100644
|
|
--- a/arch/arm/boot/dts/dra72x.dtsi
|
|
+++ b/arch/arm/boot/dts/dra72x.dtsi
|
|
@@ -108,7 +108,3 @@
|
|
&pcie2_rc {
|
|
compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
|
|
};
|
|
-
|
|
-&usb4_tm {
|
|
- status = "disabled";
|
|
-};
|
|
diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi
|
|
index e1850d6c841a7..b4e07d99ffde1 100644
|
|
--- a/arch/arm/boot/dts/dra74x.dtsi
|
|
+++ b/arch/arm/boot/dts/dra74x.dtsi
|
|
@@ -49,49 +49,6 @@
|
|
reg = <0x41500000 0x100>;
|
|
};
|
|
|
|
- target-module@48940000 {
|
|
- compatible = "ti,sysc-omap4", "ti,sysc";
|
|
- reg = <0x48940000 0x4>,
|
|
- <0x48940010 0x4>;
|
|
- reg-names = "rev", "sysc";
|
|
- ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
|
|
- ti,sysc-midle = <SYSC_IDLE_FORCE>,
|
|
- <SYSC_IDLE_NO>,
|
|
- <SYSC_IDLE_SMART>,
|
|
- <SYSC_IDLE_SMART_WKUP>;
|
|
- ti,sysc-sidle = <SYSC_IDLE_FORCE>,
|
|
- <SYSC_IDLE_NO>,
|
|
- <SYSC_IDLE_SMART>,
|
|
- <SYSC_IDLE_SMART_WKUP>;
|
|
- clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
|
|
- clock-names = "fck";
|
|
- #address-cells = <1>;
|
|
- #size-cells = <1>;
|
|
- ranges = <0x0 0x48940000 0x20000>;
|
|
-
|
|
- omap_dwc3_4: omap_dwc3_4@0 {
|
|
- compatible = "ti,dwc3";
|
|
- reg = <0 0x10000>;
|
|
- interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
|
|
- #address-cells = <1>;
|
|
- #size-cells = <1>;
|
|
- utmi-mode = <2>;
|
|
- ranges;
|
|
- status = "disabled";
|
|
- usb4: usb@10000 {
|
|
- compatible = "snps,dwc3";
|
|
- reg = <0x10000 0x17000>;
|
|
- interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
|
|
- <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
|
|
- <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
|
|
- interrupt-names = "peripheral",
|
|
- "host",
|
|
- "otg";
|
|
- maximum-speed = "high-speed";
|
|
- dr_mode = "otg";
|
|
- };
|
|
- };
|
|
- };
|
|
|
|
target-module@41501000 {
|
|
compatible = "ti,sysc-omap2", "ti,sysc";
|
|
@@ -224,3 +181,52 @@
|
|
&pcie2_rc {
|
|
compatible = "ti,dra746-pcie-rc", "ti,dra7-pcie";
|
|
};
|
|
+
|
|
+&l4_per3 {
|
|
+ segment@0 {
|
|
+ usb4_tm: target-module@140000 { /* 0x48940000, ap 75 3c.0 */
|
|
+ compatible = "ti,sysc-omap4", "ti,sysc";
|
|
+ reg = <0x140000 0x4>,
|
|
+ <0x140010 0x4>;
|
|
+ reg-names = "rev", "sysc";
|
|
+ ti,sysc-mask = <SYSC_OMAP4_DMADISABLE>;
|
|
+ ti,sysc-midle = <SYSC_IDLE_FORCE>,
|
|
+ <SYSC_IDLE_NO>,
|
|
+ <SYSC_IDLE_SMART>,
|
|
+ <SYSC_IDLE_SMART_WKUP>;
|
|
+ ti,sysc-sidle = <SYSC_IDLE_FORCE>,
|
|
+ <SYSC_IDLE_NO>,
|
|
+ <SYSC_IDLE_SMART>,
|
|
+ <SYSC_IDLE_SMART_WKUP>;
|
|
+ /* Domains (P, C): l3init_pwrdm, l3init_clkdm */
|
|
+ clocks = <&l3init_clkctrl DRA7_L3INIT_USB_OTG_SS4_CLKCTRL 0>;
|
|
+ clock-names = "fck";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ ranges = <0x0 0x140000 0x20000>;
|
|
+
|
|
+ omap_dwc3_4: omap_dwc3_4@0 {
|
|
+ compatible = "ti,dwc3";
|
|
+ reg = <0 0x10000>;
|
|
+ interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ utmi-mode = <2>;
|
|
+ ranges;
|
|
+ status = "disabled";
|
|
+ usb4: usb@10000 {
|
|
+ compatible = "snps,dwc3";
|
|
+ reg = <0x10000 0x17000>;
|
|
+ interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
|
|
+ <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ interrupt-names = "peripheral",
|
|
+ "host",
|
|
+ "otg";
|
|
+ maximum-speed = "high-speed";
|
|
+ dr_mode = "otg";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
|
index 20c222b33f98e..d91f7fa2cf808 100644
|
|
--- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
|
+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts
|
|
@@ -22,7 +22,7 @@
|
|
label = "blue:heartbeat";
|
|
pwms = <&pwm 2 2000000 0>;
|
|
pwm-names = "pwm2";
|
|
- max_brightness = <255>;
|
|
+ max-brightness = <255>;
|
|
linux,default-trigger = "heartbeat";
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
|
|
index ede7822576436..1c24f9b35973f 100644
|
|
--- a/arch/arm/boot/dts/exynos5422-odroidxu4.dts
|
|
+++ b/arch/arm/boot/dts/exynos5422-odroidxu4.dts
|
|
@@ -24,7 +24,7 @@
|
|
label = "blue:heartbeat";
|
|
pwms = <&pwm 2 2000000 0>;
|
|
pwm-names = "pwm2";
|
|
- max_brightness = <255>;
|
|
+ max-brightness = <255>;
|
|
linux,default-trigger = "heartbeat";
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi b/arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi
|
|
index 2fc3e86dc5f70..982752e1df24a 100644
|
|
--- a/arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi
|
|
+++ b/arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi
|
|
@@ -22,7 +22,7 @@
|
|
* Green LED is much brighter than the others
|
|
* so limit its max brightness
|
|
*/
|
|
- max_brightness = <127>;
|
|
+ max-brightness = <127>;
|
|
linux,default-trigger = "mmc0";
|
|
};
|
|
|
|
@@ -30,7 +30,7 @@
|
|
label = "blue:heartbeat";
|
|
pwms = <&pwm 2 2000000 0>;
|
|
pwm-names = "pwm2";
|
|
- max_brightness = <255>;
|
|
+ max-brightness = <255>;
|
|
linux,default-trigger = "heartbeat";
|
|
};
|
|
};
|
|
diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts
|
|
index 9611ddf067927..08091d2a64e15 100644
|
|
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
|
|
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
|
|
@@ -125,18 +125,6 @@
|
|
};
|
|
};
|
|
|
|
- ethernet@60000000 {
|
|
- status = "okay";
|
|
-
|
|
- ethernet-port@0 {
|
|
- phy-mode = "rgmii";
|
|
- phy-handle = <&phy0>;
|
|
- };
|
|
- ethernet-port@1 {
|
|
- /* Not used in this platform */
|
|
- };
|
|
- };
|
|
-
|
|
usb@68000000 {
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
|
|
index d0768ae429faa..e3de2b487cf49 100644
|
|
--- a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
|
|
@@ -96,30 +96,40 @@
|
|
reg = <0>;
|
|
max-speed = <100>;
|
|
reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
|
|
- reset-delay-us = <1000>;
|
|
- reset-post-delay-us = <1000>;
|
|
+ reset-assert-us = <1000>;
|
|
+ reset-deassert-us = <1000>;
|
|
+ smsc,disable-energy-detect; /* Make plugin detection reliable */
|
|
};
|
|
};
|
|
};
|
|
|
|
&i2c1 {
|
|
clock-frequency = <100000>;
|
|
- pinctrl-names = "default";
|
|
+ pinctrl-names = "default", "gpio";
|
|
pinctrl-0 = <&pinctrl_i2c1>;
|
|
+ pinctrl-1 = <&pinctrl_i2c1_gpio>;
|
|
+ scl-gpios = <&gpio3 21 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
+ sda-gpios = <&gpio3 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
status = "okay";
|
|
};
|
|
|
|
&i2c2 {
|
|
clock-frequency = <100000>;
|
|
- pinctrl-names = "default";
|
|
+ pinctrl-names = "default", "gpio";
|
|
pinctrl-0 = <&pinctrl_i2c2>;
|
|
+ pinctrl-1 = <&pinctrl_i2c2_gpio>;
|
|
+ scl-gpios = <&gpio4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
+ sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
status = "okay";
|
|
};
|
|
|
|
&i2c3 {
|
|
clock-frequency = <100000>;
|
|
- pinctrl-names = "default";
|
|
+ pinctrl-names = "default", "gpio";
|
|
pinctrl-0 = <&pinctrl_i2c3>;
|
|
+ pinctrl-1 = <&pinctrl_i2c3_gpio>;
|
|
+ scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
+ sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
|
|
status = "okay";
|
|
|
|
ltc3676: pmic@3c {
|
|
@@ -285,6 +295,13 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_i2c1_gpio: i2c1-gpio-grp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x4001b8b1
|
|
+ MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x4001b8b1
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_i2c2: i2c2-grp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
|
|
@@ -292,6 +309,13 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_i2c2_gpio: i2c2-gpio-grp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x4001b8b1
|
|
+ MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x4001b8b1
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_i2c3: i2c3-grp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
|
|
@@ -299,6 +323,13 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_i2c3_gpio: i2c3-gpio-grp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1
|
|
+ MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_pmic_hw300: pmic-hw300-grp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x1B0B0
|
|
diff --git a/arch/arm/boot/dts/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom-sdx55-t55.dts
|
|
index ddcd53aa533db..2ffcd085904db 100644
|
|
--- a/arch/arm/boot/dts/qcom-sdx55-t55.dts
|
|
+++ b/arch/arm/boot/dts/qcom-sdx55-t55.dts
|
|
@@ -250,7 +250,7 @@
|
|
nand-ecc-step-size = <512>;
|
|
nand-bus-width = <8>;
|
|
/* efs2 partition is secured */
|
|
- secure-regions = <0x500000 0xb00000>;
|
|
+ secure-regions = /bits/ 64 <0x500000 0xb00000>;
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
|
|
index 3065f84634b80..80c40da79604f 100644
|
|
--- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
|
|
+++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts
|
|
@@ -250,8 +250,8 @@
|
|
nand-ecc-step-size = <512>;
|
|
nand-bus-width = <8>;
|
|
/* ico and efs2 partitions are secured */
|
|
- secure-regions = <0x500000 0x500000
|
|
- 0xa00000 0xb00000>;
|
|
+ secure-regions = /bits/ 64 <0x500000 0x500000
|
|
+ 0xa00000 0xb00000>;
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
|
|
index d2240b89ee529..4658453234959 100644
|
|
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
|
|
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
|
|
@@ -145,7 +145,7 @@
|
|
status = "okay";
|
|
|
|
clocks = <&mstp1_clks R8A7779_CLK_DU>, <&x3_clk>;
|
|
- clock-names = "du", "dclkin.0";
|
|
+ clock-names = "du.0", "dclkin.0";
|
|
|
|
ports {
|
|
port@0 {
|
|
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
|
|
index 74d7e9084eabe..3c5fcdfe16b87 100644
|
|
--- a/arch/arm/boot/dts/r8a7779.dtsi
|
|
+++ b/arch/arm/boot/dts/r8a7779.dtsi
|
|
@@ -463,6 +463,7 @@
|
|
reg = <0xfff80000 0x40000>;
|
|
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
|
|
clocks = <&mstp1_clks R8A7779_CLK_DU>;
|
|
+ clock-names = "du.0";
|
|
power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
|
|
status = "disabled";
|
|
|
|
diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
|
|
index 272a1a67a9adc..31d08423a32f0 100644
|
|
--- a/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
|
|
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
|
|
@@ -123,7 +123,6 @@
|
|
max-speed = <100>;
|
|
phy-handle = <&phy0>;
|
|
st,eth-ref-clk-sel;
|
|
- phy-reset-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>;
|
|
|
|
mdio0 {
|
|
#address-cells = <1>;
|
|
@@ -132,6 +131,13 @@
|
|
|
|
phy0: ethernet-phy@1 {
|
|
reg = <1>;
|
|
+ /* LAN8710Ai */
|
|
+ compatible = "ethernet-phy-id0007.c0f0",
|
|
+ "ethernet-phy-ieee802.3-c22";
|
|
+ clocks = <&rcc ETHCK_K>;
|
|
+ reset-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>;
|
|
+ reset-assert-us = <500>;
|
|
+ reset-deassert-us = <500>;
|
|
interrupt-parent = <&gpioi>;
|
|
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
|
|
};
|
|
diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
|
|
index 97f497854e05d..d05fa679dcd30 100644
|
|
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
|
|
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
|
|
@@ -85,7 +85,7 @@
|
|
pinctrl-0 = <&emac_rgmii_pins>;
|
|
phy-supply = <®_gmac_3v3>;
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-mode = "rgmii";
|
|
+ phy-mode = "rgmii-id";
|
|
|
|
status = "okay";
|
|
};
|
|
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
|
|
index 25b01da4771b3..8b48326be9fd5 100644
|
|
--- a/arch/arm/mach-exynos/exynos.c
|
|
+++ b/arch/arm/mach-exynos/exynos.c
|
|
@@ -55,6 +55,7 @@ void __init exynos_sysram_init(void)
|
|
sysram_base_addr = of_iomap(node, 0);
|
|
sysram_base_phys = of_translate_address(node,
|
|
of_get_address(node, 0, NULL, NULL));
|
|
+ of_node_put(node);
|
|
break;
|
|
}
|
|
|
|
@@ -62,6 +63,7 @@ void __init exynos_sysram_init(void)
|
|
if (!of_device_is_available(node))
|
|
continue;
|
|
sysram_ns_base_addr = of_iomap(node, 0);
|
|
+ of_node_put(node);
|
|
break;
|
|
}
|
|
}
|
|
diff --git a/arch/arm/probes/kprobes/test-thumb.c b/arch/arm/probes/kprobes/test-thumb.c
|
|
index 456c181a7bfe8..4e11f0b760f89 100644
|
|
--- a/arch/arm/probes/kprobes/test-thumb.c
|
|
+++ b/arch/arm/probes/kprobes/test-thumb.c
|
|
@@ -441,21 +441,21 @@ void kprobe_thumb32_test_cases(void)
|
|
"3: mvn r0, r0 \n\t"
|
|
"2: nop \n\t")
|
|
|
|
- TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,"]",
|
|
+ TEST_RX("tbh [pc, r",7, (9f-(1f+4))>>1,", lsl #1]",
|
|
"9: \n\t"
|
|
".short (2f-1b-4)>>1 \n\t"
|
|
".short (3f-1b-4)>>1 \n\t"
|
|
"3: mvn r0, r0 \n\t"
|
|
"2: nop \n\t")
|
|
|
|
- TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,"]",
|
|
+ TEST_RX("tbh [pc, r",12, ((9f-(1f+4))>>1)+1,", lsl #1]",
|
|
"9: \n\t"
|
|
".short (2f-1b-4)>>1 \n\t"
|
|
".short (3f-1b-4)>>1 \n\t"
|
|
"3: mvn r0, r0 \n\t"
|
|
"2: nop \n\t")
|
|
|
|
- TEST_RRX("tbh [r",1,9f, ", r",14,1,"]",
|
|
+ TEST_RRX("tbh [r",1,9f, ", r",14,1,", lsl #1]",
|
|
"9: \n\t"
|
|
".short (2f-1b-4)>>1 \n\t"
|
|
".short (3f-1b-4)>>1 \n\t"
|
|
@@ -468,10 +468,10 @@ void kprobe_thumb32_test_cases(void)
|
|
|
|
TEST_UNSUPPORTED("strexb r0, r1, [r2]")
|
|
TEST_UNSUPPORTED("strexh r0, r1, [r2]")
|
|
- TEST_UNSUPPORTED("strexd r0, r1, [r2]")
|
|
+ TEST_UNSUPPORTED("strexd r0, r1, r2, [r2]")
|
|
TEST_UNSUPPORTED("ldrexb r0, [r1]")
|
|
TEST_UNSUPPORTED("ldrexh r0, [r1]")
|
|
- TEST_UNSUPPORTED("ldrexd r0, [r1]")
|
|
+ TEST_UNSUPPORTED("ldrexd r0, r1, [r1]")
|
|
|
|
TEST_GROUP("Data-processing (shifted register) and (modified immediate)")
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
index e22b94c83647f..5e66ce1a334fb 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
|
|
@@ -79,7 +79,7 @@
|
|
&emac {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rgmii_pins>;
|
|
- phy-mode = "rgmii-id";
|
|
+ phy-mode = "rgmii-txid";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
phy-supply = <®_dc1sw>;
|
|
status = "okay";
|
|
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
|
|
index 24d293ef56d7b..74d15789ce9a0 100644
|
|
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
|
|
@@ -655,6 +655,8 @@ edp_brij_i2c: &i2c2 {
|
|
clocks = <&rpmhcc RPMH_LN_BB_CLK3>;
|
|
clock-names = "refclk";
|
|
|
|
+ no-hpd;
|
|
+
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
|
|
index 6228ba2d85132..b82014eac56b7 100644
|
|
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
|
|
@@ -2754,8 +2754,8 @@
|
|
usb_1_qmpphy: phy-wrapper@88e9000 {
|
|
compatible = "qcom,sc7180-qmp-usb3-dp-phy";
|
|
reg = <0 0x088e9000 0 0x18c>,
|
|
- <0 0x088e8000 0 0x38>,
|
|
- <0 0x088ea000 0 0x40>;
|
|
+ <0 0x088e8000 0 0x3c>,
|
|
+ <0 0x088ea000 0 0x18c>;
|
|
status = "disabled";
|
|
#address-cells = <2>;
|
|
#size-cells = <2>;
|
|
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
|
|
index 8f617f7b6d34e..f712771df0c77 100644
|
|
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
|
|
@@ -46,6 +46,14 @@
|
|
};
|
|
|
|
reserved-memory {
|
|
+ /* The rmtfs_mem needs to be guarded due to "XPU limitations"
|
|
+ * it is otherwise possible for an allocation adjacent to the
|
|
+ * rmtfs_mem region to trigger an XPU violation, causing a crash.
|
|
+ */
|
|
+ rmtfs_lower_guard: memory@f5b00000 {
|
|
+ no-map;
|
|
+ reg = <0 0xf5b00000 0 0x1000>;
|
|
+ };
|
|
/*
|
|
* The rmtfs memory region in downstream is 'dynamically allocated'
|
|
* but given the same address every time. Hard code it as this address is
|
|
@@ -59,6 +67,10 @@
|
|
qcom,client-id = <1>;
|
|
qcom,vmid = <15>;
|
|
};
|
|
+ rmtfs_upper_guard: memory@f5d01000 {
|
|
+ no-map;
|
|
+ reg = <0 0xf5d01000 0 0x2000>;
|
|
+ };
|
|
|
|
/*
|
|
* It seems like reserving the old rmtfs_mem region is also needed to prevent
|
|
diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
|
|
index 140db2d5ba317..c2a709a384e9e 100644
|
|
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
|
|
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
|
|
@@ -376,6 +376,8 @@
|
|
clocks = <&sn65dsi86_refclk>;
|
|
clock-names = "refclk";
|
|
|
|
+ no-hpd;
|
|
+
|
|
ports {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
|
|
index 46f8dbf689048..95d9262d4f8a6 100644
|
|
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
|
|
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
|
|
@@ -76,6 +76,7 @@
|
|
opp-hz = /bits/ 64 <1500000000>;
|
|
opp-microvolt = <820000>;
|
|
clock-latency-ns = <300000>;
|
|
+ opp-suspend;
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/renesas/r8a77960.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
|
|
index 12476e354d746..a91a42c57484e 100644
|
|
--- a/arch/arm64/boot/dts/renesas/r8a77960.dtsi
|
|
+++ b/arch/arm64/boot/dts/renesas/r8a77960.dtsi
|
|
@@ -63,18 +63,19 @@
|
|
|
|
opp-500000000 {
|
|
opp-hz = /bits/ 64 <500000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
};
|
|
opp-1000000000 {
|
|
opp-hz = /bits/ 64 <1000000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
};
|
|
opp-1500000000 {
|
|
opp-hz = /bits/ 64 <1500000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
+ opp-suspend;
|
|
};
|
|
opp-1600000000 {
|
|
opp-hz = /bits/ 64 <1600000000>;
|
|
diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
|
|
index d9804768425a7..7f9d5c3605222 100644
|
|
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
|
|
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
|
|
@@ -52,18 +52,19 @@
|
|
|
|
opp-500000000 {
|
|
opp-hz = /bits/ 64 <500000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
};
|
|
opp-1000000000 {
|
|
opp-hz = /bits/ 64 <1000000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
};
|
|
opp-1500000000 {
|
|
opp-hz = /bits/ 64 <1500000000>;
|
|
- opp-microvolt = <820000>;
|
|
+ opp-microvolt = <830000>;
|
|
clock-latency-ns = <300000>;
|
|
+ opp-suspend;
|
|
};
|
|
opp-1600000000 {
|
|
opp-hz = /bits/ 64 <1600000000>;
|
|
diff --git a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
|
|
index 7417cf5fea0f0..2426e533128ce 100644
|
|
--- a/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
|
|
+++ b/arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts
|
|
@@ -59,7 +59,7 @@
|
|
memory@48000000 {
|
|
device_type = "memory";
|
|
/* first 128MB is reserved for secure area. */
|
|
- reg = <0x0 0x48000000 0x0 0x38000000>;
|
|
+ reg = <0x0 0x48000000 0x0 0x78000000>;
|
|
};
|
|
|
|
osc5_clk: osc5-clock {
|
|
diff --git a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
|
|
index 70b3604e56cd7..9a7d1aca49984 100644
|
|
--- a/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
|
|
+++ b/arch/arm64/boot/dts/renesas/r8a779a0.dtsi
|
|
@@ -1096,7 +1096,6 @@
|
|
<0x0 0xf1060000 0 0x110000>;
|
|
interrupts = <GIC_PPI 9
|
|
(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;
|
|
- power-domains = <&sysc R8A779A0_PD_ALWAYS_ON>;
|
|
};
|
|
|
|
fcpvd0: fcp@fea10000 {
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
|
|
index c7e31efdd2e11..c02059c0a9547 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
|
|
@@ -177,8 +177,6 @@
|
|
};
|
|
|
|
&gmac2phy {
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&fephyled_linkm1>, <&fephyled_rxm1>;
|
|
status = "okay";
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
|
index fa58098876438..cef4d18b599dd 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
|
|
@@ -33,7 +33,7 @@
|
|
|
|
sys_led: led-sys {
|
|
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
|
|
- label = "red:sys";
|
|
+ label = "red:power";
|
|
default-state = "on";
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
index c172f5a803e7b..8b27ee4be7556 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
|
|
@@ -389,6 +389,7 @@
|
|
|
|
vcc_sdio: LDO_REG4 {
|
|
regulator-name = "vcc_sdio";
|
|
+ regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <3000000>;
|
|
@@ -493,6 +494,8 @@
|
|
regulator-min-microvolt = <712500>;
|
|
regulator-max-microvolt = <1500000>;
|
|
regulator-ramp-delay = <1000>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
vin-supply = <&vcc3v3_sys>;
|
|
|
|
regulator-state-mem {
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
|
|
index ca59d1f711f8a..bcbf436a96b55 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
|
|
@@ -489,7 +489,8 @@
|
|
ti,mac-only;
|
|
label = "port1";
|
|
phys = <&phy_gmii_sel 1>;
|
|
- mac-address = [00 00 de ad be ef];
|
|
+ mac-address = [00 00 00 00 00 00];
|
|
+ ti,syscon-efuse = <&main_conf 0x200>;
|
|
};
|
|
|
|
cpsw_port2: port@2 {
|
|
@@ -497,7 +498,7 @@
|
|
ti,mac-only;
|
|
label = "port2";
|
|
phys = <&phy_gmii_sel 2>;
|
|
- mac-address = [00 01 de ad be ef];
|
|
+ mac-address = [00 00 00 00 00 00];
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
|
|
index deb19ae5e168a..eaf7edb2ef4dd 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
|
|
@@ -87,7 +87,7 @@
|
|
};
|
|
|
|
mcu_gpio0: gpio@4201000 {
|
|
- compatible = "ti,am64-gpio", "keystone-gpio";
|
|
+ compatible = "ti,am64-gpio", "ti,keystone-gpio";
|
|
reg = <0x0 0x4201000 0x0 0x100>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
|
|
index dad0efa961ed1..2fd0de905e618 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
|
|
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
|
|
@@ -334,7 +334,7 @@
|
|
&main_spi0 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&main_spi0_pins_default>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
eeprom@0 {
|
|
compatible = "microchip,93lc46b";
|
|
reg = <0>;
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
|
|
index de763ca9251c7..d9a7e2689b93b 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
|
|
@@ -575,7 +575,7 @@
|
|
|
|
#address-cells = <1>;
|
|
#size-cells= <0>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
};
|
|
|
|
&tscadc0 {
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
|
|
index eddb2ffb93ca6..1b947e2c2e74f 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
|
|
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
|
|
@@ -299,7 +299,7 @@
|
|
pinctrl-0 = <&main_spi0_pins_default>;
|
|
#address-cells = <1>;
|
|
#size-cells= <0>;
|
|
- ti,pindir-d0-out-d1-in = <1>;
|
|
+ ti,pindir-d0-out-d1-in;
|
|
|
|
flash@0{
|
|
compatible = "jedec,spi-nor";
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
|
|
index 19fea8adbcff4..a4b4b17a6ad74 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
|
|
@@ -683,6 +683,7 @@
|
|
"otg";
|
|
maximum-speed = "super-speed";
|
|
dr_mode = "otg";
|
|
+ cdns,phyrst-a-enable;
|
|
};
|
|
};
|
|
|
|
@@ -696,7 +697,6 @@
|
|
<149>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <69>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
|
|
@@ -714,7 +714,6 @@
|
|
<158>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <69>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
|
|
@@ -732,7 +731,6 @@
|
|
<167>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <69>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 109 TI_SCI_PD_EXCLUSIVE>;
|
|
@@ -750,7 +748,6 @@
|
|
<176>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <69>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
|
|
index 5663fe3ea4660..343449af53fb9 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
|
|
@@ -117,7 +117,6 @@
|
|
interrupts = <103>, <104>, <105>, <106>, <107>, <108>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <85>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
|
|
@@ -134,7 +133,6 @@
|
|
interrupts = <112>, <113>, <114>, <115>, <116>, <117>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
- #address-cells = <0>;
|
|
ti,ngpio = <85>;
|
|
ti,davinci-gpio-unbanked = <0>;
|
|
power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
|
|
index 60764366e22bd..ffccbc53f1e75 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
|
|
+++ b/arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
|
|
@@ -9,6 +9,7 @@
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
#include <dt-bindings/input/input.h>
|
|
#include <dt-bindings/net/ti-dp83867.h>
|
|
+#include <dt-bindings/phy/phy-cadence.h>
|
|
|
|
/ {
|
|
chosen {
|
|
@@ -358,7 +359,7 @@
|
|
};
|
|
|
|
&serdes3 {
|
|
- serdes3_usb_link: link@0 {
|
|
+ serdes3_usb_link: phy@0 {
|
|
reg = <0>;
|
|
cdns,num-lanes = <2>;
|
|
#phy-cells = <0>;
|
|
@@ -635,8 +636,45 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+&cmn_refclk1 {
|
|
+ clock-frequency = <100000000>;
|
|
+};
|
|
+
|
|
+&wiz0_pll1_refclk {
|
|
+ assigned-clocks = <&wiz0_pll1_refclk>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
+&wiz0_refclk_dig {
|
|
+ assigned-clocks = <&wiz0_refclk_dig>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
+&wiz1_pll1_refclk {
|
|
+ assigned-clocks = <&wiz1_pll1_refclk>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
+&wiz1_refclk_dig {
|
|
+ assigned-clocks = <&wiz1_refclk_dig>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
+&wiz2_pll1_refclk {
|
|
+ assigned-clocks = <&wiz2_pll1_refclk>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
+&wiz2_refclk_dig {
|
|
+ assigned-clocks = <&wiz2_refclk_dig>;
|
|
+ assigned-clock-parents = <&cmn_refclk1>;
|
|
+};
|
|
+
|
|
&serdes0 {
|
|
- serdes0_pcie_link: link@0 {
|
|
+ assigned-clocks = <&serdes0 CDNS_SIERRA_PLL_CMNLC>;
|
|
+ assigned-clock-parents = <&wiz0_pll1_refclk>;
|
|
+
|
|
+ serdes0_pcie_link: phy@0 {
|
|
reg = <0>;
|
|
cdns,num-lanes = <1>;
|
|
#phy-cells = <0>;
|
|
@@ -646,7 +684,10 @@
|
|
};
|
|
|
|
&serdes1 {
|
|
- serdes1_pcie_link: link@0 {
|
|
+ assigned-clocks = <&serdes1 CDNS_SIERRA_PLL_CMNLC>;
|
|
+ assigned-clock-parents = <&wiz1_pll1_refclk>;
|
|
+
|
|
+ serdes1_pcie_link: phy@0 {
|
|
reg = <0>;
|
|
cdns,num-lanes = <2>;
|
|
#phy-cells = <0>;
|
|
@@ -656,7 +697,10 @@
|
|
};
|
|
|
|
&serdes2 {
|
|
- serdes2_pcie_link: link@0 {
|
|
+ assigned-clocks = <&serdes2 CDNS_SIERRA_PLL_CMNLC>;
|
|
+ assigned-clock-parents = <&wiz2_pll1_refclk>;
|
|
+
|
|
+ serdes2_pcie_link: phy@0 {
|
|
reg = <0>;
|
|
cdns,num-lanes = <2>;
|
|
#phy-cells = <0>;
|
|
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
|
|
index 3bcafe4c1742e..9ce4afd6da62f 100644
|
|
--- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
|
|
+++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
|
|
@@ -8,6 +8,20 @@
|
|
#include <dt-bindings/mux/mux.h>
|
|
#include <dt-bindings/mux/ti-serdes.h>
|
|
|
|
+/ {
|
|
+ cmn_refclk: clock-cmnrefclk {
|
|
+ #clock-cells = <0>;
|
|
+ compatible = "fixed-clock";
|
|
+ clock-frequency = <0>;
|
|
+ };
|
|
+
|
|
+ cmn_refclk1: clock-cmnrefclk1 {
|
|
+ #clock-cells = <0>;
|
|
+ compatible = "fixed-clock";
|
|
+ clock-frequency = <0>;
|
|
+ };
|
|
+};
|
|
+
|
|
&cbass_main {
|
|
msmc_ram: sram@70000000 {
|
|
compatible = "mmio-sram";
|
|
@@ -338,24 +352,12 @@
|
|
pinctrl-single,function-mask = <0xffffffff>;
|
|
};
|
|
|
|
- dummy_cmn_refclk: dummy-cmn-refclk {
|
|
- #clock-cells = <0>;
|
|
- compatible = "fixed-clock";
|
|
- clock-frequency = <100000000>;
|
|
- };
|
|
-
|
|
- dummy_cmn_refclk1: dummy-cmn-refclk1 {
|
|
- #clock-cells = <0>;
|
|
- compatible = "fixed-clock";
|
|
- clock-frequency = <100000000>;
|
|
- };
|
|
-
|
|
serdes_wiz0: wiz@5000000 {
|
|
compatible = "ti,j721e-wiz-16g";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
power-domains = <&k3_pds 292 TI_SCI_PD_EXCLUSIVE>;
|
|
- clocks = <&k3_clks 292 5>, <&k3_clks 292 11>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 292 5>, <&k3_clks 292 11>, <&cmn_refclk>;
|
|
clock-names = "fck", "core_ref_clk", "ext_ref_clk";
|
|
assigned-clocks = <&k3_clks 292 11>, <&k3_clks 292 0>;
|
|
assigned-clock-parents = <&k3_clks 292 15>, <&k3_clks 292 4>;
|
|
@@ -364,21 +366,21 @@
|
|
ranges = <0x5000000 0x0 0x5000000 0x10000>;
|
|
|
|
wiz0_pll0_refclk: pll0-refclk {
|
|
- clocks = <&k3_clks 292 11>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 292 11>, <&cmn_refclk>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz0_pll0_refclk>;
|
|
assigned-clock-parents = <&k3_clks 292 11>;
|
|
};
|
|
|
|
wiz0_pll1_refclk: pll1-refclk {
|
|
- clocks = <&k3_clks 292 0>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 292 0>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz0_pll1_refclk>;
|
|
assigned-clock-parents = <&k3_clks 292 0>;
|
|
};
|
|
|
|
wiz0_refclk_dig: refclk-dig {
|
|
- clocks = <&k3_clks 292 11>, <&k3_clks 292 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 292 11>, <&k3_clks 292 0>, <&cmn_refclk>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz0_refclk_dig>;
|
|
assigned-clock-parents = <&k3_clks 292 11>;
|
|
@@ -412,7 +414,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
power-domains = <&k3_pds 293 TI_SCI_PD_EXCLUSIVE>;
|
|
- clocks = <&k3_clks 293 5>, <&k3_clks 293 13>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 293 5>, <&k3_clks 293 13>, <&cmn_refclk>;
|
|
clock-names = "fck", "core_ref_clk", "ext_ref_clk";
|
|
assigned-clocks = <&k3_clks 293 13>, <&k3_clks 293 0>;
|
|
assigned-clock-parents = <&k3_clks 293 17>, <&k3_clks 293 4>;
|
|
@@ -421,21 +423,21 @@
|
|
ranges = <0x5010000 0x0 0x5010000 0x10000>;
|
|
|
|
wiz1_pll0_refclk: pll0-refclk {
|
|
- clocks = <&k3_clks 293 13>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 293 13>, <&cmn_refclk>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz1_pll0_refclk>;
|
|
assigned-clock-parents = <&k3_clks 293 13>;
|
|
};
|
|
|
|
wiz1_pll1_refclk: pll1-refclk {
|
|
- clocks = <&k3_clks 293 0>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 293 0>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz1_pll1_refclk>;
|
|
assigned-clock-parents = <&k3_clks 293 0>;
|
|
};
|
|
|
|
wiz1_refclk_dig: refclk-dig {
|
|
- clocks = <&k3_clks 293 13>, <&k3_clks 293 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 293 13>, <&k3_clks 293 0>, <&cmn_refclk>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz1_refclk_dig>;
|
|
assigned-clock-parents = <&k3_clks 293 13>;
|
|
@@ -469,7 +471,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
power-domains = <&k3_pds 294 TI_SCI_PD_EXCLUSIVE>;
|
|
- clocks = <&k3_clks 294 5>, <&k3_clks 294 11>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 294 5>, <&k3_clks 294 11>, <&cmn_refclk>;
|
|
clock-names = "fck", "core_ref_clk", "ext_ref_clk";
|
|
assigned-clocks = <&k3_clks 294 11>, <&k3_clks 294 0>;
|
|
assigned-clock-parents = <&k3_clks 294 15>, <&k3_clks 294 4>;
|
|
@@ -478,21 +480,21 @@
|
|
ranges = <0x5020000 0x0 0x5020000 0x10000>;
|
|
|
|
wiz2_pll0_refclk: pll0-refclk {
|
|
- clocks = <&k3_clks 294 11>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 294 11>, <&cmn_refclk>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz2_pll0_refclk>;
|
|
assigned-clock-parents = <&k3_clks 294 11>;
|
|
};
|
|
|
|
wiz2_pll1_refclk: pll1-refclk {
|
|
- clocks = <&k3_clks 294 0>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 294 0>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz2_pll1_refclk>;
|
|
assigned-clock-parents = <&k3_clks 294 0>;
|
|
};
|
|
|
|
wiz2_refclk_dig: refclk-dig {
|
|
- clocks = <&k3_clks 294 11>, <&k3_clks 294 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 294 11>, <&k3_clks 294 0>, <&cmn_refclk>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz2_refclk_dig>;
|
|
assigned-clock-parents = <&k3_clks 294 11>;
|
|
@@ -526,7 +528,7 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
power-domains = <&k3_pds 295 TI_SCI_PD_EXCLUSIVE>;
|
|
- clocks = <&k3_clks 295 5>, <&k3_clks 295 9>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 295 5>, <&k3_clks 295 9>, <&cmn_refclk>;
|
|
clock-names = "fck", "core_ref_clk", "ext_ref_clk";
|
|
assigned-clocks = <&k3_clks 295 9>, <&k3_clks 295 0>;
|
|
assigned-clock-parents = <&k3_clks 295 13>, <&k3_clks 295 4>;
|
|
@@ -535,21 +537,21 @@
|
|
ranges = <0x5030000 0x0 0x5030000 0x10000>;
|
|
|
|
wiz3_pll0_refclk: pll0-refclk {
|
|
- clocks = <&k3_clks 295 9>, <&dummy_cmn_refclk>;
|
|
+ clocks = <&k3_clks 295 9>, <&cmn_refclk>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz3_pll0_refclk>;
|
|
assigned-clock-parents = <&k3_clks 295 9>;
|
|
};
|
|
|
|
wiz3_pll1_refclk: pll1-refclk {
|
|
- clocks = <&k3_clks 295 0>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 295 0>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz3_pll1_refclk>;
|
|
assigned-clock-parents = <&k3_clks 295 0>;
|
|
};
|
|
|
|
wiz3_refclk_dig: refclk-dig {
|
|
- clocks = <&k3_clks 295 9>, <&k3_clks 295 0>, <&dummy_cmn_refclk>, <&dummy_cmn_refclk1>;
|
|
+ clocks = <&k3_clks 295 9>, <&k3_clks 295 0>, <&cmn_refclk>, <&cmn_refclk1>;
|
|
#clock-cells = <0>;
|
|
assigned-clocks = <&wiz3_refclk_dig>;
|
|
assigned-clock-parents = <&k3_clks 295 9>;
|
|
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
|
|
index 08c6f769df9ae..9907a431db0d0 100644
|
|
--- a/arch/arm64/configs/defconfig
|
|
+++ b/arch/arm64/configs/defconfig
|
|
@@ -491,7 +491,6 @@ CONFIG_SPI_S3C64XX=y
|
|
CONFIG_SPI_SH_MSIOF=m
|
|
CONFIG_SPI_SUN6I=y
|
|
CONFIG_SPI_SPIDEV=m
|
|
-CONFIG_MTK_PMIC_WRAP=m
|
|
CONFIG_SPMI=y
|
|
CONFIG_PINCTRL_SINGLE=y
|
|
CONFIG_PINCTRL_MAX77620=y
|
|
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S
|
|
index 95cd62d673711..2cf999e41d30e 100644
|
|
--- a/arch/arm64/lib/copy_from_user.S
|
|
+++ b/arch/arm64/lib/copy_from_user.S
|
|
@@ -29,7 +29,7 @@
|
|
.endm
|
|
|
|
.macro ldrh1 reg, ptr, val
|
|
- user_ldst 9998f, ldtrh, \reg, \ptr, \val
|
|
+ user_ldst 9997f, ldtrh, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro strh1 reg, ptr, val
|
|
@@ -37,7 +37,7 @@
|
|
.endm
|
|
|
|
.macro ldr1 reg, ptr, val
|
|
- user_ldst 9998f, ldtr, \reg, \ptr, \val
|
|
+ user_ldst 9997f, ldtr, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro str1 reg, ptr, val
|
|
@@ -45,7 +45,7 @@
|
|
.endm
|
|
|
|
.macro ldp1 reg1, reg2, ptr, val
|
|
- user_ldp 9998f, \reg1, \reg2, \ptr, \val
|
|
+ user_ldp 9997f, \reg1, \reg2, \ptr, \val
|
|
.endm
|
|
|
|
.macro stp1 reg1, reg2, ptr, val
|
|
@@ -53,8 +53,10 @@
|
|
.endm
|
|
|
|
end .req x5
|
|
+srcin .req x15
|
|
SYM_FUNC_START(__arch_copy_from_user)
|
|
add end, x0, x2
|
|
+ mov srcin, x1
|
|
#include "copy_template.S"
|
|
mov x0, #0 // Nothing to copy
|
|
ret
|
|
@@ -63,6 +65,11 @@ EXPORT_SYMBOL(__arch_copy_from_user)
|
|
|
|
.section .fixup,"ax"
|
|
.align 2
|
|
+9997: cmp dst, dstin
|
|
+ b.ne 9998f
|
|
+ // Before being absolutely sure we couldn't copy anything, try harder
|
|
+USER(9998f, ldtrb tmp1w, [srcin])
|
|
+ strb tmp1w, [dst], #1
|
|
9998: sub x0, end, dst // bytes not copied
|
|
ret
|
|
.previous
|
|
diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S
|
|
index 1f61cd0df0627..dbea3799c3efb 100644
|
|
--- a/arch/arm64/lib/copy_in_user.S
|
|
+++ b/arch/arm64/lib/copy_in_user.S
|
|
@@ -30,33 +30,34 @@
|
|
.endm
|
|
|
|
.macro ldrh1 reg, ptr, val
|
|
- user_ldst 9998f, ldtrh, \reg, \ptr, \val
|
|
+ user_ldst 9997f, ldtrh, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro strh1 reg, ptr, val
|
|
- user_ldst 9998f, sttrh, \reg, \ptr, \val
|
|
+ user_ldst 9997f, sttrh, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro ldr1 reg, ptr, val
|
|
- user_ldst 9998f, ldtr, \reg, \ptr, \val
|
|
+ user_ldst 9997f, ldtr, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro str1 reg, ptr, val
|
|
- user_ldst 9998f, sttr, \reg, \ptr, \val
|
|
+ user_ldst 9997f, sttr, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro ldp1 reg1, reg2, ptr, val
|
|
- user_ldp 9998f, \reg1, \reg2, \ptr, \val
|
|
+ user_ldp 9997f, \reg1, \reg2, \ptr, \val
|
|
.endm
|
|
|
|
.macro stp1 reg1, reg2, ptr, val
|
|
- user_stp 9998f, \reg1, \reg2, \ptr, \val
|
|
+ user_stp 9997f, \reg1, \reg2, \ptr, \val
|
|
.endm
|
|
|
|
end .req x5
|
|
-
|
|
+srcin .req x15
|
|
SYM_FUNC_START(__arch_copy_in_user)
|
|
add end, x0, x2
|
|
+ mov srcin, x1
|
|
#include "copy_template.S"
|
|
mov x0, #0
|
|
ret
|
|
@@ -65,6 +66,12 @@ EXPORT_SYMBOL(__arch_copy_in_user)
|
|
|
|
.section .fixup,"ax"
|
|
.align 2
|
|
+9997: cmp dst, dstin
|
|
+ b.ne 9998f
|
|
+ // Before being absolutely sure we couldn't copy anything, try harder
|
|
+USER(9998f, ldtrb tmp1w, [srcin])
|
|
+USER(9998f, sttrb tmp1w, [dst])
|
|
+ add dst, dst, #1
|
|
9998: sub x0, end, dst // bytes not copied
|
|
ret
|
|
.previous
|
|
diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S
|
|
index 043da90f5dd7d..9f380eecf6531 100644
|
|
--- a/arch/arm64/lib/copy_to_user.S
|
|
+++ b/arch/arm64/lib/copy_to_user.S
|
|
@@ -32,7 +32,7 @@
|
|
.endm
|
|
|
|
.macro strh1 reg, ptr, val
|
|
- user_ldst 9998f, sttrh, \reg, \ptr, \val
|
|
+ user_ldst 9997f, sttrh, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro ldr1 reg, ptr, val
|
|
@@ -40,7 +40,7 @@
|
|
.endm
|
|
|
|
.macro str1 reg, ptr, val
|
|
- user_ldst 9998f, sttr, \reg, \ptr, \val
|
|
+ user_ldst 9997f, sttr, \reg, \ptr, \val
|
|
.endm
|
|
|
|
.macro ldp1 reg1, reg2, ptr, val
|
|
@@ -48,12 +48,14 @@
|
|
.endm
|
|
|
|
.macro stp1 reg1, reg2, ptr, val
|
|
- user_stp 9998f, \reg1, \reg2, \ptr, \val
|
|
+ user_stp 9997f, \reg1, \reg2, \ptr, \val
|
|
.endm
|
|
|
|
end .req x5
|
|
+srcin .req x15
|
|
SYM_FUNC_START(__arch_copy_to_user)
|
|
add end, x0, x2
|
|
+ mov srcin, x1
|
|
#include "copy_template.S"
|
|
mov x0, #0
|
|
ret
|
|
@@ -62,6 +64,12 @@ EXPORT_SYMBOL(__arch_copy_to_user)
|
|
|
|
.section .fixup,"ax"
|
|
.align 2
|
|
+9997: cmp dst, dstin
|
|
+ b.ne 9998f
|
|
+ // Before being absolutely sure we couldn't copy anything, try harder
|
|
+ ldrb tmp1w, [srcin]
|
|
+USER(9998f, sttrb tmp1w, [dst])
|
|
+ add dst, dst, #1
|
|
9998: sub x0, end, dst // bytes not copied
|
|
ret
|
|
.previous
|
|
diff --git a/arch/hexagon/kernel/vmlinux.lds.S b/arch/hexagon/kernel/vmlinux.lds.S
|
|
index 35b18e55eae80..57465bff1fe49 100644
|
|
--- a/arch/hexagon/kernel/vmlinux.lds.S
|
|
+++ b/arch/hexagon/kernel/vmlinux.lds.S
|
|
@@ -38,6 +38,8 @@ SECTIONS
|
|
.text : AT(ADDR(.text)) {
|
|
_text = .;
|
|
TEXT_TEXT
|
|
+ IRQENTRY_TEXT
|
|
+ SOFTIRQENTRY_TEXT
|
|
SCHED_TEXT
|
|
CPUIDLE_TEXT
|
|
LOCK_TEXT
|
|
@@ -59,14 +61,9 @@ SECTIONS
|
|
|
|
_end = .;
|
|
|
|
- /DISCARD/ : {
|
|
- EXIT_TEXT
|
|
- EXIT_DATA
|
|
- EXIT_CALL
|
|
- }
|
|
-
|
|
STABS_DEBUG
|
|
DWARF_DEBUG
|
|
ELF_DETAILS
|
|
|
|
+ DISCARDS
|
|
}
|
|
diff --git a/arch/m68k/68000/dragen2.c b/arch/m68k/68000/dragen2.c
|
|
index 584893c57c373..62f10a9e1ab7f 100644
|
|
--- a/arch/m68k/68000/dragen2.c
|
|
+++ b/arch/m68k/68000/dragen2.c
|
|
@@ -11,6 +11,7 @@
|
|
#include <linux/init.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/MC68VZ328.h>
|
|
+#include "screen.h"
|
|
|
|
/***************************************************************************/
|
|
/* Init Drangon Engine hardware */
|
|
diff --git a/arch/m68k/68000/screen.h b/arch/m68k/68000/screen.h
|
|
new file mode 100644
|
|
index 0000000000000..2089bdf02688f
|
|
--- /dev/null
|
|
+++ b/arch/m68k/68000/screen.h
|
|
@@ -0,0 +1,804 @@
|
|
+/* Created with The GIMP */
|
|
+#define screen_width 320
|
|
+#define screen_height 240
|
|
+static unsigned char screen_bits[] = {
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x56,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x0d, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x5a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x03, 0x95, 0x6a, 0x00, 0x00, 0x00, 0x03, 0xf8, 0x70, 0xe0, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
|
|
+ 0x01, 0xf8, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x5b, 0x55, 0x00, 0x00, 0x00, 0x0f,
|
|
+ 0xfc, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x38, 0x03, 0xfc, 0x00, 0x7f, 0x80, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0xb5, 0x56,
|
|
+ 0x00, 0x00, 0x00, 0x1e, 0x0c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x03, 0x0e, 0x00, 0x61,
|
|
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0xd7, 0x55, 0x55, 0x00, 0x03, 0x8e, 0x1c, 0x00, 0x70, 0xe1, 0x9e,
|
|
+ 0x0e, 0x38, 0xe1, 0x80, 0x70, 0xc0, 0xf0, 0x73, 0x33, 0xc0, 0x78, 0x38,
|
|
+ 0x00, 0x0e, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0xa9, 0xaa, 0xad, 0x00, 0x03, 0x8e, 0x38,
|
|
+ 0x00, 0x70, 0xe1, 0xff, 0x0e, 0x38, 0xe3, 0x80, 0x71, 0xc3, 0xf8, 0x77,
|
|
+ 0x3f, 0xe1, 0xfc, 0x38, 0x00, 0x0e, 0x00, 0xef, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x2b, 0x55, 0x6a,
|
|
+ 0x00, 0x03, 0x8e, 0x38, 0x00, 0x70, 0xe1, 0xe7, 0x0e, 0x38, 0x73, 0x00,
|
|
+ 0x73, 0x83, 0x9c, 0x7f, 0x3c, 0xe1, 0xce, 0x38, 0x00, 0x1c, 0x00, 0xff,
|
|
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x15, 0x56, 0xab, 0x55, 0x00, 0x03, 0x8e, 0x38, 0x00, 0x70, 0xe1, 0xc7,
|
|
+ 0x0e, 0x38, 0x76, 0x00, 0x77, 0x07, 0x1c, 0x78, 0x38, 0xe3, 0x8e, 0x38,
|
|
+ 0x00, 0x78, 0x00, 0xf3, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x69, 0x55, 0x5a, 0xb7, 0x00, 0x03, 0x8e, 0x38,
|
|
+ 0x00, 0x70, 0xe1, 0xc7, 0x0e, 0x38, 0x3c, 0x00, 0x7e, 0x07, 0xfc, 0x70,
|
|
+ 0x38, 0xe3, 0xfe, 0x38, 0x00, 0xf0, 0x00, 0xe1, 0xc0, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa5, 0x9a, 0xab, 0x6d,
|
|
+ 0x00, 0x03, 0x8e, 0x3c, 0x00, 0x70, 0xe1, 0xc7, 0x0e, 0x38, 0x3e, 0x00,
|
|
+ 0x7f, 0x07, 0xfc, 0x70, 0x38, 0xe3, 0xfe, 0x38, 0x01, 0xc0, 0x00, 0xe1,
|
|
+ 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
|
+ 0x4d, 0x75, 0xb6, 0xd5, 0x00, 0x03, 0x8e, 0x1c, 0x00, 0x70, 0xe1, 0xc7,
|
|
+ 0x0e, 0x38, 0x77, 0x00, 0x77, 0x87, 0x00, 0x70, 0x38, 0xe3, 0x80, 0x38,
|
|
+ 0x03, 0x80, 0x00, 0xe1, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x14, 0xaa, 0xca, 0xd5, 0x5b, 0x00, 0x03, 0x9e, 0x1f,
|
|
+ 0x0c, 0x70, 0xe1, 0xc7, 0x0e, 0x78, 0x67, 0x00, 0x73, 0xc7, 0x8c, 0x70,
|
|
+ 0x38, 0xe3, 0xc6, 0x38, 0x03, 0xfe, 0x38, 0x71, 0xc0, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0xb5, 0xbb, 0x5b, 0x6a,
|
|
+ 0x00, 0x03, 0xfe, 0x0f, 0xfc, 0x70, 0xe1, 0xc7, 0x0f, 0xf8, 0xe3, 0x80,
|
|
+ 0x71, 0xe3, 0xfc, 0x70, 0x38, 0xe1, 0xfe, 0x38, 0x03, 0xfe, 0x38, 0x7f,
|
|
+ 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa9,
|
|
+ 0x6b, 0x56, 0xd6, 0xad, 0x00, 0x01, 0xe6, 0x03, 0xf0, 0x70, 0xe1, 0xc7,
|
|
+ 0x07, 0x98, 0xc3, 0x80, 0x70, 0xe0, 0xf8, 0x70, 0x38, 0xe0, 0x7c, 0x38,
|
|
+ 0x03, 0xfe, 0x38, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x03, 0x55, 0x55, 0x6a, 0xba, 0xeb, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x56, 0xd5, 0xd5, 0xd5, 0xac,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x5a,
|
|
+ 0xb7, 0x3d, 0x57, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x75, 0x6d, 0xaa, 0xd3, 0xac, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8b, 0x6a, 0xb6, 0xde, 0x6b, 0xb6,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xba, 0xad,
|
|
+ 0xeb, 0x32, 0xda, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x1e, 0xaa, 0xb5, 0xad, 0x6e, 0x96, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x01, 0x86, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0xfc, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x6b, 0x6f, 0x5a, 0xb5, 0x75, 0x69,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x86, 0x00, 0x00, 0x06, 0x18, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf5, 0xda, 0xd9,
|
|
+ 0x53, 0xeb, 0x6b, 0x4b, 0x00, 0x00, 0xf0, 0xde, 0x03, 0xe6, 0xf0, 0x78,
|
|
+ 0x06, 0x0c, 0x6c, 0x7c, 0x1f, 0x87, 0x86, 0xf0, 0xc0, 0xde, 0x0f, 0xcc,
|
|
+ 0xde, 0x0f, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x03, 0xd6, 0xab, 0x57, 0x6e, 0x8a, 0xd6, 0xba, 0x00, 0x01, 0x98, 0xe7,
|
|
+ 0x01, 0x87, 0x38, 0xcc, 0x06, 0x0c, 0x6c, 0x06, 0x31, 0x8c, 0xc7, 0x38,
|
|
+ 0xc0, 0xe7, 0x18, 0xcc, 0xe7, 0x19, 0x80, 0xc3, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x0e, 0x2d, 0x5e, 0xda, 0x55, 0xbb, 0x59, 0x42,
|
|
+ 0x00, 0x03, 0x0c, 0xc3, 0x01, 0x86, 0x19, 0x8c, 0x06, 0x0c, 0x70, 0x06,
|
|
+ 0x61, 0x98, 0x66, 0x18, 0xf8, 0xc3, 0x30, 0xcc, 0xc3, 0x31, 0x80, 0xc3,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0xf7, 0x6b, 0x6a,
|
|
+ 0xab, 0x56, 0xd6, 0xbf, 0x00, 0x03, 0x0c, 0xc3, 0x01, 0x86, 0x19, 0xfc,
|
|
+ 0x06, 0x0c, 0x60, 0x7e, 0x61, 0x98, 0x66, 0x18, 0xc0, 0xc3, 0x30, 0xcc,
|
|
+ 0xc3, 0x3f, 0x80, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x75, 0x94, 0xdb, 0x75, 0x6e, 0xda, 0xaa, 0xa2, 0x00, 0x03, 0x0c, 0xc3,
|
|
+ 0x01, 0x86, 0x19, 0x80, 0x06, 0x0c, 0x60, 0xc6, 0x61, 0x98, 0x66, 0x18,
|
|
+ 0xc0, 0xc3, 0x30, 0xcc, 0xc3, 0x30, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0xdb, 0x6b, 0xad, 0x9b, 0x27, 0x55, 0x55, 0x55,
|
|
+ 0x00, 0x03, 0x0c, 0xc3, 0x01, 0x86, 0x19, 0x80, 0x06, 0x0c, 0x60, 0xc6,
|
|
+ 0x33, 0x98, 0x66, 0x18, 0xc0, 0xc3, 0x19, 0xcc, 0xc3, 0x30, 0x00, 0xc3,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x36, 0xde, 0xb5, 0x65,
|
|
+ 0x75, 0x5a, 0xd5, 0x56, 0x00, 0x01, 0x98, 0xc3, 0x01, 0x86, 0x18, 0xc4,
|
|
+ 0x06, 0x18, 0x60, 0xce, 0x1d, 0x8c, 0xc6, 0x18, 0xc0, 0xc3, 0x0e, 0xcc,
|
|
+ 0xc3, 0x18, 0x80, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
|
|
+ 0xed, 0xb5, 0x6d, 0x56, 0x55, 0x55, 0x55, 0xae, 0x00, 0x00, 0xf0, 0xc3,
|
|
+ 0x00, 0xe6, 0x18, 0x78, 0x07, 0xf0, 0x60, 0x77, 0x01, 0x87, 0x86, 0x18,
|
|
+ 0xfc, 0xc3, 0x00, 0xcc, 0xc3, 0x0f, 0x00, 0xc3, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x7a, 0xab, 0x6d, 0xda, 0xaa, 0xca, 0xd5, 0x6d, 0x58,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x80, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0xda, 0xaa, 0xea, 0xae,
|
|
+ 0x9b, 0x5a, 0xa9, 0x4b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xd5,
|
|
+ 0xbb, 0xfd, 0xad, 0xad, 0x69, 0xea, 0xcb, 0x55, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x05, 0xaf, 0xb6, 0x8a, 0x6a, 0xb9, 0x5a, 0x2d, 0xba, 0xb6,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x7a, 0x75, 0x6e, 0xcd, 0x52,
|
|
+ 0x9b, 0xdb, 0x55, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0xad,
|
|
+ 0xaf, 0x95, 0x55, 0xed, 0x55, 0x55, 0x6b, 0x55, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0xea, 0xb5, 0xec, 0xfd, 0x59, 0x5a, 0xb5, 0x56, 0xaa, 0xb6,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xb7, 0x6b, 0x36, 0x4a, 0xeb, 0xab,
|
|
+ 0x2d, 0x6a, 0x9b, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xad, 0x6f,
|
|
+ 0x6b, 0xeb, 0xdd, 0x7b, 0x6a, 0x55, 0xb5, 0x56, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x17, 0x76, 0xda, 0xd6, 0x5d, 0x62, 0xc6, 0xd5, 0x36, 0xaa, 0xb5,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xdb, 0x56, 0xbc, 0xf2, 0xa5, 0x5d,
|
|
+ 0x96, 0xaa, 0xb6, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xab, 0xee, 0xfd,
|
|
+ 0xd5, 0x2c, 0x6d, 0x9a, 0x75, 0x5b, 0x6a, 0xb5, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x03, 0xee, 0xad, 0x55, 0x15, 0xef, 0x54, 0xf6, 0xc5, 0x6a, 0xa9, 0xa6,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x05, 0x5b, 0xd6, 0xad, 0xbe, 0xb0, 0xa6, 0x35,
|
|
+ 0x5b, 0xd5, 0x4a, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0xeb, 0x5d, 0xf5,
|
|
+ 0xaa, 0xd7, 0xf4, 0x75, 0xba, 0x55, 0xaf, 0x6e, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x37, 0x5e, 0xf7, 0x55, 0x61, 0xbc, 0x08, 0x5b, 0x55, 0x5a, 0xa9, 0xb5,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0xf6, 0xba, 0xaa, 0xaa, 0x9f, 0x69, 0xec, 0xd5,
|
|
+ 0x4b, 0xa9, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2d, 0xd5, 0xed, 0x5a,
|
|
+ 0xf2, 0xd6, 0xae, 0xdb, 0x9e, 0x27, 0x5f, 0xb5, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
|
|
+ 0x6d, 0x5b, 0xaa, 0xda, 0xae, 0x95, 0x58, 0xd5, 0x34, 0x6d, 0x68, 0xad,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x15, 0xdb, 0xd7, 0x56, 0xb5, 0xd5, 0x6d, 0x29, 0x5b,
|
|
+ 0x4b, 0xdb, 0x57, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0xda, 0xac, 0xd5, 0x4b,
|
|
+ 0x57, 0x6a, 0x9b, 0x76, 0x5c, 0x95, 0x54, 0x2a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa,
|
|
+ 0xb7, 0xfb, 0xab, 0xb6, 0xea, 0xad, 0x62, 0x95, 0xa1, 0xf5, 0xa9, 0xad,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x03, 0x57, 0xaf, 0x6b, 0x72, 0x54, 0x99, 0xd5, 0x0e, 0xf3,
|
|
+ 0x5f, 0x15, 0x2a, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xea, 0xd4, 0xad, 0x5d, 0x35,
|
|
+ 0xb5, 0x34, 0xb2, 0xaa, 0x54, 0xba, 0xad, 0x55, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x5e,
|
|
+ 0xaf, 0xed, 0xab, 0xea, 0xb3, 0xaa, 0x6a, 0xad, 0xd5, 0xd5, 0xaa, 0xab,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x2a, 0xb9, 0xf5, 0xbb, 0xb5, 0x55, 0x64, 0x57, 0x55, 0x6b,
|
|
+ 0x5d, 0xd0, 0x52, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xab, 0x5b, 0xb6, 0x6d, 0x37,
|
|
+ 0x6f, 0xaa, 0x5b, 0xa2, 0xb5, 0x1f, 0xed, 0x73, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x65, 0xaa,
|
|
+ 0x6e, 0xfb, 0xd3, 0x5a, 0xd4, 0x54, 0xaa, 0x5e, 0xc3, 0xb5, 0x15, 0x56,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x07, 0xaf, 0x7f, 0xea, 0xb6, 0xaa, 0xd6, 0xad, 0xf1, 0xd2, 0xd5,
|
|
+ 0x56, 0x55, 0x6a, 0xd5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xbd, 0xda, 0xaf, 0x75, 0x6f, 0x5a,
|
|
+ 0x45, 0x26, 0xb7, 0x5b, 0x20, 0xdd, 0x55, 0x2a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0xeb, 0x7f,
|
|
+ 0xf5, 0x4d, 0x95, 0x76, 0xd9, 0x56, 0xb5, 0x52, 0x6d, 0x12, 0xad, 0xaa,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x57, 0x3f, 0xa4, 0x8f, 0xb9, 0x6e, 0xa2, 0x6f, 0x1d, 0x6a, 0xef,
|
|
+ 0xb5, 0x6d, 0xaa, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x03, 0xfd, 0x75, 0x2f, 0x7c, 0x57, 0x88, 0xf6,
|
|
+ 0x80, 0xb5, 0x57, 0x5c, 0xd7, 0x55, 0x54, 0xae, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x39, 0xff, 0xf6,
|
|
+ 0xab, 0x7a, 0x57, 0x94, 0xef, 0x0d, 0xe4, 0xea, 0xa8, 0xaa, 0xab, 0xff,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x0c, 0xf7, 0xff, 0x6d, 0xb7, 0x4b, 0x39, 0x17, 0x2a, 0xfa, 0xb7, 0x56,
|
|
+ 0xb7, 0xaa, 0xed, 0xd9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x18, 0xbe, 0xfd, 0xda, 0x9e, 0xec, 0xe6, 0xd5,
|
|
+ 0x52, 0x2a, 0x58, 0xa9, 0x54, 0x5a, 0x97, 0xe7, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xe9, 0xf6, 0xbe,
|
|
+ 0xd4, 0x5b, 0xad, 0x63, 0x61, 0xf7, 0xb7, 0xaf, 0x55, 0x52, 0x9f, 0xee,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
|
|
+ 0xc9, 0xbd, 0xfb, 0x6b, 0xeb, 0xf5, 0x6b, 0x2d, 0x57, 0x52, 0x94, 0xaa,
|
|
+ 0xb1, 0xab, 0x4a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x02, 0xdb, 0xcb, 0xff, 0xf5, 0x3b, 0x55, 0xa0, 0x00,
|
|
+ 0x45, 0x6e, 0xb5, 0xb5, 0x65, 0x52, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x2e, 0x7d, 0xdb, 0xa5,
|
|
+ 0xca, 0xbe, 0x80, 0x00, 0x0a, 0x54, 0xaa, 0xa5, 0x45, 0x08, 0x09, 0x15,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
|
|
+ 0xd8, 0xd3, 0x1b, 0xae, 0xb7, 0xea, 0x00, 0x00, 0x00, 0x95, 0xaa, 0x56,
|
|
+ 0xdc, 0xe1, 0x21, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x53, 0x41, 0xff, 0x77, 0xbd, 0xaa, 0x58, 0x00, 0x00,
|
|
+ 0x00, 0xdb, 0x75, 0xd4, 0xb2, 0xa4, 0x07, 0xea, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xef, 0x07, 0xbd, 0x65, 0xeb,
|
|
+ 0xa2, 0xd0, 0x00, 0x00, 0x00, 0x25, 0x4b, 0x35, 0x56, 0x80, 0x77, 0x6a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x28,
|
|
+ 0x01, 0x28, 0x9a, 0xb6, 0xd7, 0x60, 0x00, 0x00, 0x00, 0x0c, 0xaa, 0xaa,
|
|
+ 0xaa, 0x02, 0x07, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x17, 0xe0, 0x17, 0xb1, 0xbf, 0xee, 0xb4, 0xc0, 0x00, 0x00,
|
|
+ 0x00, 0x08, 0xaa, 0xad, 0x68, 0x54, 0x04, 0x5a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x74, 0x87, 0x77, 0x72, 0x5a,
|
|
+ 0xab, 0x80, 0x00, 0x00, 0x00, 0x02, 0xd4, 0xb5, 0x52, 0x08, 0x5b, 0xd4,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00,
|
|
+ 0x1f, 0xd6, 0xef, 0xda, 0xd5, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x52, 0xd5,
|
|
+ 0x40, 0xf1, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x9b, 0x00, 0x17, 0x4b, 0x92, 0xb7, 0xaf, 0x00, 0x00, 0x00,
|
|
+ 0x0e, 0x01, 0x4e, 0xaa, 0xae, 0x95, 0x55, 0x6d, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb8, 0x11, 0x2b, 0x13, 0x76, 0xef,
|
|
+ 0x54, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x54, 0xaa, 0xaa, 0xb5, 0xad, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x40, 0x00,
|
|
+ 0x7e, 0x7c, 0x65, 0xf4, 0x78, 0x00, 0x00, 0x00, 0x1f, 0x00, 0xab, 0x56,
|
|
+ 0xd5, 0x55, 0x59, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x0a, 0x40, 0x42, 0x6d, 0xce, 0xe5, 0xae, 0x54, 0x00, 0x00, 0x00,
|
|
+ 0x18, 0x00, 0x6d, 0x75, 0x5d, 0x55, 0x4d, 0x52, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x82, 0x03, 0xdc, 0x54, 0xbf, 0x61,
|
|
+ 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xad, 0xa2, 0xb5, 0x60, 0xad,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x16,
|
|
+ 0xd9, 0xb5, 0xa4, 0xc7, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a, 0xea,
|
|
+ 0xae, 0xd5, 0x57, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x54, 0x04, 0x0d, 0x76, 0xbb, 0x4b, 0xbc, 0x58, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x36, 0x95, 0xa9, 0x55, 0x54, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x50, 0x08, 0x5b, 0xc5, 0x3d, 0x97, 0x0a,
|
|
+ 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xb6, 0xab, 0x2b, 0x55, 0xab,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x24, 0x20, 0x3d,
|
|
+ 0x59, 0x7b, 0x76, 0x37, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x6d,
|
|
+ 0x75, 0xb5, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x12, 0xf0, 0x01, 0xff, 0x21, 0xa8, 0xc3, 0x74, 0xa8, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x1b, 0xa9, 0x4b, 0x55, 0x55, 0x2a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x25, 0xc0, 0x41, 0xca, 0x9c, 0x77, 0x58, 0x9d,
|
|
+ 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x56, 0xb4, 0xad, 0xb2, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x80, 0x0f, 0xbe,
|
|
+ 0xc0, 0xf6, 0xd5, 0xb3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x54,
|
|
+ 0xa5, 0xaa, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x17, 0x04, 0x87, 0xbc, 0x6a, 0x3b, 0xac, 0x9d, 0x58, 0x00, 0x00, 0x03,
|
|
+ 0xe0, 0x00, 0x16, 0xab, 0x55, 0x4a, 0xd6, 0xa5, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0x5c, 0x00, 0x1f, 0x54, 0xc9, 0x2a, 0xb7, 0xa6,
|
|
+ 0xd8, 0x0f, 0x00, 0x07, 0xf8, 0x00, 0x15, 0x6a, 0x55, 0x5a, 0xa4, 0xaa,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0x08, 0x74, 0xca,
|
|
+ 0x9c, 0x5a, 0xa8, 0xc5, 0x30, 0x1f, 0x80, 0x0f, 0xfc, 0x00, 0x0d, 0x55,
|
|
+ 0xaa, 0xa5, 0x55, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
|
|
+ 0xf0, 0x20, 0xea, 0x5a, 0xb0, 0xe7, 0x95, 0x7d, 0x10, 0x3f, 0xc0, 0x1f,
|
|
+ 0xfe, 0x00, 0x0a, 0xaa, 0xaa, 0xad, 0x4a, 0x95, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x03, 0xf4, 0x02, 0x7d, 0xb5, 0x8f, 0x9c, 0xaa, 0xe9,
|
|
+ 0xa0, 0x3f, 0xc0, 0x1f, 0xfe, 0x00, 0x06, 0xb5, 0x54, 0xa9, 0x2a, 0x54,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x40, 0x47, 0xeb, 0xab,
|
|
+ 0x75, 0x51, 0x55, 0x4d, 0xd8, 0x3f, 0xe0, 0x3f, 0x3f, 0x00, 0x0a, 0xaa,
|
|
+ 0xa9, 0x4a, 0xaa, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23,
|
|
+ 0xc0, 0x06, 0xff, 0xe5, 0xb6, 0xbb, 0xa9, 0x34, 0x48, 0x30, 0xe0, 0x3c,
|
|
+ 0x0f, 0x00, 0x0a, 0xaa, 0x8a, 0xaa, 0xaa, 0xa4, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0xaf, 0x80, 0x9f, 0xa1, 0x8d, 0xb5, 0xd6, 0x93, 0xcd,
|
|
+ 0x90, 0x62, 0x60, 0x3c, 0x27, 0x00, 0x06, 0xaa, 0xb5, 0xaa, 0xaa, 0xa9,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0x92, 0x3f, 0xb5, 0x36,
|
|
+ 0x56, 0xb5, 0x9d, 0x55, 0x90, 0x62, 0x60, 0x38, 0x17, 0x80, 0x0d, 0x54,
|
|
+ 0xaa, 0x54, 0xaa, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x7a,
|
|
+ 0x00, 0xba, 0xab, 0x73, 0xe7, 0xa2, 0xb6, 0x55, 0x2c, 0x61, 0x60, 0x38,
|
|
+ 0x17, 0x80, 0x09, 0x6b, 0x4a, 0xd5, 0x4a, 0x92, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x0d, 0xfe, 0x03, 0x6d, 0xea, 0x08, 0x51, 0x1d, 0x2b, 0x35,
|
|
+ 0x08, 0x61, 0x60, 0x38, 0x07, 0x80, 0x06, 0xda, 0xaa, 0xa9, 0x55, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xf8, 0x4e, 0xfb, 0x89, 0xde,
|
|
+ 0x35, 0xea, 0x6b, 0x72, 0x28, 0x60, 0x70, 0x38, 0x07, 0x80, 0x05, 0x52,
|
|
+ 0xaa, 0xaa, 0x95, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf8,
|
|
+ 0x0d, 0x63, 0xbd, 0xe3, 0x57, 0x55, 0xb6, 0x49, 0xcc, 0x20, 0x7f, 0xf8,
|
|
+ 0x07, 0x80, 0x0a, 0xaa, 0xaa, 0xaa, 0xaa, 0xad, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x5d, 0xe1, 0x34, 0xc6, 0xab, 0xa7, 0x91, 0x77, 0x37, 0xcc,
|
|
+ 0x48, 0x30, 0x9f, 0x3c, 0x07, 0x80, 0x0a, 0xaa, 0xaa, 0xaa, 0xaa, 0x69,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3b, 0xc0, 0x34, 0xdb, 0x4e, 0xf9,
|
|
+ 0xae, 0xd5, 0x54, 0xe1, 0xb4, 0x19, 0x3f, 0xfe, 0x0f, 0x00, 0x05, 0x55,
|
|
+ 0x55, 0x55, 0x52, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7f, 0x89,
|
|
+ 0xf1, 0xf7, 0xe5, 0x57, 0xea, 0x8d, 0x4c, 0xda, 0xac, 0x13, 0xff, 0xff,
|
|
+ 0x80, 0x00, 0x0a, 0xd5, 0xaa, 0xa4, 0x95, 0x54, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0xf7, 0x02, 0x53, 0x6c, 0x72, 0x10, 0xa3, 0x6a, 0x74, 0xea,
|
|
+ 0x34, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x05, 0x4e, 0x54, 0x95, 0x55, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xfc, 0x97, 0xd6, 0x55, 0xb6, 0xab,
|
|
+ 0xb7, 0x45, 0x46, 0xad, 0xf4, 0x1f, 0xff, 0xff, 0xfe, 0x00, 0x05, 0x2a,
|
|
+ 0xd5, 0x54, 0x95, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xcf, 0x0e,
|
|
+ 0xfb, 0x2d, 0x12, 0xd4, 0xb8, 0xb6, 0xeb, 0x6a, 0x10, 0x3f, 0xff, 0xff,
|
|
+ 0xff, 0x00, 0x02, 0xda, 0x8a, 0xab, 0x6a, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x57, 0xbc, 0x3a, 0xc6, 0x0d, 0x76, 0xb1, 0x77, 0x15, 0x2a, 0x56,
|
|
+ 0x34, 0x7f, 0xff, 0xff, 0xff, 0x80, 0x02, 0xa5, 0x75, 0x2a, 0x52, 0xaa,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x0f, 0xfc, 0xdf, 0x75, 0x9d, 0x5a, 0x67,
|
|
+ 0x15, 0x59, 0xb3, 0x6c, 0x4c, 0x7f, 0xff, 0xff, 0xff, 0x80, 0x05, 0x55,
|
|
+ 0x8a, 0xaa, 0xaa, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xf9, 0xdb,
|
|
+ 0xed, 0x36, 0x5a, 0xeb, 0xad, 0x6b, 0x57, 0x5d, 0xa4, 0x7f, 0xff, 0xff,
|
|
+ 0xf3, 0x80, 0x05, 0x54, 0xb2, 0xaa, 0xaa, 0xa9, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x7f, 0xf4, 0x5a, 0xaa, 0xdb, 0x40, 0x20, 0xea, 0xaa, 0xa8, 0x19,
|
|
+ 0xe8, 0x1f, 0xff, 0xff, 0xe7, 0x00, 0x02, 0x55, 0x4b, 0xd5, 0x55, 0x4a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x05, 0xff, 0xf2, 0xb5, 0x7d, 0x56, 0xaa, 0x76,
|
|
+ 0xa5, 0xce, 0xb4, 0xd1, 0x2c, 0x0f, 0xff, 0xff, 0x0f, 0x00, 0x02, 0xa5,
|
|
+ 0x5a, 0x2a, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xc1, 0x31,
|
|
+ 0x9a, 0x8d, 0x61, 0x2e, 0xb2, 0xb5, 0x57, 0x59, 0x88, 0x07, 0xff, 0xf8,
|
|
+ 0x7e, 0x06, 0x00, 0xaa, 0x65, 0xd2, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x1f, 0x7e, 0x02, 0x55, 0x67, 0xb5, 0x5b, 0x05, 0xfa, 0xab, 0x0a, 0x8d,
|
|
+ 0xe4, 0x03, 0xff, 0xc3, 0xfe, 0x07, 0x01, 0xaa, 0xaa, 0x26, 0xaa, 0xa9,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x16, 0x7d, 0x10, 0x57, 0x9d, 0x4a, 0x8a, 0xd7,
|
|
+ 0x95, 0x5a, 0xd5, 0x4d, 0x58, 0x00, 0xfc, 0x1f, 0xe6, 0x03, 0xc1, 0x55,
|
|
+ 0x52, 0xd5, 0x55, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0xe1, 0x42, 0xa4,
|
|
+ 0x7d, 0xd7, 0xba, 0xb0, 0x24, 0xd5, 0x97, 0xc5, 0xd2, 0x00, 0x00, 0x7f,
|
|
+ 0x87, 0x03, 0xe0, 0x42, 0xaa, 0x95, 0x55, 0x4b, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x0d, 0x42, 0x17, 0xfb, 0x8c, 0xac, 0x46, 0xae, 0xdd, 0xb3, 0x68, 0x92,
|
|
+ 0x6c, 0x03, 0x03, 0xfe, 0x0f, 0x01, 0xe0, 0x5a, 0x55, 0x62, 0xaa, 0x54,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0x3d, 0x0a, 0x32, 0xd5, 0x7b, 0xc9, 0xde, 0xad,
|
|
+ 0x91, 0x4a, 0xaa, 0xc6, 0x68, 0x21, 0xff, 0xf8, 0x7f, 0x00, 0x60, 0x2a,
|
|
+ 0xa9, 0x2e, 0xa9, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x64, 0xb3, 0x18,
|
|
+ 0x8e, 0xae, 0xb4, 0x46, 0x9a, 0xbb, 0x54, 0xd5, 0xb4, 0x30, 0xff, 0xe0,
|
|
+ 0xff, 0x80, 0x00, 0x52, 0xa5, 0x51, 0x55, 0x4a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
|
|
+ 0x82, 0xc1, 0x52, 0xb3, 0xcb, 0xc5, 0xd4, 0xda, 0xd3, 0x4a, 0x68, 0x87,
|
|
+ 0x68, 0x30, 0x3f, 0x03, 0xff, 0x80, 0x00, 0x2a, 0xaa, 0x55, 0x45, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0x5b, 0xc6, 0xa9, 0x19, 0x74, 0x3d, 0xa9, 0x92,
|
|
+ 0xab, 0x5b, 0x95, 0xb0, 0x28, 0x78, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x15,
|
|
+ 0x2a, 0x95, 0x2a, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x0f, 0x6b, 0xa2,
|
|
+ 0xb7, 0x22, 0x61, 0x2b, 0x52, 0xaa, 0x33, 0x1d, 0xa0, 0x7c, 0x00, 0x0f,
|
|
+ 0xff, 0xe0, 0x00, 0x14, 0xa4, 0xaa, 0xa9, 0x52, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
|
|
+ 0x00, 0x23, 0x27, 0x64, 0x8d, 0xfb, 0x64, 0xa7, 0x5a, 0xaa, 0xd3, 0x5a,
|
|
+ 0xa0, 0x7c, 0x00, 0x3f, 0xff, 0xe0, 0x00, 0x05, 0x29, 0x52, 0x45, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x02, 0x4a, 0x5f, 0x66, 0x6a, 0xab, 0x22, 0xaf, 0xec,
|
|
+ 0xa9, 0x55, 0x17, 0x17, 0xa0, 0xfe, 0x00, 0x7f, 0xff, 0xf0, 0x00, 0x02,
|
|
+ 0xaa, 0x4a, 0xaa, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x8d, 0x83, 0x49, 0xad,
|
|
+ 0x9a, 0x57, 0x50, 0x6b, 0x6b, 0x5a, 0xd1, 0x1a, 0x80, 0xff, 0x00, 0xff,
|
|
+ 0xff, 0xf0, 0x00, 0x05, 0x52, 0x95, 0x29, 0x55, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c,
|
|
+ 0x1b, 0x4b, 0xcb, 0x45, 0x7b, 0x4e, 0x4b, 0x5d, 0x2a, 0xd5, 0x16, 0x29,
|
|
+ 0x41, 0xff, 0x87, 0xff, 0xff, 0xf8, 0x00, 0x01, 0x2a, 0xa5, 0x4a, 0x52,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x20, 0x52, 0x98, 0x9d, 0x0e, 0x95, 0x65, 0x38, 0x95,
|
|
+ 0x55, 0x6a, 0xab, 0x35, 0x81, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x01,
|
|
+ 0xa9, 0x14, 0xa9, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x80, 0xe3, 0x2b, 0x74, 0x4d,
|
|
+ 0xb5, 0x55, 0xd5, 0x95, 0x69, 0x4a, 0xac, 0x6e, 0x03, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xfc, 0x00, 0x01, 0x25, 0x65, 0x2a, 0x95, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
|
+ 0x9a, 0xb7, 0x0b, 0xb0, 0x6f, 0xfc, 0xfd, 0x6a, 0x8b, 0xd5, 0x4e, 0xa8,
|
|
+ 0x03, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x01, 0x49, 0x14, 0xa5, 0x6a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x08, 0x02, 0x94, 0xab, 0x3d, 0xc9, 0x6b, 0xb5, 0x43, 0xee,
|
|
+ 0xb6, 0x95, 0x54, 0x9a, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00,
|
|
+ 0xaa, 0x54, 0xaa, 0x4a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x13, 0x9f, 0x68, 0x5b,
|
|
+ 0xff, 0xfa, 0xd7, 0xfa, 0xa5, 0x6a, 0xac, 0xd4, 0x07, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xfe, 0x00, 0x00, 0x55, 0x53, 0x2a, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04,
|
|
+ 0x65, 0x3c, 0x8b, 0x93, 0x87, 0x76, 0x75, 0xf5, 0x57, 0x55, 0x5c, 0xa8,
|
|
+ 0x0f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x0b, 0x54, 0x95, 0x54,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x2a, 0x7b, 0xfd, 0x75, 0xba, 0xae, 0xfe, 0x44, 0x5a,
|
|
+ 0x8a, 0xca, 0x9c, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
|
|
+ 0x14, 0x4a, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0xd8, 0xa2, 0xbd, 0x59, 0x52,
|
|
+ 0x8e, 0xec, 0x48, 0xf1, 0x2d, 0x52, 0x9c, 0xa0, 0x0f, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xfe, 0x02, 0x00, 0x02, 0x95, 0x54, 0x92, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x35,
|
|
+ 0x5f, 0xed, 0x6a, 0xf2, 0x95, 0x19, 0x09, 0xaa, 0x6a, 0x5d, 0x48, 0xc0,
|
|
+ 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x02, 0xaa, 0x52, 0xaa,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x04, 0x22, 0xa6, 0xc3, 0xdf, 0xd0, 0x66, 0x29, 0xf0, 0x01, 0x6a,
|
|
+ 0xca, 0xd5, 0x59, 0x80, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80,
|
|
+ 0x05, 0x2a, 0xaa, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0xa4, 0x03, 0xf2, 0x61, 0xed,
|
|
+ 0x17, 0xe2, 0x02, 0xaa, 0x99, 0x2a, 0x98, 0x80, 0x07, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x80, 0x40, 0x02, 0x55, 0x55, 0x2a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x09, 0x05,
|
|
+ 0x88, 0xa7, 0x47, 0xdc, 0xc0, 0x00, 0x2a, 0x6b, 0x4a, 0x6a, 0xb0, 0x00,
|
|
+ 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x20, 0x01, 0x55, 0x55, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x80, 0x2e, 0x89, 0x11, 0xfb, 0x87, 0x9c, 0x90, 0x64, 0xaa, 0x9a,
|
|
+ 0x4a, 0xa9, 0x1a, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x30,
|
|
+ 0x00, 0xa8, 0x42, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x2b, 0x16, 0x2b, 0x85, 0x09, 0xf8,
|
|
+ 0x83, 0x45, 0x5d, 0xad, 0x95, 0x49, 0x5c, 0x08, 0x1f, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xe0, 0x10, 0x00, 0xae, 0xea, 0x4a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x49, 0x28,
|
|
+ 0x3b, 0xf5, 0xbd, 0x30, 0x14, 0x96, 0x95, 0x6a, 0xd2, 0xb5, 0xaa, 0x10,
|
|
+ 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x18, 0x00, 0xa9, 0x15, 0x55,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x02, 0x19, 0x26, 0x58, 0x76, 0x4a, 0x1e, 0xe1, 0x7a, 0xba, 0xb1, 0x5b,
|
|
+ 0x4a, 0xab, 0x2c, 0x10, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x08,
|
|
+ 0x00, 0x2b, 0x6a, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x11, 0x21, 0x4d, 0x78, 0x6d, 0x20,
|
|
+ 0x0a, 0x84, 0xda, 0xaf, 0x55, 0x56, 0x52, 0x20, 0x3f, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xf0, 0x0c, 0x00, 0x54, 0xaa, 0xa5, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0xe8, 0x62,
|
|
+ 0xcd, 0x49, 0xd8, 0x42, 0xb4, 0xb8, 0x96, 0x3a, 0xa5, 0x54, 0xd4, 0x00,
|
|
+ 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x04, 0x00, 0x14, 0xaa, 0x4a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x05, 0x2d, 0x18, 0x4e, 0x0e, 0x61, 0xb0, 0x0a, 0xab, 0x6b, 0xaa, 0x37,
|
|
+ 0x0d, 0x5a, 0xa8, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x06,
|
|
+ 0x00, 0x2b, 0x4a, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0xb1, 0xd8, 0x5f, 0xc1, 0x90, 0x55,
|
|
+ 0x55, 0x4a, 0x32, 0xed, 0x79, 0x49, 0x50, 0x00, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xf8, 0x06, 0x00, 0x12, 0xaa, 0xa9, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x16, 0x00, 0xd1,
|
|
+ 0xac, 0x89, 0x91, 0x4a, 0xaa, 0xaa, 0xa9, 0xb2, 0xc5, 0x65, 0x68, 0x00,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x03, 0x00, 0x15, 0x2a, 0x4a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
|
|
+ 0x64, 0x54, 0x81, 0xcf, 0x89, 0x00, 0x1f, 0xf2, 0xaa, 0xd5, 0x6b, 0x35,
|
|
+ 0x5a, 0xad, 0xa8, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x03,
|
|
+ 0x00, 0x05, 0x6a, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x23, 0xf6, 0x52, 0x28, 0x19, 0xd5,
|
|
+ 0x45, 0x55, 0x49, 0x54, 0xa5, 0x6a, 0xa0, 0x01, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xfc, 0x03, 0x00, 0x15, 0x24, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x09, 0x18, 0x04, 0x6c,
|
|
+ 0x64, 0x61, 0x21, 0x95, 0xad, 0x56, 0xaa, 0xd7, 0xab, 0x55, 0x50, 0x03,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x01, 0x80, 0x04, 0xaa, 0x94,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
|
|
+ 0x12, 0x46, 0x20, 0xdc, 0xc4, 0x01, 0x01, 0xaa, 0xaa, 0xa9, 0x5b, 0x49,
|
|
+ 0x2a, 0xad, 0xa0, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x01,
|
|
+ 0x80, 0x02, 0xa4, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x10, 0x44, 0x08, 0x00, 0xd1, 0x84, 0x20, 0x05, 0xaa,
|
|
+ 0xaa, 0x95, 0x66, 0xaa, 0xaa, 0xaa, 0xa0, 0x03, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xfe, 0x01, 0x80, 0x05, 0x55, 0x29, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0c, 0xa8, 0x89, 0x99,
|
|
+ 0x00, 0x22, 0x03, 0xd5, 0x4a, 0xaa, 0xa7, 0x4d, 0x5a, 0xd5, 0x40, 0x07,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x01, 0x80, 0x02, 0x49, 0x4a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48,
|
|
+ 0x18, 0x02, 0x03, 0x24, 0x10, 0xa8, 0x2f, 0x6a, 0xaa, 0xaa, 0x45, 0x51,
|
|
+ 0x4a, 0xb5, 0x40, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
|
|
+ 0x80, 0x04, 0x95, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x02, 0x01, 0x05, 0x48, 0x07, 0xae, 0x83, 0x02, 0x8c, 0x2a,
|
|
+ 0x95, 0x52, 0xcd, 0x56, 0xad, 0x56, 0xc0, 0x07, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xfe, 0x00, 0xc0, 0x01, 0x52, 0x52, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x58, 0x98, 0x2f, 0x30,
|
|
+ 0x02, 0x82, 0x01, 0x6a, 0xaa, 0xaa, 0x8d, 0x29, 0x35, 0xb5, 0x04, 0x07,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0xc0, 0x02, 0x94, 0x95,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
|
|
+ 0x45, 0x30, 0x1f, 0xa0, 0x25, 0x1d, 0x15, 0x4a, 0xa5, 0x51, 0xad, 0x55,
|
|
+ 0x6d, 0x6a, 0x84, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
|
|
+ 0xc0, 0x01, 0x29, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x08, 0xa1, 0x2d, 0x21, 0x7f, 0x40, 0x4d, 0xb0, 0x35, 0x55,
|
|
+ 0x15, 0x15, 0x79, 0x25, 0x4a, 0xca, 0x04, 0x0f, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x00, 0xc0, 0x02, 0x52, 0x96, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x7f, 0x24,
|
|
+ 0x8a, 0x58, 0xad, 0x55, 0x55, 0x52, 0x0a, 0x5a, 0xaa, 0xbb, 0x04, 0x0f,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0x00, 0xa5, 0x20,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x09,
|
|
+ 0x50, 0x42, 0xfd, 0xc0, 0x59, 0x53, 0x53, 0x4c, 0xaa, 0x54, 0x5a, 0xa2,
|
|
+ 0xad, 0xaa, 0x04, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
|
|
+ 0xc0, 0x01, 0x4d, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x08, 0x02, 0x15, 0x90, 0x7d, 0x15, 0x76, 0xac, 0xad, 0x52,
|
|
+ 0x95, 0x55, 0xaa, 0x4c, 0xa5, 0x54, 0x04, 0x0f, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x00, 0xc0, 0x00, 0xa5, 0x12, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x0c, 0x83, 0x01, 0xff, 0xf9,
|
|
+ 0x15, 0x29, 0x51, 0x55, 0x52, 0x2c, 0xa2, 0x54, 0xab, 0x6c, 0x04, 0x0f,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x80, 0x01, 0x28, 0x54,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98,
|
|
+ 0x06, 0x01, 0xff, 0xe9, 0x55, 0xd5, 0x56, 0xa5, 0x55, 0xaa, 0xad, 0x51,
|
|
+ 0x35, 0x54, 0x04, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
|
|
+ 0x80, 0x00, 0x4a, 0xa9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x01, 0x08, 0x31, 0x1c, 0x12, 0xf4, 0xc5, 0x44, 0x5a, 0xaa, 0x49,
|
|
+ 0xaa, 0xa9, 0xa8, 0x95, 0x55, 0x50, 0x04, 0x0f, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x01, 0x80, 0x01, 0x52, 0x82, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x48, 0x1c, 0x41, 0x3e, 0x2e,
|
|
+ 0x8b, 0x54, 0xaa, 0xab, 0x52, 0xa5, 0x45, 0x24, 0x95, 0x50, 0x06, 0x0f,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x01, 0x24, 0x5a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x00,
|
|
+ 0x38, 0x01, 0x1d, 0x64, 0x9a, 0xa9, 0x2a, 0x94, 0xaa, 0xab, 0x55, 0x55,
|
|
+ 0xaa, 0xd8, 0x02, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03,
|
|
+ 0x00, 0x01, 0x4a, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x13, 0xc8, 0x00, 0xb0, 0x02, 0x3e, 0x96, 0x35, 0x6a, 0xaa, 0x55,
|
|
+ 0x4a, 0x95, 0x4a, 0x54, 0x55, 0x28, 0x03, 0x0f, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x8f, 0xc0, 0x01, 0x29, 0x4a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x83, 0x49, 0x20, 0x8c, 0x78, 0xb5,
|
|
+ 0x65, 0x4a, 0xaa, 0xa6, 0xaa, 0xa5, 0x29, 0x45, 0xaa, 0xa8, 0x03, 0x0f,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x70, 0x01, 0x45, 0x28,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x03, 0x20,
|
|
+ 0x00, 0x30, 0x75, 0x4c, 0x95, 0x55, 0x54, 0xa9, 0x52, 0x95, 0x52, 0x95,
|
|
+ 0x2a, 0xa8, 0x01, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80,
|
|
+ 0x18, 0x00, 0x94, 0xa5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x0d, 0x0c, 0x0c, 0x44, 0x18, 0xe5, 0xb9, 0xb5, 0x54, 0x92, 0x96,
|
|
+ 0xaa, 0x55, 0x4a, 0x69, 0x55, 0x20, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x00, 0x00, 0x01, 0x29, 0x29, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x2e, 0x08, 0x1c, 0x01, 0x7b, 0xdc, 0x96,
|
|
+ 0x4a, 0xaa, 0xaa, 0xa9, 0x4a, 0xaa, 0x95, 0x0a, 0x73, 0x50, 0x00, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x01, 0x52, 0x52,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x20, 0x30,
|
|
+ 0x44, 0x79, 0x88, 0xd4, 0x95, 0x49, 0x54, 0xab, 0x52, 0x94, 0xa4, 0xaa,
|
|
+ 0xc6, 0x51, 0xe0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
|
|
+ 0x00, 0x00, 0x8a, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x38, 0x2a, 0x21, 0x01, 0xfb, 0xa0, 0x7d, 0x54, 0xb5, 0x55, 0x54,
|
|
+ 0x95, 0x55, 0x29, 0x55, 0x29, 0x57, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xfe, 0x00, 0x00, 0x02, 0x50, 0x52, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x90, 0x00, 0x0d, 0xfb, 0xca, 0xd2,
|
|
+ 0xaa, 0x92, 0x49, 0x55, 0x55, 0x2a, 0x4a, 0x4a, 0xd3, 0x57, 0xfc, 0x1f,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x02, 0x95, 0x54,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x20, 0xa4,
|
|
+ 0x13, 0xfd, 0xab, 0x2a, 0x52, 0xa5, 0x52, 0x55, 0x52, 0xa9, 0x55, 0x55,
|
|
+ 0x2a, 0x57, 0xff, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc6, 0x00,
|
|
+ 0x00, 0x0d, 0x24, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x08, 0x30, 0xc0, 0x00, 0x77, 0xb5, 0x55, 0x69, 0x4a, 0xaa, 0x96, 0xaa,
|
|
+ 0x94, 0xaa, 0x91, 0x45, 0x55, 0x4f, 0xff, 0x03, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0xcf, 0x00, 0x00, 0x1e, 0x55, 0x2a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x30, 0x81, 0x00, 0x67, 0xb4, 0x74, 0x52,
|
|
+ 0x55, 0x55, 0x2a, 0xaa, 0xaa, 0x52, 0x55, 0x35, 0x52, 0xaf, 0xff, 0x81,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x00, 0x00, 0x1e, 0xa0, 0x48,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe3, 0x00, 0x08,
|
|
+ 0x86, 0x4a, 0xd4, 0xd5, 0x54, 0x91, 0x49, 0x55, 0x51, 0x54, 0x95, 0x49,
|
|
+ 0x56, 0x4f, 0xff, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x80,
|
|
+ 0x00, 0x3e, 0x0b, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x05, 0xc4, 0x02, 0x00, 0x7f, 0xbd, 0x8a, 0x25, 0x49, 0x55, 0x2a, 0xb5,
|
|
+ 0x55, 0x52, 0xa4, 0x96, 0xac, 0x8f, 0xff, 0xe0, 0x7f, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x9f, 0x80, 0x00, 0x7e, 0x54, 0xa4, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x43, 0x80, 0x20, 0x21, 0x4d, 0x3f, 0x52, 0xb4,
|
|
+ 0x55, 0x2a, 0x55, 0x55, 0x4a, 0xa4, 0x95, 0x32, 0xa5, 0x4f, 0xff, 0xe0,
|
|
+ 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xc0, 0x00, 0xfe, 0x49, 0x14,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe8, 0x04, 0x08,
|
|
+ 0x1a, 0x46, 0xd4, 0x49, 0xaa, 0xa4, 0xaa, 0xaa, 0x54, 0x95, 0x2a, 0xc4,
|
|
+ 0x94, 0x8f, 0xff, 0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xe0,
|
|
+ 0x01, 0xfe, 0x92, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x8e, 0x40, 0x80, 0x00, 0x74, 0x44, 0x51, 0x55, 0x64, 0xa9, 0x49, 0x55,
|
|
+ 0x49, 0x51, 0x52, 0x5a, 0x2a, 0x1f, 0xff, 0xf8, 0x07, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x9f, 0xf0, 0x07, 0xfe, 0x24, 0x52, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x0d, 0x90, 0x00, 0x41, 0xeb, 0x12, 0xab, 0x52,
|
|
+ 0xa9, 0x4a, 0xaa, 0xa5, 0x52, 0x95, 0x2a, 0xa2, 0xa8, 0x1f, 0xff, 0xf8,
|
|
+ 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xf8, 0x1f, 0xfe, 0x52, 0x8a,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3b, 0x81, 0x08, 0x05,
|
|
+ 0xe3, 0x15, 0xa5, 0x36, 0x95, 0x4a, 0x4a, 0xaa, 0x45, 0x2a, 0xa2, 0xac,
|
|
+ 0x00, 0x3f, 0xff, 0xfc, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xff,
|
|
+ 0xff, 0xfe, 0x04, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0xb2, 0x00, 0x00, 0x80, 0xe8, 0x52, 0xac, 0xa8, 0xa4, 0x92, 0xa9, 0x4a,
|
|
+ 0x95, 0x51, 0x2d, 0x50, 0xe1, 0xff, 0xff, 0xfe, 0x00, 0x7f, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x9f, 0xff, 0xff, 0xfe, 0x29, 0x05, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x04, 0x00, 0x35, 0x10, 0x09, 0xa9, 0x4a, 0xaa, 0xaa,
|
|
+ 0xa9, 0x54, 0x95, 0x2a, 0xa4, 0x8a, 0xa9, 0x43, 0xff, 0xff, 0xff, 0xfe,
|
|
+ 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0xfe, 0x12, 0xa9,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0x03,
|
|
+ 0x34, 0xa5, 0x19, 0x25, 0x55, 0x55, 0x55, 0x55, 0x15, 0x55, 0x45, 0x53,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xff,
|
|
+ 0xff, 0xfe, 0x04, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
|
|
+ 0x49, 0x3c, 0x00, 0x34, 0x75, 0x4a, 0xa2, 0xaa, 0x92, 0x92, 0x92, 0x54,
|
|
+ 0x52, 0x54, 0x99, 0x53, 0xff, 0xff, 0xff, 0xff, 0x80, 0x0f, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x9f, 0xff, 0xff, 0xff, 0x14, 0x94, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0x02, 0x00, 0x78, 0x12, 0xfc, 0xaa, 0x92, 0x2d, 0x54,
|
|
+ 0xa4, 0xa5, 0x2a, 0x92, 0x94, 0x92, 0xa2, 0xa3, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0x80, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0xff, 0x01, 0x51,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x16, 0xf0, 0x80, 0x71,
|
|
+ 0xc5, 0x2a, 0x65, 0x25, 0x55, 0x4a, 0x52, 0xaa, 0x51, 0x52, 0x95, 0x21,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xc0, 0x07, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff,
|
|
+ 0xff, 0xff, 0x81, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
|
+ 0x8e, 0xa0, 0x00, 0xb3, 0x94, 0xa4, 0xa9, 0x55, 0x45, 0x54, 0xa5, 0x25,
|
|
+ 0x25, 0x2a, 0x65, 0x41, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x07, 0xff, 0xff,
|
|
+ 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0x80, 0x4a, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x00, 0xa0, 0x0f, 0x42, 0x13, 0x46, 0x94, 0x94, 0xa5, 0x4a,
|
|
+ 0x54, 0x92, 0x88, 0xa8, 0x49, 0x55, 0x4a, 0x51, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xe0, 0x07, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xe0, 0x52,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2d, 0x00, 0x87, 0x56,
|
|
+ 0x4b, 0x2a, 0x99, 0x55, 0x4a, 0xaa, 0x55, 0x4a, 0x92, 0xa2, 0x54, 0xa8,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xf0, 0x07, 0xff, 0xff, 0xff, 0xfd, 0x8f, 0xff,
|
|
+ 0xff, 0xff, 0xfe, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x88,
|
|
+ 0x18, 0x04, 0x1f, 0x11, 0x51, 0x51, 0x0b, 0x54, 0x94, 0xa5, 0x52, 0x92,
|
|
+ 0x55, 0x54, 0x95, 0x20, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x0f, 0xff, 0xff,
|
|
+ 0xff, 0xf9, 0x8f, 0xff, 0xff, 0xff, 0xff, 0x89, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x11, 0xe0, 0x38, 0x01, 0x3e, 0x4d, 0x0a, 0x55, 0x5a, 0x55,
|
|
+ 0x55, 0x4a, 0x25, 0x24, 0x81, 0x25, 0x29, 0x48, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xc2,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0xf0, 0x90, 0x7e, 0xd4,
|
|
+ 0x68, 0x92, 0xaa, 0x54, 0x92, 0x92, 0xa9, 0x55, 0x2e, 0xaa, 0xa2, 0x58,
|
|
+ 0x7f, 0xff, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xff, 0xe0, 0x8f, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x04,
|
|
+ 0x40, 0x00, 0x49, 0xe2, 0x8a, 0xa9, 0x54, 0x95, 0x2a, 0x54, 0x4a, 0x48,
|
|
+ 0x91, 0x51, 0x2a, 0xc8, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xc0, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xe2, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x2e, 0x00, 0x00, 0x03, 0x79, 0x4a, 0xa9, 0x45, 0x49, 0x54,
|
|
+ 0xa4, 0x89, 0x49, 0x52, 0x8a, 0x85, 0x4a, 0x98, 0x7f, 0xff, 0xff, 0xff,
|
|
+ 0xfe, 0x7f, 0xff, 0xff, 0xff, 0x80, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xc4,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x48, 0x44, 0x91, 0x65, 0x55,
|
|
+ 0x4a, 0x54, 0x96, 0x85, 0x55, 0x52, 0xaa, 0x8a, 0x1a, 0xaa, 0x59, 0x30,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xfe, 0x01, 0x0f, 0xff,
|
|
+ 0xff, 0xff, 0xff, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00,
|
|
+ 0x00, 0x02, 0xc3, 0x50, 0x29, 0x49, 0x2d, 0x35, 0x24, 0x54, 0x89, 0x32,
|
|
+ 0x52, 0x91, 0x49, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0x30, 0xff, 0xff,
|
|
+ 0xfc, 0x01, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x00, 0x20, 0x08, 0x80, 0x00, 0x87, 0x4b, 0x42, 0x95, 0x2a, 0x4a,
|
|
+ 0x4a, 0x89, 0x52, 0x44, 0x45, 0x25, 0x55, 0x10, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0x98, 0x7f, 0xff, 0xf0, 0x01, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x09,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x40, 0x11, 0x15, 0x6a, 0x92,
|
|
+ 0x4d, 0x29, 0x4a, 0xaa, 0xa4, 0xaa, 0x55, 0x54, 0x9a, 0x74, 0x44, 0xb1,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0x8c, 0x1f, 0xff, 0x00, 0x01, 0x0f, 0xff,
|
|
+ 0xff, 0xff, 0xf0, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
|
|
+ 0x80, 0x01, 0x48, 0x54, 0x94, 0xa6, 0xa9, 0x52, 0x45, 0x24, 0x84, 0x92,
|
|
+ 0xa4, 0x85, 0x2a, 0x43, 0xff, 0xff, 0xff, 0xff, 0xff, 0x84, 0x00, 0x00,
|
|
+ 0x00, 0x01, 0x1f, 0xff, 0xff, 0xff, 0xc0, 0x92, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x11, 0x00, 0x09, 0x02, 0x03, 0x53, 0x15, 0x2a, 0x49, 0x4a, 0xa5,
|
|
+ 0x49, 0x29, 0x29, 0x24, 0x2a, 0xd5, 0x54, 0xa3, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xc6, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xff, 0xff, 0xfe, 0x01, 0x24,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x02, 0x20, 0x26, 0xd4, 0xa2,
|
|
+ 0x49, 0xb5, 0x15, 0x4a, 0x52, 0xa9, 0x4a, 0x92, 0xa5, 0x12, 0x52, 0xa3,
|
|
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xc6, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xff,
|
|
+ 0xff, 0xf0, 0x14, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x44,
|
|
+ 0x00, 0x0c, 0xc4, 0xa4, 0xa8, 0x25, 0x2a, 0xaa, 0x84, 0x45, 0x28, 0xa4,
|
|
+ 0xa8, 0xa5, 0x4a, 0x43, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc2, 0x00, 0x00,
|
|
+ 0x00, 0x06, 0x1f, 0xff, 0xff, 0xc0, 0x25, 0x24, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x00, 0x10, 0x80, 0x12, 0x01, 0x11, 0x12, 0x8a, 0x95, 0x49, 0x55, 0x49,
|
|
+ 0x2a, 0xaa, 0x45, 0x0a, 0x4a, 0x94, 0xaa, 0x90, 0xff, 0xff, 0xff, 0xff,
|
|
+ 0xff, 0xc2, 0x00, 0x00, 0x00, 0x06, 0x1f, 0xff, 0xff, 0x02, 0x48, 0x92,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x08, 0x00, 0x22, 0x01, 0x24, 0x95,
|
|
+ 0x21, 0x55, 0x55, 0x2a, 0x54, 0x92, 0x94, 0xa8, 0xa9, 0x2a, 0x92, 0xa8,
|
|
+ 0x1f, 0xff, 0xff, 0xff, 0xff, 0x82, 0x00, 0x00, 0x00, 0x06, 0x0f, 0xff,
|
|
+ 0xfe, 0x02, 0x49, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x40,
|
|
+ 0x00, 0xc4, 0x89, 0x11, 0x54, 0x95, 0x29, 0x49, 0x49, 0x24, 0x29, 0x12,
|
|
+ 0x92, 0xa5, 0x55, 0x28, 0x01, 0xff, 0xff, 0xff, 0xff, 0x82, 0x00, 0x00,
|
|
+ 0x00, 0x02, 0x0f, 0xff, 0xfc, 0x14, 0x92, 0x49, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x08, 0x42, 0x06, 0x44, 0x45, 0x08, 0x92, 0x24, 0x95, 0xaa, 0xa5, 0x52,
|
|
+ 0x92, 0x55, 0x42, 0x52, 0xaa, 0x4a, 0x49, 0x4a, 0x80, 0x0f, 0xff, 0xff,
|
|
+ 0xff, 0x84, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x04, 0x92, 0x49,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2a, 0x80, 0x01, 0x95, 0x2a, 0x8a,
|
|
+ 0xa0, 0x95, 0x2a, 0x95, 0x54, 0xa4, 0x54, 0x84, 0x44, 0x95, 0x55, 0x29,
|
|
+ 0x54, 0x00, 0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff,
|
|
+ 0xe0, 0x29, 0x24, 0x92, 0x00, 0x00, 0x00, 0x00, 0x22, 0x04, 0x03, 0x03,
|
|
+ 0x42, 0x12, 0x52, 0x2a, 0x15, 0x55, 0x54, 0xa8, 0x92, 0xa9, 0x49, 0x29,
|
|
+ 0x54, 0xaa, 0x92, 0x52, 0xa5, 0x40, 0x07, 0xff, 0xff, 0x00, 0x15, 0x50,
|
|
+ 0x92, 0x44, 0x07, 0xff, 0xc0, 0x52, 0x54, 0xaa, 0x00, 0x00, 0x00, 0x00,
|
|
+ 0x84, 0x02, 0x86, 0x03, 0x08, 0x41, 0x48, 0x94, 0xa5, 0x52, 0xaa, 0x8a,
|
|
+ 0x49, 0x52, 0x92, 0x45, 0x49, 0x55, 0x2a, 0xaa, 0x94, 0x96, 0x00, 0x7f,
|
|
+ 0xfe, 0x01, 0x55, 0x2b, 0x25, 0x50, 0x03, 0xff, 0x00, 0xa4, 0x91, 0x08,
|
|
+ 0x00, 0x00, 0x00, 0x00, 0x88, 0x2c, 0x18, 0x14, 0x0a, 0xaa, 0x92, 0x55,
|
|
+ 0x49, 0x55, 0x4a, 0xa9, 0x52, 0x44, 0x92, 0x94, 0x92, 0x92, 0xca, 0x4a,
|
|
+ 0x55, 0x27, 0xa0, 0x0f, 0xf8, 0x05, 0x35, 0x49, 0x68, 0x91, 0x00, 0xf8,
|
|
+ 0x04, 0x95, 0x25, 0x29, 0x00, 0x00, 0x00, 0x01, 0x08, 0x04, 0x18, 0x00,
|
|
+ 0x08, 0x04, 0x49, 0x08, 0x55, 0x4a, 0xa9, 0x12, 0x95, 0x55, 0x49, 0x22,
|
|
+ 0x65, 0x2a, 0x5a, 0x92, 0xa9, 0x49, 0x54, 0x00, 0xe0, 0x24, 0xb2, 0x55,
|
|
+ 0x15, 0x4c, 0x00, 0x00, 0x02, 0x48, 0x52, 0x52, 0x00, 0x00, 0x00, 0x02,
|
|
+ 0x21, 0x09, 0x50, 0x81, 0x51, 0x69, 0x48, 0x52, 0x92, 0x94, 0xaa, 0x54,
|
|
+ 0x25, 0x54, 0x92, 0x4a, 0x89, 0x54, 0x82, 0xaa, 0x4a, 0x53, 0x55, 0x00,
|
|
+ 0x00, 0x49, 0x65, 0x52, 0x51, 0x12, 0x80, 0x00, 0x14, 0x92, 0x92, 0x42,
|
|
+ 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x50, 0x24, 0x2a, 0x95, 0x25, 0x29,
|
|
+ 0x4a, 0xb5, 0x48, 0xa5, 0x52, 0x49, 0x24, 0x94, 0xaa, 0xab, 0x15, 0x24,
|
|
+ 0x92, 0xa5, 0x54, 0x40, 0x00, 0xaa, 0xb5, 0x25, 0x4a, 0xa4, 0x80, 0x00,
|
|
+ 0x21, 0x24, 0xa8, 0x94, 0x00, 0x00, 0x00, 0x0a, 0x44, 0x02, 0xb1, 0x01,
|
|
+ 0x24, 0x80, 0x48, 0xa2, 0x55, 0x55, 0x52, 0x8a, 0x94, 0xaa, 0x49, 0x22,
|
|
+ 0x8a, 0x49, 0x49, 0x55, 0x4a, 0x51, 0x25, 0x48, 0x02, 0xa8, 0x6a, 0x69,
|
|
+ 0x12, 0x29, 0x50, 0x00, 0x55, 0x24, 0x81, 0x24, 0x00, 0x00, 0x00, 0x23,
|
|
+ 0x80, 0x90, 0x70, 0x14, 0x82, 0x55, 0x22, 0x8a, 0xa9, 0x14, 0xaa, 0xa9,
|
|
+ 0x25, 0x51, 0x2a, 0x55, 0x21, 0x55, 0x55, 0x12, 0x55, 0x32, 0xaa, 0x94,
|
|
+ 0xa5, 0x55, 0x5a, 0x92, 0x54, 0xa5, 0x52, 0x24, 0xa2, 0x49, 0x2a, 0x92,
|
|
+ 0x00, 0x00, 0x00, 0x0e, 0x08, 0x00, 0xe2, 0xa0, 0x04, 0x54, 0x84, 0x52,
|
|
+ 0x4a, 0xa4, 0xaa, 0x2a, 0xa9, 0x25, 0x45, 0x42, 0xae, 0x92, 0x44, 0xa4,
|
|
+ 0x91, 0x24, 0xaa, 0xaa, 0xaa, 0x91, 0x55, 0x55, 0x51, 0x55, 0x54, 0xa9,
|
|
+ 0x14, 0x92, 0x49, 0x24, 0x00, 0x00, 0x00, 0x24, 0x01, 0x82, 0x70, 0x09,
|
|
+ 0x2a, 0x41, 0x2a, 0x89, 0x14, 0x49, 0x29, 0x52, 0x4a, 0xaa, 0x2a, 0x15,
|
|
+ 0x12, 0xaa, 0xa9, 0x2a, 0xaa, 0xba, 0xa4, 0x94, 0x95, 0x55, 0x5a, 0x49,
|
|
+ 0x25, 0x20, 0x49, 0x22, 0xa5, 0x24, 0x92, 0x92, 0x00, 0x00, 0x01, 0x0c,
|
|
+ 0x93, 0x10, 0xe2, 0x11, 0x00, 0x94, 0x22, 0x52, 0x69, 0x53, 0x52, 0x45,
|
|
+ 0x49, 0x22, 0xa4, 0x4a, 0x55, 0x29, 0x2a, 0xa4, 0x52, 0x42, 0xaa, 0xa5,
|
|
+ 0x52, 0xa8, 0xaa, 0x55, 0x4a, 0xab, 0xa9, 0x4a, 0x54, 0x49, 0x32, 0x24 };
|
|
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
|
|
index e4b7839293e16..3548b3b452699 100644
|
|
--- a/arch/mips/boot/compressed/Makefile
|
|
+++ b/arch/mips/boot/compressed/Makefile
|
|
@@ -40,7 +40,7 @@ GCOV_PROFILE := n
|
|
UBSAN_SANITIZE := n
|
|
|
|
# decompressor objects (linked with vmlinuz)
|
|
-vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
|
|
+vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o $(obj)/bswapsi.o
|
|
|
|
ifdef CONFIG_DEBUG_ZBOOT
|
|
vmlinuzobjs-$(CONFIG_DEBUG_ZBOOT) += $(obj)/dbg.o
|
|
@@ -54,7 +54,7 @@ extra-y += uart-ath79.c
|
|
$(obj)/uart-ath79.c: $(srctree)/arch/mips/ath79/early_printk.c
|
|
$(call cmd,shipped)
|
|
|
|
-vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o $(obj)/bswapsi.o
|
|
+vmlinuzobjs-$(CONFIG_KERNEL_XZ) += $(obj)/ashldi3.o
|
|
|
|
extra-y += ashldi3.c
|
|
$(obj)/ashldi3.c: $(obj)/%.c: $(srctree)/lib/%.c FORCE
|
|
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
|
|
index 3d70d15ada286..aae1346a509a9 100644
|
|
--- a/arch/mips/boot/compressed/decompress.c
|
|
+++ b/arch/mips/boot/compressed/decompress.c
|
|
@@ -7,6 +7,8 @@
|
|
* Author: Wu Zhangjin <wuzhangjin@gmail.com>
|
|
*/
|
|
|
|
+#define DISABLE_BRANCH_PROFILING
|
|
+
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
diff --git a/arch/mips/include/asm/vdso/vdso.h b/arch/mips/include/asm/vdso/vdso.h
|
|
index 737ddfc3411cb..a327ca21270ec 100644
|
|
--- a/arch/mips/include/asm/vdso/vdso.h
|
|
+++ b/arch/mips/include/asm/vdso/vdso.h
|
|
@@ -67,7 +67,7 @@ static inline const struct vdso_data *get_vdso_data(void)
|
|
|
|
static inline void __iomem *get_gic(const struct vdso_data *data)
|
|
{
|
|
- return (void __iomem *)data - PAGE_SIZE;
|
|
+ return (void __iomem *)((unsigned long)data & PAGE_MASK) - PAGE_SIZE;
|
|
}
|
|
|
|
#endif /* CONFIG_CLKSRC_MIPS_GIC */
|
|
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
|
|
index 5d91036ad626d..58fbcfcc98c9e 100644
|
|
--- a/arch/powerpc/boot/devtree.c
|
|
+++ b/arch/powerpc/boot/devtree.c
|
|
@@ -13,6 +13,7 @@
|
|
#include "string.h"
|
|
#include "stdio.h"
|
|
#include "ops.h"
|
|
+#include "of.h"
|
|
|
|
void dt_fixup_memory(u64 start, u64 size)
|
|
{
|
|
@@ -23,21 +24,25 @@ void dt_fixup_memory(u64 start, u64 size)
|
|
root = finddevice("/");
|
|
if (getprop(root, "#address-cells", &naddr, sizeof(naddr)) < 0)
|
|
naddr = 2;
|
|
+ else
|
|
+ naddr = be32_to_cpu(naddr);
|
|
if (naddr < 1 || naddr > 2)
|
|
fatal("Can't cope with #address-cells == %d in /\n\r", naddr);
|
|
|
|
if (getprop(root, "#size-cells", &nsize, sizeof(nsize)) < 0)
|
|
nsize = 1;
|
|
+ else
|
|
+ nsize = be32_to_cpu(nsize);
|
|
if (nsize < 1 || nsize > 2)
|
|
fatal("Can't cope with #size-cells == %d in /\n\r", nsize);
|
|
|
|
i = 0;
|
|
if (naddr == 2)
|
|
- memreg[i++] = start >> 32;
|
|
- memreg[i++] = start & 0xffffffff;
|
|
+ memreg[i++] = cpu_to_be32(start >> 32);
|
|
+ memreg[i++] = cpu_to_be32(start & 0xffffffff);
|
|
if (nsize == 2)
|
|
- memreg[i++] = size >> 32;
|
|
- memreg[i++] = size & 0xffffffff;
|
|
+ memreg[i++] = cpu_to_be32(size >> 32);
|
|
+ memreg[i++] = cpu_to_be32(size & 0xffffffff);
|
|
|
|
memory = finddevice("/memory");
|
|
if (! memory) {
|
|
@@ -45,9 +50,9 @@ void dt_fixup_memory(u64 start, u64 size)
|
|
setprop_str(memory, "device_type", "memory");
|
|
}
|
|
|
|
- printf("Memory <- <0x%x", memreg[0]);
|
|
+ printf("Memory <- <0x%x", be32_to_cpu(memreg[0]));
|
|
for (i = 1; i < (naddr + nsize); i++)
|
|
- printf(" 0x%x", memreg[i]);
|
|
+ printf(" 0x%x", be32_to_cpu(memreg[i]));
|
|
printf("> (%ldMB)\n\r", (unsigned long)(size >> 20));
|
|
|
|
setprop(memory, "reg", memreg, (naddr + nsize)*sizeof(u32));
|
|
@@ -65,10 +70,10 @@ void dt_fixup_cpu_clocks(u32 cpu, u32 tb, u32 bus)
|
|
printf("CPU bus-frequency <- 0x%x (%dMHz)\n\r", bus, MHZ(bus));
|
|
|
|
while ((devp = find_node_by_devtype(devp, "cpu"))) {
|
|
- setprop_val(devp, "clock-frequency", cpu);
|
|
- setprop_val(devp, "timebase-frequency", tb);
|
|
+ setprop_val(devp, "clock-frequency", cpu_to_be32(cpu));
|
|
+ setprop_val(devp, "timebase-frequency", cpu_to_be32(tb));
|
|
if (bus > 0)
|
|
- setprop_val(devp, "bus-frequency", bus);
|
|
+ setprop_val(devp, "bus-frequency", cpu_to_be32(bus));
|
|
}
|
|
|
|
timebase_period_ns = 1000000000 / tb;
|
|
@@ -80,7 +85,7 @@ void dt_fixup_clock(const char *path, u32 freq)
|
|
|
|
if (devp) {
|
|
printf("%s: clock-frequency <- %x (%dMHz)\n\r", path, freq, MHZ(freq));
|
|
- setprop_val(devp, "clock-frequency", freq);
|
|
+ setprop_val(devp, "clock-frequency", cpu_to_be32(freq));
|
|
}
|
|
}
|
|
|
|
@@ -133,8 +138,12 @@ void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize)
|
|
{
|
|
if (getprop(node, "#address-cells", naddr, 4) != 4)
|
|
*naddr = 2;
|
|
+ else
|
|
+ *naddr = be32_to_cpu(*naddr);
|
|
if (getprop(node, "#size-cells", nsize, 4) != 4)
|
|
*nsize = 1;
|
|
+ else
|
|
+ *nsize = be32_to_cpu(*nsize);
|
|
}
|
|
|
|
static void copy_val(u32 *dest, u32 *src, int naddr)
|
|
@@ -163,9 +172,9 @@ static int add_reg(u32 *reg, u32 *add, int naddr)
|
|
int i, carry = 0;
|
|
|
|
for (i = MAX_ADDR_CELLS - 1; i >= MAX_ADDR_CELLS - naddr; i--) {
|
|
- u64 tmp = (u64)reg[i] + add[i] + carry;
|
|
+ u64 tmp = (u64)be32_to_cpu(reg[i]) + be32_to_cpu(add[i]) + carry;
|
|
carry = tmp >> 32;
|
|
- reg[i] = (u32)tmp;
|
|
+ reg[i] = cpu_to_be32((u32)tmp);
|
|
}
|
|
|
|
return !carry;
|
|
@@ -180,18 +189,18 @@ static int compare_reg(u32 *reg, u32 *range, u32 *rangesize)
|
|
u32 end;
|
|
|
|
for (i = 0; i < MAX_ADDR_CELLS; i++) {
|
|
- if (reg[i] < range[i])
|
|
+ if (be32_to_cpu(reg[i]) < be32_to_cpu(range[i]))
|
|
return 0;
|
|
- if (reg[i] > range[i])
|
|
+ if (be32_to_cpu(reg[i]) > be32_to_cpu(range[i]))
|
|
break;
|
|
}
|
|
|
|
for (i = 0; i < MAX_ADDR_CELLS; i++) {
|
|
- end = range[i] + rangesize[i];
|
|
+ end = be32_to_cpu(range[i]) + be32_to_cpu(rangesize[i]);
|
|
|
|
- if (reg[i] < end)
|
|
+ if (be32_to_cpu(reg[i]) < end)
|
|
break;
|
|
- if (reg[i] > end)
|
|
+ if (be32_to_cpu(reg[i]) > end)
|
|
return 0;
|
|
}
|
|
|
|
@@ -240,7 +249,6 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
|
|
return 0;
|
|
|
|
dt_get_reg_format(parent, &naddr, &nsize);
|
|
-
|
|
if (nsize > 2)
|
|
return 0;
|
|
|
|
@@ -252,10 +260,10 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
|
|
|
|
copy_val(last_addr, prop_buf + offset, naddr);
|
|
|
|
- ret_size = prop_buf[offset + naddr];
|
|
+ ret_size = be32_to_cpu(prop_buf[offset + naddr]);
|
|
if (nsize == 2) {
|
|
ret_size <<= 32;
|
|
- ret_size |= prop_buf[offset + naddr + 1];
|
|
+ ret_size |= be32_to_cpu(prop_buf[offset + naddr + 1]);
|
|
}
|
|
|
|
for (;;) {
|
|
@@ -278,7 +286,6 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
|
|
|
|
offset = find_range(last_addr, prop_buf, prev_naddr,
|
|
naddr, prev_nsize, buflen / 4);
|
|
-
|
|
if (offset < 0)
|
|
return 0;
|
|
|
|
@@ -296,8 +303,7 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
|
|
if (naddr > 2)
|
|
return 0;
|
|
|
|
- ret_addr = ((u64)last_addr[2] << 32) | last_addr[3];
|
|
-
|
|
+ ret_addr = ((u64)be32_to_cpu(last_addr[2]) << 32) | be32_to_cpu(last_addr[3]);
|
|
if (sizeof(void *) == 4 &&
|
|
(ret_addr >= 0x100000000ULL || ret_size > 0x100000000ULL ||
|
|
ret_addr + ret_size > 0x100000000ULL))
|
|
@@ -350,11 +356,14 @@ int dt_is_compatible(void *node, const char *compat)
|
|
int dt_get_virtual_reg(void *node, void **addr, int nres)
|
|
{
|
|
unsigned long xaddr;
|
|
- int n;
|
|
+ int n, i;
|
|
|
|
n = getprop(node, "virtual-reg", addr, nres * 4);
|
|
- if (n > 0)
|
|
+ if (n > 0) {
|
|
+ for (i = 0; i < n/4; i ++)
|
|
+ ((u32 *)addr)[i] = be32_to_cpu(((u32 *)addr)[i]);
|
|
return n / 4;
|
|
+ }
|
|
|
|
for (n = 0; n < nres; n++) {
|
|
if (!dt_xlate_reg(node, n, &xaddr, NULL))
|
|
diff --git a/arch/powerpc/boot/ns16550.c b/arch/powerpc/boot/ns16550.c
|
|
index b0da4466d4198..f16d2be1d0f31 100644
|
|
--- a/arch/powerpc/boot/ns16550.c
|
|
+++ b/arch/powerpc/boot/ns16550.c
|
|
@@ -15,6 +15,7 @@
|
|
#include "stdio.h"
|
|
#include "io.h"
|
|
#include "ops.h"
|
|
+#include "of.h"
|
|
|
|
#define UART_DLL 0 /* Out: Divisor Latch Low */
|
|
#define UART_DLM 1 /* Out: Divisor Latch High */
|
|
@@ -58,16 +59,20 @@ int ns16550_console_init(void *devp, struct serial_console_data *scdp)
|
|
int n;
|
|
u32 reg_offset;
|
|
|
|
- if (dt_get_virtual_reg(devp, (void **)®_base, 1) < 1)
|
|
+ if (dt_get_virtual_reg(devp, (void **)®_base, 1) < 1) {
|
|
+ printf("virt reg parse fail...\r\n");
|
|
return -1;
|
|
+ }
|
|
|
|
n = getprop(devp, "reg-offset", ®_offset, sizeof(reg_offset));
|
|
if (n == sizeof(reg_offset))
|
|
- reg_base += reg_offset;
|
|
+ reg_base += be32_to_cpu(reg_offset);
|
|
|
|
n = getprop(devp, "reg-shift", ®_shift, sizeof(reg_shift));
|
|
if (n != sizeof(reg_shift))
|
|
reg_shift = 0;
|
|
+ else
|
|
+ reg_shift = be32_to_cpu(reg_shift);
|
|
|
|
scdp->open = ns16550_open;
|
|
scdp->putc = ns16550_putc;
|
|
diff --git a/arch/powerpc/include/asm/inst.h b/arch/powerpc/include/asm/inst.h
|
|
index 268d3bd073c8a..887ef150fdda7 100644
|
|
--- a/arch/powerpc/include/asm/inst.h
|
|
+++ b/arch/powerpc/include/asm/inst.h
|
|
@@ -12,6 +12,8 @@
|
|
unsigned long __gui_ptr = (unsigned long)ptr; \
|
|
struct ppc_inst __gui_inst; \
|
|
unsigned int __prefix, __suffix; \
|
|
+ \
|
|
+ __chk_user_ptr(ptr); \
|
|
__gui_ret = gu_op(__prefix, (unsigned int __user *)__gui_ptr); \
|
|
if (__gui_ret == 0) { \
|
|
if ((__prefix >> 26) == OP_PREFIX) { \
|
|
@@ -29,7 +31,10 @@
|
|
})
|
|
#else /* !CONFIG_PPC64 */
|
|
#define ___get_user_instr(gu_op, dest, ptr) \
|
|
- gu_op((dest).val, (u32 __user *)(ptr))
|
|
+({ \
|
|
+ __chk_user_ptr(ptr); \
|
|
+ gu_op((dest).val, (u32 __user *)(ptr)); \
|
|
+})
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
#define get_user_instr(x, ptr) \
|
|
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
|
|
index e646c7f218bc8..12b6b76e8d0f7 100644
|
|
--- a/arch/powerpc/include/asm/ps3.h
|
|
+++ b/arch/powerpc/include/asm/ps3.h
|
|
@@ -71,6 +71,7 @@ struct ps3_dma_region_ops;
|
|
* @bus_addr: The 'translated' bus address of the region.
|
|
* @len: The length in bytes of the region.
|
|
* @offset: The offset from the start of memory of the region.
|
|
+ * @dma_mask: Device dma_mask.
|
|
* @ioid: The IOID of the device who owns this region
|
|
* @chunk_list: Opaque variable used by the ioc page manager.
|
|
* @region_ops: struct ps3_dma_region_ops - dma region operations
|
|
@@ -85,6 +86,7 @@ struct ps3_dma_region {
|
|
enum ps3_dma_region_type region_type;
|
|
unsigned long len;
|
|
unsigned long offset;
|
|
+ u64 dma_mask;
|
|
|
|
/* driver variables (set by ps3_dma_region_create) */
|
|
unsigned long bus_addr;
|
|
diff --git a/arch/powerpc/mm/book3s64/radix_tlb.c b/arch/powerpc/mm/book3s64/radix_tlb.c
|
|
index 409e612107892..817a02ef60320 100644
|
|
--- a/arch/powerpc/mm/book3s64/radix_tlb.c
|
|
+++ b/arch/powerpc/mm/book3s64/radix_tlb.c
|
|
@@ -291,22 +291,30 @@ static inline void fixup_tlbie_lpid(unsigned long lpid)
|
|
/*
|
|
* We use 128 set in radix mode and 256 set in hpt mode.
|
|
*/
|
|
-static __always_inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
|
|
+static inline void _tlbiel_pid(unsigned long pid, unsigned long ric)
|
|
{
|
|
int set;
|
|
|
|
asm volatile("ptesync": : :"memory");
|
|
|
|
- /*
|
|
- * Flush the first set of the TLB, and if we're doing a RIC_FLUSH_ALL,
|
|
- * also flush the entire Page Walk Cache.
|
|
- */
|
|
- __tlbiel_pid(pid, 0, ric);
|
|
+ switch (ric) {
|
|
+ case RIC_FLUSH_PWC:
|
|
|
|
- /* For PWC, only one flush is needed */
|
|
- if (ric == RIC_FLUSH_PWC) {
|
|
+ /* For PWC, only one flush is needed */
|
|
+ __tlbiel_pid(pid, 0, RIC_FLUSH_PWC);
|
|
ppc_after_tlbiel_barrier();
|
|
return;
|
|
+ case RIC_FLUSH_TLB:
|
|
+ __tlbiel_pid(pid, 0, RIC_FLUSH_TLB);
|
|
+ break;
|
|
+ case RIC_FLUSH_ALL:
|
|
+ default:
|
|
+ /*
|
|
+ * Flush the first set of the TLB, and if
|
|
+ * we're doing a RIC_FLUSH_ALL, also flush
|
|
+ * the entire Page Walk Cache.
|
|
+ */
|
|
+ __tlbiel_pid(pid, 0, RIC_FLUSH_ALL);
|
|
}
|
|
|
|
if (!cpu_has_feature(CPU_FTR_ARCH_31)) {
|
|
@@ -1176,7 +1184,7 @@ void radix__tlb_flush(struct mmu_gather *tlb)
|
|
}
|
|
}
|
|
|
|
-static __always_inline void __radix__flush_tlb_range_psize(struct mm_struct *mm,
|
|
+static void __radix__flush_tlb_range_psize(struct mm_struct *mm,
|
|
unsigned long start, unsigned long end,
|
|
int psize, bool also_pwc)
|
|
{
|
|
diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
|
|
index 57a8c1153851a..94411af24013f 100644
|
|
--- a/arch/powerpc/net/bpf_jit_comp64.c
|
|
+++ b/arch/powerpc/net/bpf_jit_comp64.c
|
|
@@ -667,7 +667,7 @@ emit_clear:
|
|
* BPF_STX ATOMIC (atomic ops)
|
|
*/
|
|
case BPF_STX | BPF_ATOMIC | BPF_W:
|
|
- if (insn->imm != BPF_ADD) {
|
|
+ if (imm != BPF_ADD) {
|
|
pr_err_ratelimited(
|
|
"eBPF filter atomic op code %02x (@%d) unsupported\n",
|
|
code, i);
|
|
@@ -689,7 +689,7 @@ emit_clear:
|
|
PPC_BCC_SHORT(COND_NE, tmp_idx);
|
|
break;
|
|
case BPF_STX | BPF_ATOMIC | BPF_DW:
|
|
- if (insn->imm != BPF_ADD) {
|
|
+ if (imm != BPF_ADD) {
|
|
pr_err_ratelimited(
|
|
"eBPF filter atomic op code %02x (@%d) unsupported\n",
|
|
code, i);
|
|
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
|
|
index d094321964fb0..a81eac35d9009 100644
|
|
--- a/arch/powerpc/platforms/ps3/mm.c
|
|
+++ b/arch/powerpc/platforms/ps3/mm.c
|
|
@@ -6,6 +6,7 @@
|
|
* Copyright 2006 Sony Corp.
|
|
*/
|
|
|
|
+#include <linux/dma-mapping.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/export.h>
|
|
#include <linux/memblock.h>
|
|
@@ -1118,6 +1119,7 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev,
|
|
enum ps3_dma_region_type region_type, void *addr, unsigned long len)
|
|
{
|
|
unsigned long lpar_addr;
|
|
+ int result;
|
|
|
|
lpar_addr = addr ? ps3_mm_phys_to_lpar(__pa(addr)) : 0;
|
|
|
|
@@ -1129,6 +1131,16 @@ int ps3_dma_region_init(struct ps3_system_bus_device *dev,
|
|
r->offset -= map.r1.offset;
|
|
r->len = len ? len : ALIGN(map.total, 1 << r->page_size);
|
|
|
|
+ dev->core.dma_mask = &r->dma_mask;
|
|
+
|
|
+ result = dma_set_mask_and_coherent(&dev->core, DMA_BIT_MASK(32));
|
|
+
|
|
+ if (result < 0) {
|
|
+ dev_err(&dev->core, "%s:%d: dma_set_mask_and_coherent failed: %d\n",
|
|
+ __func__, __LINE__, result);
|
|
+ return result;
|
|
+ }
|
|
+
|
|
switch (dev->dev_type) {
|
|
case PS3_DEVICE_TYPE_SB:
|
|
r->region_ops = (USE_DYNAMIC_DMA)
|
|
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
|
|
index 93488bbf491b9..90e1639697b4d 100644
|
|
--- a/arch/s390/Kconfig
|
|
+++ b/arch/s390/Kconfig
|
|
@@ -165,7 +165,6 @@ config S390
|
|
select HAVE_GCC_PLUGINS
|
|
select HAVE_GENERIC_VDSO
|
|
select HAVE_IOREMAP_PROT if PCI
|
|
- select HAVE_IRQ_EXIT_ON_IRQ_STACK
|
|
select HAVE_KERNEL_BZIP2
|
|
select HAVE_KERNEL_GZIP
|
|
select HAVE_KERNEL_LZ4
|
|
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
|
|
index e443ed9947bd6..098abe3a56f37 100644
|
|
--- a/arch/s390/Makefile
|
|
+++ b/arch/s390/Makefile
|
|
@@ -28,6 +28,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
|
|
KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain
|
|
KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
|
|
KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding
|
|
+KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector
|
|
KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)
|
|
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)
|
|
KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))
|
|
diff --git a/arch/s390/boot/ipl_parm.c b/arch/s390/boot/ipl_parm.c
|
|
index d372a45fe10e7..dd92092e3eec3 100644
|
|
--- a/arch/s390/boot/ipl_parm.c
|
|
+++ b/arch/s390/boot/ipl_parm.c
|
|
@@ -28,22 +28,25 @@ static inline int __diag308(unsigned long subcode, void *addr)
|
|
register unsigned long _addr asm("0") = (unsigned long)addr;
|
|
register unsigned long _rc asm("1") = 0;
|
|
unsigned long reg1, reg2;
|
|
- psw_t old = S390_lowcore.program_new_psw;
|
|
+ psw_t old;
|
|
|
|
asm volatile(
|
|
+ " mvc 0(16,%[psw_old]),0(%[psw_pgm])\n"
|
|
" epsw %0,%1\n"
|
|
- " st %0,%[psw_pgm]\n"
|
|
- " st %1,%[psw_pgm]+4\n"
|
|
+ " st %0,0(%[psw_pgm])\n"
|
|
+ " st %1,4(%[psw_pgm])\n"
|
|
" larl %0,1f\n"
|
|
- " stg %0,%[psw_pgm]+8\n"
|
|
+ " stg %0,8(%[psw_pgm])\n"
|
|
" diag %[addr],%[subcode],0x308\n"
|
|
- "1: nopr %%r7\n"
|
|
+ "1: mvc 0(16,%[psw_pgm]),0(%[psw_old])\n"
|
|
: "=&d" (reg1), "=&a" (reg2),
|
|
- [psw_pgm] "=Q" (S390_lowcore.program_new_psw),
|
|
+ "+Q" (S390_lowcore.program_new_psw),
|
|
+ "=Q" (old),
|
|
[addr] "+d" (_addr), "+d" (_rc)
|
|
- : [subcode] "d" (subcode)
|
|
+ : [subcode] "d" (subcode),
|
|
+ [psw_old] "a" (&old),
|
|
+ [psw_pgm] "a" (&S390_lowcore.program_new_psw)
|
|
: "cc", "memory");
|
|
- S390_lowcore.program_new_psw = old;
|
|
return _rc;
|
|
}
|
|
|
|
diff --git a/arch/s390/boot/mem_detect.c b/arch/s390/boot/mem_detect.c
|
|
index 40168e59abd38..a0e980f57c02c 100644
|
|
--- a/arch/s390/boot/mem_detect.c
|
|
+++ b/arch/s390/boot/mem_detect.c
|
|
@@ -69,24 +69,27 @@ static int __diag260(unsigned long rx1, unsigned long rx2)
|
|
register unsigned long _ry asm("4") = 0x10; /* storage configuration */
|
|
int rc = -1; /* fail */
|
|
unsigned long reg1, reg2;
|
|
- psw_t old = S390_lowcore.program_new_psw;
|
|
+ psw_t old;
|
|
|
|
asm volatile(
|
|
+ " mvc 0(16,%[psw_old]),0(%[psw_pgm])\n"
|
|
" epsw %0,%1\n"
|
|
- " st %0,%[psw_pgm]\n"
|
|
- " st %1,%[psw_pgm]+4\n"
|
|
+ " st %0,0(%[psw_pgm])\n"
|
|
+ " st %1,4(%[psw_pgm])\n"
|
|
" larl %0,1f\n"
|
|
- " stg %0,%[psw_pgm]+8\n"
|
|
+ " stg %0,8(%[psw_pgm])\n"
|
|
" diag %[rx],%[ry],0x260\n"
|
|
" ipm %[rc]\n"
|
|
" srl %[rc],28\n"
|
|
- "1:\n"
|
|
+ "1: mvc 0(16,%[psw_pgm]),0(%[psw_old])\n"
|
|
: "=&d" (reg1), "=&a" (reg2),
|
|
- [psw_pgm] "=Q" (S390_lowcore.program_new_psw),
|
|
+ "+Q" (S390_lowcore.program_new_psw),
|
|
+ "=Q" (old),
|
|
[rc] "+&d" (rc), [ry] "+d" (_ry)
|
|
- : [rx] "d" (_rx1), "d" (_rx2)
|
|
+ : [rx] "d" (_rx1), "d" (_rx2),
|
|
+ [psw_old] "a" (&old),
|
|
+ [psw_pgm] "a" (&S390_lowcore.program_new_psw)
|
|
: "cc", "memory");
|
|
- S390_lowcore.program_new_psw = old;
|
|
return rc == 0 ? _ry : -1;
|
|
}
|
|
|
|
@@ -111,24 +114,30 @@ static int diag260(void)
|
|
|
|
static int tprot(unsigned long addr)
|
|
{
|
|
- unsigned long pgm_addr;
|
|
+ unsigned long reg1, reg2;
|
|
int rc = -EFAULT;
|
|
- psw_t old = S390_lowcore.program_new_psw;
|
|
+ psw_t old;
|
|
|
|
- S390_lowcore.program_new_psw.mask = __extract_psw();
|
|
asm volatile(
|
|
- " larl %[pgm_addr],1f\n"
|
|
- " stg %[pgm_addr],%[psw_pgm_addr]\n"
|
|
+ " mvc 0(16,%[psw_old]),0(%[psw_pgm])\n"
|
|
+ " epsw %[reg1],%[reg2]\n"
|
|
+ " st %[reg1],0(%[psw_pgm])\n"
|
|
+ " st %[reg2],4(%[psw_pgm])\n"
|
|
+ " larl %[reg1],1f\n"
|
|
+ " stg %[reg1],8(%[psw_pgm])\n"
|
|
" tprot 0(%[addr]),0\n"
|
|
" ipm %[rc]\n"
|
|
" srl %[rc],28\n"
|
|
- "1:\n"
|
|
- : [pgm_addr] "=&d"(pgm_addr),
|
|
- [psw_pgm_addr] "=Q"(S390_lowcore.program_new_psw.addr),
|
|
- [rc] "+&d"(rc)
|
|
- : [addr] "a"(addr)
|
|
+ "1: mvc 0(16,%[psw_pgm]),0(%[psw_old])\n"
|
|
+ : [reg1] "=&d" (reg1),
|
|
+ [reg2] "=&a" (reg2),
|
|
+ [rc] "+&d" (rc),
|
|
+ "=Q" (S390_lowcore.program_new_psw.addr),
|
|
+ "=Q" (old)
|
|
+ : [psw_old] "a" (&old),
|
|
+ [psw_pgm] "a" (&S390_lowcore.program_new_psw),
|
|
+ [addr] "a" (addr)
|
|
: "cc", "memory");
|
|
- S390_lowcore.program_new_psw = old;
|
|
return rc;
|
|
}
|
|
|
|
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
|
|
index 023a15dc25a33..dbd380d811335 100644
|
|
--- a/arch/s390/include/asm/processor.h
|
|
+++ b/arch/s390/include/asm/processor.h
|
|
@@ -207,7 +207,7 @@ static __always_inline unsigned long current_stack_pointer(void)
|
|
return sp;
|
|
}
|
|
|
|
-static __no_kasan_or_inline unsigned short stap(void)
|
|
+static __always_inline unsigned short stap(void)
|
|
{
|
|
unsigned short cpu_address;
|
|
|
|
@@ -246,7 +246,7 @@ static inline void __load_psw(psw_t psw)
|
|
* Set PSW mask to specified value, while leaving the
|
|
* PSW addr pointing to the next instruction.
|
|
*/
|
|
-static __no_kasan_or_inline void __load_psw_mask(unsigned long mask)
|
|
+static __always_inline void __load_psw_mask(unsigned long mask)
|
|
{
|
|
unsigned long addr;
|
|
psw_t psw;
|
|
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
|
|
index 382d73da134cf..93538e63fa03f 100644
|
|
--- a/arch/s390/kernel/setup.c
|
|
+++ b/arch/s390/kernel/setup.c
|
|
@@ -165,7 +165,7 @@ static void __init set_preferred_console(void)
|
|
else if (CONSOLE_IS_3270)
|
|
add_preferred_console("tty3270", 0, NULL);
|
|
else if (CONSOLE_IS_VT220)
|
|
- add_preferred_console("ttyS", 1, NULL);
|
|
+ add_preferred_console("ttysclp", 0, NULL);
|
|
else if (CONSOLE_IS_HVC)
|
|
add_preferred_console("hvc", 0, NULL);
|
|
}
|
|
diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
|
|
index c57f8c40e9926..21c4ebe29b9a2 100644
|
|
--- a/arch/s390/purgatory/Makefile
|
|
+++ b/arch/s390/purgatory/Makefile
|
|
@@ -24,6 +24,7 @@ KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes
|
|
KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare
|
|
KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
|
|
KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
|
|
+KBUILD_CFLAGS += -fno-stack-protector
|
|
KBUILD_CFLAGS += $(CLANG_FLAGS)
|
|
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
|
|
KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))
|
|
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
|
|
index d8845d4aac6a7..6040817c036f3 100644
|
|
--- a/arch/um/drivers/chan_user.c
|
|
+++ b/arch/um/drivers/chan_user.c
|
|
@@ -256,7 +256,8 @@ static int winch_tramp(int fd, struct tty_port *port, int *fd_out,
|
|
goto out_close;
|
|
}
|
|
|
|
- if (os_set_fd_block(*fd_out, 0)) {
|
|
+ err = os_set_fd_block(*fd_out, 0);
|
|
+ if (err) {
|
|
printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd "
|
|
"non-blocking.\n");
|
|
goto out_close;
|
|
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
|
|
index 482a19c5105c5..7334019c9e60a 100644
|
|
--- a/arch/um/drivers/slip_user.c
|
|
+++ b/arch/um/drivers/slip_user.c
|
|
@@ -145,7 +145,8 @@ static int slip_open(void *data)
|
|
}
|
|
sfd = err;
|
|
|
|
- if (set_up_tty(sfd))
|
|
+ err = set_up_tty(sfd);
|
|
+ if (err)
|
|
goto out_close2;
|
|
|
|
pri->slave = sfd;
|
|
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
|
|
index 8e0b43cf089f4..cbd4f00fe77ee 100644
|
|
--- a/arch/um/drivers/ubd_kern.c
|
|
+++ b/arch/um/drivers/ubd_kern.c
|
|
@@ -1242,8 +1242,7 @@ static int __init ubd_driver_init(void){
|
|
* enough. So use anyway the io thread. */
|
|
}
|
|
stack = alloc_stack(0, 0);
|
|
- io_pid = start_io_thread(stack + PAGE_SIZE - sizeof(void *),
|
|
- &thread_fd);
|
|
+ io_pid = start_io_thread(stack + PAGE_SIZE, &thread_fd);
|
|
if(io_pid < 0){
|
|
printk(KERN_ERR
|
|
"ubd : Failed to start I/O thread (errno = %d) - "
|
|
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
|
|
index 592cdb1384415..5afac0fef24ea 100644
|
|
--- a/arch/um/kernel/skas/clone.c
|
|
+++ b/arch/um/kernel/skas/clone.c
|
|
@@ -29,7 +29,7 @@ stub_clone_handler(void)
|
|
long err;
|
|
|
|
err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
|
|
- (unsigned long)data + UM_KERN_PAGE_SIZE / 2 - sizeof(void *));
|
|
+ (unsigned long)data + UM_KERN_PAGE_SIZE / 2);
|
|
if (err) {
|
|
data->parent_err = err;
|
|
goto done;
|
|
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
|
|
index 9fa6e4187d4fb..32e88baf18dd4 100644
|
|
--- a/arch/um/os-Linux/helper.c
|
|
+++ b/arch/um/os-Linux/helper.c
|
|
@@ -64,7 +64,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)
|
|
goto out_close;
|
|
}
|
|
|
|
- sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
|
|
+ sp = stack + UM_KERN_PAGE_SIZE;
|
|
data.pre_exec = pre_exec;
|
|
data.pre_data = pre_data;
|
|
data.argv = argv;
|
|
@@ -120,7 +120,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
|
|
if (stack == 0)
|
|
return -ENOMEM;
|
|
|
|
- sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
|
|
+ sp = stack + UM_KERN_PAGE_SIZE;
|
|
pid = clone(proc, (void *) sp, flags, arg);
|
|
if (pid < 0) {
|
|
err = -errno;
|
|
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
|
|
index 96f511d1aabe6..e283f130aadc5 100644
|
|
--- a/arch/um/os-Linux/signal.c
|
|
+++ b/arch/um/os-Linux/signal.c
|
|
@@ -129,7 +129,7 @@ void set_sigstack(void *sig_stack, int size)
|
|
stack_t stack = {
|
|
.ss_flags = 0,
|
|
.ss_sp = sig_stack,
|
|
- .ss_size = size - sizeof(void *)
|
|
+ .ss_size = size
|
|
};
|
|
|
|
if (sigaltstack(&stack, NULL) != 0)
|
|
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
|
|
index fba674fac8b73..87d3129e7362e 100644
|
|
--- a/arch/um/os-Linux/skas/process.c
|
|
+++ b/arch/um/os-Linux/skas/process.c
|
|
@@ -327,7 +327,7 @@ int start_userspace(unsigned long stub_stack)
|
|
}
|
|
|
|
/* set stack pointer to the end of the stack page, so it can grow downwards */
|
|
- sp = (unsigned long) stack + UM_KERN_PAGE_SIZE - sizeof(void *);
|
|
+ sp = (unsigned long)stack + UM_KERN_PAGE_SIZE;
|
|
|
|
flags = CLONE_FILES | SIGCHLD;
|
|
|
|
diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h
|
|
index 16bf4d4a8159e..4e5af2b00d89b 100644
|
|
--- a/arch/x86/include/asm/fpu/internal.h
|
|
+++ b/arch/x86/include/asm/fpu/internal.h
|
|
@@ -103,6 +103,7 @@ static inline void fpstate_init_fxstate(struct fxregs_state *fx)
|
|
}
|
|
extern void fpstate_sanitize_xstate(struct fpu *fpu);
|
|
|
|
+/* Returns 0 or the negated trap number, which results in -EFAULT for #PF */
|
|
#define user_insn(insn, output, input...) \
|
|
({ \
|
|
int err; \
|
|
@@ -110,14 +111,14 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu);
|
|
might_fault(); \
|
|
\
|
|
asm volatile(ASM_STAC "\n" \
|
|
- "1:" #insn "\n\t" \
|
|
+ "1: " #insn "\n" \
|
|
"2: " ASM_CLAC "\n" \
|
|
".section .fixup,\"ax\"\n" \
|
|
- "3: movl $-1,%[err]\n" \
|
|
+ "3: negl %%eax\n" \
|
|
" jmp 2b\n" \
|
|
".previous\n" \
|
|
- _ASM_EXTABLE(1b, 3b) \
|
|
- : [err] "=r" (err), output \
|
|
+ _ASM_EXTABLE_FAULT(1b, 3b) \
|
|
+ : [err] "=a" (err), output \
|
|
: "0"(0), input); \
|
|
err; \
|
|
})
|
|
@@ -219,16 +220,20 @@ static inline void fxsave(struct fxregs_state *fx)
|
|
#define XRSTOR ".byte " REX_PREFIX "0x0f,0xae,0x2f"
|
|
#define XRSTORS ".byte " REX_PREFIX "0x0f,0xc7,0x1f"
|
|
|
|
+/*
|
|
+ * After this @err contains 0 on success or the negated trap number when
|
|
+ * the operation raises an exception. For faults this results in -EFAULT.
|
|
+ */
|
|
#define XSTATE_OP(op, st, lmask, hmask, err) \
|
|
asm volatile("1:" op "\n\t" \
|
|
"xor %[err], %[err]\n" \
|
|
"2:\n\t" \
|
|
".pushsection .fixup,\"ax\"\n\t" \
|
|
- "3: movl $-2,%[err]\n\t" \
|
|
+ "3: negl %%eax\n\t" \
|
|
"jmp 2b\n\t" \
|
|
".popsection\n\t" \
|
|
- _ASM_EXTABLE(1b, 3b) \
|
|
- : [err] "=r" (err) \
|
|
+ _ASM_EXTABLE_FAULT(1b, 3b) \
|
|
+ : [err] "=a" (err) \
|
|
: "D" (st), "m" (*st), "a" (lmask), "d" (hmask) \
|
|
: "memory")
|
|
|
|
diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c
|
|
index c413756ba89fa..6bb874441de8b 100644
|
|
--- a/arch/x86/kernel/fpu/regset.c
|
|
+++ b/arch/x86/kernel/fpu/regset.c
|
|
@@ -117,7 +117,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
|
|
/*
|
|
* A whole standard-format XSAVE buffer is needed:
|
|
*/
|
|
- if ((pos != 0) || (count < fpu_user_xstate_size))
|
|
+ if (pos != 0 || count != fpu_user_xstate_size)
|
|
return -EFAULT;
|
|
|
|
xsave = &fpu->state.xsave;
|
|
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
|
|
index 1cadb2faf7405..4819251ffe7cc 100644
|
|
--- a/arch/x86/kernel/fpu/xstate.c
|
|
+++ b/arch/x86/kernel/fpu/xstate.c
|
|
@@ -1084,20 +1084,10 @@ static inline bool xfeatures_mxcsr_quirk(u64 xfeatures)
|
|
return true;
|
|
}
|
|
|
|
-static void fill_gap(struct membuf *to, unsigned *last, unsigned offset)
|
|
+static void copy_feature(bool from_xstate, struct membuf *to, void *xstate,
|
|
+ void *init_xstate, unsigned int size)
|
|
{
|
|
- if (*last >= offset)
|
|
- return;
|
|
- membuf_write(to, (void *)&init_fpstate.xsave + *last, offset - *last);
|
|
- *last = offset;
|
|
-}
|
|
-
|
|
-static void copy_part(struct membuf *to, unsigned *last, unsigned offset,
|
|
- unsigned size, void *from)
|
|
-{
|
|
- fill_gap(to, last, offset);
|
|
- membuf_write(to, from, size);
|
|
- *last = offset + size;
|
|
+ membuf_write(to, from_xstate ? xstate : init_xstate, size);
|
|
}
|
|
|
|
/*
|
|
@@ -1109,10 +1099,10 @@ static void copy_part(struct membuf *to, unsigned *last, unsigned offset,
|
|
*/
|
|
void copy_xstate_to_kernel(struct membuf to, struct xregs_state *xsave)
|
|
{
|
|
+ const unsigned int off_mxcsr = offsetof(struct fxregs_state, mxcsr);
|
|
+ struct xregs_state *xinit = &init_fpstate.xsave;
|
|
struct xstate_header header;
|
|
- const unsigned off_mxcsr = offsetof(struct fxregs_state, mxcsr);
|
|
- unsigned size = to.left;
|
|
- unsigned last = 0;
|
|
+ unsigned int zerofrom;
|
|
int i;
|
|
|
|
/*
|
|
@@ -1122,41 +1112,68 @@ void copy_xstate_to_kernel(struct membuf to, struct xregs_state *xsave)
|
|
header.xfeatures = xsave->header.xfeatures;
|
|
header.xfeatures &= xfeatures_mask_user();
|
|
|
|
- if (header.xfeatures & XFEATURE_MASK_FP)
|
|
- copy_part(&to, &last, 0, off_mxcsr, &xsave->i387);
|
|
- if (header.xfeatures & (XFEATURE_MASK_SSE | XFEATURE_MASK_YMM))
|
|
- copy_part(&to, &last, off_mxcsr,
|
|
- MXCSR_AND_FLAGS_SIZE, &xsave->i387.mxcsr);
|
|
- if (header.xfeatures & XFEATURE_MASK_FP)
|
|
- copy_part(&to, &last, offsetof(struct fxregs_state, st_space),
|
|
- 128, &xsave->i387.st_space);
|
|
- if (header.xfeatures & XFEATURE_MASK_SSE)
|
|
- copy_part(&to, &last, xstate_offsets[XFEATURE_SSE],
|
|
- 256, &xsave->i387.xmm_space);
|
|
- /*
|
|
- * Fill xsave->i387.sw_reserved value for ptrace frame:
|
|
- */
|
|
- copy_part(&to, &last, offsetof(struct fxregs_state, sw_reserved),
|
|
- 48, xstate_fx_sw_bytes);
|
|
- /*
|
|
- * Copy xregs_state->header:
|
|
- */
|
|
- copy_part(&to, &last, offsetof(struct xregs_state, header),
|
|
- sizeof(header), &header);
|
|
+ /* Copy FP state up to MXCSR */
|
|
+ copy_feature(header.xfeatures & XFEATURE_MASK_FP, &to, &xsave->i387,
|
|
+ &xinit->i387, off_mxcsr);
|
|
+
|
|
+ /* Copy MXCSR when SSE or YMM are set in the feature mask */
|
|
+ copy_feature(header.xfeatures & (XFEATURE_MASK_SSE | XFEATURE_MASK_YMM),
|
|
+ &to, &xsave->i387.mxcsr, &xinit->i387.mxcsr,
|
|
+ MXCSR_AND_FLAGS_SIZE);
|
|
+
|
|
+ /* Copy the remaining FP state */
|
|
+ copy_feature(header.xfeatures & XFEATURE_MASK_FP,
|
|
+ &to, &xsave->i387.st_space, &xinit->i387.st_space,
|
|
+ sizeof(xsave->i387.st_space));
|
|
+
|
|
+ /* Copy the SSE state - shared with YMM, but independently managed */
|
|
+ copy_feature(header.xfeatures & XFEATURE_MASK_SSE,
|
|
+ &to, &xsave->i387.xmm_space, &xinit->i387.xmm_space,
|
|
+ sizeof(xsave->i387.xmm_space));
|
|
+
|
|
+ /* Zero the padding area */
|
|
+ membuf_zero(&to, sizeof(xsave->i387.padding));
|
|
+
|
|
+ /* Copy xsave->i387.sw_reserved */
|
|
+ membuf_write(&to, xstate_fx_sw_bytes, sizeof(xsave->i387.sw_reserved));
|
|
+
|
|
+ /* Copy the user space relevant state of @xsave->header */
|
|
+ membuf_write(&to, &header, sizeof(header));
|
|
+
|
|
+ zerofrom = offsetof(struct xregs_state, extended_state_area);
|
|
|
|
for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
|
|
/*
|
|
- * Copy only in-use xstates:
|
|
+ * The ptrace buffer is in non-compacted XSAVE format.
|
|
+ * In non-compacted format disabled features still occupy
|
|
+ * state space, but there is no state to copy from in the
|
|
+ * compacted init_fpstate. The gap tracking will zero this
|
|
+ * later.
|
|
*/
|
|
- if ((header.xfeatures >> i) & 1) {
|
|
- void *src = __raw_xsave_addr(xsave, i);
|
|
+ if (!(xfeatures_mask_user() & BIT_ULL(i)))
|
|
+ continue;
|
|
|
|
- copy_part(&to, &last, xstate_offsets[i],
|
|
- xstate_sizes[i], src);
|
|
- }
|
|
+ /*
|
|
+ * If there was a feature or alignment gap, zero the space
|
|
+ * in the destination buffer.
|
|
+ */
|
|
+ if (zerofrom < xstate_offsets[i])
|
|
+ membuf_zero(&to, xstate_offsets[i] - zerofrom);
|
|
+
|
|
+ copy_feature(header.xfeatures & BIT_ULL(i), &to,
|
|
+ __raw_xsave_addr(xsave, i),
|
|
+ __raw_xsave_addr(xinit, i),
|
|
+ xstate_sizes[i]);
|
|
|
|
+ /*
|
|
+ * Keep track of the last copied state in the non-compacted
|
|
+ * target buffer for gap zeroing.
|
|
+ */
|
|
+ zerofrom = xstate_offsets[i] + xstate_sizes[i];
|
|
}
|
|
- fill_gap(&to, &last, size);
|
|
+
|
|
+ if (to.left)
|
|
+ membuf_zero(&to, to.left);
|
|
}
|
|
|
|
/*
|
|
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
|
|
index a06cb107c0e88..ca3ab89be5ccb 100644
|
|
--- a/arch/x86/kernel/signal.c
|
|
+++ b/arch/x86/kernel/signal.c
|
|
@@ -234,10 +234,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|
void __user **fpstate)
|
|
{
|
|
/* Default to using normal stack */
|
|
+ bool nested_altstack = on_sig_stack(regs->sp);
|
|
+ bool entering_altstack = false;
|
|
unsigned long math_size = 0;
|
|
unsigned long sp = regs->sp;
|
|
unsigned long buf_fx = 0;
|
|
- int onsigstack = on_sig_stack(sp);
|
|
int ret;
|
|
|
|
/* redzone */
|
|
@@ -246,15 +247,23 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|
|
|
/* This is the X/Open sanctioned signal stack switching. */
|
|
if (ka->sa.sa_flags & SA_ONSTACK) {
|
|
- if (sas_ss_flags(sp) == 0)
|
|
+ /*
|
|
+ * This checks nested_altstack via sas_ss_flags(). Sensible
|
|
+ * programs use SS_AUTODISARM, which disables that check, and
|
|
+ * programs that don't use SS_AUTODISARM get compatible.
|
|
+ */
|
|
+ if (sas_ss_flags(sp) == 0) {
|
|
sp = current->sas_ss_sp + current->sas_ss_size;
|
|
+ entering_altstack = true;
|
|
+ }
|
|
} else if (IS_ENABLED(CONFIG_X86_32) &&
|
|
- !onsigstack &&
|
|
+ !nested_altstack &&
|
|
regs->ss != __USER_DS &&
|
|
!(ka->sa.sa_flags & SA_RESTORER) &&
|
|
ka->sa.sa_restorer) {
|
|
/* This is the legacy signal stack switching. */
|
|
sp = (unsigned long) ka->sa.sa_restorer;
|
|
+ entering_altstack = true;
|
|
}
|
|
|
|
sp = fpu__alloc_mathframe(sp, IS_ENABLED(CONFIG_X86_32),
|
|
@@ -267,8 +276,15 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|
* If we are on the alternate signal stack and would overflow it, don't.
|
|
* Return an always-bogus address instead so we will die with SIGSEGV.
|
|
*/
|
|
- if (onsigstack && !likely(on_sig_stack(sp)))
|
|
+ if (unlikely((nested_altstack || entering_altstack) &&
|
|
+ !__on_sig_stack(sp))) {
|
|
+
|
|
+ if (show_unhandled_signals && printk_ratelimit())
|
|
+ pr_info("%s[%d] overflowed sigaltstack\n",
|
|
+ current->comm, task_pid_nr(current));
|
|
+
|
|
return (void __user *)-1L;
|
|
+ }
|
|
|
|
/* save i387 and extended state */
|
|
ret = copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size);
|
|
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
|
|
index c42613cfb5ba6..ca7866d63e982 100644
|
|
--- a/arch/x86/kvm/cpuid.c
|
|
+++ b/arch/x86/kvm/cpuid.c
|
|
@@ -940,8 +940,21 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
|
|
unsigned virt_as = max((entry->eax >> 8) & 0xff, 48U);
|
|
unsigned phys_as = entry->eax & 0xff;
|
|
|
|
- if (!g_phys_as)
|
|
+ /*
|
|
+ * If TDP (NPT) is disabled use the adjusted host MAXPHYADDR as
|
|
+ * the guest operates in the same PA space as the host, i.e.
|
|
+ * reductions in MAXPHYADDR for memory encryption affect shadow
|
|
+ * paging, too.
|
|
+ *
|
|
+ * If TDP is enabled but an explicit guest MAXPHYADDR is not
|
|
+ * provided, use the raw bare metal MAXPHYADDR as reductions to
|
|
+ * the HPAs do not affect GPAs.
|
|
+ */
|
|
+ if (!tdp_enabled)
|
|
+ g_phys_as = boot_cpu_data.x86_phys_bits;
|
|
+ else if (!g_phys_as)
|
|
g_phys_as = phys_as;
|
|
+
|
|
entry->eax = g_phys_as | (virt_as << 8);
|
|
entry->edx = 0;
|
|
cpuid_entry_override(entry, CPUID_8000_0008_EBX);
|
|
@@ -964,12 +977,18 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
|
|
case 0x8000001a:
|
|
case 0x8000001e:
|
|
break;
|
|
- /* Support memory encryption cpuid if host supports it */
|
|
case 0x8000001F:
|
|
- if (!kvm_cpu_cap_has(X86_FEATURE_SEV))
|
|
+ if (!kvm_cpu_cap_has(X86_FEATURE_SEV)) {
|
|
entry->eax = entry->ebx = entry->ecx = entry->edx = 0;
|
|
- else
|
|
+ } else {
|
|
cpuid_entry_override(entry, CPUID_8000_001F_EAX);
|
|
+
|
|
+ /*
|
|
+ * Enumerate '0' for "PA bits reduction", the adjusted
|
|
+ * MAXPHYADDR is enumerated directly (see 0x80000008).
|
|
+ */
|
|
+ entry->ebx &= ~GENMASK(11, 6);
|
|
+ }
|
|
break;
|
|
/*Add support for Centaur's CPUID instruction*/
|
|
case 0xC0000000:
|
|
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
|
|
index 99afc6f1eed02..716266ab177f4 100644
|
|
--- a/arch/x86/kvm/mmu/mmu.c
|
|
+++ b/arch/x86/kvm/mmu/mmu.c
|
|
@@ -53,6 +53,8 @@
|
|
#include <asm/kvm_page_track.h>
|
|
#include "trace.h"
|
|
|
|
+#include "paging.h"
|
|
+
|
|
extern bool itlb_multihit_kvm_mitigation;
|
|
|
|
static int __read_mostly nx_huge_pages = -1;
|
|
diff --git a/arch/x86/kvm/mmu/paging.h b/arch/x86/kvm/mmu/paging.h
|
|
new file mode 100644
|
|
index 0000000000000..de8ab323bb707
|
|
--- /dev/null
|
|
+++ b/arch/x86/kvm/mmu/paging.h
|
|
@@ -0,0 +1,14 @@
|
|
+/* SPDX-License-Identifier: GPL-2.0-only */
|
|
+/* Shadow paging constants/helpers that don't need to be #undef'd. */
|
|
+#ifndef __KVM_X86_PAGING_H
|
|
+#define __KVM_X86_PAGING_H
|
|
+
|
|
+#define GUEST_PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))
|
|
+#define PT64_LVL_ADDR_MASK(level) \
|
|
+ (GUEST_PT64_BASE_ADDR_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
|
|
+ * PT64_LEVEL_BITS))) - 1))
|
|
+#define PT64_LVL_OFFSET_MASK(level) \
|
|
+ (GUEST_PT64_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \
|
|
+ * PT64_LEVEL_BITS))) - 1))
|
|
+#endif /* __KVM_X86_PAGING_H */
|
|
+
|
|
diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
|
|
index 52fffd68b5229..45160fe800983 100644
|
|
--- a/arch/x86/kvm/mmu/paging_tmpl.h
|
|
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
|
|
@@ -24,7 +24,7 @@
|
|
#define pt_element_t u64
|
|
#define guest_walker guest_walker64
|
|
#define FNAME(name) paging##64_##name
|
|
- #define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK
|
|
+ #define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK
|
|
#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
|
|
#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
|
|
#define PT_INDEX(addr, level) PT64_INDEX(addr, level)
|
|
@@ -57,7 +57,7 @@
|
|
#define pt_element_t u64
|
|
#define guest_walker guest_walkerEPT
|
|
#define FNAME(name) ept_##name
|
|
- #define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK
|
|
+ #define PT_BASE_ADDR_MASK GUEST_PT64_BASE_ADDR_MASK
|
|
#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
|
|
#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
|
|
#define PT_INDEX(addr, level) PT64_INDEX(addr, level)
|
|
diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h
|
|
index bca0ba11cccf3..6925dfc389817 100644
|
|
--- a/arch/x86/kvm/mmu/spte.h
|
|
+++ b/arch/x86/kvm/mmu/spte.h
|
|
@@ -38,12 +38,6 @@ static_assert(SPTE_TDP_AD_ENABLED_MASK == 0);
|
|
#else
|
|
#define PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))
|
|
#endif
|
|
-#define PT64_LVL_ADDR_MASK(level) \
|
|
- (PT64_BASE_ADDR_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
|
|
- * PT64_LEVEL_BITS))) - 1))
|
|
-#define PT64_LVL_OFFSET_MASK(level) \
|
|
- (PT64_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \
|
|
- * PT64_LEVEL_BITS))) - 1))
|
|
|
|
#define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask \
|
|
| shadow_x_mask | shadow_nx_mask | shadow_me_mask)
|
|
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
|
|
index e088086f3de6a..62f1f06fe1970 100644
|
|
--- a/arch/x86/kvm/svm/svm.c
|
|
+++ b/arch/x86/kvm/svm/svm.c
|
|
@@ -1897,7 +1897,7 @@ static int npf_interception(struct kvm_vcpu *vcpu)
|
|
{
|
|
struct vcpu_svm *svm = to_svm(vcpu);
|
|
|
|
- u64 fault_address = __sme_clr(svm->vmcb->control.exit_info_2);
|
|
+ u64 fault_address = svm->vmcb->control.exit_info_2;
|
|
u64 error_code = svm->vmcb->control.exit_info_1;
|
|
|
|
trace_kvm_page_fault(fault_address, error_code);
|
|
@@ -2080,6 +2080,11 @@ static int nmi_interception(struct kvm_vcpu *vcpu)
|
|
return 1;
|
|
}
|
|
|
|
+static int smi_interception(struct kvm_vcpu *vcpu)
|
|
+{
|
|
+ return 1;
|
|
+}
|
|
+
|
|
static int intr_interception(struct kvm_vcpu *vcpu)
|
|
{
|
|
++vcpu->stat.irq_exits;
|
|
@@ -2915,7 +2920,16 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
|
|
svm_disable_lbrv(vcpu);
|
|
break;
|
|
case MSR_VM_HSAVE_PA:
|
|
- svm->nested.hsave_msr = data;
|
|
+ /*
|
|
+ * Old kernels did not validate the value written to
|
|
+ * MSR_VM_HSAVE_PA. Allow KVM_SET_MSR to set an invalid
|
|
+ * value to allow live migrating buggy or malicious guests
|
|
+ * originating from those kernels.
|
|
+ */
|
|
+ if (!msr->host_initiated && !page_address_valid(vcpu, data))
|
|
+ return 1;
|
|
+
|
|
+ svm->nested.hsave_msr = data & PAGE_MASK;
|
|
break;
|
|
case MSR_VM_CR:
|
|
return svm_set_vm_cr(vcpu, data);
|
|
@@ -3054,8 +3068,7 @@ static int (*const svm_exit_handlers[])(struct kvm_vcpu *vcpu) = {
|
|
[SVM_EXIT_EXCP_BASE + GP_VECTOR] = gp_interception,
|
|
[SVM_EXIT_INTR] = intr_interception,
|
|
[SVM_EXIT_NMI] = nmi_interception,
|
|
- [SVM_EXIT_SMI] = kvm_emulate_as_nop,
|
|
- [SVM_EXIT_INIT] = kvm_emulate_as_nop,
|
|
+ [SVM_EXIT_SMI] = smi_interception,
|
|
[SVM_EXIT_VINTR] = interrupt_window_interception,
|
|
[SVM_EXIT_RDPMC] = kvm_emulate_rdpmc,
|
|
[SVM_EXIT_CPUID] = kvm_emulate_cpuid,
|
|
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
index dad282fe0dac2..b5a3de788b5fc 100644
|
|
--- a/arch/x86/kvm/x86.c
|
|
+++ b/arch/x86/kvm/x86.c
|
|
@@ -9347,6 +9347,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
|
|
set_debugreg(vcpu->arch.eff_db[3], 3);
|
|
set_debugreg(vcpu->arch.dr6, 6);
|
|
vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD;
|
|
+ } else if (unlikely(hw_breakpoint_active())) {
|
|
+ set_debugreg(0, 7);
|
|
}
|
|
|
|
for (;;) {
|
|
diff --git a/block/blk-core.c b/block/blk-core.c
|
|
index 9bcdae93f6d4f..ce0125efbaa76 100644
|
|
--- a/block/blk-core.c
|
|
+++ b/block/blk-core.c
|
|
@@ -1253,7 +1253,7 @@ static void update_io_ticks(struct block_device *part, unsigned long now,
|
|
unsigned long stamp;
|
|
again:
|
|
stamp = READ_ONCE(part->bd_stamp);
|
|
- if (unlikely(stamp != now)) {
|
|
+ if (unlikely(time_after(now, stamp))) {
|
|
if (likely(cmpxchg(&part->bd_stamp, stamp, now) == stamp))
|
|
__part_stat_add(part, io_ticks, end ? now - stamp : 1);
|
|
}
|
|
diff --git a/block/genhd.c b/block/genhd.c
|
|
index 9f8cb7beaad11..ad7436bd60c1b 100644
|
|
--- a/block/genhd.c
|
|
+++ b/block/genhd.c
|
|
@@ -402,12 +402,12 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action)
|
|
xa_for_each(&disk->part_tbl, idx, part) {
|
|
if (bdev_is_partition(part) && !bdev_nr_sectors(part))
|
|
continue;
|
|
- if (!bdgrab(part))
|
|
+ if (!kobject_get_unless_zero(&part->bd_device.kobj))
|
|
continue;
|
|
|
|
rcu_read_unlock();
|
|
kobject_uevent(bdev_kobj(part), action);
|
|
- bdput(part);
|
|
+ put_device(&part->bd_device);
|
|
rcu_read_lock();
|
|
}
|
|
rcu_read_unlock();
|
|
diff --git a/block/partitions/ldm.c b/block/partitions/ldm.c
|
|
index d333786b5c7eb..cc86534c80ad9 100644
|
|
--- a/block/partitions/ldm.c
|
|
+++ b/block/partitions/ldm.c
|
|
@@ -510,7 +510,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state)
|
|
|
|
p = (struct msdos_partition *)(data + 0x01BE);
|
|
for (i = 0; i < 4; i++, p++)
|
|
- if (SYS_IND (p) == LDM_PARTITION) {
|
|
+ if (p->sys_ind == LDM_PARTITION) {
|
|
result = true;
|
|
break;
|
|
}
|
|
diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h
|
|
index d8d6beaa72c4d..8693704dcf5e9 100644
|
|
--- a/block/partitions/ldm.h
|
|
+++ b/block/partitions/ldm.h
|
|
@@ -84,9 +84,6 @@ struct parsed_partitions;
|
|
#define TOC_BITMAP1 "config" /* Names of the two defined */
|
|
#define TOC_BITMAP2 "log" /* bitmaps in the TOCBLOCK. */
|
|
|
|
-/* Borrowed from msdos.c */
|
|
-#define SYS_IND(p) (get_unaligned(&(p)->sys_ind))
|
|
-
|
|
struct frag { /* VBLK Fragment handling */
|
|
struct list_head list;
|
|
u32 group;
|
|
diff --git a/block/partitions/msdos.c b/block/partitions/msdos.c
|
|
index 8f2fcc0802642..c94de377c5025 100644
|
|
--- a/block/partitions/msdos.c
|
|
+++ b/block/partitions/msdos.c
|
|
@@ -38,8 +38,6 @@
|
|
*/
|
|
#include <asm/unaligned.h>
|
|
|
|
-#define SYS_IND(p) get_unaligned(&p->sys_ind)
|
|
-
|
|
static inline sector_t nr_sects(struct msdos_partition *p)
|
|
{
|
|
return (sector_t)get_unaligned_le32(&p->nr_sects);
|
|
@@ -52,9 +50,9 @@ static inline sector_t start_sect(struct msdos_partition *p)
|
|
|
|
static inline int is_extended_partition(struct msdos_partition *p)
|
|
{
|
|
- return (SYS_IND(p) == DOS_EXTENDED_PARTITION ||
|
|
- SYS_IND(p) == WIN98_EXTENDED_PARTITION ||
|
|
- SYS_IND(p) == LINUX_EXTENDED_PARTITION);
|
|
+ return (p->sys_ind == DOS_EXTENDED_PARTITION ||
|
|
+ p->sys_ind == WIN98_EXTENDED_PARTITION ||
|
|
+ p->sys_ind == LINUX_EXTENDED_PARTITION);
|
|
}
|
|
|
|
#define MSDOS_LABEL_MAGIC1 0x55
|
|
@@ -193,7 +191,7 @@ static void parse_extended(struct parsed_partitions *state,
|
|
|
|
put_partition(state, state->next, next, size);
|
|
set_info(state, state->next, disksig);
|
|
- if (SYS_IND(p) == LINUX_RAID_PARTITION)
|
|
+ if (p->sys_ind == LINUX_RAID_PARTITION)
|
|
state->parts[state->next].flags = ADDPART_FLAG_RAID;
|
|
loopct = 0;
|
|
if (++state->next == state->limit)
|
|
@@ -546,7 +544,7 @@ static void parse_minix(struct parsed_partitions *state,
|
|
* a secondary MBR describing its subpartitions, or
|
|
* the normal boot sector. */
|
|
if (msdos_magic_present(data + 510) &&
|
|
- SYS_IND(p) == MINIX_PARTITION) { /* subpartition table present */
|
|
+ p->sys_ind == MINIX_PARTITION) { /* subpartition table present */
|
|
char tmp[1 + BDEVNAME_SIZE + 10 + 9 + 1];
|
|
|
|
snprintf(tmp, sizeof(tmp), " %s%d: <minix:", state->name, origin);
|
|
@@ -555,7 +553,7 @@ static void parse_minix(struct parsed_partitions *state,
|
|
if (state->next == state->limit)
|
|
break;
|
|
/* add each partition in use */
|
|
- if (SYS_IND(p) == MINIX_PARTITION)
|
|
+ if (p->sys_ind == MINIX_PARTITION)
|
|
put_partition(state, state->next++,
|
|
start_sect(p), nr_sects(p));
|
|
}
|
|
@@ -643,7 +641,7 @@ int msdos_partition(struct parsed_partitions *state)
|
|
p = (struct msdos_partition *) (data + 0x1be);
|
|
for (slot = 1 ; slot <= 4 ; slot++, p++) {
|
|
/* If this is an EFI GPT disk, msdos should ignore it. */
|
|
- if (SYS_IND(p) == EFI_PMBR_OSTYPE_EFI_GPT) {
|
|
+ if (p->sys_ind == EFI_PMBR_OSTYPE_EFI_GPT) {
|
|
put_dev_sector(sect);
|
|
return 0;
|
|
}
|
|
@@ -685,11 +683,11 @@ int msdos_partition(struct parsed_partitions *state)
|
|
}
|
|
put_partition(state, slot, start, size);
|
|
set_info(state, slot, disksig);
|
|
- if (SYS_IND(p) == LINUX_RAID_PARTITION)
|
|
+ if (p->sys_ind == LINUX_RAID_PARTITION)
|
|
state->parts[slot].flags = ADDPART_FLAG_RAID;
|
|
- if (SYS_IND(p) == DM6_PARTITION)
|
|
+ if (p->sys_ind == DM6_PARTITION)
|
|
strlcat(state->pp_buf, "[DM]", PAGE_SIZE);
|
|
- if (SYS_IND(p) == EZD_PARTITION)
|
|
+ if (p->sys_ind == EZD_PARTITION)
|
|
strlcat(state->pp_buf, "[EZD]", PAGE_SIZE);
|
|
}
|
|
|
|
@@ -698,7 +696,7 @@ int msdos_partition(struct parsed_partitions *state)
|
|
/* second pass - output for each on a separate line */
|
|
p = (struct msdos_partition *) (0x1be + data);
|
|
for (slot = 1 ; slot <= 4 ; slot++, p++) {
|
|
- unsigned char id = SYS_IND(p);
|
|
+ unsigned char id = p->sys_ind;
|
|
int n;
|
|
|
|
if (!nr_sects(p))
|
|
diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
|
|
index 49b781a9cd979..ab8a4e0191b19 100644
|
|
--- a/drivers/acpi/acpi_amba.c
|
|
+++ b/drivers/acpi/acpi_amba.c
|
|
@@ -76,6 +76,7 @@ static int amba_handler_attach(struct acpi_device *adev,
|
|
case IORESOURCE_MEM:
|
|
if (!address_found) {
|
|
dev->res = *rentry->res;
|
|
+ dev->res.name = dev_name(&dev->dev);
|
|
address_found = true;
|
|
}
|
|
break;
|
|
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
|
|
index 0c884020f74b4..08a51dd285c43 100644
|
|
--- a/drivers/acpi/acpi_video.c
|
|
+++ b/drivers/acpi/acpi_video.c
|
|
@@ -540,6 +540,15 @@ static const struct dmi_system_id video_dmi_table[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"),
|
|
},
|
|
},
|
|
+ {
|
|
+ .callback = video_set_report_key_events,
|
|
+ .driver_data = (void *)((uintptr_t)REPORT_BRIGHTNESS_KEY_EVENTS),
|
|
+ .ident = "Dell Vostro 3350",
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
|
|
+ DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3350"),
|
|
+ },
|
|
+ },
|
|
/*
|
|
* Some machines change the brightness themselves when a brightness
|
|
* hotkey gets pressed, despite us telling them not to. In this case
|
|
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
|
|
index c1179edc0f3b8..921312a8d9576 100644
|
|
--- a/drivers/base/arch_topology.c
|
|
+++ b/drivers/base/arch_topology.c
|
|
@@ -18,10 +18,11 @@
|
|
#include <linux/cpumask.h>
|
|
#include <linux/init.h>
|
|
#include <linux/percpu.h>
|
|
+#include <linux/rcupdate.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/smp.h>
|
|
|
|
-static DEFINE_PER_CPU(struct scale_freq_data *, sft_data);
|
|
+static DEFINE_PER_CPU(struct scale_freq_data __rcu *, sft_data);
|
|
static struct cpumask scale_freq_counters_mask;
|
|
static bool scale_freq_invariant;
|
|
|
|
@@ -66,16 +67,20 @@ void topology_set_scale_freq_source(struct scale_freq_data *data,
|
|
if (cpumask_empty(&scale_freq_counters_mask))
|
|
scale_freq_invariant = topology_scale_freq_invariant();
|
|
|
|
+ rcu_read_lock();
|
|
+
|
|
for_each_cpu(cpu, cpus) {
|
|
- sfd = per_cpu(sft_data, cpu);
|
|
+ sfd = rcu_dereference(*per_cpu_ptr(&sft_data, cpu));
|
|
|
|
/* Use ARCH provided counters whenever possible */
|
|
if (!sfd || sfd->source != SCALE_FREQ_SOURCE_ARCH) {
|
|
- per_cpu(sft_data, cpu) = data;
|
|
+ rcu_assign_pointer(per_cpu(sft_data, cpu), data);
|
|
cpumask_set_cpu(cpu, &scale_freq_counters_mask);
|
|
}
|
|
}
|
|
|
|
+ rcu_read_unlock();
|
|
+
|
|
update_scale_freq_invariant(true);
|
|
}
|
|
EXPORT_SYMBOL_GPL(topology_set_scale_freq_source);
|
|
@@ -86,22 +91,32 @@ void topology_clear_scale_freq_source(enum scale_freq_source source,
|
|
struct scale_freq_data *sfd;
|
|
int cpu;
|
|
|
|
+ rcu_read_lock();
|
|
+
|
|
for_each_cpu(cpu, cpus) {
|
|
- sfd = per_cpu(sft_data, cpu);
|
|
+ sfd = rcu_dereference(*per_cpu_ptr(&sft_data, cpu));
|
|
|
|
if (sfd && sfd->source == source) {
|
|
- per_cpu(sft_data, cpu) = NULL;
|
|
+ rcu_assign_pointer(per_cpu(sft_data, cpu), NULL);
|
|
cpumask_clear_cpu(cpu, &scale_freq_counters_mask);
|
|
}
|
|
}
|
|
|
|
+ rcu_read_unlock();
|
|
+
|
|
+ /*
|
|
+ * Make sure all references to previous sft_data are dropped to avoid
|
|
+ * use-after-free races.
|
|
+ */
|
|
+ synchronize_rcu();
|
|
+
|
|
update_scale_freq_invariant(false);
|
|
}
|
|
EXPORT_SYMBOL_GPL(topology_clear_scale_freq_source);
|
|
|
|
void topology_scale_freq_tick(void)
|
|
{
|
|
- struct scale_freq_data *sfd = *this_cpu_ptr(&sft_data);
|
|
+ struct scale_freq_data *sfd = rcu_dereference_sched(*this_cpu_ptr(&sft_data));
|
|
|
|
if (sfd)
|
|
sfd->set_freq_scale();
|
|
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
|
|
index b9fa3ef5b57c0..425bae6181319 100644
|
|
--- a/drivers/block/virtio_blk.c
|
|
+++ b/drivers/block/virtio_blk.c
|
|
@@ -948,6 +948,8 @@ static int virtblk_freeze(struct virtio_device *vdev)
|
|
blk_mq_quiesce_queue(vblk->disk->queue);
|
|
|
|
vdev->config->del_vqs(vdev);
|
|
+ kfree(vblk->vqs);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
|
|
index 59dfd9c421a1e..7eaf303a7a86f 100644
|
|
--- a/drivers/char/virtio_console.c
|
|
+++ b/drivers/char/virtio_console.c
|
|
@@ -475,7 +475,7 @@ static struct port_buffer *get_inbuf(struct port *port)
|
|
|
|
buf = virtqueue_get_buf(port->in_vq, &len);
|
|
if (buf) {
|
|
- buf->len = len;
|
|
+ buf->len = min_t(size_t, len, buf->size);
|
|
buf->offset = 0;
|
|
port->stats.bytes_received += len;
|
|
}
|
|
@@ -1709,7 +1709,7 @@ static void control_work_handler(struct work_struct *work)
|
|
while ((buf = virtqueue_get_buf(vq, &len))) {
|
|
spin_unlock(&portdev->c_ivq_lock);
|
|
|
|
- buf->len = len;
|
|
+ buf->len = min_t(size_t, len, buf->size);
|
|
buf->offset = 0;
|
|
|
|
handle_control_message(vq->vdev, portdev, buf);
|
|
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c
|
|
index 2f769b1630c57..a27445f40d2c2 100644
|
|
--- a/drivers/cpufreq/cppc_cpufreq.c
|
|
+++ b/drivers/cpufreq/cppc_cpufreq.c
|
|
@@ -182,6 +182,16 @@ static int cppc_verify_policy(struct cpufreq_policy_data *policy)
|
|
return 0;
|
|
}
|
|
|
|
+static void cppc_cpufreq_put_cpu_data(struct cpufreq_policy *policy)
|
|
+{
|
|
+ struct cppc_cpudata *cpu_data = policy->driver_data;
|
|
+
|
|
+ list_del(&cpu_data->node);
|
|
+ free_cpumask_var(cpu_data->shared_cpu_map);
|
|
+ kfree(cpu_data);
|
|
+ policy->driver_data = NULL;
|
|
+}
|
|
+
|
|
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
|
|
{
|
|
struct cppc_cpudata *cpu_data = policy->driver_data;
|
|
@@ -196,11 +206,7 @@ static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
|
|
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
|
|
caps->lowest_perf, cpu, ret);
|
|
|
|
- /* Remove CPU node from list and free driver data for policy */
|
|
- free_cpumask_var(cpu_data->shared_cpu_map);
|
|
- list_del(&cpu_data->node);
|
|
- kfree(policy->driver_data);
|
|
- policy->driver_data = NULL;
|
|
+ cppc_cpufreq_put_cpu_data(policy);
|
|
}
|
|
|
|
/*
|
|
@@ -330,7 +336,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|
default:
|
|
pr_debug("Unsupported CPU co-ord type: %d\n",
|
|
policy->shared_type);
|
|
- return -EFAULT;
|
|
+ ret = -EFAULT;
|
|
+ goto out;
|
|
}
|
|
|
|
/*
|
|
@@ -345,10 +352,16 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
|
|
cpu_data->perf_ctrls.desired_perf = caps->highest_perf;
|
|
|
|
ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
|
|
- if (ret)
|
|
+ if (ret) {
|
|
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
|
|
caps->highest_perf, cpu, ret);
|
|
+ goto out;
|
|
+ }
|
|
|
|
+ return 0;
|
|
+
|
|
+out:
|
|
+ cppc_cpufreq_put_cpu_data(policy);
|
|
return ret;
|
|
}
|
|
|
|
diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
|
|
index c8a4364ad3c26..ec9a87ca2dbb8 100644
|
|
--- a/drivers/cpufreq/scmi-cpufreq.c
|
|
+++ b/drivers/cpufreq/scmi-cpufreq.c
|
|
@@ -174,7 +174,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
|
|
nr_opp = dev_pm_opp_get_opp_count(cpu_dev);
|
|
if (nr_opp <= 0) {
|
|
dev_err(cpu_dev, "%s: No OPPs for this device: %d\n",
|
|
- __func__, ret);
|
|
+ __func__, nr_opp);
|
|
|
|
ret = -ENODEV;
|
|
goto out_free_opp;
|
|
diff --git a/drivers/dma/fsl-qdma.c b/drivers/dma/fsl-qdma.c
|
|
index ed2ab46b15e7f..045ead46ec8fc 100644
|
|
--- a/drivers/dma/fsl-qdma.c
|
|
+++ b/drivers/dma/fsl-qdma.c
|
|
@@ -1235,7 +1235,11 @@ static int fsl_qdma_probe(struct platform_device *pdev)
|
|
fsl_qdma->dma_dev.device_synchronize = fsl_qdma_synchronize;
|
|
fsl_qdma->dma_dev.device_terminate_all = fsl_qdma_terminate_all;
|
|
|
|
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(40));
|
|
+ ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(40));
|
|
+ if (ret) {
|
|
+ dev_err(&pdev->dev, "dma_set_mask failure.\n");
|
|
+ return ret;
|
|
+ }
|
|
|
|
platform_set_drvdata(pdev, fsl_qdma);
|
|
|
|
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
|
|
index 91164c5f0757d..2fc4c3f91fd54 100644
|
|
--- a/drivers/edac/Kconfig
|
|
+++ b/drivers/edac/Kconfig
|
|
@@ -271,7 +271,7 @@ config EDAC_PND2
|
|
config EDAC_IGEN6
|
|
tristate "Intel client SoC Integrated MC"
|
|
depends on PCI && PCI_MMCONFIG && ARCH_HAVE_NMI_SAFE_CMPXCHG
|
|
- depends on X64_64 && X86_MCE_INTEL
|
|
+ depends on X86_64 && X86_MCE_INTEL
|
|
help
|
|
Support for error detection and correction on the Intel
|
|
client SoC Integrated Memory Controller using In-Band ECC IP.
|
|
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
|
|
index 66eb3f0e5dafc..c2983ed534949 100644
|
|
--- a/drivers/firmware/arm_scmi/driver.c
|
|
+++ b/drivers/firmware/arm_scmi/driver.c
|
|
@@ -335,6 +335,10 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo,
|
|
return;
|
|
}
|
|
|
|
+ /* rx.len could be shrunk in the sync do_xfer, so reset to maxsz */
|
|
+ if (msg_type == MSG_TYPE_DELAYED_RESP)
|
|
+ xfer->rx.len = info->desc->max_msg_size;
|
|
+
|
|
scmi_dump_header_dbg(dev, &xfer->hdr);
|
|
|
|
info->desc->ops->fetch_response(cinfo, xfer);
|
|
@@ -513,8 +517,12 @@ static int do_xfer_with_response(const struct scmi_protocol_handle *ph,
|
|
xfer->async_done = &async_response;
|
|
|
|
ret = do_xfer(ph, xfer);
|
|
- if (!ret && !wait_for_completion_timeout(xfer->async_done, timeout))
|
|
- ret = -ETIMEDOUT;
|
|
+ if (!ret) {
|
|
+ if (!wait_for_completion_timeout(xfer->async_done, timeout))
|
|
+ ret = -ETIMEDOUT;
|
|
+ else if (xfer->hdr.status)
|
|
+ ret = scmi_to_linux_errno(xfer->hdr.status);
|
|
+ }
|
|
|
|
xfer->async_done = NULL;
|
|
return ret;
|
|
diff --git a/drivers/firmware/tegra/bpmp-tegra210.c b/drivers/firmware/tegra/bpmp-tegra210.c
|
|
index ae15940a078e3..c32754055c60b 100644
|
|
--- a/drivers/firmware/tegra/bpmp-tegra210.c
|
|
+++ b/drivers/firmware/tegra/bpmp-tegra210.c
|
|
@@ -210,7 +210,7 @@ static int tegra210_bpmp_init(struct tegra_bpmp *bpmp)
|
|
priv->tx_irq_data = irq_get_irq_data(err);
|
|
if (!priv->tx_irq_data) {
|
|
dev_err(&pdev->dev, "failed to get IRQ data for TX IRQ\n");
|
|
- return err;
|
|
+ return -ENOENT;
|
|
}
|
|
|
|
err = platform_get_irq_byname(pdev, "rx");
|
|
diff --git a/drivers/firmware/turris-mox-rwtm.c b/drivers/firmware/turris-mox-rwtm.c
|
|
index 62f0d1a5dd324..1cf4f10874923 100644
|
|
--- a/drivers/firmware/turris-mox-rwtm.c
|
|
+++ b/drivers/firmware/turris-mox-rwtm.c
|
|
@@ -147,11 +147,14 @@ MOX_ATTR_RO(pubkey, "%s\n", pubkey);
|
|
|
|
static int mox_get_status(enum mbox_cmd cmd, u32 retval)
|
|
{
|
|
- if (MBOX_STS_CMD(retval) != cmd ||
|
|
- MBOX_STS_ERROR(retval) != MBOX_STS_SUCCESS)
|
|
+ if (MBOX_STS_CMD(retval) != cmd)
|
|
return -EIO;
|
|
else if (MBOX_STS_ERROR(retval) == MBOX_STS_FAIL)
|
|
return -(int)MBOX_STS_VALUE(retval);
|
|
+ else if (MBOX_STS_ERROR(retval) == MBOX_STS_BADCMD)
|
|
+ return -ENOSYS;
|
|
+ else if (MBOX_STS_ERROR(retval) != MBOX_STS_SUCCESS)
|
|
+ return -EIO;
|
|
else
|
|
return MBOX_STS_VALUE(retval);
|
|
}
|
|
@@ -201,11 +204,14 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
|
|
return ret;
|
|
|
|
ret = mox_get_status(MBOX_CMD_BOARD_INFO, reply->retval);
|
|
- if (ret < 0 && ret != -ENODATA) {
|
|
- return ret;
|
|
- } else if (ret == -ENODATA) {
|
|
+ if (ret == -ENODATA) {
|
|
dev_warn(rwtm->dev,
|
|
"Board does not have manufacturing information burned!\n");
|
|
+ } else if (ret == -ENOSYS) {
|
|
+ dev_notice(rwtm->dev,
|
|
+ "Firmware does not support the BOARD_INFO command\n");
|
|
+ } else if (ret < 0) {
|
|
+ return ret;
|
|
} else {
|
|
rwtm->serial_number = reply->status[1];
|
|
rwtm->serial_number <<= 32;
|
|
@@ -234,10 +240,13 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
|
|
return ret;
|
|
|
|
ret = mox_get_status(MBOX_CMD_ECDSA_PUB_KEY, reply->retval);
|
|
- if (ret < 0 && ret != -ENODATA) {
|
|
- return ret;
|
|
- } else if (ret == -ENODATA) {
|
|
+ if (ret == -ENODATA) {
|
|
dev_warn(rwtm->dev, "Board has no public key burned!\n");
|
|
+ } else if (ret == -ENOSYS) {
|
|
+ dev_notice(rwtm->dev,
|
|
+ "Firmware does not support the ECDSA_PUB_KEY command\n");
|
|
+ } else if (ret < 0) {
|
|
+ return ret;
|
|
} else {
|
|
u32 *s = reply->status;
|
|
|
|
@@ -251,6 +260,27 @@ static int mox_get_board_info(struct mox_rwtm *rwtm)
|
|
return 0;
|
|
}
|
|
|
|
+static int check_get_random_support(struct mox_rwtm *rwtm)
|
|
+{
|
|
+ struct armada_37xx_rwtm_tx_msg msg;
|
|
+ int ret;
|
|
+
|
|
+ msg.command = MBOX_CMD_GET_RANDOM;
|
|
+ msg.args[0] = 1;
|
|
+ msg.args[1] = rwtm->buf_phys;
|
|
+ msg.args[2] = 4;
|
|
+
|
|
+ ret = mbox_send_message(rwtm->mbox, &msg);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ ret = wait_for_completion_timeout(&rwtm->cmd_done, HZ / 2);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ return mox_get_status(MBOX_CMD_GET_RANDOM, rwtm->reply.retval);
|
|
+}
|
|
+
|
|
static int mox_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait)
|
|
{
|
|
struct mox_rwtm *rwtm = (struct mox_rwtm *) rng->priv;
|
|
@@ -488,6 +518,13 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
|
|
if (ret < 0)
|
|
dev_warn(dev, "Cannot read board information: %i\n", ret);
|
|
|
|
+ ret = check_get_random_support(rwtm);
|
|
+ if (ret < 0) {
|
|
+ dev_notice(dev,
|
|
+ "Firmware does not support the GET_RANDOM command\n");
|
|
+ goto free_channel;
|
|
+ }
|
|
+
|
|
rwtm->hwrng.name = DRIVER_NAME "_hwrng";
|
|
rwtm->hwrng.read = mox_hwrng_read;
|
|
rwtm->hwrng.priv = (unsigned long) rwtm;
|
|
@@ -505,6 +542,8 @@ static int turris_mox_rwtm_probe(struct platform_device *pdev)
|
|
goto free_channel;
|
|
}
|
|
|
|
+ dev_info(dev, "HWRNG successfully registered\n");
|
|
+
|
|
return 0;
|
|
|
|
free_channel:
|
|
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c
|
|
index 90dbe58ca1edc..dbad73162c833 100644
|
|
--- a/drivers/fsi/fsi-master-aspeed.c
|
|
+++ b/drivers/fsi/fsi-master-aspeed.c
|
|
@@ -645,6 +645,7 @@ static const struct of_device_id fsi_master_aspeed_match[] = {
|
|
{ .compatible = "aspeed,ast2600-fsi-master" },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, fsi_master_aspeed_match);
|
|
|
|
static struct platform_driver fsi_master_aspeed_driver = {
|
|
.driver = {
|
|
diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
|
|
index 57a779a89b073..70c03e304d6c8 100644
|
|
--- a/drivers/fsi/fsi-master-ast-cf.c
|
|
+++ b/drivers/fsi/fsi-master-ast-cf.c
|
|
@@ -1427,6 +1427,7 @@ static const struct of_device_id fsi_master_acf_match[] = {
|
|
{ .compatible = "aspeed,ast2500-cf-fsi-master" },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, fsi_master_acf_match);
|
|
|
|
static struct platform_driver fsi_master_acf = {
|
|
.driver = {
|
|
diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c
|
|
index aa97c4a250cb4..7d5f29b4b595d 100644
|
|
--- a/drivers/fsi/fsi-master-gpio.c
|
|
+++ b/drivers/fsi/fsi-master-gpio.c
|
|
@@ -882,6 +882,7 @@ static const struct of_device_id fsi_master_gpio_match[] = {
|
|
{ .compatible = "fsi-master-gpio" },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, fsi_master_gpio_match);
|
|
|
|
static struct platform_driver fsi_master_gpio_driver = {
|
|
.driver = {
|
|
diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
|
|
index cb05b6dacc9d5..dc74bffedd727 100644
|
|
--- a/drivers/fsi/fsi-occ.c
|
|
+++ b/drivers/fsi/fsi-occ.c
|
|
@@ -636,6 +636,7 @@ static const struct of_device_id occ_match[] = {
|
|
},
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, occ_match);
|
|
|
|
static struct platform_driver occ_driver = {
|
|
.driver = {
|
|
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
|
|
index c91d056515966..f5cfc0698799a 100644
|
|
--- a/drivers/gpio/gpio-pca953x.c
|
|
+++ b/drivers/gpio/gpio-pca953x.c
|
|
@@ -1241,6 +1241,7 @@ static const struct of_device_id pca953x_dt_ids[] = {
|
|
|
|
{ .compatible = "onnn,cat9554", .data = OF_953X( 8, PCA_INT), },
|
|
{ .compatible = "onnn,pca9654", .data = OF_953X( 8, PCA_INT), },
|
|
+ { .compatible = "onnn,pca9655", .data = OF_953X(16, PCA_INT), },
|
|
|
|
{ .compatible = "exar,xra1202", .data = OF_953X( 8, 0), },
|
|
{ }
|
|
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
|
|
index 3521c1dc3ac00..c288a7502de25 100644
|
|
--- a/drivers/gpio/gpio-zynq.c
|
|
+++ b/drivers/gpio/gpio-zynq.c
|
|
@@ -736,6 +736,11 @@ static int __maybe_unused zynq_gpio_suspend(struct device *dev)
|
|
struct zynq_gpio *gpio = dev_get_drvdata(dev);
|
|
struct irq_data *data = irq_get_irq_data(gpio->irq);
|
|
|
|
+ if (!data) {
|
|
+ dev_err(dev, "irq_get_irq_data() failed\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
if (!device_may_wakeup(dev))
|
|
disable_irq(gpio->irq);
|
|
|
|
@@ -753,6 +758,11 @@ static int __maybe_unused zynq_gpio_resume(struct device *dev)
|
|
struct irq_data *data = irq_get_irq_data(gpio->irq);
|
|
int ret;
|
|
|
|
+ if (!data) {
|
|
+ dev_err(dev, "irq_get_irq_data() failed\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
if (!device_may_wakeup(dev))
|
|
enable_irq(gpio->irq);
|
|
|
|
@@ -1001,8 +1011,11 @@ err_pm_dis:
|
|
static int zynq_gpio_remove(struct platform_device *pdev)
|
|
{
|
|
struct zynq_gpio *gpio = platform_get_drvdata(pdev);
|
|
+ int ret;
|
|
|
|
- pm_runtime_get_sync(&pdev->dev);
|
|
+ ret = pm_runtime_get_sync(&pdev->dev);
|
|
+ if (ret < 0)
|
|
+ dev_warn(&pdev->dev, "pm_runtime_get_sync() Failed\n");
|
|
gpiochip_remove(&gpio->chip);
|
|
clk_disable_unprepare(gpio->clk);
|
|
device_set_wakeup_capable(&pdev->dev, 0);
|
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
index c576902ccf8e6..9dfed9d560dc4 100644
|
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
|
|
@@ -1148,6 +1148,7 @@ static const struct pci_device_id pciidlist[] = {
|
|
{0x1002, 0x734F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14},
|
|
|
|
/* Renoir */
|
|
+ {0x1002, 0x15E7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
|
|
{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
|
|
{0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
|
|
{0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},
|
|
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
|
|
index 0597aeb5f0e89..9ea5b4d2fe8b8 100644
|
|
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
|
|
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
|
|
@@ -7846,6 +7846,97 @@ static void gfx_v10_0_update_fine_grain_clock_gating(struct amdgpu_device *adev,
|
|
}
|
|
}
|
|
|
|
+static void gfx_v10_0_apply_medium_grain_clock_gating_workaround(struct amdgpu_device *adev)
|
|
+{
|
|
+ uint32_t reg_data = 0;
|
|
+ uint32_t reg_idx = 0;
|
|
+ uint32_t i;
|
|
+
|
|
+ const uint32_t tcp_ctrl_regs[] = {
|
|
+ mmCGTS_SA0_WGP00_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP00_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP01_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP01_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP02_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP02_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP10_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP10_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP11_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP11_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP12_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP12_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP00_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP00_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP01_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP01_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP02_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP02_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP10_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP10_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP11_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP11_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP12_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP12_CU1_TCP_CTRL_REG
|
|
+ };
|
|
+
|
|
+ const uint32_t tcp_ctrl_regs_nv12[] = {
|
|
+ mmCGTS_SA0_WGP00_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP00_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP01_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP01_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP02_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP02_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP10_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP10_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP11_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA0_WGP11_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP00_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP00_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP01_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP01_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP02_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP02_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP10_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP10_CU1_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP11_CU0_TCP_CTRL_REG,
|
|
+ mmCGTS_SA1_WGP11_CU1_TCP_CTRL_REG,
|
|
+ };
|
|
+
|
|
+ const uint32_t sm_ctlr_regs[] = {
|
|
+ mmCGTS_SA0_QUAD0_SM_CTRL_REG,
|
|
+ mmCGTS_SA0_QUAD1_SM_CTRL_REG,
|
|
+ mmCGTS_SA1_QUAD0_SM_CTRL_REG,
|
|
+ mmCGTS_SA1_QUAD1_SM_CTRL_REG
|
|
+ };
|
|
+
|
|
+ if (adev->asic_type == CHIP_NAVI12) {
|
|
+ for (i = 0; i < ARRAY_SIZE(tcp_ctrl_regs_nv12); i++) {
|
|
+ reg_idx = adev->reg_offset[GC_HWIP][0][mmCGTS_SA0_WGP00_CU0_TCP_CTRL_REG_BASE_IDX] +
|
|
+ tcp_ctrl_regs_nv12[i];
|
|
+ reg_data = RREG32(reg_idx);
|
|
+ reg_data |= CGTS_SA0_WGP00_CU0_TCP_CTRL_REG__TCPI_LS_OVERRIDE_MASK;
|
|
+ WREG32(reg_idx, reg_data);
|
|
+ }
|
|
+ } else {
|
|
+ for (i = 0; i < ARRAY_SIZE(tcp_ctrl_regs); i++) {
|
|
+ reg_idx = adev->reg_offset[GC_HWIP][0][mmCGTS_SA0_WGP00_CU0_TCP_CTRL_REG_BASE_IDX] +
|
|
+ tcp_ctrl_regs[i];
|
|
+ reg_data = RREG32(reg_idx);
|
|
+ reg_data |= CGTS_SA0_WGP00_CU0_TCP_CTRL_REG__TCPI_LS_OVERRIDE_MASK;
|
|
+ WREG32(reg_idx, reg_data);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(sm_ctlr_regs); i++) {
|
|
+ reg_idx = adev->reg_offset[GC_HWIP][0][mmCGTS_SA0_QUAD0_SM_CTRL_REG_BASE_IDX] +
|
|
+ sm_ctlr_regs[i];
|
|
+ reg_data = RREG32(reg_idx);
|
|
+ reg_data &= ~CGTS_SA0_QUAD0_SM_CTRL_REG__SM_MODE_MASK;
|
|
+ reg_data |= 2 << CGTS_SA0_QUAD0_SM_CTRL_REG__SM_MODE__SHIFT;
|
|
+ WREG32(reg_idx, reg_data);
|
|
+ }
|
|
+}
|
|
+
|
|
static int gfx_v10_0_update_gfx_clock_gating(struct amdgpu_device *adev,
|
|
bool enable)
|
|
{
|
|
@@ -7862,6 +7953,10 @@ static int gfx_v10_0_update_gfx_clock_gating(struct amdgpu_device *adev,
|
|
gfx_v10_0_update_3d_clock_gating(adev, enable);
|
|
/* === CGCG + CGLS === */
|
|
gfx_v10_0_update_coarse_grain_clock_gating(adev, enable);
|
|
+
|
|
+ if ((adev->asic_type >= CHIP_NAVI10) &&
|
|
+ (adev->asic_type <= CHIP_NAVI12))
|
|
+ gfx_v10_0_apply_medium_grain_clock_gating_workaround(adev);
|
|
} else {
|
|
/* CGCG/CGLS should be disabled before MGCG/MGLS
|
|
* === CGCG + CGLS ===
|
|
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
|
|
index d97e330a50221..7fe746c5a2b89 100644
|
|
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
|
|
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
|
|
@@ -452,13 +452,9 @@ static const struct sysfs_ops procfs_stats_ops = {
|
|
.show = kfd_procfs_stats_show,
|
|
};
|
|
|
|
-static struct attribute *procfs_stats_attrs[] = {
|
|
- NULL
|
|
-};
|
|
-
|
|
static struct kobj_type procfs_stats_type = {
|
|
.sysfs_ops = &procfs_stats_ops,
|
|
- .default_attrs = procfs_stats_attrs,
|
|
+ .release = kfd_procfs_kobj_release,
|
|
};
|
|
|
|
int kfd_procfs_add_queue(struct queue *q)
|
|
@@ -984,9 +980,11 @@ static void kfd_process_wq_release(struct work_struct *work)
|
|
|
|
sysfs_remove_file(p->kobj, &pdd->attr_vram);
|
|
sysfs_remove_file(p->kobj, &pdd->attr_sdma);
|
|
- sysfs_remove_file(p->kobj, &pdd->attr_evict);
|
|
- if (pdd->dev->kfd2kgd->get_cu_occupancy != NULL)
|
|
- sysfs_remove_file(p->kobj, &pdd->attr_cu_occupancy);
|
|
+
|
|
+ sysfs_remove_file(pdd->kobj_stats, &pdd->attr_evict);
|
|
+ if (pdd->dev->kfd2kgd->get_cu_occupancy)
|
|
+ sysfs_remove_file(pdd->kobj_stats,
|
|
+ &pdd->attr_cu_occupancy);
|
|
kobject_del(pdd->kobj_stats);
|
|
kobject_put(pdd->kobj_stats);
|
|
pdd->kobj_stats = NULL;
|
|
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
|
|
index 95a6c36cea4c6..243dd1efcdbf5 100644
|
|
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
|
|
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
|
|
@@ -153,6 +153,7 @@ void pqm_uninit(struct process_queue_manager *pqm)
|
|
if (pqn->q && pqn->q->gws)
|
|
amdgpu_amdkfd_remove_gws_from_process(pqm->process->kgd_process_info,
|
|
pqn->q->gws);
|
|
+ kfd_procfs_del_queue(pqn->q);
|
|
uninit_queue(pqn->q);
|
|
list_del(&pqn->process_queue_list);
|
|
kfree(pqn);
|
|
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
|
|
index 159014455fab0..a68dc25a19c6d 100644
|
|
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
|
|
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
|
|
@@ -94,6 +94,9 @@ static int drm_dp_mst_register_i2c_bus(struct drm_dp_mst_port *port);
|
|
static void drm_dp_mst_unregister_i2c_bus(struct drm_dp_mst_port *port);
|
|
static void drm_dp_mst_kick_tx(struct drm_dp_mst_topology_mgr *mgr);
|
|
|
|
+static bool drm_dp_mst_port_downstream_of_branch(struct drm_dp_mst_port *port,
|
|
+ struct drm_dp_mst_branch *branch);
|
|
+
|
|
#define DBG_PREFIX "[dp_mst]"
|
|
|
|
#define DP_STR(x) [DP_ ## x] = #x
|
|
@@ -2497,7 +2500,7 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb,
|
|
{
|
|
struct drm_dp_mst_topology_mgr *mgr = mstb->mgr;
|
|
struct drm_dp_mst_port *port;
|
|
- int old_ddps, old_input, ret, i;
|
|
+ int old_ddps, ret;
|
|
u8 new_pdt;
|
|
bool new_mcs;
|
|
bool dowork = false, create_connector = false;
|
|
@@ -2529,7 +2532,6 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb,
|
|
}
|
|
|
|
old_ddps = port->ddps;
|
|
- old_input = port->input;
|
|
port->input = conn_stat->input_port;
|
|
port->ldps = conn_stat->legacy_device_plug_status;
|
|
port->ddps = conn_stat->displayport_device_plug_status;
|
|
@@ -2552,28 +2554,6 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb,
|
|
dowork = false;
|
|
}
|
|
|
|
- if (!old_input && old_ddps != port->ddps && !port->ddps) {
|
|
- for (i = 0; i < mgr->max_payloads; i++) {
|
|
- struct drm_dp_vcpi *vcpi = mgr->proposed_vcpis[i];
|
|
- struct drm_dp_mst_port *port_validated;
|
|
-
|
|
- if (!vcpi)
|
|
- continue;
|
|
-
|
|
- port_validated =
|
|
- container_of(vcpi, struct drm_dp_mst_port, vcpi);
|
|
- port_validated =
|
|
- drm_dp_mst_topology_get_port_validated(mgr, port_validated);
|
|
- if (!port_validated) {
|
|
- mutex_lock(&mgr->payload_lock);
|
|
- vcpi->num_slots = 0;
|
|
- mutex_unlock(&mgr->payload_lock);
|
|
- } else {
|
|
- drm_dp_mst_topology_put_port(port_validated);
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
if (port->connector)
|
|
drm_modeset_unlock(&mgr->base.lock);
|
|
else if (create_connector)
|
|
@@ -3383,6 +3363,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
|
|
struct drm_dp_mst_port *port;
|
|
int i, j;
|
|
int cur_slots = 1;
|
|
+ bool skip;
|
|
|
|
mutex_lock(&mgr->payload_lock);
|
|
for (i = 0; i < mgr->max_payloads; i++) {
|
|
@@ -3397,6 +3378,16 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
|
|
port = container_of(vcpi, struct drm_dp_mst_port,
|
|
vcpi);
|
|
|
|
+ mutex_lock(&mgr->lock);
|
|
+ skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
|
|
+ mutex_unlock(&mgr->lock);
|
|
+
|
|
+ if (skip) {
|
|
+ drm_dbg_kms(mgr->dev,
|
|
+ "Virtual channel %d is not in current topology\n",
|
|
+ i);
|
|
+ continue;
|
|
+ }
|
|
/* Validated ports don't matter if we're releasing
|
|
* VCPI
|
|
*/
|
|
@@ -3404,8 +3395,16 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr)
|
|
port = drm_dp_mst_topology_get_port_validated(
|
|
mgr, port);
|
|
if (!port) {
|
|
- mutex_unlock(&mgr->payload_lock);
|
|
- return -EINVAL;
|
|
+ if (vcpi->num_slots == payload->num_slots) {
|
|
+ cur_slots += vcpi->num_slots;
|
|
+ payload->start_slot = req_payload.start_slot;
|
|
+ continue;
|
|
+ } else {
|
|
+ drm_dbg_kms(mgr->dev,
|
|
+ "Fail:set payload to invalid sink");
|
|
+ mutex_unlock(&mgr->payload_lock);
|
|
+ return -EINVAL;
|
|
+ }
|
|
}
|
|
put_port = true;
|
|
}
|
|
@@ -3489,6 +3488,7 @@ int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr)
|
|
struct drm_dp_mst_port *port;
|
|
int i;
|
|
int ret = 0;
|
|
+ bool skip;
|
|
|
|
mutex_lock(&mgr->payload_lock);
|
|
for (i = 0; i < mgr->max_payloads; i++) {
|
|
@@ -3498,6 +3498,13 @@ int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr)
|
|
|
|
port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);
|
|
|
|
+ mutex_lock(&mgr->lock);
|
|
+ skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
|
|
+ mutex_unlock(&mgr->lock);
|
|
+
|
|
+ if (skip)
|
|
+ continue;
|
|
+
|
|
DRM_DEBUG_KMS("payload %d %d\n", i, mgr->payloads[i].payload_state);
|
|
if (mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL) {
|
|
ret = drm_dp_create_payload_step2(mgr, port, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]);
|
|
@@ -4577,9 +4584,18 @@ EXPORT_SYMBOL(drm_dp_mst_reset_vcpi_slots);
|
|
void drm_dp_mst_deallocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,
|
|
struct drm_dp_mst_port *port)
|
|
{
|
|
+ bool skip;
|
|
+
|
|
if (!port->vcpi.vcpi)
|
|
return;
|
|
|
|
+ mutex_lock(&mgr->lock);
|
|
+ skip = !drm_dp_mst_port_downstream_of_branch(port, mgr->mst_primary);
|
|
+ mutex_unlock(&mgr->lock);
|
|
+
|
|
+ if (skip)
|
|
+ return;
|
|
+
|
|
drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
|
|
port->vcpi.num_slots = 0;
|
|
port->vcpi.pbn = 0;
|
|
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
|
|
index ebe9dccf2d830..0b8648396fb24 100644
|
|
--- a/drivers/gpu/drm/gma500/framebuffer.c
|
|
+++ b/drivers/gpu/drm/gma500/framebuffer.c
|
|
@@ -352,6 +352,7 @@ static struct drm_framebuffer *psb_user_framebuffer_create
|
|
const struct drm_mode_fb_cmd2 *cmd)
|
|
{
|
|
struct drm_gem_object *obj;
|
|
+ struct drm_framebuffer *fb;
|
|
|
|
/*
|
|
* Find the GEM object and thus the gtt range object that is
|
|
@@ -362,7 +363,11 @@ static struct drm_framebuffer *psb_user_framebuffer_create
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
/* Let the core code do all the work */
|
|
- return psb_framebuffer_create(dev, cmd, obj);
|
|
+ fb = psb_framebuffer_create(dev, cmd, obj);
|
|
+ if (IS_ERR(fb))
|
|
+ drm_gem_object_put(obj);
|
|
+
|
|
+ return fb;
|
|
}
|
|
|
|
static int psbfb_probe(struct drm_fb_helper *fb_helper,
|
|
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
|
|
index 74bf6fc8461fe..674ef8805c704 100644
|
|
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
|
|
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
|
|
@@ -304,10 +304,7 @@ static void __gen8_ppgtt_alloc(struct i915_address_space * const vm,
|
|
__i915_gem_object_pin_pages(pt->base);
|
|
i915_gem_object_make_unshrinkable(pt->base);
|
|
|
|
- if (lvl ||
|
|
- gen8_pt_count(*start, end) < I915_PDES ||
|
|
- intel_vgpu_active(vm->i915))
|
|
- fill_px(pt, vm->scratch[lvl]->encode);
|
|
+ fill_px(pt, vm->scratch[lvl]->encode);
|
|
|
|
spin_lock(&pd->lock);
|
|
if (likely(!pd->entry[idx])) {
|
|
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
|
|
index 8a322594210c4..f282a26131c0b 100644
|
|
--- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
|
|
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
|
|
@@ -348,7 +348,7 @@ static struct i915_fence_reg *fence_find(struct i915_ggtt *ggtt)
|
|
if (intel_has_pending_fb_unpin(ggtt->vm.i915))
|
|
return ERR_PTR(-EAGAIN);
|
|
|
|
- return ERR_PTR(-EDEADLK);
|
|
+ return ERR_PTR(-ENOBUFS);
|
|
}
|
|
|
|
int __i915_vma_pin_fence(struct i915_vma *vma)
|
|
diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
|
|
index 24d0c974bfd55..1b44d86af9c22 100644
|
|
--- a/drivers/hwtracing/intel_th/core.c
|
|
+++ b/drivers/hwtracing/intel_th/core.c
|
|
@@ -215,6 +215,22 @@ static ssize_t port_show(struct device *dev, struct device_attribute *attr,
|
|
|
|
static DEVICE_ATTR_RO(port);
|
|
|
|
+static void intel_th_trace_prepare(struct intel_th_device *thdev)
|
|
+{
|
|
+ struct intel_th_device *hub = to_intel_th_hub(thdev);
|
|
+ struct intel_th_driver *hubdrv = to_intel_th_driver(hub->dev.driver);
|
|
+
|
|
+ if (hub->type != INTEL_TH_SWITCH)
|
|
+ return;
|
|
+
|
|
+ if (thdev->type != INTEL_TH_OUTPUT)
|
|
+ return;
|
|
+
|
|
+ pm_runtime_get_sync(&thdev->dev);
|
|
+ hubdrv->prepare(hub, &thdev->output);
|
|
+ pm_runtime_put(&thdev->dev);
|
|
+}
|
|
+
|
|
static int intel_th_output_activate(struct intel_th_device *thdev)
|
|
{
|
|
struct intel_th_driver *thdrv =
|
|
@@ -235,6 +251,7 @@ static int intel_th_output_activate(struct intel_th_device *thdev)
|
|
if (ret)
|
|
goto fail_put;
|
|
|
|
+ intel_th_trace_prepare(thdev);
|
|
if (thdrv->activate)
|
|
ret = thdrv->activate(thdev);
|
|
else
|
|
diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c
|
|
index 28509b02a0b56..b3308934a687d 100644
|
|
--- a/drivers/hwtracing/intel_th/gth.c
|
|
+++ b/drivers/hwtracing/intel_th/gth.c
|
|
@@ -564,6 +564,21 @@ static void gth_tscu_resync(struct gth_device *gth)
|
|
iowrite32(reg, gth->base + REG_TSCU_TSUCTRL);
|
|
}
|
|
|
|
+static void intel_th_gth_prepare(struct intel_th_device *thdev,
|
|
+ struct intel_th_output *output)
|
|
+{
|
|
+ struct gth_device *gth = dev_get_drvdata(&thdev->dev);
|
|
+ int count;
|
|
+
|
|
+ /*
|
|
+ * Wait until the output port is in reset before we start
|
|
+ * programming it.
|
|
+ */
|
|
+ for (count = GTH_PLE_WAITLOOP_DEPTH;
|
|
+ count && !(gth_output_get(gth, output->port) & BIT(5)); count--)
|
|
+ cpu_relax();
|
|
+}
|
|
+
|
|
/**
|
|
* intel_th_gth_enable() - enable tracing to an output device
|
|
* @thdev: GTH device
|
|
@@ -815,6 +830,7 @@ static struct intel_th_driver intel_th_gth_driver = {
|
|
.assign = intel_th_gth_assign,
|
|
.unassign = intel_th_gth_unassign,
|
|
.set_output = intel_th_gth_set_output,
|
|
+ .prepare = intel_th_gth_prepare,
|
|
.enable = intel_th_gth_enable,
|
|
.trig_switch = intel_th_gth_switch,
|
|
.disable = intel_th_gth_disable,
|
|
diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
|
|
index 89c67e0e1d348..0ffb42990175a 100644
|
|
--- a/drivers/hwtracing/intel_th/intel_th.h
|
|
+++ b/drivers/hwtracing/intel_th/intel_th.h
|
|
@@ -143,6 +143,7 @@ intel_th_output_assigned(struct intel_th_device *thdev)
|
|
* @remove: remove method
|
|
* @assign: match a given output type device against available outputs
|
|
* @unassign: deassociate an output type device from an output port
|
|
+ * @prepare: prepare output port for tracing
|
|
* @enable: enable tracing for a given output device
|
|
* @disable: disable tracing for a given output device
|
|
* @irq: interrupt callback
|
|
@@ -164,6 +165,8 @@ struct intel_th_driver {
|
|
struct intel_th_device *othdev);
|
|
void (*unassign)(struct intel_th_device *thdev,
|
|
struct intel_th_device *othdev);
|
|
+ void (*prepare)(struct intel_th_device *thdev,
|
|
+ struct intel_th_output *output);
|
|
void (*enable)(struct intel_th_device *thdev,
|
|
struct intel_th_output *output);
|
|
void (*trig_switch)(struct intel_th_device *thdev,
|
|
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
|
|
index 5a97e4a02fa2a..e314ccaf114ac 100644
|
|
--- a/drivers/i2c/i2c-core-base.c
|
|
+++ b/drivers/i2c/i2c-core-base.c
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/i2c-smbus.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/interrupt.h>
|
|
#include <linux/irqflags.h>
|
|
#include <linux/jump_label.h>
|
|
#include <linux/kernel.h>
|
|
@@ -627,6 +628,8 @@ static void i2c_device_shutdown(struct device *dev)
|
|
driver = to_i2c_driver(dev->driver);
|
|
if (driver->shutdown)
|
|
driver->shutdown(client);
|
|
+ else if (client->irq > 0)
|
|
+ disable_irq(client->irq);
|
|
}
|
|
|
|
static void i2c_client_dev_release(struct device *dev)
|
|
diff --git a/drivers/iio/gyro/fxas21002c_core.c b/drivers/iio/gyro/fxas21002c_core.c
|
|
index 645461c704547..6a85f231fd57c 100644
|
|
--- a/drivers/iio/gyro/fxas21002c_core.c
|
|
+++ b/drivers/iio/gyro/fxas21002c_core.c
|
|
@@ -366,14 +366,7 @@ out_unlock:
|
|
|
|
static int fxas21002c_pm_get(struct fxas21002c_data *data)
|
|
{
|
|
- struct device *dev = regmap_get_device(data->regmap);
|
|
- int ret;
|
|
-
|
|
- ret = pm_runtime_get_sync(dev);
|
|
- if (ret < 0)
|
|
- pm_runtime_put_noidle(dev);
|
|
-
|
|
- return ret;
|
|
+ return pm_runtime_resume_and_get(regmap_get_device(data->regmap));
|
|
}
|
|
|
|
static int fxas21002c_pm_put(struct fxas21002c_data *data)
|
|
@@ -1004,7 +997,6 @@ int fxas21002c_core_probe(struct device *dev, struct regmap *regmap, int irq,
|
|
pm_disable:
|
|
pm_runtime_disable(dev);
|
|
pm_runtime_set_suspended(dev);
|
|
- pm_runtime_put_noidle(dev);
|
|
|
|
return ret;
|
|
}
|
|
@@ -1018,7 +1010,6 @@ void fxas21002c_core_remove(struct device *dev)
|
|
|
|
pm_runtime_disable(dev);
|
|
pm_runtime_set_suspended(dev);
|
|
- pm_runtime_put_noidle(dev);
|
|
}
|
|
EXPORT_SYMBOL_GPL(fxas21002c_core_remove);
|
|
|
|
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
|
|
index 7cedaab096a7f..e8d242ee6743b 100644
|
|
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
|
|
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
|
|
@@ -15,19 +15,19 @@
|
|
*
|
|
* Supported sensors:
|
|
* - LSM6DS3:
|
|
- * - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416
|
|
+ * - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416
|
|
* - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
|
|
* - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
|
|
* - FIFO size: 8KB
|
|
*
|
|
* - LSM6DS3H/LSM6DSL/LSM6DSM/ISM330DLC/LSM6DS3TR-C:
|
|
- * - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416
|
|
+ * - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416
|
|
* - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
|
|
* - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
|
|
* - FIFO size: 4KB
|
|
*
|
|
* - LSM6DSO/LSM6DSOX/ASM330LHH/LSM6DSR/ISM330DHCX/LSM6DST/LSM6DSOP:
|
|
- * - Accelerometer/Gyroscope supported ODR [Hz]: 13, 26, 52, 104, 208, 416,
|
|
+ * - Accelerometer/Gyroscope supported ODR [Hz]: 12.5, 26, 52, 104, 208, 416,
|
|
* 833
|
|
* - Accelerometer supported full-scale [g]: +-2/+-4/+-8/+-16
|
|
* - Gyroscope supported full-scale [dps]: +-125/+-245/+-500/+-1000/+-2000
|
|
diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
|
|
index d534f4f3909eb..6cf3eceaf2d97 100644
|
|
--- a/drivers/iio/magnetometer/bmc150_magn.c
|
|
+++ b/drivers/iio/magnetometer/bmc150_magn.c
|
|
@@ -265,7 +265,7 @@ static int bmc150_magn_set_power_state(struct bmc150_magn_data *data, bool on)
|
|
int ret;
|
|
|
|
if (on) {
|
|
- ret = pm_runtime_get_sync(data->dev);
|
|
+ ret = pm_runtime_resume_and_get(data->dev);
|
|
} else {
|
|
pm_runtime_mark_last_busy(data->dev);
|
|
ret = pm_runtime_put_autosuspend(data->dev);
|
|
@@ -274,9 +274,6 @@ static int bmc150_magn_set_power_state(struct bmc150_magn_data *data, bool on)
|
|
if (ret < 0) {
|
|
dev_err(data->dev,
|
|
"failed to change power state to %d\n", on);
|
|
- if (on)
|
|
- pm_runtime_put_noidle(data->dev);
|
|
-
|
|
return ret;
|
|
}
|
|
#endif
|
|
@@ -966,12 +963,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,
|
|
ret = iio_device_register(indio_dev);
|
|
if (ret < 0) {
|
|
dev_err(dev, "unable to register iio device\n");
|
|
- goto err_buffer_cleanup;
|
|
+ goto err_disable_runtime_pm;
|
|
}
|
|
|
|
dev_dbg(dev, "Registered device %s\n", name);
|
|
return 0;
|
|
|
|
+err_disable_runtime_pm:
|
|
+ pm_runtime_disable(dev);
|
|
err_buffer_cleanup:
|
|
iio_triggered_buffer_cleanup(indio_dev);
|
|
err_free_irq:
|
|
@@ -995,7 +994,6 @@ int bmc150_magn_remove(struct device *dev)
|
|
|
|
pm_runtime_disable(dev);
|
|
pm_runtime_set_suspended(dev);
|
|
- pm_runtime_put_noidle(dev);
|
|
|
|
iio_triggered_buffer_cleanup(indio_dev);
|
|
|
|
diff --git a/drivers/input/touchscreen/hideep.c b/drivers/input/touchscreen/hideep.c
|
|
index ddad4a82a5e55..e9547ee297564 100644
|
|
--- a/drivers/input/touchscreen/hideep.c
|
|
+++ b/drivers/input/touchscreen/hideep.c
|
|
@@ -361,13 +361,16 @@ static int hideep_enter_pgm(struct hideep_ts *ts)
|
|
return -EIO;
|
|
}
|
|
|
|
-static void hideep_nvm_unlock(struct hideep_ts *ts)
|
|
+static int hideep_nvm_unlock(struct hideep_ts *ts)
|
|
{
|
|
u32 unmask_code;
|
|
+ int error;
|
|
|
|
hideep_pgm_w_reg(ts, HIDEEP_FLASH_CFG, HIDEEP_NVM_SFR_RPAGE);
|
|
- hideep_pgm_r_reg(ts, 0x0000000C, &unmask_code);
|
|
+ error = hideep_pgm_r_reg(ts, 0x0000000C, &unmask_code);
|
|
hideep_pgm_w_reg(ts, HIDEEP_FLASH_CFG, HIDEEP_NVM_DEFAULT_PAGE);
|
|
+ if (error)
|
|
+ return error;
|
|
|
|
/* make it unprotected code */
|
|
unmask_code &= ~HIDEEP_PROT_MODE;
|
|
@@ -384,6 +387,8 @@ static void hideep_nvm_unlock(struct hideep_ts *ts)
|
|
NVM_W_SFR(HIDEEP_NVM_MASK_OFS, ts->nvm_mask);
|
|
SET_FLASH_HWCONTROL();
|
|
hideep_pgm_w_reg(ts, HIDEEP_FLASH_CFG, HIDEEP_NVM_DEFAULT_PAGE);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static int hideep_check_status(struct hideep_ts *ts)
|
|
@@ -462,7 +467,9 @@ static int hideep_program_nvm(struct hideep_ts *ts,
|
|
u32 addr = 0;
|
|
int error;
|
|
|
|
- hideep_nvm_unlock(ts);
|
|
+ error = hideep_nvm_unlock(ts);
|
|
+ if (error)
|
|
+ return error;
|
|
|
|
while (ucode_len > 0) {
|
|
xfer_len = min_t(size_t, ucode_len, HIDEEP_NVM_PAGE_SIZE);
|
|
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
|
|
index 98b3a1c2a1813..44a427833385e 100644
|
|
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
|
|
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
|
|
@@ -130,6 +130,16 @@ static int qcom_adreno_smmu_alloc_context_bank(struct arm_smmu_domain *smmu_doma
|
|
return __arm_smmu_alloc_bitmap(smmu->context_map, start, count);
|
|
}
|
|
|
|
+static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
|
|
+{
|
|
+ const struct device_node *np = smmu->dev->of_node;
|
|
+
|
|
+ if (of_device_is_compatible(np, "qcom,msm8996-smmu-v2"))
|
|
+ return false;
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
|
|
struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
|
|
{
|
|
@@ -144,7 +154,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
|
|
* be AARCH64 stage 1 but double check because the arm-smmu code assumes
|
|
* that is the case when the TTBR1 quirk is enabled
|
|
*/
|
|
- if ((smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
|
|
+ if (qcom_adreno_can_do_ttbr1(smmu_domain->smmu) &&
|
|
+ (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
|
|
(smmu_domain->cfg.fmt == ARM_SMMU_CTX_FMT_AARCH64))
|
|
pgtbl_cfg->quirks |= IO_PGTABLE_QUIRK_ARM_TTBR1;
|
|
|
|
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
|
|
index 6f72c4d208cad..1a647e0ea3ebb 100644
|
|
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
|
|
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
|
|
@@ -74,7 +74,7 @@ static bool using_legacy_binding, using_generic_binding;
|
|
static inline int arm_smmu_rpm_get(struct arm_smmu_device *smmu)
|
|
{
|
|
if (pm_runtime_enabled(smmu->dev))
|
|
- return pm_runtime_get_sync(smmu->dev);
|
|
+ return pm_runtime_resume_and_get(smmu->dev);
|
|
|
|
return 0;
|
|
}
|
|
@@ -1271,6 +1271,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
|
|
u64 phys;
|
|
unsigned long va, flags;
|
|
int ret, idx = cfg->cbndx;
|
|
+ phys_addr_t addr = 0;
|
|
|
|
ret = arm_smmu_rpm_get(smmu);
|
|
if (ret < 0)
|
|
@@ -1290,6 +1291,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
|
|
dev_err(dev,
|
|
"iova to phys timed out on %pad. Falling back to software table walk.\n",
|
|
&iova);
|
|
+ arm_smmu_rpm_put(smmu);
|
|
return ops->iova_to_phys(ops, iova);
|
|
}
|
|
|
|
@@ -1298,12 +1300,14 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
|
|
if (phys & ARM_SMMU_CB_PAR_F) {
|
|
dev_err(dev, "translation fault!\n");
|
|
dev_err(dev, "PAR = 0x%llx\n", phys);
|
|
- return 0;
|
|
+ goto out;
|
|
}
|
|
|
|
+ addr = (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
|
|
+out:
|
|
arm_smmu_rpm_put(smmu);
|
|
|
|
- return (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
|
|
+ return addr;
|
|
}
|
|
|
|
static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
|
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
|
index be35284a20160..dad910ba9553d 100644
|
|
--- a/drivers/iommu/intel/iommu.c
|
|
+++ b/drivers/iommu/intel/iommu.c
|
|
@@ -2434,10 +2434,11 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
|
|
return 0;
|
|
}
|
|
|
|
-static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn)
|
|
+static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8 devfn)
|
|
{
|
|
- unsigned long flags;
|
|
+ struct intel_iommu *iommu = info->iommu;
|
|
struct context_entry *context;
|
|
+ unsigned long flags;
|
|
u16 did_old;
|
|
|
|
if (!iommu)
|
|
@@ -2449,7 +2450,16 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn
|
|
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
return;
|
|
}
|
|
- did_old = context_domain_id(context);
|
|
+
|
|
+ if (sm_supported(iommu)) {
|
|
+ if (hw_pass_through && domain_type_is_si(info->domain))
|
|
+ did_old = FLPT_DEFAULT_DID;
|
|
+ else
|
|
+ did_old = info->domain->iommu_did[iommu->seq_id];
|
|
+ } else {
|
|
+ did_old = context_domain_id(context);
|
|
+ }
|
|
+
|
|
context_clear_entry(context);
|
|
__iommu_flush_cache(iommu, context, sizeof(*context));
|
|
spin_unlock_irqrestore(&iommu->lock, flags);
|
|
@@ -2467,6 +2477,8 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn
|
|
0,
|
|
0,
|
|
DMA_TLB_DSI_FLUSH);
|
|
+
|
|
+ __iommu_flush_dev_iotlb(info, 0, MAX_AGAW_PFN_WIDTH);
|
|
}
|
|
|
|
static inline void unlink_domain_info(struct device_domain_info *info)
|
|
@@ -4436,9 +4448,9 @@ out_free_dmar:
|
|
|
|
static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *opaque)
|
|
{
|
|
- struct intel_iommu *iommu = opaque;
|
|
+ struct device_domain_info *info = opaque;
|
|
|
|
- domain_context_clear_one(iommu, PCI_BUS_NUM(alias), alias & 0xff);
|
|
+ domain_context_clear_one(info, PCI_BUS_NUM(alias), alias & 0xff);
|
|
return 0;
|
|
}
|
|
|
|
@@ -4448,12 +4460,13 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
|
|
* devices, unbinding the driver from any one of them will possibly leave
|
|
* the others unable to operate.
|
|
*/
|
|
-static void domain_context_clear(struct intel_iommu *iommu, struct device *dev)
|
|
+static void domain_context_clear(struct device_domain_info *info)
|
|
{
|
|
- if (!iommu || !dev || !dev_is_pci(dev))
|
|
+ if (!info->iommu || !info->dev || !dev_is_pci(info->dev))
|
|
return;
|
|
|
|
- pci_for_each_dma_alias(to_pci_dev(dev), &domain_context_clear_one_cb, iommu);
|
|
+ pci_for_each_dma_alias(to_pci_dev(info->dev),
|
|
+ &domain_context_clear_one_cb, info);
|
|
}
|
|
|
|
static void __dmar_remove_one_dev_info(struct device_domain_info *info)
|
|
@@ -4470,14 +4483,13 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
|
|
iommu = info->iommu;
|
|
domain = info->domain;
|
|
|
|
- if (info->dev) {
|
|
+ if (info->dev && !dev_is_real_dma_subdevice(info->dev)) {
|
|
if (dev_is_pci(info->dev) && sm_supported(iommu))
|
|
intel_pasid_tear_down_entry(iommu, info->dev,
|
|
PASID_RID2PASID, false);
|
|
|
|
iommu_disable_dev_iotlb(info);
|
|
- if (!dev_is_real_dma_subdevice(info->dev))
|
|
- domain_context_clear(iommu, info->dev);
|
|
+ domain_context_clear(info);
|
|
intel_pasid_free_table(info->dev);
|
|
}
|
|
|
|
diff --git a/drivers/leds/leds-tlc591xx.c b/drivers/leds/leds-tlc591xx.c
|
|
index 5b9dfdf743ecd..cb7bd1353f9f0 100644
|
|
--- a/drivers/leds/leds-tlc591xx.c
|
|
+++ b/drivers/leds/leds-tlc591xx.c
|
|
@@ -148,16 +148,20 @@ static int
|
|
tlc591xx_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
- struct device_node *np = dev_of_node(&client->dev), *child;
|
|
+ struct device_node *np, *child;
|
|
struct device *dev = &client->dev;
|
|
const struct tlc591xx *tlc591xx;
|
|
struct tlc591xx_priv *priv;
|
|
int err, count, reg;
|
|
|
|
- tlc591xx = device_get_match_data(dev);
|
|
+ np = dev_of_node(dev);
|
|
if (!np)
|
|
return -ENODEV;
|
|
|
|
+ tlc591xx = device_get_match_data(dev);
|
|
+ if (!tlc591xx)
|
|
+ return -ENODEV;
|
|
+
|
|
count = of_get_available_child_count(np);
|
|
if (!count || count > tlc591xx->max_leds)
|
|
return -EINVAL;
|
|
diff --git a/drivers/leds/leds-turris-omnia.c b/drivers/leds/leds-turris-omnia.c
|
|
index 2f9a289ab2456..1adfed1c0619b 100644
|
|
--- a/drivers/leds/leds-turris-omnia.c
|
|
+++ b/drivers/leds/leds-turris-omnia.c
|
|
@@ -274,6 +274,7 @@ static const struct i2c_device_id omnia_id[] = {
|
|
{ "omnia", 0 },
|
|
{ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(i2c, omnia_id);
|
|
|
|
static struct i2c_driver omnia_leds_driver = {
|
|
.probe = omnia_leds_probe,
|
|
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
|
|
index 14386d0b5f578..c267283b01fda 100644
|
|
--- a/drivers/memory/atmel-ebi.c
|
|
+++ b/drivers/memory/atmel-ebi.c
|
|
@@ -600,8 +600,10 @@ static int atmel_ebi_probe(struct platform_device *pdev)
|
|
child);
|
|
|
|
ret = atmel_ebi_dev_disable(ebi, child);
|
|
- if (ret)
|
|
+ if (ret) {
|
|
+ of_node_put(child);
|
|
return ret;
|
|
+ }
|
|
}
|
|
}
|
|
|
|
diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
|
|
index 89f99b5b64504..d062c2f8250f4 100644
|
|
--- a/drivers/memory/fsl_ifc.c
|
|
+++ b/drivers/memory/fsl_ifc.c
|
|
@@ -97,7 +97,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev)
|
|
iounmap(ctrl->gregs);
|
|
|
|
dev_set_drvdata(&dev->dev, NULL);
|
|
- kfree(ctrl);
|
|
|
|
return 0;
|
|
}
|
|
@@ -209,7 +208,8 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
|
|
|
|
dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");
|
|
|
|
- fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);
|
|
+ fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev),
|
|
+ GFP_KERNEL);
|
|
if (!fsl_ifc_ctrl_dev)
|
|
return -ENOMEM;
|
|
|
|
@@ -219,8 +219,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
|
|
fsl_ifc_ctrl_dev->gregs = of_iomap(dev->dev.of_node, 0);
|
|
if (!fsl_ifc_ctrl_dev->gregs) {
|
|
dev_err(&dev->dev, "failed to get memory region\n");
|
|
- ret = -ENODEV;
|
|
- goto err;
|
|
+ return -ENODEV;
|
|
}
|
|
|
|
if (of_property_read_bool(dev->dev.of_node, "little-endian")) {
|
|
@@ -295,6 +294,7 @@ err_irq:
|
|
free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
|
|
irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);
|
|
err:
|
|
+ iounmap(fsl_ifc_ctrl_dev->gregs);
|
|
return ret;
|
|
}
|
|
|
|
diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c
|
|
index 9c0a284167773..b0b251bb207f3 100644
|
|
--- a/drivers/memory/pl353-smc.c
|
|
+++ b/drivers/memory/pl353-smc.c
|
|
@@ -407,6 +407,7 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)
|
|
break;
|
|
}
|
|
if (!match) {
|
|
+ err = -ENODEV;
|
|
dev_err(&adev->dev, "no matching children\n");
|
|
goto out_clk_disable;
|
|
}
|
|
diff --git a/drivers/memory/stm32-fmc2-ebi.c b/drivers/memory/stm32-fmc2-ebi.c
|
|
index 4d5758c419c55..ffec26a99313b 100644
|
|
--- a/drivers/memory/stm32-fmc2-ebi.c
|
|
+++ b/drivers/memory/stm32-fmc2-ebi.c
|
|
@@ -1048,16 +1048,19 @@ static int stm32_fmc2_ebi_parse_dt(struct stm32_fmc2_ebi *ebi)
|
|
if (ret) {
|
|
dev_err(dev, "could not retrieve reg property: %d\n",
|
|
ret);
|
|
+ of_node_put(child);
|
|
return ret;
|
|
}
|
|
|
|
if (bank >= FMC2_MAX_BANKS) {
|
|
dev_err(dev, "invalid reg value: %d\n", bank);
|
|
+ of_node_put(child);
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (ebi->bank_assigned & BIT(bank)) {
|
|
dev_err(dev, "bank already assigned: %d\n", bank);
|
|
+ of_node_put(child);
|
|
return -EINVAL;
|
|
}
|
|
|
|
@@ -1066,6 +1069,7 @@ static int stm32_fmc2_ebi_parse_dt(struct stm32_fmc2_ebi *ebi)
|
|
if (ret) {
|
|
dev_err(dev, "setup chip select %d failed: %d\n",
|
|
bank, ret);
|
|
+ of_node_put(child);
|
|
return ret;
|
|
}
|
|
}
|
|
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
|
|
index 47556d2d9abe2..8ebfc7bbe4e01 100644
|
|
--- a/drivers/mfd/da9052-i2c.c
|
|
+++ b/drivers/mfd/da9052-i2c.c
|
|
@@ -113,6 +113,7 @@ static const struct i2c_device_id da9052_i2c_id[] = {
|
|
{"da9053-bc", DA9053_BC},
|
|
{}
|
|
};
|
|
+MODULE_DEVICE_TABLE(i2c, da9052_i2c_id);
|
|
|
|
#ifdef CONFIG_OF
|
|
static const struct of_device_id dialog_dt_ids[] = {
|
|
diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c
|
|
index 30d82bfe5b02f..6fb206da27298 100644
|
|
--- a/drivers/mfd/motorola-cpcap.c
|
|
+++ b/drivers/mfd/motorola-cpcap.c
|
|
@@ -327,6 +327,10 @@ static int cpcap_probe(struct spi_device *spi)
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ /* Parent SPI controller uses DMA, CPCAP and child devices do not */
|
|
+ spi->dev.coherent_dma_mask = 0;
|
|
+ spi->dev.dma_mask = &spi->dev.coherent_dma_mask;
|
|
+
|
|
return devm_mfd_add_devices(&spi->dev, 0, cpcap_mfd_devices,
|
|
ARRAY_SIZE(cpcap_mfd_devices), NULL, 0, NULL);
|
|
}
|
|
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c
|
|
index 61aa020199f57..cd2f45257dc16 100644
|
|
--- a/drivers/mfd/stmpe-i2c.c
|
|
+++ b/drivers/mfd/stmpe-i2c.c
|
|
@@ -109,7 +109,7 @@ static const struct i2c_device_id stmpe_i2c_id[] = {
|
|
{ "stmpe2403", STMPE2403 },
|
|
{ }
|
|
};
|
|
-MODULE_DEVICE_TABLE(i2c, stmpe_id);
|
|
+MODULE_DEVICE_TABLE(i2c, stmpe_i2c_id);
|
|
|
|
static struct i2c_driver stmpe_i2c_driver = {
|
|
.driver = {
|
|
diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c
|
|
index cd402c89189ea..de6d44a158bba 100644
|
|
--- a/drivers/misc/cardreader/alcor_pci.c
|
|
+++ b/drivers/misc/cardreader/alcor_pci.c
|
|
@@ -139,7 +139,13 @@ static void alcor_pci_init_check_aspm(struct alcor_pci_priv *priv)
|
|
u32 val32;
|
|
|
|
priv->pdev_cap_off = alcor_pci_find_cap_offset(priv, priv->pdev);
|
|
- priv->parent_cap_off = alcor_pci_find_cap_offset(priv,
|
|
+ /*
|
|
+ * A device might be attached to root complex directly and
|
|
+ * priv->parent_pdev will be NULL. In this case we don't check its
|
|
+ * capability and disable ASPM completely.
|
|
+ */
|
|
+ if (priv->parent_pdev)
|
|
+ priv->parent_cap_off = alcor_pci_find_cap_offset(priv,
|
|
priv->parent_pdev);
|
|
|
|
if ((priv->pdev_cap_off == 0) || (priv->parent_cap_off == 0)) {
|
|
diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c
|
|
index 00e92b6788284..eea0d3e35b88d 100644
|
|
--- a/drivers/misc/habanalabs/common/device.c
|
|
+++ b/drivers/misc/habanalabs/common/device.c
|
|
@@ -1334,8 +1334,9 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
|
|
}
|
|
|
|
/*
|
|
- * From this point, in case of an error, add char devices and create
|
|
- * sysfs nodes as part of the error flow, to allow debugging.
|
|
+ * From this point, override rc (=0) in case of an error to allow
|
|
+ * debugging (by adding char devices and create sysfs nodes as part of
|
|
+ * the error flow).
|
|
*/
|
|
add_cdev_sysfs_on_err = true;
|
|
|
|
diff --git a/drivers/misc/habanalabs/common/firmware_if.c b/drivers/misc/habanalabs/common/firmware_if.c
|
|
index 0713b2c12d54f..86efb9fa701c9 100644
|
|
--- a/drivers/misc/habanalabs/common/firmware_if.c
|
|
+++ b/drivers/misc/habanalabs/common/firmware_if.c
|
|
@@ -1006,11 +1006,14 @@ int hl_fw_init_cpu(struct hl_device *hdev, u32 cpu_boot_status_reg,
|
|
|
|
if (!(hdev->fw_components & FW_TYPE_LINUX)) {
|
|
dev_info(hdev->dev, "Skip loading Linux F/W\n");
|
|
+ rc = 0;
|
|
goto out;
|
|
}
|
|
|
|
- if (status == CPU_BOOT_STATUS_SRAM_AVAIL)
|
|
+ if (status == CPU_BOOT_STATUS_SRAM_AVAIL) {
|
|
+ rc = 0;
|
|
goto out;
|
|
+ }
|
|
|
|
dev_info(hdev->dev,
|
|
"Loading firmware to device, may take some time...\n");
|
|
diff --git a/drivers/misc/habanalabs/common/habanalabs_drv.c b/drivers/misc/habanalabs/common/habanalabs_drv.c
|
|
index d15b912a347bd..91bcaaed5cd64 100644
|
|
--- a/drivers/misc/habanalabs/common/habanalabs_drv.c
|
|
+++ b/drivers/misc/habanalabs/common/habanalabs_drv.c
|
|
@@ -309,7 +309,7 @@ int create_hdev(struct hl_device **dev, struct pci_dev *pdev,
|
|
|
|
if (pdev)
|
|
hdev->asic_prop.fw_security_disabled =
|
|
- !is_asic_secured(pdev->device);
|
|
+ !is_asic_secured(hdev->asic_type);
|
|
else
|
|
hdev->asic_prop.fw_security_disabled = true;
|
|
|
|
diff --git a/drivers/misc/habanalabs/common/mmu/mmu.c b/drivers/misc/habanalabs/common/mmu/mmu.c
|
|
index b37189956b146..792d25b79ea68 100644
|
|
--- a/drivers/misc/habanalabs/common/mmu/mmu.c
|
|
+++ b/drivers/misc/habanalabs/common/mmu/mmu.c
|
|
@@ -501,12 +501,20 @@ static void hl_mmu_pa_page_with_offset(struct hl_ctx *ctx, u64 virt_addr,
|
|
|
|
if ((hops->range_type == HL_VA_RANGE_TYPE_DRAM) &&
|
|
!is_power_of_2(prop->dram_page_size)) {
|
|
- u32 bit;
|
|
+ unsigned long dram_page_size = prop->dram_page_size;
|
|
u64 page_offset_mask;
|
|
u64 phys_addr_mask;
|
|
+ u32 bit;
|
|
|
|
- bit = __ffs64((u64)prop->dram_page_size);
|
|
- page_offset_mask = ((1ull << bit) - 1);
|
|
+ /*
|
|
+ * find last set bit in page_size to cover all bits of page
|
|
+ * offset. note that 1 has to be added to bit index.
|
|
+ * note that the internal ulong variable is used to avoid
|
|
+ * alignment issue.
|
|
+ */
|
|
+ bit = find_last_bit(&dram_page_size,
|
|
+ sizeof(dram_page_size) * BITS_PER_BYTE) + 1;
|
|
+ page_offset_mask = (BIT_ULL(bit) - 1);
|
|
phys_addr_mask = ~page_offset_mask;
|
|
*phys_addr = (tmp_phys_addr & phys_addr_mask) |
|
|
(virt_addr & page_offset_mask);
|
|
diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
|
|
index 9e4a6bb3acd11..b7b281ae8d5ae 100644
|
|
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
|
|
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
|
|
@@ -2834,7 +2834,7 @@ static void gaudi_init_mme_qman(struct hl_device *hdev, u32 mme_offset,
|
|
|
|
/* Configure RAZWI IRQ */
|
|
mme_id = mme_offset /
|
|
- (mmMME1_QM_GLBL_CFG0 - mmMME0_QM_GLBL_CFG0);
|
|
+ (mmMME1_QM_GLBL_CFG0 - mmMME0_QM_GLBL_CFG0) / 2;
|
|
|
|
mme_qm_err_cfg = MME_QMAN_GLBL_ERR_CFG_MSG_EN_MASK;
|
|
if (hdev->stop_on_err) {
|
|
@@ -4934,6 +4934,7 @@ already_pinned:
|
|
return 0;
|
|
|
|
unpin_memory:
|
|
+ list_del(&userptr->job_node);
|
|
hl_unpin_host_memory(hdev, userptr);
|
|
free_userptr:
|
|
kfree(userptr);
|
|
@@ -8306,8 +8307,10 @@ static int gaudi_internal_cb_pool_init(struct hl_device *hdev,
|
|
HL_VA_RANGE_TYPE_HOST, HOST_SPACE_INTERNAL_CB_SZ,
|
|
HL_MMU_VA_ALIGNMENT_NOT_NEEDED);
|
|
|
|
- if (!hdev->internal_cb_va_base)
|
|
+ if (!hdev->internal_cb_va_base) {
|
|
+ rc = -ENOMEM;
|
|
goto destroy_internal_cb_pool;
|
|
+ }
|
|
|
|
mutex_lock(&ctx->mmu_lock);
|
|
rc = hl_mmu_map_contiguous(ctx, hdev->internal_cb_va_base,
|
|
diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
|
|
index e0ad2a269779b..d4ac10b9f25ee 100644
|
|
--- a/drivers/misc/habanalabs/goya/goya.c
|
|
+++ b/drivers/misc/habanalabs/goya/goya.c
|
|
@@ -3270,6 +3270,7 @@ already_pinned:
|
|
return 0;
|
|
|
|
unpin_memory:
|
|
+ list_del(&userptr->job_node);
|
|
hl_unpin_host_memory(hdev, userptr);
|
|
free_userptr:
|
|
kfree(userptr);
|
|
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
|
|
index 4edad6c445d37..dc8a06c06c637 100644
|
|
--- a/drivers/misc/ibmasm/module.c
|
|
+++ b/drivers/misc/ibmasm/module.c
|
|
@@ -111,7 +111,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
result = ibmasm_init_remote_input_dev(sp);
|
|
if (result) {
|
|
dev_err(sp->dev, "Failed to initialize remote queue\n");
|
|
- goto error_send_message;
|
|
+ goto error_init_remote;
|
|
}
|
|
|
|
result = ibmasm_send_driver_vpd(sp);
|
|
@@ -131,8 +131,9 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
return 0;
|
|
|
|
error_send_message:
|
|
- disable_sp_interrupts(sp->base_address);
|
|
ibmasm_free_remote_input_dev(sp);
|
|
+error_init_remote:
|
|
+ disable_sp_interrupts(sp->base_address);
|
|
free_irq(sp->irq, (void *)sp);
|
|
error_request_irq:
|
|
iounmap(sp->base_address);
|
|
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
|
|
index 2debb32a1813a..6af2279644137 100644
|
|
--- a/drivers/net/virtio_net.c
|
|
+++ b/drivers/net/virtio_net.c
|
|
@@ -1581,6 +1581,8 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
|
|
struct virtnet_info *vi = sq->vq->vdev->priv;
|
|
unsigned int index = vq2txq(sq->vq);
|
|
struct netdev_queue *txq;
|
|
+ int opaque;
|
|
+ bool done;
|
|
|
|
if (unlikely(is_xdp_raw_buffer_queue(vi, index))) {
|
|
/* We don't need to enable cb for XDP */
|
|
@@ -1590,10 +1592,28 @@ static int virtnet_poll_tx(struct napi_struct *napi, int budget)
|
|
|
|
txq = netdev_get_tx_queue(vi->dev, index);
|
|
__netif_tx_lock(txq, raw_smp_processor_id());
|
|
+ virtqueue_disable_cb(sq->vq);
|
|
free_old_xmit_skbs(sq, true);
|
|
+
|
|
+ opaque = virtqueue_enable_cb_prepare(sq->vq);
|
|
+
|
|
+ done = napi_complete_done(napi, 0);
|
|
+
|
|
+ if (!done)
|
|
+ virtqueue_disable_cb(sq->vq);
|
|
+
|
|
__netif_tx_unlock(txq);
|
|
|
|
- virtqueue_napi_complete(napi, sq->vq, 0);
|
|
+ if (done) {
|
|
+ if (unlikely(virtqueue_poll(sq->vq, opaque))) {
|
|
+ if (napi_schedule_prep(napi)) {
|
|
+ __netif_tx_lock(txq, raw_smp_processor_id());
|
|
+ virtqueue_disable_cb(sq->vq);
|
|
+ __netif_tx_unlock(txq);
|
|
+ __napi_schedule(napi);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
|
|
if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
|
|
netif_tx_wake_queue(txq);
|
|
@@ -3299,8 +3319,11 @@ static __maybe_unused int virtnet_restore(struct virtio_device *vdev)
|
|
virtnet_set_queues(vi, vi->curr_queue_pairs);
|
|
|
|
err = virtnet_cpu_notif_add(vi);
|
|
- if (err)
|
|
+ if (err) {
|
|
+ virtnet_freeze_down(vdev);
|
|
+ remove_vq_common(vi);
|
|
return err;
|
|
+ }
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
|
|
index d8aceef832846..07ee347ea3f3c 100644
|
|
--- a/drivers/nvme/target/tcp.c
|
|
+++ b/drivers/nvme/target/tcp.c
|
|
@@ -1497,7 +1497,6 @@ static void nvmet_tcp_state_change(struct sock *sk)
|
|
case TCP_CLOSE_WAIT:
|
|
case TCP_CLOSE:
|
|
/* FALLTHRU */
|
|
- sk->sk_user_data = NULL;
|
|
nvmet_tcp_schedule_release_queue(queue);
|
|
break;
|
|
default:
|
|
diff --git a/drivers/pci/controller/dwc/pcie-intel-gw.c b/drivers/pci/controller/dwc/pcie-intel-gw.c
|
|
index f89a7d24ba28e..d15cf35fa7f2d 100644
|
|
--- a/drivers/pci/controller/dwc/pcie-intel-gw.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-intel-gw.c
|
|
@@ -39,6 +39,10 @@
|
|
#define PCIE_APP_IRN_PM_TO_ACK BIT(9)
|
|
#define PCIE_APP_IRN_LINK_AUTO_BW_STAT BIT(11)
|
|
#define PCIE_APP_IRN_BW_MGT BIT(12)
|
|
+#define PCIE_APP_IRN_INTA BIT(13)
|
|
+#define PCIE_APP_IRN_INTB BIT(14)
|
|
+#define PCIE_APP_IRN_INTC BIT(15)
|
|
+#define PCIE_APP_IRN_INTD BIT(16)
|
|
#define PCIE_APP_IRN_MSG_LTR BIT(18)
|
|
#define PCIE_APP_IRN_SYS_ERR_RC BIT(29)
|
|
#define PCIE_APP_INTX_OFST 12
|
|
@@ -48,10 +52,8 @@
|
|
PCIE_APP_IRN_RX_VDM_MSG | PCIE_APP_IRN_SYS_ERR_RC | \
|
|
PCIE_APP_IRN_PM_TO_ACK | PCIE_APP_IRN_MSG_LTR | \
|
|
PCIE_APP_IRN_BW_MGT | PCIE_APP_IRN_LINK_AUTO_BW_STAT | \
|
|
- (PCIE_APP_INTX_OFST + PCI_INTERRUPT_INTA) | \
|
|
- (PCIE_APP_INTX_OFST + PCI_INTERRUPT_INTB) | \
|
|
- (PCIE_APP_INTX_OFST + PCI_INTERRUPT_INTC) | \
|
|
- (PCIE_APP_INTX_OFST + PCI_INTERRUPT_INTD))
|
|
+ PCIE_APP_IRN_INTA | PCIE_APP_IRN_INTB | \
|
|
+ PCIE_APP_IRN_INTC | PCIE_APP_IRN_INTD)
|
|
|
|
#define BUS_IATU_OFFSET SZ_256M
|
|
#define RESET_INTERVAL_MS 100
|
|
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
|
|
index fa6b12cfc0430..3ec7b29d5dc72 100644
|
|
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
|
@@ -1826,7 +1826,7 @@ static int tegra_pcie_ep_raise_msi_irq(struct tegra_pcie_dw *pcie, u16 irq)
|
|
if (unlikely(irq > 31))
|
|
return -EINVAL;
|
|
|
|
- appl_writel(pcie, (1 << irq), APPL_MSI_CTRL_1);
|
|
+ appl_writel(pcie, BIT(irq), APPL_MSI_CTRL_1);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
|
|
index da3cd216da007..aefef1986201a 100644
|
|
--- a/drivers/pci/controller/pci-ftpci100.c
|
|
+++ b/drivers/pci/controller/pci-ftpci100.c
|
|
@@ -34,12 +34,12 @@
|
|
* Special configuration registers directly in the first few words
|
|
* in I/O space.
|
|
*/
|
|
-#define PCI_IOSIZE 0x00
|
|
-#define PCI_PROT 0x04 /* AHB protection */
|
|
-#define PCI_CTRL 0x08 /* PCI control signal */
|
|
-#define PCI_SOFTRST 0x10 /* Soft reset counter and response error enable */
|
|
-#define PCI_CONFIG 0x28 /* PCI configuration command register */
|
|
-#define PCI_DATA 0x2C
|
|
+#define FTPCI_IOSIZE 0x00
|
|
+#define FTPCI_PROT 0x04 /* AHB protection */
|
|
+#define FTPCI_CTRL 0x08 /* PCI control signal */
|
|
+#define FTPCI_SOFTRST 0x10 /* Soft reset counter and response error enable */
|
|
+#define FTPCI_CONFIG 0x28 /* PCI configuration command register */
|
|
+#define FTPCI_DATA 0x2C
|
|
|
|
#define FARADAY_PCI_STATUS_CMD 0x04 /* Status and command */
|
|
#define FARADAY_PCI_PMC 0x40 /* Power management control */
|
|
@@ -195,9 +195,9 @@ static int faraday_raw_pci_read_config(struct faraday_pci *p, int bus_number,
|
|
PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
|
|
PCI_CONF_WHERE(config) |
|
|
PCI_CONF_ENABLE,
|
|
- p->base + PCI_CONFIG);
|
|
+ p->base + FTPCI_CONFIG);
|
|
|
|
- *value = readl(p->base + PCI_DATA);
|
|
+ *value = readl(p->base + FTPCI_DATA);
|
|
|
|
if (size == 1)
|
|
*value = (*value >> (8 * (config & 3))) & 0xFF;
|
|
@@ -230,17 +230,17 @@ static int faraday_raw_pci_write_config(struct faraday_pci *p, int bus_number,
|
|
PCI_CONF_FUNCTION(PCI_FUNC(fn)) |
|
|
PCI_CONF_WHERE(config) |
|
|
PCI_CONF_ENABLE,
|
|
- p->base + PCI_CONFIG);
|
|
+ p->base + FTPCI_CONFIG);
|
|
|
|
switch (size) {
|
|
case 4:
|
|
- writel(value, p->base + PCI_DATA);
|
|
+ writel(value, p->base + FTPCI_DATA);
|
|
break;
|
|
case 2:
|
|
- writew(value, p->base + PCI_DATA + (config & 3));
|
|
+ writew(value, p->base + FTPCI_DATA + (config & 3));
|
|
break;
|
|
case 1:
|
|
- writeb(value, p->base + PCI_DATA + (config & 3));
|
|
+ writeb(value, p->base + FTPCI_DATA + (config & 3));
|
|
break;
|
|
default:
|
|
ret = PCIBIOS_BAD_REGISTER_NUMBER;
|
|
@@ -469,7 +469,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
|
|
if (!faraday_res_to_memcfg(io->start - win->offset,
|
|
resource_size(io), &val)) {
|
|
/* setup I/O space size */
|
|
- writel(val, p->base + PCI_IOSIZE);
|
|
+ writel(val, p->base + FTPCI_IOSIZE);
|
|
} else {
|
|
dev_err(dev, "illegal IO mem size\n");
|
|
return -EINVAL;
|
|
@@ -477,11 +477,11 @@ static int faraday_pci_probe(struct platform_device *pdev)
|
|
}
|
|
|
|
/* Setup hostbridge */
|
|
- val = readl(p->base + PCI_CTRL);
|
|
+ val = readl(p->base + FTPCI_CTRL);
|
|
val |= PCI_COMMAND_IO;
|
|
val |= PCI_COMMAND_MEMORY;
|
|
val |= PCI_COMMAND_MASTER;
|
|
- writel(val, p->base + PCI_CTRL);
|
|
+ writel(val, p->base + FTPCI_CTRL);
|
|
/* Mask and clear all interrupts */
|
|
faraday_raw_pci_write_config(p, 0, 0, FARADAY_PCI_CTRL2 + 2, 2, 0xF000);
|
|
if (variant->cascaded_irq) {
|
|
diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
|
|
index bebe3eeebc4e1..efbf8c80bd311 100644
|
|
--- a/drivers/pci/controller/pci-hyperv.c
|
|
+++ b/drivers/pci/controller/pci-hyperv.c
|
|
@@ -444,7 +444,6 @@ enum hv_pcibus_state {
|
|
hv_pcibus_probed,
|
|
hv_pcibus_installed,
|
|
hv_pcibus_removing,
|
|
- hv_pcibus_removed,
|
|
hv_pcibus_maximum
|
|
};
|
|
|
|
@@ -3243,8 +3242,9 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs)
|
|
struct pci_packet teardown_packet;
|
|
u8 buffer[sizeof(struct pci_message)];
|
|
} pkt;
|
|
- struct hv_dr_state *dr;
|
|
struct hv_pci_compl comp_pkt;
|
|
+ struct hv_pci_dev *hpdev, *tmp;
|
|
+ unsigned long flags;
|
|
int ret;
|
|
|
|
/*
|
|
@@ -3256,9 +3256,16 @@ static int hv_pci_bus_exit(struct hv_device *hdev, bool keep_devs)
|
|
|
|
if (!keep_devs) {
|
|
/* Delete any children which might still exist. */
|
|
- dr = kzalloc(sizeof(*dr), GFP_KERNEL);
|
|
- if (dr && hv_pci_start_relations_work(hbus, dr))
|
|
- kfree(dr);
|
|
+ spin_lock_irqsave(&hbus->device_list_lock, flags);
|
|
+ list_for_each_entry_safe(hpdev, tmp, &hbus->children, list_entry) {
|
|
+ list_del(&hpdev->list_entry);
|
|
+ if (hpdev->pci_slot)
|
|
+ pci_destroy_slot(hpdev->pci_slot);
|
|
+ /* For the two refs got in new_pcichild_device() */
|
|
+ put_pcichild(hpdev);
|
|
+ put_pcichild(hpdev);
|
|
+ }
|
|
+ spin_unlock_irqrestore(&hbus->device_list_lock, flags);
|
|
}
|
|
|
|
ret = hv_send_resources_released(hdev);
|
|
@@ -3301,13 +3308,23 @@ static int hv_pci_remove(struct hv_device *hdev)
|
|
|
|
hbus = hv_get_drvdata(hdev);
|
|
if (hbus->state == hv_pcibus_installed) {
|
|
+ tasklet_disable(&hdev->channel->callback_event);
|
|
+ hbus->state = hv_pcibus_removing;
|
|
+ tasklet_enable(&hdev->channel->callback_event);
|
|
+ destroy_workqueue(hbus->wq);
|
|
+ hbus->wq = NULL;
|
|
+ /*
|
|
+ * At this point, no work is running or can be scheduled
|
|
+ * on hbus-wq. We can't race with hv_pci_devices_present()
|
|
+ * or hv_pci_eject_device(), it's safe to proceed.
|
|
+ */
|
|
+
|
|
/* Remove the bus from PCI's point of view. */
|
|
pci_lock_rescan_remove();
|
|
pci_stop_root_bus(hbus->pci_bus);
|
|
hv_pci_remove_slots(hbus);
|
|
pci_remove_root_bus(hbus->pci_bus);
|
|
pci_unlock_rescan_remove();
|
|
- hbus->state = hv_pcibus_removed;
|
|
}
|
|
|
|
ret = hv_pci_bus_exit(hdev, false);
|
|
@@ -3322,7 +3339,6 @@ static int hv_pci_remove(struct hv_device *hdev)
|
|
irq_domain_free_fwnode(hbus->sysdata.fwnode);
|
|
put_hvpcibus(hbus);
|
|
wait_for_completion(&hbus->remove_event);
|
|
- destroy_workqueue(hbus->wq);
|
|
|
|
hv_put_dom_num(hbus->sysdata.domain);
|
|
|
|
diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
|
|
index 8069bd9232d45..c979229a6d0df 100644
|
|
--- a/drivers/pci/controller/pci-tegra.c
|
|
+++ b/drivers/pci/controller/pci-tegra.c
|
|
@@ -2539,6 +2539,7 @@ static const struct of_device_id tegra_pcie_of_match[] = {
|
|
{ .compatible = "nvidia,tegra20-pcie", .data = &tegra20_pcie },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, tegra_pcie_of_match);
|
|
|
|
static void *tegra_pcie_ports_seq_start(struct seq_file *s, loff_t *pos)
|
|
{
|
|
diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c
|
|
index eede4e8f3f75a..81b4effeb1309 100644
|
|
--- a/drivers/pci/controller/pcie-iproc-msi.c
|
|
+++ b/drivers/pci/controller/pcie-iproc-msi.c
|
|
@@ -171,7 +171,7 @@ static struct irq_chip iproc_msi_irq_chip = {
|
|
|
|
static struct msi_domain_info iproc_msi_domain_info = {
|
|
.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
|
|
- MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX,
|
|
+ MSI_FLAG_PCI_MSIX,
|
|
.chip = &iproc_msi_irq_chip,
|
|
};
|
|
|
|
@@ -250,20 +250,23 @@ static int iproc_msi_irq_domain_alloc(struct irq_domain *domain,
|
|
struct iproc_msi *msi = domain->host_data;
|
|
int hwirq, i;
|
|
|
|
+ if (msi->nr_cpus > 1 && nr_irqs > 1)
|
|
+ return -EINVAL;
|
|
+
|
|
mutex_lock(&msi->bitmap_lock);
|
|
|
|
- /* Allocate 'nr_cpus' number of MSI vectors each time */
|
|
- hwirq = bitmap_find_next_zero_area(msi->bitmap, msi->nr_msi_vecs, 0,
|
|
- msi->nr_cpus, 0);
|
|
- if (hwirq < msi->nr_msi_vecs) {
|
|
- bitmap_set(msi->bitmap, hwirq, msi->nr_cpus);
|
|
- } else {
|
|
- mutex_unlock(&msi->bitmap_lock);
|
|
- return -ENOSPC;
|
|
- }
|
|
+ /*
|
|
+ * Allocate 'nr_irqs' multiplied by 'nr_cpus' number of MSI vectors
|
|
+ * each time
|
|
+ */
|
|
+ hwirq = bitmap_find_free_region(msi->bitmap, msi->nr_msi_vecs,
|
|
+ order_base_2(msi->nr_cpus * nr_irqs));
|
|
|
|
mutex_unlock(&msi->bitmap_lock);
|
|
|
|
+ if (hwirq < 0)
|
|
+ return -ENOSPC;
|
|
+
|
|
for (i = 0; i < nr_irqs; i++) {
|
|
irq_domain_set_info(domain, virq + i, hwirq + i,
|
|
&iproc_msi_bottom_irq_chip,
|
|
@@ -284,7 +287,8 @@ static void iproc_msi_irq_domain_free(struct irq_domain *domain,
|
|
mutex_lock(&msi->bitmap_lock);
|
|
|
|
hwirq = hwirq_to_canonical_hwirq(msi, data->hwirq);
|
|
- bitmap_clear(msi->bitmap, hwirq, msi->nr_cpus);
|
|
+ bitmap_release_region(msi->bitmap, hwirq,
|
|
+ order_base_2(msi->nr_cpus * nr_irqs));
|
|
|
|
mutex_unlock(&msi->bitmap_lock);
|
|
|
|
@@ -539,6 +543,9 @@ int iproc_msi_init(struct iproc_pcie *pcie, struct device_node *node)
|
|
mutex_init(&msi->bitmap_lock);
|
|
msi->nr_cpus = num_possible_cpus();
|
|
|
|
+ if (msi->nr_cpus == 1)
|
|
+ iproc_msi_domain_info.flags |= MSI_FLAG_MULTI_PCI_MSI;
|
|
+
|
|
msi->nr_irqs = of_irq_count(node);
|
|
if (!msi->nr_irqs) {
|
|
dev_err(pcie->dev, "found no MSI GIC interrupt\n");
|
|
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
|
|
index 3c5b97716d409..f3aeb8d4eaca8 100644
|
|
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
|
|
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
|
|
@@ -1012,6 +1012,7 @@ static const struct of_device_id mtk_pcie_of_match[] = {
|
|
{ .compatible = "mediatek,mt8192-pcie" },
|
|
{},
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, mtk_pcie_of_match);
|
|
|
|
static struct platform_driver mtk_pcie_driver = {
|
|
.probe = mtk_pcie_probe,
|
|
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
|
|
index f1d08a1b1591f..78d04ac29cd56 100644
|
|
--- a/drivers/pci/controller/pcie-rockchip-host.c
|
|
+++ b/drivers/pci/controller/pcie-rockchip-host.c
|
|
@@ -592,10 +592,6 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
|
|
if (err)
|
|
return err;
|
|
|
|
- err = rockchip_pcie_setup_irq(rockchip);
|
|
- if (err)
|
|
- return err;
|
|
-
|
|
rockchip->vpcie12v = devm_regulator_get_optional(dev, "vpcie12v");
|
|
if (IS_ERR(rockchip->vpcie12v)) {
|
|
if (PTR_ERR(rockchip->vpcie12v) != -ENODEV)
|
|
@@ -973,8 +969,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
|
|
if (err)
|
|
goto err_vpcie;
|
|
|
|
- rockchip_pcie_enable_interrupts(rockchip);
|
|
-
|
|
err = rockchip_pcie_init_irq_domain(rockchip);
|
|
if (err < 0)
|
|
goto err_deinit_port;
|
|
@@ -992,6 +986,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
|
|
bridge->sysdata = rockchip;
|
|
bridge->ops = &rockchip_pcie_ops;
|
|
|
|
+ err = rockchip_pcie_setup_irq(rockchip);
|
|
+ if (err)
|
|
+ goto err_remove_irq_domain;
|
|
+
|
|
+ rockchip_pcie_enable_interrupts(rockchip);
|
|
+
|
|
err = pci_host_probe(bridge);
|
|
if (err < 0)
|
|
goto err_remove_irq_domain;
|
|
diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c
|
|
index d2a1920bb0557..1c40d2506aef3 100644
|
|
--- a/drivers/pci/ecam.c
|
|
+++ b/drivers/pci/ecam.c
|
|
@@ -32,7 +32,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
|
|
struct pci_config_window *cfg;
|
|
unsigned int bus_range, bus_range_max, bsz;
|
|
struct resource *conflict;
|
|
- int i, err;
|
|
+ int err;
|
|
|
|
if (busr->start > busr->end)
|
|
return ERR_PTR(-EINVAL);
|
|
@@ -50,6 +50,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
|
|
cfg->busr.start = busr->start;
|
|
cfg->busr.end = busr->end;
|
|
cfg->busr.flags = IORESOURCE_BUS;
|
|
+ cfg->bus_shift = bus_shift;
|
|
bus_range = resource_size(&cfg->busr);
|
|
bus_range_max = resource_size(cfgres) >> bus_shift;
|
|
if (bus_range > bus_range_max) {
|
|
@@ -77,13 +78,6 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
|
|
cfg->winp = kcalloc(bus_range, sizeof(*cfg->winp), GFP_KERNEL);
|
|
if (!cfg->winp)
|
|
goto err_exit_malloc;
|
|
- for (i = 0; i < bus_range; i++) {
|
|
- cfg->winp[i] =
|
|
- pci_remap_cfgspace(cfgres->start + i * bsz,
|
|
- bsz);
|
|
- if (!cfg->winp[i])
|
|
- goto err_exit_iomap;
|
|
- }
|
|
} else {
|
|
cfg->win = pci_remap_cfgspace(cfgres->start, bus_range * bsz);
|
|
if (!cfg->win)
|
|
@@ -129,6 +123,44 @@ void pci_ecam_free(struct pci_config_window *cfg)
|
|
}
|
|
EXPORT_SYMBOL_GPL(pci_ecam_free);
|
|
|
|
+static int pci_ecam_add_bus(struct pci_bus *bus)
|
|
+{
|
|
+ struct pci_config_window *cfg = bus->sysdata;
|
|
+ unsigned int bsz = 1 << cfg->bus_shift;
|
|
+ unsigned int busn = bus->number;
|
|
+ phys_addr_t start;
|
|
+
|
|
+ if (!per_bus_mapping)
|
|
+ return 0;
|
|
+
|
|
+ if (busn < cfg->busr.start || busn > cfg->busr.end)
|
|
+ return -EINVAL;
|
|
+
|
|
+ busn -= cfg->busr.start;
|
|
+ start = cfg->res.start + busn * bsz;
|
|
+
|
|
+ cfg->winp[busn] = pci_remap_cfgspace(start, bsz);
|
|
+ if (!cfg->winp[busn])
|
|
+ return -ENOMEM;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void pci_ecam_remove_bus(struct pci_bus *bus)
|
|
+{
|
|
+ struct pci_config_window *cfg = bus->sysdata;
|
|
+ unsigned int busn = bus->number;
|
|
+
|
|
+ if (!per_bus_mapping || busn < cfg->busr.start || busn > cfg->busr.end)
|
|
+ return;
|
|
+
|
|
+ busn -= cfg->busr.start;
|
|
+ if (cfg->winp[busn]) {
|
|
+ iounmap(cfg->winp[busn]);
|
|
+ cfg->winp[busn] = NULL;
|
|
+ }
|
|
+}
|
|
+
|
|
/*
|
|
* Function to implement the pci_ops ->map_bus method
|
|
*/
|
|
@@ -167,6 +199,8 @@ EXPORT_SYMBOL_GPL(pci_ecam_map_bus);
|
|
/* ECAM ops */
|
|
const struct pci_ecam_ops pci_generic_ecam_ops = {
|
|
.pci_ops = {
|
|
+ .add_bus = pci_ecam_add_bus,
|
|
+ .remove_bus = pci_ecam_remove_bus,
|
|
.map_bus = pci_ecam_map_bus,
|
|
.read = pci_generic_config_read,
|
|
.write = pci_generic_config_write,
|
|
@@ -178,6 +212,8 @@ EXPORT_SYMBOL_GPL(pci_generic_ecam_ops);
|
|
/* ECAM ops for 32-bit access only (non-compliant) */
|
|
const struct pci_ecam_ops pci_32b_ops = {
|
|
.pci_ops = {
|
|
+ .add_bus = pci_ecam_add_bus,
|
|
+ .remove_bus = pci_ecam_remove_bus,
|
|
.map_bus = pci_ecam_map_bus,
|
|
.read = pci_generic_config_read32,
|
|
.write = pci_generic_config_write32,
|
|
@@ -187,6 +223,8 @@ const struct pci_ecam_ops pci_32b_ops = {
|
|
/* ECAM ops for 32-bit read only (non-compliant) */
|
|
const struct pci_ecam_ops pci_32b_read_ops = {
|
|
.pci_ops = {
|
|
+ .add_bus = pci_ecam_add_bus,
|
|
+ .remove_bus = pci_ecam_remove_bus,
|
|
.map_bus = pci_ecam_map_bus,
|
|
.read = pci_generic_config_read32,
|
|
.write = pci_generic_config_write,
|
|
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
|
|
index fb3840e222add..9d06939736c0f 100644
|
|
--- a/drivers/pci/hotplug/pciehp_hpc.c
|
|
+++ b/drivers/pci/hotplug/pciehp_hpc.c
|
|
@@ -563,6 +563,32 @@ void pciehp_power_off_slot(struct controller *ctrl)
|
|
PCI_EXP_SLTCTL_PWR_OFF);
|
|
}
|
|
|
|
+static void pciehp_ignore_dpc_link_change(struct controller *ctrl,
|
|
+ struct pci_dev *pdev, int irq)
|
|
+{
|
|
+ /*
|
|
+ * Ignore link changes which occurred while waiting for DPC recovery.
|
|
+ * Could be several if DPC triggered multiple times consecutively.
|
|
+ */
|
|
+ synchronize_hardirq(irq);
|
|
+ atomic_and(~PCI_EXP_SLTSTA_DLLSC, &ctrl->pending_events);
|
|
+ if (pciehp_poll_mode)
|
|
+ pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
|
|
+ PCI_EXP_SLTSTA_DLLSC);
|
|
+ ctrl_info(ctrl, "Slot(%s): Link Down/Up ignored (recovered by DPC)\n",
|
|
+ slot_name(ctrl));
|
|
+
|
|
+ /*
|
|
+ * If the link is unexpectedly down after successful recovery,
|
|
+ * the corresponding link change may have been ignored above.
|
|
+ * Synthesize it to ensure that it is acted on.
|
|
+ */
|
|
+ down_read(&ctrl->reset_lock);
|
|
+ if (!pciehp_check_link_active(ctrl))
|
|
+ pciehp_request(ctrl, PCI_EXP_SLTSTA_DLLSC);
|
|
+ up_read(&ctrl->reset_lock);
|
|
+}
|
|
+
|
|
static irqreturn_t pciehp_isr(int irq, void *dev_id)
|
|
{
|
|
struct controller *ctrl = (struct controller *)dev_id;
|
|
@@ -706,6 +732,16 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
|
|
PCI_EXP_SLTCTL_ATTN_IND_ON);
|
|
}
|
|
|
|
+ /*
|
|
+ * Ignore Link Down/Up events caused by Downstream Port Containment
|
|
+ * if recovery from the error succeeded.
|
|
+ */
|
|
+ if ((events & PCI_EXP_SLTSTA_DLLSC) && pci_dpc_recovered(pdev) &&
|
|
+ ctrl->state == ON_STATE) {
|
|
+ events &= ~PCI_EXP_SLTSTA_DLLSC;
|
|
+ pciehp_ignore_dpc_link_change(ctrl, pdev, irq);
|
|
+ }
|
|
+
|
|
/*
|
|
* Disable requests have higher priority than Presence Detect Changed
|
|
* or Data Link Layer State Changed events.
|
|
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
|
|
index 1963826303631..c49c13a5fedc7 100644
|
|
--- a/drivers/pci/p2pdma.c
|
|
+++ b/drivers/pci/p2pdma.c
|
|
@@ -308,10 +308,41 @@ static const struct pci_p2pdma_whitelist_entry {
|
|
{}
|
|
};
|
|
|
|
+/*
|
|
+ * This lookup function tries to find the PCI device corresponding to a given
|
|
+ * host bridge.
|
|
+ *
|
|
+ * It assumes the host bridge device is the first PCI device in the
|
|
+ * bus->devices list and that the devfn is 00.0. These assumptions should hold
|
|
+ * for all the devices in the whitelist above.
|
|
+ *
|
|
+ * This function is equivalent to pci_get_slot(host->bus, 0), however it does
|
|
+ * not take the pci_bus_sem lock seeing __host_bridge_whitelist() must not
|
|
+ * sleep.
|
|
+ *
|
|
+ * For this to be safe, the caller should hold a reference to a device on the
|
|
+ * bridge, which should ensure the host_bridge device will not be freed
|
|
+ * or removed from the head of the devices list.
|
|
+ */
|
|
+static struct pci_dev *pci_host_bridge_dev(struct pci_host_bridge *host)
|
|
+{
|
|
+ struct pci_dev *root;
|
|
+
|
|
+ root = list_first_entry_or_null(&host->bus->devices,
|
|
+ struct pci_dev, bus_list);
|
|
+
|
|
+ if (!root)
|
|
+ return NULL;
|
|
+ if (root->devfn != PCI_DEVFN(0, 0))
|
|
+ return NULL;
|
|
+
|
|
+ return root;
|
|
+}
|
|
+
|
|
static bool __host_bridge_whitelist(struct pci_host_bridge *host,
|
|
bool same_host_bridge)
|
|
{
|
|
- struct pci_dev *root = pci_get_slot(host->bus, PCI_DEVFN(0, 0));
|
|
+ struct pci_dev *root = pci_host_bridge_dev(host);
|
|
const struct pci_p2pdma_whitelist_entry *entry;
|
|
unsigned short vendor, device;
|
|
|
|
@@ -320,7 +351,6 @@ static bool __host_bridge_whitelist(struct pci_host_bridge *host,
|
|
|
|
vendor = root->vendor;
|
|
device = root->device;
|
|
- pci_dev_put(root);
|
|
|
|
for (entry = pci_p2pdma_whitelist; entry->vendor; entry++) {
|
|
if (vendor != entry->vendor || device != entry->device)
|
|
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
|
|
index c32f3b7540e87..76b381cf70b27 100644
|
|
--- a/drivers/pci/pci-label.c
|
|
+++ b/drivers/pci/pci-label.c
|
|
@@ -145,7 +145,7 @@ static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf)
|
|
len = utf16s_to_utf8s((const wchar_t *)obj->buffer.pointer,
|
|
obj->buffer.length,
|
|
UTF16_LITTLE_ENDIAN,
|
|
- buf, PAGE_SIZE);
|
|
+ buf, PAGE_SIZE - 1);
|
|
buf[len] = '\n';
|
|
}
|
|
|
|
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
|
|
index 37c913bbc6e17..dac6922553b40 100644
|
|
--- a/drivers/pci/pci.h
|
|
+++ b/drivers/pci/pci.h
|
|
@@ -385,6 +385,8 @@ static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)
|
|
|
|
/* pci_dev priv_flags */
|
|
#define PCI_DEV_ADDED 0
|
|
+#define PCI_DPC_RECOVERED 1
|
|
+#define PCI_DPC_RECOVERING 2
|
|
|
|
static inline void pci_dev_assign_added(struct pci_dev *dev, bool added)
|
|
{
|
|
@@ -439,10 +441,12 @@ void pci_restore_dpc_state(struct pci_dev *dev);
|
|
void pci_dpc_init(struct pci_dev *pdev);
|
|
void dpc_process_error(struct pci_dev *pdev);
|
|
pci_ers_result_t dpc_reset_link(struct pci_dev *pdev);
|
|
+bool pci_dpc_recovered(struct pci_dev *pdev);
|
|
#else
|
|
static inline void pci_save_dpc_state(struct pci_dev *dev) {}
|
|
static inline void pci_restore_dpc_state(struct pci_dev *dev) {}
|
|
static inline void pci_dpc_init(struct pci_dev *pdev) {}
|
|
+static inline bool pci_dpc_recovered(struct pci_dev *pdev) { return false; }
|
|
#endif
|
|
|
|
#ifdef CONFIG_PCIEPORTBUS
|
|
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
|
|
index e05aba86a3179..c556e7beafe38 100644
|
|
--- a/drivers/pci/pcie/dpc.c
|
|
+++ b/drivers/pci/pcie/dpc.c
|
|
@@ -71,6 +71,58 @@ void pci_restore_dpc_state(struct pci_dev *dev)
|
|
pci_write_config_word(dev, dev->dpc_cap + PCI_EXP_DPC_CTL, *cap);
|
|
}
|
|
|
|
+static DECLARE_WAIT_QUEUE_HEAD(dpc_completed_waitqueue);
|
|
+
|
|
+#ifdef CONFIG_HOTPLUG_PCI_PCIE
|
|
+static bool dpc_completed(struct pci_dev *pdev)
|
|
+{
|
|
+ u16 status;
|
|
+
|
|
+ pci_read_config_word(pdev, pdev->dpc_cap + PCI_EXP_DPC_STATUS, &status);
|
|
+ if ((status != 0xffff) && (status & PCI_EXP_DPC_STATUS_TRIGGER))
|
|
+ return false;
|
|
+
|
|
+ if (test_bit(PCI_DPC_RECOVERING, &pdev->priv_flags))
|
|
+ return false;
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
+/**
|
|
+ * pci_dpc_recovered - whether DPC triggered and has recovered successfully
|
|
+ * @pdev: PCI device
|
|
+ *
|
|
+ * Return true if DPC was triggered for @pdev and has recovered successfully.
|
|
+ * Wait for recovery if it hasn't completed yet. Called from the PCIe hotplug
|
|
+ * driver to recognize and ignore Link Down/Up events caused by DPC.
|
|
+ */
|
|
+bool pci_dpc_recovered(struct pci_dev *pdev)
|
|
+{
|
|
+ struct pci_host_bridge *host;
|
|
+
|
|
+ if (!pdev->dpc_cap)
|
|
+ return false;
|
|
+
|
|
+ /*
|
|
+ * Synchronization between hotplug and DPC is not supported
|
|
+ * if DPC is owned by firmware and EDR is not enabled.
|
|
+ */
|
|
+ host = pci_find_host_bridge(pdev->bus);
|
|
+ if (!host->native_dpc && !IS_ENABLED(CONFIG_PCIE_EDR))
|
|
+ return false;
|
|
+
|
|
+ /*
|
|
+ * Need a timeout in case DPC never completes due to failure of
|
|
+ * dpc_wait_rp_inactive(). The spec doesn't mandate a time limit,
|
|
+ * but reports indicate that DPC completes within 4 seconds.
|
|
+ */
|
|
+ wait_event_timeout(dpc_completed_waitqueue, dpc_completed(pdev),
|
|
+ msecs_to_jiffies(4000));
|
|
+
|
|
+ return test_and_clear_bit(PCI_DPC_RECOVERED, &pdev->priv_flags);
|
|
+}
|
|
+#endif /* CONFIG_HOTPLUG_PCI_PCIE */
|
|
+
|
|
static int dpc_wait_rp_inactive(struct pci_dev *pdev)
|
|
{
|
|
unsigned long timeout = jiffies + HZ;
|
|
@@ -91,8 +143,11 @@ static int dpc_wait_rp_inactive(struct pci_dev *pdev)
|
|
|
|
pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)
|
|
{
|
|
+ pci_ers_result_t ret;
|
|
u16 cap;
|
|
|
|
+ set_bit(PCI_DPC_RECOVERING, &pdev->priv_flags);
|
|
+
|
|
/*
|
|
* DPC disables the Link automatically in hardware, so it has
|
|
* already been reset by the time we get here.
|
|
@@ -106,18 +161,27 @@ pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)
|
|
if (!pcie_wait_for_link(pdev, false))
|
|
pci_info(pdev, "Data Link Layer Link Active not cleared in 1000 msec\n");
|
|
|
|
- if (pdev->dpc_rp_extensions && dpc_wait_rp_inactive(pdev))
|
|
- return PCI_ERS_RESULT_DISCONNECT;
|
|
+ if (pdev->dpc_rp_extensions && dpc_wait_rp_inactive(pdev)) {
|
|
+ clear_bit(PCI_DPC_RECOVERED, &pdev->priv_flags);
|
|
+ ret = PCI_ERS_RESULT_DISCONNECT;
|
|
+ goto out;
|
|
+ }
|
|
|
|
pci_write_config_word(pdev, cap + PCI_EXP_DPC_STATUS,
|
|
PCI_EXP_DPC_STATUS_TRIGGER);
|
|
|
|
if (!pcie_wait_for_link(pdev, true)) {
|
|
pci_info(pdev, "Data Link Layer Link Active not set in 1000 msec\n");
|
|
- return PCI_ERS_RESULT_DISCONNECT;
|
|
+ clear_bit(PCI_DPC_RECOVERED, &pdev->priv_flags);
|
|
+ ret = PCI_ERS_RESULT_DISCONNECT;
|
|
+ } else {
|
|
+ set_bit(PCI_DPC_RECOVERED, &pdev->priv_flags);
|
|
+ ret = PCI_ERS_RESULT_RECOVERED;
|
|
}
|
|
-
|
|
- return PCI_ERS_RESULT_RECOVERED;
|
|
+out:
|
|
+ clear_bit(PCI_DPC_RECOVERING, &pdev->priv_flags);
|
|
+ wake_up_all(&dpc_completed_waitqueue);
|
|
+ return ret;
|
|
}
|
|
|
|
static void dpc_process_rp_pio_error(struct pci_dev *pdev)
|
|
diff --git a/drivers/phy/intel/phy-intel-keembay-emmc.c b/drivers/phy/intel/phy-intel-keembay-emmc.c
|
|
index eb7c635ed89ae..0eb11ac7c2e2e 100644
|
|
--- a/drivers/phy/intel/phy-intel-keembay-emmc.c
|
|
+++ b/drivers/phy/intel/phy-intel-keembay-emmc.c
|
|
@@ -95,7 +95,8 @@ static int keembay_emmc_phy_power(struct phy *phy, bool on_off)
|
|
else
|
|
freqsel = 0x0;
|
|
|
|
- if (mhz < 50 || mhz > 200)
|
|
+ /* Check for EMMC clock rate*/
|
|
+ if (mhz > 175)
|
|
dev_warn(&phy->dev, "Unsupported rate: %d MHz\n", mhz);
|
|
|
|
/*
|
|
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
|
|
index c5067eb753706..1c5af2fef1423 100644
|
|
--- a/drivers/power/reset/gpio-poweroff.c
|
|
+++ b/drivers/power/reset/gpio-poweroff.c
|
|
@@ -90,6 +90,7 @@ static const struct of_device_id of_gpio_poweroff_match[] = {
|
|
{ .compatible = "gpio-poweroff", },
|
|
{},
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, of_gpio_poweroff_match);
|
|
|
|
static struct platform_driver gpio_poweroff_driver = {
|
|
.probe = gpio_poweroff_probe,
|
|
diff --git a/drivers/power/reset/regulator-poweroff.c b/drivers/power/reset/regulator-poweroff.c
|
|
index f697088e0ad1a..20701203935f0 100644
|
|
--- a/drivers/power/reset/regulator-poweroff.c
|
|
+++ b/drivers/power/reset/regulator-poweroff.c
|
|
@@ -64,6 +64,7 @@ static const struct of_device_id of_regulator_poweroff_match[] = {
|
|
{ .compatible = "regulator-poweroff", },
|
|
{},
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, of_regulator_poweroff_match);
|
|
|
|
static struct platform_driver regulator_poweroff_driver = {
|
|
.probe = regulator_poweroff_probe,
|
|
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
|
|
index e696364126f1d..20a2f93252f91 100644
|
|
--- a/drivers/power/supply/Kconfig
|
|
+++ b/drivers/power/supply/Kconfig
|
|
@@ -712,7 +712,8 @@ config BATTERY_GOLDFISH
|
|
|
|
config BATTERY_RT5033
|
|
tristate "RT5033 fuel gauge support"
|
|
- depends on MFD_RT5033
|
|
+ depends on I2C
|
|
+ select REGMAP_I2C
|
|
help
|
|
This adds support for battery fuel gauge in Richtek RT5033 PMIC.
|
|
The fuelgauge calculates and determines the battery state of charge
|
|
diff --git a/drivers/power/supply/ab8500-bm.h b/drivers/power/supply/ab8500-bm.h
|
|
index 41c69a4f2a1fc..871bdc1f5cbda 100644
|
|
--- a/drivers/power/supply/ab8500-bm.h
|
|
+++ b/drivers/power/supply/ab8500-bm.h
|
|
@@ -507,8 +507,6 @@ struct abx500_bm_data {
|
|
int bkup_bat_v;
|
|
int bkup_bat_i;
|
|
bool autopower_cfg;
|
|
- bool ac_enabled;
|
|
- bool usb_enabled;
|
|
bool no_maintenance;
|
|
bool capacity_scaling;
|
|
bool chg_unknown_bat;
|
|
@@ -730,4 +728,8 @@ int ab8500_bm_of_probe(struct device *dev,
|
|
struct device_node *np,
|
|
struct abx500_bm_data *bm);
|
|
|
|
+extern struct platform_driver ab8500_fg_driver;
|
|
+extern struct platform_driver ab8500_btemp_driver;
|
|
+extern struct platform_driver abx500_chargalg_driver;
|
|
+
|
|
#endif /* _AB8500_CHARGER_H_ */
|
|
diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c
|
|
index fdfcd59fc43e3..4df305c767c5c 100644
|
|
--- a/drivers/power/supply/ab8500_btemp.c
|
|
+++ b/drivers/power/supply/ab8500_btemp.c
|
|
@@ -13,6 +13,7 @@
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/device.h>
|
|
+#include <linux/component.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/slab.h>
|
|
@@ -932,26 +933,6 @@ static int __maybe_unused ab8500_btemp_suspend(struct device *dev)
|
|
return 0;
|
|
}
|
|
|
|
-static int ab8500_btemp_remove(struct platform_device *pdev)
|
|
-{
|
|
- struct ab8500_btemp *di = platform_get_drvdata(pdev);
|
|
- int i, irq;
|
|
-
|
|
- /* Disable interrupts */
|
|
- for (i = 0; i < ARRAY_SIZE(ab8500_btemp_irq); i++) {
|
|
- irq = platform_get_irq_byname(pdev, ab8500_btemp_irq[i].name);
|
|
- free_irq(irq, di);
|
|
- }
|
|
-
|
|
- /* Delete the work queue */
|
|
- destroy_workqueue(di->btemp_wq);
|
|
-
|
|
- flush_scheduled_work();
|
|
- power_supply_unregister(di->btemp_psy);
|
|
-
|
|
- return 0;
|
|
-}
|
|
-
|
|
static char *supply_interface[] = {
|
|
"ab8500_chargalg",
|
|
"ab8500_fg",
|
|
@@ -966,6 +947,40 @@ static const struct power_supply_desc ab8500_btemp_desc = {
|
|
.external_power_changed = ab8500_btemp_external_power_changed,
|
|
};
|
|
|
|
+static int ab8500_btemp_bind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
+{
|
|
+ struct ab8500_btemp *di = dev_get_drvdata(dev);
|
|
+
|
|
+ /* Create a work queue for the btemp */
|
|
+ di->btemp_wq =
|
|
+ alloc_workqueue("ab8500_btemp_wq", WQ_MEM_RECLAIM, 0);
|
|
+ if (di->btemp_wq == NULL) {
|
|
+ dev_err(dev, "failed to create work queue\n");
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ /* Kick off periodic temperature measurements */
|
|
+ ab8500_btemp_periodic(di, true);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void ab8500_btemp_unbind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
+{
|
|
+ struct ab8500_btemp *di = dev_get_drvdata(dev);
|
|
+
|
|
+ /* Delete the work queue */
|
|
+ destroy_workqueue(di->btemp_wq);
|
|
+ flush_scheduled_work();
|
|
+}
|
|
+
|
|
+static const struct component_ops ab8500_btemp_component_ops = {
|
|
+ .bind = ab8500_btemp_bind,
|
|
+ .unbind = ab8500_btemp_unbind,
|
|
+};
|
|
+
|
|
static int ab8500_btemp_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
@@ -1011,14 +1026,6 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
|
|
psy_cfg.num_supplicants = ARRAY_SIZE(supply_interface);
|
|
psy_cfg.drv_data = di;
|
|
|
|
- /* Create a work queue for the btemp */
|
|
- di->btemp_wq =
|
|
- alloc_workqueue("ab8500_btemp_wq", WQ_MEM_RECLAIM, 0);
|
|
- if (di->btemp_wq == NULL) {
|
|
- dev_err(dev, "failed to create work queue\n");
|
|
- return -ENOMEM;
|
|
- }
|
|
-
|
|
/* Init work for measuring temperature periodically */
|
|
INIT_DEFERRABLE_WORK(&di->btemp_periodic_work,
|
|
ab8500_btemp_periodic_work);
|
|
@@ -1031,7 +1038,7 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
|
|
AB8500_BTEMP_HIGH_TH, &val);
|
|
if (ret < 0) {
|
|
dev_err(dev, "%s ab8500 read failed\n", __func__);
|
|
- goto free_btemp_wq;
|
|
+ return ret;
|
|
}
|
|
switch (val) {
|
|
case BTEMP_HIGH_TH_57_0:
|
|
@@ -1050,30 +1057,28 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
|
|
}
|
|
|
|
/* Register BTEMP power supply class */
|
|
- di->btemp_psy = power_supply_register(dev, &ab8500_btemp_desc,
|
|
- &psy_cfg);
|
|
+ di->btemp_psy = devm_power_supply_register(dev, &ab8500_btemp_desc,
|
|
+ &psy_cfg);
|
|
if (IS_ERR(di->btemp_psy)) {
|
|
dev_err(dev, "failed to register BTEMP psy\n");
|
|
- ret = PTR_ERR(di->btemp_psy);
|
|
- goto free_btemp_wq;
|
|
+ return PTR_ERR(di->btemp_psy);
|
|
}
|
|
|
|
/* Register interrupts */
|
|
for (i = 0; i < ARRAY_SIZE(ab8500_btemp_irq); i++) {
|
|
irq = platform_get_irq_byname(pdev, ab8500_btemp_irq[i].name);
|
|
- if (irq < 0) {
|
|
- ret = irq;
|
|
- goto free_irq;
|
|
- }
|
|
+ if (irq < 0)
|
|
+ return irq;
|
|
|
|
- ret = request_threaded_irq(irq, NULL, ab8500_btemp_irq[i].isr,
|
|
+ ret = devm_request_threaded_irq(dev, irq, NULL,
|
|
+ ab8500_btemp_irq[i].isr,
|
|
IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
|
|
ab8500_btemp_irq[i].name, di);
|
|
|
|
if (ret) {
|
|
dev_err(dev, "failed to request %s IRQ %d: %d\n"
|
|
, ab8500_btemp_irq[i].name, irq, ret);
|
|
- goto free_irq;
|
|
+ return ret;
|
|
}
|
|
dev_dbg(dev, "Requested %s IRQ %d: %d\n",
|
|
ab8500_btemp_irq[i].name, irq, ret);
|
|
@@ -1081,23 +1086,16 @@ static int ab8500_btemp_probe(struct platform_device *pdev)
|
|
|
|
platform_set_drvdata(pdev, di);
|
|
|
|
- /* Kick off periodic temperature measurements */
|
|
- ab8500_btemp_periodic(di, true);
|
|
list_add_tail(&di->node, &ab8500_btemp_list);
|
|
|
|
- return ret;
|
|
+ return component_add(dev, &ab8500_btemp_component_ops);
|
|
+}
|
|
|
|
-free_irq:
|
|
- /* We also have to free all successfully registered irqs */
|
|
- for (i = i - 1; i >= 0; i--) {
|
|
- irq = platform_get_irq_byname(pdev, ab8500_btemp_irq[i].name);
|
|
- free_irq(irq, di);
|
|
- }
|
|
+static int ab8500_btemp_remove(struct platform_device *pdev)
|
|
+{
|
|
+ component_del(&pdev->dev, &ab8500_btemp_component_ops);
|
|
|
|
- power_supply_unregister(di->btemp_psy);
|
|
-free_btemp_wq:
|
|
- destroy_workqueue(di->btemp_wq);
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
static SIMPLE_DEV_PM_OPS(ab8500_btemp_pm_ops, ab8500_btemp_suspend, ab8500_btemp_resume);
|
|
@@ -1106,8 +1104,9 @@ static const struct of_device_id ab8500_btemp_match[] = {
|
|
{ .compatible = "stericsson,ab8500-btemp", },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, ab8500_btemp_match);
|
|
|
|
-static struct platform_driver ab8500_btemp_driver = {
|
|
+struct platform_driver ab8500_btemp_driver = {
|
|
.probe = ab8500_btemp_probe,
|
|
.remove = ab8500_btemp_remove,
|
|
.driver = {
|
|
@@ -1116,20 +1115,6 @@ static struct platform_driver ab8500_btemp_driver = {
|
|
.pm = &ab8500_btemp_pm_ops,
|
|
},
|
|
};
|
|
-
|
|
-static int __init ab8500_btemp_init(void)
|
|
-{
|
|
- return platform_driver_register(&ab8500_btemp_driver);
|
|
-}
|
|
-
|
|
-static void __exit ab8500_btemp_exit(void)
|
|
-{
|
|
- platform_driver_unregister(&ab8500_btemp_driver);
|
|
-}
|
|
-
|
|
-device_initcall(ab8500_btemp_init);
|
|
-module_exit(ab8500_btemp_exit);
|
|
-
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_AUTHOR("Johan Palsson, Karl Komierowski, Arun R Murthy");
|
|
MODULE_ALIAS("platform:ab8500-btemp");
|
|
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
|
|
index a9be10eb2c22e..98127e3591f92 100644
|
|
--- a/drivers/power/supply/ab8500_charger.c
|
|
+++ b/drivers/power/supply/ab8500_charger.c
|
|
@@ -13,6 +13,7 @@
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/device.h>
|
|
+#include <linux/component.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/notifier.h>
|
|
@@ -414,6 +415,14 @@ disable_otp:
|
|
static void ab8500_power_supply_changed(struct ab8500_charger *di,
|
|
struct power_supply *psy)
|
|
{
|
|
+ /*
|
|
+ * This happens if we get notifications or interrupts and
|
|
+ * the platform has been configured not to support one or
|
|
+ * other type of charging.
|
|
+ */
|
|
+ if (!psy)
|
|
+ return;
|
|
+
|
|
if (di->autopower_cfg) {
|
|
if (!di->usb.charger_connected &&
|
|
!di->ac.charger_connected &&
|
|
@@ -440,7 +449,15 @@ static void ab8500_charger_set_usb_connected(struct ab8500_charger *di,
|
|
if (!connected)
|
|
di->flags.vbus_drop_end = false;
|
|
|
|
- sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL, "present");
|
|
+ /*
|
|
+ * Sometimes the platform is configured not to support
|
|
+ * USB charging and no psy has been created, but we still
|
|
+ * will get these notifications.
|
|
+ */
|
|
+ if (di->usb_chg.psy) {
|
|
+ sysfs_notify(&di->usb_chg.psy->dev.kobj, NULL,
|
|
+ "present");
|
|
+ }
|
|
|
|
if (connected) {
|
|
mutex_lock(&di->charger_attached_mutex);
|
|
@@ -3276,10 +3293,74 @@ static struct notifier_block charger_nb = {
|
|
.notifier_call = ab8500_external_charger_prepare,
|
|
};
|
|
|
|
-static int ab8500_charger_remove(struct platform_device *pdev)
|
|
+static char *supply_interface[] = {
|
|
+ "ab8500_chargalg",
|
|
+ "ab8500_fg",
|
|
+ "ab8500_btemp",
|
|
+};
|
|
+
|
|
+static const struct power_supply_desc ab8500_ac_chg_desc = {
|
|
+ .name = "ab8500_ac",
|
|
+ .type = POWER_SUPPLY_TYPE_MAINS,
|
|
+ .properties = ab8500_charger_ac_props,
|
|
+ .num_properties = ARRAY_SIZE(ab8500_charger_ac_props),
|
|
+ .get_property = ab8500_charger_ac_get_property,
|
|
+};
|
|
+
|
|
+static const struct power_supply_desc ab8500_usb_chg_desc = {
|
|
+ .name = "ab8500_usb",
|
|
+ .type = POWER_SUPPLY_TYPE_USB,
|
|
+ .properties = ab8500_charger_usb_props,
|
|
+ .num_properties = ARRAY_SIZE(ab8500_charger_usb_props),
|
|
+ .get_property = ab8500_charger_usb_get_property,
|
|
+};
|
|
+
|
|
+static int ab8500_charger_bind(struct device *dev)
|
|
{
|
|
- struct ab8500_charger *di = platform_get_drvdata(pdev);
|
|
- int i, irq, ret;
|
|
+ struct ab8500_charger *di = dev_get_drvdata(dev);
|
|
+ int ch_stat;
|
|
+ int ret;
|
|
+
|
|
+ /* Create a work queue for the charger */
|
|
+ di->charger_wq = alloc_ordered_workqueue("ab8500_charger_wq",
|
|
+ WQ_MEM_RECLAIM);
|
|
+ if (di->charger_wq == NULL) {
|
|
+ dev_err(dev, "failed to create work queue\n");
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ ch_stat = ab8500_charger_detect_chargers(di, false);
|
|
+
|
|
+ if (ch_stat & AC_PW_CONN) {
|
|
+ if (is_ab8500(di->parent))
|
|
+ queue_delayed_work(di->charger_wq,
|
|
+ &di->ac_charger_attached_work,
|
|
+ HZ);
|
|
+ }
|
|
+ if (ch_stat & USB_PW_CONN) {
|
|
+ if (is_ab8500(di->parent))
|
|
+ queue_delayed_work(di->charger_wq,
|
|
+ &di->usb_charger_attached_work,
|
|
+ HZ);
|
|
+ di->vbus_detected = true;
|
|
+ di->vbus_detected_start = true;
|
|
+ queue_work(di->charger_wq,
|
|
+ &di->detect_usb_type_work);
|
|
+ }
|
|
+
|
|
+ ret = component_bind_all(dev, di);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "can't bind component devices\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void ab8500_charger_unbind(struct device *dev)
|
|
+{
|
|
+ struct ab8500_charger *di = dev_get_drvdata(dev);
|
|
+ int ret;
|
|
|
|
/* Disable AC charging */
|
|
ab8500_charger_ac_en(&di->ac_chg, false, 0, 0);
|
|
@@ -3287,68 +3368,47 @@ static int ab8500_charger_remove(struct platform_device *pdev)
|
|
/* Disable USB charging */
|
|
ab8500_charger_usb_en(&di->usb_chg, false, 0, 0);
|
|
|
|
- /* Disable interrupts */
|
|
- for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) {
|
|
- irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
|
|
- free_irq(irq, di);
|
|
- }
|
|
-
|
|
/* Backup battery voltage and current disable */
|
|
ret = abx500_mask_and_set_register_interruptible(di->dev,
|
|
AB8500_RTC, AB8500_RTC_CTRL_REG, RTC_BUP_CH_ENA, 0);
|
|
if (ret < 0)
|
|
dev_err(di->dev, "%s mask and set failed\n", __func__);
|
|
|
|
- usb_unregister_notifier(di->usb_phy, &di->nb);
|
|
- usb_put_phy(di->usb_phy);
|
|
-
|
|
/* Delete the work queue */
|
|
destroy_workqueue(di->charger_wq);
|
|
|
|
- /* Unregister external charger enable notifier */
|
|
- if (!di->ac_chg.enabled)
|
|
- blocking_notifier_chain_unregister(
|
|
- &charger_notifier_list, &charger_nb);
|
|
-
|
|
flush_scheduled_work();
|
|
- if (di->usb_chg.enabled)
|
|
- power_supply_unregister(di->usb_chg.psy);
|
|
|
|
- if (di->ac_chg.enabled && !di->ac_chg.external)
|
|
- power_supply_unregister(di->ac_chg.psy);
|
|
-
|
|
- return 0;
|
|
+ /* Unbind fg, btemp, algorithm */
|
|
+ component_unbind_all(dev, di);
|
|
}
|
|
|
|
-static char *supply_interface[] = {
|
|
- "ab8500_chargalg",
|
|
- "ab8500_fg",
|
|
- "ab8500_btemp",
|
|
+static const struct component_master_ops ab8500_charger_comp_ops = {
|
|
+ .bind = ab8500_charger_bind,
|
|
+ .unbind = ab8500_charger_unbind,
|
|
};
|
|
|
|
-static const struct power_supply_desc ab8500_ac_chg_desc = {
|
|
- .name = "ab8500_ac",
|
|
- .type = POWER_SUPPLY_TYPE_MAINS,
|
|
- .properties = ab8500_charger_ac_props,
|
|
- .num_properties = ARRAY_SIZE(ab8500_charger_ac_props),
|
|
- .get_property = ab8500_charger_ac_get_property,
|
|
+static struct platform_driver *const ab8500_charger_component_drivers[] = {
|
|
+ &ab8500_fg_driver,
|
|
+ &ab8500_btemp_driver,
|
|
+ &abx500_chargalg_driver,
|
|
};
|
|
|
|
-static const struct power_supply_desc ab8500_usb_chg_desc = {
|
|
- .name = "ab8500_usb",
|
|
- .type = POWER_SUPPLY_TYPE_USB,
|
|
- .properties = ab8500_charger_usb_props,
|
|
- .num_properties = ARRAY_SIZE(ab8500_charger_usb_props),
|
|
- .get_property = ab8500_charger_usb_get_property,
|
|
-};
|
|
+static int ab8500_charger_compare_dev(struct device *dev, void *data)
|
|
+{
|
|
+ return dev == data;
|
|
+}
|
|
|
|
static int ab8500_charger_probe(struct platform_device *pdev)
|
|
{
|
|
- struct device_node *np = pdev->dev.of_node;
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct device_node *np = dev->of_node;
|
|
+ struct component_match *match = NULL;
|
|
struct power_supply_config ac_psy_cfg = {}, usb_psy_cfg = {};
|
|
struct ab8500_charger *di;
|
|
- int irq, i, charger_status, ret = 0, ch_stat;
|
|
- struct device *dev = &pdev->dev;
|
|
+ int charger_status;
|
|
+ int i, irq;
|
|
+ int ret;
|
|
|
|
di = devm_kzalloc(dev, sizeof(*di), GFP_KERNEL);
|
|
if (!di)
|
|
@@ -3393,6 +3453,38 @@ static int ab8500_charger_probe(struct platform_device *pdev)
|
|
return ret;
|
|
}
|
|
|
|
+ /*
|
|
+ * VDD ADC supply needs to be enabled from this driver when there
|
|
+ * is a charger connected to avoid erroneous BTEMP_HIGH/LOW
|
|
+ * interrupts during charging
|
|
+ */
|
|
+ di->regu = devm_regulator_get(dev, "vddadc");
|
|
+ if (IS_ERR(di->regu)) {
|
|
+ ret = PTR_ERR(di->regu);
|
|
+ dev_err(dev, "failed to get vddadc regulator\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ /* Request interrupts */
|
|
+ for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) {
|
|
+ irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
|
|
+ if (irq < 0)
|
|
+ return irq;
|
|
+
|
|
+ ret = devm_request_threaded_irq(dev,
|
|
+ irq, NULL, ab8500_charger_irq[i].isr,
|
|
+ IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
|
|
+ ab8500_charger_irq[i].name, di);
|
|
+
|
|
+ if (ret != 0) {
|
|
+ dev_err(dev, "failed to request %s IRQ %d: %d\n"
|
|
+ , ab8500_charger_irq[i].name, irq, ret);
|
|
+ return ret;
|
|
+ }
|
|
+ dev_dbg(dev, "Requested %s IRQ %d: %d\n",
|
|
+ ab8500_charger_irq[i].name, irq, ret);
|
|
+ }
|
|
+
|
|
/* initialize lock */
|
|
spin_lock_init(&di->usb_state.usb_lock);
|
|
mutex_init(&di->usb_ipt_crnt_lock);
|
|
@@ -3419,14 +3511,16 @@ static int ab8500_charger_probe(struct platform_device *pdev)
|
|
di->ac_chg.max_out_curr =
|
|
di->bm->chg_output_curr[di->bm->n_chg_out_curr - 1];
|
|
di->ac_chg.wdt_refresh = CHG_WD_INTERVAL;
|
|
- di->ac_chg.enabled = di->bm->ac_enabled;
|
|
+ /*
|
|
+ * The AB8505 only supports USB charging. If we are not the
|
|
+ * AB8505, register an AC charger.
|
|
+ *
|
|
+ * TODO: if this should be opt-in, add DT properties for this.
|
|
+ */
|
|
+ if (!is_ab8505(di->parent))
|
|
+ di->ac_chg.enabled = true;
|
|
di->ac_chg.external = false;
|
|
|
|
- /*notifier for external charger enabling*/
|
|
- if (!di->ac_chg.enabled)
|
|
- blocking_notifier_chain_register(
|
|
- &charger_notifier_list, &charger_nb);
|
|
-
|
|
/* USB supply */
|
|
/* ux500_charger sub-class */
|
|
di->usb_chg.ops.enable = &ab8500_charger_usb_en;
|
|
@@ -3438,18 +3532,9 @@ static int ab8500_charger_probe(struct platform_device *pdev)
|
|
di->usb_chg.max_out_curr =
|
|
di->bm->chg_output_curr[di->bm->n_chg_out_curr - 1];
|
|
di->usb_chg.wdt_refresh = CHG_WD_INTERVAL;
|
|
- di->usb_chg.enabled = di->bm->usb_enabled;
|
|
di->usb_chg.external = false;
|
|
di->usb_state.usb_current = -1;
|
|
|
|
- /* Create a work queue for the charger */
|
|
- di->charger_wq = alloc_ordered_workqueue("ab8500_charger_wq",
|
|
- WQ_MEM_RECLAIM);
|
|
- if (di->charger_wq == NULL) {
|
|
- dev_err(dev, "failed to create work queue\n");
|
|
- return -ENOMEM;
|
|
- }
|
|
-
|
|
mutex_init(&di->charger_attached_mutex);
|
|
|
|
/* Init work for HW failure check */
|
|
@@ -3500,61 +3585,32 @@ static int ab8500_charger_probe(struct platform_device *pdev)
|
|
INIT_WORK(&di->check_usb_thermal_prot_work,
|
|
ab8500_charger_check_usb_thermal_prot_work);
|
|
|
|
- /*
|
|
- * VDD ADC supply needs to be enabled from this driver when there
|
|
- * is a charger connected to avoid erroneous BTEMP_HIGH/LOW
|
|
- * interrupts during charging
|
|
- */
|
|
- di->regu = devm_regulator_get(dev, "vddadc");
|
|
- if (IS_ERR(di->regu)) {
|
|
- ret = PTR_ERR(di->regu);
|
|
- dev_err(dev, "failed to get vddadc regulator\n");
|
|
- goto free_charger_wq;
|
|
- }
|
|
-
|
|
|
|
/* Initialize OVV, and other registers */
|
|
ret = ab8500_charger_init_hw_registers(di);
|
|
if (ret) {
|
|
dev_err(dev, "failed to initialize ABB registers\n");
|
|
- goto free_charger_wq;
|
|
+ return ret;
|
|
}
|
|
|
|
/* Register AC charger class */
|
|
if (di->ac_chg.enabled) {
|
|
- di->ac_chg.psy = power_supply_register(dev,
|
|
+ di->ac_chg.psy = devm_power_supply_register(dev,
|
|
&ab8500_ac_chg_desc,
|
|
&ac_psy_cfg);
|
|
if (IS_ERR(di->ac_chg.psy)) {
|
|
dev_err(dev, "failed to register AC charger\n");
|
|
- ret = PTR_ERR(di->ac_chg.psy);
|
|
- goto free_charger_wq;
|
|
+ return PTR_ERR(di->ac_chg.psy);
|
|
}
|
|
}
|
|
|
|
/* Register USB charger class */
|
|
- if (di->usb_chg.enabled) {
|
|
- di->usb_chg.psy = power_supply_register(dev,
|
|
- &ab8500_usb_chg_desc,
|
|
- &usb_psy_cfg);
|
|
- if (IS_ERR(di->usb_chg.psy)) {
|
|
- dev_err(dev, "failed to register USB charger\n");
|
|
- ret = PTR_ERR(di->usb_chg.psy);
|
|
- goto free_ac;
|
|
- }
|
|
- }
|
|
-
|
|
- di->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
- if (IS_ERR_OR_NULL(di->usb_phy)) {
|
|
- dev_err(dev, "failed to get usb transceiver\n");
|
|
- ret = -EINVAL;
|
|
- goto free_usb;
|
|
- }
|
|
- di->nb.notifier_call = ab8500_charger_usb_notifier_call;
|
|
- ret = usb_register_notifier(di->usb_phy, &di->nb);
|
|
- if (ret) {
|
|
- dev_err(dev, "failed to register usb notifier\n");
|
|
- goto put_usb_phy;
|
|
+ di->usb_chg.psy = devm_power_supply_register(dev,
|
|
+ &ab8500_usb_chg_desc,
|
|
+ &usb_psy_cfg);
|
|
+ if (IS_ERR(di->usb_chg.psy)) {
|
|
+ dev_err(dev, "failed to register USB charger\n");
|
|
+ return PTR_ERR(di->usb_chg.psy);
|
|
}
|
|
|
|
/* Identify the connected charger types during startup */
|
|
@@ -3566,84 +3622,93 @@ static int ab8500_charger_probe(struct platform_device *pdev)
|
|
sysfs_notify(&di->ac_chg.psy->dev.kobj, NULL, "present");
|
|
}
|
|
|
|
- if (charger_status & USB_PW_CONN) {
|
|
- di->vbus_detected = true;
|
|
- di->vbus_detected_start = true;
|
|
- queue_work(di->charger_wq,
|
|
- &di->detect_usb_type_work);
|
|
- }
|
|
-
|
|
- /* Register interrupts */
|
|
- for (i = 0; i < ARRAY_SIZE(ab8500_charger_irq); i++) {
|
|
- irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
|
|
- if (irq < 0) {
|
|
- ret = irq;
|
|
- goto free_irq;
|
|
- }
|
|
+ platform_set_drvdata(pdev, di);
|
|
|
|
- ret = request_threaded_irq(irq, NULL, ab8500_charger_irq[i].isr,
|
|
- IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
|
|
- ab8500_charger_irq[i].name, di);
|
|
+ /* Create something that will match the subdrivers when we bind */
|
|
+ for (i = 0; i < ARRAY_SIZE(ab8500_charger_component_drivers); i++) {
|
|
+ struct device_driver *drv = &ab8500_charger_component_drivers[i]->driver;
|
|
+ struct device *p = NULL, *d;
|
|
|
|
- if (ret != 0) {
|
|
- dev_err(dev, "failed to request %s IRQ %d: %d\n"
|
|
- , ab8500_charger_irq[i].name, irq, ret);
|
|
- goto free_irq;
|
|
+ while ((d = platform_find_device_by_driver(p, drv))) {
|
|
+ put_device(p);
|
|
+ component_match_add(dev, &match,
|
|
+ ab8500_charger_compare_dev, d);
|
|
+ p = d;
|
|
}
|
|
- dev_dbg(dev, "Requested %s IRQ %d: %d\n",
|
|
- ab8500_charger_irq[i].name, irq, ret);
|
|
+ put_device(p);
|
|
+ }
|
|
+ if (!match) {
|
|
+ dev_err(dev, "no matching components\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+ if (IS_ERR(match)) {
|
|
+ dev_err(dev, "could not create component match\n");
|
|
+ return PTR_ERR(match);
|
|
}
|
|
|
|
- platform_set_drvdata(pdev, di);
|
|
-
|
|
- mutex_lock(&di->charger_attached_mutex);
|
|
+ /* Notifier for external charger enabling */
|
|
+ if (!di->ac_chg.enabled)
|
|
+ blocking_notifier_chain_register(
|
|
+ &charger_notifier_list, &charger_nb);
|
|
|
|
- ch_stat = ab8500_charger_detect_chargers(di, false);
|
|
|
|
- if ((ch_stat & AC_PW_CONN) == AC_PW_CONN) {
|
|
- if (is_ab8500(di->parent))
|
|
- queue_delayed_work(di->charger_wq,
|
|
- &di->ac_charger_attached_work,
|
|
- HZ);
|
|
+ di->usb_phy = usb_get_phy(USB_PHY_TYPE_USB2);
|
|
+ if (IS_ERR_OR_NULL(di->usb_phy)) {
|
|
+ dev_err(dev, "failed to get usb transceiver\n");
|
|
+ ret = -EINVAL;
|
|
+ goto out_charger_notifier;
|
|
}
|
|
- if ((ch_stat & USB_PW_CONN) == USB_PW_CONN) {
|
|
- if (is_ab8500(di->parent))
|
|
- queue_delayed_work(di->charger_wq,
|
|
- &di->usb_charger_attached_work,
|
|
- HZ);
|
|
+ di->nb.notifier_call = ab8500_charger_usb_notifier_call;
|
|
+ ret = usb_register_notifier(di->usb_phy, &di->nb);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "failed to register usb notifier\n");
|
|
+ goto put_usb_phy;
|
|
}
|
|
|
|
- mutex_unlock(&di->charger_attached_mutex);
|
|
|
|
- return ret;
|
|
+ ret = component_master_add_with_match(&pdev->dev,
|
|
+ &ab8500_charger_comp_ops,
|
|
+ match);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "failed to add component master\n");
|
|
+ goto free_notifier;
|
|
+ }
|
|
|
|
-free_irq:
|
|
- usb_unregister_notifier(di->usb_phy, &di->nb);
|
|
+ return 0;
|
|
|
|
- /* We also have to free all successfully registered irqs */
|
|
- for (i = i - 1; i >= 0; i--) {
|
|
- irq = platform_get_irq_byname(pdev, ab8500_charger_irq[i].name);
|
|
- free_irq(irq, di);
|
|
- }
|
|
+free_notifier:
|
|
+ usb_unregister_notifier(di->usb_phy, &di->nb);
|
|
put_usb_phy:
|
|
usb_put_phy(di->usb_phy);
|
|
-free_usb:
|
|
- if (di->usb_chg.enabled)
|
|
- power_supply_unregister(di->usb_chg.psy);
|
|
-free_ac:
|
|
- if (di->ac_chg.enabled)
|
|
- power_supply_unregister(di->ac_chg.psy);
|
|
-free_charger_wq:
|
|
- destroy_workqueue(di->charger_wq);
|
|
+out_charger_notifier:
|
|
+ if (!di->ac_chg.enabled)
|
|
+ blocking_notifier_chain_unregister(
|
|
+ &charger_notifier_list, &charger_nb);
|
|
return ret;
|
|
}
|
|
|
|
+static int ab8500_charger_remove(struct platform_device *pdev)
|
|
+{
|
|
+ struct ab8500_charger *di = platform_get_drvdata(pdev);
|
|
+
|
|
+ component_master_del(&pdev->dev, &ab8500_charger_comp_ops);
|
|
+
|
|
+ usb_unregister_notifier(di->usb_phy, &di->nb);
|
|
+ usb_put_phy(di->usb_phy);
|
|
+ if (!di->ac_chg.enabled)
|
|
+ blocking_notifier_chain_unregister(
|
|
+ &charger_notifier_list, &charger_nb);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static SIMPLE_DEV_PM_OPS(ab8500_charger_pm_ops, ab8500_charger_suspend, ab8500_charger_resume);
|
|
|
|
static const struct of_device_id ab8500_charger_match[] = {
|
|
{ .compatible = "stericsson,ab8500-charger", },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, ab8500_charger_match);
|
|
|
|
static struct platform_driver ab8500_charger_driver = {
|
|
.probe = ab8500_charger_probe,
|
|
@@ -3657,15 +3722,24 @@ static struct platform_driver ab8500_charger_driver = {
|
|
|
|
static int __init ab8500_charger_init(void)
|
|
{
|
|
+ int ret;
|
|
+
|
|
+ ret = platform_register_drivers(ab8500_charger_component_drivers,
|
|
+ ARRAY_SIZE(ab8500_charger_component_drivers));
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
return platform_driver_register(&ab8500_charger_driver);
|
|
}
|
|
|
|
static void __exit ab8500_charger_exit(void)
|
|
{
|
|
+ platform_unregister_drivers(ab8500_charger_component_drivers,
|
|
+ ARRAY_SIZE(ab8500_charger_component_drivers));
|
|
platform_driver_unregister(&ab8500_charger_driver);
|
|
}
|
|
|
|
-subsys_initcall_sync(ab8500_charger_init);
|
|
+module_init(ab8500_charger_init);
|
|
module_exit(ab8500_charger_exit);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c
|
|
index 0c7c01a0d9790..46c718e9ebb7c 100644
|
|
--- a/drivers/power/supply/ab8500_fg.c
|
|
+++ b/drivers/power/supply/ab8500_fg.c
|
|
@@ -17,6 +17,7 @@
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
+#include <linux/component.h>
|
|
#include <linux/device.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/platform_device.h>
|
|
@@ -2980,27 +2981,6 @@ static int __maybe_unused ab8500_fg_suspend(struct device *dev)
|
|
return 0;
|
|
}
|
|
|
|
-static int ab8500_fg_remove(struct platform_device *pdev)
|
|
-{
|
|
- int ret = 0;
|
|
- struct ab8500_fg *di = platform_get_drvdata(pdev);
|
|
-
|
|
- list_del(&di->node);
|
|
-
|
|
- /* Disable coulomb counter */
|
|
- ret = ab8500_fg_coulomb_counter(di, false);
|
|
- if (ret)
|
|
- dev_err(di->dev, "failed to disable coulomb counter\n");
|
|
-
|
|
- destroy_workqueue(di->fg_wq);
|
|
- ab8500_fg_sysfs_exit(di);
|
|
-
|
|
- flush_scheduled_work();
|
|
- ab8500_fg_sysfs_psy_remove_attrs(di);
|
|
- power_supply_unregister(di->fg_psy);
|
|
- return ret;
|
|
-}
|
|
-
|
|
/* ab8500 fg driver interrupts and their respective isr */
|
|
static struct ab8500_fg_interrupts ab8500_fg_irq[] = {
|
|
{"NCONV_ACCU", ab8500_fg_cc_convend_handler},
|
|
@@ -3024,11 +3004,50 @@ static const struct power_supply_desc ab8500_fg_desc = {
|
|
.external_power_changed = ab8500_fg_external_power_changed,
|
|
};
|
|
|
|
+static int ab8500_fg_bind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
+{
|
|
+ struct ab8500_fg *di = dev_get_drvdata(dev);
|
|
+
|
|
+ /* Create a work queue for running the FG algorithm */
|
|
+ di->fg_wq = alloc_ordered_workqueue("ab8500_fg_wq", WQ_MEM_RECLAIM);
|
|
+ if (di->fg_wq == NULL) {
|
|
+ dev_err(dev, "failed to create work queue\n");
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ /* Start the coulomb counter */
|
|
+ ab8500_fg_coulomb_counter(di, true);
|
|
+ /* Run the FG algorithm */
|
|
+ queue_delayed_work(di->fg_wq, &di->fg_periodic_work, 0);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void ab8500_fg_unbind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
+{
|
|
+ struct ab8500_fg *di = dev_get_drvdata(dev);
|
|
+ int ret;
|
|
+
|
|
+ /* Disable coulomb counter */
|
|
+ ret = ab8500_fg_coulomb_counter(di, false);
|
|
+ if (ret)
|
|
+ dev_err(dev, "failed to disable coulomb counter\n");
|
|
+
|
|
+ destroy_workqueue(di->fg_wq);
|
|
+ flush_scheduled_work();
|
|
+}
|
|
+
|
|
+static const struct component_ops ab8500_fg_component_ops = {
|
|
+ .bind = ab8500_fg_bind,
|
|
+ .unbind = ab8500_fg_unbind,
|
|
+};
|
|
+
|
|
static int ab8500_fg_probe(struct platform_device *pdev)
|
|
{
|
|
- struct device_node *np = pdev->dev.of_node;
|
|
- struct power_supply_config psy_cfg = {};
|
|
struct device *dev = &pdev->dev;
|
|
+ struct power_supply_config psy_cfg = {};
|
|
struct ab8500_fg *di;
|
|
int i, irq;
|
|
int ret = 0;
|
|
@@ -3074,13 +3093,6 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
ab8500_fg_charge_state_to(di, AB8500_FG_CHARGE_INIT);
|
|
ab8500_fg_discharge_state_to(di, AB8500_FG_DISCHARGE_INIT);
|
|
|
|
- /* Create a work queue for running the FG algorithm */
|
|
- di->fg_wq = alloc_ordered_workqueue("ab8500_fg_wq", WQ_MEM_RECLAIM);
|
|
- if (di->fg_wq == NULL) {
|
|
- dev_err(dev, "failed to create work queue\n");
|
|
- return -ENOMEM;
|
|
- }
|
|
-
|
|
/* Init work for running the fg algorithm instantly */
|
|
INIT_WORK(&di->fg_work, ab8500_fg_instant_work);
|
|
|
|
@@ -3113,7 +3125,7 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
ret = ab8500_fg_init_hw_registers(di);
|
|
if (ret) {
|
|
dev_err(dev, "failed to initialize registers\n");
|
|
- goto free_inst_curr_wq;
|
|
+ return ret;
|
|
}
|
|
|
|
/* Consider battery unknown until we're informed otherwise */
|
|
@@ -3121,15 +3133,13 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
di->flags.batt_id_received = false;
|
|
|
|
/* Register FG power supply class */
|
|
- di->fg_psy = power_supply_register(dev, &ab8500_fg_desc, &psy_cfg);
|
|
+ di->fg_psy = devm_power_supply_register(dev, &ab8500_fg_desc, &psy_cfg);
|
|
if (IS_ERR(di->fg_psy)) {
|
|
dev_err(dev, "failed to register FG psy\n");
|
|
- ret = PTR_ERR(di->fg_psy);
|
|
- goto free_inst_curr_wq;
|
|
+ return PTR_ERR(di->fg_psy);
|
|
}
|
|
|
|
di->fg_samples = SEC_TO_SAMPLE(di->bm->fg_params->init_timer);
|
|
- ab8500_fg_coulomb_counter(di, true);
|
|
|
|
/*
|
|
* Initialize completion used to notify completion and start
|
|
@@ -3141,19 +3151,18 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
/* Register primary interrupt handlers */
|
|
for (i = 0; i < ARRAY_SIZE(ab8500_fg_irq); i++) {
|
|
irq = platform_get_irq_byname(pdev, ab8500_fg_irq[i].name);
|
|
- if (irq < 0) {
|
|
- ret = irq;
|
|
- goto free_irq;
|
|
- }
|
|
+ if (irq < 0)
|
|
+ return irq;
|
|
|
|
- ret = request_threaded_irq(irq, NULL, ab8500_fg_irq[i].isr,
|
|
+ ret = devm_request_threaded_irq(dev, irq, NULL,
|
|
+ ab8500_fg_irq[i].isr,
|
|
IRQF_SHARED | IRQF_NO_SUSPEND | IRQF_ONESHOT,
|
|
ab8500_fg_irq[i].name, di);
|
|
|
|
if (ret != 0) {
|
|
dev_err(dev, "failed to request %s IRQ %d: %d\n",
|
|
ab8500_fg_irq[i].name, irq, ret);
|
|
- goto free_irq;
|
|
+ return ret;
|
|
}
|
|
dev_dbg(dev, "Requested %s IRQ %d: %d\n",
|
|
ab8500_fg_irq[i].name, irq, ret);
|
|
@@ -3168,14 +3177,14 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
ret = ab8500_fg_sysfs_init(di);
|
|
if (ret) {
|
|
dev_err(dev, "failed to create sysfs entry\n");
|
|
- goto free_irq;
|
|
+ return ret;
|
|
}
|
|
|
|
ret = ab8500_fg_sysfs_psy_create_attrs(di);
|
|
if (ret) {
|
|
dev_err(dev, "failed to create FG psy\n");
|
|
ab8500_fg_sysfs_exit(di);
|
|
- goto free_irq;
|
|
+ return ret;
|
|
}
|
|
|
|
/* Calibrate the fg first time */
|
|
@@ -3185,24 +3194,21 @@ static int ab8500_fg_probe(struct platform_device *pdev)
|
|
/* Use room temp as default value until we get an update from driver. */
|
|
di->bat_temp = 210;
|
|
|
|
- /* Run the FG algorithm */
|
|
- queue_delayed_work(di->fg_wq, &di->fg_periodic_work, 0);
|
|
-
|
|
list_add_tail(&di->node, &ab8500_fg_list);
|
|
|
|
- return ret;
|
|
+ return component_add(dev, &ab8500_fg_component_ops);
|
|
+}
|
|
|
|
-free_irq:
|
|
- /* We also have to free all registered irqs */
|
|
- while (--i >= 0) {
|
|
- /* Last assignment of i from primary interrupt handlers */
|
|
- irq = platform_get_irq_byname(pdev, ab8500_fg_irq[i].name);
|
|
- free_irq(irq, di);
|
|
- }
|
|
+static int ab8500_fg_remove(struct platform_device *pdev)
|
|
+{
|
|
+ int ret = 0;
|
|
+ struct ab8500_fg *di = platform_get_drvdata(pdev);
|
|
+
|
|
+ component_del(&pdev->dev, &ab8500_fg_component_ops);
|
|
+ list_del(&di->node);
|
|
+ ab8500_fg_sysfs_exit(di);
|
|
+ ab8500_fg_sysfs_psy_remove_attrs(di);
|
|
|
|
- power_supply_unregister(di->fg_psy);
|
|
-free_inst_curr_wq:
|
|
- destroy_workqueue(di->fg_wq);
|
|
return ret;
|
|
}
|
|
|
|
@@ -3212,8 +3218,9 @@ static const struct of_device_id ab8500_fg_match[] = {
|
|
{ .compatible = "stericsson,ab8500-fg", },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, ab8500_fg_match);
|
|
|
|
-static struct platform_driver ab8500_fg_driver = {
|
|
+struct platform_driver ab8500_fg_driver = {
|
|
.probe = ab8500_fg_probe,
|
|
.remove = ab8500_fg_remove,
|
|
.driver = {
|
|
@@ -3222,20 +3229,6 @@ static struct platform_driver ab8500_fg_driver = {
|
|
.pm = &ab8500_fg_pm_ops,
|
|
},
|
|
};
|
|
-
|
|
-static int __init ab8500_fg_init(void)
|
|
-{
|
|
- return platform_driver_register(&ab8500_fg_driver);
|
|
-}
|
|
-
|
|
-static void __exit ab8500_fg_exit(void)
|
|
-{
|
|
- platform_driver_unregister(&ab8500_fg_driver);
|
|
-}
|
|
-
|
|
-subsys_initcall_sync(ab8500_fg_init);
|
|
-module_exit(ab8500_fg_exit);
|
|
-
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_AUTHOR("Johan Palsson, Karl Komierowski");
|
|
MODULE_ALIAS("platform:ab8500-fg");
|
|
diff --git a/drivers/power/supply/abx500_chargalg.c b/drivers/power/supply/abx500_chargalg.c
|
|
index f5b792243727d..599684ce0e4b0 100644
|
|
--- a/drivers/power/supply/abx500_chargalg.c
|
|
+++ b/drivers/power/supply/abx500_chargalg.c
|
|
@@ -15,6 +15,7 @@
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/device.h>
|
|
+#include <linux/component.h>
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/delay.h>
|
|
@@ -1943,13 +1944,44 @@ static int __maybe_unused abx500_chargalg_suspend(struct device *dev)
|
|
return 0;
|
|
}
|
|
|
|
-static int abx500_chargalg_remove(struct platform_device *pdev)
|
|
+static char *supply_interface[] = {
|
|
+ "ab8500_fg",
|
|
+};
|
|
+
|
|
+static const struct power_supply_desc abx500_chargalg_desc = {
|
|
+ .name = "abx500_chargalg",
|
|
+ .type = POWER_SUPPLY_TYPE_BATTERY,
|
|
+ .properties = abx500_chargalg_props,
|
|
+ .num_properties = ARRAY_SIZE(abx500_chargalg_props),
|
|
+ .get_property = abx500_chargalg_get_property,
|
|
+ .external_power_changed = abx500_chargalg_external_power_changed,
|
|
+};
|
|
+
|
|
+static int abx500_chargalg_bind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
{
|
|
- struct abx500_chargalg *di = platform_get_drvdata(pdev);
|
|
+ struct abx500_chargalg *di = dev_get_drvdata(dev);
|
|
|
|
- /* sysfs interface to enable/disbale charging from user space */
|
|
- abx500_chargalg_sysfs_exit(di);
|
|
+ /* Create a work queue for the chargalg */
|
|
+ di->chargalg_wq = alloc_ordered_workqueue("abx500_chargalg_wq",
|
|
+ WQ_MEM_RECLAIM);
|
|
+ if (di->chargalg_wq == NULL) {
|
|
+ dev_err(di->dev, "failed to create work queue\n");
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ /* Run the charging algorithm */
|
|
+ queue_delayed_work(di->chargalg_wq, &di->chargalg_periodic_work, 0);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
|
|
+static void abx500_chargalg_unbind(struct device *dev, struct device *master,
|
|
+ void *data)
|
|
+{
|
|
+ struct abx500_chargalg *di = dev_get_drvdata(dev);
|
|
+
|
|
+ /* Stop all timers and work */
|
|
hrtimer_cancel(&di->safety_timer);
|
|
hrtimer_cancel(&di->maintenance_timer);
|
|
|
|
@@ -1959,48 +1991,36 @@ static int abx500_chargalg_remove(struct platform_device *pdev)
|
|
|
|
/* Delete the work queue */
|
|
destroy_workqueue(di->chargalg_wq);
|
|
-
|
|
- power_supply_unregister(di->chargalg_psy);
|
|
-
|
|
- return 0;
|
|
+ flush_scheduled_work();
|
|
}
|
|
|
|
-static char *supply_interface[] = {
|
|
- "ab8500_fg",
|
|
-};
|
|
-
|
|
-static const struct power_supply_desc abx500_chargalg_desc = {
|
|
- .name = "abx500_chargalg",
|
|
- .type = POWER_SUPPLY_TYPE_BATTERY,
|
|
- .properties = abx500_chargalg_props,
|
|
- .num_properties = ARRAY_SIZE(abx500_chargalg_props),
|
|
- .get_property = abx500_chargalg_get_property,
|
|
- .external_power_changed = abx500_chargalg_external_power_changed,
|
|
+static const struct component_ops abx500_chargalg_component_ops = {
|
|
+ .bind = abx500_chargalg_bind,
|
|
+ .unbind = abx500_chargalg_unbind,
|
|
};
|
|
|
|
static int abx500_chargalg_probe(struct platform_device *pdev)
|
|
{
|
|
- struct device_node *np = pdev->dev.of_node;
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct device_node *np = dev->of_node;
|
|
struct power_supply_config psy_cfg = {};
|
|
struct abx500_chargalg *di;
|
|
int ret = 0;
|
|
|
|
- di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL);
|
|
- if (!di) {
|
|
- dev_err(&pdev->dev, "%s no mem for ab8500_chargalg\n", __func__);
|
|
+ di = devm_kzalloc(dev, sizeof(*di), GFP_KERNEL);
|
|
+ if (!di)
|
|
return -ENOMEM;
|
|
- }
|
|
|
|
di->bm = &ab8500_bm_data;
|
|
|
|
- ret = ab8500_bm_of_probe(&pdev->dev, np, di->bm);
|
|
+ ret = ab8500_bm_of_probe(dev, np, di->bm);
|
|
if (ret) {
|
|
- dev_err(&pdev->dev, "failed to get battery information\n");
|
|
+ dev_err(dev, "failed to get battery information\n");
|
|
return ret;
|
|
}
|
|
|
|
/* get device struct and parent */
|
|
- di->dev = &pdev->dev;
|
|
+ di->dev = dev;
|
|
di->parent = dev_get_drvdata(pdev->dev.parent);
|
|
|
|
psy_cfg.supplied_to = supply_interface;
|
|
@@ -2016,14 +2036,6 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
|
|
di->maintenance_timer.function =
|
|
abx500_chargalg_maintenance_timer_expired;
|
|
|
|
- /* Create a work queue for the chargalg */
|
|
- di->chargalg_wq = alloc_ordered_workqueue("abx500_chargalg_wq",
|
|
- WQ_MEM_RECLAIM);
|
|
- if (di->chargalg_wq == NULL) {
|
|
- dev_err(di->dev, "failed to create work queue\n");
|
|
- return -ENOMEM;
|
|
- }
|
|
-
|
|
/* Init work for chargalg */
|
|
INIT_DEFERRABLE_WORK(&di->chargalg_periodic_work,
|
|
abx500_chargalg_periodic_work);
|
|
@@ -2037,12 +2049,12 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
|
|
di->chg_info.prev_conn_chg = -1;
|
|
|
|
/* Register chargalg power supply class */
|
|
- di->chargalg_psy = power_supply_register(di->dev, &abx500_chargalg_desc,
|
|
+ di->chargalg_psy = devm_power_supply_register(di->dev,
|
|
+ &abx500_chargalg_desc,
|
|
&psy_cfg);
|
|
if (IS_ERR(di->chargalg_psy)) {
|
|
dev_err(di->dev, "failed to register chargalg psy\n");
|
|
- ret = PTR_ERR(di->chargalg_psy);
|
|
- goto free_chargalg_wq;
|
|
+ return PTR_ERR(di->chargalg_psy);
|
|
}
|
|
|
|
platform_set_drvdata(pdev, di);
|
|
@@ -2051,21 +2063,24 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
|
|
ret = abx500_chargalg_sysfs_init(di);
|
|
if (ret) {
|
|
dev_err(di->dev, "failed to create sysfs entry\n");
|
|
- goto free_psy;
|
|
+ return ret;
|
|
}
|
|
di->curr_status.curr_step = CHARGALG_CURR_STEP_HIGH;
|
|
|
|
- /* Run the charging algorithm */
|
|
- queue_delayed_work(di->chargalg_wq, &di->chargalg_periodic_work, 0);
|
|
-
|
|
dev_info(di->dev, "probe success\n");
|
|
- return ret;
|
|
+ return component_add(dev, &abx500_chargalg_component_ops);
|
|
+}
|
|
|
|
-free_psy:
|
|
- power_supply_unregister(di->chargalg_psy);
|
|
-free_chargalg_wq:
|
|
- destroy_workqueue(di->chargalg_wq);
|
|
- return ret;
|
|
+static int abx500_chargalg_remove(struct platform_device *pdev)
|
|
+{
|
|
+ struct abx500_chargalg *di = platform_get_drvdata(pdev);
|
|
+
|
|
+ component_del(&pdev->dev, &abx500_chargalg_component_ops);
|
|
+
|
|
+ /* sysfs interface to enable/disable charging from user space */
|
|
+ abx500_chargalg_sysfs_exit(di);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static SIMPLE_DEV_PM_OPS(abx500_chargalg_pm_ops, abx500_chargalg_suspend, abx500_chargalg_resume);
|
|
@@ -2075,7 +2090,7 @@ static const struct of_device_id ab8500_chargalg_match[] = {
|
|
{ },
|
|
};
|
|
|
|
-static struct platform_driver abx500_chargalg_driver = {
|
|
+struct platform_driver abx500_chargalg_driver = {
|
|
.probe = abx500_chargalg_probe,
|
|
.remove = abx500_chargalg_remove,
|
|
.driver = {
|
|
@@ -2084,9 +2099,6 @@ static struct platform_driver abx500_chargalg_driver = {
|
|
.pm = &abx500_chargalg_pm_ops,
|
|
},
|
|
};
|
|
-
|
|
-module_platform_driver(abx500_chargalg_driver);
|
|
-
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_AUTHOR("Johan Palsson, Karl Komierowski");
|
|
MODULE_ALIAS("platform:abx500-chargalg");
|
|
diff --git a/drivers/power/supply/axp288_fuel_gauge.c b/drivers/power/supply/axp288_fuel_gauge.c
|
|
index 39e16ecb76386..37af0e216bc3a 100644
|
|
--- a/drivers/power/supply/axp288_fuel_gauge.c
|
|
+++ b/drivers/power/supply/axp288_fuel_gauge.c
|
|
@@ -723,15 +723,6 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "MEEGOPAD T02"),
|
|
},
|
|
},
|
|
- {
|
|
- /* Meegopad T08 */
|
|
- .matches = {
|
|
- DMI_MATCH(DMI_SYS_VENDOR, "Default string"),
|
|
- DMI_MATCH(DMI_BOARD_VENDOR, "To be filled by OEM."),
|
|
- DMI_MATCH(DMI_BOARD_NAME, "T3 MRD"),
|
|
- DMI_MATCH(DMI_BOARD_VERSION, "V1.1"),
|
|
- },
|
|
- },
|
|
{ /* Mele PCG03 Mini PC */
|
|
.matches = {
|
|
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Mini PC"),
|
|
@@ -745,6 +736,15 @@ static const struct dmi_system_id axp288_fuel_gauge_blacklist[] = {
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
|
|
}
|
|
},
|
|
+ {
|
|
+ /* Various Ace PC/Meegopad/MinisForum/Wintel Mini-PCs/HDMI-sticks */
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BOARD_NAME, "T3 MRD"),
|
|
+ DMI_MATCH(DMI_CHASSIS_TYPE, "3"),
|
|
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
|
+ DMI_MATCH(DMI_BIOS_VERSION, "5.11"),
|
|
+ },
|
|
+ },
|
|
{}
|
|
};
|
|
|
|
diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
|
|
index 45da870aecca4..d67edb760c948 100644
|
|
--- a/drivers/power/supply/charger-manager.c
|
|
+++ b/drivers/power/supply/charger-manager.c
|
|
@@ -1279,6 +1279,7 @@ static const struct of_device_id charger_manager_match[] = {
|
|
},
|
|
{},
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, charger_manager_match);
|
|
|
|
static struct charger_desc *of_cm_parse_desc(struct device *dev)
|
|
{
|
|
diff --git a/drivers/power/supply/max17040_battery.c b/drivers/power/supply/max17040_battery.c
|
|
index 1aab868adabf7..e80dd9141ae72 100644
|
|
--- a/drivers/power/supply/max17040_battery.c
|
|
+++ b/drivers/power/supply/max17040_battery.c
|
|
@@ -361,12 +361,10 @@ static irqreturn_t max17040_thread_handler(int id, void *dev)
|
|
static int max17040_enable_alert_irq(struct max17040_chip *chip)
|
|
{
|
|
struct i2c_client *client = chip->client;
|
|
- unsigned int flags;
|
|
int ret;
|
|
|
|
- flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
|
|
ret = devm_request_threaded_irq(&client->dev, client->irq, NULL,
|
|
- max17040_thread_handler, flags,
|
|
+ max17040_thread_handler, IRQF_ONESHOT,
|
|
chip->battery->desc->name, chip);
|
|
|
|
return ret;
|
|
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
|
|
index 1d7326cd8fc63..ce2041b30a066 100644
|
|
--- a/drivers/power/supply/max17042_battery.c
|
|
+++ b/drivers/power/supply/max17042_battery.c
|
|
@@ -1104,7 +1104,7 @@ static int max17042_probe(struct i2c_client *client,
|
|
}
|
|
|
|
if (client->irq) {
|
|
- unsigned int flags = IRQF_TRIGGER_FALLING | IRQF_ONESHOT;
|
|
+ unsigned int flags = IRQF_ONESHOT;
|
|
|
|
/*
|
|
* On ACPI systems the IRQ may be handled by ACPI-event code,
|
|
diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c
|
|
index f330452341f02..9ad0afe83d1b7 100644
|
|
--- a/drivers/power/supply/rt5033_battery.c
|
|
+++ b/drivers/power/supply/rt5033_battery.c
|
|
@@ -164,9 +164,16 @@ static const struct i2c_device_id rt5033_battery_id[] = {
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, rt5033_battery_id);
|
|
|
|
+static const struct of_device_id rt5033_battery_of_match[] = {
|
|
+ { .compatible = "richtek,rt5033-battery", },
|
|
+ { }
|
|
+};
|
|
+MODULE_DEVICE_TABLE(of, rt5033_battery_of_match);
|
|
+
|
|
static struct i2c_driver rt5033_battery_driver = {
|
|
.driver = {
|
|
.name = "rt5033-battery",
|
|
+ .of_match_table = rt5033_battery_of_match,
|
|
},
|
|
.probe = rt5033_battery_probe,
|
|
.remove = rt5033_battery_remove,
|
|
diff --git a/drivers/power/supply/sc2731_charger.c b/drivers/power/supply/sc2731_charger.c
|
|
index 335cb857ef307..288b79836c139 100644
|
|
--- a/drivers/power/supply/sc2731_charger.c
|
|
+++ b/drivers/power/supply/sc2731_charger.c
|
|
@@ -524,6 +524,7 @@ static const struct of_device_id sc2731_charger_of_match[] = {
|
|
{ .compatible = "sprd,sc2731-charger", },
|
|
{ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, sc2731_charger_of_match);
|
|
|
|
static struct platform_driver sc2731_charger_driver = {
|
|
.driver = {
|
|
diff --git a/drivers/power/supply/sc27xx_fuel_gauge.c b/drivers/power/supply/sc27xx_fuel_gauge.c
|
|
index 9c627618c2249..1ae8374e1cebe 100644
|
|
--- a/drivers/power/supply/sc27xx_fuel_gauge.c
|
|
+++ b/drivers/power/supply/sc27xx_fuel_gauge.c
|
|
@@ -1342,6 +1342,7 @@ static const struct of_device_id sc27xx_fgu_of_match[] = {
|
|
{ .compatible = "sprd,sc2731-fgu", },
|
|
{ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, sc27xx_fgu_of_match);
|
|
|
|
static struct platform_driver sc27xx_fgu_driver = {
|
|
.probe = sc27xx_fgu_probe,
|
|
diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c
|
|
index 7efa431a62b2e..5ec2e6bb2465c 100644
|
|
--- a/drivers/power/supply/surface_battery.c
|
|
+++ b/drivers/power/supply/surface_battery.c
|
|
@@ -345,6 +345,16 @@ static u32 spwr_notify_bat(struct ssam_event_notifier *nf, const struct ssam_eve
|
|
struct spwr_battery_device *bat = container_of(nf, struct spwr_battery_device, notif);
|
|
int status;
|
|
|
|
+ /*
|
|
+ * We cannot use strict matching when registering the notifier as the
|
|
+ * EC expects us to register it against instance ID 0. Strict matching
|
|
+ * would thus drop events, as those may have non-zero instance IDs in
|
|
+ * this subsystem. So we need to check the instance ID of the event
|
|
+ * here manually.
|
|
+ */
|
|
+ if (event->instance_id != bat->sdev->uid.instance)
|
|
+ return 0;
|
|
+
|
|
dev_dbg(&bat->sdev->dev, "power event (cid = %#04x, iid = %#04x, tid = %#04x)\n",
|
|
event->command_id, event->instance_id, event->target_id);
|
|
|
|
@@ -720,8 +730,8 @@ static void spwr_battery_init(struct spwr_battery_device *bat, struct ssam_devic
|
|
bat->notif.base.fn = spwr_notify_bat;
|
|
bat->notif.event.reg = registry;
|
|
bat->notif.event.id.target_category = sdev->uid.category;
|
|
- bat->notif.event.id.instance = 0;
|
|
- bat->notif.event.mask = SSAM_EVENT_MASK_STRICT;
|
|
+ bat->notif.event.id.instance = 0; /* need to register with instance 0 */
|
|
+ bat->notif.event.mask = SSAM_EVENT_MASK_TARGET;
|
|
bat->notif.event.flags = SSAM_EVENT_SEQUENCED;
|
|
|
|
bat->psy_desc.name = bat->name;
|
|
diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
|
|
index 81a5b79822c9b..a060c36c7766f 100644
|
|
--- a/drivers/power/supply/surface_charger.c
|
|
+++ b/drivers/power/supply/surface_charger.c
|
|
@@ -66,7 +66,7 @@ struct spwr_ac_device {
|
|
|
|
static int spwr_ac_update_unlocked(struct spwr_ac_device *ac)
|
|
{
|
|
- u32 old = ac->state;
|
|
+ __le32 old = ac->state;
|
|
int status;
|
|
|
|
lockdep_assert_held(&ac->lock);
|
|
diff --git a/drivers/pwm/pwm-img.c b/drivers/pwm/pwm-img.c
|
|
index cc37054589ccf..11b16ecc4f967 100644
|
|
--- a/drivers/pwm/pwm-img.c
|
|
+++ b/drivers/pwm/pwm-img.c
|
|
@@ -156,7 +156,7 @@ static int img_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
|
|
struct img_pwm_chip *pwm_chip = to_img_pwm_chip(chip);
|
|
int ret;
|
|
|
|
- ret = pm_runtime_get_sync(chip->dev);
|
|
+ ret = pm_runtime_resume_and_get(chip->dev);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
diff --git a/drivers/pwm/pwm-imx1.c b/drivers/pwm/pwm-imx1.c
|
|
index c957b365448ee..e73858a8e464c 100644
|
|
--- a/drivers/pwm/pwm-imx1.c
|
|
+++ b/drivers/pwm/pwm-imx1.c
|
|
@@ -168,8 +168,6 @@ static int pwm_imx1_remove(struct platform_device *pdev)
|
|
{
|
|
struct pwm_imx1_chip *imx = platform_get_drvdata(pdev);
|
|
|
|
- pwm_imx1_clk_disable_unprepare(&imx->chip);
|
|
-
|
|
return pwmchip_remove(&imx->chip);
|
|
}
|
|
|
|
diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
|
|
index 7c9f174de64ee..ec9f93006654e 100644
|
|
--- a/drivers/pwm/pwm-pca9685.c
|
|
+++ b/drivers/pwm/pwm-pca9685.c
|
|
@@ -23,11 +23,11 @@
|
|
#include <linux/bitmap.h>
|
|
|
|
/*
|
|
- * Because the PCA9685 has only one prescaler per chip, changing the period of
|
|
- * one channel affects the period of all 16 PWM outputs!
|
|
- * However, the ratio between each configured duty cycle and the chip-wide
|
|
- * period remains constant, because the OFF time is set in proportion to the
|
|
- * counter range.
|
|
+ * Because the PCA9685 has only one prescaler per chip, only the first channel
|
|
+ * that is enabled is allowed to change the prescale register.
|
|
+ * PWM channels requested afterwards must use a period that results in the same
|
|
+ * prescale setting as the one set by the first requested channel.
|
|
+ * GPIOs do not count as enabled PWMs as they are not using the prescaler.
|
|
*/
|
|
|
|
#define PCA9685_MODE1 0x00
|
|
@@ -78,8 +78,9 @@
|
|
struct pca9685 {
|
|
struct pwm_chip chip;
|
|
struct regmap *regmap;
|
|
-#if IS_ENABLED(CONFIG_GPIOLIB)
|
|
struct mutex lock;
|
|
+ DECLARE_BITMAP(pwms_enabled, PCA9685_MAXCHAN + 1);
|
|
+#if IS_ENABLED(CONFIG_GPIOLIB)
|
|
struct gpio_chip gpio;
|
|
DECLARE_BITMAP(pwms_inuse, PCA9685_MAXCHAN + 1);
|
|
#endif
|
|
@@ -90,6 +91,22 @@ static inline struct pca9685 *to_pca(struct pwm_chip *chip)
|
|
return container_of(chip, struct pca9685, chip);
|
|
}
|
|
|
|
+/* This function is supposed to be called with the lock mutex held */
|
|
+static bool pca9685_prescaler_can_change(struct pca9685 *pca, int channel)
|
|
+{
|
|
+ /* No PWM enabled: Change allowed */
|
|
+ if (bitmap_empty(pca->pwms_enabled, PCA9685_MAXCHAN + 1))
|
|
+ return true;
|
|
+ /* More than one PWM enabled: Change not allowed */
|
|
+ if (bitmap_weight(pca->pwms_enabled, PCA9685_MAXCHAN + 1) > 1)
|
|
+ return false;
|
|
+ /*
|
|
+ * Only one PWM enabled: Change allowed if the PWM about to
|
|
+ * be changed is the one that is already enabled
|
|
+ */
|
|
+ return test_bit(channel, pca->pwms_enabled);
|
|
+}
|
|
+
|
|
/* Helper function to set the duty cycle ratio to duty/4096 (e.g. duty=2048 -> 50%) */
|
|
static void pca9685_pwm_set_duty(struct pca9685 *pca, int channel, unsigned int duty)
|
|
{
|
|
@@ -240,8 +257,6 @@ static int pca9685_pwm_gpio_probe(struct pca9685 *pca)
|
|
{
|
|
struct device *dev = pca->chip.dev;
|
|
|
|
- mutex_init(&pca->lock);
|
|
-
|
|
pca->gpio.label = dev_name(dev);
|
|
pca->gpio.parent = dev;
|
|
pca->gpio.request = pca9685_pwm_gpio_request;
|
|
@@ -285,8 +300,8 @@ static void pca9685_set_sleep_mode(struct pca9685 *pca, bool enable)
|
|
}
|
|
}
|
|
|
|
-static int pca9685_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
- const struct pwm_state *state)
|
|
+static int __pca9685_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
+ const struct pwm_state *state)
|
|
{
|
|
struct pca9685 *pca = to_pca(chip);
|
|
unsigned long long duty, prescale;
|
|
@@ -309,6 +324,12 @@ static int pca9685_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
|
|
regmap_read(pca->regmap, PCA9685_PRESCALE, &val);
|
|
if (prescale != val) {
|
|
+ if (!pca9685_prescaler_can_change(pca, pwm->hwpwm)) {
|
|
+ dev_err(chip->dev,
|
|
+ "pwm not changed: periods of enabled pwms must match!\n");
|
|
+ return -EBUSY;
|
|
+ }
|
|
+
|
|
/*
|
|
* Putting the chip briefly into SLEEP mode
|
|
* at this point won't interfere with the
|
|
@@ -331,6 +352,25 @@ static int pca9685_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
return 0;
|
|
}
|
|
|
|
+static int pca9685_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
+ const struct pwm_state *state)
|
|
+{
|
|
+ struct pca9685 *pca = to_pca(chip);
|
|
+ int ret;
|
|
+
|
|
+ mutex_lock(&pca->lock);
|
|
+ ret = __pca9685_pwm_apply(chip, pwm, state);
|
|
+ if (ret == 0) {
|
|
+ if (state->enabled)
|
|
+ set_bit(pwm->hwpwm, pca->pwms_enabled);
|
|
+ else
|
|
+ clear_bit(pwm->hwpwm, pca->pwms_enabled);
|
|
+ }
|
|
+ mutex_unlock(&pca->lock);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static void pca9685_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
struct pwm_state *state)
|
|
{
|
|
@@ -372,6 +412,14 @@ static int pca9685_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
|
|
|
|
if (pca9685_pwm_test_and_set_inuse(pca, pwm->hwpwm))
|
|
return -EBUSY;
|
|
+
|
|
+ if (pwm->hwpwm < PCA9685_MAXCHAN) {
|
|
+ /* PWMs - except the "all LEDs" channel - default to enabled */
|
|
+ mutex_lock(&pca->lock);
|
|
+ set_bit(pwm->hwpwm, pca->pwms_enabled);
|
|
+ mutex_unlock(&pca->lock);
|
|
+ }
|
|
+
|
|
pm_runtime_get_sync(chip->dev);
|
|
|
|
return 0;
|
|
@@ -381,7 +429,11 @@ static void pca9685_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
|
|
{
|
|
struct pca9685 *pca = to_pca(chip);
|
|
|
|
+ mutex_lock(&pca->lock);
|
|
pca9685_pwm_set_duty(pca, pwm->hwpwm, 0);
|
|
+ clear_bit(pwm->hwpwm, pca->pwms_enabled);
|
|
+ mutex_unlock(&pca->lock);
|
|
+
|
|
pm_runtime_put(chip->dev);
|
|
pca9685_pwm_clear_inuse(pca, pwm->hwpwm);
|
|
}
|
|
@@ -422,6 +474,8 @@ static int pca9685_pwm_probe(struct i2c_client *client,
|
|
|
|
i2c_set_clientdata(client, pca);
|
|
|
|
+ mutex_init(&pca->lock);
|
|
+
|
|
regmap_read(pca->regmap, PCA9685_MODE2, ®);
|
|
|
|
if (device_property_read_bool(&client->dev, "invert"))
|
|
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c
|
|
index 1a1cedfd11ce2..6879b49581b34 100644
|
|
--- a/drivers/pwm/pwm-spear.c
|
|
+++ b/drivers/pwm/pwm-spear.c
|
|
@@ -228,10 +228,6 @@ static int spear_pwm_probe(struct platform_device *pdev)
|
|
static int spear_pwm_remove(struct platform_device *pdev)
|
|
{
|
|
struct spear_pwm_chip *pc = platform_get_drvdata(pdev);
|
|
- int i;
|
|
-
|
|
- for (i = 0; i < NUM_PWM; i++)
|
|
- pwm_disable(&pc->chip.pwms[i]);
|
|
|
|
/* clk was prepared in probe, hence unprepare it here */
|
|
clk_unprepare(pc->clk);
|
|
diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
|
|
index c529a170bcdd1..5509ce0d54326 100644
|
|
--- a/drivers/pwm/pwm-tegra.c
|
|
+++ b/drivers/pwm/pwm-tegra.c
|
|
@@ -300,7 +300,6 @@ static int tegra_pwm_probe(struct platform_device *pdev)
|
|
static int tegra_pwm_remove(struct platform_device *pdev)
|
|
{
|
|
struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);
|
|
- unsigned int i;
|
|
int err;
|
|
|
|
if (WARN_ON(!pc))
|
|
@@ -310,18 +309,6 @@ static int tegra_pwm_remove(struct platform_device *pdev)
|
|
if (err < 0)
|
|
return err;
|
|
|
|
- for (i = 0; i < pc->chip.npwm; i++) {
|
|
- struct pwm_device *pwm = &pc->chip.pwms[i];
|
|
-
|
|
- if (!pwm_is_enabled(pwm))
|
|
- if (clk_prepare_enable(pc->clk) < 0)
|
|
- continue;
|
|
-
|
|
- pwm_writel(pc, i, 0);
|
|
-
|
|
- clk_disable_unprepare(pc->clk);
|
|
- }
|
|
-
|
|
reset_control_assert(pc->rst);
|
|
clk_disable_unprepare(pc->clk);
|
|
|
|
diff --git a/drivers/pwm/pwm-visconti.c b/drivers/pwm/pwm-visconti.c
|
|
index 46d9037863661..af4e37d3e3a67 100644
|
|
--- a/drivers/pwm/pwm-visconti.c
|
|
+++ b/drivers/pwm/pwm-visconti.c
|
|
@@ -82,17 +82,14 @@ static int visconti_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
|
|
return -ERANGE;
|
|
|
|
/*
|
|
- * PWMC controls a divider that divides the input clk by a
|
|
- * power of two between 1 and 8. As a smaller divider yields
|
|
- * higher precision, pick the smallest possible one.
|
|
+ * PWMC controls a divider that divides the input clk by a power of two
|
|
+ * between 1 and 8. As a smaller divider yields higher precision, pick
|
|
+ * the smallest possible one. As period is at most 0xffff << 3, pwmc0 is
|
|
+ * in the intended range [0..3].
|
|
*/
|
|
- if (period > 0xffff) {
|
|
- pwmc0 = ilog2(period >> 16);
|
|
- if (WARN_ON(pwmc0 > 3))
|
|
- return -EINVAL;
|
|
- } else {
|
|
- pwmc0 = 0;
|
|
- }
|
|
+ pwmc0 = fls(period >> 16);
|
|
+ if (WARN_ON(pwmc0 > 3))
|
|
+ return -EINVAL;
|
|
|
|
period >>= pwmc0;
|
|
duty_cycle >>= pwmc0;
|
|
diff --git a/drivers/remoteproc/remoteproc_cdev.c b/drivers/remoteproc/remoteproc_cdev.c
|
|
index 0b8a84c04f766..4ad98b0b8caa5 100644
|
|
--- a/drivers/remoteproc/remoteproc_cdev.c
|
|
+++ b/drivers/remoteproc/remoteproc_cdev.c
|
|
@@ -124,7 +124,7 @@ int rproc_char_device_add(struct rproc *rproc)
|
|
|
|
void rproc_char_device_remove(struct rproc *rproc)
|
|
{
|
|
- __unregister_chrdev(MAJOR(rproc->dev.devt), rproc->index, 1, "remoteproc");
|
|
+ cdev_del(&rproc->cdev);
|
|
}
|
|
|
|
void __init rproc_init_cdev(void)
|
|
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
|
|
index 626a6b90fba2c..203e2bd8ebb4f 100644
|
|
--- a/drivers/remoteproc/remoteproc_core.c
|
|
+++ b/drivers/remoteproc/remoteproc_core.c
|
|
@@ -2602,7 +2602,6 @@ int rproc_del(struct rproc *rproc)
|
|
mutex_unlock(&rproc->lock);
|
|
|
|
rproc_delete_debug_dir(rproc);
|
|
- rproc_char_device_remove(rproc);
|
|
|
|
/* the rproc is downref'ed as soon as it's removed from the klist */
|
|
mutex_lock(&rproc_list_mutex);
|
|
@@ -2613,6 +2612,7 @@ int rproc_del(struct rproc *rproc)
|
|
synchronize_rcu();
|
|
|
|
device_del(&rproc->dev);
|
|
+ rproc_char_device_remove(rproc);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
|
|
index 7353f9e7e7afe..b643efcf995a1 100644
|
|
--- a/drivers/remoteproc/stm32_rproc.c
|
|
+++ b/drivers/remoteproc/stm32_rproc.c
|
|
@@ -474,14 +474,12 @@ static int stm32_rproc_attach(struct rproc *rproc)
|
|
static int stm32_rproc_detach(struct rproc *rproc)
|
|
{
|
|
struct stm32_rproc *ddata = rproc->priv;
|
|
- int err, dummy_data, idx;
|
|
+ int err, idx;
|
|
|
|
/* Inform the remote processor of the detach */
|
|
idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_DETACH);
|
|
if (idx >= 0 && ddata->mb[idx].chan) {
|
|
- /* A dummy data is sent to allow to block on transmit */
|
|
- err = mbox_send_message(ddata->mb[idx].chan,
|
|
- &dummy_data);
|
|
+ err = mbox_send_message(ddata->mb[idx].chan, "stop");
|
|
if (err < 0)
|
|
dev_warn(&rproc->dev, "warning: remote FW detach without ack\n");
|
|
}
|
|
@@ -493,15 +491,13 @@ static int stm32_rproc_detach(struct rproc *rproc)
|
|
static int stm32_rproc_stop(struct rproc *rproc)
|
|
{
|
|
struct stm32_rproc *ddata = rproc->priv;
|
|
- int err, dummy_data, idx;
|
|
+ int err, idx;
|
|
|
|
/* request shutdown of the remote processor */
|
|
if (rproc->state != RPROC_OFFLINE) {
|
|
idx = stm32_rproc_mbox_idx(rproc, STM32_MBX_SHUTDOWN);
|
|
if (idx >= 0 && ddata->mb[idx].chan) {
|
|
- /* a dummy data is sent to allow to block on transmit */
|
|
- err = mbox_send_message(ddata->mb[idx].chan,
|
|
- &dummy_data);
|
|
+ err = mbox_send_message(ddata->mb[idx].chan, "detach");
|
|
if (err < 0)
|
|
dev_warn(&rproc->dev, "warning: remote FW shutdown without ack\n");
|
|
}
|
|
@@ -556,7 +552,7 @@ static void stm32_rproc_kick(struct rproc *rproc, int vqid)
|
|
continue;
|
|
if (!ddata->mb[i].chan)
|
|
return;
|
|
- err = mbox_send_message(ddata->mb[i].chan, (void *)(long)vqid);
|
|
+ err = mbox_send_message(ddata->mb[i].chan, "kick");
|
|
if (err < 0)
|
|
dev_err(&rproc->dev, "%s: failed (%s, err:%d)\n",
|
|
__func__, ddata->mb[i].name, err);
|
|
@@ -580,7 +576,7 @@ static int stm32_rproc_da_to_pa(struct rproc *rproc,
|
|
continue;
|
|
|
|
*pa = da - p_mem->dev_addr + p_mem->bus_addr;
|
|
- dev_dbg(dev, "da %llx to pa %#x\n", da, *pa);
|
|
+ dev_dbg(dev, "da %llx to pa %pap\n", da, pa);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/ti_k3_r5_remoteproc.c
|
|
index 5cf8d030a1f0f..4104e4846dbff 100644
|
|
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
|
|
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
|
|
@@ -1272,9 +1272,9 @@ static int k3_r5_core_of_init(struct platform_device *pdev)
|
|
|
|
core->tsp = k3_r5_core_of_get_tsp(dev, core->ti_sci);
|
|
if (IS_ERR(core->tsp)) {
|
|
+ ret = PTR_ERR(core->tsp);
|
|
dev_err(dev, "failed to construct ti-sci proc control, ret = %d\n",
|
|
ret);
|
|
- ret = PTR_ERR(core->tsp);
|
|
goto err;
|
|
}
|
|
|
|
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
|
|
index 3e7f55e44d849..bc8e90c8be529 100644
|
|
--- a/drivers/reset/Kconfig
|
|
+++ b/drivers/reset/Kconfig
|
|
@@ -59,7 +59,8 @@ config RESET_BRCMSTB
|
|
config RESET_BRCMSTB_RESCAL
|
|
bool "Broadcom STB RESCAL reset controller"
|
|
depends on HAS_IOMEM
|
|
- default ARCH_BRCMSTB || COMPILE_TEST
|
|
+ depends on ARCH_BRCMSTB || COMPILE_TEST
|
|
+ default ARCH_BRCMSTB
|
|
help
|
|
This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on
|
|
BCM7216.
|
|
@@ -82,6 +83,7 @@ config RESET_IMX7
|
|
|
|
config RESET_INTEL_GW
|
|
bool "Intel Reset Controller Driver"
|
|
+ depends on X86 || COMPILE_TEST
|
|
depends on OF && HAS_IOMEM
|
|
select REGMAP_MMIO
|
|
help
|
|
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
|
|
index 71c1c8264b2db..e2a6a927b84ce 100644
|
|
--- a/drivers/reset/core.c
|
|
+++ b/drivers/reset/core.c
|
|
@@ -774,7 +774,10 @@ static struct reset_control *__reset_control_get_internal(
|
|
if (!rstc)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
- try_module_get(rcdev->owner);
|
|
+ if (!try_module_get(rcdev->owner)) {
|
|
+ kfree(rstc);
|
|
+ return ERR_PTR(-ENODEV);
|
|
+ }
|
|
|
|
rstc->rcdev = rcdev;
|
|
list_add(&rstc->list, &rcdev->reset_control_head);
|
|
diff --git a/drivers/reset/reset-a10sr.c b/drivers/reset/reset-a10sr.c
|
|
index 7eacc89382f8a..99b3bc8382f35 100644
|
|
--- a/drivers/reset/reset-a10sr.c
|
|
+++ b/drivers/reset/reset-a10sr.c
|
|
@@ -118,6 +118,7 @@ static struct platform_driver a10sr_reset_driver = {
|
|
.probe = a10sr_reset_probe,
|
|
.driver = {
|
|
.name = "altr_a10sr_reset",
|
|
+ .of_match_table = a10sr_reset_of_match,
|
|
},
|
|
};
|
|
module_platform_driver(a10sr_reset_driver);
|
|
diff --git a/drivers/reset/reset-brcmstb.c b/drivers/reset/reset-brcmstb.c
|
|
index f213264c8567b..42c9d5241c530 100644
|
|
--- a/drivers/reset/reset-brcmstb.c
|
|
+++ b/drivers/reset/reset-brcmstb.c
|
|
@@ -111,6 +111,7 @@ static const struct of_device_id brcmstb_reset_of_match[] = {
|
|
{ .compatible = "brcm,brcmstb-reset" },
|
|
{ /* sentinel */ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, brcmstb_reset_of_match);
|
|
|
|
static struct platform_driver brcmstb_reset_driver = {
|
|
.probe = brcmstb_reset_probe,
|
|
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
|
|
index d8c13fded164f..914497abeef91 100644
|
|
--- a/drivers/rtc/Kconfig
|
|
+++ b/drivers/rtc/Kconfig
|
|
@@ -502,7 +502,8 @@ config RTC_DRV_M41T80_WDT
|
|
|
|
config RTC_DRV_BD70528
|
|
tristate "ROHM BD70528, BD71815 and BD71828 PMIC RTC"
|
|
- depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528 && (BD70528_WATCHDOG || !BD70528_WATCHDOG)
|
|
+ depends on MFD_ROHM_BD71828 || MFD_ROHM_BD70528
|
|
+ depends on BD70528_WATCHDOG || !BD70528_WATCHDOG
|
|
help
|
|
If you say Y here you will get support for the RTC
|
|
block on ROHM BD70528, BD71815 and BD71828 Power Management IC.
|
|
diff --git a/drivers/rtc/proc.c b/drivers/rtc/proc.c
|
|
index 73344598fc1be..cbcdbb19d848e 100644
|
|
--- a/drivers/rtc/proc.c
|
|
+++ b/drivers/rtc/proc.c
|
|
@@ -23,8 +23,8 @@ static bool is_rtc_hctosys(struct rtc_device *rtc)
|
|
int size;
|
|
char name[NAME_SIZE];
|
|
|
|
- size = scnprintf(name, NAME_SIZE, "rtc%d", rtc->id);
|
|
- if (size > NAME_SIZE)
|
|
+ size = snprintf(name, NAME_SIZE, "rtc%d", rtc->id);
|
|
+ if (size >= NAME_SIZE)
|
|
return false;
|
|
|
|
return !strncmp(name, CONFIG_RTC_HCTOSYS_DEVICE, NAME_SIZE);
|
|
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
|
|
index 7f4445b0f8192..2f96c31e9b7b2 100644
|
|
--- a/drivers/s390/char/sclp_vt220.c
|
|
+++ b/drivers/s390/char/sclp_vt220.c
|
|
@@ -35,8 +35,8 @@
|
|
#define SCLP_VT220_MINOR 65
|
|
#define SCLP_VT220_DRIVER_NAME "sclp_vt220"
|
|
#define SCLP_VT220_DEVICE_NAME "ttysclp"
|
|
-#define SCLP_VT220_CONSOLE_NAME "ttyS"
|
|
-#define SCLP_VT220_CONSOLE_INDEX 1 /* console=ttyS1 */
|
|
+#define SCLP_VT220_CONSOLE_NAME "ttysclp"
|
|
+#define SCLP_VT220_CONSOLE_INDEX 0 /* console=ttysclp0 */
|
|
|
|
/* Representation of a single write request */
|
|
struct sclp_vt220_request {
|
|
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
|
|
index 544efd4c42f02..b8cd75a872eeb 100644
|
|
--- a/drivers/s390/scsi/zfcp_sysfs.c
|
|
+++ b/drivers/s390/scsi/zfcp_sysfs.c
|
|
@@ -487,6 +487,7 @@ static ssize_t zfcp_sysfs_port_fc_security_show(struct device *dev,
|
|
if (0 == (status & ZFCP_STATUS_COMMON_OPEN) ||
|
|
0 == (status & ZFCP_STATUS_COMMON_UNBLOCKED) ||
|
|
0 == (status & ZFCP_STATUS_PORT_PHYS_OPEN) ||
|
|
+ 0 != (status & ZFCP_STATUS_PORT_LINK_TEST) ||
|
|
0 != (status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
|
|
0 != (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))
|
|
i = sprintf(buf, "unknown\n");
|
|
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
index 4b79661275c90..42e494a7106cd 100644
|
|
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
|
|
@@ -1923,8 +1923,12 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
|
|
|
|
if (ccb->arc_cdb_size <= 0x300)
|
|
arc_cdb_size = (ccb->arc_cdb_size - 1) >> 6 | 1;
|
|
- else
|
|
- arc_cdb_size = (((ccb->arc_cdb_size + 0xff) >> 8) + 2) << 1 | 1;
|
|
+ else {
|
|
+ arc_cdb_size = ((ccb->arc_cdb_size + 0xff) >> 8) + 2;
|
|
+ if (arc_cdb_size > 0xF)
|
|
+ arc_cdb_size = 0xF;
|
|
+ arc_cdb_size = (arc_cdb_size << 1) | 1;
|
|
+ }
|
|
ccb_post_stamp = (ccb->smid | arc_cdb_size);
|
|
writel(0, &pmu->inbound_queueport_high);
|
|
writel(ccb_post_stamp, &pmu->inbound_queueport_low);
|
|
@@ -2415,10 +2419,17 @@ static void arcmsr_hbaD_doorbell_isr(struct AdapterControlBlock *pACB)
|
|
|
|
static void arcmsr_hbaE_doorbell_isr(struct AdapterControlBlock *pACB)
|
|
{
|
|
- uint32_t outbound_doorbell, in_doorbell, tmp;
|
|
+ uint32_t outbound_doorbell, in_doorbell, tmp, i;
|
|
struct MessageUnit_E __iomem *reg = pACB->pmuE;
|
|
|
|
- in_doorbell = readl(®->iobound_doorbell);
|
|
+ if (pACB->adapter_type == ACB_ADAPTER_TYPE_F) {
|
|
+ for (i = 0; i < 5; i++) {
|
|
+ in_doorbell = readl(®->iobound_doorbell);
|
|
+ if (in_doorbell != 0)
|
|
+ break;
|
|
+ }
|
|
+ } else
|
|
+ in_doorbell = readl(®->iobound_doorbell);
|
|
outbound_doorbell = in_doorbell ^ pACB->in_doorbell;
|
|
do {
|
|
writel(0, ®->host_int_status); /* clear interrupt */
|
|
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
|
|
index 27c4f1598f765..b98f2f1e782df 100644
|
|
--- a/drivers/scsi/be2iscsi/be_main.c
|
|
+++ b/drivers/scsi/be2iscsi/be_main.c
|
|
@@ -416,7 +416,7 @@ static struct beiscsi_hba *beiscsi_hba_alloc(struct pci_dev *pcidev)
|
|
"beiscsi_hba_alloc - iscsi_host_alloc failed\n");
|
|
return NULL;
|
|
}
|
|
- shost->max_id = BE2_MAX_SESSIONS;
|
|
+ shost->max_id = BE2_MAX_SESSIONS - 1;
|
|
shost->max_channel = 0;
|
|
shost->max_cmd_len = BEISCSI_MAX_CMD_LEN;
|
|
shost->max_lun = BEISCSI_NUM_MAX_LUN;
|
|
@@ -5318,7 +5318,7 @@ static int beiscsi_enable_port(struct beiscsi_hba *phba)
|
|
/* Re-enable UER. If different TPE occurs then it is recoverable. */
|
|
beiscsi_set_uer_feature(phba);
|
|
|
|
- phba->shost->max_id = phba->params.cxns_per_ctrl;
|
|
+ phba->shost->max_id = phba->params.cxns_per_ctrl - 1;
|
|
phba->shost->can_queue = phba->params.ios_per_ctrl;
|
|
ret = beiscsi_init_port(phba);
|
|
if (ret < 0) {
|
|
@@ -5745,6 +5745,7 @@ free_hba:
|
|
pci_disable_msix(phba->pcidev);
|
|
pci_dev_put(phba->pcidev);
|
|
iscsi_host_free(phba->shost);
|
|
+ pci_disable_pcie_error_reporting(pcidev);
|
|
pci_set_drvdata(pcidev, NULL);
|
|
disable_pci:
|
|
pci_release_regions(pcidev);
|
|
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
|
|
index 2ad85c6b99fd2..8cf2f9a7cfdc2 100644
|
|
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
|
|
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
|
|
@@ -791,7 +791,7 @@ struct bnx2i_hba *bnx2i_alloc_hba(struct cnic_dev *cnic)
|
|
return NULL;
|
|
shost->dma_boundary = cnic->pcidev->dma_mask;
|
|
shost->transportt = bnx2i_scsi_xport_template;
|
|
- shost->max_id = ISCSI_MAX_CONNS_PER_HBA;
|
|
+ shost->max_id = ISCSI_MAX_CONNS_PER_HBA - 1;
|
|
shost->max_channel = 0;
|
|
shost->max_lun = 512;
|
|
shost->max_cmd_len = 16;
|
|
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
|
|
index f6bcae829c29b..506b561670af0 100644
|
|
--- a/drivers/scsi/cxgbi/libcxgbi.c
|
|
+++ b/drivers/scsi/cxgbi/libcxgbi.c
|
|
@@ -337,7 +337,7 @@ void cxgbi_hbas_remove(struct cxgbi_device *cdev)
|
|
EXPORT_SYMBOL_GPL(cxgbi_hbas_remove);
|
|
|
|
int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun,
|
|
- unsigned int max_id, struct scsi_host_template *sht,
|
|
+ unsigned int max_conns, struct scsi_host_template *sht,
|
|
struct scsi_transport_template *stt)
|
|
{
|
|
struct cxgbi_hba *chba;
|
|
@@ -357,7 +357,7 @@ int cxgbi_hbas_add(struct cxgbi_device *cdev, u64 max_lun,
|
|
|
|
shost->transportt = stt;
|
|
shost->max_lun = max_lun;
|
|
- shost->max_id = max_id;
|
|
+ shost->max_id = max_conns - 1;
|
|
shost->max_channel = 0;
|
|
shost->max_cmd_len = SCSI_MAX_VARLEN_CDB_SIZE;
|
|
|
|
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
|
|
index efa8c03814767..005b97c61dc00 100644
|
|
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
|
|
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
|
|
@@ -517,7 +517,8 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
|
|
int len, k, off, bufflen = ALUA_RTPG_SIZE;
|
|
int group_id_old, state_old, pref_old, valid_states_old;
|
|
unsigned char *desc, *buff;
|
|
- unsigned err, retval;
|
|
+ unsigned err;
|
|
+ int retval;
|
|
unsigned int tpg_desc_tbl_off;
|
|
unsigned char orig_transition_tmo;
|
|
unsigned long flags;
|
|
@@ -562,12 +563,12 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
|
|
kfree(buff);
|
|
return SCSI_DH_OK;
|
|
}
|
|
- if (!scsi_sense_valid(&sense_hdr)) {
|
|
+ if (retval < 0 || !scsi_sense_valid(&sense_hdr)) {
|
|
sdev_printk(KERN_INFO, sdev,
|
|
"%s: rtpg failed, result %d\n",
|
|
ALUA_DH_NAME, retval);
|
|
kfree(buff);
|
|
- if (driver_byte(retval) == DRIVER_ERROR)
|
|
+ if (retval < 0)
|
|
return SCSI_DH_DEV_TEMP_BUSY;
|
|
return SCSI_DH_IO;
|
|
}
|
|
@@ -791,11 +792,11 @@ static unsigned alua_stpg(struct scsi_device *sdev, struct alua_port_group *pg)
|
|
retval = submit_stpg(sdev, pg->group_id, &sense_hdr);
|
|
|
|
if (retval) {
|
|
- if (!scsi_sense_valid(&sense_hdr)) {
|
|
+ if (retval < 0 || !scsi_sense_valid(&sense_hdr)) {
|
|
sdev_printk(KERN_INFO, sdev,
|
|
"%s: stpg failed, result %d",
|
|
ALUA_DH_NAME, retval);
|
|
- if (driver_byte(retval) == DRIVER_ERROR)
|
|
+ if (retval < 0)
|
|
return SCSI_DH_DEV_TEMP_BUSY;
|
|
} else {
|
|
sdev_printk(KERN_INFO, sdev, "%s: stpg failed\n",
|
|
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
index 3e359ac752fd2..3cba7bfba2965 100644
|
|
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
|
|
@@ -1649,7 +1649,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (irq < 0) {
|
|
dev_err(dev, "irq init: fail map phy interrupt %d\n",
|
|
idx);
|
|
- return -ENOENT;
|
|
+ return irq;
|
|
}
|
|
|
|
rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
|
|
@@ -1657,7 +1657,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (rc) {
|
|
dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
|
|
irq, rc);
|
|
- return -ENOENT;
|
|
+ return rc;
|
|
}
|
|
}
|
|
}
|
|
@@ -1668,7 +1668,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (irq < 0) {
|
|
dev_err(dev, "irq init: could not map cq interrupt %d\n",
|
|
idx);
|
|
- return -ENOENT;
|
|
+ return irq;
|
|
}
|
|
|
|
rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
|
|
@@ -1676,7 +1676,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (rc) {
|
|
dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
|
|
irq, rc);
|
|
- return -ENOENT;
|
|
+ return rc;
|
|
}
|
|
}
|
|
|
|
@@ -1686,7 +1686,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (irq < 0) {
|
|
dev_err(dev, "irq init: could not map fatal interrupt %d\n",
|
|
idx);
|
|
- return -ENOENT;
|
|
+ return irq;
|
|
}
|
|
|
|
rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
|
|
@@ -1694,7 +1694,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
|
|
if (rc) {
|
|
dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
|
|
irq, rc);
|
|
- return -ENOENT;
|
|
+ return rc;
|
|
}
|
|
}
|
|
|
|
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
|
|
index cd52664920e1a..b40bb6bd5f5d0 100644
|
|
--- a/drivers/scsi/hosts.c
|
|
+++ b/drivers/scsi/hosts.c
|
|
@@ -220,6 +220,9 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
|
|
goto fail;
|
|
}
|
|
|
|
+ shost->cmd_per_lun = min_t(short, shost->cmd_per_lun,
|
|
+ shost->can_queue);
|
|
+
|
|
error = scsi_init_sense_cache(shost);
|
|
if (error)
|
|
goto fail;
|
|
@@ -485,6 +488,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
|
|
shost_printk(KERN_WARNING, shost,
|
|
"error handler thread failed to spawn, error = %ld\n",
|
|
PTR_ERR(shost->ehandler));
|
|
+ shost->ehandler = NULL;
|
|
goto fail;
|
|
}
|
|
|
|
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
|
|
index 2aaf836786548..dfe906307e55d 100644
|
|
--- a/drivers/scsi/libiscsi.c
|
|
+++ b/drivers/scsi/libiscsi.c
|
|
@@ -230,11 +230,11 @@ static int iscsi_prep_ecdb_ahs(struct iscsi_task *task)
|
|
*/
|
|
static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)
|
|
{
|
|
- struct iscsi_conn *conn = task->conn;
|
|
- struct iscsi_tm *tmf = &conn->tmhdr;
|
|
+ struct iscsi_session *session = task->conn->session;
|
|
+ struct iscsi_tm *tmf = &session->tmhdr;
|
|
u64 hdr_lun;
|
|
|
|
- if (conn->tmf_state == TMF_INITIAL)
|
|
+ if (session->tmf_state == TMF_INITIAL)
|
|
return 0;
|
|
|
|
if ((tmf->opcode & ISCSI_OPCODE_MASK) != ISCSI_OP_SCSI_TMFUNC)
|
|
@@ -254,24 +254,19 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)
|
|
* Fail all SCSI cmd PDUs
|
|
*/
|
|
if (opcode != ISCSI_OP_SCSI_DATA_OUT) {
|
|
- iscsi_conn_printk(KERN_INFO, conn,
|
|
- "task [op %x itt "
|
|
- "0x%x/0x%x] "
|
|
- "rejected.\n",
|
|
- opcode, task->itt,
|
|
- task->hdr_itt);
|
|
+ iscsi_session_printk(KERN_INFO, session,
|
|
+ "task [op %x itt 0x%x/0x%x] rejected.\n",
|
|
+ opcode, task->itt, task->hdr_itt);
|
|
return -EACCES;
|
|
}
|
|
/*
|
|
* And also all data-out PDUs in response to R2T
|
|
* if fast_abort is set.
|
|
*/
|
|
- if (conn->session->fast_abort) {
|
|
- iscsi_conn_printk(KERN_INFO, conn,
|
|
- "task [op %x itt "
|
|
- "0x%x/0x%x] fast abort.\n",
|
|
- opcode, task->itt,
|
|
- task->hdr_itt);
|
|
+ if (session->fast_abort) {
|
|
+ iscsi_session_printk(KERN_INFO, session,
|
|
+ "task [op %x itt 0x%x/0x%x] fast abort.\n",
|
|
+ opcode, task->itt, task->hdr_itt);
|
|
return -EACCES;
|
|
}
|
|
break;
|
|
@@ -284,7 +279,7 @@ static int iscsi_check_tmf_restrictions(struct iscsi_task *task, int opcode)
|
|
*/
|
|
if (opcode == ISCSI_OP_SCSI_DATA_OUT &&
|
|
task->hdr_itt == tmf->rtt) {
|
|
- ISCSI_DBG_SESSION(conn->session,
|
|
+ ISCSI_DBG_SESSION(session,
|
|
"Preventing task %x/%x from sending "
|
|
"data-out due to abort task in "
|
|
"progress\n", task->itt,
|
|
@@ -936,20 +931,21 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
|
|
static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr)
|
|
{
|
|
struct iscsi_tm_rsp *tmf = (struct iscsi_tm_rsp *)hdr;
|
|
+ struct iscsi_session *session = conn->session;
|
|
|
|
conn->exp_statsn = be32_to_cpu(hdr->statsn) + 1;
|
|
conn->tmfrsp_pdus_cnt++;
|
|
|
|
- if (conn->tmf_state != TMF_QUEUED)
|
|
+ if (session->tmf_state != TMF_QUEUED)
|
|
return;
|
|
|
|
if (tmf->response == ISCSI_TMF_RSP_COMPLETE)
|
|
- conn->tmf_state = TMF_SUCCESS;
|
|
+ session->tmf_state = TMF_SUCCESS;
|
|
else if (tmf->response == ISCSI_TMF_RSP_NO_TASK)
|
|
- conn->tmf_state = TMF_NOT_FOUND;
|
|
+ session->tmf_state = TMF_NOT_FOUND;
|
|
else
|
|
- conn->tmf_state = TMF_FAILED;
|
|
- wake_up(&conn->ehwait);
|
|
+ session->tmf_state = TMF_FAILED;
|
|
+ wake_up(&session->ehwait);
|
|
}
|
|
|
|
static int iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin *rhdr)
|
|
@@ -1361,7 +1357,6 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|
enum iscsi_err err)
|
|
{
|
|
struct iscsi_conn *conn;
|
|
- struct device *dev;
|
|
|
|
spin_lock_bh(&session->frwd_lock);
|
|
conn = session->leadconn;
|
|
@@ -1370,10 +1365,8 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|
return;
|
|
}
|
|
|
|
- dev = get_device(&conn->cls_conn->dev);
|
|
+ iscsi_get_conn(conn->cls_conn);
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
- if (!dev)
|
|
- return;
|
|
/*
|
|
* if the host is being removed bypass the connection
|
|
* recovery initialization because we are going to kill
|
|
@@ -1383,7 +1376,7 @@ void iscsi_session_failure(struct iscsi_session *session,
|
|
iscsi_conn_error_event(conn->cls_conn, err);
|
|
else
|
|
iscsi_conn_failure(conn, err);
|
|
- put_device(dev);
|
|
+ iscsi_put_conn(conn->cls_conn);
|
|
}
|
|
EXPORT_SYMBOL_GPL(iscsi_session_failure);
|
|
|
|
@@ -1829,15 +1822,14 @@ EXPORT_SYMBOL_GPL(iscsi_target_alloc);
|
|
|
|
static void iscsi_tmf_timedout(struct timer_list *t)
|
|
{
|
|
- struct iscsi_conn *conn = from_timer(conn, t, tmf_timer);
|
|
- struct iscsi_session *session = conn->session;
|
|
+ struct iscsi_session *session = from_timer(session, t, tmf_timer);
|
|
|
|
spin_lock(&session->frwd_lock);
|
|
- if (conn->tmf_state == TMF_QUEUED) {
|
|
- conn->tmf_state = TMF_TIMEDOUT;
|
|
+ if (session->tmf_state == TMF_QUEUED) {
|
|
+ session->tmf_state = TMF_TIMEDOUT;
|
|
ISCSI_DBG_EH(session, "tmf timedout\n");
|
|
/* unblock eh_abort() */
|
|
- wake_up(&conn->ehwait);
|
|
+ wake_up(&session->ehwait);
|
|
}
|
|
spin_unlock(&session->frwd_lock);
|
|
}
|
|
@@ -1860,8 +1852,8 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
|
|
return -EPERM;
|
|
}
|
|
conn->tmfcmd_pdus_cnt++;
|
|
- conn->tmf_timer.expires = timeout * HZ + jiffies;
|
|
- add_timer(&conn->tmf_timer);
|
|
+ session->tmf_timer.expires = timeout * HZ + jiffies;
|
|
+ add_timer(&session->tmf_timer);
|
|
ISCSI_DBG_EH(session, "tmf set timeout\n");
|
|
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
@@ -1875,12 +1867,12 @@ static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn,
|
|
* 3) session is terminated or restarted or userspace has
|
|
* given up on recovery
|
|
*/
|
|
- wait_event_interruptible(conn->ehwait, age != session->age ||
|
|
+ wait_event_interruptible(session->ehwait, age != session->age ||
|
|
session->state != ISCSI_STATE_LOGGED_IN ||
|
|
- conn->tmf_state != TMF_QUEUED);
|
|
+ session->tmf_state != TMF_QUEUED);
|
|
if (signal_pending(current))
|
|
flush_signals(current);
|
|
- del_timer_sync(&conn->tmf_timer);
|
|
+ del_timer_sync(&session->tmf_timer);
|
|
|
|
mutex_lock(&session->eh_mutex);
|
|
spin_lock_bh(&session->frwd_lock);
|
|
@@ -2312,17 +2304,17 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
|
|
}
|
|
|
|
/* only have one tmf outstanding at a time */
|
|
- if (conn->tmf_state != TMF_INITIAL)
|
|
+ if (session->tmf_state != TMF_INITIAL)
|
|
goto failed;
|
|
- conn->tmf_state = TMF_QUEUED;
|
|
+ session->tmf_state = TMF_QUEUED;
|
|
|
|
- hdr = &conn->tmhdr;
|
|
+ hdr = &session->tmhdr;
|
|
iscsi_prep_abort_task_pdu(task, hdr);
|
|
|
|
if (iscsi_exec_task_mgmt_fn(conn, hdr, age, session->abort_timeout))
|
|
goto failed;
|
|
|
|
- switch (conn->tmf_state) {
|
|
+ switch (session->tmf_state) {
|
|
case TMF_SUCCESS:
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
/*
|
|
@@ -2337,7 +2329,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
|
|
*/
|
|
spin_lock_bh(&session->frwd_lock);
|
|
fail_scsi_task(task, DID_ABORT);
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
memset(hdr, 0, sizeof(*hdr));
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
iscsi_start_tx(conn);
|
|
@@ -2348,7 +2340,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
|
|
goto failed_unlocked;
|
|
case TMF_NOT_FOUND:
|
|
if (!sc->SCp.ptr) {
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
memset(hdr, 0, sizeof(*hdr));
|
|
/* task completed before tmf abort response */
|
|
ISCSI_DBG_EH(session, "sc completed while abort in "
|
|
@@ -2357,7 +2349,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
|
|
}
|
|
fallthrough;
|
|
default:
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
goto failed;
|
|
}
|
|
|
|
@@ -2416,11 +2408,11 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
|
|
conn = session->leadconn;
|
|
|
|
/* only have one tmf outstanding at a time */
|
|
- if (conn->tmf_state != TMF_INITIAL)
|
|
+ if (session->tmf_state != TMF_INITIAL)
|
|
goto unlock;
|
|
- conn->tmf_state = TMF_QUEUED;
|
|
+ session->tmf_state = TMF_QUEUED;
|
|
|
|
- hdr = &conn->tmhdr;
|
|
+ hdr = &session->tmhdr;
|
|
iscsi_prep_lun_reset_pdu(sc, hdr);
|
|
|
|
if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
|
|
@@ -2429,7 +2421,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
|
|
goto unlock;
|
|
}
|
|
|
|
- switch (conn->tmf_state) {
|
|
+ switch (session->tmf_state) {
|
|
case TMF_SUCCESS:
|
|
break;
|
|
case TMF_TIMEDOUT:
|
|
@@ -2437,7 +2429,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
|
|
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
|
|
goto done;
|
|
default:
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
goto unlock;
|
|
}
|
|
|
|
@@ -2449,7 +2441,7 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)
|
|
spin_lock_bh(&session->frwd_lock);
|
|
memset(hdr, 0, sizeof(*hdr));
|
|
fail_scsi_tasks(conn, sc->device->lun, DID_ERROR);
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
|
|
iscsi_start_tx(conn);
|
|
@@ -2472,8 +2464,7 @@ void iscsi_session_recovery_timedout(struct iscsi_cls_session *cls_session)
|
|
spin_lock_bh(&session->frwd_lock);
|
|
if (session->state != ISCSI_STATE_LOGGED_IN) {
|
|
session->state = ISCSI_STATE_RECOVERY_FAILED;
|
|
- if (session->leadconn)
|
|
- wake_up(&session->leadconn->ehwait);
|
|
+ wake_up(&session->ehwait);
|
|
}
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
}
|
|
@@ -2518,7 +2509,7 @@ failed:
|
|
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
|
|
|
|
ISCSI_DBG_EH(session, "wait for relogin\n");
|
|
- wait_event_interruptible(conn->ehwait,
|
|
+ wait_event_interruptible(session->ehwait,
|
|
session->state == ISCSI_STATE_TERMINATE ||
|
|
session->state == ISCSI_STATE_LOGGED_IN ||
|
|
session->state == ISCSI_STATE_RECOVERY_FAILED);
|
|
@@ -2579,11 +2570,11 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)
|
|
conn = session->leadconn;
|
|
|
|
/* only have one tmf outstanding at a time */
|
|
- if (conn->tmf_state != TMF_INITIAL)
|
|
+ if (session->tmf_state != TMF_INITIAL)
|
|
goto unlock;
|
|
- conn->tmf_state = TMF_QUEUED;
|
|
+ session->tmf_state = TMF_QUEUED;
|
|
|
|
- hdr = &conn->tmhdr;
|
|
+ hdr = &session->tmhdr;
|
|
iscsi_prep_tgt_reset_pdu(sc, hdr);
|
|
|
|
if (iscsi_exec_task_mgmt_fn(conn, hdr, session->age,
|
|
@@ -2592,7 +2583,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)
|
|
goto unlock;
|
|
}
|
|
|
|
- switch (conn->tmf_state) {
|
|
+ switch (session->tmf_state) {
|
|
case TMF_SUCCESS:
|
|
break;
|
|
case TMF_TIMEDOUT:
|
|
@@ -2600,7 +2591,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)
|
|
iscsi_conn_failure(conn, ISCSI_ERR_SCSI_EH_SESSION_RST);
|
|
goto done;
|
|
default:
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
goto unlock;
|
|
}
|
|
|
|
@@ -2612,7 +2603,7 @@ static int iscsi_eh_target_reset(struct scsi_cmnd *sc)
|
|
spin_lock_bh(&session->frwd_lock);
|
|
memset(hdr, 0, sizeof(*hdr));
|
|
fail_scsi_tasks(conn, -1, DID_ERROR);
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
|
|
iscsi_start_tx(conn);
|
|
@@ -2942,7 +2933,10 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
|
|
session->tt = iscsit;
|
|
session->dd_data = cls_session->dd_data + sizeof(*session);
|
|
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
+ timer_setup(&session->tmf_timer, iscsi_tmf_timedout, 0);
|
|
mutex_init(&session->eh_mutex);
|
|
+
|
|
spin_lock_init(&session->frwd_lock);
|
|
spin_lock_init(&session->back_lock);
|
|
|
|
@@ -3046,7 +3040,6 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
|
|
conn->c_stage = ISCSI_CONN_INITIAL_STAGE;
|
|
conn->id = conn_idx;
|
|
conn->exp_statsn = 0;
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
|
|
timer_setup(&conn->transport_timer, iscsi_check_transport_timeouts, 0);
|
|
|
|
@@ -3071,8 +3064,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
|
|
goto login_task_data_alloc_fail;
|
|
conn->login_task->data = conn->data = data;
|
|
|
|
- timer_setup(&conn->tmf_timer, iscsi_tmf_timedout, 0);
|
|
- init_waitqueue_head(&conn->ehwait);
|
|
+ init_waitqueue_head(&session->ehwait);
|
|
|
|
return cls_conn;
|
|
|
|
@@ -3107,7 +3099,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
|
|
* leading connection? then give up on recovery.
|
|
*/
|
|
session->state = ISCSI_STATE_TERMINATE;
|
|
- wake_up(&conn->ehwait);
|
|
+ wake_up(&session->ehwait);
|
|
}
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
|
|
@@ -3182,7 +3174,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)
|
|
* commands after successful recovery
|
|
*/
|
|
conn->stop_stage = 0;
|
|
- conn->tmf_state = TMF_INITIAL;
|
|
+ session->tmf_state = TMF_INITIAL;
|
|
session->age++;
|
|
if (session->age == 16)
|
|
session->age = 0;
|
|
@@ -3196,7 +3188,7 @@ int iscsi_conn_start(struct iscsi_cls_conn *cls_conn)
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
|
|
iscsi_unblock_session(session->cls_session);
|
|
- wake_up(&conn->ehwait);
|
|
+ wake_up(&session->ehwait);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(iscsi_conn_start);
|
|
@@ -3290,7 +3282,7 @@ void iscsi_conn_stop(struct iscsi_cls_conn *cls_conn, int flag)
|
|
spin_lock_bh(&session->frwd_lock);
|
|
fail_scsi_tasks(conn, -1, DID_TRANSPORT_DISRUPTED);
|
|
fail_mgmt_tasks(session, conn);
|
|
- memset(&conn->tmhdr, 0, sizeof(conn->tmhdr));
|
|
+ memset(&session->tmhdr, 0, sizeof(session->tmhdr));
|
|
spin_unlock_bh(&session->frwd_lock);
|
|
mutex_unlock(&session->eh_mutex);
|
|
}
|
|
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
|
|
index c3ca2ccf9f828..933927f738c7b 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_els.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_els.c
|
|
@@ -1175,6 +1175,15 @@ stop_rr_fcf_flogi:
|
|
phba->fcf.fcf_redisc_attempted = 0; /* reset */
|
|
goto out;
|
|
}
|
|
+ } else if (vport->port_state > LPFC_FLOGI &&
|
|
+ vport->fc_flag & FC_PT2PT) {
|
|
+ /*
|
|
+ * In a p2p topology, it is possible that discovery has
|
|
+ * already progressed, and this completion can be ignored.
|
|
+ * Recheck the indicated topology.
|
|
+ */
|
|
+ if (!sp->cmn.fPort)
|
|
+ goto out;
|
|
}
|
|
|
|
flogifail:
|
|
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
|
|
index bc0bcb0dccc9a..9ed826fd53e85 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_sli.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_sli.c
|
|
@@ -7959,7 +7959,7 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
|
|
"0393 Error %d during rpi post operation\n",
|
|
rc);
|
|
rc = -ENODEV;
|
|
- goto out_destroy_queue;
|
|
+ goto out_free_iocblist;
|
|
}
|
|
lpfc_sli4_node_prep(phba);
|
|
|
|
@@ -8125,8 +8125,9 @@ out_io_buff_free:
|
|
out_unset_queue:
|
|
/* Unset all the queues set up in this routine when error out */
|
|
lpfc_sli4_queue_unset(phba);
|
|
-out_destroy_queue:
|
|
+out_free_iocblist:
|
|
lpfc_free_iocb_list(phba);
|
|
+out_destroy_queue:
|
|
lpfc_sli4_queue_destroy(phba);
|
|
out_stop_timers:
|
|
lpfc_stop_hba_timers(phba);
|
|
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
|
|
index b5a765b73c761..a43b67299b084 100644
|
|
--- a/drivers/scsi/megaraid/megaraid_sas.h
|
|
+++ b/drivers/scsi/megaraid/megaraid_sas.h
|
|
@@ -2262,6 +2262,15 @@ enum MR_PERF_MODE {
|
|
(mode) == MR_LATENCY_PERF_MODE ? "Latency" : \
|
|
"Unknown")
|
|
|
|
+enum MEGASAS_LD_TARGET_ID_STATUS {
|
|
+ LD_TARGET_ID_INITIAL,
|
|
+ LD_TARGET_ID_ACTIVE,
|
|
+ LD_TARGET_ID_DELETED,
|
|
+};
|
|
+
|
|
+#define MEGASAS_TARGET_ID(sdev) \
|
|
+ (((sdev->channel % 2) * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id)
|
|
+
|
|
struct megasas_instance {
|
|
|
|
unsigned int *reply_map;
|
|
@@ -2326,6 +2335,9 @@ struct megasas_instance {
|
|
struct megasas_pd_list pd_list[MEGASAS_MAX_PD];
|
|
struct megasas_pd_list local_pd_list[MEGASAS_MAX_PD];
|
|
u8 ld_ids[MEGASAS_MAX_LD_IDS];
|
|
+ u8 ld_tgtid_status[MEGASAS_MAX_LD_IDS];
|
|
+ u8 ld_ids_prev[MEGASAS_MAX_LD_IDS];
|
|
+ u8 ld_ids_from_raidmap[MEGASAS_MAX_LD_IDS];
|
|
s8 init_id;
|
|
|
|
u16 max_num_sge;
|
|
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
index 4d4e9dbe5193f..3fecf4b2b0bd9 100644
|
|
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
|
|
@@ -141,6 +141,8 @@ static int megasas_register_aen(struct megasas_instance *instance,
|
|
u32 seq_num, u32 class_locale_word);
|
|
static void megasas_get_pd_info(struct megasas_instance *instance,
|
|
struct scsi_device *sdev);
|
|
+static void
|
|
+megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
|
|
|
|
/*
|
|
* PCI ID table for all supported controllers
|
|
@@ -436,6 +438,12 @@ megasas_decode_evt(struct megasas_instance *instance)
|
|
(class_locale.members.locale),
|
|
format_class(class_locale.members.class),
|
|
evt_detail->description);
|
|
+
|
|
+ if (megasas_dbg_lvl & LD_PD_DEBUG)
|
|
+ dev_info(&instance->pdev->dev,
|
|
+ "evt_detail.args.ld.target_id/index %d/%d\n",
|
|
+ evt_detail->args.ld.target_id, evt_detail->args.ld.ld_index);
|
|
+
|
|
}
|
|
|
|
/*
|
|
@@ -1779,6 +1787,7 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
|
|
{
|
|
struct megasas_instance *instance;
|
|
struct MR_PRIV_DEVICE *mr_device_priv_data;
|
|
+ u32 ld_tgt_id;
|
|
|
|
instance = (struct megasas_instance *)
|
|
scmd->device->host->hostdata;
|
|
@@ -1805,17 +1814,21 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
|
|
}
|
|
}
|
|
|
|
- if (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR) {
|
|
+ mr_device_priv_data = scmd->device->hostdata;
|
|
+ if (!mr_device_priv_data ||
|
|
+ (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR)) {
|
|
scmd->result = DID_NO_CONNECT << 16;
|
|
scmd->scsi_done(scmd);
|
|
return 0;
|
|
}
|
|
|
|
- mr_device_priv_data = scmd->device->hostdata;
|
|
- if (!mr_device_priv_data) {
|
|
- scmd->result = DID_NO_CONNECT << 16;
|
|
- scmd->scsi_done(scmd);
|
|
- return 0;
|
|
+ if (MEGASAS_IS_LOGICAL(scmd->device)) {
|
|
+ ld_tgt_id = MEGASAS_TARGET_ID(scmd->device);
|
|
+ if (instance->ld_tgtid_status[ld_tgt_id] == LD_TARGET_ID_DELETED) {
|
|
+ scmd->result = DID_NO_CONNECT << 16;
|
|
+ scmd->scsi_done(scmd);
|
|
+ return 0;
|
|
+ }
|
|
}
|
|
|
|
if (atomic_read(&instance->adprecovery) != MEGASAS_HBA_OPERATIONAL)
|
|
@@ -2095,7 +2108,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
|
|
|
|
static int megasas_slave_alloc(struct scsi_device *sdev)
|
|
{
|
|
- u16 pd_index = 0;
|
|
+ u16 pd_index = 0, ld_tgt_id;
|
|
struct megasas_instance *instance ;
|
|
struct MR_PRIV_DEVICE *mr_device_priv_data;
|
|
|
|
@@ -2120,6 +2133,14 @@ scan_target:
|
|
GFP_KERNEL);
|
|
if (!mr_device_priv_data)
|
|
return -ENOMEM;
|
|
+
|
|
+ if (MEGASAS_IS_LOGICAL(sdev)) {
|
|
+ ld_tgt_id = MEGASAS_TARGET_ID(sdev);
|
|
+ instance->ld_tgtid_status[ld_tgt_id] = LD_TARGET_ID_ACTIVE;
|
|
+ if (megasas_dbg_lvl & LD_PD_DEBUG)
|
|
+ sdev_printk(KERN_INFO, sdev, "LD target ID %d created.\n", ld_tgt_id);
|
|
+ }
|
|
+
|
|
sdev->hostdata = mr_device_priv_data;
|
|
|
|
atomic_set(&mr_device_priv_data->r1_ldio_hint,
|
|
@@ -2129,6 +2150,19 @@ scan_target:
|
|
|
|
static void megasas_slave_destroy(struct scsi_device *sdev)
|
|
{
|
|
+ u16 ld_tgt_id;
|
|
+ struct megasas_instance *instance;
|
|
+
|
|
+ instance = megasas_lookup_instance(sdev->host->host_no);
|
|
+
|
|
+ if (MEGASAS_IS_LOGICAL(sdev)) {
|
|
+ ld_tgt_id = MEGASAS_TARGET_ID(sdev);
|
|
+ instance->ld_tgtid_status[ld_tgt_id] = LD_TARGET_ID_DELETED;
|
|
+ if (megasas_dbg_lvl & LD_PD_DEBUG)
|
|
+ sdev_printk(KERN_INFO, sdev,
|
|
+ "LD target ID %d removed from OS stack\n", ld_tgt_id);
|
|
+ }
|
|
+
|
|
kfree(sdev->hostdata);
|
|
sdev->hostdata = NULL;
|
|
}
|
|
@@ -3525,6 +3559,22 @@ megasas_complete_abort(struct megasas_instance *instance,
|
|
}
|
|
}
|
|
|
|
+static void
|
|
+megasas_set_ld_removed_by_fw(struct megasas_instance *instance)
|
|
+{
|
|
+ uint i;
|
|
+
|
|
+ for (i = 0; (i < MEGASAS_MAX_LD_IDS); i++) {
|
|
+ if (instance->ld_ids_prev[i] != 0xff &&
|
|
+ instance->ld_ids_from_raidmap[i] == 0xff) {
|
|
+ if (megasas_dbg_lvl & LD_PD_DEBUG)
|
|
+ dev_info(&instance->pdev->dev,
|
|
+ "LD target ID %d removed from RAID map\n", i);
|
|
+ instance->ld_tgtid_status[i] = LD_TARGET_ID_DELETED;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
/**
|
|
* megasas_complete_cmd - Completes a command
|
|
* @instance: Adapter soft state
|
|
@@ -3687,9 +3737,13 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
|
|
fusion->fast_path_io = 0;
|
|
}
|
|
|
|
+ if (instance->adapter_type >= INVADER_SERIES)
|
|
+ megasas_set_ld_removed_by_fw(instance);
|
|
+
|
|
megasas_sync_map_info(instance);
|
|
spin_unlock_irqrestore(instance->host->host_lock,
|
|
flags);
|
|
+
|
|
break;
|
|
}
|
|
if (opcode == MR_DCMD_CTRL_EVENT_GET_INFO ||
|
|
@@ -7545,11 +7599,16 @@ static int megasas_probe_one(struct pci_dev *pdev,
|
|
return 0;
|
|
|
|
fail_start_aen:
|
|
+ instance->unload = 1;
|
|
+ scsi_remove_host(instance->host);
|
|
fail_io_attach:
|
|
megasas_mgmt_info.count--;
|
|
megasas_mgmt_info.max_index--;
|
|
megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL;
|
|
|
|
+ if (instance->requestorId && !instance->skip_heartbeat_timer_del)
|
|
+ del_timer_sync(&instance->sriov_heartbeat_timer);
|
|
+
|
|
instance->instancet->disable_intr(instance);
|
|
megasas_destroy_irqs(instance);
|
|
|
|
@@ -7557,8 +7616,16 @@ fail_io_attach:
|
|
megasas_release_fusion(instance);
|
|
else
|
|
megasas_release_mfi(instance);
|
|
+
|
|
if (instance->msix_vectors)
|
|
pci_free_irq_vectors(instance->pdev);
|
|
+ instance->msix_vectors = 0;
|
|
+
|
|
+ if (instance->fw_crash_state != UNAVAILABLE)
|
|
+ megasas_free_host_crash_buffer(instance);
|
|
+
|
|
+ if (instance->adapter_type != MFI_SERIES)
|
|
+ megasas_fusion_stop_watchdog(instance);
|
|
fail_init_mfi:
|
|
scsi_host_put(host);
|
|
fail_alloc_instance:
|
|
@@ -8818,8 +8885,10 @@ megasas_aen_polling(struct work_struct *work)
|
|
union megasas_evt_class_locale class_locale;
|
|
int event_type = 0;
|
|
u32 seq_num;
|
|
+ u16 ld_target_id;
|
|
int error;
|
|
u8 dcmd_ret = DCMD_SUCCESS;
|
|
+ struct scsi_device *sdev1;
|
|
|
|
if (!instance) {
|
|
printk(KERN_ERR "invalid instance!\n");
|
|
@@ -8842,12 +8911,23 @@ megasas_aen_polling(struct work_struct *work)
|
|
break;
|
|
|
|
case MR_EVT_LD_OFFLINE:
|
|
- case MR_EVT_CFG_CLEARED:
|
|
case MR_EVT_LD_DELETED:
|
|
+ ld_target_id = instance->evt_detail->args.ld.target_id;
|
|
+ sdev1 = scsi_device_lookup(instance->host,
|
|
+ MEGASAS_MAX_PD_CHANNELS +
|
|
+ (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),
|
|
+ (ld_target_id - MEGASAS_MAX_DEV_PER_CHANNEL),
|
|
+ 0);
|
|
+ if (sdev1)
|
|
+ megasas_remove_scsi_device(sdev1);
|
|
+
|
|
+ event_type = SCAN_VD_CHANNEL;
|
|
+ break;
|
|
case MR_EVT_LD_CREATED:
|
|
event_type = SCAN_VD_CHANNEL;
|
|
break;
|
|
|
|
+ case MR_EVT_CFG_CLEARED:
|
|
case MR_EVT_CTRL_HOST_BUS_SCAN_REQUESTED:
|
|
case MR_EVT_FOREIGN_CFG_IMPORTED:
|
|
case MR_EVT_LD_STATE_CHANGE:
|
|
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
|
|
index b6c08d6200335..83f69c33b01a9 100644
|
|
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
|
|
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
|
|
@@ -349,6 +349,10 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id)
|
|
|
|
num_lds = le16_to_cpu(drv_map->raidMap.ldCount);
|
|
|
|
+ memcpy(instance->ld_ids_prev,
|
|
+ instance->ld_ids_from_raidmap,
|
|
+ sizeof(instance->ld_ids_from_raidmap));
|
|
+ memset(instance->ld_ids_from_raidmap, 0xff, MEGASAS_MAX_LD_IDS);
|
|
/*Convert Raid capability values to CPU arch */
|
|
for (i = 0; (num_lds > 0) && (i < MAX_LOGICAL_DRIVES_EXT); i++) {
|
|
ld = MR_TargetIdToLdGet(i, drv_map);
|
|
@@ -359,7 +363,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id)
|
|
|
|
raid = MR_LdRaidGet(ld, drv_map);
|
|
le32_to_cpus((u32 *)&raid->capability);
|
|
-
|
|
+ instance->ld_ids_from_raidmap[i] = i;
|
|
num_lds--;
|
|
}
|
|
|
|
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
|
|
index cd94a0c81f835..142e60741094f 100644
|
|
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
|
|
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
|
|
@@ -3745,6 +3745,7 @@ static void megasas_sync_irqs(unsigned long instance_addr)
|
|
if (irq_ctx->irq_poll_scheduled) {
|
|
irq_ctx->irq_poll_scheduled = false;
|
|
enable_irq(irq_ctx->os_irq);
|
|
+ complete_cmd_fusion(instance, irq_ctx->MSIxIndex, irq_ctx);
|
|
}
|
|
}
|
|
}
|
|
@@ -3776,6 +3777,7 @@ int megasas_irqpoll(struct irq_poll *irqpoll, int budget)
|
|
irq_poll_complete(irqpoll);
|
|
irq_ctx->irq_poll_scheduled = false;
|
|
enable_irq(irq_ctx->os_irq);
|
|
+ complete_cmd_fusion(instance, irq_ctx->MSIxIndex, irq_ctx);
|
|
}
|
|
|
|
return num_entries;
|
|
@@ -3792,6 +3794,7 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr)
|
|
{
|
|
struct megasas_instance *instance =
|
|
(struct megasas_instance *)instance_addr;
|
|
+ struct megasas_irq_context *irq_ctx = NULL;
|
|
u32 count, MSIxIndex;
|
|
|
|
count = instance->msix_vectors > 0 ? instance->msix_vectors : 1;
|
|
@@ -3800,8 +3803,10 @@ megasas_complete_cmd_dpc_fusion(unsigned long instance_addr)
|
|
if (atomic_read(&instance->adprecovery) == MEGASAS_HW_CRITICAL_ERROR)
|
|
return;
|
|
|
|
- for (MSIxIndex = 0 ; MSIxIndex < count; MSIxIndex++)
|
|
- complete_cmd_fusion(instance, MSIxIndex, NULL);
|
|
+ for (MSIxIndex = 0 ; MSIxIndex < count; MSIxIndex++) {
|
|
+ irq_ctx = &instance->irq_context[MSIxIndex];
|
|
+ complete_cmd_fusion(instance, MSIxIndex, irq_ctx);
|
|
+ }
|
|
}
|
|
|
|
/**
|
|
@@ -5272,6 +5277,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance)
|
|
if (!fusion->log_to_span) {
|
|
dev_err(&instance->pdev->dev, "Failed from %s %d\n",
|
|
__func__, __LINE__);
|
|
+ kfree(instance->ctrl_context);
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
index a5f70f0e02871..b48f10f7cf310 100644
|
|
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
@@ -3697,6 +3697,28 @@ _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc)
|
|
ioc->fw_events_cleanup = 1;
|
|
while ((fw_event = dequeue_next_fw_event(ioc)) ||
|
|
(fw_event = ioc->current_event)) {
|
|
+
|
|
+ /*
|
|
+ * Don't call cancel_work_sync() for current_event
|
|
+ * other than MPT3SAS_REMOVE_UNRESPONDING_DEVICES;
|
|
+ * otherwise we may observe deadlock if current
|
|
+ * hard reset issued as part of processing the current_event.
|
|
+ *
|
|
+ * Orginal logic of cleaning the current_event is added
|
|
+ * for handling the back to back host reset issued by the user.
|
|
+ * i.e. during back to back host reset, driver use to process
|
|
+ * the two instances of MPT3SAS_REMOVE_UNRESPONDING_DEVICES
|
|
+ * event back to back and this made the drives to unregister
|
|
+ * the devices from SML.
|
|
+ */
|
|
+
|
|
+ if (fw_event == ioc->current_event &&
|
|
+ ioc->current_event->event !=
|
|
+ MPT3SAS_REMOVE_UNRESPONDING_DEVICES) {
|
|
+ ioc->current_event = NULL;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
/*
|
|
* Wait on the fw_event to complete. If this returns 1, then
|
|
* the event was never executed, and we need a put for the
|
|
diff --git a/drivers/scsi/qedi/qedi.h b/drivers/scsi/qedi/qedi.h
|
|
index c342defc3f522..ce199a7a16b80 100644
|
|
--- a/drivers/scsi/qedi/qedi.h
|
|
+++ b/drivers/scsi/qedi/qedi.h
|
|
@@ -284,6 +284,7 @@ struct qedi_ctx {
|
|
#define QEDI_IN_RECOVERY 5
|
|
#define QEDI_IN_OFFLINE 6
|
|
#define QEDI_IN_SHUTDOWN 7
|
|
+#define QEDI_BLOCK_IO 8
|
|
|
|
u8 mac[ETH_ALEN];
|
|
u32 src_ip[4];
|
|
diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
|
|
index 440ddd2309f1d..4c87640e6a911 100644
|
|
--- a/drivers/scsi/qedi/qedi_fw.c
|
|
+++ b/drivers/scsi/qedi/qedi_fw.c
|
|
@@ -73,7 +73,6 @@ static void qedi_process_logout_resp(struct qedi_ctx *qedi,
|
|
spin_unlock(&qedi_conn->list_lock);
|
|
|
|
cmd->state = RESPONSE_RECEIVED;
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr, NULL, 0);
|
|
|
|
spin_unlock(&session->back_lock);
|
|
@@ -138,7 +137,6 @@ static void qedi_process_text_resp(struct qedi_ctx *qedi,
|
|
spin_unlock(&qedi_conn->list_lock);
|
|
|
|
cmd->state = RESPONSE_RECEIVED;
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
|
|
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr_ptr,
|
|
qedi_conn->gen_pdu.resp_buf,
|
|
@@ -161,16 +159,9 @@ static void qedi_tmf_resp_work(struct work_struct *work)
|
|
set_bit(QEDI_CONN_FW_CLEANUP, &qedi_conn->flags);
|
|
resp_hdr_ptr = (struct iscsi_tm_rsp *)qedi_cmd->tmf_resp_buf;
|
|
|
|
- iscsi_block_session(session->cls_session);
|
|
rval = qedi_cleanup_all_io(qedi, qedi_conn, qedi_cmd->task, true);
|
|
- if (rval) {
|
|
- qedi_clear_task_idx(qedi, qedi_cmd->task_id);
|
|
- iscsi_unblock_session(session->cls_session);
|
|
+ if (rval)
|
|
goto exit_tmf_resp;
|
|
- }
|
|
-
|
|
- iscsi_unblock_session(session->cls_session);
|
|
- qedi_clear_task_idx(qedi, qedi_cmd->task_id);
|
|
|
|
spin_lock(&session->back_lock);
|
|
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr_ptr, NULL, 0);
|
|
@@ -245,8 +236,6 @@ static void qedi_process_tmf_resp(struct qedi_ctx *qedi,
|
|
goto unblock_sess;
|
|
}
|
|
|
|
- qedi_clear_task_idx(qedi, qedi_cmd->task_id);
|
|
-
|
|
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr_ptr, NULL, 0);
|
|
kfree(resp_hdr_ptr);
|
|
|
|
@@ -314,7 +303,6 @@ static void qedi_process_login_resp(struct qedi_ctx *qedi,
|
|
"Freeing tid=0x%x for cid=0x%x\n",
|
|
cmd->task_id, qedi_conn->iscsi_conn_id);
|
|
cmd->state = RESPONSE_RECEIVED;
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
}
|
|
|
|
static void qedi_get_rq_bdq_buf(struct qedi_ctx *qedi,
|
|
@@ -468,7 +456,6 @@ static int qedi_process_nopin_mesg(struct qedi_ctx *qedi,
|
|
}
|
|
|
|
spin_unlock(&qedi_conn->list_lock);
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
}
|
|
|
|
done:
|
|
@@ -673,7 +660,6 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi,
|
|
if (qedi_io_tracing)
|
|
qedi_trace_io(qedi, task, cmd->task_id, QEDI_IO_TRACE_RSP);
|
|
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
__iscsi_complete_pdu(conn, (struct iscsi_hdr *)hdr,
|
|
conn->data, datalen);
|
|
error:
|
|
@@ -730,7 +716,6 @@ static void qedi_process_nopin_local_cmpl(struct qedi_ctx *qedi,
|
|
cqe->itid, cmd->task_id);
|
|
|
|
cmd->state = RESPONSE_RECEIVED;
|
|
- qedi_clear_task_idx(qedi, cmd->task_id);
|
|
|
|
spin_lock_bh(&session->back_lock);
|
|
__iscsi_put_task(task);
|
|
@@ -748,7 +733,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
|
|
itt_t protoitt = 0;
|
|
int found = 0;
|
|
struct qedi_cmd *qedi_cmd = NULL;
|
|
- u32 rtid = 0;
|
|
u32 iscsi_cid;
|
|
struct qedi_conn *qedi_conn;
|
|
struct qedi_cmd *dbg_cmd;
|
|
@@ -779,7 +763,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
|
|
found = 1;
|
|
mtask = qedi_cmd->task;
|
|
tmf_hdr = (struct iscsi_tm *)mtask->hdr;
|
|
- rtid = work->rtid;
|
|
|
|
list_del_init(&work->list);
|
|
kfree(work);
|
|
@@ -821,8 +804,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
|
|
if (qedi_cmd->state == CLEANUP_WAIT_FAILED)
|
|
qedi_cmd->state = CLEANUP_RECV;
|
|
|
|
- qedi_clear_task_idx(qedi_conn->qedi, rtid);
|
|
-
|
|
spin_lock(&qedi_conn->list_lock);
|
|
if (likely(dbg_cmd->io_cmd_in_list)) {
|
|
dbg_cmd->io_cmd_in_list = false;
|
|
@@ -856,7 +837,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi,
|
|
QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_TID,
|
|
"Freeing tid=0x%x for cid=0x%x\n",
|
|
cqe->itid, qedi_conn->iscsi_conn_id);
|
|
- qedi_clear_task_idx(qedi_conn->qedi, cqe->itid);
|
|
|
|
} else {
|
|
qedi_get_proto_itt(qedi, cqe->itid, &ptmp_itt);
|
|
@@ -1453,7 +1433,7 @@ abort_ret:
|
|
|
|
ldel_exit:
|
|
spin_lock_bh(&qedi_conn->tmf_work_lock);
|
|
- if (!qedi_cmd->list_tmf_work) {
|
|
+ if (qedi_cmd->list_tmf_work) {
|
|
list_del_init(&list_work->list);
|
|
qedi_cmd->list_tmf_work = NULL;
|
|
kfree(list_work);
|
|
diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
|
|
index 087c7ff28cd52..5f7e62f19d83a 100644
|
|
--- a/drivers/scsi/qedi/qedi_iscsi.c
|
|
+++ b/drivers/scsi/qedi/qedi_iscsi.c
|
|
@@ -330,12 +330,22 @@ free_conn:
|
|
|
|
void qedi_mark_device_missing(struct iscsi_cls_session *cls_session)
|
|
{
|
|
- iscsi_block_session(cls_session);
|
|
+ struct iscsi_session *session = cls_session->dd_data;
|
|
+ struct qedi_conn *qedi_conn = session->leadconn->dd_data;
|
|
+
|
|
+ spin_lock_bh(&session->frwd_lock);
|
|
+ set_bit(QEDI_BLOCK_IO, &qedi_conn->qedi->flags);
|
|
+ spin_unlock_bh(&session->frwd_lock);
|
|
}
|
|
|
|
void qedi_mark_device_available(struct iscsi_cls_session *cls_session)
|
|
{
|
|
- iscsi_unblock_session(cls_session);
|
|
+ struct iscsi_session *session = cls_session->dd_data;
|
|
+ struct qedi_conn *qedi_conn = session->leadconn->dd_data;
|
|
+
|
|
+ spin_lock_bh(&session->frwd_lock);
|
|
+ clear_bit(QEDI_BLOCK_IO, &qedi_conn->qedi->flags);
|
|
+ spin_unlock_bh(&session->frwd_lock);
|
|
}
|
|
|
|
static int qedi_bind_conn_to_iscsi_cid(struct qedi_ctx *qedi,
|
|
@@ -783,7 +793,6 @@ static int qedi_mtask_xmit(struct iscsi_conn *conn, struct iscsi_task *task)
|
|
}
|
|
|
|
cmd->conn = conn->dd_data;
|
|
- cmd->scsi_cmd = NULL;
|
|
return qedi_iscsi_send_generic_request(task);
|
|
}
|
|
|
|
@@ -794,9 +803,16 @@ static int qedi_task_xmit(struct iscsi_task *task)
|
|
struct qedi_cmd *cmd = task->dd_data;
|
|
struct scsi_cmnd *sc = task->sc;
|
|
|
|
+ /* Clear now so in cleanup_task we know it didn't make it */
|
|
+ cmd->scsi_cmd = NULL;
|
|
+ cmd->task_id = U16_MAX;
|
|
+
|
|
if (test_bit(QEDI_IN_SHUTDOWN, &qedi_conn->qedi->flags))
|
|
return -ENODEV;
|
|
|
|
+ if (test_bit(QEDI_BLOCK_IO, &qedi_conn->qedi->flags))
|
|
+ return -EACCES;
|
|
+
|
|
cmd->state = 0;
|
|
cmd->task = NULL;
|
|
cmd->use_slowpath = false;
|
|
@@ -1394,13 +1410,24 @@ static umode_t qedi_attr_is_visible(int param_type, int param)
|
|
|
|
static void qedi_cleanup_task(struct iscsi_task *task)
|
|
{
|
|
- if (!task->sc || task->state == ISCSI_TASK_PENDING) {
|
|
+ struct qedi_cmd *cmd;
|
|
+
|
|
+ if (task->state == ISCSI_TASK_PENDING) {
|
|
QEDI_INFO(NULL, QEDI_LOG_IO, "Returning ref_cnt=%d\n",
|
|
refcount_read(&task->refcount));
|
|
return;
|
|
}
|
|
|
|
- qedi_iscsi_unmap_sg_list(task->dd_data);
|
|
+ if (task->sc)
|
|
+ qedi_iscsi_unmap_sg_list(task->dd_data);
|
|
+
|
|
+ cmd = task->dd_data;
|
|
+ if (cmd->task_id != U16_MAX)
|
|
+ qedi_clear_task_idx(iscsi_host_priv(task->conn->session->host),
|
|
+ cmd->task_id);
|
|
+
|
|
+ cmd->task_id = U16_MAX;
|
|
+ cmd->scsi_cmd = NULL;
|
|
}
|
|
|
|
struct iscsi_transport qedi_iscsi_transport = {
|
|
diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
|
|
index 2455d1448a7e3..edf9154327048 100644
|
|
--- a/drivers/scsi/qedi/qedi_main.c
|
|
+++ b/drivers/scsi/qedi/qedi_main.c
|
|
@@ -640,7 +640,7 @@ static struct qedi_ctx *qedi_host_alloc(struct pci_dev *pdev)
|
|
goto exit_setup_shost;
|
|
}
|
|
|
|
- shost->max_id = QEDI_MAX_ISCSI_CONNS_PER_HBA;
|
|
+ shost->max_id = QEDI_MAX_ISCSI_CONNS_PER_HBA - 1;
|
|
shost->max_channel = 0;
|
|
shost->max_lun = ~0;
|
|
shost->max_cmd_len = 16;
|
|
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
|
|
index 269bfb8f91655..89560562d9f69 100644
|
|
--- a/drivers/scsi/scsi_lib.c
|
|
+++ b/drivers/scsi/scsi_lib.c
|
|
@@ -2094,9 +2094,7 @@ EXPORT_SYMBOL_GPL(scsi_mode_select);
|
|
* @sshdr: place to put sense data (or NULL if no sense to be collected).
|
|
* must be SCSI_SENSE_BUFFERSIZE big.
|
|
*
|
|
- * Returns zero if unsuccessful, or the header offset (either 4
|
|
- * or 8 depending on whether a six or ten byte command was
|
|
- * issued) if successful.
|
|
+ * Returns zero if successful, or a negative error number on failure
|
|
*/
|
|
int
|
|
scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
|
|
@@ -2143,6 +2141,8 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
|
|
|
|
result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buffer, len,
|
|
sshdr, timeout, retries, NULL);
|
|
+ if (result < 0)
|
|
+ return result;
|
|
|
|
/* This code looks awful: what it's doing is making sure an
|
|
* ILLEGAL REQUEST sense return identifies the actual command
|
|
@@ -2187,13 +2187,15 @@ scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
|
|
data->block_descriptor_length = buffer[3];
|
|
}
|
|
data->header_length = header_length;
|
|
+ result = 0;
|
|
} else if ((status_byte(result) == CHECK_CONDITION) &&
|
|
scsi_sense_valid(sshdr) &&
|
|
sshdr->sense_key == UNIT_ATTENTION && retry_count) {
|
|
retry_count--;
|
|
goto retry;
|
|
}
|
|
-
|
|
+ if (result > 0)
|
|
+ result = -EIO;
|
|
return result;
|
|
}
|
|
EXPORT_SYMBOL(scsi_mode_sense);
|
|
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
|
|
index 6ce1cc992d1d0..b07105ae7c917 100644
|
|
--- a/drivers/scsi/scsi_transport_iscsi.c
|
|
+++ b/drivers/scsi/scsi_transport_iscsi.c
|
|
@@ -2459,6 +2459,18 @@ int iscsi_destroy_conn(struct iscsi_cls_conn *conn)
|
|
}
|
|
EXPORT_SYMBOL_GPL(iscsi_destroy_conn);
|
|
|
|
+void iscsi_put_conn(struct iscsi_cls_conn *conn)
|
|
+{
|
|
+ put_device(&conn->dev);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(iscsi_put_conn);
|
|
+
|
|
+void iscsi_get_conn(struct iscsi_cls_conn *conn)
|
|
+{
|
|
+ get_device(&conn->dev);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(iscsi_get_conn);
|
|
+
|
|
/*
|
|
* iscsi interface functions
|
|
*/
|
|
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
|
|
index c9abed8429c9a..4a96fb05731d2 100644
|
|
--- a/drivers/scsi/scsi_transport_sas.c
|
|
+++ b/drivers/scsi/scsi_transport_sas.c
|
|
@@ -1229,16 +1229,15 @@ int sas_read_port_mode_page(struct scsi_device *sdev)
|
|
char *buffer = kzalloc(BUF_SIZE, GFP_KERNEL), *msdata;
|
|
struct sas_end_device *rdev = sas_sdev_to_rdev(sdev);
|
|
struct scsi_mode_data mode_data;
|
|
- int res, error;
|
|
+ int error;
|
|
|
|
if (!buffer)
|
|
return -ENOMEM;
|
|
|
|
- res = scsi_mode_sense(sdev, 1, 0x19, buffer, BUF_SIZE, 30*HZ, 3,
|
|
- &mode_data, NULL);
|
|
+ error = scsi_mode_sense(sdev, 1, 0x19, buffer, BUF_SIZE, 30*HZ, 3,
|
|
+ &mode_data, NULL);
|
|
|
|
- error = -EINVAL;
|
|
- if (!scsi_status_is_good(res))
|
|
+ if (error)
|
|
goto out;
|
|
|
|
msdata = buffer + mode_data.header_length +
|
|
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
|
index a2c3d9ad9ee49..4df54d4b3c657 100644
|
|
--- a/drivers/scsi/sd.c
|
|
+++ b/drivers/scsi/sd.c
|
|
@@ -2684,18 +2684,18 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
|
|
* 5: Illegal Request, Sense Code 24: Invalid field in
|
|
* CDB.
|
|
*/
|
|
- if (!scsi_status_is_good(res))
|
|
+ if (res < 0)
|
|
res = sd_do_mode_sense(sdkp, 0, 0, buffer, 4, &data, NULL);
|
|
|
|
/*
|
|
* Third attempt: ask 255 bytes, as we did earlier.
|
|
*/
|
|
- if (!scsi_status_is_good(res))
|
|
+ if (res < 0)
|
|
res = sd_do_mode_sense(sdkp, 0, 0x3F, buffer, 255,
|
|
&data, NULL);
|
|
}
|
|
|
|
- if (!scsi_status_is_good(res)) {
|
|
+ if (res < 0) {
|
|
sd_first_printk(KERN_WARNING, sdkp,
|
|
"Test WP failed, assume Write Enabled\n");
|
|
} else {
|
|
@@ -2756,7 +2756,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
|
|
res = sd_do_mode_sense(sdkp, dbd, modepage, buffer, first_len,
|
|
&data, &sshdr);
|
|
|
|
- if (!scsi_status_is_good(res))
|
|
+ if (res < 0)
|
|
goto bad_sense;
|
|
|
|
if (!data.header_length) {
|
|
@@ -2788,7 +2788,7 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
|
|
res = sd_do_mode_sense(sdkp, dbd, modepage, buffer, len,
|
|
&data, &sshdr);
|
|
|
|
- if (scsi_status_is_good(res)) {
|
|
+ if (!res) {
|
|
int offset = data.header_length + data.block_descriptor_length;
|
|
|
|
while (offset < len) {
|
|
@@ -2906,7 +2906,7 @@ static void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
|
|
res = scsi_mode_sense(sdp, 1, 0x0a, buffer, 36, SD_TIMEOUT,
|
|
sdkp->max_retries, &data, &sshdr);
|
|
|
|
- if (!scsi_status_is_good(res) || !data.header_length ||
|
|
+ if (res < 0 || !data.header_length ||
|
|
data.length < 6) {
|
|
sd_first_printk(KERN_WARNING, sdkp,
|
|
"getting Control mode page failed, assume no ATO\n");
|
|
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
|
|
index 7815ed642d434..1a94c7b1de2df 100644
|
|
--- a/drivers/scsi/sr.c
|
|
+++ b/drivers/scsi/sr.c
|
|
@@ -913,7 +913,7 @@ static void get_capabilities(struct scsi_cd *cd)
|
|
rc = scsi_mode_sense(cd->device, 0, 0x2a, buffer, ms_len,
|
|
SR_TIMEOUT, 3, &data, NULL);
|
|
|
|
- if (!scsi_status_is_good(rc) || data.length > ms_len ||
|
|
+ if (rc < 0 || data.length > ms_len ||
|
|
data.header_length + data.block_descriptor_length > data.length) {
|
|
/* failed, drive doesn't have capabilities mode page */
|
|
cd->cdi.speed = 1;
|
|
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
|
|
index e6718a74e5dae..b2e28197a0861 100644
|
|
--- a/drivers/scsi/storvsc_drv.c
|
|
+++ b/drivers/scsi/storvsc_drv.c
|
|
@@ -1009,17 +1009,40 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
|
|
struct storvsc_scan_work *wrk;
|
|
void (*process_err_fn)(struct work_struct *work);
|
|
struct hv_host_device *host_dev = shost_priv(host);
|
|
- bool do_work = false;
|
|
|
|
- switch (SRB_STATUS(vm_srb->srb_status)) {
|
|
- case SRB_STATUS_ERROR:
|
|
+ /*
|
|
+ * In some situations, Hyper-V sets multiple bits in the
|
|
+ * srb_status, such as ABORTED and ERROR. So process them
|
|
+ * individually, with the most specific bits first.
|
|
+ */
|
|
+
|
|
+ if (vm_srb->srb_status & SRB_STATUS_INVALID_LUN) {
|
|
+ set_host_byte(scmnd, DID_NO_CONNECT);
|
|
+ process_err_fn = storvsc_remove_lun;
|
|
+ goto do_work;
|
|
+ }
|
|
+
|
|
+ if (vm_srb->srb_status & SRB_STATUS_ABORTED) {
|
|
+ if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID &&
|
|
+ /* Capacity data has changed */
|
|
+ (asc == 0x2a) && (ascq == 0x9)) {
|
|
+ process_err_fn = storvsc_device_scan;
|
|
+ /*
|
|
+ * Retry the I/O that triggered this.
|
|
+ */
|
|
+ set_host_byte(scmnd, DID_REQUEUE);
|
|
+ goto do_work;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (vm_srb->srb_status & SRB_STATUS_ERROR) {
|
|
/*
|
|
* Let upper layer deal with error when
|
|
* sense message is present.
|
|
*/
|
|
-
|
|
if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID)
|
|
- break;
|
|
+ return;
|
|
+
|
|
/*
|
|
* If there is an error; offline the device since all
|
|
* error recovery strategies would have already been
|
|
@@ -1032,37 +1055,19 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb,
|
|
set_host_byte(scmnd, DID_PASSTHROUGH);
|
|
break;
|
|
/*
|
|
- * On Some Windows hosts TEST_UNIT_READY command can return
|
|
- * SRB_STATUS_ERROR, let the upper level code deal with it
|
|
- * based on the sense information.
|
|
+ * On some Hyper-V hosts TEST_UNIT_READY command can
|
|
+ * return SRB_STATUS_ERROR. Let the upper level code
|
|
+ * deal with it based on the sense information.
|
|
*/
|
|
case TEST_UNIT_READY:
|
|
break;
|
|
default:
|
|
set_host_byte(scmnd, DID_ERROR);
|
|
}
|
|
- break;
|
|
- case SRB_STATUS_INVALID_LUN:
|
|
- set_host_byte(scmnd, DID_NO_CONNECT);
|
|
- do_work = true;
|
|
- process_err_fn = storvsc_remove_lun;
|
|
- break;
|
|
- case SRB_STATUS_ABORTED:
|
|
- if (vm_srb->srb_status & SRB_STATUS_AUTOSENSE_VALID &&
|
|
- (asc == 0x2a) && (ascq == 0x9)) {
|
|
- do_work = true;
|
|
- process_err_fn = storvsc_device_scan;
|
|
- /*
|
|
- * Retry the I/O that triggered this.
|
|
- */
|
|
- set_host_byte(scmnd, DID_REQUEUE);
|
|
- }
|
|
- break;
|
|
}
|
|
+ return;
|
|
|
|
- if (!do_work)
|
|
- return;
|
|
-
|
|
+do_work:
|
|
/*
|
|
* We need to schedule work to process this error; schedule it.
|
|
*/
|
|
diff --git a/drivers/soc/mediatek/mtk-pm-domains.c b/drivers/soc/mediatek/mtk-pm-domains.c
|
|
index 0af00efa0ef83..b762bc40f56bd 100644
|
|
--- a/drivers/soc/mediatek/mtk-pm-domains.c
|
|
+++ b/drivers/soc/mediatek/mtk-pm-domains.c
|
|
@@ -211,7 +211,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
|
|
if (ret)
|
|
return ret;
|
|
|
|
- ret = clk_bulk_enable(pd->num_clks, pd->clks);
|
|
+ ret = clk_bulk_prepare_enable(pd->num_clks, pd->clks);
|
|
if (ret)
|
|
goto err_reg;
|
|
|
|
@@ -229,7 +229,7 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
|
|
regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_ISO_BIT);
|
|
regmap_set_bits(scpsys->base, pd->data->ctl_offs, PWR_RST_B_BIT);
|
|
|
|
- ret = clk_bulk_enable(pd->num_subsys_clks, pd->subsys_clks);
|
|
+ ret = clk_bulk_prepare_enable(pd->num_subsys_clks, pd->subsys_clks);
|
|
if (ret)
|
|
goto err_pwr_ack;
|
|
|
|
@@ -246,9 +246,9 @@ static int scpsys_power_on(struct generic_pm_domain *genpd)
|
|
err_disable_sram:
|
|
scpsys_sram_disable(pd);
|
|
err_disable_subsys_clks:
|
|
- clk_bulk_disable(pd->num_subsys_clks, pd->subsys_clks);
|
|
+ clk_bulk_disable_unprepare(pd->num_subsys_clks, pd->subsys_clks);
|
|
err_pwr_ack:
|
|
- clk_bulk_disable(pd->num_clks, pd->clks);
|
|
+ clk_bulk_disable_unprepare(pd->num_clks, pd->clks);
|
|
err_reg:
|
|
scpsys_regulator_disable(pd->supply);
|
|
return ret;
|
|
@@ -269,7 +269,7 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- clk_bulk_disable(pd->num_subsys_clks, pd->subsys_clks);
|
|
+ clk_bulk_disable_unprepare(pd->num_subsys_clks, pd->subsys_clks);
|
|
|
|
/* subsys power off */
|
|
regmap_clear_bits(scpsys->base, pd->data->ctl_offs, PWR_RST_B_BIT);
|
|
@@ -284,7 +284,7 @@ static int scpsys_power_off(struct generic_pm_domain *genpd)
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- clk_bulk_disable(pd->num_clks, pd->clks);
|
|
+ clk_bulk_disable_unprepare(pd->num_clks, pd->clks);
|
|
|
|
scpsys_regulator_disable(pd->supply);
|
|
|
|
@@ -297,6 +297,7 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
const struct scpsys_domain_data *domain_data;
|
|
struct scpsys_domain *pd;
|
|
struct device_node *root_node = scpsys->dev->of_node;
|
|
+ struct device_node *smi_node;
|
|
struct property *prop;
|
|
const char *clk_name;
|
|
int i, ret, num_clks;
|
|
@@ -352,9 +353,13 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
if (IS_ERR(pd->infracfg))
|
|
return ERR_CAST(pd->infracfg);
|
|
|
|
- pd->smi = syscon_regmap_lookup_by_phandle_optional(node, "mediatek,smi");
|
|
- if (IS_ERR(pd->smi))
|
|
- return ERR_CAST(pd->smi);
|
|
+ smi_node = of_parse_phandle(node, "mediatek,smi", 0);
|
|
+ if (smi_node) {
|
|
+ pd->smi = device_node_to_regmap(smi_node);
|
|
+ of_node_put(smi_node);
|
|
+ if (IS_ERR(pd->smi))
|
|
+ return ERR_CAST(pd->smi);
|
|
+ }
|
|
|
|
num_clks = of_clk_get_parent_count(node);
|
|
if (num_clks > 0) {
|
|
@@ -405,14 +410,6 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
pd->subsys_clks[i].clk = clk;
|
|
}
|
|
|
|
- ret = clk_bulk_prepare(pd->num_clks, pd->clks);
|
|
- if (ret)
|
|
- goto err_put_subsys_clocks;
|
|
-
|
|
- ret = clk_bulk_prepare(pd->num_subsys_clks, pd->subsys_clks);
|
|
- if (ret)
|
|
- goto err_unprepare_clocks;
|
|
-
|
|
/*
|
|
* Initially turn on all domains to make the domains usable
|
|
* with !CONFIG_PM and to get the hardware in sync with the
|
|
@@ -427,7 +424,7 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
ret = scpsys_power_on(&pd->genpd);
|
|
if (ret < 0) {
|
|
dev_err(scpsys->dev, "%pOF: failed to power on domain: %d\n", node, ret);
|
|
- goto err_unprepare_clocks;
|
|
+ goto err_put_subsys_clocks;
|
|
}
|
|
}
|
|
|
|
@@ -435,7 +432,7 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
ret = -EINVAL;
|
|
dev_err(scpsys->dev,
|
|
"power domain with id %d already exists, check your device-tree\n", id);
|
|
- goto err_unprepare_subsys_clocks;
|
|
+ goto err_put_subsys_clocks;
|
|
}
|
|
|
|
if (!pd->data->name)
|
|
@@ -455,10 +452,6 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no
|
|
|
|
return scpsys->pd_data.domains[id];
|
|
|
|
-err_unprepare_subsys_clocks:
|
|
- clk_bulk_unprepare(pd->num_subsys_clks, pd->subsys_clks);
|
|
-err_unprepare_clocks:
|
|
- clk_bulk_unprepare(pd->num_clks, pd->clks);
|
|
err_put_subsys_clocks:
|
|
clk_bulk_put(pd->num_subsys_clks, pd->subsys_clks);
|
|
err_put_clocks:
|
|
@@ -537,10 +530,7 @@ static void scpsys_remove_one_domain(struct scpsys_domain *pd)
|
|
"failed to remove domain '%s' : %d - state may be inconsistent\n",
|
|
pd->genpd.name, ret);
|
|
|
|
- clk_bulk_unprepare(pd->num_clks, pd->clks);
|
|
clk_bulk_put(pd->num_clks, pd->clks);
|
|
-
|
|
- clk_bulk_unprepare(pd->num_subsys_clks, pd->subsys_clks);
|
|
clk_bulk_put(pd->num_subsys_clks, pd->subsys_clks);
|
|
}
|
|
|
|
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
|
|
index a9e0aa72654dd..100d904bf7007 100644
|
|
--- a/drivers/soundwire/bus.c
|
|
+++ b/drivers/soundwire/bus.c
|
|
@@ -821,26 +821,6 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,
|
|
mutex_unlock(&bus->bus_lock);
|
|
}
|
|
|
|
-static enum sdw_clk_stop_mode sdw_get_clk_stop_mode(struct sdw_slave *slave)
|
|
-{
|
|
- enum sdw_clk_stop_mode mode;
|
|
-
|
|
- /*
|
|
- * Query for clock stop mode if Slave implements
|
|
- * ops->get_clk_stop_mode, else read from property.
|
|
- */
|
|
- if (slave->ops && slave->ops->get_clk_stop_mode) {
|
|
- mode = slave->ops->get_clk_stop_mode(slave);
|
|
- } else {
|
|
- if (slave->prop.clk_stop_mode1)
|
|
- mode = SDW_CLK_STOP_MODE1;
|
|
- else
|
|
- mode = SDW_CLK_STOP_MODE0;
|
|
- }
|
|
-
|
|
- return mode;
|
|
-}
|
|
-
|
|
static int sdw_slave_clk_stop_callback(struct sdw_slave *slave,
|
|
enum sdw_clk_stop_mode mode,
|
|
enum sdw_clk_stop_type type)
|
|
@@ -849,11 +829,8 @@ static int sdw_slave_clk_stop_callback(struct sdw_slave *slave,
|
|
|
|
if (slave->ops && slave->ops->clk_stop) {
|
|
ret = slave->ops->clk_stop(slave, mode, type);
|
|
- if (ret < 0) {
|
|
- dev_err(&slave->dev,
|
|
- "Clk Stop type =%d failed: %d\n", type, ret);
|
|
+ if (ret < 0)
|
|
return ret;
|
|
- }
|
|
}
|
|
|
|
return 0;
|
|
@@ -880,7 +857,8 @@ static int sdw_slave_clk_stop_prepare(struct sdw_slave *slave,
|
|
} else {
|
|
ret = sdw_read_no_pm(slave, SDW_SCP_SYSTEMCTRL);
|
|
if (ret < 0) {
|
|
- dev_err(&slave->dev, "SDW_SCP_SYSTEMCTRL read failed:%d\n", ret);
|
|
+ if (ret != -ENODATA)
|
|
+ dev_err(&slave->dev, "SDW_SCP_SYSTEMCTRL read failed:%d\n", ret);
|
|
return ret;
|
|
}
|
|
val = ret;
|
|
@@ -889,9 +867,8 @@ static int sdw_slave_clk_stop_prepare(struct sdw_slave *slave,
|
|
|
|
ret = sdw_write_no_pm(slave, SDW_SCP_SYSTEMCTRL, val);
|
|
|
|
- if (ret < 0)
|
|
- dev_err(&slave->dev,
|
|
- "Clock Stop prepare failed for slave: %d", ret);
|
|
+ if (ret < 0 && ret != -ENODATA)
|
|
+ dev_err(&slave->dev, "SDW_SCP_SYSTEMCTRL write failed:%d\n", ret);
|
|
|
|
return ret;
|
|
}
|
|
@@ -933,7 +910,6 @@ static int sdw_bus_wait_for_clk_prep_deprep(struct sdw_bus *bus, u16 dev_num)
|
|
*/
|
|
int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
|
|
{
|
|
- enum sdw_clk_stop_mode slave_mode;
|
|
bool simple_clk_stop = true;
|
|
struct sdw_slave *slave;
|
|
bool is_slave = false;
|
|
@@ -943,6 +919,9 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
|
|
* In order to save on transition time, prepare
|
|
* each Slave and then wait for all Slave(s) to be
|
|
* prepared for clock stop.
|
|
+ * If one of the Slave devices has lost sync and
|
|
+ * replies with Command Ignored/-ENODATA, we continue
|
|
+ * the loop
|
|
*/
|
|
list_for_each_entry(slave, &bus->slaves, node) {
|
|
if (!slave->dev_num)
|
|
@@ -955,36 +934,45 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
|
|
/* Identify if Slave(s) are available on Bus */
|
|
is_slave = true;
|
|
|
|
- slave_mode = sdw_get_clk_stop_mode(slave);
|
|
- slave->curr_clk_stop_mode = slave_mode;
|
|
-
|
|
- ret = sdw_slave_clk_stop_callback(slave, slave_mode,
|
|
+ ret = sdw_slave_clk_stop_callback(slave,
|
|
+ SDW_CLK_STOP_MODE0,
|
|
SDW_CLK_PRE_PREPARE);
|
|
- if (ret < 0) {
|
|
- dev_err(&slave->dev,
|
|
- "pre-prepare failed:%d", ret);
|
|
- return ret;
|
|
- }
|
|
-
|
|
- ret = sdw_slave_clk_stop_prepare(slave,
|
|
- slave_mode, true);
|
|
- if (ret < 0) {
|
|
- dev_err(&slave->dev,
|
|
- "pre-prepare failed:%d", ret);
|
|
+ if (ret < 0 && ret != -ENODATA) {
|
|
+ dev_err(&slave->dev, "clock stop pre-prepare cb failed:%d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
- if (slave_mode == SDW_CLK_STOP_MODE1)
|
|
+ /* Only prepare a Slave device if needed */
|
|
+ if (!slave->prop.simple_clk_stop_capable) {
|
|
simple_clk_stop = false;
|
|
+
|
|
+ ret = sdw_slave_clk_stop_prepare(slave,
|
|
+ SDW_CLK_STOP_MODE0,
|
|
+ true);
|
|
+ if (ret < 0 && ret != -ENODATA) {
|
|
+ dev_err(&slave->dev, "clock stop prepare failed:%d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
/* Skip remaining clock stop preparation if no Slave is attached */
|
|
if (!is_slave)
|
|
- return ret;
|
|
+ return 0;
|
|
|
|
+ /*
|
|
+ * Don't wait for all Slaves to be ready if they follow the simple
|
|
+ * state machine
|
|
+ */
|
|
if (!simple_clk_stop) {
|
|
ret = sdw_bus_wait_for_clk_prep_deprep(bus,
|
|
SDW_BROADCAST_DEV_NUM);
|
|
+ /*
|
|
+ * if there are no Slave devices present and the reply is
|
|
+ * Command_Ignored/-ENODATA, we don't need to continue with the
|
|
+ * flow and can just return here. The error code is not modified
|
|
+ * and its handling left as an exercise for the caller.
|
|
+ */
|
|
if (ret < 0)
|
|
return ret;
|
|
}
|
|
@@ -998,21 +986,17 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
|
|
slave->status != SDW_SLAVE_ALERT)
|
|
continue;
|
|
|
|
- slave_mode = slave->curr_clk_stop_mode;
|
|
+ ret = sdw_slave_clk_stop_callback(slave,
|
|
+ SDW_CLK_STOP_MODE0,
|
|
+ SDW_CLK_POST_PREPARE);
|
|
|
|
- if (slave_mode == SDW_CLK_STOP_MODE1) {
|
|
- ret = sdw_slave_clk_stop_callback(slave,
|
|
- slave_mode,
|
|
- SDW_CLK_POST_PREPARE);
|
|
-
|
|
- if (ret < 0) {
|
|
- dev_err(&slave->dev,
|
|
- "post-prepare failed:%d", ret);
|
|
- }
|
|
+ if (ret < 0 && ret != -ENODATA) {
|
|
+ dev_err(&slave->dev, "clock stop post-prepare cb failed:%d\n", ret);
|
|
+ return ret;
|
|
}
|
|
}
|
|
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
EXPORT_SYMBOL(sdw_bus_prep_clk_stop);
|
|
|
|
@@ -1035,12 +1019,8 @@ int sdw_bus_clk_stop(struct sdw_bus *bus)
|
|
ret = sdw_bwrite_no_pm(bus, SDW_BROADCAST_DEV_NUM,
|
|
SDW_SCP_CTRL, SDW_SCP_CTRL_CLK_STP_NOW);
|
|
if (ret < 0) {
|
|
- if (ret == -ENODATA)
|
|
- dev_dbg(bus->dev,
|
|
- "ClockStopNow Broadcast msg ignored %d", ret);
|
|
- else
|
|
- dev_err(bus->dev,
|
|
- "ClockStopNow Broadcast msg failed %d", ret);
|
|
+ if (ret != -ENODATA)
|
|
+ dev_err(bus->dev, "ClockStopNow Broadcast msg failed %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
@@ -1059,7 +1039,6 @@ EXPORT_SYMBOL(sdw_bus_clk_stop);
|
|
*/
|
|
int sdw_bus_exit_clk_stop(struct sdw_bus *bus)
|
|
{
|
|
- enum sdw_clk_stop_mode mode;
|
|
bool simple_clk_stop = true;
|
|
struct sdw_slave *slave;
|
|
bool is_slave = false;
|
|
@@ -1081,33 +1060,36 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)
|
|
/* Identify if Slave(s) are available on Bus */
|
|
is_slave = true;
|
|
|
|
- mode = slave->curr_clk_stop_mode;
|
|
-
|
|
- if (mode == SDW_CLK_STOP_MODE1) {
|
|
- simple_clk_stop = false;
|
|
- continue;
|
|
- }
|
|
-
|
|
- ret = sdw_slave_clk_stop_callback(slave, mode,
|
|
+ ret = sdw_slave_clk_stop_callback(slave, SDW_CLK_STOP_MODE0,
|
|
SDW_CLK_PRE_DEPREPARE);
|
|
if (ret < 0)
|
|
- dev_warn(&slave->dev,
|
|
- "clk stop deprep failed:%d", ret);
|
|
+ dev_warn(&slave->dev, "clock stop pre-deprepare cb failed:%d\n", ret);
|
|
|
|
- ret = sdw_slave_clk_stop_prepare(slave, mode,
|
|
- false);
|
|
+ /* Only de-prepare a Slave device if needed */
|
|
+ if (!slave->prop.simple_clk_stop_capable) {
|
|
+ simple_clk_stop = false;
|
|
|
|
- if (ret < 0)
|
|
- dev_warn(&slave->dev,
|
|
- "clk stop deprep failed:%d", ret);
|
|
+ ret = sdw_slave_clk_stop_prepare(slave, SDW_CLK_STOP_MODE0,
|
|
+ false);
|
|
+
|
|
+ if (ret < 0)
|
|
+ dev_warn(&slave->dev, "clock stop deprepare failed:%d\n", ret);
|
|
+ }
|
|
}
|
|
|
|
/* Skip remaining clock stop de-preparation if no Slave is attached */
|
|
if (!is_slave)
|
|
return 0;
|
|
|
|
- if (!simple_clk_stop)
|
|
- sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM);
|
|
+ /*
|
|
+ * Don't wait for all Slaves to be ready if they follow the simple
|
|
+ * state machine
|
|
+ */
|
|
+ if (!simple_clk_stop) {
|
|
+ ret = sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM);
|
|
+ if (ret < 0)
|
|
+ dev_warn(&slave->dev, "clock stop deprepare wait failed:%d\n", ret);
|
|
+ }
|
|
|
|
list_for_each_entry(slave, &bus->slaves, node) {
|
|
if (!slave->dev_num)
|
|
@@ -1117,9 +1099,10 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)
|
|
slave->status != SDW_SLAVE_ALERT)
|
|
continue;
|
|
|
|
- mode = slave->curr_clk_stop_mode;
|
|
- sdw_slave_clk_stop_callback(slave, mode,
|
|
- SDW_CLK_POST_DEPREPARE);
|
|
+ ret = sdw_slave_clk_stop_callback(slave, SDW_CLK_STOP_MODE0,
|
|
+ SDW_CLK_POST_DEPREPARE);
|
|
+ if (ret < 0)
|
|
+ dev_warn(&slave->dev, "clock stop post-deprepare cb failed:%d\n", ret);
|
|
}
|
|
|
|
return 0;
|
|
diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h
|
|
index ff21343fbe0be..a428b0d7e37c7 100644
|
|
--- a/drivers/staging/rtl8723bs/hal/odm.h
|
|
+++ b/drivers/staging/rtl8723bs/hal/odm.h
|
|
@@ -197,10 +197,7 @@ struct odm_rate_adaptive {
|
|
|
|
#define AVG_THERMAL_NUM 8
|
|
#define IQK_Matrix_REG_NUM 8
|
|
-#define IQK_Matrix_Settings_NUM (14 + 24 + 21) /* Channels_2_4G_NUM
|
|
- * + Channels_5G_20M_NUM
|
|
- * + Channels_5G
|
|
- */
|
|
+#define IQK_Matrix_Settings_NUM 14 /* Channels_2_4G_NUM */
|
|
|
|
#define DM_Type_ByFW 0
|
|
#define DM_Type_ByDriver 1
|
|
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
|
|
index 6d0d0beed402f..0cd5608e64969 100644
|
|
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
|
|
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
|
|
@@ -2602,10 +2602,9 @@ static int rtw_dbg_port(struct net_device *dev,
|
|
case 0x12: /* set rx_stbc */
|
|
{
|
|
struct registry_priv *pregpriv = &padapter->registrypriv;
|
|
- /* 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, 0x3: enable both 2.4g and 5g */
|
|
- /* default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ */
|
|
- if (extra_arg == 0 || extra_arg == 1 ||
|
|
- extra_arg == 2 || extra_arg == 3)
|
|
+ /* 0: disable, bit(0):enable 2.4g */
|
|
+ /* default is set to enable 2.4GHZ */
|
|
+ if (extra_arg == 0 || extra_arg == 1)
|
|
pregpriv->rx_stbc = extra_arg;
|
|
}
|
|
break;
|
|
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
|
|
index e1e412348076b..1a60adb1d30a0 100644
|
|
--- a/drivers/thermal/rcar_gen3_thermal.c
|
|
+++ b/drivers/thermal/rcar_gen3_thermal.c
|
|
@@ -143,7 +143,7 @@ static void rcar_gen3_thermal_calc_coefs(struct rcar_gen3_thermal_tsc *tsc,
|
|
* Division is not scaled in BSP and if scaled it might overflow
|
|
* the dividend (4095 * 4095 << 14 > INT_MAX) so keep it unscaled
|
|
*/
|
|
- tsc->tj_t = (FIXPT_INT((ptat[1] - ptat[2]) * 157)
|
|
+ tsc->tj_t = (FIXPT_INT((ptat[1] - ptat[2]) * (ths_tj_1 - TJ_3))
|
|
/ (ptat[0] - ptat[2])) + FIXPT_INT(TJ_3);
|
|
|
|
tsc->coef.a1 = FIXPT_DIV(FIXPT_INT(thcode[1] - thcode[2]),
|
|
diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
|
|
index 3682edb2f4669..fe06cccf14b38 100644
|
|
--- a/drivers/thermal/sprd_thermal.c
|
|
+++ b/drivers/thermal/sprd_thermal.c
|
|
@@ -532,6 +532,7 @@ static const struct of_device_id sprd_thermal_of_match[] = {
|
|
{ .compatible = "sprd,ums512-thermal", .data = &ums512_data },
|
|
{ },
|
|
};
|
|
+MODULE_DEVICE_TABLE(of, sprd_thermal_of_match);
|
|
|
|
static const struct dev_pm_ops sprd_thermal_pm_ops = {
|
|
SET_SYSTEM_SLEEP_PM_OPS(sprd_thm_suspend, sprd_thm_resume)
|
|
diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c
|
|
index 46d0906a30707..470885e6f1c86 100644
|
|
--- a/drivers/thunderbolt/eeprom.c
|
|
+++ b/drivers/thunderbolt/eeprom.c
|
|
@@ -214,7 +214,10 @@ static u32 tb_crc32(void *data, size_t len)
|
|
return ~__crc32c_le(~0, data, len);
|
|
}
|
|
|
|
-#define TB_DROM_DATA_START 13
|
|
+#define TB_DROM_DATA_START 13
|
|
+#define TB_DROM_HEADER_SIZE 22
|
|
+#define USB4_DROM_HEADER_SIZE 16
|
|
+
|
|
struct tb_drom_header {
|
|
/* BYTE 0 */
|
|
u8 uid_crc8; /* checksum for uid */
|
|
@@ -224,9 +227,9 @@ struct tb_drom_header {
|
|
u32 data_crc32; /* checksum for data_len bytes starting at byte 13 */
|
|
/* BYTE 13 */
|
|
u8 device_rom_revision; /* should be <= 1 */
|
|
- u16 data_len:10;
|
|
- u8 __unknown1:6;
|
|
- /* BYTES 16-21 */
|
|
+ u16 data_len:12;
|
|
+ u8 reserved:4;
|
|
+ /* BYTES 16-21 - Only for TBT DROM, nonexistent in USB4 DROM */
|
|
u16 vendor_id;
|
|
u16 model_id;
|
|
u8 model_rev;
|
|
@@ -401,10 +404,10 @@ static int tb_drom_parse_entry_port(struct tb_switch *sw,
|
|
*
|
|
* Drom must have been copied to sw->drom.
|
|
*/
|
|
-static int tb_drom_parse_entries(struct tb_switch *sw)
|
|
+static int tb_drom_parse_entries(struct tb_switch *sw, size_t header_size)
|
|
{
|
|
struct tb_drom_header *header = (void *) sw->drom;
|
|
- u16 pos = sizeof(*header);
|
|
+ u16 pos = header_size;
|
|
u16 drom_size = header->data_len + TB_DROM_DATA_START;
|
|
int res;
|
|
|
|
@@ -566,7 +569,7 @@ static int tb_drom_parse(struct tb_switch *sw)
|
|
header->data_crc32, crc);
|
|
}
|
|
|
|
- return tb_drom_parse_entries(sw);
|
|
+ return tb_drom_parse_entries(sw, TB_DROM_HEADER_SIZE);
|
|
}
|
|
|
|
static int usb4_drom_parse(struct tb_switch *sw)
|
|
@@ -583,7 +586,7 @@ static int usb4_drom_parse(struct tb_switch *sw)
|
|
return -EINVAL;
|
|
}
|
|
|
|
- return tb_drom_parse_entries(sw);
|
|
+ return tb_drom_parse_entries(sw, USB4_DROM_HEADER_SIZE);
|
|
}
|
|
|
|
/**
|
|
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
|
|
index 0b077b45d6a94..bce28729dd7bd 100644
|
|
--- a/drivers/tty/serial/8250/8250_of.c
|
|
+++ b/drivers/tty/serial/8250/8250_of.c
|
|
@@ -192,6 +192,10 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
|
|
u32 tx_threshold;
|
|
int ret;
|
|
|
|
+ if (IS_ENABLED(CONFIG_SERIAL_8250_BCM7271) &&
|
|
+ of_device_is_compatible(ofdev->dev.of_node, "brcm,bcm7271-uart"))
|
|
+ return -ENODEV;
|
|
+
|
|
port_type = (unsigned long)of_device_get_match_data(&ofdev->dev);
|
|
if (port_type == PORT_UNKNOWN)
|
|
return -EINVAL;
|
|
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
|
|
index 53f2697014a02..dc2ef05a10ebe 100644
|
|
--- a/drivers/tty/serial/8250/serial_cs.c
|
|
+++ b/drivers/tty/serial/8250/serial_cs.c
|
|
@@ -306,6 +306,7 @@ static int serial_resume(struct pcmcia_device *link)
|
|
static int serial_probe(struct pcmcia_device *link)
|
|
{
|
|
struct serial_info *info;
|
|
+ int ret;
|
|
|
|
dev_dbg(&link->dev, "serial_attach()\n");
|
|
|
|
@@ -320,7 +321,15 @@ static int serial_probe(struct pcmcia_device *link)
|
|
if (do_sound)
|
|
link->config_flags |= CONF_ENABLE_SPKR;
|
|
|
|
- return serial_config(link);
|
|
+ ret = serial_config(link);
|
|
+ if (ret)
|
|
+ goto free_info;
|
|
+
|
|
+ return 0;
|
|
+
|
|
+free_info:
|
|
+ kfree(info);
|
|
+ return ret;
|
|
}
|
|
|
|
static void serial_detach(struct pcmcia_device *link)
|
|
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
|
|
index 9c78e43e669d7..0d7ea144a4a6d 100644
|
|
--- a/drivers/tty/serial/fsl_lpuart.c
|
|
+++ b/drivers/tty/serial/fsl_lpuart.c
|
|
@@ -1571,6 +1571,9 @@ static void lpuart_tx_dma_startup(struct lpuart_port *sport)
|
|
u32 uartbaud;
|
|
int ret;
|
|
|
|
+ if (uart_console(&sport->port))
|
|
+ goto err;
|
|
+
|
|
if (!sport->dma_tx_chan)
|
|
goto err;
|
|
|
|
@@ -1600,6 +1603,9 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport)
|
|
int ret;
|
|
unsigned char cr3;
|
|
|
|
+ if (uart_console(&sport->port))
|
|
+ goto err;
|
|
+
|
|
if (!sport->dma_rx_chan)
|
|
goto err;
|
|
|
|
@@ -2404,6 +2410,9 @@ lpuart32_console_get_options(struct lpuart_port *sport, int *baud,
|
|
|
|
bd = lpuart32_read(&sport->port, UARTBAUD);
|
|
bd &= UARTBAUD_SBR_MASK;
|
|
+ if (!bd)
|
|
+ return;
|
|
+
|
|
sbr = bd;
|
|
uartclk = lpuart_get_baud_clk_rate(sport);
|
|
/*
|
|
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
|
|
index f42ccc40ffa64..a5f15f22d9efe 100644
|
|
--- a/drivers/tty/serial/uartlite.c
|
|
+++ b/drivers/tty/serial/uartlite.c
|
|
@@ -505,21 +505,23 @@ static void ulite_console_write(struct console *co, const char *s,
|
|
|
|
static int ulite_console_setup(struct console *co, char *options)
|
|
{
|
|
- struct uart_port *port;
|
|
+ struct uart_port *port = NULL;
|
|
int baud = 9600;
|
|
int bits = 8;
|
|
int parity = 'n';
|
|
int flow = 'n';
|
|
|
|
-
|
|
- port = console_port;
|
|
+ if (co->index >= 0 && co->index < ULITE_NR_UARTS)
|
|
+ port = ulite_ports + co->index;
|
|
|
|
/* Has the device been initialized yet? */
|
|
- if (!port->mapbase) {
|
|
+ if (!port || !port->mapbase) {
|
|
pr_debug("console on ttyUL%i not present\n", co->index);
|
|
return -ENODEV;
|
|
}
|
|
|
|
+ console_port = port;
|
|
+
|
|
/* not initialized yet? */
|
|
if (!port->membase) {
|
|
if (ulite_request_port(port))
|
|
@@ -655,17 +657,6 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
|
|
|
|
dev_set_drvdata(dev, port);
|
|
|
|
-#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
|
|
- /*
|
|
- * If console hasn't been found yet try to assign this port
|
|
- * because it is required to be assigned for console setup function.
|
|
- * If register_console() don't assign value, then console_port pointer
|
|
- * is cleanup.
|
|
- */
|
|
- if (ulite_uart_driver.cons->index == -1)
|
|
- console_port = port;
|
|
-#endif
|
|
-
|
|
/* Register the port */
|
|
rc = uart_add_one_port(&ulite_uart_driver, port);
|
|
if (rc) {
|
|
@@ -675,12 +666,6 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
|
|
return rc;
|
|
}
|
|
|
|
-#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
|
|
- /* This is not port which is used for console that's why clean it up */
|
|
- if (ulite_uart_driver.cons->index == -1)
|
|
- console_port = NULL;
|
|
-#endif
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c
|
|
index 6c4e3a19f42cb..c9545a4eff664 100644
|
|
--- a/drivers/usb/common/usb-conn-gpio.c
|
|
+++ b/drivers/usb/common/usb-conn-gpio.c
|
|
@@ -149,14 +149,32 @@ static int usb_charger_get_property(struct power_supply *psy,
|
|
return 0;
|
|
}
|
|
|
|
-static int usb_conn_probe(struct platform_device *pdev)
|
|
+static int usb_conn_psy_register(struct usb_conn_info *info)
|
|
{
|
|
- struct device *dev = &pdev->dev;
|
|
- struct power_supply_desc *desc;
|
|
- struct usb_conn_info *info;
|
|
+ struct device *dev = info->dev;
|
|
+ struct power_supply_desc *desc = &info->desc;
|
|
struct power_supply_config cfg = {
|
|
.of_node = dev->of_node,
|
|
};
|
|
+
|
|
+ desc->name = "usb-charger";
|
|
+ desc->properties = usb_charger_properties;
|
|
+ desc->num_properties = ARRAY_SIZE(usb_charger_properties);
|
|
+ desc->get_property = usb_charger_get_property;
|
|
+ desc->type = POWER_SUPPLY_TYPE_USB;
|
|
+ cfg.drv_data = info;
|
|
+
|
|
+ info->charger = devm_power_supply_register(dev, desc, &cfg);
|
|
+ if (IS_ERR(info->charger))
|
|
+ dev_err(dev, "Unable to register charger\n");
|
|
+
|
|
+ return PTR_ERR_OR_ZERO(info->charger);
|
|
+}
|
|
+
|
|
+static int usb_conn_probe(struct platform_device *pdev)
|
|
+{
|
|
+ struct device *dev = &pdev->dev;
|
|
+ struct usb_conn_info *info;
|
|
bool need_vbus = true;
|
|
int ret = 0;
|
|
|
|
@@ -218,6 +236,10 @@ static int usb_conn_probe(struct platform_device *pdev)
|
|
return PTR_ERR(info->role_sw);
|
|
}
|
|
|
|
+ ret = usb_conn_psy_register(info);
|
|
+ if (ret)
|
|
+ goto put_role_sw;
|
|
+
|
|
if (info->id_gpiod) {
|
|
info->id_irq = gpiod_to_irq(info->id_gpiod);
|
|
if (info->id_irq < 0) {
|
|
@@ -252,20 +274,6 @@ static int usb_conn_probe(struct platform_device *pdev)
|
|
}
|
|
}
|
|
|
|
- desc = &info->desc;
|
|
- desc->name = "usb-charger";
|
|
- desc->properties = usb_charger_properties;
|
|
- desc->num_properties = ARRAY_SIZE(usb_charger_properties);
|
|
- desc->get_property = usb_charger_get_property;
|
|
- desc->type = POWER_SUPPLY_TYPE_USB;
|
|
- cfg.drv_data = info;
|
|
-
|
|
- info->charger = devm_power_supply_register(dev, desc, &cfg);
|
|
- if (IS_ERR(info->charger)) {
|
|
- dev_err(dev, "Unable to register charger\n");
|
|
- return PTR_ERR(info->charger);
|
|
- }
|
|
-
|
|
platform_set_drvdata(pdev, info);
|
|
|
|
/* Perform initial detection */
|
|
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
|
|
index 1e51460938b83..2b37bdd39a740 100644
|
|
--- a/drivers/usb/dwc3/dwc3-pci.c
|
|
+++ b/drivers/usb/dwc3/dwc3-pci.c
|
|
@@ -36,7 +36,7 @@
|
|
#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e
|
|
#define PCI_DEVICE_ID_INTEL_CNPV 0xa3b0
|
|
#define PCI_DEVICE_ID_INTEL_ICLLP 0x34ee
|
|
-#define PCI_DEVICE_ID_INTEL_EHLLP 0x4b7e
|
|
+#define PCI_DEVICE_ID_INTEL_EHL 0x4b7e
|
|
#define PCI_DEVICE_ID_INTEL_TGPLP 0xa0ee
|
|
#define PCI_DEVICE_ID_INTEL_TGPH 0x43ee
|
|
#define PCI_DEVICE_ID_INTEL_JSP 0x4dee
|
|
@@ -167,7 +167,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc)
|
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
|
|
if (pdev->device == PCI_DEVICE_ID_INTEL_BXT ||
|
|
pdev->device == PCI_DEVICE_ID_INTEL_BXT_M ||
|
|
- pdev->device == PCI_DEVICE_ID_INTEL_EHLLP) {
|
|
+ pdev->device == PCI_DEVICE_ID_INTEL_EHL) {
|
|
guid_parse(PCI_INTEL_BXT_DSM_GUID, &dwc->guid);
|
|
dwc->has_dsm_for_pm = true;
|
|
}
|
|
@@ -375,8 +375,8 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
|
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
|
|
(kernel_ulong_t) &dwc3_pci_intel_swnode, },
|
|
|
|
- { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP),
|
|
- (kernel_ulong_t) &dwc3_pci_intel_swnode },
|
|
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHL),
|
|
+ (kernel_ulong_t) &dwc3_pci_intel_swnode, },
|
|
|
|
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
|
|
(kernel_ulong_t) &dwc3_pci_intel_swnode, },
|
|
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
|
|
index e556993081170..a82b3de1a54be 100644
|
|
--- a/drivers/usb/gadget/function/f_hid.c
|
|
+++ b/drivers/usb/gadget/function/f_hid.c
|
|
@@ -88,7 +88,7 @@ static struct usb_interface_descriptor hidg_interface_desc = {
|
|
static struct hid_descriptor hidg_desc = {
|
|
.bLength = sizeof hidg_desc,
|
|
.bDescriptorType = HID_DT_HID,
|
|
- .bcdHID = 0x0101,
|
|
+ .bcdHID = cpu_to_le16(0x0101),
|
|
.bCountryCode = 0x00,
|
|
.bNumDescriptors = 0x1,
|
|
/*.desc[0].bDescriptorType = DYNAMIC */
|
|
diff --git a/drivers/usb/gadget/legacy/hid.c b/drivers/usb/gadget/legacy/hid.c
|
|
index c4eda7fe7ab45..5b27d289443fe 100644
|
|
--- a/drivers/usb/gadget/legacy/hid.c
|
|
+++ b/drivers/usb/gadget/legacy/hid.c
|
|
@@ -171,8 +171,10 @@ static int hid_bind(struct usb_composite_dev *cdev)
|
|
struct usb_descriptor_header *usb_desc;
|
|
|
|
usb_desc = usb_otg_descriptor_alloc(gadget);
|
|
- if (!usb_desc)
|
|
+ if (!usb_desc) {
|
|
+ status = -ENOMEM;
|
|
goto put;
|
|
+ }
|
|
usb_otg_descriptor_init(gadget, usb_desc);
|
|
otg_desc[0] = usb_desc;
|
|
otg_desc[1] = NULL;
|
|
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
|
|
index 27283654ca080..9248ce8d09a4a 100644
|
|
--- a/drivers/usb/host/xhci.c
|
|
+++ b/drivers/usb/host/xhci.c
|
|
@@ -1361,12 +1361,17 @@ static void xhci_unmap_temp_buf(struct usb_hcd *hcd, struct urb *urb)
|
|
urb->transfer_buffer_length,
|
|
dir);
|
|
|
|
- if (usb_urb_dir_in(urb))
|
|
+ if (usb_urb_dir_in(urb)) {
|
|
len = sg_pcopy_from_buffer(urb->sg, urb->num_sgs,
|
|
urb->transfer_buffer,
|
|
buf_len,
|
|
0);
|
|
-
|
|
+ if (len != buf_len) {
|
|
+ xhci_dbg(hcd_to_xhci(hcd),
|
|
+ "Copy from tmp buf to urb sg list failed\n");
|
|
+ urb->actual_length = len;
|
|
+ }
|
|
+ }
|
|
urb->transfer_flags &= ~URB_DMA_MAP_SINGLE;
|
|
kfree(urb->transfer_buffer);
|
|
urb->transfer_buffer = NULL;
|
|
diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c
|
|
index 800cfd1967ada..cfa56a58b271b 100644
|
|
--- a/drivers/vdpa/mlx5/core/mr.c
|
|
+++ b/drivers/vdpa/mlx5/core/mr.c
|
|
@@ -219,11 +219,6 @@ static void destroy_indirect_key(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_m
|
|
mlx5_vdpa_destroy_mkey(mvdev, &mkey->mkey);
|
|
}
|
|
|
|
-static struct device *get_dma_device(struct mlx5_vdpa_dev *mvdev)
|
|
-{
|
|
- return &mvdev->mdev->pdev->dev;
|
|
-}
|
|
-
|
|
static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr,
|
|
struct vhost_iotlb *iotlb)
|
|
{
|
|
@@ -239,7 +234,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr
|
|
u64 pa;
|
|
u64 paend;
|
|
struct scatterlist *sg;
|
|
- struct device *dma = get_dma_device(mvdev);
|
|
+ struct device *dma = mvdev->vdev.dma_dev;
|
|
|
|
for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);
|
|
map; map = vhost_iotlb_itree_next(map, start, mr->end - 1)) {
|
|
@@ -298,7 +293,7 @@ err_map:
|
|
|
|
static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr)
|
|
{
|
|
- struct device *dma = get_dma_device(mvdev);
|
|
+ struct device *dma = mvdev->vdev.dma_dev;
|
|
|
|
destroy_direct_mr(mvdev, mr);
|
|
dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);
|
|
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
|
|
index dda5dc6f77378..32dd5ed712cb4 100644
|
|
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
|
|
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
|
|
@@ -611,8 +611,8 @@ static void cq_destroy(struct mlx5_vdpa_net *ndev, u16 idx)
|
|
mlx5_db_free(ndev->mvdev.mdev, &vcq->db);
|
|
}
|
|
|
|
-static int umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq, int num,
|
|
- struct mlx5_vdpa_umem **umemp)
|
|
+static void set_umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq, int num,
|
|
+ struct mlx5_vdpa_umem **umemp)
|
|
{
|
|
struct mlx5_core_dev *mdev = ndev->mvdev.mdev;
|
|
int p_a;
|
|
@@ -635,7 +635,7 @@ static int umem_size(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq
|
|
*umemp = &mvq->umem3;
|
|
break;
|
|
}
|
|
- return p_a * mvq->num_ent + p_b;
|
|
+ (*umemp)->size = p_a * mvq->num_ent + p_b;
|
|
}
|
|
|
|
static void umem_frag_buf_free(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_umem *umem)
|
|
@@ -651,15 +651,10 @@ static int create_umem(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *m
|
|
void *in;
|
|
int err;
|
|
__be64 *pas;
|
|
- int size;
|
|
struct mlx5_vdpa_umem *umem;
|
|
|
|
- size = umem_size(ndev, mvq, num, &umem);
|
|
- if (size < 0)
|
|
- return size;
|
|
-
|
|
- umem->size = size;
|
|
- err = umem_frag_buf_alloc(ndev, umem, size);
|
|
+ set_umem_size(ndev, mvq, num, &umem);
|
|
+ err = umem_frag_buf_alloc(ndev, umem, umem->size);
|
|
if (err)
|
|
return err;
|
|
|
|
@@ -829,9 +824,9 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
|
|
MLX5_SET(virtio_q, vq_ctx, umem_1_id, mvq->umem1.id);
|
|
MLX5_SET(virtio_q, vq_ctx, umem_1_size, mvq->umem1.size);
|
|
MLX5_SET(virtio_q, vq_ctx, umem_2_id, mvq->umem2.id);
|
|
- MLX5_SET(virtio_q, vq_ctx, umem_2_size, mvq->umem1.size);
|
|
+ MLX5_SET(virtio_q, vq_ctx, umem_2_size, mvq->umem2.size);
|
|
MLX5_SET(virtio_q, vq_ctx, umem_3_id, mvq->umem3.id);
|
|
- MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem1.size);
|
|
+ MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem3.size);
|
|
MLX5_SET(virtio_q, vq_ctx, pd, ndev->mvdev.res.pdn);
|
|
if (MLX5_CAP_DEV_VDPA_EMULATION(ndev->mvdev.mdev, eth_frame_offload_type))
|
|
MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0, 1);
|
|
@@ -1772,6 +1767,14 @@ out:
|
|
mutex_unlock(&ndev->reslock);
|
|
}
|
|
|
|
+static void clear_vqs_ready(struct mlx5_vdpa_net *ndev)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < ndev->mvdev.max_vqs; i++)
|
|
+ ndev->vqs[i].ready = false;
|
|
+}
|
|
+
|
|
static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
|
|
{
|
|
struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
|
|
@@ -1782,6 +1785,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
|
|
if (!status) {
|
|
mlx5_vdpa_info(mvdev, "performing device reset\n");
|
|
teardown_driver(ndev);
|
|
+ clear_vqs_ready(ndev);
|
|
mlx5_vdpa_destroy_mr(&ndev->mvdev);
|
|
ndev->mvdev.status = 0;
|
|
ndev->mvdev.mlx_features = 0;
|
|
@@ -2037,7 +2041,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
|
|
goto err_mtu;
|
|
}
|
|
|
|
- mvdev->vdev.dma_dev = mdev->device;
|
|
+ mvdev->vdev.dma_dev = &mdev->pdev->dev;
|
|
err = mlx5_vdpa_alloc_resources(&ndev->mvdev);
|
|
if (err)
|
|
goto err_mpfs;
|
|
diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
|
|
index c76ebb5312121..9145e06245658 100644
|
|
--- a/drivers/vdpa/virtio_pci/vp_vdpa.c
|
|
+++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
|
|
@@ -442,6 +442,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|
vp_modern_map_vq_notify(mdev, i,
|
|
&vp_vdpa->vring[i].notify_pa);
|
|
if (!vp_vdpa->vring[i].notify) {
|
|
+ ret = -EINVAL;
|
|
dev_warn(&pdev->dev, "Fail to map vq notify %d\n", i);
|
|
goto err;
|
|
}
|
|
diff --git a/drivers/video/backlight/lm3630a_bl.c b/drivers/video/backlight/lm3630a_bl.c
|
|
index 662029d6a3dc9..419b0334cf087 100644
|
|
--- a/drivers/video/backlight/lm3630a_bl.c
|
|
+++ b/drivers/video/backlight/lm3630a_bl.c
|
|
@@ -190,7 +190,7 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl)
|
|
if ((pwm_ctrl & LM3630A_PWM_BANK_A) != 0) {
|
|
lm3630a_pwm_ctrl(pchip, bl->props.brightness,
|
|
bl->props.max_brightness);
|
|
- return bl->props.brightness;
|
|
+ return 0;
|
|
}
|
|
|
|
/* disable sleep */
|
|
@@ -210,8 +210,8 @@ static int lm3630a_bank_a_update_status(struct backlight_device *bl)
|
|
return 0;
|
|
|
|
out_i2c_err:
|
|
- dev_err(pchip->dev, "i2c failed to access\n");
|
|
- return bl->props.brightness;
|
|
+ dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));
|
|
+ return ret;
|
|
}
|
|
|
|
static int lm3630a_bank_a_get_brightness(struct backlight_device *bl)
|
|
@@ -267,7 +267,7 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl)
|
|
if ((pwm_ctrl & LM3630A_PWM_BANK_B) != 0) {
|
|
lm3630a_pwm_ctrl(pchip, bl->props.brightness,
|
|
bl->props.max_brightness);
|
|
- return bl->props.brightness;
|
|
+ return 0;
|
|
}
|
|
|
|
/* disable sleep */
|
|
@@ -287,8 +287,8 @@ static int lm3630a_bank_b_update_status(struct backlight_device *bl)
|
|
return 0;
|
|
|
|
out_i2c_err:
|
|
- dev_err(pchip->dev, "i2c failed to access REG_CTRL\n");
|
|
- return bl->props.brightness;
|
|
+ dev_err(pchip->dev, "i2c failed to access (%pe)\n", ERR_PTR(ret));
|
|
+ return ret;
|
|
}
|
|
|
|
static int lm3630a_bank_b_get_brightness(struct backlight_device *bl)
|
|
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
|
|
index 98f193078c05a..1c855145711ba 100644
|
|
--- a/drivers/video/fbdev/core/fbmem.c
|
|
+++ b/drivers/video/fbdev/core/fbmem.c
|
|
@@ -970,13 +970,11 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
|
|
fb_var_to_videomode(&mode2, &info->var);
|
|
/* make sure we don't delete the videomode of current var */
|
|
ret = fb_mode_is_equal(&mode1, &mode2);
|
|
-
|
|
- if (!ret)
|
|
- fbcon_mode_deleted(info, &mode1);
|
|
-
|
|
- if (!ret)
|
|
- fb_delete_videomode(&mode1, &info->modelist);
|
|
-
|
|
+ if (!ret) {
|
|
+ ret = fbcon_mode_deleted(info, &mode1);
|
|
+ if (!ret)
|
|
+ fb_delete_videomode(&mode1, &info->modelist);
|
|
+ }
|
|
|
|
return ret ? -EINVAL : 0;
|
|
}
|
|
diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
|
|
index 10ec60d81e847..3bf08b5bb3595 100644
|
|
--- a/drivers/virtio/virtio_mem.c
|
|
+++ b/drivers/virtio/virtio_mem.c
|
|
@@ -2420,6 +2420,10 @@ static int virtio_mem_init(struct virtio_mem *vm)
|
|
dev_warn(&vm->vdev->dev,
|
|
"Some device memory is not addressable/pluggable. This can make some memory unusable.\n");
|
|
|
|
+ /* Prepare the offline threshold - make sure we can add two blocks. */
|
|
+ vm->offline_threshold = max_t(uint64_t, 2 * memory_block_size_bytes(),
|
|
+ VIRTIO_MEM_DEFAULT_OFFLINE_THRESHOLD);
|
|
+
|
|
/*
|
|
* We want subblocks to span at least MAX_ORDER_NR_PAGES and
|
|
* pageblock_nr_pages pages. This:
|
|
@@ -2466,14 +2470,11 @@ static int virtio_mem_init(struct virtio_mem *vm)
|
|
vm->bbm.bb_size - 1;
|
|
vm->bbm.first_bb_id = virtio_mem_phys_to_bb_id(vm, addr);
|
|
vm->bbm.next_bb_id = vm->bbm.first_bb_id;
|
|
- }
|
|
|
|
- /* Prepare the offline threshold - make sure we can add two blocks. */
|
|
- vm->offline_threshold = max_t(uint64_t, 2 * memory_block_size_bytes(),
|
|
- VIRTIO_MEM_DEFAULT_OFFLINE_THRESHOLD);
|
|
- /* In BBM, we also want at least two big blocks. */
|
|
- vm->offline_threshold = max_t(uint64_t, 2 * vm->bbm.bb_size,
|
|
- vm->offline_threshold);
|
|
+ /* Make sure we can add two big blocks. */
|
|
+ vm->offline_threshold = max_t(uint64_t, 2 * vm->bbm.bb_size,
|
|
+ vm->offline_threshold);
|
|
+ }
|
|
|
|
dev_info(&vm->vdev->dev, "start address: 0x%llx", vm->addr);
|
|
dev_info(&vm->vdev->dev, "region size: 0x%llx", vm->region_size);
|
|
diff --git a/drivers/w1/slaves/w1_ds2438.c b/drivers/w1/slaves/w1_ds2438.c
|
|
index 5cfb0ae23e916..5698566b0ee01 100644
|
|
--- a/drivers/w1/slaves/w1_ds2438.c
|
|
+++ b/drivers/w1/slaves/w1_ds2438.c
|
|
@@ -62,13 +62,13 @@ static int w1_ds2438_get_page(struct w1_slave *sl, int pageno, u8 *buf)
|
|
if (w1_reset_select_slave(sl))
|
|
continue;
|
|
w1_buf[0] = W1_DS2438_RECALL_MEMORY;
|
|
- w1_buf[1] = 0x00;
|
|
+ w1_buf[1] = (u8)pageno;
|
|
w1_write_block(sl->master, w1_buf, 2);
|
|
|
|
if (w1_reset_select_slave(sl))
|
|
continue;
|
|
w1_buf[0] = W1_DS2438_READ_SCRATCH;
|
|
- w1_buf[1] = 0x00;
|
|
+ w1_buf[1] = (u8)pageno;
|
|
w1_write_block(sl->master, w1_buf, 2);
|
|
|
|
count = w1_read_block(sl->master, buf, DS2438_PAGE_SIZE + 1);
|
|
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
|
|
index 7e00960651fa2..507fd815d7679 100644
|
|
--- a/drivers/watchdog/aspeed_wdt.c
|
|
+++ b/drivers/watchdog/aspeed_wdt.c
|
|
@@ -147,7 +147,7 @@ static int aspeed_wdt_set_timeout(struct watchdog_device *wdd,
|
|
|
|
wdd->timeout = timeout;
|
|
|
|
- actual = min(timeout, wdd->max_hw_heartbeat_ms * 1000);
|
|
+ actual = min(timeout, wdd->max_hw_heartbeat_ms / 1000);
|
|
|
|
writel(actual * WDT_RATE_1MHZ, wdt->base + WDT_RELOAD_VALUE);
|
|
writel(WDT_RESTART_MAGIC, wdt->base + WDT_RESTART);
|
|
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
|
|
index bf31d7b67a697..3f1324871cfd6 100644
|
|
--- a/drivers/watchdog/iTCO_wdt.c
|
|
+++ b/drivers/watchdog/iTCO_wdt.c
|
|
@@ -71,6 +71,8 @@
|
|
#define TCOBASE(p) ((p)->tco_res->start)
|
|
/* SMI Control and Enable Register */
|
|
#define SMI_EN(p) ((p)->smi_res->start)
|
|
+#define TCO_EN (1 << 13)
|
|
+#define GBL_SMI_EN (1 << 0)
|
|
|
|
#define TCO_RLD(p) (TCOBASE(p) + 0x00) /* TCO Timer Reload/Curr. Value */
|
|
#define TCOv1_TMR(p) (TCOBASE(p) + 0x01) /* TCOv1 Timer Initial Value*/
|
|
@@ -355,8 +357,12 @@ static int iTCO_wdt_set_timeout(struct watchdog_device *wd_dev, unsigned int t)
|
|
|
|
tmrval = seconds_to_ticks(p, t);
|
|
|
|
- /* For TCO v1 the timer counts down twice before rebooting */
|
|
- if (p->iTCO_version == 1)
|
|
+ /*
|
|
+ * If TCO SMIs are off, the timer counts down twice before rebooting.
|
|
+ * Otherwise, the BIOS generally reboots when the SMI triggers.
|
|
+ */
|
|
+ if (p->smi_res &&
|
|
+ (SMI_EN(p) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN))
|
|
tmrval /= 2;
|
|
|
|
/* from the specs: */
|
|
@@ -521,7 +527,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
|
|
* Disables TCO logic generating an SMI#
|
|
*/
|
|
val32 = inl(SMI_EN(p));
|
|
- val32 &= 0xffffdfff; /* Turn off SMI clearing watchdog */
|
|
+ val32 &= ~TCO_EN; /* Turn off SMI clearing watchdog */
|
|
outl(val32, SMI_EN(p));
|
|
}
|
|
|
|
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c
|
|
index e9ee22a7cb456..8ac021748d160 100644
|
|
--- a/drivers/watchdog/imx_sc_wdt.c
|
|
+++ b/drivers/watchdog/imx_sc_wdt.c
|
|
@@ -183,16 +183,12 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
|
|
watchdog_stop_on_reboot(wdog);
|
|
watchdog_stop_on_unregister(wdog);
|
|
|
|
- ret = devm_watchdog_register_device(dev, wdog);
|
|
- if (ret)
|
|
- return ret;
|
|
-
|
|
ret = imx_scu_irq_group_enable(SC_IRQ_GROUP_WDOG,
|
|
SC_IRQ_WDOG,
|
|
true);
|
|
if (ret) {
|
|
dev_warn(dev, "Enable irq failed, pretimeout NOT supported\n");
|
|
- return 0;
|
|
+ goto register_device;
|
|
}
|
|
|
|
imx_sc_wdd->wdt_notifier.notifier_call = imx_sc_wdt_notify;
|
|
@@ -203,7 +199,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
|
|
false);
|
|
dev_warn(dev,
|
|
"Register irq notifier failed, pretimeout NOT supported\n");
|
|
- return 0;
|
|
+ goto register_device;
|
|
}
|
|
|
|
ret = devm_add_action_or_reset(dev, imx_sc_wdt_action,
|
|
@@ -213,7 +209,8 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
|
|
else
|
|
dev_warn(dev, "Add action failed, pretimeout NOT supported\n");
|
|
|
|
- return 0;
|
|
+register_device:
|
|
+ return devm_watchdog_register_device(dev, wdog);
|
|
}
|
|
|
|
static int __maybe_unused imx_sc_wdt_suspend(struct device *dev)
|
|
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
|
|
index bdf9564efa29e..395bde79e2920 100644
|
|
--- a/drivers/watchdog/jz4740_wdt.c
|
|
+++ b/drivers/watchdog/jz4740_wdt.c
|
|
@@ -176,9 +176,9 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
|
|
watchdog_set_drvdata(jz4740_wdt, drvdata);
|
|
|
|
drvdata->map = device_node_to_regmap(dev->parent->of_node);
|
|
- if (!drvdata->map) {
|
|
+ if (IS_ERR(drvdata->map)) {
|
|
dev_err(dev, "regmap not found\n");
|
|
- return -EINVAL;
|
|
+ return PTR_ERR(drvdata->map);
|
|
}
|
|
|
|
return devm_watchdog_register_device(dev, &drvdata->wdt);
|
|
diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c
|
|
index 547d3fea33ff6..dd192b8dff551 100644
|
|
--- a/drivers/watchdog/keembay_wdt.c
|
|
+++ b/drivers/watchdog/keembay_wdt.c
|
|
@@ -23,12 +23,14 @@
|
|
#define TIM_WDOG_EN 0x8
|
|
#define TIM_SAFE 0xc
|
|
|
|
-#define WDT_ISR_MASK GENMASK(9, 8)
|
|
+#define WDT_TH_INT_MASK BIT(8)
|
|
+#define WDT_TO_INT_MASK BIT(9)
|
|
#define WDT_ISR_CLEAR 0x8200ff18
|
|
#define WDT_UNLOCK 0xf1d0dead
|
|
#define WDT_LOAD_MAX U32_MAX
|
|
#define WDT_LOAD_MIN 1
|
|
#define WDT_TIMEOUT 5
|
|
+#define WDT_PRETIMEOUT 4
|
|
|
|
static unsigned int timeout = WDT_TIMEOUT;
|
|
module_param(timeout, int, 0);
|
|
@@ -82,7 +84,6 @@ static int keembay_wdt_start(struct watchdog_device *wdog)
|
|
{
|
|
struct keembay_wdt *wdt = watchdog_get_drvdata(wdog);
|
|
|
|
- keembay_wdt_set_timeout_reg(wdog);
|
|
keembay_wdt_writel(wdt, TIM_WDOG_EN, 1);
|
|
|
|
return 0;
|
|
@@ -108,6 +109,7 @@ static int keembay_wdt_set_timeout(struct watchdog_device *wdog, u32 t)
|
|
{
|
|
wdog->timeout = t;
|
|
keembay_wdt_set_timeout_reg(wdog);
|
|
+ keembay_wdt_set_pretimeout_reg(wdog);
|
|
|
|
return 0;
|
|
}
|
|
@@ -139,8 +141,7 @@ static irqreturn_t keembay_wdt_to_isr(int irq, void *dev_id)
|
|
struct keembay_wdt *wdt = dev_id;
|
|
struct arm_smccc_res res;
|
|
|
|
- keembay_wdt_writel(wdt, TIM_WATCHDOG, 1);
|
|
- arm_smccc_smc(WDT_ISR_CLEAR, WDT_ISR_MASK, 0, 0, 0, 0, 0, 0, &res);
|
|
+ arm_smccc_smc(WDT_ISR_CLEAR, WDT_TO_INT_MASK, 0, 0, 0, 0, 0, 0, &res);
|
|
dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt timeout.\n");
|
|
emergency_restart();
|
|
|
|
@@ -152,7 +153,9 @@ static irqreturn_t keembay_wdt_th_isr(int irq, void *dev_id)
|
|
struct keembay_wdt *wdt = dev_id;
|
|
struct arm_smccc_res res;
|
|
|
|
- arm_smccc_smc(WDT_ISR_CLEAR, WDT_ISR_MASK, 0, 0, 0, 0, 0, 0, &res);
|
|
+ keembay_wdt_set_pretimeout(&wdt->wdd, 0x0);
|
|
+
|
|
+ arm_smccc_smc(WDT_ISR_CLEAR, WDT_TH_INT_MASK, 0, 0, 0, 0, 0, 0, &res);
|
|
dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt pre-timeout.\n");
|
|
watchdog_notify_pretimeout(&wdt->wdd);
|
|
|
|
@@ -224,11 +227,13 @@ static int keembay_wdt_probe(struct platform_device *pdev)
|
|
wdt->wdd.min_timeout = WDT_LOAD_MIN;
|
|
wdt->wdd.max_timeout = WDT_LOAD_MAX / wdt->rate;
|
|
wdt->wdd.timeout = WDT_TIMEOUT;
|
|
+ wdt->wdd.pretimeout = WDT_PRETIMEOUT;
|
|
|
|
watchdog_set_drvdata(&wdt->wdd, wdt);
|
|
watchdog_set_nowayout(&wdt->wdd, nowayout);
|
|
watchdog_init_timeout(&wdt->wdd, timeout, dev);
|
|
keembay_wdt_set_timeout(&wdt->wdd, wdt->wdd.timeout);
|
|
+ keembay_wdt_set_pretimeout(&wdt->wdd, wdt->wdd.pretimeout);
|
|
|
|
ret = devm_watchdog_register_device(dev, &wdt->wdd);
|
|
if (ret)
|
|
diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
|
|
index 78cf11c949416..60b6d74f267dd 100644
|
|
--- a/drivers/watchdog/lpc18xx_wdt.c
|
|
+++ b/drivers/watchdog/lpc18xx_wdt.c
|
|
@@ -292,7 +292,7 @@ static int lpc18xx_wdt_remove(struct platform_device *pdev)
|
|
struct lpc18xx_wdt_dev *lpc18xx_wdt = platform_get_drvdata(pdev);
|
|
|
|
dev_warn(&pdev->dev, "I quit now, hardware will probably reboot!\n");
|
|
- del_timer(&lpc18xx_wdt->timer);
|
|
+ del_timer_sync(&lpc18xx_wdt->timer);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
|
|
index a947a63fb44ae..7b974802dfc7c 100644
|
|
--- a/drivers/watchdog/sbc60xxwdt.c
|
|
+++ b/drivers/watchdog/sbc60xxwdt.c
|
|
@@ -146,7 +146,7 @@ static void wdt_startup(void)
|
|
static void wdt_turnoff(void)
|
|
{
|
|
/* Stop the timer */
|
|
- del_timer(&timer);
|
|
+ del_timer_sync(&timer);
|
|
inb_p(wdt_stop);
|
|
pr_info("Watchdog timer is now disabled...\n");
|
|
}
|
|
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
|
|
index e66e6b905964b..ca65468f4b9ce 100644
|
|
--- a/drivers/watchdog/sc520_wdt.c
|
|
+++ b/drivers/watchdog/sc520_wdt.c
|
|
@@ -186,7 +186,7 @@ static int wdt_startup(void)
|
|
static int wdt_turnoff(void)
|
|
{
|
|
/* Stop the timer */
|
|
- del_timer(&timer);
|
|
+ del_timer_sync(&timer);
|
|
|
|
/* Stop the watchdog */
|
|
wdt_config(0);
|
|
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c
|
|
index 5772cc5d37804..f2650863fd027 100644
|
|
--- a/drivers/watchdog/w83877f_wdt.c
|
|
+++ b/drivers/watchdog/w83877f_wdt.c
|
|
@@ -166,7 +166,7 @@ static void wdt_startup(void)
|
|
static void wdt_turnoff(void)
|
|
{
|
|
/* Stop the timer */
|
|
- del_timer(&timer);
|
|
+ del_timer_sync(&timer);
|
|
|
|
wdt_change(WDT_DISABLE);
|
|
|
|
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
|
|
index 6d5c4e45cfef0..cf53713f8aa01 100644
|
|
--- a/fs/btrfs/block-group.c
|
|
+++ b/fs/btrfs/block-group.c
|
|
@@ -1499,7 +1499,15 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)
|
|
if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE))
|
|
return;
|
|
|
|
- mutex_lock(&fs_info->reclaim_bgs_lock);
|
|
+ /*
|
|
+ * Long running balances can keep us blocked here for eternity, so
|
|
+ * simply skip reclaim if we're unable to get the mutex.
|
|
+ */
|
|
+ if (!mutex_trylock(&fs_info->reclaim_bgs_lock)) {
|
|
+ btrfs_exclop_finish(fs_info);
|
|
+ return;
|
|
+ }
|
|
+
|
|
spin_lock(&fs_info->unused_bgs_lock);
|
|
while (!list_empty(&fs_info->reclaim_bgs)) {
|
|
bg = list_first_entry(&fs_info->reclaim_bgs,
|
|
@@ -1539,7 +1547,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)
|
|
goto next;
|
|
|
|
btrfs_info(fs_info, "reclaiming chunk %llu with %llu%% used",
|
|
- bg->start, div_u64(bg->used * 100, bg->length));
|
|
+ bg->start, div64_u64(bg->used * 100, bg->length));
|
|
trace_btrfs_reclaim_block_group(bg);
|
|
ret = btrfs_relocate_chunk(fs_info, bg->start);
|
|
if (ret)
|
|
@@ -2192,6 +2200,13 @@ error:
|
|
return ret;
|
|
}
|
|
|
|
+/*
|
|
+ * This function, insert_block_group_item(), belongs to the phase 2 of chunk
|
|
+ * allocation.
|
|
+ *
|
|
+ * See the comment at btrfs_chunk_alloc() for details about the chunk allocation
|
|
+ * phases.
|
|
+ */
|
|
static int insert_block_group_item(struct btrfs_trans_handle *trans,
|
|
struct btrfs_block_group *block_group)
|
|
{
|
|
@@ -2214,15 +2229,19 @@ static int insert_block_group_item(struct btrfs_trans_handle *trans,
|
|
return btrfs_insert_item(trans, root, &key, &bgi, sizeof(bgi));
|
|
}
|
|
|
|
+/*
|
|
+ * This function, btrfs_create_pending_block_groups(), belongs to the phase 2 of
|
|
+ * chunk allocation.
|
|
+ *
|
|
+ * See the comment at btrfs_chunk_alloc() for details about the chunk allocation
|
|
+ * phases.
|
|
+ */
|
|
void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
struct btrfs_block_group *block_group;
|
|
int ret = 0;
|
|
|
|
- if (!trans->can_flush_pending_bgs)
|
|
- return;
|
|
-
|
|
while (!list_empty(&trans->new_bgs)) {
|
|
int index;
|
|
|
|
@@ -2237,6 +2256,13 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
|
|
ret = insert_block_group_item(trans, block_group);
|
|
if (ret)
|
|
btrfs_abort_transaction(trans, ret);
|
|
+ if (!block_group->chunk_item_inserted) {
|
|
+ mutex_lock(&fs_info->chunk_mutex);
|
|
+ ret = btrfs_chunk_alloc_add_chunk_item(trans, block_group);
|
|
+ mutex_unlock(&fs_info->chunk_mutex);
|
|
+ if (ret)
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ }
|
|
ret = btrfs_finish_chunk_alloc(trans, block_group->start,
|
|
block_group->length);
|
|
if (ret)
|
|
@@ -2260,8 +2286,9 @@ next:
|
|
btrfs_trans_release_chunk_metadata(trans);
|
|
}
|
|
|
|
-int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
- u64 type, u64 chunk_offset, u64 size)
|
|
+struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,
|
|
+ u64 bytes_used, u64 type,
|
|
+ u64 chunk_offset, u64 size)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
struct btrfs_block_group *cache;
|
|
@@ -2271,7 +2298,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
|
|
cache = btrfs_create_block_group_cache(fs_info, chunk_offset);
|
|
if (!cache)
|
|
- return -ENOMEM;
|
|
+ return ERR_PTR(-ENOMEM);
|
|
|
|
cache->length = size;
|
|
set_free_space_tree_thresholds(cache);
|
|
@@ -2285,7 +2312,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
ret = btrfs_load_block_group_zone_info(cache, true);
|
|
if (ret) {
|
|
btrfs_put_block_group(cache);
|
|
- return ret;
|
|
+ return ERR_PTR(ret);
|
|
}
|
|
|
|
ret = exclude_super_stripes(cache);
|
|
@@ -2293,7 +2320,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
/* We may have excluded something, so call this just in case */
|
|
btrfs_free_excluded_extents(cache);
|
|
btrfs_put_block_group(cache);
|
|
- return ret;
|
|
+ return ERR_PTR(ret);
|
|
}
|
|
|
|
add_new_free_space(cache, chunk_offset, chunk_offset + size);
|
|
@@ -2320,7 +2347,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
if (ret) {
|
|
btrfs_remove_free_space_cache(cache);
|
|
btrfs_put_block_group(cache);
|
|
- return ret;
|
|
+ return ERR_PTR(ret);
|
|
}
|
|
|
|
/*
|
|
@@ -2339,7 +2366,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
btrfs_update_delayed_refs_rsv(trans);
|
|
|
|
set_avail_alloc_bits(fs_info, type);
|
|
- return 0;
|
|
+ return cache;
|
|
}
|
|
|
|
/*
|
|
@@ -3219,11 +3246,203 @@ int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, u64 type)
|
|
return btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);
|
|
}
|
|
|
|
+static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags)
|
|
+{
|
|
+ struct btrfs_block_group *bg;
|
|
+ int ret;
|
|
+
|
|
+ /*
|
|
+ * Check if we have enough space in the system space info because we
|
|
+ * will need to update device items in the chunk btree and insert a new
|
|
+ * chunk item in the chunk btree as well. This will allocate a new
|
|
+ * system block group if needed.
|
|
+ */
|
|
+ check_system_chunk(trans, flags);
|
|
+
|
|
+ bg = btrfs_alloc_chunk(trans, flags);
|
|
+ if (IS_ERR(bg)) {
|
|
+ ret = PTR_ERR(bg);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * If this is a system chunk allocation then stop right here and do not
|
|
+ * add the chunk item to the chunk btree. This is to prevent a deadlock
|
|
+ * because this system chunk allocation can be triggered while COWing
|
|
+ * some extent buffer of the chunk btree and while holding a lock on a
|
|
+ * parent extent buffer, in which case attempting to insert the chunk
|
|
+ * item (or update the device item) would result in a deadlock on that
|
|
+ * parent extent buffer. In this case defer the chunk btree updates to
|
|
+ * the second phase of chunk allocation and keep our reservation until
|
|
+ * the second phase completes.
|
|
+ *
|
|
+ * This is a rare case and can only be triggered by the very few cases
|
|
+ * we have where we need to touch the chunk btree outside chunk allocation
|
|
+ * and chunk removal. These cases are basically adding a device, removing
|
|
+ * a device or resizing a device.
|
|
+ */
|
|
+ if (flags & BTRFS_BLOCK_GROUP_SYSTEM)
|
|
+ return 0;
|
|
+
|
|
+ ret = btrfs_chunk_alloc_add_chunk_item(trans, bg);
|
|
+ /*
|
|
+ * Normally we are not expected to fail with -ENOSPC here, since we have
|
|
+ * previously reserved space in the system space_info and allocated one
|
|
+ * new system chunk if necessary. However there are two exceptions:
|
|
+ *
|
|
+ * 1) We may have enough free space in the system space_info but all the
|
|
+ * existing system block groups have a profile which can not be used
|
|
+ * for extent allocation.
|
|
+ *
|
|
+ * This happens when mounting in degraded mode. For example we have a
|
|
+ * RAID1 filesystem with 2 devices, lose one device and mount the fs
|
|
+ * using the other device in degraded mode. If we then allocate a chunk,
|
|
+ * we may have enough free space in the existing system space_info, but
|
|
+ * none of the block groups can be used for extent allocation since they
|
|
+ * have a RAID1 profile, and because we are in degraded mode with a
|
|
+ * single device, we are forced to allocate a new system chunk with a
|
|
+ * SINGLE profile. Making check_system_chunk() iterate over all system
|
|
+ * block groups and check if they have a usable profile and enough space
|
|
+ * can be slow on very large filesystems, so we tolerate the -ENOSPC and
|
|
+ * try again after forcing allocation of a new system chunk. Like this
|
|
+ * we avoid paying the cost of that search in normal circumstances, when
|
|
+ * we were not mounted in degraded mode;
|
|
+ *
|
|
+ * 2) We had enough free space info the system space_info, and one suitable
|
|
+ * block group to allocate from when we called check_system_chunk()
|
|
+ * above. However right after we called it, the only system block group
|
|
+ * with enough free space got turned into RO mode by a running scrub,
|
|
+ * and in this case we have to allocate a new one and retry. We only
|
|
+ * need do this allocate and retry once, since we have a transaction
|
|
+ * handle and scrub uses the commit root to search for block groups.
|
|
+ */
|
|
+ if (ret == -ENOSPC) {
|
|
+ const u64 sys_flags = btrfs_system_alloc_profile(trans->fs_info);
|
|
+ struct btrfs_block_group *sys_bg;
|
|
+
|
|
+ sys_bg = btrfs_alloc_chunk(trans, sys_flags);
|
|
+ if (IS_ERR(sys_bg)) {
|
|
+ ret = PTR_ERR(sys_bg);
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ ret = btrfs_chunk_alloc_add_chunk_item(trans, sys_bg);
|
|
+ if (ret) {
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ ret = btrfs_chunk_alloc_add_chunk_item(trans, bg);
|
|
+ if (ret) {
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+ } else if (ret) {
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+out:
|
|
+ btrfs_trans_release_chunk_metadata(trans);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/*
|
|
- * If force is CHUNK_ALLOC_FORCE:
|
|
+ * Chunk allocation is done in 2 phases:
|
|
+ *
|
|
+ * 1) Phase 1 - through btrfs_chunk_alloc() we allocate device extents for
|
|
+ * the chunk, the chunk mapping, create its block group and add the items
|
|
+ * that belong in the chunk btree to it - more specifically, we need to
|
|
+ * update device items in the chunk btree and add a new chunk item to it.
|
|
+ *
|
|
+ * 2) Phase 2 - through btrfs_create_pending_block_groups(), we add the block
|
|
+ * group item to the extent btree and the device extent items to the devices
|
|
+ * btree.
|
|
+ *
|
|
+ * This is done to prevent deadlocks. For example when COWing a node from the
|
|
+ * extent btree we are holding a write lock on the node's parent and if we
|
|
+ * trigger chunk allocation and attempted to insert the new block group item
|
|
+ * in the extent btree right way, we could deadlock because the path for the
|
|
+ * insertion can include that parent node. At first glance it seems impossible
|
|
+ * to trigger chunk allocation after starting a transaction since tasks should
|
|
+ * reserve enough transaction units (metadata space), however while that is true
|
|
+ * most of the time, chunk allocation may still be triggered for several reasons:
|
|
+ *
|
|
+ * 1) When reserving metadata, we check if there is enough free space in the
|
|
+ * metadata space_info and therefore don't trigger allocation of a new chunk.
|
|
+ * However later when the task actually tries to COW an extent buffer from
|
|
+ * the extent btree or from the device btree for example, it is forced to
|
|
+ * allocate a new block group (chunk) because the only one that had enough
|
|
+ * free space was just turned to RO mode by a running scrub for example (or
|
|
+ * device replace, block group reclaim thread, etc), so we can not use it
|
|
+ * for allocating an extent and end up being forced to allocate a new one;
|
|
+ *
|
|
+ * 2) Because we only check that the metadata space_info has enough free bytes,
|
|
+ * we end up not allocating a new metadata chunk in that case. However if
|
|
+ * the filesystem was mounted in degraded mode, none of the existing block
|
|
+ * groups might be suitable for extent allocation due to their incompatible
|
|
+ * profile (for e.g. mounting a 2 devices filesystem, where all block groups
|
|
+ * use a RAID1 profile, in degraded mode using a single device). In this case
|
|
+ * when the task attempts to COW some extent buffer of the extent btree for
|
|
+ * example, it will trigger allocation of a new metadata block group with a
|
|
+ * suitable profile (SINGLE profile in the example of the degraded mount of
|
|
+ * the RAID1 filesystem);
|
|
+ *
|
|
+ * 3) The task has reserved enough transaction units / metadata space, but when
|
|
+ * it attempts to COW an extent buffer from the extent or device btree for
|
|
+ * example, it does not find any free extent in any metadata block group,
|
|
+ * therefore forced to try to allocate a new metadata block group.
|
|
+ * This is because some other task allocated all available extents in the
|
|
+ * meanwhile - this typically happens with tasks that don't reserve space
|
|
+ * properly, either intentionally or as a bug. One example where this is
|
|
+ * done intentionally is fsync, as it does not reserve any transaction units
|
|
+ * and ends up allocating a variable number of metadata extents for log
|
|
+ * tree extent buffers.
|
|
+ *
|
|
+ * We also need this 2 phases setup when adding a device to a filesystem with
|
|
+ * a seed device - we must create new metadata and system chunks without adding
|
|
+ * any of the block group items to the chunk, extent and device btrees. If we
|
|
+ * did not do it this way, we would get ENOSPC when attempting to update those
|
|
+ * btrees, since all the chunks from the seed device are read-only.
|
|
+ *
|
|
+ * Phase 1 does the updates and insertions to the chunk btree because if we had
|
|
+ * it done in phase 2 and have a thundering herd of tasks allocating chunks in
|
|
+ * parallel, we risk having too many system chunks allocated by many tasks if
|
|
+ * many tasks reach phase 1 without the previous ones completing phase 2. In the
|
|
+ * extreme case this leads to exhaustion of the system chunk array in the
|
|
+ * superblock. This is easier to trigger if using a btree node/leaf size of 64K
|
|
+ * and with RAID filesystems (so we have more device items in the chunk btree).
|
|
+ * This has happened before and commit eafa4fd0ad0607 ("btrfs: fix exhaustion of
|
|
+ * the system chunk array due to concurrent allocations") provides more details.
|
|
+ *
|
|
+ * For allocation of system chunks, we defer the updates and insertions into the
|
|
+ * chunk btree to phase 2. This is to prevent deadlocks on extent buffers because
|
|
+ * if the chunk allocation is triggered while COWing an extent buffer of the
|
|
+ * chunk btree, we are holding a lock on the parent of that extent buffer and
|
|
+ * doing the chunk btree updates and insertions can require locking that parent.
|
|
+ * This is for the very few and rare cases where we update the chunk btree that
|
|
+ * are not chunk allocation or chunk removal: adding a device, removing a device
|
|
+ * or resizing a device.
|
|
+ *
|
|
+ * The reservation of system space, done through check_system_chunk(), as well
|
|
+ * as all the updates and insertions into the chunk btree must be done while
|
|
+ * holding fs_info->chunk_mutex. This is important to guarantee that while COWing
|
|
+ * an extent buffer from the chunks btree we never trigger allocation of a new
|
|
+ * system chunk, which would result in a deadlock (trying to lock twice an
|
|
+ * extent buffer of the chunk btree, first time before triggering the chunk
|
|
+ * allocation and the second time during chunk allocation while attempting to
|
|
+ * update the chunks btree). The system chunk array is also updated while holding
|
|
+ * that mutex. The same logic applies to removing chunks - we must reserve system
|
|
+ * space, update the chunk btree and the system chunk array in the superblock
|
|
+ * while holding fs_info->chunk_mutex.
|
|
+ *
|
|
+ * This function, btrfs_chunk_alloc(), belongs to phase 1.
|
|
+ *
|
|
+ * If @force is CHUNK_ALLOC_FORCE:
|
|
* - return 1 if it successfully allocates a chunk,
|
|
* - return errors including -ENOSPC otherwise.
|
|
- * If force is NOT CHUNK_ALLOC_FORCE:
|
|
+ * If @force is NOT CHUNK_ALLOC_FORCE:
|
|
* - return 0 if it doesn't need to allocate a new chunk,
|
|
* - return 1 if it successfully allocates a chunk,
|
|
* - return errors including -ENOSPC otherwise.
|
|
@@ -3240,6 +3459,13 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,
|
|
/* Don't re-enter if we're already allocating a chunk */
|
|
if (trans->allocating_chunk)
|
|
return -ENOSPC;
|
|
+ /*
|
|
+ * If we are removing a chunk, don't re-enter or we would deadlock.
|
|
+ * System space reservation and system chunk allocation is done by the
|
|
+ * chunk remove operation (btrfs_remove_chunk()).
|
|
+ */
|
|
+ if (trans->removing_chunk)
|
|
+ return -ENOSPC;
|
|
|
|
space_info = btrfs_find_space_info(fs_info, flags);
|
|
ASSERT(space_info);
|
|
@@ -3303,13 +3529,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,
|
|
force_metadata_allocation(fs_info);
|
|
}
|
|
|
|
- /*
|
|
- * Check if we have enough space in SYSTEM chunk because we may need
|
|
- * to update devices.
|
|
- */
|
|
- check_system_chunk(trans, flags);
|
|
-
|
|
- ret = btrfs_alloc_chunk(trans, flags);
|
|
+ ret = do_chunk_alloc(trans, flags);
|
|
trans->allocating_chunk = false;
|
|
|
|
spin_lock(&space_info->lock);
|
|
@@ -3328,22 +3548,6 @@ out:
|
|
space_info->chunk_alloc = 0;
|
|
spin_unlock(&space_info->lock);
|
|
mutex_unlock(&fs_info->chunk_mutex);
|
|
- /*
|
|
- * When we allocate a new chunk we reserve space in the chunk block
|
|
- * reserve to make sure we can COW nodes/leafs in the chunk tree or
|
|
- * add new nodes/leafs to it if we end up needing to do it when
|
|
- * inserting the chunk item and updating device items as part of the
|
|
- * second phase of chunk allocation, performed by
|
|
- * btrfs_finish_chunk_alloc(). So make sure we don't accumulate a
|
|
- * large number of new block groups to create in our transaction
|
|
- * handle's new_bgs list to avoid exhausting the chunk block reserve
|
|
- * in extreme cases - like having a single transaction create many new
|
|
- * block groups when starting to write out the free space caches of all
|
|
- * the block groups that were made dirty during the lifetime of the
|
|
- * transaction.
|
|
- */
|
|
- if (trans->chunk_bytes_reserved >= (u64)SZ_2M)
|
|
- btrfs_create_pending_block_groups(trans);
|
|
|
|
return ret;
|
|
}
|
|
@@ -3364,7 +3568,6 @@ static u64 get_profile_num_devs(struct btrfs_fs_info *fs_info, u64 type)
|
|
*/
|
|
void check_system_chunk(struct btrfs_trans_handle *trans, u64 type)
|
|
{
|
|
- struct btrfs_transaction *cur_trans = trans->transaction;
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
struct btrfs_space_info *info;
|
|
u64 left;
|
|
@@ -3379,7 +3582,6 @@ void check_system_chunk(struct btrfs_trans_handle *trans, u64 type)
|
|
lockdep_assert_held(&fs_info->chunk_mutex);
|
|
|
|
info = btrfs_find_space_info(fs_info, BTRFS_BLOCK_GROUP_SYSTEM);
|
|
-again:
|
|
spin_lock(&info->lock);
|
|
left = info->total_bytes - btrfs_space_info_used(info, true);
|
|
spin_unlock(&info->lock);
|
|
@@ -3398,76 +3600,39 @@ again:
|
|
|
|
if (left < thresh) {
|
|
u64 flags = btrfs_system_alloc_profile(fs_info);
|
|
- u64 reserved = atomic64_read(&cur_trans->chunk_bytes_reserved);
|
|
-
|
|
- /*
|
|
- * If there's not available space for the chunk tree (system
|
|
- * space) and there are other tasks that reserved space for
|
|
- * creating a new system block group, wait for them to complete
|
|
- * the creation of their system block group and release excess
|
|
- * reserved space. We do this because:
|
|
- *
|
|
- * *) We can end up allocating more system chunks than necessary
|
|
- * when there are multiple tasks that are concurrently
|
|
- * allocating block groups, which can lead to exhaustion of
|
|
- * the system array in the superblock;
|
|
- *
|
|
- * *) If we allocate extra and unnecessary system block groups,
|
|
- * despite being empty for a long time, and possibly forever,
|
|
- * they end not being added to the list of unused block groups
|
|
- * because that typically happens only when deallocating the
|
|
- * last extent from a block group - which never happens since
|
|
- * we never allocate from them in the first place. The few
|
|
- * exceptions are when mounting a filesystem or running scrub,
|
|
- * which add unused block groups to the list of unused block
|
|
- * groups, to be deleted by the cleaner kthread.
|
|
- * And even when they are added to the list of unused block
|
|
- * groups, it can take a long time until they get deleted,
|
|
- * since the cleaner kthread might be sleeping or busy with
|
|
- * other work (deleting subvolumes, running delayed iputs,
|
|
- * defrag scheduling, etc);
|
|
- *
|
|
- * This is rare in practice, but can happen when too many tasks
|
|
- * are allocating blocks groups in parallel (via fallocate())
|
|
- * and before the one that reserved space for a new system block
|
|
- * group finishes the block group creation and releases the space
|
|
- * reserved in excess (at btrfs_create_pending_block_groups()),
|
|
- * other tasks end up here and see free system space temporarily
|
|
- * not enough for updating the chunk tree.
|
|
- *
|
|
- * We unlock the chunk mutex before waiting for such tasks and
|
|
- * lock it again after the wait, otherwise we would deadlock.
|
|
- * It is safe to do so because allocating a system chunk is the
|
|
- * first thing done while allocating a new block group.
|
|
- */
|
|
- if (reserved > trans->chunk_bytes_reserved) {
|
|
- const u64 min_needed = reserved - thresh;
|
|
-
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
- wait_event(cur_trans->chunk_reserve_wait,
|
|
- atomic64_read(&cur_trans->chunk_bytes_reserved) <=
|
|
- min_needed);
|
|
- mutex_lock(&fs_info->chunk_mutex);
|
|
- goto again;
|
|
- }
|
|
+ struct btrfs_block_group *bg;
|
|
|
|
/*
|
|
* Ignore failure to create system chunk. We might end up not
|
|
* needing it, as we might not need to COW all nodes/leafs from
|
|
* the paths we visit in the chunk tree (they were already COWed
|
|
* or created in the current transaction for example).
|
|
+ *
|
|
+ * Also, if our caller is allocating a system chunk, do not
|
|
+ * attempt to insert the chunk item in the chunk btree, as we
|
|
+ * could deadlock on an extent buffer since our caller may be
|
|
+ * COWing an extent buffer from the chunk btree.
|
|
*/
|
|
- ret = btrfs_alloc_chunk(trans, flags);
|
|
+ bg = btrfs_alloc_chunk(trans, flags);
|
|
+ if (IS_ERR(bg)) {
|
|
+ ret = PTR_ERR(bg);
|
|
+ } else if (!(type & BTRFS_BLOCK_GROUP_SYSTEM)) {
|
|
+ /*
|
|
+ * If we fail to add the chunk item here, we end up
|
|
+ * trying again at phase 2 of chunk allocation, at
|
|
+ * btrfs_create_pending_block_groups(). So ignore
|
|
+ * any error here.
|
|
+ */
|
|
+ btrfs_chunk_alloc_add_chunk_item(trans, bg);
|
|
+ }
|
|
}
|
|
|
|
if (!ret) {
|
|
ret = btrfs_block_rsv_add(fs_info->chunk_root,
|
|
&fs_info->chunk_block_rsv,
|
|
thresh, BTRFS_RESERVE_NO_FLUSH);
|
|
- if (!ret) {
|
|
- atomic64_add(thresh, &cur_trans->chunk_bytes_reserved);
|
|
+ if (!ret)
|
|
trans->chunk_bytes_reserved += thresh;
|
|
- }
|
|
}
|
|
}
|
|
|
|
diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
|
|
index 7b927425dc715..c72a71efcb187 100644
|
|
--- a/fs/btrfs/block-group.h
|
|
+++ b/fs/btrfs/block-group.h
|
|
@@ -97,6 +97,7 @@ struct btrfs_block_group {
|
|
unsigned int removed:1;
|
|
unsigned int to_copy:1;
|
|
unsigned int relocating_repair:1;
|
|
+ unsigned int chunk_item_inserted:1;
|
|
|
|
int disk_cache_state;
|
|
|
|
@@ -268,8 +269,9 @@ void btrfs_reclaim_bgs_work(struct work_struct *work);
|
|
void btrfs_reclaim_bgs(struct btrfs_fs_info *fs_info);
|
|
void btrfs_mark_bg_to_reclaim(struct btrfs_block_group *bg);
|
|
int btrfs_read_block_groups(struct btrfs_fs_info *info);
|
|
-int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
|
|
- u64 type, u64 chunk_offset, u64 size);
|
|
+struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,
|
|
+ u64 bytes_used, u64 type,
|
|
+ u64 chunk_offset, u64 size);
|
|
void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans);
|
|
int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,
|
|
bool do_chunk_alloc);
|
|
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
|
|
index 4bc3ca2cbd7d4..c5c08c87e1303 100644
|
|
--- a/fs/btrfs/ctree.c
|
|
+++ b/fs/btrfs/ctree.c
|
|
@@ -364,49 +364,6 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
|
|
return 0;
|
|
}
|
|
|
|
-static struct extent_buffer *alloc_tree_block_no_bg_flush(
|
|
- struct btrfs_trans_handle *trans,
|
|
- struct btrfs_root *root,
|
|
- u64 parent_start,
|
|
- const struct btrfs_disk_key *disk_key,
|
|
- int level,
|
|
- u64 hint,
|
|
- u64 empty_size,
|
|
- enum btrfs_lock_nesting nest)
|
|
-{
|
|
- struct btrfs_fs_info *fs_info = root->fs_info;
|
|
- struct extent_buffer *ret;
|
|
-
|
|
- /*
|
|
- * If we are COWing a node/leaf from the extent, chunk, device or free
|
|
- * space trees, make sure that we do not finish block group creation of
|
|
- * pending block groups. We do this to avoid a deadlock.
|
|
- * COWing can result in allocation of a new chunk, and flushing pending
|
|
- * block groups (btrfs_create_pending_block_groups()) can be triggered
|
|
- * when finishing allocation of a new chunk. Creation of a pending block
|
|
- * group modifies the extent, chunk, device and free space trees,
|
|
- * therefore we could deadlock with ourselves since we are holding a
|
|
- * lock on an extent buffer that btrfs_create_pending_block_groups() may
|
|
- * try to COW later.
|
|
- * For similar reasons, we also need to delay flushing pending block
|
|
- * groups when splitting a leaf or node, from one of those trees, since
|
|
- * we are holding a write lock on it and its parent or when inserting a
|
|
- * new root node for one of those trees.
|
|
- */
|
|
- if (root == fs_info->extent_root ||
|
|
- root == fs_info->chunk_root ||
|
|
- root == fs_info->dev_root ||
|
|
- root == fs_info->free_space_root)
|
|
- trans->can_flush_pending_bgs = false;
|
|
-
|
|
- ret = btrfs_alloc_tree_block(trans, root, parent_start,
|
|
- root->root_key.objectid, disk_key, level,
|
|
- hint, empty_size, nest);
|
|
- trans->can_flush_pending_bgs = true;
|
|
-
|
|
- return ret;
|
|
-}
|
|
-
|
|
/*
|
|
* does the dirty work in cow of a single block. The parent block (if
|
|
* supplied) is updated to point to the new cow copy. The new buffer is marked
|
|
@@ -455,8 +412,9 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
|
|
if ((root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) && parent)
|
|
parent_start = parent->start;
|
|
|
|
- cow = alloc_tree_block_no_bg_flush(trans, root, parent_start, &disk_key,
|
|
- level, search_start, empty_size, nest);
|
|
+ cow = btrfs_alloc_tree_block(trans, root, parent_start,
|
|
+ root->root_key.objectid, &disk_key, level,
|
|
+ search_start, empty_size, nest);
|
|
if (IS_ERR(cow))
|
|
return PTR_ERR(cow);
|
|
|
|
@@ -2458,9 +2416,9 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
|
|
else
|
|
btrfs_node_key(lower, &lower_key, 0);
|
|
|
|
- c = alloc_tree_block_no_bg_flush(trans, root, 0, &lower_key, level,
|
|
- root->node->start, 0,
|
|
- BTRFS_NESTING_NEW_ROOT);
|
|
+ c = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
|
|
+ &lower_key, level, root->node->start, 0,
|
|
+ BTRFS_NESTING_NEW_ROOT);
|
|
if (IS_ERR(c))
|
|
return PTR_ERR(c);
|
|
|
|
@@ -2589,8 +2547,9 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
|
|
mid = (c_nritems + 1) / 2;
|
|
btrfs_node_key(c, &disk_key, mid);
|
|
|
|
- split = alloc_tree_block_no_bg_flush(trans, root, 0, &disk_key, level,
|
|
- c->start, 0, BTRFS_NESTING_SPLIT);
|
|
+ split = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
|
|
+ &disk_key, level, c->start, 0,
|
|
+ BTRFS_NESTING_SPLIT);
|
|
if (IS_ERR(split))
|
|
return PTR_ERR(split);
|
|
|
|
@@ -3381,10 +3340,10 @@ again:
|
|
* BTRFS_NESTING_SPLIT_THE_SPLITTENING if we need to, but for now just
|
|
* use BTRFS_NESTING_NEW_ROOT.
|
|
*/
|
|
- right = alloc_tree_block_no_bg_flush(trans, root, 0, &disk_key, 0,
|
|
- l->start, 0, num_doubles ?
|
|
- BTRFS_NESTING_NEW_ROOT :
|
|
- BTRFS_NESTING_SPLIT);
|
|
+ right = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
|
|
+ &disk_key, 0, l->start, 0,
|
|
+ num_doubles ? BTRFS_NESTING_NEW_ROOT :
|
|
+ BTRFS_NESTING_SPLIT);
|
|
if (IS_ERR(right))
|
|
return PTR_ERR(right);
|
|
|
|
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
|
|
index 9229549697ce7..272eff4441bcf 100644
|
|
--- a/fs/btrfs/inode.c
|
|
+++ b/fs/btrfs/inode.c
|
|
@@ -2260,13 +2260,127 @@ bool btrfs_bio_fits_in_ordered_extent(struct page *page, struct bio *bio,
|
|
return ret;
|
|
}
|
|
|
|
+/*
|
|
+ * Split an extent_map at [start, start + len]
|
|
+ *
|
|
+ * This function is intended to be used only for extract_ordered_extent().
|
|
+ */
|
|
+static int split_zoned_em(struct btrfs_inode *inode, u64 start, u64 len,
|
|
+ u64 pre, u64 post)
|
|
+{
|
|
+ struct extent_map_tree *em_tree = &inode->extent_tree;
|
|
+ struct extent_map *em;
|
|
+ struct extent_map *split_pre = NULL;
|
|
+ struct extent_map *split_mid = NULL;
|
|
+ struct extent_map *split_post = NULL;
|
|
+ int ret = 0;
|
|
+ int modified;
|
|
+ unsigned long flags;
|
|
+
|
|
+ /* Sanity check */
|
|
+ if (pre == 0 && post == 0)
|
|
+ return 0;
|
|
+
|
|
+ split_pre = alloc_extent_map();
|
|
+ if (pre)
|
|
+ split_mid = alloc_extent_map();
|
|
+ if (post)
|
|
+ split_post = alloc_extent_map();
|
|
+ if (!split_pre || (pre && !split_mid) || (post && !split_post)) {
|
|
+ ret = -ENOMEM;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ ASSERT(pre + post < len);
|
|
+
|
|
+ lock_extent(&inode->io_tree, start, start + len - 1);
|
|
+ write_lock(&em_tree->lock);
|
|
+ em = lookup_extent_mapping(em_tree, start, len);
|
|
+ if (!em) {
|
|
+ ret = -EIO;
|
|
+ goto out_unlock;
|
|
+ }
|
|
+
|
|
+ ASSERT(em->len == len);
|
|
+ ASSERT(!test_bit(EXTENT_FLAG_COMPRESSED, &em->flags));
|
|
+ ASSERT(em->block_start < EXTENT_MAP_LAST_BYTE);
|
|
+
|
|
+ flags = em->flags;
|
|
+ clear_bit(EXTENT_FLAG_PINNED, &em->flags);
|
|
+ clear_bit(EXTENT_FLAG_LOGGING, &flags);
|
|
+ modified = !list_empty(&em->list);
|
|
+
|
|
+ /* First, replace the em with a new extent_map starting from * em->start */
|
|
+ split_pre->start = em->start;
|
|
+ split_pre->len = (pre ? pre : em->len - post);
|
|
+ split_pre->orig_start = split_pre->start;
|
|
+ split_pre->block_start = em->block_start;
|
|
+ split_pre->block_len = split_pre->len;
|
|
+ split_pre->orig_block_len = split_pre->block_len;
|
|
+ split_pre->ram_bytes = split_pre->len;
|
|
+ split_pre->flags = flags;
|
|
+ split_pre->compress_type = em->compress_type;
|
|
+ split_pre->generation = em->generation;
|
|
+
|
|
+ replace_extent_mapping(em_tree, em, split_pre, modified);
|
|
+
|
|
+ /*
|
|
+ * Now we only have an extent_map at:
|
|
+ * [em->start, em->start + pre] if pre != 0
|
|
+ * [em->start, em->start + em->len - post] if pre == 0
|
|
+ */
|
|
+
|
|
+ if (pre) {
|
|
+ /* Insert the middle extent_map */
|
|
+ split_mid->start = em->start + pre;
|
|
+ split_mid->len = em->len - pre - post;
|
|
+ split_mid->orig_start = split_mid->start;
|
|
+ split_mid->block_start = em->block_start + pre;
|
|
+ split_mid->block_len = split_mid->len;
|
|
+ split_mid->orig_block_len = split_mid->block_len;
|
|
+ split_mid->ram_bytes = split_mid->len;
|
|
+ split_mid->flags = flags;
|
|
+ split_mid->compress_type = em->compress_type;
|
|
+ split_mid->generation = em->generation;
|
|
+ add_extent_mapping(em_tree, split_mid, modified);
|
|
+ }
|
|
+
|
|
+ if (post) {
|
|
+ split_post->start = em->start + em->len - post;
|
|
+ split_post->len = post;
|
|
+ split_post->orig_start = split_post->start;
|
|
+ split_post->block_start = em->block_start + em->len - post;
|
|
+ split_post->block_len = split_post->len;
|
|
+ split_post->orig_block_len = split_post->block_len;
|
|
+ split_post->ram_bytes = split_post->len;
|
|
+ split_post->flags = flags;
|
|
+ split_post->compress_type = em->compress_type;
|
|
+ split_post->generation = em->generation;
|
|
+ add_extent_mapping(em_tree, split_post, modified);
|
|
+ }
|
|
+
|
|
+ /* Once for us */
|
|
+ free_extent_map(em);
|
|
+ /* Once for the tree */
|
|
+ free_extent_map(em);
|
|
+
|
|
+out_unlock:
|
|
+ write_unlock(&em_tree->lock);
|
|
+ unlock_extent(&inode->io_tree, start, start + len - 1);
|
|
+out:
|
|
+ free_extent_map(split_pre);
|
|
+ free_extent_map(split_mid);
|
|
+ free_extent_map(split_post);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static blk_status_t extract_ordered_extent(struct btrfs_inode *inode,
|
|
struct bio *bio, loff_t file_offset)
|
|
{
|
|
struct btrfs_ordered_extent *ordered;
|
|
- struct extent_map *em = NULL, *em_new = NULL;
|
|
- struct extent_map_tree *em_tree = &inode->extent_tree;
|
|
u64 start = (u64)bio->bi_iter.bi_sector << SECTOR_SHIFT;
|
|
+ u64 file_len;
|
|
u64 len = bio->bi_iter.bi_size;
|
|
u64 end = start + len;
|
|
u64 ordered_end;
|
|
@@ -2306,41 +2420,16 @@ static blk_status_t extract_ordered_extent(struct btrfs_inode *inode,
|
|
goto out;
|
|
}
|
|
|
|
+ file_len = ordered->num_bytes;
|
|
pre = start - ordered->disk_bytenr;
|
|
post = ordered_end - end;
|
|
|
|
ret = btrfs_split_ordered_extent(ordered, pre, post);
|
|
if (ret)
|
|
goto out;
|
|
-
|
|
- read_lock(&em_tree->lock);
|
|
- em = lookup_extent_mapping(em_tree, ordered->file_offset, len);
|
|
- if (!em) {
|
|
- read_unlock(&em_tree->lock);
|
|
- ret = -EIO;
|
|
- goto out;
|
|
- }
|
|
- read_unlock(&em_tree->lock);
|
|
-
|
|
- ASSERT(!test_bit(EXTENT_FLAG_COMPRESSED, &em->flags));
|
|
- /*
|
|
- * We cannot reuse em_new here but have to create a new one, as
|
|
- * unpin_extent_cache() expects the start of the extent map to be the
|
|
- * logical offset of the file, which does not hold true anymore after
|
|
- * splitting.
|
|
- */
|
|
- em_new = create_io_em(inode, em->start + pre, len,
|
|
- em->start + pre, em->block_start + pre, len,
|
|
- len, len, BTRFS_COMPRESS_NONE,
|
|
- BTRFS_ORDERED_REGULAR);
|
|
- if (IS_ERR(em_new)) {
|
|
- ret = PTR_ERR(em_new);
|
|
- goto out;
|
|
- }
|
|
- free_extent_map(em_new);
|
|
+ ret = split_zoned_em(inode, file_offset, file_len, pre, post);
|
|
|
|
out:
|
|
- free_extent_map(em);
|
|
btrfs_put_ordered_extent(ordered);
|
|
|
|
return errno_to_blk_status(ret);
|
|
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
|
|
index 37450c7644ca0..d73b1afdc4166 100644
|
|
--- a/fs/btrfs/transaction.c
|
|
+++ b/fs/btrfs/transaction.c
|
|
@@ -254,23 +254,21 @@ static inline int extwriter_counter_read(struct btrfs_transaction *trans)
|
|
}
|
|
|
|
/*
|
|
- * To be called after all the new block groups attached to the transaction
|
|
- * handle have been created (btrfs_create_pending_block_groups()).
|
|
+ * To be called after doing the chunk btree updates right after allocating a new
|
|
+ * chunk (after btrfs_chunk_alloc_add_chunk_item() is called), when removing a
|
|
+ * chunk after all chunk btree updates and after finishing the second phase of
|
|
+ * chunk allocation (btrfs_create_pending_block_groups()) in case some block
|
|
+ * group had its chunk item insertion delayed to the second phase.
|
|
*/
|
|
void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
- struct btrfs_transaction *cur_trans = trans->transaction;
|
|
|
|
if (!trans->chunk_bytes_reserved)
|
|
return;
|
|
|
|
- WARN_ON_ONCE(!list_empty(&trans->new_bgs));
|
|
-
|
|
btrfs_block_rsv_release(fs_info, &fs_info->chunk_block_rsv,
|
|
trans->chunk_bytes_reserved, NULL);
|
|
- atomic64_sub(trans->chunk_bytes_reserved, &cur_trans->chunk_bytes_reserved);
|
|
- cond_wake_up(&cur_trans->chunk_reserve_wait);
|
|
trans->chunk_bytes_reserved = 0;
|
|
}
|
|
|
|
@@ -386,8 +384,6 @@ loop:
|
|
spin_lock_init(&cur_trans->dropped_roots_lock);
|
|
INIT_LIST_HEAD(&cur_trans->releasing_ebs);
|
|
spin_lock_init(&cur_trans->releasing_ebs_lock);
|
|
- atomic64_set(&cur_trans->chunk_bytes_reserved, 0);
|
|
- init_waitqueue_head(&cur_trans->chunk_reserve_wait);
|
|
list_add_tail(&cur_trans->list, &fs_info->trans_list);
|
|
extent_io_tree_init(fs_info, &cur_trans->dirty_pages,
|
|
IO_TREE_TRANS_DIRTY_PAGES, fs_info->btree_inode);
|
|
@@ -704,7 +700,6 @@ again:
|
|
h->fs_info = root->fs_info;
|
|
|
|
h->type = type;
|
|
- h->can_flush_pending_bgs = true;
|
|
INIT_LIST_HEAD(&h->new_bgs);
|
|
|
|
smp_mb();
|
|
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
|
|
index c49e2266b28ba..21b36f6e9322b 100644
|
|
--- a/fs/btrfs/transaction.h
|
|
+++ b/fs/btrfs/transaction.h
|
|
@@ -96,13 +96,6 @@ struct btrfs_transaction {
|
|
|
|
spinlock_t releasing_ebs_lock;
|
|
struct list_head releasing_ebs;
|
|
-
|
|
- /*
|
|
- * The number of bytes currently reserved, by all transaction handles
|
|
- * attached to this transaction, for metadata extents of the chunk tree.
|
|
- */
|
|
- atomic64_t chunk_bytes_reserved;
|
|
- wait_queue_head_t chunk_reserve_wait;
|
|
};
|
|
|
|
#define __TRANS_FREEZABLE (1U << 0)
|
|
@@ -141,7 +134,7 @@ struct btrfs_trans_handle {
|
|
short aborted;
|
|
bool adding_csums;
|
|
bool allocating_chunk;
|
|
- bool can_flush_pending_bgs;
|
|
+ bool removing_chunk;
|
|
bool reloc_reserved;
|
|
bool in_fsync;
|
|
struct btrfs_root *root;
|
|
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
|
|
index 760d950752f51..b5ed0a699ee5f 100644
|
|
--- a/fs/btrfs/tree-log.c
|
|
+++ b/fs/btrfs/tree-log.c
|
|
@@ -3173,7 +3173,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
|
|
if (!log_root_tree->node) {
|
|
ret = btrfs_alloc_log_tree_node(trans, log_root_tree);
|
|
if (ret) {
|
|
- mutex_unlock(&fs_info->tree_log_mutex);
|
|
+ mutex_unlock(&fs_info->tree_root->log_mutex);
|
|
goto out;
|
|
}
|
|
}
|
|
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
|
|
index 47d27059d0641..38633ab8108bb 100644
|
|
--- a/fs/btrfs/volumes.c
|
|
+++ b/fs/btrfs/volumes.c
|
|
@@ -1745,19 +1745,14 @@ again:
|
|
extent = btrfs_item_ptr(leaf, path->slots[0],
|
|
struct btrfs_dev_extent);
|
|
} else {
|
|
- btrfs_handle_fs_error(fs_info, ret, "Slot search failed");
|
|
goto out;
|
|
}
|
|
|
|
*dev_extent_len = btrfs_dev_extent_length(leaf, extent);
|
|
|
|
ret = btrfs_del_item(trans, root, path);
|
|
- if (ret) {
|
|
- btrfs_handle_fs_error(fs_info, ret,
|
|
- "Failed to remove dev extent item");
|
|
- } else {
|
|
+ if (ret == 0)
|
|
set_bit(BTRFS_TRANS_HAVE_FREE_BGS, &trans->transaction->flags);
|
|
- }
|
|
out:
|
|
btrfs_free_path(path);
|
|
return ret;
|
|
@@ -2942,7 +2937,7 @@ static int btrfs_del_sys_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
|
|
u32 cur;
|
|
struct btrfs_key key;
|
|
|
|
- mutex_lock(&fs_info->chunk_mutex);
|
|
+ lockdep_assert_held(&fs_info->chunk_mutex);
|
|
array_size = btrfs_super_sys_array_size(super_copy);
|
|
|
|
ptr = super_copy->sys_chunk_array;
|
|
@@ -2972,7 +2967,6 @@ static int btrfs_del_sys_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
|
|
cur += len;
|
|
}
|
|
}
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
return ret;
|
|
}
|
|
|
|
@@ -3012,6 +3006,29 @@ struct extent_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info,
|
|
return em;
|
|
}
|
|
|
|
+static int remove_chunk_item(struct btrfs_trans_handle *trans,
|
|
+ struct map_lookup *map, u64 chunk_offset)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ /*
|
|
+ * Removing chunk items and updating the device items in the chunks btree
|
|
+ * requires holding the chunk_mutex.
|
|
+ * See the comment at btrfs_chunk_alloc() for the details.
|
|
+ */
|
|
+ lockdep_assert_held(&trans->fs_info->chunk_mutex);
|
|
+
|
|
+ for (i = 0; i < map->num_stripes; i++) {
|
|
+ int ret;
|
|
+
|
|
+ ret = btrfs_update_device(trans, map->stripes[i].dev);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ return btrfs_free_chunk(trans, chunk_offset);
|
|
+}
|
|
+
|
|
int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
@@ -3032,14 +3049,16 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
|
|
return PTR_ERR(em);
|
|
}
|
|
map = em->map_lookup;
|
|
- mutex_lock(&fs_info->chunk_mutex);
|
|
- check_system_chunk(trans, map->type);
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
|
|
/*
|
|
- * Take the device list mutex to prevent races with the final phase of
|
|
- * a device replace operation that replaces the device object associated
|
|
- * with map stripes (dev-replace.c:btrfs_dev_replace_finishing()).
|
|
+ * First delete the device extent items from the devices btree.
|
|
+ * We take the device_list_mutex to avoid racing with the finishing phase
|
|
+ * of a device replace operation. See the comment below before acquiring
|
|
+ * fs_info->chunk_mutex. Note that here we do not acquire the chunk_mutex
|
|
+ * because that can result in a deadlock when deleting the device extent
|
|
+ * items from the devices btree - COWing an extent buffer from the btree
|
|
+ * may result in allocating a new metadata chunk, which would attempt to
|
|
+ * lock again fs_info->chunk_mutex.
|
|
*/
|
|
mutex_lock(&fs_devices->device_list_mutex);
|
|
for (i = 0; i < map->num_stripes; i++) {
|
|
@@ -3061,18 +3080,73 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
|
|
btrfs_clear_space_info_full(fs_info);
|
|
mutex_unlock(&fs_info->chunk_mutex);
|
|
}
|
|
+ }
|
|
+ mutex_unlock(&fs_devices->device_list_mutex);
|
|
|
|
- ret = btrfs_update_device(trans, device);
|
|
+ /*
|
|
+ * We acquire fs_info->chunk_mutex for 2 reasons:
|
|
+ *
|
|
+ * 1) Just like with the first phase of the chunk allocation, we must
|
|
+ * reserve system space, do all chunk btree updates and deletions, and
|
|
+ * update the system chunk array in the superblock while holding this
|
|
+ * mutex. This is for similar reasons as explained on the comment at
|
|
+ * the top of btrfs_chunk_alloc();
|
|
+ *
|
|
+ * 2) Prevent races with the final phase of a device replace operation
|
|
+ * that replaces the device object associated with the map's stripes,
|
|
+ * because the device object's id can change at any time during that
|
|
+ * final phase of the device replace operation
|
|
+ * (dev-replace.c:btrfs_dev_replace_finishing()), so we could grab the
|
|
+ * replaced device and then see it with an ID of
|
|
+ * BTRFS_DEV_REPLACE_DEVID, which would cause a failure when updating
|
|
+ * the device item, which does not exists on the chunk btree.
|
|
+ * The finishing phase of device replace acquires both the
|
|
+ * device_list_mutex and the chunk_mutex, in that order, so we are
|
|
+ * safe by just acquiring the chunk_mutex.
|
|
+ */
|
|
+ trans->removing_chunk = true;
|
|
+ mutex_lock(&fs_info->chunk_mutex);
|
|
+
|
|
+ check_system_chunk(trans, map->type);
|
|
+
|
|
+ ret = remove_chunk_item(trans, map, chunk_offset);
|
|
+ /*
|
|
+ * Normally we should not get -ENOSPC since we reserved space before
|
|
+ * through the call to check_system_chunk().
|
|
+ *
|
|
+ * Despite our system space_info having enough free space, we may not
|
|
+ * be able to allocate extents from its block groups, because all have
|
|
+ * an incompatible profile, which will force us to allocate a new system
|
|
+ * block group with the right profile, or right after we called
|
|
+ * check_system_space() above, a scrub turned the only system block group
|
|
+ * with enough free space into RO mode.
|
|
+ * This is explained with more detail at do_chunk_alloc().
|
|
+ *
|
|
+ * So if we get -ENOSPC, allocate a new system chunk and retry once.
|
|
+ */
|
|
+ if (ret == -ENOSPC) {
|
|
+ const u64 sys_flags = btrfs_system_alloc_profile(fs_info);
|
|
+ struct btrfs_block_group *sys_bg;
|
|
+
|
|
+ sys_bg = btrfs_alloc_chunk(trans, sys_flags);
|
|
+ if (IS_ERR(sys_bg)) {
|
|
+ ret = PTR_ERR(sys_bg);
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ ret = btrfs_chunk_alloc_add_chunk_item(trans, sys_bg);
|
|
if (ret) {
|
|
- mutex_unlock(&fs_devices->device_list_mutex);
|
|
btrfs_abort_transaction(trans, ret);
|
|
goto out;
|
|
}
|
|
- }
|
|
- mutex_unlock(&fs_devices->device_list_mutex);
|
|
|
|
- ret = btrfs_free_chunk(trans, chunk_offset);
|
|
- if (ret) {
|
|
+ ret = remove_chunk_item(trans, map, chunk_offset);
|
|
+ if (ret) {
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ goto out;
|
|
+ }
|
|
+ } else if (ret) {
|
|
btrfs_abort_transaction(trans, ret);
|
|
goto out;
|
|
}
|
|
@@ -3087,6 +3161,15 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
|
|
}
|
|
}
|
|
|
|
+ mutex_unlock(&fs_info->chunk_mutex);
|
|
+ trans->removing_chunk = false;
|
|
+
|
|
+ /*
|
|
+ * We are done with chunk btree updates and deletions, so release the
|
|
+ * system space we previously reserved (with check_system_chunk()).
|
|
+ */
|
|
+ btrfs_trans_release_chunk_metadata(trans);
|
|
+
|
|
ret = btrfs_remove_block_group(trans, chunk_offset, em);
|
|
if (ret) {
|
|
btrfs_abort_transaction(trans, ret);
|
|
@@ -3094,6 +3177,10 @@ int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset)
|
|
}
|
|
|
|
out:
|
|
+ if (trans->removing_chunk) {
|
|
+ mutex_unlock(&fs_info->chunk_mutex);
|
|
+ trans->removing_chunk = false;
|
|
+ }
|
|
/* once for us */
|
|
free_extent_map(em);
|
|
return ret;
|
|
@@ -4868,13 +4955,12 @@ static int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info,
|
|
u32 array_size;
|
|
u8 *ptr;
|
|
|
|
- mutex_lock(&fs_info->chunk_mutex);
|
|
+ lockdep_assert_held(&fs_info->chunk_mutex);
|
|
+
|
|
array_size = btrfs_super_sys_array_size(super_copy);
|
|
if (array_size + item_size + sizeof(disk_key)
|
|
- > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) {
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
+ > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE)
|
|
return -EFBIG;
|
|
- }
|
|
|
|
ptr = super_copy->sys_chunk_array + array_size;
|
|
btrfs_cpu_key_to_disk(&disk_key, key);
|
|
@@ -4883,7 +4969,6 @@ static int btrfs_add_system_chunk(struct btrfs_fs_info *fs_info,
|
|
memcpy(ptr, chunk, item_size);
|
|
item_size += sizeof(disk_key);
|
|
btrfs_set_super_sys_array_size(super_copy, array_size + item_size);
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
|
|
return 0;
|
|
}
|
|
@@ -5233,13 +5318,14 @@ static int decide_stripe_size(struct btrfs_fs_devices *fs_devices,
|
|
}
|
|
}
|
|
|
|
-static int create_chunk(struct btrfs_trans_handle *trans,
|
|
+static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans,
|
|
struct alloc_chunk_ctl *ctl,
|
|
struct btrfs_device_info *devices_info)
|
|
{
|
|
struct btrfs_fs_info *info = trans->fs_info;
|
|
struct map_lookup *map = NULL;
|
|
struct extent_map_tree *em_tree;
|
|
+ struct btrfs_block_group *block_group;
|
|
struct extent_map *em;
|
|
u64 start = ctl->start;
|
|
u64 type = ctl->type;
|
|
@@ -5249,7 +5335,7 @@ static int create_chunk(struct btrfs_trans_handle *trans,
|
|
|
|
map = kmalloc(map_lookup_size(ctl->num_stripes), GFP_NOFS);
|
|
if (!map)
|
|
- return -ENOMEM;
|
|
+ return ERR_PTR(-ENOMEM);
|
|
map->num_stripes = ctl->num_stripes;
|
|
|
|
for (i = 0; i < ctl->ndevs; ++i) {
|
|
@@ -5271,7 +5357,7 @@ static int create_chunk(struct btrfs_trans_handle *trans,
|
|
em = alloc_extent_map();
|
|
if (!em) {
|
|
kfree(map);
|
|
- return -ENOMEM;
|
|
+ return ERR_PTR(-ENOMEM);
|
|
}
|
|
set_bit(EXTENT_FLAG_FS_MAPPING, &em->flags);
|
|
em->map_lookup = map;
|
|
@@ -5287,12 +5373,12 @@ static int create_chunk(struct btrfs_trans_handle *trans,
|
|
if (ret) {
|
|
write_unlock(&em_tree->lock);
|
|
free_extent_map(em);
|
|
- return ret;
|
|
+ return ERR_PTR(ret);
|
|
}
|
|
write_unlock(&em_tree->lock);
|
|
|
|
- ret = btrfs_make_block_group(trans, 0, type, start, ctl->chunk_size);
|
|
- if (ret)
|
|
+ block_group = btrfs_make_block_group(trans, 0, type, start, ctl->chunk_size);
|
|
+ if (IS_ERR(block_group))
|
|
goto error_del_extent;
|
|
|
|
for (i = 0; i < map->num_stripes; i++) {
|
|
@@ -5312,7 +5398,7 @@ static int create_chunk(struct btrfs_trans_handle *trans,
|
|
check_raid56_incompat_flag(info, type);
|
|
check_raid1c34_incompat_flag(info, type);
|
|
|
|
- return 0;
|
|
+ return block_group;
|
|
|
|
error_del_extent:
|
|
write_lock(&em_tree->lock);
|
|
@@ -5324,34 +5410,36 @@ error_del_extent:
|
|
/* One for the tree reference */
|
|
free_extent_map(em);
|
|
|
|
- return ret;
|
|
+ return block_group;
|
|
}
|
|
|
|
-int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type)
|
|
+struct btrfs_block_group *btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
|
|
+ u64 type)
|
|
{
|
|
struct btrfs_fs_info *info = trans->fs_info;
|
|
struct btrfs_fs_devices *fs_devices = info->fs_devices;
|
|
struct btrfs_device_info *devices_info = NULL;
|
|
struct alloc_chunk_ctl ctl;
|
|
+ struct btrfs_block_group *block_group;
|
|
int ret;
|
|
|
|
lockdep_assert_held(&info->chunk_mutex);
|
|
|
|
if (!alloc_profile_is_valid(type, 0)) {
|
|
ASSERT(0);
|
|
- return -EINVAL;
|
|
+ return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
if (list_empty(&fs_devices->alloc_list)) {
|
|
if (btrfs_test_opt(info, ENOSPC_DEBUG))
|
|
btrfs_debug(info, "%s: no writable device", __func__);
|
|
- return -ENOSPC;
|
|
+ return ERR_PTR(-ENOSPC);
|
|
}
|
|
|
|
if (!(type & BTRFS_BLOCK_GROUP_TYPE_MASK)) {
|
|
btrfs_err(info, "invalid chunk type 0x%llx requested", type);
|
|
ASSERT(0);
|
|
- return -EINVAL;
|
|
+ return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
ctl.start = find_next_chunk(info);
|
|
@@ -5361,46 +5449,43 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type)
|
|
devices_info = kcalloc(fs_devices->rw_devices, sizeof(*devices_info),
|
|
GFP_NOFS);
|
|
if (!devices_info)
|
|
- return -ENOMEM;
|
|
+ return ERR_PTR(-ENOMEM);
|
|
|
|
ret = gather_device_info(fs_devices, &ctl, devices_info);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ block_group = ERR_PTR(ret);
|
|
goto out;
|
|
+ }
|
|
|
|
ret = decide_stripe_size(fs_devices, &ctl, devices_info);
|
|
- if (ret < 0)
|
|
+ if (ret < 0) {
|
|
+ block_group = ERR_PTR(ret);
|
|
goto out;
|
|
+ }
|
|
|
|
- ret = create_chunk(trans, &ctl, devices_info);
|
|
+ block_group = create_chunk(trans, &ctl, devices_info);
|
|
|
|
out:
|
|
kfree(devices_info);
|
|
- return ret;
|
|
+ return block_group;
|
|
}
|
|
|
|
/*
|
|
- * Chunk allocation falls into two parts. The first part does work
|
|
- * that makes the new allocated chunk usable, but does not do any operation
|
|
- * that modifies the chunk tree. The second part does the work that
|
|
- * requires modifying the chunk tree. This division is important for the
|
|
- * bootstrap process of adding storage to a seed btrfs.
|
|
+ * This function, btrfs_finish_chunk_alloc(), belongs to phase 2.
|
|
+ *
|
|
+ * See the comment at btrfs_chunk_alloc() for details about the chunk allocation
|
|
+ * phases.
|
|
*/
|
|
int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
|
|
u64 chunk_offset, u64 chunk_size)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
- struct btrfs_root *extent_root = fs_info->extent_root;
|
|
- struct btrfs_root *chunk_root = fs_info->chunk_root;
|
|
- struct btrfs_key key;
|
|
struct btrfs_device *device;
|
|
- struct btrfs_chunk *chunk;
|
|
- struct btrfs_stripe *stripe;
|
|
struct extent_map *em;
|
|
struct map_lookup *map;
|
|
- size_t item_size;
|
|
u64 dev_offset;
|
|
u64 stripe_size;
|
|
- int i = 0;
|
|
+ int i;
|
|
int ret = 0;
|
|
|
|
em = btrfs_get_chunk_map(fs_info, chunk_offset, chunk_size);
|
|
@@ -5408,53 +5493,117 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
|
|
return PTR_ERR(em);
|
|
|
|
map = em->map_lookup;
|
|
- item_size = btrfs_chunk_item_size(map->num_stripes);
|
|
stripe_size = em->orig_block_len;
|
|
|
|
- chunk = kzalloc(item_size, GFP_NOFS);
|
|
- if (!chunk) {
|
|
- ret = -ENOMEM;
|
|
- goto out;
|
|
- }
|
|
-
|
|
/*
|
|
* Take the device list mutex to prevent races with the final phase of
|
|
* a device replace operation that replaces the device object associated
|
|
* with the map's stripes, because the device object's id can change
|
|
* at any time during that final phase of the device replace operation
|
|
- * (dev-replace.c:btrfs_dev_replace_finishing()).
|
|
+ * (dev-replace.c:btrfs_dev_replace_finishing()), so we could grab the
|
|
+ * replaced device and then see it with an ID of BTRFS_DEV_REPLACE_DEVID,
|
|
+ * resulting in persisting a device extent item with such ID.
|
|
*/
|
|
mutex_lock(&fs_info->fs_devices->device_list_mutex);
|
|
for (i = 0; i < map->num_stripes; i++) {
|
|
device = map->stripes[i].dev;
|
|
dev_offset = map->stripes[i].physical;
|
|
|
|
- ret = btrfs_update_device(trans, device);
|
|
- if (ret)
|
|
- break;
|
|
ret = btrfs_alloc_dev_extent(trans, device, chunk_offset,
|
|
dev_offset, stripe_size);
|
|
if (ret)
|
|
break;
|
|
}
|
|
- if (ret) {
|
|
- mutex_unlock(&fs_info->fs_devices->device_list_mutex);
|
|
+ mutex_unlock(&fs_info->fs_devices->device_list_mutex);
|
|
+
|
|
+ free_extent_map(em);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+/*
|
|
+ * This function, btrfs_chunk_alloc_add_chunk_item(), typically belongs to the
|
|
+ * phase 1 of chunk allocation. It belongs to phase 2 only when allocating system
|
|
+ * chunks.
|
|
+ *
|
|
+ * See the comment at btrfs_chunk_alloc() for details about the chunk allocation
|
|
+ * phases.
|
|
+ */
|
|
+int btrfs_chunk_alloc_add_chunk_item(struct btrfs_trans_handle *trans,
|
|
+ struct btrfs_block_group *bg)
|
|
+{
|
|
+ struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
+ struct btrfs_root *extent_root = fs_info->extent_root;
|
|
+ struct btrfs_root *chunk_root = fs_info->chunk_root;
|
|
+ struct btrfs_key key;
|
|
+ struct btrfs_chunk *chunk;
|
|
+ struct btrfs_stripe *stripe;
|
|
+ struct extent_map *em;
|
|
+ struct map_lookup *map;
|
|
+ size_t item_size;
|
|
+ int i;
|
|
+ int ret;
|
|
+
|
|
+ /*
|
|
+ * We take the chunk_mutex for 2 reasons:
|
|
+ *
|
|
+ * 1) Updates and insertions in the chunk btree must be done while holding
|
|
+ * the chunk_mutex, as well as updating the system chunk array in the
|
|
+ * superblock. See the comment on top of btrfs_chunk_alloc() for the
|
|
+ * details;
|
|
+ *
|
|
+ * 2) To prevent races with the final phase of a device replace operation
|
|
+ * that replaces the device object associated with the map's stripes,
|
|
+ * because the device object's id can change at any time during that
|
|
+ * final phase of the device replace operation
|
|
+ * (dev-replace.c:btrfs_dev_replace_finishing()), so we could grab the
|
|
+ * replaced device and then see it with an ID of BTRFS_DEV_REPLACE_DEVID,
|
|
+ * which would cause a failure when updating the device item, which does
|
|
+ * not exists, or persisting a stripe of the chunk item with such ID.
|
|
+ * Here we can't use the device_list_mutex because our caller already
|
|
+ * has locked the chunk_mutex, and the final phase of device replace
|
|
+ * acquires both mutexes - first the device_list_mutex and then the
|
|
+ * chunk_mutex. Using any of those two mutexes protects us from a
|
|
+ * concurrent device replace.
|
|
+ */
|
|
+ lockdep_assert_held(&fs_info->chunk_mutex);
|
|
+
|
|
+ em = btrfs_get_chunk_map(fs_info, bg->start, bg->length);
|
|
+ if (IS_ERR(em)) {
|
|
+ ret = PTR_ERR(em);
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ map = em->map_lookup;
|
|
+ item_size = btrfs_chunk_item_size(map->num_stripes);
|
|
+
|
|
+ chunk = kzalloc(item_size, GFP_NOFS);
|
|
+ if (!chunk) {
|
|
+ ret = -ENOMEM;
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
goto out;
|
|
}
|
|
|
|
+ for (i = 0; i < map->num_stripes; i++) {
|
|
+ struct btrfs_device *device = map->stripes[i].dev;
|
|
+
|
|
+ ret = btrfs_update_device(trans, device);
|
|
+ if (ret)
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
stripe = &chunk->stripe;
|
|
for (i = 0; i < map->num_stripes; i++) {
|
|
- device = map->stripes[i].dev;
|
|
- dev_offset = map->stripes[i].physical;
|
|
+ struct btrfs_device *device = map->stripes[i].dev;
|
|
+ const u64 dev_offset = map->stripes[i].physical;
|
|
|
|
btrfs_set_stack_stripe_devid(stripe, device->devid);
|
|
btrfs_set_stack_stripe_offset(stripe, dev_offset);
|
|
memcpy(stripe->dev_uuid, device->uuid, BTRFS_UUID_SIZE);
|
|
stripe++;
|
|
}
|
|
- mutex_unlock(&fs_info->fs_devices->device_list_mutex);
|
|
|
|
- btrfs_set_stack_chunk_length(chunk, chunk_size);
|
|
+ btrfs_set_stack_chunk_length(chunk, bg->length);
|
|
btrfs_set_stack_chunk_owner(chunk, extent_root->root_key.objectid);
|
|
btrfs_set_stack_chunk_stripe_len(chunk, map->stripe_len);
|
|
btrfs_set_stack_chunk_type(chunk, map->type);
|
|
@@ -5466,15 +5615,18 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
|
|
|
|
key.objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
|
|
key.type = BTRFS_CHUNK_ITEM_KEY;
|
|
- key.offset = chunk_offset;
|
|
+ key.offset = bg->start;
|
|
|
|
ret = btrfs_insert_item(trans, chunk_root, &key, chunk, item_size);
|
|
- if (ret == 0 && map->type & BTRFS_BLOCK_GROUP_SYSTEM) {
|
|
- /*
|
|
- * TODO: Cleanup of inserted chunk root in case of
|
|
- * failure.
|
|
- */
|
|
+ if (ret)
|
|
+ goto out;
|
|
+
|
|
+ bg->chunk_item_inserted = 1;
|
|
+
|
|
+ if (map->type & BTRFS_BLOCK_GROUP_SYSTEM) {
|
|
ret = btrfs_add_system_chunk(fs_info, &key, chunk, item_size);
|
|
+ if (ret)
|
|
+ goto out;
|
|
}
|
|
|
|
out:
|
|
@@ -5487,16 +5639,41 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans)
|
|
{
|
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
|
u64 alloc_profile;
|
|
- int ret;
|
|
+ struct btrfs_block_group *meta_bg;
|
|
+ struct btrfs_block_group *sys_bg;
|
|
+
|
|
+ /*
|
|
+ * When adding a new device for sprouting, the seed device is read-only
|
|
+ * so we must first allocate a metadata and a system chunk. But before
|
|
+ * adding the block group items to the extent, device and chunk btrees,
|
|
+ * we must first:
|
|
+ *
|
|
+ * 1) Create both chunks without doing any changes to the btrees, as
|
|
+ * otherwise we would get -ENOSPC since the block groups from the
|
|
+ * seed device are read-only;
|
|
+ *
|
|
+ * 2) Add the device item for the new sprout device - finishing the setup
|
|
+ * of a new block group requires updating the device item in the chunk
|
|
+ * btree, so it must exist when we attempt to do it. The previous step
|
|
+ * ensures this does not fail with -ENOSPC.
|
|
+ *
|
|
+ * After that we can add the block group items to their btrees:
|
|
+ * update existing device item in the chunk btree, add a new block group
|
|
+ * item to the extent btree, add a new chunk item to the chunk btree and
|
|
+ * finally add the new device extent items to the devices btree.
|
|
+ */
|
|
|
|
alloc_profile = btrfs_metadata_alloc_profile(fs_info);
|
|
- ret = btrfs_alloc_chunk(trans, alloc_profile);
|
|
- if (ret)
|
|
- return ret;
|
|
+ meta_bg = btrfs_alloc_chunk(trans, alloc_profile);
|
|
+ if (IS_ERR(meta_bg))
|
|
+ return PTR_ERR(meta_bg);
|
|
|
|
alloc_profile = btrfs_system_alloc_profile(fs_info);
|
|
- ret = btrfs_alloc_chunk(trans, alloc_profile);
|
|
- return ret;
|
|
+ sys_bg = btrfs_alloc_chunk(trans, alloc_profile);
|
|
+ if (IS_ERR(sys_bg))
|
|
+ return PTR_ERR(sys_bg);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static inline int btrfs_chunk_max_errors(struct map_lookup *map)
|
|
@@ -7425,10 +7602,18 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info)
|
|
total_dev++;
|
|
} else if (found_key.type == BTRFS_CHUNK_ITEM_KEY) {
|
|
struct btrfs_chunk *chunk;
|
|
+
|
|
+ /*
|
|
+ * We are only called at mount time, so no need to take
|
|
+ * fs_info->chunk_mutex. Plus, to avoid lockdep warnings,
|
|
+ * we always lock first fs_info->chunk_mutex before
|
|
+ * acquiring any locks on the chunk tree. This is a
|
|
+ * requirement for chunk allocation, see the comment on
|
|
+ * top of btrfs_chunk_alloc() for details.
|
|
+ */
|
|
+ ASSERT(!test_bit(BTRFS_FS_OPEN, &fs_info->flags));
|
|
chunk = btrfs_item_ptr(leaf, slot, struct btrfs_chunk);
|
|
- mutex_lock(&fs_info->chunk_mutex);
|
|
ret = read_one_chunk(&found_key, leaf, chunk);
|
|
- mutex_unlock(&fs_info->chunk_mutex);
|
|
if (ret)
|
|
goto error;
|
|
}
|
|
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
|
|
index 9c0d84e5ec066..0f6ee7152b8b6 100644
|
|
--- a/fs/btrfs/volumes.h
|
|
+++ b/fs/btrfs/volumes.h
|
|
@@ -447,7 +447,8 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *map,
|
|
struct btrfs_io_geometry *io_geom);
|
|
int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);
|
|
int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);
|
|
-int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, u64 type);
|
|
+struct btrfs_block_group *btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
|
|
+ u64 type);
|
|
void btrfs_mapping_tree_free(struct extent_map_tree *tree);
|
|
blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
|
|
int mirror_num);
|
|
@@ -506,6 +507,8 @@ unsigned long btrfs_full_stripe_len(struct btrfs_fs_info *fs_info,
|
|
u64 logical);
|
|
int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
|
|
u64 chunk_offset, u64 chunk_size);
|
|
+int btrfs_chunk_alloc_add_chunk_item(struct btrfs_trans_handle *trans,
|
|
+ struct btrfs_block_group *bg);
|
|
int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset);
|
|
struct extent_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info,
|
|
u64 logical, u64 length);
|
|
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
|
|
index c1570fada3d8e..998dc4dfdc6b1 100644
|
|
--- a/fs/ceph/addr.c
|
|
+++ b/fs/ceph/addr.c
|
|
@@ -82,10 +82,6 @@ static int ceph_set_page_dirty(struct page *page)
|
|
struct inode *inode;
|
|
struct ceph_inode_info *ci;
|
|
struct ceph_snap_context *snapc;
|
|
- int ret;
|
|
-
|
|
- if (unlikely(!mapping))
|
|
- return !TestSetPageDirty(page);
|
|
|
|
if (PageDirty(page)) {
|
|
dout("%p set_page_dirty %p idx %lu -- already dirty\n",
|
|
@@ -130,11 +126,7 @@ static int ceph_set_page_dirty(struct page *page)
|
|
BUG_ON(PagePrivate(page));
|
|
attach_page_private(page, snapc);
|
|
|
|
- ret = __set_page_dirty_nobuffers(page);
|
|
- WARN_ON(!PageLocked(page));
|
|
- WARN_ON(!page->mapping);
|
|
-
|
|
- return ret;
|
|
+ return __set_page_dirty_nobuffers(page);
|
|
}
|
|
|
|
/*
|
|
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
|
|
index c87c37cf29143..8dec4edc8a9fe 100644
|
|
--- a/fs/cifs/cifs_dfs_ref.c
|
|
+++ b/fs/cifs/cifs_dfs_ref.c
|
|
@@ -173,7 +173,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
|
|
}
|
|
}
|
|
|
|
- rc = dns_resolve_server_name_to_ip(name, &srvIP);
|
|
+ rc = dns_resolve_server_name_to_ip(name, &srvIP, NULL);
|
|
if (rc < 0) {
|
|
cifs_dbg(FYI, "%s: Failed to resolve server part of %s to IP: %d\n",
|
|
__func__, name, rc);
|
|
@@ -208,6 +208,10 @@ char *cifs_compose_mount_options(const char *sb_mountdata,
|
|
else
|
|
noff = tkn_e - (sb_mountdata + off) + 1;
|
|
|
|
+ if (strncasecmp(sb_mountdata + off, "cruid=", 6) == 0) {
|
|
+ off += noff;
|
|
+ continue;
|
|
+ }
|
|
if (strncasecmp(sb_mountdata + off, "unc=", 4) == 0) {
|
|
off += noff;
|
|
continue;
|
|
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
|
|
index 706a2aeba1dec..016082024d7d1 100644
|
|
--- a/fs/cifs/cifsglob.h
|
|
+++ b/fs/cifs/cifsglob.h
|
|
@@ -84,6 +84,9 @@
|
|
#define SMB_ECHO_INTERVAL_MAX 600
|
|
#define SMB_ECHO_INTERVAL_DEFAULT 60
|
|
|
|
+/* dns resolution interval in seconds */
|
|
+#define SMB_DNS_RESOLVE_INTERVAL_DEFAULT 600
|
|
+
|
|
/* maximum number of PDUs in one compound */
|
|
#define MAX_COMPOUND 5
|
|
|
|
@@ -654,6 +657,7 @@ struct TCP_Server_Info {
|
|
/* point to the SMBD connection if RDMA is used instead of socket */
|
|
struct smbd_connection *smbd_conn;
|
|
struct delayed_work echo; /* echo ping workqueue job */
|
|
+ struct delayed_work resolve; /* dns resolution workqueue job */
|
|
char *smallbuf; /* pointer to current "small" buffer */
|
|
char *bigbuf; /* pointer to current "big" buffer */
|
|
/* Total size of this PDU. Only valid from cifs_demultiplex_thread */
|
|
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
|
|
index eb6c10fa67410..584acc1372508 100644
|
|
--- a/fs/cifs/connect.c
|
|
+++ b/fs/cifs/connect.c
|
|
@@ -90,6 +90,8 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server)
|
|
int rc;
|
|
int len;
|
|
char *unc, *ipaddr = NULL;
|
|
+ time64_t expiry, now;
|
|
+ unsigned long ttl = SMB_DNS_RESOLVE_INTERVAL_DEFAULT;
|
|
|
|
if (!server->hostname)
|
|
return -EINVAL;
|
|
@@ -103,13 +105,13 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server)
|
|
}
|
|
scnprintf(unc, len, "\\\\%s", server->hostname);
|
|
|
|
- rc = dns_resolve_server_name_to_ip(unc, &ipaddr);
|
|
+ rc = dns_resolve_server_name_to_ip(unc, &ipaddr, &expiry);
|
|
kfree(unc);
|
|
|
|
if (rc < 0) {
|
|
cifs_dbg(FYI, "%s: failed to resolve server part of %s to IP: %d\n",
|
|
__func__, server->hostname, rc);
|
|
- return rc;
|
|
+ goto requeue_resolve;
|
|
}
|
|
|
|
spin_lock(&cifs_tcp_ses_lock);
|
|
@@ -118,7 +120,45 @@ static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server)
|
|
spin_unlock(&cifs_tcp_ses_lock);
|
|
kfree(ipaddr);
|
|
|
|
- return !rc ? -1 : 0;
|
|
+ /* rc == 1 means success here */
|
|
+ if (rc) {
|
|
+ now = ktime_get_real_seconds();
|
|
+ if (expiry && expiry > now)
|
|
+ /*
|
|
+ * To make sure we don't use the cached entry, retry 1s
|
|
+ * after expiry.
|
|
+ */
|
|
+ ttl = (expiry - now + 1);
|
|
+ }
|
|
+ rc = !rc ? -1 : 0;
|
|
+
|
|
+requeue_resolve:
|
|
+ cifs_dbg(FYI, "%s: next dns resolution scheduled for %lu seconds in the future\n",
|
|
+ __func__, ttl);
|
|
+ mod_delayed_work(cifsiod_wq, &server->resolve, (ttl * HZ));
|
|
+
|
|
+ return rc;
|
|
+}
|
|
+
|
|
+
|
|
+static void cifs_resolve_server(struct work_struct *work)
|
|
+{
|
|
+ int rc;
|
|
+ struct TCP_Server_Info *server = container_of(work,
|
|
+ struct TCP_Server_Info, resolve.work);
|
|
+
|
|
+ mutex_lock(&server->srv_mutex);
|
|
+
|
|
+ /*
|
|
+ * Resolve the hostname again to make sure that IP address is up-to-date.
|
|
+ */
|
|
+ rc = reconn_set_ipaddr_from_hostname(server);
|
|
+ if (rc) {
|
|
+ cifs_dbg(FYI, "%s: failed to resolve hostname: %d\n",
|
|
+ __func__, rc);
|
|
+ }
|
|
+
|
|
+ mutex_unlock(&server->srv_mutex);
|
|
}
|
|
|
|
#ifdef CONFIG_CIFS_DFS_UPCALL
|
|
@@ -698,6 +738,7 @@ static void clean_demultiplex_info(struct TCP_Server_Info *server)
|
|
spin_unlock(&cifs_tcp_ses_lock);
|
|
|
|
cancel_delayed_work_sync(&server->echo);
|
|
+ cancel_delayed_work_sync(&server->resolve);
|
|
|
|
spin_lock(&GlobalMid_Lock);
|
|
server->tcpStatus = CifsExiting;
|
|
@@ -1278,6 +1319,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect)
|
|
spin_unlock(&cifs_tcp_ses_lock);
|
|
|
|
cancel_delayed_work_sync(&server->echo);
|
|
+ cancel_delayed_work_sync(&server->resolve);
|
|
|
|
if (from_reconnect)
|
|
/*
|
|
@@ -1360,6 +1402,7 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx)
|
|
INIT_LIST_HEAD(&tcp_ses->tcp_ses_list);
|
|
INIT_LIST_HEAD(&tcp_ses->smb_ses_list);
|
|
INIT_DELAYED_WORK(&tcp_ses->echo, cifs_echo_request);
|
|
+ INIT_DELAYED_WORK(&tcp_ses->resolve, cifs_resolve_server);
|
|
INIT_DELAYED_WORK(&tcp_ses->reconnect, smb2_reconnect_server);
|
|
mutex_init(&tcp_ses->reconnect_mutex);
|
|
memcpy(&tcp_ses->srcaddr, &ctx->srcaddr,
|
|
@@ -1440,6 +1483,12 @@ smbd_connected:
|
|
/* queue echo request delayed work */
|
|
queue_delayed_work(cifsiod_wq, &tcp_ses->echo, tcp_ses->echo_interval);
|
|
|
|
+ /* queue dns resolution delayed work */
|
|
+ cifs_dbg(FYI, "%s: next dns resolution scheduled for %d seconds in the future\n",
|
|
+ __func__, SMB_DNS_RESOLVE_INTERVAL_DEFAULT);
|
|
+
|
|
+ queue_delayed_work(cifsiod_wq, &tcp_ses->resolve, (SMB_DNS_RESOLVE_INTERVAL_DEFAULT * HZ));
|
|
+
|
|
return tcp_ses;
|
|
|
|
out_err_crypto_release:
|
|
@@ -4106,7 +4155,8 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
|
|
if (!tree)
|
|
return -ENOMEM;
|
|
|
|
- if (!tcon->dfs_path) {
|
|
+ /* If it is not dfs or there was no cached dfs referral, then reconnect to same share */
|
|
+ if (!tcon->dfs_path || dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl)) {
|
|
if (tcon->ipc) {
|
|
scnprintf(tree, MAX_TREE_SIZE, "\\\\%s\\IPC$", server->hostname);
|
|
rc = ops->tree_connect(xid, tcon->ses, tree, tcon, nlsc);
|
|
@@ -4116,9 +4166,6 @@ int cifs_tree_connect(const unsigned int xid, struct cifs_tcon *tcon, const stru
|
|
goto out;
|
|
}
|
|
|
|
- rc = dfs_cache_noreq_find(tcon->dfs_path + 1, &ref, &tl);
|
|
- if (rc)
|
|
- goto out;
|
|
isroot = ref.server_type == DFS_TYPE_ROOT;
|
|
free_dfs_info_param(&ref);
|
|
|
|
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
|
|
index 534cbba72789f..8c78b48faf015 100644
|
|
--- a/fs/cifs/dns_resolve.c
|
|
+++ b/fs/cifs/dns_resolve.c
|
|
@@ -36,6 +36,7 @@
|
|
* dns_resolve_server_name_to_ip - Resolve UNC server name to ip address.
|
|
* @unc: UNC path specifying the server (with '/' as delimiter)
|
|
* @ip_addr: Where to return the IP address.
|
|
+ * @expiry: Where to return the expiry time for the dns record.
|
|
*
|
|
* The IP address will be returned in string form, and the caller is
|
|
* responsible for freeing it.
|
|
@@ -43,7 +44,7 @@
|
|
* Returns length of result on success, -ve on error.
|
|
*/
|
|
int
|
|
-dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
|
|
+dns_resolve_server_name_to_ip(const char *unc, char **ip_addr, time64_t *expiry)
|
|
{
|
|
struct sockaddr_storage ss;
|
|
const char *hostname, *sep;
|
|
@@ -78,13 +79,14 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)
|
|
|
|
/* Perform the upcall */
|
|
rc = dns_query(current->nsproxy->net_ns, NULL, hostname, len,
|
|
- NULL, ip_addr, NULL, false);
|
|
+ NULL, ip_addr, expiry, false);
|
|
if (rc < 0)
|
|
cifs_dbg(FYI, "%s: unable to resolve: %*.*s\n",
|
|
__func__, len, len, hostname);
|
|
else
|
|
- cifs_dbg(FYI, "%s: resolved: %*.*s to %s\n",
|
|
- __func__, len, len, hostname, *ip_addr);
|
|
+ cifs_dbg(FYI, "%s: resolved: %*.*s to %s expiry %llu\n",
|
|
+ __func__, len, len, hostname, *ip_addr,
|
|
+ expiry ? (*expiry) : 0);
|
|
return rc;
|
|
|
|
name_is_IP_address:
|
|
diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
|
|
index d3f5d27f4d06e..ff5483d5244d2 100644
|
|
--- a/fs/cifs/dns_resolve.h
|
|
+++ b/fs/cifs/dns_resolve.h
|
|
@@ -24,7 +24,7 @@
|
|
#define _DNS_RESOLVE_H
|
|
|
|
#ifdef __KERNEL__
|
|
-extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
|
|
+extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr, time64_t *expiry);
|
|
#endif /* KERNEL */
|
|
|
|
#endif /* _DNS_RESOLVE_H */
|
|
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
|
|
index 7207a63819cbf..cccaccfb02d04 100644
|
|
--- a/fs/cifs/misc.c
|
|
+++ b/fs/cifs/misc.c
|
|
@@ -1199,7 +1199,7 @@ int match_target_ip(struct TCP_Server_Info *server,
|
|
|
|
cifs_dbg(FYI, "%s: target name: %s\n", __func__, target + 2);
|
|
|
|
- rc = dns_resolve_server_name_to_ip(target, &tip);
|
|
+ rc = dns_resolve_server_name_to_ip(target, &tip, NULL);
|
|
if (rc < 0)
|
|
goto out;
|
|
|
|
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
|
|
index be799040a4154..b96ecba918990 100644
|
|
--- a/fs/ext4/ext4_jbd2.c
|
|
+++ b/fs/ext4/ext4_jbd2.c
|
|
@@ -327,6 +327,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
|
|
|
|
set_buffer_meta(bh);
|
|
set_buffer_prio(bh);
|
|
+ set_buffer_uptodate(bh);
|
|
if (ext4_handle_valid(handle)) {
|
|
err = jbd2_journal_dirty_metadata(handle, bh);
|
|
/* Errors can only happen due to aborted journal or a nasty bug */
|
|
@@ -355,7 +356,6 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
|
|
err);
|
|
}
|
|
} else {
|
|
- set_buffer_uptodate(bh);
|
|
if (inode)
|
|
mark_buffer_dirty_inode(bh, inode);
|
|
else
|
|
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
|
|
index 09f1f02e1d6d6..6a4e040ea9b3a 100644
|
|
--- a/fs/ext4/super.c
|
|
+++ b/fs/ext4/super.c
|
|
@@ -705,15 +705,23 @@ static void flush_stashed_error_work(struct work_struct *work)
|
|
* ext4 error handling code during handling of previous errors.
|
|
*/
|
|
if (!sb_rdonly(sbi->s_sb) && journal) {
|
|
+ struct buffer_head *sbh = sbi->s_sbh;
|
|
handle = jbd2_journal_start(journal, 1);
|
|
if (IS_ERR(handle))
|
|
goto write_directly;
|
|
- if (jbd2_journal_get_write_access(handle, sbi->s_sbh)) {
|
|
+ if (jbd2_journal_get_write_access(handle, sbh)) {
|
|
jbd2_journal_stop(handle);
|
|
goto write_directly;
|
|
}
|
|
ext4_update_super(sbi->s_sb);
|
|
- if (jbd2_journal_dirty_metadata(handle, sbi->s_sbh)) {
|
|
+ if (buffer_write_io_error(sbh) || !buffer_uptodate(sbh)) {
|
|
+ ext4_msg(sbi->s_sb, KERN_ERR, "previous I/O error to "
|
|
+ "superblock detected");
|
|
+ clear_buffer_write_io_error(sbh);
|
|
+ set_buffer_uptodate(sbh);
|
|
+ }
|
|
+
|
|
+ if (jbd2_journal_dirty_metadata(handle, sbh)) {
|
|
jbd2_journal_stop(handle);
|
|
goto write_directly;
|
|
}
|
|
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
|
|
index 8d1f17ab94d82..ab63951c08cbc 100644
|
|
--- a/fs/f2fs/gc.c
|
|
+++ b/fs/f2fs/gc.c
|
|
@@ -1450,10 +1450,8 @@ next_step:
|
|
|
|
if (phase == 3) {
|
|
inode = f2fs_iget(sb, dni.ino);
|
|
- if (IS_ERR(inode) || is_bad_inode(inode)) {
|
|
- set_sbi_flag(sbi, SBI_NEED_FSCK);
|
|
+ if (IS_ERR(inode) || is_bad_inode(inode))
|
|
continue;
|
|
- }
|
|
|
|
if (!down_write_trylock(
|
|
&F2FS_I(inode)->i_gc_rwsem[WRITE])) {
|
|
@@ -1822,6 +1820,7 @@ static void init_atgc_management(struct f2fs_sb_info *sbi)
|
|
am->candidate_ratio = DEF_GC_THREAD_CANDIDATE_RATIO;
|
|
am->max_candidate_count = DEF_GC_THREAD_MAX_CANDIDATE_COUNT;
|
|
am->age_weight = DEF_GC_THREAD_AGE_WEIGHT;
|
|
+ am->age_threshold = DEF_GC_THREAD_AGE_THRESHOLD;
|
|
}
|
|
|
|
void f2fs_build_gc_manager(struct f2fs_sb_info *sbi)
|
|
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
|
|
index a9cd9cf972296..d4139e166b958 100644
|
|
--- a/fs/f2fs/namei.c
|
|
+++ b/fs/f2fs/namei.c
|
|
@@ -153,7 +153,8 @@ fail_drop:
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
-static inline int is_extension_exist(const unsigned char *s, const char *sub)
|
|
+static inline int is_extension_exist(const unsigned char *s, const char *sub,
|
|
+ bool tmp_ext)
|
|
{
|
|
size_t slen = strlen(s);
|
|
size_t sublen = strlen(sub);
|
|
@@ -169,6 +170,13 @@ static inline int is_extension_exist(const unsigned char *s, const char *sub)
|
|
if (slen < sublen + 2)
|
|
return 0;
|
|
|
|
+ if (!tmp_ext) {
|
|
+ /* file has no temp extension */
|
|
+ if (s[slen - sublen - 1] != '.')
|
|
+ return 0;
|
|
+ return !strncasecmp(s + slen - sublen, sub, sublen);
|
|
+ }
|
|
+
|
|
for (i = 1; i < slen - sublen; i++) {
|
|
if (s[i] != '.')
|
|
continue;
|
|
@@ -194,7 +202,7 @@ static inline void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *
|
|
hot_count = sbi->raw_super->hot_ext_count;
|
|
|
|
for (i = 0; i < cold_count + hot_count; i++) {
|
|
- if (is_extension_exist(name, extlist[i]))
|
|
+ if (is_extension_exist(name, extlist[i], true))
|
|
break;
|
|
}
|
|
|
|
@@ -295,7 +303,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
|
|
hot_count = sbi->raw_super->hot_ext_count;
|
|
|
|
for (i = cold_count; i < cold_count + hot_count; i++) {
|
|
- if (is_extension_exist(name, extlist[i])) {
|
|
+ if (is_extension_exist(name, extlist[i], false)) {
|
|
up_read(&sbi->sb_lock);
|
|
return;
|
|
}
|
|
@@ -306,7 +314,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
|
|
ext = F2FS_OPTION(sbi).extensions;
|
|
|
|
for (i = 0; i < ext_cnt; i++) {
|
|
- if (!is_extension_exist(name, ext[i]))
|
|
+ if (!is_extension_exist(name, ext[i], false))
|
|
continue;
|
|
|
|
set_compress_context(inode);
|
|
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
|
|
index 096492caaa6bf..b29de80ab60e8 100644
|
|
--- a/fs/f2fs/super.c
|
|
+++ b/fs/f2fs/super.c
|
|
@@ -4321,4 +4321,5 @@ module_exit(exit_f2fs_fs)
|
|
MODULE_AUTHOR("Samsung Electronics's Praesto Team");
|
|
MODULE_DESCRIPTION("Flash Friendly File System");
|
|
MODULE_LICENSE("GPL");
|
|
+MODULE_SOFTDEP("pre: crc32");
|
|
|
|
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
|
|
index 3fa8604c21d52..d296b0d19c273 100644
|
|
--- a/fs/fuse/dir.c
|
|
+++ b/fs/fuse/dir.c
|
|
@@ -252,7 +252,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags)
|
|
if (ret == -ENOMEM)
|
|
goto out;
|
|
if (ret || fuse_invalid_attr(&outarg.attr) ||
|
|
- inode_wrong_type(inode, outarg.attr.mode))
|
|
+ fuse_stale_inode(inode, outarg.generation, &outarg.attr))
|
|
goto invalid;
|
|
|
|
forget_all_cached_acls(inode);
|
|
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
|
|
index 7e463e2200531..120f9c5908d19 100644
|
|
--- a/fs/fuse/fuse_i.h
|
|
+++ b/fs/fuse/fuse_i.h
|
|
@@ -761,6 +761,9 @@ struct fuse_conn {
|
|
/* Auto-mount submounts announced by the server */
|
|
unsigned int auto_submounts:1;
|
|
|
|
+ /* Propagate syncfs() to server */
|
|
+ unsigned int sync_fs:1;
|
|
+
|
|
/** The number of requests waiting for completion */
|
|
atomic_t num_waiting;
|
|
|
|
@@ -867,6 +870,13 @@ static inline u64 fuse_get_attr_version(struct fuse_conn *fc)
|
|
return atomic64_read(&fc->attr_version);
|
|
}
|
|
|
|
+static inline bool fuse_stale_inode(const struct inode *inode, int generation,
|
|
+ struct fuse_attr *attr)
|
|
+{
|
|
+ return inode->i_generation != generation ||
|
|
+ inode_wrong_type(inode, attr->mode);
|
|
+}
|
|
+
|
|
static inline void fuse_make_bad(struct inode *inode)
|
|
{
|
|
remove_inode_hash(inode);
|
|
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
|
|
index 393e36b74dc44..cf16d6d3a6038 100644
|
|
--- a/fs/fuse/inode.c
|
|
+++ b/fs/fuse/inode.c
|
|
@@ -350,8 +350,8 @@ retry:
|
|
inode->i_generation = generation;
|
|
fuse_init_inode(inode, attr);
|
|
unlock_new_inode(inode);
|
|
- } else if (inode_wrong_type(inode, attr->mode)) {
|
|
- /* Inode has changed type, any I/O on the old should fail */
|
|
+ } else if (fuse_stale_inode(inode, generation, attr)) {
|
|
+ /* nodeid was reused, any I/O on the old inode should fail */
|
|
fuse_make_bad(inode);
|
|
iput(inode);
|
|
goto retry;
|
|
@@ -506,6 +506,45 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf)
|
|
return err;
|
|
}
|
|
|
|
+static int fuse_sync_fs(struct super_block *sb, int wait)
|
|
+{
|
|
+ struct fuse_mount *fm = get_fuse_mount_super(sb);
|
|
+ struct fuse_conn *fc = fm->fc;
|
|
+ struct fuse_syncfs_in inarg;
|
|
+ FUSE_ARGS(args);
|
|
+ int err;
|
|
+
|
|
+ /*
|
|
+ * Userspace cannot handle the wait == 0 case. Avoid a
|
|
+ * gratuitous roundtrip.
|
|
+ */
|
|
+ if (!wait)
|
|
+ return 0;
|
|
+
|
|
+ /* The filesystem is being unmounted. Nothing to do. */
|
|
+ if (!sb->s_root)
|
|
+ return 0;
|
|
+
|
|
+ if (!fc->sync_fs)
|
|
+ return 0;
|
|
+
|
|
+ memset(&inarg, 0, sizeof(inarg));
|
|
+ args.in_numargs = 1;
|
|
+ args.in_args[0].size = sizeof(inarg);
|
|
+ args.in_args[0].value = &inarg;
|
|
+ args.opcode = FUSE_SYNCFS;
|
|
+ args.nodeid = get_node_id(sb->s_root->d_inode);
|
|
+ args.out_numargs = 0;
|
|
+
|
|
+ err = fuse_simple_request(fm, &args);
|
|
+ if (err == -ENOSYS) {
|
|
+ fc->sync_fs = 0;
|
|
+ err = 0;
|
|
+ }
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
enum {
|
|
OPT_SOURCE,
|
|
OPT_SUBTYPE,
|
|
@@ -909,6 +948,7 @@ static const struct super_operations fuse_super_operations = {
|
|
.put_super = fuse_put_super,
|
|
.umount_begin = fuse_umount_begin,
|
|
.statfs = fuse_statfs,
|
|
+ .sync_fs = fuse_sync_fs,
|
|
.show_options = fuse_show_options,
|
|
};
|
|
|
|
diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c
|
|
index 277f7041d55aa..bc267832310c7 100644
|
|
--- a/fs/fuse/readdir.c
|
|
+++ b/fs/fuse/readdir.c
|
|
@@ -200,9 +200,12 @@ retry:
|
|
if (!d_in_lookup(dentry)) {
|
|
struct fuse_inode *fi;
|
|
inode = d_inode(dentry);
|
|
+ if (inode && get_node_id(inode) != o->nodeid)
|
|
+ inode = NULL;
|
|
if (!inode ||
|
|
- get_node_id(inode) != o->nodeid ||
|
|
- inode_wrong_type(inode, o->attr.mode)) {
|
|
+ fuse_stale_inode(inode, o->generation, &o->attr)) {
|
|
+ if (inode)
|
|
+ fuse_make_bad(inode);
|
|
d_invalidate(dentry);
|
|
dput(dentry);
|
|
goto retry;
|
|
diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
|
|
index bcb8a02e2d8b5..f9809b1b82f04 100644
|
|
--- a/fs/fuse/virtio_fs.c
|
|
+++ b/fs/fuse/virtio_fs.c
|
|
@@ -1447,6 +1447,7 @@ static int virtio_fs_get_tree(struct fs_context *fsc)
|
|
fc->release = fuse_free_conn;
|
|
fc->delete_stale = true;
|
|
fc->auto_submounts = true;
|
|
+ fc->sync_fs = true;
|
|
|
|
/* Tell FUSE to split requests that exceed the virtqueue's size */
|
|
fc->max_pages_limit = min_t(unsigned int, fc->max_pages_limit,
|
|
diff --git a/fs/io-wq.h b/fs/io-wq.h
|
|
index af2df0680ee22..32c7b4e824845 100644
|
|
--- a/fs/io-wq.h
|
|
+++ b/fs/io-wq.h
|
|
@@ -87,7 +87,6 @@ static inline void wq_list_del(struct io_wq_work_list *list,
|
|
|
|
struct io_wq_work {
|
|
struct io_wq_work_node list;
|
|
- const struct cred *creds;
|
|
unsigned flags;
|
|
};
|
|
|
|
diff --git a/fs/io_uring.c b/fs/io_uring.c
|
|
index ad1f31fafe445..eeea6b8c8bee0 100644
|
|
--- a/fs/io_uring.c
|
|
+++ b/fs/io_uring.c
|
|
@@ -299,11 +299,8 @@ struct io_sq_data {
|
|
struct io_comp_state {
|
|
struct io_kiocb *reqs[IO_COMPL_BATCH];
|
|
unsigned int nr;
|
|
- unsigned int locked_free_nr;
|
|
/* inline/task_work completion list, under ->uring_lock */
|
|
struct list_head free_list;
|
|
- /* IRQ completion list, under ->completion_lock */
|
|
- struct list_head locked_free_list;
|
|
};
|
|
|
|
struct io_submit_link {
|
|
@@ -369,9 +366,6 @@ struct io_ring_ctx {
|
|
unsigned cached_cq_overflow;
|
|
unsigned long sq_check_overflow;
|
|
|
|
- /* hashed buffered write serialization */
|
|
- struct io_wq_hash *hash_map;
|
|
-
|
|
struct list_head defer_list;
|
|
struct list_head timeout_list;
|
|
struct list_head cq_overflow_list;
|
|
@@ -385,12 +379,12 @@ struct io_ring_ctx {
|
|
} ____cacheline_aligned_in_smp;
|
|
|
|
struct io_submit_state submit_state;
|
|
+ /* IRQ completion list, under ->completion_lock */
|
|
+ struct list_head locked_free_list;
|
|
+ unsigned int locked_free_nr;
|
|
|
|
struct io_rings *rings;
|
|
|
|
- /* Only used for accounting purposes */
|
|
- struct mm_struct *mm_account;
|
|
-
|
|
const struct cred *sq_creds; /* cred used for __io_sq_thread() */
|
|
struct io_sq_data *sq_data; /* if using sq thread polling */
|
|
|
|
@@ -411,14 +405,6 @@ struct io_ring_ctx {
|
|
unsigned nr_user_bufs;
|
|
struct io_mapped_ubuf **user_bufs;
|
|
|
|
- struct user_struct *user;
|
|
-
|
|
- struct completion ref_comp;
|
|
-
|
|
-#if defined(CONFIG_UNIX)
|
|
- struct socket *ring_sock;
|
|
-#endif
|
|
-
|
|
struct xarray io_buffers;
|
|
|
|
struct xarray personalities;
|
|
@@ -462,12 +448,24 @@ struct io_ring_ctx {
|
|
|
|
struct io_restriction restrictions;
|
|
|
|
- /* exit task_work */
|
|
- struct callback_head *exit_task_work;
|
|
-
|
|
/* Keep this last, we don't need it for the fast path */
|
|
- struct work_struct exit_work;
|
|
- struct list_head tctx_list;
|
|
+ struct {
|
|
+ #if defined(CONFIG_UNIX)
|
|
+ struct socket *ring_sock;
|
|
+ #endif
|
|
+ /* hashed buffered write serialization */
|
|
+ struct io_wq_hash *hash_map;
|
|
+
|
|
+ /* Only used for accounting purposes */
|
|
+ struct user_struct *user;
|
|
+ struct mm_struct *mm_account;
|
|
+
|
|
+ /* ctx exit and cancelation */
|
|
+ struct callback_head *exit_task_work;
|
|
+ struct work_struct exit_work;
|
|
+ struct list_head tctx_list;
|
|
+ struct completion ref_comp;
|
|
+ };
|
|
};
|
|
|
|
struct io_uring_task {
|
|
@@ -851,6 +849,8 @@ struct io_kiocb {
|
|
struct hlist_node hash_node;
|
|
struct async_poll *apoll;
|
|
struct io_wq_work work;
|
|
+ const struct cred *creds;
|
|
+
|
|
/* store used ubuf, so we can prevent reloading */
|
|
struct io_mapped_ubuf *imu;
|
|
};
|
|
@@ -1037,7 +1037,7 @@ static bool io_disarm_next(struct io_kiocb *req);
|
|
static void io_uring_del_task_file(unsigned long index);
|
|
static void io_uring_try_cancel_requests(struct io_ring_ctx *ctx,
|
|
struct task_struct *task,
|
|
- struct files_struct *files);
|
|
+ bool cancel_all);
|
|
static void io_uring_cancel_sqpoll(struct io_sq_data *sqd);
|
|
static struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx);
|
|
|
|
@@ -1106,15 +1106,14 @@ static void io_refs_resurrect(struct percpu_ref *ref, struct completion *compl)
|
|
percpu_ref_put(ref);
|
|
}
|
|
|
|
-static bool io_match_task(struct io_kiocb *head,
|
|
- struct task_struct *task,
|
|
- struct files_struct *files)
|
|
+static bool io_match_task(struct io_kiocb *head, struct task_struct *task,
|
|
+ bool cancel_all)
|
|
{
|
|
struct io_kiocb *req;
|
|
|
|
if (task && head->task != task)
|
|
return false;
|
|
- if (!files)
|
|
+ if (cancel_all)
|
|
return true;
|
|
|
|
io_for_each_link(req, head) {
|
|
@@ -1196,7 +1195,7 @@ static struct io_ring_ctx *io_ring_ctx_alloc(struct io_uring_params *p)
|
|
init_llist_head(&ctx->rsrc_put_llist);
|
|
INIT_LIST_HEAD(&ctx->tctx_list);
|
|
INIT_LIST_HEAD(&ctx->submit_state.comp.free_list);
|
|
- INIT_LIST_HEAD(&ctx->submit_state.comp.locked_free_list);
|
|
+ INIT_LIST_HEAD(&ctx->locked_free_list);
|
|
return ctx;
|
|
err:
|
|
kfree(ctx->dummy_ubuf);
|
|
@@ -1230,8 +1229,8 @@ static void io_prep_async_work(struct io_kiocb *req)
|
|
const struct io_op_def *def = &io_op_defs[req->opcode];
|
|
struct io_ring_ctx *ctx = req->ctx;
|
|
|
|
- if (!req->work.creds)
|
|
- req->work.creds = get_current_cred();
|
|
+ if (!req->creds)
|
|
+ req->creds = get_current_cred();
|
|
|
|
req->work.list.next = NULL;
|
|
req->work.flags = 0;
|
|
@@ -1593,8 +1592,6 @@ static void io_req_complete_post(struct io_kiocb *req, long res,
|
|
* free_list cache.
|
|
*/
|
|
if (req_ref_put_and_test(req)) {
|
|
- struct io_comp_state *cs = &ctx->submit_state.comp;
|
|
-
|
|
if (req->flags & (REQ_F_LINK | REQ_F_HARDLINK)) {
|
|
if (req->flags & (REQ_F_LINK_TIMEOUT | REQ_F_FAIL_LINK))
|
|
io_disarm_next(req);
|
|
@@ -1605,8 +1602,8 @@ static void io_req_complete_post(struct io_kiocb *req, long res,
|
|
}
|
|
io_dismantle_req(req);
|
|
io_put_task(req->task, 1);
|
|
- list_add(&req->compl.list, &cs->locked_free_list);
|
|
- cs->locked_free_nr++;
|
|
+ list_add(&req->compl.list, &ctx->locked_free_list);
|
|
+ ctx->locked_free_nr++;
|
|
} else {
|
|
if (!percpu_ref_tryget(&ctx->refs))
|
|
req = NULL;
|
|
@@ -1661,8 +1658,8 @@ static void io_flush_cached_locked_reqs(struct io_ring_ctx *ctx,
|
|
struct io_comp_state *cs)
|
|
{
|
|
spin_lock_irq(&ctx->completion_lock);
|
|
- list_splice_init(&cs->locked_free_list, &cs->free_list);
|
|
- cs->locked_free_nr = 0;
|
|
+ list_splice_init(&ctx->locked_free_list, &cs->free_list);
|
|
+ ctx->locked_free_nr = 0;
|
|
spin_unlock_irq(&ctx->completion_lock);
|
|
}
|
|
|
|
@@ -1678,7 +1675,7 @@ static bool io_flush_cached_reqs(struct io_ring_ctx *ctx)
|
|
* locked cache, grab the lock and move them over to our submission
|
|
* side cache.
|
|
*/
|
|
- if (READ_ONCE(cs->locked_free_nr) > IO_COMPL_BATCH)
|
|
+ if (READ_ONCE(ctx->locked_free_nr) > IO_COMPL_BATCH)
|
|
io_flush_cached_locked_reqs(ctx, cs);
|
|
|
|
nr = state->free_reqs;
|
|
@@ -1747,9 +1744,9 @@ static void io_dismantle_req(struct io_kiocb *req)
|
|
percpu_ref_put(req->fixed_rsrc_refs);
|
|
if (req->async_data)
|
|
kfree(req->async_data);
|
|
- if (req->work.creds) {
|
|
- put_cred(req->work.creds);
|
|
- req->work.creds = NULL;
|
|
+ if (req->creds) {
|
|
+ put_cred(req->creds);
|
|
+ req->creds = NULL;
|
|
}
|
|
}
|
|
|
|
@@ -1886,48 +1883,43 @@ static void ctx_flush_and_put(struct io_ring_ctx *ctx)
|
|
percpu_ref_put(&ctx->refs);
|
|
}
|
|
|
|
-static bool __tctx_task_work(struct io_uring_task *tctx)
|
|
-{
|
|
- struct io_ring_ctx *ctx = NULL;
|
|
- struct io_wq_work_list list;
|
|
- struct io_wq_work_node *node;
|
|
-
|
|
- if (wq_list_empty(&tctx->task_list))
|
|
- return false;
|
|
-
|
|
- spin_lock_irq(&tctx->task_lock);
|
|
- list = tctx->task_list;
|
|
- INIT_WQ_LIST(&tctx->task_list);
|
|
- spin_unlock_irq(&tctx->task_lock);
|
|
-
|
|
- node = list.first;
|
|
- while (node) {
|
|
- struct io_wq_work_node *next = node->next;
|
|
- struct io_kiocb *req;
|
|
-
|
|
- req = container_of(node, struct io_kiocb, io_task_work.node);
|
|
- if (req->ctx != ctx) {
|
|
- ctx_flush_and_put(ctx);
|
|
- ctx = req->ctx;
|
|
- percpu_ref_get(&ctx->refs);
|
|
- }
|
|
-
|
|
- req->task_work.func(&req->task_work);
|
|
- node = next;
|
|
- }
|
|
-
|
|
- ctx_flush_and_put(ctx);
|
|
- return list.first != NULL;
|
|
-}
|
|
-
|
|
static void tctx_task_work(struct callback_head *cb)
|
|
{
|
|
- struct io_uring_task *tctx = container_of(cb, struct io_uring_task, task_work);
|
|
+ struct io_uring_task *tctx = container_of(cb, struct io_uring_task,
|
|
+ task_work);
|
|
|
|
clear_bit(0, &tctx->task_state);
|
|
|
|
- while (__tctx_task_work(tctx))
|
|
+ while (!wq_list_empty(&tctx->task_list)) {
|
|
+ struct io_ring_ctx *ctx = NULL;
|
|
+ struct io_wq_work_list list;
|
|
+ struct io_wq_work_node *node;
|
|
+
|
|
+ spin_lock_irq(&tctx->task_lock);
|
|
+ list = tctx->task_list;
|
|
+ INIT_WQ_LIST(&tctx->task_list);
|
|
+ spin_unlock_irq(&tctx->task_lock);
|
|
+
|
|
+ node = list.first;
|
|
+ while (node) {
|
|
+ struct io_wq_work_node *next = node->next;
|
|
+ struct io_kiocb *req = container_of(node, struct io_kiocb,
|
|
+ io_task_work.node);
|
|
+
|
|
+ if (req->ctx != ctx) {
|
|
+ ctx_flush_and_put(ctx);
|
|
+ ctx = req->ctx;
|
|
+ percpu_ref_get(&ctx->refs);
|
|
+ }
|
|
+ req->task_work.func(&req->task_work);
|
|
+ node = next;
|
|
+ }
|
|
+
|
|
+ ctx_flush_and_put(ctx);
|
|
+ if (!list.first)
|
|
+ break;
|
|
cond_resched();
|
|
+ }
|
|
}
|
|
|
|
static int io_req_task_work_add(struct io_kiocb *req)
|
|
@@ -2040,7 +2032,7 @@ static void __io_req_task_submit(struct io_kiocb *req)
|
|
|
|
/* ctx stays valid until unlock, even if we drop all ours ctx->refs */
|
|
mutex_lock(&ctx->uring_lock);
|
|
- if (!(current->flags & PF_EXITING) && !current->in_execve)
|
|
+ if (!(req->task->flags & PF_EXITING) && !req->task->in_execve)
|
|
__io_queue_sqe(req);
|
|
else
|
|
io_req_complete_failed(req, -EFAULT);
|
|
@@ -2235,12 +2227,6 @@ static inline unsigned int io_put_rw_kbuf(struct io_kiocb *req)
|
|
|
|
static inline bool io_run_task_work(void)
|
|
{
|
|
- /*
|
|
- * Not safe to run on exiting task, and the task_work handling will
|
|
- * not add work to such a task.
|
|
- */
|
|
- if (unlikely(current->flags & PF_EXITING))
|
|
- return false;
|
|
if (current->task_works) {
|
|
__set_current_state(TASK_RUNNING);
|
|
task_work_run();
|
|
@@ -5265,7 +5251,7 @@ static bool io_poll_remove_one(struct io_kiocb *req)
|
|
* Returns true if we found and killed one or more poll requests
|
|
*/
|
|
static bool io_poll_remove_all(struct io_ring_ctx *ctx, struct task_struct *tsk,
|
|
- struct files_struct *files)
|
|
+ bool cancel_all)
|
|
{
|
|
struct hlist_node *tmp;
|
|
struct io_kiocb *req;
|
|
@@ -5277,7 +5263,7 @@ static bool io_poll_remove_all(struct io_ring_ctx *ctx, struct task_struct *tsk,
|
|
|
|
list = &ctx->cancel_hash[i];
|
|
hlist_for_each_entry_safe(req, tmp, list, hash_node) {
|
|
- if (io_match_task(req, tsk, files))
|
|
+ if (io_match_task(req, tsk, cancel_all))
|
|
posted += io_poll_remove_one(req);
|
|
}
|
|
}
|
|
@@ -6115,8 +6101,8 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
|
|
const struct cred *creds = NULL;
|
|
int ret;
|
|
|
|
- if (req->work.creds && req->work.creds != current_cred())
|
|
- creds = override_creds(req->work.creds);
|
|
+ if (req->creds && req->creds != current_cred())
|
|
+ creds = override_creds(req->creds);
|
|
|
|
switch (req->opcode) {
|
|
case IORING_OP_NOP:
|
|
@@ -6523,7 +6509,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
|
|
atomic_set(&req->refs, 2);
|
|
req->task = current;
|
|
req->result = 0;
|
|
- req->work.creds = NULL;
|
|
+ req->creds = NULL;
|
|
|
|
/* enforce forwards compatibility on users */
|
|
if (unlikely(sqe_flags & ~SQE_VALID_FLAGS))
|
|
@@ -6539,10 +6525,10 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
|
|
|
|
personality = READ_ONCE(sqe->personality);
|
|
if (personality) {
|
|
- req->work.creds = xa_load(&ctx->personalities, personality);
|
|
- if (!req->work.creds)
|
|
+ req->creds = xa_load(&ctx->personalities, personality);
|
|
+ if (!req->creds)
|
|
return -EINVAL;
|
|
- get_cred(req->work.creds);
|
|
+ get_cred(req->creds);
|
|
}
|
|
state = &ctx->submit_state;
|
|
|
|
@@ -8747,7 +8733,7 @@ static void io_ring_exit_work(struct work_struct *work)
|
|
* as nobody else will be looking for them.
|
|
*/
|
|
do {
|
|
- io_uring_try_cancel_requests(ctx, NULL, NULL);
|
|
+ io_uring_try_cancel_requests(ctx, NULL, true);
|
|
if (ctx->sq_data) {
|
|
struct io_sq_data *sqd = ctx->sq_data;
|
|
struct task_struct *tsk;
|
|
@@ -8798,14 +8784,14 @@ static void io_ring_exit_work(struct work_struct *work)
|
|
|
|
/* Returns true if we found and killed one or more timeouts */
|
|
static bool io_kill_timeouts(struct io_ring_ctx *ctx, struct task_struct *tsk,
|
|
- struct files_struct *files)
|
|
+ bool cancel_all)
|
|
{
|
|
struct io_kiocb *req, *tmp;
|
|
int canceled = 0;
|
|
|
|
spin_lock_irq(&ctx->completion_lock);
|
|
list_for_each_entry_safe(req, tmp, &ctx->timeout_list, timeout.list) {
|
|
- if (io_match_task(req, tsk, files)) {
|
|
+ if (io_match_task(req, tsk, cancel_all)) {
|
|
io_kill_timeout(req, -ECANCELED);
|
|
canceled++;
|
|
}
|
|
@@ -8831,8 +8817,8 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
|
|
io_unregister_personality(ctx, index);
|
|
mutex_unlock(&ctx->uring_lock);
|
|
|
|
- io_kill_timeouts(ctx, NULL, NULL);
|
|
- io_poll_remove_all(ctx, NULL, NULL);
|
|
+ io_kill_timeouts(ctx, NULL, true);
|
|
+ io_poll_remove_all(ctx, NULL, true);
|
|
|
|
/* if we failed setting up the ctx, we might not have any rings */
|
|
io_iopoll_try_reap_events(ctx);
|
|
@@ -8858,7 +8844,7 @@ static int io_uring_release(struct inode *inode, struct file *file)
|
|
|
|
struct io_task_cancel {
|
|
struct task_struct *task;
|
|
- struct files_struct *files;
|
|
+ bool all;
|
|
};
|
|
|
|
static bool io_cancel_task_cb(struct io_wq_work *work, void *data)
|
|
@@ -8867,30 +8853,29 @@ static bool io_cancel_task_cb(struct io_wq_work *work, void *data)
|
|
struct io_task_cancel *cancel = data;
|
|
bool ret;
|
|
|
|
- if (cancel->files && (req->flags & REQ_F_LINK_TIMEOUT)) {
|
|
+ if (!cancel->all && (req->flags & REQ_F_LINK_TIMEOUT)) {
|
|
unsigned long flags;
|
|
struct io_ring_ctx *ctx = req->ctx;
|
|
|
|
/* protect against races with linked timeouts */
|
|
spin_lock_irqsave(&ctx->completion_lock, flags);
|
|
- ret = io_match_task(req, cancel->task, cancel->files);
|
|
+ ret = io_match_task(req, cancel->task, cancel->all);
|
|
spin_unlock_irqrestore(&ctx->completion_lock, flags);
|
|
} else {
|
|
- ret = io_match_task(req, cancel->task, cancel->files);
|
|
+ ret = io_match_task(req, cancel->task, cancel->all);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static bool io_cancel_defer_files(struct io_ring_ctx *ctx,
|
|
- struct task_struct *task,
|
|
- struct files_struct *files)
|
|
+ struct task_struct *task, bool cancel_all)
|
|
{
|
|
struct io_defer_entry *de;
|
|
LIST_HEAD(list);
|
|
|
|
spin_lock_irq(&ctx->completion_lock);
|
|
list_for_each_entry_reverse(de, &ctx->defer_list, list) {
|
|
- if (io_match_task(de->req, task, files)) {
|
|
+ if (io_match_task(de->req, task, cancel_all)) {
|
|
list_cut_position(&list, &ctx->defer_list, &de->list);
|
|
break;
|
|
}
|
|
@@ -8934,9 +8919,9 @@ static bool io_uring_try_cancel_iowq(struct io_ring_ctx *ctx)
|
|
|
|
static void io_uring_try_cancel_requests(struct io_ring_ctx *ctx,
|
|
struct task_struct *task,
|
|
- struct files_struct *files)
|
|
+ bool cancel_all)
|
|
{
|
|
- struct io_task_cancel cancel = { .task = task, .files = files, };
|
|
+ struct io_task_cancel cancel = { .task = task, .all = cancel_all, };
|
|
struct io_uring_task *tctx = task ? task->io_uring : NULL;
|
|
|
|
while (1) {
|
|
@@ -8956,7 +8941,7 @@ static void io_uring_try_cancel_requests(struct io_ring_ctx *ctx,
|
|
}
|
|
|
|
/* SQPOLL thread does its own polling */
|
|
- if ((!(ctx->flags & IORING_SETUP_SQPOLL) && !files) ||
|
|
+ if ((!(ctx->flags & IORING_SETUP_SQPOLL) && cancel_all) ||
|
|
(ctx->sq_data && ctx->sq_data->thread == current)) {
|
|
while (!list_empty_careful(&ctx->iopoll_list)) {
|
|
io_iopoll_try_reap_events(ctx);
|
|
@@ -8964,10 +8949,11 @@ static void io_uring_try_cancel_requests(struct io_ring_ctx *ctx,
|
|
}
|
|
}
|
|
|
|
- ret |= io_cancel_defer_files(ctx, task, files);
|
|
- ret |= io_poll_remove_all(ctx, task, files);
|
|
- ret |= io_kill_timeouts(ctx, task, files);
|
|
- ret |= io_run_task_work();
|
|
+ ret |= io_cancel_defer_files(ctx, task, cancel_all);
|
|
+ ret |= io_poll_remove_all(ctx, task, cancel_all);
|
|
+ ret |= io_kill_timeouts(ctx, task, cancel_all);
|
|
+ if (task)
|
|
+ ret |= io_run_task_work();
|
|
ret |= io_run_ctx_fallback(ctx);
|
|
if (!ret)
|
|
break;
|
|
@@ -9072,7 +9058,7 @@ static s64 tctx_inflight(struct io_uring_task *tctx, bool tracked)
|
|
return percpu_counter_sum(&tctx->inflight);
|
|
}
|
|
|
|
-static void io_uring_try_cancel(struct files_struct *files)
|
|
+static void io_uring_try_cancel(bool cancel_all)
|
|
{
|
|
struct io_uring_task *tctx = current->io_uring;
|
|
struct io_tctx_node *node;
|
|
@@ -9083,7 +9069,7 @@ static void io_uring_try_cancel(struct files_struct *files)
|
|
|
|
/* sqpoll task will cancel all its requests */
|
|
if (!ctx->sq_data)
|
|
- io_uring_try_cancel_requests(ctx, current, files);
|
|
+ io_uring_try_cancel_requests(ctx, current, cancel_all);
|
|
}
|
|
}
|
|
|
|
@@ -9109,7 +9095,7 @@ static void io_uring_cancel_sqpoll(struct io_sq_data *sqd)
|
|
if (!inflight)
|
|
break;
|
|
list_for_each_entry(ctx, &sqd->ctx_list, sqd_list)
|
|
- io_uring_try_cancel_requests(ctx, current, NULL);
|
|
+ io_uring_try_cancel_requests(ctx, current, true);
|
|
|
|
prepare_to_wait(&tctx->wait, &wait, TASK_UNINTERRUPTIBLE);
|
|
/*
|
|
@@ -9133,6 +9119,7 @@ void __io_uring_cancel(struct files_struct *files)
|
|
struct io_uring_task *tctx = current->io_uring;
|
|
DEFINE_WAIT(wait);
|
|
s64 inflight;
|
|
+ bool cancel_all = !files;
|
|
|
|
if (tctx->io_wq)
|
|
io_wq_exit_start(tctx->io_wq);
|
|
@@ -9141,10 +9128,10 @@ void __io_uring_cancel(struct files_struct *files)
|
|
atomic_inc(&tctx->in_idle);
|
|
do {
|
|
/* read completions before cancelations */
|
|
- inflight = tctx_inflight(tctx, !!files);
|
|
+ inflight = tctx_inflight(tctx, !cancel_all);
|
|
if (!inflight)
|
|
break;
|
|
- io_uring_try_cancel(files);
|
|
+ io_uring_try_cancel(cancel_all);
|
|
prepare_to_wait(&tctx->wait, &wait, TASK_UNINTERRUPTIBLE);
|
|
|
|
/*
|
|
@@ -9152,14 +9139,14 @@ void __io_uring_cancel(struct files_struct *files)
|
|
* avoids a race where a completion comes in before we did
|
|
* prepare_to_wait().
|
|
*/
|
|
- if (inflight == tctx_inflight(tctx, !!files))
|
|
+ if (inflight == tctx_inflight(tctx, !cancel_all))
|
|
schedule();
|
|
finish_wait(&tctx->wait, &wait);
|
|
} while (1);
|
|
atomic_dec(&tctx->in_idle);
|
|
|
|
io_uring_clean_tctx(tctx);
|
|
- if (!files) {
|
|
+ if (cancel_all) {
|
|
/* for exec all current's requests should be gone, kill tctx */
|
|
__io_uring_free(current);
|
|
}
|
|
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
|
|
index 9330eff210e0c..78fd136ac13b9 100644
|
|
--- a/fs/jfs/jfs_logmgr.c
|
|
+++ b/fs/jfs/jfs_logmgr.c
|
|
@@ -1324,6 +1324,7 @@ int lmLogInit(struct jfs_log * log)
|
|
} else {
|
|
if (!uuid_equal(&logsuper->uuid, &log->uuid)) {
|
|
jfs_warn("wrong uuid on JFS log device");
|
|
+ rc = -EINVAL;
|
|
goto errout20;
|
|
}
|
|
log->size = le32_to_cpu(logsuper->size);
|
|
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
|
|
index e6ec6f09ac6e4..7c45ac3c3b0b5 100644
|
|
--- a/fs/nfs/delegation.c
|
|
+++ b/fs/nfs/delegation.c
|
|
@@ -75,6 +75,13 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation)
|
|
set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags);
|
|
}
|
|
|
|
+static void nfs_mark_return_delegation(struct nfs_server *server,
|
|
+ struct nfs_delegation *delegation)
|
|
+{
|
|
+ set_bit(NFS_DELEGATION_RETURN, &delegation->flags);
|
|
+ set_bit(NFS4CLNT_DELEGRETURN, &server->nfs_client->cl_state);
|
|
+}
|
|
+
|
|
static bool
|
|
nfs4_is_valid_delegation(const struct nfs_delegation *delegation,
|
|
fmode_t flags)
|
|
@@ -293,6 +300,7 @@ nfs_start_delegation_return_locked(struct nfs_inode *nfsi)
|
|
goto out;
|
|
spin_lock(&delegation->lock);
|
|
if (!test_and_set_bit(NFS_DELEGATION_RETURNING, &delegation->flags)) {
|
|
+ clear_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags);
|
|
/* Refcount matched in nfs_end_delegation_return() */
|
|
ret = nfs_get_delegation(delegation);
|
|
}
|
|
@@ -314,16 +322,17 @@ nfs_start_delegation_return(struct nfs_inode *nfsi)
|
|
return delegation;
|
|
}
|
|
|
|
-static void
|
|
-nfs_abort_delegation_return(struct nfs_delegation *delegation,
|
|
- struct nfs_client *clp)
|
|
+static void nfs_abort_delegation_return(struct nfs_delegation *delegation,
|
|
+ struct nfs_client *clp, int err)
|
|
{
|
|
|
|
spin_lock(&delegation->lock);
|
|
clear_bit(NFS_DELEGATION_RETURNING, &delegation->flags);
|
|
- set_bit(NFS_DELEGATION_RETURN, &delegation->flags);
|
|
+ if (err == -EAGAIN) {
|
|
+ set_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags);
|
|
+ set_bit(NFS4CLNT_DELEGRETURN_DELAYED, &clp->cl_state);
|
|
+ }
|
|
spin_unlock(&delegation->lock);
|
|
- set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state);
|
|
}
|
|
|
|
static struct nfs_delegation *
|
|
@@ -539,7 +548,7 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation
|
|
} while (err == 0);
|
|
|
|
if (err) {
|
|
- nfs_abort_delegation_return(delegation, clp);
|
|
+ nfs_abort_delegation_return(delegation, clp, err);
|
|
goto out;
|
|
}
|
|
|
|
@@ -568,6 +577,7 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation)
|
|
if (ret)
|
|
clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags);
|
|
if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) ||
|
|
+ test_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags) ||
|
|
test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))
|
|
ret = false;
|
|
|
|
@@ -647,6 +657,38 @@ out:
|
|
return err;
|
|
}
|
|
|
|
+static bool nfs_server_clear_delayed_delegations(struct nfs_server *server)
|
|
+{
|
|
+ struct nfs_delegation *d;
|
|
+ bool ret = false;
|
|
+
|
|
+ list_for_each_entry_rcu (d, &server->delegations, super_list) {
|
|
+ if (!test_bit(NFS_DELEGATION_RETURN_DELAYED, &d->flags))
|
|
+ continue;
|
|
+ nfs_mark_return_delegation(server, d);
|
|
+ clear_bit(NFS_DELEGATION_RETURN_DELAYED, &d->flags);
|
|
+ ret = true;
|
|
+ }
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static bool nfs_client_clear_delayed_delegations(struct nfs_client *clp)
|
|
+{
|
|
+ struct nfs_server *server;
|
|
+ bool ret = false;
|
|
+
|
|
+ if (!test_and_clear_bit(NFS4CLNT_DELEGRETURN_DELAYED, &clp->cl_state))
|
|
+ goto out;
|
|
+ rcu_read_lock();
|
|
+ list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) {
|
|
+ if (nfs_server_clear_delayed_delegations(server))
|
|
+ ret = true;
|
|
+ }
|
|
+ rcu_read_unlock();
|
|
+out:
|
|
+ return ret;
|
|
+}
|
|
+
|
|
/**
|
|
* nfs_client_return_marked_delegations - return previously marked delegations
|
|
* @clp: nfs_client to process
|
|
@@ -659,8 +701,14 @@ out:
|
|
*/
|
|
int nfs_client_return_marked_delegations(struct nfs_client *clp)
|
|
{
|
|
- return nfs_client_for_each_server(clp,
|
|
- nfs_server_return_marked_delegations, NULL);
|
|
+ int err = nfs_client_for_each_server(
|
|
+ clp, nfs_server_return_marked_delegations, NULL);
|
|
+ if (err)
|
|
+ return err;
|
|
+ /* If a return was delayed, sleep to prevent hard looping */
|
|
+ if (nfs_client_clear_delayed_delegations(clp))
|
|
+ ssleep(1);
|
|
+ return 0;
|
|
}
|
|
|
|
/**
|
|
@@ -775,13 +823,6 @@ static void nfs_mark_return_if_closed_delegation(struct nfs_server *server,
|
|
set_bit(NFS4CLNT_DELEGRETURN, &server->nfs_client->cl_state);
|
|
}
|
|
|
|
-static void nfs_mark_return_delegation(struct nfs_server *server,
|
|
- struct nfs_delegation *delegation)
|
|
-{
|
|
- set_bit(NFS_DELEGATION_RETURN, &delegation->flags);
|
|
- set_bit(NFS4CLNT_DELEGRETURN, &server->nfs_client->cl_state);
|
|
-}
|
|
-
|
|
static bool nfs_server_mark_return_all_delegations(struct nfs_server *server)
|
|
{
|
|
struct nfs_delegation *delegation;
|
|
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
|
|
index c19b4fd207812..1c378992b7c0f 100644
|
|
--- a/fs/nfs/delegation.h
|
|
+++ b/fs/nfs/delegation.h
|
|
@@ -36,6 +36,7 @@ enum {
|
|
NFS_DELEGATION_REVOKED,
|
|
NFS_DELEGATION_TEST_EXPIRED,
|
|
NFS_DELEGATION_INODE_FREEING,
|
|
+ NFS_DELEGATION_RETURN_DELAYED,
|
|
};
|
|
|
|
int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,
|
|
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
|
|
index 2d30a4da49fa0..2e894fec036b0 100644
|
|
--- a/fs/nfs/direct.c
|
|
+++ b/fs/nfs/direct.c
|
|
@@ -700,8 +700,8 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
|
|
{
|
|
struct nfs_direct_req *dreq = hdr->dreq;
|
|
struct nfs_commit_info cinfo;
|
|
- bool request_commit = false;
|
|
struct nfs_page *req = nfs_list_entry(hdr->pages.next);
|
|
+ int flags = NFS_ODIRECT_DONE;
|
|
|
|
nfs_init_cinfo_from_dreq(&cinfo, dreq);
|
|
|
|
@@ -713,15 +713,9 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
|
|
|
|
nfs_direct_count_bytes(dreq, hdr);
|
|
if (hdr->good_bytes != 0 && nfs_write_need_commit(hdr)) {
|
|
- switch (dreq->flags) {
|
|
- case 0:
|
|
+ if (!dreq->flags)
|
|
dreq->flags = NFS_ODIRECT_DO_COMMIT;
|
|
- request_commit = true;
|
|
- break;
|
|
- case NFS_ODIRECT_RESCHED_WRITES:
|
|
- case NFS_ODIRECT_DO_COMMIT:
|
|
- request_commit = true;
|
|
- }
|
|
+ flags = dreq->flags;
|
|
}
|
|
spin_unlock(&dreq->lock);
|
|
|
|
@@ -729,12 +723,15 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
|
|
|
|
req = nfs_list_entry(hdr->pages.next);
|
|
nfs_list_remove_request(req);
|
|
- if (request_commit) {
|
|
+ if (flags == NFS_ODIRECT_DO_COMMIT) {
|
|
kref_get(&req->wb_kref);
|
|
memcpy(&req->wb_verf, &hdr->verf.verifier,
|
|
sizeof(req->wb_verf));
|
|
nfs_mark_request_commit(req, hdr->lseg, &cinfo,
|
|
hdr->ds_commit_idx);
|
|
+ } else if (flags == NFS_ODIRECT_RESCHED_WRITES) {
|
|
+ kref_get(&req->wb_kref);
|
|
+ nfs_mark_request_commit(req, NULL, &cinfo, 0);
|
|
}
|
|
nfs_unlock_and_release_request(req);
|
|
}
|
|
diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
|
|
index c4c021c6ebbd8..d743629e05e12 100644
|
|
--- a/fs/nfs/fscache.c
|
|
+++ b/fs/nfs/fscache.c
|
|
@@ -385,12 +385,15 @@ static void nfs_readpage_from_fscache_complete(struct page *page,
|
|
"NFS: readpage_from_fscache_complete (0x%p/0x%p/%d)\n",
|
|
page, context, error);
|
|
|
|
- /* if the read completes with an error, we just unlock the page and let
|
|
- * the VM reissue the readpage */
|
|
- if (!error) {
|
|
+ /*
|
|
+ * If the read completes with an error, mark the page with PG_checked,
|
|
+ * unlock the page, and let the VM reissue the readpage.
|
|
+ */
|
|
+ if (!error)
|
|
SetPageUptodate(page);
|
|
- unlock_page(page);
|
|
- }
|
|
+ else
|
|
+ SetPageChecked(page);
|
|
+ unlock_page(page);
|
|
}
|
|
|
|
/*
|
|
@@ -405,6 +408,11 @@ int __nfs_readpage_from_fscache(struct nfs_open_context *ctx,
|
|
"NFS: readpage_from_fscache(fsc:%p/p:%p(i:%lx f:%lx)/0x%p)\n",
|
|
nfs_i_fscache(inode), page, page->index, page->flags, inode);
|
|
|
|
+ if (PageChecked(page)) {
|
|
+ ClearPageChecked(page);
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
ret = fscache_read_or_alloc_page(nfs_i_fscache(inode),
|
|
page,
|
|
nfs_readpage_from_fscache_complete,
|
|
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
|
|
index aaeeb4659bff3..59355c106eceb 100644
|
|
--- a/fs/nfs/getroot.c
|
|
+++ b/fs/nfs/getroot.c
|
|
@@ -67,7 +67,7 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i
|
|
int nfs_get_root(struct super_block *s, struct fs_context *fc)
|
|
{
|
|
struct nfs_fs_context *ctx = nfs_fc2context(fc);
|
|
- struct nfs_server *server = NFS_SB(s);
|
|
+ struct nfs_server *server = NFS_SB(s), *clone_server;
|
|
struct nfs_fsinfo fsinfo;
|
|
struct dentry *root;
|
|
struct inode *inode;
|
|
@@ -127,7 +127,7 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
|
|
}
|
|
spin_unlock(&root->d_lock);
|
|
fc->root = root;
|
|
- if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL)
|
|
+ if (server->caps & NFS_CAP_SECURITY_LABEL)
|
|
kflags |= SECURITY_LSM_NATIVE_LABELS;
|
|
if (ctx->clone_data.sb) {
|
|
if (d_inode(fc->root)->i_fop != &nfs_dir_operations) {
|
|
@@ -137,15 +137,19 @@ int nfs_get_root(struct super_block *s, struct fs_context *fc)
|
|
/* clone lsm security options from the parent to the new sb */
|
|
error = security_sb_clone_mnt_opts(ctx->clone_data.sb,
|
|
s, kflags, &kflags_out);
|
|
+ if (error)
|
|
+ goto error_splat_root;
|
|
+ clone_server = NFS_SB(ctx->clone_data.sb);
|
|
+ server->has_sec_mnt_opts = clone_server->has_sec_mnt_opts;
|
|
} else {
|
|
error = security_sb_set_mnt_opts(s, fc->security,
|
|
kflags, &kflags_out);
|
|
}
|
|
if (error)
|
|
goto error_splat_root;
|
|
- if (NFS_SB(s)->caps & NFS_CAP_SECURITY_LABEL &&
|
|
+ if (server->caps & NFS_CAP_SECURITY_LABEL &&
|
|
!(kflags_out & SECURITY_LSM_NATIVE_LABELS))
|
|
- NFS_SB(s)->caps &= ~NFS_CAP_SECURITY_LABEL;
|
|
+ server->caps &= ~NFS_CAP_SECURITY_LABEL;
|
|
|
|
nfs_setsecurity(inode, fsinfo.fattr, fsinfo.fattr->label);
|
|
error = 0;
|
|
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
|
|
index 529c4099f482a..1acae1716df12 100644
|
|
--- a/fs/nfs/inode.c
|
|
+++ b/fs/nfs/inode.c
|
|
@@ -1101,6 +1101,7 @@ EXPORT_SYMBOL_GPL(nfs_inode_attach_open_context);
|
|
void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)
|
|
{
|
|
filp->private_data = get_nfs_open_context(ctx);
|
|
+ set_bit(NFS_CONTEXT_FILE_OPEN, &ctx->flags);
|
|
if (list_empty(&ctx->list))
|
|
nfs_inode_attach_open_context(ctx);
|
|
}
|
|
@@ -1120,6 +1121,8 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, const struct
|
|
continue;
|
|
if ((pos->mode & (FMODE_READ|FMODE_WRITE)) != mode)
|
|
continue;
|
|
+ if (!test_bit(NFS_CONTEXT_FILE_OPEN, &pos->flags))
|
|
+ continue;
|
|
ctx = get_nfs_open_context(pos);
|
|
if (ctx)
|
|
break;
|
|
@@ -1135,6 +1138,7 @@ void nfs_file_clear_open_context(struct file *filp)
|
|
if (ctx) {
|
|
struct inode *inode = d_inode(ctx->dentry);
|
|
|
|
+ clear_bit(NFS_CONTEXT_FILE_OPEN, &ctx->flags);
|
|
/*
|
|
* We fatal error on write before. Try to writeback
|
|
* every page again.
|
|
@@ -2066,24 +2070,22 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
} else {
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_CHANGE;
|
|
- cache_revalidated = false;
|
|
+ if (!have_delegation ||
|
|
+ (nfsi->cache_validity & NFS_INO_INVALID_CHANGE) != 0)
|
|
+ cache_revalidated = false;
|
|
}
|
|
|
|
- if (fattr->valid & NFS_ATTR_FATTR_MTIME) {
|
|
+ if (fattr->valid & NFS_ATTR_FATTR_MTIME)
|
|
inode->i_mtime = fattr->mtime;
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_MTIME) {
|
|
+ else if (fattr_supported & NFS_ATTR_FATTR_MTIME)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_MTIME;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
- if (fattr->valid & NFS_ATTR_FATTR_CTIME) {
|
|
+ if (fattr->valid & NFS_ATTR_FATTR_CTIME)
|
|
inode->i_ctime = fattr->ctime;
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_CTIME) {
|
|
+ else if (fattr_supported & NFS_ATTR_FATTR_CTIME)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_CTIME;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
/* Check if our cached file size is stale */
|
|
if (fattr->valid & NFS_ATTR_FATTR_SIZE) {
|
|
@@ -2111,19 +2113,15 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
fattr->du.nfs3.used = 0;
|
|
fattr->valid |= NFS_ATTR_FATTR_SPACE_USED;
|
|
}
|
|
- } else {
|
|
+ } else
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_SIZE;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
|
|
inode->i_atime = fattr->atime;
|
|
- else if (fattr_supported & NFS_ATTR_FATTR_ATIME) {
|
|
+ else if (fattr_supported & NFS_ATTR_FATTR_ATIME)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_ATIME;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_MODE) {
|
|
if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) {
|
|
@@ -2134,11 +2132,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
| NFS_INO_INVALID_ACL;
|
|
attr_changed = true;
|
|
}
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_MODE) {
|
|
+ } else if (fattr_supported & NFS_ATTR_FATTR_MODE)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_MODE;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_OWNER) {
|
|
if (!uid_eq(inode->i_uid, fattr->uid)) {
|
|
@@ -2147,11 +2143,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
inode->i_uid = fattr->uid;
|
|
attr_changed = true;
|
|
}
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_OWNER) {
|
|
+ } else if (fattr_supported & NFS_ATTR_FATTR_OWNER)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_OTHER;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_GROUP) {
|
|
if (!gid_eq(inode->i_gid, fattr->gid)) {
|
|
@@ -2160,11 +2154,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
inode->i_gid = fattr->gid;
|
|
attr_changed = true;
|
|
}
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_GROUP) {
|
|
+ } else if (fattr_supported & NFS_ATTR_FATTR_GROUP)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_OTHER;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
|
|
if (inode->i_nlink != fattr->nlink) {
|
|
@@ -2173,30 +2165,24 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|
set_nlink(inode, fattr->nlink);
|
|
attr_changed = true;
|
|
}
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_NLINK) {
|
|
+ } else if (fattr_supported & NFS_ATTR_FATTR_NLINK)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_NLINK;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
if (fattr->valid & NFS_ATTR_FATTR_SPACE_USED) {
|
|
/*
|
|
* report the blocks in 512byte units
|
|
*/
|
|
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_SPACE_USED) {
|
|
+ } else if (fattr_supported & NFS_ATTR_FATTR_SPACE_USED)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_BLOCKS;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
- if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) {
|
|
+ if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
|
|
inode->i_blocks = fattr->du.nfs2.blocks;
|
|
- } else if (fattr_supported & NFS_ATTR_FATTR_BLOCKS_USED) {
|
|
+ else if (fattr_supported & NFS_ATTR_FATTR_BLOCKS_USED)
|
|
nfsi->cache_validity |=
|
|
save_cache_validity & NFS_INO_INVALID_BLOCKS;
|
|
- cache_revalidated = false;
|
|
- }
|
|
|
|
/* Update attrtimeo value if we're out of the unstable period */
|
|
if (attr_changed) {
|
|
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
|
|
index 5c4e23abc3451..2299446b3b89b 100644
|
|
--- a/fs/nfs/nfs3proc.c
|
|
+++ b/fs/nfs/nfs3proc.c
|
|
@@ -385,7 +385,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
|
break;
|
|
|
|
case NFS3_CREATE_UNCHECKED:
|
|
- goto out;
|
|
+ goto out_release_acls;
|
|
}
|
|
nfs_fattr_init(data->res.dir_attr);
|
|
nfs_fattr_init(data->res.fattr);
|
|
@@ -751,7 +751,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
|
|
break;
|
|
default:
|
|
status = -EINVAL;
|
|
- goto out;
|
|
+ goto out_release_acls;
|
|
}
|
|
|
|
d_alias = nfs3_do_create(dir, dentry, data);
|
|
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
|
|
index 543d916f79abb..3e344bec3647b 100644
|
|
--- a/fs/nfs/nfs4_fs.h
|
|
+++ b/fs/nfs/nfs4_fs.h
|
|
@@ -45,6 +45,7 @@ enum nfs4_client_state {
|
|
NFS4CLNT_RECALL_RUNNING,
|
|
NFS4CLNT_RECALL_ANY_LAYOUT_READ,
|
|
NFS4CLNT_RECALL_ANY_LAYOUT_RW,
|
|
+ NFS4CLNT_DELEGRETURN_DELAYED,
|
|
};
|
|
|
|
#define NFS4_RENEW_TIMEOUT 0x01
|
|
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
|
|
index 42719384e25fe..28431acd1230b 100644
|
|
--- a/fs/nfs/nfs4client.c
|
|
+++ b/fs/nfs/nfs4client.c
|
|
@@ -197,8 +197,11 @@ void nfs40_shutdown_client(struct nfs_client *clp)
|
|
|
|
struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
|
|
{
|
|
- int err;
|
|
+ char buf[INET6_ADDRSTRLEN + 1];
|
|
+ const char *ip_addr = cl_init->ip_addr;
|
|
struct nfs_client *clp = nfs_alloc_client(cl_init);
|
|
+ int err;
|
|
+
|
|
if (IS_ERR(clp))
|
|
return clp;
|
|
|
|
@@ -222,6 +225,44 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
|
|
init_waitqueue_head(&clp->cl_lock_waitq);
|
|
#endif
|
|
INIT_LIST_HEAD(&clp->pending_cb_stateids);
|
|
+
|
|
+ if (cl_init->minorversion != 0)
|
|
+ __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
|
|
+ __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
|
|
+ __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
|
|
+
|
|
+ /*
|
|
+ * Set up the connection to the server before we add add to the
|
|
+ * global list.
|
|
+ */
|
|
+ err = nfs_create_rpc_client(clp, cl_init, RPC_AUTH_GSS_KRB5I);
|
|
+ if (err == -EINVAL)
|
|
+ err = nfs_create_rpc_client(clp, cl_init, RPC_AUTH_UNIX);
|
|
+ if (err < 0)
|
|
+ goto error;
|
|
+
|
|
+ /* If no clientaddr= option was specified, find a usable cb address */
|
|
+ if (ip_addr == NULL) {
|
|
+ struct sockaddr_storage cb_addr;
|
|
+ struct sockaddr *sap = (struct sockaddr *)&cb_addr;
|
|
+
|
|
+ err = rpc_localaddr(clp->cl_rpcclient, sap, sizeof(cb_addr));
|
|
+ if (err < 0)
|
|
+ goto error;
|
|
+ err = rpc_ntop(sap, buf, sizeof(buf));
|
|
+ if (err < 0)
|
|
+ goto error;
|
|
+ ip_addr = (const char *)buf;
|
|
+ }
|
|
+ strlcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
|
|
+
|
|
+ err = nfs_idmap_new(clp);
|
|
+ if (err < 0) {
|
|
+ dprintk("%s: failed to create idmapper. Error = %d\n",
|
|
+ __func__, err);
|
|
+ goto error;
|
|
+ }
|
|
+ __set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
|
|
return clp;
|
|
|
|
error:
|
|
@@ -372,8 +413,6 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp)
|
|
struct nfs_client *nfs4_init_client(struct nfs_client *clp,
|
|
const struct nfs_client_initdata *cl_init)
|
|
{
|
|
- char buf[INET6_ADDRSTRLEN + 1];
|
|
- const char *ip_addr = cl_init->ip_addr;
|
|
struct nfs_client *old;
|
|
int error;
|
|
|
|
@@ -381,43 +420,6 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
|
|
/* the client is initialised already */
|
|
return clp;
|
|
|
|
- /* Check NFS protocol revision and initialize RPC op vector */
|
|
- clp->rpc_ops = &nfs_v4_clientops;
|
|
-
|
|
- if (clp->cl_minorversion != 0)
|
|
- __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags);
|
|
- __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
|
|
- __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags);
|
|
-
|
|
- error = nfs_create_rpc_client(clp, cl_init, RPC_AUTH_GSS_KRB5I);
|
|
- if (error == -EINVAL)
|
|
- error = nfs_create_rpc_client(clp, cl_init, RPC_AUTH_UNIX);
|
|
- if (error < 0)
|
|
- goto error;
|
|
-
|
|
- /* If no clientaddr= option was specified, find a usable cb address */
|
|
- if (ip_addr == NULL) {
|
|
- struct sockaddr_storage cb_addr;
|
|
- struct sockaddr *sap = (struct sockaddr *)&cb_addr;
|
|
-
|
|
- error = rpc_localaddr(clp->cl_rpcclient, sap, sizeof(cb_addr));
|
|
- if (error < 0)
|
|
- goto error;
|
|
- error = rpc_ntop(sap, buf, sizeof(buf));
|
|
- if (error < 0)
|
|
- goto error;
|
|
- ip_addr = (const char *)buf;
|
|
- }
|
|
- strlcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
|
|
-
|
|
- error = nfs_idmap_new(clp);
|
|
- if (error < 0) {
|
|
- dprintk("%s: failed to create idmapper. Error = %d\n",
|
|
- __func__, error);
|
|
- goto error;
|
|
- }
|
|
- __set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
|
|
-
|
|
error = nfs4_init_client_minor_version(clp);
|
|
if (error < 0)
|
|
goto error;
|
|
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
|
index e653654c10bcd..451d3d56d80c7 100644
|
|
--- a/fs/nfs/nfs4proc.c
|
|
+++ b/fs/nfs/nfs4proc.c
|
|
@@ -1205,12 +1205,12 @@ nfs4_update_changeattr_locked(struct inode *inode,
|
|
u64 change_attr = inode_peek_iversion_raw(inode);
|
|
|
|
cache_validity |= NFS_INO_INVALID_CTIME | NFS_INO_INVALID_MTIME;
|
|
+ if (S_ISDIR(inode->i_mode))
|
|
+ cache_validity |= NFS_INO_INVALID_DATA;
|
|
|
|
switch (NFS_SERVER(inode)->change_attr_type) {
|
|
case NFS4_CHANGE_TYPE_IS_UNDEFINED:
|
|
- break;
|
|
- case NFS4_CHANGE_TYPE_IS_TIME_METADATA:
|
|
- if ((s64)(change_attr - cinfo->after) > 0)
|
|
+ if (cinfo->after == change_attr)
|
|
goto out;
|
|
break;
|
|
default:
|
|
@@ -1218,24 +1218,21 @@ nfs4_update_changeattr_locked(struct inode *inode,
|
|
goto out;
|
|
}
|
|
|
|
- if (cinfo->atomic && cinfo->before == change_attr) {
|
|
- nfsi->attrtimeo_timestamp = jiffies;
|
|
- } else {
|
|
- if (S_ISDIR(inode->i_mode)) {
|
|
- cache_validity |= NFS_INO_INVALID_DATA;
|
|
+ inode_set_iversion_raw(inode, cinfo->after);
|
|
+ if (!cinfo->atomic || cinfo->before != change_attr) {
|
|
+ if (S_ISDIR(inode->i_mode))
|
|
nfs_force_lookup_revalidate(inode);
|
|
- } else {
|
|
- if (!NFS_PROTO(inode)->have_delegation(inode,
|
|
- FMODE_READ))
|
|
- cache_validity |= NFS_INO_REVAL_PAGECACHE;
|
|
- }
|
|
|
|
- if (cinfo->before != change_attr)
|
|
- cache_validity |= NFS_INO_INVALID_ACCESS |
|
|
- NFS_INO_INVALID_ACL |
|
|
- NFS_INO_INVALID_XATTR;
|
|
+ if (!NFS_PROTO(inode)->have_delegation(inode, FMODE_READ))
|
|
+ cache_validity |=
|
|
+ NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL |
|
|
+ NFS_INO_INVALID_SIZE | NFS_INO_INVALID_OTHER |
|
|
+ NFS_INO_INVALID_BLOCKS | NFS_INO_INVALID_NLINK |
|
|
+ NFS_INO_INVALID_MODE | NFS_INO_INVALID_XATTR |
|
|
+ NFS_INO_REVAL_PAGECACHE;
|
|
+ nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
|
|
}
|
|
- inode_set_iversion_raw(inode, cinfo->after);
|
|
+ nfsi->attrtimeo_timestamp = jiffies;
|
|
nfsi->read_cache_jiffies = timestamp;
|
|
nfsi->attr_gencount = nfs_inc_attr_generation_counter();
|
|
nfsi->cache_validity &= ~NFS_INO_INVALID_CHANGE;
|
|
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
|
|
index 2c01ee805306c..be960e47d7f61 100644
|
|
--- a/fs/nfs/pnfs.c
|
|
+++ b/fs/nfs/pnfs.c
|
|
@@ -966,10 +966,8 @@ void
|
|
pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,
|
|
const struct cred *cred, bool update_barrier)
|
|
{
|
|
- u32 oldseq, newseq, new_barrier = 0;
|
|
-
|
|
- oldseq = be32_to_cpu(lo->plh_stateid.seqid);
|
|
- newseq = be32_to_cpu(new->seqid);
|
|
+ u32 oldseq = be32_to_cpu(lo->plh_stateid.seqid);
|
|
+ u32 newseq = be32_to_cpu(new->seqid);
|
|
|
|
if (!pnfs_layout_is_valid(lo)) {
|
|
pnfs_set_layout_cred(lo, cred);
|
|
@@ -979,19 +977,21 @@ pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,
|
|
clear_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);
|
|
return;
|
|
}
|
|
- if (pnfs_seqid_is_newer(newseq, oldseq)) {
|
|
+
|
|
+ if (pnfs_seqid_is_newer(newseq, oldseq))
|
|
nfs4_stateid_copy(&lo->plh_stateid, new);
|
|
- /*
|
|
- * Because of wraparound, we want to keep the barrier
|
|
- * "close" to the current seqids.
|
|
- */
|
|
- new_barrier = newseq - atomic_read(&lo->plh_outstanding);
|
|
- }
|
|
- if (update_barrier)
|
|
- new_barrier = be32_to_cpu(new->seqid);
|
|
- else if (new_barrier == 0)
|
|
+
|
|
+ if (update_barrier) {
|
|
+ pnfs_barrier_update(lo, newseq);
|
|
return;
|
|
- pnfs_barrier_update(lo, new_barrier);
|
|
+ }
|
|
+ /*
|
|
+ * Because of wraparound, we want to keep the barrier
|
|
+ * "close" to the current seqids. We really only want to
|
|
+ * get here from a layoutget call.
|
|
+ */
|
|
+ if (atomic_read(&lo->plh_outstanding) == 1)
|
|
+ pnfs_barrier_update(lo, be32_to_cpu(lo->plh_stateid.seqid));
|
|
}
|
|
|
|
static bool
|
|
@@ -2014,7 +2014,7 @@ lookup_again:
|
|
* If the layout segment list is empty, but there are outstanding
|
|
* layoutget calls, then they might be subject to a layoutrecall.
|
|
*/
|
|
- if (list_empty(&lo->plh_segs) &&
|
|
+ if ((list_empty(&lo->plh_segs) || !pnfs_layout_is_valid(lo)) &&
|
|
atomic_read(&lo->plh_outstanding) != 0) {
|
|
spin_unlock(&ino->i_lock);
|
|
lseg = ERR_PTR(wait_var_event_killable(&lo->plh_outstanding,
|
|
@@ -2390,11 +2390,13 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
|
|
goto out_forget;
|
|
}
|
|
|
|
+ if (!pnfs_layout_is_valid(lo) && !pnfs_is_first_layoutget(lo))
|
|
+ goto out_forget;
|
|
+
|
|
if (nfs4_stateid_match_other(&lo->plh_stateid, &res->stateid)) {
|
|
/* existing state ID, make sure the sequence number matches. */
|
|
if (pnfs_layout_stateid_blocked(lo, &res->stateid)) {
|
|
- if (!pnfs_layout_is_valid(lo) &&
|
|
- pnfs_is_first_layoutget(lo))
|
|
+ if (!pnfs_layout_is_valid(lo))
|
|
lo->plh_barrier = 0;
|
|
dprintk("%s forget reply due to sequence\n", __func__);
|
|
goto out_forget;
|
|
@@ -2413,8 +2415,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
|
|
goto out_forget;
|
|
} else {
|
|
/* We have a completely new layout */
|
|
- if (!pnfs_is_first_layoutget(lo))
|
|
- goto out_forget;
|
|
pnfs_set_layout_stateid(lo, &res->stateid, lgp->cred, true);
|
|
}
|
|
|
|
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c
|
|
index 49d3389bd8130..1c2c0d08614ee 100644
|
|
--- a/fs/nfs/pnfs_nfs.c
|
|
+++ b/fs/nfs/pnfs_nfs.c
|
|
@@ -805,19 +805,16 @@ out:
|
|
}
|
|
EXPORT_SYMBOL_GPL(nfs4_pnfs_ds_add);
|
|
|
|
-static void nfs4_wait_ds_connect(struct nfs4_pnfs_ds *ds)
|
|
+static int nfs4_wait_ds_connect(struct nfs4_pnfs_ds *ds)
|
|
{
|
|
might_sleep();
|
|
- wait_on_bit(&ds->ds_state, NFS4DS_CONNECTING,
|
|
- TASK_KILLABLE);
|
|
+ return wait_on_bit(&ds->ds_state, NFS4DS_CONNECTING, TASK_KILLABLE);
|
|
}
|
|
|
|
static void nfs4_clear_ds_conn_bit(struct nfs4_pnfs_ds *ds)
|
|
{
|
|
smp_mb__before_atomic();
|
|
- clear_bit(NFS4DS_CONNECTING, &ds->ds_state);
|
|
- smp_mb__after_atomic();
|
|
- wake_up_bit(&ds->ds_state, NFS4DS_CONNECTING);
|
|
+ clear_and_wake_up_bit(NFS4DS_CONNECTING, &ds->ds_state);
|
|
}
|
|
|
|
static struct nfs_client *(*get_v3_ds_connect)(
|
|
@@ -993,30 +990,33 @@ int nfs4_pnfs_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds,
|
|
{
|
|
int err;
|
|
|
|
-again:
|
|
- err = 0;
|
|
- if (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) == 0) {
|
|
- if (version == 3) {
|
|
- err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo,
|
|
- retrans);
|
|
- } else if (version == 4) {
|
|
- err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo,
|
|
- retrans, minor_version);
|
|
- } else {
|
|
- dprintk("%s: unsupported DS version %d\n", __func__,
|
|
- version);
|
|
- err = -EPROTONOSUPPORT;
|
|
- }
|
|
+ do {
|
|
+ err = nfs4_wait_ds_connect(ds);
|
|
+ if (err || ds->ds_clp)
|
|
+ goto out;
|
|
+ if (nfs4_test_deviceid_unavailable(devid))
|
|
+ return -ENODEV;
|
|
+ } while (test_and_set_bit(NFS4DS_CONNECTING, &ds->ds_state) != 0);
|
|
|
|
- nfs4_clear_ds_conn_bit(ds);
|
|
- } else {
|
|
- nfs4_wait_ds_connect(ds);
|
|
+ if (ds->ds_clp)
|
|
+ goto connect_done;
|
|
|
|
- /* what was waited on didn't connect AND didn't mark unavail */
|
|
- if (!ds->ds_clp && !nfs4_test_deviceid_unavailable(devid))
|
|
- goto again;
|
|
+ switch (version) {
|
|
+ case 3:
|
|
+ err = _nfs4_pnfs_v3_ds_connect(mds_srv, ds, timeo, retrans);
|
|
+ break;
|
|
+ case 4:
|
|
+ err = _nfs4_pnfs_v4_ds_connect(mds_srv, ds, timeo, retrans,
|
|
+ minor_version);
|
|
+ break;
|
|
+ default:
|
|
+ dprintk("%s: unsupported DS version %d\n", __func__, version);
|
|
+ err = -EPROTONOSUPPORT;
|
|
}
|
|
|
|
+connect_done:
|
|
+ nfs4_clear_ds_conn_bit(ds);
|
|
+out:
|
|
/*
|
|
* At this point the ds->ds_clp should be ready, but it might have
|
|
* hit an error.
|
|
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
|
|
index d2b6dce1f99f7..d13a22fc94a7d 100644
|
|
--- a/fs/nfs/read.c
|
|
+++ b/fs/nfs/read.c
|
|
@@ -363,22 +363,23 @@ int nfs_readpage(struct file *file, struct page *page)
|
|
} else
|
|
desc.ctx = get_nfs_open_context(nfs_file_open_context(file));
|
|
|
|
+ xchg(&desc.ctx->error, 0);
|
|
if (!IS_SYNC(inode)) {
|
|
ret = nfs_readpage_from_fscache(desc.ctx, inode, page);
|
|
if (ret == 0)
|
|
- goto out;
|
|
+ goto out_wait;
|
|
}
|
|
|
|
- xchg(&desc.ctx->error, 0);
|
|
nfs_pageio_init_read(&desc.pgio, inode, false,
|
|
&nfs_async_read_completion_ops);
|
|
|
|
ret = readpage_async_filler(&desc, page);
|
|
+ if (ret)
|
|
+ goto out;
|
|
|
|
- if (!ret)
|
|
- nfs_pageio_complete_read(&desc.pgio, inode);
|
|
-
|
|
+ nfs_pageio_complete_read(&desc.pgio, inode);
|
|
ret = desc.pgio.pg_error < 0 ? desc.pgio.pg_error : 0;
|
|
+out_wait:
|
|
if (!ret) {
|
|
ret = wait_on_page_locked_killable(page);
|
|
if (!PageUptodate(page) && !ret)
|
|
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
|
|
index a1591feeea22c..5dfe7644a5172 100644
|
|
--- a/fs/nfsd/nfs3acl.c
|
|
+++ b/fs/nfsd/nfs3acl.c
|
|
@@ -172,7 +172,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p)
|
|
struct nfsd3_getaclres *resp = rqstp->rq_resp;
|
|
struct dentry *dentry = resp->fh.fh_dentry;
|
|
struct kvec *head = rqstp->rq_res.head;
|
|
- struct inode *inode = d_inode(dentry);
|
|
+ struct inode *inode;
|
|
unsigned int base;
|
|
int n;
|
|
int w;
|
|
@@ -181,6 +181,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, __be32 *p)
|
|
return 0;
|
|
switch (resp->status) {
|
|
case nfs_ok:
|
|
+ inode = d_inode(dentry);
|
|
if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
|
|
return 0;
|
|
if (xdr_stream_encode_u32(xdr, resp->mask) < 0)
|
|
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
|
|
index b517a8794400e..90e81f6491ff5 100644
|
|
--- a/fs/nfsd/nfs4state.c
|
|
+++ b/fs/nfsd/nfs4state.c
|
|
@@ -2816,14 +2816,11 @@ move_to_confirmed(struct nfs4_client *clp)
|
|
|
|
lockdep_assert_held(&nn->client_lock);
|
|
|
|
- dprintk("NFSD: move_to_confirm nfs4_client %p\n", clp);
|
|
list_move(&clp->cl_idhash, &nn->conf_id_hashtbl[idhashval]);
|
|
rb_erase(&clp->cl_namenode, &nn->unconf_name_tree);
|
|
add_clp_to_name_tree(clp, &nn->conf_name_tree);
|
|
- if (!test_and_set_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags) &&
|
|
- clp->cl_nfsd_dentry &&
|
|
- clp->cl_nfsd_info_dentry)
|
|
- fsnotify_dentry(clp->cl_nfsd_info_dentry, FS_MODIFY);
|
|
+ set_bit(NFSD4_CLIENT_CONFIRMED, &clp->cl_flags);
|
|
+ trace_nfsd_clid_confirmed(&clp->cl_clientid);
|
|
renew_client_locked(clp);
|
|
}
|
|
|
|
@@ -3471,6 +3468,8 @@ nfsd4_create_session(struct svc_rqst *rqstp,
|
|
/* cache solo and embedded create sessions under the client_lock */
|
|
nfsd4_cache_create_session(cr_ses, cs_slot, status);
|
|
spin_unlock(&nn->client_lock);
|
|
+ if (conf == unconf)
|
|
+ fsnotify_dentry(conf->cl_nfsd_info_dentry, FS_MODIFY);
|
|
/* init connection and backchannel */
|
|
nfsd4_init_conn(rqstp, conn, new);
|
|
nfsd4_put_session(new);
|
|
@@ -4071,6 +4070,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
|
|
}
|
|
get_client_locked(conf);
|
|
spin_unlock(&nn->client_lock);
|
|
+ if (conf == unconf)
|
|
+ fsnotify_dentry(conf->cl_nfsd_info_dentry, FS_MODIFY);
|
|
nfsd4_probe_callback(conf);
|
|
spin_lock(&nn->client_lock);
|
|
put_client_renew_locked(conf);
|
|
@@ -7229,7 +7230,6 @@ nfs4_client_to_reclaim(struct xdr_netobj name, struct xdr_netobj princhash,
|
|
unsigned int strhashval;
|
|
struct nfs4_client_reclaim *crp;
|
|
|
|
- trace_nfsd_clid_reclaim(nn, name.len, name.data);
|
|
crp = alloc_reclaim();
|
|
if (crp) {
|
|
strhashval = clientstr_hashval(name);
|
|
@@ -7279,8 +7279,6 @@ nfsd4_find_reclaim_client(struct xdr_netobj name, struct nfsd_net *nn)
|
|
unsigned int strhashval;
|
|
struct nfs4_client_reclaim *crp = NULL;
|
|
|
|
- trace_nfsd_clid_find(nn, name.len, name.data);
|
|
-
|
|
strhashval = clientstr_hashval(name);
|
|
list_for_each_entry(crp, &nn->reclaim_str_hashtbl[strhashval], cr_strhash) {
|
|
if (compare_blob(&crp->cr_name, &name) == 0) {
|
|
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
|
|
index 27a93ebd1d809..f3961506fe16c 100644
|
|
--- a/fs/nfsd/trace.h
|
|
+++ b/fs/nfsd/trace.h
|
|
@@ -408,7 +408,6 @@ TRACE_EVENT(nfsd_dirent,
|
|
__entry->ino = ino;
|
|
__entry->len = namlen;
|
|
memcpy(__get_str(name), name, namlen);
|
|
- __assign_str(name, name);
|
|
),
|
|
TP_printk("fh_hash=0x%08x ino=%llu name=%.*s",
|
|
__entry->fh_hash, __entry->ino,
|
|
@@ -511,6 +510,7 @@ DEFINE_EVENT(nfsd_clientid_class, nfsd_clid_##name, \
|
|
TP_PROTO(const clientid_t *clid), \
|
|
TP_ARGS(clid))
|
|
|
|
+DEFINE_CLIENTID_EVENT(confirmed);
|
|
DEFINE_CLIENTID_EVENT(expired);
|
|
DEFINE_CLIENTID_EVENT(purged);
|
|
DEFINE_CLIENTID_EVENT(renew);
|
|
@@ -536,35 +536,6 @@ DEFINE_EVENT(nfsd_net_class, nfsd_##name, \
|
|
DEFINE_NET_EVENT(grace_start);
|
|
DEFINE_NET_EVENT(grace_complete);
|
|
|
|
-DECLARE_EVENT_CLASS(nfsd_clid_class,
|
|
- TP_PROTO(const struct nfsd_net *nn,
|
|
- unsigned int namelen,
|
|
- const unsigned char *namedata),
|
|
- TP_ARGS(nn, namelen, namedata),
|
|
- TP_STRUCT__entry(
|
|
- __field(unsigned long long, boot_time)
|
|
- __field(unsigned int, namelen)
|
|
- __dynamic_array(unsigned char, name, namelen)
|
|
- ),
|
|
- TP_fast_assign(
|
|
- __entry->boot_time = nn->boot_time;
|
|
- __entry->namelen = namelen;
|
|
- memcpy(__get_dynamic_array(name), namedata, namelen);
|
|
- ),
|
|
- TP_printk("boot_time=%16llx nfs4_clientid=%.*s",
|
|
- __entry->boot_time, __entry->namelen, __get_str(name))
|
|
-)
|
|
-
|
|
-#define DEFINE_CLID_EVENT(name) \
|
|
-DEFINE_EVENT(nfsd_clid_class, nfsd_clid_##name, \
|
|
- TP_PROTO(const struct nfsd_net *nn, \
|
|
- unsigned int namelen, \
|
|
- const unsigned char *namedata), \
|
|
- TP_ARGS(nn, namelen, namedata))
|
|
-
|
|
-DEFINE_CLID_EVENT(find);
|
|
-DEFINE_CLID_EVENT(reclaim);
|
|
-
|
|
TRACE_EVENT(nfsd_clid_inuse_err,
|
|
TP_PROTO(const struct nfs4_client *clp),
|
|
TP_ARGS(clp),
|
|
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
|
|
index 15adf1f6ab21f..46485c04740d9 100644
|
|
--- a/fs/nfsd/vfs.c
|
|
+++ b/fs/nfsd/vfs.c
|
|
@@ -1123,6 +1123,19 @@ out:
|
|
}
|
|
|
|
#ifdef CONFIG_NFSD_V3
|
|
+static int
|
|
+nfsd_filemap_write_and_wait_range(struct nfsd_file *nf, loff_t offset,
|
|
+ loff_t end)
|
|
+{
|
|
+ struct address_space *mapping = nf->nf_file->f_mapping;
|
|
+ int ret = filemap_fdatawrite_range(mapping, offset, end);
|
|
+
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ filemap_fdatawait_range_keep_errors(mapping, offset, end);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/*
|
|
* Commit all pending writes to stable storage.
|
|
*
|
|
@@ -1153,10 +1166,11 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
|
if (err)
|
|
goto out;
|
|
if (EX_ISSYNC(fhp->fh_export)) {
|
|
- int err2;
|
|
+ int err2 = nfsd_filemap_write_and_wait_range(nf, offset, end);
|
|
|
|
down_write(&nf->nf_rwsem);
|
|
- err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
|
|
+ if (!err2)
|
|
+ err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
|
|
switch (err2) {
|
|
case 0:
|
|
nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
|
|
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
|
|
index ee5efdc35cc1e..2f2e430461b21 100644
|
|
--- a/fs/orangefs/super.c
|
|
+++ b/fs/orangefs/super.c
|
|
@@ -209,7 +209,7 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf)
|
|
buf->f_bavail = (sector_t) new_op->downcall.resp.statfs.blocks_avail;
|
|
buf->f_files = (sector_t) new_op->downcall.resp.statfs.files_total;
|
|
buf->f_ffree = (sector_t) new_op->downcall.resp.statfs.files_avail;
|
|
- buf->f_frsize = sb->s_blocksize;
|
|
+ buf->f_frsize = 0;
|
|
|
|
out_op_release:
|
|
op_release(new_op);
|
|
diff --git a/fs/seq_file.c b/fs/seq_file.c
|
|
index 5059248f2d648..d6aacbac793ad 100644
|
|
--- a/fs/seq_file.c
|
|
+++ b/fs/seq_file.c
|
|
@@ -32,6 +32,9 @@ static void seq_set_overflow(struct seq_file *m)
|
|
|
|
static void *seq_buf_alloc(unsigned long size)
|
|
{
|
|
+ if (unlikely(size > MAX_RW_COUNT))
|
|
+ return NULL;
|
|
+
|
|
return kvmalloc(size, GFP_KERNEL_ACCOUNT);
|
|
}
|
|
|
|
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
|
|
index 5bd8482e660aa..7c61d0ec0159e 100644
|
|
--- a/fs/ubifs/dir.c
|
|
+++ b/fs/ubifs/dir.c
|
|
@@ -1337,7 +1337,10 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
goto out_release;
|
|
}
|
|
|
|
+ spin_lock(&whiteout->i_lock);
|
|
whiteout->i_state |= I_LINKABLE;
|
|
+ spin_unlock(&whiteout->i_lock);
|
|
+
|
|
whiteout_ui = ubifs_inode(whiteout);
|
|
whiteout_ui->data = dev;
|
|
whiteout_ui->data_len = ubifs_encode_dev(dev, MKDEV(0, 0));
|
|
@@ -1430,7 +1433,11 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
|
|
inc_nlink(whiteout);
|
|
mark_inode_dirty(whiteout);
|
|
+
|
|
+ spin_lock(&whiteout->i_lock);
|
|
whiteout->i_state &= ~I_LINKABLE;
|
|
+ spin_unlock(&whiteout->i_lock);
|
|
+
|
|
iput(whiteout);
|
|
}
|
|
|
|
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
|
|
index 2857e64d673d1..230717384a38e 100644
|
|
--- a/fs/ubifs/journal.c
|
|
+++ b/fs/ubifs/journal.c
|
|
@@ -882,6 +882,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode)
|
|
struct ubifs_dent_node *xent, *pxent = NULL;
|
|
|
|
if (ui->xattr_cnt > ubifs_xattr_max_cnt(c)) {
|
|
+ err = -EPERM;
|
|
ubifs_err(c, "Cannot delete inode, it has too much xattrs!");
|
|
goto out_release;
|
|
}
|
|
diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h
|
|
index adbe76b203e2f..49b0ac8b6fd32 100644
|
|
--- a/include/linux/compiler-clang.h
|
|
+++ b/include/linux/compiler-clang.h
|
|
@@ -13,6 +13,12 @@
|
|
/* all clang versions usable with the kernel support KASAN ABI version 5 */
|
|
#define KASAN_ABI_VERSION 5
|
|
|
|
+/*
|
|
+ * Note: Checking __has_feature(*_sanitizer) is only true if the feature is
|
|
+ * enabled. Therefore it is not required to additionally check defined(CONFIG_*)
|
|
+ * to avoid adding redundant attributes in other configurations.
|
|
+ */
|
|
+
|
|
#if __has_feature(address_sanitizer) || __has_feature(hwaddress_sanitizer)
|
|
/* Emulate GCC's __SANITIZE_ADDRESS__ flag */
|
|
#define __SANITIZE_ADDRESS__
|
|
@@ -45,6 +51,17 @@
|
|
#define __no_sanitize_undefined
|
|
#endif
|
|
|
|
+/*
|
|
+ * Support for __has_feature(coverage_sanitizer) was added in Clang 13 together
|
|
+ * with no_sanitize("coverage"). Prior versions of Clang support coverage
|
|
+ * instrumentation, but cannot be queried for support by the preprocessor.
|
|
+ */
|
|
+#if __has_feature(coverage_sanitizer)
|
|
+#define __no_sanitize_coverage __attribute__((no_sanitize("coverage")))
|
|
+#else
|
|
+#define __no_sanitize_coverage
|
|
+#endif
|
|
+
|
|
/*
|
|
* Not all versions of clang implement the type-generic versions
|
|
* of the builtin overflow checkers. Fortunately, clang implements
|
|
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
|
|
index 5d97ef738a575..cb9217fc60af0 100644
|
|
--- a/include/linux/compiler-gcc.h
|
|
+++ b/include/linux/compiler-gcc.h
|
|
@@ -122,6 +122,12 @@
|
|
#define __no_sanitize_undefined
|
|
#endif
|
|
|
|
+#if defined(CONFIG_KCOV) && __has_attribute(__no_sanitize_coverage__)
|
|
+#define __no_sanitize_coverage __attribute__((no_sanitize_coverage))
|
|
+#else
|
|
+#define __no_sanitize_coverage
|
|
+#endif
|
|
+
|
|
#if GCC_VERSION >= 50100
|
|
#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
|
|
#endif
|
|
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
|
|
index d29bda7f6ebdd..cc2bee7f09777 100644
|
|
--- a/include/linux/compiler_types.h
|
|
+++ b/include/linux/compiler_types.h
|
|
@@ -210,7 +210,7 @@ struct ftrace_likely_data {
|
|
/* Section for code which can't be instrumented at all */
|
|
#define noinstr \
|
|
noinline notrace __attribute((__section__(".noinstr.text"))) \
|
|
- __no_kcsan __no_sanitize_address
|
|
+ __no_kcsan __no_sanitize_address __no_sanitize_coverage
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
|
|
index ffba254d2098a..ce64745948722 100644
|
|
--- a/include/linux/nfs_fs.h
|
|
+++ b/include/linux/nfs_fs.h
|
|
@@ -84,6 +84,7 @@ struct nfs_open_context {
|
|
#define NFS_CONTEXT_RESEND_WRITES (1)
|
|
#define NFS_CONTEXT_BAD (2)
|
|
#define NFS_CONTEXT_UNLOCK (3)
|
|
+#define NFS_CONTEXT_FILE_OPEN (4)
|
|
int error;
|
|
|
|
struct list_head list;
|
|
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
|
|
index fbdadd4d83774..adea5a4771cf8 100644
|
|
--- a/include/linux/pci-ecam.h
|
|
+++ b/include/linux/pci-ecam.h
|
|
@@ -55,6 +55,7 @@ struct pci_ecam_ops {
|
|
struct pci_config_window {
|
|
struct resource res;
|
|
struct resource busr;
|
|
+ unsigned int bus_shift;
|
|
void *priv;
|
|
const struct pci_ecam_ops *ops;
|
|
union {
|
|
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
|
|
index 9455476c5ba22..1199ffd305d1a 100644
|
|
--- a/include/linux/rcupdate.h
|
|
+++ b/include/linux/rcupdate.h
|
|
@@ -315,7 +315,7 @@ static inline int rcu_read_lock_any_held(void)
|
|
#define RCU_LOCKDEP_WARN(c, s) \
|
|
do { \
|
|
static bool __section(".data.unlikely") __warned; \
|
|
- if (debug_lockdep_rcu_enabled() && !__warned && (c)) { \
|
|
+ if ((c) && debug_lockdep_rcu_enabled() && !__warned) { \
|
|
__warned = true; \
|
|
lockdep_rcu_suspicious(__FILE__, __LINE__, s); \
|
|
} \
|
|
diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
|
|
index 7f4278fa21fef..0d7fec79d28ff 100644
|
|
--- a/include/linux/sched/signal.h
|
|
+++ b/include/linux/sched/signal.h
|
|
@@ -538,6 +538,17 @@ static inline int kill_cad_pid(int sig, int priv)
|
|
#define SEND_SIG_NOINFO ((struct kernel_siginfo *) 0)
|
|
#define SEND_SIG_PRIV ((struct kernel_siginfo *) 1)
|
|
|
|
+static inline int __on_sig_stack(unsigned long sp)
|
|
+{
|
|
+#ifdef CONFIG_STACK_GROWSUP
|
|
+ return sp >= current->sas_ss_sp &&
|
|
+ sp - current->sas_ss_sp < current->sas_ss_size;
|
|
+#else
|
|
+ return sp > current->sas_ss_sp &&
|
|
+ sp - current->sas_ss_sp <= current->sas_ss_size;
|
|
+#endif
|
|
+}
|
|
+
|
|
/*
|
|
* True if we are on the alternate signal stack.
|
|
*/
|
|
@@ -555,13 +566,7 @@ static inline int on_sig_stack(unsigned long sp)
|
|
if (current->sas_ss_flags & SS_AUTODISARM)
|
|
return 0;
|
|
|
|
-#ifdef CONFIG_STACK_GROWSUP
|
|
- return sp >= current->sas_ss_sp &&
|
|
- sp - current->sas_ss_sp < current->sas_ss_size;
|
|
-#else
|
|
- return sp > current->sas_ss_sp &&
|
|
- sp - current->sas_ss_sp <= current->sas_ss_size;
|
|
-#endif
|
|
+ return __on_sig_stack(sp);
|
|
}
|
|
|
|
static inline int sas_ss_flags(unsigned long sp)
|
|
diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
|
|
index ced07f8fde870..5d93d99496538 100644
|
|
--- a/include/linux/soundwire/sdw.h
|
|
+++ b/include/linux/soundwire/sdw.h
|
|
@@ -624,7 +624,6 @@ struct sdw_slave_ops {
|
|
int (*port_prep)(struct sdw_slave *slave,
|
|
struct sdw_prepare_ch *prepare_ch,
|
|
enum sdw_port_prep_ops pre_ops);
|
|
- int (*get_clk_stop_mode)(struct sdw_slave *slave);
|
|
int (*clk_stop)(struct sdw_slave *slave,
|
|
enum sdw_clk_stop_mode mode,
|
|
enum sdw_clk_stop_type type);
|
|
@@ -675,7 +674,6 @@ struct sdw_slave {
|
|
struct list_head node;
|
|
struct completion port_ready[SDW_MAX_PORTS];
|
|
unsigned int m_port_map[SDW_MAX_PORTS];
|
|
- enum sdw_clk_stop_mode curr_clk_stop_mode;
|
|
u16 dev_num;
|
|
u16 dev_num_sticky;
|
|
bool probed;
|
|
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
|
|
index 091f284bd6e93..2bb452a8f134c 100644
|
|
--- a/include/scsi/libiscsi.h
|
|
+++ b/include/scsi/libiscsi.h
|
|
@@ -195,12 +195,6 @@ struct iscsi_conn {
|
|
unsigned long suspend_tx; /* suspend Tx */
|
|
unsigned long suspend_rx; /* suspend Rx */
|
|
|
|
- /* abort */
|
|
- wait_queue_head_t ehwait; /* used in eh_abort() */
|
|
- struct iscsi_tm tmhdr;
|
|
- struct timer_list tmf_timer;
|
|
- int tmf_state; /* see TMF_INITIAL, etc.*/
|
|
-
|
|
/* negotiated params */
|
|
unsigned max_recv_dlength; /* initiator_max_recv_dsl*/
|
|
unsigned max_xmit_dlength; /* target_max_recv_dsl */
|
|
@@ -270,6 +264,11 @@ struct iscsi_session {
|
|
* and recv lock.
|
|
*/
|
|
struct mutex eh_mutex;
|
|
+ /* abort */
|
|
+ wait_queue_head_t ehwait; /* used in eh_abort() */
|
|
+ struct iscsi_tm tmhdr;
|
|
+ struct timer_list tmf_timer;
|
|
+ int tmf_state; /* see TMF_INITIAL, etc.*/
|
|
|
|
/* iSCSI session-wide sequencing */
|
|
uint32_t cmdsn;
|
|
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
|
|
index 3974329d4d023..c5d7810fd7926 100644
|
|
--- a/include/scsi/scsi_transport_iscsi.h
|
|
+++ b/include/scsi/scsi_transport_iscsi.h
|
|
@@ -443,6 +443,8 @@ extern void iscsi_remove_session(struct iscsi_cls_session *session);
|
|
extern void iscsi_free_session(struct iscsi_cls_session *session);
|
|
extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
|
|
int dd_size, uint32_t cid);
|
|
+extern void iscsi_put_conn(struct iscsi_cls_conn *conn);
|
|
+extern void iscsi_get_conn(struct iscsi_cls_conn *conn);
|
|
extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
|
|
extern void iscsi_unblock_session(struct iscsi_cls_session *session);
|
|
extern void iscsi_block_session(struct iscsi_cls_session *session);
|
|
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
|
|
index 271ae90a9bb7d..36ed092227fa5 100644
|
|
--- a/include/uapi/linux/fuse.h
|
|
+++ b/include/uapi/linux/fuse.h
|
|
@@ -181,6 +181,9 @@
|
|
* - add FUSE_OPEN_KILL_SUIDGID
|
|
* - extend fuse_setxattr_in, add FUSE_SETXATTR_EXT
|
|
* - add FUSE_SETXATTR_ACL_KILL_SGID
|
|
+ *
|
|
+ * 7.34
|
|
+ * - add FUSE_SYNCFS
|
|
*/
|
|
|
|
#ifndef _LINUX_FUSE_H
|
|
@@ -216,7 +219,7 @@
|
|
#define FUSE_KERNEL_VERSION 7
|
|
|
|
/** Minor version number of this interface */
|
|
-#define FUSE_KERNEL_MINOR_VERSION 33
|
|
+#define FUSE_KERNEL_MINOR_VERSION 34
|
|
|
|
/** The node ID of the root inode */
|
|
#define FUSE_ROOT_ID 1
|
|
@@ -509,6 +512,7 @@ enum fuse_opcode {
|
|
FUSE_COPY_FILE_RANGE = 47,
|
|
FUSE_SETUPMAPPING = 48,
|
|
FUSE_REMOVEMAPPING = 49,
|
|
+ FUSE_SYNCFS = 50,
|
|
|
|
/* CUSE specific operations */
|
|
CUSE_INIT = 4096,
|
|
@@ -971,4 +975,8 @@ struct fuse_removemapping_one {
|
|
#define FUSE_REMOVEMAPPING_MAX_ENTRY \
|
|
(PAGE_SIZE / sizeof(struct fuse_removemapping_one))
|
|
|
|
+struct fuse_syncfs_in {
|
|
+ uint64_t padding;
|
|
+};
|
|
+
|
|
#endif /* _LINUX_FUSE_H */
|
|
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
|
|
index 1f274d7fc934e..d189eff4c92ff 100644
|
|
--- a/kernel/cgroup/cgroup-v1.c
|
|
+++ b/kernel/cgroup/cgroup-v1.c
|
|
@@ -912,6 +912,8 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
|
|
opt = fs_parse(fc, cgroup1_fs_parameters, param, &result);
|
|
if (opt == -ENOPARAM) {
|
|
if (strcmp(param->key, "source") == 0) {
|
|
+ if (param->type != fs_value_is_string)
|
|
+ return invalf(fc, "Non-string source");
|
|
if (fc->source)
|
|
return invalf(fc, "Multiple sources not supported");
|
|
fc->source = param->string;
|
|
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
|
|
index ba39fbb1f8e73..af520ca263603 100644
|
|
--- a/kernel/jump_label.c
|
|
+++ b/kernel/jump_label.c
|
|
@@ -316,14 +316,16 @@ static int addr_conflict(struct jump_entry *entry, void *start, void *end)
|
|
}
|
|
|
|
static int __jump_label_text_reserved(struct jump_entry *iter_start,
|
|
- struct jump_entry *iter_stop, void *start, void *end)
|
|
+ struct jump_entry *iter_stop, void *start, void *end, bool init)
|
|
{
|
|
struct jump_entry *iter;
|
|
|
|
iter = iter_start;
|
|
while (iter < iter_stop) {
|
|
- if (addr_conflict(iter, start, end))
|
|
- return 1;
|
|
+ if (init || !jump_entry_is_init(iter)) {
|
|
+ if (addr_conflict(iter, start, end))
|
|
+ return 1;
|
|
+ }
|
|
iter++;
|
|
}
|
|
|
|
@@ -561,7 +563,7 @@ static int __jump_label_mod_text_reserved(void *start, void *end)
|
|
|
|
ret = __jump_label_text_reserved(mod->jump_entries,
|
|
mod->jump_entries + mod->num_jump_entries,
|
|
- start, end);
|
|
+ start, end, mod->state == MODULE_STATE_COMING);
|
|
|
|
module_put(mod);
|
|
|
|
@@ -786,8 +788,9 @@ early_initcall(jump_label_init_module);
|
|
*/
|
|
int jump_label_text_reserved(void *start, void *end)
|
|
{
|
|
+ bool init = system_state < SYSTEM_RUNNING;
|
|
int ret = __jump_label_text_reserved(__start___jump_table,
|
|
- __stop___jump_table, start, end);
|
|
+ __stop___jump_table, start, end, init);
|
|
|
|
if (ret)
|
|
return ret;
|
|
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
|
|
index 745f08fdd7a69..c6b4c66b8fa27 100644
|
|
--- a/kernel/kprobes.c
|
|
+++ b/kernel/kprobes.c
|
|
@@ -35,6 +35,7 @@
|
|
#include <linux/ftrace.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/jump_label.h>
|
|
+#include <linux/static_call.h>
|
|
#include <linux/perf_event.h>
|
|
|
|
#include <asm/sections.h>
|
|
@@ -1569,6 +1570,7 @@ static int check_kprobe_address_safe(struct kprobe *p,
|
|
if (!kernel_text_address((unsigned long) p->addr) ||
|
|
within_kprobe_blacklist((unsigned long) p->addr) ||
|
|
jump_label_text_reserved(p->addr, p->addr) ||
|
|
+ static_call_text_reserved(p->addr, p->addr) ||
|
|
find_bug((unsigned long)p->addr)) {
|
|
ret = -EINVAL;
|
|
goto out;
|
|
diff --git a/kernel/module.c b/kernel/module.c
|
|
index 927d46cb8eb93..0b850188419ae 100644
|
|
--- a/kernel/module.c
|
|
+++ b/kernel/module.c
|
|
@@ -4425,9 +4425,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *,
|
|
ret = fn(data, kallsyms_symbol_name(kallsyms, i),
|
|
mod, kallsyms_symbol_value(sym));
|
|
if (ret != 0)
|
|
- break;
|
|
+ goto out;
|
|
}
|
|
}
|
|
+out:
|
|
mutex_unlock(&module_mutex);
|
|
return ret;
|
|
}
|
|
diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h
|
|
index bf0827d4b6593..cfd06fb5ba6d0 100644
|
|
--- a/kernel/rcu/rcu.h
|
|
+++ b/kernel/rcu/rcu.h
|
|
@@ -308,6 +308,8 @@ static inline void rcu_init_levelspread(int *levelspread, const int *levelcnt)
|
|
}
|
|
}
|
|
|
|
+extern void rcu_init_geometry(void);
|
|
+
|
|
/* Returns a pointer to the first leaf rcu_node structure. */
|
|
#define rcu_first_leaf_node() (rcu_state.level[rcu_num_lvls - 1])
|
|
|
|
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
|
|
index e26547b34ad33..072e47288f1f4 100644
|
|
--- a/kernel/rcu/srcutree.c
|
|
+++ b/kernel/rcu/srcutree.c
|
|
@@ -90,6 +90,9 @@ static void init_srcu_struct_nodes(struct srcu_struct *ssp, bool is_static)
|
|
struct srcu_node *snp;
|
|
struct srcu_node *snp_first;
|
|
|
|
+ /* Initialize geometry if it has not already been initialized. */
|
|
+ rcu_init_geometry();
|
|
+
|
|
/* Work out the overall tree geometry. */
|
|
ssp->level[0] = &ssp->node[0];
|
|
for (i = 1; i < rcu_num_lvls; i++)
|
|
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
|
|
index 9a1396a70c520..afbb0a337c32a 100644
|
|
--- a/kernel/rcu/tree.c
|
|
+++ b/kernel/rcu/tree.c
|
|
@@ -4582,11 +4582,25 @@ static void __init rcu_init_one(void)
|
|
* replace the definitions in tree.h because those are needed to size
|
|
* the ->node array in the rcu_state structure.
|
|
*/
|
|
-static void __init rcu_init_geometry(void)
|
|
+void rcu_init_geometry(void)
|
|
{
|
|
ulong d;
|
|
int i;
|
|
+ static unsigned long old_nr_cpu_ids;
|
|
int rcu_capacity[RCU_NUM_LVLS];
|
|
+ static bool initialized;
|
|
+
|
|
+ if (initialized) {
|
|
+ /*
|
|
+ * Warn if setup_nr_cpu_ids() had not yet been invoked,
|
|
+ * unless nr_cpus_ids == NR_CPUS, in which case who cares?
|
|
+ */
|
|
+ WARN_ON_ONCE(old_nr_cpu_ids != nr_cpu_ids);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ old_nr_cpu_ids = nr_cpu_ids;
|
|
+ initialized = true;
|
|
|
|
/*
|
|
* Initialize any unspecified boot parameters.
|
|
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
|
|
index b95ae86c40a7d..dd94a602a6d25 100644
|
|
--- a/kernel/rcu/update.c
|
|
+++ b/kernel/rcu/update.c
|
|
@@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(rcu_callback_map);
|
|
|
|
noinstr int notrace debug_lockdep_rcu_enabled(void)
|
|
{
|
|
- return rcu_scheduler_active != RCU_SCHEDULER_INACTIVE && debug_locks &&
|
|
+ return rcu_scheduler_active != RCU_SCHEDULER_INACTIVE && READ_ONCE(debug_locks) &&
|
|
current->lockdep_recursion == 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(debug_lockdep_rcu_enabled);
|
|
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
|
|
index a189bec137291..35f7efed75c4c 100644
|
|
--- a/kernel/sched/sched.h
|
|
+++ b/kernel/sched/sched.h
|
|
@@ -2539,20 +2539,27 @@ static __always_inline
|
|
unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long util,
|
|
struct task_struct *p)
|
|
{
|
|
- unsigned long min_util;
|
|
- unsigned long max_util;
|
|
+ unsigned long min_util = 0;
|
|
+ unsigned long max_util = 0;
|
|
|
|
if (!static_branch_likely(&sched_uclamp_used))
|
|
return util;
|
|
|
|
- min_util = READ_ONCE(rq->uclamp[UCLAMP_MIN].value);
|
|
- max_util = READ_ONCE(rq->uclamp[UCLAMP_MAX].value);
|
|
-
|
|
if (p) {
|
|
- min_util = max(min_util, uclamp_eff_value(p, UCLAMP_MIN));
|
|
- max_util = max(max_util, uclamp_eff_value(p, UCLAMP_MAX));
|
|
+ min_util = uclamp_eff_value(p, UCLAMP_MIN);
|
|
+ max_util = uclamp_eff_value(p, UCLAMP_MAX);
|
|
+
|
|
+ /*
|
|
+ * Ignore last runnable task's max clamp, as this task will
|
|
+ * reset it. Similarly, no need to read the rq's min clamp.
|
|
+ */
|
|
+ if (rq->uclamp_flags & UCLAMP_FLAG_IDLE)
|
|
+ goto out;
|
|
}
|
|
|
|
+ min_util = max_t(unsigned long, min_util, READ_ONCE(rq->uclamp[UCLAMP_MIN].value));
|
|
+ max_util = max_t(unsigned long, max_util, READ_ONCE(rq->uclamp[UCLAMP_MAX].value));
|
|
+out:
|
|
/*
|
|
* Since CPU's {min,max}_util clamps are MAX aggregated considering
|
|
* RUNNABLE tasks with _different_ clamps, we can end up with an
|
|
diff --git a/kernel/static_call.c b/kernel/static_call.c
|
|
index 723fcc9d20db6..43ba0b1e0edbb 100644
|
|
--- a/kernel/static_call.c
|
|
+++ b/kernel/static_call.c
|
|
@@ -292,13 +292,15 @@ static int addr_conflict(struct static_call_site *site, void *start, void *end)
|
|
|
|
static int __static_call_text_reserved(struct static_call_site *iter_start,
|
|
struct static_call_site *iter_stop,
|
|
- void *start, void *end)
|
|
+ void *start, void *end, bool init)
|
|
{
|
|
struct static_call_site *iter = iter_start;
|
|
|
|
while (iter < iter_stop) {
|
|
- if (addr_conflict(iter, start, end))
|
|
- return 1;
|
|
+ if (init || !static_call_is_init(iter)) {
|
|
+ if (addr_conflict(iter, start, end))
|
|
+ return 1;
|
|
+ }
|
|
iter++;
|
|
}
|
|
|
|
@@ -324,7 +326,7 @@ static int __static_call_mod_text_reserved(void *start, void *end)
|
|
|
|
ret = __static_call_text_reserved(mod->static_call_sites,
|
|
mod->static_call_sites + mod->num_static_call_sites,
|
|
- start, end);
|
|
+ start, end, mod->state == MODULE_STATE_COMING);
|
|
|
|
module_put(mod);
|
|
|
|
@@ -459,8 +461,9 @@ static inline int __static_call_mod_text_reserved(void *start, void *end)
|
|
|
|
int static_call_text_reserved(void *start, void *end)
|
|
{
|
|
+ bool init = system_state < SYSTEM_RUNNING;
|
|
int ret = __static_call_text_reserved(__start_static_call_sites,
|
|
- __stop_static_call_sites, start, end);
|
|
+ __stop_static_call_sites, start, end, init);
|
|
|
|
if (ret)
|
|
return ret;
|
|
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
|
|
index 797e096bc1f3d..53b4ab9ea305c 100644
|
|
--- a/kernel/trace/trace_events_hist.c
|
|
+++ b/kernel/trace/trace_events_hist.c
|
|
@@ -1689,7 +1689,9 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
|
|
if (WARN_ON_ONCE(!field))
|
|
goto out;
|
|
|
|
- if (is_string_field(field)) {
|
|
+ /* Pointers to strings are just pointers and dangerous to dereference */
|
|
+ if (is_string_field(field) &&
|
|
+ (field->filter_type != FILTER_PTR_STRING)) {
|
|
flags |= HIST_FIELD_FL_STRING;
|
|
|
|
hist_field->size = MAX_FILTER_STR_VAL;
|
|
@@ -4495,8 +4497,6 @@ static inline void add_to_key(char *compound_key, void *key,
|
|
field = key_field->field;
|
|
if (field->filter_type == FILTER_DYN_STRING)
|
|
size = *(u32 *)(rec + field->offset) >> 16;
|
|
- else if (field->filter_type == FILTER_PTR_STRING)
|
|
- size = strlen(key);
|
|
else if (field->filter_type == FILTER_STATIC_STRING)
|
|
size = field->size;
|
|
|
|
diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c
|
|
index c0cfcfd486be0..e6327391b6b66 100644
|
|
--- a/lib/decompress_unlz4.c
|
|
+++ b/lib/decompress_unlz4.c
|
|
@@ -112,6 +112,9 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
|
|
error("data corrupted");
|
|
goto exit_2;
|
|
}
|
|
+ } else if (size < 4) {
|
|
+ /* empty or end-of-file */
|
|
+ goto exit_3;
|
|
}
|
|
|
|
chunksize = get_unaligned_le32(inp);
|
|
@@ -125,6 +128,10 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
|
|
continue;
|
|
}
|
|
|
|
+ if (!fill && chunksize == 0) {
|
|
+ /* empty or end-of-file */
|
|
+ goto exit_3;
|
|
+ }
|
|
|
|
if (posp)
|
|
*posp += 4;
|
|
@@ -184,6 +191,7 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
|
|
}
|
|
}
|
|
|
|
+exit_3:
|
|
ret = 0;
|
|
exit_2:
|
|
if (!input)
|
|
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
|
|
index 9eb7c31688cc8..459c33c26beae 100644
|
|
--- a/lib/iov_iter.c
|
|
+++ b/lib/iov_iter.c
|
|
@@ -1117,8 +1117,6 @@ static inline void pipe_truncate(struct iov_iter *i)
|
|
static void pipe_advance(struct iov_iter *i, size_t size)
|
|
{
|
|
struct pipe_inode_info *pipe = i->pipe;
|
|
- if (unlikely(i->count < size))
|
|
- size = i->count;
|
|
if (size) {
|
|
struct pipe_buffer *buf;
|
|
unsigned int p_mask = pipe->ring_size - 1;
|
|
@@ -1159,6 +1157,8 @@ static void iov_iter_bvec_advance(struct iov_iter *i, size_t size)
|
|
|
|
void iov_iter_advance(struct iov_iter *i, size_t size)
|
|
{
|
|
+ if (unlikely(i->count < size))
|
|
+ size = i->count;
|
|
if (unlikely(iov_iter_is_pipe(i))) {
|
|
pipe_advance(i, size);
|
|
return;
|
|
@@ -1168,7 +1168,6 @@ void iov_iter_advance(struct iov_iter *i, size_t size)
|
|
return;
|
|
}
|
|
if (unlikely(iov_iter_is_xarray(i))) {
|
|
- size = min(size, i->count);
|
|
i->iov_offset += size;
|
|
i->count -= size;
|
|
return;
|
|
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
|
|
index 65e0e8642ded8..8363f737d5adb 100644
|
|
--- a/mm/hugetlb.c
|
|
+++ b/mm/hugetlb.c
|
|
@@ -5216,8 +5216,9 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
continue;
|
|
}
|
|
|
|
- refs = min3(pages_per_huge_page(h) - pfn_offset,
|
|
- (vma->vm_end - vaddr) >> PAGE_SHIFT, remainder);
|
|
+ /* vaddr may not be aligned to PAGE_SIZE */
|
|
+ refs = min3(pages_per_huge_page(h) - pfn_offset, remainder,
|
|
+ (vma->vm_end - ALIGN_DOWN(vaddr, PAGE_SIZE)) >> PAGE_SHIFT);
|
|
|
|
if (pages || vmas)
|
|
record_subpages_vmas(mem_map_offset(page, pfn_offset),
|
|
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
|
|
index 226bb05c3b42d..869f1608c98a3 100644
|
|
--- a/net/bridge/br_multicast.c
|
|
+++ b/net/bridge/br_multicast.c
|
|
@@ -3087,7 +3087,9 @@ static void br_multicast_pim(struct net_bridge *br,
|
|
pim_hdr_type(pimhdr) != PIM_TYPE_HELLO)
|
|
return;
|
|
|
|
+ spin_lock(&br->multicast_lock);
|
|
br_multicast_mark_router(br, port);
|
|
+ spin_unlock(&br->multicast_lock);
|
|
}
|
|
|
|
static int br_ip4_multicast_mrd_rcv(struct net_bridge *br,
|
|
@@ -3098,7 +3100,9 @@ static int br_ip4_multicast_mrd_rcv(struct net_bridge *br,
|
|
igmp_hdr(skb)->type != IGMP_MRDISC_ADV)
|
|
return -ENOMSG;
|
|
|
|
+ spin_lock(&br->multicast_lock);
|
|
br_multicast_mark_router(br, port);
|
|
+ spin_unlock(&br->multicast_lock);
|
|
|
|
return 0;
|
|
}
|
|
@@ -3166,7 +3170,9 @@ static void br_ip6_multicast_mrd_rcv(struct net_bridge *br,
|
|
if (icmp6_hdr(skb)->icmp6_type != ICMPV6_MRDISC_ADV)
|
|
return;
|
|
|
|
+ spin_lock(&br->multicast_lock);
|
|
br_multicast_mark_router(br, port);
|
|
+ spin_unlock(&br->multicast_lock);
|
|
}
|
|
|
|
static int br_multicast_ipv6_rcv(struct net_bridge *br,
|
|
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
|
|
index 3964ff74ee518..ca10ba2626f27 100644
|
|
--- a/net/sunrpc/xdr.c
|
|
+++ b/net/sunrpc/xdr.c
|
|
@@ -1230,10 +1230,9 @@ static unsigned int xdr_set_page_base(struct xdr_stream *xdr,
|
|
void *kaddr;
|
|
|
|
maxlen = xdr->buf->page_len;
|
|
- if (base >= maxlen) {
|
|
- base = maxlen;
|
|
- maxlen = 0;
|
|
- } else
|
|
+ if (base >= maxlen)
|
|
+ return 0;
|
|
+ else
|
|
maxlen -= base;
|
|
if (len > maxlen)
|
|
len = maxlen;
|
|
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
|
|
index 316d049455876..3228b7a1836aa 100644
|
|
--- a/net/sunrpc/xprtsock.c
|
|
+++ b/net/sunrpc/xprtsock.c
|
|
@@ -1689,7 +1689,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)
|
|
err = kernel_bind(sock, (struct sockaddr *)&myaddr,
|
|
transport->xprt.addrlen);
|
|
if (err == 0) {
|
|
- transport->srcport = port;
|
|
+ if (transport->xprt.reuseport)
|
|
+ transport->srcport = port;
|
|
break;
|
|
}
|
|
last = port;
|
|
diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c
|
|
index d9077e91382bf..6ddf646cda659 100644
|
|
--- a/sound/ac97/bus.c
|
|
+++ b/sound/ac97/bus.c
|
|
@@ -520,7 +520,7 @@ static int ac97_bus_remove(struct device *dev)
|
|
struct ac97_codec_driver *adrv = to_ac97_driver(dev->driver);
|
|
int ret;
|
|
|
|
- ret = pm_runtime_get_sync(dev);
|
|
+ ret = pm_runtime_resume_and_get(dev);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
diff --git a/sound/core/control_led.c b/sound/core/control_led.c
|
|
index a90e31dbde61f..ff7fd5e295518 100644
|
|
--- a/sound/core/control_led.c
|
|
+++ b/sound/core/control_led.c
|
|
@@ -397,7 +397,7 @@ static ssize_t show_mode(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct snd_ctl_led *led = container_of(dev, struct snd_ctl_led, dev);
|
|
- const char *str;
|
|
+ const char *str = NULL;
|
|
|
|
switch (led->mode) {
|
|
case MODE_FOLLOW_MUTE: str = "follow-mute"; break;
|
|
diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
|
|
index 9897bd26a4388..12664c3a14141 100644
|
|
--- a/sound/firewire/Kconfig
|
|
+++ b/sound/firewire/Kconfig
|
|
@@ -38,7 +38,7 @@ config SND_OXFW
|
|
* Mackie(Loud) Onyx 1640i (former model)
|
|
* Mackie(Loud) Onyx Satellite
|
|
* Mackie(Loud) Tapco Link.Firewire
|
|
- * Mackie(Loud) d.4 pro
|
|
+ * Mackie(Loud) d.2 pro/d.4 pro (built-in FireWire card with OXFW971 ASIC)
|
|
* Mackie(Loud) U.420/U.420d
|
|
* TASCAM FireOne
|
|
* Stanton Controllers & Systems 1 Deck/Mixer
|
|
@@ -84,7 +84,7 @@ config SND_BEBOB
|
|
* PreSonus FIREBOX/FIREPOD/FP10/Inspire1394
|
|
* BridgeCo RDAudio1/Audio5
|
|
* Mackie Onyx 1220/1620/1640 (FireWire I/O Card)
|
|
- * Mackie d.2 (FireWire Option) and d.2 Pro
|
|
+ * Mackie d.2 (optional FireWire card with DM1000 ASIC)
|
|
* Stanton FinalScratch 2 (ScratchAmp)
|
|
* Tascam IF-FW/DM
|
|
* Behringer XENIX UFX 1204/1604
|
|
@@ -110,6 +110,7 @@ config SND_BEBOB
|
|
* M-Audio Ozonic/NRV10/ProfireLightBridge
|
|
* M-Audio FireWire 1814/ProjectMix IO
|
|
* Digidesign Mbox 2 Pro
|
|
+ * ToneWeal FW66
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called snd-bebob.
|
|
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
|
|
index daeecfa8b9aac..67fa0f2178b01 100644
|
|
--- a/sound/firewire/bebob/bebob.c
|
|
+++ b/sound/firewire/bebob/bebob.c
|
|
@@ -59,6 +59,7 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS);
|
|
#define VEN_MAUDIO1 0x00000d6c
|
|
#define VEN_MAUDIO2 0x000007f5
|
|
#define VEN_DIGIDESIGN 0x00a07e
|
|
+#define OUI_SHOUYO 0x002327
|
|
|
|
#define MODEL_FOCUSRITE_SAFFIRE_BOTH 0x00000000
|
|
#define MODEL_MAUDIO_AUDIOPHILE_BOTH 0x00010060
|
|
@@ -387,7 +388,7 @@ static const struct ieee1394_device_id bebob_id_table[] = {
|
|
SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal),
|
|
/* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */
|
|
SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal),
|
|
- // Mackie, d.2 (Firewire option card) and d.2 Pro (the card is built-in).
|
|
+ // Mackie, d.2 (optional Firewire card with DM1000).
|
|
SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal),
|
|
/* Stanton, ScratchAmp */
|
|
SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal),
|
|
@@ -486,6 +487,8 @@ static const struct ieee1394_device_id bebob_id_table[] = {
|
|
&maudio_special_spec),
|
|
/* Digidesign Mbox 2 Pro */
|
|
SND_BEBOB_DEV_ENTRY(VEN_DIGIDESIGN, 0x0000a9, &spec_normal),
|
|
+ // Toneweal FW66.
|
|
+ SND_BEBOB_DEV_ENTRY(OUI_SHOUYO, 0x020002, &spec_normal),
|
|
/* IDs are unknown but able to be supported */
|
|
/* Apogee, Mini-ME Firewire */
|
|
/* Apogee, Mini-DAC Firewire */
|
|
diff --git a/sound/firewire/motu/motu-protocol-v2.c b/sound/firewire/motu/motu-protocol-v2.c
|
|
index 784073aa10265..f0a0ecad4d74a 100644
|
|
--- a/sound/firewire/motu/motu-protocol-v2.c
|
|
+++ b/sound/firewire/motu/motu-protocol-v2.c
|
|
@@ -86,24 +86,23 @@ static int detect_clock_source_optical_model(struct snd_motu *motu, u32 data,
|
|
*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;
|
|
break;
|
|
case 1:
|
|
+ *src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT;
|
|
+ break;
|
|
+ case 2:
|
|
{
|
|
__be32 reg;
|
|
|
|
// To check the configuration of optical interface.
|
|
- int err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET,
|
|
- ®, sizeof(reg));
|
|
+ int err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET, ®, sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
|
|
- if (be32_to_cpu(reg) & 0x00000200)
|
|
+ if (((data & V2_OPT_IN_IFACE_MASK) >> V2_OPT_IN_IFACE_SHIFT) == V2_OPT_IFACE_MODE_SPDIF)
|
|
*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT;
|
|
else
|
|
- *src = SND_MOTU_CLOCK_SOURCE_ADAT_ON_OPT;
|
|
+ *src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;
|
|
break;
|
|
}
|
|
- case 2:
|
|
- *src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;
|
|
- break;
|
|
case 3:
|
|
*src = SND_MOTU_CLOCK_SOURCE_SPH;
|
|
break;
|
|
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
|
|
index 9eea25c46dc7e..5490637d278a4 100644
|
|
--- a/sound/firewire/oxfw/oxfw.c
|
|
+++ b/sound/firewire/oxfw/oxfw.c
|
|
@@ -355,7 +355,7 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
|
|
* Onyx-i series (former models): 0x081216
|
|
* Mackie Onyx Satellite: 0x00200f
|
|
* Tapco LINK.firewire 4x6: 0x000460
|
|
- * d.4 pro: Unknown
|
|
+ * d.2 pro/d.4 pro (built-in card): Unknown
|
|
* U.420: Unknown
|
|
* U.420d: Unknown
|
|
*/
|
|
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
|
|
index bc112df10fc57..d1ac9fc994916 100644
|
|
--- a/sound/isa/cmi8330.c
|
|
+++ b/sound/isa/cmi8330.c
|
|
@@ -547,7 +547,7 @@ static int snd_cmi8330_probe(struct snd_card *card, int dev)
|
|
}
|
|
if (acard->sb->hardware != SB_HW_16) {
|
|
snd_printk(KERN_ERR PFX "SB16 not found during probe\n");
|
|
- return err;
|
|
+ return -ENODEV;
|
|
}
|
|
|
|
snd_wss_out(acard->wss, CS4231_MISC_INFO, 0x40); /* switch on MODE2 */
|
|
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
|
|
index 4789345a8fdde..c98ccd421a2ec 100644
|
|
--- a/sound/isa/sb/sb16_csp.c
|
|
+++ b/sound/isa/sb/sb16_csp.c
|
|
@@ -1072,10 +1072,14 @@ static void snd_sb_qsound_destroy(struct snd_sb_csp * p)
|
|
card = p->chip->card;
|
|
|
|
down_write(&card->controls_rwsem);
|
|
- if (p->qsound_switch)
|
|
+ if (p->qsound_switch) {
|
|
snd_ctl_remove(card, p->qsound_switch);
|
|
- if (p->qsound_space)
|
|
+ p->qsound_switch = NULL;
|
|
+ }
|
|
+ if (p->qsound_space) {
|
|
snd_ctl_remove(card, p->qsound_space);
|
|
+ p->qsound_space = NULL;
|
|
+ }
|
|
up_write(&card->controls_rwsem);
|
|
|
|
/* cancel pending transfer of QSound parameters */
|
|
diff --git a/sound/mips/snd-n64.c b/sound/mips/snd-n64.c
|
|
index e35e93157755f..463a6fe589eb2 100644
|
|
--- a/sound/mips/snd-n64.c
|
|
+++ b/sound/mips/snd-n64.c
|
|
@@ -338,6 +338,10 @@ static int __init n64audio_probe(struct platform_device *pdev)
|
|
strcpy(card->longname, "N64 Audio");
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
+ if (!res) {
|
|
+ err = -EINVAL;
|
|
+ goto fail_dma_alloc;
|
|
+ }
|
|
if (devm_request_irq(&pdev->dev, res->start, n64audio_isr,
|
|
IRQF_SHARED, "N64 Audio", priv)) {
|
|
err = -EBUSY;
|
|
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
|
|
index 6f2b743b9d75c..6c6dc3fcde607 100644
|
|
--- a/sound/pci/hda/hda_tegra.c
|
|
+++ b/sound/pci/hda/hda_tegra.c
|
|
@@ -262,6 +262,9 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
|
|
const char *sname, *drv_name = "tegra-hda";
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
+ if (irq_id < 0)
|
|
+ return irq_id;
|
|
+
|
|
err = hda_tegra_init_chip(chip, pdev);
|
|
if (err)
|
|
return err;
|
|
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
|
|
index 9fb51ebafde16..8088f77d5a74b 100644
|
|
--- a/sound/ppc/powermac.c
|
|
+++ b/sound/ppc/powermac.c
|
|
@@ -76,7 +76,11 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|
sprintf(card->shortname, "PowerMac %s", name_ext);
|
|
sprintf(card->longname, "%s (Dev %d) Sub-frame %d",
|
|
card->shortname, chip->device_id, chip->subframe);
|
|
- if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0)
|
|
+ err = snd_pmac_tumbler_init(chip);
|
|
+ if (err < 0)
|
|
+ goto __error;
|
|
+ err = snd_pmac_tumbler_post_init();
|
|
+ if (err < 0)
|
|
goto __error;
|
|
break;
|
|
case PMAC_AWACS:
|
|
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
|
|
index 77473c226f9ec..8434c48354f16 100644
|
|
--- a/sound/soc/codecs/cs42l42.c
|
|
+++ b/sound/soc/codecs/cs42l42.c
|
|
@@ -581,6 +581,7 @@ struct cs42l42_pll_params {
|
|
u8 pll_divout;
|
|
u32 mclk_int;
|
|
u8 pll_cal_ratio;
|
|
+ u8 n;
|
|
};
|
|
|
|
/*
|
|
@@ -588,21 +589,21 @@ struct cs42l42_pll_params {
|
|
* Table 4-5 from the Datasheet
|
|
*/
|
|
static const struct cs42l42_pll_params pll_ratio_table[] = {
|
|
- { 1536000, 0, 1, 0x00, 0x7D, 0x000000, 0x03, 0x10, 12000000, 125 },
|
|
- { 2822400, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
|
|
- { 3000000, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
|
|
- { 3072000, 0, 1, 0x00, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
|
|
- { 4000000, 0, 1, 0x00, 0x30, 0x800000, 0x03, 0x10, 12000000, 96 },
|
|
- { 4096000, 0, 1, 0x00, 0x2E, 0xE00000, 0x03, 0x10, 12000000, 94 },
|
|
- { 5644800, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
|
|
- { 6000000, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
|
|
- { 6144000, 0, 1, 0x01, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
|
|
- { 11289600, 0, 0, 0, 0, 0, 0, 0, 11289600, 0 },
|
|
- { 12000000, 0, 0, 0, 0, 0, 0, 0, 12000000, 0 },
|
|
- { 12288000, 0, 0, 0, 0, 0, 0, 0, 12288000, 0 },
|
|
- { 22579200, 1, 0, 0, 0, 0, 0, 0, 22579200, 0 },
|
|
- { 24000000, 1, 0, 0, 0, 0, 0, 0, 24000000, 0 },
|
|
- { 24576000, 1, 0, 0, 0, 0, 0, 0, 24576000, 0 }
|
|
+ { 1536000, 0, 1, 0x00, 0x7D, 0x000000, 0x03, 0x10, 12000000, 125, 2},
|
|
+ { 2822400, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 11289600, 128, 1},
|
|
+ { 3000000, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 12000000, 128, 1},
|
|
+ { 3072000, 0, 1, 0x00, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125, 1},
|
|
+ { 4000000, 0, 1, 0x00, 0x30, 0x800000, 0x03, 0x10, 12000000, 96, 1},
|
|
+ { 4096000, 0, 1, 0x00, 0x2E, 0xE00000, 0x03, 0x10, 12000000, 94, 1},
|
|
+ { 5644800, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 11289600, 128, 1},
|
|
+ { 6000000, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 12000000, 128, 1},
|
|
+ { 6144000, 0, 1, 0x01, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125, 1},
|
|
+ { 11289600, 0, 0, 0, 0, 0, 0, 0, 11289600, 0, 1},
|
|
+ { 12000000, 0, 0, 0, 0, 0, 0, 0, 12000000, 0, 1},
|
|
+ { 12288000, 0, 0, 0, 0, 0, 0, 0, 12288000, 0, 1},
|
|
+ { 22579200, 1, 0, 0, 0, 0, 0, 0, 22579200, 0, 1},
|
|
+ { 24000000, 1, 0, 0, 0, 0, 0, 0, 24000000, 0, 1},
|
|
+ { 24576000, 1, 0, 0, 0, 0, 0, 0, 24576000, 0, 1}
|
|
};
|
|
|
|
static int cs42l42_pll_config(struct snd_soc_component *component)
|
|
@@ -738,8 +739,12 @@ static int cs42l42_pll_config(struct snd_soc_component *component)
|
|
snd_soc_component_update_bits(component,
|
|
CS42L42_PLL_CTL3,
|
|
CS42L42_PLL_DIVOUT_MASK,
|
|
- pll_ratio_table[i].pll_divout
|
|
+ (pll_ratio_table[i].pll_divout * pll_ratio_table[i].n)
|
|
<< CS42L42_PLL_DIVOUT_SHIFT);
|
|
+ if (pll_ratio_table[i].n != 1)
|
|
+ cs42l42->pll_divout = pll_ratio_table[i].pll_divout;
|
|
+ else
|
|
+ cs42l42->pll_divout = 0;
|
|
snd_soc_component_update_bits(component,
|
|
CS42L42_PLL_CAL_RATIO,
|
|
CS42L42_PLL_CAL_RATIO_MASK,
|
|
@@ -894,6 +899,16 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
|
|
if ((cs42l42->bclk < 11289600) && (cs42l42->sclk < 11289600)) {
|
|
snd_soc_component_update_bits(component, CS42L42_PLL_CTL1,
|
|
CS42L42_PLL_START_MASK, 1);
|
|
+
|
|
+ if (cs42l42->pll_divout) {
|
|
+ usleep_range(CS42L42_PLL_DIVOUT_TIME_US,
|
|
+ CS42L42_PLL_DIVOUT_TIME_US * 2);
|
|
+ snd_soc_component_update_bits(component, CS42L42_PLL_CTL3,
|
|
+ CS42L42_PLL_DIVOUT_MASK,
|
|
+ cs42l42->pll_divout <<
|
|
+ CS42L42_PLL_DIVOUT_SHIFT);
|
|
+ }
|
|
+
|
|
ret = regmap_read_poll_timeout(cs42l42->regmap,
|
|
CS42L42_PLL_LOCK_STATUS,
|
|
regval,
|
|
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
|
|
index 386c40f9ed311..5384105afe503 100644
|
|
--- a/sound/soc/codecs/cs42l42.h
|
|
+++ b/sound/soc/codecs/cs42l42.h
|
|
@@ -755,6 +755,7 @@
|
|
|
|
#define CS42L42_NUM_SUPPLIES 5
|
|
#define CS42L42_BOOT_TIME_US 3000
|
|
+#define CS42L42_PLL_DIVOUT_TIME_US 800
|
|
#define CS42L42_CLOCK_SWITCH_DELAY_US 150
|
|
#define CS42L42_PLL_LOCK_POLL_US 250
|
|
#define CS42L42_PLL_LOCK_TIMEOUT_US 1250
|
|
@@ -777,6 +778,7 @@ struct cs42l42_private {
|
|
int bclk;
|
|
u32 sclk;
|
|
u32 srate;
|
|
+ u8 pll_divout;
|
|
u8 plug_state;
|
|
u8 hs_type;
|
|
u8 ts_inv;
|
|
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
|
|
index 46f3f2c687566..535e17251a35e 100644
|
|
--- a/sound/soc/fsl/fsl_xcvr.c
|
|
+++ b/sound/soc/fsl/fsl_xcvr.c
|
|
@@ -1202,6 +1202,10 @@ static int fsl_xcvr_probe(struct platform_device *pdev)
|
|
|
|
rx_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rxfifo");
|
|
tx_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "txfifo");
|
|
+ if (!rx_res || !tx_res) {
|
|
+ dev_err(dev, "could not find rxfifo or txfifo resource\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
xcvr->dma_prms_rx.chan_name = "rx";
|
|
xcvr->dma_prms_tx.chan_name = "tx";
|
|
xcvr->dma_prms_rx.addr = rx_res->start;
|
|
diff --git a/sound/soc/img/img-i2s-in.c b/sound/soc/img/img-i2s-in.c
|
|
index 0843235d73c91..fd3432a1d6ab8 100644
|
|
--- a/sound/soc/img/img-i2s-in.c
|
|
+++ b/sound/soc/img/img-i2s-in.c
|
|
@@ -464,7 +464,7 @@ static int img_i2s_in_probe(struct platform_device *pdev)
|
|
if (ret)
|
|
goto err_pm_disable;
|
|
}
|
|
- ret = pm_runtime_get_sync(&pdev->dev);
|
|
+ ret = pm_runtime_resume_and_get(&pdev->dev);
|
|
if (ret < 0)
|
|
goto err_suspend;
|
|
|
|
diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
|
|
index c0d8a73c6d218..7ca3347dbd2e4 100644
|
|
--- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
|
|
+++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
|
|
@@ -644,7 +644,7 @@ static int kabylake_audio_probe(struct platform_device *pdev)
|
|
|
|
static const struct platform_device_id kbl_board_ids[] = {
|
|
{
|
|
- .name = "kbl_da7219_max98357a",
|
|
+ .name = "kbl_da7219_mx98357a",
|
|
.driver_data =
|
|
(kernel_ulong_t)&kabylake_audio_card_da7219_m98357a,
|
|
},
|
|
@@ -666,4 +666,4 @@ module_platform_driver(kabylake_audio)
|
|
MODULE_DESCRIPTION("Audio Machine driver-DA7219 & MAX98357A in I2S mode");
|
|
MODULE_AUTHOR("Naveen Manohar <naveen.m@intel.com>");
|
|
MODULE_LICENSE("GPL v2");
|
|
-MODULE_ALIAS("platform:kbl_da7219_max98357a");
|
|
+MODULE_ALIAS("platform:kbl_da7219_mx98357a");
|
|
diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c
|
|
index f3cb0773e70ee..8d1ad892e86b6 100644
|
|
--- a/sound/soc/intel/boards/sof_da7219_max98373.c
|
|
+++ b/sound/soc/intel/boards/sof_da7219_max98373.c
|
|
@@ -440,6 +440,7 @@ static const struct platform_device_id board_ids[] = {
|
|
},
|
|
{ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(platform, board_ids);
|
|
|
|
static struct platform_driver audio = {
|
|
.probe = audio_probe,
|
|
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
|
|
index 58548ea0d915f..cf1d053733e22 100644
|
|
--- a/sound/soc/intel/boards/sof_rt5682.c
|
|
+++ b/sound/soc/intel/boards/sof_rt5682.c
|
|
@@ -968,6 +968,7 @@ static const struct platform_device_id board_ids[] = {
|
|
},
|
|
{ }
|
|
};
|
|
+MODULE_DEVICE_TABLE(platform, board_ids);
|
|
|
|
static struct platform_driver sof_audio = {
|
|
.probe = sof_audio_probe,
|
|
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
|
|
index dfad2ad129abb..5827a16773c90 100644
|
|
--- a/sound/soc/intel/boards/sof_sdw.c
|
|
+++ b/sound/soc/intel/boards/sof_sdw.c
|
|
@@ -354,6 +354,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
|
|
.part_id = 0x714,
|
|
.version_id = 3,
|
|
.direction = {false, true},
|
|
+ .ignore_pch_dmic = true,
|
|
.dai_name = "rt715-aif2",
|
|
.init = sof_sdw_rt715_sdca_init,
|
|
},
|
|
@@ -361,6 +362,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
|
|
.part_id = 0x715,
|
|
.version_id = 3,
|
|
.direction = {false, true},
|
|
+ .ignore_pch_dmic = true,
|
|
.dai_name = "rt715-aif2",
|
|
.init = sof_sdw_rt715_sdca_init,
|
|
},
|
|
@@ -368,6 +370,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
|
|
.part_id = 0x714,
|
|
.version_id = 2,
|
|
.direction = {false, true},
|
|
+ .ignore_pch_dmic = true,
|
|
.dai_name = "rt715-aif2",
|
|
.init = sof_sdw_rt715_init,
|
|
},
|
|
@@ -375,6 +378,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
|
|
.part_id = 0x715,
|
|
.version_id = 2,
|
|
.direction = {false, true},
|
|
+ .ignore_pch_dmic = true,
|
|
.dai_name = "rt715-aif2",
|
|
.init = sof_sdw_rt715_init,
|
|
},
|
|
@@ -730,7 +734,8 @@ static int create_sdw_dailink(struct device *dev, int *be_index,
|
|
int *cpu_id, bool *group_generated,
|
|
struct snd_soc_codec_conf *codec_conf,
|
|
int codec_count,
|
|
- int *codec_conf_index)
|
|
+ int *codec_conf_index,
|
|
+ bool *ignore_pch_dmic)
|
|
{
|
|
const struct snd_soc_acpi_link_adr *link_next;
|
|
struct snd_soc_dai_link_component *codecs;
|
|
@@ -783,6 +788,9 @@ static int create_sdw_dailink(struct device *dev, int *be_index,
|
|
if (codec_index < 0)
|
|
return codec_index;
|
|
|
|
+ if (codec_info_list[codec_index].ignore_pch_dmic)
|
|
+ *ignore_pch_dmic = true;
|
|
+
|
|
cpu_dai_index = *cpu_id;
|
|
for_each_pcm_streams(stream) {
|
|
char *name, *cpu_name;
|
|
@@ -914,6 +922,7 @@ static int sof_card_dai_links_create(struct device *dev,
|
|
const struct snd_soc_acpi_link_adr *adr_link;
|
|
struct snd_soc_dai_link_component *cpus;
|
|
struct snd_soc_codec_conf *codec_conf;
|
|
+ bool ignore_pch_dmic = false;
|
|
int codec_conf_count;
|
|
int codec_conf_index = 0;
|
|
bool group_generated[SDW_MAX_GROUPS];
|
|
@@ -1020,7 +1029,8 @@ static int sof_card_dai_links_create(struct device *dev,
|
|
sdw_cpu_dai_num, cpus, adr_link,
|
|
&cpu_id, group_generated,
|
|
codec_conf, codec_conf_count,
|
|
- &codec_conf_index);
|
|
+ &codec_conf_index,
|
|
+ &ignore_pch_dmic);
|
|
if (ret < 0) {
|
|
dev_err(dev, "failed to create dai link %d", be_id);
|
|
return -ENOMEM;
|
|
@@ -1088,6 +1098,10 @@ SSP:
|
|
DMIC:
|
|
/* dmic */
|
|
if (dmic_num > 0) {
|
|
+ if (ignore_pch_dmic) {
|
|
+ dev_warn(dev, "Ignoring PCH DMIC\n");
|
|
+ goto HDMI;
|
|
+ }
|
|
cpus[cpu_id].dai_name = "DMIC01 Pin";
|
|
init_dai_link(dev, links + link_id, be_id, "dmic01",
|
|
0, 1, // DMIC only supports capture
|
|
@@ -1106,6 +1120,7 @@ DMIC:
|
|
INC_ID(be_id, cpu_id, link_id);
|
|
}
|
|
|
|
+HDMI:
|
|
/* HDMI */
|
|
if (hdmi_num > 0) {
|
|
idisp_components = devm_kcalloc(dev, hdmi_num,
|
|
diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
|
|
index f3cb6796363e7..ea60e8ed215c5 100644
|
|
--- a/sound/soc/intel/boards/sof_sdw_common.h
|
|
+++ b/sound/soc/intel/boards/sof_sdw_common.h
|
|
@@ -56,6 +56,7 @@ struct sof_sdw_codec_info {
|
|
int amp_num;
|
|
const u8 acpi_id[ACPI_ID_LEN];
|
|
const bool direction[2]; // playback & capture support
|
|
+ const bool ignore_pch_dmic;
|
|
const char *dai_name;
|
|
const struct snd_soc_ops *ops;
|
|
|
|
diff --git a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
|
|
index 47dadc9d5d2a0..ba5ff468c265a 100644
|
|
--- a/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
|
|
+++ b/sound/soc/intel/common/soc-acpi-intel-kbl-match.c
|
|
@@ -113,7 +113,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_kbl_machines[] = {
|
|
},
|
|
{
|
|
.id = "DLGS7219",
|
|
- .drv_name = "kbl_da7219_max98373",
|
|
+ .drv_name = "kbl_da7219_mx98373",
|
|
.fw_filename = "intel/dsp_fw_kbl.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &kbl_7219_98373_codecs,
|
|
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
|
|
index a76974ccfce10..af0129cf90a2b 100644
|
|
--- a/sound/soc/soc-core.c
|
|
+++ b/sound/soc/soc-core.c
|
|
@@ -2793,7 +2793,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
|
|
if (!routes) {
|
|
dev_err(card->dev,
|
|
"ASoC: Could not allocate DAPM route table\n");
|
|
- return -EINVAL;
|
|
+ return -ENOMEM;
|
|
}
|
|
|
|
for (i = 0; i < num_routes; i++) {
|
|
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
|
|
index 8659089a87a09..46513bb979044 100644
|
|
--- a/sound/soc/soc-pcm.c
|
|
+++ b/sound/soc/soc-pcm.c
|
|
@@ -1700,7 +1700,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
|
|
struct snd_soc_dpcm *dpcm;
|
|
struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(fe_substream);
|
|
struct snd_soc_dai *fe_cpu_dai;
|
|
- int err;
|
|
+ int err = 0;
|
|
int i;
|
|
|
|
/* apply symmetry for FE */
|
|
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
|
|
index 59abcfc9bd558..cb16b2bd8c21b 100644
|
|
--- a/sound/soc/sof/topology.c
|
|
+++ b/sound/soc/sof/topology.c
|
|
@@ -3335,7 +3335,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,
|
|
/* Copy common data to all config ipc structs */
|
|
for (i = 0; i < num_conf; i++) {
|
|
config[i].hdr.cmd = SOF_IPC_GLB_DAI_MSG | SOF_IPC_DAI_CONFIG;
|
|
- config[i].format = hw_config[i].fmt;
|
|
+ config[i].format = le32_to_cpu(hw_config[i].fmt);
|
|
config[i].type = common_config.type;
|
|
config[i].dai_index = common_config.dai_index;
|
|
}
|
|
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
|
|
index bca3e7fe27df6..38f4a2a37e0f7 100644
|
|
--- a/sound/usb/mixer_scarlett_gen2.c
|
|
+++ b/sound/usb/mixer_scarlett_gen2.c
|
|
@@ -254,10 +254,10 @@ static const struct scarlett2_device_info s6i6_gen2_info = {
|
|
.pad_input_count = 2,
|
|
|
|
.line_out_descrs = {
|
|
- "Monitor L",
|
|
- "Monitor R",
|
|
- "Headphones L",
|
|
- "Headphones R",
|
|
+ "Headphones 1 L",
|
|
+ "Headphones 1 R",
|
|
+ "Headphones 2 L",
|
|
+ "Headphones 2 R",
|
|
},
|
|
|
|
.ports = {
|
|
@@ -356,7 +356,7 @@ static const struct scarlett2_device_info s18i8_gen2_info = {
|
|
},
|
|
[SCARLETT2_PORT_TYPE_PCM] = {
|
|
.id = 0x600,
|
|
- .num = { 20, 18, 18, 14, 10 },
|
|
+ .num = { 8, 18, 18, 14, 10 },
|
|
.src_descr = "PCM %d",
|
|
.src_num_offset = 1,
|
|
.dst_descr = "PCM %02d Capture"
|
|
@@ -1033,11 +1033,10 @@ static int scarlett2_master_volume_ctl_get(struct snd_kcontrol *kctl,
|
|
struct usb_mixer_interface *mixer = elem->head.mixer;
|
|
struct scarlett2_mixer_data *private = mixer->private_data;
|
|
|
|
- if (private->vol_updated) {
|
|
- mutex_lock(&private->data_mutex);
|
|
+ mutex_lock(&private->data_mutex);
|
|
+ if (private->vol_updated)
|
|
scarlett2_update_volumes(mixer);
|
|
- mutex_unlock(&private->data_mutex);
|
|
- }
|
|
+ mutex_unlock(&private->data_mutex);
|
|
|
|
ucontrol->value.integer.value[0] = private->master_vol;
|
|
return 0;
|
|
@@ -1051,11 +1050,10 @@ static int scarlett2_volume_ctl_get(struct snd_kcontrol *kctl,
|
|
struct scarlett2_mixer_data *private = mixer->private_data;
|
|
int index = elem->control;
|
|
|
|
- if (private->vol_updated) {
|
|
- mutex_lock(&private->data_mutex);
|
|
+ mutex_lock(&private->data_mutex);
|
|
+ if (private->vol_updated)
|
|
scarlett2_update_volumes(mixer);
|
|
- mutex_unlock(&private->data_mutex);
|
|
- }
|
|
+ mutex_unlock(&private->data_mutex);
|
|
|
|
ucontrol->value.integer.value[0] = private->vol[index];
|
|
return 0;
|
|
@@ -1186,6 +1184,8 @@ static int scarlett2_sw_hw_enum_ctl_put(struct snd_kcontrol *kctl,
|
|
/* Send SW/HW switch change to the device */
|
|
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_SW_HW_SWITCH,
|
|
index, val);
|
|
+ if (err == 0)
|
|
+ err = 1;
|
|
|
|
unlock:
|
|
mutex_unlock(&private->data_mutex);
|
|
@@ -1246,6 +1246,8 @@ static int scarlett2_level_enum_ctl_put(struct snd_kcontrol *kctl,
|
|
/* Send switch change to the device */
|
|
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_LEVEL_SWITCH,
|
|
index, val);
|
|
+ if (err == 0)
|
|
+ err = 1;
|
|
|
|
unlock:
|
|
mutex_unlock(&private->data_mutex);
|
|
@@ -1296,6 +1298,8 @@ static int scarlett2_pad_ctl_put(struct snd_kcontrol *kctl,
|
|
/* Send switch change to the device */
|
|
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_PAD_SWITCH,
|
|
index, val);
|
|
+ if (err == 0)
|
|
+ err = 1;
|
|
|
|
unlock:
|
|
mutex_unlock(&private->data_mutex);
|
|
@@ -1319,11 +1323,10 @@ static int scarlett2_button_ctl_get(struct snd_kcontrol *kctl,
|
|
struct usb_mixer_interface *mixer = elem->head.mixer;
|
|
struct scarlett2_mixer_data *private = mixer->private_data;
|
|
|
|
- if (private->vol_updated) {
|
|
- mutex_lock(&private->data_mutex);
|
|
+ mutex_lock(&private->data_mutex);
|
|
+ if (private->vol_updated)
|
|
scarlett2_update_volumes(mixer);
|
|
- mutex_unlock(&private->data_mutex);
|
|
- }
|
|
+ mutex_unlock(&private->data_mutex);
|
|
|
|
ucontrol->value.enumerated.item[0] = private->buttons[elem->control];
|
|
return 0;
|
|
@@ -1352,6 +1355,8 @@ static int scarlett2_button_ctl_put(struct snd_kcontrol *kctl,
|
|
/* Send switch change to the device */
|
|
err = scarlett2_usb_set_config(mixer, SCARLETT2_CONFIG_BUTTONS,
|
|
index, val);
|
|
+ if (err == 0)
|
|
+ err = 1;
|
|
|
|
unlock:
|
|
mutex_unlock(&private->data_mutex);
|
|
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
|
|
index 22412cd69e985..10868c3fb6561 100644
|
|
--- a/sound/usb/usx2y/usX2Yhwdep.c
|
|
+++ b/sound/usb/usx2y/usX2Yhwdep.c
|
|
@@ -29,7 +29,7 @@ static vm_fault_t snd_us428ctls_vm_fault(struct vm_fault *vmf)
|
|
vmf->pgoff);
|
|
|
|
offset = vmf->pgoff << PAGE_SHIFT;
|
|
- vaddr = (char *)((struct usX2Ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset;
|
|
+ vaddr = (char *)((struct usx2ydev *)vmf->vma->vm_private_data)->us428ctls_sharedmem + offset;
|
|
page = virt_to_page(vaddr);
|
|
get_page(page);
|
|
vmf->page = page;
|
|
@@ -47,7 +47,7 @@ static const struct vm_operations_struct us428ctls_vm_ops = {
|
|
static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct vm_area_struct *area)
|
|
{
|
|
unsigned long size = (unsigned long)(area->vm_end - area->vm_start);
|
|
- struct usX2Ydev *us428 = hw->private_data;
|
|
+ struct usx2ydev *us428 = hw->private_data;
|
|
|
|
// FIXME this hwdep interface is used twice: fpga download and mmap for controlling Lights etc. Maybe better using 2 hwdep devs?
|
|
// so as long as the device isn't fully initialised yet we return -EBUSY here.
|
|
@@ -66,7 +66,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
|
|
if (!us428->us428ctls_sharedmem)
|
|
return -ENOMEM;
|
|
memset(us428->us428ctls_sharedmem, -1, sizeof(struct us428ctls_sharedmem));
|
|
- us428->us428ctls_sharedmem->CtlSnapShotLast = -2;
|
|
+ us428->us428ctls_sharedmem->ctl_snapshot_last = -2;
|
|
}
|
|
area->vm_ops = &us428ctls_vm_ops;
|
|
area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
|
@@ -77,21 +77,21 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
|
|
static __poll_t snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll_table *wait)
|
|
{
|
|
__poll_t mask = 0;
|
|
- struct usX2Ydev *us428 = hw->private_data;
|
|
+ struct usx2ydev *us428 = hw->private_data;
|
|
struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;
|
|
if (us428->chip_status & USX2Y_STAT_CHIP_HUP)
|
|
return EPOLLHUP;
|
|
|
|
poll_wait(file, &us428->us428ctls_wait_queue_head, wait);
|
|
|
|
- if (shm != NULL && shm->CtlSnapShotLast != shm->CtlSnapShotRed)
|
|
+ if (shm != NULL && shm->ctl_snapshot_last != shm->ctl_snapshot_red)
|
|
mask |= EPOLLIN;
|
|
|
|
return mask;
|
|
}
|
|
|
|
|
|
-static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
|
|
+static int snd_usx2y_hwdep_dsp_status(struct snd_hwdep *hw,
|
|
struct snd_hwdep_dsp_status *info)
|
|
{
|
|
static const char * const type_ids[USX2Y_TYPE_NUMS] = {
|
|
@@ -99,7 +99,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
|
|
[USX2Y_TYPE_224] = "us224",
|
|
[USX2Y_TYPE_428] = "us428",
|
|
};
|
|
- struct usX2Ydev *us428 = hw->private_data;
|
|
+ struct usx2ydev *us428 = hw->private_data;
|
|
int id = -1;
|
|
|
|
switch (le16_to_cpu(us428->dev->descriptor.idProduct)) {
|
|
@@ -124,7 +124,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
|
|
}
|
|
|
|
|
|
-static int usX2Y_create_usbmidi(struct snd_card *card)
|
|
+static int usx2y_create_usbmidi(struct snd_card *card)
|
|
{
|
|
static const struct snd_usb_midi_endpoint_info quirk_data_1 = {
|
|
.out_ep = 0x06,
|
|
@@ -152,28 +152,28 @@ static int usX2Y_create_usbmidi(struct snd_card *card)
|
|
.type = QUIRK_MIDI_FIXED_ENDPOINT,
|
|
.data = &quirk_data_2
|
|
};
|
|
- struct usb_device *dev = usX2Y(card)->dev;
|
|
+ struct usb_device *dev = usx2y(card)->dev;
|
|
struct usb_interface *iface = usb_ifnum_to_if(dev, 0);
|
|
const struct snd_usb_audio_quirk *quirk =
|
|
le16_to_cpu(dev->descriptor.idProduct) == USB_ID_US428 ?
|
|
&quirk_2 : &quirk_1;
|
|
|
|
- snd_printdd("usX2Y_create_usbmidi \n");
|
|
- return snd_usbmidi_create(card, iface, &usX2Y(card)->midi_list, quirk);
|
|
+ snd_printdd("usx2y_create_usbmidi \n");
|
|
+ return snd_usbmidi_create(card, iface, &usx2y(card)->midi_list, quirk);
|
|
}
|
|
|
|
-static int usX2Y_create_alsa_devices(struct snd_card *card)
|
|
+static int usx2y_create_alsa_devices(struct snd_card *card)
|
|
{
|
|
int err;
|
|
|
|
do {
|
|
- if ((err = usX2Y_create_usbmidi(card)) < 0) {
|
|
- snd_printk(KERN_ERR "usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
|
|
+ if ((err = usx2y_create_usbmidi(card)) < 0) {
|
|
+ snd_printk(KERN_ERR "usx2y_create_alsa_devices: usx2y_create_usbmidi error %i \n", err);
|
|
break;
|
|
}
|
|
- if ((err = usX2Y_audio_create(card)) < 0)
|
|
+ if ((err = usx2y_audio_create(card)) < 0)
|
|
break;
|
|
- if ((err = usX2Y_hwdep_pcm_new(card)) < 0)
|
|
+ if ((err = usx2y_hwdep_pcm_new(card)) < 0)
|
|
break;
|
|
if ((err = snd_card_register(card)) < 0)
|
|
break;
|
|
@@ -182,10 +182,10 @@ static int usX2Y_create_alsa_devices(struct snd_card *card)
|
|
return err;
|
|
}
|
|
|
|
-static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
|
|
+static int snd_usx2y_hwdep_dsp_load(struct snd_hwdep *hw,
|
|
struct snd_hwdep_dsp_image *dsp)
|
|
{
|
|
- struct usX2Ydev *priv = hw->private_data;
|
|
+ struct usx2ydev *priv = hw->private_data;
|
|
struct usb_device* dev = priv->dev;
|
|
int lret, err;
|
|
char *buf;
|
|
@@ -206,19 +206,19 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
|
|
return err;
|
|
if (dsp->index == 1) {
|
|
msleep(250); // give the device some time
|
|
- err = usX2Y_AsyncSeq04_init(priv);
|
|
+ err = usx2y_async_seq04_init(priv);
|
|
if (err) {
|
|
- snd_printk(KERN_ERR "usX2Y_AsyncSeq04_init error \n");
|
|
+ snd_printk(KERN_ERR "usx2y_async_seq04_init error \n");
|
|
return err;
|
|
}
|
|
- err = usX2Y_In04_init(priv);
|
|
+ err = usx2y_in04_init(priv);
|
|
if (err) {
|
|
- snd_printk(KERN_ERR "usX2Y_In04_init error \n");
|
|
+ snd_printk(KERN_ERR "usx2y_in04_init error \n");
|
|
return err;
|
|
}
|
|
- err = usX2Y_create_alsa_devices(hw->card);
|
|
+ err = usx2y_create_alsa_devices(hw->card);
|
|
if (err) {
|
|
- snd_printk(KERN_ERR "usX2Y_create_alsa_devices error %i \n", err);
|
|
+ snd_printk(KERN_ERR "usx2y_create_alsa_devices error %i \n", err);
|
|
snd_card_free(hw->card);
|
|
return err;
|
|
}
|
|
@@ -229,7 +229,7 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
|
|
}
|
|
|
|
|
|
-int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
|
|
+int usx2y_hwdep_new(struct snd_card *card, struct usb_device* device)
|
|
{
|
|
int err;
|
|
struct snd_hwdep *hw;
|
|
@@ -238,9 +238,9 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
|
|
return err;
|
|
|
|
hw->iface = SNDRV_HWDEP_IFACE_USX2Y;
|
|
- hw->private_data = usX2Y(card);
|
|
- hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status;
|
|
- hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load;
|
|
+ hw->private_data = usx2y(card);
|
|
+ hw->ops.dsp_status = snd_usx2y_hwdep_dsp_status;
|
|
+ hw->ops.dsp_load = snd_usx2y_hwdep_dsp_load;
|
|
hw->ops.mmap = snd_us428ctls_mmap;
|
|
hw->ops.poll = snd_us428ctls_poll;
|
|
hw->exclusive = 1;
|
|
diff --git a/sound/usb/usx2y/usX2Yhwdep.h b/sound/usb/usx2y/usX2Yhwdep.h
|
|
index 457199b5ed03b..34cef625712c6 100644
|
|
--- a/sound/usb/usx2y/usX2Yhwdep.h
|
|
+++ b/sound/usb/usx2y/usX2Yhwdep.h
|
|
@@ -2,6 +2,6 @@
|
|
#ifndef USX2YHWDEP_H
|
|
#define USX2YHWDEP_H
|
|
|
|
-int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device);
|
|
+int usx2y_hwdep_new(struct snd_card *card, struct usb_device* device);
|
|
|
|
#endif
|
|
diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c
|
|
index 091c071b270af..cff684942c4f0 100644
|
|
--- a/sound/usb/usx2y/usb_stream.c
|
|
+++ b/sound/usb/usx2y/usb_stream.c
|
|
@@ -142,8 +142,11 @@ void usb_stream_free(struct usb_stream_kernel *sk)
|
|
if (!s)
|
|
return;
|
|
|
|
- free_pages_exact(sk->write_page, s->write_size);
|
|
- sk->write_page = NULL;
|
|
+ if (sk->write_page) {
|
|
+ free_pages_exact(sk->write_page, s->write_size);
|
|
+ sk->write_page = NULL;
|
|
+ }
|
|
+
|
|
free_pages_exact(s, s->read_size);
|
|
sk->s = NULL;
|
|
}
|
|
diff --git a/sound/usb/usx2y/usbus428ctldefs.h b/sound/usb/usx2y/usbus428ctldefs.h
|
|
index 5a7518ea3aeb4..7366a940ffbba 100644
|
|
--- a/sound/usb/usx2y/usbus428ctldefs.h
|
|
+++ b/sound/usb/usx2y/usbus428ctldefs.h
|
|
@@ -4,28 +4,28 @@
|
|
* Copyright (c) 2003 by Karsten Wiese <annabellesgarden@yahoo.de>
|
|
*/
|
|
|
|
-enum E_In84{
|
|
- eFader0 = 0,
|
|
- eFader1,
|
|
- eFader2,
|
|
- eFader3,
|
|
- eFader4,
|
|
- eFader5,
|
|
- eFader6,
|
|
- eFader7,
|
|
- eFaderM,
|
|
- eTransport,
|
|
- eModifier = 10,
|
|
- eFilterSelect,
|
|
- eSelect,
|
|
- eMute,
|
|
+enum E_IN84 {
|
|
+ E_FADER_0 = 0,
|
|
+ E_FADER_1,
|
|
+ E_FADER_2,
|
|
+ E_FADER_3,
|
|
+ E_FADER_4,
|
|
+ E_FADER_5,
|
|
+ E_FADER_6,
|
|
+ E_FADER_7,
|
|
+ E_FADER_M,
|
|
+ E_TRANSPORT,
|
|
+ E_MODIFIER = 10,
|
|
+ E_FILTER_SELECT,
|
|
+ E_SELECT,
|
|
+ E_MUTE,
|
|
|
|
- eSwitch = 15,
|
|
- eWheelGain,
|
|
- eWheelFreq,
|
|
- eWheelQ,
|
|
- eWheelPan,
|
|
- eWheel = 20
|
|
+ E_SWITCH = 15,
|
|
+ E_WHEEL_GAIN,
|
|
+ E_WHEEL_FREQ,
|
|
+ E_WHEEL_Q,
|
|
+ E_WHEEL_PAN,
|
|
+ E_WHEEL = 20
|
|
};
|
|
|
|
#define T_RECORD 1
|
|
@@ -39,53 +39,53 @@ enum E_In84{
|
|
|
|
|
|
struct us428_ctls {
|
|
- unsigned char Fader[9];
|
|
- unsigned char Transport;
|
|
- unsigned char Modifier;
|
|
- unsigned char FilterSelect;
|
|
- unsigned char Select;
|
|
- unsigned char Mute;
|
|
- unsigned char UNKNOWN;
|
|
- unsigned char Switch;
|
|
- unsigned char Wheel[5];
|
|
+ unsigned char fader[9];
|
|
+ unsigned char transport;
|
|
+ unsigned char modifier;
|
|
+ unsigned char filters_elect;
|
|
+ unsigned char select;
|
|
+ unsigned char mute;
|
|
+ unsigned char unknown;
|
|
+ unsigned char wswitch;
|
|
+ unsigned char wheel[5];
|
|
};
|
|
|
|
-struct us428_setByte {
|
|
- unsigned char Offset,
|
|
- Value;
|
|
+struct us428_set_byte {
|
|
+ unsigned char offset,
|
|
+ value;
|
|
};
|
|
|
|
enum {
|
|
- eLT_Volume = 0,
|
|
- eLT_Light
|
|
+ ELT_VOLUME = 0,
|
|
+ ELT_LIGHT
|
|
};
|
|
|
|
-struct usX2Y_volume {
|
|
- unsigned char Channel,
|
|
- LH,
|
|
- LL,
|
|
- RH,
|
|
- RL;
|
|
+struct usx2y_volume {
|
|
+ unsigned char channel,
|
|
+ lh,
|
|
+ ll,
|
|
+ rh,
|
|
+ rl;
|
|
};
|
|
|
|
struct us428_lights {
|
|
- struct us428_setByte Light[7];
|
|
+ struct us428_set_byte light[7];
|
|
};
|
|
|
|
struct us428_p4out {
|
|
char type;
|
|
union {
|
|
- struct usX2Y_volume vol;
|
|
+ struct usx2y_volume vol;
|
|
struct us428_lights lights;
|
|
} val;
|
|
};
|
|
|
|
-#define N_us428_ctl_BUFS 16
|
|
-#define N_us428_p4out_BUFS 16
|
|
-struct us428ctls_sharedmem{
|
|
- struct us428_ctls CtlSnapShot[N_us428_ctl_BUFS];
|
|
- int CtlSnapShotDiffersAt[N_us428_ctl_BUFS];
|
|
- int CtlSnapShotLast, CtlSnapShotRed;
|
|
- struct us428_p4out p4out[N_us428_p4out_BUFS];
|
|
- int p4outLast, p4outSent;
|
|
+#define N_US428_CTL_BUFS 16
|
|
+#define N_US428_P4OUT_BUFS 16
|
|
+struct us428ctls_sharedmem {
|
|
+ struct us428_ctls ctl_snapshot[N_US428_CTL_BUFS];
|
|
+ int ctl_snapshot_differs_at[N_US428_CTL_BUFS];
|
|
+ int ctl_snapshot_last, ctl_snapshot_red;
|
|
+ struct us428_p4out p4out[N_US428_P4OUT_BUFS];
|
|
+ int p4out_last, p4out_sent;
|
|
};
|
|
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
|
|
index 3cd28d24f0a73..cdbb27a96e040 100644
|
|
--- a/sound/usb/usx2y/usbusx2y.c
|
|
+++ b/sound/usb/usx2y/usbusx2y.c
|
|
@@ -17,7 +17,7 @@
|
|
|
|
2004-10-26 Karsten Wiese
|
|
Version 0.8.6:
|
|
- wake_up() process waiting in usX2Y_urbs_start() on error.
|
|
+ wake_up() process waiting in usx2y_urbs_start() on error.
|
|
|
|
2004-10-21 Karsten Wiese
|
|
Version 0.8.5:
|
|
@@ -48,7 +48,7 @@
|
|
2004-06-12 Karsten Wiese
|
|
Version 0.6.3:
|
|
Made it thus the following rule is enforced:
|
|
- "All pcm substreams of one usX2Y have to operate at the same rate & format."
|
|
+ "All pcm substreams of one usx2y have to operate at the same rate & format."
|
|
|
|
2004-04-06 Karsten Wiese
|
|
Version 0.6.0:
|
|
@@ -150,161 +150,161 @@ module_param_array(enable, bool, NULL, 0444);
|
|
MODULE_PARM_DESC(enable, "Enable "NAME_ALLCAPS".");
|
|
|
|
|
|
-static int snd_usX2Y_card_used[SNDRV_CARDS];
|
|
+static int snd_usx2y_card_used[SNDRV_CARDS];
|
|
|
|
-static void usX2Y_usb_disconnect(struct usb_device* usb_device, void* ptr);
|
|
-static void snd_usX2Y_card_private_free(struct snd_card *card);
|
|
+static void usx2y_usb_disconnect(struct usb_device* usb_device, void* ptr);
|
|
+static void snd_usx2y_card_private_free(struct snd_card *card);
|
|
|
|
/*
|
|
* pipe 4 is used for switching the lamps, setting samplerate, volumes ....
|
|
*/
|
|
-static void i_usX2Y_Out04Int(struct urb *urb)
|
|
+static void i_usx2y_out04_int(struct urb *urb)
|
|
{
|
|
#ifdef CONFIG_SND_DEBUG
|
|
if (urb->status) {
|
|
int i;
|
|
- struct usX2Ydev *usX2Y = urb->context;
|
|
- for (i = 0; i < 10 && usX2Y->AS04.urb[i] != urb; i++);
|
|
- snd_printdd("i_usX2Y_Out04Int() urb %i status=%i\n", i, urb->status);
|
|
+ struct usx2ydev *usx2y = urb->context;
|
|
+ for (i = 0; i < 10 && usx2y->as04.urb[i] != urb; i++);
|
|
+ snd_printdd("i_usx2y_out04_int() urb %i status=%i\n", i, urb->status);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
-static void i_usX2Y_In04Int(struct urb *urb)
|
|
+static void i_usx2y_in04_int(struct urb *urb)
|
|
{
|
|
int err = 0;
|
|
- struct usX2Ydev *usX2Y = urb->context;
|
|
- struct us428ctls_sharedmem *us428ctls = usX2Y->us428ctls_sharedmem;
|
|
+ struct usx2ydev *usx2y = urb->context;
|
|
+ struct us428ctls_sharedmem *us428ctls = usx2y->us428ctls_sharedmem;
|
|
|
|
- usX2Y->In04IntCalls++;
|
|
+ usx2y->in04_int_calls++;
|
|
|
|
if (urb->status) {
|
|
snd_printdd("Interrupt Pipe 4 came back with status=%i\n", urb->status);
|
|
return;
|
|
}
|
|
|
|
- // printk("%i:0x%02X ", 8, (int)((unsigned char*)usX2Y->In04Buf)[8]); Master volume shows 0 here if fader is at max during boot ?!?
|
|
+ // printk("%i:0x%02X ", 8, (int)((unsigned char*)usx2y->in04_buf)[8]); Master volume shows 0 here if fader is at max during boot ?!?
|
|
if (us428ctls) {
|
|
int diff = -1;
|
|
- if (-2 == us428ctls->CtlSnapShotLast) {
|
|
+ if (-2 == us428ctls->ctl_snapshot_last) {
|
|
diff = 0;
|
|
- memcpy(usX2Y->In04Last, usX2Y->In04Buf, sizeof(usX2Y->In04Last));
|
|
- us428ctls->CtlSnapShotLast = -1;
|
|
+ memcpy(usx2y->in04_last, usx2y->in04_buf, sizeof(usx2y->in04_last));
|
|
+ us428ctls->ctl_snapshot_last = -1;
|
|
} else {
|
|
int i;
|
|
for (i = 0; i < 21; i++) {
|
|
- if (usX2Y->In04Last[i] != ((char*)usX2Y->In04Buf)[i]) {
|
|
+ if (usx2y->in04_last[i] != ((char*)usx2y->in04_buf)[i]) {
|
|
if (diff < 0)
|
|
diff = i;
|
|
- usX2Y->In04Last[i] = ((char*)usX2Y->In04Buf)[i];
|
|
+ usx2y->in04_last[i] = ((char*)usx2y->in04_buf)[i];
|
|
}
|
|
}
|
|
}
|
|
if (0 <= diff) {
|
|
- int n = us428ctls->CtlSnapShotLast + 1;
|
|
- if (n >= N_us428_ctl_BUFS || n < 0)
|
|
+ int n = us428ctls->ctl_snapshot_last + 1;
|
|
+ if (n >= N_US428_CTL_BUFS || n < 0)
|
|
n = 0;
|
|
- memcpy(us428ctls->CtlSnapShot + n, usX2Y->In04Buf, sizeof(us428ctls->CtlSnapShot[0]));
|
|
- us428ctls->CtlSnapShotDiffersAt[n] = diff;
|
|
- us428ctls->CtlSnapShotLast = n;
|
|
- wake_up(&usX2Y->us428ctls_wait_queue_head);
|
|
+ memcpy(us428ctls->ctl_snapshot + n, usx2y->in04_buf, sizeof(us428ctls->ctl_snapshot[0]));
|
|
+ us428ctls->ctl_snapshot_differs_at[n] = diff;
|
|
+ us428ctls->ctl_snapshot_last = n;
|
|
+ wake_up(&usx2y->us428ctls_wait_queue_head);
|
|
}
|
|
}
|
|
|
|
|
|
- if (usX2Y->US04) {
|
|
- if (0 == usX2Y->US04->submitted)
|
|
+ if (usx2y->us04) {
|
|
+ if (0 == usx2y->us04->submitted)
|
|
do {
|
|
- err = usb_submit_urb(usX2Y->US04->urb[usX2Y->US04->submitted++], GFP_ATOMIC);
|
|
- } while (!err && usX2Y->US04->submitted < usX2Y->US04->len);
|
|
+ err = usb_submit_urb(usx2y->us04->urb[usx2y->us04->submitted++], GFP_ATOMIC);
|
|
+ } while (!err && usx2y->us04->submitted < usx2y->us04->len);
|
|
} else
|
|
- if (us428ctls && us428ctls->p4outLast >= 0 && us428ctls->p4outLast < N_us428_p4out_BUFS) {
|
|
- if (us428ctls->p4outLast != us428ctls->p4outSent) {
|
|
- int j, send = us428ctls->p4outSent + 1;
|
|
- if (send >= N_us428_p4out_BUFS)
|
|
+ if (us428ctls && us428ctls->p4out_last >= 0 && us428ctls->p4out_last < N_US428_P4OUT_BUFS) {
|
|
+ if (us428ctls->p4out_last != us428ctls->p4out_sent) {
|
|
+ int j, send = us428ctls->p4out_sent + 1;
|
|
+ if (send >= N_US428_P4OUT_BUFS)
|
|
send = 0;
|
|
- for (j = 0; j < URBS_AsyncSeq && !err; ++j)
|
|
- if (0 == usX2Y->AS04.urb[j]->status) {
|
|
+ for (j = 0; j < URBS_ASYNC_SEQ && !err; ++j)
|
|
+ if (0 == usx2y->as04.urb[j]->status) {
|
|
struct us428_p4out *p4out = us428ctls->p4out + send; // FIXME if more than 1 p4out is new, 1 gets lost.
|
|
- usb_fill_bulk_urb(usX2Y->AS04.urb[j], usX2Y->dev,
|
|
- usb_sndbulkpipe(usX2Y->dev, 0x04), &p4out->val.vol,
|
|
- p4out->type == eLT_Light ? sizeof(struct us428_lights) : 5,
|
|
- i_usX2Y_Out04Int, usX2Y);
|
|
- err = usb_submit_urb(usX2Y->AS04.urb[j], GFP_ATOMIC);
|
|
- us428ctls->p4outSent = send;
|
|
+ usb_fill_bulk_urb(usx2y->as04.urb[j], usx2y->dev,
|
|
+ usb_sndbulkpipe(usx2y->dev, 0x04), &p4out->val.vol,
|
|
+ p4out->type == ELT_LIGHT ? sizeof(struct us428_lights) : 5,
|
|
+ i_usx2y_out04_int, usx2y);
|
|
+ err = usb_submit_urb(usx2y->as04.urb[j], GFP_ATOMIC);
|
|
+ us428ctls->p4out_sent = send;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (err)
|
|
- snd_printk(KERN_ERR "In04Int() usb_submit_urb err=%i\n", err);
|
|
+ snd_printk(KERN_ERR "in04_int() usb_submit_urb err=%i\n", err);
|
|
|
|
- urb->dev = usX2Y->dev;
|
|
+ urb->dev = usx2y->dev;
|
|
usb_submit_urb(urb, GFP_ATOMIC);
|
|
}
|
|
|
|
/*
|
|
* Prepare some urbs
|
|
*/
|
|
-int usX2Y_AsyncSeq04_init(struct usX2Ydev *usX2Y)
|
|
+int usx2y_async_seq04_init(struct usx2ydev *usx2y)
|
|
{
|
|
int err = 0,
|
|
i;
|
|
|
|
- usX2Y->AS04.buffer = kmalloc_array(URBS_AsyncSeq,
|
|
- URB_DataLen_AsyncSeq, GFP_KERNEL);
|
|
- if (NULL == usX2Y->AS04.buffer) {
|
|
+ usx2y->as04.buffer = kmalloc_array(URBS_ASYNC_SEQ,
|
|
+ URB_DATA_LEN_ASYNC_SEQ, GFP_KERNEL);
|
|
+ if (NULL == usx2y->as04.buffer) {
|
|
err = -ENOMEM;
|
|
} else
|
|
- for (i = 0; i < URBS_AsyncSeq; ++i) {
|
|
- if (NULL == (usX2Y->AS04.urb[i] = usb_alloc_urb(0, GFP_KERNEL))) {
|
|
+ for (i = 0; i < URBS_ASYNC_SEQ; ++i) {
|
|
+ if (NULL == (usx2y->as04.urb[i] = usb_alloc_urb(0, GFP_KERNEL))) {
|
|
err = -ENOMEM;
|
|
break;
|
|
}
|
|
- usb_fill_bulk_urb( usX2Y->AS04.urb[i], usX2Y->dev,
|
|
- usb_sndbulkpipe(usX2Y->dev, 0x04),
|
|
- usX2Y->AS04.buffer + URB_DataLen_AsyncSeq*i, 0,
|
|
- i_usX2Y_Out04Int, usX2Y
|
|
+ usb_fill_bulk_urb( usx2y->as04.urb[i], usx2y->dev,
|
|
+ usb_sndbulkpipe(usx2y->dev, 0x04),
|
|
+ usx2y->as04.buffer + URB_DATA_LEN_ASYNC_SEQ*i, 0,
|
|
+ i_usx2y_out04_int, usx2y
|
|
);
|
|
- err = usb_urb_ep_type_check(usX2Y->AS04.urb[i]);
|
|
+ err = usb_urb_ep_type_check(usx2y->as04.urb[i]);
|
|
if (err < 0)
|
|
break;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
-int usX2Y_In04_init(struct usX2Ydev *usX2Y)
|
|
+int usx2y_in04_init(struct usx2ydev *usx2y)
|
|
{
|
|
- if (! (usX2Y->In04urb = usb_alloc_urb(0, GFP_KERNEL)))
|
|
+ if (! (usx2y->in04_urb = usb_alloc_urb(0, GFP_KERNEL)))
|
|
return -ENOMEM;
|
|
|
|
- if (! (usX2Y->In04Buf = kmalloc(21, GFP_KERNEL)))
|
|
+ if (! (usx2y->in04_buf = kmalloc(21, GFP_KERNEL)))
|
|
return -ENOMEM;
|
|
|
|
- init_waitqueue_head(&usX2Y->In04WaitQueue);
|
|
- usb_fill_int_urb(usX2Y->In04urb, usX2Y->dev, usb_rcvintpipe(usX2Y->dev, 0x4),
|
|
- usX2Y->In04Buf, 21,
|
|
- i_usX2Y_In04Int, usX2Y,
|
|
+ init_waitqueue_head(&usx2y->in04_wait_queue);
|
|
+ usb_fill_int_urb(usx2y->in04_urb, usx2y->dev, usb_rcvintpipe(usx2y->dev, 0x4),
|
|
+ usx2y->in04_buf, 21,
|
|
+ i_usx2y_in04_int, usx2y,
|
|
10);
|
|
- if (usb_urb_ep_type_check(usX2Y->In04urb))
|
|
+ if (usb_urb_ep_type_check(usx2y->in04_urb))
|
|
return -EINVAL;
|
|
- return usb_submit_urb(usX2Y->In04urb, GFP_KERNEL);
|
|
+ return usb_submit_urb(usx2y->in04_urb, GFP_KERNEL);
|
|
}
|
|
|
|
-static void usX2Y_unlinkSeq(struct snd_usX2Y_AsyncSeq *S)
|
|
+static void usx2y_unlinkseq(struct snd_usx2y_async_seq *s)
|
|
{
|
|
int i;
|
|
- for (i = 0; i < URBS_AsyncSeq; ++i) {
|
|
- usb_kill_urb(S->urb[i]);
|
|
- usb_free_urb(S->urb[i]);
|
|
- S->urb[i] = NULL;
|
|
+ for (i = 0; i < URBS_ASYNC_SEQ; ++i) {
|
|
+ usb_kill_urb(s->urb[i]);
|
|
+ usb_free_urb(s->urb[i]);
|
|
+ s->urb[i] = NULL;
|
|
}
|
|
- kfree(S->buffer);
|
|
+ kfree(s->buffer);
|
|
}
|
|
|
|
|
|
-static const struct usb_device_id snd_usX2Y_usb_id_table[] = {
|
|
+static const struct usb_device_id snd_usx2y_usb_id_table[] = {
|
|
{
|
|
.match_flags = USB_DEVICE_ID_MATCH_DEVICE,
|
|
.idVendor = 0x1604,
|
|
@@ -323,7 +323,7 @@ static const struct usb_device_id snd_usX2Y_usb_id_table[] = {
|
|
{ /* terminator */ }
|
|
};
|
|
|
|
-static int usX2Y_create_card(struct usb_device *device,
|
|
+static int usx2y_create_card(struct usb_device *device,
|
|
struct usb_interface *intf,
|
|
struct snd_card **cardp)
|
|
{
|
|
@@ -332,20 +332,20 @@ static int usX2Y_create_card(struct usb_device *device,
|
|
int err;
|
|
|
|
for (dev = 0; dev < SNDRV_CARDS; ++dev)
|
|
- if (enable[dev] && !snd_usX2Y_card_used[dev])
|
|
+ if (enable[dev] && !snd_usx2y_card_used[dev])
|
|
break;
|
|
if (dev >= SNDRV_CARDS)
|
|
return -ENODEV;
|
|
err = snd_card_new(&intf->dev, index[dev], id[dev], THIS_MODULE,
|
|
- sizeof(struct usX2Ydev), &card);
|
|
+ sizeof(struct usx2ydev), &card);
|
|
if (err < 0)
|
|
return err;
|
|
- snd_usX2Y_card_used[usX2Y(card)->card_index = dev] = 1;
|
|
- card->private_free = snd_usX2Y_card_private_free;
|
|
- usX2Y(card)->dev = device;
|
|
- init_waitqueue_head(&usX2Y(card)->prepare_wait_queue);
|
|
- mutex_init(&usX2Y(card)->pcm_mutex);
|
|
- INIT_LIST_HEAD(&usX2Y(card)->midi_list);
|
|
+ snd_usx2y_card_used[usx2y(card)->card_index = dev] = 1;
|
|
+ card->private_free = snd_usx2y_card_private_free;
|
|
+ usx2y(card)->dev = device;
|
|
+ init_waitqueue_head(&usx2y(card)->prepare_wait_queue);
|
|
+ mutex_init(&usx2y(card)->pcm_mutex);
|
|
+ INIT_LIST_HEAD(&usx2y(card)->midi_list);
|
|
strcpy(card->driver, "USB "NAME_ALLCAPS"");
|
|
sprintf(card->shortname, "TASCAM "NAME_ALLCAPS"");
|
|
sprintf(card->longname, "%s (%x:%x if %d at %03d/%03d)",
|
|
@@ -353,14 +353,14 @@ static int usX2Y_create_card(struct usb_device *device,
|
|
le16_to_cpu(device->descriptor.idVendor),
|
|
le16_to_cpu(device->descriptor.idProduct),
|
|
0,//us428(card)->usbmidi.ifnum,
|
|
- usX2Y(card)->dev->bus->busnum, usX2Y(card)->dev->devnum
|
|
+ usx2y(card)->dev->bus->busnum, usx2y(card)->dev->devnum
|
|
);
|
|
*cardp = card;
|
|
return 0;
|
|
}
|
|
|
|
|
|
-static int usX2Y_usb_probe(struct usb_device *device,
|
|
+static int usx2y_usb_probe(struct usb_device *device,
|
|
struct usb_interface *intf,
|
|
const struct usb_device_id *device_id,
|
|
struct snd_card **cardp)
|
|
@@ -375,10 +375,10 @@ static int usX2Y_usb_probe(struct usb_device *device,
|
|
le16_to_cpu(device->descriptor.idProduct) != USB_ID_US428))
|
|
return -EINVAL;
|
|
|
|
- err = usX2Y_create_card(device, intf, &card);
|
|
+ err = usx2y_create_card(device, intf, &card);
|
|
if (err < 0)
|
|
return err;
|
|
- if ((err = usX2Y_hwdep_new(card, device)) < 0 ||
|
|
+ if ((err = usx2y_hwdep_new(card, device)) < 0 ||
|
|
(err = snd_card_register(card)) < 0) {
|
|
snd_card_free(card);
|
|
return err;
|
|
@@ -390,64 +390,64 @@ static int usX2Y_usb_probe(struct usb_device *device,
|
|
/*
|
|
* new 2.5 USB kernel API
|
|
*/
|
|
-static int snd_usX2Y_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
|
+static int snd_usx2y_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
|
{
|
|
struct snd_card *card;
|
|
int err;
|
|
|
|
- err = usX2Y_usb_probe(interface_to_usbdev(intf), intf, id, &card);
|
|
+ err = usx2y_usb_probe(interface_to_usbdev(intf), intf, id, &card);
|
|
if (err < 0)
|
|
return err;
|
|
dev_set_drvdata(&intf->dev, card);
|
|
return 0;
|
|
}
|
|
|
|
-static void snd_usX2Y_disconnect(struct usb_interface *intf)
|
|
+static void snd_usx2y_disconnect(struct usb_interface *intf)
|
|
{
|
|
- usX2Y_usb_disconnect(interface_to_usbdev(intf),
|
|
+ usx2y_usb_disconnect(interface_to_usbdev(intf),
|
|
usb_get_intfdata(intf));
|
|
}
|
|
|
|
-MODULE_DEVICE_TABLE(usb, snd_usX2Y_usb_id_table);
|
|
-static struct usb_driver snd_usX2Y_usb_driver = {
|
|
+MODULE_DEVICE_TABLE(usb, snd_usx2y_usb_id_table);
|
|
+static struct usb_driver snd_usx2y_usb_driver = {
|
|
.name = "snd-usb-usx2y",
|
|
- .probe = snd_usX2Y_probe,
|
|
- .disconnect = snd_usX2Y_disconnect,
|
|
- .id_table = snd_usX2Y_usb_id_table,
|
|
+ .probe = snd_usx2y_probe,
|
|
+ .disconnect = snd_usx2y_disconnect,
|
|
+ .id_table = snd_usx2y_usb_id_table,
|
|
};
|
|
|
|
-static void snd_usX2Y_card_private_free(struct snd_card *card)
|
|
+static void snd_usx2y_card_private_free(struct snd_card *card)
|
|
{
|
|
- kfree(usX2Y(card)->In04Buf);
|
|
- usb_free_urb(usX2Y(card)->In04urb);
|
|
- if (usX2Y(card)->us428ctls_sharedmem)
|
|
- free_pages_exact(usX2Y(card)->us428ctls_sharedmem,
|
|
- sizeof(*usX2Y(card)->us428ctls_sharedmem));
|
|
- if (usX2Y(card)->card_index >= 0 && usX2Y(card)->card_index < SNDRV_CARDS)
|
|
- snd_usX2Y_card_used[usX2Y(card)->card_index] = 0;
|
|
+ kfree(usx2y(card)->in04_buf);
|
|
+ usb_free_urb(usx2y(card)->in04_urb);
|
|
+ if (usx2y(card)->us428ctls_sharedmem)
|
|
+ free_pages_exact(usx2y(card)->us428ctls_sharedmem,
|
|
+ sizeof(*usx2y(card)->us428ctls_sharedmem));
|
|
+ if (usx2y(card)->card_index >= 0 && usx2y(card)->card_index < SNDRV_CARDS)
|
|
+ snd_usx2y_card_used[usx2y(card)->card_index] = 0;
|
|
}
|
|
|
|
/*
|
|
* Frees the device.
|
|
*/
|
|
-static void usX2Y_usb_disconnect(struct usb_device *device, void* ptr)
|
|
+static void usx2y_usb_disconnect(struct usb_device *device, void* ptr)
|
|
{
|
|
if (ptr) {
|
|
struct snd_card *card = ptr;
|
|
- struct usX2Ydev *usX2Y = usX2Y(card);
|
|
+ struct usx2ydev *usx2y = usx2y(card);
|
|
struct list_head *p;
|
|
- usX2Y->chip_status = USX2Y_STAT_CHIP_HUP;
|
|
- usX2Y_unlinkSeq(&usX2Y->AS04);
|
|
- usb_kill_urb(usX2Y->In04urb);
|
|
+ usx2y->chip_status = USX2Y_STAT_CHIP_HUP;
|
|
+ usx2y_unlinkseq(&usx2y->as04);
|
|
+ usb_kill_urb(usx2y->in04_urb);
|
|
snd_card_disconnect(card);
|
|
/* release the midi resources */
|
|
- list_for_each(p, &usX2Y->midi_list) {
|
|
+ list_for_each(p, &usx2y->midi_list) {
|
|
snd_usbmidi_disconnect(p);
|
|
}
|
|
- if (usX2Y->us428ctls_sharedmem)
|
|
- wake_up(&usX2Y->us428ctls_wait_queue_head);
|
|
+ if (usx2y->us428ctls_sharedmem)
|
|
+ wake_up(&usx2y->us428ctls_wait_queue_head);
|
|
snd_card_free(card);
|
|
}
|
|
}
|
|
|
|
-module_usb_driver(snd_usX2Y_usb_driver);
|
|
+module_usb_driver(snd_usx2y_usb_driver);
|
|
diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h
|
|
index 144b85f57bd2a..c330af628bccd 100644
|
|
--- a/sound/usb/usx2y/usbusx2y.h
|
|
+++ b/sound/usb/usx2y/usbusx2y.h
|
|
@@ -8,14 +8,14 @@
|
|
#define NRURBS 2
|
|
|
|
|
|
-#define URBS_AsyncSeq 10
|
|
-#define URB_DataLen_AsyncSeq 32
|
|
-struct snd_usX2Y_AsyncSeq {
|
|
- struct urb *urb[URBS_AsyncSeq];
|
|
+#define URBS_ASYNC_SEQ 10
|
|
+#define URB_DATA_LEN_ASYNC_SEQ 32
|
|
+struct snd_usx2y_async_seq {
|
|
+ struct urb *urb[URBS_ASYNC_SEQ];
|
|
char *buffer;
|
|
};
|
|
|
|
-struct snd_usX2Y_urbSeq {
|
|
+struct snd_usx2y_urb_seq {
|
|
int submitted;
|
|
int len;
|
|
struct urb *urb[];
|
|
@@ -23,17 +23,17 @@ struct snd_usX2Y_urbSeq {
|
|
|
|
#include "usx2yhwdeppcm.h"
|
|
|
|
-struct usX2Ydev {
|
|
+struct usx2ydev {
|
|
struct usb_device *dev;
|
|
int card_index;
|
|
int stride;
|
|
- struct urb *In04urb;
|
|
- void *In04Buf;
|
|
- char In04Last[24];
|
|
- unsigned In04IntCalls;
|
|
- struct snd_usX2Y_urbSeq *US04;
|
|
- wait_queue_head_t In04WaitQueue;
|
|
- struct snd_usX2Y_AsyncSeq AS04;
|
|
+ struct urb *in04_urb;
|
|
+ void *in04_buf;
|
|
+ char in04_last[24];
|
|
+ unsigned in04_int_calls;
|
|
+ struct snd_usx2y_urb_seq *us04;
|
|
+ wait_queue_head_t in04_wait_queue;
|
|
+ struct snd_usx2y_async_seq as04;
|
|
unsigned int rate,
|
|
format;
|
|
int chip_status;
|
|
@@ -41,9 +41,9 @@ struct usX2Ydev {
|
|
struct us428ctls_sharedmem *us428ctls_sharedmem;
|
|
int wait_iso_frame;
|
|
wait_queue_head_t us428ctls_wait_queue_head;
|
|
- struct snd_usX2Y_hwdep_pcm_shm *hwdep_pcm_shm;
|
|
- struct snd_usX2Y_substream *subs[4];
|
|
- struct snd_usX2Y_substream * volatile prepare_subs;
|
|
+ struct snd_usx2y_hwdep_pcm_shm *hwdep_pcm_shm;
|
|
+ struct snd_usx2y_substream *subs[4];
|
|
+ struct snd_usx2y_substream * volatile prepare_subs;
|
|
wait_queue_head_t prepare_wait_queue;
|
|
struct list_head midi_list;
|
|
struct list_head pcm_list;
|
|
@@ -51,21 +51,21 @@ struct usX2Ydev {
|
|
};
|
|
|
|
|
|
-struct snd_usX2Y_substream {
|
|
- struct usX2Ydev *usX2Y;
|
|
+struct snd_usx2y_substream {
|
|
+ struct usx2ydev *usx2y;
|
|
struct snd_pcm_substream *pcm_substream;
|
|
|
|
int endpoint;
|
|
unsigned int maxpacksize; /* max packet size in bytes */
|
|
|
|
atomic_t state;
|
|
-#define state_STOPPED 0
|
|
-#define state_STARTING1 1
|
|
-#define state_STARTING2 2
|
|
-#define state_STARTING3 3
|
|
-#define state_PREPARED 4
|
|
-#define state_PRERUNNING 6
|
|
-#define state_RUNNING 8
|
|
+#define STATE_STOPPED 0
|
|
+#define STATE_STARTING1 1
|
|
+#define STATE_STARTING2 2
|
|
+#define STATE_STARTING3 3
|
|
+#define STATE_PREPARED 4
|
|
+#define STATE_PRERUNNING 6
|
|
+#define STATE_RUNNING 8
|
|
|
|
int hwptr; /* free frame position in the buffer (only for playback) */
|
|
int hwptr_done; /* processed frame position in the buffer */
|
|
@@ -77,12 +77,12 @@ struct snd_usX2Y_substream {
|
|
};
|
|
|
|
|
|
-#define usX2Y(c) ((struct usX2Ydev *)(c)->private_data)
|
|
+#define usx2y(c) ((struct usx2ydev *)(c)->private_data)
|
|
|
|
-int usX2Y_audio_create(struct snd_card *card);
|
|
+int usx2y_audio_create(struct snd_card *card);
|
|
|
|
-int usX2Y_AsyncSeq04_init(struct usX2Ydev *usX2Y);
|
|
-int usX2Y_In04_init(struct usX2Ydev *usX2Y);
|
|
+int usx2y_async_seq04_init(struct usx2ydev *usx2y);
|
|
+int usx2y_in04_init(struct usx2ydev *usx2y);
|
|
|
|
#define NAME_ALLCAPS "US-X2Y"
|
|
|
|
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
|
|
index ecaf41265dcd0..8033bb7255d5c 100644
|
|
--- a/sound/usb/usx2y/usbusx2yaudio.c
|
|
+++ b/sound/usb/usx2y/usbusx2yaudio.c
|
|
@@ -54,13 +54,13 @@
|
|
#endif
|
|
|
|
|
|
-static int usX2Y_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_urb_capt_retire(struct snd_usx2y_substream *subs)
|
|
{
|
|
struct urb *urb = subs->completed_urb;
|
|
struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
|
|
unsigned char *cp;
|
|
int i, len, lens = 0, hwptr_done = subs->hwptr_done;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
|
|
for (i = 0; i < nr_of_packs(); i++) {
|
|
cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
|
|
@@ -70,7 +70,7 @@ static int usX2Y_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
urb->iso_frame_desc[i].status);
|
|
return urb->iso_frame_desc[i].status;
|
|
}
|
|
- len = urb->iso_frame_desc[i].actual_length / usX2Y->stride;
|
|
+ len = urb->iso_frame_desc[i].actual_length / usx2y->stride;
|
|
if (! len) {
|
|
snd_printd("0 == len ERROR!\n");
|
|
continue;
|
|
@@ -79,12 +79,12 @@ static int usX2Y_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
/* copy a data chunk */
|
|
if ((hwptr_done + len) > runtime->buffer_size) {
|
|
int cnt = runtime->buffer_size - hwptr_done;
|
|
- int blen = cnt * usX2Y->stride;
|
|
- memcpy(runtime->dma_area + hwptr_done * usX2Y->stride, cp, blen);
|
|
- memcpy(runtime->dma_area, cp + blen, len * usX2Y->stride - blen);
|
|
+ int blen = cnt * usx2y->stride;
|
|
+ memcpy(runtime->dma_area + hwptr_done * usx2y->stride, cp, blen);
|
|
+ memcpy(runtime->dma_area, cp + blen, len * usx2y->stride - blen);
|
|
} else {
|
|
- memcpy(runtime->dma_area + hwptr_done * usX2Y->stride, cp,
|
|
- len * usX2Y->stride);
|
|
+ memcpy(runtime->dma_area + hwptr_done * usx2y->stride, cp,
|
|
+ len * usx2y->stride);
|
|
}
|
|
lens += len;
|
|
if ((hwptr_done += len) >= runtime->buffer_size)
|
|
@@ -110,18 +110,18 @@ static int usX2Y_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
* it directly from the buffer. thus the data is once copied to
|
|
* a temporary buffer and urb points to that.
|
|
*/
|
|
-static int usX2Y_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
+static int usx2y_urb_play_prepare(struct snd_usx2y_substream *subs,
|
|
struct urb *cap_urb,
|
|
struct urb *urb)
|
|
{
|
|
int count, counts, pack;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
|
|
|
|
count = 0;
|
|
for (pack = 0; pack < nr_of_packs(); pack++) {
|
|
/* calculate the size of a packet */
|
|
- counts = cap_urb->iso_frame_desc[pack].actual_length / usX2Y->stride;
|
|
+ counts = cap_urb->iso_frame_desc[pack].actual_length / usx2y->stride;
|
|
count += counts;
|
|
if (counts < 43 || counts > 50) {
|
|
snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
|
|
@@ -134,7 +134,7 @@ static int usX2Y_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
0;
|
|
urb->iso_frame_desc[pack].length = cap_urb->iso_frame_desc[pack].actual_length;
|
|
}
|
|
- if (atomic_read(&subs->state) >= state_PRERUNNING)
|
|
+ if (atomic_read(&subs->state) >= STATE_PRERUNNING)
|
|
if (subs->hwptr + count > runtime->buffer_size) {
|
|
/* err, the transferred area goes over buffer boundary.
|
|
* copy the data to the temp buffer.
|
|
@@ -143,20 +143,20 @@ static int usX2Y_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
len = runtime->buffer_size - subs->hwptr;
|
|
urb->transfer_buffer = subs->tmpbuf;
|
|
memcpy(subs->tmpbuf, runtime->dma_area +
|
|
- subs->hwptr * usX2Y->stride, len * usX2Y->stride);
|
|
- memcpy(subs->tmpbuf + len * usX2Y->stride,
|
|
- runtime->dma_area, (count - len) * usX2Y->stride);
|
|
+ subs->hwptr * usx2y->stride, len * usx2y->stride);
|
|
+ memcpy(subs->tmpbuf + len * usx2y->stride,
|
|
+ runtime->dma_area, (count - len) * usx2y->stride);
|
|
subs->hwptr += count;
|
|
subs->hwptr -= runtime->buffer_size;
|
|
} else {
|
|
/* set the buffer pointer */
|
|
- urb->transfer_buffer = runtime->dma_area + subs->hwptr * usX2Y->stride;
|
|
+ urb->transfer_buffer = runtime->dma_area + subs->hwptr * usx2y->stride;
|
|
if ((subs->hwptr += count) >= runtime->buffer_size)
|
|
subs->hwptr -= runtime->buffer_size;
|
|
}
|
|
else
|
|
urb->transfer_buffer = subs->tmpbuf;
|
|
- urb->transfer_buffer_length = count * usX2Y->stride;
|
|
+ urb->transfer_buffer_length = count * usx2y->stride;
|
|
return 0;
|
|
}
|
|
|
|
@@ -165,10 +165,10 @@ static int usX2Y_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
*
|
|
* update the current position and call callback if a period is processed.
|
|
*/
|
|
-static void usX2Y_urb_play_retire(struct snd_usX2Y_substream *subs, struct urb *urb)
|
|
+static void usx2y_urb_play_retire(struct snd_usx2y_substream *subs, struct urb *urb)
|
|
{
|
|
struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
|
|
- int len = urb->actual_length / subs->usX2Y->stride;
|
|
+ int len = urb->actual_length / subs->usx2y->stride;
|
|
|
|
subs->transfer_done += len;
|
|
subs->hwptr_done += len;
|
|
@@ -180,14 +180,14 @@ static void usX2Y_urb_play_retire(struct snd_usX2Y_substream *subs, struct urb *
|
|
}
|
|
}
|
|
|
|
-static int usX2Y_urb_submit(struct snd_usX2Y_substream *subs, struct urb *urb, int frame)
|
|
+static int usx2y_urb_submit(struct snd_usx2y_substream *subs, struct urb *urb, int frame)
|
|
{
|
|
int err;
|
|
if (!urb)
|
|
return -ENODEV;
|
|
urb->start_frame = (frame + NRURBS * nr_of_packs()); // let hcd do rollover sanity checks
|
|
urb->hcpriv = NULL;
|
|
- urb->dev = subs->usX2Y->dev; /* we need to set this at each time */
|
|
+ urb->dev = subs->usx2y->dev; /* we need to set this at each time */
|
|
if ((err = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
|
|
snd_printk(KERN_ERR "usb_submit_urb() returned %i\n", err);
|
|
return err;
|
|
@@ -195,8 +195,8 @@ static int usX2Y_urb_submit(struct snd_usX2Y_substream *subs, struct urb *urb, i
|
|
return 0;
|
|
}
|
|
|
|
-static inline int usX2Y_usbframe_complete(struct snd_usX2Y_substream *capsubs,
|
|
- struct snd_usX2Y_substream *playbacksubs,
|
|
+static inline int usx2y_usbframe_complete(struct snd_usx2y_substream *capsubs,
|
|
+ struct snd_usx2y_substream *playbacksubs,
|
|
int frame)
|
|
{
|
|
int err, state;
|
|
@@ -204,25 +204,25 @@ static inline int usX2Y_usbframe_complete(struct snd_usX2Y_substream *capsubs,
|
|
|
|
state = atomic_read(&playbacksubs->state);
|
|
if (NULL != urb) {
|
|
- if (state == state_RUNNING)
|
|
- usX2Y_urb_play_retire(playbacksubs, urb);
|
|
- else if (state >= state_PRERUNNING)
|
|
+ if (state == STATE_RUNNING)
|
|
+ usx2y_urb_play_retire(playbacksubs, urb);
|
|
+ else if (state >= STATE_PRERUNNING)
|
|
atomic_inc(&playbacksubs->state);
|
|
} else {
|
|
switch (state) {
|
|
- case state_STARTING1:
|
|
+ case STATE_STARTING1:
|
|
urb = playbacksubs->urb[0];
|
|
atomic_inc(&playbacksubs->state);
|
|
break;
|
|
- case state_STARTING2:
|
|
+ case STATE_STARTING2:
|
|
urb = playbacksubs->urb[1];
|
|
atomic_inc(&playbacksubs->state);
|
|
break;
|
|
}
|
|
}
|
|
if (urb) {
|
|
- if ((err = usX2Y_urb_play_prepare(playbacksubs, capsubs->completed_urb, urb)) ||
|
|
- (err = usX2Y_urb_submit(playbacksubs, urb, frame))) {
|
|
+ if ((err = usx2y_urb_play_prepare(playbacksubs, capsubs->completed_urb, urb)) ||
|
|
+ (err = usx2y_urb_submit(playbacksubs, urb, frame))) {
|
|
return err;
|
|
}
|
|
}
|
|
@@ -230,13 +230,13 @@ static inline int usX2Y_usbframe_complete(struct snd_usX2Y_substream *capsubs,
|
|
playbacksubs->completed_urb = NULL;
|
|
|
|
state = atomic_read(&capsubs->state);
|
|
- if (state >= state_PREPARED) {
|
|
- if (state == state_RUNNING) {
|
|
- if ((err = usX2Y_urb_capt_retire(capsubs)))
|
|
+ if (state >= STATE_PREPARED) {
|
|
+ if (state == STATE_RUNNING) {
|
|
+ if ((err = usx2y_urb_capt_retire(capsubs)))
|
|
return err;
|
|
- } else if (state >= state_PRERUNNING)
|
|
+ } else if (state >= STATE_PRERUNNING)
|
|
atomic_inc(&capsubs->state);
|
|
- if ((err = usX2Y_urb_submit(capsubs, capsubs->completed_urb, frame)))
|
|
+ if ((err = usx2y_urb_submit(capsubs, capsubs->completed_urb, frame)))
|
|
return err;
|
|
}
|
|
capsubs->completed_urb = NULL;
|
|
@@ -244,21 +244,21 @@ static inline int usX2Y_usbframe_complete(struct snd_usX2Y_substream *capsubs,
|
|
}
|
|
|
|
|
|
-static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)
|
|
+static void usx2y_clients_stop(struct usx2ydev *usx2y)
|
|
{
|
|
int s, u;
|
|
|
|
for (s = 0; s < 4; s++) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[s];
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[s];
|
|
if (subs) {
|
|
snd_printdd("%i %p state=%i\n", s, subs, atomic_read(&subs->state));
|
|
- atomic_set(&subs->state, state_STOPPED);
|
|
+ atomic_set(&subs->state, STATE_STOPPED);
|
|
}
|
|
}
|
|
for (s = 0; s < 4; s++) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[s];
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[s];
|
|
if (subs) {
|
|
- if (atomic_read(&subs->state) >= state_PRERUNNING)
|
|
+ if (atomic_read(&subs->state) >= STATE_PRERUNNING)
|
|
snd_pcm_stop_xrun(subs->pcm_substream);
|
|
for (u = 0; u < NRURBS; u++) {
|
|
struct urb *urb = subs->urb[u];
|
|
@@ -268,60 +268,60 @@ static void usX2Y_clients_stop(struct usX2Ydev *usX2Y)
|
|
}
|
|
}
|
|
}
|
|
- usX2Y->prepare_subs = NULL;
|
|
- wake_up(&usX2Y->prepare_wait_queue);
|
|
+ usx2y->prepare_subs = NULL;
|
|
+ wake_up(&usx2y->prepare_wait_queue);
|
|
}
|
|
|
|
-static void usX2Y_error_urb_status(struct usX2Ydev *usX2Y,
|
|
- struct snd_usX2Y_substream *subs, struct urb *urb)
|
|
+static void usx2y_error_urb_status(struct usx2ydev *usx2y,
|
|
+ struct snd_usx2y_substream *subs, struct urb *urb)
|
|
{
|
|
snd_printk(KERN_ERR "ep=%i stalled with status=%i\n", subs->endpoint, urb->status);
|
|
urb->status = 0;
|
|
- usX2Y_clients_stop(usX2Y);
|
|
+ usx2y_clients_stop(usx2y);
|
|
}
|
|
|
|
-static void i_usX2Y_urb_complete(struct urb *urb)
|
|
+static void i_usx2y_urb_complete(struct urb *urb)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = urb->context;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
+ struct snd_usx2y_substream *subs = urb->context;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
|
|
- if (unlikely(atomic_read(&subs->state) < state_PREPARED)) {
|
|
+ if (unlikely(atomic_read(&subs->state) < STATE_PREPARED)) {
|
|
snd_printdd("hcd_frame=%i ep=%i%s status=%i start_frame=%i\n",
|
|
- usb_get_current_frame_number(usX2Y->dev),
|
|
+ usb_get_current_frame_number(usx2y->dev),
|
|
subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out",
|
|
urb->status, urb->start_frame);
|
|
return;
|
|
}
|
|
if (unlikely(urb->status)) {
|
|
- usX2Y_error_urb_status(usX2Y, subs, urb);
|
|
+ usx2y_error_urb_status(usx2y, subs, urb);
|
|
return;
|
|
}
|
|
|
|
subs->completed_urb = urb;
|
|
|
|
{
|
|
- struct snd_usX2Y_substream *capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE],
|
|
- *playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ struct snd_usx2y_substream *capsubs = usx2y->subs[SNDRV_PCM_STREAM_CAPTURE],
|
|
+ *playbacksubs = usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
if (capsubs->completed_urb &&
|
|
- atomic_read(&capsubs->state) >= state_PREPARED &&
|
|
+ atomic_read(&capsubs->state) >= STATE_PREPARED &&
|
|
(playbacksubs->completed_urb ||
|
|
- atomic_read(&playbacksubs->state) < state_PREPARED)) {
|
|
- if (!usX2Y_usbframe_complete(capsubs, playbacksubs, urb->start_frame))
|
|
- usX2Y->wait_iso_frame += nr_of_packs();
|
|
+ atomic_read(&playbacksubs->state) < STATE_PREPARED)) {
|
|
+ if (!usx2y_usbframe_complete(capsubs, playbacksubs, urb->start_frame))
|
|
+ usx2y->wait_iso_frame += nr_of_packs();
|
|
else {
|
|
snd_printdd("\n");
|
|
- usX2Y_clients_stop(usX2Y);
|
|
+ usx2y_clients_stop(usx2y);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
-static void usX2Y_urbs_set_complete(struct usX2Ydev * usX2Y,
|
|
+static void usx2y_urbs_set_complete(struct usx2ydev * usx2y,
|
|
void (*complete)(struct urb *))
|
|
{
|
|
int s, u;
|
|
for (s = 0; s < 4; s++) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[s];
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[s];
|
|
if (NULL != subs)
|
|
for (u = 0; u < NRURBS; u++) {
|
|
struct urb * urb = subs->urb[u];
|
|
@@ -331,30 +331,30 @@ static void usX2Y_urbs_set_complete(struct usX2Ydev * usX2Y,
|
|
}
|
|
}
|
|
|
|
-static void usX2Y_subs_startup_finish(struct usX2Ydev * usX2Y)
|
|
+static void usx2y_subs_startup_finish(struct usx2ydev * usx2y)
|
|
{
|
|
- usX2Y_urbs_set_complete(usX2Y, i_usX2Y_urb_complete);
|
|
- usX2Y->prepare_subs = NULL;
|
|
+ usx2y_urbs_set_complete(usx2y, i_usx2y_urb_complete);
|
|
+ usx2y->prepare_subs = NULL;
|
|
}
|
|
|
|
-static void i_usX2Y_subs_startup(struct urb *urb)
|
|
+static void i_usx2y_subs_startup(struct urb *urb)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = urb->context;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_substream *prepare_subs = usX2Y->prepare_subs;
|
|
+ struct snd_usx2y_substream *subs = urb->context;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_substream *prepare_subs = usx2y->prepare_subs;
|
|
if (NULL != prepare_subs)
|
|
if (urb->start_frame == prepare_subs->urb[0]->start_frame) {
|
|
- usX2Y_subs_startup_finish(usX2Y);
|
|
+ usx2y_subs_startup_finish(usx2y);
|
|
atomic_inc(&prepare_subs->state);
|
|
- wake_up(&usX2Y->prepare_wait_queue);
|
|
+ wake_up(&usx2y->prepare_wait_queue);
|
|
}
|
|
|
|
- i_usX2Y_urb_complete(urb);
|
|
+ i_usx2y_urb_complete(urb);
|
|
}
|
|
|
|
-static void usX2Y_subs_prepare(struct snd_usX2Y_substream *subs)
|
|
+static void usx2y_subs_prepare(struct snd_usx2y_substream *subs)
|
|
{
|
|
- snd_printdd("usX2Y_substream_prepare(%p) ep=%i urb0=%p urb1=%p\n",
|
|
+ snd_printdd("usx2y_substream_prepare(%p) ep=%i urb0=%p urb1=%p\n",
|
|
subs, subs->endpoint, subs->urb[0], subs->urb[1]);
|
|
/* reset the pointer */
|
|
subs->hwptr = 0;
|
|
@@ -363,7 +363,7 @@ static void usX2Y_subs_prepare(struct snd_usX2Y_substream *subs)
|
|
}
|
|
|
|
|
|
-static void usX2Y_urb_release(struct urb **urb, int free_tb)
|
|
+static void usx2y_urb_release(struct urb **urb, int free_tb)
|
|
{
|
|
if (*urb) {
|
|
usb_kill_urb(*urb);
|
|
@@ -376,13 +376,13 @@ static void usX2Y_urb_release(struct urb **urb, int free_tb)
|
|
/*
|
|
* release a substreams urbs
|
|
*/
|
|
-static void usX2Y_urbs_release(struct snd_usX2Y_substream *subs)
|
|
+static void usx2y_urbs_release(struct snd_usx2y_substream *subs)
|
|
{
|
|
int i;
|
|
- snd_printdd("usX2Y_urbs_release() %i\n", subs->endpoint);
|
|
+ snd_printdd("usx2y_urbs_release() %i\n", subs->endpoint);
|
|
for (i = 0; i < NRURBS; i++)
|
|
- usX2Y_urb_release(subs->urb + i,
|
|
- subs != subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK]);
|
|
+ usx2y_urb_release(subs->urb + i,
|
|
+ subs != subs->usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK]);
|
|
|
|
kfree(subs->tmpbuf);
|
|
subs->tmpbuf = NULL;
|
|
@@ -390,12 +390,12 @@ static void usX2Y_urbs_release(struct snd_usX2Y_substream *subs)
|
|
/*
|
|
* initialize a substream's urbs
|
|
*/
|
|
-static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_urbs_allocate(struct snd_usx2y_substream *subs)
|
|
{
|
|
int i;
|
|
unsigned int pipe;
|
|
- int is_playback = subs == subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
- struct usb_device *dev = subs->usX2Y->dev;
|
|
+ int is_playback = subs == subs->usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ struct usb_device *dev = subs->usx2y->dev;
|
|
|
|
pipe = is_playback ? usb_sndisocpipe(dev, subs->endpoint) :
|
|
usb_rcvisocpipe(dev, subs->endpoint);
|
|
@@ -417,7 +417,7 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
}
|
|
*purb = usb_alloc_urb(nr_of_packs(), GFP_KERNEL);
|
|
if (NULL == *purb) {
|
|
- usX2Y_urbs_release(subs);
|
|
+ usx2y_urbs_release(subs);
|
|
return -ENOMEM;
|
|
}
|
|
if (!is_playback && !(*purb)->transfer_buffer) {
|
|
@@ -426,7 +426,7 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
kmalloc_array(subs->maxpacksize,
|
|
nr_of_packs(), GFP_KERNEL);
|
|
if (NULL == (*purb)->transfer_buffer) {
|
|
- usX2Y_urbs_release(subs);
|
|
+ usx2y_urbs_release(subs);
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
@@ -435,43 +435,43 @@ static int usX2Y_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
(*purb)->number_of_packets = nr_of_packs();
|
|
(*purb)->context = subs;
|
|
(*purb)->interval = 1;
|
|
- (*purb)->complete = i_usX2Y_subs_startup;
|
|
+ (*purb)->complete = i_usx2y_subs_startup;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
-static void usX2Y_subs_startup(struct snd_usX2Y_substream *subs)
|
|
+static void usx2y_subs_startup(struct snd_usx2y_substream *subs)
|
|
{
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- usX2Y->prepare_subs = subs;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ usx2y->prepare_subs = subs;
|
|
subs->urb[0]->start_frame = -1;
|
|
wmb();
|
|
- usX2Y_urbs_set_complete(usX2Y, i_usX2Y_subs_startup);
|
|
+ usx2y_urbs_set_complete(usx2y, i_usx2y_subs_startup);
|
|
}
|
|
|
|
-static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_urbs_start(struct snd_usx2y_substream *subs)
|
|
{
|
|
int i, err;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
|
|
- if ((err = usX2Y_urbs_allocate(subs)) < 0)
|
|
+ if ((err = usx2y_urbs_allocate(subs)) < 0)
|
|
return err;
|
|
subs->completed_urb = NULL;
|
|
for (i = 0; i < 4; i++) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[i];
|
|
- if (subs != NULL && atomic_read(&subs->state) >= state_PREPARED)
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[i];
|
|
+ if (subs != NULL && atomic_read(&subs->state) >= STATE_PREPARED)
|
|
goto start;
|
|
}
|
|
|
|
start:
|
|
- usX2Y_subs_startup(subs);
|
|
+ usx2y_subs_startup(subs);
|
|
for (i = 0; i < NRURBS; i++) {
|
|
struct urb *urb = subs->urb[i];
|
|
if (usb_pipein(urb->pipe)) {
|
|
unsigned long pack;
|
|
if (0 == i)
|
|
- atomic_set(&subs->state, state_STARTING3);
|
|
- urb->dev = usX2Y->dev;
|
|
+ atomic_set(&subs->state, STATE_STARTING3);
|
|
+ urb->dev = usx2y->dev;
|
|
for (pack = 0; pack < nr_of_packs(); pack++) {
|
|
urb->iso_frame_desc[pack].offset = subs->maxpacksize * pack;
|
|
urb->iso_frame_desc[pack].length = subs->maxpacksize;
|
|
@@ -483,22 +483,22 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs)
|
|
goto cleanup;
|
|
} else
|
|
if (i == 0)
|
|
- usX2Y->wait_iso_frame = urb->start_frame;
|
|
+ usx2y->wait_iso_frame = urb->start_frame;
|
|
urb->transfer_flags = 0;
|
|
} else {
|
|
- atomic_set(&subs->state, state_STARTING1);
|
|
+ atomic_set(&subs->state, STATE_STARTING1);
|
|
break;
|
|
}
|
|
}
|
|
err = 0;
|
|
- wait_event(usX2Y->prepare_wait_queue, NULL == usX2Y->prepare_subs);
|
|
- if (atomic_read(&subs->state) != state_PREPARED)
|
|
+ wait_event(usx2y->prepare_wait_queue, NULL == usx2y->prepare_subs);
|
|
+ if (atomic_read(&subs->state) != STATE_PREPARED)
|
|
err = -EPIPE;
|
|
|
|
cleanup:
|
|
if (err) {
|
|
- usX2Y_subs_startup_finish(usX2Y);
|
|
- usX2Y_clients_stop(usX2Y); // something is completely wroong > stop evrything
|
|
+ usx2y_subs_startup_finish(usx2y);
|
|
+ usx2y_clients_stop(usx2y); // something is completely wroong > stop evrything
|
|
}
|
|
return err;
|
|
}
|
|
@@ -506,33 +506,33 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs)
|
|
/*
|
|
* return the current pcm pointer. just return the hwptr_done value.
|
|
*/
|
|
-static snd_pcm_uframes_t snd_usX2Y_pcm_pointer(struct snd_pcm_substream *substream)
|
|
+static snd_pcm_uframes_t snd_usx2y_pcm_pointer(struct snd_pcm_substream *substream)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = substream->runtime->private_data;
|
|
+ struct snd_usx2y_substream *subs = substream->runtime->private_data;
|
|
return subs->hwptr_done;
|
|
}
|
|
/*
|
|
* start/stop substream
|
|
*/
|
|
-static int snd_usX2Y_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
+static int snd_usx2y_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = substream->runtime->private_data;
|
|
+ struct snd_usx2y_substream *subs = substream->runtime->private_data;
|
|
|
|
switch (cmd) {
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
- snd_printdd("snd_usX2Y_pcm_trigger(START)\n");
|
|
- if (atomic_read(&subs->state) == state_PREPARED &&
|
|
- atomic_read(&subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE]->state) >= state_PREPARED) {
|
|
- atomic_set(&subs->state, state_PRERUNNING);
|
|
+ snd_printdd("snd_usx2y_pcm_trigger(START)\n");
|
|
+ if (atomic_read(&subs->state) == STATE_PREPARED &&
|
|
+ atomic_read(&subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE]->state) >= STATE_PREPARED) {
|
|
+ atomic_set(&subs->state, STATE_PRERUNNING);
|
|
} else {
|
|
snd_printdd("\n");
|
|
return -EPIPE;
|
|
}
|
|
break;
|
|
case SNDRV_PCM_TRIGGER_STOP:
|
|
- snd_printdd("snd_usX2Y_pcm_trigger(STOP)\n");
|
|
- if (atomic_read(&subs->state) >= state_PRERUNNING)
|
|
- atomic_set(&subs->state, state_PREPARED);
|
|
+ snd_printdd("snd_usx2y_pcm_trigger(STOP)\n");
|
|
+ if (atomic_read(&subs->state) >= STATE_PRERUNNING)
|
|
+ atomic_set(&subs->state, STATE_PREPARED);
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
@@ -553,7 +553,7 @@ static const struct s_c2
|
|
{
|
|
char c1, c2;
|
|
}
|
|
- SetRate44100[] =
|
|
+ setrate_44100[] =
|
|
{
|
|
{ 0x14, 0x08}, // this line sets 44100, well actually a little less
|
|
{ 0x18, 0x40}, // only tascam / frontier design knows the further lines .......
|
|
@@ -589,7 +589,7 @@ static const struct s_c2
|
|
{ 0x18, 0x7C},
|
|
{ 0x18, 0x7E}
|
|
};
|
|
-static const struct s_c2 SetRate48000[] =
|
|
+static const struct s_c2 setrate_48000[] =
|
|
{
|
|
{ 0x14, 0x09}, // this line sets 48000, well actually a little less
|
|
{ 0x18, 0x40}, // only tascam / frontier design knows the further lines .......
|
|
@@ -625,26 +625,26 @@ static const struct s_c2 SetRate48000[] =
|
|
{ 0x18, 0x7C},
|
|
{ 0x18, 0x7E}
|
|
};
|
|
-#define NOOF_SETRATE_URBS ARRAY_SIZE(SetRate48000)
|
|
+#define NOOF_SETRATE_URBS ARRAY_SIZE(setrate_48000)
|
|
|
|
-static void i_usX2Y_04Int(struct urb *urb)
|
|
+static void i_usx2y_04int(struct urb *urb)
|
|
{
|
|
- struct usX2Ydev *usX2Y = urb->context;
|
|
+ struct usx2ydev *usx2y = urb->context;
|
|
|
|
if (urb->status)
|
|
- snd_printk(KERN_ERR "snd_usX2Y_04Int() urb->status=%i\n", urb->status);
|
|
- if (0 == --usX2Y->US04->len)
|
|
- wake_up(&usX2Y->In04WaitQueue);
|
|
+ snd_printk(KERN_ERR "snd_usx2y_04int() urb->status=%i\n", urb->status);
|
|
+ if (0 == --usx2y->us04->len)
|
|
+ wake_up(&usx2y->in04_wait_queue);
|
|
}
|
|
|
|
-static int usX2Y_rate_set(struct usX2Ydev *usX2Y, int rate)
|
|
+static int usx2y_rate_set(struct usx2ydev *usx2y, int rate)
|
|
{
|
|
int err = 0, i;
|
|
- struct snd_usX2Y_urbSeq *us = NULL;
|
|
+ struct snd_usx2y_urb_seq *us = NULL;
|
|
int *usbdata = NULL;
|
|
- const struct s_c2 *ra = rate == 48000 ? SetRate48000 : SetRate44100;
|
|
+ const struct s_c2 *ra = rate == 48000 ? setrate_48000 : setrate_44100;
|
|
|
|
- if (usX2Y->rate != rate) {
|
|
+ if (usx2y->rate != rate) {
|
|
us = kzalloc(sizeof(*us) + sizeof(struct urb*) * NOOF_SETRATE_URBS, GFP_KERNEL);
|
|
if (NULL == us) {
|
|
err = -ENOMEM;
|
|
@@ -663,17 +663,17 @@ static int usX2Y_rate_set(struct usX2Ydev *usX2Y, int rate)
|
|
}
|
|
((char*)(usbdata + i))[0] = ra[i].c1;
|
|
((char*)(usbdata + i))[1] = ra[i].c2;
|
|
- usb_fill_bulk_urb(us->urb[i], usX2Y->dev, usb_sndbulkpipe(usX2Y->dev, 4),
|
|
- usbdata + i, 2, i_usX2Y_04Int, usX2Y);
|
|
+ usb_fill_bulk_urb(us->urb[i], usx2y->dev, usb_sndbulkpipe(usx2y->dev, 4),
|
|
+ usbdata + i, 2, i_usx2y_04int, usx2y);
|
|
}
|
|
err = usb_urb_ep_type_check(us->urb[0]);
|
|
if (err < 0)
|
|
goto cleanup;
|
|
us->submitted = 0;
|
|
us->len = NOOF_SETRATE_URBS;
|
|
- usX2Y->US04 = us;
|
|
- wait_event_timeout(usX2Y->In04WaitQueue, 0 == us->len, HZ);
|
|
- usX2Y->US04 = NULL;
|
|
+ usx2y->us04 = us;
|
|
+ wait_event_timeout(usx2y->in04_wait_queue, 0 == us->len, HZ);
|
|
+ usx2y->us04 = NULL;
|
|
if (us->len)
|
|
err = -ENODEV;
|
|
cleanup:
|
|
@@ -690,11 +690,11 @@ static int usX2Y_rate_set(struct usX2Ydev *usX2Y, int rate)
|
|
}
|
|
usb_free_urb(urb);
|
|
}
|
|
- usX2Y->US04 = NULL;
|
|
+ usx2y->us04 = NULL;
|
|
kfree(usbdata);
|
|
kfree(us);
|
|
if (!err)
|
|
- usX2Y->rate = rate;
|
|
+ usx2y->rate = rate;
|
|
}
|
|
}
|
|
|
|
@@ -702,53 +702,53 @@ static int usX2Y_rate_set(struct usX2Ydev *usX2Y, int rate)
|
|
}
|
|
|
|
|
|
-static int usX2Y_format_set(struct usX2Ydev *usX2Y, snd_pcm_format_t format)
|
|
+static int usx2y_format_set(struct usx2ydev *usx2y, snd_pcm_format_t format)
|
|
{
|
|
int alternate, err;
|
|
struct list_head* p;
|
|
if (format == SNDRV_PCM_FORMAT_S24_3LE) {
|
|
alternate = 2;
|
|
- usX2Y->stride = 6;
|
|
+ usx2y->stride = 6;
|
|
} else {
|
|
alternate = 1;
|
|
- usX2Y->stride = 4;
|
|
+ usx2y->stride = 4;
|
|
}
|
|
- list_for_each(p, &usX2Y->midi_list) {
|
|
+ list_for_each(p, &usx2y->midi_list) {
|
|
snd_usbmidi_input_stop(p);
|
|
}
|
|
- usb_kill_urb(usX2Y->In04urb);
|
|
- if ((err = usb_set_interface(usX2Y->dev, 0, alternate))) {
|
|
+ usb_kill_urb(usx2y->in04_urb);
|
|
+ if ((err = usb_set_interface(usx2y->dev, 0, alternate))) {
|
|
snd_printk(KERN_ERR "usb_set_interface error \n");
|
|
return err;
|
|
}
|
|
- usX2Y->In04urb->dev = usX2Y->dev;
|
|
- err = usb_submit_urb(usX2Y->In04urb, GFP_KERNEL);
|
|
- list_for_each(p, &usX2Y->midi_list) {
|
|
+ usx2y->in04_urb->dev = usx2y->dev;
|
|
+ err = usb_submit_urb(usx2y->in04_urb, GFP_KERNEL);
|
|
+ list_for_each(p, &usx2y->midi_list) {
|
|
snd_usbmidi_input_start(p);
|
|
}
|
|
- usX2Y->format = format;
|
|
- usX2Y->rate = 0;
|
|
+ usx2y->format = format;
|
|
+ usx2y->rate = 0;
|
|
return err;
|
|
}
|
|
|
|
|
|
-static int snd_usX2Y_pcm_hw_params(struct snd_pcm_substream *substream,
|
|
+static int snd_usx2y_pcm_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *hw_params)
|
|
{
|
|
int err = 0;
|
|
unsigned int rate = params_rate(hw_params);
|
|
snd_pcm_format_t format = params_format(hw_params);
|
|
struct snd_card *card = substream->pstr->pcm->card;
|
|
- struct usX2Ydev *dev = usX2Y(card);
|
|
+ struct usx2ydev *dev = usx2y(card);
|
|
int i;
|
|
|
|
- mutex_lock(&usX2Y(card)->pcm_mutex);
|
|
- snd_printdd("snd_usX2Y_hw_params(%p, %p)\n", substream, hw_params);
|
|
- /* all pcm substreams off one usX2Y have to operate at the same
|
|
+ mutex_lock(&usx2y(card)->pcm_mutex);
|
|
+ snd_printdd("snd_usx2y_hw_params(%p, %p)\n", substream, hw_params);
|
|
+ /* all pcm substreams off one usx2y have to operate at the same
|
|
* rate & format
|
|
*/
|
|
for (i = 0; i < dev->pcm_devs * 2; i++) {
|
|
- struct snd_usX2Y_substream *subs = dev->subs[i];
|
|
+ struct snd_usx2y_substream *subs = dev->subs[i];
|
|
struct snd_pcm_substream *test_substream;
|
|
|
|
if (!subs)
|
|
@@ -767,39 +767,39 @@ static int snd_usX2Y_pcm_hw_params(struct snd_pcm_substream *substream,
|
|
}
|
|
|
|
error:
|
|
- mutex_unlock(&usX2Y(card)->pcm_mutex);
|
|
+ mutex_unlock(&usx2y(card)->pcm_mutex);
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* free the buffer
|
|
*/
|
|
-static int snd_usX2Y_pcm_hw_free(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_pcm_hw_free(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data;
|
|
- mutex_lock(&subs->usX2Y->pcm_mutex);
|
|
- snd_printdd("snd_usX2Y_hw_free(%p)\n", substream);
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data;
|
|
+ mutex_lock(&subs->usx2y->pcm_mutex);
|
|
+ snd_printdd("snd_usx2y_hw_free(%p)\n", substream);
|
|
|
|
if (SNDRV_PCM_STREAM_PLAYBACK == substream->stream) {
|
|
- struct snd_usX2Y_substream *cap_subs = subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
- atomic_set(&subs->state, state_STOPPED);
|
|
- usX2Y_urbs_release(subs);
|
|
+ struct snd_usx2y_substream *cap_subs = subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
+ atomic_set(&subs->state, STATE_STOPPED);
|
|
+ usx2y_urbs_release(subs);
|
|
if (!cap_subs->pcm_substream ||
|
|
!cap_subs->pcm_substream->runtime ||
|
|
!cap_subs->pcm_substream->runtime->status ||
|
|
cap_subs->pcm_substream->runtime->status->state < SNDRV_PCM_STATE_PREPARED) {
|
|
- atomic_set(&cap_subs->state, state_STOPPED);
|
|
- usX2Y_urbs_release(cap_subs);
|
|
+ atomic_set(&cap_subs->state, STATE_STOPPED);
|
|
+ usx2y_urbs_release(cap_subs);
|
|
}
|
|
} else {
|
|
- struct snd_usX2Y_substream *playback_subs = subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
- if (atomic_read(&playback_subs->state) < state_PREPARED) {
|
|
- atomic_set(&subs->state, state_STOPPED);
|
|
- usX2Y_urbs_release(subs);
|
|
+ struct snd_usx2y_substream *playback_subs = subs->usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ if (atomic_read(&playback_subs->state) < STATE_PREPARED) {
|
|
+ atomic_set(&subs->state, STATE_STOPPED);
|
|
+ usx2y_urbs_release(subs);
|
|
}
|
|
}
|
|
- mutex_unlock(&subs->usX2Y->pcm_mutex);
|
|
+ mutex_unlock(&subs->usx2y->pcm_mutex);
|
|
return 0;
|
|
}
|
|
/*
|
|
@@ -807,40 +807,40 @@ static int snd_usX2Y_pcm_hw_free(struct snd_pcm_substream *substream)
|
|
*
|
|
* set format and initialize urbs
|
|
*/
|
|
-static int snd_usX2Y_pcm_prepare(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_pcm_prepare(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_substream *capsubs = subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_substream *capsubs = subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
int err = 0;
|
|
- snd_printdd("snd_usX2Y_pcm_prepare(%p)\n", substream);
|
|
+ snd_printdd("snd_usx2y_pcm_prepare(%p)\n", substream);
|
|
|
|
- mutex_lock(&usX2Y->pcm_mutex);
|
|
- usX2Y_subs_prepare(subs);
|
|
+ mutex_lock(&usx2y->pcm_mutex);
|
|
+ usx2y_subs_prepare(subs);
|
|
// Start hardware streams
|
|
// SyncStream first....
|
|
- if (atomic_read(&capsubs->state) < state_PREPARED) {
|
|
- if (usX2Y->format != runtime->format)
|
|
- if ((err = usX2Y_format_set(usX2Y, runtime->format)) < 0)
|
|
+ if (atomic_read(&capsubs->state) < STATE_PREPARED) {
|
|
+ if (usx2y->format != runtime->format)
|
|
+ if ((err = usx2y_format_set(usx2y, runtime->format)) < 0)
|
|
goto up_prepare_mutex;
|
|
- if (usX2Y->rate != runtime->rate)
|
|
- if ((err = usX2Y_rate_set(usX2Y, runtime->rate)) < 0)
|
|
+ if (usx2y->rate != runtime->rate)
|
|
+ if ((err = usx2y_rate_set(usx2y, runtime->rate)) < 0)
|
|
goto up_prepare_mutex;
|
|
snd_printdd("starting capture pipe for %s\n", subs == capsubs ? "self" : "playpipe");
|
|
- if (0 > (err = usX2Y_urbs_start(capsubs)))
|
|
+ if (0 > (err = usx2y_urbs_start(capsubs)))
|
|
goto up_prepare_mutex;
|
|
}
|
|
|
|
- if (subs != capsubs && atomic_read(&subs->state) < state_PREPARED)
|
|
- err = usX2Y_urbs_start(subs);
|
|
+ if (subs != capsubs && atomic_read(&subs->state) < STATE_PREPARED)
|
|
+ err = usx2y_urbs_start(subs);
|
|
|
|
up_prepare_mutex:
|
|
- mutex_unlock(&usX2Y->pcm_mutex);
|
|
+ mutex_unlock(&usx2y->pcm_mutex);
|
|
return err;
|
|
}
|
|
|
|
-static const struct snd_pcm_hardware snd_usX2Y_2c =
|
|
+static const struct snd_pcm_hardware snd_usx2y_2c =
|
|
{
|
|
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
|
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
|
@@ -862,16 +862,16 @@ static const struct snd_pcm_hardware snd_usX2Y_2c =
|
|
|
|
|
|
|
|
-static int snd_usX2Y_pcm_open(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_pcm_open(struct snd_pcm_substream *substream)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = ((struct snd_usX2Y_substream **)
|
|
+ struct snd_usx2y_substream *subs = ((struct snd_usx2y_substream **)
|
|
snd_pcm_substream_chip(substream))[substream->stream];
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
- if (subs->usX2Y->chip_status & USX2Y_STAT_CHIP_MMAP_PCM_URBS)
|
|
+ if (subs->usx2y->chip_status & USX2Y_STAT_CHIP_MMAP_PCM_URBS)
|
|
return -EBUSY;
|
|
|
|
- runtime->hw = snd_usX2Y_2c;
|
|
+ runtime->hw = snd_usx2y_2c;
|
|
runtime->private_data = subs;
|
|
subs->pcm_substream = substream;
|
|
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 1000, 200000);
|
|
@@ -880,10 +880,10 @@ static int snd_usX2Y_pcm_open(struct snd_pcm_substream *substream)
|
|
|
|
|
|
|
|
-static int snd_usX2Y_pcm_close(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_pcm_close(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data;
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data;
|
|
|
|
subs->pcm_substream = NULL;
|
|
|
|
@@ -891,75 +891,75 @@ static int snd_usX2Y_pcm_close(struct snd_pcm_substream *substream)
|
|
}
|
|
|
|
|
|
-static const struct snd_pcm_ops snd_usX2Y_pcm_ops =
|
|
+static const struct snd_pcm_ops snd_usx2y_pcm_ops =
|
|
{
|
|
- .open = snd_usX2Y_pcm_open,
|
|
- .close = snd_usX2Y_pcm_close,
|
|
- .hw_params = snd_usX2Y_pcm_hw_params,
|
|
- .hw_free = snd_usX2Y_pcm_hw_free,
|
|
- .prepare = snd_usX2Y_pcm_prepare,
|
|
- .trigger = snd_usX2Y_pcm_trigger,
|
|
- .pointer = snd_usX2Y_pcm_pointer,
|
|
+ .open = snd_usx2y_pcm_open,
|
|
+ .close = snd_usx2y_pcm_close,
|
|
+ .hw_params = snd_usx2y_pcm_hw_params,
|
|
+ .hw_free = snd_usx2y_pcm_hw_free,
|
|
+ .prepare = snd_usx2y_pcm_prepare,
|
|
+ .trigger = snd_usx2y_pcm_trigger,
|
|
+ .pointer = snd_usx2y_pcm_pointer,
|
|
};
|
|
|
|
|
|
/*
|
|
* free a usb stream instance
|
|
*/
|
|
-static void usX2Y_audio_stream_free(struct snd_usX2Y_substream **usX2Y_substream)
|
|
+static void usx2y_audio_stream_free(struct snd_usx2y_substream **usx2y_substream)
|
|
{
|
|
int stream;
|
|
|
|
for_each_pcm_streams(stream) {
|
|
- kfree(usX2Y_substream[stream]);
|
|
- usX2Y_substream[stream] = NULL;
|
|
+ kfree(usx2y_substream[stream]);
|
|
+ usx2y_substream[stream] = NULL;
|
|
}
|
|
}
|
|
|
|
-static void snd_usX2Y_pcm_private_free(struct snd_pcm *pcm)
|
|
+static void snd_usx2y_pcm_private_free(struct snd_pcm *pcm)
|
|
{
|
|
- struct snd_usX2Y_substream **usX2Y_stream = pcm->private_data;
|
|
- if (usX2Y_stream)
|
|
- usX2Y_audio_stream_free(usX2Y_stream);
|
|
+ struct snd_usx2y_substream **usx2y_stream = pcm->private_data;
|
|
+ if (usx2y_stream)
|
|
+ usx2y_audio_stream_free(usx2y_stream);
|
|
}
|
|
|
|
-static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint, int capture_endpoint)
|
|
+static int usx2y_audio_stream_new(struct snd_card *card, int playback_endpoint, int capture_endpoint)
|
|
{
|
|
struct snd_pcm *pcm;
|
|
int err, i;
|
|
- struct snd_usX2Y_substream **usX2Y_substream =
|
|
- usX2Y(card)->subs + 2 * usX2Y(card)->pcm_devs;
|
|
+ struct snd_usx2y_substream **usx2y_substream =
|
|
+ usx2y(card)->subs + 2 * usx2y(card)->pcm_devs;
|
|
|
|
for (i = playback_endpoint ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;
|
|
i <= SNDRV_PCM_STREAM_CAPTURE; ++i) {
|
|
- usX2Y_substream[i] = kzalloc(sizeof(struct snd_usX2Y_substream), GFP_KERNEL);
|
|
- if (!usX2Y_substream[i])
|
|
+ usx2y_substream[i] = kzalloc(sizeof(struct snd_usx2y_substream), GFP_KERNEL);
|
|
+ if (!usx2y_substream[i])
|
|
return -ENOMEM;
|
|
|
|
- usX2Y_substream[i]->usX2Y = usX2Y(card);
|
|
+ usx2y_substream[i]->usx2y = usx2y(card);
|
|
}
|
|
|
|
if (playback_endpoint)
|
|
- usX2Y_substream[SNDRV_PCM_STREAM_PLAYBACK]->endpoint = playback_endpoint;
|
|
- usX2Y_substream[SNDRV_PCM_STREAM_CAPTURE]->endpoint = capture_endpoint;
|
|
+ usx2y_substream[SNDRV_PCM_STREAM_PLAYBACK]->endpoint = playback_endpoint;
|
|
+ usx2y_substream[SNDRV_PCM_STREAM_CAPTURE]->endpoint = capture_endpoint;
|
|
|
|
- err = snd_pcm_new(card, NAME_ALLCAPS" Audio", usX2Y(card)->pcm_devs,
|
|
+ err = snd_pcm_new(card, NAME_ALLCAPS" Audio", usx2y(card)->pcm_devs,
|
|
playback_endpoint ? 1 : 0, 1,
|
|
&pcm);
|
|
if (err < 0) {
|
|
- usX2Y_audio_stream_free(usX2Y_substream);
|
|
+ usx2y_audio_stream_free(usx2y_substream);
|
|
return err;
|
|
}
|
|
|
|
if (playback_endpoint)
|
|
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_usX2Y_pcm_ops);
|
|
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usX2Y_pcm_ops);
|
|
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_usx2y_pcm_ops);
|
|
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usx2y_pcm_ops);
|
|
|
|
- pcm->private_data = usX2Y_substream;
|
|
- pcm->private_free = snd_usX2Y_pcm_private_free;
|
|
+ pcm->private_data = usx2y_substream;
|
|
+ pcm->private_free = snd_usx2y_pcm_private_free;
|
|
pcm->info_flags = 0;
|
|
|
|
- sprintf(pcm->name, NAME_ALLCAPS" Audio #%d", usX2Y(card)->pcm_devs);
|
|
+ sprintf(pcm->name, NAME_ALLCAPS" Audio #%d", usx2y(card)->pcm_devs);
|
|
|
|
if (playback_endpoint) {
|
|
snd_pcm_set_managed_buffer(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
|
|
@@ -972,7 +972,7 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint,
|
|
SNDRV_DMA_TYPE_CONTINUOUS,
|
|
NULL,
|
|
64*1024, 128*1024);
|
|
- usX2Y(card)->pcm_devs++;
|
|
+ usx2y(card)->pcm_devs++;
|
|
|
|
return 0;
|
|
}
|
|
@@ -980,18 +980,18 @@ static int usX2Y_audio_stream_new(struct snd_card *card, int playback_endpoint,
|
|
/*
|
|
* create a chip instance and set its names.
|
|
*/
|
|
-int usX2Y_audio_create(struct snd_card *card)
|
|
+int usx2y_audio_create(struct snd_card *card)
|
|
{
|
|
int err = 0;
|
|
|
|
- INIT_LIST_HEAD(&usX2Y(card)->pcm_list);
|
|
+ INIT_LIST_HEAD(&usx2y(card)->pcm_list);
|
|
|
|
- if (0 > (err = usX2Y_audio_stream_new(card, 0xA, 0x8)))
|
|
+ if (0 > (err = usx2y_audio_stream_new(card, 0xA, 0x8)))
|
|
return err;
|
|
- if (le16_to_cpu(usX2Y(card)->dev->descriptor.idProduct) == USB_ID_US428)
|
|
- if (0 > (err = usX2Y_audio_stream_new(card, 0, 0xA)))
|
|
+ if (le16_to_cpu(usx2y(card)->dev->descriptor.idProduct) == USB_ID_US428)
|
|
+ if (0 > (err = usx2y_audio_stream_new(card, 0, 0xA)))
|
|
return err;
|
|
- if (le16_to_cpu(usX2Y(card)->dev->descriptor.idProduct) != USB_ID_US122)
|
|
- err = usX2Y_rate_set(usX2Y(card), 44100); // Lets us428 recognize output-volume settings, disturbs us122.
|
|
+ if (le16_to_cpu(usx2y(card)->dev->descriptor.idProduct) != USB_ID_US122)
|
|
+ err = usx2y_rate_set(usx2y(card), 44100); // Lets us428 recognize output-volume settings, disturbs us122.
|
|
return err;
|
|
}
|
|
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
|
|
index 8253669c6a7d7..399470e51c411 100644
|
|
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
|
|
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
|
|
@@ -47,17 +47,17 @@
|
|
#include <sound/hwdep.h>
|
|
|
|
|
|
-static int usX2Y_usbpcm_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_usbpcm_urb_capt_retire(struct snd_usx2y_substream *subs)
|
|
{
|
|
struct urb *urb = subs->completed_urb;
|
|
struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
|
|
int i, lens = 0, hwptr_done = subs->hwptr_done;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- if (0 > usX2Y->hwdep_pcm_shm->capture_iso_start) { //FIXME
|
|
- int head = usX2Y->hwdep_pcm_shm->captured_iso_head + 1;
|
|
- if (head >= ARRAY_SIZE(usX2Y->hwdep_pcm_shm->captured_iso))
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ if (0 > usx2y->hwdep_pcm_shm->capture_iso_start) { //FIXME
|
|
+ int head = usx2y->hwdep_pcm_shm->captured_iso_head + 1;
|
|
+ if (head >= ARRAY_SIZE(usx2y->hwdep_pcm_shm->captured_iso))
|
|
head = 0;
|
|
- usX2Y->hwdep_pcm_shm->capture_iso_start = head;
|
|
+ usx2y->hwdep_pcm_shm->capture_iso_start = head;
|
|
snd_printdd("cap start %i\n", head);
|
|
}
|
|
for (i = 0; i < nr_of_packs(); i++) {
|
|
@@ -65,7 +65,7 @@ static int usX2Y_usbpcm_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
snd_printk(KERN_ERR "active frame status %i. Most probably some hardware problem.\n", urb->iso_frame_desc[i].status);
|
|
return urb->iso_frame_desc[i].status;
|
|
}
|
|
- lens += urb->iso_frame_desc[i].actual_length / usX2Y->stride;
|
|
+ lens += urb->iso_frame_desc[i].actual_length / usx2y->stride;
|
|
}
|
|
if ((hwptr_done += lens) >= runtime->buffer_size)
|
|
hwptr_done -= runtime->buffer_size;
|
|
@@ -79,10 +79,10 @@ static int usX2Y_usbpcm_urb_capt_retire(struct snd_usX2Y_substream *subs)
|
|
return 0;
|
|
}
|
|
|
|
-static inline int usX2Y_iso_frames_per_buffer(struct snd_pcm_runtime *runtime,
|
|
- struct usX2Ydev * usX2Y)
|
|
+static inline int usx2y_iso_frames_per_buffer(struct snd_pcm_runtime *runtime,
|
|
+ struct usx2ydev * usx2y)
|
|
{
|
|
- return (runtime->buffer_size * 1000) / usX2Y->rate + 1; //FIXME: so far only correct period_size == 2^x ?
|
|
+ return (runtime->buffer_size * 1000) / usx2y->rate + 1; //FIXME: so far only correct period_size == 2^x ?
|
|
}
|
|
|
|
/*
|
|
@@ -95,17 +95,17 @@ static inline int usX2Y_iso_frames_per_buffer(struct snd_pcm_runtime *runtime,
|
|
* it directly from the buffer. thus the data is once copied to
|
|
* a temporary buffer and urb points to that.
|
|
*/
|
|
-static int usX2Y_hwdep_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
+static int usx2y_hwdep_urb_play_prepare(struct snd_usx2y_substream *subs,
|
|
struct urb *urb)
|
|
{
|
|
int count, counts, pack;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_hwdep_pcm_shm *shm = usX2Y->hwdep_pcm_shm;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_hwdep_pcm_shm *shm = usx2y->hwdep_pcm_shm;
|
|
struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
|
|
|
|
if (0 > shm->playback_iso_start) {
|
|
shm->playback_iso_start = shm->captured_iso_head -
|
|
- usX2Y_iso_frames_per_buffer(runtime, usX2Y);
|
|
+ usx2y_iso_frames_per_buffer(runtime, usx2y);
|
|
if (0 > shm->playback_iso_start)
|
|
shm->playback_iso_start += ARRAY_SIZE(shm->captured_iso);
|
|
shm->playback_iso_head = shm->playback_iso_start;
|
|
@@ -114,7 +114,7 @@ static int usX2Y_hwdep_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
count = 0;
|
|
for (pack = 0; pack < nr_of_packs(); pack++) {
|
|
/* calculate the size of a packet */
|
|
- counts = shm->captured_iso[shm->playback_iso_head].length / usX2Y->stride;
|
|
+ counts = shm->captured_iso[shm->playback_iso_head].length / usx2y->stride;
|
|
if (counts < 43 || counts > 50) {
|
|
snd_printk(KERN_ERR "should not be here with counts=%i\n", counts);
|
|
return -EPIPE;
|
|
@@ -122,26 +122,26 @@ static int usX2Y_hwdep_urb_play_prepare(struct snd_usX2Y_substream *subs,
|
|
/* set up descriptor */
|
|
urb->iso_frame_desc[pack].offset = shm->captured_iso[shm->playback_iso_head].offset;
|
|
urb->iso_frame_desc[pack].length = shm->captured_iso[shm->playback_iso_head].length;
|
|
- if (atomic_read(&subs->state) != state_RUNNING)
|
|
+ if (atomic_read(&subs->state) != STATE_RUNNING)
|
|
memset((char *)urb->transfer_buffer + urb->iso_frame_desc[pack].offset, 0,
|
|
urb->iso_frame_desc[pack].length);
|
|
if (++shm->playback_iso_head >= ARRAY_SIZE(shm->captured_iso))
|
|
shm->playback_iso_head = 0;
|
|
count += counts;
|
|
}
|
|
- urb->transfer_buffer_length = count * usX2Y->stride;
|
|
+ urb->transfer_buffer_length = count * usx2y->stride;
|
|
return 0;
|
|
}
|
|
|
|
|
|
-static inline void usX2Y_usbpcm_urb_capt_iso_advance(struct snd_usX2Y_substream *subs,
|
|
+static inline void usx2y_usbpcm_urb_capt_iso_advance(struct snd_usx2y_substream *subs,
|
|
struct urb *urb)
|
|
{
|
|
int pack;
|
|
for (pack = 0; pack < nr_of_packs(); ++pack) {
|
|
struct usb_iso_packet_descriptor *desc = urb->iso_frame_desc + pack;
|
|
if (NULL != subs) {
|
|
- struct snd_usX2Y_hwdep_pcm_shm *shm = subs->usX2Y->hwdep_pcm_shm;
|
|
+ struct snd_usx2y_hwdep_pcm_shm *shm = subs->usx2y->hwdep_pcm_shm;
|
|
int head = shm->captured_iso_head + 1;
|
|
if (head >= ARRAY_SIZE(shm->captured_iso))
|
|
head = 0;
|
|
@@ -157,9 +157,9 @@ static inline void usX2Y_usbpcm_urb_capt_iso_advance(struct snd_usX2Y_substream
|
|
}
|
|
}
|
|
|
|
-static inline int usX2Y_usbpcm_usbframe_complete(struct snd_usX2Y_substream *capsubs,
|
|
- struct snd_usX2Y_substream *capsubs2,
|
|
- struct snd_usX2Y_substream *playbacksubs,
|
|
+static inline int usx2y_usbpcm_usbframe_complete(struct snd_usx2y_substream *capsubs,
|
|
+ struct snd_usx2y_substream *capsubs2,
|
|
+ struct snd_usx2y_substream *playbacksubs,
|
|
int frame)
|
|
{
|
|
int err, state;
|
|
@@ -167,25 +167,25 @@ static inline int usX2Y_usbpcm_usbframe_complete(struct snd_usX2Y_substream *cap
|
|
|
|
state = atomic_read(&playbacksubs->state);
|
|
if (NULL != urb) {
|
|
- if (state == state_RUNNING)
|
|
- usX2Y_urb_play_retire(playbacksubs, urb);
|
|
- else if (state >= state_PRERUNNING)
|
|
+ if (state == STATE_RUNNING)
|
|
+ usx2y_urb_play_retire(playbacksubs, urb);
|
|
+ else if (state >= STATE_PRERUNNING)
|
|
atomic_inc(&playbacksubs->state);
|
|
} else {
|
|
switch (state) {
|
|
- case state_STARTING1:
|
|
+ case STATE_STARTING1:
|
|
urb = playbacksubs->urb[0];
|
|
atomic_inc(&playbacksubs->state);
|
|
break;
|
|
- case state_STARTING2:
|
|
+ case STATE_STARTING2:
|
|
urb = playbacksubs->urb[1];
|
|
atomic_inc(&playbacksubs->state);
|
|
break;
|
|
}
|
|
}
|
|
if (urb) {
|
|
- if ((err = usX2Y_hwdep_urb_play_prepare(playbacksubs, urb)) ||
|
|
- (err = usX2Y_urb_submit(playbacksubs, urb, frame))) {
|
|
+ if ((err = usx2y_hwdep_urb_play_prepare(playbacksubs, urb)) ||
|
|
+ (err = usx2y_urb_submit(playbacksubs, urb, frame))) {
|
|
return err;
|
|
}
|
|
}
|
|
@@ -193,19 +193,19 @@ static inline int usX2Y_usbpcm_usbframe_complete(struct snd_usX2Y_substream *cap
|
|
playbacksubs->completed_urb = NULL;
|
|
|
|
state = atomic_read(&capsubs->state);
|
|
- if (state >= state_PREPARED) {
|
|
- if (state == state_RUNNING) {
|
|
- if ((err = usX2Y_usbpcm_urb_capt_retire(capsubs)))
|
|
+ if (state >= STATE_PREPARED) {
|
|
+ if (state == STATE_RUNNING) {
|
|
+ if ((err = usx2y_usbpcm_urb_capt_retire(capsubs)))
|
|
return err;
|
|
- } else if (state >= state_PRERUNNING)
|
|
+ } else if (state >= STATE_PRERUNNING)
|
|
atomic_inc(&capsubs->state);
|
|
- usX2Y_usbpcm_urb_capt_iso_advance(capsubs, capsubs->completed_urb);
|
|
+ usx2y_usbpcm_urb_capt_iso_advance(capsubs, capsubs->completed_urb);
|
|
if (NULL != capsubs2)
|
|
- usX2Y_usbpcm_urb_capt_iso_advance(NULL, capsubs2->completed_urb);
|
|
- if ((err = usX2Y_urb_submit(capsubs, capsubs->completed_urb, frame)))
|
|
+ usx2y_usbpcm_urb_capt_iso_advance(NULL, capsubs2->completed_urb);
|
|
+ if ((err = usx2y_urb_submit(capsubs, capsubs->completed_urb, frame)))
|
|
return err;
|
|
if (NULL != capsubs2)
|
|
- if ((err = usX2Y_urb_submit(capsubs2, capsubs2->completed_urb, frame)))
|
|
+ if ((err = usx2y_urb_submit(capsubs2, capsubs2->completed_urb, frame)))
|
|
return err;
|
|
}
|
|
capsubs->completed_urb = NULL;
|
|
@@ -215,42 +215,42 @@ static inline int usX2Y_usbpcm_usbframe_complete(struct snd_usX2Y_substream *cap
|
|
}
|
|
|
|
|
|
-static void i_usX2Y_usbpcm_urb_complete(struct urb *urb)
|
|
+static void i_usx2y_usbpcm_urb_complete(struct urb *urb)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = urb->context;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_substream *capsubs, *capsubs2, *playbacksubs;
|
|
+ struct snd_usx2y_substream *subs = urb->context;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_substream *capsubs, *capsubs2, *playbacksubs;
|
|
|
|
- if (unlikely(atomic_read(&subs->state) < state_PREPARED)) {
|
|
+ if (unlikely(atomic_read(&subs->state) < STATE_PREPARED)) {
|
|
snd_printdd("hcd_frame=%i ep=%i%s status=%i start_frame=%i\n",
|
|
- usb_get_current_frame_number(usX2Y->dev),
|
|
+ usb_get_current_frame_number(usx2y->dev),
|
|
subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out",
|
|
urb->status, urb->start_frame);
|
|
return;
|
|
}
|
|
if (unlikely(urb->status)) {
|
|
- usX2Y_error_urb_status(usX2Y, subs, urb);
|
|
+ usx2y_error_urb_status(usx2y, subs, urb);
|
|
return;
|
|
}
|
|
|
|
subs->completed_urb = urb;
|
|
- capsubs = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
- capsubs2 = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
- playbacksubs = usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
- if (capsubs->completed_urb && atomic_read(&capsubs->state) >= state_PREPARED &&
|
|
+ capsubs = usx2y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
+ capsubs2 = usx2y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
+ playbacksubs = usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ if (capsubs->completed_urb && atomic_read(&capsubs->state) >= STATE_PREPARED &&
|
|
(NULL == capsubs2 || capsubs2->completed_urb) &&
|
|
- (playbacksubs->completed_urb || atomic_read(&playbacksubs->state) < state_PREPARED)) {
|
|
- if (!usX2Y_usbpcm_usbframe_complete(capsubs, capsubs2, playbacksubs, urb->start_frame))
|
|
- usX2Y->wait_iso_frame += nr_of_packs();
|
|
+ (playbacksubs->completed_urb || atomic_read(&playbacksubs->state) < STATE_PREPARED)) {
|
|
+ if (!usx2y_usbpcm_usbframe_complete(capsubs, capsubs2, playbacksubs, urb->start_frame))
|
|
+ usx2y->wait_iso_frame += nr_of_packs();
|
|
else {
|
|
snd_printdd("\n");
|
|
- usX2Y_clients_stop(usX2Y);
|
|
+ usx2y_clients_stop(usx2y);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void usX2Y_hwdep_urb_release(struct urb **urb)
|
|
+static void usx2y_hwdep_urb_release(struct urb **urb)
|
|
{
|
|
usb_kill_urb(*urb);
|
|
usb_free_urb(*urb);
|
|
@@ -260,49 +260,49 @@ static void usX2Y_hwdep_urb_release(struct urb **urb)
|
|
/*
|
|
* release a substream
|
|
*/
|
|
-static void usX2Y_usbpcm_urbs_release(struct snd_usX2Y_substream *subs)
|
|
+static void usx2y_usbpcm_urbs_release(struct snd_usx2y_substream *subs)
|
|
{
|
|
int i;
|
|
- snd_printdd("snd_usX2Y_urbs_release() %i\n", subs->endpoint);
|
|
+ snd_printdd("snd_usx2y_urbs_release() %i\n", subs->endpoint);
|
|
for (i = 0; i < NRURBS; i++)
|
|
- usX2Y_hwdep_urb_release(subs->urb + i);
|
|
+ usx2y_hwdep_urb_release(subs->urb + i);
|
|
}
|
|
|
|
-static void usX2Y_usbpcm_subs_startup_finish(struct usX2Ydev * usX2Y)
|
|
+static void usx2y_usbpcm_subs_startup_finish(struct usx2ydev * usx2y)
|
|
{
|
|
- usX2Y_urbs_set_complete(usX2Y, i_usX2Y_usbpcm_urb_complete);
|
|
- usX2Y->prepare_subs = NULL;
|
|
+ usx2y_urbs_set_complete(usx2y, i_usx2y_usbpcm_urb_complete);
|
|
+ usx2y->prepare_subs = NULL;
|
|
}
|
|
|
|
-static void i_usX2Y_usbpcm_subs_startup(struct urb *urb)
|
|
+static void i_usx2y_usbpcm_subs_startup(struct urb *urb)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = urb->context;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_substream *prepare_subs = usX2Y->prepare_subs;
|
|
+ struct snd_usx2y_substream *subs = urb->context;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_substream *prepare_subs = usx2y->prepare_subs;
|
|
if (NULL != prepare_subs &&
|
|
urb->start_frame == prepare_subs->urb[0]->start_frame) {
|
|
atomic_inc(&prepare_subs->state);
|
|
- if (prepare_subs == usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE]) {
|
|
- struct snd_usX2Y_substream *cap_subs2 = usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
+ if (prepare_subs == usx2y->subs[SNDRV_PCM_STREAM_CAPTURE]) {
|
|
+ struct snd_usx2y_substream *cap_subs2 = usx2y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
if (cap_subs2 != NULL)
|
|
atomic_inc(&cap_subs2->state);
|
|
}
|
|
- usX2Y_usbpcm_subs_startup_finish(usX2Y);
|
|
- wake_up(&usX2Y->prepare_wait_queue);
|
|
+ usx2y_usbpcm_subs_startup_finish(usx2y);
|
|
+ wake_up(&usx2y->prepare_wait_queue);
|
|
}
|
|
|
|
- i_usX2Y_usbpcm_urb_complete(urb);
|
|
+ i_usx2y_usbpcm_urb_complete(urb);
|
|
}
|
|
|
|
/*
|
|
* initialize a substream's urbs
|
|
*/
|
|
-static int usX2Y_usbpcm_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_usbpcm_urbs_allocate(struct snd_usx2y_substream *subs)
|
|
{
|
|
int i;
|
|
unsigned int pipe;
|
|
- int is_playback = subs == subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
- struct usb_device *dev = subs->usX2Y->dev;
|
|
+ int is_playback = subs == subs->usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ struct usb_device *dev = subs->usx2y->dev;
|
|
|
|
pipe = is_playback ? usb_sndisocpipe(dev, subs->endpoint) :
|
|
usb_rcvisocpipe(dev, subs->endpoint);
|
|
@@ -319,21 +319,21 @@ static int usX2Y_usbpcm_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
}
|
|
*purb = usb_alloc_urb(nr_of_packs(), GFP_KERNEL);
|
|
if (NULL == *purb) {
|
|
- usX2Y_usbpcm_urbs_release(subs);
|
|
+ usx2y_usbpcm_urbs_release(subs);
|
|
return -ENOMEM;
|
|
}
|
|
(*purb)->transfer_buffer = is_playback ?
|
|
- subs->usX2Y->hwdep_pcm_shm->playback : (
|
|
+ subs->usx2y->hwdep_pcm_shm->playback : (
|
|
subs->endpoint == 0x8 ?
|
|
- subs->usX2Y->hwdep_pcm_shm->capture0x8 :
|
|
- subs->usX2Y->hwdep_pcm_shm->capture0xA);
|
|
+ subs->usx2y->hwdep_pcm_shm->capture0x8 :
|
|
+ subs->usx2y->hwdep_pcm_shm->capture0xA);
|
|
|
|
(*purb)->dev = dev;
|
|
(*purb)->pipe = pipe;
|
|
(*purb)->number_of_packets = nr_of_packs();
|
|
(*purb)->context = subs;
|
|
(*purb)->interval = 1;
|
|
- (*purb)->complete = i_usX2Y_usbpcm_subs_startup;
|
|
+ (*purb)->complete = i_usx2y_usbpcm_subs_startup;
|
|
}
|
|
return 0;
|
|
}
|
|
@@ -341,91 +341,91 @@ static int usX2Y_usbpcm_urbs_allocate(struct snd_usX2Y_substream *subs)
|
|
/*
|
|
* free the buffer
|
|
*/
|
|
-static int snd_usX2Y_usbpcm_hw_free(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_usbpcm_hw_free(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data,
|
|
- *cap_subs2 = subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
- mutex_lock(&subs->usX2Y->pcm_mutex);
|
|
- snd_printdd("snd_usX2Y_usbpcm_hw_free(%p)\n", substream);
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data,
|
|
+ *cap_subs2 = subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE + 2];
|
|
+ mutex_lock(&subs->usx2y->pcm_mutex);
|
|
+ snd_printdd("snd_usx2y_usbpcm_hw_free(%p)\n", substream);
|
|
|
|
if (SNDRV_PCM_STREAM_PLAYBACK == substream->stream) {
|
|
- struct snd_usX2Y_substream *cap_subs = subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
- atomic_set(&subs->state, state_STOPPED);
|
|
- usX2Y_usbpcm_urbs_release(subs);
|
|
+ struct snd_usx2y_substream *cap_subs = subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
+ atomic_set(&subs->state, STATE_STOPPED);
|
|
+ usx2y_usbpcm_urbs_release(subs);
|
|
if (!cap_subs->pcm_substream ||
|
|
!cap_subs->pcm_substream->runtime ||
|
|
!cap_subs->pcm_substream->runtime->status ||
|
|
cap_subs->pcm_substream->runtime->status->state < SNDRV_PCM_STATE_PREPARED) {
|
|
- atomic_set(&cap_subs->state, state_STOPPED);
|
|
+ atomic_set(&cap_subs->state, STATE_STOPPED);
|
|
if (NULL != cap_subs2)
|
|
- atomic_set(&cap_subs2->state, state_STOPPED);
|
|
- usX2Y_usbpcm_urbs_release(cap_subs);
|
|
+ atomic_set(&cap_subs2->state, STATE_STOPPED);
|
|
+ usx2y_usbpcm_urbs_release(cap_subs);
|
|
if (NULL != cap_subs2)
|
|
- usX2Y_usbpcm_urbs_release(cap_subs2);
|
|
+ usx2y_usbpcm_urbs_release(cap_subs2);
|
|
}
|
|
} else {
|
|
- struct snd_usX2Y_substream *playback_subs = subs->usX2Y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
- if (atomic_read(&playback_subs->state) < state_PREPARED) {
|
|
- atomic_set(&subs->state, state_STOPPED);
|
|
+ struct snd_usx2y_substream *playback_subs = subs->usx2y->subs[SNDRV_PCM_STREAM_PLAYBACK];
|
|
+ if (atomic_read(&playback_subs->state) < STATE_PREPARED) {
|
|
+ atomic_set(&subs->state, STATE_STOPPED);
|
|
if (NULL != cap_subs2)
|
|
- atomic_set(&cap_subs2->state, state_STOPPED);
|
|
- usX2Y_usbpcm_urbs_release(subs);
|
|
+ atomic_set(&cap_subs2->state, STATE_STOPPED);
|
|
+ usx2y_usbpcm_urbs_release(subs);
|
|
if (NULL != cap_subs2)
|
|
- usX2Y_usbpcm_urbs_release(cap_subs2);
|
|
+ usx2y_usbpcm_urbs_release(cap_subs2);
|
|
}
|
|
}
|
|
- mutex_unlock(&subs->usX2Y->pcm_mutex);
|
|
+ mutex_unlock(&subs->usx2y->pcm_mutex);
|
|
return 0;
|
|
}
|
|
|
|
-static void usX2Y_usbpcm_subs_startup(struct snd_usX2Y_substream *subs)
|
|
+static void usx2y_usbpcm_subs_startup(struct snd_usx2y_substream *subs)
|
|
{
|
|
- struct usX2Ydev * usX2Y = subs->usX2Y;
|
|
- usX2Y->prepare_subs = subs;
|
|
+ struct usx2ydev * usx2y = subs->usx2y;
|
|
+ usx2y->prepare_subs = subs;
|
|
subs->urb[0]->start_frame = -1;
|
|
- smp_wmb(); // Make sure above modifications are seen by i_usX2Y_subs_startup()
|
|
- usX2Y_urbs_set_complete(usX2Y, i_usX2Y_usbpcm_subs_startup);
|
|
+ smp_wmb(); // Make sure above modifications are seen by i_usx2y_subs_startup()
|
|
+ usx2y_urbs_set_complete(usx2y, i_usx2y_usbpcm_subs_startup);
|
|
}
|
|
|
|
-static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs)
|
|
+static int usx2y_usbpcm_urbs_start(struct snd_usx2y_substream *subs)
|
|
{
|
|
int p, u, err,
|
|
stream = subs->pcm_substream->stream;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
|
|
if (SNDRV_PCM_STREAM_CAPTURE == stream) {
|
|
- usX2Y->hwdep_pcm_shm->captured_iso_head = -1;
|
|
- usX2Y->hwdep_pcm_shm->captured_iso_frames = 0;
|
|
+ usx2y->hwdep_pcm_shm->captured_iso_head = -1;
|
|
+ usx2y->hwdep_pcm_shm->captured_iso_frames = 0;
|
|
}
|
|
|
|
for (p = 0; 3 >= (stream + p); p += 2) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[stream + p];
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[stream + p];
|
|
if (subs != NULL) {
|
|
- if ((err = usX2Y_usbpcm_urbs_allocate(subs)) < 0)
|
|
+ if ((err = usx2y_usbpcm_urbs_allocate(subs)) < 0)
|
|
return err;
|
|
subs->completed_urb = NULL;
|
|
}
|
|
}
|
|
|
|
for (p = 0; p < 4; p++) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[p];
|
|
- if (subs != NULL && atomic_read(&subs->state) >= state_PREPARED)
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[p];
|
|
+ if (subs != NULL && atomic_read(&subs->state) >= STATE_PREPARED)
|
|
goto start;
|
|
}
|
|
|
|
start:
|
|
- usX2Y_usbpcm_subs_startup(subs);
|
|
+ usx2y_usbpcm_subs_startup(subs);
|
|
for (u = 0; u < NRURBS; u++) {
|
|
for (p = 0; 3 >= (stream + p); p += 2) {
|
|
- struct snd_usX2Y_substream *subs = usX2Y->subs[stream + p];
|
|
+ struct snd_usx2y_substream *subs = usx2y->subs[stream + p];
|
|
if (subs != NULL) {
|
|
struct urb *urb = subs->urb[u];
|
|
if (usb_pipein(urb->pipe)) {
|
|
unsigned long pack;
|
|
if (0 == u)
|
|
- atomic_set(&subs->state, state_STARTING3);
|
|
- urb->dev = usX2Y->dev;
|
|
+ atomic_set(&subs->state, STATE_STARTING3);
|
|
+ urb->dev = usx2y->dev;
|
|
for (pack = 0; pack < nr_of_packs(); pack++) {
|
|
urb->iso_frame_desc[pack].offset = subs->maxpacksize * (pack + u * nr_of_packs());
|
|
urb->iso_frame_desc[pack].length = subs->maxpacksize;
|
|
@@ -438,25 +438,25 @@ static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs)
|
|
} else {
|
|
snd_printdd("%i\n", urb->start_frame);
|
|
if (u == 0)
|
|
- usX2Y->wait_iso_frame = urb->start_frame;
|
|
+ usx2y->wait_iso_frame = urb->start_frame;
|
|
}
|
|
urb->transfer_flags = 0;
|
|
} else {
|
|
- atomic_set(&subs->state, state_STARTING1);
|
|
+ atomic_set(&subs->state, STATE_STARTING1);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
err = 0;
|
|
- wait_event(usX2Y->prepare_wait_queue, NULL == usX2Y->prepare_subs);
|
|
- if (atomic_read(&subs->state) != state_PREPARED)
|
|
+ wait_event(usx2y->prepare_wait_queue, NULL == usx2y->prepare_subs);
|
|
+ if (atomic_read(&subs->state) != STATE_PREPARED)
|
|
err = -EPIPE;
|
|
|
|
cleanup:
|
|
if (err) {
|
|
- usX2Y_subs_startup_finish(usX2Y); // Call it now
|
|
- usX2Y_clients_stop(usX2Y); // something is completely wroong > stop evrything
|
|
+ usx2y_subs_startup_finish(usx2y); // Call it now
|
|
+ usx2y_clients_stop(usx2y); // something is completely wroong > stop evrything
|
|
}
|
|
return err;
|
|
}
|
|
@@ -466,69 +466,69 @@ static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs)
|
|
*
|
|
* set format and initialize urbs
|
|
*/
|
|
-static int snd_usX2Y_usbpcm_prepare(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_usbpcm_prepare(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data;
|
|
- struct usX2Ydev *usX2Y = subs->usX2Y;
|
|
- struct snd_usX2Y_substream *capsubs = subs->usX2Y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data;
|
|
+ struct usx2ydev *usx2y = subs->usx2y;
|
|
+ struct snd_usx2y_substream *capsubs = subs->usx2y->subs[SNDRV_PCM_STREAM_CAPTURE];
|
|
int err = 0;
|
|
- snd_printdd("snd_usX2Y_pcm_prepare(%p)\n", substream);
|
|
+ snd_printdd("snd_usx2y_pcm_prepare(%p)\n", substream);
|
|
|
|
- if (NULL == usX2Y->hwdep_pcm_shm) {
|
|
- usX2Y->hwdep_pcm_shm = alloc_pages_exact(sizeof(struct snd_usX2Y_hwdep_pcm_shm),
|
|
+ if (NULL == usx2y->hwdep_pcm_shm) {
|
|
+ usx2y->hwdep_pcm_shm = alloc_pages_exact(sizeof(struct snd_usx2y_hwdep_pcm_shm),
|
|
GFP_KERNEL);
|
|
- if (!usX2Y->hwdep_pcm_shm)
|
|
+ if (!usx2y->hwdep_pcm_shm)
|
|
return -ENOMEM;
|
|
- memset(usX2Y->hwdep_pcm_shm, 0, sizeof(struct snd_usX2Y_hwdep_pcm_shm));
|
|
+ memset(usx2y->hwdep_pcm_shm, 0, sizeof(struct snd_usx2y_hwdep_pcm_shm));
|
|
}
|
|
|
|
- mutex_lock(&usX2Y->pcm_mutex);
|
|
- usX2Y_subs_prepare(subs);
|
|
+ mutex_lock(&usx2y->pcm_mutex);
|
|
+ usx2y_subs_prepare(subs);
|
|
// Start hardware streams
|
|
// SyncStream first....
|
|
- if (atomic_read(&capsubs->state) < state_PREPARED) {
|
|
- if (usX2Y->format != runtime->format)
|
|
- if ((err = usX2Y_format_set(usX2Y, runtime->format)) < 0)
|
|
+ if (atomic_read(&capsubs->state) < STATE_PREPARED) {
|
|
+ if (usx2y->format != runtime->format)
|
|
+ if ((err = usx2y_format_set(usx2y, runtime->format)) < 0)
|
|
goto up_prepare_mutex;
|
|
- if (usX2Y->rate != runtime->rate)
|
|
- if ((err = usX2Y_rate_set(usX2Y, runtime->rate)) < 0)
|
|
+ if (usx2y->rate != runtime->rate)
|
|
+ if ((err = usx2y_rate_set(usx2y, runtime->rate)) < 0)
|
|
goto up_prepare_mutex;
|
|
snd_printdd("starting capture pipe for %s\n", subs == capsubs ?
|
|
"self" : "playpipe");
|
|
- if (0 > (err = usX2Y_usbpcm_urbs_start(capsubs)))
|
|
+ if (0 > (err = usx2y_usbpcm_urbs_start(capsubs)))
|
|
goto up_prepare_mutex;
|
|
}
|
|
|
|
if (subs != capsubs) {
|
|
- usX2Y->hwdep_pcm_shm->playback_iso_start = -1;
|
|
- if (atomic_read(&subs->state) < state_PREPARED) {
|
|
- while (usX2Y_iso_frames_per_buffer(runtime, usX2Y) >
|
|
- usX2Y->hwdep_pcm_shm->captured_iso_frames) {
|
|
+ usx2y->hwdep_pcm_shm->playback_iso_start = -1;
|
|
+ if (atomic_read(&subs->state) < STATE_PREPARED) {
|
|
+ while (usx2y_iso_frames_per_buffer(runtime, usx2y) >
|
|
+ usx2y->hwdep_pcm_shm->captured_iso_frames) {
|
|
snd_printdd("Wait: iso_frames_per_buffer=%i,"
|
|
"captured_iso_frames=%i\n",
|
|
- usX2Y_iso_frames_per_buffer(runtime, usX2Y),
|
|
- usX2Y->hwdep_pcm_shm->captured_iso_frames);
|
|
+ usx2y_iso_frames_per_buffer(runtime, usx2y),
|
|
+ usx2y->hwdep_pcm_shm->captured_iso_frames);
|
|
if (msleep_interruptible(10)) {
|
|
err = -ERESTARTSYS;
|
|
goto up_prepare_mutex;
|
|
}
|
|
}
|
|
- if (0 > (err = usX2Y_usbpcm_urbs_start(subs)))
|
|
+ if (0 > (err = usx2y_usbpcm_urbs_start(subs)))
|
|
goto up_prepare_mutex;
|
|
}
|
|
snd_printdd("Ready: iso_frames_per_buffer=%i,captured_iso_frames=%i\n",
|
|
- usX2Y_iso_frames_per_buffer(runtime, usX2Y),
|
|
- usX2Y->hwdep_pcm_shm->captured_iso_frames);
|
|
+ usx2y_iso_frames_per_buffer(runtime, usx2y),
|
|
+ usx2y->hwdep_pcm_shm->captured_iso_frames);
|
|
} else
|
|
- usX2Y->hwdep_pcm_shm->capture_iso_start = -1;
|
|
+ usx2y->hwdep_pcm_shm->capture_iso_start = -1;
|
|
|
|
up_prepare_mutex:
|
|
- mutex_unlock(&usX2Y->pcm_mutex);
|
|
+ mutex_unlock(&usx2y->pcm_mutex);
|
|
return err;
|
|
}
|
|
|
|
-static const struct snd_pcm_hardware snd_usX2Y_4c =
|
|
+static const struct snd_pcm_hardware snd_usx2y_4c =
|
|
{
|
|
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
|
|
SNDRV_PCM_INFO_BLOCK_TRANSFER |
|
|
@@ -549,17 +549,17 @@ static const struct snd_pcm_hardware snd_usX2Y_4c =
|
|
|
|
|
|
|
|
-static int snd_usX2Y_usbpcm_open(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_usbpcm_open(struct snd_pcm_substream *substream)
|
|
{
|
|
- struct snd_usX2Y_substream *subs = ((struct snd_usX2Y_substream **)
|
|
+ struct snd_usx2y_substream *subs = ((struct snd_usx2y_substream **)
|
|
snd_pcm_substream_chip(substream))[substream->stream];
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
|
|
- if (!(subs->usX2Y->chip_status & USX2Y_STAT_CHIP_MMAP_PCM_URBS))
|
|
+ if (!(subs->usx2y->chip_status & USX2Y_STAT_CHIP_MMAP_PCM_URBS))
|
|
return -EBUSY;
|
|
|
|
- runtime->hw = SNDRV_PCM_STREAM_PLAYBACK == substream->stream ? snd_usX2Y_2c :
|
|
- (subs->usX2Y->subs[3] ? snd_usX2Y_4c : snd_usX2Y_2c);
|
|
+ runtime->hw = SNDRV_PCM_STREAM_PLAYBACK == substream->stream ? snd_usx2y_2c :
|
|
+ (subs->usx2y->subs[3] ? snd_usx2y_4c : snd_usx2y_2c);
|
|
runtime->private_data = subs;
|
|
subs->pcm_substream = substream;
|
|
snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_PERIOD_TIME, 1000, 200000);
|
|
@@ -567,35 +567,35 @@ static int snd_usX2Y_usbpcm_open(struct snd_pcm_substream *substream)
|
|
}
|
|
|
|
|
|
-static int snd_usX2Y_usbpcm_close(struct snd_pcm_substream *substream)
|
|
+static int snd_usx2y_usbpcm_close(struct snd_pcm_substream *substream)
|
|
{
|
|
struct snd_pcm_runtime *runtime = substream->runtime;
|
|
- struct snd_usX2Y_substream *subs = runtime->private_data;
|
|
+ struct snd_usx2y_substream *subs = runtime->private_data;
|
|
|
|
subs->pcm_substream = NULL;
|
|
return 0;
|
|
}
|
|
|
|
|
|
-static const struct snd_pcm_ops snd_usX2Y_usbpcm_ops =
|
|
+static const struct snd_pcm_ops snd_usx2y_usbpcm_ops =
|
|
{
|
|
- .open = snd_usX2Y_usbpcm_open,
|
|
- .close = snd_usX2Y_usbpcm_close,
|
|
- .hw_params = snd_usX2Y_pcm_hw_params,
|
|
- .hw_free = snd_usX2Y_usbpcm_hw_free,
|
|
- .prepare = snd_usX2Y_usbpcm_prepare,
|
|
- .trigger = snd_usX2Y_pcm_trigger,
|
|
- .pointer = snd_usX2Y_pcm_pointer,
|
|
+ .open = snd_usx2y_usbpcm_open,
|
|
+ .close = snd_usx2y_usbpcm_close,
|
|
+ .hw_params = snd_usx2y_pcm_hw_params,
|
|
+ .hw_free = snd_usx2y_usbpcm_hw_free,
|
|
+ .prepare = snd_usx2y_usbpcm_prepare,
|
|
+ .trigger = snd_usx2y_pcm_trigger,
|
|
+ .pointer = snd_usx2y_pcm_pointer,
|
|
};
|
|
|
|
|
|
-static int usX2Y_pcms_busy_check(struct snd_card *card)
|
|
+static int usx2y_pcms_busy_check(struct snd_card *card)
|
|
{
|
|
- struct usX2Ydev *dev = usX2Y(card);
|
|
+ struct usx2ydev *dev = usx2y(card);
|
|
int i;
|
|
|
|
for (i = 0; i < dev->pcm_devs * 2; i++) {
|
|
- struct snd_usX2Y_substream *subs = dev->subs[i];
|
|
+ struct snd_usx2y_substream *subs = dev->subs[i];
|
|
if (subs && subs->pcm_substream &&
|
|
SUBSTREAM_BUSY(subs->pcm_substream))
|
|
return -EBUSY;
|
|
@@ -603,102 +603,102 @@ static int usX2Y_pcms_busy_check(struct snd_card *card)
|
|
return 0;
|
|
}
|
|
|
|
-static int snd_usX2Y_hwdep_pcm_open(struct snd_hwdep *hw, struct file *file)
|
|
+static int snd_usx2y_hwdep_pcm_open(struct snd_hwdep *hw, struct file *file)
|
|
{
|
|
struct snd_card *card = hw->card;
|
|
int err;
|
|
|
|
- mutex_lock(&usX2Y(card)->pcm_mutex);
|
|
- err = usX2Y_pcms_busy_check(card);
|
|
+ mutex_lock(&usx2y(card)->pcm_mutex);
|
|
+ err = usx2y_pcms_busy_check(card);
|
|
if (!err)
|
|
- usX2Y(card)->chip_status |= USX2Y_STAT_CHIP_MMAP_PCM_URBS;
|
|
- mutex_unlock(&usX2Y(card)->pcm_mutex);
|
|
+ usx2y(card)->chip_status |= USX2Y_STAT_CHIP_MMAP_PCM_URBS;
|
|
+ mutex_unlock(&usx2y(card)->pcm_mutex);
|
|
return err;
|
|
}
|
|
|
|
|
|
-static int snd_usX2Y_hwdep_pcm_release(struct snd_hwdep *hw, struct file *file)
|
|
+static int snd_usx2y_hwdep_pcm_release(struct snd_hwdep *hw, struct file *file)
|
|
{
|
|
struct snd_card *card = hw->card;
|
|
int err;
|
|
|
|
- mutex_lock(&usX2Y(card)->pcm_mutex);
|
|
- err = usX2Y_pcms_busy_check(card);
|
|
+ mutex_lock(&usx2y(card)->pcm_mutex);
|
|
+ err = usx2y_pcms_busy_check(card);
|
|
if (!err)
|
|
- usX2Y(hw->card)->chip_status &= ~USX2Y_STAT_CHIP_MMAP_PCM_URBS;
|
|
- mutex_unlock(&usX2Y(card)->pcm_mutex);
|
|
+ usx2y(hw->card)->chip_status &= ~USX2Y_STAT_CHIP_MMAP_PCM_URBS;
|
|
+ mutex_unlock(&usx2y(card)->pcm_mutex);
|
|
return err;
|
|
}
|
|
|
|
|
|
-static void snd_usX2Y_hwdep_pcm_vm_open(struct vm_area_struct *area)
|
|
+static void snd_usx2y_hwdep_pcm_vm_open(struct vm_area_struct *area)
|
|
{
|
|
}
|
|
|
|
|
|
-static void snd_usX2Y_hwdep_pcm_vm_close(struct vm_area_struct *area)
|
|
+static void snd_usx2y_hwdep_pcm_vm_close(struct vm_area_struct *area)
|
|
{
|
|
}
|
|
|
|
|
|
-static vm_fault_t snd_usX2Y_hwdep_pcm_vm_fault(struct vm_fault *vmf)
|
|
+static vm_fault_t snd_usx2y_hwdep_pcm_vm_fault(struct vm_fault *vmf)
|
|
{
|
|
unsigned long offset;
|
|
void *vaddr;
|
|
|
|
offset = vmf->pgoff << PAGE_SHIFT;
|
|
- vaddr = (char *)((struct usX2Ydev *)vmf->vma->vm_private_data)->hwdep_pcm_shm + offset;
|
|
+ vaddr = (char *)((struct usx2ydev *)vmf->vma->vm_private_data)->hwdep_pcm_shm + offset;
|
|
vmf->page = virt_to_page(vaddr);
|
|
get_page(vmf->page);
|
|
return 0;
|
|
}
|
|
|
|
|
|
-static const struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = {
|
|
- .open = snd_usX2Y_hwdep_pcm_vm_open,
|
|
- .close = snd_usX2Y_hwdep_pcm_vm_close,
|
|
- .fault = snd_usX2Y_hwdep_pcm_vm_fault,
|
|
+static const struct vm_operations_struct snd_usx2y_hwdep_pcm_vm_ops = {
|
|
+ .open = snd_usx2y_hwdep_pcm_vm_open,
|
|
+ .close = snd_usx2y_hwdep_pcm_vm_close,
|
|
+ .fault = snd_usx2y_hwdep_pcm_vm_fault,
|
|
};
|
|
|
|
|
|
-static int snd_usX2Y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, struct vm_area_struct *area)
|
|
+static int snd_usx2y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, struct vm_area_struct *area)
|
|
{
|
|
unsigned long size = (unsigned long)(area->vm_end - area->vm_start);
|
|
- struct usX2Ydev *usX2Y = hw->private_data;
|
|
+ struct usx2ydev *usx2y = hw->private_data;
|
|
|
|
- if (!(usX2Y->chip_status & USX2Y_STAT_CHIP_INIT))
|
|
+ if (!(usx2y->chip_status & USX2Y_STAT_CHIP_INIT))
|
|
return -EBUSY;
|
|
|
|
/* if userspace tries to mmap beyond end of our buffer, fail */
|
|
- if (size > PAGE_ALIGN(sizeof(struct snd_usX2Y_hwdep_pcm_shm))) {
|
|
- snd_printd("%lu > %lu\n", size, (unsigned long)sizeof(struct snd_usX2Y_hwdep_pcm_shm));
|
|
+ if (size > PAGE_ALIGN(sizeof(struct snd_usx2y_hwdep_pcm_shm))) {
|
|
+ snd_printd("%lu > %lu\n", size, (unsigned long)sizeof(struct snd_usx2y_hwdep_pcm_shm));
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (!usX2Y->hwdep_pcm_shm) {
|
|
+ if (!usx2y->hwdep_pcm_shm) {
|
|
return -ENODEV;
|
|
}
|
|
- area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops;
|
|
+ area->vm_ops = &snd_usx2y_hwdep_pcm_vm_ops;
|
|
area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
|
|
area->vm_private_data = hw->private_data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
-static void snd_usX2Y_hwdep_pcm_private_free(struct snd_hwdep *hwdep)
|
|
+static void snd_usx2y_hwdep_pcm_private_free(struct snd_hwdep *hwdep)
|
|
{
|
|
- struct usX2Ydev *usX2Y = hwdep->private_data;
|
|
- if (NULL != usX2Y->hwdep_pcm_shm)
|
|
- free_pages_exact(usX2Y->hwdep_pcm_shm, sizeof(struct snd_usX2Y_hwdep_pcm_shm));
|
|
+ struct usx2ydev *usx2y = hwdep->private_data;
|
|
+ if (NULL != usx2y->hwdep_pcm_shm)
|
|
+ free_pages_exact(usx2y->hwdep_pcm_shm, sizeof(struct snd_usx2y_hwdep_pcm_shm));
|
|
}
|
|
|
|
|
|
-int usX2Y_hwdep_pcm_new(struct snd_card *card)
|
|
+int usx2y_hwdep_pcm_new(struct snd_card *card)
|
|
{
|
|
int err;
|
|
struct snd_hwdep *hw;
|
|
struct snd_pcm *pcm;
|
|
- struct usb_device *dev = usX2Y(card)->dev;
|
|
+ struct usb_device *dev = usx2y(card)->dev;
|
|
if (1 != nr_of_packs())
|
|
return 0;
|
|
|
|
@@ -706,11 +706,11 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card)
|
|
return err;
|
|
|
|
hw->iface = SNDRV_HWDEP_IFACE_USX2Y_PCM;
|
|
- hw->private_data = usX2Y(card);
|
|
- hw->private_free = snd_usX2Y_hwdep_pcm_private_free;
|
|
- hw->ops.open = snd_usX2Y_hwdep_pcm_open;
|
|
- hw->ops.release = snd_usX2Y_hwdep_pcm_release;
|
|
- hw->ops.mmap = snd_usX2Y_hwdep_pcm_mmap;
|
|
+ hw->private_data = usx2y(card);
|
|
+ hw->private_free = snd_usx2y_hwdep_pcm_private_free;
|
|
+ hw->ops.open = snd_usx2y_hwdep_pcm_open;
|
|
+ hw->ops.release = snd_usx2y_hwdep_pcm_release;
|
|
+ hw->ops.mmap = snd_usx2y_hwdep_pcm_mmap;
|
|
hw->exclusive = 1;
|
|
sprintf(hw->name, "/dev/bus/usb/%03d/%03d/hwdeppcm", dev->bus->busnum, dev->devnum);
|
|
|
|
@@ -718,10 +718,10 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card)
|
|
if (err < 0) {
|
|
return err;
|
|
}
|
|
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_usX2Y_usbpcm_ops);
|
|
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usX2Y_usbpcm_ops);
|
|
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_usx2y_usbpcm_ops);
|
|
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usx2y_usbpcm_ops);
|
|
|
|
- pcm->private_data = usX2Y(card)->subs;
|
|
+ pcm->private_data = usx2y(card)->subs;
|
|
pcm->info_flags = 0;
|
|
|
|
sprintf(pcm->name, NAME_ALLCAPS" hwdep Audio");
|
|
@@ -739,7 +739,7 @@ int usX2Y_hwdep_pcm_new(struct snd_card *card)
|
|
|
|
#else
|
|
|
|
-int usX2Y_hwdep_pcm_new(struct snd_card *card)
|
|
+int usx2y_hwdep_pcm_new(struct snd_card *card)
|
|
{
|
|
return 0;
|
|
}
|
|
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.h b/sound/usb/usx2y/usx2yhwdeppcm.h
|
|
index eb5a46466f0e6..731b1c5a34741 100644
|
|
--- a/sound/usb/usx2y/usx2yhwdeppcm.h
|
|
+++ b/sound/usb/usx2y/usx2yhwdeppcm.h
|
|
@@ -4,7 +4,7 @@
|
|
#define MAXSTRIDE 3
|
|
|
|
#define SSS (((MAXPACK*MAXBUFFERMS*MAXSTRIDE + 4096) / 4096) * 4096)
|
|
-struct snd_usX2Y_hwdep_pcm_shm {
|
|
+struct snd_usx2y_hwdep_pcm_shm {
|
|
char playback[SSS];
|
|
char capture0x8[SSS];
|
|
char capture0xA[SSS];
|
|
@@ -20,4 +20,4 @@ struct snd_usX2Y_hwdep_pcm_shm {
|
|
int capture_iso_start;
|
|
};
|
|
|
|
-int usX2Y_hwdep_pcm_new(struct snd_card *card);
|
|
+int usx2y_hwdep_pcm_new(struct snd_card *card);
|
|
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
|
|
index aba12a4d488ef..9321bd0e2f763 100644
|
|
--- a/tools/perf/util/parse-events.y
|
|
+++ b/tools/perf/util/parse-events.y
|
|
@@ -316,7 +316,7 @@ event_pmu_name opt_pmu_config
|
|
if (!strncmp(name, "uncore_", 7) &&
|
|
strncmp($1, "uncore_", 7))
|
|
name += 7;
|
|
- if (!fnmatch(pattern, name, 0)) {
|
|
+ if (!perf_pmu__match(pattern, name, $1)) {
|
|
if (parse_events_copy_term_list(orig_terms, &terms))
|
|
CLEANUP_YYABORT;
|
|
if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false))
|
|
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
|
|
index 88c8ecdc60b0e..44b90d638ad5f 100644
|
|
--- a/tools/perf/util/pmu.c
|
|
+++ b/tools/perf/util/pmu.c
|
|
@@ -3,6 +3,7 @@
|
|
#include <linux/compiler.h>
|
|
#include <linux/string.h>
|
|
#include <linux/zalloc.h>
|
|
+#include <linux/ctype.h>
|
|
#include <subcmd/pager.h>
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
@@ -17,6 +18,7 @@
|
|
#include <locale.h>
|
|
#include <regex.h>
|
|
#include <perf/cpumap.h>
|
|
+#include <fnmatch.h>
|
|
#include "debug.h"
|
|
#include "evsel.h"
|
|
#include "pmu.h"
|
|
@@ -740,6 +742,27 @@ struct pmu_events_map *__weak pmu_events_map__find(void)
|
|
return perf_pmu__find_map(NULL);
|
|
}
|
|
|
|
+static bool perf_pmu__valid_suffix(char *pmu_name, char *tok)
|
|
+{
|
|
+ char *p;
|
|
+
|
|
+ if (strncmp(pmu_name, tok, strlen(tok)))
|
|
+ return false;
|
|
+
|
|
+ p = pmu_name + strlen(tok);
|
|
+ if (*p == 0)
|
|
+ return true;
|
|
+
|
|
+ if (*p != '_')
|
|
+ return false;
|
|
+
|
|
+ ++p;
|
|
+ if (*p == 0 || !isdigit(*p))
|
|
+ return false;
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
|
|
{
|
|
char *tmp = NULL, *tok, *str;
|
|
@@ -768,7 +791,7 @@ bool pmu_uncore_alias_match(const char *pmu_name, const char *name)
|
|
*/
|
|
for (; tok; name += strlen(tok), tok = strtok_r(NULL, ",", &tmp)) {
|
|
name = strstr(name, tok);
|
|
- if (!name) {
|
|
+ if (!name || !perf_pmu__valid_suffix((char *)name, tok)) {
|
|
res = false;
|
|
goto out;
|
|
}
|
|
@@ -1872,3 +1895,14 @@ bool perf_pmu__has_hybrid(void)
|
|
|
|
return !list_empty(&perf_pmu__hybrid_pmus);
|
|
}
|
|
+
|
|
+int perf_pmu__match(char *pattern, char *name, char *tok)
|
|
+{
|
|
+ if (fnmatch(pattern, name, 0))
|
|
+ return -1;
|
|
+
|
|
+ if (tok && !perf_pmu__valid_suffix(name, tok))
|
|
+ return -1;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
|
|
index a790ef758171f..926da483a141c 100644
|
|
--- a/tools/perf/util/pmu.h
|
|
+++ b/tools/perf/util/pmu.h
|
|
@@ -133,5 +133,6 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config,
|
|
char *name);
|
|
|
|
bool perf_pmu__has_hybrid(void);
|
|
+int perf_pmu__match(char *pattern, char *name, char *tok);
|
|
|
|
#endif /* __PMU_H */
|
|
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
|
|
index 3dfc543327af8..18dbd9cddda8b 100644
|
|
--- a/tools/perf/util/scripting-engines/trace-event-python.c
|
|
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
|
|
@@ -687,7 +687,7 @@ static void set_sample_datasrc_in_dict(PyObject *dict,
|
|
_PyUnicode_FromString(decode));
|
|
}
|
|
|
|
-static int regs_map(struct regs_dump *regs, uint64_t mask, char *bf, int size)
|
|
+static void regs_map(struct regs_dump *regs, uint64_t mask, char *bf, int size)
|
|
{
|
|
unsigned int i = 0, r;
|
|
int printed = 0;
|
|
@@ -695,7 +695,7 @@ static int regs_map(struct regs_dump *regs, uint64_t mask, char *bf, int size)
|
|
bf[0] = 0;
|
|
|
|
if (!regs || !regs->regs)
|
|
- return 0;
|
|
+ return;
|
|
|
|
for_each_set_bit(r, (unsigned long *) &mask, sizeof(mask) * 8) {
|
|
u64 val = regs->regs[i++];
|
|
@@ -704,8 +704,6 @@ static int regs_map(struct regs_dump *regs, uint64_t mask, char *bf, int size)
|
|
"%5s:0x%" PRIx64 " ",
|
|
perf_reg_name(r), val);
|
|
}
|
|
-
|
|
- return printed;
|
|
}
|
|
|
|
static void set_regs_in_dict(PyObject *dict,
|
|
@@ -713,7 +711,16 @@ static void set_regs_in_dict(PyObject *dict,
|
|
struct evsel *evsel)
|
|
{
|
|
struct perf_event_attr *attr = &evsel->core.attr;
|
|
- char bf[512];
|
|
+
|
|
+ /*
|
|
+ * Here value 28 is a constant size which can be used to print
|
|
+ * one register value and its corresponds to:
|
|
+ * 16 chars is to specify 64 bit register in hexadecimal.
|
|
+ * 2 chars is for appending "0x" to the hexadecimal value and
|
|
+ * 10 chars is for register name.
|
|
+ */
|
|
+ int size = __sw_hweight64(attr->sample_regs_intr) * 28;
|
|
+ char bf[size];
|
|
|
|
regs_map(&sample->intr_regs, attr->sample_regs_intr, bf, sizeof(bf));
|
|
|
|
diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c
|
|
index d8812f27648ca..d31f54ac4e982 100644
|
|
--- a/tools/testing/selftests/kvm/set_memory_region_test.c
|
|
+++ b/tools/testing/selftests/kvm/set_memory_region_test.c
|
|
@@ -377,7 +377,8 @@ static void test_add_max_memory_regions(void)
|
|
(max_mem_slots - 1), MEM_REGION_SIZE >> 10);
|
|
|
|
mem = mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment,
|
|
- PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
|
|
+ PROT_READ | PROT_WRITE,
|
|
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
|
|
TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host");
|
|
mem_aligned = (void *)(((size_t) mem + alignment - 1) & ~(alignment - 1));
|
|
|
|
diff --git a/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c b/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
|
|
index fc5bf4870d8e6..01e827c31169d 100644
|
|
--- a/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
|
|
+++ b/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
|
|
@@ -50,8 +50,6 @@ static int no_handler_test(void)
|
|
|
|
event_close(&event);
|
|
|
|
- dump_ebb_state();
|
|
-
|
|
/* The real test is that we never took an EBB at 0x0 */
|
|
|
|
return 0;
|
|
diff --git a/tools/testing/selftests/timers/rtcpie.c b/tools/testing/selftests/timers/rtcpie.c
|
|
index 47b5bad1b3933..4ef2184f15588 100644
|
|
--- a/tools/testing/selftests/timers/rtcpie.c
|
|
+++ b/tools/testing/selftests/timers/rtcpie.c
|
|
@@ -18,6 +18,8 @@
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
+#include "../kselftest.h"
|
|
+
|
|
/*
|
|
* This expects the new RTC class driver framework, working with
|
|
* clocks that will often not be clones of what the PC-AT had.
|
|
@@ -35,8 +37,14 @@ int main(int argc, char **argv)
|
|
switch (argc) {
|
|
case 2:
|
|
rtc = argv[1];
|
|
- /* FALLTHROUGH */
|
|
+ break;
|
|
case 1:
|
|
+ fd = open(default_rtc, O_RDONLY);
|
|
+ if (fd == -1) {
|
|
+ printf("Default RTC %s does not exist. Test Skipped!\n", default_rtc);
|
|
+ exit(KSFT_SKIP);
|
|
+ }
|
|
+ close(fd);
|
|
break;
|
|
default:
|
|
fprintf(stderr, "usage: rtctest [rtcdev] [d]\n");
|
|
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
|
|
index f08f5e82460b1..0be80c213f7f2 100644
|
|
--- a/virt/kvm/coalesced_mmio.c
|
|
+++ b/virt/kvm/coalesced_mmio.c
|
|
@@ -186,7 +186,6 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
|
|
coalesced_mmio_in_range(dev, zone->addr, zone->size)) {
|
|
r = kvm_io_bus_unregister_dev(kvm,
|
|
zone->pio ? KVM_PIO_BUS : KVM_MMIO_BUS, &dev->dev);
|
|
- kvm_iodevice_destructor(&dev->dev);
|
|
|
|
/*
|
|
* On failure, unregister destroys all devices on the
|
|
@@ -196,6 +195,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
|
|
*/
|
|
if (r)
|
|
break;
|
|
+ kvm_iodevice_destructor(&dev->dev);
|
|
}
|
|
}
|
|
|