Skip to content

Commit

Permalink
NFC: Add secure element enablement internal API
Browse files Browse the repository at this point in the history
Called via netlink, this API will enable or disable a specific secure
element. When a secure element is enabled, it will handle card emulation
and more generically ISO-DEP target mode, i.e. all target mode cases
except for p2p target mode.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Samuel Ortiz committed Jun 14, 2013
1 parent ee656e9 commit c531c9e
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 4 deletions.
110 changes: 106 additions & 4 deletions net/nfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,108 @@ int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,
return rc;
}

static struct nfc_se *find_se(struct nfc_dev *dev, u32 se_idx)
{
struct nfc_se *se, *n;

list_for_each_entry_safe(se, n, &dev->secure_elements, list)
if (se->idx == se_idx)
return se;

return NULL;
}

int nfc_enable_se(struct nfc_dev *dev, u32 se_idx)
{

struct nfc_se *se;
int rc;

pr_debug("%s se index %d\n", dev_name(&dev->dev), se_idx);

device_lock(&dev->dev);

if (!device_is_registered(&dev->dev)) {
rc = -ENODEV;
goto error;
}

if (!dev->dev_up) {
rc = -ENODEV;
goto error;
}

if (dev->polling) {
rc = -EBUSY;
goto error;
}

if (!dev->ops->enable_se || !dev->ops->disable_se) {
rc = -EOPNOTSUPP;
goto error;
}

se = find_se(dev, se_idx);
if (!se) {
rc = -EINVAL;
goto error;
}

if (se->type == NFC_SE_ENABLED) {
rc = -EALREADY;
goto error;
}

rc = dev->ops->enable_se(dev, se_idx);

error:
device_unlock(&dev->dev);
return rc;
}

int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)
{

struct nfc_se *se;
int rc;

pr_debug("%s se index %d\n", dev_name(&dev->dev), se_idx);

device_lock(&dev->dev);

if (!device_is_registered(&dev->dev)) {
rc = -ENODEV;
goto error;
}

if (!dev->dev_up) {
rc = -ENODEV;
goto error;
}

if (!dev->ops->enable_se || !dev->ops->disable_se) {
rc = -EOPNOTSUPP;
goto error;
}

se = find_se(dev, se_idx);
if (!se) {
rc = -EINVAL;
goto error;
}

if (se->type == NFC_SE_DISABLED) {
rc = -EALREADY;
goto error;
}

rc = dev->ops->disable_se(dev, se_idx);

error:
device_unlock(&dev->dev);
return rc;
}

int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)
{
pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);
Expand Down Expand Up @@ -762,14 +864,14 @@ EXPORT_SYMBOL(nfc_driver_failure);

int nfc_add_se(struct nfc_dev *dev, u32 se_idx, u16 type)
{
struct nfc_se *se, *n;
struct nfc_se *se;
int rc;

pr_debug("%s se index %d\n", dev_name(&dev->dev), se_idx);

list_for_each_entry_safe(se, n, &dev->secure_elements, list)
if (se->idx == se_idx)
return -EALREADY;
se = find_se(dev, se_idx);
if (se)
return -EALREADY;

se = kzalloc(sizeof(struct nfc_se), GFP_KERNEL);
if (!se)
Expand Down
3 changes: 3 additions & 0 deletions net/nfc/nfc.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,7 @@ int nfc_deactivate_target(struct nfc_dev *dev, u32 target_idx);
int nfc_data_exchange(struct nfc_dev *dev, u32 target_idx, struct sk_buff *skb,
data_exchange_cb_t cb, void *cb_context);

int nfc_enable_se(struct nfc_dev *dev, u32 se_idx);
int nfc_disable_se(struct nfc_dev *dev, u32 se_idx);

#endif /* __LOCAL_NFC_H */

0 comments on commit c531c9e

Please sign in to comment.