Commit 0b456c41 authored by Samuel Ortiz's avatar Samuel Ortiz

NFC: Remove the static supported_se field

Supported secure elements are typically found during a discovery process
initiated when the NFC controller is up and running. For a given NFC
chipset there can be many configurations (embedded SE or not, with or
without a SIM card wired to the NFC controller SWP interface, etc...) and
thus driver code will never know before hand which SEs are available.
So we remove this field, it will be replaced by a real SE discovery
mechanism.
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 322bce95
...@@ -650,7 +650,7 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, ...@@ -650,7 +650,7 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
{ {
struct microread_info *info; struct microread_info *info;
unsigned long quirks = 0; unsigned long quirks = 0;
u32 protocols, se; u32 protocols;
struct nfc_hci_init_data init_data; struct nfc_hci_init_data init_data;
int r; int r;
...@@ -678,10 +678,8 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, ...@@ -678,10 +678,8 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
NFC_PROTO_ISO14443_B_MASK | NFC_PROTO_ISO14443_B_MASK |
NFC_PROTO_NFC_DEP_MASK; NFC_PROTO_NFC_DEP_MASK;
se = NFC_SE_UICC | NFC_SE_EMBEDDED;
info->hdev = nfc_hci_allocate_device(&microread_hci_ops, &init_data, info->hdev = nfc_hci_allocate_device(&microread_hci_ops, &init_data,
quirks, protocols, se, llc_name, quirks, protocols, llc_name,
phy_headroom + phy_headroom +
MICROREAD_CMDS_HEADROOM, MICROREAD_CMDS_HEADROOM,
phy_tailroom + phy_tailroom +
......
...@@ -535,7 +535,6 @@ static int nfcwilink_probe(struct platform_device *pdev) ...@@ -535,7 +535,6 @@ static int nfcwilink_probe(struct platform_device *pdev)
drv->ndev = nci_allocate_device(&nfcwilink_ops, drv->ndev = nci_allocate_device(&nfcwilink_ops,
protocols, protocols,
NFC_SE_NONE,
NFCWILINK_HDR_LEN, NFCWILINK_HDR_LEN,
0); 0);
if (!drv->ndev) { if (!drv->ndev) {
......
...@@ -2791,7 +2791,6 @@ static int pn533_probe(struct usb_interface *interface, ...@@ -2791,7 +2791,6 @@ static int pn533_probe(struct usb_interface *interface,
dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols, dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
NFC_SE_NONE,
dev->ops->tx_header_len + dev->ops->tx_header_len +
PN533_CMD_DATAEXCH_HEAD_LEN, PN533_CMD_DATAEXCH_HEAD_LEN,
dev->ops->tx_tail_len); dev->ops->tx_tail_len);
......
...@@ -803,7 +803,7 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, ...@@ -803,7 +803,7 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
struct nfc_hci_dev **hdev) struct nfc_hci_dev **hdev)
{ {
struct pn544_hci_info *info; struct pn544_hci_info *info;
u32 protocols, se; u32 protocols;
struct nfc_hci_init_data init_data; struct nfc_hci_init_data init_data;
int r; int r;
...@@ -836,10 +836,8 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name, ...@@ -836,10 +836,8 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
NFC_PROTO_ISO14443_B_MASK | NFC_PROTO_ISO14443_B_MASK |
NFC_PROTO_NFC_DEP_MASK; NFC_PROTO_NFC_DEP_MASK;
se = NFC_SE_UICC | NFC_SE_EMBEDDED;
info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0, info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0,
protocols, se, llc_name, protocols, llc_name,
phy_headroom + PN544_CMDS_HEADROOM, phy_headroom + PN544_CMDS_HEADROOM,
phy_tailroom, phy_payload); phy_tailroom, phy_payload);
if (!info->hdev) { if (!info->hdev) {
......
...@@ -153,7 +153,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, ...@@ -153,7 +153,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
struct nfc_hci_init_data *init_data, struct nfc_hci_init_data *init_data,
unsigned long quirks, unsigned long quirks,
u32 protocols, u32 protocols,
u32 supported_se,
const char *llc_name, const char *llc_name,
int tx_headroom, int tx_headroom,
int tx_tailroom, int tx_tailroom,
......
...@@ -148,7 +148,6 @@ struct nci_dev { ...@@ -148,7 +148,6 @@ struct nci_dev {
/* ----- NCI Devices ----- */ /* ----- NCI Devices ----- */
struct nci_dev *nci_allocate_device(struct nci_ops *ops, struct nci_dev *nci_allocate_device(struct nci_ops *ops,
__u32 supported_protocols, __u32 supported_protocols,
__u32 supported_se,
int tx_headroom, int tx_headroom,
int tx_tailroom); int tx_tailroom);
void nci_free_device(struct nci_dev *ndev); void nci_free_device(struct nci_dev *ndev);
......
...@@ -115,7 +115,6 @@ struct nfc_dev { ...@@ -115,7 +115,6 @@ struct nfc_dev {
struct nfc_genl_data genl_data; struct nfc_genl_data genl_data;
u32 supported_protocols; u32 supported_protocols;
u32 supported_se;
u32 active_se; u32 active_se;
int tx_headroom; int tx_headroom;
...@@ -136,7 +135,6 @@ extern struct class nfc_class; ...@@ -136,7 +135,6 @@ extern struct class nfc_class;
struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
u32 supported_protocols, u32 supported_protocols,
u32 supported_se,
int tx_headroom, int tx_headroom,
int tx_tailroom); int tx_tailroom);
......
...@@ -832,7 +832,6 @@ struct nfc_dev *nfc_get_device(unsigned int idx) ...@@ -832,7 +832,6 @@ struct nfc_dev *nfc_get_device(unsigned int idx)
*/ */
struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
u32 supported_protocols, u32 supported_protocols,
u32 supported_se,
int tx_headroom, int tx_tailroom) int tx_headroom, int tx_tailroom)
{ {
struct nfc_dev *dev; struct nfc_dev *dev;
...@@ -850,7 +849,6 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, ...@@ -850,7 +849,6 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
dev->ops = ops; dev->ops = ops;
dev->supported_protocols = supported_protocols; dev->supported_protocols = supported_protocols;
dev->supported_se = supported_se;
dev->active_se = NFC_SE_NONE; dev->active_se = NFC_SE_NONE;
dev->tx_headroom = tx_headroom; dev->tx_headroom = tx_headroom;
dev->tx_tailroom = tx_tailroom; dev->tx_tailroom = tx_tailroom;
......
...@@ -808,7 +808,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, ...@@ -808,7 +808,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
struct nfc_hci_init_data *init_data, struct nfc_hci_init_data *init_data,
unsigned long quirks, unsigned long quirks,
u32 protocols, u32 protocols,
u32 supported_se,
const char *llc_name, const char *llc_name,
int tx_headroom, int tx_headroom,
int tx_tailroom, int tx_tailroom,
...@@ -834,7 +833,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops, ...@@ -834,7 +833,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
return NULL; return NULL;
} }
hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols, supported_se, hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols,
tx_headroom + HCI_CMDS_HEADROOM, tx_headroom + HCI_CMDS_HEADROOM,
tx_tailroom); tx_tailroom);
if (!hdev->ndev) { if (!hdev->ndev) {
......
...@@ -658,7 +658,6 @@ static struct nfc_ops nci_nfc_ops = { ...@@ -658,7 +658,6 @@ static struct nfc_ops nci_nfc_ops = {
*/ */
struct nci_dev *nci_allocate_device(struct nci_ops *ops, struct nci_dev *nci_allocate_device(struct nci_ops *ops,
__u32 supported_protocols, __u32 supported_protocols,
__u32 supported_se,
int tx_headroom, int tx_tailroom) int tx_headroom, int tx_tailroom)
{ {
struct nci_dev *ndev; struct nci_dev *ndev;
...@@ -681,7 +680,6 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, ...@@ -681,7 +680,6 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops,
ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops,
supported_protocols, supported_protocols,
supported_se,
tx_headroom + NCI_DATA_HDR_SIZE, tx_headroom + NCI_DATA_HDR_SIZE,
tx_tailroom); tx_tailroom);
if (!ndev->nfc_dev) if (!ndev->nfc_dev)
......
...@@ -162,8 +162,7 @@ struct nci_spi_dev *nci_spi_allocate_device(struct spi_device *spi, ...@@ -162,8 +162,7 @@ struct nci_spi_dev *nci_spi_allocate_device(struct spi_device *spi,
tailroom += NCI_SPI_CRC_LEN; tailroom += NCI_SPI_CRC_LEN;
ndev->nci_dev = nci_allocate_device(&nci_spi_ops, supported_protocols, ndev->nci_dev = nci_allocate_device(&nci_spi_ops, supported_protocols,
supported_se, NCI_SPI_HDR_LEN, NCI_SPI_HDR_LEN, tailroom);
tailroom);
if (!ndev->nci_dev) if (!ndev->nci_dev)
return NULL; return NULL;
......
...@@ -444,7 +444,6 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev, ...@@ -444,7 +444,6 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) || if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||
nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) || nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) || nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||
nla_put_u32(msg, NFC_ATTR_SE, dev->supported_se) ||
nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) || nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||
nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode)) nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))
goto nla_put_failure; goto nla_put_failure;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment