brcmfmac: add CLM download support

PATCH Superseded Wright Feng 4 participants 12 messages Oct 5, 2017 – Nov 14, 2017 Broadcom BRCM80211 IEEE802.11 wireless drivers

lore

Share & tools

lore

Wright Feng

author

2017-10-05 07:26 UTC #0 lore raw

PATCH v6 1/1 brcmfmac: add CLM download support

From: Chung-Hsien Hsu <[email protected]>

The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.

The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.

Signed-off-by Chung-Hsien Hsu <[email protected]>

---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present

---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +10 -0

index b55c329..df42e09 100644
@@ -71,6 +71,7 @@ struct brcmf_bus_dcmd {
  * @wowl_config: specify if dongle is configured for wowl when going to suspend
  * @get_ramsize: obtain size of device memory.
  * @get_memdump: obtain device memory dump in provided buffer.
+ * @get_fwname: obtain firmware name.
  *
  * This structure provides an abstract interface towards the
  * bus specific driver. For control messages to common driver

@@ -87,6 +88,8 @@ struct brcmf_bus_ops {
 	void (*wowl_config)(struct device *dev, bool enabled);
 	size_t (*get_ramsize)(struct device *dev);
 	int (*get_memdump)(struct device *dev, void *data, size_t len);
+	int (*get_fwname)(struct device *dev, uint chip, uint chiprev,
+			  unsigned char *fw_name);
 };

@@ -214,6 +217,13 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len)
 	return bus->ops->get_memdump(bus->dev, data, len);
 }
 
+static inline
+int brcmf_bus_get_fwname(struct brcmf_bus *bus, uint chip, uint chiprev,
+			 unsigned char *fw_name)
+{
+	return bus->ops->get_fwname(bus->dev, chip, chiprev, fw_name);
+}
+
 /*
  * interface functions from common layer
  */

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +162 -0

198 lines not on this page · raw message

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +2 -0

index 511d190..7414dff 100644
@@ -941,6 +941,8 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data)
 	seq_printf(s, "anarev: %u\n", ri->anarev);
 	seq_printf(s, "nvramrev: %08x\n", ri->nvramrev);
 
+	seq_printf(s, "clmrev: %s\n", bus_if->drvr->clmver);
+
 	return 0;
 }

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +2 -0

index a4dd313..ae39128 100644
@@ -141,6 +141,8 @@ struct brcmf_pub {
 	struct notifier_block inetaddr_notifier;
 	struct notifier_block inet6addr_notifier;
 	struct brcmf_mp_device *settings;
+
+	u8 clmver[BRCMF_DCMD_SMLEN];
 };
 
 /* forward declarations */

drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +31 -0

index 9a1eb5a..fffe347 100644
@@ -147,6 +147,21 @@
 #define BRCMF_MFP_CAPABLE		1
 #define BRCMF_MFP_REQUIRED		2
 
+/* MAX_CHUNK_LEN is the maximum length for data passing to firmware in each
+ * ioctl. It is relatively small because firmware has small maximum size input
+ * playload restriction for ioctls.
+ */
+#define MAX_CHUNK_LEN			1400
+
+#define DLOAD_HANDLER_VER		1	/* Downloader version */
+#define DLOAD_FLAG_VER_MASK		0xf000	/* Downloader version mask */
+#define DLOAD_FLAG_VER_SHIFT		12	/* Downloader version shift */
+
+#define DL_BEGIN			0x0002
+#define DL_END				0x0004
+
+#define DL_TYPE_CLM			2
+
 /* join preference types for join_pref iovar */
 enum brcmf_join_pref_types {
 	BRCMF_JOIN_PREF_RSSI = 1,

@@ -835,4 +850,20 @@ struct brcmf_gtk_keyinfo_le {
 	u8 replay_counter[BRCMF_RSN_REPLAY_LEN];
 };
 
+/**
+ * struct brcmf_dload_data_le - data passing to firmware for downloading
+ * @flag: flags related to download data.
+ * @dload_type: type of download data.
+ * @len: length in bytes of download data.
+ * @crc: crc of download data.
+ * @data: download data.
+ */
+struct brcmf_dload_data_le {
+	__le16 flag;
+	__le16 dload_type;
+	__le32 len;
+	__le32 crc;
+	u8 data[1];
+};
+
 #endif /* FWIL_TYPES_H_ */

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +19 -0

index f878706..b370ee7 100644
@@ -1350,6 +1350,24 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len)
 	return 0;
 }
 
