Commit 0c23664e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Optimize fault kprobe handling just like powerpc.
  [SPARC]: Wire up utimensat syscall.
  [SPARC64]: Fix request_irq() ignored result warnings in PCI controller code.
  [SPARC64]: Kill asm-sparc64/pbm.h
  [ATYFB]: Fix sparc includes.
  [QLA2XXX]: Fix build on sparc.
  [SPARC64]: Removal of trivial pci_controller_info uses.
  [SPARC64]: Move index info pci_pbm_info.
  [SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info.
  [SPARC64]: Move pci_ops into pci_pbm_info.
  [SPARC64] SBUS: Error interrupt registry cleanups.
  [SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's
  [SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX.
  [SPARC64] PCI: Use common routine to fetch PBM properties.
parents 6ec129c3 127cda1e

arch/sparc/kernel/systbls.S

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ sys_call_table: 
/*295*/	.long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare

/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

/*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait

/*310*/	.long sys_utimensat



#ifdef CONFIG_SUNOS_EMUL

	/* Now the SunOS syscall table. */
@@ -196,5 +197,6 @@ sunos_sys_table: 
	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys

/*310*/	.long sunos_nosys



#endif

arch/sparc64/kernel/ebus.c

+2 −1
Original line number Diff line number Diff line
@@ -13,16 +13,17 @@ 
#include <linux/string.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/pci.h>



#include <asm/system.h>

#include <asm/page.h>

#include <asm/pbm.h>

#include <asm/ebus.h>

#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/bpp.h>

#include <asm/irq.h>

#include <asm/io.h>



/* EBUS dma library. */

arch/sparc64/kernel/kprobes.c

+1 −10
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ out: 
	return 1;

}



static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)

int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)

{

	struct kprobe *cur = kprobe_running();

	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
@@ -403,15 +403,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 
		if (post_kprobe_handler(args->regs))

			ret = NOTIFY_STOP;

		break;

	case DIE_GPF:

	case DIE_PAGE_FAULT:

		/* kprobe_running() needs smp_processor_id() */

		preempt_disable();

		if (kprobe_running() &&

		    kprobe_fault_handler(args->regs, args->trapnr))

			ret = NOTIFY_STOP;

		preempt_enable();

		break;

	default:

		break;

	}

arch/sparc64/kernel/pci.c

+16 −29
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
#include <linux/sched.h>

#include <linux/capability.h>

#include <linux/errno.h>

#include <linux/pci.h>

#include <linux/msi.h>

#include <linux/irq.h>

#include <linux/init.h>



#include <asm/uaccess.h>

#include <asm/pbm.h>

#include <asm/pgtable.h>

#include <asm/irq.h>

#include <asm/ebus.h>
@@ -48,10 +48,10 @@ asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn, 
#else



/* List of all PCI controllers found in the system. */

struct pci_controller_info *pci_controller_root = NULL;

struct pci_pbm_info *pci_pbm_root = NULL;



/* Each PCI controller found gets a unique index. */

int pci_num_controllers = 0;

/* Each PBM found gets a unique index. */

int pci_num_pbms = 0;



volatile int pci_poke_in_progress;

volatile int pci_poke_cpu = -1;
@@ -291,7 +291,7 @@ extern const struct pci_iommu_ops pci_sun4u_iommu_ops, 


/* Find each controller in the system, attach and initialize

 * software state structure for each and link into the

 * pci_controller_root.  Setup the controller enough such

 * pci_pbm_root.  Setup the controller enough such

 * that bus scanning can be done.

 */

static void __init pci_controller_probe(void)
@@ -743,7 +743,6 @@ int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev, 


struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)

{

	struct pci_controller_info *p = pbm->parent;

	struct device_node *node = pbm->prom_node;

	struct pci_dev *host_pdev;

	struct pci_bus *bus;
@@ -751,7 +750,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm) 
	printk("PCI: Scanning PBM %s\n", node->full_name);



	/* XXX parent device? XXX */

	bus = pci_create_bus(NULL, pbm->pci_first_busno, p->pci_ops, pbm);

	bus = pci_create_bus(NULL, pbm->pci_first_busno, pbm->pci_ops, pbm);

	if (!bus) {

		printk(KERN_ERR "Failed to create bus for %s\n",

		       node->full_name);
@@ -776,10 +775,10 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm) 


static void __init pci_scan_each_controller_bus(void)

{

	struct pci_controller_info *p;

	struct pci_pbm_info *pbm;



	for (p = pci_controller_root; p; p = p->next)

		p->scan_bus(p);

	for (pbm = pci_pbm_root; pbm; pbm = pbm->next)

		pbm->scan_bus(pbm);

}



extern void power_init(void);
@@ -787,7 +786,7 @@ extern void power_init(void); 
static int __init pcibios_init(void)

