Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-16 Thread Sven Wolf

inteldrm will require the 5.15 port I'm working on.


I've seen your commit
https://marc.info/?l=openbsd-cvs&m=164214312609256&w=2

I can confirm that I now have an accelerated desktop/driver

[16.289] (II) Loading /usr/X11R6/lib/modules/drivers/modesetting_drv.so
[16.290]Module class: X.Org Video Driver
[16.290]ABI class: X.Org Video Driver, version 25.2
[16.290] (II) modesetting: Driver for Modesetting Kernel Drivers: kms
[16.798] (II) modeset(0): [DRI2]   DRI driver: iris
[16.798] (II) modeset(0): [DRI2]   VDPAU driver: va_gl

Thanks,
Sven



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-14 Thread Jonathan Gray
On Mon, Jan 10, 2022 at 08:56:18PM +0100, Sven Wolf wrote:
> Also with the wsfb driver the laptop is usable. I look forward to the 5.15
> drm driver.

With the latest cvs, inteldrm should attach.



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-12 Thread Stefan Sperling
On Thu, Jan 13, 2022 at 07:14:28AM +0100, Sven Wolf wrote:
> 
> 
> On 1/12/22 21:07, Stefan Sperling wrote:
> > On Wed, Jan 12, 2022 at 08:58:28PM +0100, Sven Wolf wrote:
> > > With following patches I got also the wireless nic working.
> > 
> > Nice! I am glad to see support for additional iwx devices.
> > 
> > Could you try this patch by Iraklis Karagkiozoglou please?
> > https://marc.info/?l=openbsd-tech&m=164194046522312&w=2
> > I plan to get to this patch soon. I still want to get some other patches
> > out of my queue before reviewing it. But knowing whether it works for you
> > would be good. See here for reasons why:
> > https://marc.info/?l=openbsd-tech&m=164175499605919&w=2
> 
> The patch by Iraklis Karagkiozoglou doesn't work with my device :(
> Now I get again:
> iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
> iwx0: unknown adapter type

OK, good to know. Thank you.
We will figure this out eventually, don't worry.



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-12 Thread Sven Wolf




On 1/12/22 21:07, Stefan Sperling wrote:

On Wed, Jan 12, 2022 at 08:58:28PM +0100, Sven Wolf wrote:

With following patches I got also the wireless nic working.


Nice! I am glad to see support for additional iwx devices.

Could you try this patch by Iraklis Karagkiozoglou please?
https://marc.info/?l=openbsd-tech&m=164194046522312&w=2
I plan to get to this patch soon. I still want to get some other patches
out of my queue before reviewing it. But knowing whether it works for you
would be good. See here for reasons why:
https://marc.info/?l=openbsd-tech&m=164175499605919&w=2


The patch by Iraklis Karagkiozoglou doesn't work with my device :(
Now I get again:
iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
iwx0: unknown adapter type



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-12 Thread Stefan Sperling
On Wed, Jan 12, 2022 at 08:58:28PM +0100, Sven Wolf wrote:
> With following patches I got also the wireless nic working.

Nice! I am glad to see support for additional iwx devices.

Could you try this patch by Iraklis Karagkiozoglou please?
https://marc.info/?l=openbsd-tech&m=164194046522312&w=2
I plan to get to this patch soon. I still want to get some other patches
out of my queue before reviewing it. But knowing whether it works for you
would be good. See here for reasons why:
https://marc.info/?l=openbsd-tech&m=164175499605919&w=2



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-12 Thread Sven Wolf

Thanks to jsg@ emmc, sound and touchpad are working now.

With following patches I got also the wireless nic working.
Now I have a good/new/cheap usable laptop for OpenBSD (beside my X230 :)

