From 849569a5281a16bf516ff70531267ba904d00735 Mon Sep 17 00:00:00 2001 From: Heisath Date: Sat, 20 Mar 2021 22:26:01 +0100 Subject: [PATCH] mvebu remove upstreamed patches --- ...plify-set_init_blocksize-to-regain-l.patch | 71 ------------------- ...s4-dts-assign-pinctrl-to-fan-and-led.patch | 67 ----------------- ...s4-dts-assign-pinctrl-to-fan-and-led.patch | 67 ----------------- 3 files changed, 205 deletions(-) delete mode 100644 patch/kernel/mvebu-current/0001-Revert-block-simplify-set_init_blocksize-to-regain-l.patch delete mode 100644 patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch delete mode 100644 patch/kernel/mvebu-dev/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch diff --git a/patch/kernel/mvebu-current/0001-Revert-block-simplify-set_init_blocksize-to-regain-l.patch b/patch/kernel/mvebu-current/0001-Revert-block-simplify-set_init_blocksize-to-regain-l.patch deleted file mode 100644 index e87b65c7ec..0000000000 --- a/patch/kernel/mvebu-current/0001-Revert-block-simplify-set_init_blocksize-to-regain-l.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b2b8b700c7be053eeadc0b3e172e18a0d148fa5e Mon Sep 17 00:00:00 2001 -From: Maxim Mikityanskiy -Date: Tue, 26 Jan 2021 21:46:47 +0200 -Subject: [PATCH] Revert "block: simplify set_init_blocksize" to regain lost - performance - -The cited commit introduced a serious regression with SATA write speed, -as found by bisecting. This patch reverts this commit, which restores -write speed back to the values observed before this commit. - -The performance tests were done on a Helios4 NAS (2nd batch) with 4 HDDs -(WD8003FFBX) using dd (bs=1M count=2000). "Direct" is a test with a -single HDD, the rest are different RAID levels built over the first -partitions of 4 HDDs. Test results are in MB/s, R is read, W is write. - - | Direct | RAID0 | RAID10 f2 | RAID10 n2 | RAID6 -----------------+--------+-------+-----------+-----------+-------- -9011495c9466 | R:256 | R:313 | R:276 | R:313 | R:323 -(before faulty) | W:254 | W:253 | W:195 | W:204 | W:117 -----------------+--------+-------+-----------+-----------+-------- -5ff9f19231a0 | R:257 | R:398 | R:312 | R:344 | R:391 -(faulty commit) | W:154 | W:122 | W:67.7 | W:66.6 | W:67.2 -----------------+--------+-------+-----------+-----------+-------- -5.10.10 | R:256 | R:401 | R:312 | R:356 | R:375 -unpatched | W:149 | W:123 | W:64 | W:64.1 | W:61.5 -----------------+--------+-------+-----------+-----------+-------- -5.10.10 | R:255 | R:396 | R:312 | R:340 | R:393 -patched | W:247 | W:274 | W:220 | W:225 | W:121 - -Applying this patch doesn't hurt read performance, while improves the -write speed by 1.5x - 3.5x (more impact on RAID tests). The write speed -is restored back to the state before the faulty commit, and even a bit -higher in RAID tests (which aren't HDD-bound on this device) - that is -likely related to other optimizations done between the faulty commit and -5.10.10 which also improved the read speed. - -Upstream status: accepted to 5.11. -https://www.spinics.net/lists/linux-block/msg64471.html - -Signed-off-by: Maxim Mikityanskiy -Fixes: 5ff9f19231a0 ("block: simplify set_init_blocksize") -Cc: Christoph Hellwig -Cc: Jens Axboe ---- - fs/block_dev.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/fs/block_dev.c b/fs/block_dev.c -index 3b8963e228a1..235b5042672e 100644 ---- a/fs/block_dev.c -+++ b/fs/block_dev.c -@@ -130,7 +130,15 @@ EXPORT_SYMBOL(truncate_bdev_range); - - static void set_init_blocksize(struct block_device *bdev) - { -- bdev->bd_inode->i_blkbits = blksize_bits(bdev_logical_block_size(bdev)); -+ unsigned int bsize = bdev_logical_block_size(bdev); -+ loff_t size = i_size_read(bdev->bd_inode); -+ -+ while (bsize < PAGE_SIZE) { -+ if (size & bsize) -+ break; -+ bsize <<= 1; -+ } -+ bdev->bd_inode->i_blkbits = blksize_bits(bsize); - } - - int set_blocksize(struct block_device *bdev, int size) --- -2.30.0 - diff --git a/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch b/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch deleted file mode 100644 index 1032d30be8..0000000000 --- a/patch/kernel/mvebu-current/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/arch/arm/boot/dts/armada-388-helios4.dts -+++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -70,6 +70,9 @@ - - system-leds { - compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&helios_system_led_pins>; -+ - status-led { - label = "helios4:green:status"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; -@@ -98,6 +101,9 @@ - - io-leds { - compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&helios_io_led_pins>; -+ - sata1-led { - label = "helios4:green:ata1"; - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; -@@ -133,11 +139,15 @@ - fan1: j10-pwm { - compatible = "pwm-fan"; - pwms = <&gpio1 9 40000>; /* Target freq:25 kHz */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&j10_pins>; - }; - - fan2: j17-pwm { - compatible = "pwm-fan"; - pwms = <&gpio1 23 40000>; /* Target freq:25 kHz */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&j17_pins>; - }; - - usb2_phy: usb2-phy { -@@ -298,16 +308,23 @@ - "mpp39", "mpp40"; - marvell,function = "sd0"; - }; -- helios_led_pins: helios-led-pins { -- marvell,pins = "mpp24", "mpp25", -+ helios_system_led_pins: helios-system-led-pins { -+ marvell,pins = "mpp24", "mpp25"; -+ marvell,function = "gpio"; -+ }; -+ helios_io_led_pins: helios-io-led-pins { -+ marvell,pins = "mpp49", "mpp50", - "mpp49", "mpp50", - "mpp52", "mpp53", - "mpp54"; - marvell,function = "gpio"; - }; -- helios_fan_pins: helios-fan-pins { -- marvell,pins = "mpp41", "mpp43", -- "mpp48", "mpp55"; -+ j10_pins: fan-j10-pins { -+ marvell,pins = "mpp41", "mpp43"; -+ marvell,function = "gpio"; -+ }; -+ j17_pins: fan-j17-pins { -+ marvell,pins = "mpp48", "mpp55"; - marvell,function = "gpio"; - }; - microsom_spi1_cs_pins: spi1-cs-pins { diff --git a/patch/kernel/mvebu-dev/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch b/patch/kernel/mvebu-dev/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch deleted file mode 100644 index 1032d30be8..0000000000 --- a/patch/kernel/mvebu-dev/95-helios4-dts-assign-pinctrl-to-fan-and-led.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/arch/arm/boot/dts/armada-388-helios4.dts -+++ b/arch/arm/boot/dts/armada-388-helios4.dts -@@ -70,6 +70,9 @@ - - system-leds { - compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&helios_system_led_pins>; -+ - status-led { - label = "helios4:green:status"; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; -@@ -98,6 +101,9 @@ - - io-leds { - compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&helios_io_led_pins>; -+ - sata1-led { - label = "helios4:green:ata1"; - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; -@@ -133,11 +139,15 @@ - fan1: j10-pwm { - compatible = "pwm-fan"; - pwms = <&gpio1 9 40000>; /* Target freq:25 kHz */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&j10_pins>; - }; - - fan2: j17-pwm { - compatible = "pwm-fan"; - pwms = <&gpio1 23 40000>; /* Target freq:25 kHz */ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&j17_pins>; - }; - - usb2_phy: usb2-phy { -@@ -298,16 +308,23 @@ - "mpp39", "mpp40"; - marvell,function = "sd0"; - }; -- helios_led_pins: helios-led-pins { -- marvell,pins = "mpp24", "mpp25", -+ helios_system_led_pins: helios-system-led-pins { -+ marvell,pins = "mpp24", "mpp25"; -+ marvell,function = "gpio"; -+ }; -+ helios_io_led_pins: helios-io-led-pins { -+ marvell,pins = "mpp49", "mpp50", - "mpp49", "mpp50", - "mpp52", "mpp53", - "mpp54"; - marvell,function = "gpio"; - }; -- helios_fan_pins: helios-fan-pins { -- marvell,pins = "mpp41", "mpp43", -- "mpp48", "mpp55"; -+ j10_pins: fan-j10-pins { -+ marvell,pins = "mpp41", "mpp43"; -+ marvell,function = "gpio"; -+ }; -+ j17_pins: fan-j17-pins { -+ marvell,pins = "mpp48", "mpp55"; - marvell,function = "gpio"; - }; - microsom_spi1_cs_pins: spi1-cs-pins {