Revert "tests: drivers: spi: Add test case for MLTPAN-55 workaround"

This reverts commit aec0909.

Signed-off-by: Marcin Szymczyk <[email protected]>

Author: masz-nordic

tests/drivers/spi/spim_pan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -41,20 +41,10 @@ dut_spi: &spi130 {
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(1)>;
 	};
 };
 
 &exmif {
 	status = "disabled";
 };
-
-tst_timer: &timer131 {
-	status = "okay";
-};
-
-&dppic133 {
-	owned-channels = <1>;
-	sink-channels = <1>;
-	status = "okay";
-};

tests/drivers/spi/spim_pan/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -40,18 +40,10 @@ dut_spi: &spi21 {
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(1)>;
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
-
-tst_timer: &timer20 {
-	status = "okay";
-};
-
-&dppic20 {
-	status = "okay";
-};

tests/drivers/spi/spim_pan/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay

@@ -40,18 +40,10 @@ dut_spi: &spi21 {
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(1)>;
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
-
-tst_timer: &timer20 {
-	status = "okay";
-};
-
-&dppic20 {
-	status = "okay";
-};

tests/drivers/spi/spim_pan/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay

@@ -40,18 +40,10 @@ dut_spi: &spi21 {
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(1)>;
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
-
-tst_timer: &timer20 {
-	status = "okay";
-};
-
-&dppic20 {
-	status = "okay";
-};

tests/drivers/spi/spim_pan/boards/nrf54lv10dk_nrf54lv10a_cpuapp.overlay

@@ -40,18 +40,10 @@ dut_spi: &spi21 {
 	dut_spi_dt: test-spi-dev@0 {
 		compatible = "vnd,spi-device";
 		reg = <0>;
-		spi-max-frequency = <DT_FREQ_M(4)>;
+		spi-max-frequency = <DT_FREQ_M(1)>;
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
-
-tst_timer: &timer20 {
-	status = "okay";
-};
-
-&dppic20 {
-	status = "okay";
-};

tests/drivers/spi/spim_pan/prj.conf

@@ -1,5 +1,3 @@
 CONFIG_SPI=y
 
-CONFIG_NRFX_GPPI=y
-
 CONFIG_ZTEST=y

tests/drivers/spi/spim_pan/src/main.c

@@ -8,19 +8,14 @@
 #include <zephyr/ztest.h>
 #include <zephyr/drivers/spi.h>
 #include <nrfx_spim.h>
-#include <nrfx_timer.h>
 #include <zephyr/linker/devicetree_regions.h>
 
-#include <zephyr/drivers/counter.h>
-#include <helpers/nrfx_gppi.h>
-
-/* SPI MODE 0 */
 #define SPI_MODE (SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LINES_SINGLE | SPI_TRANSFER_MSB)
-#define TEST_BUFFER_SIZE 64
+
+#define TEST_BUFFER_SIZE 8
 
 static struct spi_dt_spec spim_spec = SPI_DT_SPEC_GET(DT_NODELABEL(dut_spi_dt), SPI_MODE, 0);
 NRF_SPIM_Type *spim_reg = (NRF_SPIM_Type *)DT_REG_ADDR(DT_NODELABEL(dut_spi));
-NRF_TIMER_Type *timer_reg = (NRF_TIMER_Type *)DT_REG_ADDR(DT_NODELABEL(tst_timer));
 
 #define MEMORY_SECTION(node)                                                                       \
 	COND_CODE_1(DT_NODE_HAS_PROP(node, memory_regions),                                        \
@@ -44,27 +39,15 @@ static void set_buffers(void)
 	memset(rx_buffer, 0xFF, TEST_BUFFER_SIZE);
 }
 
-static uint32_t configure_test_timer(NRF_TIMER_Type *preg)
-{
-	const nrfy_timer_config_t test_timer_config = {.prescaler = 1,
-						       .mode = NRF_TIMER_MODE_COUNTER,
-						       .bit_width = NRF_TIMER_BIT_WIDTH_16};
-
-	nrfy_timer_periph_configure(preg, &test_timer_config);
-	nrfy_timer_task_trigger(preg, NRF_TIMER_TASK_START);
-
-	return nrfy_timer_task_address_get(preg, NRF_TIMER_TASK_COUNT);
-}
-
 /*
  * Reference: MLTPAN-8
  * Requirements to trigger the PAN workaround
  * CPHA = 0 (configured in SPI_MODE)
- * PRESCALER > 2 (4 for 4MHz)
+ * PRESCALER > 2 (16 for 1MHz)
  * First transmitted bit is 1 (0x8B, MSB)
  */
 
-ZTEST(spim_pan, test_spim_mltpan_8_workaround)
+ZTEST(spim_pan, test_spim_pan_workaround)
 {
 	int err;
 
@@ -76,59 +59,13 @@ ZTEST(spim_pan, test_spim_mltpan_8_workaround)
 
 	set_buffers();
 
-	err = spi_transceive_dt(&spim_spec, &tx_spi_buf_set, &rx_spi_buf_set);
 	TC_PRINT("SPIM prescaler: %u\n", spim_reg->PRESCALER);
 	zassert_true(spim_reg->PRESCALER > 2, "SPIM prescaler is not greater than 2\n");
-	zassert_ok(err, "SPI transceive failed: %d\n", err);
 
-	zassert_mem_equal(tx_buffer, rx_buffer, TEST_BUFFER_SIZE, "TX buffer != RX buffer\n");
-}
-
-/*
- * Reference: MLTPAN-55
- * Requirements to trigger the PAN workaround
- * MODE 0 or MODE 2 (CPHA = 0)
- * PRESCALER = 4 (4 MHz) for SPIM2x and SPIM3x
- * RX.MAXCNT lower than TX.MAXCNT
- */
-
-ZTEST(spim_pan, test_spim_mltpan_55_workaround)
-{
-	int err;
-	uint8_t ppi_channel;
-	uint32_t timer_cc_before, timer_cc_after;
-
-	uint32_t timer_task;
-	uint32_t spim_event;
-
-	struct spi_buf tx_spi_buf = {.buf = tx_buffer, .len = TEST_BUFFER_SIZE};
-	struct spi_buf_set tx_spi_buf_set = {.buffers = &tx_spi_buf, .count = 1};
-
-	struct spi_buf rx_spi_buf = {.buf = rx_buffer, .len = TEST_BUFFER_SIZE - 1};
-	struct spi_buf_set rx_spi_buf_set = {.buffers = &rx_spi_buf, .count = 1};
-
-	set_buffers();
-
-	err = nrfx_gppi_channel_alloc(&ppi_channel);
-	zassert_equal(nrfx_gppi_channel_alloc(&ppi_channel), NRFX_SUCCESS,
-		      "Failed to allocate GPPI channel");
-
-	timer_task = configure_test_timer(timer_reg);
-	spim_event = nrf_spim_event_address_get(spim_reg, NRF_SPIM_EVENT_END);
-
-	nrfx_gppi_channel_endpoints_setup(ppi_channel, spim_event, timer_task);
-	nrfx_gppi_channels_enable(BIT(ppi_channel));
-
-	timer_cc_before = nrfy_timer_capture_get(timer_reg, NRF_TIMER_CC_CHANNEL0);
 	err = spi_transceive_dt(&spim_spec, &tx_spi_buf_set, &rx_spi_buf_set);
-	timer_cc_after = nrfy_timer_capture_get(timer_reg, NRF_TIMER_CC_CHANNEL0);
-
-	TC_PRINT("Timer count before: %u, timer count after: %u\n", timer_cc_before,
-		 timer_cc_after);
+	zassert_ok(err, "SPI transceive failed: %d\n", err);
 
-	zassert_true((timer_cc_after - timer_cc_before) > 0,
-		     "NRF_SPIM_EVENT_END did not trigger\n");
-	zassert_mem_equal(tx_buffer, rx_buffer, TEST_BUFFER_SIZE - 1, "TX buffer != RX buffer\n");
+	zassert_mem_equal(tx_buffer, rx_buffer, TEST_BUFFER_SIZE, "TX buffer != RX buffer\n");
 }
 
 ZTEST_SUITE(spim_pan, NULL, test_setup, NULL, NULL, NULL);