Skip to contentSkip to conversation

mei: support DMA transactions

PATCH New Tomas Winkler 1 participant 3 messages Dec 17, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mei: support DMA transactions

Prerequisites to support DMA transactions.

Tomas Winkler (2):
mei: enable marking internal commands
mei: me: set dma mask using DMA mapping API

 drivers/misc/mei/amthif.c  |  2 ++
 drivers/misc/mei/client.c  |  2 ++
 drivers/misc/mei/hw.h      |  3 ++-
 drivers/misc/mei/mei_dev.h |  5 +++--
 drivers/misc/mei/pci-me.c  | 15 +++++++++++++++
 drivers/misc/mei/wd.c      |  1 +
 6 files changed, 25 insertions(+), 3 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/2 mei: enable marking internal commands

Set hbm header bit 30 for internal commands
This mark commands that are generated by
the device driver

---
 drivers/misc/mei/amthif.c  | 2 ++
 drivers/misc/mei/client.c  | 2 ++
 drivers/misc/mei/hw.h      | 3 ++-
 drivers/misc/mei/mei_dev.h | 5 +++--
 drivers/misc/mei/wd.c      | 1 +
 5 files changed, 10 insertions(+), 3 deletions(-)
drivers/misc/mei/amthif.c +2 -0
index d22c686..29fcd57 100644
@@ -316,6 +316,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)
 		mei_hdr.host_addr = dev->iamthif_cl.host_client_id;
 		mei_hdr.me_addr = dev->iamthif_cl.me_client_id;
 		mei_hdr.reserved = 0;
+		mei_hdr.internal = 0;
 		dev->iamthif_msg_buf_index += mei_hdr.length;
 		ret = mei_write_message(dev, &mei_hdr, dev->iamthif_msg_buf);
 		if (ret)
@@ -477,6 +478,7 @@ int mei_amthif_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
 	mei_hdr.host_addr = cl->host_client_id;
 	mei_hdr.me_addr = cl->me_client_id;
 	mei_hdr.reserved = 0;
+	mei_hdr.internal = 0;
 
 	if (*slots >= msg_slots) {
 		mei_hdr.length = len;
drivers/misc/mei/client.c +2 -0
index 3de09ab..585f46b 100644
@@ -727,6 +727,7 @@ int mei_cl_irq_write_complete(struct mei_cl *cl, struct mei_cl_cb *cb,
 	mei_hdr.host_addr = cl->host_client_id;
 	mei_hdr.me_addr = cl->me_client_id;
 	mei_hdr.reserved = 0;
+	mei_hdr.internal = cb->internal;
 
 	if (*slots >= msg_slots) {
 		mei_hdr.length = len;
@@ -826,6 +827,7 @@ int mei_cl_write(struct mei_cl *cl, struct mei_cl_cb *cb, bool blocking)
 	mei_hdr.host_addr = cl->host_client_id;
 	mei_hdr.me_addr = cl->me_client_id;
 	mei_hdr.reserved = 0;
+	mei_hdr.internal = cb->internal;
 
 
 	rets = mei_write_message(dev, &mei_hdr, buf->data);
drivers/misc/mei/hw.h +2 -1
index cb2f556..dd44e33 100644
@@ -111,7 +111,8 @@ struct mei_msg_hdr {
 	u32 me_addr:8;
 	u32 host_addr:8;
 	u32 length:9;
-	u32 reserved:6;
+	u32 reserved:5;
+	u32 internal:1;
 	u32 msg_complete:1;
 } __packed;
 
drivers/misc/mei/mei_dev.h +3 -2
index 4a7ee81..d92ca0c 100644
@@ -178,6 +178,7 @@ struct mei_cl_cb {
 	unsigned long buf_idx;
 	unsigned long read_time;
 	struct file *file_object;
+	u32 internal:1;
 };
 
 /* MEI client instance carried as file->pirvate_data*/
@@ -637,9 +638,9 @@ static inline void mei_dbgfs_deregister(struct mei_device *dev) {}
 int mei_register(struct mei_device *dev);
 void mei_deregister(struct mei_device *dev);
 
-#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d comp=%1d"
+#define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d internal=%1d comp=%1d"
 #define MEI_HDR_PRM(hdr)                  \
 	(hdr)->host_addr, (hdr)->me_addr, \
-	(hdr)->length, (hdr)->msg_complete
+	(hdr)->length, (hdr)->internal, (hdr)->msg_complete
 
 #endif
drivers/misc/mei/wd.c +1 -0
index 9e35421..f70945e 100644
@@ -115,6 +115,7 @@ int mei_wd_send(struct mei_device *dev)
 	hdr.me_addr = dev->wd_cl.me_client_id;
 	hdr.msg_complete = 1;
 	hdr.reserved = 0;
+	hdr.internal = 0;
 
 	if (!memcmp(dev->wd_data, mei_start_wd_params, MEI_WD_HDR_SIZE))
 		hdr.length = MEI_WD_START_MSG_SIZE;
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/2 mei: me: set dma mask using DMA mapping API

In reply to Tomas Winkler

ME device is 64bit DMA capable
We assume both coherent and consistent memory to match

---
 drivers/misc/mei/pci-me.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/misc/mei/pci-me.c +15 -0
index 7dfaa32..8b1deea 100644
@@ -144,6 +144,21 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		dev_err(&pdev->dev, "failed to get pci regions.\n");
 		goto disable_device;
 	}
+
+	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) ||
+	    dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+
+		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+		if (err)
+			err = dma_set_coherent_mask(&pdev->dev,
+						    DMA_BIT_MASK(32));
+	}
+	if (err) {
+		dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
+		goto release_regions;
+	}
+
+
 	/* allocates and initializes the mei dev structure */
 	dev = mei_me_dev_init(pdev);
 	if (!dev) {
Signature · 1 line
1.8.3.1