| Message ID | 20210920161136.2398632-6-Jerome.Pouiller@silabs.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | wfx: get out from the staging area | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> [...] > +/* The device needs data about the antenna configuration. This information in > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > + * documentation) files. For hardware integrators, the full process to create > + * PDS files is described here: > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > + * > + * So this function aims to send PDS to the device. However, the PDS file is > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > + * parts. > + * > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > + * fashion). PDS files can only been split between root nodes. > + */ > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > +{ > + int ret; > + int start, brace_level, i; > + > + start = 0; > + brace_level = 0; > + if (buf[0] != '{') { > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > compress it?\n"); > + return -EINVAL; > + } > + for (i = 1; i < len - 1; i++) { > + if (buf[i] == '{') > + brace_level++; > + if (buf[i] == '}') > + brace_level--; > + if (buf[i] == '}' && !brace_level) { > + i++; > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > + return -EFBIG; > + buf[start] = '{'; > + buf[i] = 0; > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > + buf[i] = '}'; > + ret = hif_configuration(wdev, buf + start, > + i - start + 1); > + if (ret > 0) { > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > options?)\n", > + start, i); > + return -EINVAL; > + } > + if (ret == -ETIMEDOUT) { > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > file?)\n", > + start, i); > + return ret; > + } > + if (ret) { > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > error\n", > + start, i); > + return -EIO; > + } > + buf[i] = ','; > + start = i; > + } > + } > + return 0; > +} I'm not really fond of having this kind of ASCII based parser in the kernel. Do you have an example compressed file somewhere? Does the device still work without these PDS files? I ask because my suggestion is to remove this part altogether and revisit after the initial driver is moved to drivers/net/wireless. A lot simpler to review complex features separately.
On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: > Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > > > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > > [...] > > > +/* The device needs data about the antenna configuration. This information in > > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > > + * documentation) files. For hardware integrators, the full process to create > > + * PDS files is described here: > > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > > + * > > + * So this function aims to send PDS to the device. However, the PDS file is > > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > > + * parts. > > + * > > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > > + * fashion). PDS files can only been split between root nodes. > > + */ > > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > > +{ > > + int ret; > > + int start, brace_level, i; > > + > > + start = 0; > > + brace_level = 0; > > + if (buf[0] != '{') { > > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > > compress it?\n"); > > + return -EINVAL; > > + } > > + for (i = 1; i < len - 1; i++) { > > + if (buf[i] == '{') > > + brace_level++; > > + if (buf[i] == '}') > > + brace_level--; > > + if (buf[i] == '}' && !brace_level) { > > + i++; > > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > > + return -EFBIG; > > + buf[start] = '{'; > > + buf[i] = 0; > > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > > + buf[i] = '}'; > > + ret = hif_configuration(wdev, buf + start, > > + i - start + 1); > > + if (ret > 0) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > > options?)\n", > > + start, i); > > + return -EINVAL; > > + } > > + if (ret == -ETIMEDOUT) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > > file?)\n", > > + start, i); > > + return ret; > > + } > > + if (ret) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > > error\n", > > + start, i); > > + return -EIO; > > + } > > + buf[i] = ','; > > + start = i; > > + } > > + } > > + return 0; > > +} > > I'm not really fond of having this kind of ASCII based parser in the > kernel. Do you have an example compressed file somewhere? An example of uncompressed configuration file can be found here[1]. Once compressed with [2], you get: {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} [1]: https://github.com/SiliconLabs/wfx-pds/blob/API4.1/BRD4001A_Rev_A01.pds.in [2]: https://github.com/SiliconLabs/wfx-linux-tools/blob/SD4/pds_compress > Does the device still work without these PDS files? I ask because my > suggestion is to remove this part altogether and revisit after the > initial driver is moved to drivers/net/wireless. A lot simpler to review > complex features separately. I think we will be able to communicate with the chip. However, the chip won't have any antenna parameters. Thus, I think the RF won't work properly.
Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: >> >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> >> > >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> >> >> [...] >> >> > +/* The device needs data about the antenna configuration. This information in >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 >> > + * documentation) files. For hardware integrators, the full process to create >> > + * PDS files is described here: >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md >> > + * >> > + * So this function aims to send PDS to the device. However, the PDS file is >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple >> > + * parts. >> > + * >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON >> > + * fashion). PDS files can only been split between root nodes. >> > + */ >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) >> > +{ >> > + int ret; >> > + int start, brace_level, i; >> > + >> > + start = 0; >> > + brace_level = 0; >> > + if (buf[0] != '{') { >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to >> > compress it?\n"); >> > + return -EINVAL; >> > + } >> > + for (i = 1; i < len - 1; i++) { >> > + if (buf[i] == '{') >> > + brace_level++; >> > + if (buf[i] == '}') >> > + brace_level--; >> > + if (buf[i] == '}' && !brace_level) { >> > + i++; >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) >> > + return -EFBIG; >> > + buf[start] = '{'; >> > + buf[i] = 0; >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); >> > + buf[i] = '}'; >> > + ret = hif_configuration(wdev, buf + start, >> > + i - start + 1); >> > + if (ret > 0) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported >> > options?)\n", >> > + start, i); >> > + return -EINVAL; >> > + } >> > + if (ret == -ETIMEDOUT) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted >> > file?)\n", >> > + start, i); >> > + return ret; >> > + } >> > + if (ret) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown >> > error\n", >> > + start, i); >> > + return -EIO; >> > + } >> > + buf[i] = ','; >> > + start = i; >> > + } >> > + } >> > + return 0; >> > +} >> >> I'm not really fond of having this kind of ASCII based parser in the >> kernel. Do you have an example compressed file somewhere? > > An example of uncompressed configuration file can be found here[1]. Once > compressed with [2], you get: > > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} So what's the grand idea with this braces format? I'm not getting it. Usually the drivers just consider this kind of firmware configuration data as a binary blob and dump it to the firmware, without knowing what the data contains. Can't you do the same? >> Does the device still work without these PDS files? I ask because my >> suggestion is to remove this part altogether and revisit after the >> initial driver is moved to drivers/net/wireless. A lot simpler to review >> complex features separately. > > I think we will be able to communicate with the chip. However, the chip won't > have any antenna parameters. Thus, I think the RF won't work properly. RF not working properly is bad, so we can't drop PDS files for now. Too bad, it would have been so much faster if we would not need to worry about PDS files during review.
On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: > CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. > > > Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > > > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > > > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > > [...] > > > +/* The device needs data about the antenna configuration. This information in > > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > > + * documentation) files. For hardware integrators, the full process to create > > + * PDS files is described here: > > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > > + * > > + * So this function aims to send PDS to the device. However, the PDS file is > > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > > + * parts. > > + * > > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > > + * fashion). PDS files can only been split between root nodes. > > + */ > > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > > +{ > > + int ret; > > + int start, brace_level, i; > > + > > + start = 0; > > + brace_level = 0; > > + if (buf[0] != '{') { > > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > > compress it?\n"); > > + return -EINVAL; > > + } > > + for (i = 1; i < len - 1; i++) { > > + if (buf[i] == '{') > > + brace_level++; > > + if (buf[i] == '}') > > + brace_level--; > > + if (buf[i] == '}' && !brace_level) { > > + i++; > > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > > + return -EFBIG; > > + buf[start] = '{'; > > + buf[i] = 0; > > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > > + buf[i] = '}'; > > + ret = hif_configuration(wdev, buf + start, > > + i - start + 1); > > + if (ret > 0) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > > options?)\n", > > + start, i); > > + return -EINVAL; > > + } > > + if (ret == -ETIMEDOUT) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > > file?)\n", > > + start, i); > > + return ret; > > + } > > + if (ret) { > > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > > error\n", > > + start, i); > > + return -EIO; > > + } > > + buf[i] = ','; > > + start = i; > > + } > > + } > > + return 0; > > +} > > I'm not really fond of having this kind of ASCII based parser in the > kernel. Do you have an example compressed file somewhere? > > Does the device still work without these PDS files? I ask because my > suggestion is to remove this part altogether and revisit after the > initial driver is moved to drivers/net/wireless. A lot simpler to review > complex features separately. Do you want I remove this function from this patch and place it a new patch at the end of this series?
Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: >> CAUTION: This email originated from outside of the organization. Do >> not click links or open attachments unless you recognize the sender >> and know the content is safe. >> >> >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: >> >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> >> > >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> >> >> [...] >> >> > +/* The device needs data about the antenna configuration. This information in >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 >> > + * documentation) files. For hardware integrators, the full process to create >> > + * PDS files is described here: >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md >> > + * >> > + * So this function aims to send PDS to the device. However, the PDS file is >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple >> > + * parts. >> > + * >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON >> > + * fashion). PDS files can only been split between root nodes. >> > + */ >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) >> > +{ >> > + int ret; >> > + int start, brace_level, i; >> > + >> > + start = 0; >> > + brace_level = 0; >> > + if (buf[0] != '{') { >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to >> > compress it?\n"); >> > + return -EINVAL; >> > + } >> > + for (i = 1; i < len - 1; i++) { >> > + if (buf[i] == '{') >> > + brace_level++; >> > + if (buf[i] == '}') >> > + brace_level--; >> > + if (buf[i] == '}' && !brace_level) { >> > + i++; >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) >> > + return -EFBIG; >> > + buf[start] = '{'; >> > + buf[i] = 0; >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); >> > + buf[i] = '}'; >> > + ret = hif_configuration(wdev, buf + start, >> > + i - start + 1); >> > + if (ret > 0) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported >> > options?)\n", >> > + start, i); >> > + return -EINVAL; >> > + } >> > + if (ret == -ETIMEDOUT) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted >> > file?)\n", >> > + start, i); >> > + return ret; >> > + } >> > + if (ret) { >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown >> > error\n", >> > + start, i); >> > + return -EIO; >> > + } >> > + buf[i] = ','; >> > + start = i; >> > + } >> > + } >> > + return 0; >> > +} >> >> I'm not really fond of having this kind of ASCII based parser in the >> kernel. Do you have an example compressed file somewhere? >> >> Does the device still work without these PDS files? I ask because my >> suggestion is to remove this part altogether and revisit after the >> initial driver is moved to drivers/net/wireless. A lot simpler to review >> complex features separately. > > Do you want I remove this function from this patch and place it a new > patch at the end of this series? I don't understand, how that would help? The problem here is the file format and that's what we should try to fix.
On Tuesday 5 October 2021 07:56:53 CEST Kalle Valo wrote: > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > > > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: > >> CAUTION: This email originated from outside of the organization. Do > >> not click links or open attachments unless you recognize the sender > >> and know the content is safe. > >> > >> > >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > >> > >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> > > >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> > >> [...] > >> > >> > +/* The device needs data about the antenna configuration. This information in > >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > >> > + * documentation) files. For hardware integrators, the full process to create > >> > + * PDS files is described here: > >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > >> > + * > >> > + * So this function aims to send PDS to the device. However, the PDS file is > >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > >> > + * parts. > >> > + * > >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > >> > + * fashion). PDS files can only been split between root nodes. > >> > + */ > >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > >> > +{ > >> > + int ret; > >> > + int start, brace_level, i; > >> > + > >> > + start = 0; > >> > + brace_level = 0; > >> > + if (buf[0] != '{') { > >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > >> > compress it?\n"); > >> > + return -EINVAL; > >> > + } > >> > + for (i = 1; i < len - 1; i++) { > >> > + if (buf[i] == '{') > >> > + brace_level++; > >> > + if (buf[i] == '}') > >> > + brace_level--; > >> > + if (buf[i] == '}' && !brace_level) { > >> > + i++; > >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > >> > + return -EFBIG; > >> > + buf[start] = '{'; > >> > + buf[i] = 0; > >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > >> > + buf[i] = '}'; > >> > + ret = hif_configuration(wdev, buf + start, > >> > + i - start + 1); > >> > + if (ret > 0) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > >> > options?)\n", > >> > + start, i); > >> > + return -EINVAL; > >> > + } > >> > + if (ret == -ETIMEDOUT) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > >> > file?)\n", > >> > + start, i); > >> > + return ret; > >> > + } > >> > + if (ret) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > >> > error\n", > >> > + start, i); > >> > + return -EIO; > >> > + } > >> > + buf[i] = ','; > >> > + start = i; > >> > + } > >> > + } > >> > + return 0; > >> > +} > >> > >> I'm not really fond of having this kind of ASCII based parser in the > >> kernel. Do you have an example compressed file somewhere? > >> > >> Does the device still work without these PDS files? I ask because my > >> suggestion is to remove this part altogether and revisit after the > >> initial driver is moved to drivers/net/wireless. A lot simpler to review > >> complex features separately. > > > > Do you want I remove this function from this patch and place it a new > > patch at the end of this series? > > I don't understand, how that would help? The problem here is the file > format and that's what we should try to fix. It was just to be able to review this function separately. Nevermind.
Hi Kalle, On Friday 1 October 2021 14:18:04 CEST Kalle Valo wrote: > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > > > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: > >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > >> > >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> > > >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> > >> [...] > >> > >> > +/* The device needs data about the antenna configuration. This information in > >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > >> > + * documentation) files. For hardware integrators, the full process to create > >> > + * PDS files is described here: > >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > >> > + * > >> > + * So this function aims to send PDS to the device. However, the PDS file is > >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > >> > + * parts. > >> > + * > >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > >> > + * fashion). PDS files can only been split between root nodes. > >> > + */ > >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > >> > +{ > >> > + int ret; > >> > + int start, brace_level, i; > >> > + > >> > + start = 0; > >> > + brace_level = 0; > >> > + if (buf[0] != '{') { > >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > >> > compress it?\n"); > >> > + return -EINVAL; > >> > + } > >> > + for (i = 1; i < len - 1; i++) { > >> > + if (buf[i] == '{') > >> > + brace_level++; > >> > + if (buf[i] == '}') > >> > + brace_level--; > >> > + if (buf[i] == '}' && !brace_level) { > >> > + i++; > >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > >> > + return -EFBIG; > >> > + buf[start] = '{'; > >> > + buf[i] = 0; > >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > >> > + buf[i] = '}'; > >> > + ret = hif_configuration(wdev, buf + start, > >> > + i - start + 1); > >> > + if (ret > 0) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > >> > options?)\n", > >> > + start, i); > >> > + return -EINVAL; > >> > + } > >> > + if (ret == -ETIMEDOUT) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > >> > file?)\n", > >> > + start, i); > >> > + return ret; > >> > + } > >> > + if (ret) { > >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > >> > error\n", > >> > + start, i); > >> > + return -EIO; > >> > + } > >> > + buf[i] = ','; > >> > + start = i; > >> > + } > >> > + } > >> > + return 0; > >> > +} > >> > >> I'm not really fond of having this kind of ASCII based parser in the > >> kernel. Do you have an example compressed file somewhere? > > > > An example of uncompressed configuration file can be found here[1]. Once > > compressed with [2], you get: > > > > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} > > So what's the grand idea with this braces format? I'm not getting it. - It allows to describe a tree structure - It is ascii (easy to dump, easy to copy-paste) - It is small (as I explain below, size matters) - Since it is similar to JSON, the structure is obvious to many people Anyway, I am not the author of that and I have to deal with it. > Usually the drivers just consider this kind of firmware configuration > data as a binary blob and dump it to the firmware, without knowing what > the data contains. Can't you do the same? [I didn't had received this mail :( ] The idea was also to send it as a binary blob. However, the firmware use a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds this size. So, we have to split the PDS before to send it. Unfortunately, we can't split it anywhere. The PDS is a tree structure and the firmware expects to receive a well formatted tree. So, the easiest way to send it to the firmware is to split the tree between each root nodes and send each subtree separately (see also the comment above wfx_send_pds()). Anyway, someone has to cook this configuration before to send it to the firmware. This could be done by a script outside of the kernel. Then we could change the input format to simplify a bit the processing in the kernel. However, the driver has already some users and I worry that changing the input format would lead to a mess.
Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > Hi Kalle, > > On Friday 1 October 2021 14:18:04 CEST Kalle Valo wrote: >> Jérôme Pouiller <jerome.pouiller@silabs.com> writes: >> >> > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: >> >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: >> >> >> >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> >> >> > >> >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> >> >> >> >> [...] >> >> >> >> > +/* The device needs data about the antenna configuration. This information in >> >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 >> >> > + * documentation) files. For hardware integrators, the full process to create >> >> > + * PDS files is described here: >> >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md >> >> > + * >> >> > + * So this function aims to send PDS to the device. However, the PDS file is >> >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple >> >> > + * parts. >> >> > + * >> >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree >> >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON >> >> > + * fashion). PDS files can only been split between root nodes. >> >> > + */ >> >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) >> >> > +{ >> >> > + int ret; >> >> > + int start, brace_level, i; >> >> > + >> >> > + start = 0; >> >> > + brace_level = 0; >> >> > + if (buf[0] != '{') { >> >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to >> >> > compress it?\n"); >> >> > + return -EINVAL; >> >> > + } >> >> > + for (i = 1; i < len - 1; i++) { >> >> > + if (buf[i] == '{') >> >> > + brace_level++; >> >> > + if (buf[i] == '}') >> >> > + brace_level--; >> >> > + if (buf[i] == '}' && !brace_level) { >> >> > + i++; >> >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) >> >> > + return -EFBIG; >> >> > + buf[start] = '{'; >> >> > + buf[i] = 0; >> >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); >> >> > + buf[i] = '}'; >> >> > + ret = hif_configuration(wdev, buf + start, >> >> > + i - start + 1); >> >> > + if (ret > 0) { >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported >> >> > options?)\n", >> >> > + start, i); >> >> > + return -EINVAL; >> >> > + } >> >> > + if (ret == -ETIMEDOUT) { >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted >> >> > file?)\n", >> >> > + start, i); >> >> > + return ret; >> >> > + } >> >> > + if (ret) { >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown >> >> > error\n", >> >> > + start, i); >> >> > + return -EIO; >> >> > + } >> >> > + buf[i] = ','; >> >> > + start = i; >> >> > + } >> >> > + } >> >> > + return 0; >> >> > +} >> >> >> >> I'm not really fond of having this kind of ASCII based parser in the >> >> kernel. Do you have an example compressed file somewhere? >> > >> > An example of uncompressed configuration file can be found here[1]. Once >> > compressed with [2], you get: >> > >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} >> >> So what's the grand idea with this braces format? I'm not getting it. > > - It allows to describe a tree structure > - It is ascii (easy to dump, easy to copy-paste) > - It is small (as I explain below, size matters) > - Since it is similar to JSON, the structure is obvious to many people > > Anyway, I am not the author of that and I have to deal with it. I'm a supported for JSON like formats, flexibility and all that. But they belong to user space, not kernel. >> Usually the drivers just consider this kind of firmware configuration >> data as a binary blob and dump it to the firmware, without knowing what >> the data contains. Can't you do the same? > > [I didn't had received this mail :( ] > > The idea was also to send it as a binary blob. However, the firmware use > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds > this size. So, we have to split the PDS before to send it. > > Unfortunately, we can't split it anywhere. The PDS is a tree structure and > the firmware expects to receive a well formatted tree. > > So, the easiest way to send it to the firmware is to split the tree > between each root nodes and send each subtree separately (see also the > comment above wfx_send_pds()). > > Anyway, someone has to cook this configuration before to send it to the > firmware. This could be done by a script outside of the kernel. Then we > could change the input format to simplify a bit the processing in the > kernel. I think a binary file with TLV format would be much better, but I'm sure there also other good choises. > However, the driver has already some users and I worry that changing > the input format would lead to a mess. You can implement a script which converts the old format to the new format. And you can use different naming scheme in the new format so that we don't accidentally load the old format. And even better if you add a some kind of signature in the new format and give a proper error from the driver if it doesn't match.
On Thursday 7 October 2021 10:35:43 CEST Kalle Valo wrote: > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > > On Friday 1 October 2021 14:18:04 CEST Kalle Valo wrote: > >> Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > >> > On Friday 1 October 2021 11:22:08 CEST Kalle Valo wrote: > >> >> Jerome Pouiller <Jerome.Pouiller@silabs.com> writes: > >> >> > >> >> > From: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> >> > > >> >> > Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> > >> >> > >> >> [...] > >> >> > >> >> > +/* The device needs data about the antenna configuration. This information in > >> >> > + * provided by PDS (Platform Data Set, this is the wording used in WF200 > >> >> > + * documentation) files. For hardware integrators, the full process to create > >> >> > + * PDS files is described here: > >> >> > + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md > >> >> > + * > >> >> > + * So this function aims to send PDS to the device. However, the PDS file is > >> >> > + * often bigger than Rx buffers of the chip, so it has to be sent in multiple > >> >> > + * parts. > >> >> > + * > >> >> > + * In add, the PDS data cannot be split anywhere. The PDS files contains tree > >> >> > + * structures. Braces are used to enter/leave a level of the tree (in a JSON > >> >> > + * fashion). PDS files can only been split between root nodes. > >> >> > + */ > >> >> > +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) > >> >> > +{ > >> >> > + int ret; > >> >> > + int start, brace_level, i; > >> >> > + > >> >> > + start = 0; > >> >> > + brace_level = 0; > >> >> > + if (buf[0] != '{') { > >> >> > + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to > >> >> > compress it?\n"); > >> >> > + return -EINVAL; > >> >> > + } > >> >> > + for (i = 1; i < len - 1; i++) { > >> >> > + if (buf[i] == '{') > >> >> > + brace_level++; > >> >> > + if (buf[i] == '}') > >> >> > + brace_level--; > >> >> > + if (buf[i] == '}' && !brace_level) { > >> >> > + i++; > >> >> > + if (i - start + 1 > WFX_PDS_MAX_SIZE) > >> >> > + return -EFBIG; > >> >> > + buf[start] = '{'; > >> >> > + buf[i] = 0; > >> >> > + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); > >> >> > + buf[i] = '}'; > >> >> > + ret = hif_configuration(wdev, buf + start, > >> >> > + i - start + 1); > >> >> > + if (ret > 0) { > >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported > >> >> > options?)\n", > >> >> > + start, i); > >> >> > + return -EINVAL; > >> >> > + } > >> >> > + if (ret == -ETIMEDOUT) { > >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted > >> >> > file?)\n", > >> >> > + start, i); > >> >> > + return ret; > >> >> > + } > >> >> > + if (ret) { > >> >> > + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown > >> >> > error\n", > >> >> > + start, i); > >> >> > + return -EIO; > >> >> > + } > >> >> > + buf[i] = ','; > >> >> > + start = i; > >> >> > + } > >> >> > + } > >> >> > + return 0; > >> >> > +} > >> >> > >> >> I'm not really fond of having this kind of ASCII based parser in the > >> >> kernel. Do you have an example compressed file somewhere? > >> > > >> > An example of uncompressed configuration file can be found here[1]. Once > >> > compressed with [2], you get: > >> > > >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} > >> > >> So what's the grand idea with this braces format? I'm not getting it. > > > > - It allows to describe a tree structure > > - It is ascii (easy to dump, easy to copy-paste) > > - It is small (as I explain below, size matters) > > - Since it is similar to JSON, the structure is obvious to many people > > > > Anyway, I am not the author of that and I have to deal with it. > > I'm a supported for JSON like formats, flexibility and all that. But > they belong to user space, not kernel. > > >> Usually the drivers just consider this kind of firmware configuration > >> data as a binary blob and dump it to the firmware, without knowing what > >> the data contains. Can't you do the same? > > > > [I didn't had received this mail :( ] > > > > The idea was also to send it as a binary blob. However, the firmware use > > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds > > this size. So, we have to split the PDS before to send it. > > > > Unfortunately, we can't split it anywhere. The PDS is a tree structure and > > the firmware expects to receive a well formatted tree. > > > > So, the easiest way to send it to the firmware is to split the tree > > between each root nodes and send each subtree separately (see also the > > comment above wfx_send_pds()). > > > > Anyway, someone has to cook this configuration before to send it to the > > firmware. This could be done by a script outside of the kernel. Then we > > could change the input format to simplify a bit the processing in the > > kernel. > > I think a binary file with TLV format would be much better, but I'm sure > there also other good choises. > > > However, the driver has already some users and I worry that changing > > the input format would lead to a mess. > > You can implement a script which converts the old format to the new > format. And you can use different naming scheme in the new format so > that we don't accidentally load the old format. And even better if you > add a some kind of signature in the new format and give a proper error > from the driver if it doesn't match. Ok. I am going to change the input format. I think the new function is going to look like: int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) { int ret; int start = 0; if (buf[start] != '{') { dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); return -EINVAL; } while (start < buf_len) { len = strnlen(buf + start, buf_len - start); if (len > WFX_PDS_MAX_SIZE) { dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); return -EINVAL; } dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); ret = wfx_hif_configuration(wdev, buf + start, len); /* FIXME: Add error handling here */ start += len; } return 0; }
Jérôme Pouiller <jerome.pouiller@silabs.com> writes: >> >> >> I'm not really fond of having this kind of ASCII based parser in the >> >> >> kernel. Do you have an example compressed file somewhere? >> >> > >> >> > An example of uncompressed configuration file can be found here[1]. Once >> >> > compressed with [2], you get: >> >> > >> >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} >> >> >> >> So what's the grand idea with this braces format? I'm not getting it. >> > >> > - It allows to describe a tree structure >> > - It is ascii (easy to dump, easy to copy-paste) >> > - It is small (as I explain below, size matters) >> > - Since it is similar to JSON, the structure is obvious to many people >> > >> > Anyway, I am not the author of that and I have to deal with it. >> >> I'm a supported for JSON like formats, flexibility and all that. But >> they belong to user space, not kernel. >> >> >> Usually the drivers just consider this kind of firmware configuration >> >> data as a binary blob and dump it to the firmware, without knowing what >> >> the data contains. Can't you do the same? >> > >> > [I didn't had received this mail :( ] >> > >> > The idea was also to send it as a binary blob. However, the firmware use >> > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds >> > this size. So, we have to split the PDS before to send it. >> > >> > Unfortunately, we can't split it anywhere. The PDS is a tree structure and >> > the firmware expects to receive a well formatted tree. >> > >> > So, the easiest way to send it to the firmware is to split the tree >> > between each root nodes and send each subtree separately (see also the >> > comment above wfx_send_pds()). >> > >> > Anyway, someone has to cook this configuration before to send it to the >> > firmware. This could be done by a script outside of the kernel. Then we >> > could change the input format to simplify a bit the processing in the >> > kernel. >> >> I think a binary file with TLV format would be much better, but I'm sure >> there also other good choises. >> >> > However, the driver has already some users and I worry that changing >> > the input format would lead to a mess. >> >> You can implement a script which converts the old format to the new >> format. And you can use different naming scheme in the new format so >> that we don't accidentally load the old format. And even better if you >> add a some kind of signature in the new format and give a proper error >> from the driver if it doesn't match. > > Ok. I am going to change the input format. I think the new function is > going to look like: > > int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) > { > int ret; > int start = 0; > > if (buf[start] != '{') { > dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); > return -EINVAL; > } > while (start < buf_len) { > len = strnlen(buf + start, buf_len - start); > if (len > WFX_PDS_MAX_SIZE) { > dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); > return -EINVAL; > } > dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); > ret = wfx_hif_configuration(wdev, buf + start, len); > /* FIXME: Add error handling here */ > start += len; > } > return 0; Did you read at all what I wrote above? Please ditch the ASCII format completely.
Kalle Valo <kvalo@codeaurora.org> writes: > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > >>> >> >> I'm not really fond of having this kind of ASCII based parser in the >>> >> >> kernel. Do you have an example compressed file somewhere? >>> >> > >>> >> > An example of uncompressed configuration file can be found here[1]. Once >>> >> > compressed with [2], you get: >>> >> > >>> >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} >>> >> >>> >> So what's the grand idea with this braces format? I'm not getting it. >>> > >>> > - It allows to describe a tree structure >>> > - It is ascii (easy to dump, easy to copy-paste) >>> > - It is small (as I explain below, size matters) >>> > - Since it is similar to JSON, the structure is obvious to many people >>> > >>> > Anyway, I am not the author of that and I have to deal with it. >>> >>> I'm a supported for JSON like formats, flexibility and all that. But >>> they belong to user space, not kernel. >>> >>> >> Usually the drivers just consider this kind of firmware configuration >>> >> data as a binary blob and dump it to the firmware, without knowing what >>> >> the data contains. Can't you do the same? >>> > >>> > [I didn't had received this mail :( ] >>> > >>> > The idea was also to send it as a binary blob. However, the firmware use >>> > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds >>> > this size. So, we have to split the PDS before to send it. >>> > >>> > Unfortunately, we can't split it anywhere. The PDS is a tree structure and >>> > the firmware expects to receive a well formatted tree. >>> > >>> > So, the easiest way to send it to the firmware is to split the tree >>> > between each root nodes and send each subtree separately (see also the >>> > comment above wfx_send_pds()). >>> > >>> > Anyway, someone has to cook this configuration before to send it to the >>> > firmware. This could be done by a script outside of the kernel. Then we >>> > could change the input format to simplify a bit the processing in the >>> > kernel. >>> >>> I think a binary file with TLV format would be much better, but I'm sure >>> there also other good choises. >>> >>> > However, the driver has already some users and I worry that changing >>> > the input format would lead to a mess. >>> >>> You can implement a script which converts the old format to the new >>> format. And you can use different naming scheme in the new format so >>> that we don't accidentally load the old format. And even better if you >>> add a some kind of signature in the new format and give a proper error >>> from the driver if it doesn't match. >> >> Ok. I am going to change the input format. I think the new function is >> going to look like: >> >> int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) >> { >> int ret; >> int start = 0; >> >> if (buf[start] != '{') { >> dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); >> return -EINVAL; >> } >> while (start < buf_len) { >> len = strnlen(buf + start, buf_len - start); >> if (len > WFX_PDS_MAX_SIZE) { >> dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); >> return -EINVAL; >> } >> dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); >> ret = wfx_hif_configuration(wdev, buf + start, len); >> /* FIXME: Add error handling here */ >> start += len; >> } >> return 0; > > Did you read at all what I wrote above? Please ditch the ASCII format > completely. Sorry, I read this too hastily. I just saw "buf[start] != '{'" and assumed this is the same ASCII format, but not sure anymore. Can you explain what changes you made now?
On Thursday 7 October 2021 12:49:47 CEST Kalle Valo wrote: > CAUTION: This email originated from outside of the organization. Do not click links or open attachments unless you recognize the sender and know the content is safe. > > > Kalle Valo <kvalo@codeaurora.org> writes: > > > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > > > >>> >> >> I'm not really fond of having this kind of ASCII based parser in the > >>> >> >> kernel. Do you have an example compressed file somewhere? > >>> >> > > >>> >> > An example of uncompressed configuration file can be found here[1]. Once > >>> >> > compressed with [2], you get: > >>> >> > > >>> >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} > >>> >> > >>> >> So what's the grand idea with this braces format? I'm not getting it. > >>> > > >>> > - It allows to describe a tree structure > >>> > - It is ascii (easy to dump, easy to copy-paste) > >>> > - It is small (as I explain below, size matters) > >>> > - Since it is similar to JSON, the structure is obvious to many people > >>> > > >>> > Anyway, I am not the author of that and I have to deal with it. > >>> > >>> I'm a supported for JSON like formats, flexibility and all that. But > >>> they belong to user space, not kernel. > >>> > >>> >> Usually the drivers just consider this kind of firmware configuration > >>> >> data as a binary blob and dump it to the firmware, without knowing what > >>> >> the data contains. Can't you do the same? > >>> > > >>> > [I didn't had received this mail :( ] > >>> > > >>> > The idea was also to send it as a binary blob. However, the firmware use > >>> > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds > >>> > this size. So, we have to split the PDS before to send it. > >>> > > >>> > Unfortunately, we can't split it anywhere. The PDS is a tree structure and > >>> > the firmware expects to receive a well formatted tree. > >>> > > >>> > So, the easiest way to send it to the firmware is to split the tree > >>> > between each root nodes and send each subtree separately (see also the > >>> > comment above wfx_send_pds()). > >>> > > >>> > Anyway, someone has to cook this configuration before to send it to the > >>> > firmware. This could be done by a script outside of the kernel. Then we > >>> > could change the input format to simplify a bit the processing in the > >>> > kernel. > >>> > >>> I think a binary file with TLV format would be much better, but I'm sure > >>> there also other good choises. > >>> > >>> > However, the driver has already some users and I worry that changing > >>> > the input format would lead to a mess. > >>> > >>> You can implement a script which converts the old format to the new > >>> format. And you can use different naming scheme in the new format so > >>> that we don't accidentally load the old format. And even better if you > >>> add a some kind of signature in the new format and give a proper error > >>> from the driver if it doesn't match. > >> > >> Ok. I am going to change the input format. I think the new function is > >> going to look like: > >> > >> int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) > >> { > >> int ret; > >> int start = 0; > >> > >> if (buf[start] != '{') { > >> dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); > >> return -EINVAL; > >> } > >> while (start < buf_len) { > >> len = strnlen(buf + start, buf_len - start); > >> if (len > WFX_PDS_MAX_SIZE) { > >> dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); > >> return -EINVAL; > >> } > >> dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); > >> ret = wfx_hif_configuration(wdev, buf + start, len); > >> /* FIXME: Add error handling here */ > >> start += len; > >> } > >> return 0; > > > > Did you read at all what I wrote above? Please ditch the ASCII format > > completely. > > Sorry, I read this too hastily. I just saw "buf[start] != '{'" and > assumed this is the same ASCII format, but not sure anymore. Can you > explain what changes you made now? The script I am going to write will compute where the PDS have to be split (this work is currently done by the driver). The script will add a separating character (let's say '\0') between each chunk. The driver will just have to find the separating character, send the chunk and repeat.
Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > On Thursday 7 October 2021 12:49:47 CEST Kalle Valo wrote: >> CAUTION: This email originated from outside of the organization. Do >> not click links or open attachments unless you recognize the sender >> and know the content is safe. >> >> >> Kalle Valo <kvalo@codeaurora.org> writes: >> >> > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: >> > >> >>> >> >> I'm not really fond of having this kind of ASCII based parser in the >> >>> >> >> kernel. Do you have an example compressed file somewhere? >> >>> >> > >> >>> >> > An example of uncompressed configuration file can be found here[1]. Once >> >>> >> > compressed with [2], you get: >> >>> >> > >> >>> >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} >> >>> >> >> >>> >> So what's the grand idea with this braces format? I'm not getting it. >> >>> > >> >>> > - It allows to describe a tree structure >> >>> > - It is ascii (easy to dump, easy to copy-paste) >> >>> > - It is small (as I explain below, size matters) >> >>> > - Since it is similar to JSON, the structure is obvious to many people >> >>> > >> >>> > Anyway, I am not the author of that and I have to deal with it. >> >>> >> >>> I'm a supported for JSON like formats, flexibility and all that. But >> >>> they belong to user space, not kernel. >> >>> >> >>> >> Usually the drivers just consider this kind of firmware configuration >> >>> >> data as a binary blob and dump it to the firmware, without knowing what >> >>> >> the data contains. Can't you do the same? >> >>> > >> >>> > [I didn't had received this mail :( ] >> >>> > >> >>> > The idea was also to send it as a binary blob. However, the firmware use >> >>> > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds >> >>> > this size. So, we have to split the PDS before to send it. >> >>> > >> >>> > Unfortunately, we can't split it anywhere. The PDS is a tree structure and >> >>> > the firmware expects to receive a well formatted tree. >> >>> > >> >>> > So, the easiest way to send it to the firmware is to split the tree >> >>> > between each root nodes and send each subtree separately (see also the >> >>> > comment above wfx_send_pds()). >> >>> > >> >>> > Anyway, someone has to cook this configuration before to send it to the >> >>> > firmware. This could be done by a script outside of the kernel. Then we >> >>> > could change the input format to simplify a bit the processing in the >> >>> > kernel. >> >>> >> >>> I think a binary file with TLV format would be much better, but I'm sure >> >>> there also other good choises. >> >>> >> >>> > However, the driver has already some users and I worry that changing >> >>> > the input format would lead to a mess. >> >>> >> >>> You can implement a script which converts the old format to the new >> >>> format. And you can use different naming scheme in the new format so >> >>> that we don't accidentally load the old format. And even better if you >> >>> add a some kind of signature in the new format and give a proper error >> >>> from the driver if it doesn't match. >> >> >> >> Ok. I am going to change the input format. I think the new function is >> >> going to look like: >> >> >> >> int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) >> >> { >> >> int ret; >> >> int start = 0; >> >> >> >> if (buf[start] != '{') { >> >> dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); >> >> return -EINVAL; >> >> } >> >> while (start < buf_len) { >> >> len = strnlen(buf + start, buf_len - start); >> >> if (len > WFX_PDS_MAX_SIZE) { >> >> dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); >> >> return -EINVAL; >> >> } >> >> dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); >> >> ret = wfx_hif_configuration(wdev, buf + start, len); >> >> /* FIXME: Add error handling here */ >> >> start += len; >> >> } >> >> return 0; >> > >> > Did you read at all what I wrote above? Please ditch the ASCII format >> > completely. >> >> Sorry, I read this too hastily. I just saw "buf[start] != '{'" and >> assumed this is the same ASCII format, but not sure anymore. Can you >> explain what changes you made now? > > The script I am going to write will compute where the PDS have to be split > (this work is currently done by the driver). The script will add a > separating character (let's say '\0') between each chunk. > > The driver will just have to find the separating character, send the > chunk and repeat. I would forget ASCII altogether and implement a proper binary format like TLV. For example, ath10k uses TLV with board-2.bin files (grep for enum ath10k_bd_ie_type). Also I recommend changing the file "signature" ('{') to something else so that the driver detects incorrect formats. And maybe even use suffix .pds2 or something like that to make it more obvious and avoid confusion?
On Wednesday 10 November 2021 10:58:41 CET Kalle Valo wrote: > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > > On Thursday 7 October 2021 12:49:47 CEST Kalle Valo wrote: > >> Kalle Valo <kvalo@codeaurora.org> writes: > >> > Jérôme Pouiller <jerome.pouiller@silabs.com> writes: > >> >>> >> >> I'm not really fond of having this kind of ASCII based parser in the > >> >>> >> >> kernel. Do you have an example compressed file somewhere? > >> >>> >> > > >> >>> >> > An example of uncompressed configuration file can be found here[1]. Once > >> >>> >> > compressed with [2], you get: > >> >>> >> > > >> >>> >> > {a:{a:4,b:1},b:{a:{a:4,b:0,c:0,d:0,e:A},b:{a:4,b:0,c:0,d:0,e:B},c:{a:4,b:0,c:0,d:0,e:C},d:{a:4,b:0,c:0,d:0,e:D},e:{a:4,b:0,c:0,d:0,e:E},f:{a:4,b:0,c:0,d:0,e:F},g:{a:4,b:0,c:0,d:0,e:G},h:{a:4,b:0,c:0,d:0,e:H},i:{a:4,b:0,c:0,d:0,e:I},j:{a:4,b:0,c:0,d:0,e:J},k:{a:4,b:0,c:0,d:0,e:K},l:{a:4,b:0,c:0,d:1,e:L},m:{a:4,b:0,c:0,d:1,e:M}},c:{a:{a:4},b:{a:6},c:{a:6,c:0},d:{a:6},e:{a:6},f:{a:6}},e:{b:0,c:1},h:{e:0,a:50,b:0,d:0,c:[{a:1,b:[0,0,0,0,0,0]},{a:2,b:[0,0,0,0,0,0]},{a:[3,9],b:[0,0,0,0,0,0]},{a:A,b:[0,0,0,0,0,0]},{a:B,b:[0,0,0,0,0,0]},{a:[C,D],b:[0,0,0,0,0,0]},{a:E,b:[0,0,0,0,0,0]}]},j:{a:0,b:0}} > >> >>> >> > >> >>> >> So what's the grand idea with this braces format? I'm not getting it. > >> >>> > > >> >>> > - It allows to describe a tree structure > >> >>> > - It is ascii (easy to dump, easy to copy-paste) > >> >>> > - It is small (as I explain below, size matters) > >> >>> > - Since it is similar to JSON, the structure is obvious to many people > >> >>> > > >> >>> > Anyway, I am not the author of that and I have to deal with it. > >> >>> > >> >>> I'm a supported for JSON like formats, flexibility and all that. But > >> >>> they belong to user space, not kernel. > >> >>> > >> >>> >> Usually the drivers just consider this kind of firmware configuration > >> >>> >> data as a binary blob and dump it to the firmware, without knowing what > >> >>> >> the data contains. Can't you do the same? > >> >>> > > >> >>> > [I didn't had received this mail :( ] > >> >>> > > >> >>> > The idea was also to send it as a binary blob. However, the firmware use > >> >>> > a limited buffer (1500 bytes) to parse it. In most of case the PDS exceeds > >> >>> > this size. So, we have to split the PDS before to send it. > >> >>> > > >> >>> > Unfortunately, we can't split it anywhere. The PDS is a tree structure and > >> >>> > the firmware expects to receive a well formatted tree. > >> >>> > > >> >>> > So, the easiest way to send it to the firmware is to split the tree > >> >>> > between each root nodes and send each subtree separately (see also the > >> >>> > comment above wfx_send_pds()). > >> >>> > > >> >>> > Anyway, someone has to cook this configuration before to send it to the > >> >>> > firmware. This could be done by a script outside of the kernel. Then we > >> >>> > could change the input format to simplify a bit the processing in the > >> >>> > kernel. > >> >>> > >> >>> I think a binary file with TLV format would be much better, but I'm sure > >> >>> there also other good choises. > >> >>> > >> >>> > However, the driver has already some users and I worry that changing > >> >>> > the input format would lead to a mess. > >> >>> > >> >>> You can implement a script which converts the old format to the new > >> >>> format. And you can use different naming scheme in the new format so > >> >>> that we don't accidentally load the old format. And even better if you > >> >>> add a some kind of signature in the new format and give a proper error > >> >>> from the driver if it doesn't match. > >> >> > >> >> Ok. I am going to change the input format. I think the new function is > >> >> going to look like: > >> >> > >> >> int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t buf_len) > >> >> { > >> >> int ret; > >> >> int start = 0; > >> >> > >> >> if (buf[start] != '{') { > >> >> dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); > >> >> return -EINVAL; > >> >> } > >> >> while (start < buf_len) { > >> >> len = strnlen(buf + start, buf_len - start); > >> >> if (len > WFX_PDS_MAX_SIZE) { > >> >> dev_err(wdev->dev, "PDS chunk is too big (legacy format?)\n"); > >> >> return -EINVAL; > >> >> } > >> >> dev_dbg(wdev->dev, "send PDS '%s'\n", buf + start); > >> >> ret = wfx_hif_configuration(wdev, buf + start, len); > >> >> /* FIXME: Add error handling here */ > >> >> start += len; > >> >> } > >> >> return 0; > >> > > >> > Did you read at all what I wrote above? Please ditch the ASCII format > >> > completely. > >> > >> Sorry, I read this too hastily. I just saw "buf[start] != '{'" and > >> assumed this is the same ASCII format, but not sure anymore. Can you > >> explain what changes you made now? > > > > The script I am going to write will compute where the PDS have to be split > > (this work is currently done by the driver). The script will add a > > separating character (let's say '\0') between each chunk. > > > > The driver will just have to find the separating character, send the > > chunk and repeat. > > I would forget ASCII altogether and implement a proper binary format > like TLV. For example, ath10k uses TLV with board-2.bin files (grep for > enum ath10k_bd_ie_type). Maybe you plan to have common functions to parse TLV files? Without that, I do not see so much benefits to TLV. However, it does not cost me so much. So all right, I'll do. > Also I recommend changing the file "signature" ('{') to something else > so that the driver detects incorrect formats. And maybe even use suffix > .pds2 or something like that to make it more obvious and avoid > confusion? Maybe I could replace '{' by '\x7b'? :) More seriously, this value is enforced by the device. However, with the introduction of TLV, I will already test the value of the Type field, so I think this test will be less important and I could remove it.
diff --git a/drivers/net/wireless/silabs/wfx/main.c b/drivers/net/wireless/silabs/wfx/main.c new file mode 100644 index 000000000000..b2ca49ca36e3 --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/main.c @@ -0,0 +1,503 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Device probe and register. + * + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. + * Copyright (c) 2010, ST-Ericsson + * Copyright (c) 2008, Johannes Berg <johannes@sipsolutions.net> + * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2007-2009, Christian Lamparter <chunkeey@web.de> + * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net> + * Copyright (c) 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al. + */ +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_net.h> +#include <linux/gpio/consumer.h> +#include <linux/mmc/sdio_func.h> +#include <linux/spi/spi.h> +#include <linux/etherdevice.h> +#include <linux/firmware.h> + +#include "main.h" +#include "wfx.h" +#include "fwio.h" +#include "hwio.h" +#include "bus.h" +#include "bh.h" +#include "sta.h" +#include "key.h" +#include "scan.h" +#include "debug.h" +#include "data_tx.h" +#include "hif_tx_mib.h" +#include "hif_api_cmd.h" + +#define WFX_PDS_MAX_SIZE 1500 + +MODULE_DESCRIPTION("Silicon Labs 802.11 Wireless LAN driver for WF200"); +MODULE_AUTHOR("Jérôme Pouiller <jerome.pouiller@silabs.com>"); +MODULE_LICENSE("GPL"); + +#define RATETAB_ENT(_rate, _rateid, _flags) { \ + .bitrate = (_rate), \ + .hw_value = (_rateid), \ + .flags = (_flags), \ +} + +static struct ieee80211_rate wfx_rates[] = { + RATETAB_ENT(10, 0, 0), + RATETAB_ENT(20, 1, IEEE80211_RATE_SHORT_PREAMBLE), + RATETAB_ENT(55, 2, IEEE80211_RATE_SHORT_PREAMBLE), + RATETAB_ENT(110, 3, IEEE80211_RATE_SHORT_PREAMBLE), + RATETAB_ENT(60, 6, 0), + RATETAB_ENT(90, 7, 0), + RATETAB_ENT(120, 8, 0), + RATETAB_ENT(180, 9, 0), + RATETAB_ENT(240, 10, 0), + RATETAB_ENT(360, 11, 0), + RATETAB_ENT(480, 12, 0), + RATETAB_ENT(540, 13, 0), +}; + +#define CHAN2G(_channel, _freq, _flags) { \ + .band = NL80211_BAND_2GHZ, \ + .center_freq = (_freq), \ + .hw_value = (_channel), \ + .flags = (_flags), \ + .max_antenna_gain = 0, \ + .max_power = 30, \ +} + +static struct ieee80211_channel wfx_2ghz_chantable[] = { + CHAN2G(1, 2412, 0), + CHAN2G(2, 2417, 0), + CHAN2G(3, 2422, 0), + CHAN2G(4, 2427, 0), + CHAN2G(5, 2432, 0), + CHAN2G(6, 2437, 0), + CHAN2G(7, 2442, 0), + CHAN2G(8, 2447, 0), + CHAN2G(9, 2452, 0), + CHAN2G(10, 2457, 0), + CHAN2G(11, 2462, 0), + CHAN2G(12, 2467, 0), + CHAN2G(13, 2472, 0), + CHAN2G(14, 2484, 0), +}; + +static const struct ieee80211_supported_band wfx_band_2ghz = { + .channels = wfx_2ghz_chantable, + .n_channels = ARRAY_SIZE(wfx_2ghz_chantable), + .bitrates = wfx_rates, + .n_bitrates = ARRAY_SIZE(wfx_rates), + .ht_cap = { + /* Receive caps */ + .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | + IEEE80211_HT_CAP_MAX_AMSDU | + (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT), + .ht_supported = 1, + .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE, + .mcs = { + .rx_mask = { 0xFF }, /* MCS0 to MCS7 */ + .rx_highest = cpu_to_le16(72), + .tx_params = IEEE80211_HT_MCS_TX_DEFINED, + }, + }, +}; + +static const struct ieee80211_iface_limit wdev_iface_limits[] = { + { .max = 1, .types = BIT(NL80211_IFTYPE_STATION) }, + { .max = 1, .types = BIT(NL80211_IFTYPE_AP) }, +}; + +static const struct ieee80211_iface_combination wfx_iface_combinations[] = { + { + .num_different_channels = 2, + .max_interfaces = 2, + .limits = wdev_iface_limits, + .n_limits = ARRAY_SIZE(wdev_iface_limits), + } +}; + +static const struct ieee80211_ops wfx_ops = { + .start = wfx_start, + .stop = wfx_stop, + .add_interface = wfx_add_interface, + .remove_interface = wfx_remove_interface, + .config = wfx_config, + .tx = wfx_tx, + .join_ibss = wfx_join_ibss, + .leave_ibss = wfx_leave_ibss, + .conf_tx = wfx_conf_tx, + .hw_scan = wfx_hw_scan, + .cancel_hw_scan = wfx_cancel_hw_scan, + .start_ap = wfx_start_ap, + .stop_ap = wfx_stop_ap, + .sta_add = wfx_sta_add, + .sta_remove = wfx_sta_remove, + .set_tim = wfx_set_tim, + .set_key = wfx_set_key, + .set_rts_threshold = wfx_set_rts_threshold, + .set_default_unicast_key = wfx_set_default_unicast_key, + .bss_info_changed = wfx_bss_info_changed, + .configure_filter = wfx_configure_filter, + .ampdu_action = wfx_ampdu_action, + .flush = wfx_flush, + .add_chanctx = wfx_add_chanctx, + .remove_chanctx = wfx_remove_chanctx, + .change_chanctx = wfx_change_chanctx, + .assign_vif_chanctx = wfx_assign_vif_chanctx, + .unassign_vif_chanctx = wfx_unassign_vif_chanctx, +}; + +bool wfx_api_older_than(struct wfx_dev *wdev, int major, int minor) +{ + if (wdev->hw_caps.api_version_major < major) + return true; + if (wdev->hw_caps.api_version_major > major) + return false; + if (wdev->hw_caps.api_version_minor < minor) + return true; + return false; +} + +/* The device needs data about the antenna configuration. This information in + * provided by PDS (Platform Data Set, this is the wording used in WF200 + * documentation) files. For hardware integrators, the full process to create + * PDS files is described here: + * https:github.com/SiliconLabs/wfx-firmware/blob/master/PDS/README.md + * + * So this function aims to send PDS to the device. However, the PDS file is + * often bigger than Rx buffers of the chip, so it has to be sent in multiple + * parts. + * + * In add, the PDS data cannot be split anywhere. The PDS files contains tree + * structures. Braces are used to enter/leave a level of the tree (in a JSON + * fashion). PDS files can only been split between root nodes. + */ +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len) +{ + int ret; + int start, brace_level, i; + + start = 0; + brace_level = 0; + if (buf[0] != '{') { + dev_err(wdev->dev, "valid PDS start with '{'. Did you forget to compress it?\n"); + return -EINVAL; + } + for (i = 1; i < len - 1; i++) { + if (buf[i] == '{') + brace_level++; + if (buf[i] == '}') + brace_level--; + if (buf[i] == '}' && !brace_level) { + i++; + if (i - start + 1 > WFX_PDS_MAX_SIZE) + return -EFBIG; + buf[start] = '{'; + buf[i] = 0; + dev_dbg(wdev->dev, "send PDS '%s}'\n", buf + start); + buf[i] = '}'; + ret = hif_configuration(wdev, buf + start, + i - start + 1); + if (ret > 0) { + dev_err(wdev->dev, "PDS bytes %d to %d: invalid data (unsupported options?)\n", + start, i); + return -EINVAL; + } + if (ret == -ETIMEDOUT) { + dev_err(wdev->dev, "PDS bytes %d to %d: chip didn't reply (corrupted file?)\n", + start, i); + return ret; + } + if (ret) { + dev_err(wdev->dev, "PDS bytes %d to %d: chip returned an unknown error\n", + start, i); + return -EIO; + } + buf[i] = ','; + start = i; + } + } + return 0; +} + +static int wfx_send_pdata_pds(struct wfx_dev *wdev) +{ + int ret = 0; + const struct firmware *pds; + u8 *tmp_buf; + + ret = request_firmware(&pds, wdev->pdata.file_pds, wdev->dev); + if (ret) { + dev_err(wdev->dev, "can't load antenna parameters (PDS file %s). The device may be unstable.\n", + wdev->pdata.file_pds); + return ret; + } + tmp_buf = kmemdup(pds->data, pds->size, GFP_KERNEL); + if (!tmp_buf) { + ret = -ENOMEM; + goto release_fw; + } + ret = wfx_send_pds(wdev, tmp_buf, pds->size); + kfree(tmp_buf); +release_fw: + release_firmware(pds); + return ret; +} + +static void wfx_free_common(void *data) +{ + struct wfx_dev *wdev = data; + + mutex_destroy(&wdev->tx_power_loop_info_lock); + mutex_destroy(&wdev->rx_stats_lock); + mutex_destroy(&wdev->conf_mutex); + ieee80211_free_hw(wdev->hw); +} + +struct wfx_dev *wfx_init_common(struct device *dev, + const struct wfx_platform_data *pdata, + const struct hwbus_ops *hwbus_ops, + void *hwbus_priv) +{ + struct ieee80211_hw *hw; + struct wfx_dev *wdev; + + hw = ieee80211_alloc_hw(sizeof(struct wfx_dev), &wfx_ops); + if (!hw) + return NULL; + + SET_IEEE80211_DEV(hw, dev); + + ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW); + ieee80211_hw_set(hw, AMPDU_AGGREGATION); + ieee80211_hw_set(hw, CONNECTION_MONITOR); + ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS); + ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS); + ieee80211_hw_set(hw, SIGNAL_DBM); + ieee80211_hw_set(hw, SUPPORTS_PS); + ieee80211_hw_set(hw, MFP_CAPABLE); + + hw->vif_data_size = sizeof(struct wfx_vif); + hw->sta_data_size = sizeof(struct wfx_sta_priv); + hw->queues = 4; + hw->max_rates = 8; + hw->max_rate_tries = 8; + hw->extra_tx_headroom = sizeof(struct hif_msg) + + sizeof(struct hif_req_tx) + + 4 /* alignment */ + 8 /* TKIP IV */; + hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_ADHOC) | + BIT(NL80211_IFTYPE_AP); + hw->wiphy->probe_resp_offload = NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS | + NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 | + NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P | + NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U; + hw->wiphy->features |= NL80211_FEATURE_AP_SCAN; + hw->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD; + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; + hw->wiphy->max_ap_assoc_sta = HIF_LINK_ID_MAX; + hw->wiphy->max_scan_ssids = 2; + hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN; + hw->wiphy->n_iface_combinations = ARRAY_SIZE(wfx_iface_combinations); + hw->wiphy->iface_combinations = wfx_iface_combinations; + hw->wiphy->bands[NL80211_BAND_2GHZ] = devm_kmalloc(dev, sizeof(wfx_band_2ghz), GFP_KERNEL); + /* FIXME: also copy wfx_rates and wfx_2ghz_chantable */ + memcpy(hw->wiphy->bands[NL80211_BAND_2GHZ], &wfx_band_2ghz, + sizeof(wfx_band_2ghz)); + + wdev = hw->priv; + wdev->hw = hw; + wdev->dev = dev; + wdev->hwbus_ops = hwbus_ops; + wdev->hwbus_priv = hwbus_priv; + memcpy(&wdev->pdata, pdata, sizeof(*pdata)); + of_property_read_string(dev->of_node, "silabs,antenna-config-file", + &wdev->pdata.file_pds); + wdev->pdata.gpio_wakeup = devm_gpiod_get_optional(dev, "wakeup", + GPIOD_OUT_LOW); + if (IS_ERR(wdev->pdata.gpio_wakeup)) + return NULL; + if (wdev->pdata.gpio_wakeup) + gpiod_set_consumer_name(wdev->pdata.gpio_wakeup, "wfx wakeup"); + + mutex_init(&wdev->conf_mutex); + mutex_init(&wdev->rx_stats_lock); + mutex_init(&wdev->tx_power_loop_info_lock); + init_completion(&wdev->firmware_ready); + INIT_DELAYED_WORK(&wdev->cooling_timeout_work, + wfx_cooling_timeout_work); + skb_queue_head_init(&wdev->tx_pending); + init_waitqueue_head(&wdev->tx_dequeue); + wfx_init_hif_cmd(&wdev->hif_cmd); + wdev->force_ps_timeout = -1; + + if (devm_add_action_or_reset(dev, wfx_free_common, wdev)) + return NULL; + + return wdev; +} + +int wfx_probe(struct wfx_dev *wdev) +{ + int i; + int err; + struct gpio_desc *gpio_saved; + + /* During first part of boot, gpio_wakeup cannot yet been used. So + * prevent bh() to touch it. + */ + gpio_saved = wdev->pdata.gpio_wakeup; + wdev->pdata.gpio_wakeup = NULL; + wdev->poll_irq = true; + + wfx_bh_register(wdev); + + err = wfx_init_device(wdev); + if (err) + goto bh_unregister; + + wfx_bh_poll_irq(wdev); + err = wait_for_completion_timeout(&wdev->firmware_ready, 1 * HZ); + if (err <= 0) { + if (err == 0) { + dev_err(wdev->dev, "timeout while waiting for startup indication\n"); + err = -ETIMEDOUT; + } else if (err == -ERESTARTSYS) { + dev_info(wdev->dev, "probe interrupted by user\n"); + } + goto bh_unregister; + } + + /* FIXME: fill wiphy::hw_version */ + dev_info(wdev->dev, "started firmware %d.%d.%d \"%s\" (API: %d.%d, keyset: %02X, caps: 0x%.8X)\n", + wdev->hw_caps.firmware_major, wdev->hw_caps.firmware_minor, + wdev->hw_caps.firmware_build, wdev->hw_caps.firmware_label, + wdev->hw_caps.api_version_major, wdev->hw_caps.api_version_minor, + wdev->keyset, wdev->hw_caps.link_mode); + snprintf(wdev->hw->wiphy->fw_version, + sizeof(wdev->hw->wiphy->fw_version), + "%d.%d.%d", + wdev->hw_caps.firmware_major, + wdev->hw_caps.firmware_minor, + wdev->hw_caps.firmware_build); + + if (wfx_api_older_than(wdev, 1, 0)) { + dev_err(wdev->dev, + "unsupported firmware API version (expect 1 while firmware returns %d)\n", + wdev->hw_caps.api_version_major); + err = -ENOTSUPP; + goto bh_unregister; + } + + if (wdev->hw_caps.link_mode == SEC_LINK_ENFORCED) { + dev_err(wdev->dev, "chip require secure_link, but can't negotiate it\n"); + goto bh_unregister; + } + + if (wdev->hw_caps.region_sel_mode) { + wdev->hw->wiphy->bands[NL80211_BAND_2GHZ]->channels[11].flags |= IEEE80211_CHAN_NO_IR; + wdev->hw->wiphy->bands[NL80211_BAND_2GHZ]->channels[12].flags |= IEEE80211_CHAN_NO_IR; + wdev->hw->wiphy->bands[NL80211_BAND_2GHZ]->channels[13].flags |= IEEE80211_CHAN_DISABLED; + } + + dev_dbg(wdev->dev, "sending configuration file %s\n", + wdev->pdata.file_pds); + err = wfx_send_pdata_pds(wdev); + if (err < 0 && err != -ENOENT) + goto bh_unregister; + + wdev->poll_irq = false; + err = wdev->hwbus_ops->irq_subscribe(wdev->hwbus_priv); + if (err) + goto bh_unregister; + + err = hif_use_multi_tx_conf(wdev, true); + if (err) + dev_err(wdev->dev, "misconfigured IRQ?\n"); + + wdev->pdata.gpio_wakeup = gpio_saved; + if (wdev->pdata.gpio_wakeup) { + dev_dbg(wdev->dev, "enable 'quiescent' power mode with wakeup GPIO and PDS file %s\n", + wdev->pdata.file_pds); + gpiod_set_value_cansleep(wdev->pdata.gpio_wakeup, 1); + control_reg_write(wdev, 0); + hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_QUIESCENT); + } else { + hif_set_operational_mode(wdev, HIF_OP_POWER_MODE_DOZE); + } + + for (i = 0; i < ARRAY_SIZE(wdev->addresses); i++) { + eth_zero_addr(wdev->addresses[i].addr); + err = of_get_mac_address(wdev->dev->of_node, + wdev->addresses[i].addr); + if (!err) { + wdev->addresses[i].addr[ETH_ALEN - 1] += i; + } else { + ether_addr_copy(wdev->addresses[i].addr, + wdev->hw_caps.mac_addr[i]); + } + if (!is_valid_ether_addr(wdev->addresses[i].addr)) { + dev_warn(wdev->dev, "using random MAC address\n"); + eth_random_addr(wdev->addresses[i].addr); + } + dev_info(wdev->dev, "MAC address %d: %pM\n", i, + wdev->addresses[i].addr); + } + wdev->hw->wiphy->n_addresses = ARRAY_SIZE(wdev->addresses); + wdev->hw->wiphy->addresses = wdev->addresses; + + if (!wfx_api_older_than(wdev, 3, 8)) + wdev->hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS; + + err = ieee80211_register_hw(wdev->hw); + if (err) + goto irq_unsubscribe; + + err = wfx_debug_init(wdev); + if (err) + goto ieee80211_unregister; + + return 0; + +ieee80211_unregister: + ieee80211_unregister_hw(wdev->hw); +irq_unsubscribe: + wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); +bh_unregister: + wfx_bh_unregister(wdev); + return err; +} + +void wfx_release(struct wfx_dev *wdev) +{ + ieee80211_unregister_hw(wdev->hw); + hif_shutdown(wdev); + wdev->hwbus_ops->irq_unsubscribe(wdev->hwbus_priv); + wfx_bh_unregister(wdev); +} + +static int __init wfx_core_init(void) +{ + int ret = 0; + + if (IS_ENABLED(CONFIG_SPI)) + ret = spi_register_driver(&wfx_spi_driver); + if (IS_ENABLED(CONFIG_MMC) && !ret) + ret = sdio_register_driver(&wfx_sdio_driver); + return ret; +} +module_init(wfx_core_init); + +static void __exit wfx_core_exit(void) +{ + if (IS_ENABLED(CONFIG_MMC)) + sdio_unregister_driver(&wfx_sdio_driver); + if (IS_ENABLED(CONFIG_SPI)) + spi_unregister_driver(&wfx_spi_driver); +} +module_exit(wfx_core_exit); diff --git a/drivers/net/wireless/silabs/wfx/main.h b/drivers/net/wireless/silabs/wfx/main.h new file mode 100644 index 000000000000..115abd2d4378 --- /dev/null +++ b/drivers/net/wireless/silabs/wfx/main.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Device probe and register. + * + * Copyright (c) 2017-2020, Silicon Laboratories, Inc. + * Copyright (c) 2010, ST-Ericsson + * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net> + * Copyright 2004-2006 Jean-Baptiste Note <jbnote@gmail.com>, et al. + */ +#ifndef WFX_MAIN_H +#define WFX_MAIN_H + +#include <linux/device.h> +#include <linux/gpio/consumer.h> + +#include "hif_api_general.h" + +struct wfx_dev; +struct hwbus_ops; + +struct wfx_platform_data { + /* Keyset and ".sec" extension will be appended to this string */ + const char *file_fw; + const char *file_pds; + struct gpio_desc *gpio_wakeup; + /* if true HIF D_out is sampled on the rising edge of the clock + * (intended to be used in 50Mhz SDIO) + */ + bool use_rising_clk; +}; + +struct wfx_dev *wfx_init_common(struct device *dev, + const struct wfx_platform_data *pdata, + const struct hwbus_ops *hwbus_ops, + void *hwbus_priv); + +int wfx_probe(struct wfx_dev *wdev); +void wfx_release(struct wfx_dev *wdev); + +bool wfx_api_older_than(struct wfx_dev *wdev, int major, int minor); +int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len); + +#endif