All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lech Perczak <lech.perczak@gmail.com>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
	linux-mips@vger.kernel.org
Cc: Lech Perczak <lech.perczak@gmail.com>,
	John Crispin <john@phrozen.org>,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH] MIPS: ath79: drop _machine_restart again
Date: Mon, 10 Jan 2022 23:48:44 +0100	[thread overview]
Message-ID: <20220110224844.2329275-1-lech.perczak@gmail.com> (raw)

Commit 81424d0ad0d4 ("MIPS: ath79: Use the reset controller to restart
OF machines") removed setup of _machine_restart on OF machines to use
reset handler in reset controller driver.
While removing remnants of non-OF machines in commit 3a77e0d75eed
("MIPS: ath79: drop machfiles"), this was introduced again, making it
impossible to use additional restart handlers registered through device
tree. Drop setting _machine_restart altogether, and ath79_restart
function, which is no longer used after this.

Fixes: 3a77e0d75eed ("MIPS: ath79: drop machfiles")
Cc: John Crispin <john@phrozen.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
---

Side note: a lot of code, that was previously encompassed by
"if (mips_machtype != ATH79_MACH_GENERIC_OF) {...} " seems to be
unnecessary at the time of dropping the non-OF machine definitions.
However it was retained for some reason, and I see a lot of references
to it by the drivers. OTOH, OF part of ath79 platform - basically whole ath79
target of OpenWrt works well without this code in 19.07 release, using 4.14.y
tree, on which the bug I'm fixing here is absent as well.

I tested this change on several devices:
TP-Link TL-WDR4300, TP-Link Archer C7v2, Meraki MR18 using OF,
and on ZTE MF286 - using OF as well - which is the very reason I discovered
this issue, as it requires registration of  gpio-restart handler,
ineffective due to this issue.

 arch/mips/ath79/setup.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 891f495c4c3c..0ac435fe2dc9 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -34,15 +34,6 @@
 
 static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
 
-static void ath79_restart(char *command)
-{
-	local_irq_disable();
-	ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
-	for (;;)
-		if (cpu_wait)
-			cpu_wait();
-}
-
 static void ath79_halt(void)
 {
 	while (1)
@@ -234,7 +225,6 @@ void __init plat_mem_setup(void)
 
 	detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
 
-	_machine_restart = ath79_restart;
 	_machine_halt = ath79_halt;
 	pm_power_off = ath79_halt;
 }
-- 
2.30.2


             reply	other threads:[~2022-01-10 22:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-10 22:48 Lech Perczak [this message]
2022-01-11 15:18 ` [PATCH] MIPS: ath79: drop _machine_restart again Thomas Bogendoerfer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220110224844.2329275-1-lech.perczak@gmail.com \
    --to=lech.perczak@gmail.com \
    --cc=f.fainelli@gmail.com \
    --cc=john@phrozen.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=tsbogend@alpha.franken.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.