Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ description:
wrapper resource contains the coprocessor control registers and mailbox
FIFOs. A separate resource provides the coprocessor vector-base register.
The firmware role identifies which GPU firmware instance uses the mailbox;
the T6040 runs a single one.
the T6040 runs a single one. The T6050 J775D profile describes the physical
GPU aperture shared by J775D and J716c; the other T6050 profiles describe
alias windows.

properties:
compatible:
Expand All @@ -25,6 +27,7 @@ properties:
- apple,t6050-apif-ascwrap-v6
- apple,t6050-ascwrap-v6
- apple,t6050-x1n1-ascwrap-v6
- apple,t6050-j775d-ascwrap-v6

reg:
items:
Expand Down
37 changes: 35 additions & 2 deletions drivers/soc/apple/mailbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ static bool ascwrap_v8_rx_irq;
module_param(ascwrap_v8_rx_irq, bool, 0444);
MODULE_PARM_DESC(ascwrap_v8_rx_irq,
"Service T8152 GPU ASCWrap v8 receive with the recv-not-empty interrupt (default: poll, no GPU mailbox interrupt is enabled)");
/* Physical T6050 GPU windows, shared by J775D and J716c. */
#define APPLE_J775D_GFX_WRAPPER_BASE 0x2302600000ULL
#define APPLE_J775D_GFX_IOP_VBAR_BASE 0x2302050000ULL
#define APPLE_J775D_GFX1_WRAPPER_BASE 0x2302e00000ULL
#define APPLE_J775D_GFX1_IOP_VBAR_BASE 0x2302850000ULL

static_assert(APPLE_ASCWRAP_V6_MBOX_OFFSET + APPLE_ASC_MBOX_A2I_CONTROL ==
0x8110);
Expand Down Expand Up @@ -1636,8 +1641,7 @@ static const struct apple_mbox_hw apple_mbox_t8152_gfx_ascwrap_v8_hw = {

static_assert(0x20 + sizeof(u32) <= APPLE_ASCWRAP_V8_MBOX_SIZE);

/* T6050's native ASCWrap v6 uses the same RUN/stop sequence. Aura grants
* these complete wrapper/VBAR windows in the retained GPU aperture. */
/* Retained T6050 wrapper/VBAR alias profile. */
static const struct apple_mbox_ascwrap_v6_role_desc apple_mbox_t6050_ascwrap_v6_roles[] = {
{ "GFX", APPLE_MBOX_ASCWRAP_V6_ROLE_GFX,
APPLE_T8140_GFX_WRAPPER_BASE + APPLE_T6050_ASCWRAP_BASE_DELTA,
Expand All @@ -1647,6 +1651,17 @@ static const struct apple_mbox_ascwrap_v6_role_desc apple_mbox_t6050_ascwrap_v6_
APPLE_T8140_GFX1_IOP_VBAR_BASE + APPLE_T6050_ASCWRAP_BASE_DELTA },
};

/*
* T6050 at its physical addresses, with both roles in the GPU aperture at
* 0x2300000000 on die 0. The other T6050 profiles retain their alias windows.
*/
static const struct apple_mbox_ascwrap_v6_role_desc apple_mbox_t6050_j775d_ascwrap_v6_roles[] = {
{ "GFX", APPLE_MBOX_ASCWRAP_V6_ROLE_GFX,
APPLE_J775D_GFX_WRAPPER_BASE, APPLE_J775D_GFX_IOP_VBAR_BASE },
{ "GFX1", APPLE_MBOX_ASCWRAP_V6_ROLE_GFX1,
APPLE_J775D_GFX1_WRAPPER_BASE, APPLE_J775D_GFX1_IOP_VBAR_BASE },
};

static const struct apple_mbox_ascwrap_v6_role_desc apple_mbox_t6050_apif_ascwrap_v6_roles[] = {
{ "GFX", APPLE_MBOX_ASCWRAP_V6_ROLE_GFX,
APPLE_T8140_GFX_WRAPPER_BASE,
Expand All @@ -1672,6 +1687,22 @@ static const struct apple_mbox_hw apple_mbox_t6050_ascwrap_v6_hw = {
.has_irq_controls = false,
};

static const struct apple_mbox_hw apple_mbox_t6050_j775d_ascwrap_v6_hw = {
.reg_offset = APPLE_ASCWRAP_V6_MBOX_OFFSET,
.is_ascwrap_v6 = true,
.ascwrap_v6_roles = apple_mbox_t6050_j775d_ascwrap_v6_roles,
.num_ascwrap_v6_roles = ARRAY_SIZE(apple_mbox_t6050_j775d_ascwrap_v6_roles),
.control_full = APPLE_ASC_MBOX_CONTROL_FULL,
.control_empty = APPLE_ASC_MBOX_CONTROL_EMPTY,
.a2i_control = APPLE_ASC_MBOX_A2I_CONTROL,
.a2i_send0 = APPLE_ASC_MBOX_A2I_SEND0,
.a2i_send1 = APPLE_ASC_MBOX_A2I_SEND1,
.i2a_control = APPLE_ASC_MBOX_I2A_CONTROL,
.i2a_recv0 = APPLE_ASC_MBOX_I2A_RECV0,
.i2a_recv1 = APPLE_ASC_MBOX_I2A_RECV1,
.has_irq_controls = false,
};

/* Retained compatibility profile: unshifted wrapper aliases, native VBAR. */
static const struct apple_mbox_hw apple_mbox_t6050_apif_ascwrap_v6_hw = {
.reg_offset = APPLE_ASCWRAP_V6_MBOX_OFFSET,
Expand Down Expand Up @@ -1717,6 +1748,8 @@ static const struct of_device_id apple_mbox_of_match[] = {
{ .compatible = "apple,t6050-apif-ascwrap-v6", .data = &apple_mbox_t6050_apif_ascwrap_v6_hw },
{ .compatible = "apple,t6050-ascwrap-v6", .data = &apple_mbox_t6050_ascwrap_v6_hw },
{ .compatible = "apple,t6050-x1n1-ascwrap-v6", .data = &apple_mbox_t6050_ascwrap_v6_hw },
{ .compatible = "apple,t6050-j775d-ascwrap-v6",
.data = &apple_mbox_t6050_j775d_ascwrap_v6_hw },
{ .compatible = "apple,t8140-asc-mailbox", .data = &apple_mbox_t8140_asc_hw },
{ .compatible = "apple,t8140-aop-setup-mailbox", .data = &apple_mbox_t8140_aop_setup_hw },
/*
Expand Down
Loading