Index: if_iwx.c
===
RCS file: /cvs/src/sys/dev/pci/if_iwx.c,v
retrieving revision 1.133
diff -u -p -u -r1.133 if_iwx.c
--- if_iwx.c9 Jan 2022 05:42:52 -   1.133
+++ if_iwx.c12 Jan 2022 19:41:48 -
@@ -9177,6 +9177,7 @@ static const struct pci_matchid iwx_devi
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
+{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
 };

 static const struct pci_matchid iwx_subsystem_id_ax201[] = {
@@ -9218,6 +9219,7 @@ iwx_match(struct device *parent, iwx_mat
case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
+case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
spid == iwx_subsystem_id_ax201[i].pm_pid)
@@ -9408,6 +9410,7 @@ iwx_attach(struct device *parent, struct
case PCI_PRODUCT_INTEL_WL_22500_2:
case PCI_PRODUCT_INTEL_WL_22500_3:
case PCI_PRODUCT_INTEL_WL_22500_5:
+case PCI_PRODUCT_INTEL_WL_22500_6:
if (sc->sc_hw_rev != IWX_CSR_HW_REV_TYPE_QUZ) {
printf("%s: unsupported AX201 adapter\n", DEVNAME(sc));
return;

Index: pcidevs
===
RCS file: /cvs/src/sys/dev/pci/pcidevs,v
retrieving revision 1.1984
diff -u -p -u -r1.1984 pcidevs
--- pcidevs 10 Jan 2022 23:40:37 -  1.1984
+++ pcidevs 12 Jan 2022 19:41:08 -
@@ -5547,6 +5547,7 @@ product INTEL JSL_I2C_3   0x4deb  Jasper L
 product INTEL JSL_XHCI 0x4ded  Jasper Lake xHCI
 product INTEL JSL_XDCI 0x4dee  Jasper Lake xDCI
 product INTEL JSL_SRAM 0x4def  Jasper Lake Shared SRAM
+product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
 product INTEL JSL_SDXC 0x4df8  Jasper Lake SDXC
 product INTEL JSL_LPSS_SPI_2   0x4dfb  Jasper Lake SPI
 product INTEL JSL_DPTF 0x4e03  Jasper Lake DPTF

After I read https://marc.info/?l=openbsd-tech&m=164175499605919&w=2 I 
think we need to wait for general fix for the ax201 issues.


Thanks,
Sven



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-11 Thread Jonathan Gray
On Tue, Jan 11, 2022 at 09:06:42PM +0100, Sven Wolf wrote:
> 
> 
> On 1/11/22 01:42, Jonathan Gray wrote:
> > On Mon, Jan 10, 2022 at 08:56:18PM +0100, Sven Wolf wrote:
> > > 
> > > 
> > > On 1/10/22 02:02, Jonathan Gray wrote:
> > > > On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:
> > > > > Hi list,
> > > > > 
> > > > > in October'21 I successfully installed OpenBSD on this litte fanless 
> > > > > latop.
> > > > > There are following issues, even with -current:
> > > > > 
> > > > > The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: 
> > > > > autoconfig
> > > > > for ALC256) is not detected.
> > > > > 
> > > > > The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at 
> > > > > address
> > > > > 0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
> > > > > After I insert an nvme into the empty internal port I got OpenBSD 
> > > > > installed.
> > > > > 
> > > > > The AX201 is not detected. In October'21 I got the AX201 with 
> > > > > following
> > > > > patch in a stable working state:
> > > > > 
> > > > > cat pcidevs.diff
> > > > > *** pcidevs   Sun Jan  9 20:02:35 2022
> > > > > --- pcidevs.swift1Sun Jan  9 19:35:41 2022
> > > > > ***
> > > > > *** 5510,5515 
> > > > > --- 5510,5516 
> > > > > product INTEL RKL_GT_40x4c8c  UHD Graphics
> > > > > product INTEL RKL_GT_50x4c90  UHD Graphics
> > > > > product INTEL RKL_GT_60x4c9a  UHD Graphics
> > > > > + product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
> > > > > product INTEL JSL_GT_10x4e51  UHD Graphics
> > > > > product INTEL JSL_GT_20x4e55  UHD Graphics
> > > > > product INTEL JSL_GT_30x4e57  UHD Graphics
> > > > > 
> > > > > 
> > > > > cat if_iwx.c.diff
> > > > > *** if_iwx.c  Sun Jan  9 20:02:35 2022
> > > > > --- if_iwx.c.swift1   Sun Jan  9 19:37:41 2022
> > > > > ***
> > > > > *** 9177,9182 
> > > > > --- 9177,9183 
> > > > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
> > > > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
> > > > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
> > > > > + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
> > > > > };
> > > > > 
> > > > > static const struct pci_matchid iwx_subsystem_id_ax201[] = {
> > > > > ***
> > > > > *** 9218,9223 
> > > > > --- 9219,9225 
> > > > >   case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
> > > > >   case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
> > > > >   case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
> > > > > + case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
> > > > >   for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
> > > > >   if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
> > > > >   spid == iwx_subsystem_id_ax201[i].pm_pid)
> > > > > 
> > > > > But now I only get following message:
> > > > > iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
> > > > > iwx0: unknown adapter type
> > > > > 
> > > > > In Linux following firmware is used:
> > > > > Loading firmware: iwlwifi-QuZ-a0-hr-b0-63.ucode
> > > > > iwlwifi :00:14.3: loaded firmware version 63.c04f3485.0
> > > > > QuZ-a0-hr-b0-63.ucode op_mode iwlmvm
> > > > > 
> > > > > I hope that Stefan has an idea, how we can get the iwx on this 
> > > > > machine in a
> > > > > working state.
> > > > > 
> > > > > The azalia and emmc issues are not the highest priority for myself. 
> > > > > Maybe
> > > > > someone will make a patch.
> > > > > 
> > > > > The touchpad only works in PS/2 mode. Fortunately on this machine, the
> > > > > touchpad mode can be changed in the (hidden) BIOS/UEFI menu (CTRL+s)
> > > > 
> > > > The touchpad is likely connected via i2c.
> > > > 
> > > > The following diff should make audio and the touchpad work.
> > > > inteldrm will require the 5.15 port I'm working on.
> > 
> > committed with another id I missed added
> > 
> > does this help with emmc?
> > 
> > Index: sys/dev/pci/sdhc_pci.c
> > ===
> > RCS file: /cvs/src/sys/dev/pci/sdhc_pci.c,v
> > retrieving revision 1.21
> > diff -u -p -U4 -r1.21 sdhc_pci.c
> > --- sys/dev/pci/sdhc_pci.c  20 Nov 2019 16:34:58 -  1.21
> > +++ sys/dev/pci/sdhc_pci.c  11 Jan 2022 00:38:27 -
> > @@ -130,9 +130,10 @@ sdhc_pci_attach(struct device *parent, s
> > /* Some Intel controllers break if set to 0V bus power. */
> > if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
> > (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_100SERIES_LP_EMMC ||
> > PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_APOLLOLAKE_EMMC ||
> > -   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC))
> > +   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC ||
> > +   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_JSL_EMMC))
> > sc->sc.

Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-11 Thread Sven Wolf




On 1/11/22 01:42, Jonathan Gray wrote:

On Mon, Jan 10, 2022 at 08:56:18PM +0100, Sven Wolf wrote:



On 1/10/22 02:02, Jonathan Gray wrote:

On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:

Hi list,

in October'21 I successfully installed OpenBSD on this litte fanless latop.
There are following issues, even with -current:

The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: autoconfig
for ALC256) is not detected.

The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at address
0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
After I insert an nvme into the empty internal port I got OpenBSD installed.

The AX201 is not detected. In October'21 I got the AX201 with following
patch in a stable working state:

cat pcidevs.diff
*** pcidevs Sun Jan  9 20:02:35 2022
--- pcidevs.swift1  Sun Jan  9 19:35:41 2022
***
*** 5510,5515 
--- 5510,5516 
product INTEL RKL_GT_4  0x4c8c  UHD Graphics
product INTEL RKL_GT_5  0x4c90  UHD Graphics
product INTEL RKL_GT_6  0x4c9a  UHD Graphics
+ product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
product INTEL JSL_GT_1  0x4e51  UHD Graphics
product INTEL JSL_GT_2  0x4e55  UHD Graphics
product INTEL JSL_GT_3  0x4e57  UHD Graphics


cat if_iwx.c.diff
*** if_iwx.cSun Jan  9 20:02:35 2022
--- if_iwx.c.swift1 Sun Jan  9 19:37:41 2022
***
*** 9177,9182 
--- 9177,9183 
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
};

static const struct pci_matchid iwx_subsystem_id_ax201[] = {
***
*** 9218,9223 
--- 9219,9225 
case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
+   case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
spid == iwx_subsystem_id_ax201[i].pm_pid)

