[sw,multitop] Port spi_device_passthrough and spi_host_testutils to DT
#26284
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlexJones0
changed the title
spi_device_passthrough and the spi_host_testutils to DT
AlexJones0
requested review from
pamaury,
nbdd0121 and
jwnrt
and removed request for
msfschaffner and
jon-flatley
AlexJones0
changed the title
spi_device_passthrough and the spi_host_testutils to DTspi_device_passthrough and spi_host_testutils to DT
jwnrt
approved these changes
Feb 13, 2025
AlexJones0
force-pushed
the
dt_spi_passthrough
branch
from
d7af541 to
6f770ba
Compare
|
Force push is just a rebase to pull in CI fixes |
AlexJones0
force-pushed
the
dt_spi_passthrough
branch
from
6f770ba to
f687fb0
Compare
|
Force push is a rebase again due to Github runner issues |
pamaury
reviewed
Feb 14, 2025
pamaury
reviewed
Feb 14, 2025
pamaury
reviewed
Feb 14, 2025
pamaury
reviewed
Feb 14, 2025
pamaury
reviewed
Feb 14, 2025
| @@ -578,50 +579,50 @@ static void configure_pinmux_sim(void) { | |||
| const pinmux_pad_attributes_t pinmux_pad_attributes[] = { | |||
| // Enable pull-ups for spi_host_0 data pins to avoid floating inputs. | |||
| { | |||
| .pad = kTopEarlgreyDirectPadsSpiHost0Sd0, | |||
| .pad = kDtPadSpiHost0Sd0, | |||
There was a problem hiding this comment.
Probably not for this PR but I feel this function is doing duplicate work. If the pins are already configured (ie the DIOs/MIOs are connected) then I think that with the DT the function could just go through the list of pins, figure out the pads that they are connected to and configure them. This would avoid repeating the list of pads in several places.
There was a problem hiding this comment.
This seems reasonable, but due to the scope I think should be addressed outside this PR.
pamaury
reviewed
Feb 14, 2025
| @@ -43,37 +44,37 @@ static dif_spi_host_t spi_host1; | |||
| // Enable pull-ups for spi_host data pins to avoid floating inputs. | |||
| static const pinmux_pad_attributes_t pinmux_pad_config[] = { | |||
| { | |||
| .pad = kTopEarlgreyMuxedPadsIob1, | |||
| .pad = kDtPadIob1, | |||
pamaury
reviewed
Feb 14, 2025
In `top_earlgrey.hjson`, the IOA2 and IOA3 pads have their port type overriden from the default `inout wire` to the value `INOUT_A0. According to the relevant comment, this is only used for simulating ADC connections right now, where these ports are switched to a real type when the SystemVerilog ANALOGSIM macro is defined (i.e. this would work if we parsed a pre-processed SV file, but not when generating from this HJSON). Since this appears to be the one unique case of a macro being used for a port-type in a hacky way, we just hard-code this into the relevant lists in dtgen/helper.py. An extra check/assertation is added to check that the port type is in a list of known port types, to avoid this issue silently appearing again in the future. Signed-off-by: Alex Jones <[email protected]>
nbdd0121
reviewed
Feb 14, 2025
AlexJones0
force-pushed
the
dt_spi_passthrough
branch
2 times, most recently
from
1f198db to
bf47a8c
Compare
pamaury
reviewed
Feb 14, 2025
pamaury
reviewed
Feb 14, 2025
pamaury
approved these changes
Feb 14, 2025
Ports the spi_host_testutils utilities to use the devicetable Pinmux interface, so that it no longer relies on Earlgrey constants. Also updates the corresponding tests that use this library to provide a CSB pin through the DT interface, though the remainder of these tests are not yet ported to devicetables. This library uses pinmux mappings that are quite specific to Earlgrey/Darjeeling, so relevant conditional compilation is introduced to ensure the testutils only build information for relevant tops, and error in the case of an undefined top (to make tracking down errors easier). Signed-off-by: Alex Jones <[email protected]>
Add a dif function for getting the attributes from a devicetables pad, like the corresponding `dif_pinmux_pad_write_attrs_dt` that already exists, but for getting attributes. Signed-off-by: Alex Jones <[email protected]>
Makes the pinmux testutils pad configuration API take pad attributes defined using DT pads, rather than Earlgrey top-specific tabs. This allows more tests to be defined using only devicetables, without depending on constants from any specific top. Signed-off-by: Alex Jones <[email protected]>
This test requires more significant changes to be suited to running on Darjeeling, as it uses some Earlgrey-specific pinmux mappings, and uses two SPI Hosts instead of just one. Only the first SPI Host is actually used, so we enable the test to scale to initialise any number of SPI hosts per top but still only use the first. Pin mappings are hard-coded for Earlgrey/Darjeeling based on the top-level using conditional compilation. When porting to DT, more generic logic for enabling all the interrupts for the Spi Host and Spi Device blocks is introduced, to avoid hard-coding the name of interrupts when the test itself does not require it. Signed-off-by: Alex Jones <[email protected]>
AlexJones0
force-pushed
the
dt_spi_passthrough
branch
from
bf47a8c to
c2ed6f1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #26234
This PR ports the
spi_device_passthroughtest to use the devicetables API so that it no longer depends on Earlgrey-specific constants. The test remains passing on Earlgrey in thesim_dvenvironment, and will compile for Darjeeling viaAs part of porting this test, a small issue with a special case in
top_earlgrey.hjsonwas encountered, withdtgennot generating necessary constants, so a fix for this is introduced. Porting of this test also required porting of thespi_host_testutilslibrary, and refactoring of the pad_attributes/configure_pad interfaces in the pinmux utils also. Note that specifically for thespi_host_testutilsand thespi_passthrough_testitself, several pinmux mappings are used which are very top-specific. I've tried to introduce some conditional compilation based on theEARLGREY_IS_TOPdefines that should throw appropriate errors when compiling the test on an unsupported top.