From bfce4b2dc86d7664b338cd600e7d759ba46c6217 Mon Sep 17 00:00:00 2001 From: kettenis Date: Sat, 29 May 2021 08:10:11 +0000 Subject: [PATCH] Remove support for the hibernate queue. Allocating this queue would overwrite the registers pointing at the normal IO queue and break things. ok dlg@, patrick@ --- sys/arch/arm64/dev/aplns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/arm64/dev/aplns.c b/sys/arch/arm64/dev/aplns.c index f2d74651924..f5f3a0ab6be 100644 --- a/sys/arch/arm64/dev/aplns.c +++ b/sys/arch/arm64/dev/aplns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aplns.c,v 1.2 2021/05/28 04:56:07 dlg Exp $ */ +/* $OpenBSD: aplns.c,v 1.3 2021/05/29 08:10:11 kettenis Exp $ */ /* * Copyright (c) 2014, 2021 David Gwynne * @@ -197,8 +197,7 @@ int nvme_ans_q_alloc(struct nvme_softc *sc, struct nvme_queue *q) { - bus_size_t db = ANS_LINEAR_IOSQ_DB; - bus_size_t base = ANS_NVMMU_BASE_IOSQ; + bus_size_t db, base; KASSERT(q->q_entries <= (ANS_NVMMU_TCB_SIZE / ANS_NVMMU_TCB_PITCH)); @@ -211,7 +210,8 @@ nvme_ans_q_alloc(struct nvme_softc *sc, switch (q->q_id) { case NVME_IO_Q: - case NVME_HIB_Q: + db = ANS_LINEAR_IOSQ_DB; + base = ANS_NVMMU_BASE_IOSQ; break; case NVME_ADMIN_Q: db = ANS_LINEAR_ASQ_DB; -- 2.20.1