[pull-request bluetooth] wpan fixes for 4.10 2017-01-07

[pull-request bluetooth] wpan fixes for 4.10 2017-01-07

[Stefan Schmidt]

A set of fixes for ieee802154 drivers targeting 4.10.

Two out of the four ATUSB patches are to make sure the buffers are DMA-able
after the changes introduced in 4.9. One of them fixes code that was already
present in 4.9 and might be worth a backport to stable. I added a cc stable
to it. The other two ATUSB patches are fixing problems from the patchset
supporting the new v0.3 firmware.

For at86rf233 we got a patch from Andrey Smirnov to make sure it works well
in hardware designs where the RSTN pin is connected to a slow GPIO pin.

The following changes since commit d896b3120b3391a2f95b2b8ec636e3f594d7f9c4:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2017-01-05 11:49:57 -0500)

are available in the git repository at:

  https://github.com/linux-wpan/linux-wpan.git for-upstream

for you to fetch changes up to 3215bb7dd0b4dc894bed61c216508ffdf8b7ebb3:

  ieee802154: atusb: fix driver to work with older firmware versions (2017-01-06 23:19:51 +0100)

----------------------------------------------------------------
Andrey Smirnov (1):
      at86rf230: Allow slow GPIO pins for "rstn"

Stefan Schmidt (4):
      ieee802154: atusb: do not use the stack for buffers to make them DMA able
      ieee802154: atusb: make sure we set a randaom extended address if fetching fails
      ieee802154: atusb: do not use the stack for address fetching to make it DMA able
      ieee802154: atusb: fix driver to work with older firmware versions

 drivers/net/ieee802154/at86rf230.c |  4 +--
 drivers/net/ieee802154/atusb.c     | 59 +++++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 18 deletions(-)

[PATCH bluetooth 1/5] ieee802154: atusb: do not use the stack for buffers to make them DMA able

[Stefan Schmidt]

 From 4.9 we should really avoid using the stack here as this will not be DMA
able on various platforms. This changes the buffers already being present in
time of 4.9 being released. This should go into stable as well.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/atusb.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 1253f86..fa3e8c3 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -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,
@@ -608,9 +621,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 +648,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 +670,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;
 }
 
-- 
2.5.5

[PATCH bluetooth 1/5] ieee802154: atusb: do not use the stack for buffers to make them DMA able

[Stefan Schmidt]

>From 4.9 we should really avoid using the stack here as this will not be DMA
able on various platforms. This changes the buffers already being present in
time of 4.9 being released. This should go into stable as well.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/atusb.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 1253f86..fa3e8c3 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -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,
@@ -608,9 +621,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 +648,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 +670,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;
 }
 
-- 
2.5.5

[PATCH bluetooth 2/5] ieee802154: atusb: make sure we set a randaom extended address if fetching fails

[Stefan Schmidt]

In the unlikely case were the firmware is new enough but the actual USB command
still fails make sure we set a random address and return.

Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/atusb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index fa3e8c3..67790f8 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -737,8 +737,11 @@ static int atusb_set_extended_addr(struct atusb *atusb)
 	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);
+		return ret;
+	}
 
 	memcpy(&extended_addr, buffer, IEEE802154_EXTENDED_ADDR_LEN);
 	/* Check if read address is not empty and the unicast bit is set correctly */
-- 
2.5.5

[PATCH bluetooth 3/5] ieee802154: atusb: do not use the stack for address fetching to make it DMA able

[Stefan Schmidt]

 From 4.9 we should really avoid using the stack here as this will not be DMA
able on various platforms. This changes a buffer that was introduced in the
4.10 merge window.

Fixes: 6cc33eba232c ("ieee802154: atusb: try to read permanent extended
address from device")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/atusb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 67790f8..63cb679 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -721,7 +721,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;
@@ -733,6 +733,10 @@ 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,
@@ -740,6 +744,7 @@ static int atusb_set_extended_addr(struct atusb *atusb)
 	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;
 	}
 
@@ -755,6 +760,7 @@ static int atusb_set_extended_addr(struct atusb *atusb)
 			&addr);
 	}
 
+	kfree(buffer);
 	return ret;
 }
 
-- 
2.5.5

[PATCH bluetooth 4/5] at86rf230: Allow slow GPIO pins for "rstn"

[Stefan Schmidt]

From: Andrey Smirnov <andrew.smirnov@gmail.com>

Driver code never touches "rstn" signal in atomic context, so there's
no need to implicitly put such restriction on it by using gpio_set_value
to manipulate it. Replace gpio_set_value to gpio_set_value_cansleep to
fix that.

As a an example of where such restriction might be inconvenient,
consider a hardware design where "rstn" is connected to a pin of I2C/SPI
GPIO expander chip.

Cc: Chris Healy <cphealy@gmail.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/at86rf230.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 46d53a6..76ba7ec 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -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);
 	}
 
-- 
2.5.5

[PATCH bluetooth 5/5] ieee802154: atusb: fix driver to work with older firmware versions

[Stefan Schmidt]

After the addition of the frame_retries callback we could run into cases where
a ATUSB device with an older firmware version would now longer be able to bring
the interface up.

