Merge ~os369510/ubuntu/+source/systemd:ubuntu-focal into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal

Proposed by jeremyszu
Status: Merged
Merge reported by: Lukas Märdian
Merged at revision: d5df07782982e97cc73e842026594d7fc2883f5d
Proposed branch: ~os369510/ubuntu/+source/systemd:ubuntu-focal
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal
Diff against target: 79 lines (+65/-0)
2 files modified
debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch (+64/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Lukas Märdian Approve
Julian Andres Klode Approve
Nick Rosbrook Pending
Dimitri John Ledkov Pending
Review via email: mp+418388@code.launchpad.net

Commit message

Same story from lp1955997, some HP machines are using intel-hid instead
of HPQ6001. Thus, add them in the allowing list.
Specify the dmi string precisely to prevent introduce the regression.

Below launchpad tickets could be reference:
from 1966170:
pnHPProBook44014inchG9NotebookPC
pnHPProBook45015.6inchG9NotebookPC

from 1965898:
pnHPElitex36083013inchG92-in-1NotebookPC

from 1966014:
pnHPEliteBook104014inchG9NotebookPC
pnHPEliteBook84014inchG9NotebookPC
pnHPElitex360104014inchG92-in-1NotebookPC
pnHPEliteBook86016inchG9NotebookPC

from 1964913:
pnHPEliteBook64014inchG9NotebookPC
pnHPEliteBook65015.6inchG9NotebookPC

In the mail from HP (please see the lp1966179), HP also confirmed the
previous two platforms' dmi string need to adjust.
pnHPZBookFury16G9MobileWorkstationPC
pnHPZBookStudio16inchG9MobileWorkstationPC

To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

Questions:

1. Is this fixed in jammy? (as this is a SRU for focal)
2. Has this been forwarded upstream or fixed there already?

Revision history for this message
Julian Andres Klode (juliank) :
review: Needs Information
Revision history for this message
jeremyszu (os369510) wrote :

Hi Julian,

1. Yes, but using different method (to unmask intel-hid for all HP machines). In focal (and impish, will propose the MP later), to reduce the regression, we decided to use an allowing list.

2. Yes, the upstream (v250) is already contain the fix (unmask intel-hid for all HP machines) but it will definitely introduce the regression if we backport to focal/impish.
Thus, we just make the Jammy to follow the upstream solution and leave focal/impish to use an allowing list for preventing regression.

For more information, you could refer the description from https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1955997

Revision history for this message
Julian Andres Klode (juliank) wrote :

Makes sense to me

review: Approve
d5df077... by jeremyszu

Add 630/830 13 inch dmi string

Revision history for this message
Lukas Märdian (slyon) wrote :

LGTM overall. we're re-using the allow-list introduced in LP: #1955997 that only affects HP machines, so I consider this a low risk change.

I've combined your two top commits into a single one, mentioning the LP: #1966179 bug number, so it shows up correctly in the debian/changelog.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
2new file mode 100644
3index 0000000..6f1edf8
4--- /dev/null
5+++ b/debian/patches/lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch
6@@ -0,0 +1,64 @@
7+From: Jeremy Szu <jeremy.szu@canonical.com>
8+Date: Thu, 24 Mar 2022 17:04:54 +0000
9+Subject: lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event
10+
11+Same story from lp1955997, some HP machines are using intel-hid instead
12+of HPQ6001. Thus, add them in the allowing list.
13+Specify the dmi string precisely to prevent introduce the regression.
14+
15+Below launchpad tickets could be reference:
16+from 1966170:
17+pnHPProBook44014inchG9NotebookPC
18+pnHPProBook45015.6inchG9NotebookPC
19+
20+from 1965898:
21+pnHPElitex36083013inchG92-in-1NotebookPC
22+
23+from 1966014:
24+pnHPEliteBook104014inchG9NotebookPC
25+pnHPEliteBook84014inchG9NotebookPC
26+pnHPElitex360104014inchG92-in-1NotebookPC
27+pnHPEliteBook86016inchG9NotebookPC
28+
29+from 1964913:
30+pnHPEliteBook64014inchG9NotebookPC
31+pnHPEliteBook65015.6inchG9NotebookPC
32+
33+In the mail from HP (please see the lp1966179), HP also confirmed the
34+previous two platforms' dmi string need to adjust.
35+pnHPZBookFury16G9MobileWorkstationPC
36+pnHPZBookStudio16inchG9MobileWorkstationPC
37+
38+In the MM channel from BillYu and AndyChi, for Thanos13 and Warpath13
39+pnHPEliteBook83013inchG9NotebookPC
40+pnHPEliteBook63013inchG9NotebookPC
41+---
42+ hwdb.d/60-keyboard.hwdb | 15 +++++++++++++--
43+ 1 file changed, 13 insertions(+), 2 deletions(-)
44+
45+diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
46+index 0a8a76d..f56c8a3 100644
47+--- a/hwdb.d/60-keyboard.hwdb
48++++ b/hwdb.d/60-keyboard.hwdb
49+@@ -493,8 +493,19 @@ evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pn*:pvr*
50+ KEYBOARD_KEY_8=unknown # Use hp-wireless instead
51+
52+ # The allowlist to unblock intel-hid on HP machines.
53+-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16inchG9MobileWorkstationPC:pvr*
54+-evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16.0InchMobileWorkstationPC:pvr*
55++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookFury16G9MobileWorkstationPC:pvr*
56++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudio16inchG9MobileWorkstationPC:pvr*
57++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook44014inchG9NotebookPC:pvr*
58++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook45015.6inchG9NotebookPC:pvr*
59++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex36083013inchG92-in-1NotebookPC:pvr*
60++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook104014inchG9NotebookPC:pvr*
61++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook84014inchG9NotebookPC:pvr*
62++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPElitex360104014inchG92-in-1NotebookPC:pvr*
63++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook86016inchG9NotebookPC:pvr*
64++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook64014inchG9NotebookPC:pvr*
65++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook65015.6inchG9NotebookPC:pvr*
66++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook83013inchG9NotebookPC:pvr*
67++evdev:name:Intel HID events:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook63013inchG9NotebookPC:pvr*
68+ KEYBOARD_KEY_8=wlan
69+
70+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:pvr*
71diff --git a/debian/patches/series b/debian/patches/series
72index e0a85c5..fbd232a 100644
73--- a/debian/patches/series
74+++ b/debian/patches/series
75@@ -173,3 +173,4 @@ lp1946388-sd-journal-don-t-check-namespaces-if-we-have-no-name.patch
76 lp1955997-add-a-allowlist-to-unblock-intel-hid-on-HP-mach.patch
77 lp1958284-core-move-reset_arguments-to-the-end-of-main-s-finish.patch
78 pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
79+lp1966179-add-more-hp-dmi-to-unblock-intel-hid-event.patch

Subscribers

People subscribed via source and target branches