Crypto : wrap dma test in a function

Run dma test command:
devmem 0xfebf1003 b 2
devmem 0xfebf1002 b 5

Author: 54shady

x86/crypto/crypto-drv.c

@@ -9,6 +9,13 @@
 #include <linux/pci.h>
 
 #define DMA_TEST_DEMO
+#ifdef DMA_TEST_DEMO
+	struct aaaa {
+		int a;
+		char name[10];
+	};
+#endif
+
 /* refcode: linux/drivers/net/ethernet/intel/e1000/e1000_main.c */
 #define BAR_0 0
 char e1000_driver_name[] = "mycrypto";
@@ -196,7 +203,12 @@ static irqreturn_t crypto_irq_handler(int irq, void *data)
 		printk("ErrorCode: %s\n", errno2errstr(readb(hw_addr + ErrorCode)));
 	}
 	if (ret == CryptoDevice_MsiReady)
+	{
 		printk("ReadyINT handled\n");
+		/* 从dma buffer中取出数据 */
+		struct aaaa *pa = cpu_out_addr;
+		printk("Read Dma data back: %d %s\n", pa->a, pa->name);
+	}
 	if (ret == CryptoDevice_MsiReset)
 		printk("ResetINT handled\n");
 
@@ -322,10 +334,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
 #ifdef DMA_TEST_DEMO
-	struct aaaa {
-		int a;
-		char name[10];
-	};
 	/* setup data */
 	struct aaaa a = {
 		.a = 911,

x86/crypto/crypto.c

@@ -7,7 +7,7 @@
 
 #include <openssl/sha.h>
 
-#define DMA_TEST_DEMO
+//#define DMA_TEST_DEMO
 #define NO2STR(n) case n: return #n
 
 #define PCI_CRYPTO_DEV(obj)        OBJECT_CHECK(PCICryptoState, obj, "crypto")
@@ -48,7 +48,8 @@ enum {
 	CryptoDevice_ReadyState,
 	CryptoDevice_ResetState,
 	CryptoDevice_AesCbcState,
-	CryptoDevice_Sha2State
+	CryptoDevice_Sha2State,
+	CryptoDevice_DmaTestState
 };
 
 enum {
@@ -90,6 +91,9 @@ typedef struct DmaRequest
  * Decrypt
  * devmem 0xfebf1002 b 3
  *
+ * Dma test command
+ * devmem 0xfebf1002 b 5
+ *
  * Enable interrupt flag to 2
  * devmem 0xfebf1003 b 2
  */
@@ -133,7 +137,8 @@ typedef enum tagCryptoDeviceCommand {
 	CryptoDevice_ResetCommand,
 	CryptoDevice_AesCbcEncryptoCommand,
 	CryptoDevice_AesCbcDecryptoCommand,
-	CryptoDevice_Sha2Command
+	CryptoDevice_Sha2Command,
+	CryptoDevice_DmaTestCommand
 } CryptoDeviceCommand;
 
 typedef enum tagCryptoDeviceMSI
@@ -455,13 +460,13 @@ static void clear_interrupt(PCICryptoState *dev)
 	}
 }
 
-#ifdef DMA_TEST_DEMO
+//#ifdef DMA_TEST_DEMO
 struct aaaa {
 	int a;
 	char name[10];
 };
 struct aaaa in;
-#endif
+//#endif
 
 static void pci_crypto_memio_write(void *opaque,
 		hwaddr addr,
@@ -503,6 +508,7 @@ static void pci_crypto_memio_write(void *opaque,
 			case CryptoDevice_AesCbcEncryptoCommand:
 			case CryptoDevice_AesCbcDecryptoCommand:
 			case CryptoDevice_Sha2Command:
+			case CryptoDevice_DmaTestCommand:
 				qemu_cond_signal(&dev->thread_cond);
 				break;
 			default:
@@ -639,6 +645,22 @@ static int DoAesCbc(PCICryptoState *dev, DmaRequest *dma, bool encrypt)
 	return 0;
 }
 
+static int DoDmaTest(PCICryptoState *dev, DmaRequest *dma)
+{
+	/* read data from driver */
+	cpu_physical_memory_read(dma->in.page_addr, &in, sizeof(struct aaaa));
+	printf("a = %d, name = %s\n", in.a, in.name);
+
+	/* we do some modify the data and pass to driver */
+	in.a = 119;
+	strcpy(in.name, "DmaOut");
+	/* 将dma in的数据修改后写入到dma out物理地址 */
+	cpu_physical_memory_write(dma->out.page_addr, &in, sizeof(struct aaaa));
+	/* 产生中断通知驱动接收数据, 在驱动中断处理函数中接收数据 */
+
+	return 0;
+}
+
 static int DoSha256(PCICryptoState *dev, DmaRequest *dma)
 {
 	unsigned char digest[SHA256_DIGEST_LENGTH] = {};
@@ -748,6 +770,18 @@ static void *worker_thread(void *pdev)
 					error = DoSha256(dev, &dma);
 					qemu_mutex_lock(&dev->io_mutex);
 					break;
+
+				/*
+				 * enable interrupt first and run dma
+				 * devmem 0xfebf1003 b 2
+				 * devmem 0xfebf1002 b 5
+				 */
+				case CryptoDevice_DmaTestCommand:
+					dev->io->State = CryptoDevice_DmaTestState;
+					qemu_mutex_unlock(&dev->io_mutex);
+					error = DoDmaTest(dev, &dma);
+					qemu_mutex_lock(&dev->io_mutex);
+					break;
 			}
 
 			switch (error)