rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-14 04:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

freebsd/if_cgem: Remove QEMU workaround

Browse Source 
This removes the workaround applied on the fly for QEMU that disables
priority queueing. The priority queue interrupt was not previously
hooked up properly in QEMU and RSB now has the patches to allow it to
work.
This commit is contained in:
Kinsey Moore 2023-06-27 10:26:11 -05:00 committed by Joel Sherrill
parent 5de608c582
commit c8e1d6dbc4
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
freebsd/sys/dev/cadence/if_cgem.c
View File

@ -133,7 +133,6 @@ struct cgem_softc {
uint32_t net_ctl_shadow;
#ifdef __rtems__
uint32_t net_cfg_shadow;
int neednullqs;
int phy_contype;
#endif /* __rtems__ */
int ref_clk_num;
@ -458,9 +457,8 @@ cgem_setup_descs(struct cgem_softc *sc)
int desc_rings_size = CGEM_NUM_RX_DESCS * sizeof(struct cgem_rx_desc) +
CGEM_NUM_TX_DESCS * sizeof(struct cgem_tx_desc);
if (sc->neednullqs)
desc_rings_size += sizeof(struct cgem_rx_desc) +
sizeof(struct cgem_tx_desc);
desc_rings_size += sizeof(struct cgem_rx_desc) +
sizeof(struct cgem_tx_desc);
#endif /* __rtems__ */
sc->txring = NULL;
sc->rxring = NULL;
@ -609,13 +607,11 @@ cgem_setup_descs(struct cgem_softc *sc)
sc->txring_queued = 0;
#ifdef __rtems__
if (sc->neednullqs) {
sc->null_qs = (void *)(sc->txring + CGEM_NUM_TX_DESCS);
sc->null_qs_physaddr = sc->txring_physaddr +
CGEM_NUM_TX_DESCS * sizeof(struct cgem_tx_desc);
sc->null_qs = (void *)(sc->txring + CGEM_NUM_TX_DESCS);
sc->null_qs_physaddr = sc->txring_physaddr +
CGEM_NUM_TX_DESCS * sizeof(struct cgem_tx_desc);
cgem_null_qs(sc);
}
cgem_null_qs(sc);
#endif /* __rtems__ */
return (0);
@ -2074,15 +2070,7 @@ cgem_attach(device_t dev)
sc->if_old_flags = if_getflags(ifp);
sc->rxbufs = DEFAULT_NUM_RX_BUFS;
#if defined(CGEM64) && defined(__rtems__)
uint32_t design_cfg6 = RD4(sc, CGEM_DESIGN_CFG6);
/*
* QEMU does not have PBUF_CUTTHRU defined and is broken when trying
* to use nullqs
*/
if ((design_cfg6 & CGEM_DESIGN_CFG6_PBUF_CUTTHRU))
sc->neednullqs = 1;
#else
#if !defined(CGEM64) && defined(__rtems__)
sc->rxhangwar = 1;
#endif