From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17CA6233946; Sat, 30 May 2026 01:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780103839; cv=none; b=Qa159mlzliUJ92FJbXawrRSo7QhGW51a3nn7hp+zH/Cy4DBLjVK9ZfTx4HlQMB68O3ThZaB9C/vX+fd+6I/8QGVXfY2RqpEfCzvzWGiitqeOa0ZPpWl+rsykscNzjRxTxB3/PhYQyqbnQ+3qySUPuVCMIKRNqfNZJ+DgQVKCixM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780103839; c=relaxed/simple; bh=nDkSs3GPEQ642DakFs+h7ILQZKhpr4fZwqPFgZvg7cQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hc0JPAdjMBImh2AoU+W+B2azwTKfneGmj2JzmQJBBd70f6z/MwbjWaP4A6fGm44j3DWEEO/z9pPlyxg8smZ27fUsvWiOfpk+/Q+saQJ29Vjr7DEgEgNMc0J1LsTvVf2+H3TOkLbcVPSKOCBlWUmvto8MQ/+67tfzCTTrZe0CpK4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gUmKL6ZR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gUmKL6ZR" Received: by smtp.kernel.org (Postfix) with ESMTPS id B0FF0C2BCC4; Sat, 30 May 2026 01:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1780103838; bh=nDkSs3GPEQ642DakFs+h7ILQZKhpr4fZwqPFgZvg7cQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=gUmKL6ZRaNLp62+FA9qfcfQ6p563MvODFDYoBa5MkbI6O7g93TNJbiENOBsMt+kCt r6NQzVRZAAKc1/3HIOXCAIhJm6b5yUS0zPCeQefcrIupqGz6WS9cb2G50ohVBcBUcO B4Uq9JByCvBwjHYQNrkfrskSPM0u79KHHTn5E4BfCOnG+NyyMhqfXYa9V8tv6wyRDI 9C9s/sHn+9meXyPSeUCFfflakpX61RQjUN5ooDYPrCdgWmYoQOepfK5Zs0UNG1T/IL 7B3HwkedYWtbNhGa4nc66RatdZJ6aTAJRTO1Qn2d2Y5ms1A3x2v8sek+sKuGU2Q0p9 5bK/9rOLzVFtg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB56CD6E53; Sat, 30 May 2026 01:17:18 +0000 (UTC) From: Markus Probst via B4 Relay Date: Sat, 30 May 2026 03:17:12 +0200 Subject: [PATCH v13 2/2] platform: Add initial synology microp driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260530-synology_microp_initial-v13-2-aa2bb9c56efc@posteo.de> References: <20260530-synology_microp_initial-v13-0-aa2bb9c56efc@posteo.de> In-Reply-To: <20260530-synology_microp_initial-v13-0-aa2bb9c56efc@posteo.de> To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Bryan O'Donoghue , Lee Jones , Pavel Machek , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Greg Kroah-Hartman Cc: platform-driver-x86@vger.kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Markus Probst X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=18533; i=markus.probst@posteo.de; h=from:subject:message-id; bh=WXbRMRDVDGz+4r57HMoQ4cG4WL5gHH2Zch61v0UQ8IY=; b=owEBiQJ2/ZANAwAIATR2H/jnrUPSAcsmYgBqGjqd+/rHRcQKimxWg9JmwiqXiSjhcU3q/aQQH mnnAwvNfBaJAk8EAAEIADkWIQSCdBjE9KxY53IwxHM0dh/4561D0gUCaho6nRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMiwyLDIACgkQNHYf+OetQ9KH9w//WeLjvxj5Py8oCCRdGlqm9ciNX7zbYeV JN+7v/QQfMUU3Mam3fPu40rBMSljcSDDwrSIRxj2IMGeGimSwOLHIKGcZtsND98DwqKdi3xElVG urc55JfqTZjWkrqE4AxhDGC1fH8NFz0U6ZBis1STWZBZWUGGNzsSVjk7LQFt3dmCFQSFKD4tQwx 4TtCR3Qqy/g5i+zX3Kta0KzXnjSbYhth0HHAYe8Dg17eSkcuBsV8t4OA8WBZAl/L67mizvZzsLJ cUgk9ppELMTY6AwF2cr5veCZ7wkT0UZiq598OyCpfor+ug/YSplY1v3UnmMpx6RFEhOsS+fp5m9 L9tREbJtyZsWaVgxvFwTkpW76pQ+FB3sapPLKydycxjbMYeewoGiUw/UHIc0jzMP6g/sTiNvHUb zoWog5ixb+TrCCcHWFQo+sKC2rskDYICkfi6aS0z+dWxy1jFVLP/w3YRxY9BFTF/2q7iDgbJu73 Mim5tay1TJI+7WErI8yl2z8dyV6X1jEcBkj5F9hcKZu1XGll5WAlNGuUNR88cva44np10QqF2ww KypTmwRhym5X2VoJ27b93i1LEYmeFl3DHnh+z6LibY4kvyzIfv55phFoks3TG8PfWhMhhbNjLPf dALarfqMFtyHudZPhm1xusS5TogqnHepFsstw+bWcGDOETpxavIA= X-Developer-Key: i=markus.probst@posteo.de; a=openpgp; fpr=827418C4F4AC58E77230C47334761FF8E7AD43D2 X-Endpoint-Received: by B4 Relay for markus.probst@posteo.de/default with auth_id=680 X-Original-From: Markus Probst Reply-To: markus.probst@posteo.de From: Markus Probst Add a initial synology microp driver, written in Rust. The driver targets a microcontroller found in Synology NAS devices. It currently only supports controlling of the power led, status led, alert led and usb led. Other components such as fan control or handling on-device buttons will be added once the required rust abstractions are there. This driver can be used both on arm and x86, thus it goes into the root directory of drivers/platform. Tested successfully on a Synology DS923+. Signed-off-by: Markus Probst --- MAINTAINERS | 7 + drivers/platform/Kconfig | 2 + drivers/platform/Makefile | 1 + drivers/platform/synology_microp/Kconfig | 13 + drivers/platform/synology_microp/Makefile | 3 + drivers/platform/synology_microp/command.rs | 54 ++++ drivers/platform/synology_microp/led.rs | 287 +++++++++++++++++++++ drivers/platform/synology_microp/model.rs | 49 ++++ .../platform/synology_microp/synology_microp.rs | 91 +++++++ 9 files changed, 507 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6e974a518a25..e032b4a1566c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25838,6 +25838,13 @@ F: drivers/dma-buf/sync_* F: include/linux/sync_file.h F: include/uapi/linux/sync_file.h +SYNOLOGY MICROP DRIVER +M: Markus Probst +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/embedded-controller/synology,ds918p-microp.yaml +F: drivers/platform/synology_microp/ + SYNOPSYS ARC ARCHITECTURE M: Vineet Gupta L: linux-snps-arc@lists.infradead.org diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig index 312788f249c9..996050566a4a 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -22,3 +22,5 @@ source "drivers/platform/arm64/Kconfig" source "drivers/platform/raspberrypi/Kconfig" source "drivers/platform/wmi/Kconfig" + +source "drivers/platform/synology_microp/Kconfig" diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile index fa322e7f8716..2381872e9133 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_SURFACE_PLATFORMS) += surface/ obj-$(CONFIG_ARM64_PLATFORM_DEVICES) += arm64/ obj-$(CONFIG_BCM2835_VCHIQ) += raspberrypi/ obj-$(CONFIG_ACPI_WMI) += wmi/ +obj-$(CONFIG_SYNOLOGY_MICROP) += synology_microp/ diff --git a/drivers/platform/synology_microp/Kconfig b/drivers/platform/synology_microp/Kconfig new file mode 100644 index 000000000000..8878cfb7bcdd --- /dev/null +++ b/drivers/platform/synology_microp/Kconfig @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 + +config SYNOLOGY_MICROP + tristate "Synology Microp driver" + depends on LEDS_CLASS && LEDS_CLASS_MULTICOLOR + depends on RUST_SERIAL_DEV_BUS_ABSTRACTIONS + help + Enable support for the EC found in Synology NAS devices. + + This is needed to properly shutdown and reboot the device, as well as + additional functionality like fan and LED control. + + This driver is work in progress and may not be fully functional. diff --git a/drivers/platform/synology_microp/Makefile b/drivers/platform/synology_microp/Makefile new file mode 100644 index 000000000000..63585ccf76e4 --- /dev/null +++ b/drivers/platform/synology_microp/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += synology_microp.o diff --git a/drivers/platform/synology_microp/command.rs b/drivers/platform/synology_microp/command.rs new file mode 100644 index 000000000000..58cb2f3cb3da --- /dev/null +++ b/drivers/platform/synology_microp/command.rs @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::{ + device::Bound, + error::Result, + serdev, // +}; + +use crate::led; + +#[expect( + clippy::enum_variant_names, + reason = "future variants will not end with Led" +)] +pub(crate) enum Command { + PowerLed(led::State), + StatusLed(led::StatusLedColor, led::State), + AlertLed(led::State), + UsbLed(led::State), + EsataLed(led::State), +} + +impl Command { + pub(crate) fn write(self, dev: &serdev::Device) -> Result { + dev.write_all( + match self { + Self::PowerLed(led::State::On) => &[0x34], + Self::PowerLed(led::State::Blink) => &[0x35], + Self::PowerLed(led::State::Off) => &[0x36], + + Self::StatusLed(_, led::State::Off) => &[0x37], + Self::StatusLed(led::StatusLedColor::Green, led::State::On) => &[0x38], + Self::StatusLed(led::StatusLedColor::Green, led::State::Blink) => &[0x39], + Self::StatusLed(led::StatusLedColor::Amber, led::State::On) => &[0x3A], + Self::StatusLed(led::StatusLedColor::Amber, led::State::Blink) => &[0x3B], + + Self::AlertLed(led::State::On) => &[0x4C, 0x41, 0x31], + Self::AlertLed(led::State::Blink) => &[0x4C, 0x41, 0x32], + Self::AlertLed(led::State::Off) => &[0x4C, 0x41, 0x33], + + Self::UsbLed(led::State::On) => &[0x40], + Self::UsbLed(led::State::Blink) => &[0x41], + Self::UsbLed(led::State::Off) => &[0x42], + + Self::EsataLed(led::State::On) => &[0x4C, 0x45, 0x31], + Self::EsataLed(led::State::Blink) => &[0x4C, 0x45, 0x32], + Self::EsataLed(led::State::Off) => &[0x4C, 0x45, 0x33], + }, + serdev::Timeout::Max, + )?; + dev.wait_until_sent(serdev::Timeout::Max); + Ok(()) + } +} diff --git a/drivers/platform/synology_microp/led.rs b/drivers/platform/synology_microp/led.rs new file mode 100644 index 000000000000..6bc347ea199e --- /dev/null +++ b/drivers/platform/synology_microp/led.rs @@ -0,0 +1,287 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::{ + device::Bound, + devres::{ + self, + Devres, // + }, + led::{ + self, + LedOps, + MultiColorSubLed, // + }, + new_mutex, + prelude::*, + serdev, + str::CString, + sync::Mutex, + time::Delta, // +}; +use pin_init::pin_init_scope; + +use crate::{ + command::Command, + model::Model, // +}; + +#[pin_data] +pub(crate) struct Data { + #[pin] + status: Devres>, + power_name: CString, + #[pin] + power: Devres>, +} + +impl Data { + pub(super) fn register<'a>( + dev: &'a serdev::Device, + model: &'a Model, + ) -> impl PinInit + 'a { + pin_init_scope(move || { + if let Some(color) = model.led_alert { + let name = + CString::try_from_fmt(fmt!("synology:{}:alarm", color.as_c_str().to_str()?))?; + devres::register( + dev.as_ref(), + led::DeviceBuilder::new().color(color).name(&name).build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::AlertLed, + }), + ), + GFP_KERNEL, + )?; + } + + if model.led_usb_copy { + devres::register( + dev.as_ref(), + led::DeviceBuilder::new() + .color(led::Color::Green) + .name(c"synology:green:usb") + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::UsbLed, + }), + ), + GFP_KERNEL, + )?; + } + + if model.led_esata { + devres::register( + dev.as_ref(), + led::DeviceBuilder::new() + .color(led::Color::Green) + .name(c"synology:green:esata") + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::EsataLed, + }), + ), + GFP_KERNEL, + )?; + } + + Ok(try_pin_init!(Self { + status <- led::DeviceBuilder::new() + .color(led::Color::Multi) + .name(c"synology:multicolor:status") + .build_multicolor( + dev, + try_pin_init!(StatusLedHandler { + blink <- new_mutex!(false), + }), + StatusLedHandler::SUBLEDS, + ), + power_name: CString::try_from_fmt(fmt!( + "synology:{}:power", + model.led_power.as_c_str().to_str()? + ))?, + power <- led::DeviceBuilder::new() + .color(model.led_power) + .name(power_name) + .build( + dev, + try_pin_init!(LedHandler { + blink <- new_mutex!(false), + command: Command::PowerLed, + }), + ), + })) + }) + } +} + +#[derive(Copy, Clone)] +pub(crate) enum StatusLedColor { + Green, + Amber, +} + +#[derive(Copy, Clone)] +pub(crate) enum State { + On, + Blink, + Off, +} + +#[pin_data] +struct LedHandler { + #[pin] + blink: Mutex, + command: fn(State) -> Command, +} + +/// Blink delay measured using video recording on DS923+ for Power and Status Led. +/// +/// We assume it is the same for all other leds and models. +const BLINK_DELAY: Delta = Delta::from_millis(167); + +#[vtable] +impl LedOps for LedHandler { + type Bus = serdev::Device; + type Mode = led::Normal; + const BLOCKING: bool = true; + const MAX_BRIGHTNESS: u32 = 1; + + fn brightness_set( + &self, + dev: &Self::Bus, + _classdev: &led::Device, + brightness: u32, + ) -> Result<()> { + let mut blink = self.blink.lock(); + (self.command)(if brightness == 0 { + *blink = false; + State::Off + } else if *blink { + State::Blink + } else { + State::On + }) + .write(dev)?; + + Ok(()) + } + + fn blink_set( + &self, + dev: &Self::Bus, + _classdev: &led::Device, + delay_on: &mut usize, + delay_off: &mut usize, + ) -> Result<()> { + let mut blink = self.blink.lock(); + + (self.command)(if *delay_on == 0 && *delay_off != 0 { + *blink = false; + + State::Off + } else if *delay_on != 0 && *delay_off == 0 { + *blink = false; + + State::On + } else { + *blink = true; + *delay_on = BLINK_DELAY.as_millis() as usize; + *delay_off = BLINK_DELAY.as_millis() as usize; + + State::Blink + }) + .write(dev) + } +} + +#[pin_data] +struct StatusLedHandler { + #[pin] + blink: Mutex, +} + +impl StatusLedHandler { + const SUBLEDS: &[MultiColorSubLed] = &[ + MultiColorSubLed::new(led::Color::Green).initial_intensity(1), + MultiColorSubLed::new(led::Color::Amber), + ]; +} + +#[vtable] +impl LedOps for StatusLedHandler { + type Bus = serdev::Device; + type Mode = led::MultiColor; + const BLOCKING: bool = true; + const MAX_BRIGHTNESS: u32 = 1; + + fn brightness_set( + &self, + dev: &Self::Bus, + classdev: &led::MultiColorDevice, + brightness: u32, + ) -> Result<()> { + let mut blink = self.blink.lock(); + if brightness == 0 { + *blink = false; + } + + let (color, subled_brightness) = if classdev.subleds()[1].intensity == 0 { + (StatusLedColor::Green, classdev.subleds()[0].brightness) + } else { + (StatusLedColor::Amber, classdev.subleds()[1].brightness) + }; + + Command::StatusLed( + color, + if subled_brightness == 0 { + State::Off + } else if *blink { + State::Blink + } else { + State::On + }, + ) + .write(dev) + } + + fn blink_set( + &self, + dev: &Self::Bus, + classdev: &led::MultiColorDevice, + delay_on: &mut usize, + delay_off: &mut usize, + ) -> Result<()> { + let mut blink = self.blink.lock(); + *blink = true; + + let (color, subled_intensity) = if classdev.subleds()[1].intensity == 0 { + (StatusLedColor::Green, classdev.subleds()[0].intensity) + } else { + (StatusLedColor::Amber, classdev.subleds()[1].intensity) + }; + Command::StatusLed( + color, + if *delay_on == 0 && *delay_off != 0 { + *blink = false; + State::Off + } else if subled_intensity == 0 { + State::Off + } else if *delay_on != 0 && *delay_off == 0 { + *blink = false; + State::On + } else { + *delay_on = BLINK_DELAY.as_millis() as usize; + *delay_off = BLINK_DELAY.as_millis() as usize; + + State::Blink + }, + ) + .write(dev) + } +} diff --git a/drivers/platform/synology_microp/model.rs b/drivers/platform/synology_microp/model.rs new file mode 100644 index 000000000000..715d8840f56b --- /dev/null +++ b/drivers/platform/synology_microp/model.rs @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::led::Color; + +pub(crate) struct Model { + pub(crate) led_power: Color, + pub(crate) led_alert: Option, + pub(crate) led_usb_copy: bool, + pub(crate) led_esata: bool, +} + +impl Model { + pub(super) const fn new() -> Self { + Self { + led_power: Color::Blue, + led_alert: None, + led_usb_copy: false, + led_esata: false, + } + } + + pub(super) const fn led_power(self, color: Color) -> Self { + Self { + led_power: color, + ..self + } + } + + pub(super) const fn led_alert(self, color: Color) -> Self { + Self { + led_alert: Some(color), + ..self + } + } + + pub(super) const fn led_esata(self) -> Self { + Self { + led_esata: true, + ..self + } + } + + pub(super) const fn led_usb_copy(self) -> Self { + Self { + led_usb_copy: true, + ..self + } + } +} diff --git a/drivers/platform/synology_microp/synology_microp.rs b/drivers/platform/synology_microp/synology_microp.rs new file mode 100644 index 000000000000..4fcab3a1678a --- /dev/null +++ b/drivers/platform/synology_microp/synology_microp.rs @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Synology Microp driver + +use kernel::{ + device, + led::Color, + of::{ + DeviceId, + IdTable, // + }, + of_device_table, + prelude::*, + serdev, // +}; +use pin_init::pin_init_scope; + +use crate::model::Model; + +pub(crate) mod command; +mod led; +mod model; + +kernel::module_serdev_device_driver! { + type: SynologyMicropDriver, + name: "synology_microp", + authors: ["Markus Probst "], + description: "Synology Microp driver", + license: "GPL v2", +} + +#[rustfmt::skip] +of_device_table!( + OF_TABLE, + MODULE_OF_TABLE, + Model, + [ + // apollolake + (DeviceId::new(c"synology,ds918p-microp"), Model::new()), + + // evansport + (DeviceId::new(c"synology,ds214play-microp"), Model::new()), + + // geminilakenk + (DeviceId::new(c"synology,ds225p-microp"), Model::new().led_usb_copy()), + + // pineview + (DeviceId::new(c"synology,ds710p-microp"), Model::new().led_esata()), + (DeviceId::new(c"synology,ds1010p-microp"), Model::new().led_alert(Color::Amber)), + + // rtd1296 + (DeviceId::new(c"synology,ds118-microp"), Model::new()), + + // rtd1619b + (DeviceId::new(c"synology,ds223-microp"), Model::new().led_usb_copy()), + + // v1000 + (DeviceId::new(c"synology,ds1823xsp-microp"), Model::new()), + (DeviceId::new(c"synology,rs1221p-microp"), Model::new().led_power(Color::Green)), + ] +); + +#[pin_data] +struct SynologyMicropDriver { + #[pin] + led: led::Data, +} + +#[vtable] +impl serdev::Driver for SynologyMicropDriver { + type IdInfo = Model; + type Data<'bound> = Self; + const OF_ID_TABLE: Option> = Some(&OF_TABLE); + + fn probe<'bound>( + dev: &'bound serdev::Device>, + model: Option<&'bound Model>, + ) -> impl PinInit + 'bound { + pin_init_scope(move || { + let model = model.ok_or(EINVAL)?; + + dev.set_baudrate(9600).map_err(|_| EINVAL)?; + dev.set_flow_control(false); + dev.set_parity(serdev::Parity::None)?; + + Ok(try_pin_init!(Self { + led <- led::Data::register(dev, model), + })) + }) + } +} -- 2.53.0