Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cec11d8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Ralf Baechle
Browse files

MIPS: TXx9: Modernize printing of kernel messages 



- Convert from printk() to pr_*(),
  - Add missing continuations, to fix user-visible breakage,
  - Drop superfluous casts (u64 has been unsigned long long on all
    architectures for many years).

On rbtx4927, this restores the kernel output like:

    -TX4927 SDRAMC --
    - CR0:0000007e00000544
    - TR:32800030e
    +TX4927 SDRAMC -- CR0:0000007e00000544 TR:32800030e

and:

    -PCIC -- PCICLK:
    -Internal(33.3MHz)
    -
    +PCIC -- PCICLK:Internal(33.3MHz)

Fixes: 4bcc595c ("printk: reinstate KERN_CONT for printing continuation lines")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14646/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2b58a76e

arch/mips/pci/pci-tx4927.c

+11 −11
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ int __init tx4927_report_pciclk(void) 
{

	int pciclk = 0;



	printk(KERN_INFO "PCIC --%s PCICLK:",

	pr_info("PCIC --%s PCICLK:",

		(__raw_readq(&tx4927_ccfgptr->ccfg) & TX4927_CCFG_PCI66) ?

		" PCI66" : "");

	if (__raw_readq(&tx4927_ccfgptr->pcfg) & TX4927_PCFG_PCICLKEN_ALL) {
@@ -37,14 +37,14 @@ int __init tx4927_report_pciclk(void) 
		case TX4927_CCFG_PCIDIVMODE_6:

			pciclk = txx9_cpu_clock / 6; break;

		}

		printk("Internal(%u.%uMHz)",

		pr_cont("Internal(%u.%uMHz)",

			(pciclk + 50000) / 1000000,

			((pciclk + 50000) / 100000) % 10);

	} else {

		printk("External");

		pr_cont("External");

		pciclk = -1;

	}

	printk("\n");

	pr_cont("\n");

	return pciclk;

}
@@ -74,7 +74,7 @@ int __init tx4927_pciclk66_setup(void) 
		}

		tx4927_ccfg_change(TX4927_CCFG_PCIDIVMODE_MASK,

				   pcidivmode);

		printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",

		pr_debug("PCICLK: ccfg:%08lx\n",

			 (unsigned long)__raw_readq(&tx4927_ccfgptr->ccfg));

	} else

		pciclk = -1;
@@ -87,5 +87,5 @@ void __init tx4927_setup_pcierr_irq(void) 
			tx4927_pcierr_interrupt,

			0, "PCI error",

			(void *)TX4927_PCIC_REG))

		printk(KERN_WARNING "Failed to request irq for PCIERR\n");

		pr_warn("Failed to request irq for PCIERR\n");

}

arch/mips/pci/pci-tx4938.c

+15 −15
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ int __init tx4938_report_pciclk(void) 
{

	int pciclk = 0;



	printk(KERN_INFO "PCIC --%s PCICLK:",

	pr_info("PCIC --%s PCICLK:",

		(__raw_readq(&tx4938_ccfgptr->ccfg) & TX4938_CCFG_PCI66) ?

		" PCI66" : "");

	if (__raw_readq(&tx4938_ccfgptr->pcfg) & TX4938_PCFG_PCICLKEN_ALL) {
@@ -45,14 +45,14 @@ int __init tx4938_report_pciclk(void) 
		case TX4938_CCFG_PCIDIVMODE_11:

			pciclk = txx9_cpu_clock / 11; break;

		}

		printk("Internal(%u.%uMHz)",

		pr_cont("Internal(%u.%uMHz)",

			(pciclk + 50000) / 1000000,

			((pciclk + 50000) / 100000) % 10);

	} else {

		printk("External");

		pr_cont("External");

		pciclk = -1;

	}

	printk("\n");

	pr_cont("\n");

	return pciclk;

}
@@ -62,7 +62,7 @@ void __init tx4938_report_pci1clk(void) 
	unsigned int pciclk =

		txx9_gbus_clock / ((ccfg & TX4938_CCFG_PCI1DMD) ? 4 : 2);



	printk(KERN_INFO "PCIC1 -- %sPCICLK:%u.%uMHz\n",

	pr_info("PCIC1 -- %sPCICLK:%u.%uMHz\n",

		(ccfg & TX4938_CCFG_PCI1_66) ? "PCI66 " : "",

		(pciclk + 50000) / 1000000,

		((pciclk + 50000) / 100000) % 10);
@@ -105,7 +105,7 @@ int __init tx4938_pciclk66_setup(void) 
		}

		tx4938_ccfg_change(TX4938_CCFG_PCIDIVMODE_MASK,

				   pcidivmode);

		printk(KERN_DEBUG "PCICLK: ccfg:%08lx\n",

		pr_debug("PCICLK: ccfg:%08lx\n",

			 (unsigned long)__raw_readq(&tx4938_ccfgptr->ccfg));

	} else

		pciclk = -1;
@@ -138,5 +138,5 @@ void __init tx4938_setup_pcierr_irq(void) 
			tx4927_pcierr_interrupt,

			0, "PCI error",

			(void *)TX4927_PCIC_REG))

		printk(KERN_WARNING "Failed to request irq for PCIERR\n");

		pr_warn("Failed to request irq for PCIERR\n");

}

arch/mips/pci/pci-tx4939.c

+5 −5
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ int __init tx4939_report_pciclk(void) 
		pciclk = txx9_master_clock * 20 / 6;

		if (!(__raw_readq(&tx4939_ccfgptr->ccfg) & TX4939_CCFG_PCI66))

			pciclk /= 2;

		printk(KERN_CONT "Internal(%u.%uMHz)",

		pr_cont("Internal(%u.%uMHz)",

			(pciclk + 50000) / 1000000,

			((pciclk + 50000) / 100000) % 10);

	} else {

		printk(KERN_CONT "External");

		pr_cont("External");

		pciclk = -1;

	}

	printk(KERN_CONT "\n");

	pr_cont("\n");

	return pciclk;

}

