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

Commit 412fda53 authored by Eric Lapuyade's avatar Eric Lapuyade Committed by Samuel Ortiz
Browse files

NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC Core 



The previous shdlc HCI driver and its header are removed from the tree.
PN544 now registers directly with HCI and passes the name of the llc it
requires (shdlc).
HCI instantiation now allocates the required llc instance. The llc is
started when the HCI device is brought up.

Signed-off-by: default avatarEric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 4a61cd66

drivers/nfc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ config PN544_NFC 


config PN544_HCI_NFC

	tristate "HCI PN544 NFC driver"

	depends on I2C && NFC_SHDLC

	depends on I2C && NFC_HCI && NFC_SHDLC

	select CRC_CCITT

	default n

	---help---

drivers/nfc/pn544_hci.c

+37 −36
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include <linux/nfc.h>

#include <net/nfc/hci.h>

#include <net/nfc/shdlc.h>

#include <net/nfc/llc.h>



#include <linux/nfc/pn544.h>
@@ -133,7 +133,7 @@ static struct nfc_hci_gate pn544_gates[] = { 


struct pn544_hci_info {

	struct i2c_client *i2c_dev;

	struct nfc_shdlc *shdlc;

	struct nfc_hci_dev *hdev;



	enum pn544_state state;
@@ -362,21 +362,21 @@ static irqreturn_t pn544_hci_irq_thread_fn(int irq, void *dev_id) 
	if (r == -EREMOTEIO) {

		info->hard_fault = r;



		nfc_shdlc_recv_frame(info->shdlc, NULL);

		nfc_hci_recv_frame(info->hdev, NULL);



		return IRQ_HANDLED;

	} else if ((r == -ENOMEM) || (r == -EBADMSG)) {

		return IRQ_HANDLED;

	}



	nfc_shdlc_recv_frame(info->shdlc, skb);

	nfc_hci_recv_frame(info->hdev, skb);



	return IRQ_HANDLED;

}



static int pn544_hci_open(struct nfc_shdlc *shdlc)

static int pn544_hci_open(struct nfc_hci_dev *hdev)

{

	struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);

	struct pn544_hci_info *info = nfc_hci_get_clientdata(hdev);

	int r = 0;



	mutex_lock(&info->info_lock);
@@ -396,9 +396,9 @@ static int pn544_hci_open(struct nfc_shdlc *shdlc) 
	return r;

}



static void pn544_hci_close(struct nfc_shdlc *shdlc)

static void pn544_hci_close(struct nfc_hci_dev *hdev)

{

	struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);

	struct pn544_hci_info *info = nfc_hci_get_clientdata(hdev);



	mutex_lock(&info->info_lock);
@@ -413,9 +413,8 @@ static void pn544_hci_close(struct nfc_shdlc *shdlc) 
	mutex_unlock(&info->info_lock);

}



static int pn544_hci_ready(struct nfc_shdlc *shdlc)

static int pn544_hci_ready(struct nfc_hci_dev *hdev)

{

	struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);

	struct sk_buff *skb;

	static struct hw_config {

		u8 adr[2];
@@ -601,9 +600,9 @@ static void pn544_hci_remove_len_crc(struct sk_buff *skb) 
	skb_trim(skb, PN544_FRAME_TAILROOM);

}



static int pn544_hci_xmit(struct nfc_shdlc *shdlc, struct sk_buff *skb)

static int pn544_hci_xmit(struct nfc_hci_dev *hdev, struct sk_buff *skb)

{

	struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);

	struct pn544_hci_info *info = nfc_hci_get_clientdata(hdev);

	struct i2c_client *client = info->i2c_dev;

	int r;
@@ -617,10 +616,9 @@ static int pn544_hci_xmit(struct nfc_shdlc *shdlc, struct sk_buff *skb) 
	return r;

}



