Received-SPF: pass (google.com: domain of linux-kernel+bounces-108309-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Feedback-ID: i5ec1447f:Fastmail
User-Agent: Cyrus-JMAP/3.11.0-alpha0-332-gdeb4194079-fm-20240319.002-gdeb41940
Precedence: bulk
MIME-Version: 1.0
Message-Id: <7276ec7b-9b00-4241-a4eb-a8997daeba5c@app.fastmail.com>
In-Reply-To: <5f853562-cbe0-32d7-2644-d42d2bb9e060@linux.intel.com>
References: <20240310061715.16531-1-luke@ljones.dev>
 <5f853562-cbe0-32d7-2644-d42d2bb9e060@linux.intel.com>
Date: Wed, 20 Mar 2024 14:18:09 +1300
From: "Luke Jones" <luke@ljones.dev>
To: =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>
Cc: platform-driver-x86@vger.kernel.org,
 "Hans de Goede" <hdegoede@redhat.com>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] platform/x86: asus-wmi: support toggling POST sound
Content-Type: text/plain;charset=utf-8
Content-Transfer-Encoding: quoted-printable


On Wed, 20 Mar 2024, at 6:48 AM, Ilpo J=C3=A4rvinen wrote:
> On Sun, 10 Mar 2024, Luke D. Jones wrote:
>=20
> > Add support for toggling the BIOS POST sound on some ASUS laptops.
> >=20
> > Signed-off-by: Luke D. Jones <luke@ljones.dev>
> > ---
> >  .../ABI/testing/sysfs-platform-asus-wmi       |  7 +++
> >  drivers/platform/x86/asus-wmi.c               | 54 ++++++++++++++++=
+++
> >  include/linux/platform_data/x86/asus-wmi.h    |  3 ++
> >  3 files changed, 64 insertions(+)
> >=20
> > diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Doc=
umentation/ABI/testing/sysfs-platform-asus-wmi
> > index e32b4f0ae15f..f3c53b7453f0 100644
> > --- a/Documentation/ABI/testing/sysfs-platform-asus-wmi
> > +++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi
> > @@ -194,3 +194,10 @@ Contact: "Luke Jones" <luke@ljones.dev>
> >  Description:
> >  Set the target temperature limit of the Nvidia dGPU:
> >  * min=3D75, max=3D87
> > +
> > +What: /sys/devices/platform/<platform>/boot_sound
> > +Date: Jun 2023
> > +KernelVersion: 6.9
> > +Contact: "Luke Jones" <luke@ljones.dev>
> > +Description:
> > + Set if the BIOS POST sound is played on boot.
> > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/=
asus-wmi.c
> > index ca8c73c15fcc..26084e9846a1 100644
> > --- a/drivers/platform/x86/asus-wmi.c
> > +++ b/drivers/platform/x86/asus-wmi.c
> > @@ -297,6 +297,7 @@ struct asus_wmi {
> >  // The RSOC controls the maximum charging percentage.
> >  bool battery_rsoc_available;
> > =20
> > + bool boot_sound_available;
> >  bool panel_overdrive_available;
> >  bool mini_led_mode_available;
> >  u32 mini_led_dev_id;
> > @@ -2106,6 +2107,55 @@ static ssize_t panel_od_store(struct device *=
dev,
> >  }
> >  static DEVICE_ATTR_RW(panel_od);
> > =20
> > +/* Bootup sound ***************************************************=
************/
> > +
> > +static ssize_t boot_sound_show(struct device *dev,
> > +      struct device_attribute *attr, char *buf)
> > +{
> > + struct asus_wmi *asus =3D dev_get_drvdata(dev);
> > + int result;
> > +
> > + result =3D asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_BOOT_=
SOUND);
> > + if (result < 0)
> > + return result;
> > +
> > + return sysfs_emit(buf, "%d\n", result);
> > +}
> > +
> > +static ssize_t boot_sound_store(struct device *dev,
> > +       struct device_attribute *attr,
> > +       const char *buf, size_t count)
> > +{
> > + int result, err;
> > + u32 snd;
> > +
> > + struct asus_wmi *asus =3D dev_get_drvdata(dev);
> > +
> > + result =3D kstrtou32(buf, 10, &snd);
> > + if (result)
> > + return result;
> > +
> > + if (snd > 1)
> > + return -EINVAL;
>=20
> Why not just use kstrtobool()?

Consistency with other methods mostly. Plus the possibility that asus mi=
ght do something like add different sounds. I'll change it if a revert b=
ack to kstrtou32 later doesn't break things.

>=20
> > +
> > + err =3D asus_wmi_set_devstate(ASUS_WMI_DEVID_BOOT_SOUND, snd, &res=
ult);
> > +
> > + if (err) {
>=20
> Don't leave empty lines between the call and its error handling.

Got it, thanks.
If there is nothing else I'll submit new version.

>=20
> --=20
> i.
>=20
> > + pr_warn("Failed to set boot sound: %d\n", err);
> > + return err;
> > + }
> > +
> > + if (result > 1) {
> > + pr_warn("Failed to set panel boot sound (result): 0x%x\n", result);
> > + return -EIO;
> > + }
> > +
> > + sysfs_notify(&asus->platform_device->dev.kobj, NULL, "boot_sound");
> > +
> > + return count;
> > +}
> > +static DEVICE_ATTR_RW(boot_sound);
> > +
> >  /* Mini-LED mode **************************************************=
************/
> >  static ssize_t mini_led_mode_show(struct device *dev,
> >     struct device_attribute *attr, char *buf)
> > @@ -4196,6 +4246,7 @@ static struct attribute *platform_attributes[]=
 =3D {
> >  &dev_attr_ppt_platform_sppt.attr,
> >  &dev_attr_nv_dynamic_boost.attr,
> >  &dev_attr_nv_temp_target.attr,
> > + &dev_attr_boot_sound.attr,
> >  &dev_attr_panel_od.attr,
> >  &dev_attr_mini_led_mode.attr,
> >  &dev_attr_available_mini_led_mode.attr,
> > @@ -4248,6 +4299,8 @@ static umode_t asus_sysfs_is_visible(struct ko=
bject *kobj,
> >  ok =3D asus->nv_dyn_boost_available;
> >  else if (attr =3D=3D &dev_attr_nv_temp_target.attr)
> >  ok =3D asus->nv_temp_tgt_available;
> > + else if (attr =3D=3D &dev_attr_boot_sound.attr)
> > + ok =3D asus->boot_sound_available;
> >  else if (attr =3D=3D &dev_attr_panel_od.attr)
> >  ok =3D asus->panel_overdrive_available;
> >  else if (attr =3D=3D &dev_attr_mini_led_mode.attr)
> > @@ -4519,6 +4572,7 @@ static int asus_wmi_add(struct platform_device=
 *pdev)
> >  asus->ppt_plat_sppt_available =3D asus_wmi_dev_is_present(asus, ASU=
S_WMI_DEVID_PPT_PLAT_SPPT);
> >  asus->nv_dyn_boost_available =3D asus_wmi_dev_is_present(asus, ASUS=
_WMI_DEVID_NV_DYN_BOOST);
> >  asus->nv_temp_tgt_available =3D asus_wmi_dev_is_present(asus, ASUS_=
WMI_DEVID_NV_THERM_TARGET);
> > + asus->boot_sound_available =3D asus_wmi_dev_is_present(asus, ASUS_=
WMI_DEVID_BOOT_SOUND);
> >  asus->panel_overdrive_available =3D asus_wmi_dev_is_present(asus, A=
SUS_WMI_DEVID_PANEL_OD);
> >  asus->ally_mcu_usb_switch =3D acpi_has_method(NULL, ASUS_USB0_PWR_E=
C0_CSEE)
> >  && dmi_match(DMI_BOARD_NAME, "RC71L");
> > diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/li=
nux/platform_data/x86/asus-wmi.h
> > index 3e9a01467c67..3eb5cd6773ad 100644
> > --- a/include/linux/platform_data/x86/asus-wmi.h
> > +++ b/include/linux/platform_data/x86/asus-wmi.h
> > @@ -137,6 +137,9 @@
> >  /* TUF laptop RGB power/state */
> >  #define ASUS_WMI_DEVID_TUF_RGB_STATE 0x00100057
> > =20
> > +/* Bootup sound control */
> > +#define ASUS_WMI_DEVID_BOOT_SOUND 0x00130022
> > +
> >  /* DSTS masks */
> >  #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001
> >  #define ASUS_WMI_DSTS_UNKNOWN_BIT 0x00000002
> >=20
>=20