mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-23 14:48:07 +00:00
Manually rebuild pending patches: - 103-kbuild-export-SUBARCH.patch - 141-jffs2-add-RENAME_EXCHANGE-support.patch - 200-ARM-9404-1-arm32-fix-boot-hang-with-HAVE_LD_DEAD_COD.patch - 203-kallsyms_uncompressed.patch - 270-platform-mikrotik-build-bits.patch - 308-mips32r2_tune.patch - 330-MIPS-kexec-Accept-command-line-parameters-from-users.patch - 402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch - 451-block-partitions-populate-fwnode.patch - 476-mtd-spi-nor-add-eon-en25q128.patch - 477-mtd-spi-nor-add-eon-en25qx128a.patch - 479-mtd-spi-nor-add-xtx-xt25f128b.patch - 481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch - 482-mtd-spi-nor-add-gd25q512.patch - 484-mtd-spi-nor-add-esmt-f25l16pa.patch - 485-mtd-spi-nor-add-xmc-xm25qh128c.patch - 488-mtd-spi-nor-add-xmc-xm25qh64c.patch - 490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch - 497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch - 498-mtd-spi-nor-locking-support-for-MX25L6405D.patch - 510-block-add-uImage.FIT-subimage-block-driver.patch - 530-jffs2_make_lzma_available.patch - 630-packet_socket_type.patch - 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch - 681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch - 700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch - 702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch - 706-net-phy-populate-host_interfaces-when-attaching-PHY.patch - 711-03-net-dsa-qca8k-add-support-for-port_change_master.patch - 734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch - 736-03-net-ethernet-mtk_eth_soc-improve-keeping-track-of-of.patch - 737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch - 739-03-net-pcs-pcs-mtk-lynxi-add-platform-driver-for-MT7988.patch - 801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch - 809-01-nvmem-core-generalize-mac-base-cells-handling.patch - 811-pci_disable_usb_common_quirks.patch - 834-ledtrig-libata.patch - 892-leds-Add-LED1202-I2C-driver.patch - 920-mangle_bootargs.patch Co-authored-by: Aditya Nugraha <vortexilation@gmail.com> Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> [ improve commit title + minor fixes ] Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
146 lines
4.0 KiB
Diff
146 lines
4.0 KiB
Diff
From: Daniel Golle <daniel@makrotopia.org>
|
|
Subject: libata: add ledtrig support
|
|
|
|
This adds a LED trigger for each ATA port indicating disk activity.
|
|
|
|
As this is needed only on specific platforms (NAS SoCs and such),
|
|
these platforms should define ARCH_WANTS_LIBATA_LEDS if there
|
|
are boards with LED(s) intended to indicate ATA disk activity and
|
|
need the OS to take care of that.
|
|
In that way, if not selected, LED trigger support not will be
|
|
included in libata-core and both, codepaths and structures remain
|
|
untouched.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/ata/Kconfig | 16 ++++++++++++++++
|
|
drivers/ata/libata-core.c | 41 +++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/libata.h | 9 +++++++++
|
|
3 files changed, 66 insertions(+)
|
|
|
|
--- a/drivers/ata/Kconfig
|
|
+++ b/drivers/ata/Kconfig
|
|
@@ -67,6 +67,22 @@ config ATA_FORCE
|
|
|
|
If unsure, say Y.
|
|
|
|
+config ARCH_WANT_LIBATA_LEDS
|
|
+ bool
|
|
+
|
|
+config ATA_LEDS
|
|
+ bool "support ATA port LED triggers"
|
|
+ depends on ARCH_WANT_LIBATA_LEDS
|
|
+ select NEW_LEDS
|
|
+ select LEDS_CLASS
|
|
+ select LEDS_TRIGGERS
|
|
+ default y
|
|
+ help
|
|
+ This option adds a LED trigger for each registered ATA port.
|
|
+ It is used to drive disk activity leds connected via GPIO.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
config ATA_ACPI
|
|
bool "ATA ACPI Support"
|
|
depends on ACPI
|
|
--- a/drivers/ata/libata-core.c
|
|
+++ b/drivers/ata/libata-core.c
|
|
@@ -703,6 +703,17 @@ static inline void ata_set_tf_cdl(struct
|
|
qc->flags |= ATA_QCFLAG_HAS_CDL | ATA_QCFLAG_RESULT_TF;
|
|
}
|
|
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+#define LIBATA_BLINK_DELAY 20 /* ms */
|
|
+static inline void ata_led_act(struct ata_port *ap)
|
|
+{
|
|
+ if (unlikely(!ap->ledtrig))
|
|
+ return;
|
|
+
|
|
+ led_trigger_blink_oneshot(ap->ledtrig, LIBATA_BLINK_DELAY, LIBATA_BLINK_DELAY, 0);
|
|
+}
|
|
+#endif
|
|
+
|
|
/**
|
|
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
|
* @qc: Metadata associated with the taskfile to build
|
|
@@ -4767,6 +4778,9 @@ void __ata_qc_complete(struct ata_queued
|
|
link->active_tag = ATA_TAG_POISON;
|
|
ap->nr_active_links--;
|
|
}
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+ ata_led_act(ap);
|
|
+#endif
|
|
|
|
/* clear exclusive status */
|
|
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
|
|
@@ -5489,6 +5503,9 @@ struct ata_port *ata_port_alloc(struct a
|
|
ap->stats.unhandled_irq = 1;
|
|
ap->stats.idle_irq = 1;
|
|
#endif
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+ ap->ledtrig = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);
|
|
+#endif
|
|
ata_sff_port_init(ap);
|
|
|
|
ata_force_pflags(ap);
|
|
@@ -5505,6 +5522,12 @@ void ata_port_free(struct ata_port *ap)
|
|
kfree(ap->pmp_link);
|
|
kfree(ap->slave_link);
|
|
ida_free(&ata_ida, ap->print_id);
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+ if (ap->ledtrig) {
|
|
+ led_trigger_unregister(ap->ledtrig);
|
|
+ kfree(ap->ledtrig);
|
|
+ };
|
|
+#endif
|
|
kfree(ap);
|
|
}
|
|
EXPORT_SYMBOL_GPL(ata_port_free);
|
|
@@ -5909,7 +5932,23 @@ int ata_host_register(struct ata_host *h
|
|
WARN_ON(1);
|
|
return -EINVAL;
|
|
}
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+ for (i = 0; i < host->n_ports; i++) {
|
|
+ if (unlikely(!host->ports[i]->ledtrig))
|
|
+ continue;
|
|
|
|
+ snprintf(host->ports[i]->ledtrig_name,
|
|
+ sizeof(host->ports[i]->ledtrig_name), "ata%u",
|
|
+ host->ports[i]->print_id);
|
|
+
|
|
+ host->ports[i]->ledtrig->name = host->ports[i]->ledtrig_name;
|
|
+
|
|
+ if (led_trigger_register(host->ports[i]->ledtrig)) {
|
|
+ kfree(host->ports[i]->ledtrig);
|
|
+ host->ports[i]->ledtrig = NULL;
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
/* Create associated sysfs transport objects */
|
|
for (i = 0; i < host->n_ports; i++) {
|
|
rc = ata_tport_add(host->dev,host->ports[i]);
|
|
--- a/include/linux/libata.h
|
|
+++ b/include/linux/libata.h
|
|
@@ -23,6 +23,9 @@
|
|
#include <linux/cdrom.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/async.h>
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+#include <linux/leds.h>
|
|
+#endif
|
|
|
|
/*
|
|
* Define if arch has non-standard setup. This is a _PCI_ standard
|
|
@@ -934,6 +937,10 @@ struct ata_port {
|
|
#ifdef CONFIG_ATA_ACPI
|
|
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
|
#endif
|
|
+#ifdef CONFIG_ATA_LEDS
|
|
+ struct led_trigger *ledtrig;
|
|
+ char ledtrig_name[8];
|
|
+#endif
|
|
};
|
|
|
|
/* The following initializer overrides a method to NULL whether one of
|