diff mbox series

[LEDE-DEV,v3,1/7] Update to latest ath10k-ct driver, enable AHB.

Message ID 1521653343-4317-1-git-send-email-greearb@candelatech.com
State Superseded
Delegated to: Hauke Mehrtens
Headers show
Series [LEDE-DEV,v3,1/7] Update to latest ath10k-ct driver, enable AHB. | expand

Commit Message

Ben Greear March 21, 2018, 5:28 p.m. UTC 
From: Ben Greear <greearb@candelatech.com>

The driver updates include:

ath10k driver backport to fix WPA 'pn' related security bugs
(4.13 based driver only currently),
a fix for off-channel TX for CT wave-1 firmware, a likely
fix for napi related crashes, and a backport of the firmware fetch
patch.

AHB is needed for the IPQ4019 platform radios.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---

v3 update:  Combine all 7 patches in one series.

 package/kernel/ath10k-ct/Makefile                  | 14 +++++----
 ...ctivate-user-space-firmware-loading-again.patch | 36 ----------------------
 2 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch

Comments

Matthias Schiffer April 13, 2018, 9:59 p.m. UTC | #1 
On 03/21/2018 06:28 PM, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
> 
> The driver updates include:
> 
> ath10k driver backport to fix WPA 'pn' related security bugs
> (4.13 based driver only currently),
> a fix for off-channel TX for CT wave-1 firmware, a likely
> fix for napi related crashes, and a backport of the firmware fetch
> patch.
> 
> AHB is needed for the IPQ4019 platform radios.
> 
> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---

The following build log was sent to me. Admittedly, building ath10k is
probably not really useful on the brcm2708 (RasPi) target, but it is
currently breaking an ALL_KMODS build for this platform unless package
build errors are ignored.

Regards,
Matthias


> make[5]: Entering directory '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/linux-4.9.91'
>   CC [M]  /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_hif_start':
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:1964:2: error: implicit declaration of function 'pcie_capability_write_word' [-Werror=implicit-function-declaration]
>   pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_hif_power_up':
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:2835:2: error: implicit declaration of function 'pcie_capability_read_word'; did you mean 'has_capability_noaudit'? [-Werror=implicit-function-declaration]
>   pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>   ^~~~~~~~~~~~~~~~~~~~~~~~~
>   has_capability_noaudit
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_init_irq':
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3246:9: error: implicit declaration of function 'pci_enable_msi'; did you mean 'pci_enable_sriov'? [-Werror=implicit-function-declaration]
>    ret = pci_enable_msi(ar_pci->pdev);
>          ^~~~~~~~~~~~~~
>          pci_enable_sriov
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_deinit_irq':
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3285:3: error: implicit declaration of function 'pci_disable_msi'; did you mean 'pci_disable_sriov'? [-Werror=implicit-function-declaration]
>    pci_disable_msi(ar_pci->pdev);
>    ^~~~~~~~~~~~~~~
>    pci_disable_sriov
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_claim':
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3398:8: error: implicit declaration of function 'pci_request_region'; did you mean 'pci_request_regions'? [-Werror=implicit-function-declaration]
>   ret = pci_request_region(pdev, BAR_NUM, "ath");
>         ^~~~~~~~~~~~~~~~~~
>         pci_request_regions
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3434:2: error: implicit declaration of function 'pci_clear_master'; did you mean 'pci_set_master'? [-Werror=implicit-function-declaration]
>   pci_clear_master(pdev);
>   ^~~~~~~~~~~~~~~~
>   pci_set_master
> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3437:2: error: implicit declaration of function 'pci_release_region'; did you mean 'pci_release_regions'? [-Werror=implicit-function-declaration]
>   pci_release_region(pdev, BAR_NUM);
>   ^~~~~~~~~~~~~~~~~~
>   pci_release_regions
> cc1: some warnings being treated as errors
> scripts/Makefile.build:293: recipe for target '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o' failed
Ben Greear April 13, 2018, 10:05 p.m. UTC | #2 
On 04/13/2018 02:59 PM, Matthias Schiffer wrote:
> On 03/21/2018 06:28 PM, greearb@candelatech.com wrote:
>> From: Ben Greear <greearb@candelatech.com>
>>
>> The driver updates include:
>>
>> ath10k driver backport to fix WPA 'pn' related security bugs
>> (4.13 based driver only currently),
>> a fix for off-channel TX for CT wave-1 firmware, a likely
>> fix for napi related crashes, and a backport of the firmware fetch
>> patch.
>>
>> AHB is needed for the IPQ4019 platform radios.
>>
>> Signed-off-by: Ben Greear <greearb@candelatech.com>
>> ---
>
> The following build log was sent to me. Admittedly, building ath10k is
> probably not really useful on the brcm2708 (RasPi) target, but it is
> currently breaking an ALL_KMODS build for this platform unless package
> build errors are ignored.

