[spi_device] Add prefix to the interrupts This commit adds mode or distinguishable prefixes to the existing interrupts. `generic_` prefix is added to pre-existed interrupts. `upload_` and `readbuf_` prefixes are added to the flash/passthrough related interrupts. Signed-off-by: Eunchan Kim <eunchan@opentitan.org>
diff --git a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson index 75ac7f1..bba6331 100644 --- a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson +++ b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
@@ -12457,49 +12457,49 @@ module_name: gpio } { - name: spi_device_rx_full + name: spi_device_generic_rx_full width: 1 type: interrupt module_name: spi_device } { - name: spi_device_rx_watermark + name: spi_device_generic_rx_watermark width: 1 type: interrupt module_name: spi_device } { - name: spi_device_tx_watermark + name: spi_device_generic_tx_watermark width: 1 type: interrupt module_name: spi_device } { - name: spi_device_rx_error + name: spi_device_generic_rx_error width: 1 type: interrupt module_name: spi_device } { - name: spi_device_rx_overflow + name: spi_device_generic_rx_overflow width: 1 type: interrupt module_name: spi_device } { - name: spi_device_tx_underflow + name: spi_device_generic_tx_underflow width: 1 type: interrupt module_name: spi_device } { - name: spi_device_cmdfifo_not_empty + name: spi_device_upload_cmdfifo_not_empty width: 1 type: interrupt module_name: spi_device } { - name: spi_device_payload_not_empty + name: spi_device_upload_payload_not_empty width: 1 type: interrupt module_name: spi_device
diff --git a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv index f46be4c..2dc76d6 100644 --- a/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv +++ b/hw/top_earlgrey/rtl/autogen/top_earlgrey.sv
@@ -394,14 +394,14 @@ logic intr_uart3_rx_timeout; logic intr_uart3_rx_parity_err; logic [31:0] intr_gpio_gpio; - logic intr_spi_device_rx_full; - logic intr_spi_device_rx_watermark; - logic intr_spi_device_tx_watermark; - logic intr_spi_device_rx_error; - logic intr_spi_device_rx_overflow; - logic intr_spi_device_tx_underflow; - logic intr_spi_device_cmdfifo_not_empty; - logic intr_spi_device_payload_not_empty; + logic intr_spi_device_generic_rx_full; + logic intr_spi_device_generic_rx_watermark; + logic intr_spi_device_generic_tx_watermark; + logic intr_spi_device_generic_rx_error; + logic intr_spi_device_generic_rx_overflow; + logic intr_spi_device_generic_tx_underflow; + logic intr_spi_device_upload_cmdfifo_not_empty; + logic intr_spi_device_upload_payload_not_empty; logic intr_spi_device_readbuf_watermark; logic intr_spi_device_readbuf_flip; logic intr_spi_device_tpm_header_not_empty; @@ -1147,17 +1147,17 @@ .cio_sd_en_o (cio_spi_device_sd_en_d2p), // Interrupt - .intr_rx_full_o (intr_spi_device_rx_full), - .intr_rx_watermark_o (intr_spi_device_rx_watermark), - .intr_tx_watermark_o (intr_spi_device_tx_watermark), - .intr_rx_error_o (intr_spi_device_rx_error), - .intr_rx_overflow_o (intr_spi_device_rx_overflow), - .intr_tx_underflow_o (intr_spi_device_tx_underflow), - .intr_cmdfifo_not_empty_o (intr_spi_device_cmdfifo_not_empty), - .intr_payload_not_empty_o (intr_spi_device_payload_not_empty), - .intr_readbuf_watermark_o (intr_spi_device_readbuf_watermark), - .intr_readbuf_flip_o (intr_spi_device_readbuf_flip), - .intr_tpm_header_not_empty_o (intr_spi_device_tpm_header_not_empty), + .intr_generic_rx_full_o (intr_spi_device_generic_rx_full), + .intr_generic_rx_watermark_o (intr_spi_device_generic_rx_watermark), + .intr_generic_tx_watermark_o (intr_spi_device_generic_tx_watermark), + .intr_generic_rx_error_o (intr_spi_device_generic_rx_error), + .intr_generic_rx_overflow_o (intr_spi_device_generic_rx_overflow), + .intr_generic_tx_underflow_o (intr_spi_device_generic_tx_underflow), + .intr_upload_cmdfifo_not_empty_o (intr_spi_device_upload_cmdfifo_not_empty), + .intr_upload_payload_not_empty_o (intr_spi_device_upload_payload_not_empty), + .intr_readbuf_watermark_o (intr_spi_device_readbuf_watermark), + .intr_readbuf_flip_o (intr_spi_device_readbuf_flip), + .intr_tpm_header_not_empty_o (intr_spi_device_tpm_header_not_empty), // [5]: fatal_fault .alert_tx_o ( alert_tx[5:5] ), .alert_rx_i ( alert_rx[5:5] ), @@ -2639,14 +2639,14 @@ intr_spi_device_tpm_header_not_empty, // IDs [75 +: 1] intr_spi_device_readbuf_flip, // IDs [74 +: 1] intr_spi_device_readbuf_watermark, // IDs [73 +: 1] - intr_spi_device_payload_not_empty, // IDs [72 +: 1] - intr_spi_device_cmdfifo_not_empty, // IDs [71 +: 1] - intr_spi_device_tx_underflow, // IDs [70 +: 1] - intr_spi_device_rx_overflow, // IDs [69 +: 1] - intr_spi_device_rx_error, // IDs [68 +: 1] - intr_spi_device_tx_watermark, // IDs [67 +: 1] - intr_spi_device_rx_watermark, // IDs [66 +: 1] - intr_spi_device_rx_full, // IDs [65 +: 1] + intr_spi_device_upload_payload_not_empty, // IDs [72 +: 1] + intr_spi_device_upload_cmdfifo_not_empty, // IDs [71 +: 1] + intr_spi_device_generic_tx_underflow, // IDs [70 +: 1] + intr_spi_device_generic_rx_overflow, // IDs [69 +: 1] + intr_spi_device_generic_rx_error, // IDs [68 +: 1] + intr_spi_device_generic_tx_watermark, // IDs [67 +: 1] + intr_spi_device_generic_rx_watermark, // IDs [66 +: 1] + intr_spi_device_generic_rx_full, // IDs [65 +: 1] intr_gpio_gpio, // IDs [33 +: 32] intr_uart3_rx_parity_err, // IDs [32 +: 1] intr_uart3_rx_timeout, // IDs [31 +: 1]
diff --git a/hw/top_earlgrey/sw/autogen/top_earlgrey.c b/hw/top_earlgrey/sw/autogen/top_earlgrey.c index a904eda..c97f436 100644 --- a/hw/top_earlgrey/sw/autogen/top_earlgrey.c +++ b/hw/top_earlgrey/sw/autogen/top_earlgrey.c
@@ -77,14 +77,14 @@ [kTopEarlgreyPlicIrqIdGpioGpio29] = kTopEarlgreyPlicPeripheralGpio, [kTopEarlgreyPlicIrqIdGpioGpio30] = kTopEarlgreyPlicPeripheralGpio, [kTopEarlgreyPlicIrqIdGpioGpio31] = kTopEarlgreyPlicPeripheralGpio, - [kTopEarlgreyPlicIrqIdSpiDeviceRxFull] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceRxWatermark] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceTxWatermark] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceRxError] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceRxOverflow] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceTxUnderflow] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDeviceCmdfifoNotEmpty] = kTopEarlgreyPlicPeripheralSpiDevice, - [kTopEarlgreyPlicIrqIdSpiDevicePayloadNotEmpty] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericRxFull] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericRxWatermark] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericTxWatermark] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericRxError] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericRxOverflow] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceGenericTxUnderflow] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceUploadCmdfifoNotEmpty] = kTopEarlgreyPlicPeripheralSpiDevice, + [kTopEarlgreyPlicIrqIdSpiDeviceUploadPayloadNotEmpty] = kTopEarlgreyPlicPeripheralSpiDevice, [kTopEarlgreyPlicIrqIdSpiDeviceReadbufWatermark] = kTopEarlgreyPlicPeripheralSpiDevice, [kTopEarlgreyPlicIrqIdSpiDeviceReadbufFlip] = kTopEarlgreyPlicPeripheralSpiDevice, [kTopEarlgreyPlicIrqIdSpiDeviceTpmHeaderNotEmpty] = kTopEarlgreyPlicPeripheralSpiDevice,
diff --git a/hw/top_earlgrey/sw/autogen/top_earlgrey.h b/hw/top_earlgrey/sw/autogen/top_earlgrey.h index a64d379..bd825c2 100644 --- a/hw/top_earlgrey/sw/autogen/top_earlgrey.h +++ b/hw/top_earlgrey/sw/autogen/top_earlgrey.h
@@ -1079,14 +1079,14 @@ kTopEarlgreyPlicIrqIdGpioGpio29 = 62, /**< gpio_gpio 29 */ kTopEarlgreyPlicIrqIdGpioGpio30 = 63, /**< gpio_gpio 30 */ kTopEarlgreyPlicIrqIdGpioGpio31 = 64, /**< gpio_gpio 31 */ - kTopEarlgreyPlicIrqIdSpiDeviceRxFull = 65, /**< spi_device_rx_full */ - kTopEarlgreyPlicIrqIdSpiDeviceRxWatermark = 66, /**< spi_device_rx_watermark */ - kTopEarlgreyPlicIrqIdSpiDeviceTxWatermark = 67, /**< spi_device_tx_watermark */ - kTopEarlgreyPlicIrqIdSpiDeviceRxError = 68, /**< spi_device_rx_error */ - kTopEarlgreyPlicIrqIdSpiDeviceRxOverflow = 69, /**< spi_device_rx_overflow */ - kTopEarlgreyPlicIrqIdSpiDeviceTxUnderflow = 70, /**< spi_device_tx_underflow */ - kTopEarlgreyPlicIrqIdSpiDeviceCmdfifoNotEmpty = 71, /**< spi_device_cmdfifo_not_empty */ - kTopEarlgreyPlicIrqIdSpiDevicePayloadNotEmpty = 72, /**< spi_device_payload_not_empty */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericRxFull = 65, /**< spi_device_generic_rx_full */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericRxWatermark = 66, /**< spi_device_generic_rx_watermark */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericTxWatermark = 67, /**< spi_device_generic_tx_watermark */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericRxError = 68, /**< spi_device_generic_rx_error */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericRxOverflow = 69, /**< spi_device_generic_rx_overflow */ + kTopEarlgreyPlicIrqIdSpiDeviceGenericTxUnderflow = 70, /**< spi_device_generic_tx_underflow */ + kTopEarlgreyPlicIrqIdSpiDeviceUploadCmdfifoNotEmpty = 71, /**< spi_device_upload_cmdfifo_not_empty */ + kTopEarlgreyPlicIrqIdSpiDeviceUploadPayloadNotEmpty = 72, /**< spi_device_upload_payload_not_empty */ kTopEarlgreyPlicIrqIdSpiDeviceReadbufWatermark = 73, /**< spi_device_readbuf_watermark */ kTopEarlgreyPlicIrqIdSpiDeviceReadbufFlip = 74, /**< spi_device_readbuf_flip */ kTopEarlgreyPlicIrqIdSpiDeviceTpmHeaderNotEmpty = 75, /**< spi_device_tpm_header_not_empty */