Commit 1d3ff767 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

NFC: mei_phy: adjust mei nfc header according the spec 



1. mei_nfc_hci_hdr and mei_nfc_hdr are just the same thing so drop one
2. use mei_nfc_hdr structure as the member of the command and the reply
instead of replicating all header fields.
3. dump the header for easier debugging

Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4b78c72

drivers/nfc/mei_phy.c

+31 −27
Original line number Original line Diff line number Diff line
@@ -24,22 +24,22 @@ 




#include "mei_phy.h"

#include "mei_phy.h"





struct mei_nfc_cmd {

struct mei_nfc_hdr {

	u8 command;

	u8 cmd;

	u8 status;

	u8 status;

	u16 req_id;

	u16 req_id;

	u32 reserved;

	u32 reserved;

	u16 data_size;

	u16 data_size;

} __packed;



struct mei_nfc_cmd {

	struct mei_nfc_hdr hdr;

	u8 sub_command;

	u8 sub_command;

	u8 data[];

	u8 data[];

} __packed;

} __packed;





struct mei_nfc_reply {

struct mei_nfc_reply {

	u8 command;

	struct mei_nfc_hdr hdr;

	u8 status;

	u16 req_id;

	u32 reserved;

	u16 data_size;

	u8 sub_command;

	u8 sub_command;

	u8 reply_status;

	u8 reply_status;

	u8 data[];

	u8 data[];
@@ -69,13 +69,6 @@ struct mei_nfc_connect_resp { 
	u16 me_build;

	u16 me_build;

} __packed;

} __packed;





struct mei_nfc_hci_hdr {

	u8 cmd;

	u8 status;

	u16 req_id;

	u32 reserved;

	u16 data_size;

} __packed;





#define MEI_NFC_CMD_MAINTENANCE 0x00

#define MEI_NFC_CMD_MAINTENANCE 0x00

#define MEI_NFC_CMD_HCI_SEND 0x01

#define MEI_NFC_CMD_HCI_SEND 0x01
@@ -84,9 +77,6 @@ struct mei_nfc_hci_hdr { 
#define MEI_NFC_SUBCMD_CONNECT    0x00

#define MEI_NFC_SUBCMD_CONNECT    0x00

#define MEI_NFC_SUBCMD_IF_VERSION 0x01

#define MEI_NFC_SUBCMD_IF_VERSION 0x01





#define MEI_NFC_HEADER_SIZE 10





#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)

#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)





#define MEI_DUMP_SKB_IN(info, skb)				\

#define MEI_DUMP_SKB_IN(info, skb)				\
@@ -103,6 +93,13 @@ do { \ 
			16, 1, (skb)->data, (skb)->len, false);	\

			16, 1, (skb)->data, (skb)->len, false);	\

} while (0)

} while (0)





#define MEI_DUMP_NFC_HDR(info, _hdr)                                \

do {                                                                \

	pr_debug("%s:\n", info);                                    \

	pr_debug("cmd=%02d status=%d req_id=%d rsvd=%d size=%d\n",  \

		 (_hdr)->cmd, (_hdr)->status, (_hdr)->req_id,       \

		 (_hdr)->reserved, (_hdr)->data_size);              \

} while (0)





static int mei_nfc_if_version(struct nfc_mei_phy *phy)

static int mei_nfc_if_version(struct nfc_mei_phy *phy)

