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
6 changes: 3 additions & 3 deletions drivers/media/platform/apple/avd/avd-pm-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ static void avd_pm_open_boot_replay_test(struct kunit *test)
avd->code = (__force void __iomem *)kunit_kzalloc(test, 0x100, GFP_KERNEL);
avd->mbox = (__force void __iomem *)kunit_kzalloc(test, 0x100, GFP_KERNEL);
avd->pm.piodma = (__force void __iomem *)kunit_kzalloc(test, 0x28, GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, avd->code);
KUNIT_ASSERT_NOT_NULL(test, avd->mbox);
KUNIT_ASSERT_NOT_NULL(test, avd->pm.piodma);
KUNIT_ASSERT_NOT_NULL(test, (__force void *)avd->code);
KUNIT_ASSERT_NOT_NULL(test, (__force void *)avd->mbox);
KUNIT_ASSERT_NOT_NULL(test, (__force void *)avd->pm.piodma);
avd->pm.sram_phys = 0x123456780ULL;
for (i = 0; i < 2; i++) {
/* Model loss of both ITCM and PIODMA configuration between boots. */
Expand Down
17 changes: 10 additions & 7 deletions drivers/media/platform/apple/isp/isp-drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,16 @@ struct isp_surf {

struct isp_message {
u64 arg0;
u64 arg1;
u64 arg2;
u64 arg3;
u64 arg4;
u64 arg5;
u64 arg6;
u64 arg7;
/* Written before arg0, which marks the message valid. */
struct_group(payload,
u64 arg1;
u64 arg2;
u64 arg3;
u64 arg4;
u64 arg5;
u64 arg6;
u64 arg7;
);
} __packed;
static_assert(sizeof(struct isp_message) == ISP_IPC_MESSAGE_SIZE);

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/apple/isp/isp-ipc.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static inline void chan_write_msg_index(struct apple_isp *isp,
struct isp_message *msg, u32 index)
{
u64 *p0 = chan_msg_virt(chan, index);
memcpy(p0 + 1, &msg->arg1, sizeof(*msg) - 8);
memcpy(p0 + 1, &msg->payload, sizeof(msg->payload));

/* Make sure we write arg0 last, since that indicates message validity. */

Expand Down
Loading