Page MenuHomeFreeBSD
Files F140441108

D26133.diff
No OneTemporary
Actions

D26133.diff
View Options

Index: head/sys/arm64/acpica/acpi_machdep.c
===================================================================
--- head/sys/arm64/acpica/acpi_machdep.c
+++ head/sys/arm64/acpica/acpi_machdep.c
@@ -232,12 +232,47 @@
static void
parse_pxm_tables(void *dummy)
{
+ uint64_t mmfr0, parange;
/* Only parse ACPI tables when booting via ACPI */
if (arm64_bus_method != ARM64_BUS_ACPI)
return;
- acpi_pxm_init(MAXCPU, (vm_paddr_t)1 << 40);
+ if (!get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0)) {
+ /* chosen arbitrarily */
+ mmfr0 = ID_AA64MMFR0_PARange_1T;
+ }
+
+ switch (ID_AA64MMFR0_PARange_VAL(mmfr0)) {
+ case ID_AA64MMFR0_PARange_4G:
+ parange = (vm_paddr_t)4 << 30 /* GiB */;
+ break;
+ case ID_AA64MMFR0_PARange_64G:
+ parange = (vm_paddr_t)64 << 30 /* GiB */;
+ break;
+ case ID_AA64MMFR0_PARange_1T:
+ parange = (vm_paddr_t)1 << 40 /* TiB */;
+ break;
+ case ID_AA64MMFR0_PARange_4T:
+ parange = (vm_paddr_t)4 << 40 /* TiB */;
+ break;
+ case ID_AA64MMFR0_PARange_16T:
+ parange = (vm_paddr_t)16 << 40 /* TiB */;
+ break;
+ case ID_AA64MMFR0_PARange_256T:
+ parange = (vm_paddr_t)256 << 40 /* TiB */;
+ break;
+ case ID_AA64MMFR0_PARange_4P:
+ parange = (vm_paddr_t)4 << 50 /* PiB */;
+ break;
+ default:
+ /* chosen arbitrarily */
+ parange = (vm_paddr_t)1 << 40 /* TiB */;
+ printf("Unknown value for PARange in mmfr0 (%#lx)\n", mmfr0);
+ break;
+ }
+
+ acpi_pxm_init(MAXCPU, parange);
acpi_pxm_parse_tables();
acpi_pxm_set_mem_locality();
}
Index: head/sys/arm64/arm64/identcpu.c
===================================================================
--- head/sys/arm64/arm64/identcpu.c
+++ head/sys/arm64/arm64/identcpu.c
@@ -916,6 +916,13 @@
.offset = __offsetof(struct cpu_desc, id_aa64dfr0),
.fields = id_aa64dfr0_fields,
},
+ { /* id_aa64mmfr0_el1 */
+ .reg = ID_AA64MMFR0_EL1,
+ .CRm = 7,
+ .Op2 = 0,
+ .offset = __offsetof(struct cpu_desc, id_aa64mmfr0),
+ .fields = id_aa64mmfr0_fields,
+ },
};
#define CPU_DESC_FIELD(desc, idx) \

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 24, 11:12 PM (2 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27234386
Default Alt Text
D26133.diff (1 KB)

Event Timeline