[PATCH v3 19/20] ARM: dts: aspeed-plametto: Add flash layout and fix memory node
The OpenBMC flash layout is used by Palmetto systems.
Add the unit name to the memory node to fix a warning with W=1.
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
v3:
- Added memory node unit name
---
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index a8f0c046e83e..4379d09a261f 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -12,7 +12,7 @@
bootargs = "console=ttyS4,115200 earlyprintk";
};
- memory {
+ memory@4000 {
reg = <0x4000 0x2000>;
};
@@ -34,6 +34,7 @@
status = "okay";
m25p,fast-read;
label = "bmc";
+#include "openbmc-flash-layout.dtsi"
};
};
--
2.15.1
[PATCH v3 17/20] ARM: dts: aspeed: Add Qanta Q71L BMC machine
From: Rick Altherr
The Qanta Q71L BMC is an ASPEED ast2400 based BMC that is part of a
Qanta x86 server.
This adds the device tree description for most upstream components. It
is a squashed commit from the OpenBMC kernel tree.
Signed-off-by: Peter Hanson
Signed-off-by: Andrew Jeffery
Signed-off-by: Patrick Venture
Signed-off-by: Rick Altherr
Signed-off-by: Joel Stanley
---
v3:
- Add GPIO include
- Add unit name to memory node to fix warning
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 458 +++
2 files changed, 460 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 48c55f307aa9..5ab5d9169511 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1106,5 +1106,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-opp-palmetto.dtb \
aspeed-bmc-opp-romulus.dtb \
aspeed-bmc-opp-witherspoon.dtb \
- aspeed-bmc-opp-zaius.dtb
+ aspeed-bmc-opp-zaius.dtb \
+ aspeed-bmc-quanta-q71l.dtb
endif
diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
new file mode 100644
index ..76aa6ea1f988
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
@@ -0,0 +1,458 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+#include "aspeed-g4.dtsi"
+#include
+
+/ {
+ model = "Quanta Q71L BMC";
+ compatible = "quanta,q71l-bmc", "aspeed,ast2400";
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "console=ttyS4,115200 earlyprintk";
+ };
+
+ memory@4000 {
+ reg = <0x4000 0x800>;
+ };
+
+ reserved-memory {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ vga_memory: framebuffer@4780 {
+ no-map;
+ reg = <0x4780 0x0080>; /* 8MB */
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ heartbeat {
+ gpios = <&gpio ASPEED_GPIO(B, 0) GPIO_ACTIVE_LOW>;
+ };
+
+ power {
+ gpios = <&gpio ASPEED_GPIO(B, 2) GPIO_ACTIVE_LOW>;
+ };
+
+ identify {
+ gpios = <&gpio ASPEED_GPIO(B, 3) GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
+ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
+ <&adc 8>, <&adc 9>, <&adc 10>;
+ };
+
+ iio-hwmon-battery {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 11>;
+ };
+
+ i2c1mux: i2cmux {
+ compatible = "i2c-mux-gpio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* mux-gpios = <&sgpio 10 GPIO_ACTIVE_HIGH> */
+ i2c-parent = <&i2c1>;
+ };
+};
+
+&fmc {
+ status = "okay";
+ flash@0 {
+ status = "okay";
+ label = "bmc";
+ m25p,fast-read;
+#include "openbmc-flash-layout.dtsi"
+ };
+};
+
+&spi {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi1_default>;
+
+ flash@0 {
+ status = "okay";
+ m25p,fast-read;
+ label = "pnor";
+ };
+};
+
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_vgahs_default &pinctrl_vgavs_default
+ &pinctrl_ddcclk_default &pinctrl_ddcdat_default>;
+};
+
+&lpc_snoop {
+ status = "okay";
+ snoop-ports = <0x80>;
+};
+
+&mac0 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rmii1_default>;
+ use-ncsi;
+};
+
+&mac1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
+};
+
+&uart5 {
+ status = "okay";
+};
+
+&i2c0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+
+ /* temp2 inlet */
+ tmp75@4c {
+ compatible = "ti,tmp75";
+ reg = <0x4c>;
+ };
+
+ /* temp3 */
+ tmp75@4e {
+ compatible = "ti,tmp75";
+ reg = <0x4e>;
+ };
+
+ /* temp1 */
+ tmp75@4f {
+ compatible = "ti,tmp75";
+ reg = <0x4f>;
+ };
+
+ /* Baseboard FRU */
+ eeprom@54 {
+ compatible = "atmel,24c64";
+ reg = <0x54>;
+ };
+
+ /* FP FRU */
+ eeprom@57 {
+ compatible = "atmel,24c64";
+ reg = <0x57>;
+ };
+};
+
+&i2c2 {
+ status = "o
[PATCH v3 18/20] ARM: dts: aspeed-romulus: Update Romulus system
- Fix incorrect RAM size
- Remove alias; these are now specified in the dtsi
- Add newly upstreamed devices
- Include OpenBMC flash layout
Signed-off-by: Joel Stanley
---
v3:
- Add GPIO include
- Fix duplicate fmc and spi nodes
- Add unit name for memory node to fix warning
---
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 133 +--
1 file changed, 126 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index a7a9386f964d..623b6ab42021 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -1,23 +1,19 @@
// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
-
#include "aspeed-g5.dtsi"
+#include
/ {
model = "Romulus BMC";
compatible = "ibm,romulus-bmc", "aspeed,ast2500";
- aliases {
- serial4 = &uart5;
- };
-
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
};
- memory {
- reg = <0x8000 0x4000>;
+ memory@8000 {
+ reg = <0x8000 0x2000>;
};
reserved-memory {
@@ -29,6 +25,49 @@
no-map;
reg = <0xbf00 0x0100>; /* 16M */
};
+
+ flash_memory: region@9800 {
+ no-map;
+ reg = <0x9800 0x0400>; /* 64M */
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ fault {
+ gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>;
+ };
+
+ identify {
+ gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+ };
+
+ power {
+ gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ fsi: gpio-fsi {
+ compatible = "fsi-master-gpio", "fsi-master";
+ #address-cells = <2>;
+ #size-cells = <0>;
+
+ clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
+ data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;
+ mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;
+ enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
+ trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ checkstop {
+ label = "checkstop";
+ gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
};
};
@@ -38,6 +77,7 @@
status = "okay";
m25p,fast-read;
label = "bmc";
+#include "openbmc-flash-layout.dtsi"
};
};
@@ -53,6 +93,12 @@
};
};
+&lpc_ctrl {
+ status = "okay";
+ memory-region = <&flash_memory>;
+ flash = <&spi1>;
+};
+
&uart1 {
/* Rear RS-232 connector */
status = "okay";
@@ -81,6 +127,10 @@
pinctrl-0 = <&pinctrl_rmii1_default>;
};
+&i2c1 {
+ status = "okay";
+};
+
&i2c2 {
status = "okay";
};
@@ -133,8 +183,77 @@
&i2c12 {
status = "okay";
+
+ max31785@52 {
+ compatible = "maxim,max31785";
+ reg = <0x52>;
+ };
+};
+
+&gpio {
+ nic_func_mode0 {
+ gpio-hog;
+ gpios = ;
+ output-low;
+ line-name = "nic_func_mode0";
+ };
+ nic_func_mode1 {
+ gpio-hog;
+ gpios = ;
+ output-low;
+ line-name = "nic_func_mode1";
+ };
};
&vuart {
status = "okay";
};
+
+&gfx {
+ status = "okay";
+};
+
+&pinctrl {
+ aspeed,external-nodes = <&gfx &lhc>;
+};
+
+&pwm_tacho {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>;
+
+ fan@0 {
+ reg = <0x00>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x08>;
+ };
+
+ fan@1 {
+ reg = <0x00>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x09>;
+ };
+
+ fan@2 {
+ reg = <0x01>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x0a>;
+ };
+
+ fan@3 {
+ reg = <0x01>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x0b>;
+ };
+
+ fan@4 {
+ reg = <0x00>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x0c>;
+ };
+
+ fan@5 {
+ reg = <0x00>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x0d>;
+ };
+
+ fan@6 {
+ reg = <0x01>;
+ aspeed,fan-tach-ch = /bits/ 8 <0x0e>;
+ };
+};
--
2.15.1
Re: [PATCH v5 15/15] devicetree: bindings: Document qcom,pvs
On 19-12-17, 21:25, Sricharan R wrote:
> + cpu@0 {
> + compatible = "qcom,krait";
> + enable-method = "qcom,kpss-acc-v1";
> + device_type = "cpu";
> + reg = <0>;
> + qcom,acc = <&acc0>;
> + qcom,saw = <&saw0>;
> + clocks = <&kraitcc 0>;
> + clock-names = "cpu";
> + cpu-supply = <&smb208_s2a>;
> + operating-points-v2 = <&cpu_opp_table>;
> + };
> +
> + qcom,pvs {
> + qcom,pvs-format-a;
> + };
Not sure what Rob is going to say on that :)
> +
> +
> + cpu_opp_table: opp_table {
> + compatible = "operating-points-v2";
> +
> + /*
> + * Missing opp-shared property means CPUs switch DVFS states
> + * independently.
> + */
> +
> + opp-14 {
> + opp-hz = /bits/ 64 <14>;
> + opp-microvolt-speed0-pvs0-v0 = <125>;
Why speed0 and v0 in all the names ?
--
viresh
[PATCH v3 14/20] ARM: dts: aspeed: Sort ASPEED entries in makefile
In preperation for adding more boards. Reviewed-by: Cédric Le Goater Signed-off-by: Joel Stanley --- arch/arm/boot/dts/Makefile | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d0381e9caf21..5d1e9d37bf3a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1101,7 +1101,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt8127-moose.dtb \ mt8135-evbp1.dtb dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb -dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \ - aspeed-bmc-opp-romulus.dtb \ - aspeed-ast2500-evb.dtb +dtb-$(CONFIG_ARCH_ASPEED) += \ + aspeed-ast2500-evb.dtb \ + aspeed-bmc-opp-palmetto.dtb \ + aspeed-bmc-opp-romulus.dtb endif -- 2.15.1
[PATCH v3 16/20] ARM: dts: aspeed: Add Ingrasys Zaius BMC machine
From: Xo Wang
Zaius is a POWER9 platform announced at OpenPOWER Summit 2016. This adds
basic DTS support for its AST2500 BMC.
This adds the device tree description for most upstream components. It
is a squashed commit of all of the patches from the OpenBMC kernel tree.
Signed-off-by: Xo Wang
Signed-off-by: Patrick Venture
Signed-off-by: Robert Lippert
Signed-off-by: Peter Hanson
Signed-off-by: Jeremy Kerr
Signed-off-by: Cédric Le Goater
Signed-off-by: Rick Altherr
Signed-off-by: Joel Stanley
---
v3:
- Add GPIO include
- Add unit name for memory node to fix warning
---
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 426 +
2 files changed, 428 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 15a9207319c1..48c55f307aa9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1105,6 +1105,6 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-ast2500-evb.dtb \
aspeed-bmc-opp-palmetto.dtb \
aspeed-bmc-opp-romulus.dtb \
- aspeed-bmc-opp-witherspoon.dtb
-
+ aspeed-bmc-opp-witherspoon.dtb \
+ aspeed-bmc-opp-zaius.dtb
endif
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
new file mode 100644
index ..c881484a85cf
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -0,0 +1,426 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+#include "aspeed-g5.dtsi"
+#include
+
+/ {
+ model = "Zaius BMC";
+ compatible = "ingrasys,zaius-bmc", "aspeed,ast2500";
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "console=ttyS4,115200 earlyprintk";
+ };
+
+ memory@8000 {
+ reg = <0x8000 0x4000>;
+ };
+
+ reserved-memory {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ flash_memory: region@9800 {
+ no-map;
+ reg = <0x9800 0x0400>; /* 64M */
+ };
+ };
+
+ onewire0 {
+ compatible = "w1-gpio";
+ gpios = <&gpio ASPEED_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
+ };
+
+ onewire1 {
+ compatible = "w1-gpio";
+ gpios = <&gpio ASPEED_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
+ };
+
+ onewire2 {
+ compatible = "w1-gpio";
+ gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+ };
+
+ onewire3 {
+ compatible = "w1-gpio";
+ gpios = <&gpio ASPEED_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+
+ checkstop {
+ label = "checkstop";
+ gpios = <&gpio ASPEED_GPIO(F, 7) GPIO_ACTIVE_LOW>;
+ linux,code = ;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ sys_boot_status {
+ label = "System boot status";
+ gpios = <&gpio ASPEED_GPIO(D, 5) GPIO_ACTIVE_LOW>;
+ };
+
+ attention {
+ label = "Attention";
+ gpios = <&gpio ASPEED_GPIO(D, 6) GPIO_ACTIVE_LOW>;
+ };
+
+ plt_fault {
+ label = "Platform fault";
+ gpios = <&gpio ASPEED_GPIO(D, 7) GPIO_ACTIVE_LOW>;
+ };
+
+ hdd_fault {
+ label = "Onboard drive fault";
+ gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ fsi: gpio-fsi {
+ compatible = "fsi-master-gpio", "fsi-master";
+ #address-cells = <2>;
+ #size-cells = <0>;
+
+ trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>;
+ enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
+ clock-gpios = <&gpio ASPEED_GPIO(G, 0) GPIO_ACTIVE_HIGH>;
+ data-gpios = <&gpio ASPEED_GPIO(G, 1) GPIO_ACTIVE_HIGH>;
+ mux-gpios = <&gpio ASPEED_GPIO(P, 6) GPIO_ACTIVE_HIGH>;
+ };
+
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
+ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
+ <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
+ <&adc 13>, <&adc 14>, <&adc 15>;
+ };
+
+ iio-hwmon-battery {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 12>;
+ };
+
+};
+
+&fmc {
+ status = "okay";
+
+ flash@0 {
+ status = "okay";
+ label = "bmc";
+ m2
[PATCH v3 15/20] ARM: dts: aspeed: Add Witherspoon BMC machine
The Witherspoon BMC is an ASPEED ast2500 based BMC that is part of an
OpenPower Power9 server.
This adds the device tree description for most upstream components. It
is a squashed commit from the OpenBMC kernel tree.
Signed-off-by: Brandon Wyman
Signed-off-by: Matt Spinler
Signed-off-by: Brad Bishop
Signed-off-by: Edward A. James
Signed-off-by: Cédric Le Goater
Signed-off-by: Andrew Jeffery
Reviewed-by: Brandon Wyman
Signed-off-by: Joel Stanley
---
v2:
- Add Brandon's reviewed-by tag
v3:
- Add GPIO include
- Add unit name for memory node to fix warning
---
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 548 +++
2 files changed, 551 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5d1e9d37bf3a..15a9207319c1 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1104,5 +1104,7 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-ast2500-evb.dtb \
aspeed-bmc-opp-palmetto.dtb \
- aspeed-bmc-opp-romulus.dtb
+ aspeed-bmc-opp-romulus.dtb \
+ aspeed-bmc-opp-witherspoon.dtb
+
endif
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
new file mode 100644
index ..5f9049d2c4c3
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -0,0 +1,548 @@
+// SPDX-License-Identifier: GPL-2.0+
+/dts-v1/;
+#include "aspeed-g5.dtsi"
+#include
+#include
+
+/ {
+ model = "Witherspoon BMC";
+ compatible = "ibm,witherspoon-bmc", "aspeed,ast2500";
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "console=ttyS4,115200 earlyprintk";
+ };
+
+ memory@8000 {
+ reg = <0x8000 0x2000>;
+ };
+
+ reserved-memory {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ flash_memory: region@9800 {
+ no-map;
+ reg = <0x9800 0x0400>; /* 64M */
+ };
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <1000>;
+
+ fan0-presence {
+ label = "fan0-presence";
+ gpios = <&pca0 4 GPIO_ACTIVE_LOW>;
+ linux,code = <4>;
+ };
+
+ fan1-presence {
+ label = "fan1-presence";
+ gpios = <&pca0 5 GPIO_ACTIVE_LOW>;
+ linux,code = <5>;
+ };
+
+ fan2-presence {
+ label = "fan2-presence";
+ gpios = <&pca0 6 GPIO_ACTIVE_LOW>;
+ linux,code = <6>;
+ };
+
+ fan3-presence {
+ label = "fan3-presence";
+ gpios = <&pca0 7 GPIO_ACTIVE_LOW>;
+ linux,code = <7>;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ fan0 {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 0 GPIO_ACTIVE_LOW>;
+ };
+
+ fan1 {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 1 GPIO_ACTIVE_LOW>;
+ };
+
+ fan2 {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 2 GPIO_ACTIVE_LOW>;
+ };
+
+ fan3 {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 3 GPIO_ACTIVE_LOW>;
+ };
+
+ front-fault {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 13 GPIO_ACTIVE_LOW>;
+ };
+
+ front-power {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 14 GPIO_ACTIVE_LOW>;
+ };
+
+ front-id {
+ retain-state-shutdown;
+ default-state = "keep";
+ gpios = <&pca0 15 GPIO_ACTIVE_LOW>;
+ };
+
+ rear-fault {
+ gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>;
+ };
+
+ rear-id {
+ gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>;
+
[PATCH v3 13/20] ARM: dts: Add OpenBMC flash layout
This is a layout used by OpenBMC systems. It describes the fixed flash
layout of a 32MB mtd device.
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
v3:
- Remove leading zeros to fix warning
---
arch/arm/boot/dts/openbmc-flash-layout.dtsi | 32 +
1 file changed, 32 insertions(+)
create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi
diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi
b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
new file mode 100644
index ..6c26524e93e1
--- /dev/null
+++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ u-boot@0 {
+ reg = <0x0 0x6>;
+ label = "u-boot";
+ };
+
+ u-boot-env@6 {
+ reg = <0x6 0x2>;
+ label = "u-boot-env";
+ };
+
+ kernel@8 {
+ reg = <0x8 0x44>;
+ label = "kernel";
+ };
+
+ rofs@c {
+ reg = <0x4c 0x174>;
+ label = "rofs";
+ };
+
+ rwfs@1c0 {
+ reg = <0x1c0 0x40>;
+ label = "rwfs";
+ };
+};
--
2.15.1
[PATCH v3 10/20] ARM: dts: aspeed: Add LPC Snoop device
LPC snoop hardware on the ASPEED BMC, used for monitoring
host I/O port activity.
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++
arch/arm/boot/dts/aspeed-g5.dtsi | 6 ++
2 files changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 91aea96c10c8..e8a61fc3956d 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -237,6 +237,13 @@
status = "disabled";
};
+ lpc_snoop: lpc-snoop@0 {
+ compatible =
"aspeed,ast2400-lpc-snoop";
+ reg = <0x0 0x80>;
+ interrupts = <8>;
+ status = "disabled";
+ };
+
lhc: lhc@20 {
compatible =
"aspeed,ast2400-lhc";
reg = <0x20 0x24 0x48 0x8>;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index af3869ec87bb..d558091aa92b 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -288,6 +288,12 @@
status = "disabled";
};
+ lpc_snoop: lpc-snoop@0 {
+ compatible =
"aspeed,ast2500-lpc-snoop";
+ reg = <0x0 0x80>;
+ interrupts = <8>;
+ status = "disabled";
+ };
lhc: lhc@20 {
compatible =
"aspeed,ast2500-lhc";
--
2.15.1
[PATCH v3 11/20] ARM: dts: aspeed: Remove skeleton.dtsi
We don't require it for any of the ASPEED systems.
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-g4.dtsi | 1 -
arch/arm/boot/dts/aspeed-g5.dtsi | 1 -
2 files changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index e8a61fc3956d..1186fe55e2d8 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
-#include "skeleton.dtsi"
#include
/ {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index d558091aa92b..6043876ad85f 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
-#include "skeleton.dtsi"
#include
/ {
--
2.15.1
[PATCH v3 12/20] ARM: dts: aspeed: Update license headers
In b24413180f56 ("License cleanup: add SPDX GPL-2.0 license identifier
to files with no license") these files had the GPL-2.0 licence added
automatically. Update them to be GPL 2.0+ in line with other IBM kernel
contributions.
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +-
arch/arm/boot/dts/aspeed-g4.dtsi | 2 +-
arch/arm/boot/dts/aspeed-g5.dtsi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 602bc10fdaf4..3e6f38e5d5d0 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
#include "aspeed-g5.dtsi"
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index c786bc2f2919..a8f0c046e83e 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
#include "aspeed-g4.dtsi"
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 8067793129ea..a7a9386f964d 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
#include "aspeed-g5.dtsi"
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 1186fe55e2d8..b0d8431a3700 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
#include
/ {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 6043876ad85f..40de3b66c33f 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0+
#include
/ {
--
2.15.1
[PATCH v3 09/20] ARM: dts: aspeed: Add PWM and tachometer node
The PWM/tach unit has a clock and reset phandle. It needs both in order
to function correctly.
Signed-off-by: Joel Stanley
--
v3:
Add the pwm reset phandle
---
arch/arm/boot/dts/aspeed-g4.dtsi | 10 ++
arch/arm/boot/dts/aspeed-g5.dtsi | 10 ++
2 files changed, 20 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index d2a82850b05b..91aea96c10c8 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -189,6 +189,16 @@
clocks = <&syscon ASPEED_CLK_APB>;
};
+ pwm_tacho: pwm-tacho-controller@1e786000 {
+ compatible = "aspeed,ast2400-pwm-tacho";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x1e786000 0x1000>;
+ clocks = <&syscon ASPEED_CLK_APB>;
+ resets = <&syscon ASPEED_RESET_PWM>;
+ status = "disabled";
+ };
+
vuart: serial@1e787000 {
compatible = "aspeed,ast2400-vuart";
reg = <0x1e787000 0x40>;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 3a25fa48d4f6..af3869ec87bb 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -239,6 +239,16 @@
status = "disabled";
};
+ pwm_tacho: pwm-tacho-controller@1e786000 {
+ compatible = "aspeed,ast2500-pwm-tacho";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x1e786000 0x1000>;
+ clocks = <&syscon ASPEED_CLK_APB>;
+ resets = <&syscon ASPEED_RESET_PWM>;
+ status = "disabled";
+ };
+
vuart: serial@1e787000 {
compatible = "aspeed,ast2500-vuart";
reg = <0x1e787000 0x40>;
--
2.15.1
[PATCH v3 07/20] ARM: dts: aspeed: Add flash controller clocks
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++
arch/arm/boot/dts/aspeed-g5.dtsi | 3 +++
2 files changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 2b1bb31ce390..36cb66d8cc10 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -55,6 +55,7 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "aspeed,ast2400-fmc";
+ clocks = <&syscon ASPEED_CLK_AHB>;
status = "disabled";
interrupts = <19>;
flash@0 {
@@ -70,6 +71,7 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "aspeed,ast2400-spi";
+ clocks = <&syscon ASPEED_CLK_AHB>;
status = "disabled";
flash@0 {
reg = < 0 >;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 95bb04e4cee2..156b345ff20d 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -55,6 +55,7 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "aspeed,ast2500-fmc";
+ clocks = <&syscon ASPEED_CLK_AHB>;
status = "disabled";
interrupts = <19>;
flash@0 {
@@ -80,6 +81,7 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "aspeed,ast2500-spi";
+ clocks = <&syscon ASPEED_CLK_AHB>;
status = "disabled";
flash@0 {
reg = < 0 >;
@@ -99,6 +101,7 @@
#address-cells = <1>;
#size-cells = <0>;
compatible = "aspeed,ast2500-spi";
+ clocks = <&syscon ASPEED_CLK_AHB>;
status = "disabled";
flash@0 {
reg = < 0 >;
--
2.15.1
[PATCH v3 08/20] ARM: dts: aspeed: Add clock phandle to GPIO
This enables a feature where the driver can debounce inputs. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 36cb66d8cc10..d2a82850b05b 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -144,6 +144,7 @@ reg = <0x1e78 0x1000>; interrupts = <20>; gpio-ranges = <&pinctrl 0 0 220>; + clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 156b345ff20d..3a25fa48d4f6 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -187,6 +187,7 @@ reg = <0x1e78 0x1000>; interrupts = <20>; gpio-ranges = <&pinctrl 0 0 220>; + clocks = <&syscon ASPEED_CLK_APB>; interrupt-controller; }; -- 2.15.1
[PATCH v3 06/20] ARM: dts: aspeed: Add watchdog clocks
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++
arch/arm/boot/dts/aspeed-g5.dtsi | 3 +++
2 files changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 57194d804051..2b1bb31ce390 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -177,11 +177,13 @@
wdt1: watchdog@1e785000 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785000 0x1c>;
+ clocks = <&syscon ASPEED_CLK_APB>;
};
wdt2: watchdog@1e785020 {
compatible = "aspeed,ast2400-wdt";
reg = <0x1e785020 0x1c>;
+ clocks = <&syscon ASPEED_CLK_APB>;
};
vuart: serial@1e787000 {
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index b6faaef2b1a7..95bb04e4cee2 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -219,16 +219,19 @@
wdt1: watchdog@1e785000 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785000 0x20>;
+ clocks = <&syscon ASPEED_CLK_APB>;
};
wdt2: watchdog@1e785020 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785020 0x20>;
+ clocks = <&syscon ASPEED_CLK_APB>;
};
wdt3: watchdog@1e785040 {
compatible = "aspeed,ast2500-wdt";
reg = <0x1e785040 0x20>;
+ clocks = <&syscon ASPEED_CLK_APB>;
status = "disabled";
};
--
2.15.1
[PATCH v3 02/20] dt-bindings: gpio: Add ASPEED constants
These are used to by the device tree to map pin numbers to constants required by the GPIO bindings. Signed-off-by: Joel Stanley -- v3: - Remove dtsi includes from this patch, they will come later --- include/dt-bindings/gpio/aspeed-gpio.h | 49 ++ 1 file changed, 49 insertions(+) create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h diff --git a/include/dt-bindings/gpio/aspeed-gpio.h b/include/dt-bindings/gpio/aspeed-gpio.h new file mode 100644 index ..56fc4889b2c4 --- /dev/null +++ b/include/dt-bindings/gpio/aspeed-gpio.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * This header provides constants for binding aspeed,*-gpio. + * + * The first cell in Aspeed's GPIO specifier is the GPIO ID. The macros below + * provide names for this. + * + * The second cell contains standard flag values specified in gpio.h. + */ + +#ifndef _DT_BINDINGS_GPIO_ASPEED_GPIO_H +#define _DT_BINDINGS_GPIO_ASPEED_GPIO_H + +#include + +#define ASPEED_GPIO_PORT_A 0 +#define ASPEED_GPIO_PORT_B 1 +#define ASPEED_GPIO_PORT_C 2 +#define ASPEED_GPIO_PORT_D 3 +#define ASPEED_GPIO_PORT_E 4 +#define ASPEED_GPIO_PORT_F 5 +#define ASPEED_GPIO_PORT_G 6 +#define ASPEED_GPIO_PORT_H 7 +#define ASPEED_GPIO_PORT_I 8 +#define ASPEED_GPIO_PORT_J 9 +#define ASPEED_GPIO_PORT_K 10 +#define ASPEED_GPIO_PORT_L 11 +#define ASPEED_GPIO_PORT_M 12 +#define ASPEED_GPIO_PORT_N 13 +#define ASPEED_GPIO_PORT_O 14 +#define ASPEED_GPIO_PORT_P 15 +#define ASPEED_GPIO_PORT_Q 16 +#define ASPEED_GPIO_PORT_R 17 +#define ASPEED_GPIO_PORT_S 18 +#define ASPEED_GPIO_PORT_T 19 +#define ASPEED_GPIO_PORT_U 20 +#define ASPEED_GPIO_PORT_V 21 +#define ASPEED_GPIO_PORT_W 22 +#define ASPEED_GPIO_PORT_X 23 +#define ASPEED_GPIO_PORT_Y 24 +#define ASPEED_GPIO_PORT_Z 25 +#define ASPEED_GPIO_PORT_AA 26 +#define ASPEED_GPIO_PORT_AB 27 +#define ASPEED_GPIO_PORT_AC 28 + +#define ASPEED_GPIO(port, offset) \ + ((ASPEED_GPIO_PORT_##port * 8) + offset) + +#endif -- 2.15.1
[PATCH v3 01/20] dt-bindings: clock: Add ASPEED constants
These will be used by the clock driver. This commit is included so the tree will build without the clock series being applied. Reviewed-by: Rob Herring Signed-off-by: Joel Stanley --- v3: - Clarify that the clock defines will be merged as part of the dt changes, so that the device tree merge will not depend on the clock tree v2: - remove NUM_CLKS define. There's no need for it to be part of ABI --- include/dt-bindings/clock/aspeed-clock.h | 52 1 file changed, 52 insertions(+) create mode 100644 include/dt-bindings/clock/aspeed-clock.h diff --git a/include/dt-bindings/clock/aspeed-clock.h b/include/dt-bindings/clock/aspeed-clock.h new file mode 100644 index ..d3558d897a4d --- /dev/null +++ b/include/dt-bindings/clock/aspeed-clock.h @@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ + +#ifndef DT_BINDINGS_ASPEED_CLOCK_H +#define DT_BINDINGS_ASPEED_CLOCK_H + +#define ASPEED_CLK_GATE_ECLK 0 +#define ASPEED_CLK_GATE_GCLK 1 +#define ASPEED_CLK_GATE_MCLK 2 +#define ASPEED_CLK_GATE_VCLK 3 +#define ASPEED_CLK_GATE_BCLK 4 +#define ASPEED_CLK_GATE_DCLK 5 +#define ASPEED_CLK_GATE_REFCLK 6 +#define ASPEED_CLK_GATE_USBPORT2CLK7 +#define ASPEED_CLK_GATE_LCLK 8 +#define ASPEED_CLK_GATE_USBUHCICLK 9 +#define ASPEED_CLK_GATE_D1CLK 10 +#define ASPEED_CLK_GATE_YCLK 11 +#define ASPEED_CLK_GATE_USBPORT1CLK12 +#define ASPEED_CLK_GATE_UART1CLK 13 +#define ASPEED_CLK_GATE_UART2CLK 14 +#define ASPEED_CLK_GATE_UART5CLK 15 +#define ASPEED_CLK_GATE_ESPICLK16 +#define ASPEED_CLK_GATE_MAC1CLK17 +#define ASPEED_CLK_GATE_MAC2CLK18 +#define ASPEED_CLK_GATE_RSACLK 19 +#define ASPEED_CLK_GATE_UART3CLK 20 +#define ASPEED_CLK_GATE_UART4CLK 21 +#define ASPEED_CLK_GATE_SDCLKCLK 22 +#define ASPEED_CLK_GATE_LHCCLK 23 +#define ASPEED_CLK_HPLL24 +#define ASPEED_CLK_AHB 25 +#define ASPEED_CLK_APB 26 +#define ASPEED_CLK_UART27 +#define ASPEED_CLK_SDIO28 +#define ASPEED_CLK_ECLK29 +#define ASPEED_CLK_ECLK_MUX30 +#define ASPEED_CLK_LHCLK 31 +#define ASPEED_CLK_MAC 32 +#define ASPEED_CLK_BCLK33 +#define ASPEED_CLK_MPLL34 + +#define ASPEED_RESET_XDMA 0 +#define ASPEED_RESET_MCTP 1 +#define ASPEED_RESET_ADC 2 +#define ASPEED_RESET_JTAG_MASTER 3 +#define ASPEED_RESET_MIC 4 +#define ASPEED_RESET_PWM 5 +#define ASPEED_RESET_PCIVGA6 +#define ASPEED_RESET_I2C 7 +#define ASPEED_RESET_AHB 8 + +#endif -- 2.15.1
[PATCH v3 05/20] ARM: dts: aspeed: Add MAC clocks
Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-g4.dtsi | 2 ++ arch/arm/boot/dts/aspeed-g5.dtsi | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index b938759f799e..57194d804051 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -90,6 +90,7 @@ compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e66 0x180>; interrupts = <2>; + clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; status = "disabled"; }; @@ -97,6 +98,7 @@ compatible = "aspeed,ast2400-mac", "faraday,ftgmac100"; reg = <0x1e68 0x180>; interrupts = <3>; + clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 1af600b48475..b6faaef2b1a7 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -124,6 +124,7 @@ compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e66 0x180>; interrupts = <2>; + clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>; status = "disabled"; }; @@ -131,6 +132,7 @@ compatible = "aspeed,ast2500-mac", "faraday,ftgmac100"; reg = <0x1e68 0x180>; interrupts = <3>; + clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>; status = "disabled"; }; -- 2.15.1
[PATCH v3 04/20] ARM: dts: aspeed: Add proper clock references
This device tree will break existing kernels that do not have the clk
patches applied (no clocksource, as we don't know the speed of the APB
clock. You can boot if you pass a lpj value on the command line, but
won't have a uart).
Older device trees running with the newer kernel will function as well
as pre-4.16 kernels. That is, that some IP blocks (i2c, pwm/tach, adc)
will not work as the kernel lacks reset controller and clock enabling.
This is being changed as existing device trees use fixed-clocks in order
to boot without a clk driver. The newly added clk driver provides proper
clock support, including gating, so we move the device trees over to
properly request clocks.
The SCU compatible string is updated as the g4-scu string made it into
the tree before we decided on aspeed,astX000- as the format for the
strings. The old string will be removed from the bindings in a future
patch.
Signed-off-by: Joel Stanley
---
v3:
- Add reset phandle to ADC node
v2:
- Add more detail to the commit message
adc reset
Signed-off-by: Joel Stanley
---
arch/arm/boot/dts/aspeed-g4.dtsi | 103 --
arch/arm/boot/dts/aspeed-g5.dtsi | 105 ---
2 files changed, 84 insertions(+), 124 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 9422f9cb1e11..b938759f799e 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "skeleton.dtsi"
+#include
/ {
model = "Aspeed BMC";
@@ -106,47 +107,12 @@
ranges;
syscon: syscon@1e6e2000 {
- compatible = "aspeed,g4-scu", "syscon",
"simple-mfd";
+ compatible = "aspeed,ast2400-scu", "syscon",
"simple-mfd";
reg = <0x1e6e2000 0x1a8>;
#address-cells = <1>;
#size-cells = <0>;
-
-clk_clkin: clk_clkin {
-#clock-cells = <0>;
-compatible = "fixed-clock";
-clock-frequency = <4800>;
-};
-
-clk_hpll: clk_hpll@70 {
-#clock-cells = <0>;
-compatible = "aspeed,g4-hpll-clock",
"fixed-clock";
-reg = <0x70>;
-clocks = <&clk_clkin>;
-clock-frequency = <38400>;
-};
-
-clk_ahb: clk_ahb@70 {
-#clock-cells = <0>;
-compatible = "aspeed,g4-ahb-clock",
"fixed-clock";
-reg = <0x70>;
-clocks = <&clk_hpll>;
-clock-frequency = <19200>;
-};
-
-clk_apb: clk_apb@8 {
-#clock-cells = <0>;
-compatible = "aspeed,g4-apb-clock",
"fixed-clock";
-reg = <0x08>;
-clocks = <&clk_hpll>;
-clock-frequency = <4800>;
-};
-
-clk_uart: clk_uart@2c{
-#clock-cells = <0>;
-compatible = "aspeed,g4-uart-clock",
"fixed-clock";
-reg = <0x2c>;
-clock-frequency = <2400>;
-};
+ #clock-cells = <1>;
+ #reset-cells = <1>;
pinctrl: pinctrl {
compatible = "aspeed,g4-pinctrl";
@@ -156,7 +122,8 @@
adc: adc@1e6e9000 {
compatible = "aspeed,ast2400-adc";
reg = <0x1e6e9000 0xb0>;
- clocks = <&clk_apb>;
+ clocks = <&syscon ASPEED_CLK_APB>;
+ resets = <&syscon ASPEED_RESET_ADC>;
#io-channel-cells = <1>;
status = "disabled";
};
@@ -181,7 +148,7 @@
compatible = "aspeed,ast2400-timer";
reg = <0x1e782000 0x90>;
interrupts = <16 17 18 35 36 37 38 39>
[PATCH v3 03/20] ARM: dts: aspeed: Add LPC and child devices
From: Andrew Jeffery
Ensure the ordering is correct and add all of the children in the SoC
device trees for the ast2400 and ast2500.
Signed-off-by: Andrew Jeffery
Reviewed-by: Cédric Le Goater
Signed-off-by: Joel Stanley
---
v3:
- Fix ast2400 compatible string
---
arch/arm/boot/dts/aspeed-g4.dtsi | 35 +++
arch/arm/boot/dts/aspeed-g5.dtsi | 27 +--
2 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 45d815a86d42..9422f9cb1e11 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -225,6 +225,41 @@
status = "disabled";
};
+ lpc: lpc@1e789000 {
+ compatible = "aspeed,ast2400-lpc", "simple-mfd";
+ reg = <0x1e789000 0x1000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x1e789000 0x1000>;
+
+ lpc_bmc: lpc-bmc@0 {
+ compatible = "aspeed,ast2400-lpc-bmc";
+ reg = <0x0 0x80>;
+ };
+
+ lpc_host: lpc-host@80 {
+ compatible = "aspeed,ast2400-lpc-host",
"simple-mfd", "syscon";
+ reg = <0x80 0x1e0>;
+ reg-io-width = <4>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x80 0x1e0>;
+
+ lpc_ctrl: lpc-ctrl@0 {
+ compatible =
"aspeed,ast2400-lpc-ctrl";
+ reg = <0x0 0x80>;
+ status = "disabled";
+ };
+
+ lhc: lhc@20 {
+ compatible =
"aspeed,ast2400-lhc";
+ reg = <0x20 0x24 0x48 0x8>;
+ };
+ };
+ };
+
uart2: serial@1e78d000 {
compatible = "ns16550a";
reg = <0x1e78d000 0x20>;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 5c4ecdba3a6b..069f13df19d1 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -265,6 +265,16 @@
status = "disabled";
};
+ vuart: serial@1e787000 {
+ compatible = "aspeed,ast2500-vuart";
+ reg = <0x1e787000 0x40>;
+ reg-shift = <2>;
+ interrupts = <10>;
+ clocks = <&clk_uart>;
+ no-loopback-test;
+ status = "disabled";
+ };
+
lpc: lpc@1e789000 {
compatible = "aspeed,ast2500-lpc", "simple-mfd";
reg = <0x1e789000 0x1000>;
@@ -288,6 +298,13 @@
reg-io-width = <4>;
+ lpc_ctrl: lpc-ctrl@0 {
+ compatible =
"aspeed,ast2500-lpc-ctrl";
+ reg = <0x0 0x80>;
+ status = "disabled";
+ };
+
+
lhc: lhc@20 {
compatible =
"aspeed,ast2500-lhc";
reg = <0x20 0x24 0x48 0x8>;
@@ -295,16 +312,6 @@
};
};
- vuart: serial@1e787000 {
- compatible = "aspeed,ast2500-vuart";
- reg = <0x1e787000 0x40>;
- reg-shift = <2>;
- interrupts = <10>;
- clocks = <&clk_uart>;
- no-loopback-test;
- status = "disabled";
- };
-
uart2: serial@1e78d000 {
compatible = "ns16550a";
reg = <0x1e78d000 0x20>;
--
2.15.1
[PATCH v3 00/19] ARM: dts: aspeed: updates and new machines
This series of device tree patches for the ASPEED BMC machines moves all systems to use the soon to be merged clk driver, and updates machines to use all of the drivers we have upstream. v3: Address review from Rob and Cedric - Move aspeed-gpio.h usage out into the patches where use of the GPIO is added - Clarify that the aspeed-clock.h patch will be merged as part of the device tree tree. This is to ensure we don't depend on the clk tree for building. - Fix duplicate flash controller nodes in Romulus v2: Address review from Arnd - Remove NUM_CLKS from dt header - Send VUART patch as a fix, drop it from this series - Add reasoning for breaking old kernel in the 'proper clock references' patch In addition it adds three new OpenBMC systems that have been developed in the OpenBMC kernel tree over the past year: two Power9 OpenPower systems, and a port by Google to a Quanta x86 server. I have boot tested these on Romulus and Palmetto, as well as boot tested all device trees in Qemu. Please review the boards you are familiar with. I will merge these in to the ASPEED ARM SoC tree for inclusion in 4.16. Andrew Jeffery (1): ARM: dts: aspeed: Add LPC and child devices Joel Stanley (16): dt-bindings: clock: Add ASPEED constants dt-bindings: gpio: Add ASPEED constants ARM: dts: aspeed: Add proper clock references ARM: dts: aspeed: Add MAC clocks ARM: dts: aspeed: Add watchdog clocks ARM: dts: aspeed: Add flash controller clocks ARM: dts: aspeed: Add clock phandle to GPIO ARM: dts: aspeed: Add PWM and tachometer node ARM: dts: aspeed: Add LPC Snoop device ARM: dts: aspeed: Remove skeleton.dtsi ARM: dts: aspeed: Update license headers ARM: dts: Add OpenBMC flash layout ARM: dts: aspeed: Sort ASPEED entries in makefile ARM: dts: aspeed: Add Witherspoon BMC machine ARM: dts: aspeed-romulus: Update Romulus system ARM: dts: aspeed-plametto: Add flash layout Rick Altherr (1): ARM: dts: aspeed: Add Qanta Q71L BMC machine Xo Wang (1): ARM: dts: aspeed: Add Ingrasys Zaius BMC machine arch/arm/boot/dts/Makefile | 8 +- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts| 3 +- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 157 ++- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 548 +++ arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 426 ++ arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 458 +++ arch/arm/boot/dts/aspeed-g4.dtsi | 163 --- arch/arm/boot/dts/aspeed-g5.dtsi | 154 --- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 32 ++ include/dt-bindings/clock/aspeed-clock.h | 52 +++ include/dt-bindings/gpio/aspeed-gpio.h | 49 ++ 12 files changed, 1905 insertions(+), 147 deletions(-) create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi create mode 100644 include/dt-bindings/clock/aspeed-clock.h create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h -- 2.15.1
Re: [PATCH v2 18/19] ARM: dts: aspeed-romulus: Update Romulus system
On Mon, Dec 18, 2017 at 8:02 PM, Cédric Le Goater wrote:
>> +};
>> +
>> +&fmc {
>> + status = "okay";
>> +
>> + flash@0 {
>> + status = "okay";
>> + label = "pnor";
>> + m25p,fast-read;
>> +#include "openbmc-flash-layout.dtsi"
>> + };
>> +};
>> +
>> +&spi1 {
>> + status = "okay";
>> +
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_spi1_default>;
>> +
>> + flash@0 {
>> + status = "okay";
>> + label = "pnor";
>> + m25p,fast-read;
>> };
>> };
>
>
> hmm, the fmc and spi1 bindings were already added in commit 1142aea9ff9d.
>
>
>> @@ -38,6 +101,7 @@
>> status = "okay";
>> m25p,fast-read;
>> label = "bmc";
>> +#include "openbmc-flash-layout.dtsi"
>
>
> This looks like an extra "fmc" node ?
You're right. It still built and booted too. Good catch.
Cheers,
Joel
Re: [PATCH v2 03/19] ARM: dts: aspeed: Add LPC and child devices
j
On Mon, Dec 18, 2017 at 7:55 PM, Cédric Le Goater wrote:
> On 12/15/2017 07:24 AM, Joel Stanley wrote:
>> From: Andrew Jeffery
>>
>> Ensure the ordering is correct and add all of the children in the SoC
>> device trees for the ast2400 and ast2500.
>>
>> Signed-off-by: Andrew Jeffery
>> Signed-off-by: Joel Stanley
>> ---
>> arch/arm/boot/dts/aspeed-g4.dtsi | 35 +++
>> arch/arm/boot/dts/aspeed-g5.dtsi | 27 +--
>> 2 files changed, 52 insertions(+), 10 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi
>> b/arch/arm/boot/dts/aspeed-g4.dtsi
>> index 100d092e6c07..a3bc5da7d42c 100644
>> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
>> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
>> @@ -226,6 +226,41 @@
>> status = "disabled";
>> };
>>
>> + lpc: lpc@1e789000 {
>> + compatible = "aspeed,ast2400-lpc",
>> "simple-mfd";
>> + reg = <0x1e789000 0x1000>;
>> +
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + ranges = <0x0 0x1e789000 0x1000>;
>> +
>> + lpc_bmc: lpc-bmc@0 {
>> + compatible = "aspeed,ast2400-lpc-bmc";
>> + reg = <0x0 0x80>;
>> + };
>> +
>> + lpc_host: lpc-host@80 {
>> + compatible =
>> "aspeed,ast2400-lpc-host", "simple-mfd", "syscon";
>> + reg = <0x80 0x1e0>;
>> + reg-io-width = <4>;
>> +
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + ranges = <0x0 0x80 0x1e0>;
>> +
>> + lpc_ctrl: lpc-ctrl@0 {
>> + compatible =
>> "aspeed,ast2400-lpc-ctrl";
>> + reg = <0x0 0x80>;
>> + status = "disabled";
>> + };
>> +
>> + lhc: lhc@20 {
>> + compatible =
>> "aspeed,ast2500-lhc";
>
> aspeed,ast2400-lhc
>
> The layout of the registers are the same but there a couple of differences
> in the bit definitions between the two SoCs.
>
> a part from that :
>
> Reviewed-by: Cédric Le Goater
Good catch. Fixed in v3.
Cheers,
Joel
Re: [PATCH v2 10/19] ARM: dts: aspeed: Add LPC Snoop device
On Mon, Dec 18, 2017 at 7:46 PM, Cédric Le Goater wrote:
> On 12/15/2017 07:24 AM, Joel Stanley wrote:
>> LPC snoop hardware on the ASPEED BMC, used for monitoring
>> host I/O port activity.
>>
>> Signed-off-by: Joel Stanley
>> ---
>> arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++
>> arch/arm/boot/dts/aspeed-g5.dtsi | 6 ++
>> 2 files changed, 13 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi
>> b/arch/arm/boot/dts/aspeed-g4.dtsi
>> index f6fee40c04c0..b3580f37f507 100644
>> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
>> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
>> @@ -236,6 +236,13 @@
>> status = "disabled";
>> };
>>
>> + lpc_snoop: lpc-snoop@0 {
>> + compatible =
>> "aspeed,ast2500-lpc-snoop";
>
> it should be :
>
> aspeed,ast2400-lpc-snoop
>
> a part from that :
>
> Reviewed-by: Cédric Le Goater
Fixed in v3.
Cheers,
Joel
[PATCH] selftests/bpf: remove the DEBUG macro for test_dev_cgroup
The test may fail if not enable DEBUG macro in dev_cgroup.c
# ./test_dev_cgroup
libbpf: load bpf program failed: Operation not permitted
libbpf: failed to load program 'cgroup/dev'
libbpf: failed to load object './dev_cgroup.o'
Failed to load DEV_CGROUP program
Removing the DEBUG macro makes the test always pass.
Signed-off-by: Chen Rong
---
tools/testing/selftests/bpf/dev_cgroup.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/dev_cgroup.c
b/tools/testing/selftests/bpf/dev_cgroup.c
index ce41a34..a167c6d 100644
--- a/tools/testing/selftests/bpf/dev_cgroup.c
+++ b/tools/testing/selftests/bpf/dev_cgroup.c
@@ -13,7 +13,6 @@ SEC("cgroup/dev")
int bpf_prog1(struct bpf_cgroup_dev_ctx *ctx)
{
short type = ctx->access_type & 0x;
-#ifdef DEBUG
short access = ctx->access_type >> 16;
char fmt[] = " %d:%d\n";
@@ -39,7 +38,6 @@ int bpf_prog1(struct bpf_cgroup_dev_ctx *ctx)
fmt[10] = 'm';
bpf_trace_printk(fmt, sizeof(fmt), ctx->major, ctx->minor);
-#endif
/* Allow access to /dev/zero and /dev/random.
* Forbid everything else.
--
2.5.0
[PATCH v3 net-next 3/5] net: sock: replace sk_state_load with inet_sk_state_load and remove sk_state_store
sk_state_load is only used by AF_INET/AF_INET6, so rename it to
inet_sk_state_load and move it into inet_sock.h.
sk_state_store is removed as it is not used any more.
Signed-off-by: Yafang Shao
---
include/net/inet_sock.h | 25 -
include/net/sock.h | 25 -
net/ipv4/inet_connection_sock.c | 2 +-
net/ipv4/tcp.c | 4 ++--
net/ipv4/tcp_diag.c | 2 +-
net/ipv4/tcp_ipv4.c | 2 +-
net/ipv6/tcp_ipv6.c | 2 +-
7 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index a3431a4..0a671c3 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -290,9 +290,32 @@ static inline void inet_sk_copy_descendant(struct sock
*sk_to,
#endif
int inet_sk_rebuild_header(struct sock *sk);
-void inet_sk_set_state(struct sock *sk, int state);
+
+/**
+ * inet_sk_state_load - read sk->sk_state for lockless contexts
+ * @sk: socket pointer
+ *
+ * Paired with inet_sk_state_store(). Used in places we don't hold socket lock:
+ * tcp_diag_get_info(), tcp_get_info(), tcp_poll(), get_tcp4_sock() ...
+ */
+static inline int inet_sk_state_load(const struct sock *sk)
+{
+ /* state change might impact lockless readers. */
+ return smp_load_acquire(&sk->sk_state);
+}
+
+/**
+ * inet_sk_state_store - update sk->sk_state
+ * @sk: socket pointer
+ * @newstate: new state
+ *
+ * Paired with inet_sk_state_load(). Should be used in contexts where
+ * state change might impact lockless readers.
+ */
void inet_sk_state_store(struct sock *sk, int newstate);
+void inet_sk_set_state(struct sock *sk, int state);
+
static inline unsigned int __inet_ehashfn(const __be32 laddr,
const __u16 lport,
const __be32 faddr,
diff --git a/include/net/sock.h b/include/net/sock.h
index 9a90472..4fd211b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2332,31 +2332,6 @@ static inline bool sk_listener(const struct sock *sk)
return (1 << sk->sk_state) & (TCPF_LISTEN | TCPF_NEW_SYN_RECV);
}
-/**
- * sk_state_load - read sk->sk_state for lockless contexts
- * @sk: socket pointer
- *
- * Paired with sk_state_store(). Used in places we do not hold socket lock :
- * tcp_diag_get_info(), tcp_get_info(), tcp_poll(), get_tcp4_sock() ...
- */
-static inline int sk_state_load(const struct sock *sk)
-{
- return smp_load_acquire(&sk->sk_state);
-}
-
-/**
- * sk_state_store - update sk->sk_state
- * @sk: socket pointer
- * @newstate: new state
- *
- * Paired with sk_state_load(). Should be used in contexts where
- * state change might impact lockless readers.
- */
-static inline void sk_state_store(struct sock *sk, int newstate)
-{
- smp_store_release(&sk->sk_state, newstate);
-}
-
void sock_enable_timestamp(struct sock *sk, int flag);
int sock_get_timestamp(struct sock *, struct timeval __user *);
int sock_get_timestampns(struct sock *, struct timespec __user *);
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index f460fc0..12410ec 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -685,7 +685,7 @@ static void reqsk_timer_handler(struct timer_list *t)
int max_retries, thresh;
u8 defer_accept;
- if (sk_state_load(sk_listener) != TCP_LISTEN)
+ if (inet_sk_state_load(sk_listener) != TCP_LISTEN)
goto drop;
max_retries = icsk->icsk_syn_retries ? :
net->ipv4.sysctl_tcp_synack_retries;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index d408fb4..67d39b7 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -502,7 +502,7 @@ unsigned int tcp_poll(struct file *file, struct socket
*sock, poll_table *wait)
sock_poll_wait(file, sk_sleep(sk), wait);
- state = sk_state_load(sk);
+ state = inet_sk_state_load(sk);
if (state == TCP_LISTEN)
return inet_csk_listen_poll(sk);
@@ -2916,7 +2916,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
if (sk->sk_type != SOCK_STREAM)
return;
- info->tcpi_state = sk_state_load(sk);
+ info->tcpi_state = inet_sk_state_load(sk);
/* Report meaningful fields for all TCP states, including listeners */
rate = READ_ONCE(sk->sk_pacing_rate);
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index abbf0ed..81148f7 100644
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -24,7 +24,7 @@ static void tcp_diag_get_info(struct sock *sk, struct
inet_diag_msg *r,
{
struct tcp_info *info = _info;
- if (sk_state_load(sk) == TCP_LISTEN) {
+ if (inet_sk_state_load(sk) == TCP_LISTEN) {
r->idiag_rqueue = sk->sk_ack_backlog;
r->idiag_wqueue = sk->sk_max_ack_backlog;
} else if (sk->sk_type == SOCK_STREAM) {
diff --git a/net/ipv4/tcp_ipv4.c b/net
[PATCH v3 net-next 0/5] replace tcp_set_state tracepoint with inet_sock_set_state
According to the discussion in the mail thread https://patchwork.kernel.org/patch/10099243/, tcp_set_state tracepoint is renamed to inet_sock_set_state tracepoint and is moved to include/trace/events/sock.h. With this new tracepoint, we can trace AF_INET/AF_INET6 sock state transitions. As there's only one single tracepoint for inet, so I didn't create a new trace file named trace/events/inet_sock.h, and just place it in include/trace/events/sock.h Currently TCP/DCCP/SCTP state transitions are traced with this tracepoint. - Why not more protocol ? If we really think that anonter protocol should be traced, I will modify the code to trace it. I just want to make the code easy and not output useless information. Steven Rostedt (VMware) (1): tcp: Export to userspace the TCP state names for the trace events Yafang Shao (4): net: tracepoint: replace tcp_set_state tracepoint with inet_sock_set_state tracepoint net: sock: replace sk_state_load with inet_sk_state_load and remove sk_state_store net: tracepoint: using sock_set_state tracepoint to trace DCCP state transition net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition include/net/inet_sock.h | 25 ++ include/net/sock.h | 25 -- include/trace/events/sock.h | 107 include/trace/events/tcp.h | 16 -- net/dccp/proto.c| 2 +- net/ipv4/af_inet.c | 14 ++ net/ipv4/inet_connection_sock.c | 8 +-- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/tcp.c | 10 ++-- net/ipv4/tcp_diag.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv6/tcp_ipv6.c | 2 +- net/sctp/endpointola.c | 2 +- net/sctp/sm_sideeffect.c| 4 +- net/sctp/socket.c | 12 ++--- 15 files changed, 167 insertions(+), 66 deletions(-) -- 1.8.3.1
[PATCH v3 net-next 5/5] net: tracepoint: using sock_set_state tracepoint to trace SCTP state transition
With changes in inet_ files, SCTP state transitions are traced with
inet_sock_set_state tracepoint.
As SCTP state names, i.e. SCTP_SS_CLOSED, SCTP_SS_ESTABLISHED,
have the same value with TCP state names. So the output info still print
the TCP state names, that makes the code easy.
Signed-off-by: Yafang Shao
---
net/sctp/endpointola.c | 2 +-
net/sctp/sm_sideeffect.c | 4 ++--
net/sctp/socket.c| 12 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index ee1e601..8b31468 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -232,7 +232,7 @@ void sctp_endpoint_free(struct sctp_endpoint *ep)
{
ep->base.dead = true;
- ep->base.sk->sk_state = SCTP_SS_CLOSED;
+ inet_sk_set_state(ep->base.sk, SCTP_SS_CLOSED);
/* Unlink this endpoint, so we can't find it again! */
sctp_unhash_endpoint(ep);
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 8adde71..c0c3ec6 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -878,12 +878,12 @@ static void sctp_cmd_new_state(struct sctp_cmd_seq *cmds,
* successfully completed a connect() call.
*/
if (sctp_state(asoc, ESTABLISHED) && sctp_sstate(sk, CLOSED))
- sk->sk_state = SCTP_SS_ESTABLISHED;
+ inet_sk_set_state(sk, SCTP_SS_ESTABLISHED);
/* Set the RCV_SHUTDOWN flag when a SHUTDOWN is received. */
if (sctp_state(asoc, SHUTDOWN_RECEIVED) &&
sctp_sstate(sk, ESTABLISHED)) {
- sk->sk_state = SCTP_SS_CLOSING;
+ inet_sk_set_state(sk, SCTP_SS_CLOSING);
sk->sk_shutdown |= RCV_SHUTDOWN;
}
}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 7eec0a0..59b5689 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1544,7 +1544,7 @@ static void sctp_close(struct sock *sk, long timeout)
lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
sk->sk_shutdown = SHUTDOWN_MASK;
- sk->sk_state = SCTP_SS_CLOSING;
+ inet_sk_set_state(sk, SCTP_SS_CLOSING);
ep = sctp_sk(sk)->ep;
@@ -4653,7 +4653,7 @@ static void sctp_shutdown(struct sock *sk, int how)
if (how & SEND_SHUTDOWN && !list_empty(&ep->asocs)) {
struct sctp_association *asoc;
- sk->sk_state = SCTP_SS_CLOSING;
+ inet_sk_set_state(sk, SCTP_SS_CLOSING);
asoc = list_entry(ep->asocs.next,
struct sctp_association, asocs);
sctp_primitive_SHUTDOWN(net, asoc, NULL);
@@ -7509,13 +7509,13 @@ static int sctp_listen_start(struct sock *sk, int
backlog)
* sockets.
*
*/
- sk->sk_state = SCTP_SS_LISTENING;
+ inet_sk_set_state(sk, SCTP_SS_LISTENING);
if (!ep->base.bind_addr.port) {
if (sctp_autobind(sk))
return -EAGAIN;
} else {
if (sctp_get_port(sk, inet_sk(sk)->inet_num)) {
- sk->sk_state = SCTP_SS_CLOSED;
+ inet_sk_set_state(sk, SCTP_SS_CLOSED);
return -EADDRINUSE;
}
}
@@ -8538,10 +8538,10 @@ static void sctp_sock_migrate(struct sock *oldsk,
struct sock *newsk,
* is called, set RCV_SHUTDOWN flag.
*/
if (sctp_state(assoc, CLOSED) && sctp_style(newsk, TCP)) {
- newsk->sk_state = SCTP_SS_CLOSED;
+ inet_sk_set_state(newsk, SCTP_SS_CLOSED);
newsk->sk_shutdown |= RCV_SHUTDOWN;
} else {
- newsk->sk_state = SCTP_SS_ESTABLISHED;
+ inet_sk_set_state(newsk, SCTP_SS_ESTABLISHED);
}
release_sock(newsk);
--
1.8.3.1
[PATCH v3 net-next 2/5] net: tracepoint: replace tcp_set_state tracepoint with inet_sock_set_state tracepoint
As sk_state is a common field for struct sock, so the state
transition tracepoint should not be a TCP specific feature.
Currently it traces all AF_INET state transition, so I rename this
tracepoint to inet_sock_set_state tracepoint with some minor changes and move it
into trace/events/sock.h.
We dont need to create a file named trace/events/inet_sock.h for this one single
tracepoint.
Two helpers are introduced to trace sk_state transition
- void inet_sk_state_store(struct sock *sk, int newstate);
- void inet_sk_set_state(struct sock *sk, int state);
As trace header should not be included in other header files,
so they are defined in sock.c.
The protocol such as SCTP maybe compiled as a ko, hence export
inet_sk_set_state().
Signed-off-by: Yafang Shao
---
include/net/inet_sock.h | 2 +
include/trace/events/sock.h | 107
include/trace/events/tcp.h | 31
net/ipv4/af_inet.c | 14 ++
net/ipv4/inet_connection_sock.c | 6 +--
net/ipv4/inet_hashtables.c | 2 +-
net/ipv4/tcp.c | 6 +--
7 files changed, 128 insertions(+), 40 deletions(-)
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 39efb96..a3431a4 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -290,6 +290,8 @@ static inline void inet_sk_copy_descendant(struct sock
*sk_to,
#endif
int inet_sk_rebuild_header(struct sock *sk);
+void inet_sk_set_state(struct sock *sk, int state);
+void inet_sk_state_store(struct sock *sk, int newstate);
static inline unsigned int __inet_ehashfn(const __be32 laddr,
const __u16 lport,
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
index ec4dade..3b9094a 100644
--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@@ -6,7 +6,50 @@
#define _TRACE_SOCK_H
#include
+#include
#include
+#include
+#include
+
+/* The protocol traced by sock_set_state */
+#define inet_protocol_names\
+ EM(IPPROTO_TCP) \
+ EM(IPPROTO_DCCP)\
+ EMe(IPPROTO_SCTP)
+
+#define tcp_state_names\
+ EM(TCP_ESTABLISHED) \
+ EM(TCP_SYN_SENT)\
+ EM(TCP_SYN_RECV)\
+ EM(TCP_FIN_WAIT1) \
+ EM(TCP_FIN_WAIT2) \
+ EM(TCP_TIME_WAIT) \
+ EM(TCP_CLOSE) \
+ EM(TCP_CLOSE_WAIT) \
+ EM(TCP_LAST_ACK)\
+ EM(TCP_LISTEN) \
+ EM(TCP_CLOSING) \
+ EMe(TCP_NEW_SYN_RECV)
+
+/* enums need to be exported to user space */
+#undef EM
+#undef EMe
+#define EM(a) TRACE_DEFINE_ENUM(a);
+#define EMe(a) TRACE_DEFINE_ENUM(a);
+
+inet_protocol_names
+tcp_state_names
+
+#undef EM
+#undef EMe
+#define EM(a) { a, #a },
+#define EMe(a) { a, #a }
+
+#define show_inet_protocol_name(val)\
+ __print_symbolic(val, inet_protocol_names)
+
+#define show_tcp_state_name(val)\
+ __print_symbolic(val, tcp_state_names)
TRACE_EVENT(sock_rcvqueue_full,
@@ -63,6 +106,70 @@
__entry->rmem_alloc)
);
+TRACE_EVENT(inet_sock_set_state,
+
+ TP_PROTO(const struct sock *sk, const int oldstate, const int newstate),
+
+ TP_ARGS(sk, oldstate, newstate),
+
+ TP_STRUCT__entry(
+ __field(const void *, skaddr)
+ __field(int, oldstate)
+ __field(int, newstate)
+ __field(__u16, sport)
+ __field(__u16, dport)
+ __field(__u8, protocol)
+ __array(__u8, saddr, 4)
+ __array(__u8, daddr, 4)
+ __array(__u8, saddr_v6, 16)
+ __array(__u8, daddr_v6, 16)
+ ),
+
+ TP_fast_assign(
+ struct inet_sock *inet = inet_sk(sk);
+ struct in6_addr *pin6;
+ __be32 *p32;
+
+ __entry->skaddr = sk;
+ __entry->oldstate = oldstate;
+ __entry->newstate = newstate;
+
+ __entry->protocol = sk->sk_protocol;
+ __entry->sport = ntohs(inet->inet_sport);
+ __entry->dport = ntohs(inet->inet_dport);
+
+ p32 = (__be32 *) __entry->saddr;
+ *p32 = inet->inet_saddr;
+
+ p32 = (__be32 *) __entry->daddr;
+ *p32 = inet->inet_daddr;
+
+#if IS_ENABLED(CONFIG_IPV6)
+ if (sk->sk_family == AF_INET6) {
+ pin6 = (struct in6_addr *)__entry->saddr_v6;
+ *pin6 = sk->sk_v6_rcv_saddr;
+ pin6 = (struct in6_addr *)__entry->daddr_v6;
+ *pin6 = sk->sk_v6_daddr;
+ } else
+#e
[PATCH v3 net-next 4/5] net: tracepoint: using sock_set_state tracepoint to trace DCCP state transition
With changes in inet_ files, DCCP state transitions are traced with inet_sock_set_state tracepoint. Signed-off-by: Yafang Shao --- net/dccp/proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 9d43c1f..7a75a1d 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -110,7 +110,7 @@ void dccp_set_state(struct sock *sk, const int state) /* Change state AFTER socket is unhashed to avoid closed * socket sitting in hash tables. */ - sk->sk_state = state; + inet_sk_set_state(sk, state); } EXPORT_SYMBOL_GPL(dccp_set_state); -- 1.8.3.1
[PATCH v3 net-next 1/5] tcp: Export to userspace the TCP state names for the trace events
From: "Steven Rostedt (VMware)"
The TCP trace events (specifically tcp_set_state), maps emums to symbol
names via __print_symbolic(). But this only works for reading trace events
from the tracefs trace files. If perf or trace-cmd were to record these
events, the event format file does not convert the enum names into numbers,
and you get something like:
__print_symbolic(REC->oldstate,
{ TCP_ESTABLISHED, "TCP_ESTABLISHED" },
{ TCP_SYN_SENT, "TCP_SYN_SENT" },
{ TCP_SYN_RECV, "TCP_SYN_RECV" },
{ TCP_FIN_WAIT1, "TCP_FIN_WAIT1" },
{ TCP_FIN_WAIT2, "TCP_FIN_WAIT2" },
{ TCP_TIME_WAIT, "TCP_TIME_WAIT" },
{ TCP_CLOSE, "TCP_CLOSE" },
{ TCP_CLOSE_WAIT, "TCP_CLOSE_WAIT" },
{ TCP_LAST_ACK, "TCP_LAST_ACK" },
{ TCP_LISTEN, "TCP_LISTEN" },
{ TCP_CLOSING, "TCP_CLOSING" },
{ TCP_NEW_SYN_RECV, "TCP_NEW_SYN_RECV" })
Where trace-cmd and perf do not know the values of those enums.
Use the TRACE_DEFINE_ENUM() macros that will have the trace events convert
the enum strings into their values at system boot. This will allow perf and
trace-cmd to see actual numbers and not enums:
__print_symbolic(REC->oldstate,
{ 1, "TCP_ESTABLISHED" },
{ 2, "TCP_SYN_SENT" },
{ 3, "TCP_SYN_RECV" },
{ 4, "TCP_FIN_WAIT1" },
{ 5, "TCP_FIN_WAIT2" },
{ 6, "TCP_TIME_WAIT" },
{ 7, "TCP_CLOSE" },
{ 8, "TCP_CLOSE_WAIT" },
{ 9, "TCP_LAST_ACK" },
{ 10, "TCP_LISTEN" },
{ 11, "TCP_CLOSING" },
{ 12, "TCP_NEW_SYN_RECV" })
Signed-off-by: Steven Rostedt (VMware)
Acked-by: Song Liu
Signed-off-by: Yafang Shao
---
include/trace/events/tcp.h | 41 -
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git a/include/trace/events/tcp.h b/include/trace/events/tcp.h
index 07a..ec52fb3 100644
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
@@ -9,21 +9,36 @@
#include
#include
+#define tcp_state_names \
+ EM(TCP_ESTABLISHED) \
+ EM(TCP_SYN_SENT)\
+ EM(TCP_SYN_RECV)\
+ EM(TCP_FIN_WAIT1) \
+ EM(TCP_FIN_WAIT2) \
+ EM(TCP_TIME_WAIT) \
+ EM(TCP_CLOSE) \
+ EM(TCP_CLOSE_WAIT) \
+ EM(TCP_LAST_ACK)\
+ EM(TCP_LISTEN) \
+ EM(TCP_CLOSING) \
+ EMe(TCP_NEW_SYN_RECV) \
+
+/* enums need to be exported to user space */
+#undef EM
+#undef EMe
+#define EM(a) TRACE_DEFINE_ENUM(a);
+#define EMe(a)TRACE_DEFINE_ENUM(a);
+
+tcp_state_names
+
+#undef EM
+#undef EMe
+#define EM(a) tcp_state_name(a),
+#define EMe(a)tcp_state_name(a)
+
#define tcp_state_name(state) { state, #state }
#define show_tcp_state_name(val) \
- __print_symbolic(val, \
- tcp_state_name(TCP_ESTABLISHED),\
- tcp_state_name(TCP_SYN_SENT), \
- tcp_state_name(TCP_SYN_RECV), \
- tcp_state_name(TCP_FIN_WAIT1), \
- tcp_state_name(TCP_FIN_WAIT2), \
- tcp_state_name(TCP_TIME_WAIT), \
- tcp_state_name(TCP_CLOSE), \
- tcp_state_name(TCP_CLOSE_WAIT), \
- tcp_state_name(TCP_LAST_ACK), \
- tcp_state_name(TCP_LISTEN), \
- tcp_state_name(TCP_CLOSING),\
- tcp_state_name(TCP_NEW_SYN_RECV))
+ __print_symbolic(val, tcp_state_names)
/*
* tcp event with arguments sk and skb
--
1.8.3.1
Re: [PATCH] PCI: Mediatek: clear irq status after irq dispathed to avoid reentry
On Wed, 2017-12-20 at 10:52 +0800, honghui.zh...@mediatek.com wrote:
> From: Honghui Zhang
>
> There maybe a same irq reentry scenario after irq received in current
> irq handle flow:
> EP device PCIe host driverEP driver
> 1. issue an irq
> 2. received irq
> 3. clear irq status
> 4. dispatch irq
> 5. clear irq source
> The irq status was not successfully cleared at step 2 since the irq
> source was not cleared yet. So the PCIe host driver may receive the
> same irq after step 5. Then there's an irq reentry occurred.
> Even worse, if the reentry irq was not an irq that EP driver expected,
> it may not handle the irq. Then we may run into the dead loop from
> step 2 to step 4.
> Clear the irq status after irq have been dispatched to avoid the irq
> reentry.
>
> Signed-off-by: Honghui Zhang
> ---
> drivers/pci/host/pcie-mediatek.c | 8
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-mediatek.c
> b/drivers/pci/host/pcie-mediatek.c
> index db93efd..3248771 100644
> --- a/drivers/pci/host/pcie-mediatek.c
> +++ b/drivers/pci/host/pcie-mediatek.c
> @@ -605,11 +605,11 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void
> *data)
>
> while ((status = readl(port->base + PCIE_INT_STATUS)) & INTX_MASK) {
> for_each_set_bit_from(bit, &status, PCI_NUM_INTX + INTX_SHIFT) {
> - /* Clear the INTx */
> - writel(1 << bit, port->base + PCIE_INT_STATUS);
> virq = irq_find_mapping(port->irq_domain,
> bit - INTX_SHIFT);
> generic_handle_irq(virq);
> + /* Clear the INTx */
> + writel(1 << bit, port->base + PCIE_INT_STATUS);
> }
> }
>
> @@ -619,10 +619,10 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void
> *data)
>
> while ((imsi_status = readl(port->base +
> PCIE_IMSI_STATUS))) {
> for_each_set_bit(bit, &imsi_status,
> MTK_MSI_IRQS_NUM) {
> - /* Clear the MSI */
> - writel(1 << bit, port->base +
> PCIE_IMSI_STATUS);
> virq =
> irq_find_mapping(port->msi_domain, bit);
> generic_handle_irq(virq);
> + /* Clear the MSI */
> + writel(1 << bit, port->base +
> PCIE_IMSI_STATUS);
> }
> }
> /* Clear MSI interrupt status */
Acked-by: Ryder Lee
Thanks.
Re: [PATCH v2 2/5] mm: Extends local cpu counter vm_diff_nodestat from s8 to s16
On 2017年12月19日 20:38, Michal Hocko wrote:
> On Tue 19-12-17 14:39:23, Kemi Wang wrote:
>> The type s8 used for vm_diff_nodestat[] as local cpu counters has the
>> limitation of global counters update frequency, especially for those
>> monotone increasing type of counters like NUMA counters with more and more
>> cpus/nodes. This patch extends the type of vm_diff_nodestat from s8 to s16
>> without any functionality change.
>>
>> before after
>> sizeof(struct per_cpu_nodestat)28 68
>
> So it is 40B * num_cpus * num_nodes. Nothing really catastrophic IMHO
> but the changelog is a bit silent about any numbers. This is a
> performance optimization so it should better give us some.
>
This patch does not have any functionality change. So no performance gain
I suppose.
I guess you are talking about performance gain from the third patch which
increases threshold size of NUMA counters.
>> Signed-off-by: Kemi Wang
>> ---
>> include/linux/mmzone.h | 4 ++--
>> mm/vmstat.c| 16
>> 2 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
>> index c06d880..2da6b6f 100644
>> --- a/include/linux/mmzone.h
>> +++ b/include/linux/mmzone.h
>> @@ -289,8 +289,8 @@ struct per_cpu_pageset {
>> };
>>
>> struct per_cpu_nodestat {
>> -s8 stat_threshold;
>> -s8 vm_node_stat_diff[NR_VM_NODE_STAT_ITEMS];
>> +s16 stat_threshold;
>> +s16 vm_node_stat_diff[NR_VM_NODE_STAT_ITEMS];
>> };
>>
>> #endif /* !__GENERATING_BOUNDS.H */
>> diff --git a/mm/vmstat.c b/mm/vmstat.c
>> index 1dd12ae..9c681cc 100644
>> --- a/mm/vmstat.c
>> +++ b/mm/vmstat.c
>> @@ -332,7 +332,7 @@ void __mod_node_page_state(struct pglist_data *pgdat,
>> enum node_stat_item item,
>> long delta)
>> {
>> struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats;
>> -s8 __percpu *p = pcp->vm_node_stat_diff + item;
>> +s16 __percpu *p = pcp->vm_node_stat_diff + item;
>> long x;
>> long t;
>>
>> @@ -390,13 +390,13 @@ void __inc_zone_state(struct zone *zone, enum
>> zone_stat_item item)
>> void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
>> {
>> struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats;
>> -s8 __percpu *p = pcp->vm_node_stat_diff + item;
>> -s8 v, t;
>> +s16 __percpu *p = pcp->vm_node_stat_diff + item;
>> +s16 v, t;
>>
>> v = __this_cpu_inc_return(*p);
>> t = __this_cpu_read(pcp->stat_threshold);
>> if (unlikely(v > t)) {
>> -s8 overstep = t >> 1;
>> +s16 overstep = t >> 1;
>>
>> node_page_state_add(v + overstep, pgdat, item);
>> __this_cpu_write(*p, -overstep);
>> @@ -434,13 +434,13 @@ void __dec_zone_state(struct zone *zone, enum
>> zone_stat_item item)
>> void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
>> {
>> struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats;
>> -s8 __percpu *p = pcp->vm_node_stat_diff + item;
>> -s8 v, t;
>> +s16 __percpu *p = pcp->vm_node_stat_diff + item;
>> +s16 v, t;
>>
>> v = __this_cpu_dec_return(*p);
>> t = __this_cpu_read(pcp->stat_threshold);
>> if (unlikely(v < - t)) {
>> -s8 overstep = t >> 1;
>> +s16 overstep = t >> 1;
>>
>> node_page_state_add(v - overstep, pgdat, item);
>> __this_cpu_write(*p, overstep);
>> @@ -533,7 +533,7 @@ static inline void mod_node_state(struct pglist_data
>> *pgdat,
>> enum node_stat_item item, int delta, int overstep_mode)
>> {
>> struct per_cpu_nodestat __percpu *pcp = pgdat->per_cpu_nodestats;
>> -s8 __percpu *p = pcp->vm_node_stat_diff + item;
>> +s16 __percpu *p = pcp->vm_node_stat_diff + item;
>> long o, n, t, z;
>>
>> do {
>> --
>> 2.7.4
>>
>
RE: [PATCH v5 1/2] dt-bindings: misc: Add DT bindings to xlnx_vcu driver
Hi Rob, > -Original Message- > From: Rob Herring [mailto:r...@kernel.org] > Sent: Tuesday, December 19, 2017 3:10 PM > To: Dhaval Rajeshbhai Shah > Cc: a...@arndb.de; gre...@linuxfoundation.org; rdun...@infradead.org; > mark.rutl...@arm.com; devicet...@vger.kernel.org; linux- > ker...@vger.kernel.org; michal.si...@xilinx.com; Hyun Kwon > ; Dhaval Rajeshbhai Shah > Subject: Re: [PATCH v5 1/2] dt-bindings: misc: Add DT bindings to xlnx_vcu > driver > > On Sun, Dec 17, 2017 at 10:15:31PM -0800, Dhaval Shah wrote: > > Add Device Tree binding document for logicoreIP. This logicoreIP > > provides the isolation between the processing system and programmable > > logic. Also provides the clock related information. > > > > Signed-off-by: Dhaval Shah > > --- > > Chnages since v5: > > No Changes. > > Chnages since v4: > > No Changes. > > Chnages since v3: > > * Use "dt-bindings: misc: ..." for the subject. > > Changes since v2: > > * Describe the h/w > > * compatible string is updated to make it more specific > >based on the logicoreIP version. > > * Removed that encoder and decoder child nodes and relatd properties as > that > >will be a separate driver and dts nodes. other team is working on that. > > * Updated to use as a single driver. > > > > .../devicetree/bindings/misc/xlnx,vcu.txt | 31 > > ++ > > 1 file changed, 31 insertions(+) > > create mode 100644 > > Documentation/devicetree/bindings/misc/xlnx,vcu.txt > > Please add Reviewed-by tags when posting new versions. > > Rob Sure. I will add this tag in the next version of patch. Thanks & Regards, Dhaval
Re: [PATCH v2] arm64: dts: ls1088a: Add USB support
On Thu, Dec 07, 2017 at 07:33:28AM +, Yinbo Zhu wrote: > Hi shawn guo, > > If my patch has no other issue, > Can you help me push it to upstream. Are you talking about v4 patch? First of all, I cannot find v4 in my mailbox. That said, it seems you did not send the patch to me. Secondly, by checking the patch on patchwork, the usb nodes in fsl-ls1088a-rdb.dts do not sorted alphabetically in label name. Shawn
[PATCH] PCI: Mediatek: clear irq status after irq dispathed to avoid reentry
From: Honghui Zhang
There maybe a same irq reentry scenario after irq received in current
irq handle flow:
EP device PCIe host driverEP driver
1. issue an irq
2. received irq
3. clear irq status
4. dispatch irq
5. clear irq source
The irq status was not successfully cleared at step 2 since the irq
source was not cleared yet. So the PCIe host driver may receive the
same irq after step 5. Then there's an irq reentry occurred.
Even worse, if the reentry irq was not an irq that EP driver expected,
it may not handle the irq. Then we may run into the dead loop from
step 2 to step 4.
Clear the irq status after irq have been dispatched to avoid the irq
reentry.
Signed-off-by: Honghui Zhang
---
drivers/pci/host/pcie-mediatek.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index db93efd..3248771 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -605,11 +605,11 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void
*data)
while ((status = readl(port->base + PCIE_INT_STATUS)) & INTX_MASK) {
for_each_set_bit_from(bit, &status, PCI_NUM_INTX + INTX_SHIFT) {
- /* Clear the INTx */
- writel(1 << bit, port->base + PCIE_INT_STATUS);
virq = irq_find_mapping(port->irq_domain,
bit - INTX_SHIFT);
generic_handle_irq(virq);
+ /* Clear the INTx */
+ writel(1 << bit, port->base + PCIE_INT_STATUS);
}
}
@@ -619,10 +619,10 @@ static irqreturn_t mtk_pcie_intr_handler(int irq, void
*data)
while ((imsi_status = readl(port->base +
PCIE_IMSI_STATUS))) {
for_each_set_bit(bit, &imsi_status,
MTK_MSI_IRQS_NUM) {
- /* Clear the MSI */
- writel(1 << bit, port->base +
PCIE_IMSI_STATUS);
virq =
irq_find_mapping(port->msi_domain, bit);
generic_handle_irq(virq);
+ /* Clear the MSI */
+ writel(1 << bit, port->base +
PCIE_IMSI_STATUS);
}
}
/* Clear MSI interrupt status */
--
2.6.4
Re: [v7, 3/3] ARM: dts: imx6qdl.dtsi/imx6ul.dtsi: add "fsl, imx6q-snvs-lpgpr" node
On Mon, Dec 11, 2017 at 11:31:52PM +0100, Maciej S. Szmigiero wrote: > On 20.06.2017 09:09, Oleksij Rempel wrote: > > This node is for Low Power General Purpose Register which can > > be used as Non-Volatile Storage. > > > > Signed-off-by: Oleksij Rempel > > --- > > arch/arm/boot/dts/imx6qdl.dtsi | 4 > > arch/arm/boot/dts/imx6ul.dtsi | 4 > > 2 files changed, 8 insertions(+) > > > > diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi > > index e426faa9c243..94e992558238 100644 > (..) > > FYI: It looks to me that while the driver itself from this series was > picked up and eventually reached Linus' tree this DT change was > forgotten, since I can't find in any tree (or am I not looking at the > right place?). Thanks for reminding. I just updated the subject as below and applied the patch. ARM: dts: imx6: add snvs-lpgpr node Shawn
Re: [PATCH v3 02/16] phy: qcom-qmp: Adapt to clk_bulk_* APIs
Hi Manu,
On Tue, Nov 21, 2017 at 2:53 PM, Manu Gautam wrote:
> From: Vivek Gautam
>
> Move from using array of clocks to clk_bulk_* APIs that
> are available now.
>
> Signed-off-by: Vivek Gautam
> Signed-off-by: Manu Gautam
> ---
> drivers/phy/qualcomm/phy-qcom-qmp.c | 50
> -
> 1 file changed, 16 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c
> b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 76acaec..90794dd 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
[snip]
> @@ -998,29 +992,17 @@ static int qcom_qmp_phy_reset_init(struct device *dev)
> static int qcom_qmp_phy_clk_init(struct device *dev)
> {
> struct qcom_qmp *qmp = dev_get_drvdata(dev);
> - int ret, i;
> + int num = qmp->cfg->num_clks;
> + int i;
>
> - qmp->clks = devm_kcalloc(dev, qmp->cfg->num_clks,
> -sizeof(*qmp->clks), GFP_KERNEL);
> + qmp->clks = devm_kcalloc(dev, num, sizeof(*qmp->clks), GFP_KERNEL);
> if (!qmp->clks)
> return -ENOMEM;
>
> - for (i = 0; i < qmp->cfg->num_clks; i++) {
> - struct clk *_clk;
> - const char *name = qmp->cfg->clk_list[i];
> -
> - _clk = devm_clk_get(dev, name);
> - if (IS_ERR(_clk)) {
> - ret = PTR_ERR(_clk);
> - if (ret != -EPROBE_DEFER)
> - dev_err(dev, "failed to get %s clk, %d\n",
> - name, ret);
> - return ret;
> - }
> - qmp->clks[i] = _clk;
> - }
> + for (i = 0; i < num; i++)
> + qmp->clks->id = qmp->cfg->clk_list[i];
I think i missed this one while rebasing.
We need to use index with this. Should be:
qmp->clks[i]->id = qmp->cfg->clk_list[i];
Regards
Vivek
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v4 04/36] nds32: Kernel booting and initialization
2017-12-20 6:01 GMT+08:00 Randy Dunlap :
> On 12/17/2017 10:46 PM, Greentime Hu wrote:
>> From: Greentime Hu
>>
>> This patch includes the kernel startup code. It can get dtb pointer
>> passed from bootloader. It will create a temp mapping by tlb
>> instructions at beginning and goto start_kernel.
>>
>> Signed-off-by: Vincent Chen
>> Signed-off-by: Greentime Hu
>> ---
>> arch/nds32/kernel/head.S | 189 ++
>> arch/nds32/kernel/setup.c | 383
>> +
>> 2 files changed, 572 insertions(+)
>> create mode 100644 arch/nds32/kernel/head.S
>> create mode 100644 arch/nds32/kernel/setup.c
>>
>
>> diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c
>> new file mode 100644
>> index 000..7718c58
>> --- /dev/null
>> +++ b/arch/nds32/kernel/setup.c
>> @@ -0,0 +1,383 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +// Copyright (C) 2005-2017 Andes Technology Corporation
>> +
>
> [snip]
>
>> +struct cache_info L1_cache_info[2];
>> +static void __init dump_cpu_info(int cpu)
>> +{
>> + int i, p = 0;
>> + char str[sizeof(hwcap_str) + 16];
>> +
>> + for (i = 0; hwcap_str[i]; i++) {
>> + if (elf_hwcap & (1 << i)) {
>> + sprintf(str + p, "%s ", hwcap_str[i]);
>> + p += strlen(hwcap_str[i]) + 1;
>> + }
>> + }
>> +
>> + pr_info("CPU%d Featuretures: %s\n", cpu, str);
>
>Features:
>
Thanks Randy. I will fix this typo.
Re: [PATCH v4 25/36] nds32: Miscellaneous header files
2017-12-19 17:54 GMT+08:00 Arnd Bergmann :
> On Tue, Dec 19, 2017 at 6:34 AM, Greentime Hu wrote:
>> Hi, Arnd:
>>
>> 2017-12-18 19:13 GMT+08:00 Arnd Bergmann :
>>> On Mon, Dec 18, 2017 at 7:46 AM, Greentime Hu wrote:
From: Greentime Hu
This patch introduces some miscellaneous header files.
>>>
+static inline void __delay(unsigned long loops)
+{
+ __asm__ __volatile__(".align 2\n"
+"1:\n"
+"\taddi\t%0, %0, -1\n"
+"\tbgtz\t%0, 1b\n"
+:"=r"(loops)
+:"0"(loops));
+}
+
+static inline void __udelay(unsigned long usecs, unsigned long lpj)
+{
+ usecs *= (unsigned long)(((0x8000ULL / (50 / HZ)) +
+ 0x8000ULL) >> 32);
+ usecs = (unsigned long)(((unsigned long long)usecs * lpj) >> 32);
+ __delay(usecs);
+}
>>>
>>> Do you have a reliable clocksource that you can read here instead of doing
>>> the
>>> loop? It's generally preferred to have an accurate delay if at all
>>> possible, the
>>> delay loop calibration is only for those architectures that don't have any
>>> way to observe how much time has passed accurately.
>>>
>>
>> We currently only have atcpit100 as clocksource but it is an IP of SoC.
>> These delay API will be unavailable if we changed to another SoC
>> unless all these timer driver provided the same APIs.
>> It may suffer our customers if they forget to port these APIs in their
>> timer drivers when they try to use nds32 in the first beginning.
>
> Ok, thanks for the clarification.
>
>> Or maybe I can use a CONFIG_USE_ACCURATE_DELAY to keep these 2
>> implementions for these purposes?
>
> I'd just add a one-line comment in delay.h to explain that there is no
> cycle counter in the CPU.
>
Thanks.
Got it. I will add a one-line comment in delay.h
Re: [PATCH v20 0/7] Virtio-balloon Enhancement
Matthew Wilcox wrote:
> > I think xb_find_set() has a bug in !node path.
>
> Don't think. Write a test-case. Please. If it shows a bug, then great,
+unsigned long xb_find_set(struct xb *xb, unsigned long size,
+ unsigned long offset)
+{
+ struct radix_tree_root *root = &xb->xbrt;
+ struct radix_tree_node *node;
+ void __rcu **slot;
+ struct ida_bitmap *bitmap;
+ unsigned long index = offset / IDA_BITMAP_BITS;
+ unsigned long index_end = size / IDA_BITMAP_BITS;
+ unsigned long bit = offset % IDA_BITMAP_BITS;
+
+ if (unlikely(offset >= size))
+ return size;
+
+ while (index <= index_end) {
+ unsigned long ret;
+ unsigned int nbits = size - index * IDA_BITMAP_BITS;
+
+ bitmap = __radix_tree_lookup(root, index, &node, &slot);
+ if (!node) {
+ index = (index | RADIX_TREE_MAP_MASK) + 1;
Why we don't need to reset "bit" to 0 here?
We will continue with wrong offset if "bit != 0", won't we?
+ continue;
+ }
+
+ if (bitmap) {
+ if (nbits > IDA_BITMAP_BITS)
+ nbits = IDA_BITMAP_BITS;
+
+ ret = find_next_bit(bitmap->bitmap, nbits, bit);
+ if (ret != nbits)
+ return ret + index * IDA_BITMAP_BITS;
+ }
+ bit = 0;
+ index++;
+ }
+
+ return size;
+}
linux-next: manual merge of the staging tree with the char-misc-next tree
Hi Greg,
Today's linux-next merge of the staging tree got conflicts in:
drivers/Kconfig
drivers/Makefile
between commits:
bbecb07fa0af ("siox: new driver framework for eckelmann SIOX")
3648e78ec701 ("slimbus: Add SLIMbus bus type")
from the char-misc-next tree and commit:
93d3ad90c2d4 ("drivers: visorbus: move driver out of staging")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/Kconfig
index 02b6fd0864c8,ef5fb8395d76..
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -213,8 -211,6 +213,10 @@@ source "drivers/mux/Kconfig
source "drivers/opp/Kconfig"
+source "drivers/siox/Kconfig"
+
+source "drivers/slimbus/Kconfig"
+
+ source "drivers/visorbus/Kconfig"
+
endmenu
diff --cc drivers/Makefile
index e09663776d8b,7a2330077e47..
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -186,4 -184,4 +186,5 @@@ obj-$(CONFIG_FPGA) += fpga
obj-$(CONFIG_FSI) += fsi/
obj-$(CONFIG_TEE) += tee/
obj-$(CONFIG_MULTIPLEXER) += mux/
+obj-$(CONFIG_SIOX)+= siox/
+ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
Re: [PATCH -tip v3 0/6] net: tcp: sctp: dccp: Replace jprobe usage with trace events
On Tue, 19 Dec 2017 10:01:56 -0800 Alexei Starovoitov wrote: > On Tue, Dec 19, 2017 at 05:56:55PM +0900, Masami Hiramatsu wrote: > > include/trace/events/sctp.h | 98 ++ > > include/trace/events/tcp.h | 80 +++ > > net/Kconfig | 17 -- > > net/dccp/Kconfig| 17 -- > > net/dccp/Makefile |2 > > net/dccp/probe.c| 203 - > > net/dccp/proto.c|5 + > > net/dccp/trace.h| 105 +++ > > net/ipv4/Makefile |1 > > net/ipv4/tcp_input.c|3 > > net/ipv4/tcp_probe.c| 301 > > --- > > net/sctp/Kconfig| 12 -- > > net/sctp/Makefile |3 > > net/sctp/probe.c| 244 --- > > net/sctp/sm_statefuns.c |5 + > > 15 files changed, 296 insertions(+), 800 deletions(-) > > You need to target net-next tree for this patch set. > Good point! I'll rebased on net-next tree. Anyway, I got an issue building this on i386. I'll fix it and resend again. Thank you, -- Masami Hiramatsu
Re: [BUG] Build error for 4.15-rc3 kernel caused by patch "kbuild: Add a cache for generated variables"
2017-12-19 2:17 GMT+09:00 Doug Anderson :
> Hi,
>
> On Mon, Dec 18, 2017 at 7:50 AM, Masahiro Yamada
> wrote:
>> 2017-12-18 23:56 GMT+09:00 Masahiro Yamada :
>>> 2017-12-17 7:35 GMT+09:00 Yang Shi :
Hi folks,
I just upgraded gcc to 6.4 on my centos 7 machine by Arnd's suggestion.
But,
I ran into the below compile error with 4.15-rc3 kernel:
In file included from ./include/uapi/linux/uuid.h:21:0,
from ./include/linux/uuid.h:19,
from ./include/linux/mod_devicetable.h:12,
from scripts/mod/devicetable-offsets.c:2:
./include/linux/string.h:8:20: fatal error: stdarg.h: No such file or
directory
#include
I bisected to commit 3298b690b21cdbe6b2ae8076d9147027f396f2b1 ("kbuild: Add
a cache for generated variables"). Once I revert this commit, kernel build
is fine.
gcc 4.8.5 is fine to build kernel with this commit.
I'm not quite sure if this is a bug or my gcc install is skewed although it
can build kernel without that commit since that commit might exacerbate the
case.
Any hint is appreciated
>>>
>>>
>>> Today, I was also hit with the same error
>>> when I was compiling linux-next.
>>> I am not so sure why this error happens, but
>>> "make clean" will probably fix the problem.
>>>
>>> You need to do "make clean" to blow .cache.mk
>>> when you upgrade your compiler.
>>> This is nasty, though...
>>>
>>
>>
>> I got it.
>>
>> The following line in the top-level Makefile.
>>
>> NOSTDINC_FLAGS += -nostdinc -isystem $(call shell-cached,$(CC)
>> -print-file-name=include)
>>
>>
>> If the stale result of -print-file-name is stored in the cache file,
>> the compiler fails to find
>
> Nice catch! Do you have any idea how we can fix it? I suppose we
> could add a single (non-cached) call to CC somewhere in there to get
> CC's version and clobber the cache if the version changes. Is that
> the best approach here?
>
> In general I remember thinking about the gcc upgrade problem when I
> was first experimenting with the cache. At the time my assumption was
> that if someone updated their gcc then they really ought to be doing a
> clean anyway (I wasn't sure if the build system somehow enforced this,
> but I didn't think so). Doing an incremental build after a compiler
> upgrade just seems (to me) to be asking for asking for trouble, or in
> the very least seems like it's not what the user wanted (if you update
> your compiler you almost certainly want it to be used to build all of
> your code, don't you?)
I agree.
When you upgrade your compiler,
you need to remove not only cache files, but also all object files.
So, "make clean" is the most reasonable way.
> Even if it's wise to do a clean after a compiler upgrade, it still
> seems pretty non-ideal that a user has to decipher an arcane error
> like this, so it seems like we should see what we can do to detect
> this case for the user and help them out. Perhaps rather than
> clobbering the cache we should actually suggest that the user run a
> "make clean"?
>
Right. I think it's a good thing to do.
BTW, "sudo make install" or "sudo make modules_install" could
add some cache entries by super user privilege?
(For example, run build targets with CROSS_COMPILE,
but run install targets without CROSS_COMPILE,
install targets will produce different cache entries.)
If so, "make clean" in normal user privilege
can not remove cache files...
--
Best Regards
Masahiro Yamada
[PATCH v3,net-next 2/2] ip6_gre: fix error path when ip6erspan_rcv failed
Same as ipv4 code, when ip6erspan_rcv call return PACKET_REJECT, we
should call icmpv6_send to send icmp unreachable message in error path.
Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support")
Acked-by: William Tu
Cc: William Tu
Signed-off-by: Haishuang Yan
---
Change since v2:
* Rebase on latest master branch.
* Fix wrong commit information.
---
net/ipv6/ip6_gre.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 45038a9..8451d00 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -604,12 +604,13 @@ static int gre_rcv(struct sk_buff *skb)
tpi.proto == htons(ETH_P_ERSPAN2))) {
if (ip6erspan_rcv(skb, hdr_len, &tpi) == PACKET_RCVD)
return 0;
- goto drop;
+ goto out;
}
if (ip6gre_rcv(skb, &tpi) == PACKET_RCVD)
return 0;
+out:
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
drop:
kfree_skb(skb);
--
1.8.3.1
[PATCH v3,net-next 1/2] ip_gre: fix error path when erspan_rcv failed
When erspan_rcv call return PACKET_REJECT, we shoudn't call ipgre_rcv to
process packets again, instead send icmp unreachable message in error
path.
Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN")
Acked-by: William Tu
Cc: William Tu
Signed-off-by: Haishuang Yan
---
Change since v3:
* Rebase on latest master branch.
* Fix wrong commit information.
---
net/ipv4/ip_gre.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 3029e3e..90c9123 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -436,11 +436,13 @@ static int gre_rcv(struct sk_buff *skb)
tpi.proto == htons(ETH_P_ERSPAN2))) {
if (erspan_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)
return 0;
+ goto out;
}
if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD)
return 0;
+out:
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
drop:
kfree_skb(skb);
--
1.8.3.1
[PATCH v3,net-next 0/2] net: erspan: fix erspan_rcv/ip6erspan_rcv error path
This patch series fix potential issue in error path. Haishuang Yan (2): ip_gre: fix error path when erspan_rcv failed ip6_gre: fix error path when ip6erspan_rcv failed net/ipv4/ip_gre.c | 2 ++ net/ipv6/ip6_gre.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 1.8.3.1
Re: [PATCH 4/5 v5] i2c: i2c-piix4: Use request_declared_muxed_region()
On 12/18/2017 12:48 AM, Zoltan Boszormenyi wrote:
From: Böszörményi Zoltán
Use the new request_declared_muxed_region() macro to
synchronize access to the I/O port pair 0xcd6 / 0xcd7.
At the same time, remove the long lifetime request_region()
call to reserve these I/O ports, so the sp5100_tco watchdog
driver can also load.
This fixes an old regression in Linux 4.4-rc4, caused by
commit 2fee61d22e60 ("i2c: piix4: Add support for multiplexed
main adapter in SB800")
v1: Started with a common mutex in a C source file.
v2: Referenced to common mutex from drivers/usb/host/pci-quirks.c
v3: Switched to using the new request_declared_muxed_region
macro.
v4: Fixed checkpatch.pl warnings and use the new
release_declared_region() macro.
v5: Rebased for 4.15-rc4
Use struct i2c_algorithm pointer directly instead of
a bool to select the proper algo.
This change makes sense, but it should be a separate patch.
Guenter
Signed-off-by: Zoltán Böszörményi
---
drivers/i2c/busses/i2c-piix4.c | 51 +++---
1 file changed, 18 insertions(+), 33 deletions(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 462948e2c535..1846d9ea7d27 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -153,10 +153,11 @@ static const struct dmi_system_id piix4_dmi_ibm[] = {
/*
* SB800 globals
- * piix4_mutex_sb800 protects piix4_port_sel_sb800 and the pair
+ * request_declared_muxed_region() protects piix4_port_sel_sb800 and the pair
* of I/O ports at SB800_PIIX4_SMB_IDX.
*/
-static DEFINE_MUTEX(piix4_mutex_sb800);
+static struct resource sb800_res = DEFINE_RES_IO_NAMED(SB800_PIIX4_SMB_IDX, 2,
+"i2c-piix4");
static u8 piix4_port_sel_sb800;
static u8 piix4_port_mask_sb800;
static u8 piix4_port_shift_sb800;
@@ -169,7 +170,6 @@ struct i2c_piix4_adapdata {
unsigned short smba;
/* SB800 */
- bool sb800_main;
bool notify_imc;
u8 port;/* Port number, shifted */
};
@@ -298,12 +298,12 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
else
smb_en = (aux) ? 0x28 : 0x2c;
- mutex_lock(&piix4_mutex_sb800);
+ request_declared_muxed_region(&sb800_res);
outb_p(smb_en, SB800_PIIX4_SMB_IDX);
smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
outb_p(smb_en + 1, SB800_PIIX4_SMB_IDX);
smba_en_hi = inb_p(SB800_PIIX4_SMB_IDX + 1);
- mutex_unlock(&piix4_mutex_sb800);
+ release_declared_region(&sb800_res);
if (!smb_en) {
smb_en_status = smba_en_lo & 0x10;
@@ -373,7 +373,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
break;
}
} else {
- mutex_lock(&piix4_mutex_sb800);
+ request_declared_muxed_region(&sb800_res);
outb_p(SB800_PIIX4_PORT_IDX_SEL, SB800_PIIX4_SMB_IDX);
port_sel = inb_p(SB800_PIIX4_SMB_IDX + 1);
piix4_port_sel_sb800 = (port_sel & 0x01) ?
@@ -381,7 +381,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
SB800_PIIX4_PORT_IDX;
piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
- mutex_unlock(&piix4_mutex_sb800);
+ release_declared_region(&sb800_res);
}
dev_info(&PIIX4_dev->dev,
@@ -679,7 +679,7 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16
addr,
u8 port;
int retval;
- mutex_lock(&piix4_mutex_sb800);
+ request_declared_muxed_region(&sb800_res);
/* Request the SMBUS semaphore, avoid conflicts with the IMC */
smbslvcnt = inb_p(SMBSLVCNT);
@@ -695,7 +695,7 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16
addr,
} while (--retries);
/* SMBus is still owned by the IMC, we give up */
if (!retries) {
- mutex_unlock(&piix4_mutex_sb800);
+ release_declared_region(&sb800_res);
return -EBUSY;
}
@@ -753,7 +753,7 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
if ((size == I2C_SMBUS_BLOCK_DATA) && adapdata->notify_imc)
piix4_imc_wakeup();
- mutex_unlock(&piix4_mutex_sb800);
+ release_declared_region(&sb800_res);
return retval;
}
@@ -804,7 +804,8 @@ static struct i2c_adapter
*piix4_main_adapters[PIIX4_MAX_ADAPTERS];
static struct i2c_adapter *piix4_aux_adapter;
static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
-bool sb800_main, u8 port, bool notify_imc,
+struct i2c_algorithm *algo,
+u8 port, bool notify_imc,
const char *name, struct i2c_adapter **padap)
Re: [PATCH v10 1/5] add infrastructure for tagging functions as error injectable
On 12/18/17 10:29 PM, Masami Hiramatsu wrote: +#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#ifdef CONFIG_BPF_KPROBE_OVERRIDE BTW, CONFIG_BPF_KPROBE_OVERRIDE is also confusable name. Since this feature override a function to just return with some return value (as far as I understand, or would you also plan to modify execution path inside a function?), I think it should be better CONFIG_BPF_FUNCTION_OVERRIDE or CONFIG_BPF_EXECUTION_OVERRIDE. I don't think such renaming makes sense. The feature is overriding kprobe by changing how kprobe returns. It doesn't override BPF_FUNCTION or BPF_EXECUTION. The kernel enters and exists bpf program as normal. Indeed, BPF is based on kprobes, but it seems you are limiting it with ftrace (function-call trace) (I'm not sure the reason why), so using "kprobes" for this feature seems strange for me. do you have an idea how kprobe override can happen when kprobe placed in the middle of the function? Please make your suggestion as patches based on top of bpf-next. Thanks
linux-next: manual merge of the usb tree with the usb.current tree
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in:
drivers/usb/usbip/vhci_rx.c
between commit:
8272d099d05f ("usbip: vhci: stop printing kernel pointer addresses in
messages")
from the usb.current tree and commit:
81d8a8eb0a97 ("USB: usbip: fix spelling mistake: "synchronuously" ->
"synchronously"")
from the usb tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/usb/usbip/vhci_rx.c
index 112ebb90d8c9,a9813f1d507d..
--- a/drivers/usb/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
@@@ -29,9 -30,9 +29,9 @@@ struct urb *pickup_urb_and_free_priv(st
case -ENOENT:
/* fall through */
case -ECONNRESET:
- dev_info(&urb->dev->dev,
- "urb %p was unlinked %ssynchronously.\n", urb,
- status == -ENOENT ? "" : "a");
+ dev_dbg(&urb->dev->dev,
-"urb seq# %u was unlinked %ssynchronuously\n",
++ "urb seq# %u was unlinked %ssynchronously\n",
+ seqnum, status == -ENOENT ? "" : "a");
break;
case -EINPROGRESS:
/* no info output */
[PATCH v3,net-next 2/2] ip6_gre: fix potential memory leak in ip6erspan_rcv
If md is NULL, tun_dst must be freed, otherwise it will cause memory
leak.
Fixes: ef7baf5e083c ("ip6_gre: add ip6 erspan collect_md mode")
Cc: William Tu
Signed-off-by: Haishuang Yan
---
Changes since v3:
* Rebase on latest master branch.
* Fix wrong commit information.
---
net/ipv6/ip6_gre.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 9bd1103..45038a9 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -550,8 +550,10 @@ static int ip6erspan_rcv(struct sk_buff *skb, int
gre_hdr_len,
info = &tun_dst->u.tun_info;
md = ip_tunnel_info_opts(info);
- if (!md)
+ if (!md) {
+ dst_release((struct dst_entry *)tun_dst);
return PACKET_REJECT;
+ }
memcpy(md, pkt_md, sizeof(*md));
md->version = ver;
--
1.8.3.1
[PATCH v3,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv
If md is NULL, tun_dst must be freed, otherwise it will cause memory
leak.
Fixes: 1a66a836da6 ("gre: add collect_md mode to ERSPAN tunnel")
Cc: William Tu
Signed-off-by: Haishuang Yan
---
Changes since v3:
* Rebase on latest master branch.
* Fix wrong commit information.
---
net/ipv4/ip_gre.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index fd4d6e9..3029e3e 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -313,8 +313,10 @@ static int erspan_rcv(struct sk_buff *skb, struct
tnl_ptk_info *tpi,
return PACKET_REJECT;
md = ip_tunnel_info_opts(&tun_dst->u.tun_info);
- if (!md)
+ if (!md) {
+ dst_release((struct dst_entry *)tun_dst);
return PACKET_REJECT;
+ }
memcpy(md, pkt_md, sizeof(*md));
md->version = ver;
--
1.8.3.1
[PATCH v3,net-next 0/2] net: erspan: fix potential memory leak
This patch series fix potential memory leak issue. Haishuang Yan (2): ip_gre: fix potential memory leak in erspan_rcv ip6_gre: fix potential memory leak in ip6erspan_rcv net/ipv4/ip_gre.c | 4 +++- net/ipv6/ip6_gre.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) -- 1.8.3.1
Re: proc_flush_task oops
ebied...@xmission.com (Eric W. Biederman) writes:
> Dave Jones writes:
>
>> On Tue, Dec 19, 2017 at 12:27:30PM -0600, Eric W. Biederman wrote:
>> > Dave Jones writes:
>> >
>> > > On Mon, Dec 18, 2017 at 03:50:52PM -0800, Linus Torvalds wrote:
>> > >
>> > > > But I don't see what would have changed in this area recently.
>> > > >
>> > > > Do you end up saving the seeds that cause crashes? Is this
>> > > > reproducible? (Other than seeing it twoce, of course)
>> > >
>> > > Only clue so far, is every time I'm able to trigger it, the last thing
>> > > the child process that triggers it did, was an execveat.
>> >
>> > Is there any chance the excveat might be called from a child thread?
>>
>> If trinity choose one of the exec syscalls, it forks off an extra child
>> to do it in, on the off-chance that it succeeds, and we never return.
>> https://github.com/kernelslacker/trinity/blob/master/syscall.c#L139
>
> extrapid = fork();
> if (extrapid == 0) {
> /* grand-child */
> char childname[]="trinity-subchild";
> prctl(PR_SET_NAME, (unsigned long) &childname);
>
> __do_syscall(rec, GOING_AWAY);
> /* if this was for eg. an successful execve, we should never
> get here.
>* if it failed though... */
> _exit(EXIT_SUCCESS);
> }
>
> That is interesting.
>
>
> So the system call sequence is a fork which just succeeded and than an
> exec. That reduces the possibilities quite a lot.
>
> With pids there was a recent change that just replaced the pid hash
> table and the pid bitmap with and idr. It changes the locking somewhat
> and probably changes the timing so that might be the culprit.
>
> I am trying to figure out if there is an interface that would let
> ns_last_pid for a pid namespace be accessed before the first pid is
> allocated and I am not seeing it. It does not appear to be possible
> to mount a proc for a pid namespace you are not currently in.
>
> *Scratches my head* I am not seeing anything obvious.
Can you try this patch as you reproduce this issue?
diff --git a/kernel/pid.c b/kernel/pid.c
index b13b624e2c49..df9e5d4d8f83 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -210,6 +210,7 @@ struct pid *alloc_pid(struct pid_namespace *ns)
goto out_unlock;
for ( ; upid >= pid->numbers; --upid) {
/* Make the PID visible to find_pid_ns. */
+ WARN_ON(!upid->ns->proc_mnt);
idr_replace(&upid->ns->idr, pid, upid->nr);
upid->ns->pid_allocated++;
}
If the warning triggers it means the bug is in alloc_pid and somehow
something has gotten past the is_child_reaper check.
If the warning does not trigger it means something is stomping proc_mnt.
In the entire kernel there are exactly two assignments to proc_mnt.
- kmem_cache_zalloc in create_pid_namespace.
- In pid_ns_prepare_proc where proc_mnt is set to a non-zero value.
On the 29th of Nov syzkaller also hit this and gave me this reproducer
that I can't figure out heads or tails of.
#{Threaded:true Collide:true Repeat:true Procs:8 Sandbox:namespace Fault:false
FaultCall:-1 FaultNth:0 EnableTun:true UseTmpDir:true HandleSegv:true
WaitRepeat:true Debug:false Repro:false}
mmap(&(0x7f00/0xfff000)=nil, 0xfff000, 0x3, 0x32, 0x,
0x0)
perf_event_open(&(0x7f25c000)={0x2, 0x78, 0x3e3, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0xf72, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0, 0x0, 0x0}, 0x0, 0x, 0x, 0x0)
socket$inet6_dccp(0xa, 0x6, 0x0)
unshare(0x2400)
sendmsg$unix(0x,
&(0x7f001000-0x38)={&(0x7f239000-0x8)=@abs={0x0, 0x0, 0x0}, 0x8,
&(0x7f008000)=[], 0x0, &(0x7f001000-0x10)=[@rights={0x200, 0x1, 0x1,
[0x]}], 0x1, 0x0}, 0x0)
process_vm_writev(0x0,
&(0x7f699000-0x70)=[{&(0x7f6a5000)="",
0x4c}, {&(0x7f7b9000-0x54)="", 0x0}, {&(0x7f4f3000)="", 0x0},
{&(0x7f2e3000-0xd6)="",
0xd6},
{&(0x7ff2e000)="",
0x52}, {&(0x7f8e5000-0x10)="", 0x10},
{&(0x7fa3a000)="", 0x0}], 0x7, &(0x7fd05000)=[{&(0x7fd64000)="",
0x0},
[PATCH v3,net-next] ip6_gre: fix a pontential issue in ip6erspan_rcv
pskb_may_pull() can change skb->data, so we need to load ipv6h/ershdr at
the right place.
Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support")
Cc: William Tu
Acked-by: William Tu
Signed-off-by: Haishuang Yan
---
Change since v3:
* Rebase on latest master branch.
* Fix wrong commit information.
---
net/ipv6/ip6_gre.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 87b9892..9bd1103 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -507,12 +507,11 @@ static int ip6erspan_rcv(struct sk_buff *skb, int
gre_hdr_len,
struct ip6_tnl *tunnel;
u8 ver;
- ipv6h = ipv6_hdr(skb);
- ershdr = (struct erspan_base_hdr *)skb->data;
-
if (unlikely(!pskb_may_pull(skb, sizeof(*ershdr
return PACKET_REJECT;
+ ipv6h = ipv6_hdr(skb);
+ ershdr = (struct erspan_base_hdr *)skb->data;
ver = (ntohs(ershdr->ver_vlan) & VER_MASK) >> VER_OFFSET;
tpi->key = cpu_to_be32(ntohs(ershdr->session_id) & ID_MASK);
--
1.8.3.1
Re: [PATCH] kfree_rcu() should use the new kfree_bulk() interface for freeing rcu structures
On Tue, Dec 19, 2017 at 04:20:51PM -0800, Paul E. McKenney wrote: > If we are going to make this sort of change, we should do so in a way > that allows the slab code to actually do the optimizations that might > make this sort of thing worthwhile. After all, if the main goal was small > code size, the best approach is to drop kfree_bulk() and get on with life > in the usual fashion. > > I would prefer to believe that something like kfree_bulk() can help, > and if that is the case, we should give it a chance to do things like > group kfree_rcu() requests by destination slab and soforth, allowing > batching optimizations that might provide more significant increases > in performance. Furthermore, having this in slab opens the door to > slab taking emergency action when memory is low. kfree_bulk does sort by destination slab; look at build_detached_freelist.
Re: [PATCH v4 0/5] Add Intel IOMMU debugfs support
On Tue, 2017-12-19 at 23:25 +0200, Andy Shevchenko wrote: > > Perhaps you need to switch to SPDX license pointer. > I dunno if Thomas' patch with documentation how to do this made > upstream > / linux-next yet. > Thanks. I found the information at https://patchwork.kernel.org/patch/1 0091607/. I'll replace the GPL 2.0 license information in intel-iommu-debug.c with the tag: // SPDX-License-Identifier: GPL-2.0
Re: [v2 PATCH -tip 1/6] net: tcp: Add trace events for TCP congestion window tracing
Hi Masami, I love your patch! Yet something to improve: [auto build test ERROR on net/master] [also build test ERROR on v4.15-rc4 next-20171219] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Masami-Hiramatsu/net-tcp-sctp-dccp-Replace-jprobe-usage-with-trace-events/20171220-081035 config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=sh All error/warnings (new ones prefixed by >>): In file included from include/trace/events/udp.h:9:0, from net//core/net-traces.c:35: >> include/trace/events/tcp.h:37:11: error: expected ')' before 'const' TP_PROTO(const struct sock *sk, const struct sk_buff *skb), ^ include/linux/tracepoint.h:105:27: note: in definition of macro 'TP_PROTO' #define TP_PROTO(args...) args ^~~~ >> include/linux/tracepoint.h:237:20: error: redefinition of >> '__tpstrtab_tcp_retransmit_skb' static const char __tpstrtab_##name[] \ ^ >> include/linux/tracepoint.h:247:2: note: in expansion of macro >> 'DEFINE_TRACE_FN' DEFINE_TRACE_FN(name, NULL, NULL); ^~~ >> include/trace/define_trace.h:51:2: note: in expansion of macro 'DEFINE_TRACE' DEFINE_TRACE(name) ^~~~ >> include/trace/events/tcp.h:90:1: note: in expansion of macro 'DEFINE_EVENT' DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, ^~~~ In file included from include/trace/events/tcp.h:10:0, from net//core/net-traces.c:34: include/linux/tracepoint.h:237:20: note: previous definition of '__tpstrtab_tcp_retransmit_skb' was here static const char __tpstrtab_##name[] \ ^ >> include/linux/tracepoint.h:247:2: note: in expansion of macro >> 'DEFINE_TRACE_FN' DEFINE_TRACE_FN(name, NULL, NULL); ^~~ >> include/trace/define_trace.h:51:2: note: in expansion of macro 'DEFINE_TRACE' DEFINE_TRACE(name) ^~~~ >> include/trace/events/tcp.h:90:1: note: in expansion of macro 'DEFINE_EVENT' DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, ^~~~ In file included from include/trace/events/udp.h:9:0, from net//core/net-traces.c:35: include/linux/tracepoint.h:239:20: error: redefinition of '__tracepoint_tcp_retransmit_skb' struct tracepoint __tracepoint_##name \ ^ >> include/linux/tracepoint.h:247:2: note: in expansion of macro >> 'DEFINE_TRACE_FN' DEFINE_TRACE_FN(name, NULL, NULL); ^~~ >> include/trace/define_trace.h:51:2: note: in expansion of macro 'DEFINE_TRACE' DEFINE_TRACE(name) ^~~~ >> include/trace/events/tcp.h:90:1: note: in expansion of macro 'DEFINE_EVENT' DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, ^~~~ In file included from include/trace/events/tcp.h:10:0, from net//core/net-traces.c:34: include/linux/tracepoint.h:239:20: note: previous definition of '__tracepoint_tcp_retransmit_skb' was here struct tracepoint __tracepoint_##name \ ^ >> include/linux/tracepoint.h:247:2: note: in expansion of macro >> 'DEFINE_TRACE_FN' DEFINE_TRACE_FN(name, NULL, NULL); ^~~ >> include/trace/define_trace.h:51:2: note: in expansion of macro 'DEFINE_TRACE' DEFINE_TRACE(name) ^~~~ >> include/trace/events/tcp.h:90:1: note: in expansion of macro 'DEFINE_EVENT' DEFINE_EVENT(tcp_event_sk_skb, tcp_retransmit_skb, ^~~~ In file included from include/trace/events/udp.h:9:0, from net//core/net-traces.c:35: >> include/linux/tracepoint.h:242:35: error: redefinition of >> '__tracepoint_ptr_tcp_retransmit_skb' static struct tracepoint * const __tracepoint_ptr_##name __used \ ^ >> include/linux/tracepoint.h:247:2: note: in expansion of macro >> 'DEFINE_TRACE_FN' DEFINE_TRACE_FN(name, NULL, NULL); ^~~ >> include/trace/define_trace.h:51:2: note: in expansion of macro 'DEFINE_TRACE' DEFINE_TRACE(name) ^~~~ >> include/trace/events/tcp.h:90:1: note: in expansion of macro
Re: [PATCH] tools/power: Don't make man pages executable
On 12/20/2017 1:36 AM, Laura Abbott wrote: On 12/19/2017 03:48 PM, Rafael J. Wysocki wrote: On 12/19/2017 8:54 PM, Laura Abbott wrote: rpm-lint flagged these as being executable: kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/turbostat.8.gz kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/x86_energy_perf_policy.8.gz Fix this Signed-off-by: Laura Abbott Please CC PM stuff to linux-pm (which makes it easier to handle). Neither of these are listed in MAINTAINERS so I missed sending to linux-pm. I'll remember for next time, do you want me to resend for tracking? Yes, please. Thanks, Rafael --- tools/power/x86/turbostat/Makefile | 2 +- tools/power/x86/x86_energy_perf_policy/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index a9bc914a8fe8..2ab25aa38263 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -25,4 +25,4 @@ install : turbostat install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile index 2447b1bbaacf..f4534fb8b951 100644 --- a/tools/power/x86/x86_energy_perf_policy/Makefile +++ b/tools/power/x86/x86_energy_perf_policy/Makefile @@ -24,5 +24,5 @@ install : x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/x86_energy_perf_policy $(DESTDIR)$(PREFIX)/bin/x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 Thanks, Rafael
Re: [PATCH] mm: thp: use down_read_trylock in khugepaged to avoid long block
On 12/18/17 12:41 AM, Michal Hocko wrote: On Sat 16-12-17 23:09:25, Kirill A. Shutemov wrote: On Sat, Dec 16, 2017 at 12:45:25PM +0100, Michal Hocko wrote: On Sat 16-12-17 04:04:10, Yang Shi wrote: [...] Shall we add "cond_resched()" in unmap_vmas(), i.e for every 100 vmas? It may improve the responsiveness a little bit for non-preempt kernel, although it still can't release the semaphore. We already do, once per pmd (see zap_pmd_range). It doesn't help. We would need to find a way to drop mmap_sem, if we're holding it way too long. And doing it on per-vma count basis is not right call. It won't address issue with single huge vma. Absolutely agreed. I just wanted to point out that a new cond_resched is not really needed. One way to reduce the lock starvation is to use range locking. It looks the range locking development is stalled? Yang Do we have any instrumentation that would help detect starvation on a rw_semaphore? I am afraid we don't.
Re: [PATCH v2,net-next 1/2] ip_gre: fix potential memory leak in erspan_rcv
> On 2017年12月19日, at 下午11:36, David Miller wrote:
>
> From: Haishuang Yan
> Date: Sat, 16 Dec 2017 10:48:38 +0800
>
>> If md is NULL, tun_dst must be freed, otherwise it will cause memory
>> leak.
>>
>> Fixes: 1a66a836da6 ("gre: add collect_md mode to ERSPAN tunnel")
>> Cc: William Tu
>> Signed-off-by: Haishuang Yan
>>
>> Change since v2:
>> * Rebase on latest master branch.
>> * Correct wrong fix information.
>
> Please do not put a changelog after the fixes and signoff tags, those tags
> must
> appear last in the commit message.
>
> Thank you.
>
Okay, I will resubmit another commit, thanks.
Re: [PATCH v2,net-next] ip6_gre: fix a pontential issue in ip6erspan_rcv
> On 2017年12月19日, at 下午11:34, David Miller wrote:
>
> From: Haishuang Yan
> Date: Sat, 16 Dec 2017 10:25:25 +0800
>
>> pskb_may_pull() can change skb->data, so we need to load ipv6h/ershdr at
>> the right place.
>>
>> Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support")
>> Acked-by: William Tu
>> Cc: William Tu
>> Signed-off-by: Haishuang Yan
>
> This patch does not apply:
>
>> +ipv6h = ipv6_hdr(skb);
>> +ershdr = (struct erspan_base_hdr *)skb->data;
>> ver = (ntohs(ershdr->ver_vlan) & VER_MASK) >> VER_OFFSET;
>> tpi->key = cpu_to_be32(ntohs(ershdr->session_id) & ID_MASK);
>> pkt_md = (struct erspan_metadata *)(ershdr + 1);
>
> There is not "pkt_md = ..." assignment in net-next on this line.
>
Okay, I will fix it and resubmit another commit, thanks.
[PATCH -V4 -mm] mm, swap: Fix race between swapoff and some swap operations
From: Huang Ying
When the swapin is performed, after getting the swap entry information
from the page table, system will swap in the swap entry, without any
lock held to prevent the swap device from being swapoff. This may
cause the race like below,
CPU 1 CPU 2
- -
do_swap_page
swapin_readahead
__read_swap_cache_async
swapoff swapcache_prepare
p->swap_map = NULL__swap_duplicate
p->swap_map[?] /* !!! NULL pointer
access */
Because swapoff is usually done when system shutdown only, the race
may not hit many people in practice. But it is still a race need to
be fixed.
To fix the race, get_swap_device() is added to check whether the
specified swap entry is valid in its swap device. If so, it will keep
the swap entry valid via preventing the swap device from being
swapoff, until put_swap_device() is called.
Because swapoff() is very race code path, to make the normal path runs
as fast as possible, RCU instead of reference count is used to
implement get/put_swap_device(). From get_swap_device() to
put_swap_device(), the RCU read lock is held, so synchronize_rcu() in
swapoff() will wait until put_swap_device() is called.
In addition to swap_map, cluster_info, etc. data structure in the
struct swap_info_struct, the swap cache radix tree will be freed after
swapoff, so this patch fixes the race between swap cache looking up
and swapoff too.
Cc: Hugh Dickins
Cc: Paul E. McKenney
Cc: Minchan Kim
Cc: Johannes Weiner
Cc: Tim Chen
Cc: Shaohua Li
Cc: Mel Gorman
Cc: "Jérôme Glisse"
Cc: Michal Hocko
Cc: Andrea Arcangeli
Cc: David Rientjes
Cc: Rik van Riel
Cc: Jan Kara
Cc: Dave Jiang
Cc: Aaron Lu
Signed-off-by: "Huang, Ying"
Changelog:
v4:
- Use synchronize_rcu() in enable_swap_info() to reduce overhead of
normal paths further.
v3:
- Re-implemented with RCU to reduce the overhead of normal paths
v2:
- Re-implemented with SRCU to reduce the overhead of normal paths.
- Avoid to check whether the swap device has been swapoff in
get_swap_device(). Because we can check the origin of the swap
entry to make sure the swap device hasn't bee swapoff.
---
include/linux/swap.h | 11 -
mm/memory.c | 2 +-
mm/swap_state.c | 16 +--
mm/swapfile.c| 123 ++-
4 files changed, 116 insertions(+), 36 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 2417d288e016..f7e8f26cf07f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -172,8 +172,9 @@ enum {
SWP_PAGE_DISCARD = (1 << 9),/* freed swap page-cluster discards */
SWP_STABLE_WRITES = (1 << 10), /* no overwrite PG_writeback pages */
SWP_SYNCHRONOUS_IO = (1 << 11), /* synchronous IO is efficient */
+ SWP_VALID = (1 << 12),/* swap is valid to be operated on? */
/* add others here before... */
- SWP_SCANNING= (1 << 12),/* refcount in scan_swap_map */
+ SWP_SCANNING= (1 << 13),/* refcount in scan_swap_map */
};
#define SWAP_CLUSTER_MAX 32UL
@@ -460,7 +461,7 @@ extern unsigned int count_swap_pages(int, int);
extern sector_t map_swap_page(struct page *, struct block_device **);
extern sector_t swapdev_block(int, pgoff_t);
extern int page_swapcount(struct page *);
-extern int __swap_count(struct swap_info_struct *si, swp_entry_t entry);
+extern int __swap_count(swp_entry_t entry);
extern int __swp_swapcount(swp_entry_t entry);
extern int swp_swapcount(swp_entry_t entry);
extern struct swap_info_struct *page_swap_info(struct page *);
@@ -470,6 +471,12 @@ extern int try_to_free_swap(struct page *);
struct backing_dev_info;
extern int init_swap_address_space(unsigned int type, unsigned long nr_pages);
extern void exit_swap_address_space(unsigned int type);
+extern struct swap_info_struct *get_swap_device(swp_entry_t entry);
+
+static inline void put_swap_device(struct swap_info_struct *si)
+{
+ rcu_read_unlock();
+}
#else /* CONFIG_SWAP */
diff --git a/mm/memory.c b/mm/memory.c
index 1a969992f76b..77a7d6191218 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2909,7 +2909,7 @@ int do_swap_page(struct vm_fault *vmf)
struct swap_info_struct *si = swp_swap_info(entry);
if (si->flags & SWP_SYNCHRONOUS_IO &&
- __swap_count(si, entry) == 1) {
+ __swap_count(entry) == 1) {
/* skip swapcache */
page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma,
vmf->address);
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 0b8ae361981f..8dde719e973c 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state
Re: [PATCH v4 2/2] kbuild: Cache a few more calls to the compiler
I'm seeing some build breakage that I bisected to commit 4e56207130eda: > CC kernel/bounds.s > In file included from /home/davehans/linux.git/include/asm-generic/bug.h:15:0, > from /home/davehans/linux.git/arch/x86/include/asm/bug.h:81, > from /home/davehans/linux.git/include/linux/bug.h:4, > from /home/davehans/linux.git/include/linux/page-flags.h:9, > from /home/davehans/linux.git/kernel/bounds.c:9: > /home/davehans/linux.git/include/linux/kernel.h:5:20: fatal error: stdarg.h: > No such file or directory > #include > ^ > compilation terminated. It's odd because I'm pretty sure I've done 4.15-rc compiles on this system before without issues. I suspect something in my config (attached) is triggering this. Does this look familiar to anyone? gcc -v Using built-in specs. COLLECT_GCC=/usr/bin/gcc COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/6.4.1/lto-wrapper Target: x86_64-redhat-linux Configured with: ../configure --enable-bootstrap --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-plugin --enable-initfini-array --disable-libgcj --with-isl --enable-libmpx --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux Thread model: posix gcc version 6.4.1 20170727 (Red Hat 6.4.1-1) (GCC) # # Automatically generated file; DO NOT EDIT. # Linux/x86 4.14.0-rc3 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MIN=28 CONFIG_ARCH_MMAP_RND_BITS_MAX=32 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ZONE_DMA32=y CONFIG_AUDIT_ARCH=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_X86_64_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=4 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y # # General setup # CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KERNEL_LZO=y CONFIG_HAVE_KERNEL_LZ4=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZ4 is not set CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y CONFIG_USELIB=y CONFIG_AUDIT=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_GENERIC_MSI_IRQ=y CONFIG_GENERIC_MSI_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y # CONFIG_GENERIC_IRQ_DEBUGFS is not set CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y # # Timers subsystem # CONFIG_TICK_ONESHOT=y CONFIG_HZ_PERIODIC=y # CONFIG_NO_HZ_IDLE is not set # CONFIG_NO_HZ_FULL is not set # CONFIG_NO_HZ is not set CONFIG_HIGH_RES_TIMERS=y # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_
RE: [PATCH v4 07/12] [media] cxd2880: Add top level of the driver
Hi, Mauro > > + > > +#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ > > Same comments as on other patches: use SPDX and dev_foo() for printing > messages. About printing messages pr_fmt, I also replied a comment to [PATCH v4 02/12] [media] cxd2880-spi: Add support for CXD2880 SPI interface. Please refer to the comment. Thanks, Takiguchi
Re: [PATCH] kthread: finer-grained lockdep/cross-release completion
On 12/19/2017 6:59 PM, Daniel Vetter wrote: On Mon, Dec 18, 2017 at 09:42:13AM -0800, Linus Torvalds wrote: On Sun, Dec 17, 2017 at 11:11 PM, Daniel Vetter wrote: This didn't seem to have made it into -rc4. Anything needed to get it going? Do you actually see the problem in -rc4? Because we ended up removing the cross-release checking due to other developers complaining. It seemed to need a lot more work before it was ready. So I suspect the patch is simply not relevant any more (even if it's not necessarily wrong either). Awww ... I like the cross release stuff, it's catching lots of good bugs for us - writing a gpu memory manager that's supposed to interface with the core one ain't the simplest thing to get right. That's also why we're going around and fixing up fallout (we've worked on the worker annotations for 4.14 too). I guess next release, hopefully. I think between 4.14 and 4.15 attemps cross-release spotted around 5 or so genuine deadlocks in i915 code. And at least right now, with the current set of fixups our CI runs are splat-free. So at least a Kconfig option would be nice, to be able to enable it easily when you want to. Wrt us not noticing: Getting the patches in through normal means takes too long, so we constantly carry arounda bunch of fixup patches to address serious issues that block CI (no lockdep is no good CI). That's why we won't immediately notice when an issue is resolved some other way. Hello Ingo and Linus, IMO, taking it off by default is enough. What fs folk actually wanted is not to remove whole stuff but make it off by default. Cross-release logic itself makes sense. Please consider it back and apply my patch making it off by default. I will do what I can do for the classification in layered fs. -- Thanks, Byungchul
Re: [PATCH 14/15] dax: associate mappings with inodes, and warn if dma collides with truncate
On Fri, Nov 10, 2017 at 1:08 AM, Christoph Hellwig wrote:
>> + struct {
>> + /*
>> + * ZONE_DEVICE pages are never on an lru or handled by
>> + * a slab allocator, this points to the hosting device
>> + * page map.
>> + */
>> + struct dev_pagemap *pgmap;
>> + /*
>> + * inode association for MEMORY_DEVICE_FS_DAX page-idle
>> + * callbacks. Note that we don't use ->mapping since
>> + * that has hard coded page-cache assumptions in
>> + * several paths.
>> + */
>
> What assumptions? I'd much rather fix those up than having two fields
> that have the same functionality.
[ Reviving this old thread where you asked why I introduce page->inode
instead of reusing page->mapping ]
For example, xfs_vm_set_page_dirty() assumes that page->mapping being
non-NULL indicates a typical page cache page, this is a false
assumption for DAX. My guess at a fix for this is to add
pagecache_page() checks to locations like this, but I worry about how
to find them all. Where pagecache_page() is:
bool pagecache_page(struct page *page)
{
if (!page->mapping)
return false;
if (!IS_DAX(page->mapping->host))
return false;
return true;
}
Otherwise we go off the rails:
WARNING: CPU: 27 PID: 1783 at fs/xfs/xfs_aops.c:1468
xfs_vm_set_page_dirty+0xf3/0x1b0 [xfs]
[..]
CPU: 27 PID: 1783 Comm: dma-collision Tainted: G O
4.15.0-rc2+ #984
[..]
Call Trace:
set_page_dirty_lock+0x40/0x60
bio_set_pages_dirty+0x37/0x50
iomap_dio_actor+0x2b7/0x3b0
? iomap_dio_zero+0x110/0x110
iomap_apply+0xa4/0x110
iomap_dio_rw+0x29e/0x3b0
? iomap_dio_zero+0x110/0x110
? xfs_file_dio_aio_read+0x7c/0x1a0 [xfs]
xfs_file_dio_aio_read+0x7c/0x1a0 [xfs]
xfs_file_read_iter+0xa0/0xc0 [xfs]
__vfs_read+0xf9/0x170
vfs_read+0xa6/0x150
SyS_pread64+0x93/0xb0
entry_SYSCALL_64_fastpath+0x1f/0x96
[PATCH 1/1] powerpc: Emulate paste instruction
From: Michael Neuling
On POWER9 DD2.1 and below there are issues when the paste instruction
generates an error. If an error occurs when thread reconfiguration
happens (ie another thread in the core goes into/out of powersave) the
core may hang.
To avoid this a special sequence is required which stops thread
configuration so that the paste can be safely executed.
This patch assumes paste executed in userspace are trapped into the
illegal instruction exception at 0xe40.
Here we re-execute the paste instruction but with the required
sequence to ensure thread reconfiguration doesn't occur.
Signed-off-by: Michael Neuling
Signed-off-by: Sukadev Bhattiprolu
---
Changelog[v4]:
- We need to disable pagefaults after all when modifying the thread
reconfig registers. Use a mutex, rather than a spinlock around
the thread reconfig registers. Acquire the mutex first then block
interrupts so we don't sleep on the mutex with interrupts disabled.
Changlog[v3]:
- [Michael Ellerman] We don't need to disable/enable pagefaults
when emulating paste;
- [Michael Ellerman, Aneesh Kumar] Fix retval from emulate_paste()
Changelog[v2]:
[Sukadev]: Use PPC_PASTE() rather than the paste instruction since
in older versions the instruction required a third parameter.
---
arch/powerpc/include/asm/emulated_ops.h | 1 +
arch/powerpc/include/asm/ppc-opcode.h | 1 +
arch/powerpc/include/asm/reg.h | 2 +
arch/powerpc/kernel/traps.c | 73 +
4 files changed, 77 insertions(+)
diff --git a/arch/powerpc/include/asm/emulated_ops.h
b/arch/powerpc/include/asm/emulated_ops.h
index 651e135..fdc95cf 100644
--- a/arch/powerpc/include/asm/emulated_ops.h
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -59,6 +59,7 @@ extern struct ppc_emulated {
struct ppc_emulated_entry lxvh8x;
struct ppc_emulated_entry lxvd2x;
struct ppc_emulated_entry lxvb16x;
+ struct ppc_emulated_entry paste;
#endif
} ppc_emulated;
diff --git a/arch/powerpc/include/asm/ppc-opcode.h
b/arch/powerpc/include/asm/ppc-opcode.h
index ce0930d..a55d2ef 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -229,6 +229,7 @@
#define PPC_INST_MTTMR 0x7c0003dc
#define PPC_INST_NOP 0x6000
#define PPC_INST_PASTE 0x7c20070d
+#define PPC_INST_PASTE_MASK0xfc2007ff
#define PPC_INST_POPCNTB 0x7cf4
#define PPC_INST_POPCNTB_MASK 0xfc0007fe
#define PPC_INST_POPCNTD 0x7c0003f4
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index b779f3c..3495ecf 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -469,6 +469,8 @@
#define SPRN_DBAT7U0x23E /* Data BAT 7 Upper Register */
#define SPRN_PPR 0x380 /* SMT Thread status Register */
#define SPRN_TSCR 0x399 /* Thread Switch Control Register */
+#define SPRN_TRIG1 0x371 /* WAT Trigger 1 */
+#define SPRN_TRIG2 0x372 /* WAT Trigger 2 */
#define SPRN_DEC 0x016 /* Decrement Register */
#define SPRN_DER 0x095 /* Debug Enable Register */
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index f3eb61b..e1ea3be 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1153,6 +1153,74 @@ static inline bool tm_abort_check(struct pt_regs *regs,
int reason)
}
#endif
+static DEFINE_MUTEX(paste_emulation_mutex);
+
+static inline int paste(void *i)
+{
+ int cr;
+ long retval = 0;
+
+ /* Need per core lock to ensure trig1/2 writes don't race */
+ mutex_lock(&paste_emulation_mutex);
+
+ hard_irq_disable();
+
+ mtspr(SPRN_TRIG1, 0); /* data doesn't matter */
+ mtspr(SPRN_TRIG1, 0); /* HW says do this twice */
+ asm volatile(
+ "1: " PPC_PASTE(0, %2) "\n"
+ "2: mfcr %1\n"
+ ".section .fixup,\"ax\"\n"
+ "3: li %0,%3\n"
+ " li %2,0\n"
+ " b 2b\n"
+ ".previous\n"
+ EX_TABLE(1b, 3b)
+ : "=r" (retval), "=r" (cr)
+ : "b" (i), "i" (-EFAULT), "0" (retval));
+ mtspr(SPRN_TRIG2, 0);
+
+ local_irq_enable();
+
+ mutex_unlock(&paste_emulation_mutex);
+
+ return retval ? retval : cr;
+}
+
+static int emulate_paste(struct pt_regs *regs, u32 instword)
+{
+ const void __user *addr;
+ unsigned long ea;
+ u8 ra, rb;
+ int rc;
+
+ if (!cpu_has_feature(CPU_FTR_ARCH_300))
+ return -EINVAL;
+
+ ra = (instword >> 16) & 0x1f;
+ rb = (instword >> 11) & 0x1f;
+
+ ea = regs->gpr[rb] + (ra ? regs->gpr[ra] : 0ul);
+ if (is_32bit_task())
+ ea &= 0xul;
+ addr = (__force const void __user *)e
[PATCH 1/1] vas: vas_window_init_dbgdir: fix order of cleanup.
Fix the order of cleanup to ensure we free the name buffer in case of an error creating 'hvwc' or 'info' files. Signed-off-by: Sukadev Bhattiprolu --- arch/powerpc/platforms/powernv/vas-debug.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/vas-debug.c b/arch/powerpc/platforms/powernv/vas-debug.c index ca22f1e..b4de4c6 100644 --- a/arch/powerpc/platforms/powernv/vas-debug.c +++ b/arch/powerpc/platforms/powernv/vas-debug.c @@ -166,13 +166,13 @@ void vas_window_init_dbgdir(struct vas_window *window) return; -free_name: - kfree(window->dbgname); - window->dbgname = NULL; - remove_dir: debugfs_remove_recursive(window->dbgdir); window->dbgdir = NULL; + +free_name: + kfree(window->dbgname); + window->dbgname = NULL; } void vas_instance_init_dbgdir(struct vas_instance *vinst) -- 2.7.4
RE: [PATCH v4 06/12] [media] cxd2880: Add integration layer for the driver
Hi, Mauro. > > > > These functions monitor the driver and watch for task completion. > > This is part of the Sony CXD2880 DVB-T2/T tuner + demodulator driver. > > If I understand well, the goal here is to have thread that would be waking > up from time to time, right? Just use the infrastructure that the Kernel > has for it, like a kthread, or timer_setup() & friends. > > Take a look at include/linux/timer.h, and just use what's already defined. This code is initialize process. Therefore, it is executed only once and it will not execute other processing at the same time. We think that the current implementation is enough. What do you think? furthermore, we will modify this code by using ktime_foo(). Thanks, Takiguchi
Re: [PATCH -tip v3 3/6] net: sctp: Add SCTP ACK tracking trace event
On Tue, 19 Dec 2017 10:20:24 -0500
Steven Rostedt wrote:
> On Tue, 19 Dec 2017 17:58:25 +0900
> Masami Hiramatsu wrote:
>
> > +TRACE_EVENT(sctp_probe,
> > +
> > + TP_PROTO(const struct sctp_endpoint *ep,
> > +const struct sctp_association *asoc,
> > +struct sctp_chunk *chunk),
> > +
> > + TP_ARGS(ep, asoc, chunk),
> > +
> > + TP_STRUCT__entry(
> > + __field(__u64, asoc)
> > + __field(__u32, mark)
> > + __field(__u16, bind_port)
> > + __field(__u16, peer_port)
> > + __field(__u32, pathmtu)
> > + __field(__u32, rwnd)
> > + __field(__u16, unack_data)
> > + ),
> > +
> > + TP_fast_assign(
> > + struct sctp_transport *sp;
> > + struct sk_buff *skb = chunk->skb;
> > +
> > + __entry->asoc = (__u64)asoc;
> > + __entry->mark = skb->mark;
> > + __entry->bind_port = ep->base.bind_addr.port;
> > + __entry->peer_port = asoc->peer.port;
> > + __entry->pathmtu = asoc->pathmtu;
> > + __entry->rwnd = asoc->peer.rwnd;
> > + __entry->unack_data = asoc->unack_data;
> > +
> > + if (trace_sctp_probe_path_enabled()) {
> > + list_for_each_entry(sp, &asoc->peer.transport_addr_list,
> > + transports) {
> > + trace_sctp_probe_path(sp, asoc);
> > + }
> > + }
>
> I thought you were going to move this into the code, like I suggested?
Ah, I missed to define sp in the block...
Thanks,
>
> -- Steve
>
> > + ),
> > +
> > + TP_printk("asoc=%#llx mark=%#x bind_port=%d peer_port=%d pathmtu=%d "
> > + "rwnd=%u unack_data=%d",
> > + __entry->asoc, __entry->mark, __entry->bind_port,
> > + __entry->peer_port, __entry->pathmtu, __entry->rwnd,
> > + __entry->unack_data)
> > +);
> > +
--
Masami Hiramatsu
RE: [PATCH v4 05/12] [media] cxd2880: Add tuner part of the driver
Hi, Mauro
> > + ret = tnr_dmd->io->read_regs(tnr_dmd->io,
> > +CXD2880_IO_TGT_SYS,
> > +0x10, data, 1);
> > + if (ret)
> > + return ret;
> > + if ((data[0] & 0x01) == 0x00)
> > + return -EBUSY;
>
> I don't know anything about this hardware, but it sounds weird to return
> -EBUSY here, except if the hardware reached a permanent busy condition,
> and would require some sort of reset to work again.
>
> As this is in the middle of lots of things, I *suspect* that this is
> not the case.
>
> If I'm right, and this is just a transitory solution that could happen
> for a limited amount of time, e. g. if what's there at data[0] is a flag
> saying that the device didn't finish the last operation yet, maybe the
> best would be to do something like:
>
> for (i = 0; i < 10; i++) {
> ret = tnr_dmd->io->read_regs(tnr_dmd->io,
>CXD2880_IO_TGT_SYS,
>0x10, data, 1);
> if (ret)
> return ret;
> if (data[0] & 0x01)
> break;
> msleep(10);
> }
> if (!(data[0] & 0x01))
> return -EBUSY;
>
> > +
> > + ret = cxd2880_io_write_multi_regs(tnr_dmd->io,
> > + CXD2880_IO_TGT_SYS,
> > + rf_init1_seq5,
> > + ARRAY_SIZE(rf_init1_seq5));
> > + if (ret)
> > + return ret;
> > +
> > + usleep_range(1000, 2000);
> > +
> > + ret = tnr_dmd->io->write_reg(tnr_dmd->io,
> > +CXD2880_IO_TGT_SYS,
> > +0x00, 0x0a);
> > + if (ret)
> > + return ret;
> > + ret = tnr_dmd->io->read_regs(tnr_dmd->io,
> > +CXD2880_IO_TGT_SYS,
> > +0x11, data, 1);
> > + if (ret)
> > + return ret;
> > + if ((data[0] & 0x01) == 0x00)
> > + return -EBUSY;
>
> Same here and on similar places.
As the hardware specification, It is abnormal if certain register doesn't
become 1 even if sleep time passes.
Perhaps it should not be return EBUSY.
We will reconsider error code.
Thanks,
Takiguchi
Re: [PATCH] kfree_rcu() should use the new kfree_bulk() interface for freeing rcu structures
On Tue, 19 Dec 2017, Rao Shoaib wrote: > > > mm/slab_common.c > > It would be great to have separate patches so that we can review it > > properly: > > > > 1. Move the code into slab_common.c > > 2. The actual code changes to the kfree rcu mechanism > > 3. The whitespace changes > I can certainly break down the patch and submit smaller patches as you have > suggested. > > BTW -- This is my first ever patch to Linux, so I am still learning the > etiquette. You are doing great. Keep at improving the patches and we will get your changes into the kernel source. If you want to sent your first patchset then a tool like "quilt" or "git" might be helpful.
Re: [PATCH/RFC] llist: add llist_[add|del_first]_exclusive
Vitaly Wool writes:
> 2017-12-19 2:35 GMT+01:00 Huang, Ying :
>
>> Vitaly Wool writes:
>>
>> > It sometimes is necessary to be able to be able to use llist in
>> > the following manner:
>> > if (node_unlisted(node))
>> > llst_add(node, list);
>> > i. e. only add a node to the list if it's not already on a list.
>> >
>> > This is not possible without taking locks because otherwise there's
>> > an obvious race between the check and the addition. This patch adds
>> > the routine to add a node only if it is not on any list that is
>> > lockless and race free as long as there's only one consumer.
>> >
>> > That is, llist_add_exclusive would only add a node if it's not
>> > already on a list, and llist_del_first_exclusive will delete the
>> > first node off the list and mark it as not being on any list.
>> >
>> > Signed-off-by: Vitaly Wool
>> > ---
>> > include/linux/llist.h | 25 +
>> > lib/llist.c | 29 +
>> > 2 files changed, 54 insertions(+)
>> >
>> > diff --git a/include/linux/llist.h b/include/linux/llist.h
>> > index 85abc29..5c60e9e 100644
>> > --- a/include/linux/llist.h
>> > +++ b/include/linux/llist.h
>> > @@ -74,6 +74,10 @@ struct llist_node {
>> > #define LLIST_HEAD_INIT(name){ NULL }
>> > #define LLIST_HEAD(name) struct llist_head name =
>> LLIST_HEAD_INIT(name)
>> >
>> > +#define LLIST_NODE_UNLISTED ((void *)(-1L))
>> > +#define LLIST_NODE_INIT(name){ LLIST_NODE_UNLISTED }
>> > +#define LLIST_NODE(name) struct llist_node name =
>> LLIST_NODE_INIT(name)
>> > +
>> > /**
>> > * init_llist_head - initialize lock-less list head
>> > * @head:the head for your lock-less list
>> > @@ -238,4 +242,25 @@ extern struct llist_node *llist_del_first(struct
>> llist_head *head);
>> >
>> > struct llist_node *llist_reverse_order(struct llist_node *head);
>> >
>> > +/**
>> > + * llist_del_first_exclusive - delete the first entry of lock-less list
>> > + * and make sure its ->next is NULL
>> > + * @head:the head for your lock-less list
>> > + *
>> > + * If list is empty, return NULL, otherwise, return the first entry
>> > + * deleted, this is the newest added one.
>> > + *
>> > + */
>> > +static inline struct llist_node *llist_del_first_exclusive(
>> > + struct llist_head *head)
>> > +{
>> > + struct llist_node *node = llist_del_first(head);
>> > +
>> > + if (READ_ONCE(node))
>> > + smp_store_release(&node->next, LLIST_NODE_UNLISTED);
>> > + return node;
>> > +}
>> > +
>> > +extern bool llist_add_exclusive(struct llist_node *, struct llist_head
>> *);
>> > +
>> > #endif /* LLIST_H */
>> > diff --git a/lib/llist.c b/lib/llist.c
>> > index 7062e93..c85fa6b 100644
>> > --- a/lib/llist.c
>> > +++ b/lib/llist.c
>> > @@ -102,3 +102,32 @@ struct llist_node *llist_reverse_order(struct
>> llist_node *head)
>> > return new_head;
>> > }
>> > EXPORT_SYMBOL_GPL(llist_reverse_order);
>> > +
>> > +/**
>> > + * llist_add_exclusive - add a node only if its ->next is NULL
>> > + * @node:the node to be added
>> > + * @head:the head for your lock-less list
>> > + *
>> > + * Return true if the node was added, or false otherwise.
>> > + */
>> > +bool llist_add_exclusive(struct llist_node *node, struct llist_head
>> *head)
>> > +{
>> > + struct llist_node *next = LLIST_NODE_UNLISTED;
>> > + struct llist_node *entry, *new_next;
>> > +
>> > + /*
>> > + * if new_next is next (== LLIST_NODE_UNLISTED) on the first run,
>> we
>> > + * get exclusive access to this node as long as others use
>> > + * llist_add_safe too.
>> > + * Then false can be returned no more and we'll loop until we get
>> the
>> > + * stuff right.
>> > + */
>> > + do {
>> > + entry = READ_ONCE(head->first);
>> > + if ((new_next = cmpxchg(&node->next, next, entry)) != next)
>> > + return false;
>> > + next = entry;
>> > + } while (cmpxchg(&head->first, entry, node) != entry);
>> > + return true;
>> > +}
>> > +EXPORT_SYMBOL_GPL(llist_add_exclusive);
>>
>> I think this could be implemented on top of llist, why add it into llist
>> itself?
>>
>
>
> Could you please elaborate how this would be implemented "on top"?
struct llist_node *my_del_first_exclusive(struct llist_head *head)
{
struct llist_node *node = llist_del_first(head);
if (node)
node->next = LLIST_NODE_UNLISTED;
}
bool my_add_exclusive(struct llist_node *node, struct llist_head *head)
{
if (node->next != LLIST_NODE_UNLIST)
return false;
if (cmpxchg(&node->next, LLIST_NODE_UNLIST, NULL) !=
LLIST_NODE_UNLIST)
return false;
llist_add(node, head);
return true;
}
Best Regards,
Huang, Ying
RE: [PATCH v4 02/12] [media] cxd2880-spi: Add support for CXD2880 SPI interface
Hi, Mauro.
> > +
> > +#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
>
> It would be better to use dev_foo() debug macros instead of
> pr_foo() ones.
I got comment for this previous version patch as below
--
The best would be to se dev_err() & friends for printing messages,
as they print the device's name as filled at struct device.
If you don't use, please add a define that will print the name at the logs,
like:
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
either at the begining of the driver or at some header file.
Btw, I'm noticing that you're also using dev_err() on other places of the code.
Please standardize. OK, on a few places, you may still need to use pr_err(),
if you need to print a message before initializing struct device, but I suspect
that you can init
--
You pointed out here before. Because dev_foo () and pr_foo () were mixed.
We standardize with pr_foo() because the logs is outputted before getting the
device structure.
Is it better to use dev_foo() where we can use it?
> > +static int cxd2880_stop_feed(struct dvb_demux_feed *feed) {
> > + int i = 0;
> > + int ret;
> > + struct dvb_demux *demux = NULL;
> > + struct cxd2880_dvb_spi *dvb_spi = NULL;
> > +
> > + if (!feed) {
> > + pr_err("invalid arg\n");
> > + return -EINVAL;
> > + }
> > +
> > + demux = feed->demux;
> > + if (!demux) {
> > + pr_err("feed->demux is NULL\n");
> > + return -EINVAL;
> > + }
> > + dvb_spi = demux->priv;
> > +
> > + if (!dvb_spi->feed_count) {
> > + pr_err("no feed is started\n");
> > + return -EINVAL;
> > + }
> > +
> > + if (feed->pid == 0x2000) {
> > + /*
> > +* Special PID case.
> > +* Number of 0x2000 feed request was stored
> > +* in dvb_spi->all_pid_feed_count.
> > +*/
> > + if (dvb_spi->all_pid_feed_count <= 0) {
> > + pr_err("PID %d not found.\n", feed->pid);
> > + return -EINVAL;
> > + }
> > + dvb_spi->all_pid_feed_count--;
> > + } else {
> > + struct cxd2880_pid_filter_config cfgtmp;
> > +
> > + cfgtmp = dvb_spi->filter_config;
> > +
> > + for (i = 0; i < CXD2880_MAX_FILTER_SIZE; i++) {
> > + if (feed->pid == cfgtmp.pid_config[i].pid &&
> > + cfgtmp.pid_config[i].is_enable != 0) {
> > + cfgtmp.pid_config[i].is_enable = 0;
> > + cfgtmp.pid_config[i].pid = 0;
> > + pr_debug("removed PID %d from #%d\n",
> > +feed->pid, i);
> > + break;
> > + }
> > + }
> > + dvb_spi->filter_config = cfgtmp;
> > +
> > + if (i == CXD2880_MAX_FILTER_SIZE) {
> > + pr_err("PID %d not found\n", feed->pid);
> > + return -EINVAL;
> > + }
> > + }
> > +
> > + ret = cxd2880_update_pid_filter(dvb_spi,
> > + &dvb_spi->filter_config,
> > + dvb_spi->all_pid_feed_count >
> 0);
> > + dvb_spi->feed_count--;
> > +
> > + if (dvb_spi->feed_count == 0) {
> > + int ret_stop = 0;
> > +
> > + ret_stop =
> kthread_stop(dvb_spi->cxd2880_ts_read_thread);
> > + if (ret_stop) {
> > + pr_err("'kthread_stop failed. (%d)\n",
> ret_stop);
> > + ret = ret_stop;
> > + }
> > + kfree(dvb_spi->ts_buf);
> > + dvb_spi->ts_buf = NULL;
> > + }
> > +
> > + pr_debug("stop feed ok.(count %d)\n", dvb_spi->feed_count);
> > +
> > + return ret;
> > +}
>
> I have the feeling that I've seen the code above before at the dvb core.
> Any reason why don't use the already-existing code at dvb_demux.c &
> friends?
The CXD2880 HW PID filter is used to decrease the amount of TS data transferred
via limited bit rate SPI interface.
Thanks,
Takiguchi
Re: thinkpad x60: sound problems in 4.15-rc1 was Re: thinkpad x60: sound problems in 4.14.0-next-20171114
On Wed, Dec 20, 2017 at 01:33:45AM +0100, Thomas Gleixner wrote:
> On Tue, 19 Dec 2017, vcap...@pengaru.com wrote:
> > On Wed, Dec 20, 2017 at 12:22:12AM +0100, Pavel Machek wrote:
> > > You forgot to mention commit id :-).
> > >
> >
> > That is very strange, anyhow:
> >
> > commit fdba46ffb4c203b6e6794163493fd310f98bb4be
> > Author: Thomas Gleixner
> > Date: Wed Sep 13 23:29:27 2017 +0200
> >
> > x86/apic: Get rid of multi CPU affinity
> >
> >
> > Will try reverting soon, just a bit busy today out in the desert and the sun
> > is going down so my solar panel is useless.
>
> The revert is not trivial.
>
> What is the exact problem and how do you reproduce that?
>
Dang.
Ostensibly the problem is audio playback looping what seems to be stuck in
a DMA buffer when I pause the audio.
I also saw once during the bisect on a 'bad' commit, a reproduction of
this, which hung everything doing IO until it the ata1 reset happened:
[ 36.606657] Monitor-Mwait will be used to enter C-3 state
[ 36.628663] do_IRQ: 0.35 No irq handler for vector
[ 37.875724] do_IRQ: 0.194 No irq handler for vector
[ 69.099090] ata1.00: exception Emask 0x0 SAct 0x0 SErr 0x0 action 0x6 frozen
[ 69.099165] ata1.00: failed command: FLUSH CACHE EXT
[ 69.099211] ata1.00: cmd ea/00:00:00:00:00/00:00:00:00:00/a0 tag 6
res 40/00:01:00:00:00/00:00:00:00:00/00 Emask 0x4
(timeout)
[ 69.099285] ata1.00: status: { DRDY }
[ 69.099309] ata1: hard resetting link
[ 69.406185] ata1: SATA link up 3.0 Gbps (SStatus 123 SControl 300)
[ 69.409255] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
[ 69.409259] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK)
filtered out
[ 69.409261] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered
out
[ 69.409433] ata1.00: supports DRM functions and may not be fully accessible
[ 69.409819] ata1.00: NCQ Send/Recv Log not supported
[ 69.411644] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
[ 69.411649] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK)
filtered out
[ 69.411654] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered
out
[ 69.411842] ata1.00: supports DRM functions and may not be fully accessible
[ 69.412242] ata1.00: NCQ Send/Recv Log not supported
[ 69.412719] ata1.00: configured for UDMA/133
[ 69.412721] ata1.00: retrying FLUSH 0xea Emask 0x4
[ 69.412964] ata1: EH complete
But that is more difficult to reproduce, it doesn't seem to happen
regularly. Infact, I thought that was independent from the audio problem
at first but now it's become clear they're all related.
The 'bad' commits always showed the 'do_IRQ: No irq handler for vector'
lines, sometimes they appear for the first time on the console when I
yanked the power cord while playing music in the quick repro cycle without
running X or anything.
What I've been doing to reproduce this is simply boot to multi-user.target,
login, run `cmus`, and play a song. Next pull the AC power from the
thinkpad x61s.
Immediately the audio gets messed up, pausing the audio doesn't pause it,
it just loops the last tiny buffer contents.
That's all I've got right now, but it doesn't seem to be limited to the
audio problem as shown by the ata1 reset. Also I've searched through all
my stored journals for anything resembling that ata1 problem, and there's
not a single occurrence going back ~300 boots across a handful of kernel
versions.
If you'd like to prep a patch for me to test, I'm happy to test, but I'm
not sure how online I'll be for the next 24 hours. It's some kind of
miracle we're communicating as-is, I'm in the middle of the damn desert but
somehow there's a cell signal.
Thanks,
Vito Caputo
Re: [v2 PATCH -tip 3/6] net: sctp: Add SCTP ACK tracking trace event
Hi Masami,
I love your patch! Perhaps something to improve:
[auto build test WARNING on net/master]
[also build test WARNING on v4.15-rc4 next-20171219]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system]
url:
https://github.com/0day-ci/linux/commits/Masami-Hiramatsu/net-tcp-sctp-dccp-Replace-jprobe-usage-with-trace-events/20171220-081035
config: i386-randconfig-x011-201751 (attached as .config)
compiler: gcc-7 (Debian 7.2.0-12) 7.2.1 20171025
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All warnings (new ones prefixed by >>):
In file included from include/trace/define_trace.h:96:0,
from include/trace/events/sctp.h:96,
from net//sctp/sm_statefuns.c:63:
include/trace/events/sctp.h: In function
'trace_event_raw_event_sctp_probe_path':
>> include/trace/events/sctp.h:31:19: warning: cast from pointer to integer of
>> different size [-Wpointer-to-int-cast]
__entry->asoc = (__u64)asoc;
^
include/trace/trace_events.h:719:4: note: in definition of macro
'DECLARE_EVENT_CLASS'
{ assign; } \
^~
include/trace/trace_events.h:78:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^~
>> include/trace/events/sctp.h:11:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(sctp_probe_path,
^~~
>> include/trace/events/sctp.h:30:2: note: in expansion of macro
>> 'TP_fast_assign'
TP_fast_assign(
^~
include/trace/events/sctp.h: In function 'trace_event_raw_event_sctp_probe':
include/trace/events/sctp.h:72:19: warning: cast from pointer to integer of
different size [-Wpointer-to-int-cast]
__entry->asoc = (__u64)asoc;
^
include/trace/trace_events.h:719:4: note: in definition of macro
'DECLARE_EVENT_CLASS'
{ assign; } \
^~
include/trace/trace_events.h:78:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^~
include/trace/events/sctp.h:50:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(sctp_probe,
^~~
include/trace/events/sctp.h:68:2: note: in expansion of macro
'TP_fast_assign'
TP_fast_assign(
^~
In file included from include/trace/define_trace.h:97:0,
from include/trace/events/sctp.h:96,
from net//sctp/sm_statefuns.c:63:
include/trace/events/sctp.h: In function 'perf_trace_sctp_probe_path':
>> include/trace/events/sctp.h:31:19: warning: cast from pointer to integer of
>> different size [-Wpointer-to-int-cast]
__entry->asoc = (__u64)asoc;
^
include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^~
include/trace/trace_events.h:78:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^~
>> include/trace/events/sctp.h:11:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(sctp_probe_path,
^~~
>> include/trace/events/sctp.h:30:2: note: in expansion of macro
>> 'TP_fast_assign'
TP_fast_assign(
^~
include/trace/events/sctp.h: In function 'perf_trace_sctp_probe':
include/trace/events/sctp.h:72:19: warning: cast from pointer to integer of
different size [-Wpointer-to-int-cast]
__entry->asoc = (__u64)asoc;
^
include/trace/perf.h:66:4: note: in definition of macro 'DECLARE_EVENT_CLASS'
{ assign; } \
^~
include/trace/trace_events.h:78:9: note: in expansion of macro 'PARAMS'
PARAMS(assign), \
^~
include/trace/events/sctp.h:50:1: note: in expansion of macro 'TRACE_EVENT'
TRACE_EVENT(sctp_probe,
^~~
include/trace/events/sctp.h:68:2: note: in expansion of macro
'TP_fast_assign'
TP_fast_assign(
^~
vim +31 include/trace/events/sctp.h
10
> 11 TRACE_EVENT(sctp_probe_path,
12
13 TP_PROTO(struct sctp_transport *sp,
14 const struct sctp_association *asoc),
15
16 TP_ARGS(sp, asoc),
17
18 TP_STRUCT__entry(
19 __field(__u64, asoc)
20 __field(__u32, primary)
21 __array(__u8, ipaddr, sizeof(union sctp_addr))
22 __field(__u32, state)
23 __field(__u32, cwnd)
24 __field(__u32, ssthresh)
25 __field(__u32, flight_size)
26
[GIT PULL 1/2] bcm2835-dt-next-2017-12-19
Hi Florian, The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323: Linux 4.15-rc1 (2017-11-26 16:01:47 -0800) are available in the Git repository at: git://github.com/anholt/linux tags/bcm2835-dt-next-2017-12-19 for you to fetch changes up to 3edb73d87e9e824326f588b5d5c5661bf53449be: ARM: dts: bcm283x: Use GPIO polarity defines consistently (2017-12-08 13:10:09 -0800) This pull request cleans up the bcm2835 DT to use #defines for GPIO polarity. Stefan Wahren (1): ARM: dts: bcm283x: Use GPIO polarity defines consistently arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +- arch/arm/boot/dts/bcm2836-rpi-2-b.dts| 4 ++-- arch/arm/boot/dts/bcm2837-rpi-3-b.dts| 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)
[GIT PULL 2/2] bcm2835-drivers-next-2017-12-19
The following changes since commit 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e: Linux 4.14-rc1 (2017-09-16 15:47:51 -0700) are available in the Git repository at: git://github.com/anholt/linux tags/bcm2835-drivers-next-2017-12-19 for you to fetch changes up to 9107ee6a50b81180f29a9f6588b21917dde2abdd: firmware: raspberrypi: print time using time64_t (2017-11-28 16:24:33 -0800) This pull request brings in a (cosmetic) y2038 fix for the Raspberry Pi firmware driver. Arnd Bergmann (1): firmware: raspberrypi: print time using time64_t drivers/firmware/raspberrypi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH v4 5/5] iommu/vt-d: Add debugfs support for Interrupt remapping
On Tue, 2017-12-19 at 23:30 +0200, Andy Shevchenko wrote: > On Tue, 2017-12-19 at 13:08 -0800, Sohil Mehta wrote: > > > > Debugfs extension for Intel IOMMU to dump Interrupt remapping table > > entries for Interrupt remapping and Interrupt posting. > > > > The file /sys/kernel/debug/intel_iommu/ir_translation_struct > > provides > > detailed information, such as Index, Source Id, Destination Id, > > Vector > > and the raw values for entries with the present bit set, in the > > format > > shown. > > > > Remapped Interrupt supported on IOMMU: dmar5 > > IR table address:93e09d54c310 > > --- > > Index SID Dest_ID Vct Raw_value_high Raw_value_low > > 1 3a00 0600 2c 00043a00 062c0009 > > 1114301 0900 a2 00044301 09a20009 > > > > Posted Interrupt supported on IOMMU: dmar5 > > IR table address:93e09d54c310 > > - > > --- > > Index SID PDA_high PDA_low Vct Raw_value_high Raw_value_low > > 4 4300 0010 40c7c880 41 00144300 > > 40c7c88000418001 > > 5 4300 0010 40c7c880 51 00144300 > > 40c7c88000518001 > > > > > > > > + seq_printf(m, "\nRemapped Interrupt supported on > > IOMMU: %s\n" > Please, avoid leading \n. Sure. I'll add a separate seq_puts(m, "\n") after each of the loops to avoid having the leading '\n's. > > > > > + " IR table address:%p\n", iommu->name, > > + iommu->ir_table); > > + > > + seq_puts(m, "- > > - > > -" > > + "\n"); > It's okay to use long string literal on one line. So, don't split (or > for multi-line string literals, split by \n like you do above). > Thanks. Will fix this and the other one. > > > > + seq_puts(m, > > "\n\t\t\t\t\t\t\t\n"); > Leading \n. > > > > > + seq_printf(m, "\nPosted Interrupt supported on > > IOMMU: > > %s\n" > Ditto. > > > > > + " IR table address:%p\n", iommu->name, > > + iommu->ir_table); > > + > > + seq_puts(m, "- > > - > > --" > > + "\n"); > Join back. >
Re: [PATCH] tools/power: Don't make man pages executable
On 12/19/2017 03:48 PM, Rafael J. Wysocki wrote: On 12/19/2017 8:54 PM, Laura Abbott wrote: rpm-lint flagged these as being executable: kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/turbostat.8.gz kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/x86_energy_perf_policy.8.gz Fix this Signed-off-by: Laura Abbott Please CC PM stuff to linux-pm (which makes it easier to handle). Neither of these are listed in MAINTAINERS so I missed sending to linux-pm. I'll remember for next time, do you want me to resend for tracking? Thanks, Laura --- tools/power/x86/turbostat/Makefile | 2 +- tools/power/x86/x86_energy_perf_policy/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index a9bc914a8fe8..2ab25aa38263 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -25,4 +25,4 @@ install : turbostat install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile index 2447b1bbaacf..f4534fb8b951 100644 --- a/tools/power/x86/x86_energy_perf_policy/Makefile +++ b/tools/power/x86/x86_energy_perf_policy/Makefile @@ -24,5 +24,5 @@ install : x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/x86_energy_perf_policy $(DESTDIR)$(PREFIX)/bin/x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 Thanks, Rafael
Waiting For Your Urgent Replay.........
My Dear, How are you together with your family? I hope all is well. Considering the fact, I did not know you in person or even have seen you before but due to the true revelation that I should share this lucrative opportunity with you, I have no choice other than to contact you. So, kindly consider this message essential and confidential. first and foremost I have to introduce myself to you I am Mr.Akram Mohamed, from Burkina Faso in west Africa, the Audit and Account Manager BANK OF AFRICA (BOA) in Ouagadougou Burkina Faso west Africa. I had the intent to contact you over transfer of fund worth the sum of Six million two hundred thousand u.s dollars. (Us$6.2m) for the betterment of our life, I agree that 40% of the total amount will be for you and 60% for me. I need your urgent response on assurance of trust that you will not deny my share when once the fund is transfer to your personal bank account. Your urgently responses is needed through this email address:mrakram.m...@gmail.com reply with your information as I stated it bellow once I receive your information I will give you more details as application and how you will apply to our bank on how to transfer the fund into your bank account. (1) Full names: (2) private phone number: (3) occupation: Make sure you keep this transaction as top secret and make it confidential till we receive the fund into your bank account that you will provide to our bank. Don't disclose it to anybody, because the secret of this transaction is as well as the success of it. I look forward to hear from you call me immediately as soon as you receive this message or email me urgent. In sincerity, Mr.Akram Mohamed
Re: [v4.14-rt][report] arm: run: stress-ng --class os --all 0 -t 5m
On 12/19/2017 02:27 AM, Sebastian Andrzej Siewior wrote:
> On 2017-12-18 20:01:05 [-0600], Grygorii Strashko wrote:
>> Hi All,
> Hi,
>
>> Below results of running stress-ng --class os --all 0 -t 5m on TI am57xx-evm
>> (SMP, 2 cpu)
>> git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git
>> branch: linux-4.14.y-rt
>> commit: d3d9904 v4.14.6-rt7
>> - only config changes applied.
>>
>> one "WARNING: possible circular locking dependency detected"
>> [ 85.943562] ==
>> [ 85.943564] WARNING: possible circular locking dependency detected
>> [ 85.943568] 4.14.6-rt7-dirty #29 Not tainted
>> [ 85.943570] --
>> [ 85.943573] stress-ng-cpu-o/764 is trying to acquire lock:
>> [ 85.943576] (&p->pi_lock){-...}, at: []
>> try_to_wake_up+0x28/0x924
>> [ 85.943594]
>> [ 85.943594] but task is already holding lock:
>> [ 85.943596] (hrtimer_bases.lock){-...}, at: []
>> hrtimer_interrupt+0x68/0x2b0
>>
>> one "WARNING: CPU: 0 PID: 3514 at kernel/rcu/tree_plugin.h:310
>> rcu_note_context_switch+0x3e8/0x988"
>> ^ sorry, log not very readable
>
> This should cure it, does it?
>
> diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
> index c2c344fda487..3971fa0c7194 100644
> --- a/kernel/time/hrtimer.c
> +++ b/kernel/time/hrtimer.c
> @@ -1952,6 +1952,7 @@ int hrtimers_dead_cpu(unsigned int scpu)
> BUG_ON(cpu_online(scpu));
> tick_cancel_sched_timer(scpu);
>
> + local_bh_disable();
> local_irq_disable();
> old_base = &per_cpu(hrtimer_bases, scpu);
> new_base = this_cpu_ptr(&hrtimer_bases);
> @@ -1979,6 +1980,7 @@ int hrtimers_dead_cpu(unsigned int scpu)
> /* Check, if we got expired work to do */
> __hrtimer_peek_ahead_timers();
> local_irq_enable();
> + local_bh_enable();
> return 0;
> }
>
I've run test few times - can't see "WARNING: possible circular locking
dependency detected"
any more. Below warning happened once.
[ 3091.593894] [ cut here ]
[ 3091.593909] WARNING: CPU: 0 PID: 1797 at kernel/rcu/tree_plugin.h:310
rcu_note_context_switch+0x554/0x950
[ 3091.593912] Modules linked in:
[ 3091.593923] CPU: 0 PID: 1797 Comm: stress-ng-clock Not tainted
4.14.6-rt7-dirty #37
[ 3091.593926] Hardware name: Generic DRA74X (Flattened Device Tree)
[ 3091.593941] [] (unwind_backtrace) from []
(show_stack+0x10/0x14)
[ 3091.593952] [] (show_stack) from []
(dump_stack+0xa0/0xd4)
[ 3091.593964] [] (dump_stack) from [] (__warn+0xd8/0x104)
[ 3091.593975] [] (__warn) from []
(warn_slowpath_null+0x20/0x28)
[ 3091.593984] [] (warn_slowpath_null) from []
(rcu_note_context_switch+0x554/0x950)
[ 3091.593996] [] (rcu_note_context_switch) from []
(__schedule+0xc4/0xa7c)
[ 3091.594005] [] (__schedule) from [] (schedule+0x60/0xf8)
[ 3091.594016] [] (schedule) from []
(rt_spin_lock_slowlock_locked+0xa8/0x304)
[ 3091.594026] [] (rt_spin_lock_slowlock_locked) from []
(__read_rt_lock+0xc0/0xf4)
[ 3091.594036] [] (__read_rt_lock) from []
(pin_current_cpu+0x3c/0x11c)
[ 3091.594047] [] (pin_current_cpu) from []
(migrate_disable+0x78/0x1e8)
[ 3091.594057] [] (migrate_disable) from []
(rt_spin_lock+0x14/0x4c)
[ 3091.594066] [] (rt_spin_lock) from []
(__lock_timer+0xc0/0x220)
[ 3091.594076] [] (__lock_timer) from []
(SyS_timer_gettime+0x14/0xb8)
[ 3091.594087] [] (SyS_timer_gettime) from []
(__sys_trace_return+0x0/0x10)
[ 3091.594091] ---[ end trace 0002 ]---
--
regards,
-grygorii
Re: thinkpad x60: sound problems in 4.15-rc1 was Re: thinkpad x60: sound problems in 4.14.0-next-20171114
On Tue, 19 Dec 2017, vcap...@pengaru.com wrote: > On Wed, Dec 20, 2017 at 12:22:12AM +0100, Pavel Machek wrote: > > You forgot to mention commit id :-). > > > > That is very strange, anyhow: > > commit fdba46ffb4c203b6e6794163493fd310f98bb4be > Author: Thomas Gleixner > Date: Wed Sep 13 23:29:27 2017 +0200 > > x86/apic: Get rid of multi CPU affinity > > > Will try reverting soon, just a bit busy today out in the desert and the sun > is going down so my solar panel is useless. The revert is not trivial. What is the exact problem and how do you reproduce that? Thanks, tglx
Re: PROBLEM: 4.15.0-rc3 APIC causes lockups on Core 2 Duo laptop
On Tue, 19 Dec 2017, Alexandru Chirvasitu wrote: > I had never heard of 'bisect' before this casual mention (you might tell > I am a bit out of my depth). I've since applied it to Linus' tree between > bebc608 Linux 4.14 (good) > > and > > 4fbd8d1 Linux 4.15-rc1 (bad) Is Linus current head 4.15-rc4 bad as well? > It took about 13 attempts (I had access to a faster machine to compile > on, and ccache helped once the cache built up some momentum). The result > is (as presented by 'git bisect' at the end of the process, between the > --- dividers added by me for clarity): > --- start of output --- > > 2b5175c4fa974b6aa05bbd2ee8d443a8036a1714 is the first bad commit > commit 2b5175c4fa974b6aa05bbd2ee8d443a8036a1714 > Author: Thomas Gleixner > Date: Tue Oct 17 09:54:57 2017 +0200 > > genirq: Add config option for reservation mode > > The interrupt reservation mode requires reactivation of PCI/MSI > interrupts. Create a config option, so the PCI code can set the > corresponding flag when required. > > Signed-off-by: Thomas Gleixner > Cc: Josh Poulson > Cc: Mihai Costache > Cc: Stephen Hemminger > Cc: Marc Zyngier > Cc: linux-...@vger.kernel.org > Cc: Haiyang Zhang > Cc: Dexuan Cui > Cc: Simon Xiao > Cc: Saeed Mahameed > Cc: Jork Loeser > Cc: Bjorn Helgaas > Cc: de...@linuxdriverproject.org > Cc: KY Srinivasan > Link: https://lkml.kernel.org/r/20171017075600.369375...@linutronix.de > > :04 04 5e73031cc0c8411a20722cce7876ab7b82ed3858 > dcf98e7a6b7d5f7c5353b7ccab02125e6d332ec8 M kernel > > --- end of output --- > > Consequently, I am cc-ing in the listed addresses. Thanks for doing that bisect, but unfortunately this commit cannot be the problematic one, It merily adds a config symbol, but it does not change any code at all. It has no effect whatsoever. So something might have gone wrong in your bisecting. I CC'ed Dou Liyang. He has changed the early APIC setup code and there has been an issue reported already. Though I lost track of that. Dou, any pointers? Thanks, tglx
[PATCH] vfb: fix video mode and line_length being set when loaded
Currently, when loading the vfb module, the newly created fbdev
has a line_length of 0, and its video mode would be PSEUDOCOLOR
regardless of color depth. (The former could be worked around by
calling the FBIOPUT_VSCREENINFO ioctl with having the FBACTIVIATE_FORCE
flag set.) This patch automatically sets the line_length correctly,
and the video mode is derived from the bit depth now as well.
Thanks to Geert Uytterhoeven for confirming the bug and helping me with
the patch.
Output of `fbset -i' before the patch:
mode "1366x768-60"
# D: 72.432 MHz, H: 47.403 kHz, V: 60.004 Hz
geometry 1366 768 1366 768 32
timings 13806 120 10 14 3 32 5
rgba 8/0,8/8,8/16,8/24
endmode
Frame buffer device information:
Name: Virtual FB
Address : 0xaa1405d85000
Size: 4196352
Type: PACKED PIXELS
Visual : PSEUDOCOLOR
XPanStep: 1
YPanStep: 1
YWrapStep : 1
LineLength : 0<-- note this
Accelerator : No
After:
mode "1366x768-60"
# D: 72.432 MHz, H: 47.403 kHz, V: 60.004 Hz
geometry 1366 768 1366 768 32
timings 13806 120 10 14 3 32 5
rgba 8/0,8/8,8/16,8/24
endmode
Frame buffer device information:
Name: Virtual FB
Address : 0xaa1405d85000
Size: 4196352
Type: PACKED PIXELS
Visual : TRUECOLOR
XPanStep: 1
YPanStep: 1
YWrapStep : 1
LineLength : 5464
Accelerator : No
Thanks for your consideration,
Pieter "PoroCYon" Sluys
---
drivers/video/fbdev/vfb.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index da653a080394..6e866fbaab8a 100644
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -239,8 +239,25 @@ static int vfb_check_var(struct fb_var_screeninfo *var,
*/
static int vfb_set_par(struct fb_info *info)
{
+ switch (info->var.bits_per_pixel) {
+ case 1:
+ info->fix.visual = FB_VISUAL_MONO01;
+ break;
+ case 2:
+ case 4:
+ case 8:
+ info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+ break;
+ case 16:
+ case 24:
+ case 32:
+ info->fix.visual = FB_VISUAL_TRUECOLOR;
+ break;
+ }
+
info->fix.line_length = get_line_length(info->var.xres_virtual,
info->var.bits_per_pixel);
+
return 0;
}
@@ -450,6 +467,8 @@ static int vfb_probe(struct platform_device *dev)
goto err2;
platform_set_drvdata(dev, info);
+ vfb_set_par(info);
+
fb_info(info, "Virtual frame buffer device, using %ldK of video
memory\n",
videomemorysize >> 10);
return 0;
--
2.15.1
Fix vfb not setting the video mode and line_length when loaded.
Copyright 2017 Pieter "PoroCYon" Sluys
under the terms of the GPLv2
---
drivers/video/fbdev/vfb.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index da653a080394..6e866fbaab8a 100644
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -239,8 +239,25 @@ static int vfb_check_var(struct fb_var_screeninfo *var,
*/
static int vfb_set_par(struct fb_info *info)
{
+ switch (info->var.bits_per_pixel) {
+ case 1:
+ info->fix.visual = FB_VISUAL_MONO01;
+ break;
+ case 2:
+ case 4:
+ case 8:
+ info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+ break;
+ case 16:
+ case 24:
+ case 32:
+ info->fix.visual = FB_VISUAL_TRUECOLOR;
+ break;
+ }
+
info->fix.line_length = get_line_length(info->var.xres_virtual,
info->var.bits_per_pixel);
+
return 0;
}
@@ -450,6 +467,8 @@ static int vfb_probe(struct platform_device *dev)
goto err2;
platform_set_drvdata(dev, info);
+ vfb_set_par(info);
+
fb_info(info, "Virtual frame buffer device, using %ldK of video memory\n",
videomemorysize >> 10);
return 0;
--
2.15.1
Re: thinkpad x60: sound problems in 4.15-rc1 was Re: thinkpad x60: sound problems in 4.14.0-next-20171114
On Wed, Dec 20, 2017 at 12:22:12AM +0100, Pavel Machek wrote: > Hi! > > > > > > > > > > > > Reappeared, 4.15-rc1. > > > > > > > > > > > > > > > > > > > > > > [ 40.473822] PM: suspend exit > > > > > > > > > > > [ 40.526027] sdhci-pci :15:00.2: Will use DMA mode > > > > > > > > > > > even though > > > > > > > > > > > HW doesn't fully claim to support it. > > > > > > > > > > > [ 40.569765] e1000e: eth1 NIC Link is Down > > > > > > > > > > > [ 40.578257] sdhci-pci :15:00.2: Will use DMA mode > > > > > > > > > > > even though > > > > > > > > > > > HW doesn't fully claim to support it. > > > > > > > > > > > [ 40.648476] sdhci-pci :15:00.2: Will use DMA mode > > > > > > > > > > > even though > > > > > > > > > > > HW doesn't fully claim to support it. > > > > > > > > > > > [ 40.737339] sdhci-pci :15:00.2: Will use DMA mode > > > > > > > > > > > even though > > > > > > > > > > > HW doesn't fully claim to support it. > > > > > > > > > > > [ 43.018955] wlan0: authenticate with 00:00:00:00:00:01 > > > > > > > > > > > [ 43.019072] wlan0: send auth to 00:00:00:00:00:01 (try > > > > > > > > > > > 1/3) > > > > > > > > > > > [ 43.023955] wlan0: authenticated > > > > > > > > > > > [ 43.031721] wlan0: associate with 00:00:00:00:00:01 > > > > > > > > > > > (try 1/3) > > > > > > > > > > > [ 43.039733] wlan0: RX AssocResp from 00:00:00:00:00:01 > > > > > > > > > > > (capab=0x401 > > > > > > > > > > > status=0 aid=1) > > > > > > > > > > > [ 43.042712] wlan0: associated > > > > > > > > > > > [ 480.662456] snd_hda_intel :00:1b.0: IRQ timing > > > > > > > > > > > workaround is > > > > > > > > > > > activated for card #0. Suggest a bigger bdl_pos_adj. > > > > > > > > > > > > > > > > > > > > This message is often superfluous, so don't take this too > > > > > > > > > > seriously. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > pavel@amd:~$ > > > > > > > > > > > > > > > > > > > > > > Again, mplayer has problems, mpg123 works. This time > > > > > > > > > > > mplayer started > > > > > > > > > > > playing video (w/o sound) after long delay. > > > > > > > > > > > > > > > > > > > > > > Uh. huh. And now problems appeared in mpg123, too, and > > > > > > > > > > > then went away > > > > > > > > > > > in mpg123 _and_ mplayer. Interesting. > > > > > > > > > > > > > > > > > > > > > > I suspect some pulseaudio fun. chromium always has sound > > > > > > > > > > > problems, > > > > > > > > > > > then I restart chromium and everything is ok. But > > > > > > > > > > > something changed in > > > > > > > > > > > -next and 4.15-rc1, because mplayer did not have problems > > > > > > > > > > > before. > > > > > > > > > > > > > > > > > > > > Hm, there is no code change at all in sound/*. If it > > > > > > > > > > happens only in > > > > > > > > > > linux-next, it must be something else... > > > > > > > > > > > > > > > > > > It happened first in -next, now it is in 4.15-rc1. > > > > > > > > > > > > > > > > So you meant a possible regression between 4.14 and 4.15-rc1? > > > > > > > > > > > > > > Yes. > > > > > > > > > > > > Hm, as far as I see, the only significant difference is the commit > > > > > > 20e3f985bb875fea4f86b04eba4b6cc29bfd6b71 > > > > > > ALSA: pcm: update tstamp only if audio_tstamp changed > > > > > > > > > > > > Another change d6c0615f510bc1ee26cfb2b9a3343ac99b9c46fb > > > > > > ALSA: hda - Fix yet remaining issue with vmaster 0dB > > > > > > initialization > > > > > > is basically for fixing a previous wrong fix, and it should > > > > > > influence > > > > > > on all use cases, not only for a specific application. > > > > > > > > > > Happened again, this time on -rc3. It is more than "audio is silent" > > > > > -- apps behave strangely. Let me test with > > > > > 20e3f985bb875fea4f86b04eba4b6cc29bfd6b71 reverted. > > > > > > > > > > Hmm. This is 4th regression this release cycle :-(. > > > > > > > > > > > > Today I jumped to 4.15-rc4 from 4.14-rc6, and have noticed some oddities > > > > with audio in youtube under firefox which I never experienced before. > > > > > > > > If I pause the playback, the audio seems to infinitely loop on whatever > > > > is in the dma buffer. Resuming playback works but now the expected > > > > audio has repeated pops and clicks mixed in with it. > > > > > > > > Even closing firefox doesn't seem to stop the looping buffer... > > > > > > > > Machine is an x61s 1.8ghz thinkpad, x86_64, debian stretch, .config > > > > attached. > > > > > > > > This for me is a 4.15 blocker, and I presume it's related to Pavel's > > > > experience as the x60 isn't much different AFAIK. > > > > > > > > > > Just reproduced this, it seems to be trivial to repro and doesn't > > > actually require pausing or anything. Simply watching a youtube video > > > causes the audio to get messed up after a short period. > > > > > > I monitored `journalctl --dmesg --follow` while reproducing this and saw > > > this line appear at
Re: [PATCH v4 1/3] dt-bindings: mailbox: Introduce Hi3660 controller binding
On Tue, Dec 19, 2017 at 05:30:38PM -0600, Rob Herring wrote: > On Tue, Dec 19, 2017 at 07:15:43PM +0800, Kaihua Zhong wrote: > > From: Leo Yan > > > > Introduce a binding for the Hi3660 mailbox controller, the mailbox is > > used within application processor (AP), communication processor (CP), > > HIFI and MCU, etc. > > > > Signed-off-by: Leo Yan > > --- > > .../bindings/mailbox/hisilicon,hi3660-mailbox.txt | 51 > > ++ > > 1 file changed, 51 insertions(+) > > create mode 100644 > > Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt > > Please add acks when posting new versions. Thanks, Rob. This is my bad :) and will add acks in later version. Thanks, Leo Yan
Maintainer docs for patch merging
Hi, Recently we started a maintainer book (merged into Jonathan's docs-next branch). Would any current maintainers please be willing to explain how they go about generating the automated emails one often receives when a patch [set] is applied. This may also be related to tree/branch management for maintainers kernel.org shows some people like to use multiple trees and some use branches? If deemed relevant we could add a section to the new book (and I'd also like to know how to do it for my own tree please so I can copy ;) I have CC'd Greg and Andrew because they seem to have a system in place for this. No rush on this, I know Christmas is soon. thanks, Tobin.
Re: Regression with a0747a859ef6 ("bdi: add error handle for bdi_debug_register")
On Tue, Dec 19, 2017 at 10:24:52 -0800, Shaohua Li wrote: Not sure if this is MD related, but could you please check if this debug patch changes anything? The system still had cpu hangs. I've attached dmesg output saved by systemd and retrieved after booting with a pre-rc2 kernel. -- Logs begin at Sun 2017-10-15 17:28:43 CDT, end at Tue 2017-12-19 16:44:19 CST. -- Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: microcode: microcode updated early to revision 0x3a, date = 2017-01-30 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: Linux version 4.15.0-rc4+ (br...@cerberus.csd.uwm.edu) (gcc version 7.2.1 20170915 (Red Hat 7.2.1-4) (GCC)) #20 SMP Tue Dec 19 16:11:36 CST 2017 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: Command line: BOOT_IMAGE=/vmlinuz-4.15.0-rc4+ root=/dev/mapper/luks-f5e2d09b-f8a3-487d-9517-abe4fb0eada3 ro rd.md.uuid=7f4fcca0:13b1445f:a91ff455:6bb1ab48 rd.luks.uuid=luks-cc6ee93c-e729-4f78-9baf-0cc5cc8a9ff1 rd.md.uuid=ef18531c:760102fb:7797cbdb:5cf9516f rd.md.uuid=42efe386:0c315f28:f7c61920:ea098f81 rd.luks.uuid=luks-f5e2d09b-f8a3-487d-9517-abe4fb0eada3 LANG=en_US.UTF-8 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: x86/fpu: Supporting XSAVE feature 0x001: 'x87 floating point registers' Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: x86/fpu: Supporting XSAVE feature 0x002: 'SSE registers' Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: x86/fpu: Supporting XSAVE feature 0x004: 'AVX registers' Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: x86/fpu: xstate_offset[2]: 576, xstate_sizes[2]: 256 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: x86/fpu: Enabled xstate features 0x7, context size is 832 bytes, using 'standard' format. Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: e820: BIOS-provided physical RAM map: Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x-0x0009e7ff] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x0009e800-0x0009] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x000e-0x000f] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x0010-0x998f1fff] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x998f2000-0x9a29dfff] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9a29e000-0x9a2e6fff] ACPI data Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9a2e7000-0x9af43fff] ACPI NVS Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9af44000-0x9b40afff] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9b40b000-0x9b40bfff] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9b40c000-0x9b419fff] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x9b41a000-0x9cff] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0xa000-0xafff] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0xfed1c000-0xfed1] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0xff00-0x] reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: BIOS-e820: [mem 0x0001-0x00085fff] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: NX (Execute Disable) protection: active Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: random: fast init done Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: SMBIOS 2.8 present. Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: DMI: Dell Inc. Precision Tower 5810/0WR1RF, BIOS A07 04/14/2015 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: e820: update [mem 0x-0x0fff] usable ==> reserved Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: e820: remove [mem 0x000a-0x000f] usable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: e820: last_pfn = 0x86 max_arch_pfn = 0x4 Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: MTRR default type: write-back Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: MTRR fixed ranges enabled: Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 0-9 write-back Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: A-B uncachable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: C-E3FFF write-through Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: E4000-F write-protect Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: MTRR variable ranges enabled: Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 0 base C000 mask 3FFFC000 uncachable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 1 base A000 mask 3FFFE000 uncachable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 2 base 0300 mask 3FC0 uncachable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 3 base 9E00 mask 3E00 uncachable Dec 19 16:35:05 cerberus.csd.uwm.edu kernel: 4 base E000 mask 3F
Re: [patch V163 27/51] x86/mm/pti: Populate user PGD
On Tue, 19 Dec 2017, Thomas Gleixner wrote:
> On Tue, 19 Dec 2017, Ingo Molnar wrote:
> We don't run out of space, but the 0-day robot triggered a nasty issue.
>
> The fixmap bottom address, which contains the early_ioremap fixmap area, is:
>
> vaddr_bt = FIXADDR_TOP - FIX_BTMAP_BEGIN * PAGE_SIZE
>
> If that address is lower than:
>
> vaddr_end = __START_KERNEL_map + KERNEL_IMAGE_SIZE;
>
> then cleanup_highmap() will happily 0 out the PMD entry for the PTE page of
> FIX_BTMAP. That entry was set up earlier in early_ioremap_init().
>
> As a consequence the first call to __early_set_fixmap() which tries to
> install a PTE for early_ioremap() will crash and burn.
>
> Below is a nasty hack which fixes the problem. Ideally we get all of this
> cpu_entry_stuff out of the fixmap. I'll look into that later, but for now
> the patch 'fixes' the issue.
I had a stab on moving the cpu_entry_area to some other place.
The patch below works, but:
- it breaks i386 build because I have not yet found a way to place the
CPU_ENTRY_AREA_BASE without creating include recursion hell
- it probably does not work on XEN_PV, but I'm too tired now to figure
that out.
Thanks,
tglx
8<---
Documentation/x86/x86_64/mm.txt |4
arch/x86/events/intel/ds.c | 53 ++--
arch/x86/include/asm/desc.h |1
arch/x86/include/asm/fixmap.h | 89
arch/x86/include/asm/pgtable_32_types.h |6 -
arch/x86/include/asm/pgtable_64_types.h | 49 ++-
arch/x86/kernel/cpu/common.c| 125
arch/x86/kernel/dumpstack.c |1
arch/x86/kernel/traps.c |5 -
arch/x86/mm/Makefile|2
arch/x86/mm/dump_pagetables.c |2
arch/x86/mm/kasan_init_64.c |6 -
arch/x86/mm/pti.c | 39 +++--
arch/x86/xen/mmu_pv.c |2
b/arch/x86/include/asm/cpu_entry_area.h | 79 ++
b/arch/x86/mm/cpu_entry_area.c | 138
16 files changed, 309 insertions(+), 292 deletions(-)
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
@@ -12,7 +12,8 @@ ea00 - eaff (=40
... unused hole ...
ec00 - fbff (=44 bits) kasan shadow memory (16TB)
... unused hole ...
-fe80 - feff (=39 bits) LDT remap for PTI
+fe00 - fe7f (=39 bits) LDT remap for PTI
+fe80 - feff (=39 bits) cpu_entry_area mapping
ff00 - ff7f (=39 bits) %esp fixup stacks
... unused hole ...
ffef - fffe (=64 GB) EFI region mapping space
@@ -36,6 +37,7 @@ ffd4 - ffd5 (=49
... unused hole ...
ffdf - fc00 (=53 bits) kasan shadow memory (8PB)
... unused hole ...
+fe80 - feff (=39 bits) cpu_entry_area mapping
ff00 - ff7f (=39 bits) %esp fixup stacks
... unused hole ...
ffef - fffe (=64 GB) EFI region mapping space
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -76,36 +76,39 @@ typedef struct { pteval_t pte; } pte_t;
#define PGDIR_MASK (~(PGDIR_SIZE - 1))
/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
-#define MAXMEM _AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)
+#define MAXMEM _AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)
#ifdef CONFIG_X86_5LEVEL
-#define VMALLOC_SIZE_TB _AC(12800, UL)
-#define __VMALLOC_BASE _AC(0xffa0, UL)
-#define __VMEMMAP_BASE _AC(0xffd4, UL)
-#define LDT_PGD_ENTRY _AC(-112, UL)
-#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
+#define VMALLOC_SIZE_TB_AC(12800, UL)
+#define __VMALLOC_BASE _AC(0xffa0, UL)
+#define __VMEMMAP_BASE _AC(0xffd4, UL)
+#define LDT_PGD_ENTRY _AC(-112, UL)
+#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
#else
-#define VMALLOC_SIZE_TB_AC(32, UL)
-#define __VMALLOC_BASE _AC(0xc900, UL)
-#define __VMEMMAP_BASE _AC(0xea00, UL)
-#define LDT_PGD_ENTRY _AC(-3, UL)
-#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
+#define VMALLOC_SIZE_TB_AC(32, UL)
+#define __VMALLOC_BASE _AC(0xc900, UL)
+#define __VMEMMAP_BASE _AC(0xea00, UL)
+#define LDT_PGD_ENTRY _AC(-4, UL)
+#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
#endif
#ifdef CONFIG_RANDOMIZE_MEMORY
-#define VMALLOC_START vmalloc_base
-#define VMEMMAP_START vmemmap_base
+#define VMALLOC_START vmalloc_base
+#define VMEMMAP_START vmemmap_base
#else
-#define VMALLOC_START __VMALLOC_BASE
-#define VMEMMAP_START __VMEMMAP_BASE
+#def
Re: [PATCH] kfree_rcu() should use the new kfree_bulk() interface for freeing rcu structures
On Tue, Dec 19, 2017 at 02:12:06PM -0800, Matthew Wilcox wrote:
> On Tue, Dec 19, 2017 at 09:41:58PM +0100, Jesper Dangaard Brouer wrote:
> > If I had to implement this: I would choose to do the optimization in
> > __rcu_process_callbacks() create small on-call-stack ptr-array for
> > kfree_bulk(). I would only optimize the case that call kfree()
> > directly. In the while(list) loop I would defer calling
> > __rcu_reclaim() for __is_kfree_rcu_offset(head->func), and instead add
> > them to the ptr-array (and flush if the array is full in loop, and
> > kfree_bulk flush after loop).
> >
> > The real advantage of kfree_bulk() comes from amortizing the per kfree
> > (behind-the-scenes) sync cost. There is an additional benefit, because
> > objects comes from RCU and will hit a slower path in SLUB. The SLUB
> > allocator is very fast for objects that gets recycled quickly (short
> > lifetime), non-locked (cpu-local) double-cmpxchg. But slower for
> > longer-lived/more-outstanding objects, as this hits a slower code-path,
> > fully locked (cross-cpu) double-cmpxchg.
>
> Something like this ... (compile tested only)
>
> Considerably less code; Rao, what do you think?
I am sorry, but I am not at all fan of this approach.
If we are going to make this sort of change, we should do so in a way
that allows the slab code to actually do the optimizations that might
make this sort of thing worthwhile. After all, if the main goal was small
code size, the best approach is to drop kfree_bulk() and get on with life
in the usual fashion.
I would prefer to believe that something like kfree_bulk() can help,
and if that is the case, we should give it a chance to do things like
group kfree_rcu() requests by destination slab and soforth, allowing
batching optimizations that might provide more significant increases
in performance. Furthermore, having this in slab opens the door to
slab taking emergency action when memory is low.
But for the patch below, NAK.
Thanx, Paul
> diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h
> index 59c471de342a..5ac4ed077233 100644
> --- a/kernel/rcu/rcu.h
> +++ b/kernel/rcu/rcu.h
> @@ -174,20 +174,19 @@ static inline void debug_rcu_head_unqueue(struct
> rcu_head *head)
> }
> #endif /* #else !CONFIG_DEBUG_OBJECTS_RCU_HEAD */
>
> -void kfree(const void *);
> -
> /*
> * Reclaim the specified callback, either by invoking it (non-lazy case)
> * or freeing it directly (lazy case). Return true if lazy, false otherwise.
> */
> -static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head)
> +static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head, void
> **kfree,
> + unsigned int *idx)
> {
> unsigned long offset = (unsigned long)head->func;
>
> rcu_lock_acquire(&rcu_callback_map);
> if (__is_kfree_rcu_offset(offset)) {
> RCU_TRACE(trace_rcu_invoke_kfree_callback(rn, head, offset);)
> - kfree((void *)head - offset);
> + kfree[*idx++] = (void *)head - offset;
> rcu_lock_release(&rcu_callback_map);
> return true;
> } else {
> diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
> index f9c0ca2ccf0c..7e13979b4697 100644
> --- a/kernel/rcu/tree.c
> +++ b/kernel/rcu/tree.c
> @@ -2725,6 +2725,8 @@ static void rcu_do_batch(struct rcu_state *rsp, struct
> rcu_data *rdp)
> struct rcu_head *rhp;
> struct rcu_cblist rcl = RCU_CBLIST_INITIALIZER(rcl);
> long bl, count;
> + void *to_free[16];
> + unsigned int to_free_idx = 0;
>
> /* If no callbacks are ready, just return. */
> if (!rcu_segcblist_ready_cbs(&rdp->cblist)) {
> @@ -2755,8 +2757,10 @@ static void rcu_do_batch(struct rcu_state *rsp, struct
> rcu_data *rdp)
> rhp = rcu_cblist_dequeue(&rcl);
> for (; rhp; rhp = rcu_cblist_dequeue(&rcl)) {
> debug_rcu_head_unqueue(rhp);
> - if (__rcu_reclaim(rsp->name, rhp))
> + if (__rcu_reclaim(rsp->name, rhp, to_free, &to_free_idx))
> rcu_cblist_dequeued_lazy(&rcl);
> + if (to_free_idx == 16)
> + kfree_bulk(16, to_free);
> /*
>* Stop only if limit reached and CPU has something to do.
>* Note: The rcl structure counts down from zero.
> @@ -2766,6 +2770,8 @@ static void rcu_do_batch(struct rcu_state *rsp, struct
> rcu_data *rdp)
>(!is_idle_task(current) && !rcu_is_callbacks_kthread(
> break;
> }
> + if (to_free_idx)
> + kfree_bulk(to_free_idx, to_free);
>
> local_irq_save(flags);
> count = -rcl.len;
> diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
> index db85ca3975f1..4127be06759b 100644
> --- a/kernel/rcu/tree_plugin.h
> +++ b/kernel/rcu/tree_plugin.h
> @@ -2189,6 +2189,8 @@ static int rcu_nocb_kthread(void *a
Re: linux-next: build warning after merge of the btrfs-kdave tree
On 2017年12月20日 06:20, Stephen Rothwell wrote:
> Hi David,
>
> After merging the btrfs-kdave tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> fs/btrfs/qgroup.c: In function 'qgroup_reserve':
> fs/btrfs/qgroup.c:2432:1: warning: label 'retry' defined but not used
> [-Wunused-label]
> retry:
> ^
>
> Introduced by commit
>
> b283738ab0ad ("Revert "btrfs: qgroups: Retry after commit on getting
> EDQUOT"")
>
Sorry, I forgot to clean it up.
I'll update the patchset along with new patches to handle qgroup limit
better.
Thanks,
Qu
signature.asc
Description: OpenPGP digital signature
Re: [PATCH v9 7/7] intel_sgx: in-kernel launch enclave
On Tue, 2017-12-19 at 17:36 +0200, Andy Shevchenko wrote: > On Tue, Dec 19, 2017 at 3:59 PM, Jarkko Sakkinen > wrote: > > > I streamlined the IPC quite a bit. See the attached patch. Can be > > applied on top of this patch. > > Sorry, I didn't look into actual code, but WRT the attached patch, > wouldn't be better / possible to use > pr_fmt() to print "intel_sgx:" prefix for all pr_*() ? Would make much sense. I can do this. In any case Ineed to update this series at least once more for the copyright platters. Thanks for the comment. Now that the series does not add anything intrusive (namely pipe exports or use a fragile AES implementation) I would propose to pull the current series as a single platform driver and move relevant code under arch/x86 in subsequent series. I've taken great of making sure that it would be doable to move code later on when I first decided to make it as a plaform driver. My thinking has been that encapsulating the codebase to a driver would be the least intrusive way to mainline the first version of the SGX support for the Linux kernel especially when there isn't publicly available HW to test it yet with launch control that makes sense for Linux. I can write a detailed description to the documentation how the implementation works in order to help to make the right decision for subsequent series. /Jarkko
Re: [PATCH v5 01/18] PCI: dwc: Use the DMA-API to get the MSI address
On Tue, Dec 19, 2017 at 12:45:30PM +, Gustavo Pimentel wrote: > Tested-By: Gustavo Pimentel > > Using an arc board with USB and SATA end points with a root complex PCIe IP > core > version 5.00, I ran the the following tests: > - I checked that all end points were listed correctly; > - I checked that no PCI related errors was present in dmesg; > - I copied a file from arc to the USB flash drive and checked the checksum; > - I copied a file from USB flash drive to the ARC and checked the checksum; > - I copied a file from arc to the SATA disk and checked the checksum; > - I copied a file from SATA disk to the arc and checked the checksum; > - I copied a file from USB flash drive to the SATA disk and checked the > checksum; > - I copied a file from SATA disk to the USB flash drive and checked the > checksum; > - I checked that no PCI related errors was present in dmesg; > > Everything seemed normal to me. Hello Gustavo, Thanks a lot for testing. FYI: I submitted a new patch set to address Lorenzo's review comments, however, I do not think that we need to redo all the testing, since now we are using the same GFP flags for MSI as we did before, which obviously worked. https://marc.info/?l=devicetree&m=151372652827788&w=2 Regards, Niklas
Re: [PATCH 2/2 v2] scsi: ufs: use sysfs entry for health info
On Tue, 2017-12-19 at 14:46 -0800, Jaegeuk Kim wrote: > Subject: [PATCH 2/2] scsi: ufs: introduce sysfs entries exposing UFS health > info > > This patch adds a new sysfs group, namely health, via: > >/sys/devices/soc/X.ufshc/health/ Thanks for the quick respin. This looks a lot better to me. I will leave it to a UFS expert to do an in-depth review. Bart.
Re: [PATCH v2] IPI performance benchmark
On Tue, 19 Dec 2017 11:50:10 +0300 Yury Norov wrote:
> This benchmark sends many IPIs in different modes and measures
> time for IPI delivery (first column), and total time, ie including
> time to acknowledge the receive by sender (second column).
>
> The scenarios are:
> Dry-run: do everything except actually sending IPI. Useful
> to estimate system overhead.
> Self-IPI: Send IPI to self CPU.
> Normal IPI: Send IPI to some other CPU.
> Broadcast IPI:Send broadcast IPI to all online CPUs.
> Broadcast lock: Send broadcast IPI to all online CPUs and force them
> acquire/release spinlock.
>
> The raw output looks like this:
> [ 155.363374] Dry-run: 0,2999696 ns
> [ 155.429162] Self-IPI: 30385328, 65589392 ns
> [ 156.060821] Normal IPI: 566914128, 631453008 ns
> [ 158.384427] Broadcast IPI: 0, 2323368720 ns
> [ 160.831850] Broadcast lock: 0, 2447000544 ns
>
> For virtualized guests, sending and reveiving IPIs causes guest exit.
> I used this test to measure performance impact on KVM subsystem of
> Christoffer Dall's series "Optimize KVM/ARM for VHE systems" [1].
>
> Test machine is ThunderX2, 112 online CPUs. Below the results normalized
> to host dry-run time, broadcast lock results omitted. Smaller - better.
>
> Host, v4.14:
> Dry-run:0 1
> Self-IPI: 9 18
> Normal IPI: 81 110
> Broadcast IPI:02106
>
> Guest, v4.14:
> Dry-run: 0 1
> Self-IPI:10 18
> Normal IPI: 305 525
> Broadcast IPI:09729
>
> Guest, v4.14 + [1]:
> Dry-run: 0 1
> Self-IPI: 9 18
> Normal IPI: 176 343
> Broadcast IPI:09885
>
That looks handy. Peter and Ingo might be interested.
I wonder if it should be in kernel/. Perhaps it's better to accumulate
these things in lib/test_*.c, rather than cluttering up other top-level
directories.
> +static ktime_t __init send_ipi(int flags)
> +{
> + ktime_t time = 0;
> + DEFINE_SPINLOCK(lock);
I have some vague historical memory that an on-stack spinlock can cause
problems, perhaps with debugging code. Can't remember, maybe I dreamed it.
Urgent Message.
Dear Friend, I am Mr. James Udo, a computer scientist with UBA Bank. I am 29 years old, just started work with UBA Bank. I came across your (B) file which was marked X and your released D disk painted RED, I took time to study it and found out that you have paid VIRTUALLY all fees and certificate but the fund has not been release to you. The most annoying thing is that they cannot tell you the truth that on no account will they ever release the fund to you. Please this is like a Mafia setting in Benin Republic/ Burkina Faso and Nigeria; you may not understand it because you are not from this country. The only thing I will need to release this fund to you is a special HARD DISK. I will buy two of it, recopy your information, destroy the previous one, and punch the computer to reflect in your bank within 24 banking hours. I will clean up the tracer and destroy your file, after which I will quit the UBA bank i don't want to work with them again. Some mafias in the bank are behind the non release of your money that's why i managed to sneak out this information for your kind perusal.If you are interested do get in touch with me immediately, you should send to me you phone numbers for easy communications and also re confirm your banking details, so that there won't be any mistake. Regards, James.
Re: [PATCH] tools/power: Don't make man pages executable
On 12/19/2017 8:54 PM, Laura Abbott wrote: rpm-lint flagged these as being executable: kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/turbostat.8.gz kernel-tools.x86_64: W: spurious-executable-perm /usr/share/man/man8/x86_energy_perf_policy.8.gz Fix this Signed-off-by: Laura Abbott Please CC PM stuff to linux-pm (which makes it easier to handle). --- tools/power/x86/turbostat/Makefile | 2 +- tools/power/x86/x86_energy_perf_policy/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index a9bc914a8fe8..2ab25aa38263 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -25,4 +25,4 @@ install : turbostat install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 diff --git a/tools/power/x86/x86_energy_perf_policy/Makefile b/tools/power/x86/x86_energy_perf_policy/Makefile index 2447b1bbaacf..f4534fb8b951 100644 --- a/tools/power/x86/x86_energy_perf_policy/Makefile +++ b/tools/power/x86/x86_energy_perf_policy/Makefile @@ -24,5 +24,5 @@ install : x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/bin install $(BUILD_OUTPUT)/x86_energy_perf_policy $(DESTDIR)$(PREFIX)/bin/x86_energy_perf_policy install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 + install -m 644 x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 Thanks, Rafael
Re: [PATCH] dt-bindings: display: panel: Fix compatible string for Toshiba LT089AC29000
On Sun, Dec 17, 2017 at 03:34:33AM +0100, Jonathan Neuschäfer wrote:
> The compatible string for this panel was specified as
> toshiba,lt089ac29000.txt. I believe this is a mistake.
>
> Fixes: 06e733e41f87 ("drm/panel: simple: add Toshiba LT089AC19000")
> Cc: Lucas Stach
> Signed-off-by: Jonathan Neuschäfer
> ---
> .../devicetree/bindings/display/panel/toshiba,lt089ac29000.txt | 2
> +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied.
Rob
