platform/x86: ideapad-laptop: Add new _CFG bit numbers for future use
authorEray Orçunus <erayorcunus@gmail.com>
Sat, 29 Oct 2022 12:03:09 +0000 (15:03 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 10:11:41 +0000 (11:11 +0100)
[ Upstream commit be5dd7d8359de9fb22115a63f09981cdf689db4f ]

Later IdeaPads report various things in last 8 bits of _CFG, at least
5 of them represent supported on-screen-displays. Add those bit numbers
to the enum, and use CFG_OSD_ as prefix of their names. Also expose
the values of these bits to debugfs, since they can be useful.

Signed-off-by: Eray Orçunus <erayorcunus@gmail.com>
Acked-by: Ike Panhc <ike.pan@canonical.com>
Link: https://lore.kernel.org/r/20221029120311.11152-5-erayorcunus@gmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/ideapad-laptop.c

index 7192e0d2a14fe7256e9c10e076c8fd0411a16c3b..125b4534424f1ec2405af49513545a32ea38b198 100644 (file)
@@ -46,10 +46,22 @@ static const char *const ideapad_wmi_fnesc_events[] = {
 #endif
 
 enum {
-       CFG_CAP_BT_BIT   = 16,
-       CFG_CAP_3G_BIT   = 17,
-       CFG_CAP_WIFI_BIT = 18,
-       CFG_CAP_CAM_BIT  = 19,
+       CFG_CAP_BT_BIT       = 16,
+       CFG_CAP_3G_BIT       = 17,
+       CFG_CAP_WIFI_BIT     = 18,
+       CFG_CAP_CAM_BIT      = 19,
+
+       /*
+        * These are OnScreenDisplay support bits that can be useful to determine
+        * whether a hotkey exists/should show OSD. But they aren't particularly
+        * meaningful since they were introduced later, i.e. 2010 IdeaPads
+        * don't have these, but they still have had OSD for hotkeys.
+        */
+       CFG_OSD_NUMLK_BIT    = 27,
+       CFG_OSD_CAPSLK_BIT   = 28,
+       CFG_OSD_MICMUTE_BIT  = 29,
+       CFG_OSD_TOUCHPAD_BIT = 30,
+       CFG_OSD_CAM_BIT      = 31,
 };
 
 enum {
@@ -387,6 +399,19 @@ static int debugfs_cfg_show(struct seq_file *s, void *data)
                seq_puts(s, " camera");
        seq_puts(s, "\n");
 
+       seq_puts(s, "OSD support:");
+       if (test_bit(CFG_OSD_NUMLK_BIT, &priv->cfg))
+               seq_puts(s, " num-lock");
+       if (test_bit(CFG_OSD_CAPSLK_BIT, &priv->cfg))
+               seq_puts(s, " caps-lock");
+       if (test_bit(CFG_OSD_MICMUTE_BIT, &priv->cfg))
+               seq_puts(s, " mic-mute");
+       if (test_bit(CFG_OSD_TOUCHPAD_BIT, &priv->cfg))
+               seq_puts(s, " touchpad");
+       if (test_bit(CFG_OSD_CAM_BIT, &priv->cfg))
+               seq_puts(s, " camera");
+       seq_puts(s, "\n");
+
        seq_puts(s, "Graphics: ");
        switch (priv->cfg & 0x700) {
        case 0x100: