Page MenuHomeFreeBSD
Differential D40071

fwget: simplify adding firmware images to pkg to install
ClosedPublic
Actions

Authored by bz on May 11 2023, 8:44 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 2:07 AM
Unknown Object (File)
Tue, Apr 1, 9:15 AM
Unknown Object (File)
Feb 25 2025, 12:39 AM
Unknown Object (File)
Feb 21 2025, 11:58 PM
Unknown Object (File)
Feb 15 2025, 8:39 AM
Unknown Object (File)
Feb 15 2025, 8:09 AM
Unknown Object (File)
Feb 14 2025, 8:18 PM
Unknown Object (File)
Jan 27 2025, 5:06 PM
View All 57 Files
Subscribers
emaste
imp

Details

Reviewers
manu
bapt
Commits
rG10aa369afd99: fwget: simplify adding firmware images to pkg to install
Summary

Rather than using echo to return the firmware package name, call a
new function (addpkg) which will also deal with (i) no leading space
and (ii) remove duplicates (as some devices have dual-wifi-cards).
In addition we won't have a line break when having multiple packages.

While here also do not call pkg(8) anymore if there is no package to
install and actually use the variable to install all and not just the
last found package.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 51456
Build 48347: arc lint + arc unit

Event Timeline

bz created this revision.May 11 2023, 8:44 PM
Herald added a subscriber: imp. · View Herald TranscriptMay 11 2023, 8:44 PM
bz requested review of this revision.May 11 2023, 8:44 PM
Harbormaster completed remote builds in B51456: Diff 121885.May 11 2023, 8:44 PM
bz added a child revision: D40073: fwget: add support for various WiFi NICs.May 11 2023, 8:49 PM
bz added a child revision: D40072: fwget: improve the pci base script.
manu requested changes to this revision.May 12 2023, 5:08 AM

In that case we can also remove all the shell redirection since we do not echo anymore and the log functions can just echo directly.
Otherwise lgtm

This revision now requires changes to proceed.May 12 2023, 5:08 AM
bz added a comment.May 12 2023, 11:04 AM
In D40071#912590, @manu wrote:

In that case we can also remove all the shell redirection since we do not echo anymore and the log functions can just echo directly.
Otherwise lgtm

Cool. Would you mind if I do that as a 4th change on top of the current stack?

bz added a child revision: D40077: fwget: remove logging redirects.May 12 2023, 11:51 AM
bapt requested changes to this revision.May 12 2023, 12:54 PM
bapt added inline comments.
usr.sbin/fwget/fwget.sh
75

this is not working:

addpkg mysuperpackage
addpkg super
echo $packages
mysuperpackages

If you want deduplication to work you need to change it to:

case " ${packages} " in
* ${_p} *) ;; #duplicate
*) packages="${packages} ${_p}" ;;
esac

note the new spaces

bz added inline comments.May 12 2023, 1:36 PM
usr.sbin/fwget/fwget.sh
75

To my understanding this doesn't work either as the first one doesn't have a leading space and the last one in the list does not have a trailing one.
Almost have to iterate over $packages and check for an exact match?

bapt added inline comments.May 12 2023, 1:49 PM
usr.sbin/fwget/fwget.sh
75

no this will always work because I added space both around "${packages}" and *\ ${_p}\ *) ;;

bz added inline comments.May 12 2023, 1:50 PM
usr.sbin/fwget/fwget.sh
75

Oh doh! I missed the former. I'll update the change immediately.

bz updated this revision to Diff 121910.May 12 2023, 2:00 PM

Fix dedup as reported by @bapt.

Harbormaster completed remote builds in B51470: Diff 121910.May 12 2023, 2:00 PM
bz marked 2 inline comments as done.May 12 2023, 2:01 PM
bz added inline comments.
usr.sbin/fwget/fwget.sh
75

Had to add extra \ for the spaces to avoid errors by sh

bz added a comment.May 20 2023, 12:59 AM

ping6?

manu accepted this revision.May 20 2023, 4:32 AM
bapt accepted this revision.May 20 2023, 10:01 AM
This revision is now accepted and ready to land.May 20 2023, 10:01 AM
Closed by commit rG10aa369afd99: fwget: simplify adding firmware images to pkg to install (authored by bz). · Explain WhyMay 20 2023, 11:15 AM
This revision was automatically updated to reflect the committed changes.
bz added a commit: rG10aa369afd99: fwget: simplify adding firmware images to pkg to install.

Revision Contents
Changeset List

PathSize
usr.sbin/
fwget/
32 lines
pci/
72 lines
22 lines