Maybe that platform has no pcie support in the kernel?

Thanks,
Ben

>
> Regards,
> Matthias
>
>
>> make[5]: Entering directory '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/linux-4.9.91'
>>   CC [M]  /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_hif_start':
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:1964:2: error: implicit declaration of function 'pcie_capability_write_word' [-Werror=implicit-function-declaration]
>>   pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>   ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_hif_power_up':
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:2835:2: error: implicit declaration of function 'pcie_capability_read_word'; did you mean 'has_capability_noaudit'? [-Werror=implicit-function-declaration]
>>   pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>   ^~~~~~~~~~~~~~~~~~~~~~~~~
>>   has_capability_noaudit
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_init_irq':
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3246:9: error: implicit declaration of function 'pci_enable_msi'; did you mean 'pci_enable_sriov'? [-Werror=implicit-function-declaration]
>>    ret = pci_enable_msi(ar_pci->pdev);
>>          ^~~~~~~~~~~~~~
>>          pci_enable_sriov
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_deinit_irq':
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3285:3: error: implicit declaration of function 'pci_disable_msi'; did you mean 'pci_disable_sriov'? [-Werror=implicit-function-declaration]
>>    pci_disable_msi(ar_pci->pdev);
>>    ^~~~~~~~~~~~~~~
>>    pci_disable_sriov
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c: In function 'ath10k_pci_claim':
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3398:8: error: implicit declaration of function 'pci_request_region'; did you mean 'pci_request_regions'? [-Werror=implicit-function-declaration]
>>   ret = pci_request_region(pdev, BAR_NUM, "ath");
>>         ^~~~~~~~~~~~~~~~~~
>>         pci_request_regions
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3434:2: error: implicit declaration of function 'pci_clear_master'; did you mean 'pci_set_master'? [-Werror=implicit-function-declaration]
>>   pci_clear_master(pdev);
>>   ^~~~~~~~~~~~~~~~
>>   pci_set_master
>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3437:2: error: implicit declaration of function 'pci_release_region'; did you mean 'pci_release_regions'? [-Werror=implicit-function-declaration]
>>   pci_release_region(pdev, BAR_NUM);
>>   ^~~~~~~~~~~~~~~~~~
>>   pci_release_regions
>> cc1: some warnings being treated as errors
>> scripts/Makefile.build:293: recipe for target '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o' failed
>
>
Matthias Schiffer April 13, 2018, 10:17 p.m. UTC | #3 
On 04/14/2018 12:05 AM, Ben Greear wrote:
> On 04/13/2018 02:59 PM, Matthias Schiffer wrote:
>> On 03/21/2018 06:28 PM, greearb@candelatech.com wrote:
>>> From: Ben Greear <greearb@candelatech.com>
>>>
>>> The driver updates include:
>>>
>>> ath10k driver backport to fix WPA 'pn' related security bugs
>>> (4.13 based driver only currently),
>>> a fix for off-channel TX for CT wave-1 firmware, a likely
>>> fix for napi related crashes, and a backport of the firmware fetch
>>> patch.
>>>
>>> AHB is needed for the IPQ4019 platform radios.
>>>
>>> Signed-off-by: Ben Greear <greearb@candelatech.com>
>>> ---
>>
>> The following build log was sent to me. Admittedly, building ath10k is
>> probably not really useful on the brcm2708 (RasPi) target, but it is
>> currently breaking an ALL_KMODS build for this platform unless package
>> build errors are ignored.
> 
> Maybe that platform has no pcie support in the kernel?

