Skip to content

nxp: imx93_a55: Switch to timer domain and Zephyr native drivers - #8520

Merged
dbaluta merged 3 commits into
thesofproject:mainfrom
LaurentiuM1234:imx93_native_switch
Mar 25, 2024
Merged

nxp: imx93_a55: Switch to timer domain and Zephyr native drivers#8520
dbaluta merged 3 commits into
thesofproject:mainfrom
LaurentiuM1234:imx93_native_switch

Conversation

@LaurentiuM1234

@LaurentiuM1234LaurentiuM1234 commented Nov 24, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

With this PR, the i.MX93 platform will now start using the timer domain in conjunction with the Zephyr native drivers.

Zephyr dependencies:

  1. drivers: dma: Introduce driver for NXP's eDMA IP zephyrproject-rtos/zephyr#65671 (EDMA)
  2. nxp: Add SAI driver with the DAI interface zephyrproject-rtos/zephyr#65187 (DAI)
  3. soc: mimx9: Remove SAI and EDMA static mappings zephyrproject-rtos/zephyr#65679 (removal of SAI3 and EDMA static mappings)
  4. include: drivers: dai: Align DAI direction with SOF direction zephyrproject-rtos/zephyr#65684 (DAI_DIR_{TX/RX} value adjustment)

Important notes:

  1. Currently, the PR is split in multiple commits. This is done to ease the reviewing process, but most of the commits will be squashed into a single one to avoid breaking git bisect.
  2. If git dependency 3 is merged before this PR and the Zephyr revision is bumped up this will lead to SOF no longer working on i.MX93 because the SAI and EDMA address spaces will no longer have any mappings, leading to translation faults.
  3. The transition to timer domain is mandatory because the DMA domain is unusable with the Zephyr native drivers ATM.

@LaurentiuM1234
LaurentiuM1234 marked this pull request as ready for review November 24, 2023 11:24
@LaurentiuM1234LaurentiuM1234 mentioned this pull request Nov 24, 2023
Closed
@lgirdwood

lgirdwood commented Nov 24, 2023

Copy link
Copy Markdown
Member

@LaurentiuM1234 I'm guessing someone from NXP will test after Zephyr PRs merge and update topologies to use timer ?

@LaurentiuM1234

LaurentiuM1234 commented Nov 24, 2023

Copy link
Copy Markdown
ContributorAuthor

@LaurentiuM1234 I'm guessing someone from NXP will test after Zephyr PRs merge and update topologies to use timer ?

The Zephyr PRs will only affect i.MX93 which has one topology that's updated in this PR

lyakh
lyakh reviewed Nov 27, 2023
View reviewed changes
Comment threadsrc/audio/host-zephyr.c Outdated
@LaurentiuM1234
LaurentiuM1234force-pushed the imx93_native_switch branch 2 times, most recently from 07b432a to a7e1110CompareNovember 28, 2023 12:41
lyakh
lyakh reviewed Nov 29, 2023
View reviewed changes
Comment threadsrc/audio/host-zephyr.c Outdated
Comment threadsrc/audio/host-zephyr.c Outdated
@LaurentiuM1234

LaurentiuM1234 commented Nov 29, 2023

Copy link
Copy Markdown
ContributorAuthor

V2 updates

  1. dma_block_cfg is now allocated on the heap.
  2. CONFIG_DAI=y has been removed from i.MX93's configuration file. It's already enabled via prf.conf
  3. Removed CONFIG_SAI_HAS_XCR4_CHMOD as a consequence to it being removed from the Zephyr driver.

@keqiaozhang

keqiaozhang commented Nov 30, 2023

Copy link
Copy Markdown
Collaborator

SOFCI TEST

@LaurentiuM1234

LaurentiuM1234 commented Dec 4, 2023

Copy link
Copy Markdown
ContributorAuthor

V3 updates

  1. Removed selection of CONFIG_DMA_DOMAIN from CONFIG_IMX93_A55. DMA domain is no longer used on i.MX93 so no need to compile zephyr_dma_domain.c.

@lgirdwoodlgirdwood added this to the v2.9 milestone Dec 18, 2023
@lgirdwood

lgirdwood commented Dec 18, 2023

Copy link
Copy Markdown
Member

@LaurentiuM1234@dbaluta I've penciled in for v2.9.

@LaurentiuM1234

LaurentiuM1234 commented Jan 17, 2024

Copy link
Copy Markdown
ContributorAuthor

V4 updates

  1. Added support for 93 SAI errata 051421.
  2. Some EDMA naming-related changes in configurations and overlay to match the changes from upstream.

@dbaluta

dbaluta commented Jan 17, 2024

Copy link
Copy Markdown
Collaborator

There is some issues with compilation on Windows:

https://github.com/thesofproject/sof/actions/runs/7555242327/job/20569791161?pr=8520

@LaurentiuM1234

LaurentiuM1234 commented Jan 17, 2024

Copy link
Copy Markdown
ContributorAuthor

There is some issues with compilation on Windows:

https://github.com/thesofproject/sof/actions/runs/7555242327/job/20569791161?pr=8520

That's normal ATM. Since we're still missing the EDMA driver, I can't bump up the Zephyr revision.

@dbaluta

dbaluta commented Jan 17, 2024

Copy link
Copy Markdown
Collaborator

Thanks! Now i see the DNM tag.

