Jeffrey Hugo <quic_jhugo@xxxxxxxxxxx> writes:
> On 1/11/2023 2:25 AM, Kalle Valo wrote:
>> From: Kalle Valo <quic_kvalo@xxxxxxxxxxx>
>>
>> Currently MHI loads the firmware image from the path provided by client
>> devices. ath11k needs to support firmware image embedded along with meta data
>> (named as firmware-2.bin). So allow the client driver to request the firmware
>> file from user space on it's own and provide the firmware image data and size
>> to MHI via a pointer struct mhi_controller::fw_data.
>>
>> This is an optional feature, if fw_data is NULL MHI load the firmware using the
>> name from struct mhi_controller::fw_image string as before.
>>
>> Tested with ath11k and WCN6855 hw2.0.
>>
>> Signed-off-by: Kalle Valo <quic_kvalo@xxxxxxxxxxx>
[...]
>> @@ -478,14 +489,14 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl)
>> */
>> if (mhi_cntrl->fbc_download) {
>> ret = mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->fbc_image,
>> - firmware->size);
>> + fw_sz);
>
> Minor nit, but it seems like this could be all on one line.
Will fix in v2.
>> --- a/include/linux/mhi.h
>> +++ b/include/linux/mhi.h
>> @@ -299,6 +299,10 @@ struct mhi_controller_config {
>> * @iova_start: IOMMU starting address for data (required)
>> * @iova_stop: IOMMU stop address for data (required)
>> * @fw_image: Firmware image name for normal booting (optional)
>> + * @fw_data: Firmware image data content for normal booting, used only
>> + * if fw_image is NULL (optional)
>
> The implementation requires fbc_download to be set, which is not a
> requirement for fw_image. That is not apparent here.
Ah, I had missed that. Will mention that in v2.
>> @@ -384,6 +388,8 @@ struct mhi_controller {
>> dma_addr_t iova_start;
>> dma_addr_t iova_stop;
>> const char *fw_image;
>> + const u8 *fw_data;
>> + size_t fw_sz;
>
> Did you run pahole? I remember this struct being well packed, and I
> think this will add a compiler hole but I have not actually verified.
I actually haven't used pahole for ages. I will run it and check how
this structure is packed.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