Correct, brcm2708 does not set CONFIG_PCI_SUPPORT (in OpenWrt .config).
d0f3dd5b9 ("ath10k-ct: update to latest version, enable AHB.") removed the
@PCI_SUPPORT dependency from ath10k-ct, so an ALL_KMODS build will now
attempt to build the package.


> 
> Thanks,
> Ben
> 
>>
>> Regards,
>> Matthias
>>
>>
>>> make[5]: Entering directory
>>> '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/linux-4.9.91'
>>>
>>>   CC [M] 
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o
>>>
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>> In function 'ath10k_pci_hif_start':
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:1964:2:
>>> error: implicit declaration of function 'pcie_capability_write_word'
>>> [-Werror=implicit-function-declaration]
>>>   pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>>   ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>> In function 'ath10k_pci_hif_power_up':
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:2835:2:
>>> error: implicit declaration of function 'pcie_capability_read_word'; did
>>> you mean 'has_capability_noaudit'? [-Werror=implicit-function-declaration]
>>>   pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>>   ^~~~~~~~~~~~~~~~~~~~~~~~~
>>>   has_capability_noaudit
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>> In function 'ath10k_pci_init_irq':
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3246:9:
>>> error: implicit declaration of function 'pci_enable_msi'; did you mean
>>> 'pci_enable_sriov'? [-Werror=implicit-function-declaration]
>>>    ret = pci_enable_msi(ar_pci->pdev);
>>>          ^~~~~~~~~~~~~~
>>>          pci_enable_sriov
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>> In function 'ath10k_pci_deinit_irq':
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3285:3:
>>> error: implicit declaration of function 'pci_disable_msi'; did you mean
>>> 'pci_disable_sriov'? [-Werror=implicit-function-declaration]
>>>    pci_disable_msi(ar_pci->pdev);
>>>    ^~~~~~~~~~~~~~~
>>>    pci_disable_sriov
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>> In function 'ath10k_pci_claim':
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3398:8:
>>> error: implicit declaration of function 'pci_request_region'; did you
>>> mean 'pci_request_regions'? [-Werror=implicit-function-declaration]
>>>   ret = pci_request_region(pdev, BAR_NUM, "ath");
>>>         ^~~~~~~~~~~~~~~~~~
>>>         pci_request_regions
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3434:2:
>>> error: implicit declaration of function 'pci_clear_master'; did you mean
>>> 'pci_set_master'? [-Werror=implicit-function-declaration]
>>>   pci_clear_master(pdev);
>>>   ^~~~~~~~~~~~~~~~
>>>   pci_set_master
>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3437:2:
>>> error: implicit declaration of function 'pci_release_region'; did you
>>> mean 'pci_release_regions'? [-Werror=implicit-function-declaration]
>>>   pci_release_region(pdev, BAR_NUM);
>>>   ^~~~~~~~~~~~~~~~~~
>>>   pci_release_regions
>>> cc1: some warnings being treated as errors
>>> scripts/Makefile.build:293: recipe for target
>>> '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o'
>>> failed
>>
>>
> 
>
Ben Greear April 13, 2018, 10:28 p.m. UTC | #4 
On 04/13/2018 03:17 PM, Matthias Schiffer wrote:
> On 04/14/2018 12:05 AM, Ben Greear wrote:
>> On 04/13/2018 02:59 PM, Matthias Schiffer wrote:
>>> On 03/21/2018 06:28 PM, greearb@candelatech.com wrote:
>>>> From: Ben Greear <greearb@candelatech.com>
>>>>
>>>> The driver updates include:
>>>>
>>>> ath10k driver backport to fix WPA 'pn' related security bugs
>>>> (4.13 based driver only currently),
>>>> a fix for off-channel TX for CT wave-1 firmware, a likely
>>>> fix for napi related crashes, and a backport of the firmware fetch
>>>> patch.
>>>>
>>>> AHB is needed for the IPQ4019 platform radios.
>>>>
>>>> Signed-off-by: Ben Greear <greearb@candelatech.com>
>>>> ---
>>>
>>> The following build log was sent to me. Admittedly, building ath10k is
>>> probably not really useful on the brcm2708 (RasPi) target, but it is
>>> currently breaking an ALL_KMODS build for this platform unless package
>>> build errors are ignored.
>>
>> Maybe that platform has no pcie support in the kernel?
>
> Correct, brcm2708 does not set CONFIG_PCI_SUPPORT (in OpenWrt .config).
> d0f3dd5b9 ("ath10k-ct: update to latest version, enable AHB.") removed the
> @PCI_SUPPORT dependency from ath10k-ct, so an ALL_KMODS build will now
> attempt to build the package.

