Skip to content

Commit ba89c37

Browse files
marcanjannau
authored andcommitted
wifi: brcmfmac: Do not set reset vector when signatures are in use
With secure boot, the vector is not accessible and trying to write it triggers PCIe errors. Skip it in that case. Signed-off-by: Hector Martin <marcan@marcan.st>
1 parent 16b0902 commit ba89c37

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ struct brcmf_pciedev_info {
398398
void __iomem *regs;
399399
void __iomem *tcm;
400400
u32 fw_size;
401+
bool skip_reset_vector;
401402
struct brcmf_chip *ci;
402403
u32 coreid;
403404
struct brcmf_pcie_shared_info shared;
@@ -1961,6 +1962,8 @@ static int brcmf_pcie_add_signature(struct brcmf_pciedev_info *devinfo,
19611962
if (err)
19621963
return err;
19631964

1965+
devinfo->skip_reset_vector = true;
1966+
19641967
return 0;
19651968
}
19661969

@@ -2201,7 +2204,8 @@ static void brcmf_pcie_buscore_activate(void *ctx, struct brcmf_chip *chip,
22012204
{
22022205
struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
22032206

2204-
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
2207+
if (!devinfo->skip_reset_vector)
2208+
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
22052209
}
22062210

22072211

0 commit comments

Comments
 (0)