2015-04-05 01:13:03 +02:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
* Bluetooth HCI UART driver for Broadcom devices
|
|
|
|
*
|
|
|
|
* Copyright (C) 2015 Intel Corporation
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/skbuff.h>
|
2015-05-28 11:25:01 +02:00
|
|
|
#include <linux/firmware.h>
|
2015-08-11 16:35:35 +02:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/acpi.h>
|
2017-08-17 19:59:51 +02:00
|
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/property.h>
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
#include <linux/platform_data/x86/apple.h>
|
2015-08-11 16:35:35 +02:00
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/clk.h>
|
|
|
|
#include <linux/gpio/consumer.h>
|
|
|
|
#include <linux/tty.h>
|
2015-09-04 15:35:44 +02:00
|
|
|
#include <linux/interrupt.h>
|
2015-09-23 18:18:08 +02:00
|
|
|
#include <linux/dmi.h>
|
2015-09-23 18:18:11 +02:00
|
|
|
#include <linux/pm_runtime.h>
|
2017-08-17 19:59:51 +02:00
|
|
|
#include <linux/serdev.h>
|
2015-04-05 01:13:03 +02:00
|
|
|
|
|
|
|
#include <net/bluetooth/bluetooth.h>
|
|
|
|
#include <net/bluetooth/hci_core.h>
|
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
#include "btbcm.h"
|
2015-04-05 01:13:03 +02:00
|
|
|
#include "hci_uart.h"
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2017-08-17 21:41:09 +02:00
|
|
|
#define BCM_NULL_PKT 0x00
|
|
|
|
#define BCM_NULL_SIZE 0
|
|
|
|
|
2015-10-07 19:12:54 +02:00
|
|
|
#define BCM_LM_DIAG_PKT 0x07
|
|
|
|
#define BCM_LM_DIAG_SIZE 63
|
|
|
|
|
2015-09-23 18:18:11 +02:00
|
|
|
#define BCM_AUTOSUSPEND_DELAY 5000 /* default autosleep delay */
|
|
|
|
|
2018-01-10 16:32:10 +01:00
|
|
|
/**
|
|
|
|
* struct bcm_device - device driver resources
|
|
|
|
* @serdev_hu: HCI UART controller struct
|
|
|
|
* @list: bcm_device_list node
|
|
|
|
* @dev: physical UART slave
|
|
|
|
* @name: device name logged by bt_dev_*() functions
|
|
|
|
* @device_wakeup: BT_WAKE pin,
|
|
|
|
* assert = Bluetooth device must wake up or remain awake,
|
|
|
|
* deassert = Bluetooth device may sleep when sleep criteria are met
|
|
|
|
* @shutdown: BT_REG_ON pin,
|
|
|
|
* power up or power down Bluetooth device internal regulators
|
2018-01-10 16:32:10 +01:00
|
|
|
* @set_device_wakeup: callback to toggle BT_WAKE pin
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
* either by accessing @device_wakeup or by calling @btlp
|
2018-01-10 16:32:10 +01:00
|
|
|
* @set_shutdown: callback to toggle BT_REG_ON pin
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
* either by accessing @shutdown or by calling @btpu/@btpd
|
|
|
|
* @btlp: Apple ACPI method to toggle BT_WAKE pin ("Bluetooth Low Power")
|
|
|
|
* @btpu: Apple ACPI method to drive BT_REG_ON pin high ("Bluetooth Power Up")
|
|
|
|
* @btpd: Apple ACPI method to drive BT_REG_ON pin low ("Bluetooth Power Down")
|
2018-01-10 16:32:10 +01:00
|
|
|
* @clk: clock used by Bluetooth device
|
|
|
|
* @clk_enabled: whether @clk is prepared and enabled
|
|
|
|
* @init_speed: default baudrate of Bluetooth device;
|
|
|
|
* the host UART is initially set to this baudrate so that
|
|
|
|
* it can configure the Bluetooth device for @oper_speed
|
|
|
|
* @oper_speed: preferred baudrate of Bluetooth device;
|
|
|
|
* set to 0 if @init_speed is already the preferred baudrate
|
|
|
|
* @irq: interrupt triggered by HOST_WAKE_BT pin
|
|
|
|
* @irq_active_low: whether @irq is active low
|
|
|
|
* @hu: pointer to HCI UART controller struct,
|
|
|
|
* used to disable flow control during runtime suspend and system sleep
|
|
|
|
* @is_suspended: whether flow control is currently disabled
|
|
|
|
*/
|
2015-08-11 16:35:35 +02:00
|
|
|
struct bcm_device {
|
2017-10-04 20:43:43 +02:00
|
|
|
/* Must be the first member, hci_serdev.c expects this. */
|
|
|
|
struct hci_uart serdev_hu;
|
2015-08-11 16:35:35 +02:00
|
|
|
struct list_head list;
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
struct device *dev;
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
const char *name;
|
|
|
|
struct gpio_desc *device_wakeup;
|
|
|
|
struct gpio_desc *shutdown;
|
2018-01-10 16:32:10 +01:00
|
|
|
int (*set_device_wakeup)(struct bcm_device *, bool);
|
|
|
|
int (*set_shutdown)(struct bcm_device *, bool);
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
acpi_handle btlp, btpu, btpd;
|
|
|
|
#endif
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
struct clk *clk;
|
|
|
|
bool clk_enabled;
|
2015-08-11 16:35:37 +02:00
|
|
|
|
|
|
|
u32 init_speed;
|
2017-08-16 09:53:30 +02:00
|
|
|
u32 oper_speed;
|
2015-09-04 15:35:44 +02:00
|
|
|
int irq;
|
2017-10-04 20:43:36 +02:00
|
|
|
bool irq_active_low;
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
#ifdef CONFIG_PM
|
2015-08-11 16:35:38 +02:00
|
|
|
struct hci_uart *hu;
|
2018-01-10 16:32:10 +01:00
|
|
|
bool is_suspended;
|
2015-08-11 16:35:38 +02:00
|
|
|
#endif
|
2015-08-11 16:35:35 +02:00
|
|
|
};
|
|
|
|
|
2017-08-17 19:59:51 +02:00
|
|
|
/* generic bcm uart resources */
|
2015-04-06 07:52:18 +02:00
|
|
|
struct bcm_data {
|
2015-08-11 16:35:35 +02:00
|
|
|
struct sk_buff *rx_skb;
|
|
|
|
struct sk_buff_head txq;
|
|
|
|
|
|
|
|
struct bcm_device *dev;
|
2015-04-06 07:52:18 +02:00
|
|
|
};
|
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
/* List of BCM BT UART devices */
|
2015-09-01 12:13:35 +02:00
|
|
|
static DEFINE_MUTEX(bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
static LIST_HEAD(bcm_device_list);
|
|
|
|
|
2017-08-17 19:59:51 +02:00
|
|
|
static inline void host_set_baudrate(struct hci_uart *hu, unsigned int speed)
|
|
|
|
{
|
|
|
|
if (hu->serdev)
|
|
|
|
serdev_device_set_baudrate(hu->serdev, speed);
|
|
|
|
else
|
|
|
|
hci_uart_set_baudrate(hu, speed);
|
|
|
|
}
|
|
|
|
|
2015-06-09 16:15:37 +02:00
|
|
|
static int bcm_set_baudrate(struct hci_uart *hu, unsigned int speed)
|
|
|
|
{
|
|
|
|
struct hci_dev *hdev = hu->hdev;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct bcm_update_uart_baud_rate param;
|
|
|
|
|
|
|
|
if (speed > 3000000) {
|
|
|
|
struct bcm_write_uart_clock_setting clock;
|
|
|
|
|
|
|
|
clock.type = BCM_UART_CLOCK_48MHZ;
|
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hdev, "Set Controller clock (%d)", clock.type);
|
2015-06-09 16:15:37 +02:00
|
|
|
|
|
|
|
/* This Broadcom specific command changes the UART's controller
|
|
|
|
* clock for baud rate > 3000000.
|
|
|
|
*/
|
|
|
|
skb = __hci_cmd_sync(hdev, 0xfc45, 1, &clock, HCI_INIT_TIMEOUT);
|
|
|
|
if (IS_ERR(skb)) {
|
|
|
|
int err = PTR_ERR(skb);
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_err(hdev, "BCM: failed to write clock (%d)",
|
|
|
|
err);
|
2015-06-09 16:15:37 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hdev, "Set Controller UART speed to %d bit/s", speed);
|
2015-06-09 16:15:37 +02:00
|
|
|
|
|
|
|
param.zero = cpu_to_le16(0);
|
|
|
|
param.baud_rate = cpu_to_le32(speed);
|
|
|
|
|
|
|
|
/* This Broadcom specific command changes the UART's controller baud
|
|
|
|
* rate.
|
|
|
|
*/
|
|
|
|
skb = __hci_cmd_sync(hdev, 0xfc18, sizeof(param), ¶m,
|
|
|
|
HCI_INIT_TIMEOUT);
|
|
|
|
if (IS_ERR(skb)) {
|
|
|
|
int err = PTR_ERR(skb);
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_err(hdev, "BCM: failed to write update baudrate (%d)",
|
|
|
|
err);
|
2015-06-09 16:15:37 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree_skb(skb);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-28 15:44:00 +02:00
|
|
|
/* bcm_device_exists should be protected by bcm_device_lock */
|
2015-08-11 16:35:35 +02:00
|
|
|
static bool bcm_device_exists(struct bcm_device *device)
|
|
|
|
{
|
|
|
|
struct list_head *p;
|
|
|
|
|
2017-10-11 15:46:21 +02:00
|
|
|
#ifdef CONFIG_PM
|
2017-10-04 20:43:43 +02:00
|
|
|
/* Devices using serdev always exist */
|
|
|
|
if (device && device->hu && device->hu->serdev)
|
|
|
|
return true;
|
2017-10-11 15:46:21 +02:00
|
|
|
#endif
|
2017-10-04 20:43:43 +02:00
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
list_for_each(p, &bcm_device_list) {
|
|
|
|
struct bcm_device *dev = list_entry(p, struct bcm_device, list);
|
|
|
|
|
|
|
|
if (device == dev)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
|
|
|
|
{
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err;
|
2015-08-11 16:35:35 +02:00
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled) {
|
|
|
|
err = clk_prepare_enable(dev->clk);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = dev->set_shutdown(dev, powered);
|
|
|
|
if (err)
|
|
|
|
goto err_clk_disable;
|
|
|
|
|
|
|
|
err = dev->set_device_wakeup(dev, powered);
|
|
|
|
if (err)
|
|
|
|
goto err_revert_shutdown;
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled)
|
2017-03-15 13:20:05 +01:00
|
|
|
clk_disable_unprepare(dev->clk);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
dev->clk_enabled = powered;
|
|
|
|
|
|
|
|
return 0;
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
|
|
|
|
err_revert_shutdown:
|
|
|
|
dev->set_shutdown(dev, !powered);
|
|
|
|
err_clk_disable:
|
|
|
|
if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled)
|
|
|
|
clk_disable_unprepare(dev->clk);
|
|
|
|
return err;
|
2015-08-11 16:35:35 +02:00
|
|
|
}
|
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
#ifdef CONFIG_PM
|
2015-09-04 15:35:44 +02:00
|
|
|
static irqreturn_t bcm_host_wake(int irq, void *data)
|
|
|
|
{
|
|
|
|
struct bcm_device *bdev = data;
|
|
|
|
|
|
|
|
bt_dev_dbg(bdev, "Host wake IRQ");
|
|
|
|
|
2017-12-26 16:07:34 +01:00
|
|
|
pm_request_resume(bdev->dev);
|
2015-09-23 18:18:11 +02:00
|
|
|
|
2015-09-04 15:35:44 +02:00
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_request_irq(struct bcm_data *bcm)
|
|
|
|
{
|
|
|
|
struct bcm_device *bdev = bcm->dev;
|
2017-07-04 12:57:56 +02:00
|
|
|
int err;
|
2015-09-04 15:35:44 +02:00
|
|
|
|
|
|
|
mutex_lock(&bcm_device_lock);
|
|
|
|
if (!bcm_device_exists(bdev)) {
|
|
|
|
err = -ENODEV;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2017-07-04 12:57:56 +02:00
|
|
|
if (bdev->irq <= 0) {
|
|
|
|
err = -EOPNOTSUPP;
|
|
|
|
goto unlock;
|
|
|
|
}
|
2015-09-04 15:35:44 +02:00
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
err = devm_request_irq(bdev->dev, bdev->irq, bcm_host_wake,
|
2017-10-04 20:43:36 +02:00
|
|
|
bdev->irq_active_low ? IRQF_TRIGGER_FALLING :
|
|
|
|
IRQF_TRIGGER_RISING,
|
|
|
|
"host_wake", bdev);
|
2018-01-10 16:32:10 +01:00
|
|
|
if (err) {
|
|
|
|
bdev->irq = err;
|
2017-07-04 12:57:56 +02:00
|
|
|
goto unlock;
|
2018-01-10 16:32:10 +01:00
|
|
|
}
|
2015-09-23 18:18:11 +02:00
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
device_init_wakeup(bdev->dev, true);
|
2017-07-04 12:57:56 +02:00
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
pm_runtime_set_autosuspend_delay(bdev->dev,
|
2017-07-04 12:57:56 +02:00
|
|
|
BCM_AUTOSUSPEND_DELAY);
|
2017-10-04 20:43:39 +02:00
|
|
|
pm_runtime_use_autosuspend(bdev->dev);
|
|
|
|
pm_runtime_set_active(bdev->dev);
|
|
|
|
pm_runtime_enable(bdev->dev);
|
2015-09-04 15:35:44 +02:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
mutex_unlock(&bcm_device_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct bcm_set_sleep_mode default_sleep_params = {
|
|
|
|
.sleep_mode = 1, /* 0=Disabled, 1=UART, 2=Reserved, 3=USB */
|
|
|
|
.idle_host = 2, /* idle threshold HOST, in 300ms */
|
|
|
|
.idle_dev = 2, /* idle threshold device, in 300ms */
|
|
|
|
.bt_wake_active = 1, /* BT_WAKE active mode: 1 = high, 0 = low */
|
|
|
|
.host_wake_active = 0, /* HOST_WAKE active mode: 1 = high, 0 = low */
|
|
|
|
.allow_host_sleep = 1, /* Allow host sleep in SCO flag */
|
2015-09-23 18:18:11 +02:00
|
|
|
.combine_modes = 1, /* Combine sleep and LPM flag */
|
2015-09-04 15:35:44 +02:00
|
|
|
.tristate_control = 0, /* Allow tri-state control of UART tx flag */
|
|
|
|
/* Irrelevant USB flags */
|
|
|
|
.usb_auto_sleep = 0,
|
|
|
|
.usb_resume_timeout = 0,
|
|
|
|
.pulsed_host_wake = 0,
|
|
|
|
.break_to_host = 0
|
|
|
|
};
|
|
|
|
|
|
|
|
static int bcm_setup_sleep(struct hci_uart *hu)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct bcm_set_sleep_mode sleep_params = default_sleep_params;
|
|
|
|
|
2017-10-04 20:43:36 +02:00
|
|
|
sleep_params.host_wake_active = !bcm->dev->irq_active_low;
|
2015-09-04 15:35:44 +02:00
|
|
|
|
|
|
|
skb = __hci_cmd_sync(hu->hdev, 0xfc27, sizeof(sleep_params),
|
|
|
|
&sleep_params, HCI_INIT_TIMEOUT);
|
|
|
|
if (IS_ERR(skb)) {
|
|
|
|
int err = PTR_ERR(skb);
|
|
|
|
bt_dev_err(hu->hdev, "Sleep VSC failed (%d)", err);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
kfree_skb(skb);
|
|
|
|
|
|
|
|
bt_dev_dbg(hu->hdev, "Set Sleep Parameters VSC succeeded");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int bcm_request_irq(struct bcm_data *bcm) { return 0; }
|
|
|
|
static inline int bcm_setup_sleep(struct hci_uart *hu) { return 0; }
|
|
|
|
#endif
|
|
|
|
|
2015-10-07 20:08:26 +02:00
|
|
|
static int bcm_set_diag(struct hci_dev *hdev, bool enable)
|
|
|
|
{
|
|
|
|
struct hci_uart *hu = hci_get_drvdata(hdev);
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
if (!test_bit(HCI_RUNNING, &hdev->flags))
|
|
|
|
return -ENETDOWN;
|
|
|
|
|
|
|
|
skb = bt_skb_alloc(3, GFP_KERNEL);
|
2015-10-22 11:06:09 +02:00
|
|
|
if (!skb)
|
|
|
|
return -ENOMEM;
|
2015-10-07 20:08:26 +02:00
|
|
|
|
networking: add and use skb_put_u8()
Joe and Bjørn suggested that it'd be nicer to not have the
cast in the fairly common case of doing
*(u8 *)skb_put(skb, 1) = c;
Add skb_put_u8() for this case, and use it across the code,
using the following spatch:
@@
expression SKB, C, S;
typedef u8;
identifier fn = {skb_put};
fresh identifier fn2 = fn ## "_u8";
@@
- *(u8 *)fn(SKB, S) = C;
+ fn2(SKB, C);
Note that due to the "S", the spatch isn't perfect, it should
have checked that S is 1, but there's also places that use a
sizeof expression like sizeof(var) or sizeof(u8) etc. Turns
out that nobody ever did something like
*(u8 *)skb_put(skb, 2) = c;
which would be wrong anyway since the second byte wouldn't be
initialized.
Suggested-by: Joe Perches <joe@perches.com>
Suggested-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-16 14:29:24 +02:00
|
|
|
skb_put_u8(skb, BCM_LM_DIAG_PKT);
|
|
|
|
skb_put_u8(skb, 0xf0);
|
|
|
|
skb_put_u8(skb, enable);
|
2015-10-07 20:08:26 +02:00
|
|
|
|
|
|
|
skb_queue_tail(&bcm->txq, skb);
|
|
|
|
hci_uart_tx_wakeup(hu);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
static int bcm_open(struct hci_uart *hu)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm;
|
2015-08-11 16:35:35 +02:00
|
|
|
struct list_head *p;
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err;
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hu->hdev, "hu %p", hu);
|
2015-04-06 07:52:18 +02:00
|
|
|
|
|
|
|
bcm = kzalloc(sizeof(*bcm), GFP_KERNEL);
|
|
|
|
if (!bcm)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
skb_queue_head_init(&bcm->txq);
|
|
|
|
|
|
|
|
hu->priv = bcm;
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
mutex_lock(&bcm_device_lock);
|
|
|
|
|
2017-08-17 19:59:51 +02:00
|
|
|
if (hu->serdev) {
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = serdev_device_open(hu->serdev);
|
|
|
|
if (err)
|
|
|
|
goto err_free;
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
bcm->dev = serdev_device_get_drvdata(hu->serdev);
|
2017-08-17 19:59:51 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2017-03-29 18:15:27 +02:00
|
|
|
if (!hu->tty->dev)
|
|
|
|
goto out;
|
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
list_for_each(p, &bcm_device_list) {
|
|
|
|
struct bcm_device *dev = list_entry(p, struct bcm_device, list);
|
|
|
|
|
|
|
|
/* Retrieve saved bcm_device based on parent of the
|
|
|
|
* platform device (saved during device probe) and
|
|
|
|
* parent of tty device used by hci_uart
|
|
|
|
*/
|
2017-10-04 20:43:39 +02:00
|
|
|
if (hu->tty->dev->parent == dev->dev->parent) {
|
2015-08-11 16:35:35 +02:00
|
|
|
bcm->dev = dev;
|
2015-09-23 18:18:09 +02:00
|
|
|
#ifdef CONFIG_PM
|
2015-08-11 16:35:38 +02:00
|
|
|
dev->hu = hu;
|
|
|
|
#endif
|
2015-08-11 16:35:35 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-29 18:15:27 +02:00
|
|
|
out:
|
2017-10-04 20:43:43 +02:00
|
|
|
if (bcm->dev) {
|
|
|
|
hu->init_speed = bcm->dev->init_speed;
|
|
|
|
hu->oper_speed = bcm->dev->oper_speed;
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bcm_gpio_set_power(bcm->dev, true);
|
|
|
|
if (err)
|
|
|
|
goto err_unset_hu;
|
2017-10-04 20:43:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-04-06 07:52:18 +02:00
|
|
|
return 0;
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
|
|
|
|
err_unset_hu:
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
bcm->dev->hu = NULL;
|
|
|
|
#endif
|
|
|
|
err_free:
|
|
|
|
mutex_unlock(&bcm_device_lock);
|
|
|
|
hu->priv = NULL;
|
|
|
|
kfree(bcm);
|
|
|
|
return err;
|
2015-04-06 07:52:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_close(struct hci_uart *hu)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
2017-10-04 20:43:43 +02:00
|
|
|
struct bcm_device *bdev = NULL;
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err;
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hu->hdev, "hu %p", hu);
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
/* Protect bcm->dev against removal of the device or driver */
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_lock(&bcm_device_lock);
|
2017-10-04 20:43:43 +02:00
|
|
|
|
|
|
|
if (hu->serdev) {
|
|
|
|
serdev_device_close(hu->serdev);
|
|
|
|
bdev = serdev_device_get_drvdata(hu->serdev);
|
|
|
|
} else if (bcm_device_exists(bcm->dev)) {
|
|
|
|
bdev = bcm->dev;
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
bdev->hu = NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bdev) {
|
2018-01-10 16:32:10 +01:00
|
|
|
if (IS_ENABLED(CONFIG_PM) && bdev->irq > 0) {
|
2017-10-04 20:43:39 +02:00
|
|
|
devm_free_irq(bdev->dev, bdev->irq, bdev);
|
|
|
|
device_init_wakeup(bdev->dev, false);
|
2018-01-10 16:32:10 +01:00
|
|
|
pm_runtime_disable(bdev->dev);
|
2015-09-04 15:35:44 +02:00
|
|
|
}
|
2018-01-10 16:32:10 +01:00
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bcm_gpio_set_power(bdev, false);
|
|
|
|
if (err)
|
|
|
|
bt_dev_err(hu->hdev, "Failed to power down");
|
|
|
|
else
|
|
|
|
pm_runtime_set_suspended(bdev->dev);
|
2015-08-11 16:35:38 +02:00
|
|
|
}
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
skb_queue_purge(&bcm->txq);
|
|
|
|
kfree_skb(bcm->rx_skb);
|
|
|
|
kfree(bcm);
|
|
|
|
|
|
|
|
hu->priv = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_flush(struct hci_uart *hu)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hu->hdev, "hu %p", hu);
|
2015-04-06 07:52:18 +02:00
|
|
|
|
|
|
|
skb_queue_purge(&bcm->txq);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_setup(struct hci_uart *hu)
|
|
|
|
{
|
2015-09-04 15:35:44 +02:00
|
|
|
struct bcm_data *bcm = hu->priv;
|
2015-05-28 11:25:05 +02:00
|
|
|
char fw_name[64];
|
|
|
|
const struct firmware *fw;
|
2015-06-18 12:43:27 +02:00
|
|
|
unsigned int speed;
|
2015-05-28 11:25:05 +02:00
|
|
|
int err;
|
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hu->hdev, "hu %p", hu);
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2015-10-07 20:08:26 +02:00
|
|
|
hu->hdev->set_diag = bcm_set_diag;
|
2015-04-06 07:52:18 +02:00
|
|
|
hu->hdev->set_bdaddr = btbcm_set_bdaddr;
|
|
|
|
|
2015-05-28 11:25:05 +02:00
|
|
|
err = btbcm_initialize(hu->hdev, fw_name, sizeof(fw_name));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = request_firmware(&fw, fw_name, &hu->hdev->dev);
|
|
|
|
if (err < 0) {
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_info(hu->hdev, "BCM: Patch %s not found", fw_name);
|
2015-05-28 11:25:05 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = btbcm_patchram(hu->hdev, fw);
|
|
|
|
if (err) {
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_info(hu->hdev, "BCM: Patch failed (%d)", err);
|
2015-05-28 11:25:05 +02:00
|
|
|
goto finalize;
|
|
|
|
}
|
|
|
|
|
2015-06-18 12:43:27 +02:00
|
|
|
/* Init speed if any */
|
|
|
|
if (hu->init_speed)
|
|
|
|
speed = hu->init_speed;
|
|
|
|
else if (hu->proto->init_speed)
|
|
|
|
speed = hu->proto->init_speed;
|
|
|
|
else
|
|
|
|
speed = 0;
|
|
|
|
|
|
|
|
if (speed)
|
2017-08-17 19:59:51 +02:00
|
|
|
host_set_baudrate(hu, speed);
|
2015-06-18 12:43:27 +02:00
|
|
|
|
|
|
|
/* Operational speed if any */
|
|
|
|
if (hu->oper_speed)
|
|
|
|
speed = hu->oper_speed;
|
|
|
|
else if (hu->proto->oper_speed)
|
|
|
|
speed = hu->proto->oper_speed;
|
|
|
|
else
|
|
|
|
speed = 0;
|
|
|
|
|
|
|
|
if (speed) {
|
|
|
|
err = bcm_set_baudrate(hu, speed);
|
2015-06-09 16:15:37 +02:00
|
|
|
if (!err)
|
2017-08-17 19:59:51 +02:00
|
|
|
host_set_baudrate(hu, speed);
|
2015-06-09 16:15:37 +02:00
|
|
|
}
|
|
|
|
|
2015-05-28 11:25:05 +02:00
|
|
|
finalize:
|
|
|
|
release_firmware(fw);
|
|
|
|
|
|
|
|
err = btbcm_finalize(hu->hdev);
|
2015-09-04 15:35:44 +02:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-06-27 19:15:07 +02:00
|
|
|
if (!bcm_request_irq(bcm))
|
2015-09-04 15:35:44 +02:00
|
|
|
err = bcm_setup_sleep(hu);
|
2015-05-28 11:25:05 +02:00
|
|
|
|
|
|
|
return err;
|
2015-04-06 07:52:18 +02:00
|
|
|
}
|
|
|
|
|
2015-10-07 19:12:54 +02:00
|
|
|
#define BCM_RECV_LM_DIAG \
|
|
|
|
.type = BCM_LM_DIAG_PKT, \
|
|
|
|
.hlen = BCM_LM_DIAG_SIZE, \
|
|
|
|
.loff = 0, \
|
|
|
|
.lsize = 0, \
|
|
|
|
.maxlen = BCM_LM_DIAG_SIZE
|
|
|
|
|
2017-08-17 21:41:09 +02:00
|
|
|
#define BCM_RECV_NULL \
|
|
|
|
.type = BCM_NULL_PKT, \
|
|
|
|
.hlen = BCM_NULL_SIZE, \
|
|
|
|
.loff = 0, \
|
|
|
|
.lsize = 0, \
|
|
|
|
.maxlen = BCM_NULL_SIZE
|
|
|
|
|
2015-04-06 08:44:59 +02:00
|
|
|
static const struct h4_recv_pkt bcm_recv_pkts[] = {
|
2015-10-07 19:12:54 +02:00
|
|
|
{ H4_RECV_ACL, .recv = hci_recv_frame },
|
|
|
|
{ H4_RECV_SCO, .recv = hci_recv_frame },
|
|
|
|
{ H4_RECV_EVENT, .recv = hci_recv_frame },
|
|
|
|
{ BCM_RECV_LM_DIAG, .recv = hci_recv_diag },
|
2017-08-17 21:41:09 +02:00
|
|
|
{ BCM_RECV_NULL, .recv = hci_recv_diag },
|
2015-04-06 08:44:59 +02:00
|
|
|
};
|
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
static int bcm_recv(struct hci_uart *hu, const void *data, int count)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
|
|
|
|
|
|
|
if (!test_bit(HCI_UART_REGISTERED, &hu->flags))
|
|
|
|
return -EUNATCH;
|
|
|
|
|
2015-04-06 08:44:59 +02:00
|
|
|
bcm->rx_skb = h4_recv_buf(hu->hdev, bcm->rx_skb, data, count,
|
|
|
|
bcm_recv_pkts, ARRAY_SIZE(bcm_recv_pkts));
|
2015-04-06 07:52:18 +02:00
|
|
|
if (IS_ERR(bcm->rx_skb)) {
|
|
|
|
int err = PTR_ERR(bcm->rx_skb);
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_err(hu->hdev, "Frame reassembly failed (%d)", err);
|
2015-06-17 14:10:39 +02:00
|
|
|
bcm->rx_skb = NULL;
|
2015-04-06 07:52:18 +02:00
|
|
|
return err;
|
2015-09-23 18:18:11 +02:00
|
|
|
} else if (!bcm->rx_skb) {
|
|
|
|
/* Delay auto-suspend when receiving completed packet */
|
|
|
|
mutex_lock(&bcm_device_lock);
|
2017-12-26 16:07:34 +01:00
|
|
|
if (bcm->dev && bcm_device_exists(bcm->dev))
|
|
|
|
pm_request_resume(bcm->dev->dev);
|
2015-09-23 18:18:11 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-04-06 07:52:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_enqueue(struct hci_uart *hu, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(hu->hdev, "hu %p skb %p", hu, skb);
|
2015-04-06 07:52:18 +02:00
|
|
|
|
|
|
|
/* Prepend skb with frame type */
|
2015-11-05 07:33:56 +01:00
|
|
|
memcpy(skb_push(skb, 1), &hci_skb_pkt_type(skb), 1);
|
2015-04-06 07:52:18 +02:00
|
|
|
skb_queue_tail(&bcm->txq, skb);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sk_buff *bcm_dequeue(struct hci_uart *hu)
|
|
|
|
{
|
|
|
|
struct bcm_data *bcm = hu->priv;
|
2015-09-23 18:18:11 +02:00
|
|
|
struct sk_buff *skb = NULL;
|
|
|
|
struct bcm_device *bdev = NULL;
|
|
|
|
|
|
|
|
mutex_lock(&bcm_device_lock);
|
|
|
|
|
|
|
|
if (bcm_device_exists(bcm->dev)) {
|
|
|
|
bdev = bcm->dev;
|
2017-10-04 20:43:39 +02:00
|
|
|
pm_runtime_get_sync(bdev->dev);
|
2015-09-23 18:18:11 +02:00
|
|
|
/* Shall be resumed here */
|
|
|
|
}
|
|
|
|
|
|
|
|
skb = skb_dequeue(&bcm->txq);
|
|
|
|
|
|
|
|
if (bdev) {
|
2017-10-04 20:43:39 +02:00
|
|
|
pm_runtime_mark_last_busy(bdev->dev);
|
|
|
|
pm_runtime_put_autosuspend(bdev->dev);
|
2015-09-23 18:18:11 +02:00
|
|
|
}
|
2015-04-06 07:52:18 +02:00
|
|
|
|
2015-09-23 18:18:11 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
|
|
|
|
|
|
|
return skb;
|
2015-04-06 07:52:18 +02:00
|
|
|
}
|
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
#ifdef CONFIG_PM
|
|
|
|
static int bcm_suspend_device(struct device *dev)
|
2015-08-11 16:35:38 +02:00
|
|
|
{
|
2017-10-04 20:43:42 +02:00
|
|
|
struct bcm_device *bdev = dev_get_drvdata(dev);
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err;
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
bt_dev_dbg(bdev, "");
|
2015-08-28 15:44:00 +02:00
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
if (!bdev->is_suspended && bdev->hu) {
|
2015-08-11 16:35:38 +02:00
|
|
|
hci_uart_set_flow_control(bdev->hu, true);
|
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
/* Once this returns, driver suspends BT via GPIO */
|
2015-08-11 16:35:38 +02:00
|
|
|
bdev->is_suspended = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Suspend the device */
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bdev->set_device_wakeup(bdev, false);
|
|
|
|
if (err) {
|
|
|
|
if (bdev->is_suspended && bdev->hu) {
|
|
|
|
bdev->is_suspended = false;
|
|
|
|
hci_uart_set_flow_control(bdev->hu, false);
|
|
|
|
}
|
|
|
|
return -EBUSY;
|
|
|
|
}
|
|
|
|
|
Bluetooth: hci_bcm: Mandate presence of shutdown and device wake GPIO
Commit 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices")
amended this driver to request a shutdown and device wake GPIO on probe,
but mandated that only one of them need to be present:
/* Make sure at-least one of the GPIO is defined and that
* a name is specified for this instance
*/
if ((!dev->device_wakeup && !dev->shutdown) || !dev->name) {
dev_err(&pdev->dev, "invalid platform data\n");
return -EINVAL;
}
However the same commit added a call to bcm_gpio_set_power() to the
->probe hook, which unconditionally accesses *both* GPIOs. Luckily,
the resulting NULL pointer deref was never reported, suggesting there's
no machine where either GPIO is missing.
Commit 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the
serdev driver") removed the check whether at least one of the GPIOs is
present without specifying a reason.
Because commit 62aaefa7d038 ("Bluetooth: hci_bcm: improve use of gpios
API") refactored the driver to use devm_gpiod_get_optional() instead of
devm_gpiod_get(), one is now tempted to believe that the driver doesn't
require *any* of the two GPIOs.
Which is wrong, the driver still requires both GPIOs to avoid a NULL
pointer deref. To this end, establish the status quo ante and request
the GPIOs with devm_gpiod_get() again. Bail out of ->probe if either
of them is missing.
Oddly enough, whereas bcm_gpio_set_power() accesses the device wake pin
unconditionally, bcm_suspend_device() and bcm_resume_device() do check
for its presence before accessing it. Those checks are superfluous,
so remove them.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
bt_dev_dbg(bdev, "suspend, delaying 15 ms");
|
|
|
|
mdelay(15);
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-09-23 18:18:09 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_resume_device(struct device *dev)
|
|
|
|
{
|
2017-10-04 20:43:42 +02:00
|
|
|
struct bcm_device *bdev = dev_get_drvdata(dev);
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err;
|
2015-09-23 18:18:09 +02:00
|
|
|
|
|
|
|
bt_dev_dbg(bdev, "");
|
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bdev->set_device_wakeup(bdev, true);
|
|
|
|
if (err) {
|
|
|
|
dev_err(dev, "Failed to power up\n");
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
Bluetooth: hci_bcm: Mandate presence of shutdown and device wake GPIO
Commit 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices")
amended this driver to request a shutdown and device wake GPIO on probe,
but mandated that only one of them need to be present:
/* Make sure at-least one of the GPIO is defined and that
* a name is specified for this instance
*/
if ((!dev->device_wakeup && !dev->shutdown) || !dev->name) {
dev_err(&pdev->dev, "invalid platform data\n");
return -EINVAL;
}
However the same commit added a call to bcm_gpio_set_power() to the
->probe hook, which unconditionally accesses *both* GPIOs. Luckily,
the resulting NULL pointer deref was never reported, suggesting there's
no machine where either GPIO is missing.
Commit 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the
serdev driver") removed the check whether at least one of the GPIOs is
present without specifying a reason.
Because commit 62aaefa7d038 ("Bluetooth: hci_bcm: improve use of gpios
API") refactored the driver to use devm_gpiod_get_optional() instead of
devm_gpiod_get(), one is now tempted to believe that the driver doesn't
require *any* of the two GPIOs.
Which is wrong, the driver still requires both GPIOs to avoid a NULL
pointer deref. To this end, establish the status quo ante and request
the GPIOs with devm_gpiod_get() again. Bail out of ->probe if either
of them is missing.
Oddly enough, whereas bcm_gpio_set_power() accesses the device wake pin
unconditionally, bcm_suspend_device() and bcm_resume_device() do check
for its presence before accessing it. Those checks are superfluous,
so remove them.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
bt_dev_dbg(bdev, "resume, delaying 15 ms");
|
|
|
|
mdelay(15);
|
2015-09-23 18:18:09 +02:00
|
|
|
|
|
|
|
/* When this executes, the device has woken up already */
|
|
|
|
if (bdev->is_suspended && bdev->hu) {
|
|
|
|
bdev->is_suspended = false;
|
|
|
|
|
|
|
|
hci_uart_set_flow_control(bdev->hu, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
2017-10-04 20:43:43 +02:00
|
|
|
/* suspend callback */
|
2015-09-23 18:18:09 +02:00
|
|
|
static int bcm_suspend(struct device *dev)
|
|
|
|
{
|
2017-10-04 20:43:42 +02:00
|
|
|
struct bcm_device *bdev = dev_get_drvdata(dev);
|
2015-09-23 18:18:09 +02:00
|
|
|
int error;
|
|
|
|
|
|
|
|
bt_dev_dbg(bdev, "suspend: is_suspended %d", bdev->is_suspended);
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
/*
|
|
|
|
* When used with a device instantiated as platform_device, bcm_suspend
|
|
|
|
* can be called at any time as long as the platform device is bound,
|
|
|
|
* so it should use bcm_device_lock to protect access to hci_uart
|
2015-09-23 18:18:09 +02:00
|
|
|
* and device_wake-up GPIO.
|
|
|
|
*/
|
|
|
|
mutex_lock(&bcm_device_lock);
|
|
|
|
|
|
|
|
if (!bdev->hu)
|
|
|
|
goto unlock;
|
|
|
|
|
2015-09-23 18:18:11 +02:00
|
|
|
if (pm_runtime_active(dev))
|
|
|
|
bcm_suspend_device(dev);
|
2015-09-23 18:18:09 +02:00
|
|
|
|
2018-01-10 16:32:10 +01:00
|
|
|
if (device_may_wakeup(dev) && bdev->irq > 0) {
|
2015-09-04 15:35:44 +02:00
|
|
|
error = enable_irq_wake(bdev->irq);
|
|
|
|
if (!error)
|
|
|
|
bt_dev_dbg(bdev, "BCM irq: enabled");
|
|
|
|
}
|
|
|
|
|
2015-08-28 15:44:00 +02:00
|
|
|
unlock:
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-08-28 15:44:00 +02:00
|
|
|
|
2015-08-11 16:35:38 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
/* resume callback */
|
2015-08-11 16:35:38 +02:00
|
|
|
static int bcm_resume(struct device *dev)
|
|
|
|
{
|
2017-10-04 20:43:42 +02:00
|
|
|
struct bcm_device *bdev = dev_get_drvdata(dev);
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
int err = 0;
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-09-01 12:13:36 +02:00
|
|
|
bt_dev_dbg(bdev, "resume: is_suspended %d", bdev->is_suspended);
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
/*
|
|
|
|
* When used with a device instantiated as platform_device, bcm_resume
|
|
|
|
* can be called at any time as long as platform device is bound,
|
|
|
|
* so it should use bcm_device_lock to protect access to hci_uart
|
2015-09-23 18:18:09 +02:00
|
|
|
* and device_wake-up GPIO.
|
|
|
|
*/
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_lock(&bcm_device_lock);
|
2015-08-28 15:44:00 +02:00
|
|
|
|
|
|
|
if (!bdev->hu)
|
|
|
|
goto unlock;
|
|
|
|
|
2018-01-10 16:32:10 +01:00
|
|
|
if (device_may_wakeup(dev) && bdev->irq > 0) {
|
2015-09-04 15:35:44 +02:00
|
|
|
disable_irq_wake(bdev->irq);
|
|
|
|
bt_dev_dbg(bdev, "BCM irq: disabled");
|
|
|
|
}
|
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bcm_resume_device(dev);
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-08-28 15:44:00 +02:00
|
|
|
unlock:
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-08-28 15:44:00 +02:00
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
if (!err) {
|
|
|
|
pm_runtime_disable(dev);
|
|
|
|
pm_runtime_set_active(dev);
|
|
|
|
pm_runtime_enable(dev);
|
|
|
|
}
|
2015-09-23 18:18:11 +02:00
|
|
|
|
2015-08-11 16:35:38 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-01-05 18:10:54 +01:00
|
|
|
static const struct acpi_gpio_params int_last_device_wakeup_gpios = { 0, 0, false };
|
|
|
|
static const struct acpi_gpio_params int_last_shutdown_gpios = { 1, 0, false };
|
|
|
|
static const struct acpi_gpio_params int_last_host_wakeup_gpios = { 2, 0, false };
|
|
|
|
|
|
|
|
static const struct acpi_gpio_mapping acpi_bcm_int_last_gpios[] = {
|
|
|
|
{ "device-wakeup-gpios", &int_last_device_wakeup_gpios, 1 },
|
|
|
|
{ "shutdown-gpios", &int_last_shutdown_gpios, 1 },
|
|
|
|
{ "host-wakeup-gpios", &int_last_host_wakeup_gpios, 1 },
|
|
|
|
{ },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct acpi_gpio_params int_first_host_wakeup_gpios = { 0, 0, false };
|
|
|
|
static const struct acpi_gpio_params int_first_device_wakeup_gpios = { 1, 0, false };
|
|
|
|
static const struct acpi_gpio_params int_first_shutdown_gpios = { 2, 0, false };
|
|
|
|
|
|
|
|
static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {
|
|
|
|
{ "device-wakeup-gpios", &int_first_device_wakeup_gpios, 1 },
|
|
|
|
{ "shutdown-gpios", &int_first_shutdown_gpios, 1 },
|
|
|
|
{ "host-wakeup-gpios", &int_first_host_wakeup_gpios, 1 },
|
2015-08-11 16:35:35 +02:00
|
|
|
{ },
|
|
|
|
};
|
|
|
|
|
2015-08-12 12:46:01 +02:00
|
|
|
#ifdef CONFIG_ACPI
|
2015-09-23 18:18:08 +02:00
|
|
|
/* IRQ polarity of some chipsets are not defined correctly in ACPI table. */
|
2017-10-04 20:43:36 +02:00
|
|
|
static const struct dmi_system_id bcm_active_low_irq_dmi_table[] = {
|
2015-09-23 18:18:08 +02:00
|
|
|
{
|
|
|
|
.ident = "Asus T100TA",
|
|
|
|
.matches = {
|
|
|
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR,
|
|
|
|
"ASUSTeK COMPUTER INC."),
|
|
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
|
|
|
|
},
|
|
|
|
},
|
2017-06-29 14:21:32 +02:00
|
|
|
{
|
|
|
|
.ident = "Asus T100CHI",
|
|
|
|
.matches = {
|
|
|
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR,
|
|
|
|
"ASUSTeK COMPUTER INC."),
|
|
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100CHI"),
|
|
|
|
},
|
|
|
|
},
|
2016-10-09 15:51:05 +02:00
|
|
|
{ /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */
|
|
|
|
.ident = "Lenovo ThinkPad 8",
|
|
|
|
.matches = {
|
|
|
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
|
|
|
DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "ThinkPad 8"),
|
|
|
|
},
|
|
|
|
},
|
Bluetooth: hci_bcm: Add support for MINIX Z83-4 based devices
The MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices use an AP6255 chip for
wifi and bluetooth. Bluetooth requires an ACPI device id of BCM2EA4 with
BCM4345 rev C0 firmware.
This patch adds the device id and to use trigger type IRQF_TRIGGER_FALLING
as defined by 'GpioInt' in the ACPI DSDT table:
Device (BLT0)
{
Name (_HID, "BCM2EA4") // _HID: Hardware ID
Method (_STA, 0, NotSerialized) // _STA: Status
{
Return (0x0F)
}
Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
{
Name (UBUF, ResourceTemplate ()
{
UartSerialBusV2 (0x0001C200, DataBitsEight, StopBitsOne,
0xFC, LittleEndian, ParityTypeNone, FlowControlHardware,
0x0020, 0x0020, "\\_SB.PCI0.URT1",
0x00, ResourceConsumer, , Exclusive,
)
GpioInt (Level, ActiveLow, Exclusive, PullNone, 0x0000,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0005
}
GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0007
}
GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0004
}
})
Return (UBUF) /* \_SB_.PCI0.URT1.BLT0._CRS.UBUF */
}
}
Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2017-10-07 08:15:25 +02:00
|
|
|
{
|
|
|
|
.ident = "MINIX Z83-4",
|
|
|
|
.matches = {
|
|
|
|
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "MINIX"),
|
|
|
|
DMI_MATCH(DMI_PRODUCT_NAME, "Z83-4"),
|
|
|
|
},
|
|
|
|
},
|
2015-09-23 18:18:08 +02:00
|
|
|
{ }
|
|
|
|
};
|
|
|
|
|
2015-08-11 16:35:37 +02:00
|
|
|
static int bcm_resource(struct acpi_resource *ares, void *data)
|
|
|
|
{
|
|
|
|
struct bcm_device *dev = data;
|
2015-09-04 15:35:44 +02:00
|
|
|
struct acpi_resource_extended_irq *irq;
|
|
|
|
struct acpi_resource_gpio *gpio;
|
|
|
|
struct acpi_resource_uart_serialbus *sb;
|
|
|
|
|
|
|
|
switch (ares->type) {
|
|
|
|
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
|
|
|
|
irq = &ares->data.extended_irq;
|
2017-10-04 20:43:36 +02:00
|
|
|
dev->irq_active_low = irq->polarity == ACPI_ACTIVE_LOW;
|
2015-09-04 15:35:44 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ACPI_RESOURCE_TYPE_GPIO:
|
|
|
|
gpio = &ares->data.gpio;
|
|
|
|
if (gpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT)
|
2017-10-04 20:43:36 +02:00
|
|
|
dev->irq_active_low = gpio->polarity == ACPI_ACTIVE_LOW;
|
2015-09-04 15:35:44 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ACPI_RESOURCE_TYPE_SERIAL_BUS:
|
2015-08-11 16:35:37 +02:00
|
|
|
sb = &ares->data.uart_serial_bus;
|
2017-08-16 09:53:30 +02:00
|
|
|
if (sb->type == ACPI_RESOURCE_SERIAL_TYPE_UART) {
|
2015-08-11 16:35:37 +02:00
|
|
|
dev->init_speed = sb->default_baud_rate;
|
2017-08-16 09:53:30 +02:00
|
|
|
dev->oper_speed = 4000000;
|
|
|
|
}
|
2015-09-04 15:35:44 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
2015-08-11 16:35:37 +02:00
|
|
|
}
|
|
|
|
|
2017-10-04 20:43:41 +02:00
|
|
|
return 0;
|
2015-08-11 16:35:37 +02:00
|
|
|
}
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
|
|
|
|
static int bcm_apple_set_device_wakeup(struct bcm_device *dev, bool awake)
|
|
|
|
{
|
|
|
|
if (ACPI_FAILURE(acpi_execute_simple_method(dev->btlp, NULL, !awake)))
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_apple_set_shutdown(struct bcm_device *dev, bool powered)
|
|
|
|
{
|
|
|
|
if (ACPI_FAILURE(acpi_evaluate_object(powered ? dev->btpu : dev->btpd,
|
|
|
|
NULL, NULL, NULL)))
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_apple_get_resources(struct bcm_device *dev)
|
|
|
|
{
|
|
|
|
struct acpi_device *adev = ACPI_COMPANION(dev->dev);
|
|
|
|
const union acpi_object *obj;
|
|
|
|
|
|
|
|
if (!adev ||
|
|
|
|
ACPI_FAILURE(acpi_get_handle(adev->handle, "BTLP", &dev->btlp)) ||
|
|
|
|
ACPI_FAILURE(acpi_get_handle(adev->handle, "BTPU", &dev->btpu)) ||
|
|
|
|
ACPI_FAILURE(acpi_get_handle(adev->handle, "BTPD", &dev->btpd)))
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
if (!acpi_dev_get_property(adev, "baud", ACPI_TYPE_BUFFER, &obj) &&
|
|
|
|
obj->buffer.length == 8)
|
|
|
|
dev->init_speed = *(u64 *)obj->buffer.pointer;
|
|
|
|
|
|
|
|
dev->set_device_wakeup = bcm_apple_set_device_wakeup;
|
|
|
|
dev->set_shutdown = bcm_apple_set_shutdown;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline int bcm_apple_get_resources(struct bcm_device *dev)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
2017-03-10 13:28:20 +01:00
|
|
|
#endif /* CONFIG_ACPI */
|
2015-08-11 16:35:37 +02:00
|
|
|
|
2018-01-10 16:32:10 +01:00
|
|
|
static int bcm_gpio_set_device_wakeup(struct bcm_device *dev, bool awake)
|
|
|
|
{
|
|
|
|
gpiod_set_value(dev->device_wakeup, awake);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_gpio_set_shutdown(struct bcm_device *dev, bool powered)
|
|
|
|
{
|
|
|
|
gpiod_set_value(dev->shutdown, powered);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-10-04 20:43:40 +02:00
|
|
|
static int bcm_get_resources(struct bcm_device *dev)
|
2015-08-11 16:35:35 +02:00
|
|
|
{
|
2017-10-04 20:43:39 +02:00
|
|
|
dev->name = dev_name(dev->dev);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
Bluetooth: hci_bcm: Support Apple GPIO handling
Enable Bluetooth on the following Macs which provide custom ACPI methods
to toggle the GPIOs for device wake and shutdown instead of accessing
the pins directly:
MacBook8,1 2015 12"
MacBook9,1 2016 12"
MacBook10,1 2017 12"
MacBookPro13,1 2016 13"
MacBookPro13,2 2016 13" with Touch Bar
MacBookPro13,3 2016 15" with Touch Bar
MacBookPro14,1 2017 13"
MacBookPro14,2 2017 13" with Touch Bar
MacBookPro14,3 2017 15" with Touch Bar
On the MacBook8,1 Bluetooth is muxed with a second device (a debug port
on the SSD) under the control of PCH GPIO 36. Because serdev cannot
deal with multiple slaves yet, it is currently necessary to patch the
DSDT and remove the SSDC device.
The custom ACPI methods are called:
BTLP (Low Power) takes one argument, toggles device wake GPIO
BTPU (Power Up) tells SMC to drive shutdown GPIO high
BTPD (Power Down) tells SMC to drive shutdown GPIO low
BTRS (Reset) calls BTPD followed by BTPU
BTRB unknown, not present on all MacBooks
Search for the BTLP, BTPU and BTPD methods on ->probe and cache them in
struct bcm_device if the machine is a Mac.
Additionally, set the init_speed based on a custom device property
provided by Apple in lieu of _CRS resources. The Broadcom UART's speed
is fixed on Apple Macs: Any attempt to change it results in Bluetooth
status code 0x0c and bcm_set_baudrate() thus always returns -EBUSY.
By setting only the init_speed and leaving oper_speed at zero, we can
achieve that the host UART's speed is adjusted but the Broadcom UART's
speed is left as is.
The host wake pin goes into the SMC which handles it independently
of the OS, so there's no IRQ for it.
Thanks to Ronald Tschalär who did extensive debugging and testing of
this patch and contributed fixes.
ACPI snippet containing the custom methods and device properties
(taken from a MacBook8,1):
Method (BTLP, 1, Serialized)
{
If (LEqual (Arg0, 0x00))
{
Store (0x01, GD54) /* set PCH GPIO 54 direction to input */
}
If (LEqual (Arg0, 0x01))
{
Store (0x00, GD54) /* set PCH GPIO 54 direction to output */
Store (0x00, GP54) /* set PCH GPIO 54 value to low */
}
}
Method (BTPU, 0, Serialized)
{
Store (0x01, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTPD, 0, Serialized)
{
Store (0x00, \_SB.PCI0.LPCB.EC.BTPC)
Sleep (0x0A)
}
Method (BTRS, 0, Serialized)
{
BTPD ()
BTPU ()
}
Method (_DSM, 4, NotSerialized) // _DSM: Device-Specific Method
{
If (LEqual (Arg0, ToUUID ("a0b5b7c6-1318-441c-b0c9-fe695eaf949b")))
{
Store (Package (0x08)
{
"baud",
Buffer (0x08)
{ 0xC0, 0xC6, 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00 },
"parity",
Buffer (0x08)
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"dataBits",
Buffer (0x08)
{ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
"stopBits",
Buffer (0x08)
{ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
}, Local0)
DTGP (Arg0, Arg1, Arg2, Arg3, RefOf (Local0))
Return (Local0)
}
Return (0x00)
}
Link: https://github.com/Dunedan/mbp-2016-linux/issues/29
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=110901
Reported-by: Leif Liddy <leif.liddy@gmail.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Max Shavrick <mxms@me.com> [MacBook8,1]
Tested-by: Leif Liddy <leif.liddy@gmail.com> [MacBook9,1]
Tested-by: Daniel Roschka <danielroschka@phoenitydawn.de> [MacBookPro13,2]
Tested-by: Ronald Tschalär <ronald@innovation.ch> [MacBookPro13,3]
Tested-by: Peter Y. Chuang <peteryuchuang@gmail.com> [MacBookPro14,1]
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Ronald Tschalär <ronald@innovation.ch>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
if (x86_apple_machine && !bcm_apple_get_resources(dev))
|
|
|
|
return 0;
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
dev->clk = devm_clk_get(dev->dev, NULL);
|
2017-01-05 18:10:54 +01:00
|
|
|
|
Bluetooth: hci_bcm: Mandate presence of shutdown and device wake GPIO
Commit 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices")
amended this driver to request a shutdown and device wake GPIO on probe,
but mandated that only one of them need to be present:
/* Make sure at-least one of the GPIO is defined and that
* a name is specified for this instance
*/
if ((!dev->device_wakeup && !dev->shutdown) || !dev->name) {
dev_err(&pdev->dev, "invalid platform data\n");
return -EINVAL;
}
However the same commit added a call to bcm_gpio_set_power() to the
->probe hook, which unconditionally accesses *both* GPIOs. Luckily,
the resulting NULL pointer deref was never reported, suggesting there's
no machine where either GPIO is missing.
Commit 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the
serdev driver") removed the check whether at least one of the GPIOs is
present without specifying a reason.
Because commit 62aaefa7d038 ("Bluetooth: hci_bcm: improve use of gpios
API") refactored the driver to use devm_gpiod_get_optional() instead of
devm_gpiod_get(), one is now tempted to believe that the driver doesn't
require *any* of the two GPIOs.
Which is wrong, the driver still requires both GPIOs to avoid a NULL
pointer deref. To this end, establish the status quo ante and request
the GPIOs with devm_gpiod_get() again. Bail out of ->probe if either
of them is missing.
Oddly enough, whereas bcm_gpio_set_power() accesses the device wake pin
unconditionally, bcm_suspend_device() and bcm_resume_device() do check
for its presence before accessing it. Those checks are superfluous,
so remove them.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
dev->device_wakeup = devm_gpiod_get(dev->dev, "device-wakeup",
|
|
|
|
GPIOD_OUT_LOW);
|
2015-08-12 09:20:56 +02:00
|
|
|
if (IS_ERR(dev->device_wakeup))
|
|
|
|
return PTR_ERR(dev->device_wakeup);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
Bluetooth: hci_bcm: Mandate presence of shutdown and device wake GPIO
Commit 0395ffc1ee05 ("Bluetooth: hci_bcm: Add PM for BCM devices")
amended this driver to request a shutdown and device wake GPIO on probe,
but mandated that only one of them need to be present:
/* Make sure at-least one of the GPIO is defined and that
* a name is specified for this instance
*/
if ((!dev->device_wakeup && !dev->shutdown) || !dev->name) {
dev_err(&pdev->dev, "invalid platform data\n");
return -EINVAL;
}
However the same commit added a call to bcm_gpio_set_power() to the
->probe hook, which unconditionally accesses *both* GPIOs. Luckily,
the resulting NULL pointer deref was never reported, suggesting there's
no machine where either GPIO is missing.
Commit 8a92056837fd ("Bluetooth: hci_bcm: Add (runtime)pm support to the
serdev driver") removed the check whether at least one of the GPIOs is
present without specifying a reason.
Because commit 62aaefa7d038 ("Bluetooth: hci_bcm: improve use of gpios
API") refactored the driver to use devm_gpiod_get_optional() instead of
devm_gpiod_get(), one is now tempted to believe that the driver doesn't
require *any* of the two GPIOs.
Which is wrong, the driver still requires both GPIOs to avoid a NULL
pointer deref. To this end, establish the status quo ante and request
the GPIOs with devm_gpiod_get() again. Bail out of ->probe if either
of them is missing.
Oddly enough, whereas bcm_gpio_set_power() accesses the device wake pin
unconditionally, bcm_suspend_device() and bcm_resume_device() do check
for its presence before accessing it. Those checks are superfluous,
so remove them.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Loic Poulain <loic.poulain@linaro.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
dev->shutdown = devm_gpiod_get(dev->dev, "shutdown", GPIOD_OUT_LOW);
|
2015-08-12 09:20:56 +02:00
|
|
|
if (IS_ERR(dev->shutdown))
|
|
|
|
return PTR_ERR(dev->shutdown);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2018-01-10 16:32:10 +01:00
|
|
|
dev->set_device_wakeup = bcm_gpio_set_device_wakeup;
|
|
|
|
dev->set_shutdown = bcm_gpio_set_shutdown;
|
|
|
|
|
2015-09-04 15:35:44 +02:00
|
|
|
/* IRQ can be declared in ACPI table as Interrupt or GpioInt */
|
|
|
|
if (dev->irq <= 0) {
|
|
|
|
struct gpio_desc *gpio;
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
gpio = devm_gpiod_get_optional(dev->dev, "host-wakeup",
|
2015-09-04 15:35:44 +02:00
|
|
|
GPIOD_IN);
|
|
|
|
if (IS_ERR(gpio))
|
|
|
|
return PTR_ERR(gpio);
|
|
|
|
|
|
|
|
dev->irq = gpiod_to_irq(gpio);
|
|
|
|
}
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
dev_info(dev->dev, "BCM irq: %d\n", dev->irq);
|
2017-03-10 13:28:20 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
static int bcm_acpi_probe(struct bcm_device *dev)
|
|
|
|
{
|
|
|
|
LIST_HEAD(resources);
|
|
|
|
const struct dmi_system_id *dmi_id;
|
|
|
|
const struct acpi_gpio_mapping *gpio_mapping = acpi_bcm_int_last_gpios;
|
|
|
|
const struct acpi_device_id *id;
|
2017-10-04 20:43:41 +02:00
|
|
|
struct resource_entry *entry;
|
2017-03-10 13:28:20 +01:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Retrieve GPIO data */
|
2017-10-04 20:43:39 +02:00
|
|
|
id = acpi_match_device(dev->dev->driver->acpi_match_table, dev->dev);
|
2017-03-10 13:28:20 +01:00
|
|
|
if (id)
|
|
|
|
gpio_mapping = (const struct acpi_gpio_mapping *) id->driver_data;
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
ret = devm_acpi_dev_add_driver_gpios(dev->dev, gpio_mapping);
|
2017-03-10 13:28:20 +01:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2015-08-11 16:35:37 +02:00
|
|
|
/* Retrieve UART ACPI info */
|
2017-10-04 20:43:39 +02:00
|
|
|
ret = acpi_dev_get_resources(ACPI_COMPANION(dev->dev),
|
2015-09-30 15:26:45 +02:00
|
|
|
&resources, bcm_resource, dev);
|
2015-09-30 15:26:42 +02:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2017-10-04 20:43:41 +02:00
|
|
|
|
|
|
|
resource_list_for_each_entry(entry, &resources) {
|
|
|
|
if (resource_type(entry->res) == IORESOURCE_IRQ) {
|
|
|
|
dev->irq = entry->res->start;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-09-30 15:26:41 +02:00
|
|
|
acpi_dev_free_resource_list(&resources);
|
2015-08-11 16:35:37 +02:00
|
|
|
|
2017-10-04 20:43:36 +02:00
|
|
|
dmi_id = dmi_first_match(bcm_active_low_irq_dmi_table);
|
2015-09-23 18:18:08 +02:00
|
|
|
if (dmi_id) {
|
2017-10-07 08:16:08 +02:00
|
|
|
dev_warn(dev->dev, "%s: Overwriting IRQ polarity to active low",
|
2015-09-23 18:18:08 +02:00
|
|
|
dmi_id->ident);
|
2017-10-04 20:43:36 +02:00
|
|
|
dev->irq_active_low = true;
|
2015-09-23 18:18:08 +02:00
|
|
|
}
|
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2015-08-12 12:46:01 +02:00
|
|
|
#else
|
|
|
|
static int bcm_acpi_probe(struct bcm_device *dev)
|
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_ACPI */
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
static int bcm_of_probe(struct bcm_device *bdev)
|
|
|
|
{
|
|
|
|
device_property_read_u32(bdev->dev, "max-speed", &bdev->oper_speed);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
static int bcm_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct bcm_device *dev;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
|
|
|
|
if (!dev)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-10-04 20:43:39 +02:00
|
|
|
dev->dev = &pdev->dev;
|
2017-10-04 20:43:38 +02:00
|
|
|
dev->irq = platform_get_irq(pdev, 0);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2017-10-04 20:43:37 +02:00
|
|
|
if (has_acpi_companion(&pdev->dev)) {
|
2017-03-10 13:28:20 +01:00
|
|
|
ret = bcm_acpi_probe(dev);
|
2017-10-04 20:43:37 +02:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-10-04 20:43:40 +02:00
|
|
|
ret = bcm_get_resources(dev);
|
2015-09-30 15:26:44 +02:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
platform_set_drvdata(pdev, dev);
|
|
|
|
|
|
|
|
dev_info(&pdev->dev, "%s device registered.\n", dev->name);
|
|
|
|
|
|
|
|
/* Place this instance on the device list */
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_lock(&bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
list_add_tail(&dev->list, &bcm_device_list);
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
ret = bcm_gpio_set_power(dev, false);
|
|
|
|
if (ret)
|
|
|
|
dev_err(&pdev->dev, "Failed to power down\n");
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int bcm_remove(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
struct bcm_device *dev = platform_get_drvdata(pdev);
|
|
|
|
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_lock(&bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
list_del(&dev->list);
|
2015-09-01 12:13:35 +02:00
|
|
|
mutex_unlock(&bcm_device_lock);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
|
|
|
dev_info(&pdev->dev, "%s device unregistered.\n", dev->name);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
static const struct hci_uart_proto bcm_proto = {
|
|
|
|
.id = HCI_UART_BCM,
|
2016-09-19 12:05:12 +02:00
|
|
|
.name = "Broadcom",
|
2015-10-20 21:30:45 +02:00
|
|
|
.manufacturer = 15,
|
2015-06-09 16:15:37 +02:00
|
|
|
.init_speed = 115200,
|
2015-04-06 07:52:18 +02:00
|
|
|
.open = bcm_open,
|
|
|
|
.close = bcm_close,
|
|
|
|
.flush = bcm_flush,
|
|
|
|
.setup = bcm_setup,
|
2015-06-09 16:15:37 +02:00
|
|
|
.set_baudrate = bcm_set_baudrate,
|
2015-04-06 07:52:18 +02:00
|
|
|
.recv = bcm_recv,
|
|
|
|
.enqueue = bcm_enqueue,
|
|
|
|
.dequeue = bcm_dequeue,
|
|
|
|
};
|
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
static const struct acpi_device_id bcm_acpi_match[] = {
|
2017-01-05 18:10:54 +01:00
|
|
|
{ "BCM2E1A", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E39", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E3A", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E3D", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E3F", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E40", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E54", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E55", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E64", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E65", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E67", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E71", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
2017-11-22 14:37:28 +01:00
|
|
|
{ "BCM2E72", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
2017-01-05 18:10:54 +01:00
|
|
|
{ "BCM2E7B", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
|
|
|
{ "BCM2E7C", (kernel_ulong_t)&acpi_bcm_int_last_gpios },
|
2017-10-13 17:54:02 +02:00
|
|
|
{ "BCM2E7E", (kernel_ulong_t)&acpi_bcm_int_first_gpios },
|
2017-01-05 18:10:54 +01:00
|
|
|
{ "BCM2E95", (kernel_ulong_t)&acpi_bcm_int_first_gpios },
|
|
|
|
{ "BCM2E96", (kernel_ulong_t)&acpi_bcm_int_first_gpios },
|
Bluetooth: hci_bcm: Add support for MINIX Z83-4 based devices
The MINIX NEO Z83-4 and MINIX NEO Z83-4 Pro devices use an AP6255 chip for
wifi and bluetooth. Bluetooth requires an ACPI device id of BCM2EA4 with
BCM4345 rev C0 firmware.
This patch adds the device id and to use trigger type IRQF_TRIGGER_FALLING
as defined by 'GpioInt' in the ACPI DSDT table:
Device (BLT0)
{
Name (_HID, "BCM2EA4") // _HID: Hardware ID
Method (_STA, 0, NotSerialized) // _STA: Status
{
Return (0x0F)
}
Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
{
Name (UBUF, ResourceTemplate ()
{
UartSerialBusV2 (0x0001C200, DataBitsEight, StopBitsOne,
0xFC, LittleEndian, ParityTypeNone, FlowControlHardware,
0x0020, 0x0020, "\\_SB.PCI0.URT1",
0x00, ResourceConsumer, , Exclusive,
)
GpioInt (Level, ActiveLow, Exclusive, PullNone, 0x0000,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0005
}
GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0007
}
GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, IoRestrictionOutputOnly,
"\\_SB.GPO1", 0x00, ResourceConsumer, ,
)
{ // Pin list
0x0004
}
})
Return (UBUF) /* \_SB_.PCI0.URT1.BLT0._CRS.UBUF */
}
}
Signed-off-by: Ian W MORRISON <ianwmorrison@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2017-10-07 08:15:25 +02:00
|
|
|
{ "BCM2EA4", (kernel_ulong_t)&acpi_bcm_int_first_gpios },
|
2015-08-11 16:35:35 +02:00
|
|
|
{ },
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(acpi, bcm_acpi_match);
|
|
|
|
#endif
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
/* suspend and resume callbacks */
|
2015-09-23 18:18:11 +02:00
|
|
|
static const struct dev_pm_ops bcm_pm_ops = {
|
|
|
|
SET_SYSTEM_SLEEP_PM_OPS(bcm_suspend, bcm_resume)
|
|
|
|
SET_RUNTIME_PM_OPS(bcm_suspend_device, bcm_resume_device, NULL)
|
|
|
|
};
|
2015-08-11 16:35:38 +02:00
|
|
|
|
2015-08-11 16:35:35 +02:00
|
|
|
static struct platform_driver bcm_driver = {
|
|
|
|
.probe = bcm_probe,
|
|
|
|
.remove = bcm_remove,
|
|
|
|
.driver = {
|
|
|
|
.name = "hci_bcm",
|
|
|
|
.acpi_match_table = ACPI_PTR(bcm_acpi_match),
|
2015-08-11 16:35:38 +02:00
|
|
|
.pm = &bcm_pm_ops,
|
2015-08-11 16:35:35 +02:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2017-08-17 19:59:51 +02:00
|
|
|
static int bcm_serdev_probe(struct serdev_device *serdev)
|
|
|
|
{
|
2017-10-04 20:43:43 +02:00
|
|
|
struct bcm_device *bcmdev;
|
2017-08-17 19:59:51 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
bcmdev = devm_kzalloc(&serdev->dev, sizeof(*bcmdev), GFP_KERNEL);
|
|
|
|
if (!bcmdev)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
bcmdev->dev = &serdev->dev;
|
2017-10-11 15:46:21 +02:00
|
|
|
#ifdef CONFIG_PM
|
2017-10-04 20:43:43 +02:00
|
|
|
bcmdev->hu = &bcmdev->serdev_hu;
|
2017-10-11 15:46:21 +02:00
|
|
|
#endif
|
2017-10-04 20:43:43 +02:00
|
|
|
bcmdev->serdev_hu.serdev = serdev;
|
2017-08-17 19:59:51 +02:00
|
|
|
serdev_device_set_drvdata(serdev, bcmdev);
|
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
if (has_acpi_companion(&serdev->dev))
|
|
|
|
err = bcm_acpi_probe(bcmdev);
|
|
|
|
else
|
|
|
|
err = bcm_of_probe(bcmdev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2017-08-17 19:59:51 +02:00
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
err = bcm_get_resources(bcmdev);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
Bluetooth: hci_bcm: Handle errors properly
A significant portion of this driver lacks error handling. As a first
step, add error paths to bcm_gpio_set_power(), bcm_open(), bcm_close(),
bcm_suspend_device(), bcm_resume_device(), bcm_resume(), bcm_probe() and
bcm_serdev_probe(). (I've also scrutinized bcm_suspend() but think it's
fine as is.)
Those are all the functions accessing the device wake and shutdown GPIO.
On Apple Macs the pins are accessed through ACPI methods, which may fail
for various reasons, hence proper error handling is necessary. Non-Macs
access the pins directly, which may fail as well but the GPIO core does
not yet pass back errors to consumers.
Cc: Frédéric Danis <frederic.danis.oss@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2018-01-10 16:32:10 +01:00
|
|
|
err = bcm_gpio_set_power(bcmdev, false);
|
|
|
|
if (err)
|
|
|
|
dev_err(&serdev->dev, "Failed to power down\n");
|
2017-10-04 20:43:43 +02:00
|
|
|
|
|
|
|
return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
|
2017-08-17 19:59:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void bcm_serdev_remove(struct serdev_device *serdev)
|
|
|
|
{
|
2017-10-04 20:43:43 +02:00
|
|
|
struct bcm_device *bcmdev = serdev_device_get_drvdata(serdev);
|
2017-08-17 19:59:51 +02:00
|
|
|
|
2017-10-04 20:43:43 +02:00
|
|
|
hci_uart_unregister_device(&bcmdev->serdev_hu);
|
2017-08-17 19:59:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_OF
|
|
|
|
static const struct of_device_id bcm_bluetooth_of_match[] = {
|
|
|
|
{ .compatible = "brcm,bcm43438-bt" },
|
|
|
|
{ },
|
|
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, bcm_bluetooth_of_match);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static struct serdev_device_driver bcm_serdev_driver = {
|
|
|
|
.probe = bcm_serdev_probe,
|
|
|
|
.remove = bcm_serdev_remove,
|
|
|
|
.driver = {
|
|
|
|
.name = "hci_uart_bcm",
|
|
|
|
.of_match_table = of_match_ptr(bcm_bluetooth_of_match),
|
2017-10-04 20:43:43 +02:00
|
|
|
.acpi_match_table = ACPI_PTR(bcm_acpi_match),
|
|
|
|
.pm = &bcm_pm_ops,
|
2017-08-17 19:59:51 +02:00
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
int __init bcm_init(void)
|
|
|
|
{
|
2017-08-17 19:59:51 +02:00
|
|
|
/* For now, we need to keep both platform device
|
|
|
|
* driver (ACPI generated) and serdev driver (DT).
|
|
|
|
*/
|
2015-08-11 16:35:35 +02:00
|
|
|
platform_driver_register(&bcm_driver);
|
2017-08-17 19:59:51 +02:00
|
|
|
serdev_device_driver_register(&bcm_serdev_driver);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
return hci_uart_register_proto(&bcm_proto);
|
|
|
|
}
|
|
|
|
|
|
|
|
int __exit bcm_deinit(void)
|
|
|
|
{
|
2015-08-11 16:35:35 +02:00
|
|
|
platform_driver_unregister(&bcm_driver);
|
2017-08-17 19:59:51 +02:00
|
|
|
serdev_device_driver_unregister(&bcm_serdev_driver);
|
2015-08-11 16:35:35 +02:00
|
|
|
|
2015-04-06 07:52:18 +02:00
|
|
|
return hci_uart_unregister_proto(&bcm_proto);
|
|
|
|
}
|