matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update saibcm-modules for Linux 6.1

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2023-09-08 16:02:15 -07:00
parent 9caddabab7
commit 2658cdae3b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/broadcom/saibcm-modules/sdklt/linux/knet/ngknet_main.c
View File

@ -1430,7 +1430,7 @@ ngknet_set_mac_address(struct net_device *ndev, void *addr)
} }
netdev_info(ndev, "Setting new MAC address\n"); netdev_info(ndev, "Setting new MAC address\n");
memcpy(ndev->dev_addr, ((struct sockaddr *)addr)->sa_data, ndev->addr_len); eth_hw_addr_set(ndev, ((struct sockaddr *)addr)->sa_data);
return 0; return 0;
} }
@ -1702,7 +1702,7 @@ ngknet_ndev_init(ngknet_netif_t *netif, struct net_device **nd)
ngknet_dev_mac[5]++; ngknet_dev_mac[5]++;
ma = ngknet_dev_mac; ma = ngknet_dev_mac;
} }
memcpy(ndev->dev_addr, ma, ETH_ALEN); eth_hw_addr_set(ndev, ma);
/* Initialize the device features */ /* Initialize the device features */
ndev->hw_features = NETIF_F_RXCSUM | ndev->hw_features = NETIF_F_RXCSUM |
@ -1916,7 +1916,7 @@ ngknet_dev_probe(int dn, ngknet_netif_t *netif)
priv_hdl[hdl->unit][hdl->chan].hdl = hdl; priv_hdl[hdl->unit][hdl->chan].hdl = hdl;
hdl->priv = &priv_hdl[hdl->unit][hdl->chan]; hdl->priv = &priv_hdl[hdl->unit][hdl->chan];
netif_napi_add(ndev, (struct napi_struct *)hdl->priv, netif_napi_add(ndev, (struct napi_struct *)hdl->priv,
ngknet_poll, pdev->ctrl.budget); ngknet_poll);
if (pdev->flags & PDMA_GROUP_INTR) { if (pdev->flags & PDMA_GROUP_INTR) {
break; break;
} }

8
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
View File

@ -5670,7 +5670,7 @@ bkn_set_mac_address(struct net_device *dev, void *addr)
#endif #endif
return -EINVAL; return -EINVAL;
} }
memcpy(dev->dev_addr, ((struct sockaddr *)addr)->sa_data, dev->addr_len); eth_hw_addr_set(dev, ((struct sockaddr *)addr)->sa_data);
return 0; return 0;
} }
#endif #endif
@ -6969,7 +6969,7 @@ bkn_init_ndev(u8 *mac, char *name)
#endif #endif
/* Set the device MAC address */ /* Set the device MAC address */
memcpy(dev->dev_addr, mac, 6); eth_hw_addr_set(dev, mac);
/* Device information -- not available right now */ /* Device information -- not available right now */
dev->irq = 0; dev->irq = 0;
@ -8511,7 +8511,7 @@ bkn_knet_hw_init(kcom_msg_hw_init_t *kmsg, int len)
/* Ensure 32-bit PCI DMA is mapped properly on 64-bit platforms */ /* Ensure 32-bit PCI DMA is mapped properly on 64-bit platforms */
dev_type = kernel_bde->get_dev_type(sinfo->dev_no); dev_type = kernel_bde->get_dev_type(sinfo->dev_no);
if (dev_type & BDE_PCI_DEV_TYPE && sinfo->cmic_type != 'x') { if (dev_type & BDE_PCI_DEV_TYPE && sinfo->cmic_type != 'x') {
if (pci_set_dma_mask(sinfo->pdev, 0xffffffff)) { if (dma_set_mask_and_coherent(&sinfo->pdev->dev, 0xffffffff)) {
cfg_api_unlock(sinfo, &flags); cfg_api_unlock(sinfo, &flags);
gprintk("No suitable DMA available for SKBs\n"); gprintk("No suitable DMA available for SKBs\n");
kmsg->hdr.status = KCOM_E_RESOURCE; kmsg->hdr.status = KCOM_E_RESOURCE;
@ -9688,7 +9688,7 @@ bkn_knet_dev_init(int d)
} }
if (use_napi) { if (use_napi) {
netif_napi_add(dev, &sinfo->napi, bkn_poll, napi_weight); netif_napi_add(dev, &sinfo->napi, bkn_poll);
} }
return 0; return 0;
} }

2
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/shared/ksal.c
View File

@ -46,7 +46,7 @@
#endif #endif
#include <linux/time.h> #include <linux/time.h>
#ifdef MAX_USER_RT_PRIO #if defined(MAX_USER_RT_PRIO) || defined(MAX_RT_PRIO)
/* Assume 2.6 scheduler */ /* Assume 2.6 scheduler */
#define SAL_YIELD(task) \ #define SAL_YIELD(task) \
yield() yield()