hwdb: fixed modalias for One-netbook OneMix 2s #20562

ghost · 2021-08-28T13:16:51Z

Original: hwdb: add accel matrix for One-netbook OneMix 2s #20068
Problem: Problem with hwdb accel matrix for One-netbook OneMix 2s #20550
Fixed these

So now it is working normally but iio-sensor-proxy.service status show one problem (bottom row; could not find trigger). I don't know if this is iio-sensor-proxy problem or is it my modalias but I show it here if it is any useful for something and/or must be fixed before merging:

● iio-sensor-proxy.service - IIO Sensor Proxy service
     Loaded: loaded (/usr/lib/systemd/system/iio-sensor-proxy.service; static)
     Active: active (running) since Sat 2021-08-28 15:53:14 EEST; 1min 4s ago
   Main PID: 314 (iio-sensor-prox)
      Tasks: 3 (limit: 9414)
     Memory: 1.3M
        CPU: 93ms
     CGroup: /system.slice/iio-sensor-proxy.service
             └─314 /usr/lib/iio-sensor-proxy

elo 28 15:53:14 antin-umpc systemd[1]: Starting IIO Sensor Proxy service...
elo 28 15:53:14 antin-umpc systemd[1]: Started IIO Sensor Proxy service.
elo 28 15:53:14 antin-umpc iio-sensor-prox[314]: Could not find trigger name associated with /sys/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-BOSC0200:00/iio:device0

jwrdegoede · 2021-08-30T07:56:37Z

hwdb.d/60-sensor.hwdb

@@ -693,7 +693,7 @@ sensor:modalias:acpi:SMO8500*:dmi:bvnAmericanMegatrendsInc.:bvr5.6.5:bd07/25/201

 # One-netbook OneMix 2s
 # OneMix 2s has no product name filled, matching entire dmi-alias
-sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.12:bd10/26/2018:br5.12:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnDefaultstring:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:*
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.12:bd10/26/2018:br5.12:svnDefaultstring:pnDefaultstring:pvrDefaultstring:skuDefaultstring:rvnDefaultstring:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
 ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1


By removing the old /sys/class/dmi/id/modalias value you will break this for older kernels, instead of outright replacing it, please add a '*' at the place where newer kernels insert the skuDefaultstring: into the DMI modalias so that it will work with both old and new kernels.

So like this?

sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.12:bd10/26/2018:br5.12:svnDefaultstring:pnDefaultstring:pvrDefaultstring:*:rvnDefaultstring:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:

Almost, you are adding not only a * but also a : extra, so the old string will still not match.

Also I just noticed that you are also dropping the * at the end, that is there deliberately for if the udev rules start adding extra info at the end for narrower matches. So we must keep the * at the end.

So I believe what you want is this: sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.12:bd10/26/2018:br5.12:svnDefaultstring:pnDefaultstring:pvrDefaultstring:*rvnDefaultstring:rnDefaultstring:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:*

Thanks for helping! I created new commit for this.

poettering · 2021-08-30T09:09:36Z

kinda stupid the kernel added this field in the middle. bad idea.

poettering · 2021-08-30T09:10:01Z

also please add comment into the hwdb file why the two lines exist

jwrdegoede · 2021-08-30T09:21:22Z

kinda stupid the kernel added this field in the middle. bad idea.

Agreed

also please add comment into the hwdb file why the two lines exist

I suggested adding a '*' where the extra bit has shown up, so then there still is only 1 line.

jwrdegoede · 2021-08-31T10:12:18Z

@poettering wrote:

kinda stupid the kernel added this field in the middle. bad idea.

So I've been thinking a bit more about this, the change adding the sku field is only present in the 5.13 and the just released 5.14 kernel; and we have a bunch of other modalias matches which are also affected by this.

So I believe that the right fix is to move the sku field to the end of the modalias, which will fix existing modalias matches in hwdb since the all end with a *.

The kernel fix for this can then be added to the stable 5.13.y and 5.14.y series, resolving this on the kernel side.

I will prepare and test a patch for this (I've a GPD win which hwdb entries are also impacted by this) and then submit the kernel fix upstream right away.

This also means that merging this pull-req won't be necessary, since we are going to fix things on the kernel side.

jwrdegoede · 2021-08-31T10:12:24Z

Note the new sku field has already been put to use in 2 new hwdb entries:

sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:*
 ACCEL_LOCATION=base

sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:*
 ACCEL_LOCATION=base

The wildcard use before and after the sku in these matches means that they
should keep working with the sku moved to the end.

jwrdegoede · 2021-08-31T10:43:57Z

Ugh, the kernel folks really messed things up here, there not only is a new :sku...: field, there also is a new(ish) :br...: field. Which has been present since 2020-06-06. And some newer hwdb entries test on that, while others do not:

60-sensors.hwdb dmi:modalias matches with :br###:
One-netbook OneMix 2s
One-netbook OneMix 3s
Voyo Winpad A15

60-sensors.hwdb dmi:modalias matches without :br###:
Chuwi HiBook
Chuwi CoreBook
GPD win
I.T.Works TW891
Onda v975w
Point of View TAB-P800W
Teclast X98 Plus I
Thundersoft TST168 tablet

What a mess :(

Ok, so new plan, I still think that changing the kernel to move the sku field to the end of the modalias is sound, it won't break anything that we know of (it was added specifically for the 2 Dell matches mentioned above).

That leaves the :br...: field mess, since that has been out there in shipped kernels for quite long; and since we actually have a couple of hwdb matches checking for that, we cannot just move that to the end on the kernel side too, that has too big of a chance of causing (other) breakage.

So I will prepare a patch replacing existing :br...: matches with a * and while add it add * where necessary to deal with kernels with the sku field in the middle (since I need to touch all "full" modalias matches anyways).

I'll submit a systemd pull-req for the hwdb part of this plan, this will include a fix for the "One-netbook OneMix 2s
", together with fixing all the other matches, so this pull-req can be closed.

ghost · 2021-08-31T11:58:14Z

I'll submit a systemd pull-req for the hwdb part of this plan, this will include a fix for the "One-netbook OneMix 2s
", together with fixing all the other matches, so this pull-req can be closed.

Thank you! I close this pr.

Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

jwrdegoede · 2021-08-31T13:55:15Z

The kernel patch for moving the sku field to the end has been posted upstream:
https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/

… kernels Recent kernels have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields and a new ":sku<value>:" field has been added between the ":pvr<value>:" and ":rvn<value>:" fields. A kernel-patch moving the sku field to the end of the modalias has been posted upstream: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). To fix all this, this commit makes the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields 3. Replace "pvr<value>:rvn<value>" matches with: "pvr<value>:*rvn<value>" inserting an '*' where newer kernels will have the new sku field This makes these matches working with old as well as new kernels, including with kernels which have the fix to move the sku field to the end. Link: systemd#20550 Link: systemd#20562

jwrdegoede · 2021-08-31T14:15:02Z

And a new systemd pull-req updating all affected dmi modalias matches in hwdb so that they work with all kernel versions is here: #20599

Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <jdelvare@suse.de>

Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

commit f97a210 upstream. Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

… kernels Recent kernels have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: systemd#20550 Link: systemd#20562

… kernels Kernels >= 5.8 have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: systemd#20550 Link: systemd#20562

… kernels Kernels >= 5.8 have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: #20550 Link: #20562

BugLink: https://bugs.launchpad.net/bugs/1946245 commit f97a2103f1a75ca70f23deadb4d96a16c4d85e7d upstream. Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com>

… kernels Kernels >= 5.8 have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: systemd/systemd#20550 Link: systemd/systemd#20562 (cherry picked from commit f813515)

… kernels Kernels >= 5.8 have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: systemd/systemd#20550 Link: systemd/systemd#20562 (cherry picked from commit f813515) (cherry picked from commit 52c9bc1)

BugLink: https://bugs.launchpad.net/bugs/1946245 commit f97a2103f1a75ca70f23deadb4d96a16c4d85e7d upstream. Commit e26f023 ("firmware/dmi: Include product_sku info to modalias") added a new field to the modalias in the middle of the modalias, breaking some existing udev/hwdb matches on the whole modalias without a wildcard ('*') in between the pvr and rvn fields. All modalias matches in e.g. : https://github.com/systemd/systemd/blob/main/hwdb.d/60-sensor.hwdb deliberately end in ':*' so that new fields can be added at *the end* of the modalias, but adding a new field in the middle like this breaks things. Move the new sku field to the end of the modalias to fix some hwdb entries no longer matching. The new sku field has already been put to use in 2 new hwdb entries: sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0A3E:* ACCEL_LOCATION=base sensor:modalias:platform:HID-SENSOR-200073:dmi:*svnDell*:sku0B0B:* ACCEL_LOCATION=base The wildcard use before and after the sku in these matches means that they should keep working with the sku moved to the end. Note that there is a second instance of in essence the same problem, commit f5152f4 ("firmware/dmi: Report DMI Bios & EC firmware release") Added 2 new br and efr fields in the middle of the modalias. This too breaks some hwdb modalias matches, but this has gone unnoticed for over a year. So some newer hwdb modalias matches actually depend on these fields being in the middle of the string. Moving these to the end now would break 3 hwdb entries, while fixing 8 entries. Since there is no good answer for the new br and efr fields I have chosen to leave these as is. Instead I'll submit a hwdb update to put a wildcard at the place where these fields may or may not be present depending on the kernel version. BugLink: systemd/systemd#20550 Link: systemd/systemd#20562 Fixes: e26f023 ("firmware/dmi: Include product_sku info to modalias") Cc: stable@vger.kernel.org Cc: Kai-Chuan Hsieh <kaichuan.hsieh@canonical.com> Cc: Erwan Velu <e.velu@criteo.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com>

… kernels Kernels >= 5.8 have added new fields to the dmi/id/modalias file in the middle of the modalias (instead of adding them at the end). Specifically new ":br<value>:" and (optional) ":efr<value>:" fields have been added between the ":bd<value>:" and ":svn<value>:" fields. Note the 5.13.0 and 5.14.0 kernels also added a new ":sku<value>:" field between the ":pvr<value>:" and ":rvn<value>:" fields, this has been fixed in later 5.13.y and 5.14.y releases, by moving the sku field to the end: https://lore.kernel.org/lkml/20210831130508.14511-1-hdegoede@redhat.com/ Unfortunately the same cannot be done for the new br and efr fields since those have been added more then a year ago and hwdb even already has some newer entries relying on the new br field being there (and thus not working with older kernels). Fix the issue with the br and efr fields through the following changes: 1. Replace any matches on ":br<value>" from newer entries with an '*' 2. Replace "bd<value>:svn<value>" matches with: "bd<value>:*svn<value>" inserting an '*' where newer kernels will have the new br + efr fields This makes these matches working with old as well as new kernels. Link: systemd#20550 Link: systemd#20562

Fixed modalias

8bf82ad

github-actions bot added the hwdb label Aug 28, 2021

jwrdegoede mentioned this pull request Aug 30, 2021

Problem with hwdb accel matrix for One-netbook OneMix 2s #20550

Closed

jwrdegoede suggested changes Aug 30, 2021

View reviewed changes

poettering added the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Aug 30, 2021

Fixed to work with both old and new kernels

b35cc68

ghost closed this Aug 31, 2021

jwrdegoede mentioned this pull request Aug 31, 2021

hwdb: sensors: Fix some modalias matches no longer working with newer kernels #20599

Merged

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

hwdb: fixed modalias for One-netbook OneMix 2s #20562

hwdb: fixed modalias for One-netbook OneMix 2s #20562

Uh oh!

ghost commented Aug 28, 2021

Uh oh!

jwrdegoede Aug 30, 2021

Uh oh!

ghost Aug 30, 2021

Uh oh!

jwrdegoede Aug 30, 2021

Uh oh!

ghost Aug 30, 2021

Uh oh!

poettering commented Aug 30, 2021

Uh oh!

poettering commented Aug 30, 2021

Uh oh!

jwrdegoede commented Aug 30, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

ghost commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

Uh oh!

Uh oh!

hwdb: fixed modalias for One-netbook OneMix 2s #20562

hwdb: fixed modalias for One-netbook OneMix 2s #20562

Uh oh!

Conversation

ghost commented Aug 28, 2021

Uh oh!

jwrdegoede Aug 30, 2021

Choose a reason for hiding this comment

Uh oh!

ghost Aug 30, 2021

Choose a reason for hiding this comment

Uh oh!

jwrdegoede Aug 30, 2021

Choose a reason for hiding this comment

Uh oh!

ghost Aug 30, 2021

Choose a reason for hiding this comment

Uh oh!

poettering commented Aug 30, 2021

Uh oh!

poettering commented Aug 30, 2021

Uh oh!

jwrdegoede commented Aug 30, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

ghost commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

jwrdegoede commented Aug 31, 2021

Uh oh!

Uh oh!