* [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 @ 2011-11-08 7:36 Yao, Costa 2011-11-08 14:58 ` Gustavo Padovan 2011-11-09 7:44 ` Marcel Holtmann 0 siblings, 2 replies; 4+ messages in thread From: Yao, Costa @ 2011-11-08 7:36 UTC (permalink / raw) To: Marcel Holtmann, padovan@profusion.mobi, linux-bluetooth@vger.kernel.org QVIzMDA2IGlzIGEgY29tcG9zaXRlIGRldmljZSwgYW5kIGludGVyZmFjZSAwIGlzIHVzZWQgZm9y IGhpZCBmdW5jdGlvbiwgbm90IGZvciBibHVldG9vdGggZnVuY3Rpb24uDQpXZSBzaG91bGQgbWFr ZSB0aGUgZm9sbG93aW5nIGNoYW5nZXM6DQoxIEJsYWNrbGlzdCBBUjMwMDYgUElEL1ZJRCBpbiBh dGgza190YWJsZQ0KMiBBZGQgYXRoM2tfY29tcG9zaXRlX2RldmljZV90YWJsZSBpbiBhdGgzay5j IHRvIHJlZ2lzdGVyIGNvbXBvc2l0ZSBkZXZpY2UuDQozIExvYWQgcGF0Y2ggYW5kIHN5c2NvbmZp ZyBmaWxlcyBmb3IgQVIzMDA2DQoNClNpZ25lZC1vZmYtYnk6IENvc3RhIFlhbyA8Y3F5YW9AcWNh LnF1YWxjb21tLmNvbT4NCi0tLQ0KIGRyaXZlcnMvYmx1ZXRvb3RoL2F0aDNrLmMgfCAgIDY0ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tDQogMSBmaWxlcyBjaGFu Z2VkLCA2MSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ibHVldG9vdGgvYXRoM2suYyBiL2RyaXZlcnMvYmx1ZXRvb3RoL2F0aDNrLmMNCmluZGV4 IDE2MjI3NzIuLmE5ZDY2NzggMTAwNjQ0DQotLS0gYS9kcml2ZXJzL2JsdWV0b290aC9hdGgzay5j DQorKysgYi9kcml2ZXJzL2JsdWV0b290aC9hdGgzay5jDQpAQCAtNDAsNiArNDAsNyBAQA0KIA0K ICNkZWZpbmUgQVRIM0tfTU9ERV9NQVNLCQkJCTB4M0YNCiAjZGVmaW5lIEFUSDNLX05PUk1BTF9N T0RFCQkJMHgwRQ0KKyNkZWZpbmUgQVRIM0tfUFJFQk9PVF9NT0RFCQkJMHgwRA0KIA0KICNkZWZp bmUgQVRIM0tfUEFUQ0hfVVBEQVRFCQkJMHg4MA0KICNkZWZpbmUgQVRIM0tfU1lTQ0ZHX1VQREFU RQkJCTB4NDANCkBAIC03MSw2ICs3Miw3IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2RldmljZV9pZCBh dGgza190YWJsZVtdID0gew0KIA0KIAkvKiBBdGhlcm9zIEFSMzAxMiB3aXRoIHNmbGFzaCBmaXJt d2FyZSovDQogCXsgVVNCX0RFVklDRSgweDBDRjMsIDB4MzAwNCkgfSwNCisJeyBVU0JfREVWSUNF KDB4MENGMywgMHgzMDA2KSB9LA0KIA0KIAkvKiBBdGhlcm9zIEFSNUJCVTEyIHdpdGggc2ZsYXNo IGZpcm13YXJlICovDQogCXsgVVNCX0RFVklDRSgweDA0ODksIDB4RTAyQykgfSwNCkBAIC04MSwx NiArODMsMjYgQEAgc3RhdGljIHN0cnVjdCB1c2JfZGV2aWNlX2lkIGF0aDNrX3RhYmxlW10gPSB7 DQogTU9EVUxFX0RFVklDRV9UQUJMRSh1c2IsIGF0aDNrX3RhYmxlKTsNCiANCiAjZGVmaW5lIEJU VVNCX0FUSDMwMTIJCTB4ODANCisjZGVmaW5lIEJUVVNCX0FUSDMwMDYJCTB4MDEwMA0KIC8qIFRo aXMgdGFibGUgaXMgdG8gbG9hZCBwYXRjaCBhbmQgc3lzY29uZmlnIGZpbGVzDQogICogZm9yIEFS MzAxMiAqLw0KIHN0YXRpYyBzdHJ1Y3QgdXNiX2RldmljZV9pZCBhdGgza19ibGlzdF90YmxbXSA9 IHsNCiANCiAJLyogQXRoZXJvcyBBUjMwMTIgd2l0aCBzZmxhc2ggZmlybXdhcmUqLw0KIAl7IFVT Ql9ERVZJQ0UoMHgwY2YzLCAweDMwMDQpLCAuZHJpdmVyX2luZm8gPSBCVFVTQl9BVEgzMDEyIH0s DQorCXsgVVNCX0RFVklDRSgweDBjZjMsIDB4MzAwNiksIC5kcml2ZXJfaW5mbyA9IEJUVVNCX0FU SDMwMDYgfSwNCiANCiAJeyB9CS8qIFRlcm1pbmF0aW5nIGVudHJ5ICovDQogfTsNCiANCisvKiBB dGhlcm9zIGNvbXBvc2l0ZSBkZXZpY2VzIHRhYmxlDQorICovDQorc3RhdGljIHN0cnVjdCB1c2Jf ZGV2aWNlX2lkIGF0aDNrX2NvbXBvc2l0ZV9kZXZpY2VfdGFibGVbXSA9IHsNCisNCisJeyBVU0Jf REVWSUNFKDB4MGNmMywgMHgzMDA2KSB9LA0KKw0KKwl7IH0JLyogVGVybWluYXRpbmcgZW50cnkg Ki8NCit9Ow0KICNkZWZpbmUgVVNCX1JFUV9ERlVfRE5MT0FECTENCiAjZGVmaW5lIEJVTEtfU0la RQkJNDA5Ng0KICNkZWZpbmUgRldfSERSX1NJWkUJCTIwDQpAQCAtMzYxLDExICszNzMsMTkgQEAg c3RhdGljIGludCBhdGgza19wcm9iZShzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZiwNCiAJY29u c3Qgc3RydWN0IGZpcm13YXJlICpmaXJtd2FyZTsNCiAJc3RydWN0IHVzYl9kZXZpY2UgKnVkZXYg PSBpbnRlcmZhY2VfdG9fdXNiZGV2KGludGYpOw0KIAlpbnQgcmV0Ow0KKwl1bnNpZ25lZCBjaGFy IGZ3X3N0YXRlOw0KKwljb25zdCBzdHJ1Y3QgdXNiX2RldmljZV9pZCAqbWF0Y2hfY29tcF9kZXY7 DQogDQogCUJUX0RCRygiaW50ZiAlcCBpZCAlcCIsIGludGYsIGlkKTsNCi0NCi0JaWYgKGludGYt PmN1cl9hbHRzZXR0aW5nLT5kZXNjLmJJbnRlcmZhY2VOdW1iZXIgIT0gMCkNCi0JCXJldHVybiAt RU5PREVWOw0KKyAgICAvKiBGb3IgY29tcG9zaXRlIGRldmljZSAqLw0KKwltYXRjaF9jb21wX2Rl diA9IHVzYl9tYXRjaF9pZChpbnRmLCBhdGgza19jb21wb3NpdGVfZGV2aWNlX3RhYmxlKTsNCisJ aWYgKG1hdGNoX2NvbXBfZGV2KSB7DQorCQlpZiAoaW50Zi0+Y3VyX2FsdHNldHRpbmctPmRlc2Mu YkludGVyZmFjZU51bWJlciAhPSAyKQ0KKwkJCXJldHVybiAtRU5PREVWOw0KKwl9IGVsc2Ugew0K KwkJaWYgKGludGYtPmN1cl9hbHRzZXR0aW5nLT5kZXNjLmJJbnRlcmZhY2VOdW1iZXIgIT0gMCkN CisJCQlyZXR1cm4gLUVOT0RFVjsNCisJfQ0KIA0KIAkvKiBtYXRjaCBkZXZpY2UgSUQgaW4gYXRo M2sgYmxhY2tsaXN0IHRhYmxlICovDQogCWlmICghaWQtPmRyaXZlcl9pbmZvKSB7DQpAQCAtMzk5 LDYgKzQxOSw0NCBAQCBzdGF0aWMgaW50IGF0aDNrX3Byb2JlKHN0cnVjdCB1c2JfaW50ZXJmYWNl ICppbnRmLA0KIAkJfQ0KIAkJYXRoM2tfc3dpdGNoX3BpZCh1ZGV2KTsNCiAJCXJldHVybiAwOw0K Kwl9IGVsc2UgaWYgKGlkLT5kcml2ZXJfaW5mbyAmIEJUVVNCX0FUSDMwMDYpIHsNCisNCisJCWlm IChsZTE2X3RvX2NwdSh1ZGV2LT5kZXNjcmlwdG9yLmJjZERldmljZSkgPiAweDAwMDEpIHsNCisJ CQlCVF9FUlIoImF0aDNrX3Byb2JlOiB1ZGV2LT5kZXNjcmlwdG9yLmJjZERldmljZSIpOw0KKwkJ CXJldHVybiAtRU5PREVWOw0KKwkJfQ0KKwkJcmV0ID0gYXRoM2tfZ2V0X3N0YXRlKHVkZXYsICZm d19zdGF0ZSk7DQorCQlpZiAocmV0IDwgMCkgew0KKwkJCUJUX0VSUigiYXRoM2tfcHJvYmU6IGF0 aDNrX2dldF9zdGF0ZSBlcnIiKTsNCisJCQlyZXR1cm4gcmV0Ow0KKwkJfQ0KKwkJaWYgKChmd19z dGF0ZSAmIEFUSDNLX01PREVfTUFTSykgPT0gQVRIM0tfUFJFQk9PVF9NT0RFKSB7DQorCQkJQlRf RVJSKCJhdGgza19wcm9iZTogZmlybXdhcmUgYXJlIGluIHByZWJvb3QgbW9kZSBub3ciKTsNCisJ CQlCVF9FUlIoImF0aDNrX3Byb2JlOiB0cnkgdG8gc3dpdGNoIHRvIE5vcm1hbCBNb2RlIik7DQor CQkJcmV0ID0gYXRoM2tfc2V0X25vcm1hbF9tb2RlKHVkZXYpOw0KKwkJCWlmIChyZXQgPCAwKSB7 DQorCQkJCUJUX0VSUigiYXRoM2tfcHJvYmU6IHNldCBub3JtYWwgbW9kZSBmYWlsZWQiKTsNCisJ CQkJcmV0dXJuIHJldDsNCisJCQl9DQorCQl9DQorCQkvKk5vdGUgd2Ugc2hvdWxkIHdhaXQgZm9y IGEgd2hpbGUqLw0KKwkJbWRlbGF5KDEwMCk7DQorCQlyZXQgPSBhdGgza19sb2FkX3BhdGNoKHVk ZXYpOw0KKwkJaWYgKHJldCA8IDApIHsNCisJCQlCVF9FUlIoImF0aDNrX3Byb2JlOiBMb2FkIHBh dGNoIGZpbGUgZmFpbGVkIik7DQorCQkJcmV0dXJuIHJldDsNCisJCX0NCisJCXJldCA9IGF0aDNr X2xvYWRfc3lzY2ZnKHVkZXYpOw0KKwkJaWYgKHJldCA8IDApIHsNCisJCQlCVF9FUlIoImF0aDNr X3Byb2JlOiBMb2FkIHN5c2NvbmZpZyBmaWxlIGZhaWxlZCIpOw0KKwkJCXJldHVybiByZXQ7DQor CQl9DQorCQlyZXQgPSBhdGgza19zd2l0Y2hfcGlkKHVkZXYpOw0KKwkJaWYgKHJldCA8IDApIHsN CisJCQlCVF9FUlIoImF0aDNrX3Byb2JlOiBzd2l0Y2ggcGlkIGZhaWxlZCIpOw0KKwkJCXJldHVy biByZXQ7DQorCQl9DQorCQlyZXR1cm4gMDsNCiAJfQ0KIA0KIAlyZXQgPSByZXF1ZXN0X2Zpcm13 YXJlKCZmaXJtd2FyZSwgQVRIM0tfRklSTVdBUkUsICZ1ZGV2LT5kZXYpOw0KLS0gDQoxLjcuNC4x DQo= ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 2011-11-08 7:36 [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 Yao, Costa @ 2011-11-08 14:58 ` Gustavo Padovan 2011-11-09 2:59 ` Yao, Costa 2011-11-09 7:44 ` Marcel Holtmann 1 sibling, 1 reply; 4+ messages in thread From: Gustavo Padovan @ 2011-11-08 14:58 UTC (permalink / raw) To: Yao, Costa; +Cc: Marcel Holtmann, linux-bluetooth@vger.kernel.org Hi Costa, * Yao, Costa <cqyao@qca.qualcomm.com> [2011-11-08 07:36:11 +0000]: > AR3006 is a composite device, and interface 0 is used for hid function, not for bluetooth function. > We should make the following changes: > 1 Blacklist AR3006 PID/VID in ath3k_table > 2 Add ath3k_composite_device_table in ath3k.c to register composite device. > 3 Load patch and sysconfig files for AR3006 > > Signed-off-by: Costa Yao <cqyao@qca.qualcomm.com> > --- > drivers/bluetooth/ath3k.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 61 insertions(+), 3 deletions(-) > > diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c > index 1622772..a9d6678 100644 > --- a/drivers/bluetooth/ath3k.c > +++ b/drivers/bluetooth/ath3k.c > @@ -40,6 +40,7 @@ > > #define ATH3K_MODE_MASK 0x3F > #define ATH3K_NORMAL_MODE 0x0E > +#define ATH3K_PREBOOT_MODE 0x0D > > #define ATH3K_PATCH_UPDATE 0x80 > #define ATH3K_SYSCFG_UPDATE 0x40 > @@ -71,6 +72,7 @@ static struct usb_device_id ath3k_table[] = { > > /* Atheros AR3012 with sflash firmware*/ > { USB_DEVICE(0x0CF3, 0x3004) }, > + { USB_DEVICE(0x0CF3, 0x3006) }, > > /* Atheros AR5BBU12 with sflash firmware */ > { USB_DEVICE(0x0489, 0xE02C) }, > @@ -81,16 +83,26 @@ static struct usb_device_id ath3k_table[] = { > MODULE_DEVICE_TABLE(usb, ath3k_table); > > #define BTUSB_ATH3012 0x80 > +#define BTUSB_ATH3006 0x0100 > /* This table is to load patch and sysconfig files > * for AR3012 */ > static struct usb_device_id ath3k_blist_tbl[] = { > > /* Atheros AR3012 with sflash firmware*/ > { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, > + { USB_DEVICE(0x0cf3, 0x3006), .driver_info = BTUSB_ATH3006 }, > > { } /* Terminating entry */ > }; > > +/* Atheros composite devices table > + */ > +static struct usb_device_id ath3k_composite_device_table[] = { > + > + { USB_DEVICE(0x0cf3, 0x3006) }, > + > + { } /* Terminating entry */ > +}; > #define USB_REQ_DFU_DNLOAD 1 > #define BULK_SIZE 4096 > #define FW_HDR_SIZE 20 > @@ -361,11 +373,19 @@ static int ath3k_probe(struct usb_interface *intf, > const struct firmware *firmware; > struct usb_device *udev = interface_to_usbdev(intf); > int ret; > + unsigned char fw_state; > + const struct usb_device_id *match_comp_dev; > > BT_DBG("intf %p id %p", intf, id); > - > - if (intf->cur_altsetting->desc.bInterfaceNumber != 0) > - return -ENODEV; > + /* For composite device */ > + match_comp_dev = usb_match_id(intf, ath3k_composite_device_table); > + if (match_comp_dev) { > + if (intf->cur_altsetting->desc.bInterfaceNumber != 2) > + return -ENODEV; > + } else { > + if (intf->cur_altsetting->desc.bInterfaceNumber != 0) > + return -ENODEV; > + } > > /* match device ID in ath3k blacklist table */ > if (!id->driver_info) { > @@ -399,6 +419,44 @@ static int ath3k_probe(struct usb_interface *intf, > } > ath3k_switch_pid(udev); > return 0; > + } else if (id->driver_info & BTUSB_ATH3006) { > + > + if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x0001) { > + BT_ERR("ath3k_probe: udev->descriptor.bcdDevice"); > + return -ENODEV; > + } > + ret = ath3k_get_state(udev, &fw_state); > + if (ret < 0) { > + BT_ERR("ath3k_probe: ath3k_get_state err"); > + return ret; > + } > + if ((fw_state & ATH3K_MODE_MASK) == ATH3K_PREBOOT_MODE) { > + BT_ERR("ath3k_probe: firmware are in preboot mode now"); > + BT_ERR("ath3k_probe: try to switch to Normal Mode"); > + ret = ath3k_set_normal_mode(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: set normal mode failed"); > + return ret; > + } > + } > + /*Note we should wait for a while*/ > + mdelay(100); > + ret = ath3k_load_patch(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: Load patch file failed"); > + return ret; > + } > + ret = ath3k_load_syscfg(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: Load sysconfig file failed"); > + return ret; > + } > + ret = ath3k_switch_pid(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: switch pid failed"); > + return ret; > + } > + return 0; You are duplicating some code here, care to merge the common parts between this and the handling of BTUSB_ATH3012? Gustavo ^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 2011-11-08 14:58 ` Gustavo Padovan @ 2011-11-09 2:59 ` Yao, Costa 0 siblings, 0 replies; 4+ messages in thread From: Yao, Costa @ 2011-11-09 2:59 UTC (permalink / raw) To: Gustavo Padovan Cc: Marcel Holtmann, linux-bluetooth@vger.kernel.org, Fan, Hong, Wu, Frank, Chen, Jack, Chang, Robert, Sumangala, Suraj, Wang, Tom, Liu, Haijun, QCA.Mgr.Haijun.Liu-All SGkgR3VzdGF2bywNCg0KICAgTm90IHRoZSBleGFjdGx5IGR1cGxpY2F0ZS4gQVIzMDA2LCBhcyBh IGNvbXBvc2l0ZSBkZXZpY2UsIHNob3VsZCB1c2UgZGlmZmVyZW50IGNvbW1hbmQgc2VxdWVuY2Ug YXMgQVIzMDEyLiANCiAgIEl0IHVzZXMgY29tbW9uIGZ1bmN0aW9ucywgYnV0IGl0IGlzIGRpZmZl cmVudCBjYWxsaW5nIHNlcXVlbmNlLg0KDQpDb3N0YSBZYW8NCg0KLS0tLS1PcmlnaW5hbCBNZXNz YWdlLS0tLS0NCkZyb206IEd1c3Rhdm8gRi4gUGFkb3ZhbiBbbWFpbHRvOnBhb0Bwcm9mdXNpb24u bW9iaV0gT24gQmVoYWxmIE9mIEd1c3Rhdm8gUGFkb3Zhbg0KU2VudDogMjAxMcTqMTHUwjjI1SAy Mjo1OA0KVG86IFlhbywgQ29zdGENCkNjOiBNYXJjZWwgSG9sdG1hbm47IGxpbnV4LWJsdWV0b290 aEB2Z2VyLmtlcm5lbC5vcmcNClN1YmplY3Q6IFJlOiBbUEFUQ0hdIEJsdWV0b290aDogYXRoM2s6 IEFkZCBzdXBwb3J0IGZvciBRdWFsY29tbSBBdGhlcm9zIDMwMDYNCg0KSGkgQ29zdGEsDQoNCiog WWFvLCBDb3N0YSA8Y3F5YW9AcWNhLnF1YWxjb21tLmNvbT4gWzIwMTEtMTEtMDggMDc6MzY6MTEg KzAwMDBdOg0KDQo+IEFSMzAwNiBpcyBhIGNvbXBvc2l0ZSBkZXZpY2UsIGFuZCBpbnRlcmZhY2Ug MCBpcyB1c2VkIGZvciBoaWQgZnVuY3Rpb24sIG5vdCBmb3IgYmx1ZXRvb3RoIGZ1bmN0aW9uLg0K PiBXZSBzaG91bGQgbWFrZSB0aGUgZm9sbG93aW5nIGNoYW5nZXM6DQo+IDEgQmxhY2tsaXN0IEFS MzAwNiBQSUQvVklEIGluIGF0aDNrX3RhYmxlDQo+IDIgQWRkIGF0aDNrX2NvbXBvc2l0ZV9kZXZp Y2VfdGFibGUgaW4gYXRoM2suYyB0byByZWdpc3RlciBjb21wb3NpdGUgZGV2aWNlLg0KPiAzIExv YWQgcGF0Y2ggYW5kIHN5c2NvbmZpZyBmaWxlcyBmb3IgQVIzMDA2DQo+IA0KPiBTaWduZWQtb2Zm LWJ5OiBDb3N0YSBZYW8gPGNxeWFvQHFjYS5xdWFsY29tbS5jb20+DQo+IC0tLQ0KPiAgZHJpdmVy cy9ibHVldG9vdGgvYXRoM2suYyB8ICAgNjQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0NCj4gIDEgZmlsZXMgY2hhbmdlZCwgNjEgaW5zZXJ0aW9ucygrKSwgMyBk ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2JsdWV0b290aC9hdGgzay5j IGIvZHJpdmVycy9ibHVldG9vdGgvYXRoM2suYyANCj4gaW5kZXggMTYyMjc3Mi4uYTlkNjY3OCAx MDA2NDQNCj4gLS0tIGEvZHJpdmVycy9ibHVldG9vdGgvYXRoM2suYw0KPiArKysgYi9kcml2ZXJz L2JsdWV0b290aC9hdGgzay5jDQo+IEBAIC00MCw2ICs0MCw3IEBADQo+ICANCj4gICNkZWZpbmUg QVRIM0tfTU9ERV9NQVNLCQkJCTB4M0YNCj4gICNkZWZpbmUgQVRIM0tfTk9STUFMX01PREUJCQkw eDBFDQo+ICsjZGVmaW5lIEFUSDNLX1BSRUJPT1RfTU9ERQkJCTB4MEQNCj4gIA0KPiAgI2RlZmlu ZSBBVEgzS19QQVRDSF9VUERBVEUJCQkweDgwDQo+ICAjZGVmaW5lIEFUSDNLX1NZU0NGR19VUERB VEUJCQkweDQwDQo+IEBAIC03MSw2ICs3Miw3IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2RldmljZV9p ZCBhdGgza190YWJsZVtdID0gew0KPiAgDQo+ICAJLyogQXRoZXJvcyBBUjMwMTIgd2l0aCBzZmxh c2ggZmlybXdhcmUqLw0KPiAgCXsgVVNCX0RFVklDRSgweDBDRjMsIDB4MzAwNCkgfSwNCj4gKwl7 IFVTQl9ERVZJQ0UoMHgwQ0YzLCAweDMwMDYpIH0sDQo+ICANCj4gIAkvKiBBdGhlcm9zIEFSNUJC VTEyIHdpdGggc2ZsYXNoIGZpcm13YXJlICovDQo+ICAJeyBVU0JfREVWSUNFKDB4MDQ4OSwgMHhF MDJDKSB9LA0KPiBAQCAtODEsMTYgKzgzLDI2IEBAIHN0YXRpYyBzdHJ1Y3QgdXNiX2RldmljZV9p ZCBhdGgza190YWJsZVtdID0geyAgDQo+IE1PRFVMRV9ERVZJQ0VfVEFCTEUodXNiLCBhdGgza190 YWJsZSk7DQo+ICANCj4gICNkZWZpbmUgQlRVU0JfQVRIMzAxMgkJMHg4MA0KPiArI2RlZmluZSBC VFVTQl9BVEgzMDA2CQkweDAxMDANCj4gIC8qIFRoaXMgdGFibGUgaXMgdG8gbG9hZCBwYXRjaCBh bmQgc3lzY29uZmlnIGZpbGVzDQo+ICAgKiBmb3IgQVIzMDEyICovDQo+ICBzdGF0aWMgc3RydWN0 IHVzYl9kZXZpY2VfaWQgYXRoM2tfYmxpc3RfdGJsW10gPSB7DQo+ICANCj4gIAkvKiBBdGhlcm9z IEFSMzAxMiB3aXRoIHNmbGFzaCBmaXJtd2FyZSovDQo+ICAJeyBVU0JfREVWSUNFKDB4MGNmMywg MHgzMDA0KSwgLmRyaXZlcl9pbmZvID0gQlRVU0JfQVRIMzAxMiB9LA0KPiArCXsgVVNCX0RFVklD RSgweDBjZjMsIDB4MzAwNiksIC5kcml2ZXJfaW5mbyA9IEJUVVNCX0FUSDMwMDYgfSwNCj4gIA0K PiAgCXsgfQkvKiBUZXJtaW5hdGluZyBlbnRyeSAqLw0KPiAgfTsNCj4gIA0KPiArLyogQXRoZXJv cyBjb21wb3NpdGUgZGV2aWNlcyB0YWJsZQ0KPiArICovDQo+ICtzdGF0aWMgc3RydWN0IHVzYl9k ZXZpY2VfaWQgYXRoM2tfY29tcG9zaXRlX2RldmljZV90YWJsZVtdID0gew0KPiArDQo+ICsJeyBV U0JfREVWSUNFKDB4MGNmMywgMHgzMDA2KSB9LA0KPiArDQo+ICsJeyB9CS8qIFRlcm1pbmF0aW5n IGVudHJ5ICovDQo+ICt9Ow0KPiAgI2RlZmluZSBVU0JfUkVRX0RGVV9ETkxPQUQJMQ0KPiAgI2Rl ZmluZSBCVUxLX1NJWkUJCTQwOTYNCj4gICNkZWZpbmUgRldfSERSX1NJWkUJCTIwDQo+IEBAIC0z NjEsMTEgKzM3MywxOSBAQCBzdGF0aWMgaW50IGF0aDNrX3Byb2JlKHN0cnVjdCB1c2JfaW50ZXJm YWNlICppbnRmLA0KPiAgCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZmlybXdhcmU7DQo+ICAJc3Ry dWN0IHVzYl9kZXZpY2UgKnVkZXYgPSBpbnRlcmZhY2VfdG9fdXNiZGV2KGludGYpOw0KPiAgCWlu dCByZXQ7DQo+ICsJdW5zaWduZWQgY2hhciBmd19zdGF0ZTsNCj4gKwljb25zdCBzdHJ1Y3QgdXNi X2RldmljZV9pZCAqbWF0Y2hfY29tcF9kZXY7DQo+ICANCj4gIAlCVF9EQkcoImludGYgJXAgaWQg JXAiLCBpbnRmLCBpZCk7DQo+IC0NCj4gLQlpZiAoaW50Zi0+Y3VyX2FsdHNldHRpbmctPmRlc2Mu YkludGVyZmFjZU51bWJlciAhPSAwKQ0KPiAtCQlyZXR1cm4gLUVOT0RFVjsNCj4gKyAgICAvKiBG b3IgY29tcG9zaXRlIGRldmljZSAqLw0KPiArCW1hdGNoX2NvbXBfZGV2ID0gdXNiX21hdGNoX2lk KGludGYsIGF0aDNrX2NvbXBvc2l0ZV9kZXZpY2VfdGFibGUpOw0KPiArCWlmIChtYXRjaF9jb21w X2Rldikgew0KPiArCQlpZiAoaW50Zi0+Y3VyX2FsdHNldHRpbmctPmRlc2MuYkludGVyZmFjZU51 bWJlciAhPSAyKQ0KPiArCQkJcmV0dXJuIC1FTk9ERVY7DQo+ICsJfSBlbHNlIHsNCj4gKwkJaWYg KGludGYtPmN1cl9hbHRzZXR0aW5nLT5kZXNjLmJJbnRlcmZhY2VOdW1iZXIgIT0gMCkNCj4gKwkJ CXJldHVybiAtRU5PREVWOw0KPiArCX0NCj4gIA0KPiAgCS8qIG1hdGNoIGRldmljZSBJRCBpbiBh dGgzayBibGFja2xpc3QgdGFibGUgKi8NCj4gIAlpZiAoIWlkLT5kcml2ZXJfaW5mbykgew0KPiBA QCAtMzk5LDYgKzQxOSw0NCBAQCBzdGF0aWMgaW50IGF0aDNrX3Byb2JlKHN0cnVjdCB1c2JfaW50 ZXJmYWNlICppbnRmLA0KPiAgCQl9DQo+ICAJCWF0aDNrX3N3aXRjaF9waWQodWRldik7DQo+ICAJ CXJldHVybiAwOw0KPiArCX0gZWxzZSBpZiAoaWQtPmRyaXZlcl9pbmZvICYgQlRVU0JfQVRIMzAw Nikgew0KPiArDQo+ICsJCWlmIChsZTE2X3RvX2NwdSh1ZGV2LT5kZXNjcmlwdG9yLmJjZERldmlj ZSkgPiAweDAwMDEpIHsNCj4gKwkJCUJUX0VSUigiYXRoM2tfcHJvYmU6IHVkZXYtPmRlc2NyaXB0 b3IuYmNkRGV2aWNlIik7DQo+ICsJCQlyZXR1cm4gLUVOT0RFVjsNCj4gKwkJfQ0KPiArCQlyZXQg PSBhdGgza19nZXRfc3RhdGUodWRldiwgJmZ3X3N0YXRlKTsNCj4gKwkJaWYgKHJldCA8IDApIHsN Cj4gKwkJCUJUX0VSUigiYXRoM2tfcHJvYmU6IGF0aDNrX2dldF9zdGF0ZSBlcnIiKTsNCj4gKwkJ CXJldHVybiByZXQ7DQo+ICsJCX0NCj4gKwkJaWYgKChmd19zdGF0ZSAmIEFUSDNLX01PREVfTUFT SykgPT0gQVRIM0tfUFJFQk9PVF9NT0RFKSB7DQo+ICsJCQlCVF9FUlIoImF0aDNrX3Byb2JlOiBm aXJtd2FyZSBhcmUgaW4gcHJlYm9vdCBtb2RlIG5vdyIpOw0KPiArCQkJQlRfRVJSKCJhdGgza19w cm9iZTogdHJ5IHRvIHN3aXRjaCB0byBOb3JtYWwgTW9kZSIpOw0KPiArCQkJcmV0ID0gYXRoM2tf c2V0X25vcm1hbF9tb2RlKHVkZXYpOw0KPiArCQkJaWYgKHJldCA8IDApIHsNCj4gKwkJCQlCVF9F UlIoImF0aDNrX3Byb2JlOiBzZXQgbm9ybWFsIG1vZGUgZmFpbGVkIik7DQo+ICsJCQkJcmV0dXJu IHJldDsNCj4gKwkJCX0NCj4gKwkJfQ0KPiArCQkvKk5vdGUgd2Ugc2hvdWxkIHdhaXQgZm9yIGEg d2hpbGUqLw0KPiArCQltZGVsYXkoMTAwKTsNCj4gKwkJcmV0ID0gYXRoM2tfbG9hZF9wYXRjaCh1 ZGV2KTsNCj4gKwkJaWYgKHJldCA8IDApIHsNCj4gKwkJCUJUX0VSUigiYXRoM2tfcHJvYmU6IExv YWQgcGF0Y2ggZmlsZSBmYWlsZWQiKTsNCj4gKwkJCXJldHVybiByZXQ7DQo+ICsJCX0NCj4gKwkJ cmV0ID0gYXRoM2tfbG9hZF9zeXNjZmcodWRldik7DQo+ICsJCWlmIChyZXQgPCAwKSB7DQo+ICsJ CQlCVF9FUlIoImF0aDNrX3Byb2JlOiBMb2FkIHN5c2NvbmZpZyBmaWxlIGZhaWxlZCIpOw0KPiAr CQkJcmV0dXJuIHJldDsNCj4gKwkJfQ0KPiArCQlyZXQgPSBhdGgza19zd2l0Y2hfcGlkKHVkZXYp Ow0KPiArCQlpZiAocmV0IDwgMCkgew0KPiArCQkJQlRfRVJSKCJhdGgza19wcm9iZTogc3dpdGNo IHBpZCBmYWlsZWQiKTsNCj4gKwkJCXJldHVybiByZXQ7DQo+ICsJCX0NCj4gKwkJcmV0dXJuIDA7 DQoNCllvdSBhcmUgZHVwbGljYXRpbmcgc29tZSBjb2RlIGhlcmUsIGNhcmUgdG8gbWVyZ2UgdGhl IGNvbW1vbiBwYXJ0cyBiZXR3ZWVuIHRoaXMgYW5kIHRoZSBoYW5kbGluZyBvZiBCVFVTQl9BVEgz MDEyPw0KDQoJR3VzdGF2bw0K ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 2011-11-08 7:36 [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 Yao, Costa 2011-11-08 14:58 ` Gustavo Padovan @ 2011-11-09 7:44 ` Marcel Holtmann 1 sibling, 0 replies; 4+ messages in thread From: Marcel Holtmann @ 2011-11-09 7:44 UTC (permalink / raw) To: Yao, Costa; +Cc: padovan@profusion.mobi, linux-bluetooth@vger.kernel.org Hi Costa, > AR3006 is a composite device, and interface 0 is used for hid function, not for bluetooth function. > We should make the following changes: > 1 Blacklist AR3006 PID/VID in ath3k_table > 2 Add ath3k_composite_device_table in ath3k.c to register composite device. > 3 Load patch and sysconfig files for AR3006 > > Signed-off-by: Costa Yao <cqyao@qca.qualcomm.com> > --- > drivers/bluetooth/ath3k.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 61 insertions(+), 3 deletions(-) > > diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c > index 1622772..a9d6678 100644 > --- a/drivers/bluetooth/ath3k.c > +++ b/drivers/bluetooth/ath3k.c > @@ -40,6 +40,7 @@ > > #define ATH3K_MODE_MASK 0x3F > #define ATH3K_NORMAL_MODE 0x0E > +#define ATH3K_PREBOOT_MODE 0x0D > > #define ATH3K_PATCH_UPDATE 0x80 > #define ATH3K_SYSCFG_UPDATE 0x40 > @@ -71,6 +72,7 @@ static struct usb_device_id ath3k_table[] = { > > /* Atheros AR3012 with sflash firmware*/ > { USB_DEVICE(0x0CF3, 0x3004) }, > + { USB_DEVICE(0x0CF3, 0x3006) }, why not use .driver_info here as well. > /* Atheros AR5BBU12 with sflash firmware */ > { USB_DEVICE(0x0489, 0xE02C) }, > @@ -81,16 +83,26 @@ static struct usb_device_id ath3k_table[] = { > MODULE_DEVICE_TABLE(usb, ath3k_table); > > #define BTUSB_ATH3012 0x80 > +#define BTUSB_ATH3006 0x0100 > /* This table is to load patch and sysconfig files > * for AR3012 */ > static struct usb_device_id ath3k_blist_tbl[] = { > > /* Atheros AR3012 with sflash firmware*/ > { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, > + { USB_DEVICE(0x0cf3, 0x3006), .driver_info = BTUSB_ATH3006 }, > > { } /* Terminating entry */ > }; > > +/* Atheros composite devices table > + */ > +static struct usb_device_id ath3k_composite_device_table[] = { > + > + { USB_DEVICE(0x0cf3, 0x3006) }, > + > + { } /* Terminating entry */ > +}; I don't see a point in having another table here. Why can we not use the driver table? > #define USB_REQ_DFU_DNLOAD 1 > #define BULK_SIZE 4096 > #define FW_HDR_SIZE 20 > @@ -361,11 +373,19 @@ static int ath3k_probe(struct usb_interface *intf, > const struct firmware *firmware; > struct usb_device *udev = interface_to_usbdev(intf); > int ret; > + unsigned char fw_state; > + const struct usb_device_id *match_comp_dev; > > BT_DBG("intf %p id %p", intf, id); > - > - if (intf->cur_altsetting->desc.bInterfaceNumber != 0) > - return -ENODEV; > + /* For composite device */ > + match_comp_dev = usb_match_id(intf, ath3k_composite_device_table); > + if (match_comp_dev) { > + if (intf->cur_altsetting->desc.bInterfaceNumber != 2) > + return -ENODEV; > + } else { > + if (intf->cur_altsetting->desc.bInterfaceNumber != 0) > + return -ENODEV; > + } > > /* match device ID in ath3k blacklist table */ > if (!id->driver_info) { > @@ -399,6 +419,44 @@ static int ath3k_probe(struct usb_interface *intf, > } > ath3k_switch_pid(udev); > return 0; > + } else if (id->driver_info & BTUSB_ATH3006) { > + > + if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x0001) { > + BT_ERR("ath3k_probe: udev->descriptor.bcdDevice"); > + return -ENODEV; > + } > + ret = ath3k_get_state(udev, &fw_state); > + if (ret < 0) { > + BT_ERR("ath3k_probe: ath3k_get_state err"); > + return ret; > + } > + if ((fw_state & ATH3K_MODE_MASK) == ATH3K_PREBOOT_MODE) { > + BT_ERR("ath3k_probe: firmware are in preboot mode now"); > + BT_ERR("ath3k_probe: try to switch to Normal Mode"); > + ret = ath3k_set_normal_mode(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: set normal mode failed"); > + return ret; > + } > + } > + /*Note we should wait for a while*/ > + mdelay(100); > + ret = ath3k_load_patch(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: Load patch file failed"); > + return ret; > + } > + ret = ath3k_load_syscfg(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: Load sysconfig file failed"); > + return ret; > + } > + ret = ath3k_switch_pid(udev); > + if (ret < 0) { > + BT_ERR("ath3k_probe: switch pid failed"); > + return ret; > + } > + return 0; > } This code is horrible. Can you please use the core table and utilize .driver_info. And then you might wanna split this extra handling into a separate function and not just hack it in via one big if statement. Regards Marcel ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-09 7:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-08 7:36 [PATCH] Bluetooth: ath3k: Add support for Qualcomm Atheros 3006 Yao, Costa 2011-11-08 14:58 ` Gustavo Padovan 2011-11-09 2:59 ` Yao, Costa 2011-11-09 7:44 ` Marcel Holtmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).