+static int brcmf_pcie_get_fwname(struct device *dev, u32 chip, u32 chiprev,
+				 u8 *fw_name)
+{
+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+	struct brcmf_pciedev *buspub = bus_if->bus_priv.pcie;
+	struct brcmf_pciedev_info *devinfo = buspub->devinfo;
+	int ret = 0;
+
+	if (devinfo->fw_name[0] != '\0')
+		strlcpy(fw_name, devinfo->fw_name, BRCMF_FW_NAME_LEN);
+	else
+		ret = brcmf_fw_map_chip_to_name(chip, chiprev,
+						brcmf_pcie_fwnames,
+						ARRAY_SIZE(brcmf_pcie_fwnames),
+						fw_name, NULL);
+
+	return ret;
+}
 
 static const struct brcmf_bus_ops brcmf_pcie_bus_ops = {
 	.txdata = brcmf_pcie_tx,

@@ -1359,6 +1377,7 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len)
 	.wowl_config = brcmf_pcie_wowl_config,
 	.get_ramsize = brcmf_pcie_get_ramsize,
 	.get_memdump = brcmf_pcie_get_memdump,
+	.get_fwname = brcmf_pcie_get_fwname,
 };

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +19 -0

index b1789b1..3a71ca0 100644
@@ -3972,6 +3972,24 @@ static void brcmf_sdio_buscore_write32(void *ctx, u32 addr, u32 val)
 	}
 }
 
+static int brcmf_sdio_get_fwname(struct device *dev, u32 chip, u32 chiprev,
+				 u8 *fw_name)
+{
+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+	int ret = 0;
+
+	if (sdiodev->fw_name[0] != '\0')
+		strlcpy(fw_name, sdiodev->fw_name, BRCMF_FW_NAME_LEN);
+	else
+		ret = brcmf_fw_map_chip_to_name(chip, chiprev,
+						brcmf_sdio_fwnames,
+						ARRAY_SIZE(brcmf_sdio_fwnames),
+						fw_name, NULL);
+
+	return ret;
+}
+
 static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
 	.stop = brcmf_sdio_bus_stop,
 	.preinit = brcmf_sdio_bus_preinit,

@@ -3982,6 +4000,7 @@ static void brcmf_sdio_buscore_write32(void *ctx, u32 addr, u32 val)
 	.wowl_config = brcmf_sdio_wowl_config,
 	.get_ramsize = brcmf_sdio_bus_get_ramsize,
 	.get_memdump = brcmf_sdio_bus_get_memdump,
+	.get_fwname = brcmf_sdio_get_fwname,
 };
 
 static void brcmf_sdio_firmware_callback(struct device *dev, int err,

drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +18 -0

index 8f20a4b..9622dd9 100644
@@ -1128,12 +1128,30 @@ static void brcmf_usb_wowl_config(struct device *dev, bool enabled)
 		device_set_wakeup_enable(devinfo->dev, false);
 }
 
+static int brcmf_usb_get_fwname(struct device *dev, u32 chip, u32 chiprev,
+				u8 *fw_name)
+{
+	struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
+	int ret = 0;
+
+	if (devinfo->fw_name[0] != '\0')
+		strlcpy(fw_name, devinfo->fw_name, BRCMF_FW_NAME_LEN);
+	else
+		ret = brcmf_fw_map_chip_to_name(chip, chiprev,
+						brcmf_usb_fwnames,
+						ARRAY_SIZE(brcmf_usb_fwnames),
+						fw_name, NULL);
+
+	return ret;
+}
+
 static const struct brcmf_bus_ops brcmf_usb_bus_ops = {
 	.txdata = brcmf_usb_tx,
 	.stop = brcmf_usb_down,
 	.txctl = brcmf_usb_tx_ctlpkt,
 	.rxctl = brcmf_usb_rx_ctlpkt,
 	.wowl_config = brcmf_usb_wowl_config,
+	.get_fwname = brcmf_usb_get_fwname,
 };
 
 static int brcmf_usb_bus_setup(struct brcmf_usbdev_info *devinfo)

Signature · 1 line

1.9.1

Chung-Hsien Hsu

2017-11-03 08:27 UTC #1 lore raw

Quoted 19 lines · Wright Feng

From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present

Quoted 10 lines

---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)

Any comments or feedback about this? I'm hoping to have it in v4.15.

Regards,
Chung-Hsien

Arend van Spriel

maintainer

2017-11-03 09:20 UTC #2 lore raw

Quoted 31 lines · Chung-Hsien Hsu

Quoted 19 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
Quoted 10 lines
---
  .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
  .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
  .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
  .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
  .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
  .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
  .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
  .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
  8 files changed, 263 insertions(+)

Quoted 1 line

Any comments or feedback about this? I'm hoping to have it in v4.15.

Hi Chung-Hsien,

Sorry for not following up. The change log for v6 made me wonder if all my comments on v5 were addressed. I just checked and it looks fine to me. Kalle has set this patch to Deferred state in patchwork maybe awaiting my response. I already gave my "Reviewed-by:" on v5 so you may add that for v6, but I am sure Kalle can do that.

