Page MenuHomeFreeBSD
Differential D6049

Add additional guards so that GELIBOOT is not compiled if it is disabled
ClosedPublic
Actions

Authored by allanjude on Apr 21 2016, 3:36 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 4:22 PM
Unknown Object (File)
Mon, Apr 14, 4:44 AM
Unknown Object (File)
Sat, Apr 12, 11:12 PM
Unknown Object (File)
Feb 20 2025, 6:07 PM
Unknown Object (File)
Feb 18 2025, 8:29 PM
Unknown Object (File)
Feb 8 2025, 1:17 AM
Unknown Object (File)
Feb 7 2025, 3:37 PM
Unknown Object (File)
Jan 11 2025, 8:14 PM
View All 78 Files
Subscribers
imp

Details

Reviewers
cem
Commits
rS298418: Add more guards to disable GELIBOOT by defining LOADER_NO_GELI_SUPPORT

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

allanjude updated this revision to Diff 15446.Apr 21 2016, 3:36 PM
allanjude retitled this revision from to Add additional guards so that GELIBOOT is not compiled if it is disabled.
allanjude updated this object.
allanjude edited the test plan for this revision. (Show Details)
allanjude added a reviewer: cem.
Herald added a subscriber: imp. · View Herald TranscriptApr 21 2016, 3:36 PM
cem accepted this revision.Apr 21 2016, 3:49 PM
cem edited edge metadata.
This revision is now accepted and ready to land.Apr 21 2016, 3:49 PM
Closed by commit rS298418: Add more guards to disable GELIBOOT by defining LOADER_NO_GELI_SUPPORT (authored by allanjude). · Explain WhyApr 21 2016, 4:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sys/
boot/
5 lines
3 lines

Diff 15448

View Options

head/sys/boot/Makefile.amd64

Show All 37 Lines
#include <sys/limits.h> #include <sys/limits.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if_dl.h> #include <net/if_dl.h>
#include "common/efx.h" #include "common/efx.h"
#include "sfxge.h" #include "sfxge.h"
#define SFXGE_PARAM_STATS_UPDATE_PERIOD_MS \
SFXGE_PARAM(stats_update_period_ms)
static int sfxge_stats_update_period_ms = SFXGE_STATS_UPDATE_PERIOD_MS;
TUNABLE_INT(SFXGE_PARAM_STATS_UPDATE_PERIOD_MS,
&sfxge_stats_update_period_ms);
SYSCTL_INT(_hw_sfxge, OID_AUTO, stats_update_period_ms, CTLFLAG_RDTUN,
&sfxge_stats_update_period_ms, 0,
"netstat interface statistics update period in milliseconds");
static int sfxge_phy_cap_mask(struct sfxge_softc *, int, uint32_t *); static int sfxge_phy_cap_mask(struct sfxge_softc *, int, uint32_t *);
static int static int
sfxge_mac_stat_update(struct sfxge_softc *sc) sfxge_mac_stat_update(struct sfxge_softc *sc)
{ {
struct sfxge_port *port = &sc->port; struct sfxge_port *port = &sc->port;
efsys_mem_t *esmp = &(port->mac_stats.dma_buf); efsys_mem_t *esmp = &(port->mac_stats.dma_buf);
clock_t now; clock_t now;
unsigned int min_ticks; unsigned int min_ticks;
unsigned int count; unsigned int count;
int rc; int rc;
SFXGE_PORT_LOCK_ASSERT_OWNED(port); SFXGE_PORT_LOCK_ASSERT_OWNED(port);
if (__predict_false(port->init_state != SFXGE_PORT_STARTED)) { if (__predict_false(port->init_state != SFXGE_PORT_STARTED)) {
rc = 0; rc = 0;
goto out; goto out;
} }
min_ticks = (unsigned int)hz * SFXGE_STATS_UPDATE_PERIOD_MS / 1000; min_ticks = (unsigned int)hz * port->stats_update_period_ms / 1000;
now = ticks; now = ticks;
if ((unsigned int)(now - port->mac_stats.update_time) < min_ticks) { if ((unsigned int)(now - port->mac_stats.update_time) < min_ticks) {
rc = 0; rc = 0;
goto out; goto out;
} }
port->mac_stats.update_time = now; port->mac_stats.update_time = now;
▲ Show 20 Lines • Show All 436 Lines • ▼ Show 20 Linessfxge_port_start(struct sfxge_softc *sc)
if_addr_runlock(ifp); if_addr_runlock(ifp);
if ((rc = efx_mac_addr_set(enp, mac_addr)) != 0) if ((rc = efx_mac_addr_set(enp, mac_addr)) != 0)
goto fail4; goto fail4;
sfxge_mac_filter_set_locked(sc); sfxge_mac_filter_set_locked(sc);
/* Update MAC stats by DMA every period */ /* Update MAC stats by DMA every period */
if ((rc = efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf, if ((rc = efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf,
SFXGE_STATS_UPDATE_PERIOD_MS, port->stats_update_period_ms,
B_FALSE)) != 0) B_FALSE)) != 0)
goto fail6; goto fail6;
if ((rc = efx_mac_drain(enp, B_FALSE)) != 0) if ((rc = efx_mac_drain(enp, B_FALSE)) != 0)
goto fail8; goto fail8;
if ((rc = sfxge_phy_cap_mask(sc, sc->media.ifm_cur->ifm_media, if ((rc = sfxge_phy_cap_mask(sc, sc->media.ifm_cur->ifm_media,
&phy_cap_mask)) != 0) &phy_cap_mask)) != 0)
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Linessfxge_port_fini(struct sfxge_softc *sc)
sfxge_dma_free(esmp); sfxge_dma_free(esmp);
free(port->mac_stats.decode_buf, M_SFXGE); free(port->mac_stats.decode_buf, M_SFXGE);
SFXGE_PORT_LOCK_DESTROY(port); SFXGE_PORT_LOCK_DESTROY(port);
port->sc = NULL; port->sc = NULL;
} }
static uint16_t
sfxge_port_stats_update_period_ms(struct sfxge_softc *sc)
{
int period_ms = sfxge_stats_update_period_ms;
if (period_ms < 0) {
device_printf(sc->dev,
"treat negative stats update period %d as 0 (disable)\n",
period_ms);
period_ms = 0;
} else if (period_ms > UINT16_MAX) {
device_printf(sc->dev,
"treat too big stats update period %d as %u\n",
period_ms, UINT16_MAX);
period_ms = UINT16_MAX;
}
return period_ms;
}
int int
sfxge_port_init(struct sfxge_softc *sc) sfxge_port_init(struct sfxge_softc *sc)
{ {
struct sfxge_port *port; struct sfxge_port *port;
struct sysctl_ctx_list *sysctl_ctx; struct sysctl_ctx_list *sysctl_ctx;
struct sysctl_oid *sysctl_tree; struct sysctl_oid *sysctl_tree;
efsys_mem_t *mac_stats_buf, *phy_stats_buf; efsys_mem_t *mac_stats_buf, *phy_stats_buf;
int rc; int rc;
Show All 32 Lines SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
sfxge_port_link_fc_handler, "IU", "link flow control mode"); sfxge_port_link_fc_handler, "IU", "link flow control mode");
#endif #endif
DBGPRINT(sc->dev, "alloc MAC stats"); DBGPRINT(sc->dev, "alloc MAC stats");
port->mac_stats.decode_buf = malloc(EFX_MAC_NSTATS * sizeof(uint64_t), port->mac_stats.decode_buf = malloc(EFX_MAC_NSTATS * sizeof(uint64_t),
M_SFXGE, M_WAITOK | M_ZERO); M_SFXGE, M_WAITOK | M_ZERO);
if ((rc = sfxge_dma_alloc(sc, EFX_MAC_STATS_SIZE, mac_stats_buf)) != 0) if ((rc = sfxge_dma_alloc(sc, EFX_MAC_STATS_SIZE, mac_stats_buf)) != 0)
goto fail2; goto fail2;
port->stats_update_period_ms = sfxge_port_stats_update_period_ms(sc);
sfxge_mac_stat_init(sc); sfxge_mac_stat_init(sc);
port->init_state = SFXGE_PORT_INITIALIZED; port->init_state = SFXGE_PORT_INITIALIZED;
DBGPRINT(sc->dev, "success"); DBGPRINT(sc->dev, "success");
return (0); return (0);
fail2: fail2:
▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines
View Options

