diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index c63e28c75766..4621584b1b6f 100644 --- a/drivers/nvme/host/apple.c +++ b/drivers/nvme/host/apple.c @@ -42,7 +42,11 @@ #define APPLE_ANS_ACQ_DB 0x1004 #define APPLE_ANS_IOCQ_DB 0x100c -#define APPLE_ANS_MAX_PEND_CMDS_CTRL 0x1210 +#define APPLE_ANS_T8132_IOQ_CMDS 0x1200 +#define APPLE_ANS_T8132_IOQ_CQES 0x1208 +#define APPLE_ANS_T8132_IOQ_SIZE 0x1210 + +#define APPLE_ANS_T8103_MAX_PEND_CMDS_CTRL 0x1210 #define APPLE_ANS_BOOT_STATUS 0x1300 #define APPLE_ANS_BOOT_STATUS_OK 0xde71ce55 @@ -184,6 +188,7 @@ struct apple_nvme_iod { struct apple_nvme_hw { bool has_lsq_nvmmu; + bool needs_ioq_register; u32 max_queue_depth; }; @@ -1133,9 +1138,16 @@ static void apple_nvme_reset_work(struct work_struct *work) anv->mmio_nvme + APPLE_ANS_LINEAR_SQ_CTRL); /* Allow as many pending command as possible for both queues */ - writel(anv->hw->max_queue_depth - | (anv->hw->max_queue_depth << 16), anv->mmio_nvme - + APPLE_ANS_MAX_PEND_CMDS_CTRL); + if (!anv->hw->needs_ioq_register) { + /* + * Since T8132, this is replaced by IOQ_SIZE which is + * located at the same offset and is handled with the + * IO queue setup further below. + */ + writel(anv->hw->max_queue_depth + | (anv->hw->max_queue_depth << 16), anv->mmio_nvme + + APPLE_ANS_T8103_MAX_PEND_CMDS_CTRL); + } /* Setup the NVMMU for the maximum admin and IO queue depth */ writel(anv->hw->max_queue_depth - 1, @@ -1190,6 +1202,16 @@ static void apple_nvme_reset_work(struct work_struct *work) if (ret) goto out_remove_cq; + if (anv->hw->needs_ioq_register) { + writeq(anv->ioq.cq_dma_addr, + anv->mmio_nvme + APPLE_ANS_T8132_IOQ_CQES); + writeq(anv->ioq.sq_dma_addr, + anv->mmio_nvme + APPLE_ANS_T8132_IOQ_CMDS); + writel((anv->hw->max_queue_depth - 1) + | ((anv->hw->max_queue_depth - 1) << 16), anv->mmio_nvme + + APPLE_ANS_T8132_IOQ_SIZE); + } + apple_nvme_init_queue(&anv->ioq); nr_io_queues = 1; ret = nvme_set_queue_count(&anv->ctrl, &nr_io_queues); @@ -1699,17 +1721,26 @@ static DEFINE_SIMPLE_DEV_PM_OPS(apple_nvme_pm_ops, apple_nvme_suspend, static const struct apple_nvme_hw apple_nvme_t8015_hw = { .has_lsq_nvmmu = false, + .needs_ioq_register = false, .max_queue_depth = 16, }; static const struct apple_nvme_hw apple_nvme_t8103_hw = { .has_lsq_nvmmu = true, + .needs_ioq_register = false, + .max_queue_depth = 64, +}; + +static const struct apple_nvme_hw apple_nvme_t8132_hw = { + .has_lsq_nvmmu = true, + .needs_ioq_register = true, .max_queue_depth = 64, }; static const struct of_device_id apple_nvme_of_match[] = { { .compatible = "apple,t8015-nvme-ans2", .data = &apple_nvme_t8015_hw }, { .compatible = "apple,t8103-nvme-ans2", .data = &apple_nvme_t8103_hw }, + { .compatible = "apple,t8132-nvme-ans2", .data = &apple_nvme_t8132_hw }, { .compatible = "apple,nvme-ans2", .data = &apple_nvme_t8103_hw }, {}, };