Skip to content

Commit 4b8d1b5

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 5b5c32b commit 4b8d1b5

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
@@ -400,6 +400,7 @@ struct brcmf_pciedev_info {
400400
void __iomem *regs;
401401
void __iomem *tcm;
402402
u32 fw_size;
403+
bool skip_reset_vector;
403404
struct brcmf_chip *ci;
404405
u32 coreid;
405406
struct brcmf_pcie_shared_info shared;
@@ -1964,6 +1965,8 @@ static int brcmf_pcie_add_signature(struct brcmf_pciedev_info *devinfo,
19641965
if (err)
19651966
return err;
19661967

1968+
devinfo->skip_reset_vector = true;
1969+
19671970
return 0;
19681971
}
19691972

@@ -2204,7 +2207,8 @@ static void brcmf_pcie_buscore_activate(void *ctx, struct brcmf_chip *chip,
22042207
{
22052208
struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
22062209

2207-
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
2210+
if (!devinfo->skip_reset_vector)
2211+
brcmf_pcie_write_tcm32(devinfo, 0, rstvec);
22082212
}
22092213

22102214

0 commit comments

Comments
 (0)