[coreboot] [PATCH] Fix printk format warning

Stefan Reinauer stepan at coresystems.de
Wed Mar 4 01:54:03 CET 2009


Carl-Daniel Hailfinger wrote:
> On 02.03.2009 02:32, Carl-Daniel Hailfinger wrote:
>   
>> On 01.03.2009 20:24, Stefan Reinauer wrote:
>>   
>>     
>>> On 01.03.2009 19:44 Uhr, Carl-Daniel Hailfinger wrote:
>>>     
>>>       
>>>> Fix printk format warning in amdk8_acpi.c.
>>>>
>>>> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
>>>>
>>>> Index: LinuxBIOSv2-asus_m2a-vm/src/northbridge/amd/amdk8/amdk8_acpi.c
>>>>
>>>>       
>>>>         
>>> Are you sure this is a current tree?  
>>>     
>>>       
>> Yes. For easier tab completion, the v2 trees on my disk are named
>> LinuxBIOSv2-* and the v3 trees are named corebootv3-*
>>
>>   
>>     
>>> Acked-by: Stefan Reinauer <stepan at coresystems.de>
>>>   
>>>     
>>>       
>> Thanks!
>>
>> I just went on a bugfix frenzy and fixed all printk format warnings
>> triggered by the AMD 690/SB600 targets and would prefer to commit them
>> in one go.
>> This new patch includes the small patch you already acked.
>>
>> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
>>   
>>     
>
> Any reviews?
> With this patch, the DBM690T and the Pistachio have no more printk
> format warnings.

Sure, go ahead.

Acked-by: Stefan Reinauer <stepan at coresystems.de>

