From: Geoff Levand <geoff@infradead.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: linuxppc-dev@lists.ozlabs.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Markus Elfring <elfring@users.sourceforge.net>,
Dan Carpenter <dan.carpenter@oracle.com>,
Emmanuel Nicolet <emmanuel.nicolet@gmail.com>
Subject: [PATCH 9/9] powerpc/ps3: Add udbg_panic
Date: Fri, 27 Mar 2020 20:26:23 +0000 [thread overview]
Message-ID: <1333a8985c4190763c9c0312bcefad8b1ea863c7.1585340156.git.geoff@infradead.org> (raw)
In-Reply-To: <cover.1585340156.git.geoff@infradead.org>
BUG_ON() won't work in the early init code, so replace it with
a new routine udbg_panic() that uses udbg_printf() and lv1_panic().
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/platforms/ps3/mm.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 423be34f0f5f..7c7c2f53eacb 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -26,6 +26,13 @@
#define DBG pr_devel
#endif
+#define udbg_panic(_val, _msg) \
+if (_val) { \
+ udbg_printf("%s:%d: " _msg ": %d\n", \
+ __func__, __LINE__, (int)(_val)); \
+ lv1_panic(0); \
+}
+
enum {
#if defined(CONFIG_PS3_DYNAMIC_DMA)
USE_DYNAMIC_DMA = 1,
@@ -313,7 +320,7 @@ static void ps3_mm_region_destroy(struct mem_region *r)
if (r->base) {
result = lv1_release_memory(r->base);
- BUG_ON(result);
+ udbg_panic(result, "lv1_release_memory failed");
r->size = r->base = r->offset = 0;
map.total = map.rm.size;
}
--
2.20.1
next prev parent reply other threads:[~2020-03-27 20:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 20:26 [PATCH 0/9] PS3 patches for v5.7 Geoff Levand
2020-03-27 20:26 ` [PATCH 5/9] ps3disk: use the default segment boundary Geoff Levand
2020-03-27 20:26 ` Geoff Levand [this message]
2020-03-27 20:26 ` [PATCH 6/9] powerpc/ps3: Set CONFIG_UEVENT_HELPER=y in ps3_defconfig Geoff Levand
2020-04-06 13:05 ` Michael Ellerman
2020-03-27 20:26 ` [PATCH 8/9] powerpc/ps3: Add lv1_panic Geoff Levand
2020-03-27 20:26 ` [PATCH 7/9] powerpc/ps3: Add check for otheros image size Geoff Levand
2020-03-29 14:00 ` Geert Uytterhoeven
2020-03-30 3:10 ` Geoff Levand
2020-03-30 3:11 ` [PATCH V2 " Geoff Levand
2020-03-27 20:26 ` [PATCH 4/9] powerpc/ps3: remove an unneeded NULL check Geoff Levand
2020-04-06 13:05 ` Michael Ellerman
2020-03-27 20:26 ` [PATCH 1/9] powerpc/ps3: Remove duplicate error messages Geoff Levand
2020-03-28 17:09 ` Markus Elfring
2020-04-06 13:05 ` Michael Ellerman
2020-03-27 20:26 ` [PATCH 3/9] net/ps3_gelic_net: Remove duplicate error message Geoff Levand
2020-03-27 20:26 ` [PATCH 2/9] drivers/ps3: Remove duplicate error messages Geoff Levand
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=1333a8985c4190763c9c0312bcefad8b1ea863c7.1585340156.git.geoff@infradead.org \
--to=geoff@infradead.org \
--cc=dan.carpenter@oracle.com \
--cc=elfring@users.sourceforge.net \
--cc=emmanuel.nicolet@gmail.com \
--cc=geert@linux-m68k.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).