-LINUX_VERSION-6.1 = .41
-LINUX_KERNEL_HASH-6.1.41 = 312809a78eea052a08a6580f47b2ed8dd28e5633461d6731febaf3cb1e570bb7
\ No newline at end of file
+LINUX_VERSION-6.1 = .42
+LINUX_KERNEL_HASH-6.1.42 = aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201
-@@ -1367,6 +1370,9 @@
+@@ -1368,6 +1371,9 @@
#define USB_VENDOR_ID_XIAOMI 0x2717
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -197,6 +198,7 @@ static const struct hid_device_id hid_qu
+@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
-@@ -4540,6 +4540,7 @@ static const struct {
+@@ -4635,6 +4635,7 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
int ret = 0;
bool invalid_bdaddr;
size_t i;
-@@ -4568,7 +4569,9 @@ static int hci_dev_setup_sync(struct hci
+@@ -4663,7 +4664,9 @@ static int hci_dev_setup_sync(struct hci
if (!ret) {
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3495,11 +3495,8 @@ static void mtk_pending_work(struct work
+@@ -3478,11 +3478,8 @@ static void mtk_pending_work(struct work
rtnl_lock();
dev_dbg(eth->dev, "[%s][%d] reset\n", __func__, __LINE__);
/* stop all devices to make sure that dma is properly shut down */
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
-@@ -3533,7 +3530,7 @@ static void mtk_pending_work(struct work
+@@ -3516,7 +3513,7 @@ static void mtk_pending_work(struct work
dev_dbg(eth->dev, "[%s][%d] reset done\n", __func__, __LINE__);
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
/* Set FE to PDMAv2 if necessary */
-@@ -3522,7 +3574,7 @@ static void mtk_pending_work(struct work
+@@ -3505,7 +3557,7 @@ static void mtk_pending_work(struct work
if (eth->dev->pins)
pinctrl_select_state(eth->dev->pins->p,
eth->dev->pins->default_state);
/* restart DMA and enable IRQs */
for (i = 0; i < MTK_MAC_COUNT; i++) {
-@@ -4114,7 +4166,7 @@ static int mtk_probe(struct platform_dev
+@@ -4107,7 +4159,7 @@ static int mtk_probe(struct platform_dev
eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);
INIT_WORK(ð->pending_work, mtk_pending_work);
return ret;
}
-@@ -3546,30 +3565,53 @@ static int mtk_do_ioctl(struct net_devic
+@@ -3529,30 +3548,53 @@ static int mtk_do_ioctl(struct net_devic
return -EOPNOTSUPP;
}
if (eth->dev->pins)
pinctrl_select_state(eth->dev->pins->p,
-@@ -3580,15 +3622,19 @@ static void mtk_pending_work(struct work
+@@ -3563,15 +3605,19 @@ static void mtk_pending_work(struct work
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!test_bit(i, &restart))
continue;
static int mtk_hw_init(struct mtk_eth *eth, bool reset)
{
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
-@@ -3672,6 +3774,7 @@ static int mtk_cleanup(struct mtk_eth *e
+@@ -3655,6 +3757,7 @@ static int mtk_cleanup(struct mtk_eth *e
mtk_unreg_dev(eth);
mtk_free_dev(eth);
cancel_work_sync(ð->pending_work);
return 0;
}
-@@ -4099,6 +4202,7 @@ static int mtk_probe(struct platform_dev
+@@ -4092,6 +4195,7 @@ static int mtk_probe(struct platform_dev
eth->rx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
INIT_WORK(ð->rx_dim.work, mtk_dim_rx);
eth->tx_dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
INIT_WORK(ð->tx_dim.work, mtk_dim_tx);
-@@ -4301,6 +4405,8 @@ static int mtk_probe(struct platform_dev
+@@ -4294,6 +4398,8 @@ static int mtk_probe(struct platform_dev
netif_napi_add(ð->dummy_dev, ð->rx_napi, mtk_napi_rx);
platform_set_drvdata(pdev, eth);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3703,6 +3703,11 @@ static void mtk_pending_work(struct work
+@@ -3686,6 +3686,11 @@ static void mtk_pending_work(struct work
set_bit(MTK_RESETTING, ð->state);
mtk_prepare_for_reset(eth);
/* stop all devices to make sure that dma is properly shut down */
for (i = 0; i < MTK_MAC_COUNT; i++) {
-@@ -3740,6 +3745,8 @@ static void mtk_pending_work(struct work
+@@ -3723,6 +3728,8 @@ static void mtk_pending_work(struct work
clear_bit(MTK_RESETTING, ð->state);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4484,7 +4484,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4477,7 +4477,7 @@ static const struct mtk_soc_data mt7621_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7621_CLKS_BITMAP,
.required_pctl = false,
.hash_offset = 2,
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
-@@ -4523,7 +4523,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4516,7 +4516,7 @@ static const struct mtk_soc_data mt7623_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7623_CLKS_BITMAP,
.required_pctl = true,
return 0;
}
-@@ -3774,8 +3930,12 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -3757,8 +3913,12 @@ static int mtk_unreg_dev(struct mtk_eth
int i;
for (i = 0; i < MTK_MAC_COUNT; i++) {
unregister_netdev(eth->netdev[i]);
}
-@@ -3992,6 +4152,23 @@ static int mtk_set_rxnfc(struct net_devi
+@@ -3975,6 +4135,23 @@ static int mtk_set_rxnfc(struct net_devi
return ret;
}
static const struct ethtool_ops mtk_ethtool_ops = {
.get_link_ksettings = mtk_get_link_ksettings,
.set_link_ksettings = mtk_set_link_ksettings,
-@@ -4027,6 +4204,7 @@ static const struct net_device_ops mtk_n
+@@ -4009,6 +4186,7 @@ static const struct net_device_ops mtk_n
.ndo_setup_tc = mtk_eth_setup_tc,
.ndo_bpf = mtk_xdp,
.ndo_xdp_xmit = mtk_xdp_xmit,
};
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
-@@ -4036,6 +4214,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4018,6 +4196,7 @@ static int mtk_add_mac(struct mtk_eth *e
struct phylink *phylink;
struct mtk_mac *mac;
int id, err;
if (!_id) {
dev_err(eth->dev, "missing mac id\n");
-@@ -4053,7 +4232,10 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4035,7 +4214,10 @@ static int mtk_add_mac(struct mtk_eth *e
return -EINVAL;
}
if (!eth->netdev[id]) {
dev_err(eth->dev, "alloc_etherdev failed\n");
return -ENOMEM;
-@@ -4150,6 +4332,11 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4143,6 +4325,11 @@ static int mtk_add_mac(struct mtk_eth *e
else
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
/* Enable RX VLan Offloading */
mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);
-@@ -3922,6 +3982,12 @@ static int mtk_free_dev(struct mtk_eth *
+@@ -3905,6 +3965,12 @@ static int mtk_free_dev(struct mtk_eth *
free_netdev(eth->netdev[i]);
}
mtk_eth_path_name(path), __func__, updated);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4808,6 +4808,26 @@ static const struct mtk_soc_data mt7629_
+@@ -4801,6 +4801,26 @@ static const struct mtk_soc_data mt7629_
},
};
static const struct mtk_soc_data mt7986_data = {
.reg_map = &mt7986_reg_map,
.ana_rgc3 = 0x128,
-@@ -4849,6 +4869,7 @@ const struct of_device_id of_mtk_match[]
+@@ -4842,6 +4862,7 @@ const struct of_device_id of_mtk_match[]
{ .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
{ .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
{ .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},
}
return NULL;
-@@ -4031,8 +4032,17 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -4014,8 +4015,17 @@ static int mtk_unreg_dev(struct mtk_eth
return 0;
}
mtk_unreg_dev(eth);
mtk_free_dev(eth);
cancel_work_sync(ð->pending_work);
-@@ -4462,6 +4472,36 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -4455,6 +4465,36 @@ void mtk_eth_set_dma_device(struct mtk_e
rtnl_unlock();
}
static int mtk_probe(struct platform_device *pdev)
{
struct resource *res = NULL;
-@@ -4525,13 +4565,7 @@ static int mtk_probe(struct platform_dev
+@@ -4518,13 +4558,7 @@ static int mtk_probe(struct platform_dev
}
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SGMII)) {
if (err)
return err;
-@@ -4542,14 +4576,17 @@ static int mtk_probe(struct platform_dev
+@@ -4535,14 +4569,17 @@ static int mtk_probe(struct platform_dev
"mediatek,pctl");
if (IS_ERR(eth->pctl)) {
dev_err(&pdev->dev, "no pctl regmap found\n");
}
if (eth->soc->offload_version) {
-@@ -4708,6 +4745,8 @@ err_deinit_hw:
+@@ -4701,6 +4738,8 @@ err_deinit_hw:
mtk_hw_deinit(eth);
err_wed_exit:
mtk_wed_exit();
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
-@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
+@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3465,6 +3465,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m
else
reg = 1 << port;
* and return the first char from this token.
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
-@@ -75,6 +75,7 @@ static struct addr_range percpu_range =
+@@ -77,6 +77,7 @@ static struct addr_range percpu_range =
static struct sym_entry **table;
static unsigned int table_size, table_cnt;
static int all_symbols;
+static int uncompressed;
static int absolute_percpu;
static int base_relative;
-
-@@ -535,6 +536,9 @@ static void write_src(void)
-
- free(markers);
+ static int lto_clang;
+@@ -605,6 +606,9 @@ static void write_src(void)
+ printf("\t.long\t%u\n", table[i]->seq);
+ printf("\n");
+ if (uncompressed)
+ return;
output_label("kallsyms_token_table");
off = 0;
for (i = 0; i < 256; i++) {
-@@ -586,6 +590,9 @@ static unsigned char *find_token(unsigne
+@@ -656,6 +660,9 @@ static unsigned char *find_token(unsigne
{
int i;
for (i = 0; i < len - 1; i++) {
if (str[i] == token[0] && str[i+1] == token[1])
return &str[i];
-@@ -658,6 +665,9 @@ static void optimize_result(void)
+@@ -728,6 +735,9 @@ static void optimize_result(void)
{
int i, best;
/* using the '\0' symbol last allows compress_symbols to use standard
* fast string functions */
for (i = 255; i >= 0; i--) {
-@@ -818,6 +828,7 @@ int main(int argc, char **argv)
- {"all-symbols", no_argument, &all_symbols, 1},
+@@ -889,6 +899,7 @@ int main(int argc, char **argv)
{"absolute-percpu", no_argument, &absolute_percpu, 1},
{"base-relative", no_argument, &base_relative, 1},
+ {"lto-clang", no_argument, <o_clang, 1},
+ {"uncompressed", no_argument, &uncompressed, 1},
{},
};
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
-@@ -156,6 +156,10 @@ kallsyms()
- kallsymopt="${kallsymopt} --base-relative"
+@@ -160,6 +160,10 @@ kallsyms()
+ kallsymopt="${kallsymopt} --lto-clang"
fi
+ if is_enabled CONFIG_KALLSYMS_UNCOMPRESSED; then
}
return IRQ_HANDLED;
-@@ -4727,6 +4727,8 @@ static int mtk_probe(struct platform_dev
+@@ -4720,6 +4720,8 @@ static int mtk_probe(struct platform_dev
* for NAPI to work
*/
init_dummy_netdev(ð->dummy_dev);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4696,8 +4696,8 @@ static int mtk_probe(struct platform_dev
+@@ -4689,8 +4689,8 @@ static int mtk_probe(struct platform_dev
for (i = 0; i < num_ppe; i++) {
u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
if (!eth->ppe[i]) {
err = -ENOMEM;
goto err_deinit_ppe;
-@@ -4823,6 +4823,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4816,6 +4816,7 @@ static const struct mtk_soc_data mt7622_
.required_pctl = false,
.offload_version = 2,
.hash_offset = 2,
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
-@@ -4860,6 +4861,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4853,6 +4854,7 @@ static const struct mtk_soc_data mt7629_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7629_CLKS_BITMAP,
.required_pctl = false,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4880,6 +4882,7 @@ static const struct mtk_soc_data mt7981_
+@@ -4873,6 +4875,7 @@ static const struct mtk_soc_data mt7981_
.offload_version = 2,
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma_v2),
.rxd_size = sizeof(struct mtk_rx_dma_v2),
-@@ -4899,6 +4902,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4892,6 +4895,7 @@ static const struct mtk_soc_data mt7986_
.required_pctl = false,
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),
/* set interrupt delays based on current Net DIM sample */
mtk_dim_rx(ð->rx_dim.work);
-@@ -4419,7 +4388,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4412,7 +4381,7 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->hw_features |= NETIF_F_LRO;
eth->netdev[id]->vlan_features = eth->soc->hw_features &
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4043,7 +4043,10 @@ static void mtk_sgmii_destroy(struct mtk
+@@ -4026,7 +4026,10 @@ static void mtk_sgmii_destroy(struct mtk
{
int i;
mtk_pcs_lynxi_destroy(eth->sgmii_pcs[i]);
}
-@@ -4486,7 +4489,12 @@ static int mtk_sgmii_init(struct mtk_eth
+@@ -4479,7 +4482,12 @@ static int mtk_sgmii_init(struct mtk_eth
u32 flags;
int i;
np = of_parse_phandle(eth->dev->of_node, "mediatek,sgmiisys", i);
if (!np)
break;
-@@ -4531,6 +4539,18 @@ static int mtk_probe(struct platform_dev
+@@ -4524,6 +4532,18 @@ static int mtk_probe(struct platform_dev
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
eth->ip_align = NET_IP_ALIGN;
spin_lock_init(ð->page_lock);
spin_lock_init(ð->tx_irq_lock);
spin_lock_init(ð->rx_irq_lock);
-@@ -4716,7 +4736,7 @@ static int mtk_probe(struct platform_dev
+@@ -4709,7 +4729,7 @@ static int mtk_probe(struct platform_dev
goto err_deinit_ppe;
}
if (!eth->netdev[i])
continue;
-@@ -4792,6 +4812,7 @@ static const struct mtk_soc_data mt2701_
+@@ -4785,6 +4805,7 @@ static const struct mtk_soc_data mt2701_
.hw_features = MTK_HW_FEATURES,
.required_clks = MT7623_CLKS_BITMAP,
.required_pctl = true,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4810,6 +4831,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4803,6 +4824,7 @@ static const struct mtk_soc_data mt7621_
.required_pctl = false,
.offload_version = 1,
.hash_offset = 2,
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
-@@ -4831,6 +4853,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4824,6 +4846,7 @@ static const struct mtk_soc_data mt7622_
.offload_version = 2,
.hash_offset = 2,
.has_accounting = true,
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
-@@ -4850,6 +4873,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4843,6 +4866,7 @@ static const struct mtk_soc_data mt7623_
.required_pctl = true,
.offload_version = 1,
.hash_offset = 2,
.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
-@@ -4869,6 +4893,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4862,6 +4886,7 @@ static const struct mtk_soc_data mt7629_
.required_clks = MT7629_CLKS_BITMAP,
.required_pctl = false,
.has_accounting = true,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4890,6 +4915,7 @@ static const struct mtk_soc_data mt7981_
+@@ -4883,6 +4908,7 @@ static const struct mtk_soc_data mt7981_
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),
.has_accounting = true,
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma_v2),
.rxd_size = sizeof(struct mtk_rx_dma_v2),
-@@ -4908,6 +4934,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4901,6 +4927,7 @@ static const struct mtk_soc_data mt7986_
.required_clks = MT7986_CLKS_BITMAP,
.required_pctl = false,
.hash_offset = 4,
.foe_entry_size = sizeof(struct mtk_foe_entry),
.has_accounting = true,
.txrx = {
-@@ -4926,6 +4953,7 @@ static const struct mtk_soc_data rt5350_
+@@ -4919,6 +4946,7 @@ static const struct mtk_soc_data rt5350_
.hw_features = MTK_HW_FEATURES_MT7628,
.required_clks = MT7628_CLKS_BITMAP,
.required_pctl = false,
struct net_device *dev = eth->netdev[i];
mtk_w32(eth, MAC_MCR_FORCE_LINK_DOWN, MTK_MAC_MCR(i));
-@@ -3963,7 +3963,7 @@ static void mtk_pending_work(struct work
+@@ -3946,7 +3946,7 @@ static void mtk_pending_work(struct work
mtk_prepare_for_reset(eth);
/* stop all devices to make sure that dma is properly shut down */
if (!eth->netdev[i] || !netif_running(eth->netdev[i]))
continue;
-@@ -3979,7 +3979,7 @@ static void mtk_pending_work(struct work
+@@ -3962,7 +3962,7 @@ static void mtk_pending_work(struct work
mtk_hw_init(eth, true);
/* restart DMA and enable IRQs */
if (!test_bit(i, &restart))
continue;
-@@ -4007,7 +4007,7 @@ static int mtk_free_dev(struct mtk_eth *
+@@ -3990,7 +3990,7 @@ static int mtk_free_dev(struct mtk_eth *
{
int i;
if (!eth->netdev[i])
continue;
free_netdev(eth->netdev[i]);
-@@ -4026,7 +4026,7 @@ static int mtk_unreg_dev(struct mtk_eth
+@@ -4009,7 +4009,7 @@ static int mtk_unreg_dev(struct mtk_eth
{
int i;
struct mtk_mac *mac;
if (!eth->netdev[i])
continue;
-@@ -4331,7 +4331,7 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4313,7 +4313,7 @@ static int mtk_add_mac(struct mtk_eth *e
}
id = be32_to_cpup(_id);
dev_err(eth->dev, "%d is not a valid mac id\n", id);
return -EINVAL;
}
-@@ -4461,7 +4461,7 @@ void mtk_eth_set_dma_device(struct mtk_e
+@@ -4454,7 +4454,7 @@ void mtk_eth_set_dma_device(struct mtk_e
rtnl_lock();
dev = eth->netdev[i];
if (!dev || !(dev->flags & IFF_UP))
-@@ -4787,7 +4787,7 @@ static int mtk_remove(struct platform_de
+@@ -4780,7 +4780,7 @@ static int mtk_remove(struct platform_de
int i;
/* stop all devices to make sure that dma is properly shut down */
/* PSE should not drop port8 and port9 packets from WDMA Tx */
mtk_w32(eth, 0x00000300, PSE_DROP_CFG);
-@@ -4368,7 +4433,11 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4361,7 +4426,11 @@ static int mtk_add_mac(struct mtk_eth *e
}
spin_lock_init(&mac->hw_stats->stats_lock);
u64_stats_init(&mac->hw_stats->syncp);
data |= TX_DMA_SWC_V2 | QID_BITS_V2(info->qid);
WRITE_ONCE(desc->txd4, data);
-@@ -5016,6 +5117,25 @@ static const struct mtk_soc_data mt7986_
+@@ -5009,6 +5110,25 @@ static const struct mtk_soc_data mt7986_
},
};
static const struct mtk_soc_data rt5350_data = {
.reg_map = &mt7628_reg_map,
.caps = MT7628_CAPS,
-@@ -5034,14 +5154,15 @@ static const struct mtk_soc_data rt5350_
+@@ -5027,14 +5147,15 @@ static const struct mtk_soc_data rt5350_
};
const struct of_device_id of_mtk_match[] = {
mtk_w32(eth, val, MTK_PPSC);
dev_dbg(eth->dev, "MDC is running on %d Hz\n", MDC_MAX_FREQ / divider);
-@@ -4487,8 +4690,8 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4469,8 +4672,8 @@ static int mtk_add_mac(struct mtk_eth *e
const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode;
struct phylink *phylink;
int txqs = 1;
if (!_id) {
-@@ -4579,6 +4782,32 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4572,6 +4775,32 @@ static int mtk_add_mac(struct mtk_eth *e
mac->phylink_config.supported_interfaces);
}
phylink = phylink_create(&mac->phylink_config,
of_fwnode_handle(mac->of_node),
phy_mode, &mtk_phylink_ops);
-@@ -4766,6 +4995,13 @@ static int mtk_probe(struct platform_dev
+@@ -4759,6 +4988,13 @@ static int mtk_probe(struct platform_dev
if (err)
return err;
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -6973,6 +6973,7 @@ static int mv88e6xxx_register_switch(str
+@@ -6980,6 +6980,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
projects / openwrt / staging / blocktrron.git / commitdiff