* sd8688 firmware location
@ 2013-01-08 23:56 Lubomir Rintel
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-08 23:56 UTC (permalink / raw)
To: David Woodhouse, Ben Hutchings, libertas-dev, linux-bluetooth
Cc: Marcel Holtmann, Gustavo Padovan, Johan Hedberg, linux-kernel,
lkundrak
Hi!
btmrvl_sdio and libertas_sdio both use firmware files sd8688.bin and
sd8688_helper.bin. In linux-firmware, they're present in libertas/ tree and
(since 3d32a58b) libertas_sdio perfers loading it from there, while it is able
to fallback to load it from linux-firmware root. btmrvl_sdio, on the other hand
only looks in the root and ends up not being successful.
Obviously, there are two solutions to the problem -- either teach btmrvl_sdio
to look into libertas/, or move the files in linux-firmware tree. I don't
really have a strong preference, though it probably makes less sense to keep in
in libertas/, since the bluetooth hardware is not really marketed as "Libertas."
I'm following up with patches to linux and linux-firmware and I'd be very
thankful if you could pick one (not both of them).
Have a nice day!
--
Lubomir Rintel >o
(\)
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-08 23:56 sd8688 firmware location Lubomir Rintel
@ 2013-01-08 23:56 ` Lubomir Rintel
2013-01-09 2:28 ` Marcel Holtmann
2013-01-08 23:57 ` [PATCH] Move sd8688*.bin images away from libertas tree Lubomir Rintel
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2 siblings, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-08 23:56 UTC (permalink / raw)
To: David Woodhouse, Ben Hutchings, libertas-dev, linux-bluetooth
Cc: Marcel Holtmann, Gustavo Padovan, Johan Hedberg, linux-kernel,
lkundrak
linux-firmware ships the sd8688* firmware images that are shared with
libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
and so should we.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 9959d4c..494f921 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -83,22 +83,28 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
- .helper = "sd8688_helper.bin",
- .firmware = "sd8688.bin",
+ .helper = "libertas/sd8688_helper.bin",
+ .helper2 = "sd8688_helper.bin",
+ .firmware = "libertas/sd8688.bin",
+ .firmware2 = "sd8688.bin",
.reg = &btmrvl_reg_8688,
.sd_blksz_fw_dl = 64,
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8787 = {
.helper = NULL,
+ .helper2 = NULL,
.firmware = "mrvl/sd8787_uapsta.bin",
+ .firmware2 = NULL,
.reg = &btmrvl_reg_87xx,
.sd_blksz_fw_dl = 256,
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8797 = {
.helper = NULL,
+ .helper2 = NULL,
.firmware = "mrvl/sd8797_uapsta.bin",
+ .firmware2 = NULL,
.reg = &btmrvl_reg_87xx,
.sd_blksz_fw_dl = 256,
};
@@ -260,6 +266,11 @@ static int btmrvl_sdio_download_helper(struct btmrvl_sdio_card *card)
ret = request_firmware(&fw_helper, card->helper,
&card->func->dev);
+ if (ret < 0 && card->helper2) {
+ release_firmware(fw_helper);
+ ret = request_firmware(&fw_helper, card->helper2,
+ &card->func->dev);
+ }
if ((ret < 0) || !fw_helper) {
BT_ERR("request_firmware(helper) failed, error code = %d",
ret);
@@ -360,6 +371,11 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card)
ret = request_firmware(&fw_firmware, card->firmware,
&card->func->dev);
+ if (ret < 0 && card->firmware2) {
+ release_firmware(fw_firmware);
+ ret = request_firmware(&fw_firmware, card->firmware2,
+ &card->func->dev);
+ }
if ((ret < 0) || !fw_firmware) {
BT_ERR("request_firmware(firmware) failed, error code = %d",
ret);
@@ -970,7 +986,9 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
if (id->driver_data) {
struct btmrvl_sdio_device *data = (void *) id->driver_data;
card->helper = data->helper;
+ card->helper2 = data->helper2;
card->firmware = data->firmware;
+ card->firmware2 = data->firmware2;
card->reg = data->reg;
card->sd_blksz_fw_dl = data->sd_blksz_fw_dl;
}
@@ -1186,6 +1204,8 @@ MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL v2");
MODULE_FIRMWARE("sd8688_helper.bin");
+MODULE_FIRMWARE("libertas/sd8688_helper.bin");
MODULE_FIRMWARE("sd8688.bin");
+MODULE_FIRMWARE("libertas/sd8688.bin");
MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 43d35a6..4a5a019 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -84,7 +84,9 @@ struct btmrvl_sdio_card {
struct sdio_func *func;
u32 ioport;
const char *helper;
+ const char *helper2;
const char *firmware;
+ const char *firmware2;
const struct btmrvl_sdio_card_reg *reg;
u16 sd_blksz_fw_dl;
u8 rx_unit;
@@ -92,8 +94,8 @@ struct btmrvl_sdio_card {
};
struct btmrvl_sdio_device {
- const char *helper;
- const char *firmware;
+ const char *helper, *helper2;
+ const char *firmware, *firmware2;
const struct btmrvl_sdio_card_reg *reg;
u16 sd_blksz_fw_dl;
};
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH] Move sd8688*.bin images away from libertas tree
2013-01-08 23:56 sd8688 firmware location Lubomir Rintel
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
@ 2013-01-08 23:57 ` Lubomir Rintel
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2 siblings, 0 replies; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-08 23:57 UTC (permalink / raw)
To: David Woodhouse, Ben Hutchings, libertas-dev, linux-bluetooth
Cc: Marcel Holtmann, Gustavo Padovan, Johan Hedberg, linux-kernel,
lkundrak
They are (unlike rest of sd8xxx images from libertas/ and mrvl/) not Libertas
WiFi specific and are used for the bluetooth controller (btmrvl) which does not
look for them in libertas/.
This is fine for the WiFi driver that utilizes those, since it has always been
looking in this place as well.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
libertas/sd8688.bin => sd8688.bin | Bin 259172 -> 259172 bytes
libertas/sd8688_helper.bin => sd8688_helper.bin | Bin 2616 -> 2616 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
rename libertas/sd8688.bin => sd8688.bin (100%)
rename libertas/sd8688_helper.bin => sd8688_helper.bin (100%)
--
1.7.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
@ 2013-01-09 2:28 ` Marcel Holtmann
2013-01-09 2:43 ` Bing Zhao
0 siblings, 1 reply; 19+ messages in thread
From: Marcel Holtmann @ 2013-01-09 2:28 UTC (permalink / raw)
To: Lubomir Rintel
Cc: David Woodhouse, Ben Hutchings, libertas-dev, linux-bluetooth,
Gustavo Padovan, Johan Hedberg, linux-kernel
Hi Lubomir,
> linux-firmware ships the sd8688* firmware images that are shared with
> libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> and so should we.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
> drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> 2 files changed, 26 insertions(+), 4 deletions(-)
NAK from me on this one. I do not want the driver to check two
locations. That is what userspace can work around.
If we want to unify the location between the WiFi driver and the
Bluetooth driver, I am fine with that, but seriously, just pick one over
the other. I do not care which one.
Regards
Marcel
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-09 2:28 ` Marcel Holtmann
@ 2013-01-09 2:43 ` Bing Zhao
2013-01-09 6:31 ` Lubomir Rintel
2013-01-18 7:37 ` [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location Lubomir Rintel
0 siblings, 2 replies; 19+ messages in thread
From: Bing Zhao @ 2013-01-09 2:43 UTC (permalink / raw)
To: Marcel Holtmann, Lubomir Rintel
Cc: David Woodhouse, Ben Hutchings, libertas-dev@lists.infradead.org,
linux-bluetooth@vger.kernel.org, Gustavo Padovan, Johan Hedberg,
linux-kernel@vger.kernel.org
DQo+ID4gbGludXgtZmlybXdhcmUgc2hpcHMgdGhlIHNkODY4OCogZmlybXdhcmUgaW1hZ2VzIHRo
YXQgYXJlIHNoYXJlZCB3aXRoDQo+ID4gbGliZXJ0YXNfc2RpbyBXaUZpIGRyaXZlciB1bmRlciBs
aWJlcnRhcy8uIGxpYmVydGFzX3NkaW8gbG9va3MgaW4gYm90aCBwbGFjZXMNCj4gPiBhbmQgc28g
c2hvdWxkIHdlLg0KPiA+DQo+ID4gU2lnbmVkLW9mZi1ieTogTHVib21pciBSaW50ZWwgPGxrdW5k
cmFrQHYzLnNrPg0KPiA+IC0tLQ0KPiA+ICBkcml2ZXJzL2JsdWV0b290aC9idG1ydmxfc2Rpby5j
IHwgICAyNCArKysrKysrKysrKysrKysrKysrKysrLS0NCj4gPiAgZHJpdmVycy9ibHVldG9vdGgv
YnRtcnZsX3NkaW8uaCB8ICAgIDYgKysrKy0tDQo+ID4gIDIgZmlsZXMgY2hhbmdlZCwgMjYgaW5z
ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkNCj4gDQo+IE5BSyBmcm9tIG1lIG9uIHRoaXMgb25l
LiBJIGRvIG5vdCB3YW50IHRoZSBkcml2ZXIgdG8gY2hlY2sgdHdvDQo+IGxvY2F0aW9ucy4gVGhh
dCBpcyB3aGF0IHVzZXJzcGFjZSBjYW4gd29yayBhcm91bmQuDQo+IA0KPiBJZiB3ZSB3YW50IHRv
IHVuaWZ5IHRoZSBsb2NhdGlvbiBiZXR3ZWVuIHRoZSBXaUZpIGRyaXZlciBhbmQgdGhlDQo+IEJs
dWV0b290aCBkcml2ZXIsIEkgYW0gZmluZSB3aXRoIHRoYXQsIGJ1dCBzZXJpb3VzbHksIGp1c3Qg
cGljayBvbmUgb3Zlcg0KPiB0aGUgb3RoZXIuIEkgZG8gbm90IGNhcmUgd2hpY2ggb25lLg0KDQpU
aGUgdW5pZmllZCBsb2NhdGlvbiBpcyBtcnZsLyBkaXJlY3RvcnkuDQoNCldlIGNhbiBwcm9iYWJs
eSBtb3ZlIFNEODY4OCBmaXJtd2FyZSAmIGhlbHBlciBiaW5hcmllcyB0byBtcnZsLyBhbmQgaGF2
ZSBib3RoIGRyaXZlcnMgZ3JhYiB0aGUgaW1hZ2VzIHRoZXJlPw0KDQpSZWdhcmRzLA0KQmluZw0K
DQo=
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-09 2:43 ` Bing Zhao
@ 2013-01-09 6:31 ` Lubomir Rintel
2013-01-09 6:35 ` Marcel Holtmann
2013-01-18 7:37 ` [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location Lubomir Rintel
1 sibling, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-09 6:31 UTC (permalink / raw)
To: Bing Zhao
Cc: Marcel Holtmann, David Woodhouse, Ben Hutchings,
libertas-dev@lists.infradead.org, linux-bluetooth@vger.kernel.org,
Gustavo Padovan, Johan Hedberg, linux-kernel@vger.kernel.org
On Tue, 2013-01-08 at 18:43 -0800, Bing Zhao wrote:
> > > linux-firmware ships the sd8688* firmware images that are shared with
> > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > and so should we.
> > >
> > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > ---
> > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > 2 files changed, 26 insertions(+), 4 deletions(-)
> >
> > NAK from me on this one. I do not want the driver to check two
> > locations. That is what userspace can work around.
> >
> > If we want to unify the location between the WiFi driver and the
> > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > the other. I do not care which one.
>
> The unified location is mrvl/ directory.
>
> We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
That would break existing setups, wouldn't it?
I was under impression (commit 3d32a58b) that we care about
compatibility here. Do we?
--
Lubomir Rintel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-09 6:31 ` Lubomir Rintel
@ 2013-01-09 6:35 ` Marcel Holtmann
2013-01-18 7:33 ` Lubomir Rintel
0 siblings, 1 reply; 19+ messages in thread
From: Marcel Holtmann @ 2013-01-09 6:35 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Bing Zhao, David Woodhouse, Ben Hutchings,
libertas-dev@lists.infradead.org, linux-bluetooth@vger.kernel.org,
Gustavo Padovan, Johan Hedberg, linux-kernel@vger.kernel.org
Hi Lubomir,
> > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > and so should we.
> > > >
> > > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > > ---
> > > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > > 2 files changed, 26 insertions(+), 4 deletions(-)
> > >
> > > NAK from me on this one. I do not want the driver to check two
> > > locations. That is what userspace can work around.
> > >
> > > If we want to unify the location between the WiFi driver and the
> > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > the other. I do not care which one.
> >
> > The unified location is mrvl/ directory.
> >
> > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
>
> That would break existing setups, wouldn't it?
>
> I was under impression (commit 3d32a58b) that we care about
> compatibility here. Do we?
that is what symlinks are for.
Regards
Marcel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: sd8688 firmware location
2013-01-08 23:56 sd8688 firmware location Lubomir Rintel
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
2013-01-08 23:57 ` [PATCH] Move sd8688*.bin images away from libertas tree Lubomir Rintel
@ 2013-01-09 22:45 ` Dan Williams
2013-01-10 1:20 ` Bing Zhao
` (2 more replies)
2 siblings, 3 replies; 19+ messages in thread
From: Dan Williams @ 2013-01-09 22:45 UTC (permalink / raw)
To: Lubomir Rintel
Cc: David Woodhouse, Ben Hutchings, libertas-dev, linux-bluetooth,
Gustavo Padovan, Marcel Holtmann, Johan Hedberg, linux-kernel
On Wed, 2013-01-09 at 00:56 +0100, Lubomir Rintel wrote:
> Hi!
>
> btmrvl_sdio and libertas_sdio both use firmware files sd8688.bin and
> sd8688_helper.bin. In linux-firmware, they're present in libertas/ tree and
> (since 3d32a58b) libertas_sdio perfers loading it from there, while it is able
> to fallback to load it from linux-firmware root. btmrvl_sdio, on the other hand
> only looks in the root and ends up not being successful.
>
> Obviously, there are two solutions to the problem -- either teach btmrvl_sdio
> to look into libertas/, or move the files in linux-firmware tree. I don't
> really have a strong preference, though it probably makes less sense to keep in
> in libertas/, since the bluetooth hardware is not really marketed as "Libertas."
>
> I'm following up with patches to linux and linux-firmware and I'd be very
> thankful if you could pick one (not both of them).
So the BT part and the wifi part have different SDIO IDs; are they
actually connected separately to the SDIO bus? Or is the chip only in
one mode at one time or something like that? Is there a problem with
having both libertas and btmrvl loaded at the same time since they're
essentially the same chip?
I don't really mind moving stuff to mrvl/ out of libertas/ for these
devices, but I do want some backwards compat code in libertas for that.
Unless, of course, Marcel was talking about symlinks in the
linux-firmware git tree, which would be fine with me. The important
point is that simply updating your linux-firmware package or install or
whatever *should not* result in a failed firmware load.
Dan
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: sd8688 firmware location
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
@ 2013-01-10 1:20 ` Bing Zhao
2013-01-18 7:39 ` [PATCH] libertas sdio: look for 8688 firmware in common location Lubomir Rintel
2013-01-21 1:13 ` sd8688 firmware location Ben Hutchings
2 siblings, 0 replies; 19+ messages in thread
From: Bing Zhao @ 2013-01-10 1:20 UTC (permalink / raw)
To: Dan Williams, Lubomir Rintel
Cc: David Woodhouse, Ben Hutchings, libertas-dev@lists.infradead.org,
linux-bluetooth@vger.kernel.org, Gustavo Padovan, Marcel Holtmann,
Johan Hedberg, linux-kernel@vger.kernel.org
SGkgRGFuLA0KDQo+ID4gYnRtcnZsX3NkaW8gYW5kIGxpYmVydGFzX3NkaW8gYm90aCB1c2UgZmly
bXdhcmUgZmlsZXMgc2Q4Njg4LmJpbiBhbmQNCj4gPiBzZDg2ODhfaGVscGVyLmJpbi4gSW4gbGlu
dXgtZmlybXdhcmUsIHRoZXkncmUgcHJlc2VudCBpbiBsaWJlcnRhcy8gdHJlZSBhbmQNCj4gPiAo
c2luY2UgM2QzMmE1OGIpIGxpYmVydGFzX3NkaW8gcGVyZmVycyBsb2FkaW5nIGl0IGZyb20gdGhl
cmUsIHdoaWxlIGl0IGlzIGFibGUNCj4gPiB0byBmYWxsYmFjayB0byBsb2FkIGl0IGZyb20gbGlu
dXgtZmlybXdhcmUgcm9vdC4gYnRtcnZsX3NkaW8sIG9uIHRoZSBvdGhlciBoYW5kDQo+ID4gb25s
eSBsb29rcyBpbiB0aGUgcm9vdCBhbmQgZW5kcyB1cCBub3QgYmVpbmcgc3VjY2Vzc2Z1bC4NCj4g
Pg0KPiA+IE9idmlvdXNseSwgdGhlcmUgYXJlIHR3byBzb2x1dGlvbnMgdG8gdGhlIHByb2JsZW0g
LS0gZWl0aGVyIHRlYWNoIGJ0bXJ2bF9zZGlvDQo+ID4gdG8gbG9vayBpbnRvIGxpYmVydGFzLywg
b3IgbW92ZSB0aGUgZmlsZXMgaW4gbGludXgtZmlybXdhcmUgdHJlZS4gSSBkb24ndA0KPiA+IHJl
YWxseSBoYXZlIGEgc3Ryb25nIHByZWZlcmVuY2UsIHRob3VnaCBpdCBwcm9iYWJseSBtYWtlcyBs
ZXNzIHNlbnNlIHRvIGtlZXAgaW4NCj4gPiBpbiBsaWJlcnRhcy8sIHNpbmNlIHRoZSBibHVldG9v
dGggaGFyZHdhcmUgaXMgbm90IHJlYWxseSBtYXJrZXRlZCBhcyAiTGliZXJ0YXMuIg0KPiA+DQo+
ID4gSSdtIGZvbGxvd2luZyB1cCB3aXRoIHBhdGNoZXMgdG8gbGludXggYW5kIGxpbnV4LWZpcm13
YXJlIGFuZCBJJ2QgYmUgdmVyeQ0KPiA+IHRoYW5rZnVsIGlmIHlvdSBjb3VsZCBwaWNrIG9uZSAo
bm90IGJvdGggb2YgdGhlbSkuDQo+IA0KPiBTbyB0aGUgQlQgcGFydCBhbmQgdGhlIHdpZmkgcGFy
dCBoYXZlIGRpZmZlcmVudCBTRElPIElEczsgYXJlIHRoZXkNCj4gYWN0dWFsbHkgY29ubmVjdGVk
IHNlcGFyYXRlbHkgdG8gdGhlIFNESU8gYnVzPyAgT3IgaXMgdGhlIGNoaXAgb25seSBpbg0KPiBv
bmUgbW9kZSBhdCBvbmUgdGltZSBvciBzb21ldGhpbmcgbGlrZSB0aGF0PyAgSXMgdGhlcmUgYSBw
cm9ibGVtIHdpdGgNCj4gaGF2aW5nIGJvdGggbGliZXJ0YXMgYW5kIGJ0bXJ2bCBsb2FkZWQgYXQg
dGhlIHNhbWUgdGltZSBzaW5jZSB0aGV5J3JlDQo+IGVzc2VudGlhbGx5IHRoZSBzYW1lIGNoaXA/
DQoNClNEODY4OCBpcyBhIGNvbWJvIGNoaXAgd2l0aCBkaWZmZXJlbnQgZGV2aWNlIElEcyBmb3Ig
V0xBTiAoZnVuY3Rpb24gMSkgYW5kIEJUIChmdW5jdGlvbiAyKS4gV0xBTiArIEJUIHRvZ2V0aGVy
IGFyZSBjb25uZWN0ZWQgdG8gdGhlIGJ1cyB3aXRoIGEgc2luZ2xlIFNESU8gaW50ZXJmYWNlLiBC
b3RoIGxpYmVydGFzIGFuZCBidG1ydmwgZHJpdmVycyBjYW4gYmUgbG9hZGVkIGF0IHRoZSBzYW1l
IHRpbWUsIGFuZCBXTEFOICYgQlQgZnVuY3Rpb25zIHdvcmsgY29uY3VycmVudGx5LiBPZiBjb3Vy
c2UgdGhlIFNESU8gYnVzIGlzIHNoYXJlZCBiZXR3ZWVuIFdMQU4gYW5kIEJULg0KDQpUaGUgZmly
bXdhcmUgaW1hZ2UgY2FuIGJlIGRvd25sb2FkZWQgZnJvbSBob3N0IHRvIGRldmljZSBieSBlaXRo
ZXIgbGliZXJ0YXMgb3IgYnRtcnZsIGRyaXZlciB3aG9ldmVyIGJlY29tZXMgdGhlIHdpbm5lciBm
cm9tIGZpcm13YXJlIGRvd25sb2FkaW5nIHBlcnNwZWN0aXZlLg0KDQpSZWdhcmRzLA0KQmluZw0K
DQo+IA0KPiBJIGRvbid0IHJlYWxseSBtaW5kIG1vdmluZyBzdHVmZiB0byBtcnZsLyBvdXQgb2Yg
bGliZXJ0YXMvIGZvciB0aGVzZQ0KPiBkZXZpY2VzLCBidXQgSSBkbyB3YW50IHNvbWUgYmFja3dh
cmRzIGNvbXBhdCBjb2RlIGluIGxpYmVydGFzIGZvciB0aGF0Lg0KPiBVbmxlc3MsIG9mIGNvdXJz
ZSwgTWFyY2VsIHdhcyB0YWxraW5nIGFib3V0IHN5bWxpbmtzIGluIHRoZQ0KPiBsaW51eC1maXJt
d2FyZSBnaXQgdHJlZSwgd2hpY2ggd291bGQgYmUgZmluZSB3aXRoIG1lLiAgVGhlIGltcG9ydGFu
dA0KPiBwb2ludCBpcyB0aGF0IHNpbXBseSB1cGRhdGluZyB5b3VyIGxpbnV4LWZpcm13YXJlIHBh
Y2thZ2Ugb3IgaW5zdGFsbCBvcg0KPiB3aGF0ZXZlciAqc2hvdWxkIG5vdCogcmVzdWx0IGluIGEg
ZmFpbGVkIGZpcm13YXJlIGxvYWQuDQo+IA0KPiBEYW4NCg==
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-09 6:35 ` Marcel Holtmann
@ 2013-01-18 7:33 ` Lubomir Rintel
2013-01-21 1:12 ` Ben Hutchings
0 siblings, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-18 7:33 UTC (permalink / raw)
To: Marcel Holtmann, David Woodhouse, Ben Hutchings
Cc: Bing Zhao, libertas-dev@lists.infradead.org,
linux-bluetooth@vger.kernel.org, Gustavo Padovan, Johan Hedberg,
linux-kernel@vger.kernel.org
On Tue, 2013-01-08 at 22:35 -0800, Marcel Holtmann wrote:
> Hi Lubomir,
>
> > > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > > and so should we.
> > > > >
> > > > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > > > ---
> > > > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > > > 2 files changed, 26 insertions(+), 4 deletions(-)
> > > >
> > > > NAK from me on this one. I do not want the driver to check two
> > > > locations. That is what userspace can work around.
> > > >
> > > > If we want to unify the location between the WiFi driver and the
> > > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > > the other. I do not care which one.
> > >
> > > The unified location is mrvl/ directory.
> > >
> > > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
> >
> > That would break existing setups, wouldn't it?
> >
> > I was under impression (commit 3d32a58b) that we care about
> > compatibility here. Do we?
>
> that is what symlinks are for.
David, Ben: please pull the following branch then:
git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
Thank you!
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location
2013-01-09 2:43 ` Bing Zhao
2013-01-09 6:31 ` Lubomir Rintel
@ 2013-01-18 7:37 ` Lubomir Rintel
2013-01-18 7:58 ` Marcel Holtmann
1 sibling, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-18 7:37 UTC (permalink / raw)
To: Marcel Holtmann, Bing Zhao
Cc: Ben Hutchings, David Woodhouse, Gustavo Padovan, Johan Hedberg,
libertas-dev, linux-bluetooth, linux-kernel, Lubomir Rintel
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/bluetooth/btmrvl_sdio.c | 8 ++++----
drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 3f4bfc8..bc27d01 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
- .helper = "sd8688_helper.bin",
- .firmware = "sd8688.bin",
+ .helper = "mrvl/sd8688_helper.bin",
+ .firmware = "mrvl/sd8688.bin",
.reg = &btmrvl_reg_8688,
.sd_blksz_fw_dl = 64,
};
@@ -1179,7 +1179,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("sd8688_helper.bin");
-MODULE_FIRMWARE("sd8688.bin");
+MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
+MODULE_FIRMWARE("mrvl/sd8688.bin");
MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 43d35a6..4a5a019 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -84,7 +84,9 @@ struct btmrvl_sdio_card {
struct sdio_func *func;
u32 ioport;
const char *helper;
+ const char *helper2;
const char *firmware;
+ const char *firmware2;
const struct btmrvl_sdio_card_reg *reg;
u16 sd_blksz_fw_dl;
u8 rx_unit;
@@ -92,8 +94,8 @@ struct btmrvl_sdio_card {
};
struct btmrvl_sdio_device {
- const char *helper;
- const char *firmware;
+ const char *helper, *helper2;
+ const char *firmware, *firmware2;
const struct btmrvl_sdio_card_reg *reg;
u16 sd_blksz_fw_dl;
};
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH] libertas sdio: look for 8688 firmware in common location
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2013-01-10 1:20 ` Bing Zhao
@ 2013-01-18 7:39 ` Lubomir Rintel
2013-01-21 1:13 ` sd8688 firmware location Ben Hutchings
2 siblings, 0 replies; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-18 7:39 UTC (permalink / raw)
To: Dan Williams
Cc: Marcel Holtmann, Bing Zhao, Ben Hutchings, David Woodhouse,
Gustavo Padovan, Johan Hedberg, libertas-dev, linux-bluetooth,
linux-kernel, Lubomir Rintel
sd8688 is not only used by libertas WiFi, but shared with btmrvl bluetooth as
well.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/net/wireless/libertas/if_sdio.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 739309e..be16a76 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -85,6 +85,7 @@ static const struct lbs_fw_table fw_table[] = {
{ MODEL_8686, "libertas/sd8686_v9_helper.bin", "libertas/sd8686_v9.bin" },
{ MODEL_8686, "libertas/sd8686_v8_helper.bin", "libertas/sd8686_v8.bin" },
{ MODEL_8686, "sd8686_helper.bin", "sd8686.bin" },
+ { MODEL_8688, "mrvl/sd8688_helper.bin", "mrvl/sd8688.bin" },
{ MODEL_8688, "libertas/sd8688_helper.bin", "libertas/sd8688.bin" },
{ MODEL_8688, "sd8688_helper.bin", "sd8688.bin" },
{ 0, NULL, NULL }
@@ -99,6 +100,8 @@ MODULE_FIRMWARE("libertas/sd8686_v8_helper.bin");
MODULE_FIRMWARE("libertas/sd8686_v8.bin");
MODULE_FIRMWARE("sd8686_helper.bin");
MODULE_FIRMWARE("sd8686.bin");
+MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
+MODULE_FIRMWARE("mrvl/sd8688.bin");
MODULE_FIRMWARE("libertas/sd8688_helper.bin");
MODULE_FIRMWARE("libertas/sd8688.bin");
MODULE_FIRMWARE("sd8688_helper.bin");
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location
2013-01-18 7:37 ` [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location Lubomir Rintel
@ 2013-01-18 7:58 ` Marcel Holtmann
2013-01-19 19:01 ` Lubomir Rintel
0 siblings, 1 reply; 19+ messages in thread
From: Marcel Holtmann @ 2013-01-18 7:58 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Bing Zhao, Ben Hutchings, David Woodhouse, Gustavo Padovan,
Johan Hedberg, libertas-dev, linux-bluetooth, linux-kernel
Hi Lubumir,
proper commit message with explanation here please.
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
> drivers/bluetooth/btmrvl_sdio.c | 8 ++++----
> drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
> index 3f4bfc8..bc27d01 100644
> --- a/drivers/bluetooth/btmrvl_sdio.c
> +++ b/drivers/bluetooth/btmrvl_sdio.c
> @@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
> };
>
> static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
> - .helper = "sd8688_helper.bin",
> - .firmware = "sd8688.bin",
> + .helper = "mrvl/sd8688_helper.bin",
> + .firmware = "mrvl/sd8688.bin",
> .reg = &btmrvl_reg_8688,
> .sd_blksz_fw_dl = 64,
> };
> @@ -1179,7 +1179,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
> MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
> MODULE_VERSION(VERSION);
> MODULE_LICENSE("GPL v2");
> -MODULE_FIRMWARE("sd8688_helper.bin");
> -MODULE_FIRMWARE("sd8688.bin");
> +MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
> +MODULE_FIRMWARE("mrvl/sd8688.bin");
> MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
> MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
> diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
> index 43d35a6..4a5a019 100644
> --- a/drivers/bluetooth/btmrvl_sdio.h
> +++ b/drivers/bluetooth/btmrvl_sdio.h
> @@ -84,7 +84,9 @@ struct btmrvl_sdio_card {
> struct sdio_func *func;
> u32 ioport;
> const char *helper;
> + const char *helper2;
> const char *firmware;
> + const char *firmware2;
And please clear out the patch from left-overs.
> const struct btmrvl_sdio_card_reg *reg;
> u16 sd_blksz_fw_dl;
> u8 rx_unit;
> @@ -92,8 +94,8 @@ struct btmrvl_sdio_card {
> };
>
> struct btmrvl_sdio_device {
> - const char *helper;
> - const char *firmware;
> + const char *helper, *helper2;
> + const char *firmware, *firmware2;
And here as well.
Regards
Marcel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location
2013-01-18 7:58 ` Marcel Holtmann
@ 2013-01-19 19:01 ` Lubomir Rintel
2013-01-19 20:23 ` Marcel Holtmann
0 siblings, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-19 19:01 UTC (permalink / raw)
To: Marcel Holtmann
Cc: Lubomir Rintel, Bing Zhao, Ben Hutchings, David Woodhouse,
Gustavo Padovan, Johan Hedberg, libertas-dev, linux-bluetooth,
linux-kernel
The firmware images are shared with libertas_sdio WiFi chip and used to be in
libertas/ subtree in linux-firmware. As btmrvl_sdio used to look into the
linux-firmware root, it ended up being unsuccessful. Since the firmware files
are not specific to the libertas hardware, they're being moved into mrvl/ now.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/bluetooth/btmrvl_sdio.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 9959d4c..1cb5183 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -83,8 +83,8 @@ static const struct btmrvl_sdio_card_reg btmrvl_reg_87xx = {
};
static const struct btmrvl_sdio_device btmrvl_sdio_sd8688 = {
- .helper = "sd8688_helper.bin",
- .firmware = "sd8688.bin",
+ .helper = "mrvl/sd8688_helper.bin",
+ .firmware = "mrvl/sd8688.bin",
.reg = &btmrvl_reg_8688,
.sd_blksz_fw_dl = 64,
};
@@ -1185,7 +1185,7 @@ MODULE_AUTHOR("Marvell International Ltd.");
MODULE_DESCRIPTION("Marvell BT-over-SDIO driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("sd8688_helper.bin");
-MODULE_FIRMWARE("sd8688.bin");
+MODULE_FIRMWARE("mrvl/sd8688_helper.bin");
+MODULE_FIRMWARE("mrvl/sd8688.bin");
MODULE_FIRMWARE("mrvl/sd8787_uapsta.bin");
MODULE_FIRMWARE("mrvl/sd8797_uapsta.bin");
--
1.7.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location
2013-01-19 19:01 ` Lubomir Rintel
@ 2013-01-19 20:23 ` Marcel Holtmann
0 siblings, 0 replies; 19+ messages in thread
From: Marcel Holtmann @ 2013-01-19 20:23 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Bing Zhao, Ben Hutchings, David Woodhouse, Gustavo Padovan,
Johan Hedberg, libertas-dev, linux-bluetooth, linux-kernel
Hi Lubomir,
> The firmware images are shared with libertas_sdio WiFi chip and used to be in
> libertas/ subtree in linux-firmware. As btmrvl_sdio used to look into the
> linux-firmware root, it ended up being unsuccessful. Since the firmware files
> are not specific to the libertas hardware, they're being moved into mrvl/ now.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
> drivers/bluetooth/btmrvl_sdio.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Regards
Marcel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-18 7:33 ` Lubomir Rintel
@ 2013-01-21 1:12 ` Ben Hutchings
2013-01-27 11:21 ` Lubomir Rintel
0 siblings, 1 reply; 19+ messages in thread
From: Ben Hutchings @ 2013-01-21 1:12 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Marcel Holtmann, David Woodhouse, Bing Zhao,
libertas-dev@lists.infradead.org, linux-bluetooth@vger.kernel.org,
Gustavo Padovan, Johan Hedberg, linux-kernel@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 1759 bytes --]
On Fri, 2013-01-18 at 08:33 +0100, Lubomir Rintel wrote:
> On Tue, 2013-01-08 at 22:35 -0800, Marcel Holtmann wrote:
> > Hi Lubomir,
> >
> > > > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > > > and so should we.
> > > > > >
> > > > > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > > > > ---
> > > > > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > > > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > > > > 2 files changed, 26 insertions(+), 4 deletions(-)
> > > > >
> > > > > NAK from me on this one. I do not want the driver to check two
> > > > > locations. That is what userspace can work around.
> > > > >
> > > > > If we want to unify the location between the WiFi driver and the
> > > > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > > > the other. I do not care which one.
> > > >
> > > > The unified location is mrvl/ directory.
> > > >
> > > > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
> > >
> > > That would break existing setups, wouldn't it?
> > >
> > > I was under impression (commit 3d32a58b) that we care about
> > > compatibility here. Do we?
> >
> > that is what symlinks are for.
>
> David, Ben: please pull the following branch then:
> git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
>
> Thank you!
The symlinks are broken, and you didn't update WHENCE.
Ben.
--
Ben Hutchings
Q. Which is the greater problem in the world today, ignorance or apathy?
A. I don't know and I couldn't care less.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: sd8688 firmware location
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2013-01-10 1:20 ` Bing Zhao
2013-01-18 7:39 ` [PATCH] libertas sdio: look for 8688 firmware in common location Lubomir Rintel
@ 2013-01-21 1:13 ` Ben Hutchings
2 siblings, 0 replies; 19+ messages in thread
From: Ben Hutchings @ 2013-01-21 1:13 UTC (permalink / raw)
To: Dan Williams
Cc: Lubomir Rintel, David Woodhouse, libertas-dev, linux-bluetooth,
Gustavo Padovan, Marcel Holtmann, Johan Hedberg, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2093 bytes --]
On Wed, 2013-01-09 at 16:45 -0600, Dan Williams wrote:
> On Wed, 2013-01-09 at 00:56 +0100, Lubomir Rintel wrote:
> > Hi!
> >
> > btmrvl_sdio and libertas_sdio both use firmware files sd8688.bin and
> > sd8688_helper.bin. In linux-firmware, they're present in libertas/ tree and
> > (since 3d32a58b) libertas_sdio perfers loading it from there, while it is able
> > to fallback to load it from linux-firmware root. btmrvl_sdio, on the other hand
> > only looks in the root and ends up not being successful.
> >
> > Obviously, there are two solutions to the problem -- either teach btmrvl_sdio
> > to look into libertas/, or move the files in linux-firmware tree. I don't
> > really have a strong preference, though it probably makes less sense to keep in
> > in libertas/, since the bluetooth hardware is not really marketed as "Libertas."
> >
> > I'm following up with patches to linux and linux-firmware and I'd be very
> > thankful if you could pick one (not both of them).
>
> So the BT part and the wifi part have different SDIO IDs; are they
> actually connected separately to the SDIO bus? Or is the chip only in
> one mode at one time or something like that? Is there a problem with
> having both libertas and btmrvl loaded at the same time since they're
> essentially the same chip?
>
> I don't really mind moving stuff to mrvl/ out of libertas/ for these
> devices, but I do want some backwards compat code in libertas for that.
> Unless, of course, Marcel was talking about symlinks in the
> linux-firmware git tree, which would be fine with me. The important
> point is that simply updating your linux-firmware package or install or
> whatever *should not* result in a failed firmware load.
The general policy for linux-firmware.git has been that all filenames
required by all mainline kernel releases will be supported indefinitely.
There is already precedent for compatibility symlinks.
Ben.
--
Ben Hutchings
Q. Which is the greater problem in the world today, ignorance or apathy?
A. I don't know and I couldn't care less.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-21 1:12 ` Ben Hutchings
@ 2013-01-27 11:21 ` Lubomir Rintel
2013-02-18 3:18 ` Ben Hutchings
0 siblings, 1 reply; 19+ messages in thread
From: Lubomir Rintel @ 2013-01-27 11:21 UTC (permalink / raw)
To: Ben Hutchings
Cc: Marcel Holtmann, David Woodhouse, Bing Zhao,
libertas-dev@lists.infradead.org, linux-bluetooth@vger.kernel.org,
Gustavo Padovan, Johan Hedberg, linux-kernel@vger.kernel.org
On Mon, 2013-01-21 at 01:12 +0000, Ben Hutchings wrote:
> On Fri, 2013-01-18 at 08:33 +0100, Lubomir Rintel wrote:
> > On Tue, 2013-01-08 at 22:35 -0800, Marcel Holtmann wrote:
> > > Hi Lubomir,
> > >
> > > > > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > > > > and so should we.
> > > > > > >
> > > > > > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > > > > > ---
> > > > > > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > > > > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > > > > > 2 files changed, 26 insertions(+), 4 deletions(-)
> > > > > >
> > > > > > NAK from me on this one. I do not want the driver to check two
> > > > > > locations. That is what userspace can work around.
> > > > > >
> > > > > > If we want to unify the location between the WiFi driver and the
> > > > > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > > > > the other. I do not care which one.
> > > > >
> > > > > The unified location is mrvl/ directory.
> > > > >
> > > > > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
> > > >
> > > > That would break existing setups, wouldn't it?
> > > >
> > > > I was under impression (commit 3d32a58b) that we care about
> > > > compatibility here. Do we?
> > >
> > > that is what symlinks are for.
> >
> > David, Ben: please pull the following branch then:
> > git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
> >
> > Thank you!
>
> The symlinks are broken, and you didn't update WHENCE.
Oops, sorry for that. Fixed now, please pull:
git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
Thank you!
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place
2013-01-27 11:21 ` Lubomir Rintel
@ 2013-02-18 3:18 ` Ben Hutchings
0 siblings, 0 replies; 19+ messages in thread
From: Ben Hutchings @ 2013-02-18 3:18 UTC (permalink / raw)
To: Lubomir Rintel
Cc: Marcel Holtmann, David Woodhouse, Bing Zhao,
libertas-dev@lists.infradead.org, linux-bluetooth@vger.kernel.org,
Gustavo Padovan, Johan Hedberg, linux-kernel@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 2168 bytes --]
On Sun, 2013-01-27 at 12:21 +0100, Lubomir Rintel wrote:
> On Mon, 2013-01-21 at 01:12 +0000, Ben Hutchings wrote:
> > On Fri, 2013-01-18 at 08:33 +0100, Lubomir Rintel wrote:
> > > On Tue, 2013-01-08 at 22:35 -0800, Marcel Holtmann wrote:
> > > > Hi Lubomir,
> > > >
> > > > > > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > > > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > > > > > and so should we.
> > > > > > > >
> > > > > > > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> > > > > > > > ---
> > > > > > > > drivers/bluetooth/btmrvl_sdio.c | 24 ++++++++++++++++++++++--
> > > > > > > > drivers/bluetooth/btmrvl_sdio.h | 6 ++++--
> > > > > > > > 2 files changed, 26 insertions(+), 4 deletions(-)
> > > > > > >
> > > > > > > NAK from me on this one. I do not want the driver to check two
> > > > > > > locations. That is what userspace can work around.
> > > > > > >
> > > > > > > If we want to unify the location between the WiFi driver and the
> > > > > > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > > > > > the other. I do not care which one.
> > > > > >
> > > > > > The unified location is mrvl/ directory.
> > > > > >
> > > > > > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
> > > > >
> > > > > That would break existing setups, wouldn't it?
> > > > >
> > > > > I was under impression (commit 3d32a58b) that we care about
> > > > > compatibility here. Do we?
> > > >
> > > > that is what symlinks are for.
> > >
> > > David, Ben: please pull the following branch then:
> > > git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
> > >
> > > Thank you!
> >
> > The symlinks are broken, and you didn't update WHENCE.
>
> Oops, sorry for that. Fixed now, please pull:
> git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
>
> Thank you!
Pulled and will be pushed out shortly. Sorry for the delay.
Ben.
--
Ben Hutchings
Sturgeon's Law: Ninety percent of everything is crap.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2013-02-18 3:18 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-08 23:56 sd8688 firmware location Lubomir Rintel
2013-01-08 23:56 ` [PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place Lubomir Rintel
2013-01-09 2:28 ` Marcel Holtmann
2013-01-09 2:43 ` Bing Zhao
2013-01-09 6:31 ` Lubomir Rintel
2013-01-09 6:35 ` Marcel Holtmann
2013-01-18 7:33 ` Lubomir Rintel
2013-01-21 1:12 ` Ben Hutchings
2013-01-27 11:21 ` Lubomir Rintel
2013-02-18 3:18 ` Ben Hutchings
2013-01-18 7:37 ` [PATCH] bluetooth: btmrvl_sdio: look for sd8688 firmware in proper location Lubomir Rintel
2013-01-18 7:58 ` Marcel Holtmann
2013-01-19 19:01 ` Lubomir Rintel
2013-01-19 20:23 ` Marcel Holtmann
2013-01-08 23:57 ` [PATCH] Move sd8688*.bin images away from libertas tree Lubomir Rintel
2013-01-09 22:45 ` sd8688 firmware location Dan Williams
2013-01-10 1:20 ` Bing Zhao
2013-01-18 7:39 ` [PATCH] libertas sdio: look for 8688 firmware in common location Lubomir Rintel
2013-01-21 1:13 ` sd8688 firmware location Ben Hutchings
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).