But now I only get following message:
iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
iwx0: unknown adapter type

In Linux following firmware is used:
Loading firmware: iwlwifi-QuZ-a0-hr-b0-63.ucode
iwlwifi :00:14.3: loaded firmware version 63.c04f3485.0
QuZ-a0-hr-b0-63.ucode op_mode iwlmvm

I hope that Stefan has an idea, how we can get the iwx on this machine in a
working state.

The azalia and emmc issues are not the highest priority for myself. Maybe
someone will make a patch.

The touchpad only works in PS/2 mode. Fortunately on this machine, the
touchpad mode can be changed in the (hidden) BIOS/UEFI menu (CTRL+s)


The touchpad is likely connected via i2c.

The following diff should make audio and the touchpad work.
inteldrm will require the 5.15 port I'm working on.


committed with another id I missed added

does this help with emmc?

Index: sys/dev/pci/sdhc_pci.c
===
RCS file: /cvs/src/sys/dev/pci/sdhc_pci.c,v
retrieving revision 1.21
diff -u -p -U4 -r1.21 sdhc_pci.c
--- sys/dev/pci/sdhc_pci.c  20 Nov 2019 16:34:58 -  1.21
+++ sys/dev/pci/sdhc_pci.c  11 Jan 2022 00:38:27 -
@@ -130,9 +130,10 @@ sdhc_pci_attach(struct device *parent, s
/* Some Intel controllers break if set to 0V bus power. */
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_100SERIES_LP_EMMC ||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_APOLLOLAKE_EMMC ||
-   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC))
+   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC ||
+   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_JSL_EMMC))
sc->sc.sc_flags |= SDHC_F_NOPWR0;
  
  	/* Some RICOH controllers need to be bumped into the right mode. */

if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RICOH &&



Thanks :)
Also this patch works perfectly.
The emmc is now accessible.

Sven



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-10 Thread Jonathan Gray
On Mon, Jan 10, 2022 at 08:56:18PM +0100, Sven Wolf wrote:
> 
> 
> On 1/10/22 02:02, Jonathan Gray wrote:
> > On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:
> > > Hi list,
> > > 
> > > in October'21 I successfully installed OpenBSD on this litte fanless 
> > > latop.
> > > There are following issues, even with -current:
> > > 
> > > The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: autoconfig
> > > for ALC256) is not detected.
> > > 
> > > The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at address
> > > 0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
> > > After I insert an nvme into the empty internal port I got OpenBSD 
> > > installed.
> > > 
> > > The AX201 is not detected. In October'21 I got the AX201 with following
> > > patch in a stable working state:
> > > 
> > > cat pcidevs.diff
> > > *** pcidevs   Sun Jan  9 20:02:35 2022
> > > --- pcidevs.swift1Sun Jan  9 19:35:41 2022
> > > ***
> > > *** 5510,5515 
> > > --- 5510,5516 
> > >product INTEL RKL_GT_4 0x4c8c  UHD Graphics
> > >product INTEL RKL_GT_5 0x4c90  UHD Graphics
> > >product INTEL RKL_GT_6 0x4c9a  UHD Graphics
> > > + product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
> > >product INTEL JSL_GT_1 0x4e51  UHD Graphics
> > >product INTEL JSL_GT_2 0x4e55  UHD Graphics
> > >product INTEL JSL_GT_3 0x4e57  UHD Graphics
> > > 
> > > 
> > > cat if_iwx.c.diff
> > > *** if_iwx.c  Sun Jan  9 20:02:35 2022
> > > --- if_iwx.c.swift1   Sun Jan  9 19:37:41 2022
> > > ***
> > > *** 9177,9182 
> > > --- 9177,9183 
> > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
> > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
> > >   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
> > > + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
> > >};
> > > 
> > >static const struct pci_matchid iwx_subsystem_id_ax201[] = {
> > > ***
> > > *** 9218,9223 
> > > --- 9219,9225 
> > >   case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
> > >   case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
> > >   case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
> > > + case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
> > >   for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
> > >   if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
> > >   spid == iwx_subsystem_id_ax201[i].pm_pid)
> > > 
> > > But now I only get following message:
> > > iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
> > > iwx0: unknown adapter type
> > > 
> > > In Linux following firmware is used:
> > > Loading firmware: iwlwifi-QuZ-a0-hr-b0-63.ucode
> > > iwlwifi :00:14.3: loaded firmware version 63.c04f3485.0
> > > QuZ-a0-hr-b0-63.ucode op_mode iwlmvm
> > > 
> > > I hope that Stefan has an idea, how we can get the iwx on this machine in 
> > > a
> > > working state.
> > > 
> > > The azalia and emmc issues are not the highest priority for myself. Maybe
> > > someone will make a patch.
> > > 
> > > The touchpad only works in PS/2 mode. Fortunately on this machine, the
> > > touchpad mode can be changed in the (hidden) BIOS/UEFI menu (CTRL+s)
> > 
> > The touchpad is likely connected via i2c.
> > 
> > The following diff should make audio and the touchpad work.
> > inteldrm will require the 5.15 port I'm working on.