{

	pci_controller_probe();

	if (pci_controller_root == NULL)

	if (pci_pbm_root == NULL)

		return 0;



	pci_scan_each_controller_bus();
@@ -922,10 +921,8 @@ static int __pci_mmap_make_offset_bus(struct pci_dev *pdev, struct vm_area_struc 
				      enum pci_mmap_state mmap_state)

{

	struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;

	struct pci_controller_info *p;

	unsigned long space_size, user_offset, user_size;



	p = pbm->parent;

	if (mmap_state == pci_mmap_io) {

		space_size = (pbm->io_space.end -

			      pbm->io_space.start) + 1;
@@ -1078,11 +1075,7 @@ int pci_domain_nr(struct pci_bus *pbus) 
	if (pbm == NULL || pbm->parent == NULL) {

		ret = -ENXIO;

	} else {

		struct pci_controller_info *p = pbm->parent;



		ret = p->index;

		ret = ((ret << 1) +

		       ((pbm == &pbm->parent->pbm_B) ? 1 : 0));

		ret = pbm->index;

	}



	return ret;
@@ -1093,17 +1086,12 @@ EXPORT_SYMBOL(pci_domain_nr); 
int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)

{

	struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;

	struct pci_controller_info *p = pbm->parent;

	int virt_irq, err;

	int virt_irq;



	if (!pbm->msi_num || !p->setup_msi_irq)

	if (!pbm->setup_msi_irq)

		return -EINVAL;



	err = p->setup_msi_irq(&virt_irq, pdev, desc);

	if (err)

		return err;



	return 0;

	return pbm->setup_msi_irq(&virt_irq, pdev, desc);

}



void arch_teardown_msi_irq(unsigned int virt_irq)
@@ -1111,12 +1099,11 @@ void arch_teardown_msi_irq(unsigned int virt_irq) 
	struct msi_desc *entry = get_irq_msi(virt_irq);

	struct pci_dev *pdev = entry->dev;

	struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;

	struct pci_controller_info *p = pbm->parent;



	if (!pbm->msi_num || !p->setup_msi_irq)

	if (!pbm->teardown_msi_irq)

		return;



	return p->teardown_msi_irq(virt_irq, pdev);

	return pbm->teardown_msi_irq(virt_irq, pdev);

}

#endif /* !(CONFIG_PCI_MSI) */

arch/sparc64/kernel/pci_common.c

+27 −19
Original line number Diff line number Diff line
@@ -9,12 +9,26 @@ 
#include <linux/pci.h>

#include <linux/device.h>



#include <asm/pbm.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/oplib.h>



#include "pci_impl.h"



void pci_get_pbm_props(struct pci_pbm_info *pbm)

{

	const u32 *val = of_get_property(pbm->prom_node, "bus-range", NULL);



	pbm->pci_first_busno = val[0];

	pbm->pci_last_busno = val[1];



	val = of_get_property(pbm->prom_node, "ino-bitmap", NULL);

	if (val) {

		pbm->ino_bitmap = (((u64)val[1] << 32UL) |

				   ((u64)val[0] <<  0UL));

	}

}



static void pci_register_legacy_regions(struct resource *io_res,

					struct resource *mem_res)

{
@@ -149,8 +163,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 
}



/* Generic helper routines for PCI error reporting. */

void pci_scan_for_target_abort(struct pci_controller_info *p,

			       struct pci_pbm_info *pbm,

void pci_scan_for_target_abort(struct pci_pbm_info *pbm,

			       struct pci_bus *pbus)

{

	struct pci_dev *pdev;
@@ -165,18 +178,16 @@ void pci_scan_for_target_abort(struct pci_controller_info *p, 
				   PCI_STATUS_REC_TARGET_ABORT));

		if (error_bits) {

			pci_write_config_word(pdev, PCI_STATUS, error_bits);

			printk("PCI%d(PBM%c): Device [%s] saw Target Abort [%016x]\n",

			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),

			       pci_name(pdev), status);

			printk("%s: Device %s saw Target Abort [%016x]\n",

			       pbm->name, pci_name(pdev), status);

		}

	}



	list_for_each_entry(bus, &pbus->children, node)

		pci_scan_for_target_abort(p, pbm, bus);

		pci_scan_for_target_abort(pbm, bus);

}



void pci_scan_for_master_abort(struct pci_controller_info *p,

			       struct pci_pbm_info *pbm,

void pci_scan_for_master_abort(struct pci_pbm_info *pbm,

			       struct pci_bus *pbus)

{

	struct pci_dev *pdev;
@@ -190,18 +201,16 @@ void pci_scan_for_master_abort(struct pci_controller_info *p, 
			(status & (PCI_STATUS_REC_MASTER_ABORT));

		if (error_bits) {

			pci_write_config_word(pdev, PCI_STATUS, error_bits);

			printk("PCI%d(PBM%c): Device [%s] received Master Abort [%016x]\n",

			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),

			       pci_name(pdev), status);

			printk("%s: Device %s received Master Abort [%016x]\n",

			       pbm->name, pci_name(pdev), status);

		}

	}



	list_for_each_entry(bus, &pbus->children, node)

		pci_scan_for_master_abort(p, pbm, bus);

		pci_scan_for_master_abort(pbm, bus);

}



void pci_scan_for_parity_error(struct pci_controller_info *p,

			       struct pci_pbm_info *pbm,

void pci_scan_for_parity_error(struct pci_pbm_info *pbm,

			       struct pci_bus *pbus)

{

	struct pci_dev *pdev;
@@ -216,12 +225,11 @@ void pci_scan_for_parity_error(struct pci_controller_info *p, 
				   PCI_STATUS_DETECTED_PARITY));

		if (error_bits) {

			pci_write_config_word(pdev, PCI_STATUS, error_bits);

			printk("PCI%d(PBM%c): Device [%s] saw Parity Error [%016x]\n",

			       p->index, ((pbm == &p->pbm_A) ? 'A' : 'B'),

			       pci_name(pdev), status);

			printk("%s: Device %s saw Parity Error [%016x]\n",

			       pbm->name, pci_name(pdev), status);

		}

	}



	list_for_each_entry(bus, &pbus->children, node)

		pci_scan_for_parity_error(p, pbm, bus);

		pci_scan_for_parity_error(pbm, bus);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE