mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
bf6002e74b
octeon/patches-5.10 -> octeon/patches-5.15 Removed 140-octeon_e300_support.patch as E300 support appears to be upstreamed. Reworked 130-add_itus_support.patch to compensate for the upstreaming of E300 octeon/config-5.15 The following Kernel Symbols were ADDED: Line 5: +CONFIG_AF_UNIX_OOB=y Line 6: +CONFIG_AHCI_OCTEON=y Line 9: +CONFIG_ARCH_KEEP_MEMBLOCK=y Line 16: +CONFIG_ATA=y Line 17: +CONFIG_BINARY_PRINTF=y Line 29: +CONFIG_CPU_R4K_FPU=y Line 45: +CONFIG_FWNODE_MDIO=y Line 51: +CONFIG_GENERIC_FIND_FIRST_BIT=y Line 59: +CONFIG_GLOB=y Line 61: +CONFIG_GPIO_CDEV=y Line 77: +CONFIG_LTO_NONE=y Line 85: +CONFIG_MIPS_FP_SUPPORT=y Line 93: +CONFIG_NET_SELFTESTS=y Line 94: +CONFIG_NET_SOCK_MSG=y Line 105: +CONFIG_PATA_OCTEON_CF=y Line 106: +CONFIG_PATA_TIMINGS=y Line 114: +CONFIG_PTP_1588_CLOCK_OPTIONAL=y Line 121: +CONFIG_SATA_AHCI_PLATFORM=y Line 122: +CONFIG_SATA_HOST=y Line 124: +CONFIG_SCSI_COMMON=y Line 132: +CONFIG_SOCK_RX_QUEUE_MAPPING=y Line 157: +CONFIG_USB_XHCI_HCD=y Line 158: +CONFIG_USB_XHCI_PLATFORM=y The following kernel symbols were REMOVED: Line 21: -CONFIG_BLK_SCSI_REQUEST=y Line 37: -CONFIG_ENABLE_MUST_CHECK=y Line 69: -CONFIG_HOLES_IN_ZONE=y Line 102: -CONFIG_OF_NET=y Line 140: -CONFIG_SYS_SUPPORTS_HUGETLBFS=y Compiled for Itus Shield, Boots successfully, continuing to test for existing 5.10 memory leak. Signed-off-by: Donald Hoskins <grommish@gmail.com> [refresh patches] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
Date: Wed, 28 Oct 2020 19:00:00 +0000
|
|
Subject: [PATCH] staging: octeon: add net-labels support
|
|
|
|
With this patch, device name can be set within dts file
|
|
in the same way as dsa port can.
|
|
|
|
Add label to pip interface node to use this feature:
|
|
label = "lan0";
|
|
|
|
Tested-by: Johannes Kimmel <fff@bareminimum.eu>
|
|
Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
--- a/drivers/staging/octeon/ethernet.c
|
|
+++ b/drivers/staging/octeon/ethernet.c
|
|
@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres
|
|
int cvm_oct_common_init(struct net_device *dev)
|
|
{
|
|
struct octeon_ethernet *priv = netdev_priv(dev);
|
|
+ const u8 *label = NULL;
|
|
int ret;
|
|
|
|
+ if (priv->of_node)
|
|
+ label = of_get_property(priv->of_node, "label", NULL);
|
|
+
|
|
ret = of_get_mac_address(priv->of_node, dev->dev_addr);
|
|
if (ret)
|
|
eth_hw_addr_random(dev);
|
|
@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic
|
|
if (dev->netdev_ops->ndo_stop)
|
|
dev->netdev_ops->ndo_stop(dev);
|
|
|
|
+ if (!IS_ERR_OR_NULL(label))
|
|
+ dev_alloc_name(dev, label);
|
|
+
|
|
return 0;
|
|
}
|
|
|