Hmm, the AHB stuff doesn't require PCI afaik, but maybe I need some
additional #ifdefs somewhere to not try building the pci logic in
ath10k-ct for platforms that don't define PCI.

I don't have time to work on that today, but will try to look at it
early next week if no one beats me to it.

Thanks,
Ben

>
>
>>
>> Thanks,
>> Ben
>>
>>>
>>> Regards,
>>> Matthias
>>>
>>>
>>>> make[5]: Entering directory
>>>> '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/linux-4.9.91'
>>>>
>>>>   CC [M]
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o
>>>>
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>>> In function 'ath10k_pci_hif_start':
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:1964:2:
>>>> error: implicit declaration of function 'pcie_capability_write_word'
>>>> [-Werror=implicit-function-declaration]
>>>>   pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>>>   ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>>> In function 'ath10k_pci_hif_power_up':
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:2835:2:
>>>> error: implicit declaration of function 'pcie_capability_read_word'; did
>>>> you mean 'has_capability_noaudit'? [-Werror=implicit-function-declaration]
>>>>   pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,
>>>>   ^~~~~~~~~~~~~~~~~~~~~~~~~
>>>>   has_capability_noaudit
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>>> In function 'ath10k_pci_init_irq':
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3246:9:
>>>> error: implicit declaration of function 'pci_enable_msi'; did you mean
>>>> 'pci_enable_sriov'? [-Werror=implicit-function-declaration]
>>>>    ret = pci_enable_msi(ar_pci->pdev);
>>>>          ^~~~~~~~~~~~~~
>>>>          pci_enable_sriov
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>>> In function 'ath10k_pci_deinit_irq':
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3285:3:
>>>> error: implicit declaration of function 'pci_disable_msi'; did you mean
>>>> 'pci_disable_sriov'? [-Werror=implicit-function-declaration]
>>>>    pci_disable_msi(ar_pci->pdev);
>>>>    ^~~~~~~~~~~~~~~
>>>>    pci_disable_sriov
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:
>>>> In function 'ath10k_pci_claim':
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3398:8:
>>>> error: implicit declaration of function 'pci_request_region'; did you
>>>> mean 'pci_request_regions'? [-Werror=implicit-function-declaration]
>>>>   ret = pci_request_region(pdev, BAR_NUM, "ath");
>>>>         ^~~~~~~~~~~~~~~~~~
>>>>         pci_request_regions
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3434:2:
>>>> error: implicit declaration of function 'pci_clear_master'; did you mean
>>>> 'pci_set_master'? [-Werror=implicit-function-declaration]
>>>>   pci_clear_master(pdev);
>>>>   ^~~~~~~~~~~~~~~~
>>>>   pci_set_master
>>>> /scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.c:3437:2:
>>>> error: implicit declaration of function 'pci_release_region'; did you
>>>> mean 'pci_release_regions'? [-Werror=implicit-function-declaration]
>>>>   pci_release_region(pdev, BAR_NUM);
>>>>   ^~~~~~~~~~~~~~~~~~
>>>>   pci_release_regions
>>>> cc1: some warnings being treated as errors
>>>> scripts/Makefile.build:293: recipe for target
>>>> '/scratch/hexa/build/gluon/openwrt/build_dir/target-arm_arm1176jzf-s+vfp_musl_eabi/linux-brcm2708_bcm2708/ath10k-ct-2018-03-16-30827f7d/ath10k-4.13/pci.o'
>>>> failed
>>>
>>>
>>
>>
>
>
diff mbox series