head/sys/boot/Makefile.i386

Show All 37 Lines
#include <sys/limits.h> #include <sys/limits.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if_dl.h> #include <net/if_dl.h>
#include "common/efx.h" #include "common/efx.h"
#include "sfxge.h" #include "sfxge.h"
#define SFXGE_PARAM_STATS_UPDATE_PERIOD_MS \
SFXGE_PARAM(stats_update_period_ms)
static int sfxge_stats_update_period_ms = SFXGE_STATS_UPDATE_PERIOD_MS;
TUNABLE_INT(SFXGE_PARAM_STATS_UPDATE_PERIOD_MS,
&sfxge_stats_update_period_ms);
SYSCTL_INT(_hw_sfxge, OID_AUTO, stats_update_period_ms, CTLFLAG_RDTUN,
&sfxge_stats_update_period_ms, 0,
"netstat interface statistics update period in milliseconds");
static int sfxge_phy_cap_mask(struct sfxge_softc *, int, uint32_t *); static int sfxge_phy_cap_mask(struct sfxge_softc *, int, uint32_t *);
static int static int
sfxge_mac_stat_update(struct sfxge_softc *sc) sfxge_mac_stat_update(struct sfxge_softc *sc)
{ {
struct sfxge_port *port = &sc->port; struct sfxge_port *port = &sc->port;
efsys_mem_t *esmp = &(port->mac_stats.dma_buf); efsys_mem_t *esmp = &(port->mac_stats.dma_buf);
clock_t now; clock_t now;
unsigned int min_ticks; unsigned int min_ticks;
unsigned int count; unsigned int count;
int rc; int rc;
SFXGE_PORT_LOCK_ASSERT_OWNED(port); SFXGE_PORT_LOCK_ASSERT_OWNED(port);
if (__predict_false(port->init_state != SFXGE_PORT_STARTED)) { if (__predict_false(port->init_state != SFXGE_PORT_STARTED)) {
rc = 0; rc = 0;
goto out; goto out;
} }
min_ticks = (unsigned int)hz * SFXGE_STATS_UPDATE_PERIOD_MS / 1000; min_ticks = (unsigned int)hz * port->stats_update_period_ms / 1000;
now = ticks; now = ticks;
if ((unsigned int)(now - port->mac_stats.update_time) < min_ticks) { if ((unsigned int)(now - port->mac_stats.update_time) < min_ticks) {
rc = 0; rc = 0;
goto out; goto out;
} }
port->mac_stats.update_time = now; port->mac_stats.update_time = now;
▲ Show 20 Lines • Show All 436 Lines • ▼ Show 20 Linessfxge_port_start(struct sfxge_softc *sc)
if_addr_runlock(ifp); if_addr_runlock(ifp);
if ((rc = efx_mac_addr_set(enp, mac_addr)) != 0) if ((rc = efx_mac_addr_set(enp, mac_addr)) != 0)
goto fail4; goto fail4;
sfxge_mac_filter_set_locked(sc); sfxge_mac_filter_set_locked(sc);
/* Update MAC stats by DMA every period */ /* Update MAC stats by DMA every period */
if ((rc = efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf, if ((rc = efx_mac_stats_periodic(enp, &port->mac_stats.dma_buf,
SFXGE_STATS_UPDATE_PERIOD_MS, port->stats_update_period_ms,
B_FALSE)) != 0) B_FALSE)) != 0)
goto fail6; goto fail6;
if ((rc = efx_mac_drain(enp, B_FALSE)) != 0) if ((rc = efx_mac_drain(enp, B_FALSE)) != 0)
goto fail8; goto fail8;
if ((rc = sfxge_phy_cap_mask(sc, sc->media.ifm_cur->ifm_media, if ((rc = sfxge_phy_cap_mask(sc, sc->media.ifm_cur->ifm_media,
&phy_cap_mask)) != 0) &phy_cap_mask)) != 0)
▲ Show 20 Lines • Show All 141 Lines • ▼ Show 20 Linessfxge_port_fini(struct sfxge_softc *sc)
sfxge_dma_free(esmp); sfxge_dma_free(esmp);
free(port->mac_stats.decode_buf, M_SFXGE); free(port->mac_stats.decode_buf, M_SFXGE);
SFXGE_PORT_LOCK_DESTROY(port); SFXGE_PORT_LOCK_DESTROY(port);
port->sc = NULL; port->sc = NULL;
} }
static uint16_t
sfxge_port_stats_update_period_ms(struct sfxge_softc *sc)
{
int period_ms = sfxge_stats_update_period_ms;
if (period_ms < 0) {
device_printf(sc->dev,
"treat negative stats update period %d as 0 (disable)\n",
period_ms);
period_ms = 0;
} else if (period_ms > UINT16_MAX) {
device_printf(sc->dev,
"treat too big stats update period %d as %u\n",
period_ms, UINT16_MAX);
period_ms = UINT16_MAX;
}
return period_ms;
}
int int
sfxge_port_init(struct sfxge_softc *sc) sfxge_port_init(struct sfxge_softc *sc)
{ {
struct sfxge_port *port; struct sfxge_port *port;
struct sysctl_ctx_list *sysctl_ctx; struct sysctl_ctx_list *sysctl_ctx;
struct sysctl_oid *sysctl_tree; struct sysctl_oid *sysctl_tree;
efsys_mem_t *mac_stats_buf, *phy_stats_buf; efsys_mem_t *mac_stats_buf, *phy_stats_buf;
int rc; int rc;
Show All 32 Lines SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
sfxge_port_link_fc_handler, "IU", "link flow control mode"); sfxge_port_link_fc_handler, "IU", "link flow control mode");
#endif #endif
DBGPRINT(sc->dev, "alloc MAC stats"); DBGPRINT(sc->dev, "alloc MAC stats");
port->mac_stats.decode_buf = malloc(EFX_MAC_NSTATS * sizeof(uint64_t), port->mac_stats.decode_buf = malloc(EFX_MAC_NSTATS * sizeof(uint64_t),
M_SFXGE, M_WAITOK | M_ZERO); M_SFXGE, M_WAITOK | M_ZERO);
if ((rc = sfxge_dma_alloc(sc, EFX_MAC_STATS_SIZE, mac_stats_buf)) != 0) if ((rc = sfxge_dma_alloc(sc, EFX_MAC_STATS_SIZE, mac_stats_buf)) != 0)
goto fail2; goto fail2;
port->stats_update_period_ms = sfxge_port_stats_update_period_ms(sc);
sfxge_mac_stat_init(sc); sfxge_mac_stat_init(sc);
port->init_state = SFXGE_PORT_INITIALIZED; port->init_state = SFXGE_PORT_INITIALIZED;
DBGPRINT(sc->dev, "success"); DBGPRINT(sc->dev, "success");
return (0); return (0);
fail2: fail2:
▲ Show 20 Lines • Show All 274 Lines • Show Last 20 Lines