|
|
@@ -33,12 +33,12 @@ int saa7164_bus_setup(struct saa7164_dev *dev)
|
|
|
b->Type = TYPE_BUS_PCIe;
|
|
|
b->m_wMaxReqSize = SAA_DEVICE_MAXREQUESTSIZE;
|
|
|
|
|
|
- b->m_pdwSetRing = (u8 *)(dev->bmmio +
|
|
|
+ b->m_pdwSetRing = (u8 __iomem *)(dev->bmmio +
|
|
|
((u32)dev->busdesc.CommandRing));
|
|
|
|
|
|
b->m_dwSizeSetRing = SAA_DEVICE_BUFFERBLOCKSIZE;
|
|
|
|
|
|
- b->m_pdwGetRing = (u8 *)(dev->bmmio +
|
|
|
+ b->m_pdwGetRing = (u8 __iomem *)(dev->bmmio +
|
|
|
((u32)dev->busdesc.ResponseRing));
|
|
|
|
|
|
b->m_dwSizeGetRing = SAA_DEVICE_BUFFERBLOCKSIZE;
|
|
|
@@ -138,6 +138,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
u32 bytes_to_write, free_write_space, timeout, curr_srp, curr_swp;
|
|
|
u32 new_swp, space_rem;
|
|
|
int ret = SAA_ERR_BAD_PARAMETER;
|
|
|
+ u16 size;
|
|
|
|
|
|
if (!msg) {
|
|
|
printk(KERN_ERR "%s() !msg\n", __func__);
|
|
|
@@ -148,10 +149,6 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
|
|
|
saa7164_bus_verify(dev);
|
|
|
|
|
|
- msg->size = cpu_to_le16(msg->size);
|
|
|
- msg->command = cpu_to_le32(msg->command);
|
|
|
- msg->controlselector = cpu_to_le16(msg->controlselector);
|
|
|
-
|
|
|
if (msg->size > dev->bus.m_wMaxReqSize) {
|
|
|
printk(KERN_ERR "%s() Exceeded dev->bus.m_wMaxReqSize\n",
|
|
|
__func__);
|
|
|
@@ -169,8 +166,8 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
bytes_to_write = sizeof(*msg) + msg->size;
|
|
|
free_write_space = 0;
|
|
|
timeout = SAA_BUS_TIMEOUT;
|
|
|
- curr_srp = le32_to_cpu(saa7164_readl(bus->m_dwSetReadPos));
|
|
|
- curr_swp = le32_to_cpu(saa7164_readl(bus->m_dwSetWritePos));
|
|
|
+ curr_srp = saa7164_readl(bus->m_dwSetReadPos);
|
|
|
+ curr_swp = saa7164_readl(bus->m_dwSetWritePos);
|
|
|
|
|
|
/* Deal with ring wrapping issues */
|
|
|
if (curr_srp > curr_swp)
|
|
|
@@ -203,7 +200,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
mdelay(1);
|
|
|
|
|
|
/* Check the space usage again */
|
|
|
- curr_srp = le32_to_cpu(saa7164_readl(bus->m_dwSetReadPos));
|
|
|
+ curr_srp = saa7164_readl(bus->m_dwSetReadPos);
|
|
|
|
|
|
/* Deal with ring wrapping issues */
|
|
|
if (curr_srp > curr_swp)
|
|
|
@@ -223,6 +220,16 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
dprintk(DBGLVL_BUS, "%s() bus->m_dwSizeSetRing = %x\n", __func__,
|
|
|
bus->m_dwSizeSetRing);
|
|
|
|
|
|
+ /*
|
|
|
+ * Make a copy of msg->size before it is converted to le16 since it is
|
|
|
+ * used in the code below.
|
|
|
+ */
|
|
|
+ size = msg->size;
|
|
|
+ /* Convert to le16/le32 */
|
|
|
+ msg->size = (__force u16)cpu_to_le16(msg->size);
|
|
|
+ msg->command = (__force u32)cpu_to_le32(msg->command);
|
|
|
+ msg->controlselector = (__force u16)cpu_to_le16(msg->controlselector);
|
|
|
+
|
|
|
/* Mental Note: line 462 tmmhComResBusPCIe.cpp */
|
|
|
|
|
|
/* Check if we're going to wrap again */
|
|
|
@@ -243,28 +250,28 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
dprintk(DBGLVL_BUS, "%s() tr4\n", __func__);
|
|
|
|
|
|
/* Split the msg into pieces as the ring wraps */
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp, msg, space_rem);
|
|
|
- memcpy(bus->m_pdwSetRing, (u8 *)msg + space_rem,
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, space_rem);
|
|
|
+ memcpy_toio(bus->m_pdwSetRing, (u8 *)msg + space_rem,
|
|
|
sizeof(*msg) - space_rem);
|
|
|
|
|
|
- memcpy(bus->m_pdwSetRing + sizeof(*msg) - space_rem,
|
|
|
- buf, msg->size);
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + sizeof(*msg) - space_rem,
|
|
|
+ buf, size);
|
|
|
|
|
|
} else if (space_rem == sizeof(*msg)) {
|
|
|
dprintk(DBGLVL_BUS, "%s() tr5\n", __func__);
|
|
|
|
|
|
/* Additional data at the beginning of the ring */
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
- memcpy(bus->m_pdwSetRing, buf, msg->size);
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
+ memcpy_toio(bus->m_pdwSetRing, buf, size);
|
|
|
|
|
|
} else {
|
|
|
/* Additional data wraps around the ring */
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
- if (msg->size > 0) {
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp +
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
+ if (size > 0) {
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp +
|
|
|
sizeof(*msg), buf, space_rem -
|
|
|
sizeof(*msg));
|
|
|
- memcpy(bus->m_pdwSetRing, (u8 *)buf +
|
|
|
+ memcpy_toio(bus->m_pdwSetRing, (u8 *)buf +
|
|
|
space_rem - sizeof(*msg),
|
|
|
bytes_to_write - space_rem);
|
|
|
}
|
|
|
@@ -276,15 +283,20 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
dprintk(DBGLVL_BUS, "%s() tr6\n", __func__);
|
|
|
|
|
|
/* The ring buffer doesn't wrap, two simple copies */
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
- memcpy(bus->m_pdwSetRing + curr_swp + sizeof(*msg), buf,
|
|
|
- msg->size);
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
|
|
|
+ memcpy_toio(bus->m_pdwSetRing + curr_swp + sizeof(*msg), buf,
|
|
|
+ size);
|
|
|
}
|
|
|
|
|
|
dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
|
|
|
|
|
|
/* Update the bus write position */
|
|
|
- saa7164_writel(bus->m_dwSetWritePos, cpu_to_le32(new_swp));
|
|
|
+ saa7164_writel(bus->m_dwSetWritePos, new_swp);
|
|
|
+
|
|
|
+ /* Convert back to cpu after writing the msg to the ringbuffer. */
|
|
|
+ msg->size = le16_to_cpu((__force __le16)msg->size);
|
|
|
+ msg->command = le32_to_cpu((__force __le32)msg->command);
|
|
|
+ msg->controlselector = le16_to_cpu((__force __le16)msg->controlselector);
|
|
|
ret = SAA_OK;
|
|
|
|
|
|
out:
|
|
|
@@ -336,8 +348,8 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
/* Peek the bus to see if a msg exists, if it's not what we're expecting
|
|
|
* then return cleanly else read the message from the bus.
|
|
|
*/
|
|
|
- curr_gwp = le32_to_cpu(saa7164_readl(bus->m_dwGetWritePos));
|
|
|
- curr_grp = le32_to_cpu(saa7164_readl(bus->m_dwGetReadPos));
|
|
|
+ curr_gwp = saa7164_readl(bus->m_dwGetWritePos);
|
|
|
+ curr_grp = saa7164_readl(bus->m_dwGetReadPos);
|
|
|
|
|
|
if (curr_gwp == curr_grp) {
|
|
|
ret = SAA_ERR_EMPTY;
|
|
|
@@ -369,14 +381,18 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
new_grp -= bus->m_dwSizeGetRing;
|
|
|
space_rem = bus->m_dwSizeGetRing - curr_grp;
|
|
|
|
|
|
- memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, space_rem);
|
|
|
- memcpy((u8 *)&msg_tmp + space_rem, bus->m_pdwGetRing,
|
|
|
+ memcpy_fromio(&msg_tmp, bus->m_pdwGetRing + curr_grp, space_rem);
|
|
|
+ memcpy_fromio((u8 *)&msg_tmp + space_rem, bus->m_pdwGetRing,
|
|
|
bytes_to_read - space_rem);
|
|
|
|
|
|
} else {
|
|
|
/* No wrapping */
|
|
|
- memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, bytes_to_read);
|
|
|
+ memcpy_fromio(&msg_tmp, bus->m_pdwGetRing + curr_grp, bytes_to_read);
|
|
|
}
|
|
|
+ /* Convert from little endian to CPU */
|
|
|
+ msg_tmp.size = le16_to_cpu((__force __le16)msg_tmp.size);
|
|
|
+ msg_tmp.command = le32_to_cpu((__force __le32)msg_tmp.command);
|
|
|
+ msg_tmp.controlselector = le16_to_cpu((__force __le16)msg_tmp.controlselector);
|
|
|
|
|
|
/* No need to update the read positions, because this was a peek */
|
|
|
/* If the caller specifically want to peek, return */
|
|
|
@@ -427,24 +443,24 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
|
|
|
if (space_rem < sizeof(*msg)) {
|
|
|
/* msg wraps around the ring */
|
|
|
- memcpy(msg, bus->m_pdwGetRing + curr_grp, space_rem);
|
|
|
- memcpy((u8 *)msg + space_rem, bus->m_pdwGetRing,
|
|
|
+ memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, space_rem);
|
|
|
+ memcpy_fromio((u8 *)msg + space_rem, bus->m_pdwGetRing,
|
|
|
sizeof(*msg) - space_rem);
|
|
|
if (buf)
|
|
|
- memcpy(buf, bus->m_pdwGetRing + sizeof(*msg) -
|
|
|
+ memcpy_fromio(buf, bus->m_pdwGetRing + sizeof(*msg) -
|
|
|
space_rem, buf_size);
|
|
|
|
|
|
} else if (space_rem == sizeof(*msg)) {
|
|
|
- memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
+ memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
if (buf)
|
|
|
- memcpy(buf, bus->m_pdwGetRing, buf_size);
|
|
|
+ memcpy_fromio(buf, bus->m_pdwGetRing, buf_size);
|
|
|
} else {
|
|
|
/* Additional data wraps around the ring */
|
|
|
- memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
+ memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
if (buf) {
|
|
|
- memcpy(buf, bus->m_pdwGetRing + curr_grp +
|
|
|
+ memcpy_fromio(buf, bus->m_pdwGetRing + curr_grp +
|
|
|
sizeof(*msg), space_rem - sizeof(*msg));
|
|
|
- memcpy(buf + space_rem - sizeof(*msg),
|
|
|
+ memcpy_fromio(buf + space_rem - sizeof(*msg),
|
|
|
bus->m_pdwGetRing, bytes_to_read -
|
|
|
space_rem);
|
|
|
}
|
|
|
@@ -453,19 +469,20 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
|
|
|
|
|
|
} else {
|
|
|
/* No wrapping */
|
|
|
- memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
+ memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
|
|
|
if (buf)
|
|
|
- memcpy(buf, bus->m_pdwGetRing + curr_grp + sizeof(*msg),
|
|
|
+ memcpy_fromio(buf, bus->m_pdwGetRing + curr_grp + sizeof(*msg),
|
|
|
buf_size);
|
|
|
}
|
|
|
+ /* Convert from little endian to CPU */
|
|
|
+ msg->size = le16_to_cpu((__force __le16)msg->size);
|
|
|
+ msg->command = le32_to_cpu((__force __le32)msg->command);
|
|
|
+ msg->controlselector = le16_to_cpu((__force __le16)msg->controlselector);
|
|
|
|
|
|
/* Update the read positions, adjusting the ring */
|
|
|
- saa7164_writel(bus->m_dwGetReadPos, cpu_to_le32(new_grp));
|
|
|
+ saa7164_writel(bus->m_dwGetReadPos, new_grp);
|
|
|
|
|
|
peekout:
|
|
|
- msg->size = le16_to_cpu(msg->size);
|
|
|
- msg->command = le32_to_cpu(msg->command);
|
|
|
- msg->controlselector = le16_to_cpu(msg->controlselector);
|
|
|
ret = SAA_OK;
|
|
|
out:
|
|
|
mutex_unlock(&bus->lock);
|
Hans Verkuil