Page MenuHomeFreeBSD
Differential D37292

bhyve: Drop volatile qualifiers from snapshot code
ClosedPublic
Actions

Authored by markj on Nov 6 2022, 7:36 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 9:19 AM
Unknown Object (File)
Thu, Mar 27, 8:08 AM
Unknown Object (File)
Feb 23 2025, 2:58 AM
Unknown Object (File)
Feb 20 2025, 12:18 PM
Unknown Object (File)
Jan 30 2025, 9:57 AM
Unknown Object (File)
Jan 27 2025, 4:57 PM
Unknown Object (File)
Jan 27 2025, 4:54 PM
Unknown Object (File)
Dec 22 2024, 10:39 AM
View All 64 Files
Subscribers
bcran
imp
rgrimes

Details

Reviewers
jhb
corvink
Group Reviewers
bhyve
Commits
rG385e330c1c5d: bhyve: Drop volatile qualifiers from snapshot code
rG8b1adff8bcbd: bhyve: Drop volatile qualifiers from snapshot code
Summary

They accomplish nothing since the qualifier is casted away in calls to
memcpy() and copyin()/copyout(). No functional change intended.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
sys/
amd64/
include/
10 lines
vmm/
17 lines
usr.sbin/
bhyve/
14 lines

Diff 112937

View Options

sys/amd64/include/vmm_snapshot.h

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Linesrk8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay)
*udelay = 0; *udelay = 0;
return (0); return (0);
} }
static void static void
rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv) rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv)
{ {
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
int change;
change =
((sc->def->voltage_min2 - sc->def->voltage_min) /
sc->def->voltage_step);
if (val > change) {
if (val < sc->def->voltage_nstep) {
*uv = sc->def->voltage_min2 +
(val - change) *
sc->def->voltage_step2;
} else
*uv = sc->def->voltage_max2;
return;
}
}
if (val < sc->def->voltage_nstep) if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step; *uv = sc->def->voltage_min + val * sc->def->voltage_step;
else else
*uv = sc->def->voltage_max;
} else {
if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step;
else
*uv = sc->def->voltage_min + *uv = sc->def->voltage_min +
(sc->def->voltage_nstep * sc->def->voltage_step); (sc->def->voltage_nstep * sc->def->voltage_step);
} }
}
static int static int
rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt, rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt,
int max_uvolt, uint8_t *val) int max_uvolt, uint8_t *val)
{ {
uint8_t nval; uint8_t nval;
int nstep, uvolt; int nstep, uvolt;
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
nval = 0; nval = 0;
uvolt = sc->def->voltage_min; uvolt = sc->def->voltage_min;
for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt; for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt;
nstep++) { nstep++) {
++nval; ++nval;
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
if (uvolt < sc->def->voltage_min2)
uvolt += sc->def->voltage_step; uvolt += sc->def->voltage_step;
else
uvolt += sc->def->voltage_step2;
} else
uvolt += sc->def->voltage_step;
} else
uvolt += sc->def->voltage_step;
} }
if (uvolt > max_uvolt) if (uvolt > max_uvolt)
return (EINVAL); return (EINVAL);
*val = nval; *val = nval;
return (0); return (0);
} }
Show All 13 Linesrk8xx_regnode_status(struct regnode *regnode, int *status)
return (0); return (0);
} }
static int static int
rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt, rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt,
int max_uvolt, int *udelay) int max_uvolt, int *udelay)
{ {
struct rk8xx_reg_sc *sc; struct rk8xx_reg_sc *sc;
uint8_t val; uint8_t val, old;
int uvolt; int uvolt;
struct rk8xx_softc *sc1;
sc = regnode_get_softc(regnode); sc = regnode_get_softc(regnode);
sc1 = device_get_softc(sc->base_dev);
if (!sc->def->voltage_step) if (!sc->def->voltage_step)
return (ENXIO); return (ENXIO);
dprintf(sc, "Setting %s to %d<->%d uvolts\n", dprintf(sc, "Setting %s to %d<->%d uvolts\n",
sc->def->name, sc->def->name,
min_uvolt, min_uvolt,
max_uvolt); max_uvolt);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
old = val;
if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0) if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0)
return (ERANGE); return (ERANGE);
if (sc1->type == RK809 || sc1->type == RK817)
val |= (old &= ~sc->def->voltage_mask);
rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
*udelay = 0; *udelay = 0;
rk8xx_regnode_reg_to_voltage(sc, val, &uvolt); rk8xx_regnode_reg_to_voltage(sc, val, &uvolt);
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines
View Options