Regards,
Arend

Chung-Hsien Hsu

2017-11-03 09:40 UTC #3 lore raw

Quoted 36 lines · Arend van Spriel

Quoted 31 lines · Chung-Hsien Hsu
Quoted 19 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
Quoted 10 lines
---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)
Quoted 1 line
Any comments or feedback about this? I'm hoping to have it in v4.15.
Hi Chung-Hsien,

Quoted 8 lines

Sorry for not following up. The change log for v6 made me wonder if all my comments on v5 were addressed. I just checked and it looks fine to me. Kalle has set this patch to Deferred state in patchwork maybe awaiting my response. I already gave my "Reviewed-by:" on v5 so you may add that for v6, but I am sure Kalle can do that.
Regards,
Arend

Hi Arend,

Thanks for the confirmation and quick reply. How can I know the state of a patch, e.g., a patch is set to Deferred state?

Hi Kalle,

Could you please help to add Arend's "Reviewed-by:" on v6? Or should I add it and resend v6?

Regards,
Chung-Hsien

Kalle Valo

2017-11-03 13:40 UTC #4 lore raw

Quoted 33 lines · Chung-Hsien Hsu

Quoted 32 lines · Arend van Spriel
Quoted 31 lines · Chung-Hsien Hsu
Quoted 29 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)

Quoted 1 line

Quoted 1 line
Quoted 1 line
Any comments or feedback about this? I'm hoping to have it in v4.15.

This might not necessary make it to v4.15, it depends if Linus releases the final v4.14 on Sunday or not.

Quoted 4 lines

Quoted 4 lines
Sorry for not following up. The change log for v6 made me wonder if all my comments on v5 were addressed. I just checked and it looks fine to me. Kalle has set this patch to Deferred state in patchwork maybe awaiting my response.

Yup, I was waiting your comments.

Quoted 10 lines

Quoted 5 lines
I already gave my "Reviewed-by:" on v5 so you may add that for v6, but I am sure Kalle can do that.
Regards,
Arend
Hi Arend,
Thanks for the confirmation and quick reply. How can I know the state of a patch, e.g., a patch is set to Deferred state?

I have documented this in the wiki:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#checking_state_of_patches_from_patchwork

Quoted 2 lines

Could you please help to add Arend's "Reviewed-by:" on v6? Or should I add it and resend v6?

Sure, I can add it. No need to resend.

And actually Arend should be able to add the tag automatically by replying to the patch with his tag, patchwork would then pick it up and add it when I apply the patch. To my knowledge patchwork supports Acked-by, Reviewed-by and Tested-by tags.

Signature · 1 line

Kalle Valo

Chung-Hsien Hsu

2017-11-10 02:51 UTC #5 lore raw

Quoted 35 lines · Kalle Valo

Quoted 33 lines · Chung-Hsien Hsu
Quoted 32 lines · Arend van Spriel
Quoted 31 lines · Chung-Hsien Hsu
Quoted 29 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Any comments or feedback about this? I'm hoping to have it in v4.15.
This might not necessary make it to v4.15, it depends if Linus releases the final v4.14 on Sunday or not.

Since the final v4.14 was not released last Sunday, is it possible to get this to v4.15?

Quoted 26 lines

Quoted 5 lines
Quoted 5 lines
Sorry for not following up. The change log for v6 made me wonder if all my comments on v5 were addressed. I just checked and it looks fine to me. Kalle has set this patch to Deferred state in patchwork maybe awaiting my response.
Yup, I was waiting your comments.
Quoted 10 lines
Quoted 5 lines
I already gave my "Reviewed-by:" on v5 so you may add that for v6, but I am sure Kalle can do that.
Regards,
Arend
Hi Arend,
Thanks for the confirmation and quick reply. How can I know the state of a patch, e.g., a patch is set to Deferred state?
I have documented this in the wiki:
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#checking_state_of_patches_from_patchwork
Quoted 2 lines
Could you please help to add Arend's "Reviewed-by:" on v6? Or should I add it and resend v6?

Quoted 6 lines

Sure, I can add it. No need to resend.
And actually Arend should be able to add the tag automatically by replying to the patch with his tag, patchwork would then pick it up and add it when I apply the patch. To my knowledge patchwork supports Acked-by, Reviewed-by and Tested-by tags.

Thanks for the info.

Regards,
Chung-Hsien

Quoted 3 lines

Signature · 2 lines
-- 
Kalle Valo

Kalle Valo

2017-11-10 06:16 UTC #6 lore raw

Quoted 36 lines · Chung-Hsien Hsu

