Commit 9fc5f0f8 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman

mei: cleanup slots to data conversions

Cleanup conversions between slots and data.
Define MEI_SLOT_SIZE instead of using 4 or sizeof(u32) across
the source code.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 670d198b
...@@ -1597,7 +1597,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb, ...@@ -1597,7 +1597,7 @@ int mei_cl_irq_write(struct mei_cl *cl, struct mei_cl_cb *cb,
/* Split the message only if we can write the whole host buffer */ /* Split the message only if we can write the whole host buffer */
} else if ((u32)slots == dev->hbuf_depth) { } else if ((u32)slots == dev->hbuf_depth) {
msg_slots = slots; msg_slots = slots;
len = (slots * sizeof(u32)) - sizeof(struct mei_msg_hdr); len = mei_slots2data(slots) - sizeof(struct mei_msg_hdr);
mei_hdr.length = len; mei_hdr.length = len;
mei_hdr.msg_complete = 0; mei_hdr.msg_complete = 0;
} else { } else {
......
...@@ -511,7 +511,7 @@ static int mei_me_hbuf_empty_slots(struct mei_device *dev) ...@@ -511,7 +511,7 @@ static int mei_me_hbuf_empty_slots(struct mei_device *dev)
*/ */
static size_t mei_me_hbuf_max_len(const struct mei_device *dev) static size_t mei_me_hbuf_max_len(const struct mei_device *dev)
{ {
return dev->hbuf_depth * sizeof(u32) - sizeof(struct mei_msg_hdr); return mei_slots2data(dev->hbuf_depth) - sizeof(struct mei_msg_hdr);
} }
...@@ -549,7 +549,7 @@ static int mei_me_hbuf_write(struct mei_device *dev, ...@@ -549,7 +549,7 @@ static int mei_me_hbuf_write(struct mei_device *dev,
mei_me_hcbww_write(dev, *((u32 *) header)); mei_me_hcbww_write(dev, *((u32 *) header));
for (i = 0; i < length / 4; i++) for (i = 0; i < length / MEI_SLOT_SIZE; i++)
mei_me_hcbww_write(dev, reg_buf[i]); mei_me_hcbww_write(dev, reg_buf[i]);
rem = length & 0x3; rem = length & 0x3;
...@@ -604,11 +604,11 @@ static int mei_me_count_full_read_slots(struct mei_device *dev) ...@@ -604,11 +604,11 @@ static int mei_me_count_full_read_slots(struct mei_device *dev)
* Return: always 0 * Return: always 0
*/ */
static int mei_me_read_slots(struct mei_device *dev, unsigned char *buffer, static int mei_me_read_slots(struct mei_device *dev, unsigned char *buffer,
unsigned long buffer_length) unsigned long buffer_length)
{ {
u32 *reg_buf = (u32 *)buffer; u32 *reg_buf = (u32 *)buffer;
for (; buffer_length >= sizeof(u32); buffer_length -= sizeof(u32)) for (; buffer_length >= MEI_SLOT_SIZE; buffer_length -= MEI_SLOT_SIZE)
*reg_buf++ = mei_me_mecbrw_read(dev); *reg_buf++ = mei_me_mecbrw_read(dev);
if (buffer_length > 0) { if (buffer_length > 0) {
......
...@@ -682,7 +682,7 @@ static void mei_txe_hw_config(struct mei_device *dev) ...@@ -682,7 +682,7 @@ static void mei_txe_hw_config(struct mei_device *dev)
struct mei_txe_hw *hw = to_txe_hw(dev); struct mei_txe_hw *hw = to_txe_hw(dev);
/* Doesn't change in runtime */ /* Doesn't change in runtime */
dev->hbuf_depth = PAYLOAD_SIZE / 4; dev->hbuf_depth = PAYLOAD_SIZE / MEI_SLOT_SIZE;
hw->aliveness = mei_txe_aliveness_get(dev); hw->aliveness = mei_txe_aliveness_get(dev);
hw->readiness = mei_txe_readiness_get(dev); hw->readiness = mei_txe_readiness_get(dev);
...@@ -766,7 +766,7 @@ static int mei_txe_write(struct mei_device *dev, ...@@ -766,7 +766,7 @@ static int mei_txe_write(struct mei_device *dev,
* *
* @dev: the device structure * @dev: the device structure
* *
* Return: the PAYLOAD_SIZE - 4 * Return: the PAYLOAD_SIZE - header size
*/ */
static size_t mei_txe_hbuf_max_len(const struct mei_device *dev) static size_t mei_txe_hbuf_max_len(const struct mei_device *dev)
{ {
...@@ -797,7 +797,7 @@ static int mei_txe_hbuf_empty_slots(struct mei_device *dev) ...@@ -797,7 +797,7 @@ static int mei_txe_hbuf_empty_slots(struct mei_device *dev)
static int mei_txe_count_full_read_slots(struct mei_device *dev) static int mei_txe_count_full_read_slots(struct mei_device *dev)
{ {
/* read buffers has static size */ /* read buffers has static size */
return PAYLOAD_SIZE / 4; return PAYLOAD_SIZE / MEI_SLOT_SIZE;
} }
/** /**
...@@ -839,7 +839,7 @@ static int mei_txe_read(struct mei_device *dev, ...@@ -839,7 +839,7 @@ static int mei_txe_read(struct mei_device *dev,
dev_dbg(dev->dev, "buffer-length = %lu buf[0]0x%08X\n", dev_dbg(dev->dev, "buffer-length = %lu buf[0]0x%08X\n",
len, mei_txe_out_data_read(dev, 0)); len, mei_txe_out_data_read(dev, 0));
for (i = 0; i < len / 4; i++) { for (i = 0; i < len / MEI_SLOT_SIZE; i++) {
/* skip header: index starts from 1 */ /* skip header: index starts from 1 */
reg = mei_txe_out_data_read(dev, i + 1); reg = mei_txe_out_data_read(dev, i + 1);
dev_dbg(dev->dev, "buf[%d] = 0x%08X\n", i, reg); dev_dbg(dev->dev, "buf[%d] = 0x%08X\n", i, reg);
......
...@@ -26,7 +26,9 @@ ...@@ -26,7 +26,9 @@
#include "hw.h" #include "hw.h"
#include "hbm.h" #include "hbm.h"
#define MEI_RD_MSG_BUF_SIZE (128 * sizeof(u32)) #define MEI_SLOT_SIZE sizeof(u32)
#define MEI_RD_MSG_BUF_SIZE (128 * MEI_SLOT_SIZE)
/* /*
* Number of Maximum MEI Clients * Number of Maximum MEI Clients
...@@ -540,7 +542,7 @@ static inline unsigned long mei_secs_to_jiffies(unsigned long sec) ...@@ -540,7 +542,7 @@ static inline unsigned long mei_secs_to_jiffies(unsigned long sec)
*/ */
static inline u32 mei_data2slots(size_t length) static inline u32 mei_data2slots(size_t length)
{ {
return DIV_ROUND_UP(sizeof(struct mei_msg_hdr) + length, 4); return DIV_ROUND_UP(sizeof(struct mei_msg_hdr) + length, MEI_SLOT_SIZE);
} }
/** /**
...@@ -552,7 +554,7 @@ static inline u32 mei_data2slots(size_t length) ...@@ -552,7 +554,7 @@ static inline u32 mei_data2slots(size_t length)
*/ */
static inline u32 mei_slots2data(int slots) static inline u32 mei_slots2data(int slots)
{ {
return slots * 4; return slots * MEI_SLOT_SIZE;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment