aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-02-01 17:50:27 +0100
committerJohn Crispin <john@phrozen.org>2018-02-13 10:01:53 +0100
commit5adf16b49254ad0b95e315bc34cdc7577f07d026 (patch)
tree72ab65d334c5ecf0f429b657bc3745753423cab3 /target/linux/cns3xxx/patches-4.14
parentbef3f85742134f08856f9de175b85da9b2715bfb (diff)
downloadupstream-5adf16b49254ad0b95e315bc34cdc7577f07d026.tar.gz
upstream-5adf16b49254ad0b95e315bc34cdc7577f07d026.tar.bz2
upstream-5adf16b49254ad0b95e315bc34cdc7577f07d026.zip
cns3xxx: remove linux 4.9 support
- Remove kernel 4.9 support - Apply specific 4.14 changes directly to source - Refreshed all Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.14')
-rw-r--r--target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch77
-rw-r--r--target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch29
2 files changed, 0 insertions, 106 deletions
diff --git a/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch b/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch
deleted file mode 100644
index 3538586f6f..0000000000
--- a/target/linux/cns3xxx/patches-4.14/140-fix-ethernet-irq-imbalance.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/drivers/net/ethernet/cavium/cns3xxx_eth.c
-+++ b/drivers/net/ethernet/cavium/cns3xxx_eth.c
-@@ -712,26 +712,20 @@ static int eth_poll(struct napi_struct *
- }
-
- rx_ring->cur_index = i;
-- if (!received) {
-- napi_complete(napi);
-- enable_irq(sw->rx_irq);
-- budget = 0;
--
-- /* If 1 or more frames came in during IRQ enable, re-schedule */
-- if (rx_ring->desc[i].cown)
-- eth_schedule_poll(sw);
-- }
--
-- spin_lock_bh(&tx_lock);
-- eth_complete_tx(sw);
-- spin_unlock_bh(&tx_lock);
-
- cns3xxx_alloc_rx_buf(sw, received);
--
- wmb();
- enable_rx_dma(sw);
-
-- return budget;
-+ if (received < budget && napi_complete_done(napi, received)) {
-+ enable_irq(sw->rx_irq);
-+ }
-+
-+ spin_lock_bh(&tx_lock);
-+ eth_complete_tx(sw);
-+ spin_unlock_bh(&tx_lock);
-+
-+ return received;
- }
-
- static void eth_set_desc(struct sw *sw, struct _tx_ring *tx_ring, int index,
-@@ -856,18 +850,6 @@ static void cns3xxx_get_drvinfo(struct n
- strcpy(info->bus_info, "internal");
- }
-
--static int cns3xxx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
--{
-- struct port *port = netdev_priv(dev);
-- return phy_ethtool_gset(port->phydev, cmd);
--}
--
--static int cns3xxx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
--{
-- struct port *port = netdev_priv(dev);
-- return phy_ethtool_sset(port->phydev, cmd);
--}
--
- static int cns3xxx_nway_reset(struct net_device *dev)
- {
- struct port *port = netdev_priv(dev);
-@@ -876,8 +858,8 @@ static int cns3xxx_nway_reset(struct net
-
- static struct ethtool_ops cns3xxx_ethtool_ops = {
- .get_drvinfo = cns3xxx_get_drvinfo,
-- .get_settings = cns3xxx_get_settings,
-- .set_settings = cns3xxx_set_settings,
-+ .get_link_ksettings = phy_ethtool_get_link_ksettings,
-+ .set_link_ksettings = phy_ethtool_set_link_ksettings,
- .nway_reset = cns3xxx_nway_reset,
- .get_link = ethtool_op_get_link,
- };
-@@ -1177,7 +1159,7 @@ static int eth_init_one(struct platform_
- goto err_remove_mdio;
- }
-
-- strcpy(napi_dev->name, "switch%d");
-+ strcpy(napi_dev->name, "cns3xxx_eth");
- napi_dev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST;
-
- SET_NETDEV_DEV(napi_dev, &pdev->dev);
diff --git a/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch b/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch
deleted file mode 100644
index 11a630e502..0000000000
--- a/target/linux/cns3xxx/patches-4.14/150-laguna-delete-deprecated-uart-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/arm/mach-cns3xxx/laguna.c
-+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -389,7 +389,7 @@ static struct plat_serial8250_port lagun
- .mapbase = (CNS3XXX_UART0_BASE),
- .irq = IRQ_CNS3XXX_UART0,
- .iotype = UPIO_MEM,
-- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP,
-+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP,
- .regshift = 2,
- .uartclk = 24000000,
- .type = PORT_16550A,
-@@ -397,7 +397,7 @@ static struct plat_serial8250_port lagun
- .mapbase = (CNS3XXX_UART1_BASE),
- .irq = IRQ_CNS3XXX_UART1,
- .iotype = UPIO_MEM,
-- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP,
-+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP,
- .regshift = 2,
- .uartclk = 24000000,
- .type = PORT_16550A,
-@@ -405,7 +405,7 @@ static struct plat_serial8250_port lagun
- .mapbase = (CNS3XXX_UART2_BASE),
- .irq = IRQ_CNS3XXX_UART2,
- .iotype = UPIO_MEM,
-- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_NO_TXEN_TEST | UPF_IOREMAP,
-+ .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE | UPF_IOREMAP,
- .regshift = 2,
- .uartclk = 24000000,
- .type = PORT_16550A,