mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge tag 'ASB-2024-10-05_11-5.4' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
https://source.android.com/docs/security/bulletin/2024-10-01 * tag 'ASB-2024-10-05_11-5.4' of https://android.googlesource.com/kernel/common: (397 commits) Linux 5.4.283 scsi: aacraid: Fix double-free on probe failure net: dsa: mv8e6xxx: Fix stub function parameters usb: core: sysfs: Unmerge @usb3_hardware_lpm_attr_group in remove_power_attributes() usb: dwc3: st: add missing depopulate in probe error path usb: dwc3: st: fix probed platform device ref count on probe error path usb: dwc3: core: Prevent USB core invalid event buffer address access usb: dwc3: omap: add missing depopulate in probe error path USB: serial: option: add MeiG Smart SRM825L cdc-acm: Add DISABLE_ECHO quirk for GE HealthCare UI Controller soc: qcom: cmd-db: Map shared memory as WC, not WB nfc: pn533: Add poll mod list filling check nfc: pn533: Add autopoll capability nfc: pn533: Add dev_up/dev_down hooks to phy_ops net: busy-poll: use ktime_get_ns() instead of local_clock() gtp: fix a potential NULL pointer dereference ethtool: check device is present when getting link settings r8152: Factor out OOB link list waits soundwire: stream: fix programming slave ports for non-continous port maps net:rds: Fix possible deadlock in rds_message_put ... Change-Id: Ia6559a770f5db990f2bf6e5a034c63e3d7df4510
This commit is contained in:
Michael Bestas
Alexander Winkowski
commit
a421f676d6
376 changed files with 3731 additions and 1792 deletions
|
|
@ -185,6 +185,32 @@ struct pn533_cmd_jump_dep_response {
|
|||
u8 gt[];
|
||||
} __packed;
|
||||
|
||||
struct pn532_autopoll_resp {
|
||||
u8 type;
|
||||
u8 ln;
|
||||
u8 tg;
|
||||
u8 tgdata[];
|
||||
};
|
||||
|
||||
/* PN532_CMD_IN_AUTOPOLL */
|
||||
#define PN532_AUTOPOLL_POLLNR_INFINITE 0xff
|
||||
#define PN532_AUTOPOLL_PERIOD 0x03 /* in units of 150 ms */
|
||||
|
||||
#define PN532_AUTOPOLL_TYPE_GENERIC_106 0x00
|
||||
#define PN532_AUTOPOLL_TYPE_GENERIC_212 0x01
|
||||
#define PN532_AUTOPOLL_TYPE_GENERIC_424 0x02
|
||||
#define PN532_AUTOPOLL_TYPE_JEWEL 0x04
|
||||
#define PN532_AUTOPOLL_TYPE_MIFARE 0x10
|
||||
#define PN532_AUTOPOLL_TYPE_FELICA212 0x11
|
||||
#define PN532_AUTOPOLL_TYPE_FELICA424 0x12
|
||||
#define PN532_AUTOPOLL_TYPE_ISOA 0x20
|
||||
#define PN532_AUTOPOLL_TYPE_ISOB 0x23
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_106 0x40
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_212 0x41
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_PASSIVE_424 0x42
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_106 0x80
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_212 0x81
|
||||
#define PN532_AUTOPOLL_TYPE_DEP_ACTIVE_424 0x82
|
||||
|
||||
/* PN533_TG_INIT_AS_TARGET */
|
||||
#define PN533_INIT_TARGET_PASSIVE 0x1
|
||||
|
|
@ -1394,6 +1420,101 @@ static int pn533_poll_dep(struct nfc_dev *nfc_dev)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int pn533_autopoll_complete(struct pn533 *dev, void *arg,
|
||||
struct sk_buff *resp)
|
||||
{
|
||||
struct pn532_autopoll_resp *apr;
|
||||
struct nfc_target nfc_tgt;
|
||||
u8 nbtg;
|
||||
int rc;
|
||||
|
||||
if (IS_ERR(resp)) {
|
||||
rc = PTR_ERR(resp);
|
||||
|
||||
nfc_err(dev->dev, "%s autopoll complete error %d\n",
|
||||
__func__, rc);
|
||||
|
||||
if (rc == -ENOENT) {
|
||||
if (dev->poll_mod_count != 0)
|
||||
return rc;
|
||||
goto stop_poll;
|
||||
} else if (rc < 0) {
|
||||
nfc_err(dev->dev,
|
||||
"Error %d when running autopoll\n", rc);
|
||||
goto stop_poll;
|
||||
}
|
||||
}
|
||||
|
||||
nbtg = resp->data[0];
|
||||
if ((nbtg > 2) || (nbtg <= 0))
|
||||
return -EAGAIN;
|
||||
|
||||
apr = (struct pn532_autopoll_resp *)&resp->data[1];
|
||||
while (nbtg--) {
|
||||
memset(&nfc_tgt, 0, sizeof(struct nfc_target));
|
||||
switch (apr->type) {
|
||||
case PN532_AUTOPOLL_TYPE_ISOA:
|
||||
dev_dbg(dev->dev, "ISOA\n");
|
||||
rc = pn533_target_found_type_a(&nfc_tgt, apr->tgdata,
|
||||
apr->ln - 1);
|
||||
break;
|
||||
case PN532_AUTOPOLL_TYPE_FELICA212:
|
||||
case PN532_AUTOPOLL_TYPE_FELICA424:
|
||||
dev_dbg(dev->dev, "FELICA\n");
|
||||
rc = pn533_target_found_felica(&nfc_tgt, apr->tgdata,
|
||||
apr->ln - 1);
|
||||
break;
|
||||
case PN532_AUTOPOLL_TYPE_JEWEL:
|
||||
dev_dbg(dev->dev, "JEWEL\n");
|
||||
rc = pn533_target_found_jewel(&nfc_tgt, apr->tgdata,
|
||||
apr->ln - 1);
|
||||
break;
|
||||
case PN532_AUTOPOLL_TYPE_ISOB:
|
||||
dev_dbg(dev->dev, "ISOB\n");
|
||||
rc = pn533_target_found_type_b(&nfc_tgt, apr->tgdata,
|
||||
apr->ln - 1);
|
||||
break;
|
||||
case PN532_AUTOPOLL_TYPE_MIFARE:
|
||||
dev_dbg(dev->dev, "Mifare\n");
|
||||
rc = pn533_target_found_type_a(&nfc_tgt, apr->tgdata,
|
||||
apr->ln - 1);
|
||||
break;
|
||||
default:
|
||||
nfc_err(dev->dev,
|
||||
"Unknown current poll modulation\n");
|
||||
rc = -EPROTO;
|
||||
}
|
||||
|
||||
if (rc)
|
||||
goto done;
|
||||
|
||||
if (!(nfc_tgt.supported_protocols & dev->poll_protocols)) {
|
||||
nfc_err(dev->dev,
|
||||
"The Tg found doesn't have the desired protocol\n");
|
||||
rc = -EAGAIN;
|
||||
goto done;
|
||||
}
|
||||
|
||||
dev->tgt_available_prots = nfc_tgt.supported_protocols;
|
||||
apr = (struct pn532_autopoll_resp *)
|
||||
(apr->tgdata + (apr->ln - 1));
|
||||
}
|
||||
|
||||
pn533_poll_reset_mod_list(dev);
|
||||
nfc_targets_found(dev->nfc_dev, &nfc_tgt, 1);
|
||||
|
||||
done:
|
||||
dev_kfree_skb(resp);
|
||||
return rc;
|
||||
|
||||
stop_poll:
|
||||
nfc_err(dev->dev, "autopoll operation has been stopped\n");
|
||||
|
||||
pn533_poll_reset_mod_list(dev);
|
||||
dev->poll_protocols = 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int pn533_poll_complete(struct pn533 *dev, void *arg,
|
||||
struct sk_buff *resp)
|
||||
{
|
||||
|
|
@ -1537,6 +1658,7 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev,
|
|||
{
|
||||
struct pn533 *dev = nfc_get_drvdata(nfc_dev);
|
||||
struct pn533_poll_modulations *cur_mod;
|
||||
struct sk_buff *skb;
|
||||
u8 rand_mod;
|
||||
int rc;
|
||||
|
||||
|
|
@ -1562,9 +1684,78 @@ static int pn533_start_poll(struct nfc_dev *nfc_dev,
|
|||
tm_protocols = 0;
|
||||
}
|
||||
|
||||
pn533_poll_create_mod_list(dev, im_protocols, tm_protocols);
|
||||
dev->poll_protocols = im_protocols;
|
||||
dev->listen_protocols = tm_protocols;
|
||||
if (dev->device_type == PN533_DEVICE_PN532_AUTOPOLL) {
|
||||
skb = pn533_alloc_skb(dev, 4 + 6);
|
||||
if (!skb)
|
||||
return -ENOMEM;
|
||||
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_POLLNR_INFINITE;
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) = PN532_AUTOPOLL_PERIOD;
|
||||
|
||||
if ((im_protocols & NFC_PROTO_MIFARE_MASK) &&
|
||||
(im_protocols & NFC_PROTO_ISO14443_MASK) &&
|
||||
(im_protocols & NFC_PROTO_NFC_DEP_MASK))
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_GENERIC_106;
|
||||
else {
|
||||
if (im_protocols & NFC_PROTO_MIFARE_MASK)
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_MIFARE;
|
||||
|
||||
if (im_protocols & NFC_PROTO_ISO14443_MASK)
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_ISOA;
|
||||
|
||||
if (im_protocols & NFC_PROTO_NFC_DEP_MASK) {
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_DEP_PASSIVE_106;
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_DEP_PASSIVE_212;
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_DEP_PASSIVE_424;
|
||||
}
|
||||
}
|
||||
|
||||
if (im_protocols & NFC_PROTO_FELICA_MASK ||
|
||||
im_protocols & NFC_PROTO_NFC_DEP_MASK) {
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_FELICA212;
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_FELICA424;
|
||||
}
|
||||
|
||||
if (im_protocols & NFC_PROTO_JEWEL_MASK)
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_JEWEL;
|
||||
|
||||
if (im_protocols & NFC_PROTO_ISO14443_B_MASK)
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_ISOB;
|
||||
|
||||
if (tm_protocols)
|
||||
*((u8 *)skb_put(skb, sizeof(u8))) =
|
||||
PN532_AUTOPOLL_TYPE_DEP_ACTIVE_106;
|
||||
|
||||
rc = pn533_send_cmd_async(dev, PN533_CMD_IN_AUTOPOLL, skb,
|
||||
pn533_autopoll_complete, NULL);
|
||||
|
||||
if (rc < 0)
|
||||
dev_kfree_skb(skb);
|
||||
else
|
||||
dev->poll_mod_count++;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
pn533_poll_create_mod_list(dev, im_protocols, tm_protocols);
|
||||
if (!dev->poll_mod_count) {
|
||||
nfc_err(dev->dev,
|
||||
"Poll mod list is empty\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Do not always start polling from the same modulation */
|
||||
get_random_bytes(&rand_mod, sizeof(rand_mod));
|
||||
|
|
@ -2465,7 +2656,11 @@ static int pn533_dev_up(struct nfc_dev *nfc_dev)
|
|||
{
|
||||
struct pn533 *dev = nfc_get_drvdata(nfc_dev);
|
||||
|
||||
if (dev->device_type == PN533_DEVICE_PN532) {
|
||||
if (dev->phy_ops->dev_up)
|
||||
dev->phy_ops->dev_up(dev);
|
||||
|
||||
if ((dev->device_type == PN533_DEVICE_PN532) ||
|
||||
(dev->device_type == PN533_DEVICE_PN532_AUTOPOLL)) {
|
||||
int rc = pn532_sam_configuration(nfc_dev);
|
||||
|
||||
if (rc)
|
||||
|
|
@ -2477,7 +2672,14 @@ static int pn533_dev_up(struct nfc_dev *nfc_dev)
|
|||
|
||||
static int pn533_dev_down(struct nfc_dev *nfc_dev)
|
||||
{
|
||||
return pn533_rf_field(nfc_dev, 0);
|
||||
struct pn533 *dev = nfc_get_drvdata(nfc_dev);
|
||||
int ret;
|
||||
|
||||
ret = pn533_rf_field(nfc_dev, 0);
|
||||
if (dev->phy_ops->dev_down && !ret)
|
||||
dev->phy_ops->dev_down(dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct nfc_ops pn533_nfc_ops = {
|
||||
|
|
@ -2505,6 +2707,7 @@ static int pn533_setup(struct pn533 *dev)
|
|||
case PN533_DEVICE_PASORI:
|
||||
case PN533_DEVICE_ACR122U:
|
||||
case PN533_DEVICE_PN532:
|
||||
case PN533_DEVICE_PN532_AUTOPOLL:
|
||||
max_retries.mx_rty_atr = 0x2;
|
||||
max_retries.mx_rty_psl = 0x1;
|
||||
max_retries.mx_rty_passive_act =
|
||||
|
|
@ -2541,6 +2744,7 @@ static int pn533_setup(struct pn533 *dev)
|
|||
switch (dev->device_type) {
|
||||
case PN533_DEVICE_STD:
|
||||
case PN533_DEVICE_PN532:
|
||||
case PN533_DEVICE_PN532_AUTOPOLL:
|
||||
break;
|
||||
|
||||
case PN533_DEVICE_PASORI:
|
||||
|
|
|
|||
|
|
@ -6,10 +6,11 @@
|
|||
* Copyright (C) 2012-2013 Tieto Poland
|
||||
*/
|
||||
|
||||
#define PN533_DEVICE_STD 0x1
|
||||
#define PN533_DEVICE_PASORI 0x2
|
||||
#define PN533_DEVICE_ACR122U 0x3
|
||||
#define PN533_DEVICE_PN532 0x4
|
||||
#define PN533_DEVICE_STD 0x1
|
||||
#define PN533_DEVICE_PASORI 0x2
|
||||
#define PN533_DEVICE_ACR122U 0x3
|
||||
#define PN533_DEVICE_PN532 0x4
|
||||
#define PN533_DEVICE_PN532_AUTOPOLL 0x5
|
||||
|
||||
#define PN533_ALL_PROTOCOLS (NFC_PROTO_JEWEL_MASK | NFC_PROTO_MIFARE_MASK |\
|
||||
NFC_PROTO_FELICA_MASK | NFC_PROTO_ISO14443_MASK |\
|
||||
|
|
@ -70,6 +71,7 @@
|
|||
#define PN533_CMD_IN_ATR 0x50
|
||||
#define PN533_CMD_IN_RELEASE 0x52
|
||||
#define PN533_CMD_IN_JUMP_FOR_DEP 0x56
|
||||
#define PN533_CMD_IN_AUTOPOLL 0x60
|
||||
|
||||
#define PN533_CMD_TG_INIT_AS_TARGET 0x8c
|
||||
#define PN533_CMD_TG_GET_DATA 0x86
|
||||
|
|
@ -207,6 +209,15 @@ struct pn533_phy_ops {
|
|||
struct sk_buff *out);
|
||||
int (*send_ack)(struct pn533 *dev, gfp_t flags);
|
||||
void (*abort_cmd)(struct pn533 *priv, gfp_t flags);
|
||||
/*
|
||||
* dev_up and dev_down are optional.
|
||||
* They are used to inform the phy layer that the nfc chip
|
||||
* is going to be really used very soon. The phy layer can then
|
||||
* bring up it's interface to the chip and have it suspended for power
|
||||
* saving reasons otherwise.
|
||||
*/
|
||||
void (*dev_up)(struct pn533 *priv);
|
||||
void (*dev_down)(struct pn533 *priv);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue