aboutsummaryrefslogtreecommitdiff
path: root/sys/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/arm/debug_monitor.c34
-rw-r--r--sys/arm/arm/machdep_boot.c2
-rw-r--r--sys/arm/conf/GENERIC2
-rw-r--r--sys/arm/conf/TEGRA1244
-rw-r--r--sys/arm/freescale/imx/imx6_ssi.c6
-rw-r--r--sys/arm/freescale/vybrid/vf_sai.c6
-rw-r--r--sys/arm/include/param.h2
-rw-r--r--sys/arm/include/vmparam.h5
8 files changed, 8 insertions, 53 deletions
diff --git a/sys/arm/arm/debug_monitor.c b/sys/arm/arm/debug_monitor.c
index 7944becbae4d..a703c65f541b 100644
--- a/sys/arm/arm/debug_monitor.c
+++ b/sys/arm/arm/debug_monitor.c
@@ -83,8 +83,6 @@ static uint32_t dbg_breakpoint_num;
#define ID_DFR0_CP_DEBUG_M_SHIFT 0
#define ID_DFR0_CP_DEBUG_M_MASK (0xF << ID_DFR0_CP_DEBUG_M_SHIFT)
#define ID_DFR0_CP_DEBUG_M_NS (0x0) /* Not supported */
-#define ID_DFR0_CP_DEBUG_M_V6 (0x2) /* v6 Debug arch. CP14 access */
-#define ID_DFR0_CP_DEBUG_M_V6_1 (0x3) /* v6.1 Debug arch. CP14 access */
#define ID_DFR0_CP_DEBUG_M_V7 (0x4) /* v7 Debug arch. CP14 access */
#define ID_DFR0_CP_DEBUG_M_V7_1 (0x5) /* v7.1 Debug arch. CP14 access */
@@ -594,10 +592,6 @@ dbg_enable_monitor(void)
dbg_dscr = cp14_dbgdscrint_get();
switch (dbg_model) {
- case ID_DFR0_CP_DEBUG_M_V6:
- case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */
- cp14_dbgdscr_v6_set(dbg_dscr | DBGSCR_MDBG_EN);
- break;
case ID_DFR0_CP_DEBUG_M_V7: /* fall through */
case ID_DFR0_CP_DEBUG_M_V7_1:
cp14_dbgdscr_v7_set(dbg_dscr | DBGSCR_MDBG_EN);
@@ -820,26 +814,12 @@ dbg_get_ossr(void)
static __inline boolean_t
dbg_arch_supported(void)
{
- uint32_t dbg_didr;
-
switch (dbg_model) {
- case ID_DFR0_CP_DEBUG_M_V6:
- case ID_DFR0_CP_DEBUG_M_V6_1:
- dbg_didr = cp14_dbgdidr_get();
- /*
- * read-all-zeroes is used by QEMU
- * to indicate that ARMv6 debug support
- * is not implemented. Real hardware has at
- * least version bits set
- */
- if (dbg_didr == 0)
- return (FALSE);
- return (TRUE);
case ID_DFR0_CP_DEBUG_M_V7:
case ID_DFR0_CP_DEBUG_M_V7_1: /* fall through */
return (TRUE);
default:
- /* We only support valid v6.x/v7.x modes through CP14 */
+ /* We only support valid v7.x modes through CP14 */
return (FALSE);
}
}
@@ -875,16 +855,6 @@ dbg_reset_state(void)
err = 0;
switch (dbg_model) {
- case ID_DFR0_CP_DEBUG_M_V6:
- case ID_DFR0_CP_DEBUG_M_V6_1: /* fall through */
- /*
- * Arch needs monitor mode selected and enabled
- * to be able to access breakpoint/watchpoint registers.
- */
- err = dbg_enable_monitor();
- if (err != 0)
- return (err);
- goto vectr_clr;
case ID_DFR0_CP_DEBUG_M_V7:
/* Is core power domain powered up? */
if ((cp14_dbgprsr_get() & DBGPRSR_PU) == 0)
@@ -974,8 +944,6 @@ dbg_monitor_init(void)
if (bootverbose) {
db_printf("ARM Debug Architecture %s\n",
- (dbg_model == ID_DFR0_CP_DEBUG_M_V6) ? "v6" :
- (dbg_model == ID_DFR0_CP_DEBUG_M_V6_1) ? "v6.1" :
(dbg_model == ID_DFR0_CP_DEBUG_M_V7) ? "v7" :
(dbg_model == ID_DFR0_CP_DEBUG_M_V7_1) ? "v7.1" : "unknown");
}
diff --git a/sys/arm/arm/machdep_boot.c b/sys/arm/arm/machdep_boot.c
index 8a6c63af3c92..9bb1f0ccae91 100644
--- a/sys/arm/arm/machdep_boot.c
+++ b/sys/arm/arm/machdep_boot.c
@@ -165,7 +165,7 @@ cmdline_set_env(char *cmdline, const char *guard)
}
/*
- * Called for armv6 and newer.
+ * Called for armv7 and newer.
*/
void arm_parse_fdt_bootargs(void)
{
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
index 89841947713d..b0a2eb92554b 100644
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -100,7 +100,7 @@ device pci
device pci_host_generic
# PCI NICs
-device re # RealTek 8139C+/8169/8169S/8110S
+device re # Realtek 8139C+/8169/8169S/8110S
# VirtIO
device virtio
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
index ff23e63f77bd..86462841f24e 100644
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -98,7 +98,7 @@ device ums # USB mouse
#device cdce # Generic USB over Ethernet
#device cue # CATC USB Ethernet
#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
+#device rue # Realtek RTL8150 USB Ethernet
#device udav # Davicom DM9601E USB
# USB Wireless
@@ -117,7 +117,7 @@ device pci
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
-device re # RealTek 8139C+/8169/8169S/8110S
+device re # Realtek 8139C+/8169/8169S/8110S
# DRM2
device fbd
diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c
index 76870cfb29c9..f4ef955761b4 100644
--- a/sys/arm/freescale/imx/imx6_ssi.c
+++ b/sys/arm/freescale/imx/imx6_ssi.c
@@ -736,11 +736,7 @@ ssi_attach(device_t dev)
sc->pos = 0;
sc->conf = malloc(sizeof(struct sdma_conf), M_DEVBUF, M_WAITOK | M_ZERO);
- mtx_init(&sc->lock, device_get_nameunit(dev), "ssi softc");
- if (sc->lock == NULL) {
- device_printf(dev, "Can't create mtx\n");
- return (ENXIO);
- }
+ mtx_init(&sc->lock, device_get_nameunit(dev), "ssi softc", MTX_DEF);
if (bus_alloc_resources(dev, ssi_spec, sc->res)) {
device_printf(dev, "could not allocate resources\n");
diff --git a/sys/arm/freescale/vybrid/vf_sai.c b/sys/arm/freescale/vybrid/vf_sai.c
index 6ccfcae2bc2e..d3a3ab93fe80 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -691,11 +691,7 @@ sai_attach(device_t dev)
sc->sr = &rate_map[0];
sc->pos = 0;
- mtx_init(&sc->lock, device_get_nameunit(dev), "sai softc");
- if (sc->lock == NULL) {
- device_printf(dev, "Cant create mtx\n");
- return (ENXIO);
- }
+ mtx_init(&sc->lock, device_get_nameunit(dev), "sai softc", MTX_DEF);
if (bus_alloc_resources(dev, sai_spec, sc->res)) {
device_printf(dev, "could not allocate resources\n");
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 67f49ec14a99..79c9bc09c284 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -78,8 +78,6 @@
* This does not reflect the optimal alignment, just the possibility
* (within reasonable limits).
*
- * armv4 and v5 require alignment to the type's size. armv6 requires 8-byte
- * alignment for the ldrd/strd instructions, but otherwise follows armv7 rules.
* armv7 requires that an 8-byte type be aligned to at least a 4-byte boundary;
* access to smaller types can be unaligned, except that the compiler may
* optimize access to adjacent uint32_t values into a single load/store-multiple
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index 15807923cefb..03145d7e322a 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -73,10 +73,7 @@
#endif
/*
- * The virtual address the kernel is linked to run at. For armv4/5 platforms
- * the low-order 30 bits of this must match the low-order bits of the physical
- * address the kernel is loaded at, so the value is most often provided as a
- * kernel config option in the std.platform file. For armv6/7 the kernel can
+ * The virtual address the kernel is linked to run at. For armv7 the kernel can
* be loaded at any 2MB boundary, and KERNVIRTADDR can also be set to any 2MB
* boundary. It is typically overridden in the std.platform file only when
* KERNBASE is also set to a lower address to provide more KVA.
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-29 20:43:22 +0000