We keep this functionality disabled now if the minimum firmware version for this
feature is not available.

Fixes: 5d82288b93db3bc ("ieee802154: atusb: implement .set_frame_retries
ops callback")
Reported-by: Alexander Aring <aar@pengutronix.de>
Acked-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
---
 drivers/net/ieee802154/atusb.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
index 63cb679..ef68851 100644
--- a/drivers/net/ieee802154/atusb.c
+++ b/drivers/net/ieee802154/atusb.c
@@ -562,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);
 }
@@ -802,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;
@@ -832,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,
-- 
2.5.5

Re: [PATCH bluetooth 1/5] ieee802154: atusb: do not use the stack for buffers to make them DMA able

[Greg KH]

On Sat, Jan 07, 2017 at 01:18:53AM +0100, Stefan Schmidt wrote:
> From 4.9 we should really avoid using the stack here as this will not be DMA
> able on various platforms. This changes the buffers already being present in
> time of 4.9 being released. This should go into stable as well.

It's not just a 4.9 issue, this affects other platforms on all kernel
versions.

> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [pull-request bluetooth] wpan fixes for 4.10 2017-01-07

[Stefan Schmidt]

Hello Marcel.

On 07/01/17 01:18, Stefan Schmidt wrote:
> A set of fixes for ieee802154 drivers targeting 4.10.
>
> Two out of the four ATUSB patches are to make sure the buffers are DMA-able
> after the changes introduced in 4.9. One of them fixes code that was already
> present in 4.9 and might be worth a backport to stable. I added a cc stable
> to it. The other two ATUSB patches are fixing problems from the patchset
> supporting the new v0.3 firmware.
>
> For at86rf233 we got a patch from Andrey Smirnov to make sure it works well
> in hardware designs where the RSTN pin is connected to a slow GPIO pin.
>
> The following changes since commit d896b3120b3391a2f95b2b8ec636e3f594d7f9c4:
>
>   Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2017-01-05 11:49:57 -0500)
>
> are available in the git repository at:
>
>   https://github.com/linux-wpan/linux-wpan.git for-upstream
>
> for you to fetch changes up to 3215bb7dd0b4dc894bed61c216508ffdf8b7ebb3:
>
>   ieee802154: atusb: fix driver to work with older firmware versions (2017-01-06 23:19:51 +0100)
>
> ----------------------------------------------------------------
> Andrey Smirnov (1):
>       at86rf230: Allow slow GPIO pins for "rstn"
>
> Stefan Schmidt (4):
>       ieee802154: atusb: do not use the stack for buffers to make them DMA able
>       ieee802154: atusb: make sure we set a randaom extended address if fetching fails
>       ieee802154: atusb: do not use the stack for address fetching to make it DMA able
>       ieee802154: atusb: fix driver to work with older firmware versions
>
>  drivers/net/ieee802154/at86rf230.c |  4 +--
>  drivers/net/ieee802154/atusb.c     | 59 +++++++++++++++++++++++++++-----------
>  2 files changed, 45 insertions(+), 18 deletions(-)

Anything wrong with this pull request or have you just been to busy to 
come to it yet?

regards
Stefan Schmidt

Re: [pull-request bluetooth] wpan fixes for 4.10 2017-01-07

[Marcel Holtmann]

Hi Stefan,

> A set of fixes for ieee802154 drivers targeting 4.10.
> 
> Two out of the four ATUSB patches are to make sure the buffers are DMA-able
> after the changes introduced in 4.9. One of them fixes code that was already
> present in 4.9 and might be worth a backport to stable. I added a cc stable
> to it. The other two ATUSB patches are fixing problems from the patchset
> supporting the new v0.3 firmware.
> 
> For at86rf233 we got a patch from Andrey Smirnov to make sure it works well
> in hardware designs where the RSTN pin is connected to a slow GPIO pin.
> 
> The following changes since commit d896b3120b3391a2f95b2b8ec636e3f594d7f9c4:
> 
>  Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2017-01-05 11:49:57 -0500)
> 
> are available in the git repository at:
> 
>  https://github.com/linux-wpan/linux-wpan.git for-upstream
> 
> for you to fetch changes up to 3215bb7dd0b4dc894bed61c216508ffdf8b7ebb3:
> 
>  ieee802154: atusb: fix driver to work with older firmware versions (2017-01-06 23:19:51 +0100)
> 
> ----------------------------------------------------------------
> Andrey Smirnov (1):
>      at86rf230: Allow slow GPIO pins for "rstn"
> 
> Stefan Schmidt (4):
>      ieee802154: atusb: do not use the stack for buffers to make them DMA able
>      ieee802154: atusb: make sure we set a randaom extended address if fetching fails
>      ieee802154: atusb: do not use the stack for address fetching to make it DMA able
>      ieee802154: atusb: fix driver to work with older firmware versions
> 
> drivers/net/ieee802154/at86rf230.c |  4 +--
> drivers/net/ieee802154/atusb.c     | 59 +++++++++++++++++++++++++++-----------
> 2 files changed, 45 insertions(+), 18 deletions(-)

patches have been applied to bluetooth-stable tree.

Regards

Marcel