Skip to contentSkip to conversation

64bit resource: fix up printks for resources in ide drivers

PATCH NAK Jeff Garzik 3 participants 3 messages Jun 29, 2006 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 84 lines · Linux Kernel Mailing List

commit 08f46de9a0e7c293db34cf44f9451d18ef609770
tree 83c28b79165adee350aad8cb9d4e2e59486acf56
parent 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa
author Greg Kroah-Hartman <[email protected]> Tue, 13 Jun 2006 05:15:59 -0700 committer Greg Kroah-Hartman <[email protected]> Tue, 27 Jun 2006 23:23:59 -0700

[PATCH] 64bit resource: fix up printks for resources in ide drivers

This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <[email protected]>

 drivers/ide/pci/aec62xx.c      |    3 ++-
 drivers/ide/pci/cmd64x.c       |    3 ++-
 drivers/ide/pci/hpt34x.c       |    2 +-
 drivers/ide/pci/pdc202xx_new.c |    4 ++--
 drivers/ide/pci/pdc202xx_old.c |    4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)
drivers/ide/pci/aec62xx.c +2 -1
index c743e68..8d5b872 100644
@@ -254,7 +254,8 @@ static unsigned int __devinit init_chips
 
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
 	}
 
 	if (bus_speed <= 33)
drivers/ide/pci/cmd64x.c +2 -1
index 3d9c7af..9828039 100644
@@ -609,7 +609,8 @@ static unsigned int __devinit init_chips
 #ifdef __i386__
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
 	}
 #endif
 
drivers/ide/pci/hpt34x.c +1 -1
index be334da..7da5502 100644
@@ -176,7 +176,7 @@ static unsigned int __devinit init_chips
 			pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 				dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
 			printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
-				dev->resource[PCI_ROM_RESOURCE].start);
+				(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
 		}
 		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
 	} else {
drivers/ide/pci/pdc202xx_new.c +2 -2
index acd6317..20d5965 100644
@@ -313,8 +313,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);
 	}
 
 #ifdef CONFIG_PPC_PMAC
drivers/ide/pci/pdc202xx_old.c +0 -0
index 22d1754..ffbef74 100644

drivers/ide/pci/pdc202xx_old.c static unsigned int __devinit init_chips · line 548

Quoted 7 lines
drivers/ide/pci/pdc202xx_old.c +2 -2
@@ -544,8 +544,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned long)dev->resource[PCI_ROM_RESOURCE].start);

Why cast to unsigned long here? Won't that truncate the data in certain cases, now that it is 64bit?

Other printk patches seem to use unsigned long long, as I would expect.

Jeff

#2 lore raw
Quoted 113 lines · Jeff Garzik
Quoted 99 lines · Linux Kernel Mailing List

commit 08f46de9a0e7c293db34cf44f9451d18ef609770
tree 83c28b79165adee350aad8cb9d4e2e59486acf56
parent 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa
author Greg Kroah-Hartman <[email protected]> Tue, 13 Jun 2006 05:15:59 -0700 committer Greg Kroah-Hartman <[email protected]> Tue, 27 Jun 2006 23:23:59 -0700

[PATCH] 64bit resource: fix up printks for resources in ide drivers

This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <[email protected]>

drivers/ide/pci/aec62xx.c      |    3 ++-
drivers/ide/pci/cmd64x.c       |    3 ++-
drivers/ide/pci/hpt34x.c       |    2 +-
drivers/ide/pci/pdc202xx_new.c |    4 ++--
drivers/ide/pci/pdc202xx_old.c |    4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
drivers/ide/pci/aec62xx.c +2 -1
index c743e68..8d5b872 100644
@@ -254,7 +254,8 @@ static unsigned int __devinit init_chips
 
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, 
 		dev->resource[PCI_ROM_RESOURCE].start | 
 		PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, 
 dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
long)dev->resource[PCI_ROM_RESOURCE].start);
	}

	if (bus_speed <= 33)
drivers/ide/pci/cmd64x.c +2 -1
index 3d9c7af..9828039 100644
@@ -609,7 +609,8 @@ static unsigned int __devinit init_chips
 #ifdef __i386__
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, 
 		dev->resource[PCI_ROM_RESOURCE].start | 
 		PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, 
 dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
long)dev->resource[PCI_ROM_RESOURCE].start);
	}

#endif

drivers/ide/pci/hpt34x.c +1 -1
index be334da..7da5502 100644
@@ -176,7 +176,7 @@ static unsigned int __devinit init_chips
 			pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 				dev->resource[PCI_ROM_RESOURCE].start | 
 				PCI_ROM_ADDRESS_ENABLE);
 			printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
-				dev->resource[PCI_ROM_RESOURCE].start);
+				(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);
 		}
		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
	} else {
drivers/ide/pci/pdc202xx_new.c +2 -2
index acd6317..20d5965 100644
@@ -313,8 +313,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | 
 			PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);
 	}

#ifdef CONFIG_PPC_PMAC

drivers/ide/pci/pdc202xx_old.c +0 -0
index 22d1754..ffbef74 100644