sys/amd64/vmm/vmm_snapshot.c

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Linesrk8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay)
*udelay = 0; *udelay = 0;
return (0); return (0);
} }
static void static void
rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv) rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv)
{ {
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
int change;
change =
((sc->def->voltage_min2 - sc->def->voltage_min) /
sc->def->voltage_step);
if (val > change) {
if (val < sc->def->voltage_nstep) {
*uv = sc->def->voltage_min2 +
(val - change) *
sc->def->voltage_step2;
} else
*uv = sc->def->voltage_max2;
return;
}
}
if (val < sc->def->voltage_nstep) if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step; *uv = sc->def->voltage_min + val * sc->def->voltage_step;
else else
*uv = sc->def->voltage_max;
} else {
if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step;
else
*uv = sc->def->voltage_min + *uv = sc->def->voltage_min +
(sc->def->voltage_nstep * sc->def->voltage_step); (sc->def->voltage_nstep * sc->def->voltage_step);
} }
}
static int static int
rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt, rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt,
int max_uvolt, uint8_t *val) int max_uvolt, uint8_t *val)
{ {
uint8_t nval; uint8_t nval;
int nstep, uvolt; int nstep, uvolt;
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
nval = 0; nval = 0;
uvolt = sc->def->voltage_min; uvolt = sc->def->voltage_min;
for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt; for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt;
nstep++) { nstep++) {
++nval; ++nval;
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
if (uvolt < sc->def->voltage_min2)
uvolt += sc->def->voltage_step; uvolt += sc->def->voltage_step;
else
uvolt += sc->def->voltage_step2;
} else
uvolt += sc->def->voltage_step;
} else
uvolt += sc->def->voltage_step;
} }
if (uvolt > max_uvolt) if (uvolt > max_uvolt)
return (EINVAL); return (EINVAL);
*val = nval; *val = nval;
return (0); return (0);
} }
Show All 13 Linesrk8xx_regnode_status(struct regnode *regnode, int *status)
return (0); return (0);
} }
static int static int
rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt, rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt,
int max_uvolt, int *udelay) int max_uvolt, int *udelay)
{ {
struct rk8xx_reg_sc *sc; struct rk8xx_reg_sc *sc;
uint8_t val; uint8_t val, old;
int uvolt; int uvolt;
struct rk8xx_softc *sc1;
sc = regnode_get_softc(regnode); sc = regnode_get_softc(regnode);
sc1 = device_get_softc(sc->base_dev);
if (!sc->def->voltage_step) if (!sc->def->voltage_step)
return (ENXIO); return (ENXIO);
dprintf(sc, "Setting %s to %d<->%d uvolts\n", dprintf(sc, "Setting %s to %d<->%d uvolts\n",
sc->def->name, sc->def->name,
min_uvolt, min_uvolt,
max_uvolt); max_uvolt);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
old = val;
if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0) if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0)
return (ERANGE); return (ERANGE);
if (sc1->type == RK809 || sc1->type == RK817)
val |= (old &= ~sc->def->voltage_mask);
rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
*udelay = 0; *udelay = 0;
rk8xx_regnode_reg_to_voltage(sc, val, &uvolt); rk8xx_regnode_reg_to_voltage(sc, val, &uvolt);
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines
View Options

usr.sbin/bhyve/snapshot.c