static int pn544_hci_start_poll(struct nfc_shdlc *shdlc,

static int pn544_hci_start_poll(struct nfc_hci_dev *hdev,

				u32 im_protocols, u32 tm_protocols)

{

	struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);

	u8 phases = 0;

	int r;

	u8 duration[2];
@@ -671,7 +669,7 @@ static int pn544_hci_start_poll(struct nfc_shdlc *shdlc, 
	return r;

}



static int pn544_hci_target_from_gate(struct nfc_shdlc *shdlc, u8 gate,

static int pn544_hci_target_from_gate(struct nfc_hci_dev *hdev, u8 gate,

				      struct nfc_target *target)

{

	switch (gate) {
@@ -689,11 +687,10 @@ static int pn544_hci_target_from_gate(struct nfc_shdlc *shdlc, u8 gate, 
	return 0;

}



static int pn544_hci_complete_target_discovered(struct nfc_shdlc *shdlc,

static int pn544_hci_complete_target_discovered(struct nfc_hci_dev *hdev,

						u8 gate,

						struct nfc_target *target)

{

	struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);

	struct sk_buff *uid_skb;

	int r = 0;
@@ -765,13 +762,12 @@ static void pn544_hci_data_exchange_cb(void *context, struct sk_buff *skb, 
 * <= 0: driver handled the data exchange

 *    1: driver doesn't especially handle, please do standard processing

 */

static int pn544_hci_data_exchange(struct nfc_shdlc *shdlc,

static int pn544_hci_data_exchange(struct nfc_hci_dev *hdev,

				   struct nfc_target *target,

				   struct sk_buff *skb, data_exchange_cb_t cb,

				   void *cb_context)

{

	struct pn544_hci_info *info = nfc_shdlc_get_clientdata(shdlc);

	struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);

	struct pn544_hci_info *info = nfc_hci_get_clientdata(hdev);



	pr_info(DRIVER_DESC ": %s for gate=%d\n", __func__,

		target->hci_reader_gate);
@@ -824,17 +820,15 @@ static int pn544_hci_data_exchange(struct nfc_shdlc *shdlc, 
	}

}



static int pn544_hci_check_presence(struct nfc_shdlc *shdlc,

static int pn544_hci_check_presence(struct nfc_hci_dev *hdev,

				   struct nfc_target *target)

{

	struct nfc_hci_dev *hdev = nfc_shdlc_get_hci_dev(shdlc);



	return nfc_hci_send_cmd(hdev, target->hci_reader_gate,

				PN544_RF_READER_CMD_PRESENCE_CHECK,

				NULL, 0, NULL);

}



static struct nfc_shdlc_ops pn544_shdlc_ops = {

static struct nfc_hci_ops pn544_hci_ops = {

	.open = pn544_hci_open,

	.close = pn544_hci_close,

	.hci_ready = pn544_hci_ready,
@@ -926,23 +920,30 @@ static int __devinit pn544_hci_probe(struct i2c_client *client, 
		    NFC_PROTO_ISO14443_B_MASK |

		    NFC_PROTO_NFC_DEP_MASK;



	info->shdlc = nfc_shdlc_allocate(&pn544_shdlc_ops,

					 &init_data, protocols,

					 PN544_FRAME_HEADROOM + PN544_CMDS_HEADROOM,

	info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data,

					     protocols, LLC_SHDLC_NAME,

					     PN544_FRAME_HEADROOM +

					     PN544_CMDS_HEADROOM,

					     PN544_FRAME_TAILROOM,

					 PN544_HCI_LLC_MAX_PAYLOAD,

					 dev_name(&client->dev));

	if (!info->shdlc) {

		dev_err(&client->dev, "Cannot allocate nfc shdlc.\n");

					     PN544_HCI_LLC_MAX_PAYLOAD);

	if (!info->hdev) {

		dev_err(&client->dev, "Cannot allocate nfc hdev.\n");

		r = -ENOMEM;

		goto err_allocshdlc;

		goto err_alloc_hdev;

	}



	nfc_shdlc_set_clientdata(info->shdlc, info);

	nfc_hci_set_clientdata(info->hdev, info);



	r = nfc_hci_register_device(info->hdev);

	if (r)

		goto err_regdev;



	return 0;



err_allocshdlc:

err_regdev:

	nfc_hci_free_device(info->hdev);



err_alloc_hdev:

	free_irq(client->irq, info);



err_rti:
@@ -963,7 +964,7 @@ static __devexit int pn544_hci_remove(struct i2c_client *client) 


	dev_dbg(&client->dev, "%s\n", __func__);



	nfc_shdlc_free(info->shdlc);

	nfc_hci_free_device(info->hdev);



	if (info->state != PN544_ST_COLD) {

		if (pdata->disable)

include/net/nfc/hci.h

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ struct nfc_hci_dev { 


	struct nfc_hci_ops *ops;



	struct nfc_llc *llc;



	struct nfc_hci_init_data init_data;



	void *clientdata;
@@ -113,6 +115,7 @@ struct nfc_hci_dev { 
struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,

					    struct nfc_hci_init_data *init_data,

					    u32 protocols,

					    const char *llc_name,

					    int tx_headroom,

					    int tx_tailroom,

					    int max_link_payload);

include/net/nfc/shdlc.h

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012  Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the

 * Free Software Foundation, Inc.,

 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */



#ifndef __NFC_SHDLC_H

#define __NFC_SHDLC_H



struct nfc_shdlc;



struct nfc_shdlc_ops {

	int (*open) (struct nfc_shdlc *shdlc);

	void (*close) (struct nfc_shdlc *shdlc);

	int (*hci_ready) (struct nfc_shdlc *shdlc);

	int (*xmit) (struct nfc_shdlc *shdlc, struct sk_buff *skb);

	int (*start_poll) (struct nfc_shdlc *shdlc,

			   u32 im_protocols, u32 tm_protocols);

	int (*target_from_gate) (struct nfc_shdlc *shdlc, u8 gate,

				 struct nfc_target *target);

	int (*complete_target_discovered) (struct nfc_shdlc *shdlc, u8 gate,

					   struct nfc_target *target);

	int (*data_exchange) (struct nfc_shdlc *shdlc,

			      struct nfc_target *target, struct sk_buff *skb,

			      data_exchange_cb_t cb, void *cb_context);

	int (*check_presence)(struct nfc_shdlc *shdlc,

			      struct nfc_target *target);

};



enum shdlc_state {

	SHDLC_DISCONNECTED = 0,

	SHDLC_CONNECTING = 1,

	SHDLC_NEGOCIATING = 2,

	SHDLC_CONNECTED = 3

};



struct nfc_shdlc {

	struct mutex state_mutex;

	enum shdlc_state state;

	int hard_fault;



	struct nfc_hci_dev *hdev;



	wait_queue_head_t *connect_wq;

	int connect_tries;

	int connect_result;

	struct timer_list connect_timer;/* aka T3 in spec 10.6.1 */



	u8 w;				/* window size */

	bool srej_support;



	struct timer_list t1_timer;	/* send ack timeout */

	bool t1_active;



	struct timer_list t2_timer;	/* guard/retransmit timeout */

	bool t2_active;



	int ns;				/* next seq num for send */

	int nr;				/* next expected seq num for receive */

	int dnr;			/* oldest sent unacked seq num */



	struct sk_buff_head rcv_q;



	struct sk_buff_head send_q;

	bool rnr;			/* other side is not ready to receive */



	struct sk_buff_head ack_pending_q;



	struct work_struct sm_work;



	struct nfc_shdlc_ops *ops;



	int client_headroom;

	int client_tailroom;



	void *clientdata;

};



void nfc_shdlc_recv_frame(struct nfc_shdlc *shdlc, struct sk_buff *skb);



struct nfc_shdlc *nfc_shdlc_allocate(struct nfc_shdlc_ops *ops,

				     struct nfc_hci_init_data *init_data,

				     u32 protocols,

				     int tx_headroom, int tx_tailroom,

				     int max_link_payload, const char *devname);



void nfc_shdlc_free(struct nfc_shdlc *shdlc);



void nfc_shdlc_set_clientdata(struct nfc_shdlc *shdlc, void *clientdata);

void *nfc_shdlc_get_clientdata(struct nfc_shdlc *shdlc);

struct nfc_hci_dev *nfc_shdlc_get_hci_dev(struct nfc_shdlc *shdlc);



#endif /* __NFC_SHDLC_H */

net/nfc/hci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
obj-$(CONFIG_NFC_HCI) += hci.o



hci-y			:= core.o hcp.o command.o llc.o llc_nop.o

hci-$(CONFIG_NFC_SHDLC) += shdlc.o llc_shdlc.o
 
hci-$(CONFIG_NFC_SHDLC) += llc_shdlc.o