Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NFC: nci: Add NFCEE enabling and disabling support

Browse source 
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: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2015-02-01 22:26:11 +01:00 • committed by Samuel Ortiz
parent af9c8aa67d
commit f7f793f313
4 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/net/nfc/nci.h
View file

@ -284,6 +284,14 @@ struct nci_nfcee_discover_cmd {
__u8 discovery_action; __u8 discovery_action;
} __packed; } __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 ---- */ /* ---- NCI Responses ---- */
/* ----------------------- */ /* ----------------------- */
@ -333,6 +341,7 @@ struct nci_nfcee_discover_rsp {
__u8 num_nfcee; __u8 num_nfcee;
} __packed; } __packed;
#define NCI_OP_NFCEE_MODE_SET_RSP nci_opcode_pack(NCI_GID_NFCEE_MGMT, 0x01)
/* --------------------------- */ /* --------------------------- */
/* ---- NCI Notifications ---- */ /* ---- NCI Notifications ---- */
/* --------------------------- */ /* --------------------------- */

1
include/net/nfc/nci_core.h
View file

@ -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_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_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, static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev,
unsigned int len, unsigned int len,

21
net/nfc/nci/core.c
View file

@ -486,6 +486,27 @@ int nci_nfcee_discover(struct nci_dev *ndev, u8 action)
} }
EXPORT_SYMBOL(nci_nfcee_discover); 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) static int nci_set_local_general_bytes(struct nfc_dev *nfc_dev)
{ {
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev); struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);

13
net/nfc/nci/rsp.c
View file

@ -213,6 +213,15 @@ static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev,
nci_req_complete(ndev, discover_rsp->status); 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) void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
{ {
__u16 rsp_opcode = nci_opcode(skb->data); __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); nci_nfcee_discover_rsp_packet(ndev, skb);
break; break;
case NCI_OP_NFCEE_MODE_SET_RSP:
nci_nfcee_mode_set_rsp_packet(ndev, skb);
break;
default: default:
pr_err("unknown rsp opcode 0x%x\n", rsp_opcode); pr_err("unknown rsp opcode 0x%x\n", rsp_opcode);
break; break;