iuliana-prodan
iuliana-prodan reviewed Jan 18, 2024
View reviewed changes
Comment threadapp/boards/mimx93_evk_a55.overlay Outdated
Comment threadapp/boards/mimx93_evk_a55.overlay Outdated
Comment threadsrc/audio/host-zephyr.c
@LaurentiuM1234
LaurentiuM1234force-pushed the imx93_native_switch branch 2 times, most recently from ec6fbc8 to 314825cCompareJanuary 25, 2024 09:46
@LaurentiuM1234

LaurentiuM1234 commented Jan 25, 2024

Copy link
Copy Markdown
ContributorAuthor

V5 updates:

  1. Most Zephyr dependencies have been merged, added west.yml bump. Waiting on dai: nxp: sai: Disable data line on pause trigger zephyrproject-rtos/zephyr#67907

@LaurentiuM1234
LaurentiuM1234force-pushed the imx93_native_switch branch 3 times, most recently from 3ae68ab to f45fa54CompareFebruary 1, 2024 22:35
@LaurentiuM1234

LaurentiuM1234 commented Feb 1, 2024

Copy link
Copy Markdown
ContributorAuthor

V6 updates

  1. Dependencies merged, updated Zephyr manifest and 64-bit CI build is now clean.
  2. Switched to RX SYNC - TX ASYNC mode. See comments from overlay for explanation.

A few notes:

  1. Current PR layout will break git bisect. Since 93 is not officially supported in the kernel and is mostly used to test out new stuff I would be inclined to keep the layout as-is as long as this won't affect anyone else.
  2. Bunch of CI failures, some of them caused by the recent SMP changes from Zephyr.
  3. Need to re-test everything to make sure the native switch works ok. Will lift the DNM tag once this is done and the SMP-related issues are fixed. Also need to make sure that this PR isn't a cause for the other non-SMP-related CI failures.

@LaurentiuM1234

LaurentiuM1234 commented Feb 7, 2024•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

@lgirdwood@kv2019i do we, by any chance, have an ETA on the fix for the SMP-related issues? It would be very helpful. Thanks!

EDIT: just found #8818 tracking this. Sorry for the unnecessary ping!

@LaurentiuM1234LaurentiuM1234 mentioned this pull request Feb 13, 2024
Merged
@kv2019i

kv2019i commented Mar 4, 2024

Copy link
Copy Markdown
Collaborator

We are very close to unblocking Zephyr updates now, but as there are still issues, we'll do SOF2.9 with old Zephyr baseline. I'll bump this to 2.10.

@kv2019ikv2019i modified the milestones: v2.9, v2.10Mar 4, 2024
@LaurentiuM1234

LaurentiuM1234 commented Mar 11, 2024

Copy link
Copy Markdown
ContributorAuthor

V7 updates

  1. EDMA4 and SAI3 nodes have been moved to Zephyr (see dts: nxp: imx93: add nodes for SAI3 and EDMA4 zephyrproject-rtos/zephyr#70045). All we do here is enable and configure them for SOF usage.
  2. Removed commits that were already merged via Preparatory patches for NXP platforms transition to Zephyr native drivers #8859
  3. Removed cleanup commits. This will be handled separately.

@LaurentiuM1234
west.yml: bump up Zephyr revision
b075b27
Bump up Zephyr revision to fetch a Zephyr version that
contains the following patch:
1) 64ba1b221091c343f7cca79a7970981eb1ff3a35
("dts: nxp: imx93: add nodes for SAI3 and EDMA4")
This is required for the transition to Zephyr native drivers
on i.MX93.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@LaurentiuM1234
boards: mimx93_evk_a55: Enable SAI, EDMA and HOST DMA drivers
43b0d6c
This commit introduces the necessary changes to the overlay
and configuration files required for enabling the Zephyr native
SAI, EDMA and HOST DMA drivers on i.MX93.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@LaurentiuM1234
nxp: imx93: Switch to native Zephyr drivers and timer domain
af38974
Starting with this commit, i.MX93 now uses the timer domain
in conjunction with the Zephyr native drivers.
Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@LaurentiuM1234

LaurentiuM1234 commented Mar 22, 2024

Copy link
Copy Markdown
ContributorAuthor

V8 updates

  1. All dependencies have been merged. Removing the [DNM] tag.
  2. Added manifest update

@LaurentiuM1234LaurentiuM1234 changed the title [DNM]: nxp: imx93_a55: Switch to timer domain and Zephyr native driversnxp: imx93_a55: Switch to timer domain and Zephyr native driversMar 22, 2024
@LaurentiuM1234LaurentiuM1234 mentioned this pull request Mar 25, 2024
Closed
@dbaluta
dbaluta merged commit aaf2f11 into thesofproject:mainMar 25, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iuliana-prodaniuliana-prodaniuliana-prodan left review comments
@dbalutadbalutadbaluta approved these changes
@lyakhlyakhlyakh approved these changes
@marc-hbmarc-hbAwaiting requested review from marc-hb
@kv2019ikv2019iAwaiting requested review from kv2019ikv2019i is a code owner
@abonislawskiabonislawskiAwaiting requested review from abonislawskiabonislawski is a code owner
@ranj063ranj063Awaiting requested review from ranj063ranj063 is a code owner
@lgirdwoodlgirdwoodAwaiting requested review from lgirdwoodlgirdwood is a code owner
@plbossartplbossartAwaiting requested review from plbossartplbossart is a code owner
@mmaka1mmaka1Awaiting requested review from mmaka1mmaka1 is a code owner
@lbetlejlbetlejAwaiting requested review from lbetlejlbetlej is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.10

Development

Successfully merging this pull request may close these issues.

7 participants

@LaurentiuM1234@lgirdwood@keqiaozhang@dbaluta@kv2019i@lyakh@iuliana-prodan