Skip to content

Commit 23f67eb

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 c9044e3 commit 23f67eb

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
@@ -402,6 +402,7 @@ struct brcmf_pciedev_info {
402402
void __iomem *regs;
403403
void __iomem *tcm;
404404
u32 fw_size;
405+
bool skip_reset_vector;
405406
struct brcmf_chip *ci;
406407
u32 coreid;
407408
struct brcmf_pcie_shared_info shared;
@@ -1968,6 +1969,8 @@ static int brcmf_pcie_add_signature(struct brcmf_pciedev_info *devinfo,
19681969
if (err)
19691970
return err;
19701971

1972+
devinfo->skip_reset_vector = true;
1973+
19711974
return 0;
19721975
}
19731976

@@ -2208,7 +2211,8 @@ static void brcmf_pcie_buscore_activate(void *ctx, struct brcmf_chip *chip,
22082211
{
22092212
struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
22102213

2211-
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
2214+
if (!devinfo->skip_reset_vector)
2215+
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
22122216
}
22132217

22142218

0 commit comments

Comments
 (0)