committed with another id I missed added

does this help with emmc?

Index: sys/dev/pci/sdhc_pci.c
===
RCS file: /cvs/src/sys/dev/pci/sdhc_pci.c,v
retrieving revision 1.21
diff -u -p -U4 -r1.21 sdhc_pci.c
--- sys/dev/pci/sdhc_pci.c  20 Nov 2019 16:34:58 -  1.21
+++ sys/dev/pci/sdhc_pci.c  11 Jan 2022 00:38:27 -
@@ -130,9 +130,10 @@ sdhc_pci_attach(struct device *parent, s
/* Some Intel controllers break if set to 0V bus power. */
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_INTEL &&
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_100SERIES_LP_EMMC ||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_APOLLOLAKE_EMMC ||
-   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC))
+   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_GLK_EMMC ||
+   PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_JSL_EMMC))
sc->sc.sc_flags |= SDHC_F_NOPWR0;
 
/* Some RICOH controllers need to be bumped into the right mode. */
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RICOH &&



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-10 Thread Sven Wolf




On 1/10/22 02:02, Jonathan Gray wrote:

On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:

Hi list,

in October'21 I successfully installed OpenBSD on this litte fanless latop.
There are following issues, even with -current:

The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: autoconfig
for ALC256) is not detected.

The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at address
0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
After I insert an nvme into the empty internal port I got OpenBSD installed.

The AX201 is not detected. In October'21 I got the AX201 with following
patch in a stable working state:

cat pcidevs.diff
*** pcidevs Sun Jan  9 20:02:35 2022
--- pcidevs.swift1  Sun Jan  9 19:35:41 2022
***
*** 5510,5515 
--- 5510,5516 
   product INTEL RKL_GT_4   0x4c8c  UHD Graphics
   product INTEL RKL_GT_5   0x4c90  UHD Graphics
   product INTEL RKL_GT_6   0x4c9a  UHD Graphics
+ product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
   product INTEL JSL_GT_1   0x4e51  UHD Graphics
   product INTEL JSL_GT_2   0x4e55  UHD Graphics
   product INTEL JSL_GT_3   0x4e57  UHD Graphics


cat if_iwx.c.diff
*** if_iwx.cSun Jan  9 20:02:35 2022
--- if_iwx.c.swift1 Sun Jan  9 19:37:41 2022
***
*** 9177,9182 
--- 9177,9183 
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
   };

   static const struct pci_matchid iwx_subsystem_id_ax201[] = {
***
*** 9218,9223 
--- 9219,9225 
case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
+   case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
spid == iwx_subsystem_id_ax201[i].pm_pid)

But now I only get following message:
iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
iwx0: unknown adapter type

In Linux following firmware is used:
Loading firmware: iwlwifi-QuZ-a0-hr-b0-63.ucode
iwlwifi :00:14.3: loaded firmware version 63.c04f3485.0
QuZ-a0-hr-b0-63.ucode op_mode iwlmvm

I hope that Stefan has an idea, how we can get the iwx on this machine in a
working state.

The azalia and emmc issues are not the highest priority for myself. Maybe
someone will make a patch.

The touchpad only works in PS/2 mode. Fortunately on this machine, the
touchpad mode can be changed in the (hidden) BIOS/UEFI menu (CTRL+s)


