diff mbox series

matroxfb: cannot determine memory size

Message ID 5da53ec5-3a9c-ec87-da20-69f140aaaa6b@molgen.mpg.de
State New
Headers show
Series matroxfb: cannot determine memory size | expand

Commit Message

Paul Menzel Dec. 15, 2022, 4:39 p.m. UTC
Dear Linux folks,


Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.

## Working:

     [    0.000000] Linux version 5.10.103.mx64.429 
(root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 
2.37) #1 SMP Mon Mar 7 16:41:58 CET 2022
     [    0.000000] Command line: 
BOOT_IMAGE=/boot/bzImage-5.10.103.mx64.429 root=LABEL=root ro 
crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 
init=/bin/systemd audit=0 random.trust_cpu=on 
systemd.unified_cgroup_hierarchy
     […]
     [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 
08/29/2013
     […]
     [   48.045530] matroxfb: Matrox MGA-G200eW (PCI) detected
     [   48.054675] matroxfb: 640x480x8bpp (virtual: 640x13107)
     [   48.059966] matroxfb: framebuffer at 0xC5000000, mapped to 
0x00000000ca7238fa, size 8388608

## Non-working:

### 5.10.110

     [    0.000000] Linux version 5.10.110.mx64.433 
(root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 
2.37) #1 SMP Thu Apr 14 15:28:53 CEST 2022
     [    0.000000] Command line: root=LABEL=root ro 
crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 
init=/bin/systemd audit=0 random.trust_cpu=on 
systemd.unified_cgroup_hierarchy
     […]
     [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 
08/29/2013
     […]
     [   35.225987] matroxfb: Matrox MGA-G200eW (PCI) detected
     [   35.234088] matroxfb: cannot determine memory size
     [   35.238931] matroxfb: probe of 0000:09:03.0 failed with error -1

### 5.15.77

     [    0.000000] Linux version 5.15.77.mx64.440 
(root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU 
Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
     [    0.000000] Command line: root=LABEL=root ro 
crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 
init=/bin/systemd audit=0 random.trust_cpu=on 
systemd.unified_cgroup_hierarchy

     […]
     [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 
04/19/2011
     […]
     [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
     [    9.444502] matroxfb: cannot determine memory size
     [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1

We see it on several systems:

     $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
     0a:03.0 VGA compatible controller [0300]: Matrox Electronics 
Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)

     $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
     09:03.0 VGA compatible controller [0300]: Matrox Electronics 
Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)

I found some old log from April 2022, where I booted 5.10.109, and the 
error is not there, pointing toward the regression to be introduced 
between 5.10.109 and 5.10.110.

```
$ git log --oneline v5.10.109..v5.10.110 --grep fbdev
b1c28577529c video: fbdev: sm712fb: Fix crash in smtcfb_write()
681a317034b2 video: fbdev: udlfb: replace snprintf in show functions 
with sysfs_emit
a7c624abf694 video: fbdev: omapfb: panel-tpo-td043mtea1: Use 
sysfs_emit() instead of snprintf()
543dae0a46b0 video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() 
instead of snprintf()
da210b1b551c video: fbdev: omapfb: acx565akm: replace snprintf with 
sysfs_emit
8c7e2141fb89 video: fbdev: cirrusfb: check pixclock to avoid divide by zero
1e33f197468f video: fbdev: w100fb: Reset global state
08dff4820127 video: fbdev: nvidiafb: Use strscpy() to prevent buffer 
overflow
066d9b48f949 video: fbdev: omapfb: Add missing of_node_put() in 
dvic_probe_of
bf4bad1114a3 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
6de6a64f23a6 video: fbdev: atmel_lcdfb: fix an error code in 
atmel_lcdfb_probe()
64ec3e678d76 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
0dff86aeb191 video: fbdev: controlfb: Fix COMPILE_TEST build
ec1c20b02ae0 video: fbdev: controlfb: Fix set but not used warnings
f8bf19f7f311 video: fbdev: matroxfb: set maxvram of vbG200eW to the same 
as vbG200 to avoid black screen
2ca2a5552a83 video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
72af8810922e video: fbdev: sm712fb: Fix crash in smtcfb_read()
```

Is it worthwhile to test commit f8bf19f7f311 (video: fbdev: matroxfb: 
set maxvram of vbG200eW to the same as vbG200 to avoid black screen)?

The master commit 62d89a7d49a was added to v5.18-rc1, and was also 
backported to the Linux 5.15 series in 5.15.33.


Kind regards,

Paul

Comments

Helge Deller Dec. 15, 2022, 11:02 p.m. UTC | #1
On 12/15/22 17:39, Paul Menzel wrote:
> Dear Linux folks,
>
>
> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
>
> ## Working:
>
>      [    0.000000] Linux version 5.10.103.mx64.429 (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 2.37) #1 SMP Mon Mar 7 16:41:58 CET 2022
>      [    0.000000] Command line: BOOT_IMAGE=/boot/bzImage-5.10.103.mx64.429 root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>      […]
>      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>      […]
>      [   48.045530] matroxfb: Matrox MGA-G200eW (PCI) detected
>      [   48.054675] matroxfb: 640x480x8bpp (virtual: 640x13107)
>      [   48.059966] matroxfb: framebuffer at 0xC5000000, mapped to 0x00000000ca7238fa, size 8388608
>
> ## Non-working:
>
> ### 5.10.110
>
>      [    0.000000] Linux version 5.10.110.mx64.433 (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 2.37) #1 SMP Thu Apr 14 15:28:53 CEST 2022
>      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>      […]
>      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>      […]
>      [   35.225987] matroxfb: Matrox MGA-G200eW (PCI) detected
>      [   35.234088] matroxfb: cannot determine memory size
>      [   35.238931] matroxfb: probe of 0000:09:03.0 failed with error -1
>
> ### 5.15.77
>
>      [    0.000000] Linux version 5.15.77.mx64.440 (root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
>      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>
>      […]
>      [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 04/19/2011
>      […]
>      [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
>      [    9.444502] matroxfb: cannot determine memory size
>      [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1
>
> We see it on several systems:
>
>      $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
>      0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>
>      $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
>      09:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>
> I found some old log from April 2022, where I booted 5.10.109, and the error is not there, pointing toward the regression to be introduced between 5.10.109 and 5.10.110.
>
> ```
> $ git log --oneline v5.10.109..v5.10.110 --grep fbdev
> b1c28577529c video: fbdev: sm712fb: Fix crash in smtcfb_write()
> 681a317034b2 video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
> a7c624abf694 video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
> 543dae0a46b0 video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
> da210b1b551c video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
> 8c7e2141fb89 video: fbdev: cirrusfb: check pixclock to avoid divide by zero
> 1e33f197468f video: fbdev: w100fb: Reset global state
> 08dff4820127 video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
> 066d9b48f949 video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
> bf4bad1114a3 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
> 6de6a64f23a6 video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
> 64ec3e678d76 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
> 0dff86aeb191 video: fbdev: controlfb: Fix COMPILE_TEST build
> ec1c20b02ae0 video: fbdev: controlfb: Fix set but not used warnings
> f8bf19f7f311 video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen
> 2ca2a5552a83 video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
> 72af8810922e video: fbdev: sm712fb: Fix crash in smtcfb_read()
> ```
>
> Is it worthwhile to test commit f8bf19f7f311 (video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen)?

Yes, it is.
Please try and report back.
It seems to be the only relevant patch, and it fits with the name of your card.

Helge


>
> The master commit 62d89a7d49a was added to v5.18-rc1, and was also backported to the Linux 5.15 series in 5.15.33.
>
>
> Kind regards,
>
> Paul
Paul Menzel Dec. 16, 2022, 11:58 a.m. UTC | #2
[Cc: +regressions@, +stable@]

#regzbot ^introduced: 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4


Dear Helge,


Thank you for your prompt reply.

Am 16.12.22 um 00:02 schrieb Helge Deller:
> On 12/15/22 17:39, Paul Menzel wrote:

>> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
>>
>> ## Working:
>>
>>      [    0.000000] Linux version 5.10.103.mx64.429 (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 2.37) #1 SMP Mon Mar 7 16:41:58 CET 2022
>>      [    0.000000] Command line: BOOT_IMAGE=/boot/bzImage-5.10.103.mx64.429 root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>>      […]
>>      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>>      […]
>>      [   48.045530] matroxfb: Matrox MGA-G200eW (PCI) detected
>>      [   48.054675] matroxfb: 640x480x8bpp (virtual: 640x13107)
>>      [   48.059966] matroxfb: framebuffer at 0xC5000000, mapped to 0x00000000ca7238fa, size 8388608
>>
>> ## Non-working:
>>
>> ### 5.10.110
>>
>>      [    0.000000] Linux version 5.10.110.mx64.433 (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU 
>> Binutils) 2.37) #1 SMP Thu Apr 14 15:28:53 CEST 2022
>>      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>>      […]
>>      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>>      […]
>>      [   35.225987] matroxfb: Matrox MGA-G200eW (PCI) detected
>>      [   35.234088] matroxfb: cannot determine memory size
>>      [   35.238931] matroxfb: probe of 0000:09:03.0 failed with error -1
>>
>> ### 5.15.77
>>
>>      [    0.000000] Linux version 5.15.77.mx64.440 (root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
>>      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>>      […]
>>      [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 04/19/2011
>>      […]
>>      [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
>>      [    9.444502] matroxfb: cannot determine memory size
>>      [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1
>>
>> We see it on several systems:
>>
>>      $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
>>      0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>>
>>      $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
>>      09:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>>
>> I found some old log from April 2022, where I booted 5.10.109, and the 
>> error is not there, pointing toward the regression to be introduced 
>> between 5.10.109 and 5.10.110.
>>
>> ```
>> $ git log --oneline v5.10.109..v5.10.110 --grep fbdev

[…]

>> ```
>>
>> Is it worthwhile to test commit f8bf19f7f311 (video: fbdev: matroxfb: 
>> set maxvram of vbG200eW to the same as vbG200 to avoid black screen)?
> 
> Yes, it is.
> Please try and report back.
> It seems to be the only relevant patch, and it fits with the name of 
> your card.

I tested Linus’ master with commit 84e57d292203 (Merge tag 
'exfat-for-6.2-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) and the 
error is still there. Reverting commit fixes the issue.

Tested on:

     DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013

Current master:

     [   36.221595] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
     [   36.228355] Console: switching to colour dummy device 80x25
     [   36.234069] matroxfb: Matrox MGA-G200eW (PCI) detected
     [   36.239316] PInS memtype = 7
     [   36.242198] matroxfb: cannot determine memory size
     [   36.242209] matroxfb: probe of 0000:09:03.0 failed with error -1

After reverting 62d89a7d49af (video: fbdev: matroxfb: set maxvram of 
vbG200eW to the same as vbG200 to avoid black screen):

     [   38.140763] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
     [   38.148057] Console: switching to colour dummy device 80x25
     [   38.153789] matroxfb: Matrox MGA-G200eW (PCI) detected
     [   38.159042] PInS memtype = 7
     [   38.161953] matroxfb: 640x480x8bpp (virtual: 640x13107)
2022-12-16T12:26:11.301999+01:00 invidia kernel: [   38.167175] 
matroxfb: framebuffer at 0xC5000000, mapped to 0x000000006f41c38c, size 
8388608

>> The master commit 62d89a7d49a was added to v5.18-rc1, and was also 
>> backported to the Linux 5.15 series in 5.15.33.


Kind regards,

Paul
Helge Deller Dec. 16, 2022, 9:21 p.m. UTC | #3
* Paul Menzel <pmenzel@molgen.mpg.de>:
> [Cc: +regressions@, +stable@]
>
> #regzbot ^introduced: 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4
>
>
> Dear Helge,
>
>
> Thank you for your prompt reply.
>
> Am 16.12.22 um 00:02 schrieb Helge Deller:
> > On 12/15/22 17:39, Paul Menzel wrote:
>
> > > Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
> > >
> > > ## Working:
> > >
> > >      [    0.000000] Linux version 5.10.103.mx64.429 (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU Binutils) 2.37) #1 SMP Mon Mar 7 16:41:58 CET 2022
> > >      [    0.000000] Command line: BOOT_IMAGE=/boot/bzImage-5.10.103.mx64.429 root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
> > >      […]
> > >      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
> > >      […]
> > >      [   48.045530] matroxfb: Matrox MGA-G200eW (PCI) detected
> > >      [   48.054675] matroxfb: 640x480x8bpp (virtual: 640x13107)
> > >      [   48.059966] matroxfb: framebuffer at 0xC5000000, mapped to 0x00000000ca7238fa, size 8388608
> > >
> > > ## Non-working:
> > >
> > > ### 5.10.110
> > >
> > >      [    0.000000] Linux version 5.10.110.mx64.433
> > > (root@theinternet.molgen.mpg.de) (gcc (GCC) 7.5.0, GNU ld (GNU
> > > Binutils) 2.37) #1 SMP Thu Apr 14 15:28:53 CEST 2022
> > >      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
> > >      […]
> > >      [    0.000000] DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
> > >      […]
> > >      [   35.225987] matroxfb: Matrox MGA-G200eW (PCI) detected
> > >      [   35.234088] matroxfb: cannot determine memory size
> > >      [   35.238931] matroxfb: probe of 0000:09:03.0 failed with error -1
> > >
> > > ### 5.15.77
> > >
> > >      [    0.000000] Linux version 5.15.77.mx64.440 (root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
> > >      [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
> > >      […]
> > >      [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 04/19/2011
> > >      […]
> > >      [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
> > >      [    9.444502] matroxfb: cannot determine memory size
> > >      [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1
> > >
> > > We see it on several systems:
> > >
> > >      $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
> > >      0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
> > >
> > >      $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
> > >      09:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
> > >
> > > I found some old log from April 2022, where I booted 5.10.109, and
> > > the error is not there, pointing toward the regression to be
> > > introduced between 5.10.109 and 5.10.110.
> > >
> > > ```
> > > $ git log --oneline v5.10.109..v5.10.110 --grep fbdev
>
> […]
>
> > > ```
> > >
> > > Is it worthwhile to test commit f8bf19f7f311 (video: fbdev:
> > > matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid
> > > black screen)?
> >
> > Yes, it is.
> > Please try and report back.
> > It seems to be the only relevant patch, and it fits with the name of
> > your card.
>
> I tested Linus’ master with commit 84e57d292203 (Merge tag
> 'exfat-for-6.2-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) and the
> error is still there. Reverting commit fixes the issue.
>
> Tested on:
>
>     DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>
> Current master:
>
>     [   36.221595] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>     [   36.228355] Console: switching to colour dummy device 80x25
>     [   36.234069] matroxfb: Matrox MGA-G200eW (PCI) detected
>     [   36.239316] PInS memtype = 7
>     [   36.242198] matroxfb: cannot determine memory size
>     [   36.242209] matroxfb: probe of 0000:09:03.0 failed with error -1
>
> After reverting 62d89a7d49af (video: fbdev: matroxfb: set maxvram of
> vbG200eW to the same as vbG200 to avoid black screen):
>
>     [   38.140763] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>     [   38.148057] Console: switching to colour dummy device 80x25
>     [   38.153789] matroxfb: Matrox MGA-G200eW (PCI) detected
>     [   38.159042] PInS memtype = 7
>     [   38.161953] matroxfb: 640x480x8bpp (virtual: 640x13107)
> 2022-12-16T12:26:11.301999+01:00 invidia kernel: [   38.167175] matroxfb:
> framebuffer at 0xC5000000, mapped to 0x000000006f41c38c, size 8388608
>
> > > The master commit 62d89a7d49a was added to v5.18-rc1, and was also
> > > backported to the Linux 5.15 series in 5.15.33.

Good.

Could you test if the patch below works for you as well (on top of git master) ?
I believe the commit f8bf19f7f311 (video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen)
changed the wrong value...

If it works, can you send a patch?

Helge


diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index 0d3cee7ae726..5192c7ac459a 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -1378,8 +1378,8 @@ static struct video_board vbG200 = {
 	.lowlevel = &matrox_G100
 };
 static struct video_board vbG200eW = {
-	.maxvram = 0x100000,
-	.maxdisplayable = 0x800000,
+	.maxvram = 0x800000,
+	.maxdisplayable = 0x100000,
 	.accelID = FB_ACCEL_MATROX_MGAG200,
 	.lowlevel = &matrox_G100
 };
Paul Menzel Dec. 19, 2022, 11:58 a.m. UTC | #4
Dear Helge,


Am 16.12.22 um 22:21 schrieb Helge Deller:
> * Paul Menzel <pmenzel@molgen.mpg.de>:
>> [Cc: +regressions@, +stable@]
>>
>> #regzbot ^introduced: 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4

>> Am 16.12.22 um 00:02 schrieb Helge Deller:
>>> On 12/15/22 17:39, Paul Menzel wrote:
>>
>>>> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.

[…]

>>>> ### 5.15.77
>>>>
>>>>       [    0.000000] Linux version 5.15.77.mx64.440 (root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
>>>>       [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>>>>       […]
>>>>       [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 04/19/2011
>>>>       […]
>>>>       [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
>>>>       [    9.444502] matroxfb: cannot determine memory size
>>>>       [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1
>>>>
>>>> We see it on several systems:
>>>>
>>>>       $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
>>>>       0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>>>>
>>>>       $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
>>>>       09:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)

Also Dell PowerEdge R815.

[…]

>> I tested Linus’ master with commit 84e57d292203 (Merge tag
>> 'exfat-for-6.2-rc1' of
>> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) and the
>> error is still there. Reverting commit fixes the issue.
>>
>> Tested on:
>>
>>      DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>>
>> Current master:
>>
>>      [   36.221595] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>>      [   36.228355] Console: switching to colour dummy device 80x25
>>      [   36.234069] matroxfb: Matrox MGA-G200eW (PCI) detected
>>      [   36.239316] PInS memtype = 7
>>      [   36.242198] matroxfb: cannot determine memory size
>>      [   36.242209] matroxfb: probe of 0000:09:03.0 failed with error -1
>>
>> After reverting 62d89a7d49af (video: fbdev: matroxfb: set maxvram of
>> vbG200eW to the same as vbG200 to avoid black screen):
>>
>>      [   38.140763] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>>      [   38.148057] Console: switching to colour dummy device 80x25
>>      [   38.153789] matroxfb: Matrox MGA-G200eW (PCI) detected
>>      [   38.159042] PInS memtype = 7
>>      [   38.161953] matroxfb: 640x480x8bpp (virtual: 640x13107)
>>      [   38.167175] matroxfb: framebuffer at 0xC5000000, mapped to 0x000000006f41c38c, size 8388608
>>
>>>> The master commit 62d89a7d49a was added to v5.18-rc1, and was also
>>>> backported to the Linux 5.15 series in 5.15.33.
> 
> Good.
> 
> Could you test if the patch below works for you as well (on top of
> git master) ? I believe the commit f8bf19f7f311 (video: fbdev:
> matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid
> black screen) changed the wrong value...

> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> index 0d3cee7ae726..5192c7ac459a 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> @@ -1378,8 +1378,8 @@ static struct video_board vbG200 = {
>   	.lowlevel = &matrox_G100
>   };
>   static struct video_board vbG200eW = {
> -	.maxvram = 0x100000,
> -	.maxdisplayable = 0x800000,
> +	.maxvram = 0x800000,
> +	.maxdisplayable = 0x100000,
>   	.accelID = FB_ACCEL_MATROX_MGAG200,
>   	.lowlevel = &matrox_G100
>   };

Thank you. That worked.

     $ dmesg | grep -e matroxfb -e "Linux version" -e "DMI:"
     [    0.000000] Linux version 6.1.0.mx64.440-13147-gfa99506bedb1 
(pmenzel@dontpanic.molgen.mpg.de) (gcc (GCC) 11.1.0, GNU ld (GNU 
Binutils) 2.37) #1 SMP PREEMPT_DYNAMIC Mon Dec 19 12:13:21 CET 2022
     [    0.000000] DMI: Dell Inc. PowerEdge R815/04Y8PT, BIOS 3.4.0 
03/23/2018
     [   29.033666] matroxfb 0000:0a:03.0: vgaarb: deactivate vga console
     [   29.046608] matroxfb: Matrox MGA-G200eW (PCI) detected
     [   29.054769] matroxfb: 640x480x8bpp (virtual: 640x1638)
     [   29.059901] matroxfb: framebuffer at 0xE4000000, mapped to 
0x00000000d36c9776, size 8388608
     [   34.917829] matroxfb: Pixel PLL not locked after 5 secs
     $ lspci -nn -s 0a:03.0
     0a:03.0 VGA compatible controller [0300]: Matrox Electronics 
Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)

> If it works, can you send a patch?

Will do. If you have some explanation though, I could add to the commit 
message, that’d be great.


Kind regards,

Paul
Helge Deller Dec. 19, 2022, 12:19 p.m. UTC | #5
On 12/19/22 12:58, Paul Menzel wrote:
>
> Dear Helge,
>
>
> Am 16.12.22 um 22:21 schrieb Helge Deller:
>> * Paul Menzel <pmenzel@molgen.mpg.de>:
>>> [Cc: +regressions@, +stable@]
>>>
>>> #regzbot ^introduced: 62d89a7d49afe46e6b9bbe9e23b004ad848dbde4
>
>>> Am 16.12.22 um 00:02 schrieb Helge Deller:
>>>> On 12/15/22 17:39, Paul Menzel wrote:
>>>
>>>>> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
>
> […]
>
>>>>> ### 5.15.77
>>>>>
>>>>>       [    0.000000] Linux version 5.15.77.mx64.440 (root@theinternet.molgen.mpg.de) (gcc (GCC) 10.4.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue Nov 8 15:42:33 CET 2022
>>>>>       [    0.000000] Command line: root=LABEL=root ro crashkernel=64G-:256M console=ttyS0,115200n8 console=tty0 init=/bin/systemd audit=0 random.trust_cpu=on systemd.unified_cgroup_hierarchy
>>>>>       […]
>>>>>       [    0.000000] DMI: Dell Inc. PowerEdge R715/0G2DP3, BIOS 1.5.2 04/19/2011
>>>>>       […]
>>>>>       [    9.436420] matroxfb: Matrox MGA-G200eW (PCI) detected
>>>>>       [    9.444502] matroxfb: cannot determine memory size
>>>>>       [    9.449316] matroxfb: probe of 0000:0a:03.0 failed with error -1
>>>>>
>>>>> We see it on several systems:
>>>>>
>>>>>       $ lspci -nn -s 0a:03.0 # Dell PowerEdge R715
>>>>>       0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>>>>>
>>>>>       $ lspci -nn -s 09:03.0 # Dell PowerEdge R910
>>>>>       09:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>
> Also Dell PowerEdge R815.
>
> […]
>
>>> I tested Linus’ master with commit 84e57d292203 (Merge tag
>>> 'exfat-for-6.2-rc1' of
>>> git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) and the
>>> error is still there. Reverting commit fixes the issue.
>>>
>>> Tested on:
>>>
>>>      DMI: Dell Inc. PowerEdge R910/0KYD3D, BIOS 2.10.0 08/29/2013
>>>
>>> Current master:
>>>
>>>      [   36.221595] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>>>      [   36.228355] Console: switching to colour dummy device 80x25
>>>      [   36.234069] matroxfb: Matrox MGA-G200eW (PCI) detected
>>>      [   36.239316] PInS memtype = 7
>>>      [   36.242198] matroxfb: cannot determine memory size
>>>      [   36.242209] matroxfb: probe of 0000:09:03.0 failed with error -1
>>>
>>> After reverting 62d89a7d49af (video: fbdev: matroxfb: set maxvram of
>>> vbG200eW to the same as vbG200 to avoid black screen):
>>>
>>>      [   38.140763] matroxfb 0000:09:03.0: vgaarb: deactivate vga console
>>>      [   38.148057] Console: switching to colour dummy device 80x25
>>>      [   38.153789] matroxfb: Matrox MGA-G200eW (PCI) detected
>>>      [   38.159042] PInS memtype = 7
>>>      [   38.161953] matroxfb: 640x480x8bpp (virtual: 640x13107)
>>>      [   38.167175] matroxfb: framebuffer at 0xC5000000, mapped to 0x000000006f41c38c, size 8388608
>>>
>>>>> The master commit 62d89a7d49a was added to v5.18-rc1, and was also
>>>>> backported to the Linux 5.15 series in 5.15.33.
>>
>> Good.
>>
>> Could you test if the patch below works for you as well (on top of
>> git master) ? I believe the commit f8bf19f7f311 (video: fbdev:
>> matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid
>> black screen) changed the wrong value...
>
>> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
>> index 0d3cee7ae726..5192c7ac459a 100644
>> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
>> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
>> @@ -1378,8 +1378,8 @@ static struct video_board vbG200 = {
>>       .lowlevel = &matrox_G100
>>   };
>>   static struct video_board vbG200eW = {
>> -    .maxvram = 0x100000,
>> -    .maxdisplayable = 0x800000,
>> +    .maxvram = 0x800000,
>> +    .maxdisplayable = 0x100000,
>>       .accelID = FB_ACCEL_MATROX_MGAG200,
>>       .lowlevel = &matrox_G100
>>   };
>
> Thank you. That worked.
>
>      $ dmesg | grep -e matroxfb -e "Linux version" -e "DMI:"
>      [    0.000000] Linux version 6.1.0.mx64.440-13147-gfa99506bedb1 (pmenzel@dontpanic.molgen.mpg.de) (gcc (GCC) 11.1.0, GNU ld (GNU Binutils) 2.37) #1 SMP PREEMPT_DYNAMIC Mon Dec 19 12:13:21 CET 2022
>      [    0.000000] DMI: Dell Inc. PowerEdge R815/04Y8PT, BIOS 3.4.0 03/23/2018
>      [   29.033666] matroxfb 0000:0a:03.0: vgaarb: deactivate vga console
>      [   29.046608] matroxfb: Matrox MGA-G200eW (PCI) detected
>      [   29.054769] matroxfb: 640x480x8bpp (virtual: 640x1638)
>      [   29.059901] matroxfb: framebuffer at 0xE4000000, mapped to 0x00000000d36c9776, size 8388608
>      [   34.917829] matroxfb: Pixel PLL not locked after 5 secs
>      $ lspci -nn -s 0a:03.0
>      0a:03.0 VGA compatible controller [0300]: Matrox Electronics Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>
>> If it works, can you send a patch?
>
> Will do.

Great.

> If you have some explanation though, I could add to the commit message, that’d be great.

Look at the comment in the code, a few lines further down, for the vbG400 card:

/* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for
    whole 32MB */
static struct video_board vbG400 = {
         .maxvram = 0x2000000,
         .maxdisplayable = 0x1000000,

it makes sense to have maxdisplayable smaller than maxvram.
But Z Liu made maxvram lower than maxdisplayable.

Helge
Paul Menzel Jan. 3, 2023, 4:20 p.m. UTC | #6
Dear Thomas,


I have to correct myself.


Am 16.12.22 um 14:16 schrieb Paul Menzel:

> Am 16.12.22 um 13:27 schrieb Thomas Zimmermann:
> 
>> Am 15.12.22 um 17:39 schrieb Paul Menzel:
> 
> […]
> 
>>> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
>>
>> Off-topic, but related. matroxfb is obsolete and there's a maintained 
>> DRM replacement (mgag200) for this hardware.
> 
> I also remembered something like this in the back of my head. Though I 
> thought about using simpledrm (`DRM_SIMPLEDRM`), we do not build though.
> 
>> Is there anything missing from mgag200 that prevents you from switching?
> No, it looks like the matroxfb modules take precedence over the mgag200 
> module:
> 
>      $ grep -e FB_MATROX -e MGAG /boot/config-5.15.77.mx64.440
>      CONFIG_DRM_MGAG200=m
>      CONFIG_FB_MATROX=m
>      CONFIG_FB_MATROX_MILLENIUM=y
>      CONFIG_FB_MATROX_MYSTIQUE=y
>      CONFIG_FB_MATROX_G=y
>      CONFIG_FB_MATROX_I2C=m
>      # CONFIG_FB_MATROX_MAVEN is not set
> 
>      $ lsmod | grep matrox
>      matroxfb_base          28672  0
>      matroxfb_g450          16384  1 matroxfb_base
>      matroxfb_Ti3026        16384  1 matroxfb_base
>      matroxfb_accel         16384  1 matroxfb_base
>      matroxfb_DAC1064       20480  1 matroxfb_base
>      g450_pll               16384  2 matroxfb_g450,matroxfb_DAC1064
>      matroxfb_misc          20480  5 g450_pll,matroxfb_Ti3026,matroxfb_base,matroxfb_g450,matroxfb_DAC1064

The search string was incorrect. The module mgag200, is loaded:

     $ lsmod | grep mgag200
     mgag200                36864  0
     drm_kms_helper        241664  3 mgag200
     drm                   524288  3 drm_kms_helper,mgag200
     i2c_algo_bit           16384  1 mgag200

and it is used according to `lspci`:

     $ lspci -nn -k -s 09:03.
     09:03.0 VGA compatible controller [0300]: Matrox Electronics 
Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
         DeviceName: Embedded Video
         Subsystem: Dell MGA G200eW WPCM450 [1028:02d3]
         Kernel driver in use: mgag200
         Kernel modules: matroxfb_base, mgag200

So, it was only a cosmetic issue.


Kind regards,

Paul
Thomas Zimmermann Jan. 4, 2023, 8:19 a.m. UTC | #7
Hi

Am 03.01.23 um 17:20 schrieb Paul Menzel:
> Dear Thomas,
> 
> 
> I have to correct myself.
> 
> 
> Am 16.12.22 um 14:16 schrieb Paul Menzel:
> 
>> Am 16.12.22 um 13:27 schrieb Thomas Zimmermann:
>>
>>> Am 15.12.22 um 17:39 schrieb Paul Menzel:
>>
>> […]
>>
>>>> Between Linux 5.10.103 and 5.10.110/5.15.77, matrixfb fails to load.
>>>
>>> Off-topic, but related. matroxfb is obsolete and there's a maintained 
>>> DRM replacement (mgag200) for this hardware.
>>
>> I also remembered something like this in the back of my head. Though I 
>> thought about using simpledrm (`DRM_SIMPLEDRM`), we do not build though.
>>
>>> Is there anything missing from mgag200 that prevents you from switching?
>> No, it looks like the matroxfb modules take precedence over the 
>> mgag200 module:
>>
>>      $ grep -e FB_MATROX -e MGAG /boot/config-5.15.77.mx64.440
>>      CONFIG_DRM_MGAG200=m
>>      CONFIG_FB_MATROX=m
>>      CONFIG_FB_MATROX_MILLENIUM=y
>>      CONFIG_FB_MATROX_MYSTIQUE=y
>>      CONFIG_FB_MATROX_G=y
>>      CONFIG_FB_MATROX_I2C=m
>>      # CONFIG_FB_MATROX_MAVEN is not set
>>
>>      $ lsmod | grep matrox
>>      matroxfb_base          28672  0
>>      matroxfb_g450          16384  1 matroxfb_base
>>      matroxfb_Ti3026        16384  1 matroxfb_base
>>      matroxfb_accel         16384  1 matroxfb_base
>>      matroxfb_DAC1064       20480  1 matroxfb_base
>>      g450_pll               16384  2 matroxfb_g450,matroxfb_DAC1064
>>      matroxfb_misc          20480  5 
>> g450_pll,matroxfb_Ti3026,matroxfb_base,matroxfb_g450,matroxfb_DAC1064
> 
> The search string was incorrect. The module mgag200, is loaded:
> 
>      $ lsmod | grep mgag200
>      mgag200                36864  0
>      drm_kms_helper        241664  3 mgag200
>      drm                   524288  3 drm_kms_helper,mgag200
>      i2c_algo_bit           16384  1 mgag200
> 
> and it is used according to `lspci`:
> 
>      $ lspci -nn -k -s 09:03.
>      09:03.0 VGA compatible controller [0300]: Matrox Electronics 
> Systems Ltd. MGA G200eW WPCM450 [102b:0532] (rev 0a)
>          DeviceName: Embedded Video
>          Subsystem: Dell MGA G200eW WPCM450 [1028:02d3]
>          Kernel driver in use: mgag200
>          Kernel modules: matroxfb_base, mgag200
> 
> So, it was only a cosmetic issue.

Thanks for all the feedback. The output shown in your original bug 
report came from matroxfb, so it must have been loaded then. I don't 
know what the preferred order is if multiple modules serve the same 
hardware. Maybe it's random.

Best regards
Thomas

> 
> 
> Kind regards,
> 
> Paul
diff mbox series

Patch

--- /boot/config-5.10.103.mx64.429	2022-03-07 16:50:58.000000000 +0100
+++ /boot/config-5.10.113.mx64.434	2022-04-28 14:09:19.000000000 +0200
@@ -1,6 +1,6 @@ 
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.103 Kernel Configuration
+# Linux/x86 5.10.113 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 7.5.0"
 CONFIG_CC_IS_GCC=y
@@ -21,7 +21,7 @@ 
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION=".mx64.429"
+CONFIG_LOCALVERSION=".mx64.434"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -259,7 +259,6 @@ 
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
-CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
 # end of General setup
@@ -770,7 +769,6 @@ 
 
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
-CONFIG_MODULE_SIG_FORMAT=y
 CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
@@ -778,15 +776,7 @@ 
 CONFIG_MODVERSIONS=y
 CONFIG_ASM_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
-# CONFIG_MODULE_SIG_FORCE is not set
-CONFIG_MODULE_SIG_ALL=y
-CONFIG_MODULE_SIG_SHA1=y
-# CONFIG_MODULE_SIG_SHA224 is not set
-# CONFIG_MODULE_SIG_SHA256 is not set
-# CONFIG_MODULE_SIG_SHA384 is not set
-# CONFIG_MODULE_SIG_SHA512 is not set
-CONFIG_MODULE_SIG_HASH="sha1"
+# CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_UNUSED_SYMBOLS=y
@@ -1071,7 +1061,6 @@ 
 # CONFIG_IPV6_SEG6_LWTUNNEL is not set
 # CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
-# CONFIG_NETLABEL is not set
 # CONFIG_MPTCP is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NET_PTP_CLASSIFY=y
@@ -1352,7 +1341,6 @@ 
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
-# CONFIG_IP_NF_SECURITY is not set
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
@@ -1388,7 +1376,6 @@ 
 CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
-# CONFIG_IP6_NF_SECURITY is not set
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IP6_NF_TARGET_NPT=m
@@ -1810,6 +1797,7 @@ 
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=y
 # CONFIG_PARIDE is not set
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
@@ -2230,10 +2218,10 @@ 
 # end of Distributed Switch Architecture drivers
 
 CONFIG_ETHERNET=y
-CONFIG_MDIO=y
+CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=y
-CONFIG_TYPHOON=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
 CONFIG_NET_VENDOR_ADAPTEC=y
 # CONFIG_ADAPTEC_STARFIRE is not set
 CONFIG_NET_VENDOR_AGERE=y
@@ -2241,7 +2229,7 @@ 
 CONFIG_NET_VENDOR_ALACRITECH=y
 # CONFIG_SLICOSS is not set
 CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_ACENIC=y
+CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 # CONFIG_ALTERA_TSE is not set
 CONFIG_NET_VENDOR_AMAZON=y
@@ -2255,7 +2243,7 @@ 
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
-CONFIG_ATL1=y
+CONFIG_ATL1=m
 # CONFIG_ATL1E is not set
 # CONFIG_ATL1C is not set
 # CONFIG_ALX is not set
@@ -2264,11 +2252,11 @@ 
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
-CONFIG_BNX2=y
+CONFIG_BNX2=m
 # CONFIG_CNIC is not set
-CONFIG_TIGON3=y
+CONFIG_TIGON3=m
 CONFIG_TIGON3_HWMON=y
-CONFIG_BNX2X=y
+CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
 # CONFIG_SYSTEMPORT is not set
 CONFIG_BNXT=m
@@ -2284,13 +2272,13 @@ 
 # CONFIG_THUNDER_NIC_VF is not set
 # CONFIG_THUNDER_NIC_BGX is not set
 # CONFIG_THUNDER_NIC_RGX is not set
-CONFIG_CAVIUM_PTP=y
+CONFIG_CAVIUM_PTP=m
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_CHELSIO_T1=y
+CONFIG_CHELSIO_T1=m
 # CONFIG_CHELSIO_T1_1G is not set
-CONFIG_CHELSIO_T3=y
+CONFIG_CHELSIO_T3=m
 # CONFIG_CHELSIO_T4 is not set
 # CONFIG_CHELSIO_T4VF is not set
 CONFIG_NET_VENDOR_CISCO=y
@@ -2300,19 +2288,19 @@ 
 # CONFIG_DNET is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
-CONFIG_DE2104X=y
+CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=y
+CONFIG_TULIP=m
 # CONFIG_TULIP_MWI is not set
 CONFIG_TULIP_MMIO=y
 CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
-CONFIG_DE4X5=y
+CONFIG_DE4X5=m
 # CONFIG_WINBOND_840 is not set
 # CONFIG_DM9102 is not set
 # CONFIG_ULI526X is not set
 CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DL2K=y
+CONFIG_DL2K=m
 # CONFIG_SUNDANCE is not set
 CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_BE2NET is not set
@@ -2323,13 +2311,13 @@ 
 # CONFIG_HINIC is not set
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
 CONFIG_E1000E_HWTS=y
-CONFIG_IGB=y
+CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
-CONFIG_IGBVF=y
+CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
 CONFIG_IXGBE_HWMON=y
@@ -2342,10 +2330,10 @@ 
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_MVMDIO is not set
-CONFIG_SKGE=y
+CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 # CONFIG_SKGE_GENESIS is not set
-CONFIG_SKY2=y
+CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX4_EN is not set
@@ -2365,7 +2353,7 @@ 
 # CONFIG_NATSEMI is not set
 # CONFIG_NS83820 is not set
 CONFIG_NET_VENDOR_NETERION=y
-CONFIG_S2IO=y
+CONFIG_S2IO=m
 # CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
@@ -2374,7 +2362,7 @@ 
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_FORCEDETH=y
+CONFIG_FORCEDETH=m
 CONFIG_NET_VENDOR_OKI=y
 # CONFIG_ETHOC is not set
 CONFIG_NET_VENDOR_PACKET_ENGINES=y
@@ -2394,13 +2382,13 @@ 
 # CONFIG_R6040 is not set
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_ATP is not set
-CONFIG_8139CP=y
-CONFIG_8139TOO=y
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R8169=y
+CONFIG_R8169=m
 CONFIG_NET_VENDOR_RENESAS=y
 CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
@@ -2412,8 +2400,8 @@ 
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=y
-CONFIG_SIS190=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_EPIC100 is not set
 # CONFIG_SMSC911X is not set
@@ -2436,7 +2424,7 @@ 
 CONFIG_NET_VENDOR_VIA=y
 CONFIG_VIA_RHINE=y
 # CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_VELOCITY=y
+CONFIG_VIA_VELOCITY=m
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
@@ -2446,7 +2434,7 @@ 
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_SB1000 is not set
-CONFIG_PHYLIB=y
+CONFIG_PHYLIB=m
 CONFIG_SWPHY=y
 # CONFIG_LED_TRIGGER_PHY is not set
 CONFIG_FIXED_PHY=m
@@ -2479,7 +2467,7 @@ 
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_QSEMI_PHY is not set
-CONFIG_REALTEK_PHY=y
+CONFIG_REALTEK_PHY=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_ROCKCHIP_PHY is not set
 # CONFIG_SMSC_PHY is not set
@@ -2492,9 +2480,9 @@ 
 # CONFIG_DP83869_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVRES=y
+CONFIG_MDIO_DEVICE=m
+CONFIG_MDIO_BUS=m
+CONFIG_MDIO_DEVRES=m
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_MVUSB is not set
@@ -2793,7 +2781,7 @@ 
 
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=y
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
 
 #
 # I2C Hardware Bus support
@@ -2866,7 +2854,7 @@ 
 # CONFIG_SPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
-CONFIG_PPS=y
+CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
 
 #
@@ -2884,7 +2872,7 @@ 
 #
 # PTP clock support
 #
-CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK=m
 
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
@@ -4752,7 +4740,6 @@ 
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -4901,7 +4888,6 @@ 
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
-CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
@@ -4917,7 +4903,6 @@ 
 # CONFIG_NFSD_SCSILAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
 # CONFIG_NFSD_V4_2_INTER_SSC is not set
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -4933,7 +4918,6 @@ 
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
 CONFIG_CEPH_FS_POSIX_ACL=y
-# CONFIG_CEPH_FS_SECURITY_LABEL is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
@@ -5014,33 +4998,15 @@ 
 # CONFIG_ENCRYPTED_KEYS is not set
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
-CONFIG_SECURITY=y
+# CONFIG_SECURITY is not set
 CONFIG_SECURITYFS=y
-# CONFIG_SECURITY_NETWORK is not set
 CONFIG_PAGE_TABLE_ISOLATION=y
-# CONFIG_SECURITY_PATH is not set
 # CONFIG_INTEL_TXT is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-CONFIG_SECURITY_LOCKDOWN_LSM=y
-# CONFIG_SECURITY_LOCKDOWN_LSM_EARLY is not set
-CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
-# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
-CONFIG_INTEGRITY=y
-# CONFIG_INTEGRITY_SIGNATURE is not set
-CONFIG_INTEGRITY_AUDIT=y
-# CONFIG_IMA is not set
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
-# CONFIG_EVM is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf"
 
@@ -5281,17 +5247,14 @@ 
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
-CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=m
 # CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
-CONFIG_PKCS7_MESSAGE_PARSER=y
-# CONFIG_PKCS7_TEST_KEY is not set
-# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+CONFIG_PKCS7_MESSAGE_PARSER=m
 
 #
 # Certificates for signature checking
 #
-CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
@@ -5320,7 +5283,7 @@ 
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
-CONFIG_CRC_CCITT=y
+CONFIG_CRC_CCITT=m
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
@@ -5390,7 +5353,7 @@ 
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
 CONFIG_DIMLIB=y
-CONFIG_OID_REGISTRY=y
+CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y