Diff 121885

View Options

usr.sbin/fwget/fwget.sh

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Lines
static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */
static int cpu_quirks; /* Indicate any hardware bugs. */ static int cpu_quirks; /* Indicate any hardware bugs. */
/* Values for sysctl. */ /* Values for sysctl. */
static struct sysctl_ctx_list cpu_sysctl_ctx; static struct sysctl_ctx_list cpu_sysctl_ctx;
static struct sysctl_oid *cpu_sysctl_tree; static struct sysctl_oid *cpu_sysctl_tree;
static int cpu_cx_generic; static int cpu_cx_generic;
static int cpu_cx_lowest_lim; static int cpu_cx_lowest_lim;
static bool cppc_notify;
static struct acpi_cpu_softc **cpu_softc; static struct acpi_cpu_softc **cpu_softc;
ACPI_SERIAL_DECL(cpu, "ACPI CPU"); ACPI_SERIAL_DECL(cpu, "ACPI CPU");
static int acpi_cpu_probe(device_t dev); static int acpi_cpu_probe(device_t dev);
static int acpi_cpu_attach(device_t dev); static int acpi_cpu_attach(device_t dev);
static int acpi_cpu_suspend(device_t dev); static int acpi_cpu_suspend(device_t dev);
static int acpi_cpu_resume(device_t dev); static int acpi_cpu_resume(device_t dev);
▲ Show 20 Lines • Show All 227 Lines • ▼ Show 20 Lines
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
/* /*
* Ask for MWAIT modes if not disabled and interrupts work * Ask for MWAIT modes if not disabled and interrupts work
* reasonable with MWAIT. * reasonable with MWAIT.
*/ */
if (!acpi_disabled("mwait") && cpu_mwait_usable()) if (!acpi_disabled("mwait") && cpu_mwait_usable())
sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE; sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE;
/*
* Work around a lingering SMM bug which leads to freezes when handling
* CPPC notifications. Tell the SMM we will handle any CPPC notifications.
*/
if ((cpu_power_eax & CPUTPM1_HWP_NOTIFICATION) && cppc_notify)
sc->cpu_features |= ACPI_CAP_INTR_CPPC;
#endif #endif
jhbUnsubmitted
Not Done
Inline Actions

I would maybe call the hint cppc_notify with the sense being that "1" enables it and "0" disables notifications (we try to avoid "negative" hints/tunables). You would then just want to set the default value to 1 and change the last test to cppcval != 0. I would also perhaps rename cppcval to cppc_notify as well.

jhb: I would maybe call the hint `cppc_notify` with the sense being that "1" enables it and "0"…
if (devclass_get_drivers(device_get_devclass(dev), &drivers, if (devclass_get_drivers(device_get_devclass(dev), &drivers,
&drv_count) == 0) { &drv_count) == 0) {
for (i = 0; i < drv_count; i++) { for (i = 0; i < drv_count; i++) {
if (ACPI_GET_FEATURES(drivers[i], &features) == 0) if (ACPI_GET_FEATURES(drivers[i], &features) == 0)
sc->cpu_features |= features; sc->cpu_features |= features;
} }
free(drivers, M_TEMP); free(drivers, M_TEMP);
▲ Show 20 Lines • Show All 563 Lines • ▼ Show 20 Lines if ((sc = cpu_softc[i]) != NULL)
acpi_cpu_startup_cx(sc); acpi_cpu_startup_cx(sc);
} }
/* Add a sysctl handler to handle global Cx lowest setting */ /* Add a sysctl handler to handle global Cx lowest setting */
SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree), SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A",
"Global lowest Cx sleep state to use"); "Global lowest Cx sleep state to use");
/* Add sysctl handler to control registering for CPPC notifications */
cppc_notify = 1;
SYSCTL_ADD_BOOL(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cppc_notify", CTLFLAG_RDTUN | CTLFLAG_MPSAFE,
&cppc_notify, 0, "Register for CPPC Notifications");
/* Take over idling from cpu_idle_default(). */ /* Take over idling from cpu_idle_default(). */
cpu_cx_lowest_lim = 0; cpu_cx_lowest_lim = 0;
CPU_FOREACH(i) { CPU_FOREACH(i) {
if ((sc = cpu_softc[i]) != NULL) if ((sc = cpu_softc[i]) != NULL)
enable_idle(sc); enable_idle(sc);
} }
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
▲ Show 20 Lines • Show All 525 Lines • Show Last 20 Lines
View Options