Quoted 35 lines · Kalle Valo
Quoted 33 lines · Chung-Hsien Hsu
Quoted 32 lines · Arend van Spriel
Quoted 31 lines · Chung-Hsien Hsu
Quoted 29 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
---
 .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h |  10 ++
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  | 162 +++++++++++++++++++++
 .../wireless/broadcom/brcm80211/brcmfmac/core.c    |   2 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.h    |   2 +
 .../broadcom/brcm80211/brcmfmac/fwil_types.h       |  31 ++++
 .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |  19 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  19 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  18 +++
 8 files changed, 263 insertions(+)

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Any comments or feedback about this? I'm hoping to have it in v4.15.
This might not necessary make it to v4.15, it depends if Linus releases the final v4.14 on Sunday or not.
Since the final v4.14 was not released last Sunday, is it possible to get this to v4.15?

Thanks for reminding, apparently I had forgotten to change the state of the patch from Deferred to New. But unfortunately the patch failed to apply so you need to rebase and submit v7.

Signature · 1 line

Kalle Valo

Arend van Spriel

maintainer Reviewed-by on v6 1/1

2017-11-06 08:47 UTC #7 lore raw

In reply to Wright Feng

Quoted 11 lines · Wright Feng

From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.

Reviewed-by Arend van Spriel <[email protected]>

Quoted 8 lines

Signed-off-by Chung-Hsien Hsu <[email protected]>
---
v2: Revise commit message to describe in more detail
v3: Add error handling in brcmf_c_get_clm_name function
v4: Correct the length of dload_buf in brcmf_c_download function
v5: Remove unnecessary cast and alignment
v6: Add debug log for the case of no CLM file present
---

Kalle Valo

2017-11-10 06:13 UTC #8 lore raw

In reply to Wright Feng

Quoted 9 lines · Wright Feng

From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.

Quoted 5 lines

The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
Reviewed-by Arend van Spriel <[email protected]>

Didn't apply:

error: Failed to merge in the changes.
Applying: brcmfmac: add CLM download support
Using index info to reconstruct a base tree...
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
M drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
Patch failed at 0001 brcmfmac: add CLM download support
The copy of the patch that failed is found in: .git/rebase-apply/patch

Patch set to Changes Requested.

Signature · 3 lines

https://patchwork.kernel.org/patch/9986493/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Kalle Valo

2017-11-10 06:15 UTC #9 lore raw

In reply to Wright Feng

Quoted 13 lines · Wright Feng

From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>

[...]

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) · line 311

Quoted 3 lines

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +3 -0
+	err = brcmf_fil_iovar_data_get(ifp, "clmver", buf, sizeof(buf));
+	if (err) {
+		if (err == -23) {

No magic numbers, please. Is this supposed to be -ENFILE?

Signature · 1 line

Kalle Valo

Chung-Hsien Hsu

2017-11-10 09:00 UTC #10 lore raw

Quoted 16 lines · Kalle Valo

Quoted 9 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
Quoted 4 lines
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>

Quoted 7 lines

[...]
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) · line 311
Quoted 3 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +3 -0
+	err = brcmf_fil_iovar_data_get(ifp, "clmver", buf, sizeof(buf));
+	if (err) {
+		if (err == -23) {
No magic numbers, please. Is this supposed to be -ENFILE?

It indicates "Unsupported". I will remove it since it will not affect the CLM downlaod and driver loading.

Regards,
Chung-Hsien

Quoted 3 lines

Signature · 2 lines
-- 
Kalle Valo

Kalle Valo

2017-11-14 06:47 UTC #11 lore raw

Quoted 19 lines · Chung-Hsien Hsu

Quoted 18 lines · Kalle Valo
Quoted 13 lines · Wright Feng
From: Chung-Hsien Hsu <[email protected]>
The firmware for brcmfmac devices includes information regarding regulatory constraints. For certain devices this information is kept separately in a binary form that needs to be downloaded to the device. This patch adds support to download this so-called CLM blob file. It uses the same naming scheme as the other firmware files with extension of .clm_blob.
The CLM blob file is optional. If the file does not exist, the download process will be bypassed. It will not affect the driver loading.
Signed-off-by Chung-Hsien Hsu <[email protected]>
[...]

Quoted 8 lines

Quoted 5 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) · line 311
Quoted 3 lines
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +3 -0
+	err = brcmf_fil_iovar_data_get(ifp, "clmver", buf, sizeof(buf));
+	if (err) {
+		if (err == -23) {
No magic numbers, please. Is this supposed to be -ENFILE?
It indicates "Unsupported". I will remove it since it will not affect the CLM downlaod and driver loading.

BTW you would not have to remove it, adding a define would have been just fine. (I was travelling, hence the late reply.)

Signature · 1 line

Kalle Valo