Commit 703bb99c authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Jeff Garzik
Browse files

natsemi: fix MMIO for PPC 44x platforms 



The driver stores the PCI resource address into 'unsigned long' variable before
calling ioremap()  on it. This warrants a kernel oops when the registers are
accessed on PPC 44x platforms which (being 32-bit) have PCI memory space mapped
beyond 4 GB.

The arch/ppc/ kernel has a fixup in ioremap() that creates an illusion of the
PCI memory resources are mapped below 4 GB, but arch/powerpc/ code got rid of
this trick, having instead CONFIG_RESOURCES_64BIT enabled.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 406874a7

drivers/net/natsemi.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -786,7 +786,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, 
	struct netdev_private *np;

	struct netdev_private *np;

	int i, option, irq, chip_idx = ent->driver_data;

	int i, option, irq, chip_idx = ent->driver_data;

	static int find_cnt = -1;

	static int find_cnt = -1;

	unsigned long iostart, iosize;

	resource_size_t iostart;

	unsigned long iosize;

	void __iomem *ioaddr;

	void __iomem *ioaddr;

	const int pcibar = 1; /* PCI base address register */

	const int pcibar = 1; /* PCI base address register */

	int prev_eedata;

	int prev_eedata;
@@ -946,10 +947,11 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, 
		goto err_create_file;

		goto err_create_file;





	if (netif_msg_drv(np)) {

	if (netif_msg_drv(np)) {

		printk(KERN_INFO "natsemi %s: %s at %#08lx "

		printk(KERN_INFO "natsemi %s: %s at %#08llx "

		       "(%s), %s, IRQ %d",

		       "(%s), %s, IRQ %d",

		       dev->name, natsemi_pci_info[chip_idx].name, iostart,

		       dev->name, natsemi_pci_info[chip_idx].name,

		       pci_name(np->pci_dev), print_mac(mac, dev->dev_addr), irq);

		       (unsigned long long)iostart, pci_name(np->pci_dev),

		       print_mac(mac, dev->dev_addr), irq);

		if (dev->if_port == PORT_TP)

		if (dev->if_port == PORT_TP)

			printk(", port TP.\n");

			printk(", port TP.\n");

		else if (np->ignore_phy)

		else if (np->ignore_phy)

CRA Git | Maintained and supported by SUSTech CRA and CCSE