{

{
@@ -116,10 +113,11 @@ static int mei_nfc_if_version(struct nfc_mei_phy *phy) 
	pr_info("%s\n", __func__);

	pr_info("%s\n", __func__);





	memset(&cmd, 0, sizeof(struct mei_nfc_cmd));

	memset(&cmd, 0, sizeof(struct mei_nfc_cmd));

	cmd.command = MEI_NFC_CMD_MAINTENANCE;

	cmd.hdr.cmd = MEI_NFC_CMD_MAINTENANCE;

	cmd.data_size = 1;

	cmd.hdr.data_size = 1;

	cmd.sub_command = MEI_NFC_SUBCMD_IF_VERSION;

	cmd.sub_command = MEI_NFC_SUBCMD_IF_VERSION;





	MEI_DUMP_NFC_HDR("version", &cmd.hdr);

	r = mei_cl_send(phy->device, (u8 *)&cmd, sizeof(struct mei_nfc_cmd));

	r = mei_cl_send(phy->device, (u8 *)&cmd, sizeof(struct mei_nfc_cmd));

	if (r < 0) {

	if (r < 0) {

		pr_err("Could not send IF version cmd\n");

		pr_err("Could not send IF version cmd\n");
@@ -181,12 +179,13 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) 




	connect_resp = (struct mei_nfc_connect_resp *)reply->data;

	connect_resp = (struct mei_nfc_connect_resp *)reply->data;





	cmd->command = MEI_NFC_CMD_MAINTENANCE;

	cmd->hdr.cmd = MEI_NFC_CMD_MAINTENANCE;

	cmd->data_size = 3;

	cmd->hdr.data_size = 3;

	cmd->sub_command = MEI_NFC_SUBCMD_CONNECT;

	cmd->sub_command = MEI_NFC_SUBCMD_CONNECT;

	connect->fw_ivn = phy->fw_ivn;

	connect->fw_ivn = phy->fw_ivn;

	connect->vendor_id = phy->vendor_id;

	connect->vendor_id = phy->vendor_id;





	MEI_DUMP_NFC_HDR("connect request", &cmd->hdr);

	r = mei_cl_send(phy->device, (u8 *)cmd, connect_length);

	r = mei_cl_send(phy->device, (u8 *)cmd, connect_length);

	if (r < 0) {

	if (r < 0) {

		pr_err("Could not send connect cmd %d\n", r);

		pr_err("Could not send connect cmd %d\n", r);
@@ -200,6 +199,8 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) 
		goto err;

		goto err;

	}

	}





	MEI_DUMP_NFC_HDR("connect reply", &reply->hdr);



	pr_info("IVN 0x%x Vendor ID 0x%x\n",

	pr_info("IVN 0x%x Vendor ID 0x%x\n",

		 connect_resp->fw_ivn, connect_resp->vendor_id);

		 connect_resp->fw_ivn, connect_resp->vendor_id);
@@ -218,7 +219,7 @@ static int mei_nfc_connect(struct nfc_mei_phy *phy) 




static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length)

static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length)

{

{

	struct mei_nfc_hci_hdr *hdr;

	struct mei_nfc_hdr *hdr;

	u8 *mei_buf;

	u8 *mei_buf;

	int err;

	int err;
@@ -227,13 +228,15 @@ static int mei_nfc_send(struct nfc_mei_phy *phy, u8 *buf, size_t length) 
	if (!mei_buf)

	if (!mei_buf)

		goto out;

		goto out;





	hdr = (struct mei_nfc_hci_hdr *) mei_buf;

	hdr = (struct mei_nfc_hdr *)mei_buf;

	hdr->cmd = MEI_NFC_CMD_HCI_SEND;

	hdr->cmd = MEI_NFC_CMD_HCI_SEND;

	hdr->status = 0;

	hdr->status = 0;

	hdr->req_id = phy->req_id;

	hdr->req_id = phy->req_id;

	hdr->reserved = 0;

	hdr->reserved = 0;

	hdr->data_size = length;

	hdr->data_size = length;





	MEI_DUMP_NFC_HDR("send", hdr);



	memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);

	memcpy(mei_buf + MEI_NFC_HEADER_SIZE, buf, length);

	err = mei_cl_send(phy->device, mei_buf, length + MEI_NFC_HEADER_SIZE);

	err = mei_cl_send(phy->device, mei_buf, length + MEI_NFC_HEADER_SIZE);

	if (err < 0)

	if (err < 0)
@@ -272,17 +275,18 @@ static int nfc_mei_phy_write(void *phy_id, struct sk_buff *skb) 




static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)

static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)

{

{

	struct mei_nfc_hci_hdr *hci_hdr;

	struct mei_nfc_hdr *hdr;

	int received_length;

	int received_length;





	received_length = mei_cl_recv(phy->device, buf, length);

	received_length = mei_cl_recv(phy->device, buf, length);

	if (received_length < 0)

	if (received_length < 0)

		return received_length;

		return received_length;





	hci_hdr = (struct mei_nfc_hci_hdr *) buf;

	hdr = (struct mei_nfc_hdr *) buf;





	if (hci_hdr->cmd == MEI_NFC_CMD_HCI_SEND) {

	MEI_DUMP_NFC_HDR("receive", hdr);

		phy->recv_req_id = hci_hdr->req_id;

	if (hdr->cmd == MEI_NFC_CMD_HCI_SEND) {

		phy->recv_req_id = hdr->req_id;

		wake_up(&phy->send_wq);

		wake_up(&phy->send_wq);





		return 0;

		return 0;