The touchpad is likely connected via i2c.

The following diff should make audio and the touchpad work.
inteldrm will require the 5.15 port I'm working on.

Index: sys/dev/pci/azalia.c
===
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.266
diff -u -p -r1.266 azalia.c
--- sys/dev/pci/azalia.c30 Oct 2021 03:24:59 -  1.266
+++ sys/dev/pci/azalia.c10 Jan 2022 00:47:51 -
@@ -482,6 +482,7 @@ azalia_configure_pci(azalia_t *az)
case PCI_PRODUCT_INTEL_BAYTRAIL_HDA:
case PCI_PRODUCT_INTEL_BSW_HDA:
case PCI_PRODUCT_INTEL_GLK_HDA:
+   case PCI_PRODUCT_INTEL_JSL_HDA:
reg = azalia_pci_read(az->pc, az->tag,
INTEL_PCIE_NOSNOOP_REG);
reg &= INTEL_PCIE_NOSNOOP_MASK;
@@ -495,7 +496,8 @@ const struct pci_matchid azalia_pci_devi
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_HDA },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_300SERIES_U_HDA },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_400SERIES_CAVS },
-   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA }
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_HDA },
  };
  
  int

Index: sys/dev/pci/dwiic_pci.c
===
RCS file: /cvs/src/sys/dev/pci/dwiic_pci.c,v
retrieving revision 1.18
diff -u -p -r1.18 dwiic_pci.c
--- sys/dev/pci/dwiic_pci.c 30 Oct 2021 03:27:35 -  1.18
+++ sys/dev/pci/dwiic_pci.c 10 Jan 2022 00:47:08 -
@@ -138,6 +138,12 @@ const struct pci_matchid dwiic_pci_ids[]
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_6 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_7 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_8 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_0 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_1 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_2 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_3 },
+   { PCI_VENDOR_INTEL, PCI_P

Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-09 Thread Jonathan Gray
On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:
> Hi list,
> 
> in October'21 I successfully installed OpenBSD on this litte fanless latop.
> There are following issues, even with -current:
> 
> The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: autoconfig
> for ALC256) is not detected.
> 
> The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at address
> 0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
> After I insert an nvme into the empty internal port I got OpenBSD installed.

> "10251229" at acpi0 not configured
> acpibat0 at acpi0: BAT0 model "AP18C4K" serial 891 type LION oem "Murata
> KT0030401"
> "INTC1043" at acpi0 not configured
> "INTC1043" at acpi0 not configured
> acpicmos0 at acpi0
> "PNP0C14" at acpi0 not configured
> "INT34C8" at acpi0 not configured

this is gpio which may also be implicated in interrupts
and hid devices not working

perhaps dev/acpi/pchgpio.c could be expanded to handle it



Re: Acer Swift1 (SF114-34, N6000, Jasper Lake): iwx (ax201), azalia and emmc are not working/detected