usr.sbin/fwget/pci/pci_video_amd

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Lines
static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */
static int cpu_quirks; /* Indicate any hardware bugs. */ static int cpu_quirks; /* Indicate any hardware bugs. */
/* Values for sysctl. */ /* Values for sysctl. */
static struct sysctl_ctx_list cpu_sysctl_ctx; static struct sysctl_ctx_list cpu_sysctl_ctx;
static struct sysctl_oid *cpu_sysctl_tree; static struct sysctl_oid *cpu_sysctl_tree;
static int cpu_cx_generic; static int cpu_cx_generic;
static int cpu_cx_lowest_lim; static int cpu_cx_lowest_lim;
static bool cppc_notify;
static struct acpi_cpu_softc **cpu_softc; static struct acpi_cpu_softc **cpu_softc;
ACPI_SERIAL_DECL(cpu, "ACPI CPU"); ACPI_SERIAL_DECL(cpu, "ACPI CPU");
static int acpi_cpu_probe(device_t dev); static int acpi_cpu_probe(device_t dev);
static int acpi_cpu_attach(device_t dev); static int acpi_cpu_attach(device_t dev);
static int acpi_cpu_suspend(device_t dev); static int acpi_cpu_suspend(device_t dev);
static int acpi_cpu_resume(device_t dev); static int acpi_cpu_resume(device_t dev);
▲ Show 20 Lines • Show All 227 Lines • ▼ Show 20 Lines
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
/* /*
* Ask for MWAIT modes if not disabled and interrupts work * Ask for MWAIT modes if not disabled and interrupts work
* reasonable with MWAIT. * reasonable with MWAIT.
*/ */
if (!acpi_disabled("mwait") && cpu_mwait_usable()) if (!acpi_disabled("mwait") && cpu_mwait_usable())
sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE; sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE;
/*
* Work around a lingering SMM bug which leads to freezes when handling
* CPPC notifications. Tell the SMM we will handle any CPPC notifications.
*/
if ((cpu_power_eax & CPUTPM1_HWP_NOTIFICATION) && cppc_notify)
sc->cpu_features |= ACPI_CAP_INTR_CPPC;
#endif #endif
jhbUnsubmitted
Not Done
Inline Actions

I would maybe call the hint cppc_notify with the sense being that "1" enables it and "0" disables notifications (we try to avoid "negative" hints/tunables). You would then just want to set the default value to 1 and change the last test to cppcval != 0. I would also perhaps rename cppcval to cppc_notify as well.

jhb: I would maybe call the hint `cppc_notify` with the sense being that "1" enables it and "0"…
if (devclass_get_drivers(device_get_devclass(dev), &drivers, if (devclass_get_drivers(device_get_devclass(dev), &drivers,
&drv_count) == 0) { &drv_count) == 0) {
for (i = 0; i < drv_count; i++) { for (i = 0; i < drv_count; i++) {
if (ACPI_GET_FEATURES(drivers[i], &features) == 0) if (ACPI_GET_FEATURES(drivers[i], &features) == 0)
sc->cpu_features |= features; sc->cpu_features |= features;
} }
free(drivers, M_TEMP); free(drivers, M_TEMP);
▲ Show 20 Lines • Show All 563 Lines • ▼ Show 20 Lines if ((sc = cpu_softc[i]) != NULL)
acpi_cpu_startup_cx(sc); acpi_cpu_startup_cx(sc);
} }
/* Add a sysctl handler to handle global Cx lowest setting */ /* Add a sysctl handler to handle global Cx lowest setting */
SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree), SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A",
"Global lowest Cx sleep state to use"); "Global lowest Cx sleep state to use");
/* Add sysctl handler to control registering for CPPC notifications */
cppc_notify = 1;
SYSCTL_ADD_BOOL(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cppc_notify", CTLFLAG_RDTUN | CTLFLAG_MPSAFE,
&cppc_notify, 0, "Register for CPPC Notifications");
/* Take over idling from cpu_idle_default(). */ /* Take over idling from cpu_idle_default(). */
cpu_cx_lowest_lim = 0; cpu_cx_lowest_lim = 0;
CPU_FOREACH(i) { CPU_FOREACH(i) {
if ((sc = cpu_softc[i]) != NULL) if ((sc = cpu_softc[i]) != NULL)
enable_idle(sc); enable_idle(sc);
} }
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
▲ Show 20 Lines • Show All 525 Lines • Show Last 20 Lines
View Options