drivers/ide/pci/pdc202xx_old.c static unsigned int __devinit init_chips · line 550

Quoted 9 lines
drivers/ide/pci/pdc202xx_old.c +2 -2
@@ -544,8 +544,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | 
 			PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);

Why cast to unsigned long here? Won't that truncate the data in certain cases, now that it is 64bit?

Quoted 1 line

Other printk patches seem to use unsigned long long, as I would expect.

Yes it will truncate stuff. Vivek, any reason you did it this way for the ide drivers?

thanks,

greg k-h

#3 lore raw
Quoted 114 lines · Greg KH
Quoted 113 lines · Jeff Garzik
Quoted 99 lines · Linux Kernel Mailing List

commit 08f46de9a0e7c293db34cf44f9451d18ef609770
tree 83c28b79165adee350aad8cb9d4e2e59486acf56
parent 176dfc633bbe4e03f4557d2beeefb4f0cc7f0efa
author Greg Kroah-Hartman <[email protected]> Tue, 13 Jun 2006 05:15:59 -0700 committer Greg Kroah-Hartman <[email protected]> Tue, 27 Jun 2006 23:23:59 -0700

[PATCH] 64bit resource: fix up printks for resources in ide drivers

This is needed if we wish to change the size of the resource structures.

Based on an original patch from Vivek Goyal <[email protected]>

drivers/ide/pci/aec62xx.c      |    3 ++-
drivers/ide/pci/cmd64x.c       |    3 ++-
drivers/ide/pci/hpt34x.c       |    2 +-
drivers/ide/pci/pdc202xx_new.c |    4 ++--
drivers/ide/pci/pdc202xx_old.c |    4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
drivers/ide/pci/aec62xx.c +2 -1
index c743e68..8d5b872 100644
@@ -254,7 +254,8 @@ static unsigned int __devinit init_chips
 
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, 
 		dev->resource[PCI_ROM_RESOURCE].start | 
 		PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, 
 dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
long)dev->resource[PCI_ROM_RESOURCE].start);
	}

	if (bus_speed <= 33)
drivers/ide/pci/cmd64x.c +2 -1
index 3d9c7af..9828039 100644
@@ -609,7 +609,8 @@ static unsigned int __devinit init_chips
 #ifdef __i386__
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS, 
 		dev->resource[PCI_ROM_RESOURCE].start | 
 		PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, 
 dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
long)dev->resource[PCI_ROM_RESOURCE].start);
	}

#endif

drivers/ide/pci/hpt34x.c +1 -1
index be334da..7da5502 100644
@@ -176,7 +176,7 @@ static unsigned int __devinit init_chips
 			pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 				dev->resource[PCI_ROM_RESOURCE].start | 
 				PCI_ROM_ADDRESS_ENABLE);
 			printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
-				dev->resource[PCI_ROM_RESOURCE].start);
+				(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);
 		}
		pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
	} else {
drivers/ide/pci/pdc202xx_new.c +2 -2
index acd6317..20d5965 100644
@@ -313,8 +313,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | 
 			PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);
 	}

#ifdef CONFIG_PPC_PMAC

drivers/ide/pci/pdc202xx_old.c +0 -0
index 22d1754..ffbef74 100644

drivers/ide/pci/pdc202xx_old.c static unsigned int __devinit init_chips · line 550

Quoted 9 lines
drivers/ide/pci/pdc202xx_old.c +2 -2
@@ -544,8 +544,8 @@ static unsigned int __devinit init_chips
 	if (dev->resource[PCI_ROM_RESOURCE].start) {
 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
 			dev->resource[PCI_ROM_RESOURCE].start | 
 			PCI_ROM_ADDRESS_ENABLE);
-		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n",
-			name, dev->resource[PCI_ROM_RESOURCE].start);
+		printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,
+			(unsigned 
 long)dev->resource[PCI_ROM_RESOURCE].start);

Why cast to unsigned long here? Won't that truncate the data in certain cases, now that it is 64bit?

Quoted 5 lines
Quoted 1 line

Other printk patches seem to use unsigned long long, as I would expect.

Yes it will truncate stuff. Vivek, any reason you did it this way for the ide drivers?

Initially I had kept it unsigned long long but later changed to unsigned long because of following response from Alan Cox.

[start]

Quoted 1 line

pci_write_config_dword(dev, PCI_ROM_ADDRESS,

dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);

Quoted 1 line

- printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name,

dev->resource[PCI_ROM_RESOURCE].start);

Review

Quoted 2 lines
(quoted diff) +2 -0
+             printk(KERN_INFO "%s: ROM enabled at 0x%016llx\n", name,
+                     (unsigned long

long)dev->resource[PCI_ROM_RESOURCE].start);

NAK - if the resource is 64bit then the pci_write_config_dword is also insufficient. Ditto for each other example.

We actually know the PCI resources for these are 32bit so this change shouldn't be needed. You might want to stick a (u32) or (unsigned long) cast in and leave it at that.

As far as I can tell all the ROM whacking code is bogus anyway

[end]

Thanks
Vivek