summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm64/configs/msm-auto-perf_defconfig2
-rw-r--r--arch/arm64/configs/msm-auto_defconfig1
-rw-r--r--drivers/media/platform/msm/ais/isp/msm_isp_util.c3
-rw-r--r--drivers/rtc/qpnp-rtc.c4
-rw-r--r--drivers/usb/dwc3/gadget.c22
-rw-r--r--drivers/usb/gadget/function/f_hid.c10
-rw-r--r--drivers/usb/gadget/function/f_uac1.c70
-rw-r--r--drivers/usb/misc/diag_ipc_bridge.c18
-rw-r--r--fs/timerfd.c32
-rw-r--r--include/linux/alarmtimer.h5
-rw-r--r--include/uapi/linux/time.h1
-rw-r--r--kernel/time/alarmtimer.c145
12 files changed, 122 insertions, 191 deletions
diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig
index 8b86d1b77ef5..8a25cca76f3e 100644
--- a/arch/arm64/configs/msm-auto-perf_defconfig
+++ b/arch/arm64/configs/msm-auto-perf_defconfig
@@ -459,6 +459,7 @@ CONFIG_USB_CONFIGFS_F_PTP=y
CONFIG_USB_CONFIGFS_F_ACC=y
CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_DIAG=y
CONFIG_USB_CONFIGFS_F_CDEV=y
@@ -546,6 +547,7 @@ CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y
CONFIG_MSM_GLINK_PKT=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
+CONFIG_QCOM_EARLY_DOMAIN=y
CONFIG_QCOM_SCM_XPU=y
CONFIG_QCOM_WATCHDOG_V2=y
CONFIG_QCOM_MEMORY_DUMP_V2=y
diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig
index fa739c220ea1..04bbf64ad7d9 100644
--- a/arch/arm64/configs/msm-auto_defconfig
+++ b/arch/arm64/configs/msm-auto_defconfig
@@ -463,6 +463,7 @@ CONFIG_USB_CONFIGFS_F_PTP=y
CONFIG_USB_CONFIGFS_F_ACC=y
CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_DIAG=y
CONFIG_USB_CONFIGFS_F_CDEV=y
diff --git a/drivers/media/platform/msm/ais/isp/msm_isp_util.c b/drivers/media/platform/msm/ais/isp/msm_isp_util.c
index 8753592d3dbf..83b3dfe68932 100644
--- a/drivers/media/platform/msm/ais/isp/msm_isp_util.c
+++ b/drivers/media/platform/msm/ais/isp/msm_isp_util.c
@@ -24,7 +24,6 @@
#define CREATE_TRACE_POINTS
#include "trace/events/msm_cam.h"
#include "sensor/cci/msm_early_cam.h"
-#include <soc/qcom/early_domain.h>
#define MAX_ISP_V4l2_EVENTS 100
#define MAX_ISP_REG_LIST 100
@@ -2293,8 +2292,6 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
vfe_dev->isp_raw2_debug = 0;
/* Postpone hardware changes until early camera is complete */
- /* Signal LK early camera that Kernel started running AIS */
- request_early_service_shutdown(EARLY_CAMERA);
msm_early_camera_wait();
if (vfe_dev->hw_info->vfe_ops.core_ops.init_hw(vfe_dev) < 0) {
diff --git a/drivers/rtc/qpnp-rtc.c b/drivers/rtc/qpnp-rtc.c
index bafcebb810de..af51225a9066 100644
--- a/drivers/rtc/qpnp-rtc.c
+++ b/drivers/rtc/qpnp-rtc.c
@@ -22,7 +22,6 @@
#include <linux/spmi.h>
#include <linux/platform_device.h>
#include <linux/spinlock.h>
-#include <linux/alarmtimer.h>
/* RTC/ALARM Register offsets */
#define REG_OFFSET_ALARM_RW 0x40
@@ -608,9 +607,6 @@ static int qpnp_rtc_probe(struct platform_device *pdev)
goto fail_rtc_enable;
}
- /* Init power_on_alarm after adding rtc device */
- power_on_alarm_init();
-
/* Request the alarm IRQ */
rc = request_any_context_irq(rtc_dd->rtc_alarm_irq,
qpnp_alarm_trigger, IRQF_TRIGGER_RISING,
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a6e13948041e..f25af85bb6a1 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2640,41 +2640,55 @@ static void dwc3_endpoint_interrupt(struct dwc3 *dwc,
static void dwc3_disconnect_gadget(struct dwc3 *dwc)
{
+ struct usb_gadget_driver *gadget_driver;
+
if (dwc->gadget_driver && dwc->gadget_driver->disconnect) {
+ gadget_driver = dwc->gadget_driver;
spin_unlock(&dwc->lock);
- dwc->gadget_driver->disconnect(&dwc->gadget);
+ dbg_event(0xFF, "DISCONNECT", 0);
+ gadget_driver->disconnect(&dwc->gadget);
spin_lock(&dwc->lock);
}
}
static void dwc3_suspend_gadget(struct dwc3 *dwc)
{
+ struct usb_gadget_driver *gadget_driver;
+
if (dwc->gadget_driver && dwc->gadget_driver->suspend) {
+ gadget_driver = dwc->gadget_driver;
spin_unlock(&dwc->lock);
dbg_event(0xFF, "SUSPEND", 0);
- dwc->gadget_driver->suspend(&dwc->gadget);
+ gadget_driver->suspend(&dwc->gadget);
spin_lock(&dwc->lock);
}
}
static void dwc3_resume_gadget(struct dwc3 *dwc)
{
+ struct usb_gadget_driver *gadget_driver;
+
if (dwc->gadget_driver && dwc->gadget_driver->resume) {
+ gadget_driver = dwc->gadget_driver;
spin_unlock(&dwc->lock);
dbg_event(0xFF, "RESUME", 0);
- dwc->gadget_driver->resume(&dwc->gadget);
+ gadget_driver->resume(&dwc->gadget);
spin_lock(&dwc->lock);
}
}
static void dwc3_reset_gadget(struct dwc3 *dwc)
{
+ struct usb_gadget_driver *gadget_driver;
+
if (!dwc->gadget_driver)
return;
if (dwc->gadget.speed != USB_SPEED_UNKNOWN) {
+ gadget_driver = dwc->gadget_driver;
spin_unlock(&dwc->lock);
- usb_gadget_udc_reset(&dwc->gadget, dwc->gadget_driver);
+ dbg_event(0xFF, "UDC RESET", 0);
+ usb_gadget_udc_reset(&dwc->gadget, gadget_driver);
spin_lock(&dwc->lock);
}
}
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index a5dae5bb62ab..b43de80518b0 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -825,11 +825,21 @@ end:
CONFIGFS_ATTR(f_hid_opts_, report_desc);
+static ssize_t f_hid_opts_dev_show(struct config_item *item, char *page)
+{
+ struct f_hid_opts *opts = to_f_hid_opts(item);
+
+ return sprintf(page, "%d:%d\n", major, opts->minor);
+}
+
+CONFIGFS_ATTR_RO(f_hid_opts_, dev);
+
static struct configfs_attribute *hid_attrs[] = {
&f_hid_opts_attr_subclass,
&f_hid_opts_attr_protocol,
&f_hid_opts_attr_report_length,
&f_hid_opts_attr_report_desc,
+ &f_hid_opts_attr_dev,
NULL,
};
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
index 29efbedc91f9..0445b2e1d8b5 100644
--- a/drivers/usb/gadget/function/f_uac1.c
+++ b/drivers/usb/gadget/function/f_uac1.c
@@ -79,11 +79,6 @@ static struct uac1_ac_header_descriptor_2 ac_header_desc = {
.bcdADC = cpu_to_le16(0x0100),
.wTotalLength = cpu_to_le16(UAC_DT_TOTAL_LENGTH),
.bInCollection = F_AUDIO_NUM_INTERFACES,
- .baInterfaceNr = {
- /* Interface number of the AudioStream interfaces */
- [0] = 1,
- [1] = 2,
- }
};
#define USB_OUT_IT_ID 1
@@ -209,6 +204,13 @@ static struct usb_endpoint_descriptor as_out_ep_desc = {
.bInterval = 4,
};
+static struct usb_ss_ep_comp_descriptor as_out_ep_comp_desc = {
+ .bLength = sizeof(as_out_ep_comp_desc),
+ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+
+ .wBytesPerInterval = cpu_to_le16(1024),
+};
+
/* Class-specific AS ISO OUT Endpoint Descriptor */
static struct uac_iso_endpoint_descriptor as_iso_out_desc = {
.bLength = UAC_ISO_ENDPOINT_DESC_SIZE,
@@ -240,6 +242,13 @@ static struct usb_endpoint_descriptor as_in_ep_desc = {
.bInterval = 4,
};
+static struct usb_ss_ep_comp_descriptor as_in_ep_comp_desc = {
+ .bLength = sizeof(as_in_ep_comp_desc),
+ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+
+ .wBytesPerInterval = cpu_to_le16(1024),
+};
+
/* Class-specific AS ISO OUT Endpoint Descriptor */
static struct uac_iso_endpoint_descriptor as_iso_in_desc = {
.bLength = UAC_ISO_ENDPOINT_DESC_SIZE,
@@ -279,6 +288,37 @@ static struct usb_descriptor_header *f_audio_desc[] = {
NULL,
};
+static struct usb_descriptor_header *f_audio_ss_desc[] = {
+ (struct usb_descriptor_header *)&ac_interface_desc,
+ (struct usb_descriptor_header *)&ac_header_desc,
+
+ (struct usb_descriptor_header *)&usb_out_it_desc,
+ (struct usb_descriptor_header *)&io_out_ot_desc,
+ (struct usb_descriptor_header *)&io_in_it_desc,
+ (struct usb_descriptor_header *)&usb_in_ot_desc,
+
+ (struct usb_descriptor_header *)&as_out_interface_alt_0_desc,
+ (struct usb_descriptor_header *)&as_out_interface_alt_1_desc,
+ (struct usb_descriptor_header *)&as_out_header_desc,
+
+ (struct usb_descriptor_header *)&as_out_type_i_desc,
+
+ (struct usb_descriptor_header *)&as_out_ep_desc,
+ (struct usb_descriptor_header *)&as_out_ep_comp_desc,
+ (struct usb_descriptor_header *)&as_iso_out_desc,
+
+ (struct usb_descriptor_header *)&as_in_interface_alt_0_desc,
+ (struct usb_descriptor_header *)&as_in_interface_alt_1_desc,
+ (struct usb_descriptor_header *)&as_in_header_desc,
+
+ (struct usb_descriptor_header *)&as_in_type_i_desc,
+
+ (struct usb_descriptor_header *)&as_in_ep_desc,
+ (struct usb_descriptor_header *)&as_in_ep_comp_desc,
+ (struct usb_descriptor_header *)&as_iso_in_desc,
+ NULL,
+};
+
enum {
STR_AC_IF,
STR_USB_OUT_IT,
@@ -504,6 +544,7 @@ static void f_audio_disable(struct usb_function *f)
uac1->as_in_alt = 0;
u_audio_stop_capture(&uac1->g_audio);
+ u_audio_stop_playback(&uac1->g_audio);
}
/*-------------------------------------------------------------------------*/
@@ -570,6 +611,7 @@ static int f_audio_bind(struct usb_configuration *c, struct usb_function *f)
status = usb_interface_id(c, f);
if (status < 0)
goto fail;
+ ac_header_desc.baInterfaceNr[0] = status;
as_out_interface_alt_0_desc.bInterfaceNumber = status;
as_out_interface_alt_1_desc.bInterfaceNumber = status;
uac1->as_out_intf = status;
@@ -578,6 +620,7 @@ static int f_audio_bind(struct usb_configuration *c, struct usb_function *f)
status = usb_interface_id(c, f);
if (status < 0)
goto fail;
+ ac_header_desc.baInterfaceNr[1] = status;
as_in_interface_alt_0_desc.bInterfaceNumber = status;
as_in_interface_alt_1_desc.bInterfaceNumber = status;
uac1->as_in_intf = status;
@@ -601,8 +644,8 @@ static int f_audio_bind(struct usb_configuration *c, struct usb_function *f)
audio->in_ep->desc = &as_in_ep_desc;
/* copy descriptors, and track endpoint copies */
- status = usb_assign_descriptors(f, f_audio_desc, f_audio_desc, NULL,
- NULL);
+ status = usb_assign_descriptors(f, f_audio_desc, f_audio_desc,
+ f_audio_ss_desc);
if (status)
goto fail;
@@ -798,5 +841,18 @@ static struct usb_function *f_audio_alloc(struct usb_function_instance *fi)
}
DECLARE_USB_FUNCTION_INIT(uac1, f_audio_alloc_inst, f_audio_alloc);
+
+static int __init afunc_init(void)
+{
+ return usb_function_register(&uac1usb_func);
+}
+
+static void __exit afunc_exit(void)
+{
+ usb_function_unregister(&uac1usb_func);
+}
+
+module_init(afunc_init);
+module_exit(afunc_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Ruslan Bilovol");
diff --git a/drivers/usb/misc/diag_ipc_bridge.c b/drivers/usb/misc/diag_ipc_bridge.c
index cb3aa9375ca3..a487f7c458ed 100644
--- a/drivers/usb/misc/diag_ipc_bridge.c
+++ b/drivers/usb/misc/diag_ipc_bridge.c
@@ -300,6 +300,8 @@ int diag_bridge_read(int id, char *data, int size)
pr_err_ratelimited("submitting urb failed err:%d", ret);
dev->pending_reads--;
usb_unanchor_urb(urb);
+ usb_autopm_put_interface(dev->ifc);
+ goto free_error;
}
if (id == IPC_BRIDGE) {
@@ -307,13 +309,15 @@ int diag_bridge_read(int id, char *data, int size)
ret = dev->read_result;
}
- usb_autopm_put_interface(dev->ifc);
+ usb_free_urb(urb);
+ mutex_unlock(&dev->read_mutex);
+ return ret;
free_error:
usb_free_urb(urb);
put_error:
- if (ret < 0) /* otherwise this is done in the completion handler */
- kref_put(&dev->kref, diag_bridge_delete);
+ /* If URB submit successful, this is done in the completion handler */
+ kref_put(&dev->kref, diag_bridge_delete);
error:
mutex_unlock(&dev->read_mutex);
return ret;
@@ -449,11 +453,15 @@ int diag_bridge_write(int id, char *data, int size)
ret = dev->write_result;
}
+ usb_free_urb(urb);
+ mutex_unlock(&dev->write_mutex);
+ return ret;
+
free_error:
usb_free_urb(urb);
put_error:
- if (ret < 0) /* otherwise this is done in the completion handler */
- kref_put(&dev->kref, diag_bridge_delete);
+ /* If URB submit successful, this is done in the completion handler */
+ kref_put(&dev->kref, diag_bridge_delete);
error:
mutex_unlock(&dev->write_mutex);
return ret;
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 0548c572839c..1327a02ec778 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -50,8 +50,7 @@ static DEFINE_SPINLOCK(cancel_lock);
static inline bool isalarm(struct timerfd_ctx *ctx)
{
return ctx->clockid == CLOCK_REALTIME_ALARM ||
- ctx->clockid == CLOCK_BOOTTIME_ALARM ||
- ctx->clockid == CLOCK_POWEROFF_ALARM;
+ ctx->clockid == CLOCK_BOOTTIME_ALARM;
}
/*
@@ -143,8 +142,7 @@ static void timerfd_setup_cancel(struct timerfd_ctx *ctx, int flags)
{
spin_lock(&ctx->cancel_lock);
if ((ctx->clockid == CLOCK_REALTIME ||
- ctx->clockid == CLOCK_REALTIME_ALARM ||
- ctx->clockid == CLOCK_POWEROFF_ALARM) &&
+ ctx->clockid == CLOCK_REALTIME_ALARM) &&
(flags & TFD_TIMER_ABSTIME) && (flags & TFD_TIMER_CANCEL_ON_SET)) {
if (!ctx->might_cancel) {
ctx->might_cancel = true;
@@ -176,7 +174,6 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
enum hrtimer_mode htmode;
ktime_t texp;
int clockid = ctx->clockid;
- enum alarmtimer_type type;
htmode = (flags & TFD_TIMER_ABSTIME) ?
HRTIMER_MODE_ABS: HRTIMER_MODE_REL;
@@ -187,8 +184,10 @@ static int timerfd_setup(struct timerfd_ctx *ctx, int flags,
ctx->tintv = timespec_to_ktime(ktmr->it_interval);
if (isalarm(ctx)) {
- type = clock2alarm(ctx->clockid);
- alarm_init(&ctx->t.alarm, type, timerfd_alarmproc);
+ alarm_init(&ctx->t.alarm,
+ ctx->clockid == CLOCK_REALTIME_ALARM ?
+ ALARM_REALTIME : ALARM_BOOTTIME,
+ timerfd_alarmproc);
} else {
hrtimer_init(&ctx->t.tmr, clockid, htmode);
hrtimer_set_expires(&ctx->t.tmr, texp);
@@ -388,7 +387,6 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
{
int ufd;
struct timerfd_ctx *ctx;
- enum alarmtimer_type type;
/* Check the TFD_* constants for consistency. */
BUILD_BUG_ON(TFD_CLOEXEC != O_CLOEXEC);
@@ -399,8 +397,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
clockid != CLOCK_REALTIME &&
clockid != CLOCK_REALTIME_ALARM &&
clockid != CLOCK_BOOTTIME &&
- clockid != CLOCK_BOOTTIME_ALARM &&
- clockid != CLOCK_POWEROFF_ALARM))
+ clockid != CLOCK_BOOTTIME_ALARM))
return -EINVAL;
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -411,12 +408,13 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags)
spin_lock_init(&ctx->cancel_lock);
ctx->clockid = clockid;
- if (isalarm(ctx)) {
- type = clock2alarm(ctx->clockid);
- alarm_init(&ctx->t.alarm, type, timerfd_alarmproc);
- } else {
+ if (isalarm(ctx))
+ alarm_init(&ctx->t.alarm,
+ ctx->clockid == CLOCK_REALTIME_ALARM ?
+ ALARM_REALTIME : ALARM_BOOTTIME,
+ timerfd_alarmproc);
+ else
hrtimer_init(&ctx->t.tmr, clockid, HRTIMER_MODE_ABS);
- }
ctx->moffs = ktime_mono_to_real((ktime_t){ .tv64 = 0 });
@@ -488,10 +486,6 @@ static int do_timerfd_settime(int ufd, int flags,
ret = timerfd_setup(ctx, flags, new);
spin_unlock_irq(&ctx->wqh.lock);
-
- if (ctx->clockid == CLOCK_POWEROFF_ALARM)
- set_power_on_alarm();
-
fdput(f);
return ret;
}
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 38a75b5d4792..9333ae59c8c8 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -5,12 +5,10 @@
#include <linux/hrtimer.h>
#include <linux/timerqueue.h>
#include <linux/rtc.h>
-#include <linux/types.h>
enum alarmtimer_type {
ALARM_REALTIME,
ALARM_BOOTTIME,
- ALARM_POWEROFF_REALTIME,
ALARM_NUMTYPE,
};
@@ -50,9 +48,6 @@ void alarm_start_relative(struct alarm *alarm, ktime_t start);
void alarm_restart(struct alarm *alarm);
int alarm_try_to_cancel(struct alarm *alarm);
int alarm_cancel(struct alarm *alarm);
-void set_power_on_alarm(void);
-void power_on_alarm_init(void);
-enum alarmtimer_type clock2alarm(clockid_t clockid);
u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval);
u64 alarm_forward_now(struct alarm *alarm, ktime_t interval);
diff --git a/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 7fe799e867d4..e75e1b6ff27f 100644
--- a/include/uapi/linux/time.h
+++ b/include/uapi/linux/time.h
@@ -56,7 +56,6 @@ struct itimerval {
#define CLOCK_BOOTTIME_ALARM 9
#define CLOCK_SGI_CYCLE 10 /* Hardware specific */
#define CLOCK_TAI 11
-#define CLOCK_POWEROFF_ALARM 12
#define MAX_CLOCKS 16
#define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 271b37995a89..4ac0a040e4ef 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -29,7 +29,6 @@
#ifdef CONFIG_MSM_PM
#include "lpm-levels.h"
#endif
-#include <linux/workqueue.h>
/**
* struct alarm_base - Alarm timer bases
@@ -51,116 +50,12 @@ static ktime_t freezer_delta;
static DEFINE_SPINLOCK(freezer_delta_lock);
static struct wakeup_source *ws;
-static struct delayed_work work;
-static struct workqueue_struct *power_off_alarm_workqueue;
#ifdef CONFIG_RTC_CLASS
/* rtc timer and device for setting alarm wakeups at suspend */
static struct rtc_timer rtctimer;
static struct rtc_device *rtcdev;
static DEFINE_SPINLOCK(rtcdev_lock);
-static struct mutex power_on_alarm_lock;
-static struct alarm init_alarm;
-
-/**
- * power_on_alarm_init - Init power on alarm value
- *
- * Read rtc alarm value after device booting up and add this alarm
- * into alarm queue.
- */
-void power_on_alarm_init(void)
-{
- struct rtc_wkalrm rtc_alarm;
- struct rtc_time rt;
- unsigned long alarm_time;
- struct rtc_device *rtc;
- ktime_t alarm_ktime;
-
- rtc = alarmtimer_get_rtcdev();
-
- if (!rtc)
- return;
-
- rtc_read_alarm(rtc, &rtc_alarm);
- rt = rtc_alarm.time;
-
- rtc_tm_to_time(&rt, &alarm_time);
-
- if (alarm_time) {
- alarm_ktime = ktime_set(alarm_time, 0);
- alarm_init(&init_alarm, ALARM_POWEROFF_REALTIME, NULL);
- alarm_start(&init_alarm, alarm_ktime);
- }
-}
-
-/**
- * set_power_on_alarm - set power on alarm value into rtc register
- *
- * Get the soonest power off alarm timer and set the alarm value into rtc
- * register.
- */
-void set_power_on_alarm(void)
-{
- int rc;
- struct timespec wall_time, alarm_ts;
- long alarm_secs = 0l;
- long rtc_secs, alarm_time, alarm_delta;
- struct rtc_time rtc_time;
- struct rtc_wkalrm alarm;
- struct rtc_device *rtc;
- struct timerqueue_node *next;
- unsigned long flags;
- struct alarm_base *base = &alarm_bases[ALARM_POWEROFF_REALTIME];
-
- rc = mutex_lock_interruptible(&power_on_alarm_lock);
- if (rc != 0)
- return;
-
- spin_lock_irqsave(&base->lock, flags);
- next = timerqueue_getnext(&base->timerqueue);
- spin_unlock_irqrestore(&base->lock, flags);
-
- if (next) {
- alarm_ts = ktime_to_timespec(next->expires);
- alarm_secs = alarm_ts.tv_sec;
- }
-
- if (!alarm_secs)
- goto disable_alarm;
-
- getnstimeofday(&wall_time);
-
- /*
- * alarm_secs have to be bigger than "wall_time +1".
- * It is to make sure that alarm time will be always
- * bigger than wall time.
- */
- if (alarm_secs <= wall_time.tv_sec + 1)
- goto disable_alarm;
-
- rtc = alarmtimer_get_rtcdev();
- if (!rtc)
- goto exit;
-
- rtc_read_time(rtc, &rtc_time);
- rtc_tm_to_time(&rtc_time, &rtc_secs);
- alarm_delta = wall_time.tv_sec - rtc_secs;
- alarm_time = alarm_secs - alarm_delta;
-
- rtc_time_to_tm(alarm_time, &alarm.time);
- alarm.enabled = 1;
- rc = rtc_set_alarm(rtcdev, &alarm);
- if (rc)
- goto disable_alarm;
-
- mutex_unlock(&power_on_alarm_lock);
- return;
-
-disable_alarm:
- rtc_alarm_irq_enable(rtcdev, 0);
-exit:
- mutex_unlock(&power_on_alarm_lock);
-}
static void alarmtimer_triggered_func(void *p)
{
@@ -232,8 +127,6 @@ static void alarmtimer_rtc_remove_device(struct device *dev,
static inline void alarmtimer_rtc_timer_init(void)
{
- mutex_init(&power_on_alarm_lock);
-
rtc_timer_init(&rtctimer, NULL, NULL);
}
@@ -260,14 +153,8 @@ struct rtc_device *alarmtimer_get_rtcdev(void)
static inline int alarmtimer_rtc_interface_setup(void) { return 0; }
static inline void alarmtimer_rtc_interface_remove(void) { }
static inline void alarmtimer_rtc_timer_init(void) { }
-void set_power_on_alarm(void) { }
#endif
-static void alarm_work_func(struct work_struct *unused)
-{
- set_power_on_alarm();
-}
-
/**
* alarmtimer_enqueue - Adds an alarm timer to an alarm_base timerqueue
* @base: pointer to the base where the timer is being run
@@ -337,10 +224,6 @@ static enum hrtimer_restart alarmtimer_fired(struct hrtimer *timer)
}
spin_unlock_irqrestore(&base->lock, flags);
- /* set next power off alarm */
- if (alarm->type == ALARM_POWEROFF_REALTIME)
- queue_delayed_work(power_off_alarm_workqueue, &work, 0);
-
return ret;
}
@@ -434,8 +317,6 @@ static int alarmtimer_suspend(struct device *dev)
int i;
int ret;
- cancel_delayed_work_sync(&work);
-
spin_lock_irqsave(&freezer_delta_lock, flags);
min = freezer_delta;
freezer_delta = ktime_set(0, 0);
@@ -492,7 +373,6 @@ static int alarmtimer_resume(struct device *dev)
return 0;
rtc_timer_cancel(rtc, &rtctimer);
- queue_delayed_work(power_off_alarm_workqueue, &work, 0);
return 0;
}
@@ -673,14 +553,12 @@ EXPORT_SYMBOL_GPL(alarm_forward_now);
* clock2alarm - helper that converts from clockid to alarmtypes
* @clockid: clockid.
*/
-enum alarmtimer_type clock2alarm(clockid_t clockid)
+static enum alarmtimer_type clock2alarm(clockid_t clockid)
{
if (clockid == CLOCK_REALTIME_ALARM)
return ALARM_REALTIME;
if (clockid == CLOCK_BOOTTIME_ALARM)
return ALARM_BOOTTIME;
- if (clockid == CLOCK_POWEROFF_ALARM)
- return ALARM_POWEROFF_REALTIME;
return -1;
}
@@ -1077,13 +955,10 @@ static int __init alarmtimer_init(void)
posix_timers_register_clock(CLOCK_REALTIME_ALARM, &alarm_clock);
posix_timers_register_clock(CLOCK_BOOTTIME_ALARM, &alarm_clock);
- posix_timers_register_clock(CLOCK_POWEROFF_ALARM, &alarm_clock);
/* Initialize alarm bases */
alarm_bases[ALARM_REALTIME].base_clockid = CLOCK_REALTIME;
alarm_bases[ALARM_REALTIME].gettime = &ktime_get_real;
- alarm_bases[ALARM_POWEROFF_REALTIME].base_clockid = CLOCK_REALTIME;
- alarm_bases[ALARM_POWEROFF_REALTIME].gettime = &ktime_get_real;
alarm_bases[ALARM_BOOTTIME].base_clockid = CLOCK_BOOTTIME;
alarm_bases[ALARM_BOOTTIME].gettime = &ktime_get_boottime;
for (i = 0; i < ALARM_NUMTYPE; i++) {
@@ -1105,24 +980,8 @@ static int __init alarmtimer_init(void)
goto out_drv;
}
ws = wakeup_source_register("alarmtimer");
- if (!ws) {
- error = -ENOMEM;
- goto out_ws;
- }
-
- INIT_DELAYED_WORK(&work, alarm_work_func);
- power_off_alarm_workqueue =
- create_singlethread_workqueue("power_off_alarm");
- if (!power_off_alarm_workqueue) {
- error = -ENOMEM;
- goto out_wq;
- }
-
return 0;
-out_wq:
- wakeup_source_unregister(ws);
-out_ws:
- platform_device_unregister(pdev);
+
out_drv:
platform_driver_unregister(&alarmtimer_driver);
out_if:
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-16 08:15:42 +0000