usr.sbin/fwget/pci/pci_video_intel

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Lines
static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */
static int cpu_quirks; /* Indicate any hardware bugs. */ static int cpu_quirks; /* Indicate any hardware bugs. */
/* Values for sysctl. */ /* Values for sysctl. */
static struct sysctl_ctx_list cpu_sysctl_ctx; static struct sysctl_ctx_list cpu_sysctl_ctx;
static struct sysctl_oid *cpu_sysctl_tree; static struct sysctl_oid *cpu_sysctl_tree;
static int cpu_cx_generic; static int cpu_cx_generic;
static int cpu_cx_lowest_lim; static int cpu_cx_lowest_lim;
static bool cppc_notify;
static struct acpi_cpu_softc **cpu_softc; static struct acpi_cpu_softc **cpu_softc;
ACPI_SERIAL_DECL(cpu, "ACPI CPU"); ACPI_SERIAL_DECL(cpu, "ACPI CPU");
static int acpi_cpu_probe(device_t dev); static int acpi_cpu_probe(device_t dev);
static int acpi_cpu_attach(device_t dev); static int acpi_cpu_attach(device_t dev);
static int acpi_cpu_suspend(device_t dev); static int acpi_cpu_suspend(device_t dev);
static int acpi_cpu_resume(device_t dev); static int acpi_cpu_resume(device_t dev);
▲ Show 20 Lines • Show All 227 Lines • ▼ Show 20 Lines
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
/* /*
* Ask for MWAIT modes if not disabled and interrupts work * Ask for MWAIT modes if not disabled and interrupts work
* reasonable with MWAIT. * reasonable with MWAIT.
*/ */
if (!acpi_disabled("mwait") && cpu_mwait_usable()) if (!acpi_disabled("mwait") && cpu_mwait_usable())
sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE; sc->cpu_features |= ACPI_CAP_SMP_C1_NATIVE | ACPI_CAP_SMP_C3_NATIVE;
/*
* Work around a lingering SMM bug which leads to freezes when handling
* CPPC notifications. Tell the SMM we will handle any CPPC notifications.
*/
if ((cpu_power_eax & CPUTPM1_HWP_NOTIFICATION) && cppc_notify)
sc->cpu_features |= ACPI_CAP_INTR_CPPC;
#endif #endif
jhbUnsubmitted
Not Done
Inline Actions

I would maybe call the hint cppc_notify with the sense being that "1" enables it and "0" disables notifications (we try to avoid "negative" hints/tunables). You would then just want to set the default value to 1 and change the last test to cppcval != 0. I would also perhaps rename cppcval to cppc_notify as well.

jhb: I would maybe call the hint `cppc_notify` with the sense being that "1" enables it and "0"…
if (devclass_get_drivers(device_get_devclass(dev), &drivers, if (devclass_get_drivers(device_get_devclass(dev), &drivers,
&drv_count) == 0) { &drv_count) == 0) {
for (i = 0; i < drv_count; i++) { for (i = 0; i < drv_count; i++) {
if (ACPI_GET_FEATURES(drivers[i], &features) == 0) if (ACPI_GET_FEATURES(drivers[i], &features) == 0)
sc->cpu_features |= features; sc->cpu_features |= features;
} }
free(drivers, M_TEMP); free(drivers, M_TEMP);
▲ Show 20 Lines • Show All 563 Lines • ▼ Show 20 Lines if ((sc = cpu_softc[i]) != NULL)
acpi_cpu_startup_cx(sc); acpi_cpu_startup_cx(sc);
} }
/* Add a sysctl handler to handle global Cx lowest setting */ /* Add a sysctl handler to handle global Cx lowest setting */
SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree), SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A",
"Global lowest Cx sleep state to use"); "Global lowest Cx sleep state to use");
/* Add sysctl handler to control registering for CPPC notifications */
cppc_notify = 1;
SYSCTL_ADD_BOOL(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree),
OID_AUTO, "cppc_notify", CTLFLAG_RDTUN | CTLFLAG_MPSAFE,
&cppc_notify, 0, "Register for CPPC Notifications");
/* Take over idling from cpu_idle_default(). */ /* Take over idling from cpu_idle_default(). */
cpu_cx_lowest_lim = 0; cpu_cx_lowest_lim = 0;
CPU_FOREACH(i) { CPU_FOREACH(i) {
if ((sc = cpu_softc[i]) != NULL) if ((sc = cpu_softc[i]) != NULL)
enable_idle(sc); enable_idle(sc);
} }
#if defined(__i386__) || defined(__amd64__) #if defined(__i386__) || defined(__amd64__)
▲ Show 20 Lines • Show All 525 Lines • Show Last 20 Lines