forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/net/ethernet/neterion/vxge/vxge-config.h
....@@ -297,7 +297,7 @@
297297 * @greedy_return: If Set it forces the device to return absolutely all RxD
298298 * that are consumed and still on board when a timer interrupt
299299 * triggers. If Clear, then if the device has already returned
300
- * RxD before current timer interrupt trigerred and after the
300
+ * RxD before current timer interrupt triggered and after the
301301 * previous timer interrupt triggered, then the device is not
302302 * forced to returned the rest of the consumed RxD that it has
303303 * on board which account for a byte count less than the one
....@@ -1899,18 +1899,13 @@
18991899 struct pci_dev **p_dmah,
19001900 struct pci_dev **p_dma_acch)
19011901 {
1902
- gfp_t flags;
19031902 void *vaddr;
19041903 unsigned long misaligned = 0;
19051904 int realloc_flag = 0;
19061905 *p_dma_acch = *p_dmah = NULL;
19071906
1908
- if (in_interrupt())
1909
- flags = GFP_ATOMIC | GFP_DMA;
1910
- else
1911
- flags = GFP_KERNEL | GFP_DMA;
19121907 realloc:
1913
- vaddr = kmalloc((size), flags);
1908
+ vaddr = kmalloc(size, GFP_KERNEL | GFP_DMA);
19141909 if (vaddr == NULL)
19151910 return vaddr;
19161911 misaligned = (unsigned long)VXGE_ALIGN((unsigned long)vaddr,
....@@ -2010,26 +2005,6 @@
20102005
20112006 void
20122007 vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp);
2013
-
2014
-#ifndef readq
2015
-static inline u64 readq(void __iomem *addr)
2016
-{
2017
- u64 ret = 0;
2018
- ret = readl(addr + 4);
2019
- ret <<= 32;
2020
- ret |= readl(addr);
2021
-
2022
- return ret;
2023
-}
2024
-#endif
2025
-
2026
-#ifndef writeq
2027
-static inline void writeq(u64 val, void __iomem *addr)
2028
-{
2029
- writel((u32) (val), addr);
2030
- writel((u32) (val >> 32), (addr + 4));
2031
-}
2032
-#endif
20332008
20342009 static inline void __vxge_hw_pio_mem_write32_upper(u32 val, void __iomem *addr)
20352010 {