Merge branch 'bits/080-pmp' into hoolock

Merge branch 'bits/080-pmp' into hoolock

nvme-apple: Prevent shared tags across queues on Apple A11

On Apple A11, tags of pending commands must be unique across the admin
and IO queues, else the firmware crashes with
"duplicate tag error for tag N", with N being the tag.

Apply the existing workaround for M1 of reserving two tags for the admin
queue to A11.

Cc: stable@vger.kernel.org
Fixes: 04d8ecf ("nvme: apple: Add Apple A11 support")
Signed-off-by: Nick Chan <towinchenmi@gmail.com>

nvme-apple: Prevent shared tags across queues on Apple A11

On Apple A11, tags of pending commands must be unique across the admin
and IO queues, else the firmware crashes with
"duplicate tag error for tag N", with N being the tag.

Apply the existing workaround for M1 of reserving two tags for the admin
queue to A11.

Cc: stable@vger.kernel.org
Fixes: 04d8ecf ("nvme: apple: Add Apple A11 support")
Signed-off-by: Nick Chan <towinchenmi@gmail.com>

input: misc: macsmc: Force restart instead of poweroff on T8015

In iOS, asserting force reset causes the device to restart, not poweroff.
Match that behavior here.

Signed-off-by: Nick Chan <towinchenmi@gmail.com>

input: misc: macsmc: Force restart instead of poweroff on T8015

In iOS, asserting force reset causes the device to restart, not poweroff.
Match that behavior here.

Signed-off-by: Nick Chan <towinchenmi@gmail.com>

nvme-apple: Reset q->sq_tail during queue init

Fixes a "duplicate tag error for tag 0" firmware crash during controller
reset while setting up a  queue on Apple A11 / T8015 caused by stale
entries in the submission queue due to an invalid sq_tail offset after
reset.

Fixes: 04d8ecf ("nvme: apple: Add Apple A11 support")
Cc: stable@vger.kernel.org
Suggested-by: Yuriy Havrylyuk <yhavry@gmail.com>
Reviewed-by: Sven Peter <sven@kernel.org>
Signed-off-by: Nick Chan <towinchenmi@gmail.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

nvme-apple: Reset submission queue state during controller reset

The Apple NVMe reset path was reusing stale submission queue state.

apple_nvme_init_queue() reset the CQ state, but left sq_tail and the SQ
contents alone. That works on first boot because the queue memory starts
clean, but it is not true after a controller reset.

On Apple A11 / T8015, resetting the controller by writing to reset_controller
crashes ANS/RTKit during the admin command sequence after nvme_enable_ctrl().

Reset sq_tail and clear the SQ memory when the queue is initialized. With
that change, the controller reset can be performed successfully.

Signed-off-by: Yuriy Havrylyuk <yhavry@gmail.com>
Signed-off-by: Nick Chan <towinchenmi@gmail.com>

nvme-apple: Reset q->sq_tail during queue init

Fixes controller reset on Apple A11 / T8015.

Suggested-by: Yuriy Havrylyuk <yhavry@gmail.com>
Signed-off-by: Nick Chan <towinchenmi@gmail.com>

input: misc: macsmc: Force restart instead of poweroff on T8015

In iOS, asserting force reset causes the device to restart, not poweroff.
Match that behavior here.

Signed-off-by: Nick Chan <towinchenmi@gmail.com>