Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7f793f3 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: nci: Add NFCEE enabling and disabling support 



NFCEEs can be enabled or disabled by sending the
NCI_OP_NFCEE_MODE_SET_CMD command to the NFCC. This patch
provides an API for drivers to enable and disable e.g. their
NCI discoveredd secure elements.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent af9c8aa6

include/net/nfc/nci.h

+9 −0
Original line number Diff line number Diff line
@@ -284,6 +284,14 @@ struct nci_nfcee_discover_cmd { 
	__u8	discovery_action;

} __packed;



#define NCI_OP_NFCEE_MODE_SET_CMD nci_opcode_pack(NCI_GID_NFCEE_MGMT, 0x01)

#define NCI_NFCEE_DISABLE	0x00

#define NCI_NFCEE_ENABLE	0x01

struct nci_nfcee_mode_set_cmd {

	__u8	nfcee_id;

	__u8	nfcee_mode;

} __packed;



/* ----------------------- */

/* ---- NCI Responses ---- */

/* ----------------------- */
@@ -333,6 +341,7 @@ struct nci_nfcee_discover_rsp { 
	__u8	num_nfcee;

} __packed;



#define NCI_OP_NFCEE_MODE_SET_RSP nci_opcode_pack(NCI_GID_NFCEE_MGMT, 0x01)

/* --------------------------- */

/* ---- NCI Notifications ---- */

/* --------------------------- */

include/net/nfc/nci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb); 
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val);



int nci_nfcee_discover(struct nci_dev *ndev, u8 action);

int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode);



static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev,

					    unsigned int len,

net/nfc/nci/core.c

+21 −0
Original line number Diff line number Diff line
@@ -486,6 +486,27 @@ int nci_nfcee_discover(struct nci_dev *ndev, u8 action) 
}

EXPORT_SYMBOL(nci_nfcee_discover);



static void nci_nfcee_mode_set_req(struct nci_dev *ndev, unsigned long opt)

{

	struct nci_nfcee_mode_set_cmd *cmd =

					(struct nci_nfcee_mode_set_cmd *)opt;



	nci_send_cmd(ndev, NCI_OP_NFCEE_MODE_SET_CMD,

		     sizeof(struct nci_nfcee_mode_set_cmd), cmd);

}



int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode)

{

	struct nci_nfcee_mode_set_cmd cmd;



	cmd.nfcee_id = nfcee_id;

	cmd.nfcee_mode = nfcee_mode;



	return nci_request(ndev, nci_nfcee_mode_set_req, (unsigned long)&cmd,

			   msecs_to_jiffies(NCI_CMD_TIMEOUT));

}

EXPORT_SYMBOL(nci_nfcee_mode_set);



static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev)

{

	struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

net/nfc/nci/rsp.c

+13 −0
Original line number Diff line number Diff line
@@ -213,6 +213,15 @@ static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev, 
		nci_req_complete(ndev, discover_rsp->status);

}



static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev,

					  struct sk_buff *skb)

{

	__u8 status = skb->data[0];



	pr_debug("status 0x%x\n", status);

	nci_req_complete(ndev, status);

}



void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)

{

	__u16 rsp_opcode = nci_opcode(skb->data);
@@ -262,6 +271,10 @@ void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb) 
		nci_nfcee_discover_rsp_packet(ndev, skb);

		break;



	case NCI_OP_NFCEE_MODE_SET_RSP:

		nci_nfcee_mode_set_rsp_packet(ndev, skb);

		break;



	default:

		pr_err("unknown rsp opcode 0x%x\n", rsp_opcode);

		break;