Attachment 293059 Details for Bug 384981 – patch to 2.6.23.9-85 adding printks in ssb/pci.c

patch to 2.6.23.9-85 adding printks in ssb/pci.c

linux-2.6-printk-ssb_read32.patch (text/plain), 4.72 KB, created by Oliver Henshaw on 2008-01-26 18:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Henshaw

Created: 2008-01-26 18:10:10 UTC

Size: 4.72 KB

patch

obsolete

>diff -uNrp ../kernel-2.6.23.orig/linux-2.6.23.i386/drivers/ssb/pci.c linux-2.6.23.i386/drivers/ssb/pci.c
>--- ../kernel-2.6.23.orig/linux-2.6.23.i386/drivers/ssb/pci.c	2008-01-25 16:15:01.000000000 +0000
>+++ linux-2.6.23.i386/drivers/ssb/pci.c	2008-01-25 17:51:59.000000000 +0000
>@@ -24,7 +24,7 @@
> 
> 
> /* Define the following to 1 to enable a printk on each coreswitch. */
>-#define SSB_VERBOSE_PCICORESWITCH_DEBUG		0
>+#define SSB_VERBOSE_PCICORESWITCH_DEBUG		1
> 
> 
> /* Lowlevel coreswitching */
>@@ -34,28 +34,47 @@ int ssb_pci_switch_coreidx(struct ssb_bu
> 	int attempts = 0;
> 	u32 cur_core;
> 
>+	printk(KERN_INFO "ssb_pci_switch_coreidx: At start of function\n");
>+
> 	while (1) {
>+	        printk(KERN_INFO "ssb_pci_switch_coreidx: At start of while\n");
>+
> 		err = pci_write_config_dword(bus->host_pci, SSB_BAR0_WIN,
> 					     (coreidx * SSB_CORE_SIZE)
> 					     + SSB_ENUM_BASE);
>-		if (err)
>+		printk(KERN_INFO "ssb_pci_switch_coreidx: After pci_write_config_dword\n");
>+		if (err) {
>+		        printk(KERN_INFO "ssb_pci_switch_coreidx: Inside if err ... error\n");
> 			goto error;
>+		}
> 		err = pci_read_config_dword(bus->host_pci, SSB_BAR0_WIN,
> 					    &cur_core);
>-		if (err)
>+		printk(KERN_INFO "ssb_pci_switch_coreidx: After pci_read_config_dword\n");
>+		if (err) {
>+		        printk(KERN_INFO "ssb_pci_switch_coreidx: Inside if err ... error\n");
> 			goto error;
>+		}
> 		cur_core = (cur_core - SSB_ENUM_BASE)
> 			   / SSB_CORE_SIZE;
>-		if (cur_core == coreidx)
>+		if (cur_core == coreidx) {
>+		        printk(KERN_INFO "ssb_pci_switch_coreidx: Inside if cur_core==coreidx -> break\n");
> 			break;
>+		}
> 
>-		if (attempts++ > SSB_BAR0_MAX_RETRIES)
>+		if (attempts++ > SSB_BAR0_MAX_RETRIES) {
>+		        printk(KERN_INFO "ssb_pci_switch_coreidx: Inside if attempts ... error\n");
> 			goto error;
>+		}
> 		udelay(10);
> 	}
>+	printk(KERN_INFO "ssb_pci_switch_coreidx: At end of function\n");
> 	return 0;
> error:
>+	printk(KERN_INFO "ssb_pci_switch_coreidx: ... At error");
> 	ssb_printk(KERN_ERR PFX "Failed to switch to core %u\n", coreidx);
>+	printk(KERN_INFO "ssb_pci_switch_coreidx: After ssb_printk\n");
>+	
>+	printk(KERN_INFO "ssb_pci_switch_coreidx: At end of function\n");
> 	return -ENODEV;
> }
> 
>@@ -65,6 +84,8 @@ int ssb_pci_switch_core(struct ssb_bus *
> 	int err;
> 	unsigned long flags;
> 
>+	printk(KERN_INFO "ssb_pci_switch_core: At start of function\n");
>+
> #if SSB_VERBOSE_PCICORESWITCH_DEBUG
> 	ssb_printk(KERN_INFO PFX
> 		   "Switching to %s core, index %d\n",
>@@ -73,10 +94,17 @@ int ssb_pci_switch_core(struct ssb_bus *
> #endif
> 
> 	spin_lock_irqsave(&bus->bar_lock, flags);
>+	printk(KERN_INFO "ssb_pci_switch_core: After spin_lock_irqsave\n");
> 	err = ssb_pci_switch_coreidx(bus, dev->core_index);
>-	if (!err)
>+	printk(KERN_INFO "ssb_pci_switch_core: After ssb_pci_switch_coreidx\n");
>+	if (!err) {
>+	        printk(KERN_INFO "ssb_pci_switch_core: Inside if err\n");
> 		bus->mapped_device = dev;
>+	}
> 	spin_unlock_irqrestore(&bus->bar_lock, flags);
>+	printk(KERN_INFO "ssb_pci_switch_core:After spin_unlock_irqrestore\n");
>+	
>+	printk(KERN_INFO "ssb_pci_switch_core: At end of function\n");
> 
> 	return err;
> }
>@@ -496,8 +524,11 @@ out:
> #ifdef CONFIG_SSB_DEBUG
> static int ssb_pci_assert_buspower(struct ssb_bus *bus)
> {
>-	if (likely(bus->powered_up))
>+        printk(KERN_INFO "ssb_pci_assert_buspower: At start of function\n");
>+	if (likely(bus->powered_up)) { 
>+	        printk(KERN_INFO "ssb_pci_assert_buspower: Inside if bus->powered_up -> return\n");
> 		return 0;
>+	}
> 
> 	printk(KERN_ERR PFX "FATAL ERROR: Bus powered down "
> 	       "while accessing PCI MMIO space\n");
>@@ -506,11 +537,14 @@ static int ssb_pci_assert_buspower(struc
> 		dump_stack();
> 	}
> 
>+	printk(KERN_INFO "ssb_pci_assert_buspower: At end of function\n");
>+
> 	return -ENODEV;
> }
> #else /* DEBUG */
> static inline int ssb_pci_assert_buspower(struct ssb_bus *bus)
> {
>+        printk(KERN_INFO "ssb_pci_assert_buspower: At start of function -> return 0\n");
> 	return 0;
> }
> #endif /* DEBUG */
>@@ -532,12 +566,21 @@ static u32 ssb_pci_read32(struct ssb_dev
> {
> 	struct ssb_bus *bus = dev->bus;
> 
>-	if (unlikely(ssb_pci_assert_buspower(bus)))
>+        printk(KERN_INFO "ssb_pci_read32: At start of function\n");
>+
>+	if (unlikely(ssb_pci_assert_buspower(bus))) {
>+	        printk(KERN_INFO "ssb_pci_read32: inside if ssb_pci_assert -> return\n");
> 		return 0xFFFFFFFF;
>+	}
> 	if (unlikely(bus->mapped_device != dev)) {
>-		if (unlikely(ssb_pci_switch_core(bus, dev)))
>+	        printk(KERN_INFO "ssb_pci_read32: inside if bus->mapped_device\n");
>+		if (unlikely(ssb_pci_switch_core(bus, dev))) {
>+		        printk(KERN_INFO "ssb_pci_read32: inside if ssb_pci_switch_core -> return\n");
> 			return 0xFFFFFFFF;
>+		}
> 	}
>+
>+	printk(KERN_INFO "ssb_pci_read32: At end of function -> return ioread32\m");
> 	return ioread32(bus->mmio + offset);
> }
>

Actions: View

Attachments on bug 384981: 260051 | 285841 | 289736 | 289737 | 289739 | 290296 | 290653 | 290654 | 290662 | 293058 | 293059 | 298154 | 298194 | 298210 | 298595 | 301430 | 301806 | 301817 | 302013 | 302273 | 308869