>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690.c	(working copy)
>> @@ -129,7 +129,7 @@
>>  	device_t nb_dev = 0, sb_dev = 0;
>>  	int dev_ind;
>>  
>> -	printk_info("rs690_enable: dev=0x%x, VID_DID=0x%x\n", dev, get_vid_did(dev));
>> +	printk_info("rs690_enable: dev=%p, VID_DID=0x%x\n", dev, get_vid_did(dev));
>>  
>>  	nb_dev = dev_find_slot(0, PCI_DEVFN(0, 0));
>>  	if (!nb_dev) {
>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_pcie.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_pcie.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_pcie.c	(working copy)
>> @@ -203,7 +203,7 @@
>>  	device_t sb_dev;
>>  	struct southbridge_amd_rs690_config *cfg =
>>  	    (struct southbridge_amd_rs690_config *)nb_dev->chip_info;
>> -	printk_debug("gpp_sb_init nb_dev=0x%x, dev=0x%x, port=0x%x\n", nb_dev, dev, port);
>> +	printk_debug("gpp_sb_init nb_dev=0x%p, dev=0x%p, port=0x%x\n", nb_dev, dev, port);
>>  
>>  	/* init GPP core */
>>  	set_pcie_enable_bits(nb_dev, 0x20 | PCIE_CORE_INDEX_GPPSB, 1 << 8,
>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_gfx.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_gfx.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/rs690/rs690_gfx.c	(working copy)
>> @@ -121,7 +121,7 @@
>>  	device_t k8_f0 = 0, k8_f2 = 0;
>>  	device_t nb_dev = dev_find_slot(0, 0);
>>  
>> -	printk_info("rs690_internal_gfx_enable dev=0x%x, nb_dev=0x%x.\n", dev,
>> +	printk_info("rs690_internal_gfx_enable dev=0x%p, nb_dev=0x%p.\n", dev,
>>  		    nb_dev);
>>  
>>  	/* set APERTURE_SIZE, 128M. */
>> @@ -417,7 +417,7 @@
>>  	struct southbridge_amd_rs690_config *cfg =
>>  	    (struct southbridge_amd_rs690_config *)nb_dev->chip_info;
>>  
>> -	printk_info("rs690_gfx_init, nb_dev=0x%x, dev=0x%x, port=0x%x.\n",
>> +	printk_info("rs690_gfx_init, nb_dev=0x%p, dev=0x%p, port=0x%x.\n",
>>  		    nb_dev, dev, port);
>>  
>>  	/* step 0, REFCLK_SEL, skip A11 revision */
>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_sata.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_sata.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_sata.c	(working copy)
>> @@ -96,7 +96,7 @@
>>  	printk_spew("sata_bar2=%x\n", sata_bar2);	/* 3040 */
>>  	printk_spew("sata_bar3=%x\n", sata_bar3);	/* 3080 */
>>  	printk_spew("sata_bar4=%x\n", sata_bar4);	/* 3000 */
>> -	printk_spew("sata_bar5=%x\n", sata_bar5);	/* e0309000 */
>> +	printk_spew("sata_bar5=%p\n", sata_bar5);	/* e0309000 */
>>  
>>  	/* Program the 2C to 0x43801002 */
>>  	dword = 0x43801002;
>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_usb.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_usb.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_usb.c	(working copy)
>> @@ -94,7 +94,7 @@
>>  	/* pci_write_config32(dev, 0xf8, dword); */
>>  
>>  	usb2_bar0 = (u8 *) (pci_read_config32(dev, 0x10) & ~0xFF);
>> -	printk_info("usb2_bar0=%x\n", usb2_bar0);
>> +	printk_info("usb2_bar0=%p\n", usb2_bar0);
>>  
>>  	/* RPR5.4 Enables the USB PHY auto calibration resister to match 45ohm resistence */
>>  	dword = 0x00020F00;
>> Index: LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_hda.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_hda.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/southbridge/amd/sb600/sb600_hda.c	(working copy)
>> @@ -302,7 +302,7 @@
>>  		return;
>>  
>>  	base = (u8 *) ((u32)res->base);
>> -	printk_debug("base = %08x\n", base);
>> +	printk_debug("base = %p\n", base);
>>  	codec_mask = codec_detect(base);
>>  
>>  	if (codec_mask) {
>> Index: LinuxBIOSv2-printkformatwarnings/src/devices/device.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/devices/device.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/devices/device.c	(working copy)
>> @@ -358,7 +358,7 @@
>>  			base += size;
>>  			
>>  			printk_spew(
>> -				"%s %02x *  [0x%08Lx - 0x%08Lx] %s\n",
>> +				"%s %02lx *  [0x%08Lx - 0x%08Lx] %s\n",
>>  				dev_path(dev),
>>  				resource->index, 
>>  				resource->base, 
>> Index: LinuxBIOSv2-printkformatwarnings/src/cpu/x86/mtrr/mtrr.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/cpu/x86/mtrr/mtrr.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/cpu/x86/mtrr/mtrr.c	(working copy)
>> @@ -357,7 +357,7 @@
>>  #endif
>>  	}
>>  	/* Allocate an msr */  
>> -	printk_spew(" Allocate an msr - basek = %08x, sizek = %08x,\n", basek, sizek);
>> +	printk_spew(" Allocate an msr - basek = %08lx, sizek = %08lx,\n", basek, sizek);
>>  	state->range_startk = basek;
>>  	state->range_sizek  = sizek;
>>  }
>> Index: LinuxBIOSv2-printkformatwarnings/src/cpu/x86/lapic/lapic_cpu_init.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/cpu/x86/lapic/lapic_cpu_init.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/cpu/x86/lapic/lapic_cpu_init.c	(working copy)
>> @@ -136,7 +136,7 @@
>>  	maxlvt = 4;
>>  
>>  	for (j = 1; j <= num_starts; j++) {
>> -		printk_spew("Sending STARTUP #%d to %u.\n", j, apicid);
>> +		printk_spew("Sending STARTUP #%d to %lu.\n", j, apicid);
>>  		lapic_read_around(LAPIC_SPIV);
>>  		lapic_write(LAPIC_ESR, 0);
>>  		lapic_read(LAPIC_ESR);
>> @@ -239,7 +239,7 @@
>>  		#warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPU)\n"
>>  #endif
>>  		if(stack_end > (CONFIG_LB_MEM_TOPK<<10)) {
>> -			printk_debug("start_cpu: Please increase the CONFIG_LB_MEM_TOPK more than %dK\n", stack_end>>10);
>> +			printk_debug("start_cpu: Please increase the CONFIG_LB_MEM_TOPK more than %luK\n", stack_end>>10);
>>  			die("Can not go on\n");
>>  		}
>>  		stack_end -= sizeof(struct cpu_info);
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/irq_tables.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/irq_tables.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/irq_tables.c	(working copy)
>> @@ -73,7 +73,7 @@
>>  	addr &= ~15;
>>  
>>  	/* This table must be betweeen 0xf0000 & 0x100000 */
>> -	printk_info("Writing IRQ routing tables to 0x%x...", addr);
>> +	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
>>  
>>  	pirq = (void *)(addr);
>>  	v = (u8 *) (addr);
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/acpi_tables.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/acpi_tables.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/acpi_tables.c	(working copy)
>> @@ -255,7 +255,7 @@
>>  	       ((acpi_header_t *) AmlCode)->length);
>>  
>>  	current += dsdt->length;
>> -	printk_debug("ACPI:    * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
>> +	printk_debug("ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
>>  	/* FADT */
>>  	printk_debug("ACPI:    * FADT\n");
>>  	fadt = (acpi_fadt_t *) current;
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/mainboard.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/mainboard.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/pistachio/mainboard.c	(working copy)
>> @@ -61,7 +61,7 @@
>>  {
>>  	u8 byte;
>>  
>> -	printk_info("enable_onboard_nic.\n");
>> +	printk_info("%s.\n", __func__);
>>  
>>  	/* enable GPM8 output */
>>  	byte = pm_ioread(0x95);
>> @@ -274,7 +274,7 @@
>>  	struct mainboard_config *mainboard =
>>  	    (struct mainboard_config *)dev->chip_info;
>>  
>> -	printk_info("Mainboard Pistachio Enable. dev=0x%x\n", dev);
>> +	printk_info("Mainboard Pistachio Enable. dev=0x%p\n", dev);
>>  
>>  #if (CONFIG_GFXUMA == 1)
>>  	msr_t msr, msr2;
>> @@ -308,7 +308,7 @@
>>  	}
>>  
>>  	uma_memory_base = msr.lo - uma_memory_size;	/* TOP_MEM1 */
>> -	printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
>> +	printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n",
>>  		    __func__, uma_memory_size, uma_memory_base);
>>  
>>  	/* TODO: TOP_MEM2 */
>> @@ -328,7 +328,7 @@
>>  	 * in some circumstances we want the memory mentioned as reserved.
>>   	 */
>>  #if (CONFIG_GFXUMA == 1)
>> -	printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
>> +	printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
>>  	uma_memory_base, uma_memory_size);
>>  	lb_add_memory_range(mem, LB_MEM_RESERVED,
>>  		uma_memory_base, uma_memory_size);
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/irq_tables.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/irq_tables.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/irq_tables.c	(working copy)
>> @@ -73,7 +73,7 @@
>>  	addr &= ~15;
>>  
>>  	/* This table must be betweeen 0xf0000 & 0x100000 */
>> -	printk_info("Writing IRQ routing tables to 0x%x...", addr);
>> +	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
>>  
>>  	pirq = (void *)(addr);
>>  	v = (u8 *) (addr);
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/acpi_tables.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/acpi_tables.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/acpi_tables.c	(working copy)
>> @@ -254,7 +254,7 @@
>>  	memcpy((void *)dsdt, (void *)AmlCode,
>>  	       ((acpi_header_t *) AmlCode)->length);
>>  	current += dsdt->length;
>> -	printk_debug("ACPI:    * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
>> +	printk_debug("ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
>>  	/* FADT */
>>  	printk_debug("ACPI:    * FADT\n");
>>  	fadt = (acpi_fadt_t *) current;
>> Index: LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/mainboard.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/mainboard.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/mainboard/amd/dbm690t/mainboard.c	(working copy)
>> @@ -61,7 +61,7 @@
>>  {
>>  	u8 byte;
>>  
>> -	printk_info("enable_onboard_nic.\n");
>> +	printk_info("%s.\n", __func__);
>>  
>>  	/* set index register 0C50h to 13h (miscellaneous control) */
>>  	outb(0x13, 0xC50);	/* CMIndex */
>> @@ -202,7 +202,7 @@
>>  	struct mainboard_config *mainboard =
>>  	    (struct mainboard_config *)dev->chip_info;
>>  
>> -	printk_info("Mainboard DBM690T Enable. dev=0x%x\n", dev);
>> +	printk_info("Mainboard DBM690T Enable. dev=0x%p\n", dev);
>>  
>>  #if (CONFIG_GFXUMA == 1)
>>  	msr_t msr, msr2;
>> @@ -236,7 +236,7 @@
>>  	}
>>  
>>  	uma_memory_base = msr.lo - uma_memory_size;	/* TOP_MEM1 */
>> -	printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
>> +	printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n",
>>  		    __func__, uma_memory_size, uma_memory_base);
>>  
>>  	/* TODO: TOP_MEM2 */
>> @@ -256,7 +256,7 @@
>>  	 * in some circumstances we want the memory mentioned as reserved.
>>   	 */
>>  #if (CONFIG_GFXUMA == 1)
>> -	printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
>> +	printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
>>  	uma_memory_base, uma_memory_size);
>>  	lb_add_memory_range(mem, LB_MEM_RESERVED,
>>  		uma_memory_base, uma_memory_size);
>> Index: LinuxBIOSv2-printkformatwarnings/src/lib/malloc.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/lib/malloc.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/lib/malloc.c	(working copy)
>> @@ -27,7 +27,7 @@
>>  {
>>  	void *p;
>>  
>> -	MALLOCDBG(("%s Enter, size %d, free_mem_ptr %p\n", __func__, size, free_mem_ptr));
>> +	MALLOCDBG(("%s Enter, size %ld, free_mem_ptr 0x%08lx\n", __func__, size, free_mem_ptr));
>>  	if (size < 0)
>>  		die("Error! malloc: Size < 0");
>>  	if (free_mem_ptr <= 0)
>> Index: LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/amdk8_acpi.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/amdk8_acpi.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/amdk8_acpi.c	(working copy)
>> @@ -128,7 +128,7 @@
>>  	basek = resk(res->base);
>>  	sizek = resk(res->size);
>>  
>> -	printk_debug("set_srat_mem: dev %s, res->index=%04x startk=%08x, sizek=%08x\n",
>> +	printk_debug("set_srat_mem: dev %s, res->index=%04lx startk=%08lx, sizek=%08lx\n",
>>  		     dev_path(dev), res->index, basek, sizek);
>>  	/*
>>  	 * 0-640K must be on node 0
>> Index: LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/northbridge.c
>> ===================================================================
>> --- LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/northbridge.c	(revision 3967)
>> +++ LinuxBIOSv2-printkformatwarnings/src/northbridge/amd/amdk8/northbridge.c	(working copy)
>> @@ -473,7 +473,7 @@
>>  		limit |= (nodeid & 7);
>>  
>>  		if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
>> -			printk_spew("%s, enabling legacy VGA IO forwarding for %s link %s\n",
>> +			printk_spew("%s, enabling legacy VGA IO forwarding for %s link 0x%x\n",
>>  				    __func__, dev_path(dev), link);
>>  			base |= PCI_IO_BASE_VGA_EN;
>>  		}
>>
>>
>>   
>>     
>
>
>   


-- 
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
      Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info at coresystems.dehttp://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
URL: <http://www.coreboot.org/pipermail/coreboot/attachments/20090304/7cb2596d/attachment.sig>


More information about the coreboot mailing list