From: Sven Peter <sven@kernel.org>
To: Janne Grunau <j@jannau.net>, Neal Gompa <neal@gompa.dev>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@kernel.dk>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Arnd Bergmann <arnd@arndb.de>
Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
Sven Peter <sven@kernel.org>
Subject: [PATCH 5/6] nvme-apple: Require page aligned buffers on the admin queue
Date: Thu, 06 Aug 2026 17:27:37 +0200 [thread overview]
Message-ID: <20260806-b4-nvme-fwabi-v1-5-bde19ce8db04@kernel.org> (raw)
In-Reply-To: <20260806-b4-nvme-fwabi-v1-0-bde19ce8db04@kernel.org>
Now that we have a quick to align buffers on the admin queue to the NVMe
controller page size use it for Apple controllers. This fixes pre-M1
controllers, which always rejected unaligned requests, and also makes
this driver work for M4 SoCs and for M1/M2/M3 SoCs that have been
updated to the firmware shipped with macOS 15.
Fixes: 5bd2927aceba ("nvme-apple: Add initial Apple SoC NVMe driver")
Signed-off-by: Sven Peter <sven@kernel.org>
---
drivers/nvme/host/apple.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
index 1ea732c3df1c..78f89b5679e5 100644
--- a/drivers/nvme/host/apple.c
+++ b/drivers/nvme/host/apple.c
@@ -1583,7 +1583,8 @@ static struct apple_nvme *apple_nvme_alloc(struct platform_device *pdev)
}
ret = nvme_init_ctrl(&anv->ctrl, anv->dev, &nvme_ctrl_ops,
- NVME_QUIRK_SKIP_CID_GEN | NVME_QUIRK_IDENTIFY_CNS);
+ NVME_QUIRK_SKIP_CID_GEN | NVME_QUIRK_IDENTIFY_CNS |
+ NVME_QUIRK_ADMIN_PAGE_ALIGN);
if (ret) {
dev_err_probe(dev, ret, "Failed to initialize nvme_ctrl");
goto put_dev;
--
2.55.0
next prev parent reply other threads:[~2026-08-06 15:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 15:27 [PATCH 0/6] Apple NVMe fixes for macOS 15+ firmware / M4 support Sven Peter
2026-08-06 15:27 ` [PATCH 1/6] nvme-apple: Destroy the admin queue on removal Sven Peter
2026-08-06 15:27 ` [PATCH 2/6] nvme-apple: Don't set a DMA direction for commands without a data transfer Sven Peter
2026-08-06 15:27 ` [PATCH 3/6] nvme-apple: Never set the opcode in the NVMMU TCB Sven Peter
2026-08-06 15:27 ` [PATCH 4/6] nvme: Add a quirk for page aligned admin queue buffers Sven Peter
2026-08-06 15:27 ` Sven Peter [this message]
2026-08-06 15:27 ` [PATCH 6/6] nvme-apple: Drop the PRP null check chicken bit Sven Peter
2026-08-06 16:50 ` [PATCH 0/6] Apple NVMe fixes for macOS 15+ firmware / M4 support Nick Chan
2026-08-06 17:37 ` Janne Grunau
2026-08-07 15:36 ` Joshua Peisach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260806-b4-nvme-fwabi-v1-5-bde19ce8db04@kernel.org \
--to=sven@kernel.org \
--cc=arnd@arndb.de \
--cc=asahi@lists.linux.dev \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=j@jannau.net \
--cc=kbusch@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=neal@gompa.dev \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox