leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qualcomm ARM Based SoC Updates for v4.7 part 2

Browse Source 
* Change SMD callback parameters
 * Use writecombine mapping for SMEM
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXFvdZAAoJEFKiBbHx2RXVxPQQAJnEp1+5CDN7ziQ/zJ3juSxb
 b7rOr5Z0qMDhh0H9BFdmhGzFctbY0AOqerfh138pXa6KN7maXT/enUE4vvtWUp1B
 HCr9xt13waoa8e6umj/D1qU5mMLUX+JraVkIo6Dyd1g6pVmdrbwzP+Z0tW0x7CvW
 n5r9eDYts66vGbQ6xzK40rTi22sEN32AY4mezKj40L8o0NvfZCCwb3dfw2RQzLHK
 0KnSQ0PKqU1ZWrDc2YuvRsyh5KGv+t8vvnpMVVUi4TRx3qzoGpHpH3fE3evvMGKY
 ya6nmFNFPZ+ZlzsGDx10RqLu58NmjS8LXY6O+yCGy9NPuonKpwHgYD2wxut2NR/W
 TTtMhvJWKNIwhXR8ZRDaVBWQJBwoLvpNQT1zOIUuUKf+SZ2DbfgVpte7NZvrgEka
 aY4nnZMbI0MvpaAHUtllWbC4xqMQJXY+4wrahKQgKF/l5H/0XQ99fHHz86DS9LCO
 y+dfmU98dv/1X8qmxNfsULtJwbxi2Xwzt3MMMZb5v138STyMWeqWOLm+KGzgs1hu
 Pc/RLQALdJpQEcg74s5xt2yxSqRuzDig7FtRT1a2SX33vi9YohQEgXCDe+IOJC5l
 sm1Ppi3oO/yUcocUDFTBz/g6zD4SWywu2gmBcZIh/JVy8Sd053WwlaKs1Nld6ta7
 QPx6rga7lgrYW409RS2A
 =Jzqj
 -----END PGP SIGNATURE-----

Merge tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Merge "Qualcomm ARM Based SoC Updates for v4.7 part 2" from Andy Gross:

* Change SMD callback parameters
* Use writecombine mapping for SMEM

* tag 'qcom-soc-for-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  soc: qcom: smd: Make callback pass channel reference
  soc: qcom: smem: Use write-combine remap for SMEM
This commit is contained in:
Arnd Bergmann 2016-04-25 23:50:41 +02:00
commit d3e2442b51
5 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/soc/qcom/smd-rpm.c
View File

@ -33,6 +33,7 @@
*/ */
struct qcom_smd_rpm { struct qcom_smd_rpm {
struct qcom_smd_channel *rpm_channel; struct qcom_smd_channel *rpm_channel;
struct device *dev;
struct completion ack; struct completion ack;
struct mutex lock; struct mutex lock;
@ -149,14 +150,14 @@ out:
} }
EXPORT_SYMBOL(qcom_rpm_smd_write); EXPORT_SYMBOL(qcom_rpm_smd_write);
static int qcom_smd_rpm_callback(struct qcom_smd_device *qsdev, static int qcom_smd_rpm_callback(struct qcom_smd_channel *channel,
const void *data, const void *data,
size_t count) size_t count)
{ {
const struct qcom_rpm_header *hdr = data; const struct qcom_rpm_header *hdr = data;
size_t hdr_length = le32_to_cpu(hdr->length); size_t hdr_length = le32_to_cpu(hdr->length);
const struct qcom_rpm_message *msg; const struct qcom_rpm_message *msg;
struct qcom_smd_rpm *rpm = dev_get_drvdata(&qsdev->dev); struct qcom_smd_rpm *rpm = qcom_smd_get_drvdata(channel);
const u8 *buf = data + sizeof(struct qcom_rpm_header); const u8 *buf = data + sizeof(struct qcom_rpm_header);
const u8 *end = buf + hdr_length; const u8 *end = buf + hdr_length;
char msgbuf[32]; char msgbuf[32];
@ -165,7 +166,7 @@ static int qcom_smd_rpm_callback(struct qcom_smd_device *qsdev,
if (le32_to_cpu(hdr->service_type) != RPM_SERVICE_TYPE_REQUEST || if (le32_to_cpu(hdr->service_type) != RPM_SERVICE_TYPE_REQUEST ||
hdr_length < sizeof(struct qcom_rpm_message)) { hdr_length < sizeof(struct qcom_rpm_message)) {
dev_err(&qsdev->dev, "invalid request\n"); dev_err(rpm->dev, "invalid request\n");
return 0; return 0;
} }
@ -206,7 +207,9 @@ static int qcom_smd_rpm_probe(struct qcom_smd_device *sdev)
mutex_init(&rpm->lock); mutex_init(&rpm->lock);
init_completion(&rpm->ack); init_completion(&rpm->ack);
rpm->dev = &sdev->dev;
rpm->rpm_channel = sdev->channel; rpm->rpm_channel = sdev->channel;
qcom_smd_set_drvdata(sdev->channel, rpm);
dev_set_drvdata(&sdev->dev, rpm); dev_set_drvdata(&sdev->dev, rpm);

22
drivers/soc/qcom/smd.c
View File

@ -194,6 +194,8 @@ struct qcom_smd_channel {
int pkt_size; int pkt_size;
void *drvdata;
struct list_head list; struct list_head list;
struct list_head dev_list; struct list_head dev_list;
}; };
@ -513,7 +515,6 @@ static void qcom_smd_channel_advance(struct qcom_smd_channel *channel,
*/ */
static int qcom_smd_channel_recv_single(struct qcom_smd_channel *channel) static int qcom_smd_channel_recv_single(struct qcom_smd_channel *channel)
{ {
struct qcom_smd_device *qsdev = channel->qsdev;
unsigned tail; unsigned tail;
size_t len; size_t len;
void *ptr; void *ptr;
@ -533,7 +534,7 @@ static int qcom_smd_channel_recv_single(struct qcom_smd_channel *channel)
len = channel->pkt_size; len = channel->pkt_size;
} }
ret = channel->cb(qsdev, ptr, len); ret = channel->cb(channel, ptr, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1034,6 +1035,18 @@ int qcom_smd_driver_register(struct qcom_smd_driver *qsdrv)
} }
EXPORT_SYMBOL(qcom_smd_driver_register); EXPORT_SYMBOL(qcom_smd_driver_register);
void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel)
{
return channel->drvdata;
}
EXPORT_SYMBOL(qcom_smd_get_drvdata);
void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data)
{
channel->drvdata = data;
}
EXPORT_SYMBOL(qcom_smd_set_drvdata);
/** /**
* qcom_smd_driver_unregister - unregister a smd driver * qcom_smd_driver_unregister - unregister a smd driver
* @qsdrv: qcom_smd_driver struct * @qsdrv: qcom_smd_driver struct
@ -1079,12 +1092,13 @@ qcom_smd_find_channel(struct qcom_smd_edge *edge, const char *name)
* Returns a channel handle on success, or -EPROBE_DEFER if the channel isn't * Returns a channel handle on success, or -EPROBE_DEFER if the channel isn't
* ready. * ready.
*/ */
struct qcom_smd_channel *qcom_smd_open_channel(struct qcom_smd_device *sdev, struct qcom_smd_channel *qcom_smd_open_channel(struct qcom_smd_channel *parent,
const char *name, const char *name,
qcom_smd_cb_t cb) qcom_smd_cb_t cb)
{ {
struct qcom_smd_channel *channel; struct qcom_smd_channel *channel;
struct qcom_smd_edge *edge = sdev->channel->edge; struct qcom_smd_device *sdev = parent->qsdev;
struct qcom_smd_edge *edge = parent->edge;
int ret; int ret;
/* Wait up to HZ for the channel to appear */ /* Wait up to HZ for the channel to appear */

3
drivers/soc/qcom/smem.c
View File

@ -684,8 +684,7 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev,
smem->regions[i].aux_base = (u32)r.start; smem->regions[i].aux_base = (u32)r.start;
smem->regions[i].size = resource_size(&r); smem->regions[i].size = resource_size(&r);
smem->regions[i].virt_base = devm_ioremap_nocache(dev, r.start, smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, resource_size(&r));
resource_size(&r));
if (!smem->regions[i].virt_base) if (!smem->regions[i].virt_base)
return -ENOMEM; return -ENOMEM;

8
drivers/soc/qcom/wcnss_ctrl.c
View File

@ -100,17 +100,17 @@ struct wcnss_download_nv_resp {
/** /**
* wcnss_ctrl_smd_callback() - handler from SMD responses * wcnss_ctrl_smd_callback() - handler from SMD responses
* @qsdev: smd device handle * @channel: smd channel handle
* @data: pointer to the incoming data packet * @data: pointer to the incoming data packet
* @count: size of the incoming data packet * @count: size of the incoming data packet
* *
* Handles any incoming packets from the remote WCNSS_CTRL service. * Handles any incoming packets from the remote WCNSS_CTRL service.
*/ */
static int wcnss_ctrl_smd_callback(struct qcom_smd_device *qsdev, static int wcnss_ctrl_smd_callback(struct qcom_smd_channel *channel,
const void *data, const void *data,
size_t count) size_t count)
{ {
struct wcnss_ctrl *wcnss = dev_get_drvdata(&qsdev->dev); struct wcnss_ctrl *wcnss = qcom_smd_get_drvdata(channel);
const struct wcnss_download_nv_resp *nvresp; const struct wcnss_download_nv_resp *nvresp;
const struct wcnss_version_resp *version; const struct wcnss_version_resp *version;
const struct wcnss_msg_hdr *hdr = data; const struct wcnss_msg_hdr *hdr = data;
@ -246,7 +246,7 @@ static int wcnss_ctrl_probe(struct qcom_smd_device *sdev)
init_completion(&wcnss->ack); init_completion(&wcnss->ack);
INIT_WORK(&wcnss->download_nv_work, wcnss_download_nv); INIT_WORK(&wcnss->download_nv_work, wcnss_download_nv);
dev_set_drvdata(&sdev->dev, wcnss); qcom_smd_set_drvdata(sdev->channel, wcnss);
return wcnss_request_version(wcnss); return wcnss_request_version(wcnss);
} }

7
include/linux/soc/qcom/smd.h
View File

@ -26,7 +26,7 @@ struct qcom_smd_device {
struct qcom_smd_channel *channel; struct qcom_smd_channel *channel;
}; };
typedef int (*qcom_smd_cb_t)(struct qcom_smd_device *, const void *, size_t); typedef int (*qcom_smd_cb_t)(struct qcom_smd_channel *, const void *, size_t);
/** /**
* struct qcom_smd_driver - smd driver struct * struct qcom_smd_driver - smd driver struct
@ -50,13 +50,16 @@ struct qcom_smd_driver {
int qcom_smd_driver_register(struct qcom_smd_driver *drv); int qcom_smd_driver_register(struct qcom_smd_driver *drv);
void qcom_smd_driver_unregister(struct qcom_smd_driver *drv); void qcom_smd_driver_unregister(struct qcom_smd_driver *drv);
void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel);
void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data);
#define module_qcom_smd_driver(__smd_driver) \ #define module_qcom_smd_driver(__smd_driver) \
module_driver(__smd_driver, qcom_smd_driver_register, \ module_driver(__smd_driver, qcom_smd_driver_register, \
qcom_smd_driver_unregister) qcom_smd_driver_unregister)
int qcom_smd_send(struct qcom_smd_channel *channel, const void *data, int len); int qcom_smd_send(struct qcom_smd_channel *channel, const void *data, int len);
struct qcom_smd_channel *qcom_smd_open_channel(struct qcom_smd_device *sdev, struct qcom_smd_channel *qcom_smd_open_channel(struct qcom_smd_channel *channel,
const char *name, const char *name,
qcom_smd_cb_t cb); qcom_smd_cb_t cb);