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

Commit 50719195 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 



Johan Hedberg says:

====================
pull request: bluetooth 2017-01-16

Here are a couple of important 802.15.4 driver fixes for the 4.10
kernel.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a717fcf 8e38b7d4

drivers/net/ieee802154/at86rf230.c

+2 −2
Original line number Diff line number Diff line
@@ -1715,9 +1715,9 @@ static int at86rf230_probe(struct spi_device *spi) 
	/* Reset */

	if (gpio_is_valid(rstn)) {

		udelay(1);

		gpio_set_value(rstn, 0);

		gpio_set_value_cansleep(rstn, 0);

		udelay(1);

		gpio_set_value(rstn, 1);

		gpio_set_value_cansleep(rstn, 1);

		usleep_range(120, 240);

	}

drivers/net/ieee802154/atusb.c

+43 −16
Original line number Diff line number Diff line
@@ -117,13 +117,26 @@ static int atusb_read_reg(struct atusb *atusb, uint8_t reg) 
{

	struct usb_device *usb_dev = atusb->usb_dev;

	int ret;

	uint8_t *buffer;

	uint8_t value;



	buffer = kmalloc(1, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;



	dev_dbg(&usb_dev->dev, "atusb: reg = 0x%x\n", reg);

	ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),

				ATUSB_REG_READ, ATUSB_REQ_FROM_DEV,

				0, reg, &value, 1, 1000);

	return ret >= 0 ? value : ret;

				0, reg, buffer, 1, 1000);



	if (ret >= 0) {

		value = buffer[0];

		kfree(buffer);

		return value;

	} else {

		kfree(buffer);

		return ret;

	}

}



static int atusb_write_subreg(struct atusb *atusb, uint8_t reg, uint8_t mask,
@@ -549,13 +562,6 @@ static int 
atusb_set_frame_retries(struct ieee802154_hw *hw, s8 retries)

{

	struct atusb *atusb = hw->priv;

	struct device *dev = &atusb->usb_dev->dev;



	if (atusb->fw_ver_maj == 0 && atusb->fw_ver_min < 3) {

		dev_info(dev, "Automatic frame retransmission is only available from "

			"firmware version 0.3. Please update if you want this feature.");

		return -EINVAL;

	}



	return atusb_write_subreg(atusb, SR_MAX_FRAME_RETRIES, retries);

}
@@ -608,9 +614,13 @@ static const struct ieee802154_ops atusb_ops = { 
static int atusb_get_and_show_revision(struct atusb *atusb)

{

	struct usb_device *usb_dev = atusb->usb_dev;

	unsigned char buffer[3];

	unsigned char *buffer;

	int ret;



	buffer = kmalloc(3, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;



	/* Get a couple of the ATMega Firmware values */

	ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),

				ATUSB_ID, ATUSB_REQ_FROM_DEV, 0, 0,
@@ -631,15 +641,20 @@ static int atusb_get_and_show_revision(struct atusb *atusb) 
		dev_info(&usb_dev->dev, "Please update to version 0.2 or newer");

	}



	kfree(buffer);

	return ret;

}



static int atusb_get_and_show_build(struct atusb *atusb)

{

	struct usb_device *usb_dev = atusb->usb_dev;

	char build[ATUSB_BUILD_SIZE + 1];

	char *build;

	int ret;



	build = kmalloc(ATUSB_BUILD_SIZE + 1, GFP_KERNEL);

	if (!build)

		return -ENOMEM;



	ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),

				ATUSB_BUILD, ATUSB_REQ_FROM_DEV, 0, 0,

				build, ATUSB_BUILD_SIZE, 1000);
@@ -648,6 +663,7 @@ static int atusb_get_and_show_build(struct atusb *atusb) 
		dev_info(&usb_dev->dev, "Firmware: build %s\n", build);

	}



	kfree(build);

	return ret;

}
@@ -698,7 +714,7 @@ static int atusb_get_and_show_chip(struct atusb *atusb) 
static int atusb_set_extended_addr(struct atusb *atusb)

{

	struct usb_device *usb_dev = atusb->usb_dev;

	unsigned char buffer[IEEE802154_EXTENDED_ADDR_LEN];

	unsigned char *buffer;

	__le64 extended_addr;

	u64 addr;

	int ret;
@@ -710,12 +726,20 @@ static int atusb_set_extended_addr(struct atusb *atusb) 
		return 0;

	}



	buffer = kmalloc(IEEE802154_EXTENDED_ADDR_LEN, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;



	/* Firmware is new enough so we fetch the address from EEPROM */

	ret = atusb_control_msg(atusb, usb_rcvctrlpipe(usb_dev, 0),

				ATUSB_EUI64_READ, ATUSB_REQ_FROM_DEV, 0, 0,

				buffer, IEEE802154_EXTENDED_ADDR_LEN, 1000);

	if (ret < 0)

		dev_err(&usb_dev->dev, "failed to fetch extended address\n");

	if (ret < 0) {

		dev_err(&usb_dev->dev, "failed to fetch extended address, random address set\n");

		ieee802154_random_extended_addr(&atusb->hw->phy->perm_extended_addr);

		kfree(buffer);

		return ret;

	}



	memcpy(&extended_addr, buffer, IEEE802154_EXTENDED_ADDR_LEN);

	/* Check if read address is not empty and the unicast bit is set correctly */
@@ -729,6 +753,7 @@ static int atusb_set_extended_addr(struct atusb *atusb) 
			&addr);

	}



	kfree(buffer);

	return ret;

}
@@ -770,8 +795,7 @@ static int atusb_probe(struct usb_interface *interface, 


	hw->parent = &usb_dev->dev;

	hw->flags = IEEE802154_HW_TX_OMIT_CKSUM | IEEE802154_HW_AFILT |

		    IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS |

		    IEEE802154_HW_FRAME_RETRIES;

		    IEEE802154_HW_PROMISCUOUS | IEEE802154_HW_CSMA_PARAMS;



	hw->phy->flags = WPAN_PHY_FLAG_TXPOWER | WPAN_PHY_FLAG_CCA_ED_LEVEL |

			 WPAN_PHY_FLAG_CCA_MODE;
@@ -800,6 +824,9 @@ static int atusb_probe(struct usb_interface *interface, 
	atusb_get_and_show_build(atusb);

	atusb_set_extended_addr(atusb);



	if (atusb->fw_ver_maj >= 0 && atusb->fw_ver_min >= 3)

		hw->flags |= IEEE802154_HW_FRAME_RETRIES;



	ret = atusb_get_and_clear_error(atusb);

	if (ret) {

		dev_err(&atusb->usb_dev->dev,