forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2 
 kernel/drivers/i2c/busses/i2c-ismt.c
....@@ -75,11 +75,14 @@
7575 /* PCI DIDs for the Intel SMBus Message Transport (SMT) Devices */
7676 #define PCI_DEVICE_ID_INTEL_S1200_SMT0	0x0c59
7777 #define PCI_DEVICE_ID_INTEL_S1200_SMT1	0x0c5a
78
+#define PCI_DEVICE_ID_INTEL_CDF_SMT	0x18ac
7879 #define PCI_DEVICE_ID_INTEL_DNV_SMT	0x19ac
80
+#define PCI_DEVICE_ID_INTEL_EBG_SMT	0x1bff
7981 #define PCI_DEVICE_ID_INTEL_AVOTON_SMT	0x1f15
8082 
8183 #define ISMT_DESC_ENTRIES	2	/* number of descriptor entries */
8284 #define ISMT_MAX_RETRIES	3	/* number of SMBus retries to attempt */
85
+#define ISMT_LOG_ENTRIES	3	/* number of interrupt cause log entries */
8386 
8487 /* Hardware Descriptor Constants - Control Field */
8588 #define ISMT_DESC_CWRL	0x01	/* Command/Write Length */
....@@ -173,15 +176,16 @@
173176 	u8 head;				/* ring buffer head pointer */
174177 	struct completion cmp;			/* interrupt completion */
175178 	u8 buffer[I2C_SMBUS_BLOCK_MAX + 16];	/* temp R/W data buffer */
179
+	dma_addr_t log_dma;
180
+	u32 *log;
176181 };
177182 
178
-/**
179
- * ismt_ids - PCI device IDs supported by this driver
180
- */
181183 static const struct pci_device_id ismt_ids[] = {
182184 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT0) },
183185 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_S1200_SMT1) },
186
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CDF_SMT) },
184187 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DNV_SMT) },
188
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EBG_SMT) },
185189 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_AVOTON_SMT) },
186190 	{ 0, }
187191 };
....@@ -195,6 +199,8 @@
195199 
196200 /**
197201  * __ismt_desc_dump() - dump the contents of a specific descriptor
202
+ * @dev: the iSMT device
203
+ * @desc: the iSMT hardware descriptor
198204  */
199205 static void __ismt_desc_dump(struct device *dev, const struct ismt_desc *desc)
200206 {
....@@ -406,6 +412,9 @@
406412 	memset(desc, 0, sizeof(struct ismt_desc));
407413 	desc->tgtaddr_rw = ISMT_DESC_ADDR_RW(addr, read_write);
408414 
415
+	/* Always clear the log entries */
416
+	memset(priv->log, 0, ISMT_LOG_ENTRIES * sizeof(u32));
417
+
409418 	/* Initialize common control bits */
410419 	if (likely(pci_dev_msi_enabled(priv->pci_dev)))
411420 		desc->control = ISMT_DESC_INT | ISMT_DESC_FAIR;
....@@ -498,6 +507,9 @@
498507 		if (read_write == I2C_SMBUS_WRITE) {
499508 			/* Block Write */
500509 			dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA:  WRITE\n");
510
+			if (data->block[0] < 1 || data->block[0] > I2C_SMBUS_BLOCK_MAX)
511
+				return -EINVAL;
512
+
501513 			dma_size = data->block[0] + 1;
502514 			dma_direction = DMA_TO_DEVICE;
503515 			desc->wr_len_cmd = dma_size;
....@@ -626,11 +638,6 @@
626638 	       I2C_FUNC_SMBUS_PEC;
627639 }
628640 
629
-/**
630
- * smbus_algorithm - the adapter algorithm and supported functionality
631
- * @smbus_xfer: the adapter algorithm
632
- * @functionality: functionality supported by the adapter
633
- */
634641 static const struct i2c_algorithm smbus_algorithm = {
635642 	.smbus_xfer	= ismt_access,
636643 	.functionality	= ismt_func,
....@@ -694,6 +701,8 @@
694701 
695702 	/* initialize the Master Descriptor Base Address (MDBA) */
696703 	writeq(priv->io_rng_dma, priv->smba + ISMT_MSTR_MDBA);
704
+
705
+	writeq(priv->log_dma, priv->smba + ISMT_GR_SMTICL);
697706 
698707 	/* initialize the Master Control Register (MCTRL) */
699708 	writel(ISMT_MCTRL_MEIE, priv->smba + ISMT_MSTR_MCTRL);
....@@ -779,11 +788,15 @@
779788 	if (!priv->hw)
780789 		return -ENOMEM;
781790 
782
-	memset(priv->hw, 0, (ISMT_DESC_ENTRIES * sizeof(struct ismt_desc)));
783
-
784791 	priv->head = 0;
785792 	init_completion(&priv->cmp);
786793 
794
+	priv->log = dmam_alloc_coherent(&priv->pci_dev->dev,
795
+					ISMT_LOG_ENTRIES * sizeof(u32),
796
+					&priv->log_dma, GFP_KERNEL);
797
+	if (!priv->log)
798
+		return -ENOMEM;
799
+
787800 	return 0;
788801 }
789802