Skip to content

Commit

Permalink
MIPS: SGI-IP27: use pr_info/pr_emerg and pr_cont to fix output
Browse files Browse the repository at this point in the history 
Topology and NMI output needs pr_cont() to look the way it was in the
old days of printk.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
  • Loading branch information
Thomas Bogendoerfer authored and Paul Burton committed Feb 19, 2019
1 parent a44d924 commit ab68280
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
28 changes: 14 additions & 14 deletions arch/mips/sgi-ip27/ip27-memory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ static int __init compute_node_distance(nasid_t nasid_a, nasid_t nasid_b)
}

if (router_a == NULL) {
printk("node_distance: router_a NULL\n");
pr_info("node_distance: router_a NULL\n");
return -1;
}
if (router_b == NULL) {
printk("node_distance: router_b NULL\n");
pr_info("node_distance: router_b NULL\n");
return -1;
}

Expand Down Expand Up @@ -203,17 +203,17 @@ static void __init dump_topology(void)
klrou_t *router;
cnodeid_t row, col;

printk("************** Topology ********************\n");
pr_info("************** Topology ********************\n");

printk(" ");
pr_info(" ");
for_each_online_node(col)
printk("%02d ", col);
printk("\n");
pr_cont("%02d ", col);
pr_cont("\n");
for_each_online_node(row) {
printk("%02d ", row);
pr_info("%02d ", row);
for_each_online_node(col)
printk("%2d ", node_distance(row, col));
printk("\n");
pr_cont("%2d ", node_distance(row, col));
pr_cont("\n");
}

for_each_online_node(cnode) {
Expand All @@ -230,7 +230,7 @@ static void __init dump_topology(void)
do {
if (brd->brd_flags & DUPLICATE_BOARD)
continue;
printk("Router %d:", router_num);
pr_cont("Router %d:", router_num);
router_num++;

router = (klrou_t *)NODE_OFFSET_TO_K0(NASID_GET(brd), brd->brd_compts[0]);
Expand All @@ -244,11 +244,11 @@ static void __init dump_topology(void)
router->rou_port[port].port_offset);

if (dest_brd->brd_type == KLTYPE_IP27)
printk(" %d", dest_brd->brd_nasid);
pr_cont(" %d", dest_brd->brd_nasid);
if (dest_brd->brd_type == KLTYPE_ROUTER)
printk(" r");
pr_cont(" r");
}
printk("\n");
pr_cont("\n");

} while ( (brd = find_lboard_class(KLCF_NEXT(brd), KLTYPE_ROUTER)) );
}
Expand Down Expand Up @@ -373,7 +373,7 @@ static void __init szmem(void)

if ((nodebytes >> PAGE_SHIFT) * (sizeof(struct page)) >
(slot0sz << PAGE_SHIFT)) {
printk("Ignoring slot %d onwards on node %d\n",
pr_info("Ignoring slot %d onwards on node %d\n",
slot, node);
slot = MAX_MEM_SLOTS;
continue;
Expand Down
62 changes: 31 additions & 31 deletions arch/mips/sgi-ip27/ip27-nmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,70 +62,70 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice)
(TO_UNCAC(TO_NODE(nasid, IP27_NMI_KREGS_OFFSET)) +
slice * IP27_NMI_KREGS_CPU_SIZE);

printk("NMI nasid %d: slice %d\n", nasid, slice);
pr_emerg("NMI nasid %d: slice %d\n", nasid, slice);

/*
* Saved main processor registers
*/
for (i = 0; i < 32; ) {
if ((i % 4) == 0)
printk("$%2d :", i);
printk(" %016lx", nr->gpr[i]);
pr_emerg("$%2d :", i);
pr_cont(" %016lx", nr->gpr[i]);

i++;
if ((i % 4) == 0)
printk("\n");
pr_cont("\n");
}

printk("Hi : (value lost)\n");
printk("Lo : (value lost)\n");
pr_emerg("Hi : (value lost)\n");
pr_emerg("Lo : (value lost)\n");

/*
* Saved cp0 registers
*/
printk("epc : %016lx %pS\n", nr->epc, (void *) nr->epc);
printk("%s\n", print_tainted());
printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc);
printk("ra : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]);
printk("Status: %08lx ", nr->sr);
pr_emerg("epc : %016lx %pS\n", nr->epc, (void *)nr->epc);
pr_emerg("%s\n", print_tainted());
pr_emerg("ErrEPC: %016lx %pS\n", nr->error_epc, (void *)nr->error_epc);
pr_emerg("ra : %016lx %pS\n", nr->gpr[31], (void *)nr->gpr[31]);
pr_emerg("Status: %08lx ", nr->sr);

if (nr->sr & ST0_KX)
printk("KX ");
pr_cont("KX ");
if (nr->sr & ST0_SX)
printk("SX ");
pr_cont("SX ");
if (nr->sr & ST0_UX)
printk("UX ");
pr_cont("UX ");

switch (nr->sr & ST0_KSU) {
case KSU_USER:
printk("USER ");
pr_cont("USER ");
break;
case KSU_SUPERVISOR:
printk("SUPERVISOR ");
pr_cont("SUPERVISOR ");
break;
case KSU_KERNEL:
printk("KERNEL ");
pr_cont("KERNEL ");
break;
default:
printk("BAD_MODE ");
pr_cont("BAD_MODE ");
break;
}

if (nr->sr & ST0_ERL)
printk("ERL ");
pr_cont("ERL ");
if (nr->sr & ST0_EXL)
printk("EXL ");
pr_cont("EXL ");
if (nr->sr & ST0_IE)
printk("IE ");
printk("\n");
pr_cont("IE ");
pr_cont("\n");

printk("Cause : %08lx\n", nr->cause);
printk("PrId : %08x\n", read_c0_prid());
printk("BadVA : %016lx\n", nr->badva);
printk("CErr : %016lx\n", nr->cache_err);
printk("NMI_SR: %016lx\n", nr->nmi_sr);
pr_emerg("Cause : %08lx\n", nr->cause);
pr_emerg("PrId : %08x\n", read_c0_prid());
pr_emerg("BadVA : %016lx\n", nr->badva);
pr_emerg("CErr : %016lx\n", nr->cache_err);
pr_emerg("NMI_SR: %016lx\n", nr->nmi_sr);

printk("\n");
pr_emerg("\n");
}

void nmi_dump_hub_irq(nasid_t nasid, int slice)
Expand All @@ -143,9 +143,9 @@ void nmi_dump_hub_irq(nasid_t nasid, int slice)
pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0);
pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1);

printk("PI_INT_MASK0: %16Lx PI_INT_MASK1: %16Lx\n", mask0, mask1);
printk("PI_INT_PEND0: %16Lx PI_INT_PEND1: %16Lx\n", pend0, pend1);
printk("\n\n");
pr_emerg("PI_INT_MASK0: %16llx PI_INT_MASK1: %16llx\n", mask0, mask1);
pr_emerg("PI_INT_PEND0: %16llx PI_INT_PEND1: %16llx\n", pend0, pend1);
pr_emerg("\n\n");
}

/*
Expand Down

0 comments on commit ab68280

Please sign in to comment.