2022-01-09 Thread Jonathan Gray
On Sun, Jan 09, 2022 at 09:27:57PM +0100, Sven Wolf wrote:
> Hi list,
> 
> in October'21 I successfully installed OpenBSD on this litte fanless latop.
> There are following issues, even with -current:
> 
> The soundcard (Linux dmesg: snd_hda_codec_realtek hdaudioC0D0: autoconfig
> for ALC256) is not detected.
> 
> The emmc (Linux dmesg: mmc0: new HS400 Enhanced strobe MMC card at address
> 0001, mmcblk0: mmc0:0001 DA4128 116 GiB) can't get enabled.
> After I insert an nvme into the empty internal port I got OpenBSD installed.
> 
> The AX201 is not detected. In October'21 I got the AX201 with following
> patch in a stable working state:
> 
> cat pcidevs.diff
> *** pcidevs   Sun Jan  9 20:02:35 2022
> --- pcidevs.swift1Sun Jan  9 19:35:41 2022
> ***
> *** 5510,5515 
> --- 5510,5516 
>   product INTEL RKL_GT_4  0x4c8c  UHD Graphics
>   product INTEL RKL_GT_5  0x4c90  UHD Graphics
>   product INTEL RKL_GT_6  0x4c9a  UHD Graphics
> + product INTEL WL_22500_60x4df0  Wi-Fi 6 AX201
>   product INTEL JSL_GT_1  0x4e51  UHD Graphics
>   product INTEL JSL_GT_2  0x4e55  UHD Graphics
>   product INTEL JSL_GT_3  0x4e57  UHD Graphics
> 
> 
> cat if_iwx.c.diff
> *** if_iwx.c  Sun Jan  9 20:02:35 2022
> --- if_iwx.c.swift1   Sun Jan  9 19:37:41 2022
> ***
> *** 9177,9182 
> --- 9177,9183 
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_3 },
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_4,},
>   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_5,},
> + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_WL_22500_6,},
>   };
> 
>   static const struct pci_matchid iwx_subsystem_id_ax201[] = {
> ***
> *** 9218,9223 
> --- 9219,9225 
>   case PCI_PRODUCT_INTEL_WL_22500_3: /* AX201 */
>   case PCI_PRODUCT_INTEL_WL_22500_4: /* AX201 */
>   case PCI_PRODUCT_INTEL_WL_22500_5: /* AX201 */
> + case PCI_PRODUCT_INTEL_WL_22500_6: /* AX201 */
>   for (i = 0; i < nitems(iwx_subsystem_id_ax201); i++) {
>   if (svid == iwx_subsystem_id_ax201[i].pm_vid &&
>   spid == iwx_subsystem_id_ax201[i].pm_pid)
> 
> But now I only get following message:
> iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX201" rev 0x01, msix
> iwx0: unknown adapter type
> 
> In Linux following firmware is used:
> Loading firmware: iwlwifi-QuZ-a0-hr-b0-63.ucode
> iwlwifi :00:14.3: loaded firmware version 63.c04f3485.0
> QuZ-a0-hr-b0-63.ucode op_mode iwlmvm
> 
> I hope that Stefan has an idea, how we can get the iwx on this machine in a
> working state.
> 
> The azalia and emmc issues are not the highest priority for myself. Maybe
> someone will make a patch.
> 
> The touchpad only works in PS/2 mode. Fortunately on this machine, the
> touchpad mode can be changed in the (hidden) BIOS/UEFI menu (CTRL+s)

The touchpad is likely connected via i2c.

The following diff should make audio and the touchpad work.
inteldrm will require the 5.15 port I'm working on.

Index: sys/dev/pci/azalia.c
===
RCS file: /cvs/src/sys/dev/pci/azalia.c,v
retrieving revision 1.266
diff -u -p -r1.266 azalia.c
--- sys/dev/pci/azalia.c30 Oct 2021 03:24:59 -  1.266
+++ sys/dev/pci/azalia.c10 Jan 2022 00:47:51 -
@@ -482,6 +482,7 @@ azalia_configure_pci(azalia_t *az)
case PCI_PRODUCT_INTEL_BAYTRAIL_HDA:
case PCI_PRODUCT_INTEL_BSW_HDA:
case PCI_PRODUCT_INTEL_GLK_HDA:
+   case PCI_PRODUCT_INTEL_JSL_HDA:
reg = azalia_pci_read(az->pc, az->tag,
INTEL_PCIE_NOSNOOP_REG);
reg &= INTEL_PCIE_NOSNOOP_MASK;
@@ -495,7 +496,8 @@ const struct pci_matchid azalia_pci_devi
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_200SERIES_U_HDA },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_300SERIES_U_HDA },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_400SERIES_CAVS },
-   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA }
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_500SERIES_LP_HDA },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_HDA },
 };
 
 int
Index: sys/dev/pci/dwiic_pci.c
===
RCS file: /cvs/src/sys/dev/pci/dwiic_pci.c,v
retrieving revision 1.18
diff -u -p -r1.18 dwiic_pci.c
--- sys/dev/pci/dwiic_pci.c 30 Oct 2021 03:27:35 -  1.18
+++ sys/dev/pci/dwiic_pci.c 10 Jan 2022 00:47:08 -
@@ -138,6 +138,12 @@ const struct pci_matchid dwiic_pci_ids[]
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_6 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_7 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_GLK_I2C_8 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_0 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_1 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_JSL_I2C_2 },
+   { PCI_VENDOR_INTEL, PCI_PRODUCT_INTE