Show First 20 Lines • Show All 107 Lines • ▼ Show 20 Linesrk8xx_regnode_enable(struct regnode *regnode, bool enable, int *udelay)
*udelay = 0; *udelay = 0;
return (0); return (0);
} }
static void static void
rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv) rk8xx_regnode_reg_to_voltage(struct rk8xx_reg_sc *sc, uint8_t val, int *uv)
{ {
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
int change;
change =
((sc->def->voltage_min2 - sc->def->voltage_min) /
sc->def->voltage_step);
if (val > change) {
if (val < sc->def->voltage_nstep) {
*uv = sc->def->voltage_min2 +
(val - change) *
sc->def->voltage_step2;
} else
*uv = sc->def->voltage_max2;
return;
}
}
if (val < sc->def->voltage_nstep) if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step; *uv = sc->def->voltage_min + val * sc->def->voltage_step;
else else
*uv = sc->def->voltage_max;
} else {
if (val < sc->def->voltage_nstep)
*uv = sc->def->voltage_min + val * sc->def->voltage_step;
else
*uv = sc->def->voltage_min + *uv = sc->def->voltage_min +
(sc->def->voltage_nstep * sc->def->voltage_step); (sc->def->voltage_nstep * sc->def->voltage_step);
} }
}
static int static int
rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt, rk8xx_regnode_voltage_to_reg(struct rk8xx_reg_sc *sc, int min_uvolt,
int max_uvolt, uint8_t *val) int max_uvolt, uint8_t *val)
{ {
uint8_t nval; uint8_t nval;
int nstep, uvolt; int nstep, uvolt;
struct rk8xx_softc *sc1;
sc1 = device_get_softc(sc->base_dev);
nval = 0; nval = 0;
uvolt = sc->def->voltage_min; uvolt = sc->def->voltage_min;
for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt; for (nstep = 0; nstep < sc->def->voltage_nstep && uvolt < min_uvolt;
nstep++) { nstep++) {
++nval; ++nval;
if (sc1->type == RK809 || sc1->type == RK817) {
if (sc->def->voltage_step2) {
if (uvolt < sc->def->voltage_min2)
uvolt += sc->def->voltage_step; uvolt += sc->def->voltage_step;
else
uvolt += sc->def->voltage_step2;
} else
uvolt += sc->def->voltage_step;
} else
uvolt += sc->def->voltage_step;
} }
if (uvolt > max_uvolt) if (uvolt > max_uvolt)
return (EINVAL); return (EINVAL);
*val = nval; *val = nval;
return (0); return (0);
} }
Show All 13 Linesrk8xx_regnode_status(struct regnode *regnode, int *status)
return (0); return (0);
} }
static int static int
rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt, rk8xx_regnode_set_voltage(struct regnode *regnode, int min_uvolt,
int max_uvolt, int *udelay) int max_uvolt, int *udelay)
{ {
struct rk8xx_reg_sc *sc; struct rk8xx_reg_sc *sc;
uint8_t val; uint8_t val, old;
int uvolt; int uvolt;
struct rk8xx_softc *sc1;
sc = regnode_get_softc(regnode); sc = regnode_get_softc(regnode);
sc1 = device_get_softc(sc->base_dev);
if (!sc->def->voltage_step) if (!sc->def->voltage_step)
return (ENXIO); return (ENXIO);
dprintf(sc, "Setting %s to %d<->%d uvolts\n", dprintf(sc, "Setting %s to %d<->%d uvolts\n",
sc->def->name, sc->def->name,
min_uvolt, min_uvolt,
max_uvolt); max_uvolt);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
old = val;
if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0) if (rk8xx_regnode_voltage_to_reg(sc, min_uvolt, max_uvolt, &val) != 0)
return (ERANGE); return (ERANGE);
if (sc1->type == RK809 || sc1->type == RK817)
val |= (old &= ~sc->def->voltage_mask);
rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_write(sc->base_dev, sc->def->voltage_reg, &val, 1);
rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1); rk8xx_read(sc->base_dev, sc->def->voltage_reg, &val, 1);
*udelay = 0; *udelay = 0;
rk8xx_regnode_reg_to_voltage(sc, val, &uvolt); rk8xx_regnode_reg_to_voltage(sc, val, &uvolt);
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines