From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1D2721C9F1 for ; Mon, 14 Jul 2025 06:10:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752473461; cv=none; b=ScoUnvgb7SxYkP+hvmcWOGMVFeCsQckc09i2ZcMDDLGHxUnMhaqR6y2oTN8KX8M91I851qQsbPz5A0JpQ9RuCSJjq+i5r8LPm/TxkHrxi1jYbg0m3CCxogDzcw/vqfjfy0WT53AqEKSHz8oKJAnFa6yt8vg7SLu6k/0f8LAlYYk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752473461; c=relaxed/simple; bh=e/rH8SD+Tg5pje3Lq+JRo3ekvTZcKBI1NyNIj2hZ318=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kkIBIxU8eJUf1gOKeSUYTEspBM36T8EUT+SWlTcOLWILT7IJqmNCU9zWP94SUShBogwMw9FVlicNRdauEwXhnDe5MXyapoiYI2/Q4CcjIao3isozcqSX7R8JNJe5LkxEhsLL3YqShjIlSUk+/S5zjhcs0fVHvdXQGILjB5UmAzc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rotWQsb+; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rotWQsb+" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-450df53d461so30328425e9.1 for ; Sun, 13 Jul 2025 23:10:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752473458; x=1753078258; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dSes2g4E88oXBSFPDQ6neF7W89c9NwaUqwVhdR4xBqI=; b=rotWQsb+BzRaXaIF9EZasLzZPYnyLA4P5S1PT+5/VWN+Dhgdyo75t/Im2oc/puNMDM r4svFhAoVbTatc2Jeqfv8qnRYvFIWvGq20uJoCzlHiqN1B18XNUtilZ+1JTOEUzcsUsX upmsORqXRWevk6jm6eH4HGoM0UqqRwvU7Mc+JmeWBLssK4ATbh+xhplHXd9NbFHBlHjE StNxdm30CXJ+AI/WNkBSaezuJuaSieyu/t60RYUsKFFKdwC/6Q4oBlp9QVZZzVhHBL2H f/yC25oznPeMr/RKPnPDrWt0fMo95Wk5GN6CHASnkC5/kcCDzJRLK4YHCs3/i2ff/UcH qxQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752473458; x=1753078258; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dSes2g4E88oXBSFPDQ6neF7W89c9NwaUqwVhdR4xBqI=; b=lWDQnkdQiIGM2bS1eatU1iWRjT9ZnPUm7+GZQO8ZXkoovcXJBdzni8L1JAkG5isUM0 +yAg1Ly2uByEKPIH8g65Xzywoi3shr2sX5F3iA1kiXETkmY+ZPQB3W0VddBuHc9JUyls TMtzgUIGbY4F2jUhrZ7fVoWSj5ZsqsnKqBDhoPxY1tpPB8aC6UbHXhNCqSkjVIdiqUSU auh+u6s39sGEc2CHg5Ny01CWAMuoPj0WoD1W4ONWP3motlyT5zZ8iaTaPbiq+cJi9q3r XssDymtSzOA3WJpZUhll4zqIm6J4IvG1QROHgoX0//cpz9L87FErt+vaU+NFc3d5rBkg IUbQ== X-Forwarded-Encrypted: i=1; AJvYcCWcs6UyebsD5MSX2fu0F0bsW62uNyNn58agjyJs7wzCQH4JL1YZqXSyloxwU5yqYBcQuvW2auGdtC4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1U6Ux/yItY53pEsfEIru0XdxvLZ/iGVbVifgE9lDd7NJSVPWY 4uJ9zoqP5iG8fMbePJIqpjccqCTmkshk1/eTnOROLkPU++XSV0KckHMf+oDZGBEcTrc69LOg5Q= = X-Google-Smtp-Source: AGHT+IFULlVjyNemOnSbG4TdMozAA0zsJZsF8hZ5FwjjrDDzQ4zhxHet1bEj5zD9JLh9WJDb+7sgf2zL X-Received: from wmbel18.prod.google.com ([2002:a05:600c:3e12:b0:456:1194:a7e7]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:358f:b0:456:7cf:527a with SMTP id 5b1f17b1804b1-45607cf57cbmr50279335e9.28.1752473458182; Sun, 13 Jul 2025 23:10:58 -0700 (PDT) Date: Mon, 14 Jul 2025 08:08:45 +0200 In-Reply-To: <20250714060843.4029171-5-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250714060843.4029171-5-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=4119; i=ardb@kernel.org; h=from:subject; bh=1185/TpkpWg9isRLFf5wyjQebHCYqV40b1OjCDnfhjU=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIaNk3pfgGfFHvMs1rzs+7g2Z3jR3vmPyZLljMXN3nZu4o j/3A2d6RykLgxgXg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZhI9XmGf+YT5LnE2xivqL3c nC3HM8NQY4PQY8/mbbM+RMQ4nbzY8JqRYeV6Hz0bozMrpnLtY7c4Y8N90k7s2BaRs7se9l/3u/z 3DAMA X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250714060843.4029171-6-ardb+git@google.com> Subject: [RFC PATCH 1/3] efi-rtc: Remove wakeup functionality From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Heinrich Schuchardt , Feng Tang , Alexandre Belloni , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Sunil V L , Bibo Mao , linux-rtc@vger.kernel.org, linux-efi@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, linux-riscv@lists.infradead.org, loongarch@lists.linux.dev Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel The EFI rtc driver is used by non-x86 architectures only, and exposes the get/set wakeup time functionality provided by the underlying platform. This is usually broken on most platforms, and not widely used to begin with [if at all], so let's just remove it. Signed-off-by: Ard Biesheuvel --- drivers/rtc/rtc-efi.c | 76 +------------------- 1 file changed, 2 insertions(+), 74 deletions(-) diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c index fa8bf82df948..b4f44999ef0f 100644 --- a/drivers/rtc/rtc-efi.c +++ b/drivers/rtc/rtc-efi.c @@ -112,48 +112,6 @@ convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime) return true; } -static int efi_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) -{ - efi_time_t eft; - efi_status_t status; - - /* - * As of EFI v1.10, this call always returns an unsupported status - */ - status = efi.get_wakeup_time((efi_bool_t *)&wkalrm->enabled, - (efi_bool_t *)&wkalrm->pending, &eft); - - if (status != EFI_SUCCESS) - return -EINVAL; - - if (!convert_from_efi_time(&eft, &wkalrm->time)) - return -EIO; - - return rtc_valid_tm(&wkalrm->time); -} - -static int efi_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm) -{ - efi_time_t eft; - efi_status_t status; - - convert_to_efi_time(&wkalrm->time, &eft); - - /* - * XXX Fixme: - * As of EFI 0.92 with the firmware I have on my - * machine this call does not seem to work quite - * right - * - * As of v1.10, this call always returns an unsupported status - */ - status = efi.set_wakeup_time((efi_bool_t)wkalrm->enabled, &eft); - - dev_warn(dev, "write status is %d\n", (int)status); - - return status == EFI_SUCCESS ? 0 : -EINVAL; -} - static int efi_read_time(struct device *dev, struct rtc_time *tm) { efi_status_t status; @@ -188,17 +146,13 @@ static int efi_set_time(struct device *dev, struct rtc_time *tm) static int efi_procfs(struct device *dev, struct seq_file *seq) { - efi_time_t eft, alm; + efi_time_t eft; efi_time_cap_t cap; - efi_bool_t enabled, pending; - struct rtc_device *rtc = dev_get_drvdata(dev); memset(&eft, 0, sizeof(eft)); - memset(&alm, 0, sizeof(alm)); memset(&cap, 0, sizeof(cap)); efi.get_time(&eft, &cap); - efi.get_wakeup_time(&enabled, &pending, &alm); seq_printf(seq, "Time\t\t: %u:%u:%u.%09u\n" @@ -214,26 +168,6 @@ static int efi_procfs(struct device *dev, struct seq_file *seq) /* XXX fixme: convert to string? */ seq_printf(seq, "Timezone\t: %u\n", eft.timezone); - if (test_bit(RTC_FEATURE_ALARM, rtc->features)) { - seq_printf(seq, - "Alarm Time\t: %u:%u:%u.%09u\n" - "Alarm Date\t: %u-%u-%u\n" - "Alarm Daylight\t: %u\n" - "Enabled\t\t: %s\n" - "Pending\t\t: %s\n", - alm.hour, alm.minute, alm.second, alm.nanosecond, - alm.year, alm.month, alm.day, - alm.daylight, - enabled == 1 ? "yes" : "no", - pending == 1 ? "yes" : "no"); - - if (alm.timezone == EFI_UNSPECIFIED_TIMEZONE) - seq_puts(seq, "Timezone\t: unspecified\n"); - else - /* XXX fixme: convert to string? */ - seq_printf(seq, "Timezone\t: %u\n", alm.timezone); - } - /* * now prints the capabilities */ @@ -249,8 +183,6 @@ static int efi_procfs(struct device *dev, struct seq_file *seq) static const struct rtc_class_ops efi_rtc_ops = { .read_time = efi_read_time, .set_time = efi_set_time, - .read_alarm = efi_read_alarm, - .set_alarm = efi_set_alarm, .proc = efi_procfs, }; @@ -271,11 +203,7 @@ static int __init efi_rtc_probe(struct platform_device *dev) platform_set_drvdata(dev, rtc); rtc->ops = &efi_rtc_ops; - clear_bit(RTC_FEATURE_UPDATE_INTERRUPT, rtc->features); - if (efi_rt_services_supported(EFI_RT_SUPPORTED_WAKEUP_SERVICES)) - set_bit(RTC_FEATURE_ALARM_WAKEUP_ONLY, rtc->features); - else - clear_bit(RTC_FEATURE_ALARM, rtc->features); + clear_bit(RTC_FEATURE_ALARM, rtc->features); device_init_wakeup(&dev->dev, true); -- 2.50.0.727.gbf7dc18ff4-goog