On Fri, 2014-01-10 at 15:52 +0100, Pavel Machek wrote:
> Add hci_h4p bluetooth driver to bluetooth-next. This device is used
> for example on Nokia N900 cell phone.
some mostly trivial comments:
> diff --git a/drivers/bluetooth/nokia_core.c b/drivers/bluetooth/nokia_core.c
[]
> +static void hci_h4p_disable_tx(struct hci_h4p_info *info)
> +{
> + BT_DBG("\n");
function tracers aren't generally useful.
> +void hci_h4p_enable_tx(struct hci_h4p_info *info)
> +{
> + unsigned long flags;
> + BT_DBG("\n");
etc...
> +static int hci_h4p_send_negotiation(struct hci_h4p_info *info)
> +{
> + BT_DBG("Negotiation succesful\n");
3 s's in successful
[]
> +static inline void hci_h4p_handle_byte(struct hci_h4p_info *info, u8 byte)
pretty big function to be inline
> +{
> + switch (info->rx_state) {
[]
> + case WAIT_FOR_HEADER:
> + info->rx_count--;
> + *skb_put(info->rx_skb, 1) = byte;
> + if (info->rx_count == 0) {
> + info->rx_count = hci_h4p_get_data_len(info,
> + info->rx_skb);
> + if (info->rx_count > skb_tailroom(info->rx_skb)) {
> + dev_err(info->dev, "Too long frame.\n");
> + info->garbage_bytes = info->rx_count -
> + skb_tailroom(info->rx_skb);
> + kfree_skb(info->rx_skb);
> + info->rx_skb = NULL;
> + break;
> + }
> + info->rx_state = WAIT_FOR_DATA;
> +
> + }
> + break;
Perhaps better to write with fewer indentations:
case WAIT_FOR_HEADER:
info->rx_count--;
*skb_put(info->rx_skb, 1) = byte;
if (info->rx_count != 0)
break;
info->rx_count = hci_h4p_get_data_len(info, info->rx_skb);
if (info->rx_count > skb_tailroom(info->rx_skb)) {
dev_err(info->dev, "frame too long\n");
info->garbage_bytes = info->rx_count
- skb_tailroom(info->rx_skb);
kfree_skb(info->rx_skb);
info->rx_skb = NULL;
break;
}
info->rx_state = WAIT_FOR_DATA;
break;
[]
> + if (info->rx_count == 0) {
> + /* H4+ devices should allways send word aligned
> + * packets */
s/allways/always/
80 columns are available and this could be a single line comment
/* H4+ devices should always send word aligned packets */
[]
> +static void hci_h4p_rx_tasklet(unsigned long data)
> +{
[]
> + while (hci_h4p_inb(info, UART_LSR) & UART_LSR_DR) {
[]
> + pr_debug("0x%.2x ", byte);
pr_debug is prefixed by a newline if necessary
and then <7>, one for each use.
This will produce a lot of dmesg output lines
(1 for each byte) and isn't in my opinion
necessary/useful.
> + hci_h4p_handle_byte(info, byte);
> + }
> +
> + if (!info->rx_enabled) {
> + if (hci_h4p_inb(info, UART_LSR) & UART_LSR_TEMT &&
> + info->autorts) {
> + __hci_h4p_set_auto_ctsrts(info, 0 , UART_EFR_RTS);
> + info->autorts = 0;
> + }
> + /* Flush posted write to avoid spurious interrupts */
> + hci_h4p_inb(info, UART_OMAP_SCR);
> + hci_h4p_set_clk(info, &info->rx_clocks_en, 0);
> + }
> +
> +finish_rx:
> + pr_debug("\n");
here too.
> +static void hci_h4p_tx_tasklet(unsigned long data)
> +{
[]
> + if (!skb) {
> + /* No data in buffer */
> + BT_DBG("skb ready\n");
> + if (hci_h4p_inb(info, UART_LSR) & UART_LSR_TEMT) {
> + hci_h4p_outb(info, UART_IER,
> + hci_h4p_inb(info, UART_IER) &
> + ~UART_IER_THRI);
> + hci_h4p_inb(info, UART_OMAP_SCR);
> + hci_h4p_disable_tx(info);
> + return;
> + } else
unnecessary else
> + hci_h4p_outb(info, UART_OMAP_SCR,
> + hci_h4p_inb(info, UART_OMAP_SCR) |
> + UART_OMAP_SCR_EMPTY_THR);
and unnecessary indentation
> + goto finish_tx;
> + }
> +
> + /* Copy data to tx fifo */
> + while (!(hci_h4p_inb(info, UART_OMAP_SSR) & UART_OMAP_SSR_TXFULL) &&
> + (sent < skb->len)) {
> + pr_debug("0x%.2x ", skb->data[sent]);
More unnecessary pr_debug
> +static inline void hci_h4p_set_pm_limits(struct hci_h4p_info *info, bool set)
> +{
> + struct hci_h4p_platform_data *bt_plat_data = info->dev->platform_data;
> + char *sset = set ? "set" : "clear";
const?
> +
> + if (unlikely(!bt_plat_data || !bt_plat_data->set_pm_limits))
> + return;
> +
> + if (set != !!test_bit(H4P_ACTIVE_MODE, &info->pm_flags)) {
> + bt_plat_data->set_pm_limits(info->dev, set);
> + if (set)
> + set_bit(H4P_ACTIVE_MODE, &info->pm_flags);
> + else
> + clear_bit(H4P_ACTIVE_MODE, &info->pm_flags);
> + BT_DBG("Change pm constraints to: %s", sset);
missing newline
> + return;
> + }
> +
> + BT_DBG("pm constraints remains: %s", sset);
here too
[]
> +static int hci_h4p_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
> +{
> + struct hci_h4p_info *info;
> + int err = 0;
> +
> + if (!hdev) {
> + printk(KERN_WARNING "hci_h4p: Frame for unknown device\n");
> + return -ENODEV;
> + }
Is this possible?
> +static ssize_t hci_h4p_store_bdaddr(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct hci_h4p_info *info = dev_get_drvdata(dev);
> + unsigned int bdaddr[6];
> + int ret, i;
> +
> + ret = sscanf(buf, "%2x:%2x:%2x:%2x:%2x:%2x\n",
> + &bdaddr[0], &bdaddr[1], &bdaddr[2],
> + &bdaddr[3], &bdaddr[4], &bdaddr[5]);
> +
> + if (ret != 6)
> + return -EINVAL;
> +
> + for (i = 0; i < 6; i++)
> + info->bd_addr[i] = bdaddr[i] & 0xff;
This could also return -EINVAL if bdaddr[i] > 0xff
> +static int hci_h4p_bcm_set_bdaddr(struct hci_h4p_info *info, struct sk_buff
> *skb)
> +{
> + int i;
> + static const u8 nokia_oui[3] = {0x00, 0x1f, 0xdf};
> + int not_valid;
> +
> + not_valid = 1;
> + for (i = 0; i < 6; i++) {
> + if (info->bd_addr[i] != 0x00) {
> + not_valid = 0;
> + break;
> + }
> + }
> +
> + if (not_valid) {
> + dev_info(info->dev, "Valid bluetooth address not found, setting
> some random\n");
> + /* When address is not valid, use some random but Nokia MAC */
> + memcpy(info->bd_addr, nokia_oui, 3);
> + get_random_bytes(info->bd_addr + 3, 3);
> + }
This seems wrong as addresses can have valid 0 bytes.
Perhaps use:
if (!is_valid_ether_addr(info->bd_addr))
[]
> +int hci_h4p_bc4_send_fw(struct hci_h4p_info *info,
> + struct sk_buff_head *fw_queue)
> +{
[]
> + /* Check if this is bd_address packet */
> + if (skb->data[15] == 0x01 && skb->data[16] == 0x00) {
> + offset = 21;
> + skb->data[offset + 1] = 0x00;
> + skb->data[offset + 5] = 0x00;
> +
> + not_valid = 1;
> + for (i = 0; i < 6; i++) {
> + if (info->bd_addr[i] != 0x00) {
> + not_valid = 0;
> + break;
> + }
> + }
> +
> + if (not_valid) {
> + dev_info(info->dev, "Valid bluetooth address not found,"
> + " setting some random\n");
!is_valid_ether_addr() here too
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