Patch

diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index fe094e7..83d3a05 100644
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -9,8 +9,8 @@  PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2017-06-13
-PKG_SOURCE_VERSION:=bded1823912549017d819d1796273b3134c3de20
-PKG_MIRROR_HASH:=616174650e12a82edb6b6bd18ac186e2c6a48fdad0082df9d2011ab20940814b
+PKG_SOURCE_VERSION:=e1edd74d5f0c5291b0be72c81033e74e267929d4
+PKG_MIRROR_HASH:=945dc7110017a80c33cac20d9d2a9beda0a6a98b50178319403568098534e60a
 
 PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
 PKG_BUILD_PARALLEL:=1
@@ -29,7 +29,7 @@  include $(INCLUDE_DIR)/package.mk
 define KernelPackage/ath10k-ct
   SUBMENU:=Wireless Drivers
   TITLE:=ath10k-ct driver optimized for CT ath10k firmware
-  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
+  DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11W_SUPPORT +kmod-hwmon-core
   FILES:=\
 	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
 	$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
@@ -50,9 +50,11 @@  ifdef CONFIG_PACKAGE_MAC80211_MESH
 endif
 
 CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m
-# No AHB support enabled yet.  Could conditionally enable it later.
-#CT_MAKEDEFS += CONFIG_ATH10K_AHB=y
-#NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
+
+# This AHB logic is needed for IPQ4019 radios
+CT_MAKEDEFS += CONFIG_ATH10K_AHB=m
+NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
+
 NOSTDINC_FLAGS += -DSTANDALONE_CT
 
 ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
diff --git a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch b/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
deleted file mode 100644
index dc02a9d..0000000
--- a/package/kernel/ath10k-ct/patches/130-ath10k-activate-user-space-firmware-loading-again.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-From c0cc00f250e19c717fc9cdbdb7f55aaa569c7498 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Thu, 24 Aug 2017 23:06:41 +0200
-Subject: [PATCH] ath10k: activate user space firmware loading again
-
-In commit 9f5bcfe93315 ("ath10k: silence firmware file probing
-warnings") the firmware loading was changed from request_firmware() to
-request_firmware_direct() to silence some warnings in case it fails.
-request_firmware_direct() directly searches in the file system only and
-does not send a hotplug event to user space in case it could not find
-the firmware directly.
-In LEDE we use a user space script to extract the calibration data from
-the flash memory which gets triggered by the hotplug event. This way the
-firmware gets extracted from some vendor specific partition when the
-driver requests this firmware. This mechanism does not work any more
-after this change.
-
-Fixes: 9f5bcfe93315 ("ath10k: silence firmware file probing warnings")
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: Michal Kazior <michal.kazior@tieto.com>
-Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
----
- ath10k-4.13/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/ath10k-4.13/core.c
-+++ b/ath10k-4.13/core.c
-@@ -556,7 +556,7 @@ static const struct firmware *ath10k_fet
- 		dir = ".";
- 
- 	snprintf(filename, sizeof(filename), "%s/%s", dir, file);
--	ret = request_firmware_direct(&fw, filename, ar->dev);
-+	ret = request_firmware(&fw, filename, ar->dev);
- 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
- 		   filename, ret);
-