openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00
Code Activity

In mwx_attach() do the powermanagement dance earlier and also check

Browse Source 
for MT7920 that come with a 7921 PCI id.

From kevlo@
This commit is contained in:
claudio
2026-06-03 11:48:57 +00:00
parent 7052455c5f
commit e8fd505e1d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/dev/pci/if_mwx.c
+11 -5
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: if_mwx.c,v 1.20 2026/06/03 11:38:02 claudio Exp $ */
/* $OpenBSD: if_mwx.c,v 1.21 2026/06/03 11:48:57 claudio Exp $ */
/*
* Copyright (c) 2022 Claudio Jeker <claudio@openbsd.org>
* Copyright (c) 2021 MediaTek Inc.
@@ -1359,10 +1359,19 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
return;
}
if (mwx_mcu_fw_pmctrl(sc) != 0 || mwx_mcu_drv_pmctrl(sc) != 0)
goto fail;
hwid = mwx_read(sc, MT_HW_CHIPID) & 0xffff;
hwrev = mwx_read(sc, MT_HW_REV) & 0xff;
printf(": %s, rev: %x.%x\n", pci_intr_string(pa->pa_pc, ih),
if (sc->sc_hwtype == MWX_HW_MT7921 &&
(mwx_read(sc, MT_HW_BOUND) & 0x80) != 0) {
hwid = 0x7920;
sc->sc_hwtype = MWX_HW_MT7920;
}
printf(": %s, rev: MT%x.%x\n", pci_intr_string(pa->pa_pc, ih),
hwid, hwrev);
mwx_write(sc, MT_WFDMA0_HOST_INT_ENA, 0);
@@ -1371,9 +1380,6 @@ mwx_attach(struct device *parent, struct device *self, void *aux)
sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET,
mwx_intr, sc, DEVNAME(sc));
if (mwx_mcu_fw_pmctrl(sc) != 0 || mwx_mcu_drv_pmctrl(sc) != 0)
goto fail;
if ((error = mwx_txwi_alloc(sc, MWX_TXWI_MAX)) != 0) {
printf("%s: failed to allocate DMA resources %d\n",
DEVNAME(sc), error);
sys/dev/pci/if_mwxreg.h
+2 -1
View File
@@ -1,4 +1,4 @@
/* $OpenBSD: if_mwxreg.h,v 1.12 2026/06/03 11:22:50 claudio Exp $ */
/* $OpenBSD: if_mwxreg.h,v 1.13 2026/06/03 11:48:57 claudio Exp $ */
/*
* Copyright (c) 2022 Claudio Jeker <claudio@openbsd.org>
* Copyright (C) 2021 MediaTek Inc.
@@ -324,6 +324,7 @@
#define MT_WFDMA_DUMMY_CR 0x54000120
#define MT_WFDMA_NEED_REINIT (1U << 1)
#define MT_HW_BOUND 0x70010020
#define MT_HW_CHIPID 0x70010200
#define MT_HW_REV 0x70010204