Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b3040a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull tile updates from Chris Metcalf:
 "These are a smattering of minor changes from Tilera and other folks,
  mostly in the ptrace area."

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: set CORE_DUMP_USE_REGSET on tile
  arch/tile: implement arch_ptrace using user_regset on tile
  arch/tile: implement user_regset interface on tile
  arch/tile: clean up tile-specific PTRACE_SETOPTIONS
  arch/tile: provide PT_FLAGS_COMPAT value in pt_regs
  tile/PCI: use for_each_pci_dev to simplify the code
  tilegx: remove __init from pci fixup hook
parents 31564cbd e6cdebdf

arch/tile/include/asm/elf.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -170,4 +170,6 @@ do { \ 




#endif /* CONFIG_COMPAT */

#endif /* CONFIG_COMPAT */





#define CORE_DUMP_USE_REGSET



#endif /* _ASM_TILE_ELF_H */
 
#endif /* _ASM_TILE_ELF_H */

arch/tile/include/asm/ptrace.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -24,8 +24,7 @@ typedef unsigned long pt_reg_t; 
#include <uapi/asm/ptrace.h>

#include <uapi/asm/ptrace.h>





#define PTRACE_O_MASK_TILE	(PTRACE_O_TRACEMIGRATE)

#define PTRACE_O_MASK_TILE	(PTRACE_O_TRACEMIGRATE)

#define PT_TRACE_MIGRATE	0x00080000

#define PT_TRACE_MIGRATE	PT_EVENT_FLAG(PTRACE_EVENT_MIGRATE)

#define PT_TRACE_MASK_TILE	(PT_TRACE_MIGRATE)





/* Flag bits in pt_regs.flags */

/* Flag bits in pt_regs.flags */

#define PT_FLAGS_DISABLE_IRQ    1  /* on return to kernel, disable irqs */

#define PT_FLAGS_DISABLE_IRQ    1  /* on return to kernel, disable irqs */

arch/tile/include/uapi/asm/ptrace.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -81,8 +81,14 @@ struct pt_regs { 
#define PTRACE_SETFPREGS	15

#define PTRACE_SETFPREGS	15





/* Support TILE-specific ptrace options, with events starting at 16. */

/* Support TILE-specific ptrace options, with events starting at 16. */

#define PTRACE_O_TRACEMIGRATE	0x00010000

#define PTRACE_EVENT_MIGRATE	16

#define PTRACE_EVENT_MIGRATE	16

#define PTRACE_O_TRACEMIGRATE	(1 << PTRACE_EVENT_MIGRATE)





/*

 * Flag bits in pt_regs.flags that are part of the ptrace API.

 * We start our numbering higher up to avoid confusion with the

 * non-ABI kernel-internal values that use the low 16 bits.

 */

#define PT_FLAGS_COMPAT		0x10000  /* process is an -m32 compat process */





#endif /* _UAPI_ASM_TILE_PTRACE_H */
 
#endif /* _UAPI_ASM_TILE_PTRACE_H */

arch/tile/kernel/pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -245,7 +245,7 @@ static void __devinit fixup_read_and_payload_sizes(void) 
	u16 new_values;

	u16 new_values;





	/* Scan for the smallest maximum payload size. */

	/* Scan for the smallest maximum payload size. */

	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

	for_each_pci_dev(dev) {

		u32 devcap;

		u32 devcap;

		int max_payload;

		int max_payload;
@@ -260,7 +260,7 @@ static void __devinit fixup_read_and_payload_sizes(void) 




	/* Now, set the max_payload_size for all devices to that value. */

	/* Now, set the max_payload_size for all devices to that value. */

	new_values = (max_read_size << 12) | (smallest_max_payload << 5);

	new_values = (max_read_size << 12) | (smallest_max_payload << 5);

	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)

	for_each_pci_dev(dev)

		pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL,

		pcie_capability_clear_and_set_word(dev, PCI_EXP_DEVCTL,

				PCI_EXP_DEVCTL_PAYLOAD | PCI_EXP_DEVCTL_READRQ,

				PCI_EXP_DEVCTL_PAYLOAD | PCI_EXP_DEVCTL_READRQ,

				new_values);

				new_values);

arch/tile/kernel/pci_gx.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1047,8 +1047,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) 
}

}





/* Called for each device after PCI setup is done. */

/* Called for each device after PCI setup is done. */

static void __init

static void pcibios_fixup_final(struct pci_dev *pdev)

pcibios_fixup_final(struct pci_dev *pdev)

{

{

	set_dma_ops(&pdev->dev, gx_pci_dma_map_ops);

	set_dma_ops(&pdev->dev, gx_pci_dma_map_ops);

	set_dma_offset(&pdev->dev, TILE_PCI_MEM_MAP_BASE_OFFSET);

	set_dma_offset(&pdev->dev, TILE_PCI_MEM_MAP_BASE_OFFSET);