From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0D17C433EF for ; Mon, 25 Oct 2021 07:26:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C20E60F9C for ; Mon, 25 Oct 2021 07:26:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231708AbhJYH2d (ORCPT ); Mon, 25 Oct 2021 03:28:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231189AbhJYH2b (ORCPT ); Mon, 25 Oct 2021 03:28:31 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE56FC061745; Mon, 25 Oct 2021 00:26:09 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id gn3so7591983pjb.0; Mon, 25 Oct 2021 00:26:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=p3xNnrHH4M53rb1GiCHYlSdPI2McsQhnl+07FcsHktg=; b=oYYVXLFk3S8fMRnc+slFQ8Mwa8cl/VBoK0axh2kjatf6xy8YME5qFfTHuwAbVs6xSK NjA0JUQMBsL+WD9ge2GGhmXcyyCNug+Dl/VI4F4wLBIIEaZunfHt+Ibs08O7zsP7n6eL sPjHtJ3qs9aGV5HNTTMaYtI1M52wMfd2jh5rOL4M2oGt7zj2ty7nTeMNrQ17L+2UMHb3 AFlNj788REFhO301YnzLGyAIyvD9c3AO0fgLtvtsPFEfp/fnOoL8iuIX0DrSsazyW6qT VsdNbTrEMVFAuk4xRrsqrVi+bsAwW+5mnvYqaFIZh4+XtEYi8i8LpQmE2fjSxpYREh9X 4cow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=p3xNnrHH4M53rb1GiCHYlSdPI2McsQhnl+07FcsHktg=; b=WbatgsGu7nF+Act86YIDQ6s2rqq+xXeQWdPRZckg1eAaSxG0dfOSyqPGwz9kIk/u9a cWjdUiEugwXinzGpU2qDSzjfPDz4g/ukhXhrstl42F6CpsMQ8uYWQgfyEWhryC9WjY3Q /TUbFEyxk2yFG75X5XrTNco2W7DH/bhh0Qu5rgG/iZWDtCZG1E3zSQNFPtEHm929v4Ai Dv67lC+vSJU2jnNy5F6QnNUA129/MmgE7xouhKzYTKTu0jQiSgJUGOa0gsVA4zVgjXhk qxcmhgldDR4xylCbSr8NnXmIZydp6HAjKAzUfH+q61SabKvfwB2dF6s94StkHr2L5skM wxJQ== X-Gm-Message-State: AOAM531V6BoEKEuX8qj03OSZm0IeBgX8A+QRk6QCy37F1PieCA7pyzIE 7XTyCNT2gDQesEgqyjhqu44= X-Google-Smtp-Source: ABdhPJzaL1yOJQP8Kh519CjECLZi7MQrGD0Wfn9FQG0amNPdQozfRqzr/xyQv6sbMpe+LZ0jZ6Udug== X-Received: by 2002:a17:90b:33c7:: with SMTP id lk7mr18632052pjb.172.1635146769220; Mon, 25 Oct 2021 00:26:09 -0700 (PDT) Received: from localhost.localdomain (c-73-222-199-61.hsd1.ca.comcast.net. [73.222.199.61]) by smtp.googlemail.com with ESMTPSA id c3sm10271134pji.0.2021.10.25.00.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 00:26:08 -0700 (PDT) From: Hill Ma To: benh@kernel.crashing.org, linuxppc-dev@lists.ozlabs.org Cc: Hill Ma , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH] macintosh/via-pmu-led: make disk activity usage a parameter. Date: Mon, 25 Oct 2021 00:25:08 -0700 Message-Id: <20211025072508.8667-1-maahiuzeon@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Whether to use the LED as a disk activity is a user preference. Some like this usage while others find the LED too bright. So it might be a good idea to make this choice a runtime parameter rather than compile-time config. The default is set to disabled as OS X does not use the LED as a disk activity indicator. Signed-off-by: Hill Ma --- Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ drivers/macintosh/Kconfig | 10 ---------- drivers/macintosh/via-pmu-led.c | 11 ++++++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 43dc35fe5bc0..a656a51ba0a8 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -250,6 +250,12 @@ Use timer override. For some broken Nvidia NF5 boards that require a timer override, but don't have HPET + adb_pmu_led_disk [PPC] + Use front LED as disk LED by default. Only applies to + PowerBook, iBook, PowerMac 7,2/7,3. + Format: (1/Y/y=enable, 0/N/n=disable) + Default: disabled + add_efi_memmap [EFI; X86] Include EFI memory map in kernel's map of available physical RAM. diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 5cdc361da37c..243215de563c 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig @@ -78,16 +78,6 @@ config ADB_PMU_LED behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this and the disk LED trigger and configure appropriately through sysfs. -config ADB_PMU_LED_DISK - bool "Use front LED as DISK LED by default" - depends on ADB_PMU_LED - depends on LEDS_CLASS - select LEDS_TRIGGERS - select LEDS_TRIGGER_DISK - help - This option makes the front LED default to the disk trigger - so that it blinks on disk activity. - config PMAC_SMU bool "Support for SMU based PowerMacs" depends on PPC_PMAC64 diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index ae067ab2373d..838dcf98f82e 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c @@ -25,6 +25,7 @@ #include #include #include +#include #include static spinlock_t pmu_blink_lock; @@ -71,11 +72,10 @@ static void pmu_led_set(struct led_classdev *led_cdev, spin_unlock_irqrestore(&pmu_blink_lock, flags); } +int adb_pmu_led_disk; + static struct led_classdev pmu_led = { .name = "pmu-led::front", -#ifdef CONFIG_ADB_PMU_LED_DISK - .default_trigger = "disk-activity", -#endif .brightness_set = pmu_led_set, }; @@ -106,6 +106,9 @@ static int __init via_pmu_led_init(void) } of_node_put(dt); + if (adb_pmu_led_disk) + pmu_led.default_trigger = "disk-activity"; + spin_lock_init(&pmu_blink_lock); /* no outstanding req */ pmu_blink_req.complete = 1; @@ -114,4 +117,6 @@ static int __init via_pmu_led_init(void) return led_classdev_register(NULL, &pmu_led); } +core_param(adb_pmu_led_disk, adb_pmu_led_disk, bool, 0644); + late_initcall(via_pmu_led_init); -- 2.33.1