From 1e0c22507adb4724ca25de994bcdbe69b8502900 Mon Sep 17 00:00:00 2001 From: Zoltan Herpai Date: Fri, 9 Jan 2015 19:35:14 +0000 Subject: sunxi: bump kernel to 3.18 - refresh patches - add bananapro, cubietruck, mele_m9 support Signed-off-by: Zoltan HERPAI SVN-Revision: 43900 --- .../135-ahci-fix-threaded-interrupt-setup.patch | 97 -------- .../sunxi/patches-3.18/301-add-bananapro.diff | 247 +++++++++++++++++++++ 2 files changed, 247 insertions(+), 97 deletions(-) delete mode 100644 target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch create mode 100644 target/linux/sunxi/patches-3.18/301-add-bananapro.diff (limited to 'target/linux/sunxi/patches-3.18') diff --git a/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch b/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch deleted file mode 100644 index 6d316c2053..0000000000 --- a/target/linux/sunxi/patches-3.18/135-ahci-fix-threaded-interrupt-setup.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 4bfd40ed0046299e4a5ffba31bfbbcc39cf74e03 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Thu, 23 Oct 2014 17:49:30 +0100 -Subject: [PATCH] AHCI: Fix threaded interrupt setup - -Commit 18dcf433f3de (AHCI: Optimize single IRQ interrupt processing) -switched the single IRQ case of the AHCI driver to use threaded -threaded interrupts. - -During this conversion, only the IRQF_SHARED flag was provided. The net -effect of this in the presence of level interrupts is that the -interrupt will not be masked during the execution of the treaded -handler, leading to a screaming interrupt if the thread is not -scheduled quickly enough, specially in error conditions: - -[ 2.728051] ahci-sunxi 1c18000.sata: controller can't do PMP, turning off CAP_PMP -[ 2.735578] ahci-sunxi 1c18000.sata: SSS flag set, parallel bus scan disabled -[ 2.742792] ahci-sunxi 1c18000.sata: AHCI 0001.0100 32 slots 1 ports 3 Gbps 0x1 impl platform mode -[ 2.751789] ahci-sunxi 1c18000.sata: flags: ncq sntf stag pm led clo only pio slum part ccc -[ 2.761539] scsi host0: ahci_platform -[ 2.765754] ata1: SATA max UDMA/133 mmio [mem 0x01c18000-0x01c18fff] port 0x100 irq 88 -[...] -[ 3.127977] ata1: SATA link down (SStatus 0 SControl 300) -[...] -[ 3.162035] Waiting for root device /dev/sda1... -[ 3.163700] random: nonblocking pool is initialized -[ 3.326593] irq 88: nobody cared (try booting with the "irqpoll" option) -[ 3.333296] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.18.0-rc1+ #3077 -[ 3.339936] [] (unwind_backtrace) from [] (show_stack+0x20/0x24) -[ 3.347681] [] (show_stack) from [] (dump_stack+0x9c/0xd4) -[ 3.354904] [] (dump_stack) from [] (__report_bad_irq+0x38/0xd4) -[ 3.362643] [] (__report_bad_irq) from [] (note_interrupt+0x280/0x2d0) -[ 3.370903] [] (note_interrupt) from [] (handle_irq_event_percpu+0x210/0x27c) -[ 3.379771] [] (handle_irq_event_percpu) from [] (handle_irq_event+0x4c/0x6c) -[ 3.388636] [] (handle_irq_event) from [] (handle_fasteoi_irq+0xbc/0x1a0) -[ 3.397156] [] (handle_fasteoi_irq) from [] (generic_handle_irq+0x3c/0x4c) -[ 3.405764] [] (generic_handle_irq) from [] (__handle_domain_irq+0x6c/0xb4) -[ 3.414456] [] (__handle_domain_irq) from [] (gic_handle_irq+0x34/0x6c) -[ 3.422802] [] (gic_handle_irq) from [] (__irq_svc+0x40/0x74) -[ 3.430274] Exception stack(0xc09c1df8 to 0xc09c1e40) -[ 3.435321] 1de0: 00000001 c0a27ec0 -[ 3.443491] 1e00: 00000000 00000000 c09c0028 0000001e 00000282 00000000 ee00c400 c0a239f8 -[ 3.451660] 1e20: c09c0000 c09c1ea4 c0a27ec0 c09c1e40 00200000 c003c7cc 20000113 ffffffff -[ 3.459835] [] (__irq_svc) from [] (__do_softirq+0xbc/0x34c) -[ 3.467229] [] (__do_softirq) from [] (irq_exit+0xbc/0x104) -[ 3.474536] [] (irq_exit) from [] (__handle_domain_irq+0x70/0xb4) -[ 3.482362] [] (__handle_domain_irq) from [] (gic_handle_x74) -[ 3.498169] Exception stack(0xc09c1f10 to 0xc09c1f58) -[ 3.503216] 1f00: ee7ca310 00000000 00000ab4 c0035560 -[ 3.511386] 1f20: c09c0000 00000000 c0a23f84 c09c8474 c09c84bc c09c0000 c0688bf8 c09c1f64 -[ 3.519554] 1f40: c09c1f68 c09c1f58 c00235d8 c00235dc 60000113 ffffffff -[ 3.526165] [] (__irq_svc) from [] (arch_cpu_idle+0x48/0x4c) -[ 3.533557] [] (arch_cpu_idle) from [] (cpu_startup_entry+0x13c/0x27c) -[ 3.541816] [] (cpu_startup_entry) from [] (rest_init+0x94/0x98) -[ 3.549557] [] (rest_init) from [] (start_kernel+0x3f0/0x3fc) -[ 3.557036] [] (start_kernel) from [<40008084>] (0x40008084) -[ 3.563555] handlers: -[ 3.565830] [] ahci_single_irq_intr threaded [] ahci_thread_fn -[ 3.573415] Disabling IRQ #88 -[ 3.576532] ata1: exception Emask 0x10 SAct 0x0 SErr 0x4050002 action 0xe frozen -[ 3.583977] ata1: irq_stat 0x00400040, connection status changed -[ 3.590006] ata1: SError: { RecovComm PHYRdyChg CommWake DevExch } -[ 3.596209] ata1: hard resetting link -[...] - -Not good. The culprit is a missing IRQF_ONESHOT flag, which addition -solves the problem entierly. The number of interrupts drops radically: - -[Booting Debian Jessie to a prompt] -Before fix: - 88: 3562 0 GIC 88 ahci-sunxi -After fix: - 88: 1992 0 GIC 88 ahci-sunxi - -Tested on a A20 board (ahci-sunxi). - -Cc: Alexander Gordeev -Cc: Tejun Heo -Cc: linux-ide@vger.kernel.org -Signed-off-by: Marc Zyngier ---- - drivers/ata/libahci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 5eb61c9..49c649f 100644 ---- a/drivers/ata/libahci.c -+++ b/drivers/ata/libahci.c -@@ -2492,7 +2492,7 @@ static int ahci_host_activate_single_irq(struct ata_host *host, int irq, - return rc; - - rc = devm_request_threaded_irq(host->dev, irq, ahci_single_irq_intr, -- ahci_thread_fn, IRQF_SHARED, -+ ahci_thread_fn, IRQF_SHARED | IRQF_ONESHOT, - dev_driver_string(host->dev), host); - if (rc) - return rc; diff --git a/target/linux/sunxi/patches-3.18/301-add-bananapro.diff b/target/linux/sunxi/patches-3.18/301-add-bananapro.diff new file mode 100644 index 0000000000..47454e974e --- /dev/null +++ b/target/linux/sunxi/patches-3.18/301-add-bananapro.diff @@ -0,0 +1,247 @@ +diff -ruN old/arch/arm/boot/dts/Makefile new/arch/arm/boot/dts/Makefile +--- old/arch/arm/boot/dts/Makefile 2015-01-06 09:29:23.612462619 +0100 ++++ new/arch/arm/boot/dts/Makefile 2015-01-06 09:29:36.316254352 +0100 +@@ -436,6 +436,7 @@ + sun6i-a31-m9.dtb + dtb-$(CONFIG_MACH_SUN7I) += \ + sun7i-a20-bananapi.dtb \ ++ sun7i-a20-bananapro.dtb \ + sun7i-a20-cubieboard2.dtb \ + sun7i-a20-cubietruck.dtb \ + sun7i-a20-hummingbird.dtb \ +diff -ruN old/arch/arm/boot/dts/sun7i-a20-bananapro.dts new/arch/arm/boot/dts/sun7i-a20-bananapro.dts +--- old/arch/arm/boot/dts/sun7i-a20-bananapro.dts 1970-01-01 01:00:00.000000000 +0100 ++++ new/arch/arm/boot/dts/sun7i-a20-bananapro.dts 2015-01-06 09:31:18.290582574 +0100 +@@ -0,0 +1,232 @@ ++/* ++ * Copyright 2014 Zoltan HERPAI ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ * MA 02110-1301 USA ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++/include/ "sun7i-a20.dtsi" ++/include/ "sunxi-common-regulators.dtsi" ++ ++/ { ++ model = "LeMaker Banana Pro"; ++ compatible = "lemaker,bananapro", "allwinner,sun7i-a20"; ++ ++ soc@01c00000 { ++ spi0: spi@01c05000 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&spi0_pins_a>; ++ status = "okay"; ++ }; ++ ++ mmc0: mmc@01c0f000 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>; ++ vmmc-supply = <®_vcc3v3>; ++ bus-width = <4>; ++ cd-gpios = <&pio 7 10 0>; /* PH10 */ ++ cd-inverted; ++ status = "okay"; ++ }; ++ ++ mmc3: mmc@01c12000 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mmc3_pins_a> ++ vmmc-supply = <®_vmmc3>; ++ bus-width = <4>; ++ non-removable; ++ status = "okay"; ++ ++ brcmf: bcrmf@1 { ++ reg = <1>; ++ ccompatible = "brcm,bcm4329-fmac"; ++ interrupt-parent = <&pio>; ++ interrupts = <10 8>; /* PH10 / EINT10 * taken from https://github.com/Bananian/fex/blob/master/BananaPro/BananaPro.fex.otg-off */ ++ interrupt-names = "host-wake"; ++ }; ++ }; ++ ++ usbphy: phy@01c13400 { ++ usb1_vbus-supply = <®_usb1_vbus>; ++ usb2_vbus-supply = <®_usb2_vbus>; ++ status = "okay"; ++ }; ++ ++ ehci0: usb@01c14000 { ++ status = "okay"; ++ }; ++ ++ ohci0: usb@01c14400 { ++ status = "okay"; ++ }; ++ ++ ahci: sata@01c18000 { ++ status = "okay"; ++ }; ++ ++ ehci1: usb@01c1c000 { ++ status = "okay"; ++ }; ++ ++ ohci1: usb@01c1c400 { ++ status = "okay"; ++ }; ++ ++ pinctrl@01c20800 { ++ mmc0_cd_pin_bananapro: mmc0_cd_pin@0 { ++ allwinner,pins = "PH10"; ++ allwinner,function = "gpio_in"; ++ allwinner,drive = <0>; ++ allwinner,pull = <1>; ++ }; ++ ++ gmac_power_pin_bananapro: gmac_power_pin@0 { ++ allwinner,pins = "PH23"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = <0>; ++ allwinner,pull = <0>; ++ }; ++ ++ led_pins_bananapro: led_pins@0 { ++ allwinner,pins = "PH24"; ++ allwinner,function = "gpio_out"; ++ allwinner,drive = <0>; ++ allwinner,pull = <0>; ++ }; ++ }; ++ ++ ir0: ir@01c21800 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ir0_pins_a>; ++ status = "okay"; ++ }; ++ ++ uart0: serial@01c28000 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_pins_a>; ++ status = "okay"; ++ }; ++ ++ uart3: serial@01c28c00 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart3_pins_b>; ++ status = "okay"; ++ }; ++ ++ uart7: serial@01c29c00 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart7_pins_a>; ++ status = "okay"; ++ }; ++ ++ i2c0: i2c@01c2ac00 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c0_pins_a>; ++ status = "okay"; ++ ++ axp209: pmic@34 { ++ compatible = "x-powers,axp209"; ++ reg = <0x34>; ++ interrupt-parent = <&nmi_intc>; ++ interrupts = <0 8>; ++ ++ interrupt-controller; ++ #interrupt-cells = <1>; ++ }; ++ }; ++ ++ i2c2: i2c@01c2b400 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c2_pins_a>; ++ status = "okay"; ++ }; ++ ++ gmac: ethernet@01c50000 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_pins_rgmii_a>; ++ phy = <&phy1>; ++ phy-mode = "rgmii"; ++ phy-supply = <®_gmac_3v3>; ++ status = "okay"; ++ ++ phy1: ethernet-phy@1 { ++ reg = <1>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&led_pins_bananapro>; ++ ++ green { ++ label = "bananapro:green:usr"; ++ gpios = <&pio 7 24 0>; ++ }; ++ }; ++ ++ reg_usb1_vbus: usb1-vbus { ++ status = "okay"; ++ }; ++ ++ reg_usb2_vbus: usb2-vbus { ++ status = "okay"; ++ }; ++ ++ reg_gmac_3v3: gmac-3v3 { ++ compatible = "regulator-fixed"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gmac_power_pin_bananapro>; ++ regulator-name = "gmac-3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ startup-delay-us = <50000>; ++ enable-active-high; ++ gpio = <&pio 7 23 0>; ++ }; ++}; -- cgit v1.2.3