diff --git a/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch index 206f44442540..1a0d56418bcd 100644 --- a/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch +++ b/patch/kernel/archive/rockchip-6.11/patches.armbian/general-rockchip-various-fixes.patch @@ -462,79 +462,6 @@ diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/ema index 67b8113a2..40332a976 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c -@@ -140,7 +140,7 @@ static void arc_emac_tx_clean(struct net_device *ndev) - stats->tx_bytes += skb->len; - } - -- dma_unmap_single(&ndev->dev, dma_unmap_addr(tx_buff, addr), -+ dma_unmap_single(ndev->dev.parent, dma_unmap_addr(tx_buff, addr), - dma_unmap_len(tx_buff, len), DMA_TO_DEVICE); - - /* return the sk_buff to system */ -@@ -223,9 +223,9 @@ static int arc_emac_rx(struct net_device *ndev, int budget) - continue; - } - -- addr = dma_map_single(&ndev->dev, (void *)skb->data, -+ addr = dma_map_single(ndev->dev.parent, (void *)skb->data, - EMAC_BUFFER_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&ndev->dev, addr)) { -+ if (dma_mapping_error(ndev->dev.parent, addr)) { - if (net_ratelimit()) - netdev_err(ndev, "cannot map dma buffer\n"); - dev_kfree_skb(skb); -@@ -237,7 +237,7 @@ static int arc_emac_rx(struct net_device *ndev, int budget) - } - - /* unmap previosly mapped skb */ -- dma_unmap_single(&ndev->dev, dma_unmap_addr(rx_buff, addr), -+ dma_unmap_single(ndev->dev.parent, dma_unmap_addr(rx_buff, addr), - dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE); - - pktlen = info & LEN_MASK; -@@ -445,9 +445,9 @@ static int arc_emac_open(struct net_device *ndev) - if (unlikely(!rx_buff->skb)) - return -ENOMEM; - -- addr = dma_map_single(&ndev->dev, (void *)rx_buff->skb->data, -+ addr = dma_map_single(ndev->dev.parent, (void *)rx_buff->skb->data, - EMAC_BUFFER_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&ndev->dev, addr)) { -+ if (dma_mapping_error(ndev->dev.parent, addr)) { - netdev_err(ndev, "cannot dma map\n"); - dev_kfree_skb(rx_buff->skb); - return -ENOMEM; -@@ -555,7 +555,7 @@ static void arc_free_tx_queue(struct net_device *ndev) - struct buffer_state *tx_buff = &priv->tx_buff[i]; - - if (tx_buff->skb) { -- dma_unmap_single(&ndev->dev, -+ dma_unmap_single(ndev->dev.parent, - dma_unmap_addr(tx_buff, addr), - dma_unmap_len(tx_buff, len), - DMA_TO_DEVICE); -@@ -586,7 +586,7 @@ static void arc_free_rx_queue(struct net_device *ndev) - struct buffer_state *rx_buff = &priv->rx_buff[i]; - - if (rx_buff->skb) { -- dma_unmap_single(&ndev->dev, -+ dma_unmap_single(ndev->dev.parent, - dma_unmap_addr(rx_buff, addr), - dma_unmap_len(rx_buff, len), - DMA_FROM_DEVICE); -@@ -692,10 +692,10 @@ static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) - return NETDEV_TX_BUSY; - } - -- addr = dma_map_single(&ndev->dev, (void *)skb->data, len, -+ addr = dma_map_single(ndev->dev.parent, (void *)skb->data, len, - DMA_TO_DEVICE); - -- if (unlikely(dma_mapping_error(&ndev->dev, addr))) { -+ if (unlikely(dma_mapping_error(ndev->dev.parent, addr))) { - stats->tx_dropped++; - stats->tx_errors++; - dev_kfree_skb_any(skb); @@ -850,6 +850,62 @@ static const struct net_device_ops arc_emac_netdev_ops = { #endif }; diff --git a/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch b/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch index 58552ddf57a3..7b442be36046 100644 --- a/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch +++ b/patch/kernel/archive/rockchip-6.6/patches.armbian/general-rockchip-various-fixes.patch @@ -462,79 +462,6 @@ diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/ema index 67b8113a2..40332a976 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c -@@ -140,7 +140,7 @@ static void arc_emac_tx_clean(struct net_device *ndev) - stats->tx_bytes += skb->len; - } - -- dma_unmap_single(&ndev->dev, dma_unmap_addr(tx_buff, addr), -+ dma_unmap_single(ndev->dev.parent, dma_unmap_addr(tx_buff, addr), - dma_unmap_len(tx_buff, len), DMA_TO_DEVICE); - - /* return the sk_buff to system */ -@@ -223,9 +223,9 @@ static int arc_emac_rx(struct net_device *ndev, int budget) - continue; - } - -- addr = dma_map_single(&ndev->dev, (void *)skb->data, -+ addr = dma_map_single(ndev->dev.parent, (void *)skb->data, - EMAC_BUFFER_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&ndev->dev, addr)) { -+ if (dma_mapping_error(ndev->dev.parent, addr)) { - if (net_ratelimit()) - netdev_err(ndev, "cannot map dma buffer\n"); - dev_kfree_skb(skb); -@@ -237,7 +237,7 @@ static int arc_emac_rx(struct net_device *ndev, int budget) - } - - /* unmap previosly mapped skb */ -- dma_unmap_single(&ndev->dev, dma_unmap_addr(rx_buff, addr), -+ dma_unmap_single(ndev->dev.parent, dma_unmap_addr(rx_buff, addr), - dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE); - - pktlen = info & LEN_MASK; -@@ -445,9 +445,9 @@ static int arc_emac_open(struct net_device *ndev) - if (unlikely(!rx_buff->skb)) - return -ENOMEM; - -- addr = dma_map_single(&ndev->dev, (void *)rx_buff->skb->data, -+ addr = dma_map_single(ndev->dev.parent, (void *)rx_buff->skb->data, - EMAC_BUFFER_SIZE, DMA_FROM_DEVICE); -- if (dma_mapping_error(&ndev->dev, addr)) { -+ if (dma_mapping_error(ndev->dev.parent, addr)) { - netdev_err(ndev, "cannot dma map\n"); - dev_kfree_skb(rx_buff->skb); - return -ENOMEM; -@@ -555,7 +555,7 @@ static void arc_free_tx_queue(struct net_device *ndev) - struct buffer_state *tx_buff = &priv->tx_buff[i]; - - if (tx_buff->skb) { -- dma_unmap_single(&ndev->dev, -+ dma_unmap_single(ndev->dev.parent, - dma_unmap_addr(tx_buff, addr), - dma_unmap_len(tx_buff, len), - DMA_TO_DEVICE); -@@ -586,7 +586,7 @@ static void arc_free_rx_queue(struct net_device *ndev) - struct buffer_state *rx_buff = &priv->rx_buff[i]; - - if (rx_buff->skb) { -- dma_unmap_single(&ndev->dev, -+ dma_unmap_single(ndev->dev.parent, - dma_unmap_addr(rx_buff, addr), - dma_unmap_len(rx_buff, len), - DMA_FROM_DEVICE); -@@ -692,10 +692,10 @@ static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev) - return NETDEV_TX_BUSY; - } - -- addr = dma_map_single(&ndev->dev, (void *)skb->data, len, -+ addr = dma_map_single(ndev->dev.parent, (void *)skb->data, len, - DMA_TO_DEVICE); - -- if (unlikely(dma_mapping_error(&ndev->dev, addr))) { -+ if (unlikely(dma_mapping_error(ndev->dev.parent, addr))) { - stats->tx_dropped++; - stats->tx_errors++; - dev_kfree_skb_any(skb); @@ -850,6 +850,62 @@ static const struct net_device_ops arc_emac_netdev_ops = { #endif };