arch/mips/txx9/generic/pci.c

+13 −15
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus, 
	/* It seems SLC90E66 needs some time after PCI reset... */

	mdelay(80);



	printk(KERN_INFO "PCI: Checking 66MHz capabilities...\n");

	pr_info("PCI: Checking 66MHz capabilities...\n");



	for (pci_devfn = 0; pci_devfn < 0xff; pci_devfn++) {

		if (PCI_FUNC(pci_devfn))
@@ -74,8 +74,7 @@ int __init txx9_pci66_check(struct pci_controller *hose, int top_bus, 
			early_read_config_word(hose, top_bus, current_bus,

					       pci_devfn, PCI_STATUS, &stat);

			if (!(stat & PCI_STATUS_66MHZ)) {

				printk(KERN_DEBUG

				       "PCI: %02x:%02x not 66MHz capable.\n",

				pr_debug("PCI: %02x:%02x not 66MHz capable.\n",

					 current_bus, pci_devfn);

				cap66 = 0;

				break;
@@ -209,8 +208,8 @@ txx9_alloc_pci_controller(struct pci_controller *pcic, 


	pcic->mem_offset = 0;	/* busaddr == physaddr */



	printk(KERN_INFO "PCI: IO %pR MEM %pR\n",

	       &pcic->mem_resource[1], &pcic->mem_resource[0]);

	pr_info("PCI: IO %pR MEM %pR\n", &pcic->mem_resource[1],

		&pcic->mem_resource[0]);



	/* register_pci_controller() will request MEM resource */

	release_resource(&pcic->mem_resource[0]);
@@ -219,7 +218,7 @@ txx9_alloc_pci_controller(struct pci_controller *pcic, 
	release_resource(&pcic->mem_resource[0]);

 free_and_exit:

	kfree(new);

	printk(KERN_ERR "PCI: Failed to allocate resources.\n");

	pr_err("PCI: Failed to allocate resources.\n");

	return NULL;

}
@@ -260,7 +259,7 @@ static int txx9_i8259_irq_setup(int irq) 
	err = request_irq(irq, &i8259_interrupt, IRQF_SHARED,

			  "cascade(i8259)", (void *)(long)irq);

	if (!err)

		printk(KERN_INFO "PCI-ISA bridge PIC (irq %d)\n", irq);

		pr_info("PCI-ISA bridge PIC (irq %d)\n", irq);

	return err;

}
@@ -308,13 +307,13 @@ static void quirk_slc90e66_ide(struct pci_dev *dev) 
	/* SMSC SLC90E66 IDE uses irq 14, 15 (default) */

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 14);

	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &dat);

	printk(KERN_INFO "PCI: %s: IRQ %02x", pci_name(dev), dat);

	pr_info("PCI: %s: IRQ %02x", pci_name(dev), dat);

	/* enable SMSC SLC90E66 IDE */

	for (i = 0; i < ARRAY_SIZE(regs); i++) {

		pci_read_config_byte(dev, regs[i], &dat);

		pci_write_config_byte(dev, regs[i], dat | 0x80);

		pci_read_config_byte(dev, regs[i], &dat);

		printk(KERN_CONT " IDETIM%d %02x", i, dat);

		pr_cont(" IDETIM%d %02x", i, dat);

	}

	pci_read_config_byte(dev, 0x5c, &dat);

	/*
@@ -329,8 +328,7 @@ static void quirk_slc90e66_ide(struct pci_dev *dev) 
	dat |= 0x01;

	pci_write_config_byte(dev, 0x5c, dat);

	pci_read_config_byte(dev, 0x5c, &dat);

	printk(KERN_CONT " REG5C %02x", dat);

	printk(KERN_CONT "\n");

	pr_cont(" REG5C %02x\n", dat);

}

#endif /* CONFIG_TOSHIBA_FPCIB0 */
@@ -352,7 +350,7 @@ static void final_fixup(struct pci_dev *dev) 
	    (bist & PCI_BIST_CAPABLE)) {

		unsigned long timeout;

		pci_set_power_state(dev, PCI_D0);

		printk(KERN_INFO "PCI: %s BIST...", pci_name(dev));

		pr_info("PCI: %s BIST...", pci_name(dev));

		pci_write_config_byte(dev, PCI_BIST, PCI_BIST_START);

		timeout = jiffies + HZ * 2;	/* timeout after 2 sec */

		do {
@@ -361,9 +359,9 @@ static void final_fixup(struct pci_dev *dev) 
				break;

		} while (bist & PCI_BIST_START);

		if (bist & (PCI_BIST_CODE_MASK | PCI_BIST_START))

			printk(KERN_CONT "failed. (0x%x)\n", bist);

			pr_cont("failed. (0x%x)\n", bist);

		else

			printk(KERN_CONT "OK.\n");

			pr_cont("OK.\n");

	}

}

arch/mips/txx9/generic/setup_tx3927.c

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ void __init tx3927_setup(void) 
	/* do reset on watchdog */

	tx3927_ccfgptr->ccfg |= TX3927_CCFG_WR;



	printk(KERN_INFO "TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",

	       tx3927_ccfgptr->crir,

	       tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg);

	pr_info("TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n",

		tx3927_ccfgptr->crir, tx3927_ccfgptr->ccfg,

		tx3927_ccfgptr->pcfg);



	/* TMR */

	for (i = 0; i < TX3927_NR_TMR; i++)