hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-04 23:22:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'freebsd/current/main' into hardened/current/master

Browse Source
This commit is contained in:
HardenedBSD Sync Services 2024-10-26 00:01:47 -06:00
commit 0098bac16d
No known key found for this signature in database
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/tools/ec2.conf
View File

@ -70,6 +70,11 @@ ec2_common() {
# nodes, but apply the workaround just in case.
echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf
# Graviton 1 through Graviton 4 have a bug in their ACPI where they
# mark the PL061's pins as needing to be configured in PullUp mode
# (in fact the PL061 has no pullup/pulldown resistors).
echo 'debug.acpi.quirks="8"' >> ${DESTDIR}/boot/loader.conf
# Load the kernel module for the Amazon "Elastic Network Adapter"
echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf

3
sys/dev/acpica/acpivar.h
View File

@ -227,12 +227,15 @@ extern struct mtx acpi_mutex;
* ACPI_Q_MADT_IRQ0: Specifies that ISA IRQ 0 is wired up to pin 0 of the
* first APIC and that the MADT should force that by ignoring the PC-AT
* compatible flag and ignoring overrides that redirect IRQ 0 to pin 2.
* ACPI_Q_AEI_NOPULL: Specifies that _AEI objects incorrectly designate pins
* as "PullUp" and they should be treated as "NoPull" instead.
*/
extern int acpi_quirks;
#define ACPI_Q_OK 0
#define ACPI_Q_BROKEN (1 << 0)
#define ACPI_Q_TIMER (1 << 1)
#define ACPI_Q_MADT_IRQ0 (1 << 2)
#define ACPI_Q_AEI_NOPULL (1 << 3)
#if defined(__amd64__) || defined(__i386__)
/*

6
sys/dev/gpio/acpi_gpiobus.c
View File

@ -52,8 +52,6 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res)
uint32_t flags = 0;
/* Figure out pin flags */
#ifdef NOT_YET
/* These are currently unused. */
if (gpio_res->ConnectionType == ACPI_RESOURCE_GPIO_TYPE_INT) {
switch (gpio_res->Polarity) {
case ACPI_ACTIVE_HIGH:
@ -69,10 +67,12 @@ acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *gpio_res)
break;
}
#ifdef NOT_YET
/* This is not currently implemented. */
if (gpio_res->Shareable == ACPI_SHARED)
flags |= GPIO_INTR_SHAREABLE;
}
#endif
}
switch (gpio_res->IoRestriction) {
case ACPI_IO_RESTRICT_INPUT:
flags |= GPIO_PIN_INPUT;

2
sys/dev/gpio/gpiobus.c
View File

@ -752,7 +752,7 @@ gpiobus_hinted_child(device_t bus, const char *dname, int dunit)
}
}
static int
int
gpiobus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct gpiobus_ivar *devi;

1
sys/dev/gpio/gpiobusvar.h
View File

@ -179,6 +179,7 @@ int gpiobus_detach(device_t);
int gpiobus_init_softc(device_t);
int gpiobus_alloc_ivars(struct gpiobus_ivar *);
void gpiobus_free_ivars(struct gpiobus_ivar *);
int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *);
int gpiobus_acquire_pin(device_t, uint32_t);
int gpiobus_release_pin(device_t, uint32_t);