This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Unified · Split
| @@ -27,17 +27,17 @@ Start End Size Use · 26 unmodified lines | ||
| 27 | 27 | ----------------------------------------------------------------------- |
| 28 | 28 | 0000000000000000 0000007fffffffff 512GB user |
| 29 | 29 | |
| 30 | −ffffff8000000000 ffffffbbfffcffff ~240GB vmalloc | |
| 30 | +ffffff8000000000 ffffffbbfffeffff ~240GB vmalloc | |
| 31 | 31 | |
| 32 | −ffffffbbfffd0000 ffffffbcfffdffff 64KB [guard page] | |
| 32 | +ffffffbbffff0000 ffffffbbffffffff 64KB [guard page] | |
| 33 | 33 | |
| 34 | −ffffffbbfffe0000 ffffffbcfffeffff 64KB PCI I/O space | |
| 34 | +ffffffbc00000000 ffffffbdffffffff 8GB vmemmap | |
| 35 | 35 | |
| 36 | −ffffffbbffff0000 ffffffbcffffffff 64KB [guard page] | |
| 36 | +ffffffbe00000000 ffffffbffbbfffff ~8GB [guard, future vmmemap] | |
| 37 | 37 | |
| 38 | −ffffffbc00000000 ffffffbdffffffff 8GB vmemmap | |
| 38 | +ffffffbffbe00000 ffffffbffbe0ffff 64KB PCI I/O space | |
| 39 | 39 | |
| 40 | −ffffffbe00000000 ffffffbffbffffff ~8GB [guard, future vmmemap] | |
| 40 | +ffffffbbffff0000 ffffffbcffffffff ~2MB [guard] | |
| 41 | 41 | |
| 42 | 42 | ffffffbffc000000 ffffffbfffffffff 64MB modules |
| 43 | 43 | |
| @@ -0,0 +1,19 @@ | ||
| 1 | +* EETI eGalax Multiple Touch Controller | |
| 2 | + | |
| 3 | +Required properties: | |
| 4 | +- compatible: must be "eeti,egalax_ts" | |
| 5 | +- reg: i2c slave address | |
| 6 | +- interrupt-parent: the phandle for the interrupt controller | |
| 7 | +- interrupts: touch controller interrupt | |
| 8 | +- wakeup-gpios: the gpio pin to be used for waking up the controller | |
| 9 | + as well as uased as irq pin | |
| 10 | + | |
| 11 | +Example: | |
| 12 | + | |
| 13 | + egalax_ts@04 { | |
| 14 | + compatible = "eeti,egalax_ts"; | |
| 15 | + reg = <0x04>; | |
| 16 | + interrupt-parent = <&gpio1>; | |
| 17 | + interrupts = <9 2>; | |
| 18 | + wakeup-gpios = <&gpio1 9 0>; | |
| 19 | + }; | |
| @@ -10,7 +10,7 @@ Supported chips: · 9 unmodified lines | ||
| 10 | 10 | BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors |
| 11 | 11 | (not yet published) |
| 12 | 12 | |
| 13 | −Author: Andreas Herrmann <andreas.herrmann3@amd.com> | |
| 13 | +Author: Andreas Herrmann <herrmann.der.user@googlemail.com> | |
| 14 | 14 | |
| 15 | 15 | Description |
| 16 | 16 | ----------- |
| @@ -503,7 +503,7 @@ F: include/linux/altera_uart.h · 502 unmodified lines | ||
| 503 | 503 | F: include/linux/altera_jtaguart.h |
| 504 | 504 | |
| 505 | 505 | AMD FAM15H PROCESSOR POWER MONITORING DRIVER |
| 506 | −M: Andreas Herrmann <andreas.herrmann3@amd.com> | |
| 506 | +M: Andreas Herrmann <herrmann.der.user@googlemail.com> | |
| 507 | 507 | L: lm-sensors@lm-sensors.org |
| 508 | 508 | S: Maintained |
| 509 | 509 | F: Documentation/hwmon/fam15h_power |
| @@ -2507,6 +2507,7 @@ M: Joonyoung Shim <jy0922.shim@samsung.com> · 1997 unmodified lines | ||
| 2507 | 2507 | M: Seung-Woo Kim <sw0312.kim@samsung.com> |
| 2508 | 2508 | M: Kyungmin Park <kyungmin.park@samsung.com> |
| 2509 | 2509 | L: dri-devel@lists.freedesktop.org |
| 2510 | +T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git | |
| 2510 | 2511 | S: Supported |
| 2511 | 2512 | F: drivers/gpu/drm/exynos |
| 2512 | 2513 | F: include/drm/exynos* |
| @@ -5647,7 +5648,7 @@ S: Maintained · 3134 unmodified lines | ||
| 5647 | 5648 | F: drivers/pinctrl/spear/ |
| 5648 | 5649 | |
| 5649 | 5650 | PKTCDVD DRIVER |
| 5650 | −M: Peter Osterlund <petero2@telia.com> | |
| 5651 | +M: Jiri Kosina <jkosina@suse.cz> | |
| 5651 | 5652 | S: Maintained |
| 5652 | 5653 | F: drivers/block/pktcdvd.c |
| 5653 | 5654 | F: include/linux/pktcdvd.h |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | VERSION = 3 |
| 2 | 2 | PATCHLEVEL = 7 |
| 3 | 3 | SUBLEVEL = 0 |
| 4 | −EXTRAVERSION = -rc3 | |
| 4 | +EXTRAVERSION = -rc5 | |
| 5 | 5 | NAME = Terrified Chipmunk |
| 6 | 6 | |
| 7 | 7 | # *DOCUMENTATION* |
| @@ -64,7 +64,7 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); · 63 unmodified lines | ||
| 64 | 64 | static inline void __raw_writew(u16 val, volatile void __iomem *addr) |
| 65 | 65 | { |
| 66 | 66 | asm volatile("strh %1, %0" |
| 67 | − : "+Qo" (*(volatile u16 __force *)addr) | |
| 67 | + : "+Q" (*(volatile u16 __force *)addr) | |
| 68 | 68 | : "r" (val)); |
| 69 | 69 | } |
| 70 | 70 | |
| @@ -72,7 +72,7 @@ static inline u16 __raw_readw(const volatile void __iomem *addr) · 1 unmodified line | ||
| 72 | 72 | { |
| 73 | 73 | u16 val; |
| 74 | 74 | asm volatile("ldrh %1, %0" |
| 75 | − : "+Qo" (*(volatile u16 __force *)addr), | |
| 75 | + : "+Q" (*(volatile u16 __force *)addr), | |
| 76 | 76 | "=r" (val)); |
| 77 | 77 | return val; |
| 78 | 78 | } |
| @@ -10,7 +10,5 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | extern void sched_clock_postinit(void); |
| 12 | 12 | extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); |
| 13 | −extern void setup_sched_clock_needs_suspend(u32 (*read)(void), int bits, | |
| 14 | − unsigned long rate); | |
| 15 | 13 | |
| 16 | 14 | #endif |
| @@ -27,9 +27,9 @@ · 26 unmodified lines | ||
| 27 | 27 | #if __LINUX_ARM_ARCH__ <= 6 |
| 28 | 28 | ldr \tmp, =elf_hwcap @ may not have MVFR regs |
| 29 | 29 | ldr \tmp, [\tmp, #0] |
| 30 | − tst \tmp, #HWCAP_VFPv3D16 | |
| 31 | − ldceql p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} | |
| 32 | − addne \base, \base, #32*4 @ step over unused register space | |
| 30 | + tst \tmp, #HWCAP_VFPD32 | |
| 31 | + ldcnel p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} | |
| 32 | + addeq \base, \base, #32*4 @ step over unused register space | |
| 33 | 33 | #else |
| 34 | 34 | VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 |
| 35 | 35 | and \tmp, \tmp, #MVFR0_A_SIMD_MASK @ A_SIMD field |
| @@ -51,9 +51,9 @@ · 15 unmodified lines | ||
| 51 | 51 | #if __LINUX_ARM_ARCH__ <= 6 |
| 52 | 52 | ldr \tmp, =elf_hwcap @ may not have MVFR regs |
| 53 | 53 | ldr \tmp, [\tmp, #0] |
| 54 | − tst \tmp, #HWCAP_VFPv3D16 | |
| 55 | − stceql p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} | |
| 56 | − addne \base, \base, #32*4 @ step over unused register space | |
| 54 | + tst \tmp, #HWCAP_VFPD32 | |
| 55 | + stcnel p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} | |
| 56 | + addeq \base, \base, #32*4 @ step over unused register space | |
| 57 | 57 | #else |
| 58 | 58 | VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 |
| 59 | 59 | and \tmp, \tmp, #MVFR0_A_SIMD_MASK @ A_SIMD field |
| @@ -18,11 +18,12 @@ · 17 unmodified lines | ||
| 18 | 18 | #define HWCAP_THUMBEE (1 << 11) |
| 19 | 19 | #define HWCAP_NEON (1 << 12) |
| 20 | 20 | #define HWCAP_VFPv3 (1 << 13) |
| 21 | −#define HWCAP_VFPv3D16 (1 << 14) | |
| 21 | +#define HWCAP_VFPv3D16 (1 << 14) /* also set for VFPv4-D16 */ | |
| 22 | 22 | #define HWCAP_TLS (1 << 15) |
| 23 | 23 | #define HWCAP_VFPv4 (1 << 16) |
| 24 | 24 | #define HWCAP_IDIVA (1 << 17) |
| 25 | 25 | #define HWCAP_IDIVT (1 << 18) |
| 26 | +#define HWCAP_VFPD32 (1 << 19) /* set if VFP has 32 regs (not 16) */ | |
| 26 | 27 | #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) |
| 27 | 28 | |
| 28 | 29 | |
| @@ -107,13 +107,6 @@ static void sched_clock_poll(unsigned long wrap_ticks) · 106 unmodified lines | ||
| 107 | 107 | update_sched_clock(); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | −void __init setup_sched_clock_needs_suspend(u32 (*read)(void), int bits, | |
| 111 | − unsigned long rate) | |
| 112 | −{ | |
| 113 | − setup_sched_clock(read, bits, rate); | |
| 114 | − cd.needs_suspend = true; | |
| 115 | −} | |
| 116 | − | |
| 117 | 110 | void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) |
| 118 | 111 | { |
| 119 | 112 | unsigned long r, w; |
| @@ -189,18 +182,15 @@ void __init sched_clock_postinit(void) · 69 unmodified lines | ||
| 189 | 182 | static int sched_clock_suspend(void) |
| 190 | 183 | { |
| 191 | 184 | sched_clock_poll(sched_clock_timer.data); |
| 192 | − if (cd.needs_suspend) | |
| 193 | − cd.suspended = true; | |
| 185 | + cd.suspended = true; | |
| 194 | 186 | return 0; |
| 195 | 187 | } |
| 196 | 188 | |
| 197 | 189 | static void sched_clock_resume(void) |
| 198 | 190 | { |
| 199 | − if (cd.needs_suspend) { | |
| 200 | − cd.epoch_cyc = read_sched_clock(); | |
| 201 | − cd.epoch_cyc_copy = cd.epoch_cyc; | |
| 202 | − cd.suspended = false; | |
| 203 | − } | |
| 191 | + cd.epoch_cyc = read_sched_clock(); | |
| 192 | + cd.epoch_cyc_copy = cd.epoch_cyc; | |
| 193 | + cd.suspended = false; | |
| 204 | 194 | } |
| 205 | 195 | |
| 206 | 196 | static struct syscore_ops sched_clock_ops = { |
| @@ -745,7 +745,7 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs, · 744 unmodified lines | ||
| 745 | 745 | static int |
| 746 | 746 | do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) |
| 747 | 747 | { |
| 748 | − union offset_union offset; | |
| 748 | + union offset_union uninitialized_var(offset); | |
| 749 | 749 | unsigned long instr = 0, instrptr; |
| 750 | 750 | int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); |
| 751 | 751 | unsigned int type; |
| @@ -701,11 +701,14 @@ static int __init vfp_init(void) · 700 unmodified lines | ||
| 701 | 701 | elf_hwcap |= HWCAP_VFPv3; |
| 702 | 702 | |
| 703 | 703 | /* |
| 704 | − * Check for VFPv3 D16. CPUs in this configuration | |
| 705 | − * only have 16 x 64bit registers. | |
| 704 | + * Check for VFPv3 D16 and VFPv4 D16. CPUs in | |
| 705 | + * this configuration only have 16 x 64bit | |
| 706 | + * registers. | |
| 706 | 707 | */ |
| 707 | 708 | if (((fmrx(MVFR0) & MVFR0_A_SIMD_MASK)) == 1) |
| 708 | − elf_hwcap |= HWCAP_VFPv3D16; | |
| 709 | + elf_hwcap |= HWCAP_VFPv3D16; /* also v4-D16 */ | |
| 710 | + else | |
| 711 | + elf_hwcap |= HWCAP_VFPD32; | |
| 709 | 712 | } |
| 710 | 713 | #endif |
| 711 | 714 | /* |
| @@ -166,3 +166,14 @@ void free_xenballooned_pages(int nr_pages, struct page **pages) · 165 unmodified lines | ||
| 166 | 166 | *pages = NULL; |
| 167 | 167 | } |
| 168 | 168 | EXPORT_SYMBOL_GPL(free_xenballooned_pages); |
| 169 | + | |
| 170 | +/* In the hypervisor.S file. */ | |
| 171 | +EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op); | |
| 172 | +EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op); | |
| 173 | +EXPORT_SYMBOL_GPL(HYPERVISOR_xen_version); | |
| 174 | +EXPORT_SYMBOL_GPL(HYPERVISOR_console_io); | |
| 175 | +EXPORT_SYMBOL_GPL(HYPERVISOR_sched_op); | |
| 176 | +EXPORT_SYMBOL_GPL(HYPERVISOR_hvm_op); | |
| 177 | +EXPORT_SYMBOL_GPL(HYPERVISOR_memory_op); | |
| 178 | +EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op); | |
| 179 | +EXPORT_SYMBOL_GPL(privcmd_call); | |
| @@ -48,20 +48,16 @@ · 47 unmodified lines | ||
| 48 | 48 | |
| 49 | 49 | #include <linux/linkage.h> |
| 50 | 50 | #include <asm/assembler.h> |
| 51 | +#include <asm/opcodes-virt.h> | |
| 51 | 52 | #include <xen/interface/xen.h> |
| 52 | 53 | |
| 53 | 54 | |
| 54 | −/* HVC 0xEA1 */ | |
| 55 | −#ifdef CONFIG_THUMB2_KERNEL | |
| 56 | −#define xen_hvc .word 0xf7e08ea1 | |
| 57 | −#else | |
| 58 | −#define xen_hvc .word 0xe140ea71 | |
| 59 | −#endif | |
| 55 | +#define XEN_IMM 0xEA1 | |
| 60 | 56 | |
| 61 | 57 | #define HYPERCALL_SIMPLE(hypercall) \ |
| 62 | 58 | ENTRY(HYPERVISOR_##hypercall) \ |
| 63 | 59 | mov r12, #__HYPERVISOR_##hypercall; \ |
| 64 | − xen_hvc; \ | |
| 60 | + __HVC(XEN_IMM); \ | |
| 65 | 61 | mov pc, lr; \ |
| 66 | 62 | ENDPROC(HYPERVISOR_##hypercall) |
| 67 | 63 | |
| @@ -76,7 +72,7 @@ ENTRY(HYPERVISOR_##hypercall) \ · 8 unmodified lines | ||
| 76 | 72 | stmdb sp!, {r4} \ |
| 77 | 73 | ldr r4, [sp, #4] \ |
| 78 | 74 | mov r12, #__HYPERVISOR_##hypercall; \ |
| 79 | − xen_hvc \ | |
| 75 | + __HVC(XEN_IMM); \ | |
| 80 | 76 | ldm sp!, {r4} \ |
| 81 | 77 | mov pc, lr \ |
| 82 | 78 | ENDPROC(HYPERVISOR_##hypercall) |
| @@ -100,7 +96,7 @@ ENTRY(privcmd_call) · 17 unmodified lines | ||
| 100 | 96 | mov r2, r3 |
| 101 | 97 | ldr r3, [sp, #8] |
| 102 | 98 | ldr r4, [sp, #4] |
| 103 | − xen_hvc | |
| 99 | + __HVC(XEN_IMM) | |
| 104 | 100 | ldm sp!, {r4} |
| 105 | 101 | mov pc, lr |
| 106 | 102 | ENDPROC(privcmd_call); |
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | config ARM64 |
| 2 | 2 | def_bool y |
| 3 | 3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 4 | + select ARCH_WANT_COMPAT_IPC_PARSE_VERSION | |
| 4 | 5 | select GENERIC_CLOCKEVENTS |
| 5 | 6 | select GENERIC_HARDIRQS_NO_DEPRECATED |
| 6 | 7 | select GENERIC_IOMAP |
| @@ -25,12 +25,10 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <asm/user.h> |
| 26 | 26 | |
| 27 | 27 | typedef unsigned long elf_greg_t; |
| 28 | −typedef unsigned long elf_freg_t[3]; | |
| 29 | 28 | |
| 30 | 29 | #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) |
| 31 | 30 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; |
| 32 | − | |
| 33 | −typedef struct user_fp elf_fpregset_t; | |
| 31 | +typedef struct user_fpsimd_state elf_fpregset_t; | |
| 34 | 32 | |
| 35 | 33 | #define EM_AARCH64 183 |
| 36 | 34 | |
| @@ -87,7 +85,6 @@ typedef struct user_fp elf_fpregset_t; · 50 unmodified lines | ||
| 87 | 85 | #define R_AARCH64_MOVW_PREL_G2_NC 292 |
| 88 | 86 | #define R_AARCH64_MOVW_PREL_G3 293 |
| 89 | 87 | |
| 90 | − | |
| 91 | 88 | /* |
| 92 | 89 | * These are used to set parameters in the core dumps. |
| 93 | 90 | */ |
| @@ -25,9 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | * - FPSR and FPCR |
| 26 | 26 | * - 32 128-bit data registers |
| 27 | 27 | * |
| 28 | − * Note that user_fp forms a prefix of this structure, which is relied | |
| 29 | − * upon in the ptrace FP/SIMD accessors. struct user_fpsimd_state must | |
| 30 | − * form a prefix of struct fpsimd_state. | |
| 28 | + * Note that user_fpsimd forms a prefix of this structure, which is | |
| 29 | + * relied upon in the ptrace FP/SIMD accessors. | |
| 31 | 30 | */ |
| 32 | 31 | struct fpsimd_state { |
| 33 | 32 | union { |
| @@ -114,7 +114,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) · 113 unmodified lines | ||
| 114 | 114 | * I/O port access primitives. |
| 115 | 115 | */ |
| 116 | 116 | #define IO_SPACE_LIMIT 0xffff |
| 117 | −#define PCI_IOBASE ((void __iomem *)0xffffffbbfffe0000UL) | |
| 117 | +#define PCI_IOBASE ((void __iomem *)(MODULES_VADDR - SZ_2M)) | |
| 118 | 118 | |
| 119 | 119 | static inline u8 inb(unsigned long addr) |
| 120 | 120 | { |
| @@ -225,9 +225,9 @@ extern void __iounmap(volatile void __iomem *addr); · 104 unmodified lines | ||
| 225 | 225 | #define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_XN | PTE_ATTRINDX(MT_DEVICE_nGnRE)) |
| 226 | 226 | #define PROT_NORMAL_NC (PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL_NC)) |
| 227 | 227 | |
| 228 | −#define ioremap(addr, size) __ioremap((addr), (size), PROT_DEVICE_nGnRE) | |
| 229 | −#define ioremap_nocache(addr, size) __ioremap((addr), (size), PROT_DEVICE_nGnRE) | |
| 230 | −#define ioremap_wc(addr, size) __ioremap((addr), (size), PROT_NORMAL_NC) | |
| 228 | +#define ioremap(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) | |
| 229 | +#define ioremap_nocache(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) | |
| 230 | +#define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) | |
| 231 | 231 | #define iounmap __iounmap |
| 232 | 232 | |
| 233 | 233 | #define ARCH_HAS_IOREMAP_WC |
| @@ -43,6 +43,8 @@ · 42 unmodified lines | ||
| 43 | 43 | #else |
| 44 | 44 | #define STACK_TOP STACK_TOP_MAX |
| 45 | 45 | #endif /* CONFIG_COMPAT */ |
| 46 | + | |
| 47 | +#define ARCH_LOW_ADDRESS_LIMIT PHYS_MASK | |
| 46 | 48 | #endif /* __KERNEL__ */ |
| 47 | 49 | |
| 48 | 50 | struct debug_info { |
| @@ -14,7 +14,6 @@ · 13 unmodified lines | ||
| 14 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | 15 | */ |
| 16 | 16 | #ifdef CONFIG_COMPAT |
| 17 | −#define __ARCH_WANT_COMPAT_IPC_PARSE_VERSION | |
| 18 | 17 | #define __ARCH_WANT_COMPAT_STAT64 |
| 19 | 18 | #define __ARCH_WANT_SYS_GETHOSTNAME |
| 20 | 19 | #define __ARCH_WANT_SYS_PAUSE |
| @@ -613,17 +613,11 @@ enum armv8_pmuv3_perf_types { · 612 unmodified lines | ||
| 613 | 613 | ARMV8_PMUV3_PERFCTR_BUS_ACCESS = 0x19, |
| 614 | 614 | ARMV8_PMUV3_PERFCTR_MEM_ERROR = 0x1A, |
| 615 | 615 | ARMV8_PMUV3_PERFCTR_BUS_CYCLES = 0x1D, |
| 616 | − | |
| 617 | − /* | |
| 618 | − * This isn't an architected event. | |
| 619 | − * We detect this event number and use the cycle counter instead. | |
| 620 | − */ | |
| 621 | − ARMV8_PMUV3_PERFCTR_CPU_CYCLES = 0xFF, | |
| 622 | 616 | }; |
| 623 | 617 | |
| 624 | 618 | /* PMUv3 HW events mapping. */ |
| 625 | 619 | static const unsigned armv8_pmuv3_perf_map[PERF_COUNT_HW_MAX] = { |
| 626 | − [PERF_COUNT_HW_CPU_CYCLES] = ARMV8_PMUV3_PERFCTR_CPU_CYCLES, | |
| 620 | + [PERF_COUNT_HW_CPU_CYCLES] = ARMV8_PMUV3_PERFCTR_CLOCK_CYCLES, | |
| 627 | 621 | [PERF_COUNT_HW_INSTRUCTIONS] = ARMV8_PMUV3_PERFCTR_INSTR_EXECUTED, |
| 628 | 622 | [PERF_COUNT_HW_CACHE_REFERENCES] = ARMV8_PMUV3_PERFCTR_L1_DCACHE_ACCESS, |
| 629 | 623 | [PERF_COUNT_HW_CACHE_MISSES] = ARMV8_PMUV3_PERFCTR_L1_DCACHE_REFILL, |
| @@ -1106,7 +1100,7 @@ static int armv8pmu_get_event_idx(struct pmu_hw_events *cpuc, · 476 unmodified lines | ||
| 1106 | 1100 | unsigned long evtype = event->config_base & ARMV8_EVTYPE_EVENT; |
| 1107 | 1101 | |
| 1108 | 1102 | /* Always place a cycle counter into the cycle counter. */ |
| 1109 | − if (evtype == ARMV8_PMUV3_PERFCTR_CPU_CYCLES) { | |
| 1103 | + if (evtype == ARMV8_PMUV3_PERFCTR_CLOCK_CYCLES) { | |
| 1110 | 1104 | if (test_and_set_bit(ARMV8_IDX_CYCLE_COUNTER, cpuc->used_mask)) |
| 1111 | 1105 | return -EAGAIN; |
| 1112 | 1106 | |
| @@ -309,24 +309,6 @@ struct task_struct *__switch_to(struct task_struct *prev, · 308 unmodified lines | ||
| 309 | 309 | return last; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | −/* | |
| 313 | − * Fill in the task's elfregs structure for a core dump. | |
| 314 | − */ | |
| 315 | −int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs) | |
| 316 | −{ | |
| 317 | − elf_core_copy_regs(elfregs, task_pt_regs(t)); | |
| 318 | − return 1; | |
| 319 | −} | |
| 320 | − | |
| 321 | −/* | |
| 322 | − * fill in the fpe structure for a core dump... | |
| 323 | − */ | |
| 324 | −int dump_fpu (struct pt_regs *regs, struct user_fp *fp) | |
| 325 | −{ | |
| 326 | − return 0; | |
| 327 | −} | |
| 328 | −EXPORT_SYMBOL(dump_fpu); | |
| 329 | − | |
| 330 | 312 | /* |
| 331 | 313 | * Shuffle the argument into the correct register before calling the |
| 332 | 314 | * thread function. x1 is the thread argument, x2 is the pointer to |
| @@ -211,8 +211,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void) · 210 unmodified lines | ||
| 211 | 211 | * before we continue. |
| 212 | 212 | */ |
| 213 | 213 | set_cpu_online(cpu, true); |
| 214 | − while (!cpu_active(cpu)) | |
| 215 | − cpu_relax(); | |
| 214 | + complete(&cpu_running); | |
| 216 | 215 | |
| 217 | 216 | /* |
| 218 | 217 | * OK, it's off to the idle thread for us |
| @@ -80,7 +80,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) · 79 unmodified lines | ||
| 80 | 80 | #ifdef CONFIG_ZONE_DMA32 |
| 81 | 81 | /* 4GB maximum for 32-bit only capable devices */ |
| 82 | 82 | max_dma32 = min(max, MAX_DMA32_PFN); |
| 83 | − zone_size[ZONE_DMA32] = max_dma32 - min; | |
| 83 | + zone_size[ZONE_DMA32] = max(min, max_dma32) - min; | |
| 84 | 84 | #endif |
| 85 | 85 | zone_size[ZONE_NORMAL] = max - max_dma32; |
| 86 | 86 | |
| @@ -13,6 +13,7 @@ config FRV · 12 unmodified lines | ||
| 13 | 13 | select GENERIC_CPU_DEVICES |
| 14 | 14 | select ARCH_WANT_IPC_PARSE_VERSION |
| 15 | 15 | select GENERIC_KERNEL_THREAD |
| 16 | + select GENERIC_KERNEL_EXECVE | |
| 16 | 17 | |
| 17 | 18 | config ZONE_DMA |
| 18 | 19 | bool |
| @@ -17,6 +17,8 @@ PARAMS_PHYS = 0x0207c000 · 16 unmodified lines | ||
| 17 | 17 | INITRD_PHYS = 0x02180000 |
| 18 | 18 | INITRD_VIRT = 0x02180000 |
| 19 | 19 | |
| 20 | +OBJCOPYFLAGS :=-O binary -R .note -R .note.gnu.build-id -R .comment | |
| 21 | + | |
| 20 | 22 | # |
| 21 | 23 | # If you don't define ZRELADDR above, |
| 22 | 24 | # then it defaults to ZTEXTADDR |
| @@ -32,18 +34,18 @@ Image: $(obj)/Image · 9 unmodified lines | ||
| 32 | 34 | targets: $(obj)/Image |
| 33 | 35 | |
| 34 | 36 | $(obj)/Image: vmlinux FORCE |
| 35 | − $(OBJCOPY) -O binary -R .note -R .comment -S vmlinux $@ | |
| 37 | + $(OBJCOPY) $(OBJCOPYFLAGS) -S vmlinux $@ | |
| 36 | 38 | |
| 37 | 39 | #$(obj)/Image: $(CONFIGURE) $(SYSTEM) |
| 38 | −# $(OBJCOPY) -O binary -R .note -R .comment -g -S $(SYSTEM) $@ | |
| 40 | +# $(OBJCOPY) $(OBJCOPYFLAGS) -g -S $(SYSTEM) $@ | |
| 39 | 41 | |
| 40 | 42 | bzImage: zImage |
| 41 | 43 | |
| 42 | 44 | zImage: $(CONFIGURE) compressed/$(LINUX) |
| 43 | − $(OBJCOPY) -O binary -R .note -R .comment -S compressed/$(LINUX) $@ | |
| 45 | + $(OBJCOPY) $(OBJCOPYFLAGS) -S compressed/$(LINUX) $@ | |
| 44 | 46 | |
| 45 | 47 | bootpImage: bootp/bootp |
| 46 | − $(OBJCOPY) -O binary -R .note -R .comment -S bootp/bootp $@ | |
| 48 | + $(OBJCOPY) $(OBJCOPYFLAGS) -S bootp/bootp $@ | |
| 47 | 49 | |
| 48 | 50 | compressed/$(LINUX): $(LINUX) dep |
| 49 | 51 | @$(MAKE) -C compressed $(LINUX) |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | ||
| 30 | 30 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 31 | 31 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
| 32 | 32 | #define __ARCH_WANT_SYS_EXECVE |
| 33 | −#define __ARCH_WANT_KERNEL_EXECVE | |
| 34 | 33 | |
| 35 | 34 | /* |
| 36 | 35 | * "Conditional" syscalls |
| @@ -869,11 +869,6 @@ ret_from_kernel_thread: · 868 unmodified lines | ||
| 869 | 869 | call schedule_tail |
| 870 | 870 | calll.p @(gr21,gr0) |
| 871 | 871 | or gr20,gr20,gr8 |
| 872 | − bra sys_exit | |
| 873 | − | |
| 874 | − .globl ret_from_kernel_execve | |
| 875 | −ret_from_kernel_execve: | |
| 876 | − ori gr28,0,sp | |
| 877 | 872 | bra __syscall_exit |
| 878 | 873 | |
| 879 | 874 | ################################################################################################### |
| @@ -1080,27 +1075,10 @@ __entry_return_from_kernel_interrupt: · 200 unmodified lines | ||
| 1080 | 1075 | subicc gr5,#0,gr0,icc0 |
| 1081 | 1076 | beq icc0,#0,__entry_return_direct |
| 1082 | 1077 | |
| 1083 | −__entry_preempt_need_resched: | |
| 1084 | − ldi @(gr15,#TI_FLAGS),gr4 | |
| 1085 | − andicc gr4,#_TIF_NEED_RESCHED,gr0,icc0 | |
| 1086 | − beq icc0,#1,__entry_return_direct | |
| 1087 | − | |
| 1088 | − setlos #PREEMPT_ACTIVE,gr5 | |
| 1089 | − sti gr5,@(gr15,#TI_FLAGS) | |
| 1090 | − | |
| 1091 | − andi gr23,#~PSR_PIL,gr23 | |
| 1092 | − movgs gr23,psr | |
| 1093 | − | |
| 1094 | − call schedule | |
| 1095 | − sti gr0,@(gr15,#TI_PRE_COUNT) | |
| 1096 | − | |
| 1097 | − movsg psr,gr23 | |
| 1098 | − ori gr23,#PSR_PIL_14,gr23 | |
| 1099 | − movgs gr23,psr | |
| 1100 | − bra __entry_preempt_need_resched | |
| 1101 | −#else | |
| 1102 | − bra __entry_return_direct | |
| 1078 | + subcc gr0,gr0,gr0,icc2 /* set Z and clear C */ | |
| 1079 | + call preempt_schedule_irq | |
| 1103 | 1080 | #endif |
| 1081 | + bra __entry_return_direct | |
| 1104 | 1082 | |
| 1105 | 1083 | |
| 1106 | 1084 | ############################################################################### |
| @@ -181,6 +181,9 @@ int copy_thread(unsigned long clone_flags, · 180 unmodified lines | ||
| 181 | 181 | childregs = (struct pt_regs *) |
| 182 | 182 | (task_stack_page(p) + THREAD_SIZE - FRV_FRAME0_SIZE); |
| 183 | 183 | |
| 184 | + /* set up the userspace frame (the only place that the USP is stored) */ | |
| 185 | + *childregs = *__kernel_frame0_ptr; | |
| 186 | + | |
| 184 | 187 | p->set_child_tid = p->clear_child_tid = NULL; |
| 185 | 188 | |
| 186 | 189 | p->thread.frame = childregs; |
| @@ -191,10 +194,8 @@ int copy_thread(unsigned long clone_flags, · 4 unmodified lines | ||
| 191 | 194 | p->thread.frame0 = childregs; |
| 192 | 195 | |
| 193 | 196 | if (unlikely(!regs)) { |
| 194 | − memset(childregs, 0, sizeof(struct pt_regs)); | |
| 195 | 197 | childregs->gr9 = usp; /* function */ |
| 196 | 198 | childregs->gr8 = arg; |
| 197 | − childregs->psr = PSR_S; | |
| 198 | 199 | p->thread.pc = (unsigned long) ret_from_kernel_thread; |
| 199 | 200 | save_user_regs(p->thread.user); |
| 200 | 201 | return 0; |
| @@ -11,6 +11,7 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #include <linux/types.h> |
| 13 | 13 | #include <linux/slab.h> |
| 14 | +#include <linux/export.h> | |
| 14 | 15 | #include <linux/dma-mapping.h> |
| 15 | 16 | #include <linux/list.h> |
| 16 | 17 | #include <linux/pci.h> |
| @@ -2,7 +2,8 @@ · 1 unmodified line | ||
| 2 | 2 | #define __ARCH_H8300_CACHE_H |
| 3 | 3 | |
| 4 | 4 | /* bytes per L1 cache line */ |
| 5 | −#define L1_CACHE_BYTES 4 | |
| 5 | +#define L1_CACHE_SHIFT 2 | |
| 6 | +#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) | |
| 6 | 7 | |
| 7 | 8 | /* m68k-elf-gcc 2.95.2 doesn't like these */ |
| 8 | 9 | |
| @@ -9,6 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | |
| 10 | 10 | #define LPM_ANYPATH 0xff |
| 11 | 11 | #define __MAX_CSSID 0 |
| 12 | +#define __MAX_SUBCHANNEL 65535 | |
| 13 | +#define __MAX_SSID 3 | |
| 12 | 14 | |
| 13 | 15 | #include <asm/scsw.h> |
| 14 | 16 | |
| @@ -506,12 +506,15 @@ static inline int pud_bad(pud_t pud) · 505 unmodified lines | ||
| 506 | 506 | |
| 507 | 507 | static inline int pmd_present(pmd_t pmd) |
| 508 | 508 | { |
| 509 | − return (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN) != 0UL; | |
| 509 | + unsigned long mask = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO; | |
| 510 | + return (pmd_val(pmd) & mask) == _HPAGE_TYPE_NONE || | |
| 511 | + !(pmd_val(pmd) & _SEGMENT_ENTRY_INV); | |
| 510 | 512 | } |
| 511 | 513 | |
| 512 | 514 | static inline int pmd_none(pmd_t pmd) |
| 513 | 515 | { |
| 514 | − return (pmd_val(pmd) & _SEGMENT_ENTRY_INV) != 0UL; | |
| 516 | + return (pmd_val(pmd) & _SEGMENT_ENTRY_INV) && | |
| 517 | + !(pmd_val(pmd) & _SEGMENT_ENTRY_RO); | |
| 515 | 518 | } |
| 516 | 519 | |
| 517 | 520 | static inline int pmd_large(pmd_t pmd) |
| @@ -1223,6 +1226,11 @@ static inline void __pmd_idte(unsigned long address, pmd_t *pmdp) · 705 unmodified lines | ||
| 1223 | 1226 | } |
| 1224 | 1227 | |
| 1225 | 1228 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| 1229 | + | |
| 1230 | +#define SEGMENT_NONE __pgprot(_HPAGE_TYPE_NONE) | |
| 1231 | +#define SEGMENT_RO __pgprot(_HPAGE_TYPE_RO) | |
| 1232 | +#define SEGMENT_RW __pgprot(_HPAGE_TYPE_RW) | |
| 1233 | + | |
| 1226 | 1234 | #define __HAVE_ARCH_PGTABLE_DEPOSIT |
| 1227 | 1235 | extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pgtable_t pgtable); |
| 1228 | 1236 | |
| @@ -1242,16 +1250,15 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, · 13 unmodified lines | ||
| 1242 | 1250 | |
| 1243 | 1251 | static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot) |
| 1244 | 1252 | { |
| 1245 | − unsigned long pgprot_pmd = 0; | |
| 1246 | − | |
| 1247 | − if (pgprot_val(pgprot) & _PAGE_INVALID) { | |
| 1248 | − if (pgprot_val(pgprot) & _PAGE_SWT) | |
| 1249 | − pgprot_pmd |= _HPAGE_TYPE_NONE; | |
| 1250 | − pgprot_pmd |= _SEGMENT_ENTRY_INV; | |
| 1251 | − } | |
| 1252 | − if (pgprot_val(pgprot) & _PAGE_RO) | |
| 1253 | − pgprot_pmd |= _SEGMENT_ENTRY_RO; | |
| 1254 | − return pgprot_pmd; | |
| 1253 | + /* | |
| 1254 | + * pgprot is PAGE_NONE, PAGE_RO, or PAGE_RW (see __Pxxx / __Sxxx) | |
| 1255 | + * Convert to segment table entry format. | |
| 1256 | + */ | |
| 1257 | + if (pgprot_val(pgprot) == pgprot_val(PAGE_NONE)) | |
| 1258 | + return pgprot_val(SEGMENT_NONE); | |
| 1259 | + if (pgprot_val(pgprot) == pgprot_val(PAGE_RO)) | |
| 1260 | + return pgprot_val(SEGMENT_RO); | |
| 1261 | + return pgprot_val(SEGMENT_RW); | |
| 1255 | 1262 | } |
| 1256 | 1263 | |
| 1257 | 1264 | static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) |
| @@ -1269,7 +1276,9 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd) · 11 unmodified lines | ||
| 1269 | 1276 | |
| 1270 | 1277 | static inline pmd_t pmd_mkwrite(pmd_t pmd) |
| 1271 | 1278 | { |
| 1272 | − pmd_val(pmd) &= ~_SEGMENT_ENTRY_RO; | |
| 1279 | + /* Do not clobber _HPAGE_TYPE_NONE pages! */ | |
| 1280 | + if (!(pmd_val(pmd) & _SEGMENT_ENTRY_INV)) | |
| 1281 | + pmd_val(pmd) &= ~_SEGMENT_ENTRY_RO; | |
| 1273 | 1282 | return pmd; |
| 1274 | 1283 | } |
| 1275 | 1284 | |
| @@ -44,6 +44,12 @@ _sclp_wait_int: · 43 unmodified lines | ||
| 44 | 44 | #endif |
| 45 | 45 | mvc .LoldpswS1-.LbaseS1(16,%r13),0(%r8) |
| 46 | 46 | mvc 0(16,%r8),0(%r9) |
| 47 | +#ifdef CONFIG_64BIT | |
| 48 | + epsw %r6,%r7 # set current addressing mode | |
| 49 | + nill %r6,0x1 # in new psw (31 or 64 bit mode) | |
| 50 | + nilh %r7,0x8000 | |
| 51 | + stm %r6,%r7,0(%r8) | |
| 52 | +#endif | |
| 47 | 53 | lhi %r6,0x0200 # cr mask for ext int (cr0.54) |
| 48 | 54 | ltr %r2,%r2 |
| 49 | 55 | jz .LsetctS1 |
| @@ -87,7 +93,7 @@ _sclp_wait_int: · 37 unmodified lines | ||
| 87 | 93 | .long 0x00080000, 0x80000000+.LwaitS1 # PSW to handle ext int |
| 88 | 94 | #ifdef CONFIG_64BIT |
| 89 | 95 | .LextpswS1_64: |
| 90 | − .quad 0x0000000180000000, .LwaitS1 # PSW to handle ext int, 64 bit | |
| 96 | + .quad 0, .LwaitS1 # PSW to handle ext int, 64 bit | |
| 91 | 97 | #endif |
| 92 | 98 | .LwaitpswS1: |
| 93 | 99 | .long 0x010a0000, 0x00000000+.LloopS1 # PSW to wait for ext int |
| @@ -39,7 +39,7 @@ static __always_inline unsigned long follow_table(struct mm_struct *mm, · 38 unmodified lines | ||
| 39 | 39 | pmd = pmd_offset(pud, addr); |
| 40 | 40 | if (pmd_none(*pmd)) |
| 41 | 41 | return -0x10UL; |
| 42 | − if (pmd_huge(*pmd)) { | |
| 42 | + if (pmd_large(*pmd)) { | |
| 43 | 43 | if (write && (pmd_val(*pmd) & _SEGMENT_ENTRY_RO)) |
| 44 | 44 | return -0x04UL; |
| 45 | 45 | return (pmd_val(*pmd) & HPAGE_MASK) + (addr & ~HPAGE_MASK); |
| @@ -126,7 +126,7 @@ static inline int gup_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, · 125 unmodified lines | ||
| 126 | 126 | */ |
| 127 | 127 | if (pmd_none(pmd) || pmd_trans_splitting(pmd)) |
| 128 | 128 | return 0; |
| 129 | − if (unlikely(pmd_huge(pmd))) { | |
| 129 | + if (unlikely(pmd_large(pmd))) { | |
| 130 | 130 | if (!gup_huge_pmd(pmdp, pmd, addr, next, |
| 131 | 131 | write, pages, nr)) |
| 132 | 132 | return 0; |
| @@ -20,6 +20,7 @@ config SPARC · 19 unmodified lines | ||
| 20 | 20 | select HAVE_ARCH_TRACEHOOK |
| 21 | 21 | select SYSCTL_EXCEPTION_TRACE |
| 22 | 22 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 23 | + select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | |
| 23 | 24 | select RTC_CLASS |
| 24 | 25 | select RTC_DRV_M48T59 |
| 25 | 26 | select HAVE_IRQ_WORK |
| @@ -13,13 +13,13 @@ obj-$(CONFIG_CRYPTO_DES_SPARC64) += camellia-sparc64.o · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | obj-$(CONFIG_CRYPTO_CRC32C_SPARC64) += crc32c-sparc64.o |
| 15 | 15 | |
| 16 | −sha1-sparc64-y := sha1_asm.o sha1_glue.o crop_devid.o | |
| 17 | −sha256-sparc64-y := sha256_asm.o sha256_glue.o crop_devid.o | |
| 18 | −sha512-sparc64-y := sha512_asm.o sha512_glue.o crop_devid.o | |
| 19 | −md5-sparc64-y := md5_asm.o md5_glue.o crop_devid.o | |
| 16 | +sha1-sparc64-y := sha1_asm.o sha1_glue.o | |
| 17 | +sha256-sparc64-y := sha256_asm.o sha256_glue.o | |
| 18 | +sha512-sparc64-y := sha512_asm.o sha512_glue.o | |
| 19 | +md5-sparc64-y := md5_asm.o md5_glue.o | |
| 20 | 20 | |
| 21 | −aes-sparc64-y := aes_asm.o aes_glue.o crop_devid.o | |
| 22 | −des-sparc64-y := des_asm.o des_glue.o crop_devid.o | |
| 23 | −camellia-sparc64-y := camellia_asm.o camellia_glue.o crop_devid.o | |
| 21 | +aes-sparc64-y := aes_asm.o aes_glue.o | |
| 22 | +des-sparc64-y := des_asm.o des_glue.o | |
| 23 | +camellia-sparc64-y := camellia_asm.o camellia_glue.o | |
| 24 | 24 | |
| 25 | −crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o crop_devid.o | |
| 25 | +crc32c-sparc64-y := crc32c_asm.o crc32c_glue.o | |
| @@ -475,3 +475,5 @@ MODULE_LICENSE("GPL"); · 474 unmodified lines | ||
| 475 | 475 | MODULE_DESCRIPTION("AES Secure Hash Algorithm, sparc64 aes opcode accelerated"); |
| 476 | 476 | |
| 477 | 477 | MODULE_ALIAS("aes"); |
| 478 | + | |
| 479 | +#include "crop_devid.c" | |
| @@ -320,3 +320,5 @@ MODULE_LICENSE("GPL"); · 319 unmodified lines | ||
| 320 | 320 | MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated"); |
| 321 | 321 | |
| 322 | 322 | MODULE_ALIAS("aes"); |
| 323 | + | |
| 324 | +#include "crop_devid.c" | |
| @@ -177,3 +177,5 @@ MODULE_LICENSE("GPL"); · 176 unmodified lines | ||
| 177 | 177 | MODULE_DESCRIPTION("CRC32c (Castagnoli), sparc64 crc32c opcode accelerated"); |
| 178 | 178 | |
| 179 | 179 | MODULE_ALIAS("crc32c"); |
| 180 | + | |
| 181 | +#include "crop_devid.c" | |
| @@ -527,3 +527,5 @@ MODULE_LICENSE("GPL"); · 526 unmodified lines | ||
| 527 | 527 | MODULE_DESCRIPTION("DES & Triple DES EDE Cipher Algorithms, sparc64 des opcode accelerated"); |
| 528 | 528 | |
| 529 | 529 | MODULE_ALIAS("des"); |
| 530 | + | |
| 531 | +#include "crop_devid.c" | |
| @@ -186,3 +186,5 @@ MODULE_LICENSE("GPL"); · 185 unmodified lines | ||
| 186 | 186 | MODULE_DESCRIPTION("MD5 Secure Hash Algorithm, sparc64 md5 opcode accelerated"); |
| 187 | 187 | |
| 188 | 188 | MODULE_ALIAS("md5"); |
| 189 | + | |
| 190 | +#include "crop_devid.c" | |
| @@ -181,3 +181,5 @@ MODULE_LICENSE("GPL"); · 180 unmodified lines | ||
| 181 | 181 | MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated"); |
| 182 | 182 | |
| 183 | 183 | MODULE_ALIAS("sha1"); |
| 184 | + | |
| 185 | +#include "crop_devid.c" | |
| @@ -239,3 +239,5 @@ MODULE_DESCRIPTION("SHA-224 and SHA-256 Secure Hash Algorithm, sparc64 sha256 op · 238 unmodified lines | ||
| 239 | 239 | |
| 240 | 240 | MODULE_ALIAS("sha224"); |
| 241 | 241 | MODULE_ALIAS("sha256"); |
| 242 | + | |
| 243 | +#include "crop_devid.c" | |
| @@ -224,3 +224,5 @@ MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 op · 223 unmodified lines | ||
| 224 | 224 | |
| 225 | 225 | MODULE_ALIAS("sha384"); |
| 226 | 226 | MODULE_ALIAS("sha512"); |
| 227 | + | |
| 228 | +#include "crop_devid.c" | |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | /* atomic.h: Thankfully the V9 is at least reasonable for this |
| 2 | 2 | * stuff. |
| 3 | 3 | * |
| 4 | − * Copyright (C) 1996, 1997, 2000 David S. Miller (davem@redhat.com) | |
| 4 | + * Copyright (C) 1996, 1997, 2000, 2012 David S. Miller (davem@redhat.com) | |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | 7 | #ifndef __ARCH_SPARC64_ATOMIC__ |
| @@ -106,6 +106,8 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) · 98 unmodified lines | ||
| 106 | 106 | |
| 107 | 107 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) |
| 108 | 108 | |
| 109 | +extern long atomic64_dec_if_positive(atomic64_t *v); | |
| 110 | + | |
| 109 | 111 | /* Atomic operations are already serializing */ |
| 110 | 112 | #define smp_mb__before_atomic_dec() barrier() |
| 111 | 113 | #define smp_mb__after_atomic_dec() barrier() |
| @@ -1,6 +1,46 @@ | ||
| 1 | 1 | #ifndef _SPARC64_BACKOFF_H |
| 2 | 2 | #define _SPARC64_BACKOFF_H |
| 3 | 3 | |
| 4 | +/* The macros in this file implement an exponential backoff facility | |
| 5 | + * for atomic operations. | |
| 6 | + * | |
| 7 | + * When multiple threads compete on an atomic operation, it is | |
| 8 | + * possible for one thread to be continually denied a successful | |
| 9 | + * completion of the compare-and-swap instruction. Heavily | |
| 10 | + * threaded cpu implementations like Niagara can compound this | |
| 11 | + * problem even further. | |
| 12 | + * | |
| 13 | + * When an atomic operation fails and needs to be retried, we spin a | |
| 14 | + * certain number of times. At each subsequent failure of the same | |
| 15 | + * operation we double the spin count, realizing an exponential | |
| 16 | + * backoff. | |
| 17 | + * | |
| 18 | + * When we spin, we try to use an operation that will cause the | |
| 19 | + * current cpu strand to block, and therefore make the core fully | |
| 20 | + * available to any other other runnable strands. There are two | |
| 21 | + * options, based upon cpu capabilities. | |
| 22 | + * | |
| 23 | + * On all cpus prior to SPARC-T4 we do three dummy reads of the | |
| 24 | + * condition code register. Each read blocks the strand for something | |
| 25 | + * between 40 and 50 cpu cycles. | |
| 26 | + * | |
| 27 | + * For SPARC-T4 and later we have a special "pause" instruction | |
| 28 | + * available. This is implemented using writes to register %asr27. | |
| 29 | + * The cpu will block the number of cycles written into the register, | |
| 30 | + * unless a disrupting trap happens first. SPARC-T4 specifically | |
| 31 | + * implements pause with a granularity of 8 cycles. Each strand has | |
| 32 | + * an internal pause counter which decrements every 8 cycles. So the | |
| 33 | + * chip shifts the %asr27 value down by 3 bits, and writes the result | |
| 34 | + * into the pause counter. If a value smaller than 8 is written, the | |
| 35 | + * chip blocks for 1 cycle. | |
| 36 | + * | |
| 37 | + * To achieve the same amount of backoff as the three %ccr reads give | |
| 38 | + * on earlier chips, we shift the backoff value up by 7 bits. (Three | |
| 39 | + * %ccr reads block for about 128 cycles, 1 << 7 == 128) We write the | |
| 40 | + * whole amount we want to block into the pause register, rather than | |
| 41 | + * loop writing 128 each time. | |
| 42 | + */ | |
| 43 | + | |
| 4 | 44 | #define BACKOFF_LIMIT (4 * 1024) |
| 5 | 45 | |
| 6 | 46 | #ifdef CONFIG_SMP |
| @@ -11,16 +51,25 @@ · 4 unmodified lines | ||
| 11 | 51 | #define BACKOFF_LABEL(spin_label, continue_label) \ |
| 12 | 52 | spin_label |
| 13 | 53 | |
| 14 | −#define BACKOFF_SPIN(reg, tmp, label) \ | |
| 15 | − mov reg, tmp; \ | |
| 16 | −88: brnz,pt tmp, 88b; \ | |
| 17 | − sub tmp, 1, tmp; \ | |
| 18 | − set BACKOFF_LIMIT, tmp; \ | |
| 19 | − cmp reg, tmp; \ | |
| 20 | − bg,pn %xcc, label; \ | |
| 21 | − nop; \ | |
| 22 | − ba,pt %xcc, label; \ | |
| 23 | − sllx reg, 1, reg; | |
| 54 | +#define BACKOFF_SPIN(reg, tmp, label) \ | |
| 55 | + mov reg, tmp; \ | |
| 56 | +88: rd %ccr, %g0; \ | |
| 57 | + rd %ccr, %g0; \ | |
| 58 | + rd %ccr, %g0; \ | |
| 59 | + .section .pause_3insn_patch,"ax";\ | |
| 60 | + .word 88b; \ | |
| 61 | + sllx tmp, 7, tmp; \ | |
| 62 | + wr tmp, 0, %asr27; \ | |
| 63 | + clr tmp; \ | |
| 64 | + .previous; \ | |
| 65 | + brnz,pt tmp, 88b; \ | |
| 66 | + sub tmp, 1, tmp; \ | |
| 67 | + set BACKOFF_LIMIT, tmp; \ | |
| 68 | + cmp reg, tmp; \ | |
| 69 | + bg,pn %xcc, label; \ | |
| 70 | + nop; \ | |
| 71 | + ba,pt %xcc, label; \ | |
| 72 | + sllx reg, 1, reg; | |
| 24 | 73 | |
| 25 | 74 | #else |
| 26 | 75 | |
| @@ -232,9 +232,10 @@ static inline void __user *arch_compat_alloc_user_space(long len) · 231 unmodified lines | ||
| 232 | 232 | struct pt_regs *regs = current_thread_info()->kregs; |
| 233 | 233 | unsigned long usp = regs->u_regs[UREG_I6]; |
| 234 | 234 | |
| 235 | − if (!(test_thread_flag(TIF_32BIT))) | |
| 235 | + if (test_thread_64bit_stack(usp)) | |
| 236 | 236 | usp += STACK_BIAS; |
| 237 | − else | |
| 237 | + | |
| 238 | + if (test_thread_flag(TIF_32BIT)) | |
| 238 | 239 | usp &= 0xffffffffUL; |
| 239 | 240 | |
| 240 | 241 | usp -= len; |
| @@ -196,7 +196,22 @@ extern unsigned long get_wchan(struct task_struct *task); · 195 unmodified lines | ||
| 196 | 196 | #define KSTK_EIP(tsk) (task_pt_regs(tsk)->tpc) |
| 197 | 197 | #define KSTK_ESP(tsk) (task_pt_regs(tsk)->u_regs[UREG_FP]) |
| 198 | 198 | |
| 199 | −#define cpu_relax() barrier() | |
| 199 | +/* Please see the commentary in asm/backoff.h for a description of | |
| 200 | + * what these instructions are doing and how they have been choosen. | |
| 201 | + * To make a long story short, we are trying to yield the current cpu | |
| 202 | + * strand during busy loops. | |
| 203 | + */ | |
| 204 | +#define cpu_relax() asm volatile("\n99:\n\t" \ | |
| 205 | + "rd %%ccr, %%g0\n\t" \ | |
| 206 | + "rd %%ccr, %%g0\n\t" \ | |
| 207 | + "rd %%ccr, %%g0\n\t" \ | |
| 208 | + ".section .pause_3insn_patch,\"ax\"\n\t"\ | |
| 209 | + ".word 99b\n\t" \ | |
| 210 | + "wr %%g0, 128, %%asr27\n\t" \ | |
| 211 | + "nop\n\t" \ | |
| 212 | + "nop\n\t" \ | |
| 213 | + ".previous" \ | |
| 214 | + ::: "memory") | |
| 200 | 215 | |
| 201 | 216 | /* Prefetch support. This is tuned for UltraSPARC-III and later. |
| 202 | 217 | * UltraSPARC-I will treat these as nops, and UltraSPARC-II has |
| @@ -63,5 +63,10 @@ extern char *of_console_options; · 62 unmodified lines | ||
| 63 | 63 | extern void irq_trans_init(struct device_node *dp); |
| 64 | 64 | extern char *build_path_component(struct device_node *dp); |
| 65 | 65 | |
| 66 | +/* SPARC has a local implementation */ | |
| 67 | +extern int of_address_to_resource(struct device_node *dev, int index, | |
| 68 | + struct resource *r); | |
| 69 | +#define of_address_to_resource of_address_to_resource | |
| 70 | + | |
| 66 | 71 | #endif /* __KERNEL__ */ |
| 67 | 72 | #endif /* _SPARC_PROM_H */ |
| @@ -259,6 +259,11 @@ static inline bool test_and_clear_restore_sigmask(void) · 258 unmodified lines | ||
| 259 | 259 | |
| 260 | 260 | #define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG) |
| 261 | 261 | |
| 262 | +#define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0) | |
| 263 | +#define test_thread_64bit_stack(__SP) \ | |
| 264 | + ((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \ | |
| 265 | + false : true) | |
| 266 | + | |
| 262 | 267 | #endif /* !__ASSEMBLY__ */ |
| 263 | 268 | |
| 264 | 269 | #endif /* __KERNEL__ */ |
| @@ -372,7 +372,9 @@ etrap_spill_fixup_64bit: \ · 371 unmodified lines | ||
| 372 | 372 | |
| 373 | 373 | /* Normal 32bit spill */ |
| 374 | 374 | #define SPILL_2_GENERIC(ASI) \ |
| 375 | − srl %sp, 0, %sp; \ | |
| 375 | + and %sp, 1, %g3; \ | |
| 376 | + brnz,pn %g3, (. - (128 + 4)); \ | |
| 377 | + srl %sp, 0, %sp; \ | |
| 376 | 378 | stwa %l0, [%sp + %g0] ASI; \ |
| 377 | 379 | mov 0x04, %g3; \ |
| 378 | 380 | stwa %l1, [%sp + %g3] ASI; \ |
| @@ -398,14 +400,16 @@ etrap_spill_fixup_64bit: \ · 19 unmodified lines | ||
| 398 | 400 | stwa %i6, [%g1 + %g0] ASI; \ |
| 399 | 401 | stwa %i7, [%g1 + %g3] ASI; \ |
| 400 | 402 | saved; \ |
| 401 | − retry; nop; nop; \ | |
| 403 | + retry; \ | |
| 402 | 404 | b,a,pt %xcc, spill_fixup_dax; \ |
| 403 | 405 | b,a,pt %xcc, spill_fixup_mna; \ |
| 404 | 406 | b,a,pt %xcc, spill_fixup; |
| 405 | 407 | |
| 406 | 408 | #define SPILL_2_GENERIC_ETRAP \ |
| 407 | 409 | etrap_user_spill_32bit: \ |
| 408 | − srl %sp, 0, %sp; \ | |
| 410 | + and %sp, 1, %g3; \ | |
| 411 | + brnz,pn %g3, etrap_user_spill_64bit; \ | |
| 412 | + srl %sp, 0, %sp; \ | |
| 409 | 413 | stwa %l0, [%sp + 0x00] %asi; \ |
| 410 | 414 | stwa %l1, [%sp + 0x04] %asi; \ |
| 411 | 415 | stwa %l2, [%sp + 0x08] %asi; \ |
| @@ -427,7 +431,7 @@ etrap_user_spill_32bit: \ · 15 unmodified lines | ||
| 427 | 431 | ba,pt %xcc, etrap_save; \ |
| 428 | 432 | wrpr %g1, %cwp; \ |
| 429 | 433 | nop; nop; nop; nop; \ |
| 430 | − nop; nop; nop; nop; \ | |
| 434 | + nop; nop; \ | |
| 431 | 435 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ |
| 432 | 436 | ba,a,pt %xcc, etrap_spill_fixup_32bit; \ |
| 433 | 437 | ba,a,pt %xcc, etrap_spill_fixup_32bit; |
| @@ -592,7 +596,9 @@ user_rtt_fill_64bit: \ · 158 unmodified lines | ||
| 592 | 596 | |
| 593 | 597 | /* Normal 32bit fill */ |
| 594 | 598 | #define FILL_2_GENERIC(ASI) \ |
| 595 | − srl %sp, 0, %sp; \ | |
| 599 | + and %sp, 1, %g3; \ | |
| 600 | + brnz,pn %g3, (. - (128 + 4)); \ | |
| 601 | + srl %sp, 0, %sp; \ | |
| 596 | 602 | lduwa [%sp + %g0] ASI, %l0; \ |
| 597 | 603 | mov 0x04, %g2; \ |
| 598 | 604 | mov 0x08, %g3; \ |
| @@ -616,14 +622,16 @@ user_rtt_fill_64bit: \ · 17 unmodified lines | ||
| 616 | 622 | lduwa [%g1 + %g3] ASI, %i6; \ |
| 617 | 623 | lduwa [%g1 + %g5] ASI, %i7; \ |
| 618 | 624 | restored; \ |
| 619 | − retry; nop; nop; nop; nop; \ | |
| 625 | + retry; nop; nop; \ | |
| 620 | 626 | b,a,pt %xcc, fill_fixup_dax; \ |
| 621 | 627 | b,a,pt %xcc, fill_fixup_mna; \ |
| 622 | 628 | b,a,pt %xcc, fill_fixup; |
| 623 | 629 | |
| 624 | 630 | #define FILL_2_GENERIC_RTRAP \ |
| 625 | 631 | user_rtt_fill_32bit: \ |
| 626 | − srl %sp, 0, %sp; \ | |
| 632 | + and %sp, 1, %g3; \ | |
| 633 | + brnz,pn %g3, user_rtt_fill_64bit; \ | |
| 634 | + srl %sp, 0, %sp; \ | |
| 627 | 635 | lduwa [%sp + 0x00] %asi, %l0; \ |
| 628 | 636 | lduwa [%sp + 0x04] %asi, %l1; \ |
| 629 | 637 | lduwa [%sp + 0x08] %asi, %l2; \ |
| @@ -643,7 +651,7 @@ user_rtt_fill_32bit: \ · 13 unmodified lines | ||
| 643 | 651 | ba,pt %xcc, user_rtt_pre_restore; \ |
| 644 | 652 | restored; \ |
| 645 | 653 | nop; nop; nop; nop; nop; \ |
| 646 | − nop; nop; nop; nop; nop; \ | |
| 654 | + nop; nop; nop; \ | |
| 647 | 655 | ba,a,pt %xcc, user_rtt_fill_fixup; \ |
| 648 | 656 | ba,a,pt %xcc, user_rtt_fill_fixup; \ |
| 649 | 657 | ba,a,pt %xcc, user_rtt_fill_fixup; |
| @@ -405,8 +405,13 @@ · 404 unmodified lines | ||
| 405 | 405 | #define __NR_setns 337 |
| 406 | 406 | #define __NR_process_vm_readv 338 |
| 407 | 407 | #define __NR_process_vm_writev 339 |
| 408 | +#define __NR_kern_features 340 | |
| 409 | +#define __NR_kcmp 341 | |
| 408 | 410 | |
| 409 | −#define NR_syscalls 340 | |
| 411 | +#define NR_syscalls 342 | |
| 412 | + | |
| 413 | +/* Bitmask values returned from kern_features system call. */ | |
| 414 | +#define KERN_FEATURE_MIXED_MODE_STACK 0x00000001 | |
| 410 | 415 | |
| 411 | 416 | #ifdef __32bit_syscall_numbers__ |
| 412 | 417 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
| @@ -59,6 +59,13 @@ struct popc_6insn_patch_entry { · 58 unmodified lines | ||
| 59 | 59 | extern struct popc_6insn_patch_entry __popc_6insn_patch, |
| 60 | 60 | __popc_6insn_patch_end; |
| 61 | 61 | |
| 62 | +struct pause_patch_entry { | |
| 63 | + unsigned int addr; | |
| 64 | + unsigned int insns[3]; | |
| 65 | +}; | |
| 66 | +extern struct pause_patch_entry __pause_3insn_patch, | |
| 67 | + __pause_3insn_patch_end; | |
| 68 | + | |
| 62 | 69 | extern void __init per_cpu_patch(void); |
| 63 | 70 | extern void sun4v_patch_1insn_range(struct sun4v_1insn_patch_entry *, |
| 64 | 71 | struct sun4v_1insn_patch_entry *); |
| @@ -56,11 +56,13 @@ static inline unsigned int leon_eirq_get(int cpu) · 55 unmodified lines | ||
| 56 | 56 | static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc) |
| 57 | 57 | { |
| 58 | 58 | unsigned int eirq; |
| 59 | + struct irq_bucket *p; | |
| 59 | 60 | int cpu = sparc_leon3_cpuid(); |
| 60 | 61 | |
| 61 | 62 | eirq = leon_eirq_get(cpu); |
| 62 | − if ((eirq & 0x10) && irq_map[eirq]->irq) /* bit4 tells if IRQ happened */ | |
| 63 | − generic_handle_irq(irq_map[eirq]->irq); | |
| 63 | + p = irq_map[eirq]; | |
| 64 | + if ((eirq & 0x10) && p && p->irq) /* bit4 tells if IRQ happened */ | |
| 65 | + generic_handle_irq(p->irq); | |
| 64 | 66 | } |
| 65 | 67 | |
| 66 | 68 | /* The extended IRQ controller has been found, this function registers it */ |
| @@ -1762,15 +1762,25 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, · 1761 unmodified lines | ||
| 1762 | 1762 | |
| 1763 | 1763 | ufp = regs->u_regs[UREG_I6] & 0xffffffffUL; |
| 1764 | 1764 | do { |
| 1765 | − struct sparc_stackf32 *usf, sf; | |
| 1766 | 1765 | unsigned long pc; |
| 1767 | 1766 | |
| 1768 | − usf = (struct sparc_stackf32 *) ufp; | |
| 1769 | − if (__copy_from_user_inatomic(&sf, usf, sizeof(sf))) | |
| 1770 | − break; | |
| 1767 | + if (thread32_stack_is_64bit(ufp)) { | |
| 1768 | + struct sparc_stackf *usf, sf; | |
| 1771 | 1769 | |
| 1772 | − pc = sf.callers_pc; | |
| 1773 | − ufp = (unsigned long)sf.fp; | |
| 1770 | + ufp += STACK_BIAS; | |
| 1771 | + usf = (struct sparc_stackf *) ufp; | |
| 1772 | + if (__copy_from_user_inatomic(&sf, usf, sizeof(sf))) | |
| 1773 | + break; | |
| 1774 | + pc = sf.callers_pc & 0xffffffff; | |
| 1775 | + ufp = ((unsigned long) sf.fp) & 0xffffffff; | |
| 1776 | + } else { | |
| 1777 | + struct sparc_stackf32 *usf, sf; | |
| 1778 | + usf = (struct sparc_stackf32 *) ufp; | |
| 1779 | + if (__copy_from_user_inatomic(&sf, usf, sizeof(sf))) | |
| 1780 | + break; | |
| 1781 | + pc = sf.callers_pc; | |
| 1782 | + ufp = (unsigned long)sf.fp; | |
| 1783 | + } | |
| 1774 | 1784 | perf_callchain_store(entry, pc); |
| 1775 | 1785 | } while (entry->nr < PERF_MAX_STACK_DEPTH); |
| 1776 | 1786 | } |
| @@ -452,13 +452,16 @@ void flush_thread(void) · 451 unmodified lines | ||
| 452 | 452 | /* It's a bit more tricky when 64-bit tasks are involved... */ |
| 453 | 453 | static unsigned long clone_stackframe(unsigned long csp, unsigned long psp) |
| 454 | 454 | { |
| 455 | + bool stack_64bit = test_thread_64bit_stack(psp); | |
| 455 | 456 | unsigned long fp, distance, rval; |
| 456 | 457 | |
| 457 | − if (!(test_thread_flag(TIF_32BIT))) { | |
| 458 | + if (stack_64bit) { | |
| 458 | 459 | csp += STACK_BIAS; |
| 459 | 460 | psp += STACK_BIAS; |
| 460 | 461 | __get_user(fp, &(((struct reg_window __user *)psp)->ins[6])); |
| 461 | 462 | fp += STACK_BIAS; |
| 463 | + if (test_thread_flag(TIF_32BIT)) | |
| 464 | + fp &= 0xffffffff; | |
| 462 | 465 | } else |
| 463 | 466 | __get_user(fp, &(((struct reg_window32 __user *)psp)->ins[6])); |
| 464 | 467 | |
| @@ -472,7 +475,7 @@ static unsigned long clone_stackframe(unsigned long csp, unsigned long psp) · 7 unmodified lines | ||
| 472 | 475 | rval = (csp - distance); |
| 473 | 476 | if (copy_in_user((void __user *) rval, (void __user *) psp, distance)) |
| 474 | 477 | rval = 0; |
| 475 | − else if (test_thread_flag(TIF_32BIT)) { | |
| 478 | + else if (!stack_64bit) { | |
| 476 | 479 | if (put_user(((u32)csp), |
| 477 | 480 | &(((struct reg_window32 __user *)rval)->ins[6]))) |
| 478 | 481 | rval = 0; |
| @@ -507,18 +510,18 @@ void synchronize_user_stack(void) · 28 unmodified lines | ||
| 507 | 510 | |
| 508 | 511 | flush_user_windows(); |
| 509 | 512 | if ((window = get_thread_wsaved()) != 0) { |
| 510 | − int winsize = sizeof(struct reg_window); | |
| 511 | − int bias = 0; | |
| 512 | − | |
| 513 | − if (test_thread_flag(TIF_32BIT)) | |
| 514 | − winsize = sizeof(struct reg_window32); | |
| 515 | − else | |
| 516 | − bias = STACK_BIAS; | |
| 517 | − | |
| 518 | 513 | window -= 1; |
| 519 | 514 | do { |
| 520 | − unsigned long sp = (t->rwbuf_stkptrs[window] + bias); | |
| 521 | 515 | struct reg_window *rwin = &t->reg_window[window]; |
| 516 | + int winsize = sizeof(struct reg_window); | |
| 517 | + unsigned long sp; | |
| 518 | + | |
| 519 | + sp = t->rwbuf_stkptrs[window]; | |
| 520 | + | |
| 521 | + if (test_thread_64bit_stack(sp)) | |
| 522 | + sp += STACK_BIAS; | |
| 523 | + else | |
| 524 | + winsize = sizeof(struct reg_window32); | |
| 522 | 525 | |
| 523 | 526 | if (!copy_to_user((char __user *)sp, rwin, winsize)) { |
| 524 | 527 | shift_window_buffer(window, get_thread_wsaved() - 1, t); |
| @@ -544,13 +547,6 @@ void fault_in_user_windows(void) · 19 unmodified lines | ||
| 544 | 547 | { |
| 545 | 548 | struct thread_info *t = current_thread_info(); |
| 546 | 549 | unsigned long window; |
| 547 | − int winsize = sizeof(struct reg_window); | |
| 548 | − int bias = 0; | |
| 549 | − | |
| 550 | − if (test_thread_flag(TIF_32BIT)) | |
| 551 | − winsize = sizeof(struct reg_window32); | |
| 552 | − else | |
| 553 | − bias = STACK_BIAS; | |
| 554 | 550 | |
| 555 | 551 | flush_user_windows(); |
| 556 | 552 | window = get_thread_wsaved(); |
| @@ -558,8 +554,16 @@ void fault_in_user_windows(void) · 1 unmodified line | ||
| 558 | 554 | if (likely(window != 0)) { |
| 559 | 555 | window -= 1; |
| 560 | 556 | do { |
| 561 | − unsigned long sp = (t->rwbuf_stkptrs[window] + bias); | |
| 562 | 557 | struct reg_window *rwin = &t->reg_window[window]; |
| 558 | + int winsize = sizeof(struct reg_window); | |
| 559 | + unsigned long sp; | |
| 560 | + | |
| 561 | + sp = t->rwbuf_stkptrs[window]; | |
| 562 | + | |
| 563 | + if (test_thread_64bit_stack(sp)) | |
| 564 | + sp += STACK_BIAS; | |
| 565 | + else | |
| 566 | + winsize = sizeof(struct reg_window32); | |
| 563 | 567 | |
| 564 | 568 | if (unlikely(sp & 0x7UL)) |
| 565 | 569 | stack_unaligned(sp); |
| @@ -151,7 +151,7 @@ static int regwindow64_get(struct task_struct *target, · 150 unmodified lines | ||
| 151 | 151 | { |
| 152 | 152 | unsigned long rw_addr = regs->u_regs[UREG_I6]; |
| 153 | 153 | |
| 154 | − if (test_tsk_thread_flag(current, TIF_32BIT)) { | |
| 154 | + if (!test_thread_64bit_stack(rw_addr)) { | |
| 155 | 155 | struct reg_window32 win32; |
| 156 | 156 | int i; |
| 157 | 157 | |
| @@ -176,7 +176,7 @@ static int regwindow64_set(struct task_struct *target, · 18 unmodified lines | ||
| 176 | 176 | { |
| 177 | 177 | unsigned long rw_addr = regs->u_regs[UREG_I6]; |
| 178 | 178 | |
| 179 | − if (test_tsk_thread_flag(current, TIF_32BIT)) { | |
| 179 | + if (!test_thread_64bit_stack(rw_addr)) { | |
| 180 | 180 | struct reg_window32 win32; |
| 181 | 181 | int i; |
| 182 | 182 | |
| @@ -316,6 +316,25 @@ static void __init popc_patch(void) · 315 unmodified lines | ||
| 316 | 316 | } |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | +static void __init pause_patch(void) | |
| 320 | +{ | |
| 321 | + struct pause_patch_entry *p; | |
| 322 | + | |
| 323 | + p = &__pause_3insn_patch; | |
| 324 | + while (p < &__pause_3insn_patch_end) { | |
| 325 | + unsigned long i, addr = p->addr; | |
| 326 | + | |
| 327 | + for (i = 0; i < 3; i++) { | |
| 328 | + *(unsigned int *) (addr + (i * 4)) = p->insns[i]; | |
| 329 | + wmb(); | |
| 330 | + __asm__ __volatile__("flush %0" | |
| 331 | + : : "r" (addr + (i * 4))); | |
| 332 | + } | |
| 333 | + | |
| 334 | + p++; | |
| 335 | + } | |
| 336 | +} | |
| 337 | + | |
| 319 | 338 | #ifdef CONFIG_SMP |
| 320 | 339 | void __init boot_cpu_id_too_large(int cpu) |
| 321 | 340 | { |
| @@ -528,6 +547,8 @@ static void __init init_sparc64_elf_hwcap(void) · 206 unmodified lines | ||
| 528 | 547 | |
| 529 | 548 | if (sparc64_elf_hwcap & AV_SPARC_POPC) |
| 530 | 549 | popc_patch(); |
| 550 | + if (sparc64_elf_hwcap & AV_SPARC_PAUSE) | |
| 551 | + pause_patch(); | |
| 531 | 552 | } |
| 532 | 553 | |
| 533 | 554 | void __init setup_arch(char **cmdline_p) |
| @@ -751,3 +751,8 @@ int kernel_execve(const char *filename, · 750 unmodified lines | ||
| 751 | 751 | : "cc"); |
| 752 | 752 | return __res; |
| 753 | 753 | } |
| 754 | + | |
| 755 | +asmlinkage long sys_kern_features(void) | |
| 756 | +{ | |
| 757 | + return KERN_FEATURE_MIXED_MODE_STACK; | |
| 758 | +} | |
| @@ -85,3 +85,4 @@ sys_call_table: · 84 unmodified lines | ||
| 85 | 85 | /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init |
| 86 | 86 | /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime |
| 87 | 87 | /*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev |
| 88 | +/*340*/ .long sys_ni_syscall, sys_kcmp | |
| @@ -86,6 +86,7 @@ sys_call_table32: · 85 unmodified lines | ||
| 86 | 86 | .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init |
| 87 | 87 | /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime |
| 88 | 88 | .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev |
| 89 | +/*340*/ .word sys_kern_features, sys_kcmp | |
| 89 | 90 | |
| 90 | 91 | #endif /* CONFIG_COMPAT */ |
| 91 | 92 | |
| @@ -163,3 +164,4 @@ sys_call_table: · 71 unmodified lines | ||
| 163 | 164 | .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init |
| 164 | 165 | /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime |
| 165 | 166 | .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev |
| 167 | +/*340*/ .word sys_kern_features, sys_kcmp | |
| @@ -113,21 +113,24 @@ static inline long sign_extend_imm13(long imm) · 112 unmodified lines | ||
| 113 | 113 | |
| 114 | 114 | static unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) |
| 115 | 115 | { |
| 116 | − unsigned long value; | |
| 116 | + unsigned long value, fp; | |
| 117 | 117 | |
| 118 | 118 | if (reg < 16) |
| 119 | 119 | return (!reg ? 0 : regs->u_regs[reg]); |
| 120 | + | |
| 121 | + fp = regs->u_regs[UREG_FP]; | |
| 122 | + | |
| 120 | 123 | if (regs->tstate & TSTATE_PRIV) { |
| 121 | 124 | struct reg_window *win; |
| 122 | − win = (struct reg_window *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 125 | + win = (struct reg_window *)(fp + STACK_BIAS); | |
| 123 | 126 | value = win->locals[reg - 16]; |
| 124 | − } else if (test_thread_flag(TIF_32BIT)) { | |
| 127 | + } else if (!test_thread_64bit_stack(fp)) { | |
| 125 | 128 | struct reg_window32 __user *win32; |
| 126 | − win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); | |
| 129 | + win32 = (struct reg_window32 __user *)((unsigned long)((u32)fp)); | |
| 127 | 130 | get_user(value, &win32->locals[reg - 16]); |
| 128 | 131 | } else { |
| 129 | 132 | struct reg_window __user *win; |
| 130 | − win = (struct reg_window __user *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 133 | + win = (struct reg_window __user *)(fp + STACK_BIAS); | |
| 131 | 134 | get_user(value, &win->locals[reg - 16]); |
| 132 | 135 | } |
| 133 | 136 | return value; |
| @@ -135,19 +138,24 @@ static unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) · 1 unmodified line | ||
| 135 | 138 | |
| 136 | 139 | static unsigned long *fetch_reg_addr(unsigned int reg, struct pt_regs *regs) |
| 137 | 140 | { |
| 141 | + unsigned long fp; | |
| 142 | + | |
| 138 | 143 | if (reg < 16) |
| 139 | 144 | return ®s->u_regs[reg]; |
| 145 | + | |
| 146 | + fp = regs->u_regs[UREG_FP]; | |
| 147 | + | |
| 140 | 148 | if (regs->tstate & TSTATE_PRIV) { |
| 141 | 149 | struct reg_window *win; |
| 142 | − win = (struct reg_window *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 150 | + win = (struct reg_window *)(fp + STACK_BIAS); | |
| 143 | 151 | return &win->locals[reg - 16]; |
| 144 | − } else if (test_thread_flag(TIF_32BIT)) { | |
| 152 | + } else if (!test_thread_64bit_stack(fp)) { | |
| 145 | 153 | struct reg_window32 *win32; |
| 146 | − win32 = (struct reg_window32 *)((unsigned long)((u32)regs->u_regs[UREG_FP])); | |
| 154 | + win32 = (struct reg_window32 *)((unsigned long)((u32)fp)); | |
| 147 | 155 | return (unsigned long *)&win32->locals[reg - 16]; |
| 148 | 156 | } else { |
| 149 | 157 | struct reg_window *win; |
| 150 | − win = (struct reg_window *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 158 | + win = (struct reg_window *)(fp + STACK_BIAS); | |
| 151 | 159 | return &win->locals[reg - 16]; |
| 152 | 160 | } |
| 153 | 161 | } |
| @@ -392,13 +400,15 @@ int handle_popc(u32 insn, struct pt_regs *regs) · 238 unmodified lines | ||
| 392 | 400 | if (rd) |
| 393 | 401 | regs->u_regs[rd] = ret; |
| 394 | 402 | } else { |
| 395 | − if (test_thread_flag(TIF_32BIT)) { | |
| 403 | + unsigned long fp = regs->u_regs[UREG_FP]; | |
| 404 | + | |
| 405 | + if (!test_thread_64bit_stack(fp)) { | |
| 396 | 406 | struct reg_window32 __user *win32; |
| 397 | − win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); | |
| 407 | + win32 = (struct reg_window32 __user *)((unsigned long)((u32)fp)); | |
| 398 | 408 | put_user(ret, &win32->locals[rd - 16]); |
| 399 | 409 | } else { |
| 400 | 410 | struct reg_window __user *win; |
| 401 | − win = (struct reg_window __user *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 411 | + win = (struct reg_window __user *)(fp + STACK_BIAS); | |
| 402 | 412 | put_user(ret, &win->locals[rd - 16]); |
| 403 | 413 | } |
| 404 | 414 | } |
| @@ -554,7 +564,7 @@ void handle_ld_nf(u32 insn, struct pt_regs *regs) · 149 unmodified lines | ||
| 554 | 564 | reg[0] = 0; |
| 555 | 565 | if ((insn & 0x780000) == 0x180000) |
| 556 | 566 | reg[1] = 0; |
| 557 | − } else if (test_thread_flag(TIF_32BIT)) { | |
| 567 | + } else if (!test_thread_64bit_stack(regs->u_regs[UREG_FP])) { | |
| 558 | 568 | put_user(0, (int __user *) reg); |
| 559 | 569 | if ((insn & 0x780000) == 0x180000) |
| 560 | 570 | put_user(0, ((int __user *) reg) + 1); |
| @@ -149,21 +149,24 @@ static inline void maybe_flush_windows(unsigned int rs1, unsigned int rs2, · 148 unmodified lines | ||
| 149 | 149 | |
| 150 | 150 | static unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) |
| 151 | 151 | { |
| 152 | − unsigned long value; | |
| 152 | + unsigned long value, fp; | |
| 153 | 153 | |
| 154 | 154 | if (reg < 16) |
| 155 | 155 | return (!reg ? 0 : regs->u_regs[reg]); |
| 156 | + | |
| 157 | + fp = regs->u_regs[UREG_FP]; | |
| 158 | + | |
| 156 | 159 | if (regs->tstate & TSTATE_PRIV) { |
| 157 | 160 | struct reg_window *win; |
| 158 | − win = (struct reg_window *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 161 | + win = (struct reg_window *)(fp + STACK_BIAS); | |
| 159 | 162 | value = win->locals[reg - 16]; |
| 160 | − } else if (test_thread_flag(TIF_32BIT)) { | |
| 163 | + } else if (!test_thread_64bit_stack(fp)) { | |
| 161 | 164 | struct reg_window32 __user *win32; |
| 162 | − win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); | |
| 165 | + win32 = (struct reg_window32 __user *)((unsigned long)((u32)fp)); | |
| 163 | 166 | get_user(value, &win32->locals[reg - 16]); |
| 164 | 167 | } else { |
| 165 | 168 | struct reg_window __user *win; |
| 166 | − win = (struct reg_window __user *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 169 | + win = (struct reg_window __user *)(fp + STACK_BIAS); | |
| 167 | 170 | get_user(value, &win->locals[reg - 16]); |
| 168 | 171 | } |
| 169 | 172 | return value; |
| @@ -172,16 +175,18 @@ static unsigned long fetch_reg(unsigned int reg, struct pt_regs *regs) · 2 unmodified lines | ||
| 172 | 175 | static inline unsigned long __user *__fetch_reg_addr_user(unsigned int reg, |
| 173 | 176 | struct pt_regs *regs) |
| 174 | 177 | { |
| 178 | + unsigned long fp = regs->u_regs[UREG_FP]; | |
| 179 | + | |
| 175 | 180 | BUG_ON(reg < 16); |
| 176 | 181 | BUG_ON(regs->tstate & TSTATE_PRIV); |
| 177 | 182 | |
| 178 | − if (test_thread_flag(TIF_32BIT)) { | |
| 183 | + if (!test_thread_64bit_stack(fp)) { | |
| 179 | 184 | struct reg_window32 __user *win32; |
| 180 | − win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); | |
| 185 | + win32 = (struct reg_window32 __user *)((unsigned long)((u32)fp)); | |
| 181 | 186 | return (unsigned long __user *)&win32->locals[reg - 16]; |
| 182 | 187 | } else { |
| 183 | 188 | struct reg_window __user *win; |
| 184 | − win = (struct reg_window __user *)(regs->u_regs[UREG_FP] + STACK_BIAS); | |
| 189 | + win = (struct reg_window __user *)(fp + STACK_BIAS); | |
| 185 | 190 | return &win->locals[reg - 16]; |
| 186 | 191 | } |
| 187 | 192 | } |
| @@ -204,7 +209,7 @@ static void store_reg(struct pt_regs *regs, unsigned long val, unsigned long rd) · 16 unmodified lines | ||
| 204 | 209 | } else { |
| 205 | 210 | unsigned long __user *rd_user = __fetch_reg_addr_user(rd, regs); |
| 206 | 211 | |
| 207 | − if (test_thread_flag(TIF_32BIT)) | |
| 212 | + if (!test_thread_64bit_stack(regs->u_regs[UREG_FP])) | |
| 208 | 213 | __put_user((u32)val, (u32 __user *)rd_user); |
| 209 | 214 | else |
| 210 | 215 | __put_user(val, rd_user); |
| @@ -132,6 +132,11 @@ SECTIONS · 131 unmodified lines | ||
| 132 | 132 | *(.popc_6insn_patch) |
| 133 | 133 | __popc_6insn_patch_end = .; |
| 134 | 134 | } |
| 135 | + .pause_3insn_patch : { | |
| 136 | + __pause_3insn_patch = .; | |
| 137 | + *(.pause_3insn_patch) | |
| 138 | + __pause_3insn_patch_end = .; | |
| 139 | + } | |
| 135 | 140 | PERCPU_SECTION(SMP_CACHE_BYTES) |
| 136 | 141 | |
| 137 | 142 | . = ALIGN(PAGE_SIZE); |
| @@ -43,6 +43,8 @@ spill_fixup_mna: · 42 unmodified lines | ||
| 43 | 43 | spill_fixup_dax: |
| 44 | 44 | TRAP_LOAD_THREAD_REG(%g6, %g1) |
| 45 | 45 | ldx [%g6 + TI_FLAGS], %g1 |
| 46 | + andcc %sp, 0x1, %g0 | |
| 47 | + movne %icc, 0, %g1 | |
| 46 | 48 | andcc %g1, _TIF_32BIT, %g0 |
| 47 | 49 | ldub [%g6 + TI_WSAVED], %g1 |
| 48 | 50 | sll %g1, 3, %g3 |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | /* atomic.S: These things are too big to do inline. |
| 2 | 2 | * |
| 3 | − * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net) | |
| 3 | + * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net) | |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | #include <linux/linkage.h> |
| @@ -117,3 +117,17 @@ ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */ · 110 unmodified lines | ||
| 117 | 117 | sub %g1, %o0, %o0 |
| 118 | 118 | 2: BACKOFF_SPIN(%o2, %o3, 1b) |
| 119 | 119 | ENDPROC(atomic64_sub_ret) |
| 120 | + | |
| 121 | +ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */ | |
| 122 | + BACKOFF_SETUP(%o2) | |
| 123 | +1: ldx [%o0], %g1 | |
| 124 | + brlez,pn %g1, 3f | |
| 125 | + sub %g1, 1, %g7 | |
| 126 | + casx [%o0], %g1, %g7 | |
| 127 | + cmp %g1, %g7 | |
| 128 | + bne,pn %xcc, BACKOFF_LABEL(2f, 1b) | |
| 129 | + nop | |
| 130 | +3: retl | |
| 131 | + sub %g1, 1, %o0 | |
| 132 | +2: BACKOFF_SPIN(%o2, %o3, 1b) | |
| 133 | +ENDPROC(atomic64_dec_if_positive) | |
| @@ -116,6 +116,7 @@ EXPORT_SYMBOL(atomic64_add); · 115 unmodified lines | ||
| 116 | 116 | EXPORT_SYMBOL(atomic64_add_ret); |
| 117 | 117 | EXPORT_SYMBOL(atomic64_sub); |
| 118 | 118 | EXPORT_SYMBOL(atomic64_sub_ret); |
| 119 | +EXPORT_SYMBOL(atomic64_dec_if_positive); | |
| 119 | 120 | |
| 120 | 121 | /* Atomic bit operations. */ |
| 121 | 122 | EXPORT_SYMBOL(test_and_set_bit); |
| @@ -320,7 +320,7 @@ int do_mathemu(struct pt_regs *regs, struct fpustate *f, bool illegal_insn_trap) · 319 unmodified lines | ||
| 320 | 320 | XR = 0; |
| 321 | 321 | else if (freg < 16) |
| 322 | 322 | XR = regs->u_regs[freg]; |
| 323 | − else if (test_thread_flag(TIF_32BIT)) { | |
| 323 | + else if (!test_thread_64bit_stack(regs->u_regs[UREG_FP])) { | |
| 324 | 324 | struct reg_window32 __user *win32; |
| 325 | 325 | flushw_user (); |
| 326 | 326 | win32 = (struct reg_window32 __user *)((unsigned long)((u32)regs->u_regs[UREG_FP])); |
| @@ -359,18 +359,14 @@ HYPERVISOR_update_va_mapping(unsigned long va, pte_t new_val, · 358 unmodified lines | ||
| 359 | 359 | return _hypercall4(int, update_va_mapping, va, |
| 360 | 360 | new_val.pte, new_val.pte >> 32, flags); |
| 361 | 361 | } |
| 362 | +extern int __must_check xen_event_channel_op_compat(int, void *); | |
| 362 | 363 | |
| 363 | 364 | static inline int |
| 364 | 365 | HYPERVISOR_event_channel_op(int cmd, void *arg) |
| 365 | 366 | { |
| 366 | 367 | int rc = _hypercall2(int, event_channel_op, cmd, arg); |
| 367 | − if (unlikely(rc == -ENOSYS)) { | |
| 368 | − struct evtchn_op op; | |
| 369 | − op.cmd = cmd; | |
| 370 | − memcpy(&op.u, arg, sizeof(op.u)); | |
| 371 | − rc = _hypercall1(int, event_channel_op_compat, &op); | |
| 372 | − memcpy(arg, &op.u, sizeof(op.u)); | |
| 373 | − } | |
| 368 | + if (unlikely(rc == -ENOSYS)) | |
| 369 | + rc = xen_event_channel_op_compat(cmd, arg); | |
| 374 | 370 | return rc; |
| 375 | 371 | } |
| 376 | 372 | |
| @@ -386,17 +382,14 @@ HYPERVISOR_console_io(int cmd, int count, char *str) · 9 unmodified lines | ||
| 386 | 382 | return _hypercall3(int, console_io, cmd, count, str); |
| 387 | 383 | } |
| 388 | 384 | |
| 385 | +extern int __must_check HYPERVISOR_physdev_op_compat(int, void *); | |
| 386 | + | |
| 389 | 387 | static inline int |
| 390 | 388 | HYPERVISOR_physdev_op(int cmd, void *arg) |
| 391 | 389 | { |
| 392 | 390 | int rc = _hypercall2(int, physdev_op, cmd, arg); |
| 393 | − if (unlikely(rc == -ENOSYS)) { | |
| 394 | − struct physdev_op op; | |
| 395 | − op.cmd = cmd; | |
| 396 | − memcpy(&op.u, arg, sizeof(op.u)); | |
| 397 | − rc = _hypercall1(int, physdev_op_compat, &op); | |
| 398 | − memcpy(arg, &op.u, sizeof(op.u)); | |
| 399 | − } | |
| 391 | + if (unlikely(rc == -ENOSYS)) | |
| 392 | + rc = HYPERVISOR_physdev_op_compat(cmd, arg); | |
| 400 | 393 | return rc; |
| 401 | 394 | } |
| 402 | 395 | |
| @@ -33,7 +33,6 @@ · 32 unmodified lines | ||
| 33 | 33 | #ifndef _ASM_X86_XEN_HYPERVISOR_H |
| 34 | 34 | #define _ASM_X86_XEN_HYPERVISOR_H |
| 35 | 35 | |
| 36 | −/* arch/i386/kernel/setup.c */ | |
| 37 | 36 | extern struct shared_info *HYPERVISOR_shared_info; |
| 38 | 37 | extern struct start_info *xen_start_info; |
| 39 | 38 | |
| @@ -3779,7 +3779,7 @@ static int write_exit_mmio(struct kvm_vcpu *vcpu, gpa_t gpa, · 3778 unmodified lines | ||
| 3779 | 3779 | { |
| 3780 | 3780 | struct kvm_mmio_fragment *frag = &vcpu->mmio_fragments[0]; |
| 3781 | 3781 | |
| 3782 | − memcpy(vcpu->run->mmio.data, frag->data, frag->len); | |
| 3782 | + memcpy(vcpu->run->mmio.data, frag->data, min(8u, frag->len)); | |
| 3783 | 3783 | return X86EMUL_CONTINUE; |
| 3784 | 3784 | } |
| 3785 | 3785 | |
| @@ -3832,18 +3832,11 @@ mmio: · 46 unmodified lines | ||
| 3832 | 3832 | bytes -= handled; |
| 3833 | 3833 | val += handled; |
| 3834 | 3834 | |
| 3835 | − while (bytes) { | |
| 3836 | − unsigned now = min(bytes, 8U); | |
| 3837 | − | |
| 3838 | − frag = &vcpu->mmio_fragments[vcpu->mmio_nr_fragments++]; | |
| 3839 | − frag->gpa = gpa; | |
| 3840 | − frag->data = val; | |
| 3841 | − frag->len = now; | |
| 3842 | − | |
| 3843 | − gpa += now; | |
| 3844 | − val += now; | |
| 3845 | − bytes -= now; | |
| 3846 | − } | |
| 3835 | + WARN_ON(vcpu->mmio_nr_fragments >= KVM_MAX_MMIO_FRAGMENTS); | |
| 3836 | + frag = &vcpu->mmio_fragments[vcpu->mmio_nr_fragments++]; | |
| 3837 | + frag->gpa = gpa; | |
| 3838 | + frag->data = val; | |
| 3839 | + frag->len = bytes; | |
| 3847 | 3840 | return X86EMUL_CONTINUE; |
| 3848 | 3841 | } |
| 3849 | 3842 | |
| @@ -3890,7 +3883,7 @@ int emulator_read_write(struct x86_emulate_ctxt *ctxt, unsigned long addr, · 40 unmodified lines | ||
| 3890 | 3883 | vcpu->mmio_needed = 1; |
| 3891 | 3884 | vcpu->mmio_cur_fragment = 0; |
| 3892 | 3885 | |
| 3893 | − vcpu->run->mmio.len = vcpu->mmio_fragments[0].len; | |
| 3886 | + vcpu->run->mmio.len = min(8u, vcpu->mmio_fragments[0].len); | |
| 3894 | 3887 | vcpu->run->mmio.is_write = vcpu->mmio_is_write = ops->write; |
| 3895 | 3888 | vcpu->run->exit_reason = KVM_EXIT_MMIO; |
| 3896 | 3889 | vcpu->run->mmio.phys_addr = gpa; |
| @@ -5522,28 +5515,44 @@ static int complete_emulated_pio(struct kvm_vcpu *vcpu) · 1625 unmodified lines | ||
| 5522 | 5515 | * |
| 5523 | 5516 | * read: |
| 5524 | 5517 | * for each fragment |
| 5525 | − * write gpa, len | |
| 5526 | − * exit | |
| 5527 | − * copy data | |
| 5518 | + * for each mmio piece in the fragment | |
| 5519 | + * write gpa, len | |
| 5520 | + * exit | |
| 5521 | + * copy data | |
| 5528 | 5522 | * execute insn |
| 5529 | 5523 | * |
| 5530 | 5524 | * write: |
| 5531 | 5525 | * for each fragment |
| 5532 | − * write gpa, len | |
| 5533 | − * copy data | |
| 5534 | − * exit | |
| 5526 | + * for each mmio piece in the fragment | |
| 5527 | + * write gpa, len | |
| 5528 | + * copy data | |
| 5529 | + * exit | |
| 5535 | 5530 | */ |
| 5536 | 5531 | static int complete_emulated_mmio(struct kvm_vcpu *vcpu) |
| 5537 | 5532 | { |
| 5538 | 5533 | struct kvm_run *run = vcpu->run; |
| 5539 | 5534 | struct kvm_mmio_fragment *frag; |
| 5535 | + unsigned len; | |
| 5540 | 5536 | |
| 5541 | 5537 | BUG_ON(!vcpu->mmio_needed); |
| 5542 | 5538 | |
| 5543 | 5539 | /* Complete previous fragment */ |
| 5544 | − frag = &vcpu->mmio_fragments[vcpu->mmio_cur_fragment++]; | |
| 5540 | + frag = &vcpu->mmio_fragments[vcpu->mmio_cur_fragment]; | |
| 5541 | + len = min(8u, frag->len); | |
| 5545 | 5542 | if (!vcpu->mmio_is_write) |
| 5546 | − memcpy(frag->data, run->mmio.data, frag->len); | |
| 5543 | + memcpy(frag->data, run->mmio.data, len); | |
| 5544 | + | |
| 5545 | + if (frag->len <= 8) { | |
| 5546 | + /* Switch to the next fragment. */ | |
| 5547 | + frag++; | |
| 5548 | + vcpu->mmio_cur_fragment++; | |
| 5549 | + } else { | |
| 5550 | + /* Go forward to the next mmio piece. */ | |
| 5551 | + frag->data += len; | |
| 5552 | + frag->gpa += len; | |
| 5553 | + frag->len -= len; | |
| 5554 | + } | |
| 5555 | + | |
| 5547 | 5556 | if (vcpu->mmio_cur_fragment == vcpu->mmio_nr_fragments) { |
| 5548 | 5557 | vcpu->mmio_needed = 0; |
| 5549 | 5558 | if (vcpu->mmio_is_write) |
| @@ -5551,13 +5560,12 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu) · 1 unmodified line | ||
| 5551 | 5560 | vcpu->mmio_read_completed = 1; |
| 5552 | 5561 | return complete_emulated_io(vcpu); |
| 5553 | 5562 | } |
| 5554 | − /* Initiate next fragment */ | |
| 5555 | − ++frag; | |
| 5563 | + | |
| 5556 | 5564 | run->exit_reason = KVM_EXIT_MMIO; |
| 5557 | 5565 | run->mmio.phys_addr = frag->gpa; |
| 5558 | 5566 | if (vcpu->mmio_is_write) |
| 5559 | − memcpy(run->mmio.data, frag->data, frag->len); | |
| 5560 | − run->mmio.len = frag->len; | |
| 5567 | + memcpy(run->mmio.data, frag->data, min(8u, frag->len)); | |
| 5568 | + run->mmio.len = min(8u, frag->len); | |
| 5561 | 5569 | run->mmio.is_write = vcpu->mmio_is_write; |
| 5562 | 5570 | vcpu->arch.complete_userspace_io = complete_emulated_mmio; |
| 5563 | 5571 | return 0; |
| @@ -1288,6 +1288,25 @@ unsigned long xen_read_cr2_direct(void) · 1287 unmodified lines | ||
| 1288 | 1288 | return this_cpu_read(xen_vcpu_info.arch.cr2); |
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | +void xen_flush_tlb_all(void) | |
| 1292 | +{ | |
| 1293 | + struct mmuext_op *op; | |
| 1294 | + struct multicall_space mcs; | |
| 1295 | + | |
| 1296 | + trace_xen_mmu_flush_tlb_all(0); | |
| 1297 | + | |
| 1298 | + preempt_disable(); | |
| 1299 | + | |
| 1300 | + mcs = xen_mc_entry(sizeof(*op)); | |
| 1301 | + | |
| 1302 | + op = mcs.args; | |
| 1303 | + op->cmd = MMUEXT_TLB_FLUSH_ALL; | |
| 1304 | + MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | |
| 1305 | + | |
| 1306 | + xen_mc_issue(PARAVIRT_LAZY_MMU); | |
| 1307 | + | |
| 1308 | + preempt_enable(); | |
| 1309 | +} | |
| 1291 | 1310 | static void xen_flush_tlb(void) |
| 1292 | 1311 | { |
| 1293 | 1312 | struct mmuext_op *op; |
| @@ -2518,7 +2537,7 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma, · 1224 unmodified lines | ||
| 2518 | 2537 | err = 0; |
| 2519 | 2538 | out: |
| 2520 | 2539 | |
| 2521 | − flush_tlb_all(); | |
| 2540 | + xen_flush_tlb_all(); | |
| 2522 | 2541 | |
| 2523 | 2542 | return err; |
| 2524 | 2543 | } |
| @@ -13,6 +13,8 @@ config XTENSA · 12 unmodified lines | ||
| 13 | 13 | select GENERIC_CPU_DEVICES |
| 14 | 14 | select MODULES_USE_ELF_RELA |
| 15 | 15 | select GENERIC_PCI_IOMAP |
| 16 | + select GENERIC_KERNEL_THREAD | |
| 17 | + select GENERIC_KERNEL_EXECVE | |
| 16 | 18 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 17 | 19 | help |
| 18 | 20 | Xtensa processors are 32-bit RISC machines designed by Tensilica |
| @@ -62,6 +62,10 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) · 61 unmodified lines | ||
| 62 | 62 | static inline void iounmap(volatile void __iomem *addr) |
| 63 | 63 | { |
| 64 | 64 | } |
| 65 | + | |
| 66 | +#define virt_to_bus virt_to_phys | |
| 67 | +#define bus_to_virt phys_to_virt | |
| 68 | + | |
| 65 | 69 | #endif /* CONFIG_MMU */ |
| 66 | 70 | |
| 67 | 71 | /* |
| @@ -152,6 +152,7 @@ struct thread_struct { · 151 unmodified lines | ||
| 152 | 152 | |
| 153 | 153 | /* Clearing a0 terminates the backtrace. */ |
| 154 | 154 | #define start_thread(regs, new_pc, new_sp) \ |
| 155 | + memset(regs, 0, sizeof(*regs)); \ | |
| 155 | 156 | regs->pc = new_pc; \ |
| 156 | 157 | regs->ps = USER_PS_VALUE; \ |
| 157 | 158 | regs->areg[1] = new_sp; \ |
| @@ -168,9 +169,6 @@ struct mm_struct; · 10 unmodified lines | ||
| 168 | 169 | /* Free all resources held by a thread. */ |
| 169 | 170 | #define release_thread(thread) do { } while(0) |
| 170 | 171 | |
| 171 | −/* Create a kernel thread without removing it from tasklists */ | |
| 172 | −extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | |
| 173 | − | |
| 174 | 172 | /* Copy and release all segment info associated with a VM */ |
| 175 | 173 | #define copy_segments(p, mm) do { } while(0) |
| 176 | 174 | #define release_segments(mm) do { } while(0) |
| @@ -10,7 +10,7 @@ · 9 unmodified lines | ||
| 10 | 10 | |
| 11 | 11 | struct pt_regs; |
| 12 | 12 | struct sigaction; |
| 13 | −asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*); | |
| 13 | +asmlinkage long sys_execve(char*, char**, char**, struct pt_regs*); | |
| 14 | 14 | asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*); |
| 15 | 15 | asmlinkage long xtensa_ptrace(long, long, long, long); |
| 16 | 16 | asmlinkage long xtensa_sigreturn(struct pt_regs*); |
| @@ -1,16 +1,9 @@ | ||
| 1 | −/* | |
| 2 | − * include/asm-xtensa/unistd.h | |
| 3 | − * | |
| 4 | − * This file is subject to the terms and conditions of the GNU General Public | |
| 5 | − * License. See the file "COPYING" in the main directory of this archive | |
| 6 | − * for more details. | |
| 7 | − * | |
| 8 | − * Copyright (C) 2001 - 2005 Tensilica Inc. | |
| 9 | − */ | |
| 1 | +#ifndef _XTENSA_UNISTD_H | |
| 2 | +#define _XTENSA_UNISTD_H | |
| 10 | 3 | |
| 4 | +#define __ARCH_WANT_SYS_EXECVE | |
| 11 | 5 | #include <uapi/asm/unistd.h> |
| 12 | 6 | |
| 13 | − | |
| 14 | 7 | /* |
| 15 | 8 | * "Conditional" syscalls |
| 16 | 9 | * |
| @@ -37,3 +30,5 @@ · 20 unmodified lines | ||
| 37 | 30 | #define __IGNORE_mmap /* use mmap2 */ |
| 38 | 31 | #define __IGNORE_vfork /* use clone */ |
| 39 | 32 | #define __IGNORE_fadvise64 /* use fadvise64_64 */ |
| 33 | + | |
| 34 | +#endif /* _XTENSA_UNISTD_H */ | |
| @@ -1,14 +1,4 @@ | ||
| 1 | −/* | |
| 2 | − * include/asm-xtensa/unistd.h | |
| 3 | − * | |
| 4 | − * This file is subject to the terms and conditions of the GNU General Public | |
| 5 | − * License. See the file "COPYING" in the main directory of this archive | |
| 6 | − * for more details. | |
| 7 | − * | |
| 8 | − * Copyright (C) 2001 - 2012 Tensilica Inc. | |
| 9 | − */ | |
| 10 | − | |
| 11 | −#ifndef _UAPI_XTENSA_UNISTD_H | |
| 1 | +#if !defined(_UAPI_XTENSA_UNISTD_H) || defined(__SYSCALL) | |
| 12 | 2 | #define _UAPI_XTENSA_UNISTD_H |
| 13 | 3 | |
| 14 | 4 | #ifndef __SYSCALL |
| @@ -272,7 +262,7 @@ __SYSCALL(115, sys_sendmmsg, 4) · 257 unmodified lines | ||
| 272 | 262 | #define __NR_clone 116 |
| 273 | 263 | __SYSCALL(116, xtensa_clone, 5) |
| 274 | 264 | #define __NR_execve 117 |
| 275 | −__SYSCALL(117, xtensa_execve, 3) | |
| 265 | +__SYSCALL(117, sys_execve, 3) | |
| 276 | 266 | #define __NR_exit 118 |
| 277 | 267 | __SYSCALL(118, sys_exit, 1) |
| 278 | 268 | #define __NR_exit_group 119 |
| @@ -759,4 +749,6 @@ __SYSCALL(331, sys_kcmp, 5) · 480 unmodified lines | ||
| 759 | 749 | |
| 760 | 750 | #define SYS_XTENSA_COUNT 5 /* count */ |
| 761 | 751 | |
| 752 | +#undef __SYSCALL | |
| 753 | + | |
| 762 | 754 | #endif /* _UAPI_XTENSA_UNISTD_H */ |
| @@ -1832,50 +1832,6 @@ ENTRY(system_call) · 1831 unmodified lines | ||
| 1832 | 1832 | retw |
| 1833 | 1833 | |
| 1834 | 1834 | |
| 1835 | −/* | |
| 1836 | − * Create a kernel thread | |
| 1837 | − * | |
| 1838 | − * int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |
| 1839 | − * a2 a2 a3 a4 | |
| 1840 | − */ | |
| 1841 | − | |
| 1842 | −ENTRY(kernel_thread) | |
| 1843 | − entry a1, 16 | |
| 1844 | − | |
| 1845 | − mov a5, a2 # preserve fn over syscall | |
| 1846 | − mov a7, a3 # preserve args over syscall | |
| 1847 | − | |
| 1848 | − movi a3, _CLONE_VM | _CLONE_UNTRACED | |
| 1849 | − movi a2, __NR_clone | |
| 1850 | − or a6, a4, a3 # arg0: flags | |
| 1851 | − mov a3, a1 # arg1: sp | |
| 1852 | − syscall | |
| 1853 | − | |
| 1854 | − beq a3, a1, 1f # branch if parent | |
| 1855 | − mov a6, a7 # args | |
| 1856 | − callx4 a5 # fn(args) | |
| 1857 | − | |
| 1858 | − movi a2, __NR_exit | |
| 1859 | − syscall # return value of fn(args) still in a6 | |
| 1860 | − | |
| 1861 | −1: retw | |
| 1862 | − | |
| 1863 | −/* | |
| 1864 | − * Do a system call from kernel instead of calling sys_execve, so we end up | |
| 1865 | − * with proper pt_regs. | |
| 1866 | − * | |
| 1867 | − * int kernel_execve(const char *fname, char *const argv[], charg *const envp[]) | |
| 1868 | − * a2 a2 a3 a4 | |
| 1869 | − */ | |
| 1870 | − | |
| 1871 | −ENTRY(kernel_execve) | |
| 1872 | − entry a1, 16 | |
| 1873 | − mov a6, a2 # arg0 is in a6 | |
| 1874 | − movi a2, __NR_execve | |
| 1875 | − syscall | |
| 1876 | − | |
| 1877 | − retw | |
| 1878 | − | |
| 1879 | 1835 | /* |
| 1880 | 1836 | * Task switch. |
| 1881 | 1837 | * |
| @@ -1958,3 +1914,16 @@ ENTRY(ret_from_fork) · 76 unmodified lines | ||
| 1958 | 1914 | |
| 1959 | 1915 | j common_exception_return |
| 1960 | 1916 | |
| 1917 | +/* | |
| 1918 | + * Kernel thread creation helper | |
| 1919 | + * On entry, set up by copy_thread: a2 = thread_fn, a3 = thread_fn arg | |
| 1920 | + * left from _switch_to: a6 = prev | |
| 1921 | + */ | |
| 1922 | +ENTRY(ret_from_kernel_thread) | |
| 1923 | + | |
| 1924 | + call4 schedule_tail | |
| 1925 | + mov a6, a3 | |
| 1926 | + callx4 a2 | |
| 1927 | + j common_exception_return | |
| 1928 | + | |
| 1929 | +ENDPROC(ret_from_kernel_thread) | |
| @@ -45,6 +45,7 @@ · 44 unmodified lines | ||
| 45 | 45 | #include <asm/regs.h> |
| 46 | 46 | |
| 47 | 47 | extern void ret_from_fork(void); |
| 48 | +extern void ret_from_kernel_thread(void); | |
| 48 | 49 | |
| 49 | 50 | struct task_struct *current_set[NR_CPUS] = {&init_task, }; |
| 50 | 51 | |
| @@ -158,18 +159,30 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) · 107 unmodified lines | ||
| 158 | 159 | /* |
| 159 | 160 | * Copy thread. |
| 160 | 161 | * |
| 162 | + * There are two modes in which this function is called: | |
| 163 | + * 1) Userspace thread creation, | |
| 164 | + * regs != NULL, usp_thread_fn is userspace stack pointer. | |
| 165 | + * It is expected to copy parent regs (in case CLONE_VM is not set | |
| 166 | + * in the clone_flags) and set up passed usp in the childregs. | |
| 167 | + * 2) Kernel thread creation, | |
| 168 | + * regs == NULL, usp_thread_fn is the function to run in the new thread | |
| 169 | + * and thread_fn_arg is its parameter. | |
| 170 | + * childregs are not used for the kernel threads. | |
| 171 | + * | |
| 161 | 172 | * The stack layout for the new thread looks like this: |
| 162 | 173 | * |
| 163 | − * +------------------------+ <- sp in childregs (= tos) | |
| 174 | + * +------------------------+ | |
| 164 | 175 | * | childregs | |
| 165 | 176 | * +------------------------+ <- thread.sp = sp in dummy-frame |
| 166 | 177 | * | dummy-frame | (saved in dummy-frame spill-area) |
| 167 | 178 | * +------------------------+ |
| 168 | 179 | * |
| 169 | − * We create a dummy frame to return to ret_from_fork: | |
| 170 | − * a0 points to ret_from_fork (simulating a call4) | |
| 180 | + * We create a dummy frame to return to either ret_from_fork or | |
| 181 | + * ret_from_kernel_thread: | |
| 182 | + * a0 points to ret_from_fork/ret_from_kernel_thread (simulating a call4) | |
| 171 | 183 | * sp points to itself (thread.sp) |
| 172 | − * a2, a3 are unused. | |
| 184 | + * a2, a3 are unused for userspace threads, | |
| 185 | + * a2 points to thread_fn, a3 holds thread_fn arg for kernel threads. | |
| 173 | 186 | * |
| 174 | 187 | * Note: This is a pristine frame, so we don't need any spill region on top of |
| 175 | 188 | * childregs. |
| @@ -185,43 +198,63 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) · 9 unmodified lines | ||
| 185 | 198 | * involved. Much simpler to just not copy those live frames across. |
| 186 | 199 | */ |
| 187 | 200 | |
| 188 | −int copy_thread(unsigned long clone_flags, unsigned long usp, | |
| 189 | − unsigned long unused, | |
| 190 | − struct task_struct * p, struct pt_regs * regs) | |
| 201 | +int copy_thread(unsigned long clone_flags, unsigned long usp_thread_fn, | |
| 202 | + unsigned long thread_fn_arg, | |
| 203 | + struct task_struct *p, struct pt_regs *unused) | |
| 191 | 204 | { |
| 192 | − struct pt_regs *childregs; | |
| 193 | − unsigned long tos; | |
| 194 | − int user_mode = user_mode(regs); | |
| 205 | + struct pt_regs *childregs = task_pt_regs(p); | |
| 195 | 206 | |
| 196 | 207 | #if (XTENSA_HAVE_COPROCESSORS || XTENSA_HAVE_IO_PORTS) |
| 197 | 208 | struct thread_info *ti; |
| 198 | 209 | #endif |
| 199 | 210 | |
| 200 | − /* Set up new TSS. */ | |
| 201 | − tos = (unsigned long)task_stack_page(p) + THREAD_SIZE; | |
| 202 | − if (user_mode) | |
| 203 | − childregs = (struct pt_regs*)(tos - PT_USER_SIZE); | |
| 204 | − else | |
| 205 | − childregs = (struct pt_regs*)tos - 1; | |
| 206 | − | |
| 207 | − /* This does not copy all the regs. In a bout of brilliance or madness, | |
| 208 | − ARs beyond a0-a15 exist past the end of the struct. */ | |
| 209 | − *childregs = *regs; | |
| 210 | − | |
| 211 | 211 | /* Create a call4 dummy-frame: a0 = 0, a1 = childregs. */ |
| 212 | 212 | *((int*)childregs - 3) = (unsigned long)childregs; |
| 213 | 213 | *((int*)childregs - 4) = 0; |
| 214 | 214 | |
| 215 | − childregs->areg[2] = 0; | |
| 216 | − p->set_child_tid = p->clear_child_tid = NULL; | |
| 217 | − p->thread.ra = MAKE_RA_FOR_CALL((unsigned long)ret_from_fork, 0x1); | |
| 218 | 215 | p->thread.sp = (unsigned long)childregs; |
| 219 | 216 | |
| 220 | − if (user_mode(regs)) { | |
| 217 | + if (!(p->flags & PF_KTHREAD)) { | |
| 218 | + struct pt_regs *regs = current_pt_regs(); | |
| 219 | + unsigned long usp = usp_thread_fn ? | |
| 220 | + usp_thread_fn : regs->areg[1]; | |
| 221 | 221 | |
| 222 | + p->thread.ra = MAKE_RA_FOR_CALL( | |
| 223 | + (unsigned long)ret_from_fork, 0x1); | |
| 224 | + | |
| 225 | + /* This does not copy all the regs. | |
| 226 | + * In a bout of brilliance or madness, | |
| 227 | + * ARs beyond a0-a15 exist past the end of the struct. | |
| 228 | + */ | |
| 229 | + *childregs = *regs; | |
| 222 | 230 | childregs->areg[1] = usp; |
| 231 | + childregs->areg[2] = 0; | |
| 232 | + | |
| 233 | + /* When sharing memory with the parent thread, the child | |
| 234 | + usually starts on a pristine stack, so we have to reset | |
| 235 | + windowbase, windowstart and wmask. | |
| 236 | + (Note that such a new thread is required to always create | |
| 237 | + an initial call4 frame) | |
| 238 | + The exception is vfork, where the new thread continues to | |
| 239 | + run on the parent's stack until it calls execve. This could | |
| 240 | + be a call8 or call12, which requires a legal stack frame | |
| 241 | + of the previous caller for the overflow handlers to work. | |
| 242 | + (Note that it's always legal to overflow live registers). | |
| 243 | + In this case, ensure to spill at least the stack pointer | |
| 244 | + of that frame. */ | |
| 245 | + | |
| 223 | 246 | if (clone_flags & CLONE_VM) { |
| 224 | − childregs->wmask = 1; /* can't share live windows */ | |
| 247 | + /* check that caller window is live and same stack */ | |
| 248 | + int len = childregs->wmask & ~0xf; | |
| 249 | + if (regs->areg[1] == usp && len != 0) { | |
| 250 | + int callinc = (regs->areg[0] >> 30) & 3; | |
| 251 | + int caller_ars = XCHAL_NUM_AREGS - callinc * 4; | |
| 252 | + put_user(regs->areg[caller_ars+1], | |
| 253 | + (unsigned __user*)(usp - 12)); | |
| 254 | + } | |
| 255 | + childregs->wmask = 1; | |
| 256 | + childregs->windowstart = 1; | |
| 257 | + childregs->windowbase = 0; | |
| 225 | 258 | } else { |
| 226 | 259 | int len = childregs->wmask & ~0xf; |
| 227 | 260 | memcpy(&childregs->areg[XCHAL_NUM_AREGS - len/4], |
| @@ -230,11 +263,19 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, · 2 unmodified lines | ||
| 230 | 263 | // FIXME: we need to set THREADPTR in thread_info... |
| 231 | 264 | if (clone_flags & CLONE_SETTLS) |
| 232 | 265 | childregs->areg[2] = childregs->areg[6]; |
| 233 | − | |
| 234 | 266 | } else { |
| 235 | − /* In kernel space, we start a new thread with a new stack. */ | |
| 236 | − childregs->wmask = 1; | |
| 237 | − childregs->areg[1] = tos; | |
| 267 | + p->thread.ra = MAKE_RA_FOR_CALL( | |
| 268 | + (unsigned long)ret_from_kernel_thread, 1); | |
| 269 | + | |
| 270 | + /* pass parameters to ret_from_kernel_thread: | |
| 271 | + * a2 = thread_fn, a3 = thread_fn arg | |
| 272 | + */ | |
| 273 | + *((int *)childregs - 1) = thread_fn_arg; | |
| 274 | + *((int *)childregs - 2) = usp_thread_fn; | |
| 275 | + | |
| 276 | + /* Childregs are only used when we're going to userspace | |
| 277 | + * in which case start_thread will set them up. | |
| 278 | + */ | |
| 238 | 279 | } |
| 239 | 280 | |
| 240 | 281 | #if (XTENSA_HAVE_COPROCESSORS || XTENSA_HAVE_IO_PORTS) |
| @@ -330,32 +371,5 @@ long xtensa_clone(unsigned long clone_flags, unsigned long newsp, · 89 unmodified lines | ||
| 330 | 371 | void __user *child_tid, long a5, |
| 331 | 372 | struct pt_regs *regs) |
| 332 | 373 | { |
| 333 | − if (!newsp) | |
| 334 | − newsp = regs->areg[1]; | |
| 335 | 374 | return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid); |
| 336 | 375 | } |
| 337 | − | |
| 338 | −/* | |
| 339 | − * xtensa_execve() executes a new program. | |
| 340 | − */ | |
| 341 | − | |
| 342 | −asmlinkage | |
| 343 | −long xtensa_execve(const char __user *name, | |
| 344 | − const char __user *const __user *argv, | |
| 345 | − const char __user *const __user *envp, | |
| 346 | − long a3, long a4, long a5, | |
| 347 | − struct pt_regs *regs) | |
| 348 | −{ | |
| 349 | − long error; | |
| 350 | − struct filename *filename; | |
| 351 | − | |
| 352 | − filename = getname(name); | |
| 353 | − error = PTR_ERR(filename); | |
| 354 | − if (IS_ERR(filename)) | |
| 355 | − goto out; | |
| 356 | − error = do_execve(filename->name, argv, envp, regs); | |
| 357 | − putname(filename); | |
| 358 | −out: | |
| 359 | − return error; | |
| 360 | −} | |
| 361 | − | |
| @@ -32,10 +32,8 @@ typedef void (*syscall_t)(void); · 31 unmodified lines | ||
| 32 | 32 | syscall_t sys_call_table[__NR_syscall_count] /* FIXME __cacheline_aligned */= { |
| 33 | 33 | [0 ... __NR_syscall_count - 1] = (syscall_t)&sys_ni_syscall, |
| 34 | 34 | |
| 35 | −#undef __SYSCALL | |
| 36 | 35 | #define __SYSCALL(nr,symbol,nargs) [ nr ] = (syscall_t)symbol, |
| 37 | −#undef __KERNEL_SYSCALLS__ | |
| 38 | −#include <asm/unistd.h> | |
| 36 | +#include <uapi/asm/unistd.h> | |
| 39 | 37 | }; |
| 40 | 38 | |
| 41 | 39 | asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg) |
| @@ -49,7 +47,8 @@ asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg) · 7 unmodified lines | ||
| 49 | 47 | return (long)ret; |
| 50 | 48 | } |
| 51 | 49 | |
| 52 | −asmlinkage long xtensa_fadvise64_64(int fd, int advice, unsigned long long offset, unsigned long long len) | |
| 50 | +asmlinkage long xtensa_fadvise64_64(int fd, int advice, | |
| 51 | + unsigned long long offset, unsigned long long len) | |
| 53 | 52 | { |
| 54 | 53 | return sys_fadvise64_64(fd, offset, len, advice); |
| 55 | 54 | } |
| @@ -43,7 +43,6 @@ EXPORT_SYMBOL(__strncpy_user); · 42 unmodified lines | ||
| 43 | 43 | EXPORT_SYMBOL(clear_page); |
| 44 | 44 | EXPORT_SYMBOL(copy_page); |
| 45 | 45 | |
| 46 | −EXPORT_SYMBOL(kernel_thread); | |
| 47 | 46 | EXPORT_SYMBOL(empty_zero_page); |
| 48 | 47 | |
| 49 | 48 | /* |
| @@ -89,7 +89,7 @@ config BLK_DEV_INTEGRITY · 88 unmodified lines | ||
| 89 | 89 | |
| 90 | 90 | config BLK_DEV_THROTTLING |
| 91 | 91 | bool "Block layer bio throttling support" |
| 92 | − depends on BLK_CGROUP=y && EXPERIMENTAL | |
| 92 | + depends on BLK_CGROUP=y | |
| 93 | 93 | default n |
| 94 | 94 | ---help--- |
| 95 | 95 | Block layer bio throttling support. It can be used to limit |
| @@ -285,6 +285,13 @@ static void blkg_destroy_all(struct request_queue *q) · 284 unmodified lines | ||
| 285 | 285 | blkg_destroy(blkg); |
| 286 | 286 | spin_unlock(&blkcg->lock); |
| 287 | 287 | } |
| 288 | + | |
| 289 | + /* | |
| 290 | + * root blkg is destroyed. Just clear the pointer since | |
| 291 | + * root_rl does not take reference on root blkg. | |
| 292 | + */ | |
| 293 | + q->root_blkg = NULL; | |
| 294 | + q->root_rl.blkg = NULL; | |
| 288 | 295 | } |
| 289 | 296 | |
| 290 | 297 | static void blkg_rcu_free(struct rcu_head *rcu_head) |
| @@ -326,6 +333,9 @@ struct request_list *__blk_queue_next_rl(struct request_list *rl, · 35 unmodified lines | ||
| 326 | 333 | */ |
| 327 | 334 | if (rl == &q->root_rl) { |
| 328 | 335 | ent = &q->blkg_list; |
| 336 | + /* There are no more block groups, hence no request lists */ | |
| 337 | + if (list_empty(ent)) | |
| 338 | + return NULL; | |
| 329 | 339 | } else { |
| 330 | 340 | blkg = container_of(rl, struct blkcg_gq, rl); |
| 331 | 341 | ent = &blkg->q_node; |
| @@ -2868,7 +2868,8 @@ static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b) · 2867 unmodified lines | ||
| 2868 | 2868 | struct request *rqa = container_of(a, struct request, queuelist); |
| 2869 | 2869 | struct request *rqb = container_of(b, struct request, queuelist); |
| 2870 | 2870 | |
| 2871 | − return !(rqa->q <= rqb->q); | |
| 2871 | + return !(rqa->q < rqb->q || | |
| 2872 | + (rqa->q == rqb->q && blk_rq_pos(rqa) < blk_rq_pos(rqb))); | |
| 2872 | 2873 | } |
| 2873 | 2874 | |
| 2874 | 2875 | /* |
| @@ -137,13 +137,18 @@ static void cryptd_queue_worker(struct work_struct *work) · 136 unmodified lines | ||
| 137 | 137 | struct crypto_async_request *req, *backlog; |
| 138 | 138 | |
| 139 | 139 | cpu_queue = container_of(work, struct cryptd_cpu_queue, work); |
| 140 | − /* Only handle one request at a time to avoid hogging crypto | |
| 141 | − * workqueue. preempt_disable/enable is used to prevent | |
| 142 | − * being preempted by cryptd_enqueue_request() */ | |
| 140 | + /* | |
| 141 | + * Only handle one request at a time to avoid hogging crypto workqueue. | |
| 142 | + * preempt_disable/enable is used to prevent being preempted by | |
| 143 | + * cryptd_enqueue_request(). local_bh_disable/enable is used to prevent | |
| 144 | + * cryptd_enqueue_request() being accessed from software interrupts. | |
| 145 | + */ | |
| 146 | + local_bh_disable(); | |
| 143 | 147 | preempt_disable(); |
| 144 | 148 | backlog = crypto_get_backlog(&cpu_queue->queue); |
| 145 | 149 | req = crypto_dequeue_request(&cpu_queue->queue); |
| 146 | 150 | preempt_enable(); |
| 151 | + local_bh_enable(); | |
| 147 | 152 | |
| 148 | 153 | if (!req) |
| 149 | 154 | return; |
| @@ -1345,12 +1345,15 @@ static int · 1344 unmodified lines | ||
| 1345 | 1345 | acpi_video_bus_get_devices(struct acpi_video_bus *video, |
| 1346 | 1346 | struct acpi_device *device) |
| 1347 | 1347 | { |
| 1348 | − int status; | |
| 1348 | + int status = 0; | |
| 1349 | 1349 | struct acpi_device *dev; |
| 1350 | 1350 | |
| 1351 | − status = acpi_video_device_enumerate(video); | |
| 1352 | − if (status) | |
| 1353 | − return status; | |
| 1351 | + /* | |
| 1352 | + * There are systems where video module known to work fine regardless | |
| 1353 | + * of broken _DOD and ignoring returned value here doesn't cause | |
| 1354 | + * any issues later. | |
| 1355 | + */ | |
| 1356 | + acpi_video_device_enumerate(video); | |
| 1354 | 1357 | |
| 1355 | 1358 | list_for_each_entry(dev, &device->children, node) { |
| 1356 | 1359 | |
| @@ -83,9 +83,16 @@ EXPORT_SYMBOL_GPL(platform_get_resource); · 82 unmodified lines | ||
| 83 | 83 | */ |
| 84 | 84 | int platform_get_irq(struct platform_device *dev, unsigned int num) |
| 85 | 85 | { |
| 86 | +#ifdef CONFIG_SPARC | |
| 87 | + /* sparc does not have irqs represented as IORESOURCE_IRQ resources */ | |
| 88 | + if (!dev || num >= dev->archdata.num_irqs) | |
| 89 | + return -ENXIO; | |
| 90 | + return dev->archdata.irqs[num]; | |
| 91 | +#else | |
| 86 | 92 | struct resource *r = platform_get_resource(dev, IORESOURCE_IRQ, num); |
| 87 | 93 | |
| 88 | 94 | return r ? r->start : -ENXIO; |
| 95 | +#endif | |
| 89 | 96 | } |
| 90 | 97 | EXPORT_SYMBOL_GPL(platform_get_irq); |
| 91 | 98 | |
| @@ -131,6 +131,7 @@ config BLK_CPQ_DA · 130 unmodified lines | ||
| 131 | 131 | config BLK_CPQ_CISS_DA |
| 132 | 132 | tristate "Compaq Smart Array 5xxx support" |
| 133 | 133 | depends on PCI |
| 134 | + select CHECK_SIGNATURE | |
| 134 | 135 | help |
| 135 | 136 | This is the driver for Compaq Smart Array 5xxx controllers. |
| 136 | 137 | Everyone using these boards should say Y here. |
| @@ -166,8 +167,8 @@ config BLK_DEV_DAC960 · 29 unmodified lines | ||
| 166 | 167 | module will be called DAC960. |
| 167 | 168 | |
| 168 | 169 | config BLK_DEV_UMEM |
| 169 | − tristate "Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)" | |
| 170 | − depends on PCI && EXPERIMENTAL | |
| 170 | + tristate "Micro Memory MM5415 Battery Backed RAM support" | |
| 171 | + depends on PCI | |
| 171 | 172 | ---help--- |
| 172 | 173 | Saying Y here will include support for the MM5415 family of |
| 173 | 174 | battery backed (Non-volatile) RAM cards. |
| @@ -430,8 +431,8 @@ config CDROM_PKTCDVD_BUFFERS · 256 unmodified lines | ||
| 430 | 431 | a disc is opened for writing. |
| 431 | 432 | |
| 432 | 433 | config CDROM_PKTCDVD_WCACHE |
| 433 | − bool "Enable write caching (EXPERIMENTAL)" | |
| 434 | − depends on CDROM_PKTCDVD && EXPERIMENTAL | |
| 434 | + bool "Enable write caching" | |
| 435 | + depends on CDROM_PKTCDVD | |
| 435 | 436 | help |
| 436 | 437 | If enabled, write caching will be set for the CD-R/W device. For now |
| 437 | 438 | this option is dangerous unless the CD-RW media is known good, as we |
| @@ -508,8 +509,8 @@ config XEN_BLKDEV_BACKEND · 70 unmodified lines | ||
| 508 | 509 | |
| 509 | 510 | |
| 510 | 511 | config VIRTIO_BLK |
| 511 | − tristate "Virtio block driver (EXPERIMENTAL)" | |
| 512 | − depends on EXPERIMENTAL && VIRTIO | |
| 512 | + tristate "Virtio block driver" | |
| 513 | + depends on VIRTIO | |
| 513 | 514 | ---help--- |
| 514 | 515 | This is the virtual block driver for virtio. It can be used with |
| 515 | 516 | lguest or QEMU based VMMs (like KVM or Xen). Say Y or M. |
| @@ -528,7 +529,7 @@ config BLK_DEV_HD · 12 unmodified lines | ||
| 528 | 529 | |
| 529 | 530 | config BLK_DEV_RBD |
| 530 | 531 | tristate "Rados block device (RBD)" |
| 531 | − depends on INET && EXPERIMENTAL && BLOCK | |
| 532 | + depends on INET && BLOCK | |
| 532 | 533 | select CEPH_LIB |
| 533 | 534 | select LIBCRC32C |
| 534 | 535 | select CRYPTO_AES |
| @@ -5205,7 +5205,6 @@ static void cciss_shutdown(struct pci_dev *pdev) · 5204 unmodified lines | ||
| 5205 | 5205 | return; |
| 5206 | 5206 | } |
| 5207 | 5207 | /* write all data in the battery backed cache to disk */ |
| 5208 | − memset(flush_buf, 0, 4); | |
| 5209 | 5208 | return_code = sendcmd_withirq(h, CCISS_CACHE_FLUSH, flush_buf, |
| 5210 | 5209 | 4, 0, CTLR_LUNID, TYPE_CMD); |
| 5211 | 5210 | kfree(flush_buf); |
| @@ -4109,12 +4109,19 @@ static struct platform_driver floppy_driver = { · 4108 unmodified lines | ||
| 4109 | 4109 | |
| 4110 | 4110 | static struct platform_device floppy_device[N_DRIVE]; |
| 4111 | 4111 | |
| 4112 | +static bool floppy_available(int drive) | |
| 4113 | +{ | |
| 4114 | + if (!(allowed_drive_mask & (1 << drive))) | |
| 4115 | + return false; | |
| 4116 | + if (fdc_state[FDC(drive)].version == FDC_NONE) | |
| 4117 | + return false; | |
| 4118 | + return true; | |
| 4119 | +} | |
| 4120 | + | |
| 4112 | 4121 | static struct kobject *floppy_find(dev_t dev, int *part, void *data) |
| 4113 | 4122 | { |
| 4114 | 4123 | int drive = (*part & 3) | ((*part & 0x80) >> 5); |
| 4115 | − if (drive >= N_DRIVE || | |
| 4116 | − !(allowed_drive_mask & (1 << drive)) || | |
| 4117 | − fdc_state[FDC(drive)].version == FDC_NONE) | |
| 4124 | + if (drive >= N_DRIVE || !floppy_available(drive)) | |
| 4118 | 4125 | return NULL; |
| 4119 | 4126 | if (((*part >> 2) & 0x1f) >= ARRAY_SIZE(floppy_type)) |
| 4120 | 4127 | return NULL; |
| @@ -4124,8 +4131,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) · 3 unmodified lines | ||
| 4124 | 4131 | |
| 4125 | 4132 | static int __init do_floppy_init(void) |
| 4126 | 4133 | { |
| 4127 | − int i, unit, drive; | |
| 4128 | − int err, dr; | |
| 4134 | + int i, unit, drive, err; | |
| 4129 | 4135 | |
| 4130 | 4136 | set_debugt(); |
| 4131 | 4137 | interruptjiffies = resultjiffies = jiffies; |
| @@ -4137,34 +4143,32 @@ static int __init do_floppy_init(void) · 5 unmodified lines | ||
| 4137 | 4143 | |
| 4138 | 4144 | raw_cmd = NULL; |
| 4139 | 4145 | |
| 4140 | − for (dr = 0; dr < N_DRIVE; dr++) { | |
| 4141 | − disks[dr] = alloc_disk(1); | |
| 4142 | − if (!disks[dr]) { | |
| 4143 | − err = -ENOMEM; | |
| 4144 | − goto out_put_disk; | |
| 4145 | − } | |
| 4146 | + floppy_wq = alloc_ordered_workqueue("floppy", 0); | |
| 4147 | + if (!floppy_wq) | |
| 4148 | + return -ENOMEM; | |
| 4146 | 4149 | |
| 4147 | − floppy_wq = alloc_ordered_workqueue("floppy", 0); | |
| 4148 | − if (!floppy_wq) { | |
| 4150 | + for (drive = 0; drive < N_DRIVE; drive++) { | |
| 4151 | + disks[drive] = alloc_disk(1); | |
| 4152 | + if (!disks[drive]) { | |
| 4149 | 4153 | err = -ENOMEM; |
| 4150 | 4154 | goto out_put_disk; |
| 4151 | 4155 | } |
| 4152 | 4156 | |
| 4153 | − disks[dr]->queue = blk_init_queue(do_fd_request, &floppy_lock); | |
| 4154 | − if (!disks[dr]->queue) { | |
| 4157 | + disks[drive]->queue = blk_init_queue(do_fd_request, &floppy_lock); | |
| 4158 | + if (!disks[drive]->queue) { | |
| 4155 | 4159 | err = -ENOMEM; |
| 4156 | − goto out_destroy_workq; | |
| 4160 | + goto out_put_disk; | |
| 4157 | 4161 | } |
| 4158 | 4162 | |
| 4159 | − blk_queue_max_hw_sectors(disks[dr]->queue, 64); | |
| 4160 | − disks[dr]->major = FLOPPY_MAJOR; | |
| 4161 | − disks[dr]->first_minor = TOMINOR(dr); | |
| 4162 | − disks[dr]->fops = &floppy_fops; | |
| 4163 | − sprintf(disks[dr]->disk_name, "fd%d", dr); | |
| 4163 | + blk_queue_max_hw_sectors(disks[drive]->queue, 64); | |
| 4164 | + disks[drive]->major = FLOPPY_MAJOR; | |
| 4165 | + disks[drive]->first_minor = TOMINOR(drive); | |
| 4166 | + disks[drive]->fops = &floppy_fops; | |
| 4167 | + sprintf(disks[drive]->disk_name, "fd%d", drive); | |
| 4164 | 4168 | |
| 4165 | − init_timer(&motor_off_timer[dr]); | |
| 4166 | − motor_off_timer[dr].data = dr; | |
| 4167 | − motor_off_timer[dr].function = motor_off_callback; | |
| 4169 | + init_timer(&motor_off_timer[drive]); | |
| 4170 | + motor_off_timer[drive].data = drive; | |
| 4171 | + motor_off_timer[drive].function = motor_off_callback; | |
| 4168 | 4172 | } |
| 4169 | 4173 | |
| 4170 | 4174 | err = register_blkdev(FLOPPY_MAJOR, "fd"); |
| @@ -4282,9 +4286,7 @@ static int __init do_floppy_init(void) · 111 unmodified lines | ||
| 4282 | 4286 | } |
| 4283 | 4287 | |
| 4284 | 4288 | for (drive = 0; drive < N_DRIVE; drive++) { |
| 4285 | − if (!(allowed_drive_mask & (1 << drive))) | |
| 4286 | − continue; | |
| 4287 | − if (fdc_state[FDC(drive)].version == FDC_NONE) | |
| 4289 | + if (!floppy_available(drive)) | |
| 4288 | 4290 | continue; |
| 4289 | 4291 | |
| 4290 | 4292 | floppy_device[drive].name = floppy_device_name; |
| @@ -4293,7 +4295,7 @@ static int __init do_floppy_init(void) · 2 unmodified lines | ||
| 4293 | 4295 | |
| 4294 | 4296 | err = platform_device_register(&floppy_device[drive]); |
| 4295 | 4297 | if (err) |
| 4296 | − goto out_release_dma; | |
| 4298 | + goto out_remove_drives; | |
| 4297 | 4299 | |
| 4298 | 4300 | err = device_create_file(&floppy_device[drive].dev, |
| 4299 | 4301 | &dev_attr_cmos); |
| @@ -4311,29 +4313,34 @@ static int __init do_floppy_init(void) · 11 unmodified lines | ||
| 4311 | 4313 | |
| 4312 | 4314 | out_unreg_platform_dev: |
| 4313 | 4315 | platform_device_unregister(&floppy_device[drive]); |
| 4316 | +out_remove_drives: | |
| 4317 | + while (drive--) { | |
| 4318 | + if (floppy_available(drive)) { | |
| 4319 | + del_gendisk(disks[drive]); | |
| 4320 | + device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos); | |
| 4321 | + platform_device_unregister(&floppy_device[drive]); | |
| 4322 | + } | |
| 4323 | + } | |
| 4314 | 4324 | out_release_dma: |
| 4315 | 4325 | if (atomic_read(&usage_count)) |
| 4316 | 4326 | floppy_release_irq_and_dma(); |
| 4317 | 4327 | out_unreg_region: |
| 4318 | 4328 | blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256); |
| 4319 | 4329 | platform_driver_unregister(&floppy_driver); |
| 4320 | −out_destroy_workq: | |
| 4321 | − destroy_workqueue(floppy_wq); | |
| 4322 | 4330 | out_unreg_blkdev: |
| 4323 | 4331 | unregister_blkdev(FLOPPY_MAJOR, "fd"); |
| 4324 | 4332 | out_put_disk: |
| 4325 | − while (dr--) { | |
| 4326 | − del_timer_sync(&motor_off_timer[dr]); | |
| 4327 | − if (disks[dr]->queue) { | |
| 4328 | − blk_cleanup_queue(disks[dr]->queue); | |
| 4329 | − /* | |
| 4330 | − * put_disk() is not paired with add_disk() and | |
| 4331 | − * will put queue reference one extra time. fix it. | |
| 4332 | − */ | |
| 4333 | − disks[dr]->queue = NULL; | |
| 4333 | + for (drive = 0; drive < N_DRIVE; drive++) { | |
| 4334 | + if (!disks[drive]) | |
| 4335 | + break; | |
| 4336 | + if (disks[drive]->queue) { | |
| 4337 | + del_timer_sync(&motor_off_timer[drive]); | |
| 4338 | + blk_cleanup_queue(disks[drive]->queue); | |
| 4339 | + disks[drive]->queue = NULL; | |
| 4334 | 4340 | } |
| 4335 | − put_disk(disks[dr]); | |
| 4341 | + put_disk(disks[drive]); | |
| 4336 | 4342 | } |
| 4343 | + destroy_workqueue(floppy_wq); | |
| 4337 | 4344 | return err; |
| 4338 | 4345 | } |
| 4339 | 4346 | |
| @@ -4551,8 +4558,7 @@ static void __exit floppy_module_exit(void) · 211 unmodified lines | ||
| 4551 | 4558 | for (drive = 0; drive < N_DRIVE; drive++) { |
| 4552 | 4559 | del_timer_sync(&motor_off_timer[drive]); |
| 4553 | 4560 | |
| 4554 | − if ((allowed_drive_mask & (1 << drive)) && | |
| 4555 | − fdc_state[FDC(drive)].version != FDC_NONE) { | |
| 4561 | + if (floppy_available(drive)) { | |
| 4556 | 4562 | del_gendisk(disks[drive]); |
| 4557 | 4563 | device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos); |
| 4558 | 4564 | platform_device_unregister(&floppy_device[drive]); |
| @@ -976,8 +976,21 @@ static int loop_clr_fd(struct loop_device *lo) · 975 unmodified lines | ||
| 976 | 976 | if (lo->lo_state != Lo_bound) |
| 977 | 977 | return -ENXIO; |
| 978 | 978 | |
| 979 | − if (lo->lo_refcnt > 1) /* we needed one fd for the ioctl */ | |
| 980 | − return -EBUSY; | |
| 979 | + /* | |
| 980 | + * If we've explicitly asked to tear down the loop device, | |
| 981 | + * and it has an elevated reference count, set it for auto-teardown when | |
| 982 | + * the last reference goes away. This stops $!~#$@ udev from | |
| 983 | + * preventing teardown because it decided that it needs to run blkid on | |
| 984 | + * the loopback device whenever they appear. xfstests is notorious for | |
| 985 | + * failing tests because blkid via udev races with a losetup | |
| 986 | + * <dev>/do something like mkfs/losetup -d <dev> causing the losetup -d | |
| 987 | + * command to fail with EBUSY. | |
| 988 | + */ | |
| 989 | + if (lo->lo_refcnt > 1) { | |
| 990 | + lo->lo_flags |= LO_FLAGS_AUTOCLEAR; | |
| 991 | + mutex_unlock(&lo->lo_ctl_mutex); | |
| 992 | + return 0; | |
| 993 | + } | |
| 981 | 994 | |
| 982 | 995 | if (filp == NULL) |
| 983 | 996 | return -EINVAL; |
| @@ -2035,8 +2035,9 @@ static unsigned int implicit_sector(unsigned char command, · 2034 unmodified lines | ||
| 2035 | 2035 | } |
| 2036 | 2036 | return rv; |
| 2037 | 2037 | } |
| 2038 | − | |
| 2039 | −static void mtip_set_timeout(struct host_to_dev_fis *fis, unsigned int *timeout) | |
| 2038 | +static void mtip_set_timeout(struct driver_data *dd, | |
| 2039 | + struct host_to_dev_fis *fis, | |
| 2040 | + unsigned int *timeout, u8 erasemode) | |
| 2040 | 2041 | { |
| 2041 | 2042 | switch (fis->command) { |
| 2042 | 2043 | case ATA_CMD_DOWNLOAD_MICRO: |
| @@ -2044,7 +2045,10 @@ static void mtip_set_timeout(struct host_to_dev_fis *fis, unsigned int *timeout) · 1 unmodified line | ||
| 2044 | 2045 | break; |
| 2045 | 2046 | case ATA_CMD_SEC_ERASE_UNIT: |
| 2046 | 2047 | case 0xFC: |
| 2047 | − *timeout = 240000; /* 4 minutes */ | |
| 2048 | + if (erasemode) | |
| 2049 | + *timeout = ((*(dd->port->identify + 90) * 2) * 60000); | |
| 2050 | + else | |
| 2051 | + *timeout = ((*(dd->port->identify + 89) * 2) * 60000); | |
| 2048 | 2052 | break; |
| 2049 | 2053 | case ATA_CMD_STANDBYNOW1: |
| 2050 | 2054 | *timeout = 120000; /* 2 minutes */ |
| @@ -2087,6 +2091,7 @@ static int exec_drive_taskfile(struct driver_data *dd, · 36 unmodified lines | ||
| 2087 | 2091 | unsigned int transfer_size; |
| 2088 | 2092 | unsigned long task_file_data; |
| 2089 | 2093 | int intotal = outtotal + req_task->out_size; |
| 2094 | + int erasemode = 0; | |
| 2090 | 2095 | |
| 2091 | 2096 | taskout = req_task->out_size; |
| 2092 | 2097 | taskin = req_task->in_size; |
| @@ -2212,7 +2217,13 @@ static int exec_drive_taskfile(struct driver_data *dd, · 119 unmodified lines | ||
| 2212 | 2217 | fis.lba_hi, |
| 2213 | 2218 | fis.device); |
| 2214 | 2219 | |
| 2215 | − mtip_set_timeout(&fis, &timeout); | |
| 2220 | + /* check for erase mode support during secure erase.*/ | |
| 2221 | + if ((fis.command == ATA_CMD_SEC_ERASE_UNIT) | |
| 2222 | + && (outbuf[0] & MTIP_SEC_ERASE_MODE)) { | |
| 2223 | + erasemode = 1; | |
| 2224 | + } | |
| 2225 | + | |
| 2226 | + mtip_set_timeout(dd, &fis, &timeout, erasemode); | |
| 2216 | 2227 | |
| 2217 | 2228 | /* Determine the correct transfer size.*/ |
| 2218 | 2229 | if (force_single_sector) |
| @@ -33,6 +33,9 @@ · 32 unmodified lines | ||
| 33 | 33 | /* offset of Device Control register in PCIe extended capabilites space */ |
| 34 | 34 | #define PCIE_CONFIG_EXT_DEVICE_CONTROL_OFFSET 0x48 |
| 35 | 35 | |
| 36 | +/* check for erase mode support during secure erase */ | |
| 37 | +#define MTIP_SEC_ERASE_MODE 0x3 | |
| 38 | + | |
| 36 | 39 | /* # of times to retry timed out/failed IOs */ |
| 37 | 40 | #define MTIP_MAX_RETRIES 2 |
| 38 | 41 | |
| @@ -158,8 +158,8 @@ struct xen_vbd { · 157 unmodified lines | ||
| 158 | 158 | struct block_device *bdev; |
| 159 | 159 | /* Cached size parameter. */ |
| 160 | 160 | sector_t size; |
| 161 | − bool flush_support; | |
| 162 | − bool discard_secure; | |
| 161 | + unsigned int flush_support:1; | |
| 162 | + unsigned int discard_secure:1; | |
| 163 | 163 | }; |
| 164 | 164 | |
| 165 | 165 | struct backend_info; |
| @@ -105,11 +105,10 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid) · 104 unmodified lines | ||
| 105 | 105 | { |
| 106 | 106 | struct xen_blkif *blkif; |
| 107 | 107 | |
| 108 | − blkif = kmem_cache_alloc(xen_blkif_cachep, GFP_KERNEL); | |
| 108 | + blkif = kmem_cache_zalloc(xen_blkif_cachep, GFP_KERNEL); | |
| 109 | 109 | if (!blkif) |
| 110 | 110 | return ERR_PTR(-ENOMEM); |
| 111 | 111 | |
| 112 | − memset(blkif, 0, sizeof(*blkif)); | |
| 113 | 112 | blkif->domid = domid; |
| 114 | 113 | spin_lock_init(&blkif->blk_ring_lock); |
| 115 | 114 | atomic_set(&blkif->refcnt, 1); |
| @@ -196,7 +195,7 @@ static void xen_blkif_disconnect(struct xen_blkif *blkif) · 80 unmodified lines | ||
| 196 | 195 | } |
| 197 | 196 | } |
| 198 | 197 | |
| 199 | −void xen_blkif_free(struct xen_blkif *blkif) | |
| 198 | +static void xen_blkif_free(struct xen_blkif *blkif) | |
| 200 | 199 | { |
| 201 | 200 | if (!atomic_dec_and_test(&blkif->refcnt)) |
| 202 | 201 | BUG(); |
| @@ -257,7 +256,7 @@ static struct attribute_group xen_vbdstat_group = { · 54 unmodified lines | ||
| 257 | 256 | VBD_SHOW(physical_device, "%x:%x\n", be->major, be->minor); |
| 258 | 257 | VBD_SHOW(mode, "%s\n", be->mode); |
| 259 | 258 | |
| 260 | −int xenvbd_sysfs_addif(struct xenbus_device *dev) | |
| 259 | +static int xenvbd_sysfs_addif(struct xenbus_device *dev) | |
| 261 | 260 | { |
| 262 | 261 | int error; |
| 263 | 262 | |
| @@ -281,7 +280,7 @@ fail1: device_remove_file(&dev->dev, &dev_attr_physical_device); · 17 unmodified lines | ||
| 281 | 280 | return error; |
| 282 | 281 | } |
| 283 | 282 | |
| 284 | −void xenvbd_sysfs_delif(struct xenbus_device *dev) | |
| 283 | +static void xenvbd_sysfs_delif(struct xenbus_device *dev) | |
| 285 | 284 | { |
| 286 | 285 | sysfs_remove_group(&dev->dev.kobj, &xen_vbdstat_group); |
| 287 | 286 | device_remove_file(&dev->dev, &dev_attr_mode); |
| @@ -5,7 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | * http://www.gnu.org/licenses/gpl.html |
| 6 | 6 | * |
| 7 | 7 | * Maintainer: |
| 8 | − * Andreas Herrmann <andreas.herrmann3@amd.com> | |
| 8 | + * Andreas Herrmann <herrmann.der.user@googlemail.com> | |
| 9 | 9 | * |
| 10 | 10 | * Based on the powernow-k7.c module written by Dave Jones. |
| 11 | 11 | * (C) 2003 Dave Jones on behalf of SuSE Labs |
| @@ -47,7 +47,7 @@ if GPIOLIB · 46 unmodified lines | ||
| 47 | 47 | |
| 48 | 48 | config OF_GPIO |
| 49 | 49 | def_bool y |
| 50 | − depends on OF && !SPARC | |
| 50 | + depends on OF | |
| 51 | 51 | |
| 52 | 52 | config DEBUG_GPIO |
| 53 | 53 | bool "Debug GPIO calls" |
| @@ -153,7 +153,7 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) · 152 unmodified lines | ||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | chip->gpio_chip.ngpio = GEN_74X164_NUMBER_GPIOS * chip->registers; |
| 156 | − chip->buffer = devm_kzalloc(&spi->dev, chip->gpio_chip.ngpio, GFP_KERNEL); | |
| 156 | + chip->buffer = devm_kzalloc(&spi->dev, chip->registers, GFP_KERNEL); | |
| 157 | 157 | if (!chip->buffer) { |
| 158 | 158 | ret = -ENOMEM; |
| 159 | 159 | goto exit_destroy; |
| @@ -244,6 +244,8 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned pin, · 243 unmodified lines | ||
| 244 | 244 | if (ret) |
| 245 | 245 | return ret; |
| 246 | 246 | |
| 247 | + mvebu_gpio_set(chip, pin, value); | |
| 248 | + | |
| 247 | 249 | spin_lock_irqsave(&mvchip->lock, flags); |
| 248 | 250 | u = readl_relaxed(mvebu_gpioreg_io_conf(mvchip)); |
| 249 | 251 | u &= ~(1 << pin); |
| @@ -644,7 +646,7 @@ static int __devinit mvebu_gpio_probe(struct platform_device *pdev) · 394 unmodified lines | ||
| 644 | 646 | ct->handler = handle_edge_irq; |
| 645 | 647 | ct->chip.name = mvchip->chip.label; |
| 646 | 648 | |
| 647 | − irq_setup_generic_chip(gc, IRQ_MSK(ngpios), IRQ_GC_INIT_MASK_CACHE, | |
| 649 | + irq_setup_generic_chip(gc, IRQ_MSK(ngpios), 0, | |
| 648 | 650 | IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE); |
| 649 | 651 | |
| 650 | 652 | /* Setup irq domain on top of the generic chip. */ |
| @@ -251,6 +251,40 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio, · 250 unmodified lines | ||
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | +/** | |
| 255 | + * _clear_gpio_debounce - clear debounce settings for a gpio | |
| 256 | + * @bank: the gpio bank we're acting upon | |
| 257 | + * @gpio: the gpio number on this @gpio | |
| 258 | + * | |
| 259 | + * If a gpio is using debounce, then clear the debounce enable bit and if | |
| 260 | + * this is the only gpio in this bank using debounce, then clear the debounce | |
| 261 | + * time too. The debounce clock will also be disabled when calling this function | |
| 262 | + * if this is the only gpio in the bank using debounce. | |
| 263 | + */ | |
| 264 | +static void _clear_gpio_debounce(struct gpio_bank *bank, unsigned gpio) | |
| 265 | +{ | |
| 266 | + u32 gpio_bit = GPIO_BIT(bank, gpio); | |
| 267 | + | |
| 268 | + if (!bank->dbck_flag) | |
| 269 | + return; | |
| 270 | + | |
| 271 | + if (!(bank->dbck_enable_mask & gpio_bit)) | |
| 272 | + return; | |
| 273 | + | |
| 274 | + bank->dbck_enable_mask &= ~gpio_bit; | |
| 275 | + bank->context.debounce_en &= ~gpio_bit; | |
| 276 | + __raw_writel(bank->context.debounce_en, | |
| 277 | + bank->base + bank->regs->debounce_en); | |
| 278 | + | |
| 279 | + if (!bank->dbck_enable_mask) { | |
| 280 | + bank->context.debounce = 0; | |
| 281 | + __raw_writel(bank->context.debounce, bank->base + | |
| 282 | + bank->regs->debounce); | |
| 283 | + clk_disable(bank->dbck); | |
| 284 | + bank->dbck_enabled = false; | |
| 285 | + } | |
| 286 | +} | |
| 287 | + | |
| 254 | 288 | static inline void set_gpio_trigger(struct gpio_bank *bank, int gpio, |
| 255 | 289 | unsigned trigger) |
| 256 | 290 | { |
| @@ -539,6 +573,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio) · 282 unmodified lines | ||
| 539 | 573 | _set_gpio_irqenable(bank, gpio, 0); |
| 540 | 574 | _clear_gpio_irqstatus(bank, gpio); |
| 541 | 575 | _set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), IRQ_TYPE_NONE); |
| 576 | + _clear_gpio_debounce(bank, gpio); | |
| 542 | 577 | } |
| 543 | 578 | |
| 544 | 579 | /* Use disable_irq_wake() and enable_irq_wake() functions from drivers */ |
| @@ -116,7 +116,7 @@ static void timbgpio_irq_disable(struct irq_data *d) · 115 unmodified lines | ||
| 116 | 116 | unsigned long flags; |
| 117 | 117 | |
| 118 | 118 | spin_lock_irqsave(&tgpio->lock, flags); |
| 119 | − tgpio->last_ier &= ~(1 << offset); | |
| 119 | + tgpio->last_ier &= ~(1UL << offset); | |
| 120 | 120 | iowrite32(tgpio->last_ier, tgpio->membase + TGPIO_IER); |
| 121 | 121 | spin_unlock_irqrestore(&tgpio->lock, flags); |
| 122 | 122 | } |
| @@ -128,7 +128,7 @@ static void timbgpio_irq_enable(struct irq_data *d) · 5 unmodified lines | ||
| 128 | 128 | unsigned long flags; |
| 129 | 129 | |
| 130 | 130 | spin_lock_irqsave(&tgpio->lock, flags); |
| 131 | − tgpio->last_ier |= 1 << offset; | |
| 131 | + tgpio->last_ier |= 1UL << offset; | |
| 132 | 132 | iowrite32(tgpio->last_ier, tgpio->membase + TGPIO_IER); |
| 133 | 133 | spin_unlock_irqrestore(&tgpio->lock, flags); |
| 134 | 134 | } |
| @@ -623,9 +623,11 @@ static ssize_t export_store(struct class *class, · 622 unmodified lines | ||
| 623 | 623 | */ |
| 624 | 624 | |
| 625 | 625 | status = gpio_request(gpio, "sysfs"); |
| 626 | − if (status < 0) | |
| 626 | + if (status < 0) { | |
| 627 | + if (status == -EPROBE_DEFER) | |
| 628 | + status = -ENODEV; | |
| 627 | 629 | goto done; |
| 628 | − | |
| 630 | + } | |
| 629 | 631 | status = gpio_export(gpio, true); |
| 630 | 632 | if (status < 0) |
| 631 | 633 | gpio_free(gpio); |
| @@ -1191,8 +1193,10 @@ int gpio_request(unsigned gpio, const char *label) · 559 unmodified lines | ||
| 1191 | 1193 | |
| 1192 | 1194 | spin_lock_irqsave(&gpio_lock, flags); |
| 1193 | 1195 | |
| 1194 | − if (!gpio_is_valid(gpio)) | |
| 1196 | + if (!gpio_is_valid(gpio)) { | |
| 1197 | + status = -EINVAL; | |
| 1195 | 1198 | goto done; |
| 1199 | + } | |
| 1196 | 1200 | desc = &gpio_desc[gpio]; |
| 1197 | 1201 | chip = desc->chip; |
| 1198 | 1202 | if (chip == NULL) |
| @@ -121,6 +121,8 @@ int drm_open(struct inode *inode, struct file *filp) · 120 unmodified lines | ||
| 121 | 121 | int minor_id = iminor(inode); |
| 122 | 122 | struct drm_minor *minor; |
| 123 | 123 | int retcode = 0; |
| 124 | + int need_setup = 0; | |
| 125 | + struct address_space *old_mapping; | |
| 124 | 126 | |
| 125 | 127 | minor = idr_find(&drm_minors_idr, minor_id); |
| 126 | 128 | if (!minor) |
| @@ -132,23 +134,37 @@ int drm_open(struct inode *inode, struct file *filp) · 5 unmodified lines | ||
| 132 | 134 | if (drm_device_is_unplugged(dev)) |
| 133 | 135 | return -ENODEV; |
| 134 | 136 | |
| 137 | + if (!dev->open_count++) | |
| 138 | + need_setup = 1; | |
| 139 | + mutex_lock(&dev->struct_mutex); | |
| 140 | + old_mapping = dev->dev_mapping; | |
| 141 | + if (old_mapping == NULL) | |
| 142 | + dev->dev_mapping = &inode->i_data; | |
| 143 | + /* ihold ensures nobody can remove inode with our i_data */ | |
| 144 | + ihold(container_of(dev->dev_mapping, struct inode, i_data)); | |
| 145 | + inode->i_mapping = dev->dev_mapping; | |
| 146 | + filp->f_mapping = dev->dev_mapping; | |
| 147 | + mutex_unlock(&dev->struct_mutex); | |
| 148 | + | |
| 135 | 149 | retcode = drm_open_helper(inode, filp, dev); |
| 136 | − if (!retcode) { | |
| 137 | − atomic_inc(&dev->counts[_DRM_STAT_OPENS]); | |
| 138 | − if (!dev->open_count++) | |
| 139 | − retcode = drm_setup(dev); | |
| 140 | − } | |
| 141 | − if (!retcode) { | |
| 142 | − mutex_lock(&dev->struct_mutex); | |
| 143 | − if (dev->dev_mapping == NULL) | |
| 144 | − dev->dev_mapping = &inode->i_data; | |
| 145 | − /* ihold ensures nobody can remove inode with our i_data */ | |
| 146 | − ihold(container_of(dev->dev_mapping, struct inode, i_data)); | |
| 147 | − inode->i_mapping = dev->dev_mapping; | |
| 148 | − filp->f_mapping = dev->dev_mapping; | |
| 149 | − mutex_unlock(&dev->struct_mutex); | |
| 150 | + if (retcode) | |
| 151 | + goto err_undo; | |
| 152 | + atomic_inc(&dev->counts[_DRM_STAT_OPENS]); | |
| 153 | + if (need_setup) { | |
| 154 | + retcode = drm_setup(dev); | |
| 155 | + if (retcode) | |
| 156 | + goto err_undo; | |
| 150 | 157 | } |
| 158 | + return 0; | |
| 151 | 159 | |
| 160 | +err_undo: | |
| 161 | + mutex_lock(&dev->struct_mutex); | |
| 162 | + filp->f_mapping = old_mapping; | |
| 163 | + inode->i_mapping = old_mapping; | |
| 164 | + iput(container_of(dev->dev_mapping, struct inode, i_data)); | |
| 165 | + dev->dev_mapping = old_mapping; | |
| 166 | + mutex_unlock(&dev->struct_mutex); | |
| 167 | + dev->open_count--; | |
| 152 | 168 | return retcode; |
| 153 | 169 | } |
| 154 | 170 | EXPORT_SYMBOL(drm_open); |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | config DRM_EXYNOS |
| 2 | 2 | tristate "DRM Support for Samsung SoC EXYNOS Series" |
| 3 | − depends on DRM && PLAT_SAMSUNG | |
| 3 | + depends on DRM && (PLAT_SAMSUNG || ARCH_MULTIPLATFORM) | |
| 4 | 4 | select DRM_KMS_HELPER |
| 5 | 5 | select FB_CFB_FILLRECT |
| 6 | 6 | select FB_CFB_COPYAREA |
| @@ -374,6 +374,7 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev, · 373 unmodified lines | ||
| 374 | 374 | exynos_connector->encoder_id = encoder->base.id; |
| 375 | 375 | exynos_connector->manager = manager; |
| 376 | 376 | exynos_connector->dpms = DRM_MODE_DPMS_OFF; |
| 377 | + connector->dpms = DRM_MODE_DPMS_OFF; | |
| 377 | 378 | connector->encoder = encoder; |
| 378 | 379 | |
| 379 | 380 | err = drm_mode_connector_attach_encoder(connector, encoder); |
| @@ -43,12 +43,14 @@ · 42 unmodified lines | ||
| 43 | 43 | * @manager: specific encoder has its own manager to control a hardware |
| 44 | 44 | * appropriately and we can access a hardware drawing on this manager. |
| 45 | 45 | * @dpms: store the encoder dpms value. |
| 46 | + * @updated: indicate whether overlay data updating is needed or not. | |
| 46 | 47 | */ |
| 47 | 48 | struct exynos_drm_encoder { |
| 48 | 49 | struct drm_crtc *old_crtc; |
| 49 | 50 | struct drm_encoder drm_encoder; |
| 50 | 51 | struct exynos_drm_manager *manager; |
| 51 | − int dpms; | |
| 52 | + int dpms; | |
| 53 | + bool updated; | |
| 52 | 54 | }; |
| 53 | 55 | |
| 54 | 56 | static void exynos_drm_connector_power(struct drm_encoder *encoder, int mode) |
| @@ -85,7 +87,9 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) · 30 unmodified lines | ||
| 85 | 87 | switch (mode) { |
| 86 | 88 | case DRM_MODE_DPMS_ON: |
| 87 | 89 | if (manager_ops && manager_ops->apply) |
| 88 | − manager_ops->apply(manager->dev); | |
| 90 | + if (!exynos_encoder->updated) | |
| 91 | + manager_ops->apply(manager->dev); | |
| 92 | + | |
| 89 | 93 | exynos_drm_connector_power(encoder, mode); |
| 90 | 94 | exynos_encoder->dpms = mode; |
| 91 | 95 | break; |
| @@ -94,6 +98,7 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) · 2 unmodified lines | ||
| 94 | 98 | case DRM_MODE_DPMS_OFF: |
| 95 | 99 | exynos_drm_connector_power(encoder, mode); |
| 96 | 100 | exynos_encoder->dpms = mode; |
| 101 | + exynos_encoder->updated = false; | |
| 97 | 102 | break; |
| 98 | 103 | default: |
| 99 | 104 | DRM_ERROR("unspecified mode %d\n", mode); |
| @@ -205,13 +210,22 @@ static void exynos_drm_encoder_prepare(struct drm_encoder *encoder) · 105 unmodified lines | ||
| 205 | 210 | |
| 206 | 211 | static void exynos_drm_encoder_commit(struct drm_encoder *encoder) |
| 207 | 212 | { |
| 208 | − struct exynos_drm_manager *manager = exynos_drm_get_manager(encoder); | |
| 213 | + struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder); | |
| 214 | + struct exynos_drm_manager *manager = exynos_encoder->manager; | |
| 209 | 215 | struct exynos_drm_manager_ops *manager_ops = manager->ops; |
| 210 | 216 | |
| 211 | 217 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 212 | 218 | |
| 213 | 219 | if (manager_ops && manager_ops->commit) |
| 214 | 220 | manager_ops->commit(manager->dev); |
| 221 | + | |
| 222 | + /* | |
| 223 | + * this will avoid one issue that overlay data is updated to | |
| 224 | + * real hardware two times. | |
| 225 | + * And this variable will be used to check if the data was | |
| 226 | + * already updated or not by exynos_drm_encoder_dpms function. | |
| 227 | + */ | |
| 228 | + exynos_encoder->updated = true; | |
| 215 | 229 | } |
| 216 | 230 | |
| 217 | 231 | static void exynos_drm_encoder_disable(struct drm_encoder *encoder) |
| @@ -400,19 +414,6 @@ void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data) · 182 unmodified lines | ||
| 400 | 414 | if (manager_ops && manager_ops->dpms) |
| 401 | 415 | manager_ops->dpms(manager->dev, mode); |
| 402 | 416 | |
| 403 | − /* | |
| 404 | − * set current mode to new one so that data aren't updated into | |
| 405 | − * registers by drm_helper_connector_dpms two times. | |
| 406 | − * | |
| 407 | − * in case that drm_crtc_helper_set_mode() is called, | |
| 408 | − * overlay_ops->commit() and manager_ops->commit() callbacks | |
| 409 | − * can be called two times, first at drm_crtc_helper_set_mode() | |
| 410 | − * and second at drm_helper_connector_dpms(). | |
| 411 | − * so with this setting, when drm_helper_connector_dpms() is called | |
| 412 | − * encoder->funcs->dpms() will be ignored. | |
| 413 | − */ | |
| 414 | − exynos_encoder->dpms = mode; | |
| 415 | − | |
| 416 | 417 | /* |
| 417 | 418 | * if this condition is ok then it means that the crtc is already |
| 418 | 419 | * detached from encoder and last function for detaching is properly |
| @@ -1142,7 +1142,7 @@ static int __devinit mixer_probe(struct platform_device *pdev) · 1141 unmodified lines | ||
| 1142 | 1142 | const struct of_device_id *match; |
| 1143 | 1143 | match = of_match_node(of_match_ptr(mixer_match_types), |
| 1144 | 1144 | pdev->dev.of_node); |
| 1145 | − drv = match->data; | |
| 1145 | + drv = (struct mixer_drv_data *)match->data; | |
| 1146 | 1146 | } else { |
| 1147 | 1147 | drv = (struct mixer_drv_data *) |
| 1148 | 1148 | platform_get_device_id(pdev)->driver_data; |
| @@ -1505,7 +1505,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) · 1504 unmodified lines | ||
| 1505 | 1505 | goto put_gmch; |
| 1506 | 1506 | } |
| 1507 | 1507 | |
| 1508 | − i915_kick_out_firmware_fb(dev_priv); | |
| 1508 | + if (drm_core_check_feature(dev, DRIVER_MODESET)) | |
| 1509 | + i915_kick_out_firmware_fb(dev_priv); | |
| 1509 | 1510 | |
| 1510 | 1511 | pci_set_master(dev->pdev); |
| 1511 | 1512 | |
| @@ -729,7 +729,7 @@ void intel_crt_init(struct drm_device *dev) · 728 unmodified lines | ||
| 729 | 729 | |
| 730 | 730 | crt->base.type = INTEL_OUTPUT_ANALOG; |
| 731 | 731 | crt->base.cloneable = true; |
| 732 | − if (IS_HASWELL(dev)) | |
| 732 | + if (IS_HASWELL(dev) || IS_I830(dev)) | |
| 733 | 733 | crt->base.crtc_mask = (1 << 0); |
| 734 | 734 | else |
| 735 | 735 | crt->base.crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); |
| @@ -341,9 +341,17 @@ static int intel_overlay_off(struct intel_overlay *overlay) · 340 unmodified lines | ||
| 341 | 341 | intel_ring_emit(ring, flip_addr); |
| 342 | 342 | intel_ring_emit(ring, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); |
| 343 | 343 | /* turn overlay off */ |
| 344 | − intel_ring_emit(ring, MI_OVERLAY_FLIP | MI_OVERLAY_OFF); | |
| 345 | − intel_ring_emit(ring, flip_addr); | |
| 346 | − intel_ring_emit(ring, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); | |
| 344 | + if (IS_I830(dev)) { | |
| 345 | + /* Workaround: Don't disable the overlay fully, since otherwise | |
| 346 | + * it dies on the next OVERLAY_ON cmd. */ | |
| 347 | + intel_ring_emit(ring, MI_NOOP); | |
| 348 | + intel_ring_emit(ring, MI_NOOP); | |
| 349 | + intel_ring_emit(ring, MI_NOOP); | |
| 350 | + } else { | |
| 351 | + intel_ring_emit(ring, MI_OVERLAY_FLIP | MI_OVERLAY_OFF); | |
| 352 | + intel_ring_emit(ring, flip_addr); | |
| 353 | + intel_ring_emit(ring, MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); | |
| 354 | + } | |
| 347 | 355 | intel_ring_advance(ring); |
| 348 | 356 | |
| 349 | 357 | return intel_overlay_do_wait_request(overlay, intel_overlay_off_tail); |
| @@ -435,7 +435,7 @@ int intel_panel_setup_backlight(struct drm_device *dev) · 434 unmodified lines | ||
| 435 | 435 | props.type = BACKLIGHT_RAW; |
| 436 | 436 | props.max_brightness = _intel_panel_get_max_backlight(dev); |
| 437 | 437 | if (props.max_brightness == 0) { |
| 438 | − DRM_ERROR("Failed to get maximum backlight value\n"); | |
| 438 | + DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n"); | |
| 439 | 439 | return -ENODEV; |
| 440 | 440 | } |
| 441 | 441 | dev_priv->backlight = |
| @@ -894,6 +894,45 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo) · 893 unmodified lines | ||
| 894 | 894 | } |
| 895 | 895 | #endif |
| 896 | 896 | |
| 897 | +static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo, | |
| 898 | + unsigned if_index, uint8_t tx_rate, | |
| 899 | + uint8_t *data, unsigned length) | |
| 900 | +{ | |
| 901 | + uint8_t set_buf_index[2] = { if_index, 0 }; | |
| 902 | + uint8_t hbuf_size, tmp[8]; | |
| 903 | + int i; | |
| 904 | + | |
| 905 | + if (!intel_sdvo_set_value(intel_sdvo, | |
| 906 | + SDVO_CMD_SET_HBUF_INDEX, | |
| 907 | + set_buf_index, 2)) | |
| 908 | + return false; | |
| 909 | + | |
| 910 | + if (!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HBUF_INFO, | |
| 911 | + &hbuf_size, 1)) | |
| 912 | + return false; | |
| 913 | + | |
| 914 | + /* Buffer size is 0 based, hooray! */ | |
| 915 | + hbuf_size++; | |
| 916 | + | |
| 917 | + DRM_DEBUG_KMS("writing sdvo hbuf: %i, hbuf_size %i, hbuf_size: %i\n", | |
| 918 | + if_index, length, hbuf_size); | |
| 919 | + | |
| 920 | + for (i = 0; i < hbuf_size; i += 8) { | |
| 921 | + memset(tmp, 0, 8); | |
| 922 | + if (i < length) | |
| 923 | + memcpy(tmp, data + i, min_t(unsigned, 8, length - i)); | |
| 924 | + | |
| 925 | + if (!intel_sdvo_set_value(intel_sdvo, | |
| 926 | + SDVO_CMD_SET_HBUF_DATA, | |
| 927 | + tmp, 8)) | |
| 928 | + return false; | |
| 929 | + } | |
| 930 | + | |
| 931 | + return intel_sdvo_set_value(intel_sdvo, | |
| 932 | + SDVO_CMD_SET_HBUF_TXRATE, | |
| 933 | + &tx_rate, 1); | |
| 934 | +} | |
| 935 | + | |
| 897 | 936 | static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo) |
| 898 | 937 | { |
| 899 | 938 | struct dip_infoframe avi_if = { |
| @@ -901,11 +940,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo) · 1 unmodified line | ||
| 901 | 940 | .ver = DIP_VERSION_AVI, |
| 902 | 941 | .len = DIP_LEN_AVI, |
| 903 | 942 | }; |
| 904 | − uint8_t tx_rate = SDVO_HBUF_TX_VSYNC; | |
| 905 | − uint8_t set_buf_index[2] = { 1, 0 }; | |
| 906 | 943 | uint8_t sdvo_data[4 + sizeof(avi_if.body.avi)]; |
| 907 | − uint64_t *data = (uint64_t *)sdvo_data; | |
| 908 | − unsigned i; | |
| 909 | 944 | |
| 910 | 945 | intel_dip_infoframe_csum(&avi_if); |
| 911 | 946 | |
| @@ -915,22 +950,9 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo) · 3 unmodified lines | ||
| 915 | 950 | sdvo_data[3] = avi_if.checksum; |
| 916 | 951 | memcpy(&sdvo_data[4], &avi_if.body, sizeof(avi_if.body.avi)); |
| 917 | 952 | |
| 918 | − if (!intel_sdvo_set_value(intel_sdvo, | |
| 919 | − SDVO_CMD_SET_HBUF_INDEX, | |
| 920 | − set_buf_index, 2)) | |
| 921 | − return false; | |
| 922 | − | |
| 923 | − for (i = 0; i < sizeof(sdvo_data); i += 8) { | |
| 924 | − if (!intel_sdvo_set_value(intel_sdvo, | |
| 925 | − SDVO_CMD_SET_HBUF_DATA, | |
| 926 | − data, 8)) | |
| 927 | − return false; | |
| 928 | − data++; | |
| 929 | − } | |
| 930 | − | |
| 931 | − return intel_sdvo_set_value(intel_sdvo, | |
| 932 | − SDVO_CMD_SET_HBUF_TXRATE, | |
| 933 | − &tx_rate, 1); | |
| 953 | + return intel_sdvo_write_infoframe(intel_sdvo, SDVO_HBUF_INDEX_AVI_IF, | |
| 954 | + SDVO_HBUF_TX_VSYNC, | |
| 955 | + sdvo_data, sizeof(sdvo_data)); | |
| 934 | 956 | } |
| 935 | 957 | |
| 936 | 958 | static bool intel_sdvo_set_tv_format(struct intel_sdvo *intel_sdvo) |
| @@ -708,6 +708,8 @@ struct intel_sdvo_enhancements_arg { · 707 unmodified lines | ||
| 708 | 708 | #define SDVO_CMD_SET_AUDIO_STAT 0x91 |
| 709 | 709 | #define SDVO_CMD_GET_AUDIO_STAT 0x92 |
| 710 | 710 | #define SDVO_CMD_SET_HBUF_INDEX 0x93 |
| 711 | + #define SDVO_HBUF_INDEX_ELD 0 | |
| 712 | + #define SDVO_HBUF_INDEX_AVI_IF 1 | |
| 711 | 713 | #define SDVO_CMD_GET_HBUF_INDEX 0x94 |
| 712 | 714 | #define SDVO_CMD_GET_HBUF_INFO 0x95 |
| 713 | 715 | #define SDVO_CMD_SET_HBUF_AV_SPLIT 0x96 |
| @@ -218,13 +218,16 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block) · 217 unmodified lines | ||
| 218 | 218 | node = kzalloc(sizeof(*node), GFP_KERNEL); |
| 219 | 219 | if (!node) |
| 220 | 220 | return -ENOMEM; |
| 221 | − node->offset = roundup(offset, mm->block_size); | |
| 222 | − node->length = rounddown(offset + length, mm->block_size) - node->offset; | |
| 221 | + | |
| 222 | + if (length) { | |
| 223 | + node->offset = roundup(offset, mm->block_size); | |
| 224 | + node->length = rounddown(offset + length, mm->block_size); | |
| 225 | + node->length -= node->offset; | |
| 226 | + } | |
| 223 | 227 | |
| 224 | 228 | list_add_tail(&node->nl_entry, &mm->nodes); |
| 225 | 229 | list_add_tail(&node->fl_entry, &mm->free); |
| 226 | 230 | mm->heap_nodes++; |
| 227 | − mm->heap_size += length; | |
| 228 | 231 | return 0; |
| 229 | 232 | } |
| 230 | 233 | |
| @@ -22,6 +22,8 @@ · 21 unmodified lines | ||
| 22 | 22 | * Authors: Ben Skeggs |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | +#include <subdev/bar.h> | |
| 26 | + | |
| 25 | 27 | #include <engine/software.h> |
| 26 | 28 | #include <engine/disp.h> |
| 27 | 29 | |
| @@ -37,6 +39,7 @@ nv50_disp_sclass[] = { · 9 unmodified lines | ||
| 37 | 39 | static void |
| 38 | 40 | nv50_disp_intr_vblank(struct nv50_disp_priv *priv, int crtc) |
| 39 | 41 | { |
| 42 | + struct nouveau_bar *bar = nouveau_bar(priv); | |
| 40 | 43 | struct nouveau_disp *disp = &priv->base; |
| 41 | 44 | struct nouveau_software_chan *chan, *temp; |
| 42 | 45 | unsigned long flags; |
| @@ -46,18 +49,19 @@ nv50_disp_intr_vblank(struct nv50_disp_priv *priv, int crtc) · 3 unmodified lines | ||
| 46 | 49 | if (chan->vblank.crtc != crtc) |
| 47 | 50 | continue; |
| 48 | 51 | |
| 49 | − nv_wr32(priv, 0x001704, chan->vblank.channel); | |
| 50 | − nv_wr32(priv, 0x001710, 0x80000000 | chan->vblank.ctxdma); | |
| 51 | − | |
| 52 | 52 | if (nv_device(priv)->chipset == 0x50) { |
| 53 | + nv_wr32(priv, 0x001704, chan->vblank.channel); | |
| 54 | + nv_wr32(priv, 0x001710, 0x80000000 | chan->vblank.ctxdma); | |
| 55 | + bar->flush(bar); | |
| 53 | 56 | nv_wr32(priv, 0x001570, chan->vblank.offset); |
| 54 | 57 | nv_wr32(priv, 0x001574, chan->vblank.value); |
| 55 | 58 | } else { |
| 56 | − if (nv_device(priv)->chipset >= 0xc0) { | |
| 57 | − nv_wr32(priv, 0x06000c, | |
| 58 | − upper_32_bits(chan->vblank.offset)); | |
| 59 | − } | |
| 60 | − nv_wr32(priv, 0x060010, chan->vblank.offset); | |
| 59 | + nv_wr32(priv, 0x001718, 0x80000000 | chan->vblank.channel); | |
| 60 | + bar->flush(bar); | |
| 61 | + nv_wr32(priv, 0x06000c, | |
| 62 | + upper_32_bits(chan->vblank.offset)); | |
| 63 | + nv_wr32(priv, 0x060010, | |
| 64 | + lower_32_bits(chan->vblank.offset)); | |
| 61 | 65 | nv_wr32(priv, 0x060014, chan->vblank.value); |
| 62 | 66 | } |
| 63 | 67 | |
| @@ -156,8 +156,8 @@ nv40_graph_context_ctor(struct nouveau_object *parent, · 155 unmodified lines | ||
| 156 | 156 | static int |
| 157 | 157 | nv40_graph_context_fini(struct nouveau_object *object, bool suspend) |
| 158 | 158 | { |
| 159 | − struct nv04_graph_priv *priv = (void *)object->engine; | |
| 160 | − struct nv04_graph_chan *chan = (void *)object; | |
| 159 | + struct nv40_graph_priv *priv = (void *)object->engine; | |
| 160 | + struct nv40_graph_chan *chan = (void *)object; | |
| 161 | 161 | u32 inst = 0x01000000 | nv_gpuobj(chan)->addr >> 4; |
| 162 | 162 | int ret = 0; |
| 163 | 163 | |
| @@ -38,7 +38,7 @@ struct nv40_mpeg_priv { · 37 unmodified lines | ||
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | 40 | struct nv40_mpeg_chan { |
| 41 | − struct nouveau_mpeg base; | |
| 41 | + struct nouveau_mpeg_chan base; | |
| 42 | 42 | }; |
| 43 | 43 | |
| 44 | 44 | /******************************************************************************* |
| @@ -19,7 +19,6 @@ struct nouveau_mm { · 18 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | u32 block_size; |
| 21 | 21 | int heap_nodes; |
| 22 | − u32 heap_size; | |
| 23 | 22 | }; |
| 24 | 23 | |
| 25 | 24 | int nouveau_mm_init(struct nouveau_mm *, u32 offset, u32 length, u32 block); |
| @@ -219,13 +219,11 @@ nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, · 218 unmodified lines | ||
| 219 | 219 | ((priv->base.ram.size & 0x000000ff) << 32); |
| 220 | 220 | |
| 221 | 221 | tags = nv_rd32(priv, 0x100320); |
| 222 | − if (tags) { | |
| 223 | − ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1); | |
| 224 | − if (ret) | |
| 225 | − return ret; | |
| 222 | + ret = nouveau_mm_init(&priv->base.tags, 0, tags, 1); | |
| 223 | + if (ret) | |
| 224 | + return ret; | |
| 226 | 225 | |
| 227 | − nv_debug(priv, "%d compression tags\n", tags); | |
| 228 | − } | |
| 226 | + nv_debug(priv, "%d compression tags\n", tags); | |
| 229 | 227 | |
| 230 | 228 | size = (priv->base.ram.size >> 12) - rsvd_head - rsvd_tail; |
| 231 | 229 | switch (device->chipset) { |
| @@ -292,7 +292,7 @@ nouveau_i2c_ctor(struct nouveau_object *parent, struct nouveau_object *engine, · 291 unmodified lines | ||
| 292 | 292 | case DCB_I2C_NVIO_BIT: |
| 293 | 293 | port->drive = info.drive & 0x0f; |
| 294 | 294 | if (device->card_type < NV_D0) { |
| 295 | − if (info.drive >= ARRAY_SIZE(nv50_i2c_port)) | |
| 295 | + if (port->drive >= ARRAY_SIZE(nv50_i2c_port)) | |
| 296 | 296 | break; |
| 297 | 297 | port->drive = nv50_i2c_port[port->drive]; |
| 298 | 298 | port->sense = port->drive; |
| @@ -67,7 +67,7 @@ nv41_vm_unmap(struct nouveau_gpuobj *pgt, u32 pte, u32 cnt) · 66 unmodified lines | ||
| 67 | 67 | static void |
| 68 | 68 | nv41_vm_flush(struct nouveau_vm *vm) |
| 69 | 69 | { |
| 70 | − struct nv04_vm_priv *priv = (void *)vm->vmm; | |
| 70 | + struct nv04_vmmgr_priv *priv = (void *)vm->vmm; | |
| 71 | 71 | |
| 72 | 72 | mutex_lock(&nv_subdev(priv)->mutex); |
| 73 | 73 | nv_wr32(priv, 0x100810, 0x00000022); |
| @@ -355,7 +355,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) · 354 unmodified lines | ||
| 355 | 355 | * valid - it's not (rh#613284) |
| 356 | 356 | */ |
| 357 | 357 | if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { |
| 358 | − if (!(nv_connector->edid = nouveau_acpi_edid(dev, connector))) { | |
| 358 | + if ((nv_connector->edid = nouveau_acpi_edid(dev, connector))) { | |
| 359 | 359 | status = connector_status_connected; |
| 360 | 360 | goto out; |
| 361 | 361 | } |
| @@ -290,6 +290,7 @@ nouveau_display_create(struct drm_device *dev) · 289 unmodified lines | ||
| 290 | 290 | struct nouveau_drm *drm = nouveau_drm(dev); |
| 291 | 291 | struct nouveau_disp *pdisp = nouveau_disp(drm->device); |
| 292 | 292 | struct nouveau_display *disp; |
| 293 | + u32 pclass = dev->pdev->class >> 8; | |
| 293 | 294 | int ret, gen; |
| 294 | 295 | |
| 295 | 296 | disp = drm->display = kzalloc(sizeof(*disp), GFP_KERNEL); |
| @@ -360,23 +361,27 @@ nouveau_display_create(struct drm_device *dev) · 64 unmodified lines | ||
| 360 | 361 | drm_kms_helper_poll_init(dev); |
| 361 | 362 | drm_kms_helper_poll_disable(dev); |
| 362 | 363 | |
| 363 | − if (nv_device(drm->device)->card_type < NV_50) | |
| 364 | − ret = nv04_display_create(dev); | |
| 365 | − else | |
| 366 | − if (nv_device(drm->device)->card_type < NV_D0) | |
| 367 | − ret = nv50_display_create(dev); | |
| 368 | − else | |
| 369 | − ret = nvd0_display_create(dev); | |
| 370 | − if (ret) | |
| 371 | − goto disp_create_err; | |
| 372 | − | |
| 373 | − if (dev->mode_config.num_crtc) { | |
| 374 | − ret = drm_vblank_init(dev, dev->mode_config.num_crtc); | |
| 364 | + if (nouveau_modeset == 1 || | |
| 365 | + (nouveau_modeset < 0 && pclass == PCI_CLASS_DISPLAY_VGA)) { | |
| 366 | + if (nv_device(drm->device)->card_type < NV_50) | |
| 367 | + ret = nv04_display_create(dev); | |
| 368 | + else | |
| 369 | + if (nv_device(drm->device)->card_type < NV_D0) | |
| 370 | + ret = nv50_display_create(dev); | |
| 371 | + else | |
| 372 | + ret = nvd0_display_create(dev); | |
| 375 | 373 | if (ret) |
| 376 | − goto vblank_err; | |
| 374 | + goto disp_create_err; | |
| 375 | + | |
| 376 | + if (dev->mode_config.num_crtc) { | |
| 377 | + ret = drm_vblank_init(dev, dev->mode_config.num_crtc); | |
| 378 | + if (ret) | |
| 379 | + goto vblank_err; | |
| 380 | + } | |
| 381 | + | |
| 382 | + nouveau_backlight_init(dev); | |
| 377 | 383 | } |
| 378 | 384 | |
| 379 | − nouveau_backlight_init(dev); | |
| 380 | 385 | return 0; |
| 381 | 386 | |
| 382 | 387 | vblank_err: |
| @@ -395,7 +400,8 @@ nouveau_display_destroy(struct drm_device *dev) · 12 unmodified lines | ||
| 395 | 400 | nouveau_backlight_exit(dev); |
| 396 | 401 | drm_vblank_cleanup(dev); |
| 397 | 402 | |
| 398 | − disp->dtor(dev); | |
| 403 | + if (disp->dtor) | |
| 404 | + disp->dtor(dev); | |
| 399 | 405 | |
| 400 | 406 | drm_kms_helper_poll_fini(dev); |
| 401 | 407 | drm_mode_config_cleanup(dev); |
| @@ -63,8 +63,9 @@ MODULE_PARM_DESC(noaccel, "disable kernel/abi16 acceleration"); · 62 unmodified lines | ||
| 63 | 63 | static int nouveau_noaccel = 0; |
| 64 | 64 | module_param_named(noaccel, nouveau_noaccel, int, 0400); |
| 65 | 65 | |
| 66 | −MODULE_PARM_DESC(modeset, "enable driver"); | |
| 67 | −static int nouveau_modeset = -1; | |
| 66 | +MODULE_PARM_DESC(modeset, "enable driver (default: auto, " | |
| 67 | + "0 = disabled, 1 = enabled, 2 = headless)"); | |
| 68 | +int nouveau_modeset = -1; | |
| 68 | 69 | module_param_named(modeset, nouveau_modeset, int, 0400); |
| 69 | 70 | |
| 70 | 71 | static struct drm_driver driver; |
| @@ -363,7 +364,8 @@ nouveau_drm_unload(struct drm_device *dev) · 292 unmodified lines | ||
| 363 | 364 | |
| 364 | 365 | nouveau_pm_fini(dev); |
| 365 | 366 | |
| 366 | − nouveau_display_fini(dev); | |
| 367 | + if (dev->mode_config.num_crtc) | |
| 368 | + nouveau_display_fini(dev); | |
| 367 | 369 | nouveau_display_destroy(dev); |
| 368 | 370 | |
| 369 | 371 | nouveau_irq_fini(dev); |
| @@ -403,13 +405,15 @@ nouveau_drm_suspend(struct pci_dev *pdev, pm_message_t pm_state) · 33 unmodified lines | ||
| 403 | 405 | pm_state.event == PM_EVENT_PRETHAW) |
| 404 | 406 | return 0; |
| 405 | 407 | |
| 406 | − NV_INFO(drm, "suspending fbcon...\n"); | |
| 407 | − nouveau_fbcon_set_suspend(dev, 1); | |
| 408 | + if (dev->mode_config.num_crtc) { | |
| 409 | + NV_INFO(drm, "suspending fbcon...\n"); | |
| 410 | + nouveau_fbcon_set_suspend(dev, 1); | |
| 408 | 411 | |
| 409 | − NV_INFO(drm, "suspending display...\n"); | |
| 410 | − ret = nouveau_display_suspend(dev); | |
| 411 | − if (ret) | |
| 412 | − return ret; | |
| 412 | + NV_INFO(drm, "suspending display...\n"); | |
| 413 | + ret = nouveau_display_suspend(dev); | |
| 414 | + if (ret) | |
| 415 | + return ret; | |
| 416 | + } | |
| 413 | 417 | |
| 414 | 418 | NV_INFO(drm, "evicting buffers...\n"); |
| 415 | 419 | ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM); |
| @@ -445,8 +449,10 @@ fail_client: · 29 unmodified lines | ||
| 445 | 449 | nouveau_client_init(&cli->base); |
| 446 | 450 | } |
| 447 | 451 | |
| 448 | − NV_INFO(drm, "resuming display...\n"); | |
| 449 | − nouveau_display_resume(dev); | |
| 452 | + if (dev->mode_config.num_crtc) { | |
| 453 | + NV_INFO(drm, "resuming display...\n"); | |
| 454 | + nouveau_display_resume(dev); | |
| 455 | + } | |
| 450 | 456 | return ret; |
| 451 | 457 | } |
| 452 | 458 | |
| @@ -486,8 +492,10 @@ nouveau_drm_resume(struct pci_dev *pdev) · 33 unmodified lines | ||
| 486 | 492 | nouveau_irq_postinstall(dev); |
| 487 | 493 | nouveau_pm_resume(dev); |
| 488 | 494 | |
| 489 | − NV_INFO(drm, "resuming display...\n"); | |
| 490 | − nouveau_display_resume(dev); | |
| 495 | + if (dev->mode_config.num_crtc) { | |
| 496 | + NV_INFO(drm, "resuming display...\n"); | |
| 497 | + nouveau_display_resume(dev); | |
| 498 | + } | |
| 491 | 499 | return 0; |
| 492 | 500 | } |
| 493 | 501 | |
| @@ -662,9 +670,7 @@ nouveau_drm_init(void) · 168 unmodified lines | ||
| 662 | 670 | #ifdef CONFIG_VGA_CONSOLE |
| 663 | 671 | if (vgacon_text_force()) |
| 664 | 672 | nouveau_modeset = 0; |
| 665 | − else | |
| 666 | 673 | #endif |
| 667 | − nouveau_modeset = 1; | |
| 668 | 674 | } |
| 669 | 675 | |
| 670 | 676 | if (!nouveau_modeset) |
| @@ -141,4 +141,6 @@ int nouveau_drm_resume(struct pci_dev *); · 140 unmodified lines | ||
| 141 | 141 | nv_info((cli), fmt, ##args); \ |
| 142 | 142 | } while (0) |
| 143 | 143 | |
| 144 | +extern int nouveau_modeset; | |
| 145 | + | |
| 144 | 146 | #endif |
| @@ -61,13 +61,15 @@ nouveau_irq_handler(DRM_IRQ_ARGS) · 60 unmodified lines | ||
| 61 | 61 | |
| 62 | 62 | nv_subdev(pmc)->intr(nv_subdev(pmc)); |
| 63 | 63 | |
| 64 | − if (device->card_type >= NV_D0) { | |
| 65 | − if (nv_rd32(device, 0x000100) & 0x04000000) | |
| 66 | − nvd0_display_intr(dev); | |
| 67 | − } else | |
| 68 | − if (device->card_type >= NV_50) { | |
| 69 | − if (nv_rd32(device, 0x000100) & 0x04000000) | |
| 70 | − nv50_display_intr(dev); | |
| 64 | + if (dev->mode_config.num_crtc) { | |
| 65 | + if (device->card_type >= NV_D0) { | |
| 66 | + if (nv_rd32(device, 0x000100) & 0x04000000) | |
| 67 | + nvd0_display_intr(dev); | |
| 68 | + } else | |
| 69 | + if (device->card_type >= NV_50) { | |
| 70 | + if (nv_rd32(device, 0x000100) & 0x04000000) | |
| 71 | + nv50_display_intr(dev); | |
| 72 | + } | |
| 71 | 73 | } |
| 72 | 74 | |
| 73 | 75 | return IRQ_HANDLED; |
| @@ -220,7 +220,7 @@ out: · 219 unmodified lines | ||
| 220 | 220 | NVWriteVgaCrtc(dev, 0, NV_CIO_CR_MODE_INDEX, saved_cr_mode); |
| 221 | 221 | |
| 222 | 222 | if (blue == 0x18) { |
| 223 | − NV_INFO(drm, "Load detected on head A\n"); | |
| 223 | + NV_DEBUG(drm, "Load detected on head A\n"); | |
| 224 | 224 | return connector_status_connected; |
| 225 | 225 | } |
| 226 | 226 | |
| @@ -338,8 +338,8 @@ nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) · 111 unmodified lines | ||
| 338 | 338 | |
| 339 | 339 | if (nv17_dac_sample_load(encoder) & |
| 340 | 340 | NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) { |
| 341 | − NV_INFO(drm, "Load detected on output %c\n", | |
| 342 | − '@' + ffs(dcb->or)); | |
| 341 | + NV_DEBUG(drm, "Load detected on output %c\n", | |
| 342 | + '@' + ffs(dcb->or)); | |
| 343 | 343 | return connector_status_connected; |
| 344 | 344 | } else { |
| 345 | 345 | return connector_status_disconnected; |
| @@ -413,9 +413,9 @@ static void nv04_dac_commit(struct drm_encoder *encoder) · 67 unmodified lines | ||
| 413 | 413 | |
| 414 | 414 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 415 | 415 | |
| 416 | − NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 417 | − drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | |
| 418 | − nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | |
| 416 | + NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 417 | + drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | |
| 418 | + nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable) |
| @@ -461,8 +461,8 @@ static void nv04_dac_dpms(struct drm_encoder *encoder, int mode) · 39 unmodified lines | ||
| 461 | 461 | return; |
| 462 | 462 | nv_encoder->last_dpms = mode; |
| 463 | 463 | |
| 464 | − NV_INFO(drm, "Setting dpms mode %d on vga encoder (output %d)\n", | |
| 465 | − mode, nv_encoder->dcb->index); | |
| 464 | + NV_DEBUG(drm, "Setting dpms mode %d on vga encoder (output %d)\n", | |
| 465 | + mode, nv_encoder->dcb->index); | |
| 466 | 466 | |
| 467 | 467 | nv04_dac_update_dacclk(encoder, mode == DRM_MODE_DPMS_ON); |
| 468 | 468 | } |
| @@ -476,9 +476,9 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) · 475 unmodified lines | ||
| 476 | 476 | |
| 477 | 477 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 478 | 478 | |
| 479 | − NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 480 | − drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | |
| 481 | − nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | |
| 479 | + NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 480 | + drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), | |
| 481 | + nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | |
| 482 | 482 | } |
| 483 | 483 | |
| 484 | 484 | static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) |
| @@ -520,8 +520,8 @@ static void nv04_lvds_dpms(struct drm_encoder *encoder, int mode) · 35 unmodified lines | ||
| 520 | 520 | return; |
| 521 | 521 | nv_encoder->last_dpms = mode; |
| 522 | 522 | |
| 523 | − NV_INFO(drm, "Setting dpms mode %d on lvds encoder (output %d)\n", | |
| 524 | − mode, nv_encoder->dcb->index); | |
| 523 | + NV_DEBUG(drm, "Setting dpms mode %d on lvds encoder (output %d)\n", | |
| 524 | + mode, nv_encoder->dcb->index); | |
| 525 | 525 | |
| 526 | 526 | if (was_powersaving && is_powersaving_dpms(mode)) |
| 527 | 527 | return; |
| @@ -565,8 +565,8 @@ static void nv04_tmds_dpms(struct drm_encoder *encoder, int mode) · 37 unmodified lines | ||
| 565 | 565 | return; |
| 566 | 566 | nv_encoder->last_dpms = mode; |
| 567 | 567 | |
| 568 | − NV_INFO(drm, "Setting dpms mode %d on tmds encoder (output %d)\n", | |
| 569 | − mode, nv_encoder->dcb->index); | |
| 568 | + NV_DEBUG(drm, "Setting dpms mode %d on tmds encoder (output %d)\n", | |
| 569 | + mode, nv_encoder->dcb->index); | |
| 570 | 570 | |
| 571 | 571 | nv04_dfp_update_backlight(encoder, mode); |
| 572 | 572 | nv04_dfp_update_fp_control(encoder, mode); |
| @@ -75,8 +75,8 @@ static void nv04_tv_dpms(struct drm_encoder *encoder, int mode) · 74 unmodified lines | ||
| 75 | 75 | struct nv04_mode_state *state = &nv04_display(dev)->mode_reg; |
| 76 | 76 | uint8_t crtc1A; |
| 77 | 77 | |
| 78 | − NV_INFO(drm, "Setting dpms mode %d on TV encoder (output %d)\n", | |
| 79 | − mode, nv_encoder->dcb->index); | |
| 78 | + NV_DEBUG(drm, "Setting dpms mode %d on TV encoder (output %d)\n", | |
| 79 | + mode, nv_encoder->dcb->index); | |
| 80 | 80 | |
| 81 | 81 | state->pllsel &= ~(PLLSEL_TV_CRTC1_MASK | PLLSEL_TV_CRTC2_MASK); |
| 82 | 82 | |
| @@ -167,9 +167,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder) · 84 unmodified lines | ||
| 167 | 167 | |
| 168 | 168 | helper->dpms(encoder, DRM_MODE_DPMS_ON); |
| 169 | 169 | |
| 170 | − NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 171 | − drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, | |
| 172 | − '@' + ffs(nv_encoder->dcb->or)); | |
| 170 | + NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n", | |
| 171 | + drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or)); | |
| 173 | 172 | } |
| 174 | 173 | |
| 175 | 174 | static void nv04_tv_destroy(struct drm_encoder *encoder) |
| @@ -1696,35 +1696,43 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) · 1695 unmodified lines | ||
| 1696 | 1696 | return ATOM_PPLL2; |
| 1697 | 1697 | DRM_ERROR("unable to allocate a PPLL\n"); |
| 1698 | 1698 | return ATOM_PPLL_INVALID; |
| 1699 | − } else { | |
| 1700 | − if (ASIC_IS_AVIVO(rdev)) { | |
| 1701 | − /* in DP mode, the DP ref clock can come from either PPLL | |
| 1702 | − * depending on the asic: | |
| 1703 | − * DCE3: PPLL1 or PPLL2 | |
| 1704 | − */ | |
| 1705 | − if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(radeon_crtc->encoder))) { | |
| 1706 | − /* use the same PPLL for all DP monitors */ | |
| 1707 | − pll = radeon_get_shared_dp_ppll(crtc); | |
| 1708 | − if (pll != ATOM_PPLL_INVALID) | |
| 1709 | − return pll; | |
| 1710 | − } else { | |
| 1711 | − /* use the same PPLL for all monitors with the same clock */ | |
| 1712 | − pll = radeon_get_shared_nondp_ppll(crtc); | |
| 1713 | − if (pll != ATOM_PPLL_INVALID) | |
| 1714 | − return pll; | |
| 1715 | − } | |
| 1716 | − /* all other cases */ | |
| 1717 | − pll_in_use = radeon_get_pll_use_mask(crtc); | |
| 1699 | + } else if (ASIC_IS_AVIVO(rdev)) { | |
| 1700 | + /* in DP mode, the DP ref clock can come from either PPLL | |
| 1701 | + * depending on the asic: | |
| 1702 | + * DCE3: PPLL1 or PPLL2 | |
| 1703 | + */ | |
| 1704 | + if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(radeon_crtc->encoder))) { | |
| 1705 | + /* use the same PPLL for all DP monitors */ | |
| 1706 | + pll = radeon_get_shared_dp_ppll(crtc); | |
| 1707 | + if (pll != ATOM_PPLL_INVALID) | |
| 1708 | + return pll; | |
| 1709 | + } else { | |
| 1710 | + /* use the same PPLL for all monitors with the same clock */ | |
| 1711 | + pll = radeon_get_shared_nondp_ppll(crtc); | |
| 1712 | + if (pll != ATOM_PPLL_INVALID) | |
| 1713 | + return pll; | |
| 1714 | + } | |
| 1715 | + /* all other cases */ | |
| 1716 | + pll_in_use = radeon_get_pll_use_mask(crtc); | |
| 1717 | + /* the order shouldn't matter here, but we probably | |
| 1718 | + * need this until we have atomic modeset | |
| 1719 | + */ | |
| 1720 | + if (rdev->flags & RADEON_IS_IGP) { | |
| 1718 | 1721 | if (!(pll_in_use & (1 << ATOM_PPLL1))) |
| 1719 | 1722 | return ATOM_PPLL1; |
| 1720 | 1723 | if (!(pll_in_use & (1 << ATOM_PPLL2))) |
| 1721 | 1724 | return ATOM_PPLL2; |
| 1722 | − DRM_ERROR("unable to allocate a PPLL\n"); | |
| 1723 | − return ATOM_PPLL_INVALID; | |
| 1724 | 1725 | } else { |
| 1725 | − /* on pre-R5xx asics, the crtc to pll mapping is hardcoded */ | |
| 1726 | − return radeon_crtc->crtc_id; | |
| 1726 | + if (!(pll_in_use & (1 << ATOM_PPLL2))) | |
| 1727 | + return ATOM_PPLL2; | |
| 1728 | + if (!(pll_in_use & (1 << ATOM_PPLL1))) | |
| 1729 | + return ATOM_PPLL1; | |
| 1727 | 1730 | } |
| 1731 | + DRM_ERROR("unable to allocate a PPLL\n"); | |
| 1732 | + return ATOM_PPLL_INVALID; | |
| 1733 | + } else { | |
| 1734 | + /* on pre-R5xx asics, the crtc to pll mapping is hardcoded */ | |
| 1735 | + return radeon_crtc->crtc_id; | |
| 1728 | 1736 | } |
| 1729 | 1737 | } |
| 1730 | 1738 | |
| @@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s · 1371 unmodified lines | ||
| 1372 | 1372 | WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN); |
| 1373 | 1373 | |
| 1374 | 1374 | for (i = 0; i < rdev->num_crtc; i++) { |
| 1375 | − if (save->crtc_enabled) { | |
| 1375 | + if (save->crtc_enabled[i]) { | |
| 1376 | 1376 | if (ASIC_IS_DCE6(rdev)) { |
| 1377 | 1377 | tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]); |
| 1378 | 1378 | tmp |= EVERGREEN_CRTC_BLANK_DATA_EN; |
| @@ -264,7 +264,7 @@ static int evergreen_surface_check_2d(struct radeon_cs_parser *p, · 263 unmodified lines | ||
| 264 | 264 | /* macro tile width & height */ |
| 265 | 265 | palign = (8 * surf->bankw * track->npipes) * surf->mtilea; |
| 266 | 266 | halign = (8 * surf->bankh * surf->nbanks) / surf->mtilea; |
| 267 | − mtileb = (palign / 8) * (halign / 8) * tileb;; | |
| 267 | + mtileb = (palign / 8) * (halign / 8) * tileb; | |
| 268 | 268 | mtile_pr = surf->nbx / palign; |
| 269 | 269 | mtile_ps = (mtile_pr * surf->nby) / halign; |
| 270 | 270 | surf->layer_size = mtile_ps * mtileb * slice_pt; |
| @@ -2725,6 +2725,9 @@ static bool evergreen_vm_reg_valid(u32 reg) · 2454 unmodified lines | ||
| 2725 | 2725 | /* check config regs */ |
| 2726 | 2726 | switch (reg) { |
| 2727 | 2727 | case GRBM_GFX_INDEX: |
| 2728 | + case CP_STRMOUT_CNTL: | |
| 2729 | + case CP_COHER_CNTL: | |
| 2730 | + case CP_COHER_SIZE: | |
| 2728 | 2731 | case VGT_VTX_VECT_EJECT_REG: |
| 2729 | 2732 | case VGT_CACHE_INVALIDATION: |
| 2730 | 2733 | case VGT_GS_VERTEX_REUSE: |
| @@ -91,6 +91,10 @@ · 90 unmodified lines | ||
| 91 | 91 | #define FB_READ_EN (1 << 0) |
| 92 | 92 | #define FB_WRITE_EN (1 << 1) |
| 93 | 93 | |
| 94 | +#define CP_STRMOUT_CNTL 0x84FC | |
| 95 | + | |
| 96 | +#define CP_COHER_CNTL 0x85F0 | |
| 97 | +#define CP_COHER_SIZE 0x85F4 | |
| 94 | 98 | #define CP_COHER_BASE 0x85F8 |
| 95 | 99 | #define CP_STALLED_STAT1 0x8674 |
| 96 | 100 | #define CP_STALLED_STAT2 0x8678 |
| @@ -352,9 +352,9 @@ static int radeon_atpx_switchto(enum vga_switcheroo_client_id id) · 351 unmodified lines | ||
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | /** |
| 355 | − * radeon_atpx_switchto - switch to the requested GPU | |
| 355 | + * radeon_atpx_power_state - power down/up the requested GPU | |
| 356 | 356 | * |
| 357 | − * @id: GPU to switch to | |
| 357 | + * @id: GPU to power down/up | |
| 358 | 358 | * @state: requested power state (0 = off, 1 = on) |
| 359 | 359 | * |
| 360 | 360 | * Execute the necessary ATPX function to power down/up the discrete GPU |
| @@ -941,7 +941,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) · 940 unmodified lines | ||
| 941 | 941 | struct drm_mode_object *obj; |
| 942 | 942 | int i; |
| 943 | 943 | enum drm_connector_status ret = connector_status_disconnected; |
| 944 | − bool dret = false; | |
| 944 | + bool dret = false, broken_edid = false; | |
| 945 | 945 | |
| 946 | 946 | if (!force && radeon_check_hpd_status_unchanged(connector)) |
| 947 | 947 | return connector->status; |
| @@ -965,6 +965,9 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) · 17 unmodified lines | ||
| 965 | 965 | ret = connector_status_disconnected; |
| 966 | 966 | DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n", drm_get_connector_name(connector)); |
| 967 | 967 | radeon_connector->ddc_bus = NULL; |
| 968 | + } else { | |
| 969 | + ret = connector_status_connected; | |
| 970 | + broken_edid = true; /* defer use_digital to later */ | |
| 968 | 971 | } |
| 969 | 972 | } else { |
| 970 | 973 | radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL); |
| @@ -1047,13 +1050,24 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) · 76 unmodified lines | ||
| 1047 | 1050 | |
| 1048 | 1051 | encoder_funcs = encoder->helper_private; |
| 1049 | 1052 | if (encoder_funcs->detect) { |
| 1050 | − if (ret != connector_status_connected) { | |
| 1051 | − ret = encoder_funcs->detect(encoder, connector); | |
| 1052 | − if (ret == connector_status_connected) { | |
| 1053 | − radeon_connector->use_digital = false; | |
| 1053 | + if (!broken_edid) { | |
| 1054 | + if (ret != connector_status_connected) { | |
| 1055 | + /* deal with analog monitors without DDC */ | |
| 1056 | + ret = encoder_funcs->detect(encoder, connector); | |
| 1057 | + if (ret == connector_status_connected) { | |
| 1058 | + radeon_connector->use_digital = false; | |
| 1059 | + } | |
| 1060 | + if (ret != connector_status_disconnected) | |
| 1061 | + radeon_connector->detected_by_load = true; | |
| 1054 | 1062 | } |
| 1055 | − if (ret != connector_status_disconnected) | |
| 1056 | − radeon_connector->detected_by_load = true; | |
| 1063 | + } else { | |
| 1064 | + enum drm_connector_status lret; | |
| 1065 | + /* assume digital unless load detected otherwise */ | |
| 1066 | + radeon_connector->use_digital = true; | |
| 1067 | + lret = encoder_funcs->detect(encoder, connector); | |
| 1068 | + DRM_DEBUG_KMS("load_detect %x returned: %x\n",encoder->encoder_type,lret); | |
| 1069 | + if (lret == connector_status_connected) | |
| 1070 | + radeon_connector->use_digital = false; | |
| 1057 | 1071 | } |
| 1058 | 1072 | break; |
| 1059 | 1073 | } |
| @@ -295,6 +295,7 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) · 294 unmodified lines | ||
| 295 | 295 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
| 296 | 296 | struct drm_device *dev = crtc->dev; |
| 297 | 297 | struct radeon_device *rdev = dev->dev_private; |
| 298 | + uint32_t crtc_ext_cntl = 0; | |
| 298 | 299 | uint32_t mask; |
| 299 | 300 | |
| 300 | 301 | if (radeon_crtc->crtc_id) |
| @@ -307,6 +308,16 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) · 6 unmodified lines | ||
| 307 | 308 | RADEON_CRTC_VSYNC_DIS | |
| 308 | 309 | RADEON_CRTC_HSYNC_DIS); |
| 309 | 310 | |
| 311 | + /* | |
| 312 | + * On all dual CRTC GPUs this bit controls the CRTC of the primary DAC. | |
| 313 | + * Therefore it is set in the DAC DMPS function. | |
| 314 | + * This is different for GPU's with a single CRTC but a primary and a | |
| 315 | + * TV DAC: here it controls the single CRTC no matter where it is | |
| 316 | + * routed. Therefore we set it here. | |
| 317 | + */ | |
| 318 | + if (rdev->flags & RADEON_SINGLE_CRTC) | |
| 319 | + crtc_ext_cntl = RADEON_CRTC_CRT_ON; | |
| 320 | + | |
| 310 | 321 | switch (mode) { |
| 311 | 322 | case DRM_MODE_DPMS_ON: |
| 312 | 323 | radeon_crtc->enabled = true; |
| @@ -317,7 +328,7 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) · 4 unmodified lines | ||
| 317 | 328 | else { |
| 318 | 329 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_EN, ~(RADEON_CRTC_EN | |
| 319 | 330 | RADEON_CRTC_DISP_REQ_EN_B)); |
| 320 | − WREG32_P(RADEON_CRTC_EXT_CNTL, 0, ~mask); | |
| 331 | + WREG32_P(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl, ~(mask | crtc_ext_cntl)); | |
| 321 | 332 | } |
| 322 | 333 | drm_vblank_post_modeset(dev, radeon_crtc->crtc_id); |
| 323 | 334 | radeon_crtc_load_lut(crtc); |
| @@ -331,7 +342,7 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode) · 7 unmodified lines | ||
| 331 | 342 | else { |
| 332 | 343 | WREG32_P(RADEON_CRTC_GEN_CNTL, RADEON_CRTC_DISP_REQ_EN_B, ~(RADEON_CRTC_EN | |
| 333 | 344 | RADEON_CRTC_DISP_REQ_EN_B)); |
| 334 | − WREG32_P(RADEON_CRTC_EXT_CNTL, mask, ~mask); | |
| 345 | + WREG32_P(RADEON_CRTC_EXT_CNTL, mask, ~(mask | crtc_ext_cntl)); | |
| 335 | 346 | } |
| 336 | 347 | radeon_crtc->enabled = false; |
| 337 | 348 | /* adjust pm to dpms changes AFTER disabling crtcs */ |
| @@ -537,7 +537,9 @@ static void radeon_legacy_primary_dac_dpms(struct drm_encoder *encoder, int mode · 536 unmodified lines | ||
| 537 | 537 | break; |
| 538 | 538 | } |
| 539 | 539 | |
| 540 | − WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); | |
| 540 | + /* handled in radeon_crtc_dpms() */ | |
| 541 | + if (!(rdev->flags & RADEON_SINGLE_CRTC)) | |
| 542 | + WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); | |
| 541 | 543 | WREG32(RADEON_DAC_CNTL, dac_cntl); |
| 542 | 544 | WREG32(RADEON_DAC_MACRO_CNTL, dac_macro_cntl); |
| 543 | 545 | |
| @@ -662,6 +664,8 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc · 118 unmodified lines | ||
| 662 | 664 | |
| 663 | 665 | if (ASIC_IS_R300(rdev)) |
| 664 | 666 | tmp |= (0x1b6 << RADEON_DAC_FORCE_DATA_SHIFT); |
| 667 | + else if (ASIC_IS_RV100(rdev)) | |
| 668 | + tmp |= (0x1ac << RADEON_DAC_FORCE_DATA_SHIFT); | |
| 665 | 669 | else |
| 666 | 670 | tmp |= (0x180 << RADEON_DAC_FORCE_DATA_SHIFT); |
| 667 | 671 | |
| @@ -671,6 +675,7 @@ static enum drm_connector_status radeon_legacy_primary_dac_detect(struct drm_enc · 3 unmodified lines | ||
| 671 | 675 | tmp |= RADEON_DAC_RANGE_CNTL_PS2 | RADEON_DAC_CMP_EN; |
| 672 | 676 | WREG32(RADEON_DAC_CNTL, tmp); |
| 673 | 677 | |
| 678 | + tmp = dac_macro_cntl; | |
| 674 | 679 | tmp &= ~(RADEON_DAC_PDWN_R | |
| 675 | 680 | RADEON_DAC_PDWN_G | |
| 676 | 681 | RADEON_DAC_PDWN_B); |
| @@ -1092,7 +1097,8 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode) · 415 unmodified lines | ||
| 1092 | 1097 | } else { |
| 1093 | 1098 | if (is_tv) |
| 1094 | 1099 | WREG32(RADEON_TV_MASTER_CNTL, tv_master_cntl); |
| 1095 | − else | |
| 1100 | + /* handled in radeon_crtc_dpms() */ | |
| 1101 | + else if (!(rdev->flags & RADEON_SINGLE_CRTC)) | |
| 1096 | 1102 | WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); |
| 1097 | 1103 | WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl); |
| 1098 | 1104 | } |
| @@ -1416,13 +1422,104 @@ static bool radeon_legacy_tv_detect(struct drm_encoder *encoder, · 317 unmodified lines | ||
| 1416 | 1422 | return found; |
| 1417 | 1423 | } |
| 1418 | 1424 | |
| 1425 | +static bool radeon_legacy_ext_dac_detect(struct drm_encoder *encoder, | |
| 1426 | + struct drm_connector *connector) | |
| 1427 | +{ | |
| 1428 | + struct drm_device *dev = encoder->dev; | |
| 1429 | + struct radeon_device *rdev = dev->dev_private; | |
| 1430 | + uint32_t gpio_monid, fp2_gen_cntl, disp_output_cntl, crtc2_gen_cntl; | |
| 1431 | + uint32_t disp_lin_trans_grph_a, disp_lin_trans_grph_b, disp_lin_trans_grph_c; | |
| 1432 | + uint32_t disp_lin_trans_grph_d, disp_lin_trans_grph_e, disp_lin_trans_grph_f; | |
| 1433 | + uint32_t tmp, crtc2_h_total_disp, crtc2_v_total_disp; | |
| 1434 | + uint32_t crtc2_h_sync_strt_wid, crtc2_v_sync_strt_wid; | |
| 1435 | + bool found = false; | |
| 1436 | + int i; | |
| 1437 | + | |
| 1438 | + /* save the regs we need */ | |
| 1439 | + gpio_monid = RREG32(RADEON_GPIO_MONID); | |
| 1440 | + fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL); | |
| 1441 | + disp_output_cntl = RREG32(RADEON_DISP_OUTPUT_CNTL); | |
| 1442 | + crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL); | |
| 1443 | + disp_lin_trans_grph_a = RREG32(RADEON_DISP_LIN_TRANS_GRPH_A); | |
| 1444 | + disp_lin_trans_grph_b = RREG32(RADEON_DISP_LIN_TRANS_GRPH_B); | |
| 1445 | + disp_lin_trans_grph_c = RREG32(RADEON_DISP_LIN_TRANS_GRPH_C); | |
| 1446 | + disp_lin_trans_grph_d = RREG32(RADEON_DISP_LIN_TRANS_GRPH_D); | |
| 1447 | + disp_lin_trans_grph_e = RREG32(RADEON_DISP_LIN_TRANS_GRPH_E); | |
| 1448 | + disp_lin_trans_grph_f = RREG32(RADEON_DISP_LIN_TRANS_GRPH_F); | |
| 1449 | + crtc2_h_total_disp = RREG32(RADEON_CRTC2_H_TOTAL_DISP); | |
| 1450 | + crtc2_v_total_disp = RREG32(RADEON_CRTC2_V_TOTAL_DISP); | |
| 1451 | + crtc2_h_sync_strt_wid = RREG32(RADEON_CRTC2_H_SYNC_STRT_WID); | |
| 1452 | + crtc2_v_sync_strt_wid = RREG32(RADEON_CRTC2_V_SYNC_STRT_WID); | |
| 1453 | + | |
| 1454 | + tmp = RREG32(RADEON_GPIO_MONID); | |
| 1455 | + tmp &= ~RADEON_GPIO_A_0; | |
| 1456 | + WREG32(RADEON_GPIO_MONID, tmp); | |
| 1457 | + | |
| 1458 | + WREG32(RADEON_FP2_GEN_CNTL, (RADEON_FP2_ON | | |
| 1459 | + RADEON_FP2_PANEL_FORMAT | | |
| 1460 | + R200_FP2_SOURCE_SEL_TRANS_UNIT | | |
| 1461 | + RADEON_FP2_DVO_EN | | |
| 1462 | + R200_FP2_DVO_RATE_SEL_SDR)); | |
| 1463 | + | |
| 1464 | + WREG32(RADEON_DISP_OUTPUT_CNTL, (RADEON_DISP_DAC_SOURCE_RMX | | |
| 1465 | + RADEON_DISP_TRANS_MATRIX_GRAPHICS)); | |
| 1466 | + | |
| 1467 | + WREG32(RADEON_CRTC2_GEN_CNTL, (RADEON_CRTC2_EN | | |
| 1468 | + RADEON_CRTC2_DISP_REQ_EN_B)); | |
| 1469 | + | |
| 1470 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_A, 0x00000000); | |
| 1471 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_B, 0x000003f0); | |
| 1472 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_C, 0x00000000); | |
| 1473 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_D, 0x000003f0); | |
| 1474 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_E, 0x00000000); | |
| 1475 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_F, 0x000003f0); | |
| 1476 | + | |
| 1477 | + WREG32(RADEON_CRTC2_H_TOTAL_DISP, 0x01000008); | |
| 1478 | + WREG32(RADEON_CRTC2_H_SYNC_STRT_WID, 0x00000800); | |
| 1479 | + WREG32(RADEON_CRTC2_V_TOTAL_DISP, 0x00080001); | |
| 1480 | + WREG32(RADEON_CRTC2_V_SYNC_STRT_WID, 0x00000080); | |
| 1481 | + | |
| 1482 | + for (i = 0; i < 200; i++) { | |
| 1483 | + tmp = RREG32(RADEON_GPIO_MONID); | |
| 1484 | + if (tmp & RADEON_GPIO_Y_0) | |
| 1485 | + found = true; | |
| 1486 | + | |
| 1487 | + if (found) | |
| 1488 | + break; | |
| 1489 | + | |
| 1490 | + if (!drm_can_sleep()) | |
| 1491 | + mdelay(1); | |
| 1492 | + else | |
| 1493 | + msleep(1); | |
| 1494 | + } | |
| 1495 | + | |
| 1496 | + /* restore the regs we used */ | |
| 1497 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_A, disp_lin_trans_grph_a); | |
| 1498 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_B, disp_lin_trans_grph_b); | |
| 1499 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_C, disp_lin_trans_grph_c); | |
| 1500 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_D, disp_lin_trans_grph_d); | |
| 1501 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_E, disp_lin_trans_grph_e); | |
| 1502 | + WREG32(RADEON_DISP_LIN_TRANS_GRPH_F, disp_lin_trans_grph_f); | |
| 1503 | + WREG32(RADEON_CRTC2_H_TOTAL_DISP, crtc2_h_total_disp); | |
| 1504 | + WREG32(RADEON_CRTC2_V_TOTAL_DISP, crtc2_v_total_disp); | |
| 1505 | + WREG32(RADEON_CRTC2_H_SYNC_STRT_WID, crtc2_h_sync_strt_wid); | |
| 1506 | + WREG32(RADEON_CRTC2_V_SYNC_STRT_WID, crtc2_v_sync_strt_wid); | |
| 1507 | + WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); | |
| 1508 | + WREG32(RADEON_DISP_OUTPUT_CNTL, disp_output_cntl); | |
| 1509 | + WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); | |
| 1510 | + WREG32(RADEON_GPIO_MONID, gpio_monid); | |
| 1511 | + | |
| 1512 | + return found; | |
| 1513 | +} | |
| 1514 | + | |
| 1419 | 1515 | static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder *encoder, |
| 1420 | 1516 | struct drm_connector *connector) |
| 1421 | 1517 | { |
| 1422 | 1518 | struct drm_device *dev = encoder->dev; |
| 1423 | 1519 | struct radeon_device *rdev = dev->dev_private; |
| 1424 | − uint32_t crtc2_gen_cntl, tv_dac_cntl, dac_cntl2, dac_ext_cntl; | |
| 1425 | − uint32_t disp_hw_debug, disp_output_cntl, gpiopad_a, pixclks_cntl, tmp; | |
| 1520 | + uint32_t crtc2_gen_cntl = 0, tv_dac_cntl, dac_cntl2, dac_ext_cntl; | |
| 1521 | + uint32_t gpiopad_a = 0, pixclks_cntl, tmp; | |
| 1522 | + uint32_t disp_output_cntl = 0, disp_hw_debug = 0, crtc_ext_cntl = 0; | |
| 1426 | 1523 | enum drm_connector_status found = connector_status_disconnected; |
| 1427 | 1524 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 1428 | 1525 | struct radeon_encoder_tv_dac *tv_dac = radeon_encoder->enc_priv; |
| @@ -1459,12 +1556,27 @@ static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder · 30 unmodified lines | ||
| 1459 | 1556 | return connector_status_disconnected; |
| 1460 | 1557 | } |
| 1461 | 1558 | |
| 1559 | + /* R200 uses an external DAC for secondary DAC */ | |
| 1560 | + if (rdev->family == CHIP_R200) { | |
| 1561 | + if (radeon_legacy_ext_dac_detect(encoder, connector)) | |
| 1562 | + found = connector_status_connected; | |
| 1563 | + return found; | |
| 1564 | + } | |
| 1565 | + | |
| 1462 | 1566 | /* save the regs we need */ |
| 1463 | 1567 | pixclks_cntl = RREG32_PLL(RADEON_PIXCLKS_CNTL); |
| 1464 | − gpiopad_a = ASIC_IS_R300(rdev) ? RREG32(RADEON_GPIOPAD_A) : 0; | |
| 1465 | − disp_output_cntl = ASIC_IS_R300(rdev) ? RREG32(RADEON_DISP_OUTPUT_CNTL) : 0; | |
| 1466 | − disp_hw_debug = ASIC_IS_R300(rdev) ? 0 : RREG32(RADEON_DISP_HW_DEBUG); | |
| 1467 | − crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL); | |
| 1568 | + | |
| 1569 | + if (rdev->flags & RADEON_SINGLE_CRTC) { | |
| 1570 | + crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); | |
| 1571 | + } else { | |
| 1572 | + if (ASIC_IS_R300(rdev)) { | |
| 1573 | + gpiopad_a = RREG32(RADEON_GPIOPAD_A); | |
| 1574 | + disp_output_cntl = RREG32(RADEON_DISP_OUTPUT_CNTL); | |
| 1575 | + } else { | |
| 1576 | + disp_hw_debug = RREG32(RADEON_DISP_HW_DEBUG); | |
| 1577 | + } | |
| 1578 | + crtc2_gen_cntl = RREG32(RADEON_CRTC2_GEN_CNTL); | |
| 1579 | + } | |
| 1468 | 1580 | tv_dac_cntl = RREG32(RADEON_TV_DAC_CNTL); |
| 1469 | 1581 | dac_ext_cntl = RREG32(RADEON_DAC_EXT_CNTL); |
| 1470 | 1582 | dac_cntl2 = RREG32(RADEON_DAC_CNTL2); |
| @@ -1473,22 +1585,24 @@ static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder · 2 unmodified lines | ||
| 1473 | 1585 | | RADEON_PIX2CLK_DAC_ALWAYS_ONb); |
| 1474 | 1586 | WREG32_PLL(RADEON_PIXCLKS_CNTL, tmp); |
| 1475 | 1587 | |
| 1476 | − if (ASIC_IS_R300(rdev)) | |
| 1477 | − WREG32_P(RADEON_GPIOPAD_A, 1, ~1); | |
| 1478 | − | |
| 1479 | − tmp = crtc2_gen_cntl & ~RADEON_CRTC2_PIX_WIDTH_MASK; | |
| 1480 | − tmp |= RADEON_CRTC2_CRT2_ON | | |
| 1481 | − (2 << RADEON_CRTC2_PIX_WIDTH_SHIFT); | |
| 1482 | − | |
| 1483 | − WREG32(RADEON_CRTC2_GEN_CNTL, tmp); | |
| 1484 | − | |
| 1485 | − if (ASIC_IS_R300(rdev)) { | |
| 1486 | − tmp = disp_output_cntl & ~RADEON_DISP_TVDAC_SOURCE_MASK; | |
| 1487 | − tmp |= RADEON_DISP_TVDAC_SOURCE_CRTC2; | |
| 1488 | − WREG32(RADEON_DISP_OUTPUT_CNTL, tmp); | |
| 1588 | + if (rdev->flags & RADEON_SINGLE_CRTC) { | |
| 1589 | + tmp = crtc_ext_cntl | RADEON_CRTC_CRT_ON; | |
| 1590 | + WREG32(RADEON_CRTC_EXT_CNTL, tmp); | |
| 1489 | 1591 | } else { |
| 1490 | − tmp = disp_hw_debug & ~RADEON_CRT2_DISP1_SEL; | |
| 1491 | − WREG32(RADEON_DISP_HW_DEBUG, tmp); | |
| 1592 | + tmp = crtc2_gen_cntl & ~RADEON_CRTC2_PIX_WIDTH_MASK; | |
| 1593 | + tmp |= RADEON_CRTC2_CRT2_ON | | |
| 1594 | + (2 << RADEON_CRTC2_PIX_WIDTH_SHIFT); | |
| 1595 | + WREG32(RADEON_CRTC2_GEN_CNTL, tmp); | |
| 1596 | + | |
| 1597 | + if (ASIC_IS_R300(rdev)) { | |
| 1598 | + WREG32_P(RADEON_GPIOPAD_A, 1, ~1); | |
| 1599 | + tmp = disp_output_cntl & ~RADEON_DISP_TVDAC_SOURCE_MASK; | |
| 1600 | + tmp |= RADEON_DISP_TVDAC_SOURCE_CRTC2; | |
| 1601 | + WREG32(RADEON_DISP_OUTPUT_CNTL, tmp); | |
| 1602 | + } else { | |
| 1603 | + tmp = disp_hw_debug & ~RADEON_CRT2_DISP1_SEL; | |
| 1604 | + WREG32(RADEON_DISP_HW_DEBUG, tmp); | |
| 1605 | + } | |
| 1492 | 1606 | } |
| 1493 | 1607 | |
| 1494 | 1608 | tmp = RADEON_TV_DAC_NBLANK | |
| @@ -1530,14 +1644,19 @@ static enum drm_connector_status radeon_legacy_tv_dac_detect(struct drm_encoder · 35 unmodified lines | ||
| 1530 | 1644 | WREG32(RADEON_DAC_CNTL2, dac_cntl2); |
| 1531 | 1645 | WREG32(RADEON_DAC_EXT_CNTL, dac_ext_cntl); |
| 1532 | 1646 | WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl); |
| 1533 | − WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); | |
| 1534 | 1647 | |
| 1535 | − if (ASIC_IS_R300(rdev)) { | |
| 1536 | − WREG32(RADEON_DISP_OUTPUT_CNTL, disp_output_cntl); | |
| 1537 | − WREG32_P(RADEON_GPIOPAD_A, gpiopad_a, ~1); | |
| 1648 | + if (rdev->flags & RADEON_SINGLE_CRTC) { | |
| 1649 | + WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl); | |
| 1538 | 1650 | } else { |
| 1539 | − WREG32(RADEON_DISP_HW_DEBUG, disp_hw_debug); | |
| 1651 | + WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl); | |
| 1652 | + if (ASIC_IS_R300(rdev)) { | |
| 1653 | + WREG32(RADEON_DISP_OUTPUT_CNTL, disp_output_cntl); | |
| 1654 | + WREG32_P(RADEON_GPIOPAD_A, gpiopad_a, ~1); | |
| 1655 | + } else { | |
| 1656 | + WREG32(RADEON_DISP_HW_DEBUG, disp_hw_debug); | |
| 1657 | + } | |
| 1540 | 1658 | } |
| 1659 | + | |
| 1541 | 1660 | WREG32_PLL(RADEON_PIXCLKS_CNTL, pixclks_cntl); |
| 1542 | 1661 | |
| 1543 | 1662 | return found; |
| @@ -2474,6 +2474,7 @@ static bool si_vm_reg_valid(u32 reg) · 2473 unmodified lines | ||
| 2474 | 2474 | /* check config regs */ |
| 2475 | 2475 | switch (reg) { |
| 2476 | 2476 | case GRBM_GFX_INDEX: |
| 2477 | + case CP_STRMOUT_CNTL: | |
| 2477 | 2478 | case VGT_VTX_VECT_EJECT_REG: |
| 2478 | 2479 | case VGT_CACHE_INVALIDATION: |
| 2479 | 2480 | case VGT_ESGS_RING_SIZE: |
| @@ -424,6 +424,7 @@ · 423 unmodified lines | ||
| 424 | 424 | # define RDERR_INT_ENABLE (1 << 0) |
| 425 | 425 | # define GUI_IDLE_INT_ENABLE (1 << 19) |
| 426 | 426 | |
| 427 | +#define CP_STRMOUT_CNTL 0x84FC | |
| 427 | 428 | #define SCRATCH_REG0 0x8500 |
| 428 | 429 | #define SCRATCH_REG1 0x8504 |
| 429 | 430 | #define SCRATCH_REG2 0x8508 |
| @@ -104,7 +104,7 @@ udl_fb_user_fb_create(struct drm_device *dev, · 103 unmodified lines | ||
| 104 | 104 | |
| 105 | 105 | int udl_render_hline(struct drm_device *dev, int bpp, struct urb **urb_ptr, |
| 106 | 106 | const char *front, char **urb_buf_ptr, |
| 107 | − u32 byte_offset, u32 byte_width, | |
| 107 | + u32 byte_offset, u32 device_byte_offset, u32 byte_width, | |
| 108 | 108 | int *ident_ptr, int *sent_ptr); |
| 109 | 109 | |
| 110 | 110 | int udl_dumb_create(struct drm_file *file_priv, |
| @@ -114,9 +114,10 @@ static void udlfb_dpy_deferred_io(struct fb_info *info, · 113 unmodified lines | ||
| 114 | 114 | list_for_each_entry(cur, &fbdefio->pagelist, lru) { |
| 115 | 115 | |
| 116 | 116 | if (udl_render_hline(dev, (ufbdev->ufb.base.bits_per_pixel / 8), |
| 117 | − &urb, (char *) info->fix.smem_start, | |
| 118 | − &cmd, cur->index << PAGE_SHIFT, | |
| 119 | − PAGE_SIZE, &bytes_identical, &bytes_sent)) | |
| 117 | + &urb, (char *) info->fix.smem_start, | |
| 118 | + &cmd, cur->index << PAGE_SHIFT, | |
| 119 | + cur->index << PAGE_SHIFT, | |
| 120 | + PAGE_SIZE, &bytes_identical, &bytes_sent)) | |
| 120 | 121 | goto error; |
| 121 | 122 | bytes_rendered += PAGE_SIZE; |
| 122 | 123 | } |
| @@ -187,10 +188,11 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, · 64 unmodified lines | ||
| 187 | 188 | for (i = y; i < y + height ; i++) { |
| 188 | 189 | const int line_offset = fb->base.pitches[0] * i; |
| 189 | 190 | const int byte_offset = line_offset + (x * bpp); |
| 190 | − | |
| 191 | + const int dev_byte_offset = (fb->base.width * bpp * i) + (x * bpp); | |
| 191 | 192 | if (udl_render_hline(dev, bpp, &urb, |
| 192 | 193 | (char *) fb->obj->vmapping, |
| 193 | − &cmd, byte_offset, width * bpp, | |
| 194 | + &cmd, byte_offset, dev_byte_offset, | |
| 195 | + width * bpp, | |
| 194 | 196 | &bytes_identical, &bytes_sent)) |
| 195 | 197 | goto error; |
| 196 | 198 | } |
| @@ -213,11 +213,12 @@ static void udl_compress_hline16( · 212 unmodified lines | ||
| 213 | 213 | */ |
| 214 | 214 | int udl_render_hline(struct drm_device *dev, int bpp, struct urb **urb_ptr, |
| 215 | 215 | const char *front, char **urb_buf_ptr, |
| 216 | − u32 byte_offset, u32 byte_width, | |
| 216 | + u32 byte_offset, u32 device_byte_offset, | |
| 217 | + u32 byte_width, | |
| 217 | 218 | int *ident_ptr, int *sent_ptr) |
| 218 | 219 | { |
| 219 | 220 | const u8 *line_start, *line_end, *next_pixel; |
| 220 | − u32 base16 = 0 + (byte_offset / bpp) * 2; | |
| 221 | + u32 base16 = 0 + (device_byte_offset / bpp) * 2; | |
| 221 | 222 | struct urb *urb = *urb_ptr; |
| 222 | 223 | u8 *cmd = *urb_buf_ptr; |
| 223 | 224 | u8 *cmd_end = (u8 *) urb->transfer_buffer + urb->transfer_buffer_length; |
| @@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin) · 305 unmodified lines | ||
| 306 | 306 | |
| 307 | 307 | BUG_ON(!atomic_read(&bo->reserved)); |
| 308 | 308 | BUG_ON(old_mem_type != TTM_PL_VRAM && |
| 309 | − old_mem_type != VMW_PL_FLAG_GMR); | |
| 309 | + old_mem_type != VMW_PL_GMR); | |
| 310 | 310 | |
| 311 | 311 | pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED; |
| 312 | 312 | if (pin) |
| @@ -1098,6 +1098,11 @@ static void vmw_pm_complete(struct device *kdev) · 1097 unmodified lines | ||
| 1098 | 1098 | struct drm_device *dev = pci_get_drvdata(pdev); |
| 1099 | 1099 | struct vmw_private *dev_priv = vmw_priv(dev); |
| 1100 | 1100 | |
| 1101 | + mutex_lock(&dev_priv->hw_mutex); | |
| 1102 | + vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2); | |
| 1103 | + (void) vmw_read(dev_priv, SVGA_REG_ID); | |
| 1104 | + mutex_unlock(&dev_priv->hw_mutex); | |
| 1105 | + | |
| 1101 | 1106 | /** |
| 1102 | 1107 | * Reclaim 3d reference held by fbdev and potentially |
| 1103 | 1108 | * start fifo. |
| @@ -522,6 +522,12 @@ static const struct hid_device_id apple_devices[] = { · 521 unmodified lines | ||
| 522 | 522 | .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, |
| 523 | 523 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), |
| 524 | 524 | .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, |
| 525 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI), | |
| 526 | + .driver_data = APPLE_HAS_FN }, | |
| 527 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO), | |
| 528 | + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD }, | |
| 529 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), | |
| 530 | + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS }, | |
| 525 | 531 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI), |
| 526 | 532 | .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, |
| 527 | 533 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO), |
| @@ -1532,6 +1532,9 @@ static const struct hid_device_id hid_have_special_driver[] = { · 1531 unmodified lines | ||
| 1532 | 1532 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) }, |
| 1533 | 1533 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) }, |
| 1534 | 1534 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) }, |
| 1535 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI) }, | |
| 1536 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO) }, | |
| 1537 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS) }, | |
| 1535 | 1538 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) }, |
| 1536 | 1539 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) }, |
| 1537 | 1540 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) }, |
| @@ -2139,6 +2142,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { · 601 unmodified lines | ||
| 2139 | 2142 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI) }, |
| 2140 | 2143 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_ISO) }, |
| 2141 | 2144 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7_JIS) }, |
| 2145 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI) }, | |
| 2146 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO) }, | |
| 2147 | + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS) }, | |
| 2142 | 2148 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) }, |
| 2143 | 2149 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, |
| 2144 | 2150 | { } |
| @@ -118,6 +118,9 @@ · 117 unmodified lines | ||
| 118 | 118 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI 0x0252 |
| 119 | 119 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO 0x0253 |
| 120 | 120 | #define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS 0x0254 |
| 121 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259 | |
| 122 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a | |
| 123 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b | |
| 121 | 124 | #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI 0x0249 |
| 122 | 125 | #define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO 0x024a |
| 123 | 126 | #define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS 0x024b |
| @@ -28,22 +28,30 @@ · 27 unmodified lines | ||
| 28 | 28 | #define MS_RDESC 0x08 |
| 29 | 29 | #define MS_NOGET 0x10 |
| 30 | 30 | #define MS_DUPLICATE_USAGES 0x20 |
| 31 | +#define MS_RDESC_3K 0x40 | |
| 31 | 32 | |
| 32 | −/* | |
| 33 | − * Microsoft Wireless Desktop Receiver (Model 1028) has | |
| 34 | − * 'Usage Min/Max' where it ought to have 'Physical Min/Max' | |
| 35 | − */ | |
| 36 | 33 | static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc, |
| 37 | 34 | unsigned int *rsize) |
| 38 | 35 | { |
| 39 | 36 | unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); |
| 40 | 37 | |
| 38 | + /* | |
| 39 | + * Microsoft Wireless Desktop Receiver (Model 1028) has | |
| 40 | + * 'Usage Min/Max' where it ought to have 'Physical Min/Max' | |
| 41 | + */ | |
| 41 | 42 | if ((quirks & MS_RDESC) && *rsize == 571 && rdesc[557] == 0x19 && |
| 42 | 43 | rdesc[559] == 0x29) { |
| 43 | 44 | hid_info(hdev, "fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n"); |
| 44 | 45 | rdesc[557] = 0x35; |
| 45 | 46 | rdesc[559] = 0x45; |
| 46 | 47 | } |
| 48 | + /* the same as above (s/usage/physical/) */ | |
| 49 | + if ((quirks & MS_RDESC_3K) && *rsize == 106 && | |
| 50 | + !memcmp((char []){ 0x19, 0x00, 0x29, 0xff }, | |
| 51 | + &rdesc[94], 4)) { | |
| 52 | + rdesc[94] = 0x35; | |
| 53 | + rdesc[96] = 0x45; | |
| 54 | + } | |
| 47 | 55 | return rdesc; |
| 48 | 56 | } |
| 49 | 57 | |
| @@ -192,7 +200,7 @@ static const struct hid_device_id ms_devices[] = { · 142 unmodified lines | ||
| 192 | 200 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), |
| 193 | 201 | .driver_data = MS_PRESENTER }, |
| 194 | 202 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K), |
| 195 | − .driver_data = MS_ERGONOMY }, | |
| 203 | + .driver_data = MS_ERGONOMY | MS_RDESC_3K }, | |
| 196 | 204 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), |
| 197 | 205 | .driver_data = MS_NOGET }, |
| 198 | 206 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), |
| @@ -210,8 +210,7 @@ static struct mt_class mt_classes[] = { · 209 unmodified lines | ||
| 210 | 210 | }, |
| 211 | 211 | { .name = MT_CLS_GENERALTOUCH_PWT_TENFINGERS, |
| 212 | 212 | .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP | |
| 213 | − MT_QUIRK_SLOT_IS_CONTACTNUMBER, | |
| 214 | − .maxcontacts = 10 | |
| 213 | + MT_QUIRK_SLOT_IS_CONTACTNUMBER | |
| 215 | 214 | }, |
| 216 | 215 | |
| 217 | 216 | { .name = MT_CLS_FLATFROG, |
| @@ -421,11 +420,11 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, · 203 unmodified lines | ||
| 421 | 420 | * contact max are global to the report */ |
| 422 | 421 | td->last_field_index = field->index; |
| 423 | 422 | return -1; |
| 424 | − } | |
| 425 | 423 | case HID_DG_TOUCH: |
| 426 | 424 | /* Legacy devices use TIPSWITCH and not TOUCH. |
| 427 | 425 | * Let's just ignore this field. */ |
| 428 | 426 | return -1; |
| 427 | + } | |
| 429 | 428 | /* let hid-input decide for the others */ |
| 430 | 429 | return 0; |
| 431 | 430 | |
| @@ -42,7 +42,6 @@ static struct cdev hidraw_cdev; · 41 unmodified lines | ||
| 42 | 42 | static struct class *hidraw_class; |
| 43 | 43 | static struct hidraw *hidraw_table[HIDRAW_MAX_DEVICES]; |
| 44 | 44 | static DEFINE_MUTEX(minors_lock); |
| 45 | −static void drop_ref(struct hidraw *hid, int exists_bit); | |
| 46 | 45 | |
| 47 | 46 | static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos) |
| 48 | 47 | { |
| @@ -114,7 +113,7 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer, · 65 unmodified lines | ||
| 114 | 113 | __u8 *buf; |
| 115 | 114 | int ret = 0; |
| 116 | 115 | |
| 117 | − if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { | |
| 116 | + if (!hidraw_table[minor]) { | |
| 118 | 117 | ret = -ENODEV; |
| 119 | 118 | goto out; |
| 120 | 119 | } |
| @@ -262,7 +261,7 @@ static int hidraw_open(struct inode *inode, struct file *file) · 141 unmodified lines | ||
| 262 | 261 | } |
| 263 | 262 | |
| 264 | 263 | mutex_lock(&minors_lock); |
| 265 | − if (!hidraw_table[minor] || !hidraw_table[minor]->exist) { | |
| 264 | + if (!hidraw_table[minor]) { | |
| 266 | 265 | err = -ENODEV; |
| 267 | 266 | goto out_unlock; |
| 268 | 267 | } |
| @@ -299,12 +298,36 @@ out: · 30 unmodified lines | ||
| 299 | 298 | static int hidraw_release(struct inode * inode, struct file * file) |
| 300 | 299 | { |
| 301 | 300 | unsigned int minor = iminor(inode); |
| 301 | + struct hidraw *dev; | |
| 302 | 302 | struct hidraw_list *list = file->private_data; |
| 303 | + int ret; | |
| 304 | + int i; | |
| 305 | + | |
| 306 | + mutex_lock(&minors_lock); | |
| 307 | + if (!hidraw_table[minor]) { | |
| 308 | + ret = -ENODEV; | |
| 309 | + goto unlock; | |
| 310 | + } | |
| 303 | 311 | |
| 304 | − drop_ref(hidraw_table[minor], 0); | |
| 305 | 312 | list_del(&list->node); |
| 313 | + dev = hidraw_table[minor]; | |
| 314 | + if (!--dev->open) { | |
| 315 | + if (list->hidraw->exist) { | |
| 316 | + hid_hw_power(dev->hid, PM_HINT_NORMAL); | |
| 317 | + hid_hw_close(dev->hid); | |
| 318 | + } else { | |
| 319 | + kfree(list->hidraw); | |
| 320 | + } | |
| 321 | + } | |
| 322 | + | |
| 323 | + for (i = 0; i < HIDRAW_BUFFER_SIZE; ++i) | |
| 324 | + kfree(list->buffer[i].value); | |
| 306 | 325 | kfree(list); |
| 307 | − return 0; | |
| 326 | + ret = 0; | |
| 327 | +unlock: | |
| 328 | + mutex_unlock(&minors_lock); | |
| 329 | + | |
| 330 | + return ret; | |
| 308 | 331 | } |
| 309 | 332 | |
| 310 | 333 | static long hidraw_ioctl(struct file *file, unsigned int cmd, |
| @@ -506,7 +529,21 @@ EXPORT_SYMBOL_GPL(hidraw_connect); · 195 unmodified lines | ||
| 506 | 529 | void hidraw_disconnect(struct hid_device *hid) |
| 507 | 530 | { |
| 508 | 531 | struct hidraw *hidraw = hid->hidraw; |
| 509 | − drop_ref(hidraw, 1); | |
| 532 | + | |
| 533 | + mutex_lock(&minors_lock); | |
| 534 | + hidraw->exist = 0; | |
| 535 | + | |
| 536 | + device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); | |
| 537 | + | |
| 538 | + hidraw_table[hidraw->minor] = NULL; | |
| 539 | + | |
| 540 | + if (hidraw->open) { | |
| 541 | + hid_hw_close(hid); | |
| 542 | + wake_up_interruptible(&hidraw->wait); | |
| 543 | + } else { | |
| 544 | + kfree(hidraw); | |
| 545 | + } | |
| 546 | + mutex_unlock(&minors_lock); | |
| 510 | 547 | } |
| 511 | 548 | EXPORT_SYMBOL_GPL(hidraw_disconnect); |
| 512 | 549 | |
| @@ -555,23 +592,3 @@ void hidraw_exit(void) · 42 unmodified lines | ||
| 555 | 592 | unregister_chrdev_region(dev_id, HIDRAW_MAX_DEVICES); |
| 556 | 593 | |
| 557 | 594 | } |
| 558 | − | |
| 559 | −static void drop_ref(struct hidraw *hidraw, int exists_bit) | |
| 560 | −{ | |
| 561 | − mutex_lock(&minors_lock); | |
| 562 | − if (exists_bit) { | |
| 563 | − hid_hw_close(hidraw->hid); | |
| 564 | − hidraw->exist = 0; | |
| 565 | − if (hidraw->open) | |
| 566 | − wake_up_interruptible(&hidraw->wait); | |
| 567 | − } else { | |
| 568 | − --hidraw->open; | |
| 569 | − } | |
| 570 | − | |
| 571 | − if (!hidraw->open && !hidraw->exist) { | |
| 572 | − device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); | |
| 573 | − hidraw_table[hidraw->minor] = NULL; | |
| 574 | − kfree(hidraw); | |
| 575 | − } | |
| 576 | − mutex_unlock(&minors_lock); | |
| 577 | −} | |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | * ASB100-A supports pwm1, while plain ASB100 does not. There is no known |
| 33 | 33 | * way for the driver to tell which one is there. |
| 34 | 34 | * |
| 35 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 35 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 36 | 36 | * asb100 7 3 1 4 0x31 0x0694 yes no |
| 37 | 37 | */ |
| 38 | 38 | |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | * fam15h_power.c - AMD Family 15h processor power monitoring |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2011 Advanced Micro Devices, Inc. |
| 5 | − * Author: Andreas Herrmann <andreas.herrmann3@amd.com> | |
| 5 | + * Author: Andreas Herrmann <herrmann.der.user@googlemail.com> | |
| 6 | 6 | * |
| 7 | 7 | * |
| 8 | 8 | * This driver is free software; you can redistribute it and/or |
| @@ -28,7 +28,7 @@ · 19 unmodified lines | ||
| 28 | 28 | #include <asm/processor.h> |
| 29 | 29 | |
| 30 | 30 | MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor"); |
| 31 | −MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>"); | |
| 31 | +MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>"); | |
| 32 | 32 | MODULE_LICENSE("GPL"); |
| 33 | 33 | |
| 34 | 34 | /* D18F3 */ |
| @@ -630,7 +630,9 @@ static struct platform_driver gpio_fan_driver = { · 629 unmodified lines | ||
| 630 | 630 | .driver = { |
| 631 | 631 | .name = "gpio-fan", |
| 632 | 632 | .pm = GPIO_FAN_PM, |
| 633 | +#ifdef CONFIG_OF_GPIO | |
| 633 | 634 | .of_match_table = of_match_ptr(of_gpio_fan_match), |
| 635 | +#endif | |
| 634 | 636 | }, |
| 635 | 637 | }; |
| 636 | 638 | |
| @@ -2083,6 +2083,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) · 2082 unmodified lines | ||
| 2083 | 2083 | mutex_init(&data->lock); |
| 2084 | 2084 | mutex_init(&data->update_lock); |
| 2085 | 2085 | data->name = w83627ehf_device_names[sio_data->kind]; |
| 2086 | + data->bank = 0xff; /* Force initial bank selection */ | |
| 2086 | 2087 | platform_set_drvdata(pdev, data); |
| 2087 | 2088 | |
| 2088 | 2089 | /* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */ |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | /* |
| 26 | 26 | * Supports following chips: |
| 27 | 27 | * |
| 28 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 28 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 29 | 29 | * w83627hf 9 3 2 3 0x20 0x5ca3 no yes(LPC) |
| 30 | 30 | * w83627thf 7 3 3 3 0x90 0x5ca3 no yes(LPC) |
| 31 | 31 | * w83637hf 7 3 3 3 0x80 0x5ca3 no yes(LPC) |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | /* |
| 25 | 25 | * Supports following chips: |
| 26 | 26 | * |
| 27 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 27 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 28 | 28 | * as99127f 7 3 0 3 0x31 0x12c3 yes no |
| 29 | 29 | * as99127f rev.2 (type_name = as99127f) 0x31 0x5ca3 yes no |
| 30 | 30 | * w83781d 7 3 0 3 0x10-1 0x5ca3 yes yes |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | /* |
| 23 | 23 | * Supports following chips: |
| 24 | 24 | * |
| 25 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 25 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 26 | 26 | * w83791d 10 5 5 3 0x71 0x5ca3 yes no |
| 27 | 27 | * |
| 28 | 28 | * The w83791d chip appears to be part way between the 83781d and the |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | /* |
| 32 | 32 | * Supports following chips: |
| 33 | 33 | * |
| 34 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 34 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 35 | 35 | * w83792d 9 7 7 3 0x7a 0x5ca3 yes no |
| 36 | 36 | */ |
| 37 | 37 | |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | /* |
| 21 | 21 | * Supports following chips: |
| 22 | 22 | * |
| 23 | − * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 23 | + * Chip #vin #fanin #pwm #temp wchipid vendid i2c ISA | |
| 24 | 24 | * w83l786ng 3 2 2 2 0x7b 0x5ca3 yes no |
| 25 | 25 | */ |
| 26 | 26 | |
| @@ -8,6 +8,7 @@ obj-$(CONFIG_I2C_SMBUS) += i2c-smbus.o · 7 unmodified lines | ||
| 8 | 8 | obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o |
| 9 | 9 | obj-$(CONFIG_I2C_MUX) += i2c-mux.o |
| 10 | 10 | obj-y += algos/ busses/ muxes/ |
| 11 | +obj-$(CONFIG_I2C_STUB) += i2c-stub.o | |
| 11 | 12 | |
| 12 | 13 | ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG |
| 13 | 14 | CFLAGS_i2c-core.o := -Wno-deprecated-declarations |
| @@ -81,7 +81,6 @@ config I2C_I801 · 80 unmodified lines | ||
| 81 | 81 | tristate "Intel 82801 (ICH/PCH)" |
| 82 | 82 | depends on PCI |
| 83 | 83 | select CHECK_SIGNATURE if X86 && DMI |
| 84 | − select GPIOLIB if I2C_MUX | |
| 85 | 84 | help |
| 86 | 85 | If you say yes to this option, support will be included for the Intel |
| 87 | 86 | 801 family of mainboard I2C interfaces. Specifically, the following |
| @@ -85,7 +85,6 @@ obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o · 84 unmodified lines | ||
| 85 | 85 | obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o |
| 86 | 86 | obj-$(CONFIG_I2C_PCA_ISA) += i2c-pca-isa.o |
| 87 | 87 | obj-$(CONFIG_I2C_SIBYTE) += i2c-sibyte.o |
| 88 | −obj-$(CONFIG_I2C_STUB) += i2c-stub.o | |
| 89 | 88 | obj-$(CONFIG_SCx200_ACB) += scx200_acb.o |
| 90 | 89 | obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o |
| 91 | 90 | |
| @@ -82,7 +82,8 @@ · 81 unmodified lines | ||
| 82 | 82 | #include <linux/wait.h> |
| 83 | 83 | #include <linux/err.h> |
| 84 | 84 | |
| 85 | −#if defined CONFIG_I2C_MUX || defined CONFIG_I2C_MUX_MODULE | |
| 85 | +#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ | |
| 86 | + defined CONFIG_DMI | |
| 86 | 87 | #include <linux/gpio.h> |
| 87 | 88 | #include <linux/i2c-mux-gpio.h> |
| 88 | 89 | #include <linux/platform_device.h> |
| @@ -192,7 +193,8 @@ struct i801_priv { · 103 unmodified lines | ||
| 192 | 193 | int len; |
| 193 | 194 | u8 *data; |
| 194 | 195 | |
| 195 | −#if defined CONFIG_I2C_MUX || defined CONFIG_I2C_MUX_MODULE | |
| 196 | +#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ | |
| 197 | + defined CONFIG_DMI | |
| 196 | 198 | const struct i801_mux_config *mux_drvdata; |
| 197 | 199 | struct platform_device *mux_pdev; |
| 198 | 200 | #endif |
| @@ -921,7 +923,8 @@ static void __init input_apanel_init(void) {} · 722 unmodified lines | ||
| 921 | 923 | static void __devinit i801_probe_optional_slaves(struct i801_priv *priv) {} |
| 922 | 924 | #endif /* CONFIG_X86 && CONFIG_DMI */ |
| 923 | 925 | |
| 924 | −#if defined CONFIG_I2C_MUX || defined CONFIG_I2C_MUX_MODULE | |
| 926 | +#if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \ | |
| 927 | + defined CONFIG_DMI | |
| 925 | 928 | static struct i801_mux_config i801_mux_config_asus_z8_d12 = { |
| 926 | 929 | .gpio_chip = "gpio_ich", |
| 927 | 930 | .values = { 0x02, 0x03 }, |
| @@ -1059,7 +1062,7 @@ static unsigned int __devinit i801_get_adapter_class(struct i801_priv *priv) · 131 unmodified lines | ||
| 1059 | 1062 | |
| 1060 | 1063 | id = dmi_first_match(mux_dmi_table); |
| 1061 | 1064 | if (id) { |
| 1062 | − /* Remove from branch classes from trunk */ | |
| 1065 | + /* Remove branch classes from trunk */ | |
| 1063 | 1066 | mux_config = id->driver_data; |
| 1064 | 1067 | for (i = 0; i < mux_config->n_values; i++) |
| 1065 | 1068 | class &= ~mux_config->classes[i]; |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | /* |
| 2 | 2 | * Freescale MXS I2C bus driver |
| 3 | 3 | * |
| 4 | − * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K. | |
| 4 | + * Copyright (C) 2011-2012 Wolfram Sang, Pengutronix e.K. | |
| 5 | 5 | * |
| 6 | 6 | * based on a (non-working) driver which was: |
| 7 | 7 | * |
| @@ -35,10 +35,6 @@ · 27 unmodified lines | ||
| 35 | 35 | |
| 36 | 36 | #define DRIVER_NAME "mxs-i2c" |
| 37 | 37 | |
| 38 | −static bool use_pioqueue; | |
| 39 | −module_param(use_pioqueue, bool, 0); | |
| 40 | −MODULE_PARM_DESC(use_pioqueue, "Use PIOQUEUE mode for transfer instead of DMA"); | |
| 41 | − | |
| 42 | 38 | #define MXS_I2C_CTRL0 (0x00) |
| 43 | 39 | #define MXS_I2C_CTRL0_SET (0x04) |
| 44 | 40 | |
| @@ -75,23 +71,6 @@ MODULE_PARM_DESC(use_pioqueue, "Use PIOQUEUE mode for transfer instead of DMA"); · 30 unmodified lines | ||
| 75 | 71 | MXS_I2C_CTRL1_SLAVE_STOP_IRQ | \ |
| 76 | 72 | MXS_I2C_CTRL1_SLAVE_IRQ) |
| 77 | 73 | |
| 78 | −#define MXS_I2C_QUEUECTRL (0x60) | |
| 79 | −#define MXS_I2C_QUEUECTRL_SET (0x64) | |
| 80 | −#define MXS_I2C_QUEUECTRL_CLR (0x68) | |
| 81 | − | |
| 82 | −#define MXS_I2C_QUEUECTRL_QUEUE_RUN 0x20 | |
| 83 | −#define MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE 0x04 | |
| 84 | − | |
| 85 | −#define MXS_I2C_QUEUESTAT (0x70) | |
| 86 | −#define MXS_I2C_QUEUESTAT_RD_QUEUE_EMPTY 0x00002000 | |
| 87 | −#define MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK 0x0000001F | |
| 88 | − | |
| 89 | −#define MXS_I2C_QUEUECMD (0x80) | |
| 90 | − | |
| 91 | −#define MXS_I2C_QUEUEDATA (0x90) | |
| 92 | − | |
| 93 | −#define MXS_I2C_DATA (0xa0) | |
| 94 | − | |
| 95 | 74 | |
| 96 | 75 | #define MXS_CMD_I2C_SELECT (MXS_I2C_CTRL0_RETAIN_CLOCK | \ |
| 97 | 76 | MXS_I2C_CTRL0_PRE_SEND_START | \ |
| @@ -153,7 +132,6 @@ struct mxs_i2c_dev { · 55 unmodified lines | ||
| 153 | 132 | const struct mxs_i2c_speed_config *speed; |
| 154 | 133 | |
| 155 | 134 | /* DMA support components */ |
| 156 | − bool dma_mode; | |
| 157 | 135 | int dma_channel; |
| 158 | 136 | struct dma_chan *dmach; |
| 159 | 137 | struct mxs_dma_data dma_data; |
| @@ -172,99 +150,6 @@ static void mxs_i2c_reset(struct mxs_i2c_dev *i2c) · 12 unmodified lines | ||
| 172 | 150 | writel(i2c->speed->timing2, i2c->regs + MXS_I2C_TIMING2); |
| 173 | 151 | |
| 174 | 152 | writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET); |
| 175 | − if (i2c->dma_mode) | |
| 176 | − writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE, | |
| 177 | − i2c->regs + MXS_I2C_QUEUECTRL_CLR); | |
| 178 | − else | |
| 179 | − writel(MXS_I2C_QUEUECTRL_PIO_QUEUE_MODE, | |
| 180 | − i2c->regs + MXS_I2C_QUEUECTRL_SET); | |
| 181 | −} | |
| 182 | − | |
| 183 | −static void mxs_i2c_pioq_setup_read(struct mxs_i2c_dev *i2c, u8 addr, int len, | |
| 184 | − int flags) | |
| 185 | −{ | |
| 186 | − u32 data; | |
| 187 | − | |
| 188 | − writel(MXS_CMD_I2C_SELECT, i2c->regs + MXS_I2C_QUEUECMD); | |
| 189 | − | |
| 190 | − data = (addr << 1) | I2C_SMBUS_READ; | |
| 191 | − writel(data, i2c->regs + MXS_I2C_DATA); | |
| 192 | − | |
| 193 | − data = MXS_CMD_I2C_READ | MXS_I2C_CTRL0_XFER_COUNT(len) | flags; | |
| 194 | − writel(data, i2c->regs + MXS_I2C_QUEUECMD); | |
| 195 | −} | |
| 196 | − | |
| 197 | −static void mxs_i2c_pioq_setup_write(struct mxs_i2c_dev *i2c, | |
| 198 | − u8 addr, u8 *buf, int len, int flags) | |
| 199 | −{ | |
| 200 | − u32 data; | |
| 201 | − int i, shifts_left; | |
| 202 | − | |
| 203 | − data = MXS_CMD_I2C_WRITE | MXS_I2C_CTRL0_XFER_COUNT(len + 1) | flags; | |
| 204 | − writel(data, i2c->regs + MXS_I2C_QUEUECMD); | |
| 205 | − | |
| 206 | − /* | |
| 207 | − * We have to copy the slave address (u8) and buffer (arbitrary number | |
| 208 | − * of u8) into the data register (u32). To achieve that, the u8 are put | |
| 209 | − * into the MSBs of 'data' which is then shifted for the next u8. When | |
| 210 | − * appropriate, 'data' is written to MXS_I2C_DATA. So, the first u32 | |
| 211 | − * looks like this: | |
| 212 | − * | |
| 213 | − * 3 2 1 0 | |
| 214 | − * 10987654|32109876|54321098|76543210 | |
| 215 | − * --------+--------+--------+-------- | |
| 216 | − * buffer+2|buffer+1|buffer+0|slave_addr | |
| 217 | − */ | |
| 218 | − | |
| 219 | − data = ((addr << 1) | I2C_SMBUS_WRITE) << 24; | |
| 220 | − | |
| 221 | − for (i = 0; i < len; i++) { | |
| 222 | − data >>= 8; | |
| 223 | − data |= buf[i] << 24; | |
| 224 | − if ((i & 3) == 2) | |
| 225 | − writel(data, i2c->regs + MXS_I2C_DATA); | |
| 226 | − } | |
| 227 | − | |
| 228 | − /* Write out the remaining bytes if any */ | |
| 229 | − shifts_left = 24 - (i & 3) * 8; | |
| 230 | − if (shifts_left) | |
| 231 | − writel(data >> shifts_left, i2c->regs + MXS_I2C_DATA); | |
| 232 | −} | |
| 233 | − | |
| 234 | −/* | |
| 235 | − * TODO: should be replaceable with a waitqueue and RD_QUEUE_IRQ (setting the | |
| 236 | − * rd_threshold to 1). Couldn't get this to work, though. | |
| 237 | − */ | |
| 238 | −static int mxs_i2c_wait_for_data(struct mxs_i2c_dev *i2c) | |
| 239 | −{ | |
| 240 | − unsigned long timeout = jiffies + msecs_to_jiffies(1000); | |
| 241 | − | |
| 242 | − while (readl(i2c->regs + MXS_I2C_QUEUESTAT) | |
| 243 | − & MXS_I2C_QUEUESTAT_RD_QUEUE_EMPTY) { | |
| 244 | − if (time_after(jiffies, timeout)) | |
| 245 | − return -ETIMEDOUT; | |
| 246 | − cond_resched(); | |
| 247 | − } | |
| 248 | − | |
| 249 | − return 0; | |
| 250 | −} | |
| 251 | − | |
| 252 | −static int mxs_i2c_finish_read(struct mxs_i2c_dev *i2c, u8 *buf, int len) | |
| 253 | −{ | |
| 254 | − u32 uninitialized_var(data); | |
| 255 | − int i; | |
| 256 | − | |
| 257 | − for (i = 0; i < len; i++) { | |
| 258 | − if ((i & 3) == 0) { | |
| 259 | − if (mxs_i2c_wait_for_data(i2c)) | |
| 260 | − return -ETIMEDOUT; | |
| 261 | − data = readl(i2c->regs + MXS_I2C_QUEUEDATA); | |
| 262 | − } | |
| 263 | − buf[i] = data & 0xff; | |
| 264 | − data >>= 8; | |
| 265 | − } | |
| 266 | − | |
| 267 | − return 0; | |
| 268 | 153 | } |
| 269 | 154 | |
| 270 | 155 | static void mxs_i2c_dma_finish(struct mxs_i2c_dev *i2c) |
| @@ -432,39 +317,17 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, · 161 unmodified lines | ||
| 432 | 317 | init_completion(&i2c->cmd_complete); |
| 433 | 318 | i2c->cmd_err = 0; |
| 434 | 319 | |
| 435 | − if (i2c->dma_mode) { | |
| 436 | − ret = mxs_i2c_dma_setup_xfer(adap, msg, flags); | |
| 437 | − if (ret) | |
| 438 | − return ret; | |
| 439 | − } else { | |
| 440 | − if (msg->flags & I2C_M_RD) { | |
| 441 | − mxs_i2c_pioq_setup_read(i2c, msg->addr, | |
| 442 | − msg->len, flags); | |
| 443 | − } else { | |
| 444 | − mxs_i2c_pioq_setup_write(i2c, msg->addr, msg->buf, | |
| 445 | − msg->len, flags); | |
| 446 | − } | |
| 447 | − | |
| 448 | − writel(MXS_I2C_QUEUECTRL_QUEUE_RUN, | |
| 449 | − i2c->regs + MXS_I2C_QUEUECTRL_SET); | |
| 450 | − } | |
| 320 | + ret = mxs_i2c_dma_setup_xfer(adap, msg, flags); | |
| 321 | + if (ret) | |
| 322 | + return ret; | |
| 451 | 323 | |
| 452 | 324 | ret = wait_for_completion_timeout(&i2c->cmd_complete, |
| 453 | 325 | msecs_to_jiffies(1000)); |
| 454 | 326 | if (ret == 0) |
| 455 | 327 | goto timeout; |
| 456 | 328 | |
| 457 | − if (!i2c->dma_mode && !i2c->cmd_err && (msg->flags & I2C_M_RD)) { | |
| 458 | − ret = mxs_i2c_finish_read(i2c, msg->buf, msg->len); | |
| 459 | − if (ret) | |
| 460 | − goto timeout; | |
| 461 | − } | |
| 462 | − | |
| 463 | 329 | if (i2c->cmd_err == -ENXIO) |
| 464 | 330 | mxs_i2c_reset(i2c); |
| 465 | − else | |
| 466 | − writel(MXS_I2C_QUEUECTRL_QUEUE_RUN, | |
| 467 | − i2c->regs + MXS_I2C_QUEUECTRL_CLR); | |
| 468 | 331 | |
| 469 | 332 | dev_dbg(i2c->dev, "Done with err=%d\n", i2c->cmd_err); |
| 470 | 333 | |
| @@ -472,8 +335,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, · 1 unmodified line | ||
| 472 | 335 | |
| 473 | 336 | timeout: |
| 474 | 337 | dev_dbg(i2c->dev, "Timeout!\n"); |
| 475 | − if (i2c->dma_mode) | |
| 476 | − mxs_i2c_dma_finish(i2c); | |
| 338 | + mxs_i2c_dma_finish(i2c); | |
| 477 | 339 | mxs_i2c_reset(i2c); |
| 478 | 340 | return -ETIMEDOUT; |
| 479 | 341 | } |
| @@ -502,7 +364,6 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id) · 22 unmodified lines | ||
| 502 | 364 | { |
| 503 | 365 | struct mxs_i2c_dev *i2c = dev_id; |
| 504 | 366 | u32 stat = readl(i2c->regs + MXS_I2C_CTRL1) & MXS_I2C_IRQ_MASK; |
| 505 | − bool is_last_cmd; | |
| 506 | 367 | |
| 507 | 368 | if (!stat) |
| 508 | 369 | return IRQ_NONE; |
| @@ -515,14 +376,6 @@ static irqreturn_t mxs_i2c_isr(int this_irq, void *dev_id) · 6 unmodified lines | ||
| 515 | 376 | /* MXS_I2C_CTRL1_OVERSIZE_XFER_TERM_IRQ is only for slaves */ |
| 516 | 377 | i2c->cmd_err = -EIO; |
| 517 | 378 | |
| 518 | − if (!i2c->dma_mode) { | |
| 519 | − is_last_cmd = (readl(i2c->regs + MXS_I2C_QUEUESTAT) & | |
| 520 | − MXS_I2C_QUEUESTAT_WRITE_QUEUE_CNT_MASK) == 0; | |
| 521 | − | |
| 522 | − if (is_last_cmd || i2c->cmd_err) | |
| 523 | − complete(&i2c->cmd_complete); | |
| 524 | − } | |
| 525 | − | |
| 526 | 379 | writel(stat, i2c->regs + MXS_I2C_CTRL1_CLR); |
| 527 | 380 | |
| 528 | 381 | return IRQ_HANDLED; |
| @@ -555,15 +408,6 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c) · 26 unmodified lines | ||
| 555 | 408 | struct device_node *node = dev->of_node; |
| 556 | 409 | int ret; |
| 557 | 410 | |
| 558 | − /* | |
| 559 | − * The MXS I2C DMA mode is prefered and enabled by default. | |
| 560 | − * The PIO mode is still supported, but should be used only | |
| 561 | − * for debuging purposes etc. | |
| 562 | − */ | |
| 563 | − i2c->dma_mode = !use_pioqueue; | |
| 564 | − if (!i2c->dma_mode) | |
| 565 | − dev_info(dev, "Using PIOQUEUE mode for I2C transfers!\n"); | |
| 566 | − | |
| 567 | 411 | /* |
| 568 | 412 | * TODO: This is a temporary solution and should be changed |
| 569 | 413 | * to use generic DMA binding later when the helpers get in. |
| @@ -571,8 +415,8 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c) · 1 unmodified line | ||
| 571 | 415 | ret = of_property_read_u32(node, "fsl,i2c-dma-channel", |
| 572 | 416 | &i2c->dma_channel); |
| 573 | 417 | if (ret) { |
| 574 | − dev_warn(dev, "Failed to get DMA channel, using PIOQUEUE!\n"); | |
| 575 | − i2c->dma_mode = 0; | |
| 418 | + dev_err(dev, "Failed to get DMA channel!\n"); | |
| 419 | + return -ENODEV; | |
| 576 | 420 | } |
| 577 | 421 | |
| 578 | 422 | ret = of_property_read_u32(node, "clock-frequency", &speed); |
| @@ -634,15 +478,13 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev) · 55 unmodified lines | ||
| 634 | 478 | } |
| 635 | 479 | |
| 636 | 480 | /* Setup the DMA */ |
| 637 | − if (i2c->dma_mode) { | |
| 638 | − dma_cap_zero(mask); | |
| 639 | − dma_cap_set(DMA_SLAVE, mask); | |
| 640 | − i2c->dma_data.chan_irq = dmairq; | |
| 641 | − i2c->dmach = dma_request_channel(mask, mxs_i2c_dma_filter, i2c); | |
| 642 | − if (!i2c->dmach) { | |
| 643 | − dev_err(dev, "Failed to request dma\n"); | |
| 644 | − return -ENODEV; | |
| 645 | − } | |
| 481 | + dma_cap_zero(mask); | |
| 482 | + dma_cap_set(DMA_SLAVE, mask); | |
| 483 | + i2c->dma_data.chan_irq = dmairq; | |
| 484 | + i2c->dmach = dma_request_channel(mask, mxs_i2c_dma_filter, i2c); | |
| 485 | + if (!i2c->dmach) { | |
| 486 | + dev_err(dev, "Failed to request dma\n"); | |
| 487 | + return -ENODEV; | |
| 646 | 488 | } |
| 647 | 489 | |
| 648 | 490 | platform_set_drvdata(pdev, i2c); |
| @@ -644,7 +644,11 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, · 643 unmodified lines | ||
| 644 | 644 | |
| 645 | 645 | pm_runtime_get_sync(&dev->adev->dev); |
| 646 | 646 | |
| 647 | − clk_enable(dev->clk); | |
| 647 | + status = clk_prepare_enable(dev->clk); | |
| 648 | + if (status) { | |
| 649 | + dev_err(&dev->adev->dev, "can't prepare_enable clock\n"); | |
| 650 | + goto out_clk; | |
| 651 | + } | |
| 648 | 652 | |
| 649 | 653 | status = init_hw(dev); |
| 650 | 654 | if (status) |
| @@ -671,7 +675,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap, · 20 unmodified lines | ||
| 671 | 675 | } |
| 672 | 676 | |
| 673 | 677 | out: |
| 674 | − clk_disable(dev->clk); | |
| 678 | + clk_disable_unprepare(dev->clk); | |
| 679 | +out_clk: | |
| 675 | 680 | pm_runtime_put_sync(&dev->adev->dev); |
| 676 | 681 | |
| 677 | 682 | dev->busy = false; |
| @@ -742,7 +742,7 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev) · 741 unmodified lines | ||
| 742 | 742 | } |
| 743 | 743 | |
| 744 | 744 | ret = devm_request_irq(&pdev->dev, i2c_dev->irq, |
| 745 | − tegra_i2c_isr, 0, pdev->name, i2c_dev); | |
| 745 | + tegra_i2c_isr, 0, dev_name(&pdev->dev), i2c_dev); | |
| 746 | 746 | if (ret) { |
| 747 | 747 | dev_err(&pdev->dev, "Failed to request irq %i\n", i2c_dev->irq); |
| 748 | 748 | return ret; |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | i2c-stub.c - I2C/SMBus chip emulator |
| 3 | 3 | |
| 4 | 4 | Copyright (c) 2004 Mark M. Hoffman <mhoffman@lightlink.com> |
| 5 | − Copyright (C) 2007 Jean Delvare <khali@linux-fr.org> | |
| 5 | + Copyright (C) 2007, 2012 Jean Delvare <khali@linux-fr.org> | |
| 6 | 6 | |
| 7 | 7 | This program is free software; you can redistribute it and/or modify |
| 8 | 8 | it under the terms of the GNU General Public License as published by |
| @@ -51,8 +51,8 @@ struct stub_chip { · 42 unmodified lines | ||
| 51 | 51 | static struct stub_chip *stub_chips; |
| 52 | 52 | |
| 53 | 53 | /* Return negative errno on error. */ |
| 54 | −static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, | |
| 55 | − char read_write, u8 command, int size, union i2c_smbus_data * data) | |
| 54 | +static s32 stub_xfer(struct i2c_adapter *adap, u16 addr, unsigned short flags, | |
| 55 | + char read_write, u8 command, int size, union i2c_smbus_data *data) | |
| 56 | 56 | { |
| 57 | 57 | s32 ret; |
| 58 | 58 | int i, len; |
| @@ -78,14 +78,14 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, · 19 unmodified lines | ||
| 78 | 78 | case I2C_SMBUS_BYTE: |
| 79 | 79 | if (read_write == I2C_SMBUS_WRITE) { |
| 80 | 80 | chip->pointer = command; |
| 81 | − dev_dbg(&adap->dev, "smbus byte - addr 0x%02x, " | |
| 82 | − "wrote 0x%02x.\n", | |
| 83 | − addr, command); | |
| 81 | + dev_dbg(&adap->dev, | |
| 82 | + "smbus byte - addr 0x%02x, wrote 0x%02x.\n", | |
| 83 | + addr, command); | |
| 84 | 84 | } else { |
| 85 | 85 | data->byte = chip->words[chip->pointer++] & 0xff; |
| 86 | − dev_dbg(&adap->dev, "smbus byte - addr 0x%02x, " | |
| 87 | − "read 0x%02x.\n", | |
| 88 | − addr, data->byte); | |
| 86 | + dev_dbg(&adap->dev, | |
| 87 | + "smbus byte - addr 0x%02x, read 0x%02x.\n", | |
| 88 | + addr, data->byte); | |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | ret = 0; |
| @@ -95,14 +95,14 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, · 3 unmodified lines | ||
| 95 | 95 | if (read_write == I2C_SMBUS_WRITE) { |
| 96 | 96 | chip->words[command] &= 0xff00; |
| 97 | 97 | chip->words[command] |= data->byte; |
| 98 | − dev_dbg(&adap->dev, "smbus byte data - addr 0x%02x, " | |
| 99 | − "wrote 0x%02x at 0x%02x.\n", | |
| 100 | − addr, data->byte, command); | |
| 98 | + dev_dbg(&adap->dev, | |
| 99 | + "smbus byte data - addr 0x%02x, wrote 0x%02x at 0x%02x.\n", | |
| 100 | + addr, data->byte, command); | |
| 101 | 101 | } else { |
| 102 | 102 | data->byte = chip->words[command] & 0xff; |
| 103 | − dev_dbg(&adap->dev, "smbus byte data - addr 0x%02x, " | |
| 104 | − "read 0x%02x at 0x%02x.\n", | |
| 105 | − addr, data->byte, command); | |
| 103 | + dev_dbg(&adap->dev, | |
| 104 | + "smbus byte data - addr 0x%02x, read 0x%02x at 0x%02x.\n", | |
| 105 | + addr, data->byte, command); | |
| 106 | 106 | } |
| 107 | 107 | chip->pointer = command + 1; |
| 108 | 108 | |
| @@ -112,14 +112,14 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, · 3 unmodified lines | ||
| 112 | 112 | case I2C_SMBUS_WORD_DATA: |
| 113 | 113 | if (read_write == I2C_SMBUS_WRITE) { |
| 114 | 114 | chip->words[command] = data->word; |
| 115 | − dev_dbg(&adap->dev, "smbus word data - addr 0x%02x, " | |
| 116 | − "wrote 0x%04x at 0x%02x.\n", | |
| 117 | − addr, data->word, command); | |
| 115 | + dev_dbg(&adap->dev, | |
| 116 | + "smbus word data - addr 0x%02x, wrote 0x%04x at 0x%02x.\n", | |
| 117 | + addr, data->word, command); | |
| 118 | 118 | } else { |
| 119 | 119 | data->word = chip->words[command]; |
| 120 | − dev_dbg(&adap->dev, "smbus word data - addr 0x%02x, " | |
| 121 | − "read 0x%04x at 0x%02x.\n", | |
| 122 | − addr, data->word, command); | |
| 120 | + dev_dbg(&adap->dev, | |
| 121 | + "smbus word data - addr 0x%02x, read 0x%04x at 0x%02x.\n", | |
| 122 | + addr, data->word, command); | |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | ret = 0; |
| @@ -132,17 +132,17 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags, · 6 unmodified lines | ||
| 132 | 132 | chip->words[command + i] &= 0xff00; |
| 133 | 133 | chip->words[command + i] |= data->block[1 + i]; |
| 134 | 134 | } |
| 135 | − dev_dbg(&adap->dev, "i2c block data - addr 0x%02x, " | |
| 136 | − "wrote %d bytes at 0x%02x.\n", | |
| 137 | − addr, len, command); | |
| 135 | + dev_dbg(&adap->dev, | |
| 136 | + "i2c block data - addr 0x%02x, wrote %d bytes at 0x%02x.\n", | |
| 137 | + addr, len, command); | |
| 138 | 138 | } else { |
| 139 | 139 | for (i = 0; i < len; i++) { |
| 140 | 140 | data->block[1 + i] = |
| 141 | 141 | chip->words[command + i] & 0xff; |
| 142 | 142 | } |
| 143 | − dev_dbg(&adap->dev, "i2c block data - addr 0x%02x, " | |
| 144 | − "read %d bytes at 0x%02x.\n", | |
| 145 | − addr, len, command); | |
| 143 | + dev_dbg(&adap->dev, | |
| 144 | + "i2c block data - addr 0x%02x, read %d bytes at 0x%02x.\n", | |
| 145 | + addr, len, command); | |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | ret = 0; |
| @@ -179,25 +179,24 @@ static int __init i2c_stub_init(void) · 30 unmodified lines | ||
| 179 | 179 | int i, ret; |
| 180 | 180 | |
| 181 | 181 | if (!chip_addr[0]) { |
| 182 | − printk(KERN_ERR "i2c-stub: Please specify a chip address\n"); | |
| 182 | + pr_err("i2c-stub: Please specify a chip address\n"); | |
| 183 | 183 | return -ENODEV; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | for (i = 0; i < MAX_CHIPS && chip_addr[i]; i++) { |
| 187 | 187 | if (chip_addr[i] < 0x03 || chip_addr[i] > 0x77) { |
| 188 | − printk(KERN_ERR "i2c-stub: Invalid chip address " | |
| 189 | − "0x%02x\n", chip_addr[i]); | |
| 188 | + pr_err("i2c-stub: Invalid chip address 0x%02x\n", | |
| 189 | + chip_addr[i]); | |
| 190 | 190 | return -EINVAL; |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | − printk(KERN_INFO "i2c-stub: Virtual chip at 0x%02x\n", | |
| 194 | − chip_addr[i]); | |
| 193 | + pr_info("i2c-stub: Virtual chip at 0x%02x\n", chip_addr[i]); | |
| 195 | 194 | } |
| 196 | 195 | |
| 197 | 196 | /* Allocate memory for all chips at once */ |
| 198 | 197 | stub_chips = kzalloc(i * sizeof(struct stub_chip), GFP_KERNEL); |
| 199 | 198 | if (!stub_chips) { |
| 200 | − printk(KERN_ERR "i2c-stub: Out of memory\n"); | |
| 199 | + pr_err("i2c-stub: Out of memory\n"); | |
| 201 | 200 | return -ENOMEM; |
| 202 | 201 | } |
| 203 | 202 | |
| @@ -219,4 +218,3 @@ MODULE_LICENSE("GPL"); · 15 unmodified lines | ||
| 219 | 218 | |
| 220 | 219 | module_init(i2c_stub_init); |
| 221 | 220 | module_exit(i2c_stub_exit); |
| 222 | − | |
| @@ -335,6 +335,7 @@ config KEYBOARD_LOCOMO · 334 unmodified lines | ||
| 335 | 335 | config KEYBOARD_LPC32XX |
| 336 | 336 | tristate "LPC32XX matrix key scanner support" |
| 337 | 337 | depends on ARCH_LPC32XX && OF |
| 338 | + select INPUT_MATRIXKMAP | |
| 338 | 339 | help |
| 339 | 340 | Say Y here if you want to use NXP LPC32XX SoC key scanner interface, |
| 340 | 341 | connected to a key matrix. |
| @@ -368,6 +368,9 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad) · 367 unmodified lines | ||
| 368 | 368 | unsigned int mask = 0, direct_key_num = 0; |
| 369 | 369 | unsigned long kpc = 0; |
| 370 | 370 | |
| 371 | + /* clear pending interrupt bit */ | |
| 372 | + keypad_readl(KPC); | |
| 373 | + | |
| 371 | 374 | /* enable matrix keys with automatic scan */ |
| 372 | 375 | if (pdata->matrix_key_rows && pdata->matrix_key_cols) { |
| 373 | 376 | kpc |= KPC_ASACT | KPC_MIE | KPC_ME | KPC_MS_ALL; |
| @@ -311,7 +311,6 @@ static void xenkbd_backend_changed(struct xenbus_device *dev, · 310 unmodified lines | ||
| 311 | 311 | case XenbusStateReconfiguring: |
| 312 | 312 | case XenbusStateReconfigured: |
| 313 | 313 | case XenbusStateUnknown: |
| 314 | − case XenbusStateClosed: | |
| 315 | 314 | break; |
| 316 | 315 | |
| 317 | 316 | case XenbusStateInitWait: |
| @@ -350,6 +349,10 @@ InitWait: · 32 unmodified lines | ||
| 350 | 349 | |
| 351 | 350 | break; |
| 352 | 351 | |
| 352 | + case XenbusStateClosed: | |
| 353 | + if (dev->state == XenbusStateClosed) | |
| 354 | + break; | |
| 355 | + /* Missed the backend's CLOSING state -- fallthrough */ | |
| 353 | 356 | case XenbusStateClosing: |
| 354 | 357 | xenbus_frontend_closed(dev); |
| 355 | 358 | break; |
| @@ -84,6 +84,10 @@ · 83 unmodified lines | ||
| 84 | 84 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI 0x0262 |
| 85 | 85 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_ISO 0x0263 |
| 86 | 86 | #define USB_DEVICE_ID_APPLE_WELLSPRING7_JIS 0x0264 |
| 87 | +/* MacbookPro10,2 (unibody, October 2012) */ | |
| 88 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI 0x0259 | |
| 89 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a | |
| 90 | +#define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b | |
| 87 | 91 | |
| 88 | 92 | #define BCM5974_DEVICE(prod) { \ |
| 89 | 93 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
| @@ -137,6 +141,10 @@ static const struct usb_device_id bcm5974_table[] = { · 47 unmodified lines | ||
| 137 | 141 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ANSI), |
| 138 | 142 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_ISO), |
| 139 | 143 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7_JIS), |
| 144 | + /* MacbookPro10,2 */ | |
| 145 | + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI), | |
| 146 | + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO), | |
| 147 | + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS), | |
| 140 | 148 | /* Terminating entry */ |
| 141 | 149 | {} |
| 142 | 150 | }; |
| @@ -379,6 +387,19 @@ static const struct bcm5974_config bcm5974_config_table[] = { · 236 unmodified lines | ||
| 379 | 387 | { SN_COORD, -150, 6730 }, |
| 380 | 388 | { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } |
| 381 | 389 | }, |
| 390 | + { | |
| 391 | + USB_DEVICE_ID_APPLE_WELLSPRING7A_ANSI, | |
| 392 | + USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO, | |
| 393 | + USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS, | |
| 394 | + HAS_INTEGRATED_BUTTON, | |
| 395 | + 0x84, sizeof(struct bt_data), | |
| 396 | + 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | |
| 397 | + { SN_PRESSURE, 0, 300 }, | |
| 398 | + { SN_WIDTH, 0, 2048 }, | |
| 399 | + { SN_COORD, -4750, 5280 }, | |
| 400 | + { SN_COORD, -150, 6730 }, | |
| 401 | + { SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION } | |
| 402 | + }, | |
| 382 | 403 | {} |
| 383 | 404 | }; |
| 384 | 405 | |
| @@ -391,7 +391,7 @@ static int wacom_parse_hid(struct usb_interface *intf, · 390 unmodified lines | ||
| 391 | 391 | features->pktlen = WACOM_PKGLEN_TPC2FG; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | − if (features->type == MTSCREEN || WACOM_24HDT) | |
| 394 | + if (features->type == MTSCREEN || features->type == WACOM_24HDT) | |
| 395 | 395 | features->pktlen = WACOM_PKGLEN_MTOUCH; |
| 396 | 396 | |
| 397 | 397 | if (features->type == BAMBOO_PT) { |
| @@ -1518,6 +1518,9 @@ int wacom_setup_input_capabilities(struct input_dev *input_dev, · 1517 unmodified lines | ||
| 1518 | 1518 | |
| 1519 | 1519 | input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0); |
| 1520 | 1520 | input_set_abs_params(input_dev, ABS_THROTTLE, 0, 71, 0, 0); |
| 1521 | + | |
| 1522 | + __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); | |
| 1523 | + | |
| 1521 | 1524 | wacom_setup_cintiq(wacom_wac); |
| 1522 | 1525 | break; |
| 1523 | 1526 | |
| @@ -239,7 +239,7 @@ config TOUCHSCREEN_EETI · 238 unmodified lines | ||
| 239 | 239 | |
| 240 | 240 | config TOUCHSCREEN_EGALAX |
| 241 | 241 | tristate "EETI eGalax multi-touch panel support" |
| 242 | − depends on I2C | |
| 242 | + depends on I2C && OF | |
| 243 | 243 | help |
| 244 | 244 | Say Y here to enable support for I2C connected EETI |
| 245 | 245 | eGalax multi-touch panels. |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/slab.h> |
| 29 | 29 | #include <linux/bitops.h> |
| 30 | 30 | #include <linux/input/mt.h> |
| 31 | +#include <linux/of_gpio.h> | |
| 31 | 32 | |
| 32 | 33 | /* |
| 33 | 34 | * Mouse Mode: some panel may configure the controller to mouse mode, |
| @@ -122,9 +123,17 @@ static irqreturn_t egalax_ts_interrupt(int irq, void *dev_id) · 88 unmodified lines | ||
| 122 | 123 | /* wake up controller by an falling edge of interrupt gpio. */ |
| 123 | 124 | static int egalax_wake_up_device(struct i2c_client *client) |
| 124 | 125 | { |
| 125 | − int gpio = irq_to_gpio(client->irq); | |
| 126 | + struct device_node *np = client->dev.of_node; | |
| 127 | + int gpio; | |
| 126 | 128 | int ret; |
| 127 | 129 | |
| 130 | + if (!np) | |
| 131 | + return -ENODEV; | |
| 132 | + | |
| 133 | + gpio = of_get_named_gpio(np, "wakeup-gpios", 0); | |
| 134 | + if (!gpio_is_valid(gpio)) | |
| 135 | + return -ENODEV; | |
| 136 | + | |
| 128 | 137 | ret = gpio_request(gpio, "egalax_irq"); |
| 129 | 138 | if (ret < 0) { |
| 130 | 139 | dev_err(&client->dev, |
| @@ -181,7 +190,11 @@ static int __devinit egalax_ts_probe(struct i2c_client *client, · 50 unmodified lines | ||
| 181 | 190 | ts->input_dev = input_dev; |
| 182 | 191 | |
| 183 | 192 | /* controller may be in sleep, wake it up. */ |
| 184 | − egalax_wake_up_device(client); | |
| 193 | + error = egalax_wake_up_device(client); | |
| 194 | + if (error) { | |
| 195 | + dev_err(&client->dev, "Failed to wake up the controller\n"); | |
| 196 | + goto err_free_dev; | |
| 197 | + } | |
| 185 | 198 | |
| 186 | 199 | ret = egalax_firmware_version(client); |
| 187 | 200 | if (ret < 0) { |
| @@ -274,11 +287,17 @@ static int egalax_ts_resume(struct device *dev) · 86 unmodified lines | ||
| 274 | 287 | |
| 275 | 288 | static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume); |
| 276 | 289 | |
| 290 | +static struct of_device_id egalax_ts_dt_ids[] = { | |
| 291 | + { .compatible = "eeti,egalax_ts" }, | |
| 292 | + { /* sentinel */ } | |
| 293 | +}; | |
| 294 | + | |
| 277 | 295 | static struct i2c_driver egalax_ts_driver = { |
| 278 | 296 | .driver = { |
| 279 | 297 | .name = "egalax_ts", |
| 280 | 298 | .owner = THIS_MODULE, |
| 281 | 299 | .pm = &egalax_ts_pm_ops, |
| 300 | + .of_match_table = of_match_ptr(egalax_ts_dt_ids), | |
| 282 | 301 | }, |
| 283 | 302 | .id_table = egalax_ts_id, |
| 284 | 303 | .probe = egalax_ts_probe, |
| @@ -107,7 +107,6 @@ static int tsc_connect(struct serio *serio, struct serio_driver *drv) · 106 unmodified lines | ||
| 107 | 107 | __set_bit(BTN_TOUCH, input_dev->keybit); |
| 108 | 108 | input_set_abs_params(ptsc->dev, ABS_X, 0, 0x3ff, 0, 0); |
| 109 | 109 | input_set_abs_params(ptsc->dev, ABS_Y, 0, 0x3ff, 0, 0); |
| 110 | − input_set_abs_params(ptsc->dev, ABS_PRESSURE, 0, 0, 0, 0); | |
| 111 | 110 | |
| 112 | 111 | serio_set_drvdata(serio, ptsc); |
| 113 | 112 | |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | menuconfig ISDN |
| 6 | 6 | bool "ISDN support" |
| 7 | − depends on NET | |
| 7 | + depends on NET && NETDEVICES | |
| 8 | 8 | depends on !S390 && !UML |
| 9 | 9 | ---help--- |
| 10 | 10 | ISDN ("Integrated Services Digital Network", called RNIS in France) |
| @@ -6,7 +6,7 @@ if ISDN_I4L · 5 unmodified lines | ||
| 6 | 6 | |
| 7 | 7 | config ISDN_PPP |
| 8 | 8 | bool "Support synchronous PPP" |
| 9 | − depends on INET && NETDEVICES | |
| 9 | + depends on INET | |
| 10 | 10 | select SLHC |
| 11 | 11 | help |
| 12 | 12 | Over digital connections such as ISDN, there is no need to |
| @@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) · 1311 unmodified lines | ||
| 1312 | 1312 | } else |
| 1313 | 1313 | return -EINVAL; |
| 1314 | 1314 | break; |
| 1315 | −#ifdef CONFIG_NETDEVICES | |
| 1316 | 1315 | case IIOCNETGPN: |
| 1317 | 1316 | /* Get peer phone number of a connected |
| 1318 | 1317 | * isdn network interface */ |
| @@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) · 3 unmodified lines | ||
| 1322 | 1321 | return isdn_net_getpeer(&phone, argp); |
| 1323 | 1322 | } else |
| 1324 | 1323 | return -EINVAL; |
| 1325 | −#endif | |
| 1326 | 1324 | default: |
| 1327 | 1325 | return -EINVAL; |
| 1328 | 1326 | } |
| @@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) · 23 unmodified lines | ||
| 1352 | 1350 | case IIOCNETLCR: |
| 1353 | 1351 | printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); |
| 1354 | 1352 | return -ENODEV; |
| 1355 | −#ifdef CONFIG_NETDEVICES | |
| 1356 | 1353 | case IIOCNETAIF: |
| 1357 | 1354 | /* Add a network-interface */ |
| 1358 | 1355 | if (arg) { |
| @@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) · 132 unmodified lines | ||
| 1491 | 1488 | return -EFAULT; |
| 1492 | 1489 | return isdn_net_force_hangup(name); |
| 1493 | 1490 | break; |
| 1494 | −#endif /* CONFIG_NETDEVICES */ | |
| 1495 | 1491 | case IIOCSETVER: |
| 1496 | 1492 | dev->net_verbose = arg; |
| 1497 | 1493 | printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose); |
| @@ -315,8 +315,11 @@ static int run(struct mddev *mddev) · 314 unmodified lines | ||
| 315 | 315 | } |
| 316 | 316 | conf->nfaults = 0; |
| 317 | 317 | |
| 318 | − rdev_for_each(rdev, mddev) | |
| 318 | + rdev_for_each(rdev, mddev) { | |
| 319 | 319 | conf->rdev = rdev; |
| 320 | + disk_stack_limits(mddev->gendisk, rdev->bdev, | |
| 321 | + rdev->data_offset << 9); | |
| 322 | + } | |
| 320 | 323 | |
| 321 | 324 | md_set_array_sectors(mddev, faulty_size(mddev, 0, 0)); |
| 322 | 325 | mddev->private = conf; |
| @@ -2710,7 +2710,7 @@ static struct r1conf *setup_conf(struct mddev *mddev) · 2709 unmodified lines | ||
| 2710 | 2710 | || disk_idx < 0) |
| 2711 | 2711 | continue; |
| 2712 | 2712 | if (test_bit(Replacement, &rdev->flags)) |
| 2713 | − disk = conf->mirrors + conf->raid_disks + disk_idx; | |
| 2713 | + disk = conf->mirrors + mddev->raid_disks + disk_idx; | |
| 2714 | 2714 | else |
| 2715 | 2715 | disk = conf->mirrors + disk_idx; |
| 2716 | 2716 | |
| @@ -1783,7 +1783,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) · 1782 unmodified lines | ||
| 1783 | 1783 | clear_bit(Unmerged, &rdev->flags); |
| 1784 | 1784 | } |
| 1785 | 1785 | md_integrity_add_rdev(rdev, mddev); |
| 1786 | − if (blk_queue_discard(bdev_get_queue(rdev->bdev))) | |
| 1786 | + if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev))) | |
| 1787 | 1787 | queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); |
| 1788 | 1788 | |
| 1789 | 1789 | print_conf(conf); |
| @@ -3613,11 +3613,14 @@ static int run(struct mddev *mddev) · 1823 unmodified lines | ||
| 3613 | 3613 | discard_supported = true; |
| 3614 | 3614 | } |
| 3615 | 3615 | |
| 3616 | − if (discard_supported) | |
| 3617 | − queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); | |
| 3618 | − else | |
| 3619 | − queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); | |
| 3620 | − | |
| 3616 | + if (mddev->queue) { | |
| 3617 | + if (discard_supported) | |
| 3618 | + queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, | |
| 3619 | + mddev->queue); | |
| 3620 | + else | |
| 3621 | + queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, | |
| 3622 | + mddev->queue); | |
| 3623 | + } | |
| 3621 | 3624 | /* need to check that every block has at least one working mirror */ |
| 3622 | 3625 | if (!enough(conf, -1)) { |
| 3623 | 3626 | printk(KERN_ERR "md/raid10:%s: not enough operational mirrors.\n", |
| @@ -208,7 +208,7 @@ static unsigned long exynos5250_dwmmc_caps[4] = { · 207 unmodified lines | ||
| 208 | 208 | MMC_CAP_CMD23, |
| 209 | 209 | }; |
| 210 | 210 | |
| 211 | −static struct dw_mci_drv_data exynos5250_drv_data = { | |
| 211 | +static const struct dw_mci_drv_data exynos5250_drv_data = { | |
| 212 | 212 | .caps = exynos5250_dwmmc_caps, |
| 213 | 213 | .init = dw_mci_exynos_priv_init, |
| 214 | 214 | .setup_clock = dw_mci_exynos_setup_clock, |
| @@ -220,14 +220,14 @@ static struct dw_mci_drv_data exynos5250_drv_data = { · 5 unmodified lines | ||
| 220 | 220 | |
| 221 | 221 | static const struct of_device_id dw_mci_exynos_match[] = { |
| 222 | 222 | { .compatible = "samsung,exynos5250-dw-mshc", |
| 223 | − .data = (void *)&exynos5250_drv_data, }, | |
| 223 | + .data = &exynos5250_drv_data, }, | |
| 224 | 224 | {}, |
| 225 | 225 | }; |
| 226 | −MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match); | |
| 226 | +MODULE_DEVICE_TABLE(of, dw_mci_exynos_match); | |
| 227 | 227 | |
| 228 | 228 | int dw_mci_exynos_probe(struct platform_device *pdev) |
| 229 | 229 | { |
| 230 | − struct dw_mci_drv_data *drv_data; | |
| 230 | + const struct dw_mci_drv_data *drv_data; | |
| 231 | 231 | const struct of_device_id *match; |
| 232 | 232 | |
| 233 | 233 | match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node); |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include "dw_mmc.h" |
| 25 | 25 | |
| 26 | 26 | int dw_mci_pltfm_register(struct platform_device *pdev, |
| 27 | − struct dw_mci_drv_data *drv_data) | |
| 27 | + const struct dw_mci_drv_data *drv_data) | |
| 28 | 28 | { |
| 29 | 29 | struct dw_mci *host; |
| 30 | 30 | struct resource *regs; |
| @@ -50,8 +50,8 @@ int dw_mci_pltfm_register(struct platform_device *pdev, · 19 unmodified lines | ||
| 50 | 50 | if (!host->regs) |
| 51 | 51 | return -ENOMEM; |
| 52 | 52 | |
| 53 | − if (host->drv_data->init) { | |
| 54 | − ret = host->drv_data->init(host); | |
| 53 | + if (drv_data && drv_data->init) { | |
| 54 | + ret = drv_data->init(host); | |
| 55 | 55 | if (ret) |
| 56 | 56 | return ret; |
| 57 | 57 | } |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #define _DW_MMC_PLTFM_H_ |
| 14 | 14 | |
| 15 | 15 | extern int dw_mci_pltfm_register(struct platform_device *pdev, |
| 16 | − struct dw_mci_drv_data *drv_data); | |
| 16 | + const struct dw_mci_drv_data *drv_data); | |
| 17 | 17 | extern int __devexit dw_mci_pltfm_remove(struct platform_device *pdev); |
| 18 | 18 | extern const struct dev_pm_ops dw_mci_pltfm_pmops; |
| 19 | 19 | |
| @@ -232,6 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) · 231 unmodified lines | ||
| 232 | 232 | { |
| 233 | 233 | struct mmc_data *data; |
| 234 | 234 | struct dw_mci_slot *slot = mmc_priv(mmc); |
| 235 | + struct dw_mci_drv_data *drv_data = slot->host->drv_data; | |
| 235 | 236 | u32 cmdr; |
| 236 | 237 | cmd->error = -EINPROGRESS; |
| 237 | 238 | |
| @@ -261,8 +262,8 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) · 23 unmodified lines | ||
| 261 | 262 | cmdr |= SDMMC_CMD_DAT_WR; |
| 262 | 263 | } |
| 263 | 264 | |
| 264 | − if (slot->host->drv_data->prepare_command) | |
| 265 | − slot->host->drv_data->prepare_command(slot->host, &cmdr); | |
| 265 | + if (drv_data && drv_data->prepare_command) | |
| 266 | + drv_data->prepare_command(slot->host, &cmdr); | |
| 266 | 267 | |
| 267 | 268 | return cmdr; |
| 268 | 269 | } |
| @@ -434,7 +435,7 @@ static int dw_mci_idmac_init(struct dw_mci *host) · 165 unmodified lines | ||
| 434 | 435 | return 0; |
| 435 | 436 | } |
| 436 | 437 | |
| 437 | −static struct dw_mci_dma_ops dw_mci_idmac_ops = { | |
| 438 | +static const struct dw_mci_dma_ops dw_mci_idmac_ops = { | |
| 438 | 439 | .init = dw_mci_idmac_init, |
| 439 | 440 | .start = dw_mci_idmac_start_dma, |
| 440 | 441 | .stop = dw_mci_idmac_stop_dma, |
| @@ -772,6 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) · 331 unmodified lines | ||
| 772 | 773 | static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) |
| 773 | 774 | { |
| 774 | 775 | struct dw_mci_slot *slot = mmc_priv(mmc); |
| 776 | + struct dw_mci_drv_data *drv_data = slot->host->drv_data; | |
| 775 | 777 | u32 regs; |
| 776 | 778 | |
| 777 | 779 | /* set default 1 bit mode */ |
| @@ -807,8 +809,8 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) · 29 unmodified lines | ||
| 807 | 809 | slot->clock = ios->clock; |
| 808 | 810 | } |
| 809 | 811 | |
| 810 | − if (slot->host->drv_data->set_ios) | |
| 811 | − slot->host->drv_data->set_ios(slot->host, ios); | |
| 812 | + if (drv_data && drv_data->set_ios) | |
| 813 | + drv_data->set_ios(slot->host, ios); | |
| 812 | 814 | |
| 813 | 815 | switch (ios->power_mode) { |
| 814 | 816 | case MMC_POWER_UP: |
| @@ -1815,6 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) · 1000 unmodified lines | ||
| 1815 | 1817 | { |
| 1816 | 1818 | struct mmc_host *mmc; |
| 1817 | 1819 | struct dw_mci_slot *slot; |
| 1820 | + struct dw_mci_drv_data *drv_data = host->drv_data; | |
| 1818 | 1821 | int ctrl_id, ret; |
| 1819 | 1822 | u8 bus_width; |
| 1820 | 1823 | |
| @@ -1854,8 +1857,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) · 33 unmodified lines | ||
| 1854 | 1857 | } else { |
| 1855 | 1858 | ctrl_id = to_platform_device(host->dev)->id; |
| 1856 | 1859 | } |
| 1857 | − if (host->drv_data && host->drv_data->caps) | |
| 1858 | − mmc->caps |= host->drv_data->caps[ctrl_id]; | |
| 1860 | + if (drv_data && drv_data->caps) | |
| 1861 | + mmc->caps |= drv_data->caps[ctrl_id]; | |
| 1859 | 1862 | |
| 1860 | 1863 | if (host->pdata->caps2) |
| 1861 | 1864 | mmc->caps2 = host->pdata->caps2; |
| @@ -1867,10 +1870,10 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) · 5 unmodified lines | ||
| 1867 | 1870 | else |
| 1868 | 1871 | bus_width = 1; |
| 1869 | 1872 | |
| 1870 | − if (host->drv_data->setup_bus) { | |
| 1873 | + if (drv_data && drv_data->setup_bus) { | |
| 1871 | 1874 | struct device_node *slot_np; |
| 1872 | 1875 | slot_np = dw_mci_of_find_slot_node(host->dev, slot->id); |
| 1873 | − ret = host->drv_data->setup_bus(host, slot_np, bus_width); | |
| 1876 | + ret = drv_data->setup_bus(host, slot_np, bus_width); | |
| 1874 | 1877 | if (ret) |
| 1875 | 1878 | goto err_setup_bus; |
| 1876 | 1879 | } |
| @@ -1968,7 +1971,7 @@ static void dw_mci_init_dma(struct dw_mci *host) · 91 unmodified lines | ||
| 1968 | 1971 | /* Determine which DMA interface to use */ |
| 1969 | 1972 | #ifdef CONFIG_MMC_DW_IDMAC |
| 1970 | 1973 | host->dma_ops = &dw_mci_idmac_ops; |
| 1971 | − dev_info(&host->dev, "Using internal DMA controller.\n"); | |
| 1974 | + dev_info(host->dev, "Using internal DMA controller.\n"); | |
| 1972 | 1975 | #endif |
| 1973 | 1976 | |
| 1974 | 1977 | if (!host->dma_ops) |
| @@ -2035,6 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) · 60 unmodified lines | ||
| 2035 | 2038 | struct dw_mci_board *pdata; |
| 2036 | 2039 | struct device *dev = host->dev; |
| 2037 | 2040 | struct device_node *np = dev->of_node; |
| 2041 | + struct dw_mci_drv_data *drv_data = host->drv_data; | |
| 2038 | 2042 | int idx, ret; |
| 2039 | 2043 | |
| 2040 | 2044 | pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); |
| @@ -2062,8 +2066,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) · 21 unmodified lines | ||
| 2062 | 2066 | |
| 2063 | 2067 | of_property_read_u32(np, "card-detect-delay", &pdata->detect_delay_ms); |
| 2064 | 2068 | |
| 2065 | − if (host->drv_data->parse_dt) { | |
| 2066 | − ret = host->drv_data->parse_dt(host); | |
| 2069 | + if (drv_data && drv_data->parse_dt) { | |
| 2070 | + ret = drv_data->parse_dt(host); | |
| 2067 | 2071 | if (ret) |
| 2068 | 2072 | return ERR_PTR(ret); |
| 2069 | 2073 | } |
| @@ -2080,6 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) · 10 unmodified lines | ||
| 2080 | 2084 | |
| 2081 | 2085 | int dw_mci_probe(struct dw_mci *host) |
| 2082 | 2086 | { |
| 2087 | + struct dw_mci_drv_data *drv_data = host->drv_data; | |
| 2083 | 2088 | int width, i, ret = 0; |
| 2084 | 2089 | u32 fifo_size; |
| 2085 | 2090 | int init_slots = 0; |
| @@ -2127,8 +2132,8 @@ int dw_mci_probe(struct dw_mci *host) · 41 unmodified lines | ||
| 2127 | 2132 | else |
| 2128 | 2133 | host->bus_hz = clk_get_rate(host->ciu_clk); |
| 2129 | 2134 | |
| 2130 | − if (host->drv_data->setup_clock) { | |
| 2131 | − ret = host->drv_data->setup_clock(host); | |
| 2135 | + if (drv_data && drv_data->setup_clock) { | |
| 2136 | + ret = drv_data->setup_clock(host); | |
| 2132 | 2137 | if (ret) { |
| 2133 | 2138 | dev_err(host->dev, |
| 2134 | 2139 | "implementation specific clock setup failed\n"); |
| @@ -2228,6 +2233,21 @@ int dw_mci_probe(struct dw_mci *host) · 93 unmodified lines | ||
| 2228 | 2233 | else |
| 2229 | 2234 | host->num_slots = ((mci_readl(host, HCON) >> 1) & 0x1F) + 1; |
| 2230 | 2235 | |
| 2236 | + /* | |
| 2237 | + * Enable interrupts for command done, data over, data empty, card det, | |
| 2238 | + * receive ready and error such as transmit, receive timeout, crc error | |
| 2239 | + */ | |
| 2240 | + mci_writel(host, RINTSTS, 0xFFFFFFFF); | |
| 2241 | + mci_writel(host, INTMASK, SDMMC_INT_CMD_DONE | SDMMC_INT_DATA_OVER | | |
| 2242 | + SDMMC_INT_TXDR | SDMMC_INT_RXDR | | |
| 2243 | + DW_MCI_ERROR_FLAGS | SDMMC_INT_CD); | |
| 2244 | + mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE); /* Enable mci interrupt */ | |
| 2245 | + | |
| 2246 | + dev_info(host->dev, "DW MMC controller at irq %d, " | |
| 2247 | + "%d bit host data width, " | |
| 2248 | + "%u deep fifo\n", | |
| 2249 | + host->irq, width, fifo_size); | |
| 2250 | + | |
| 2231 | 2251 | /* We need at least one slot to succeed */ |
| 2232 | 2252 | for (i = 0; i < host->num_slots; i++) { |
| 2233 | 2253 | ret = dw_mci_init_slot(host, i); |
| @@ -2257,20 +2277,6 @@ int dw_mci_probe(struct dw_mci *host) · 23 unmodified lines | ||
| 2257 | 2277 | else |
| 2258 | 2278 | host->data_offset = DATA_240A_OFFSET; |
| 2259 | 2279 | |
| 2260 | − /* | |
| 2261 | − * Enable interrupts for command done, data over, data empty, card det, | |
| 2262 | − * receive ready and error such as transmit, receive timeout, crc error | |
| 2263 | − */ | |
| 2264 | − mci_writel(host, RINTSTS, 0xFFFFFFFF); | |
| 2265 | − mci_writel(host, INTMASK, SDMMC_INT_CMD_DONE | SDMMC_INT_DATA_OVER | | |
| 2266 | − SDMMC_INT_TXDR | SDMMC_INT_RXDR | | |
| 2267 | − DW_MCI_ERROR_FLAGS | SDMMC_INT_CD); | |
| 2268 | − mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE); /* Enable mci interrupt */ | |
| 2269 | − | |
| 2270 | − dev_info(host->dev, "DW MMC controller at irq %d, " | |
| 2271 | − "%d bit host data width, " | |
| 2272 | − "%u deep fifo\n", | |
| 2273 | − host->irq, width, fifo_size); | |
| 2274 | 2280 | if (host->quirks & DW_MCI_QUIRK_IDMAC_DTO) |
| 2275 | 2281 | dev_info(host->dev, "Internal DMAC interrupt fix enabled.\n"); |
| 2276 | 2282 | |
| @@ -1134,4 +1134,4 @@ module_platform_driver(mxcmci_driver); · 1133 unmodified lines | ||
| 1134 | 1134 | MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver"); |
| 1135 | 1135 | MODULE_AUTHOR("Sascha Hauer, Pengutronix"); |
| 1136 | 1136 | MODULE_LICENSE("GPL"); |
| 1137 | −MODULE_ALIAS("platform:imx-mmc"); | |
| 1137 | +MODULE_ALIAS("platform:mxc-mmc"); | |
| @@ -178,7 +178,8 @@ struct omap_hsmmc_host { · 177 unmodified lines | ||
| 178 | 178 | |
| 179 | 179 | static int omap_hsmmc_card_detect(struct device *dev, int slot) |
| 180 | 180 | { |
| 181 | − struct omap_mmc_platform_data *mmc = dev->platform_data; | |
| 181 | + struct omap_hsmmc_host *host = dev_get_drvdata(dev); | |
| 182 | + struct omap_mmc_platform_data *mmc = host->pdata; | |
| 182 | 183 | |
| 183 | 184 | /* NOTE: assumes card detect signal is active-low */ |
| 184 | 185 | return !gpio_get_value_cansleep(mmc->slots[0].switch_pin); |
| @@ -186,7 +187,8 @@ static int omap_hsmmc_card_detect(struct device *dev, int slot) · 1 unmodified line | ||
| 186 | 187 | |
| 187 | 188 | static int omap_hsmmc_get_wp(struct device *dev, int slot) |
| 188 | 189 | { |
| 189 | − struct omap_mmc_platform_data *mmc = dev->platform_data; | |
| 190 | + struct omap_hsmmc_host *host = dev_get_drvdata(dev); | |
| 191 | + struct omap_mmc_platform_data *mmc = host->pdata; | |
| 190 | 192 | |
| 191 | 193 | /* NOTE: assumes write protect signal is active-high */ |
| 192 | 194 | return gpio_get_value_cansleep(mmc->slots[0].gpio_wp); |
| @@ -194,7 +196,8 @@ static int omap_hsmmc_get_wp(struct device *dev, int slot) · 1 unmodified line | ||
| 194 | 196 | |
| 195 | 197 | static int omap_hsmmc_get_cover_state(struct device *dev, int slot) |
| 196 | 198 | { |
| 197 | − struct omap_mmc_platform_data *mmc = dev->platform_data; | |
| 199 | + struct omap_hsmmc_host *host = dev_get_drvdata(dev); | |
| 200 | + struct omap_mmc_platform_data *mmc = host->pdata; | |
| 198 | 201 | |
| 199 | 202 | /* NOTE: assumes card detect signal is active-low */ |
| 200 | 203 | return !gpio_get_value_cansleep(mmc->slots[0].switch_pin); |
| @@ -204,7 +207,8 @@ static int omap_hsmmc_get_cover_state(struct device *dev, int slot) · 3 unmodified lines | ||
| 204 | 207 | |
| 205 | 208 | static int omap_hsmmc_suspend_cdirq(struct device *dev, int slot) |
| 206 | 209 | { |
| 207 | − struct omap_mmc_platform_data *mmc = dev->platform_data; | |
| 210 | + struct omap_hsmmc_host *host = dev_get_drvdata(dev); | |
| 211 | + struct omap_mmc_platform_data *mmc = host->pdata; | |
| 208 | 212 | |
| 209 | 213 | disable_irq(mmc->slots[0].card_detect_irq); |
| 210 | 214 | return 0; |
| @@ -212,7 +216,8 @@ static int omap_hsmmc_suspend_cdirq(struct device *dev, int slot) · 1 unmodified line | ||
| 212 | 216 | |
| 213 | 217 | static int omap_hsmmc_resume_cdirq(struct device *dev, int slot) |
| 214 | 218 | { |
| 215 | − struct omap_mmc_platform_data *mmc = dev->platform_data; | |
| 219 | + struct omap_hsmmc_host *host = dev_get_drvdata(dev); | |
| 220 | + struct omap_mmc_platform_data *mmc = host->pdata; | |
| 216 | 221 | |
| 217 | 222 | enable_irq(mmc->slots[0].card_detect_irq); |
| 218 | 223 | return 0; |
| @@ -2009,9 +2014,9 @@ static int __devexit omap_hsmmc_remove(struct platform_device *pdev) · 1790 unmodified lines | ||
| 2009 | 2014 | clk_put(host->dbclk); |
| 2010 | 2015 | } |
| 2011 | 2016 | |
| 2012 | − mmc_free_host(host->mmc); | |
| 2017 | + omap_hsmmc_gpio_free(host->pdata); | |
| 2013 | 2018 | iounmap(host->base); |
| 2014 | − omap_hsmmc_gpio_free(pdev->dev.platform_data); | |
| 2019 | + mmc_free_host(host->mmc); | |
| 2015 | 2020 | |
| 2016 | 2021 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 2017 | 2022 | if (res) |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | +#include <linux/err.h> | |
| 22 | 23 | #include <linux/io.h> |
| 23 | 24 | #include <linux/clk.h> |
| 24 | 25 | #include <linux/err.h> |
| @@ -84,30 +85,32 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) · 59 unmodified lines | ||
| 84 | 85 | struct sdhci_dove_priv *priv; |
| 85 | 86 | int ret; |
| 86 | 87 | |
| 87 | − ret = sdhci_pltfm_register(pdev, &sdhci_dove_pdata); | |
| 88 | − if (ret) | |
| 89 | − goto sdhci_dove_register_fail; | |
| 90 | − | |
| 91 | 88 | priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_dove_priv), |
| 92 | 89 | GFP_KERNEL); |
| 93 | 90 | if (!priv) { |
| 94 | 91 | dev_err(&pdev->dev, "unable to allocate private data"); |
| 95 | − ret = -ENOMEM; | |
| 96 | − goto sdhci_dove_allocate_fail; | |
| 92 | + return -ENOMEM; | |
| 97 | 93 | } |
| 98 | 94 | |
| 95 | + priv->clk = clk_get(&pdev->dev, NULL); | |
| 96 | + if (!IS_ERR(priv->clk)) | |
| 97 | + clk_prepare_enable(priv->clk); | |
| 98 | + | |
| 99 | + ret = sdhci_pltfm_register(pdev, &sdhci_dove_pdata); | |
| 100 | + if (ret) | |
| 101 | + goto sdhci_dove_register_fail; | |
| 102 | + | |
| 99 | 103 | host = platform_get_drvdata(pdev); |
| 100 | 104 | pltfm_host = sdhci_priv(host); |
| 101 | 105 | pltfm_host->priv = priv; |
| 102 | 106 | |
| 103 | − priv->clk = clk_get(&pdev->dev, NULL); | |
| 104 | − if (!IS_ERR(priv->clk)) | |
| 105 | − clk_prepare_enable(priv->clk); | |
| 106 | 107 | return 0; |
| 107 | 108 | |
| 108 | −sdhci_dove_allocate_fail: | |
| 109 | − sdhci_pltfm_unregister(pdev); | |
| 110 | 109 | sdhci_dove_register_fail: |
| 110 | + if (!IS_ERR(priv->clk)) { | |
| 111 | + clk_disable_unprepare(priv->clk); | |
| 112 | + clk_put(priv->clk); | |
| 113 | + } | |
| 111 | 114 | return ret; |
| 112 | 115 | } |
| 113 | 116 | |
| @@ -117,14 +120,13 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev) · 3 unmodified lines | ||
| 117 | 120 | struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); |
| 118 | 121 | struct sdhci_dove_priv *priv = pltfm_host->priv; |
| 119 | 122 | |
| 120 | − if (priv->clk) { | |
| 121 | − if (!IS_ERR(priv->clk)) { | |
| 122 | − clk_disable_unprepare(priv->clk); | |
| 123 | − clk_put(priv->clk); | |
| 124 | − } | |
| 125 | − devm_kfree(&pdev->dev, priv->clk); | |
| 123 | + sdhci_pltfm_unregister(pdev); | |
| 124 | + | |
| 125 | + if (!IS_ERR(priv->clk)) { | |
| 126 | + clk_disable_unprepare(priv->clk); | |
| 127 | + clk_put(priv->clk); | |
| 126 | 128 | } |
| 127 | − return sdhci_pltfm_unregister(pdev); | |
| 129 | + return 0; | |
| 128 | 130 | } |
| 129 | 131 | |
| 130 | 132 | static const struct of_device_id sdhci_dove_of_match_table[] __devinitdata = { |
| @@ -169,6 +169,16 @@ static void esdhc_of_resume(struct sdhci_host *host) · 168 unmodified lines | ||
| 169 | 169 | } |
| 170 | 170 | #endif |
| 171 | 171 | |
| 172 | +static void esdhc_of_platform_init(struct sdhci_host *host) | |
| 173 | +{ | |
| 174 | + u32 vvn; | |
| 175 | + | |
| 176 | + vvn = in_be32(host->ioaddr + SDHCI_SLOT_INT_STATUS); | |
| 177 | + vvn = (vvn & SDHCI_VENDOR_VER_MASK) >> SDHCI_VENDOR_VER_SHIFT; | |
| 178 | + if (vvn == VENDOR_V_22) | |
| 179 | + host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; | |
| 180 | +} | |
| 181 | + | |
| 172 | 182 | static struct sdhci_ops sdhci_esdhc_ops = { |
| 173 | 183 | .read_l = esdhc_readl, |
| 174 | 184 | .read_w = esdhc_readw, |
| @@ -180,6 +190,7 @@ static struct sdhci_ops sdhci_esdhc_ops = { · 5 unmodified lines | ||
| 180 | 190 | .enable_dma = esdhc_of_enable_dma, |
| 181 | 191 | .get_max_clock = esdhc_of_get_max_clock, |
| 182 | 192 | .get_min_clock = esdhc_of_get_min_clock, |
| 193 | + .platform_init = esdhc_of_platform_init, | |
| 183 | 194 | #ifdef CONFIG_PM |
| 184 | 195 | .platform_suspend = esdhc_of_suspend, |
| 185 | 196 | .platform_resume = esdhc_of_resume, |
| @@ -1196,7 +1196,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( · 1195 unmodified lines | ||
| 1196 | 1196 | return ERR_PTR(-ENODEV); |
| 1197 | 1197 | } |
| 1198 | 1198 | |
| 1199 | − if (pci_resource_len(pdev, bar) != 0x100) { | |
| 1199 | + if (pci_resource_len(pdev, bar) < 0x100) { | |
| 1200 | 1200 | dev_err(&pdev->dev, "Invalid iomem size. You may " |
| 1201 | 1201 | "experience problems.\n"); |
| 1202 | 1202 | } |
| @@ -150,6 +150,13 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, · 149 unmodified lines | ||
| 150 | 150 | goto err_remap; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | + /* | |
| 154 | + * Some platforms need to probe the controller to be able to | |
| 155 | + * determine which caps should be used. | |
| 156 | + */ | |
| 157 | + if (host->ops && host->ops->platform_init) | |
| 158 | + host->ops->platform_init(host); | |
| 159 | + | |
| 153 | 160 | platform_set_drvdata(pdev, host); |
| 154 | 161 | |
| 155 | 162 | return host; |
| @@ -211,8 +211,8 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) · 210 unmodified lines | ||
| 211 | 211 | if (ourhost->cur_clk != best_src) { |
| 212 | 212 | struct clk *clk = ourhost->clk_bus[best_src]; |
| 213 | 213 | |
| 214 | − clk_enable(clk); | |
| 215 | − clk_disable(ourhost->clk_bus[ourhost->cur_clk]); | |
| 214 | + clk_prepare_enable(clk); | |
| 215 | + clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]); | |
| 216 | 216 | |
| 217 | 217 | /* turn clock off to card before changing clock source */ |
| 218 | 218 | writew(0, host->ioaddr + SDHCI_CLOCK_CONTROL); |
| @@ -607,7 +607,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · 388 unmodified lines | ||
| 607 | 607 | } |
| 608 | 608 | |
| 609 | 609 | /* enable the local io clock and keep it running for the moment. */ |
| 610 | − clk_enable(sc->clk_io); | |
| 610 | + clk_prepare_enable(sc->clk_io); | |
| 611 | 611 | |
| 612 | 612 | for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) { |
| 613 | 613 | struct clk *clk; |
| @@ -638,7 +638,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · 24 unmodified lines | ||
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | #ifndef CONFIG_PM_RUNTIME |
| 641 | − clk_enable(sc->clk_bus[sc->cur_clk]); | |
| 641 | + clk_prepare_enable(sc->clk_bus[sc->cur_clk]); | |
| 642 | 642 | #endif |
| 643 | 643 | |
| 644 | 644 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| @@ -747,13 +747,14 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · 102 unmodified lines | ||
| 747 | 747 | sdhci_s3c_setup_card_detect_gpio(sc); |
| 748 | 748 | |
| 749 | 749 | #ifdef CONFIG_PM_RUNTIME |
| 750 | − clk_disable(sc->clk_io); | |
| 750 | + if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL) | |
| 751 | + clk_disable_unprepare(sc->clk_io); | |
| 751 | 752 | #endif |
| 752 | 753 | return 0; |
| 753 | 754 | |
| 754 | 755 | err_req_regs: |
| 755 | 756 | #ifndef CONFIG_PM_RUNTIME |
| 756 | − clk_disable(sc->clk_bus[sc->cur_clk]); | |
| 757 | + clk_disable_unprepare(sc->clk_bus[sc->cur_clk]); | |
| 757 | 758 | #endif |
| 758 | 759 | for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) { |
| 759 | 760 | if (sc->clk_bus[ptr]) { |
| @@ -762,7 +763,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) · 2 unmodified lines | ||
| 762 | 763 | } |
| 763 | 764 | |
| 764 | 765 | err_no_busclks: |
| 765 | − clk_disable(sc->clk_io); | |
| 766 | + clk_disable_unprepare(sc->clk_io); | |
| 766 | 767 | clk_put(sc->clk_io); |
| 767 | 768 | |
| 768 | 769 | err_io_clk: |
| @@ -794,7 +795,8 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) · 25 unmodified lines | ||
| 794 | 795 | gpio_free(sc->ext_cd_gpio); |
| 795 | 796 | |
| 796 | 797 | #ifdef CONFIG_PM_RUNTIME |
| 797 | − clk_enable(sc->clk_io); | |
| 798 | + if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL) | |
| 799 | + clk_prepare_enable(sc->clk_io); | |
| 798 | 800 | #endif |
| 799 | 801 | sdhci_remove_host(host, 1); |
| 800 | 802 | |
| @@ -802,14 +804,14 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) · 1 unmodified line | ||
| 802 | 804 | pm_runtime_disable(&pdev->dev); |
| 803 | 805 | |
| 804 | 806 | #ifndef CONFIG_PM_RUNTIME |
| 805 | − clk_disable(sc->clk_bus[sc->cur_clk]); | |
| 807 | + clk_disable_unprepare(sc->clk_bus[sc->cur_clk]); | |
| 806 | 808 | #endif |
| 807 | 809 | for (ptr = 0; ptr < MAX_BUS_CLK; ptr++) { |
| 808 | 810 | if (sc->clk_bus[ptr]) { |
| 809 | 811 | clk_put(sc->clk_bus[ptr]); |
| 810 | 812 | } |
| 811 | 813 | } |
| 812 | − clk_disable(sc->clk_io); | |
| 814 | + clk_disable_unprepare(sc->clk_io); | |
| 813 | 815 | clk_put(sc->clk_io); |
| 814 | 816 | |
| 815 | 817 | if (pdev->dev.of_node) { |
| @@ -849,8 +851,8 @@ static int sdhci_s3c_runtime_suspend(struct device *dev) · 33 unmodified lines | ||
| 849 | 851 | |
| 850 | 852 | ret = sdhci_runtime_suspend_host(host); |
| 851 | 853 | |
| 852 | − clk_disable(ourhost->clk_bus[ourhost->cur_clk]); | |
| 853 | − clk_disable(busclk); | |
| 854 | + clk_disable_unprepare(ourhost->clk_bus[ourhost->cur_clk]); | |
| 855 | + clk_disable_unprepare(busclk); | |
| 854 | 856 | return ret; |
| 855 | 857 | } |
| 856 | 858 | |
| @@ -861,8 +863,8 @@ static int sdhci_s3c_runtime_resume(struct device *dev) · 4 unmodified lines | ||
| 861 | 863 | struct clk *busclk = ourhost->clk_io; |
| 862 | 864 | int ret; |
| 863 | 865 | |
| 864 | − clk_enable(busclk); | |
| 865 | − clk_enable(ourhost->clk_bus[ourhost->cur_clk]); | |
| 866 | + clk_prepare_enable(busclk); | |
| 867 | + clk_prepare_enable(ourhost->clk_bus[ourhost->cur_clk]); | |
| 866 | 868 | ret = sdhci_runtime_resume_host(host); |
| 867 | 869 | return ret; |
| 868 | 870 | } |
| @@ -1315,16 +1315,19 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) · 1314 unmodified lines | ||
| 1315 | 1315 | */ |
| 1316 | 1316 | if ((host->flags & SDHCI_NEEDS_RETUNING) && |
| 1317 | 1317 | !(present_state & (SDHCI_DOING_WRITE | SDHCI_DOING_READ))) { |
| 1318 | − /* eMMC uses cmd21 while sd and sdio use cmd19 */ | |
| 1319 | − tuning_opcode = mmc->card->type == MMC_TYPE_MMC ? | |
| 1320 | − MMC_SEND_TUNING_BLOCK_HS200 : | |
| 1321 | − MMC_SEND_TUNING_BLOCK; | |
| 1322 | − spin_unlock_irqrestore(&host->lock, flags); | |
| 1323 | − sdhci_execute_tuning(mmc, tuning_opcode); | |
| 1324 | − spin_lock_irqsave(&host->lock, flags); | |
| 1325 | − | |
| 1326 | − /* Restore original mmc_request structure */ | |
| 1327 | − host->mrq = mrq; | |
| 1318 | + if (mmc->card) { | |
| 1319 | + /* eMMC uses cmd21 but sd and sdio use cmd19 */ | |
| 1320 | + tuning_opcode = | |
| 1321 | + mmc->card->type == MMC_TYPE_MMC ? | |
| 1322 | + MMC_SEND_TUNING_BLOCK_HS200 : | |
| 1323 | + MMC_SEND_TUNING_BLOCK; | |
| 1324 | + spin_unlock_irqrestore(&host->lock, flags); | |
| 1325 | + sdhci_execute_tuning(mmc, tuning_opcode); | |
| 1326 | + spin_lock_irqsave(&host->lock, flags); | |
| 1327 | + | |
| 1328 | + /* Restore original mmc_request structure */ | |
| 1329 | + host->mrq = mrq; | |
| 1330 | + } | |
| 1328 | 1331 | } |
| 1329 | 1332 | |
| 1330 | 1333 | if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23)) |
| @@ -2837,6 +2840,9 @@ int sdhci_add_host(struct sdhci_host *host) · 1506 unmodified lines | ||
| 2837 | 2840 | if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA)) |
| 2838 | 2841 | mmc->caps |= MMC_CAP_4_BIT_DATA; |
| 2839 | 2842 | |
| 2843 | + if (host->quirks2 & SDHCI_QUIRK2_HOST_NO_CMD23) | |
| 2844 | + mmc->caps &= ~MMC_CAP_CMD23; | |
| 2845 | + | |
| 2840 | 2846 | if (caps[0] & SDHCI_CAN_DO_HISPD) |
| 2841 | 2847 | mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; |
| 2842 | 2848 | |
| @@ -2846,9 +2852,12 @@ int sdhci_add_host(struct sdhci_host *host) · 3 unmodified lines | ||
| 2846 | 2852 | |
| 2847 | 2853 | /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ |
| 2848 | 2854 | host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); |
| 2849 | − if (IS_ERR(host->vqmmc)) { | |
| 2850 | − pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc)); | |
| 2851 | − host->vqmmc = NULL; | |
| 2855 | + if (IS_ERR_OR_NULL(host->vqmmc)) { | |
| 2856 | + if (PTR_ERR(host->vqmmc) < 0) { | |
| 2857 | + pr_info("%s: no vqmmc regulator found\n", | |
| 2858 | + mmc_hostname(mmc)); | |
| 2859 | + host->vqmmc = NULL; | |
| 2860 | + } | |
| 2852 | 2861 | } |
| 2853 | 2862 | else if (regulator_is_supported_voltage(host->vqmmc, 1800000, 1800000)) |
| 2854 | 2863 | regulator_enable(host->vqmmc); |
| @@ -2904,9 +2913,12 @@ int sdhci_add_host(struct sdhci_host *host) · 49 unmodified lines | ||
| 2904 | 2913 | ocr_avail = 0; |
| 2905 | 2914 | |
| 2906 | 2915 | host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); |
| 2907 | − if (IS_ERR(host->vmmc)) { | |
| 2908 | − pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc)); | |
| 2909 | − host->vmmc = NULL; | |
| 2916 | + if (IS_ERR_OR_NULL(host->vmmc)) { | |
| 2917 | + if (PTR_ERR(host->vmmc) < 0) { | |
| 2918 | + pr_info("%s: no vmmc regulator found\n", | |
| 2919 | + mmc_hostname(mmc)); | |
| 2920 | + host->vmmc = NULL; | |
| 2921 | + } | |
| 2910 | 2922 | } else |
| 2911 | 2923 | regulator_enable(host->vmmc); |
| 2912 | 2924 | |
| @@ -278,6 +278,7 @@ struct sdhci_ops { · 277 unmodified lines | ||
| 278 | 278 | void (*hw_reset)(struct sdhci_host *host); |
| 279 | 279 | void (*platform_suspend)(struct sdhci_host *host); |
| 280 | 280 | void (*platform_resume)(struct sdhci_host *host); |
| 281 | + void (*platform_init)(struct sdhci_host *host); | |
| 281 | 282 | }; |
| 282 | 283 | |
| 283 | 284 | #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS |
| @@ -1466,9 +1466,9 @@ static int __devexit sh_mmcif_remove(struct platform_device *pdev) · 1465 unmodified lines | ||
| 1466 | 1466 | |
| 1467 | 1467 | platform_set_drvdata(pdev, NULL); |
| 1468 | 1468 | |
| 1469 | + clk_disable(host->hclk); | |
| 1469 | 1470 | mmc_free_host(host->mmc); |
| 1470 | 1471 | pm_runtime_put_sync(&pdev->dev); |
| 1471 | − clk_disable(host->hclk); | |
| 1472 | 1472 | pm_runtime_disable(&pdev->dev); |
| 1473 | 1473 | |
| 1474 | 1474 | return 0; |
| @@ -1060,7 +1060,7 @@ static ssize_t bonding_store_primary(struct device *d, · 1059 unmodified lines | ||
| 1060 | 1060 | goto out; |
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | − sscanf(buf, "%16s", ifname); /* IFNAMSIZ */ | |
| 1063 | + sscanf(buf, "%15s", ifname); /* IFNAMSIZ */ | |
| 1064 | 1064 | |
| 1065 | 1065 | /* check to see if we are clearing primary */ |
| 1066 | 1066 | if (!strlen(ifname) || buf[0] == '\n') { |
| @@ -1237,7 +1237,7 @@ static ssize_t bonding_store_active_slave(struct device *d, · 170 unmodified lines | ||
| 1237 | 1237 | goto out; |
| 1238 | 1238 | } |
| 1239 | 1239 | |
| 1240 | − sscanf(buf, "%16s", ifname); /* IFNAMSIZ */ | |
| 1240 | + sscanf(buf, "%15s", ifname); /* IFNAMSIZ */ | |
| 1241 | 1241 | |
| 1242 | 1242 | /* check to see if we are clearing active */ |
| 1243 | 1243 | if (!strlen(ifname) || buf[0] == '\n') { |
| @@ -1702,7 +1702,7 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata) · 1701 unmodified lines | ||
| 1702 | 1702 | SHMEM_EEE_ADV_STATUS_SHIFT); |
| 1703 | 1703 | if ((advertised != (eee_cfg & SHMEM_EEE_ADV_STATUS_MASK))) { |
| 1704 | 1704 | DP(BNX2X_MSG_ETHTOOL, |
| 1705 | − "Direct manipulation of EEE advertisment is not supported\n"); | |
| 1705 | + "Direct manipulation of EEE advertisement is not supported\n"); | |
| 1706 | 1706 | return -EINVAL; |
| 1707 | 1707 | } |
| 1708 | 1708 | |
| @@ -137,7 +137,16 @@ · 136 unmodified lines | ||
| 137 | 137 | #define LINK_20GTFD LINK_STATUS_SPEED_AND_DUPLEX_20GTFD |
| 138 | 138 | #define LINK_20GXFD LINK_STATUS_SPEED_AND_DUPLEX_20GXFD |
| 139 | 139 | |
| 140 | − | |
| 140 | +#define LINK_UPDATE_MASK \ | |
| 141 | + (LINK_STATUS_SPEED_AND_DUPLEX_MASK | \ | |
| 142 | + LINK_STATUS_LINK_UP | \ | |
| 143 | + LINK_STATUS_PHYSICAL_LINK_FLAG | \ | |
| 144 | + LINK_STATUS_AUTO_NEGOTIATE_COMPLETE | \ | |
| 145 | + LINK_STATUS_RX_FLOW_CONTROL_FLAG_MASK | \ | |
| 146 | + LINK_STATUS_TX_FLOW_CONTROL_FLAG_MASK | \ | |
| 147 | + LINK_STATUS_PARALLEL_DETECTION_FLAG_MASK | \ | |
| 148 | + LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE | \ | |
| 149 | + LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE) | |
| 141 | 150 | |
| 142 | 151 | #define SFP_EEPROM_CON_TYPE_ADDR 0x2 |
| 143 | 152 | #define SFP_EEPROM_CON_TYPE_VAL_LC 0x7 |
| @@ -3295,6 +3304,21 @@ static void bnx2x_serdes_deassert(struct bnx2x *bp, u8 port) · 3151 unmodified lines | ||
| 3295 | 3304 | DEFAULT_PHY_DEV_ADDR); |
| 3296 | 3305 | } |
| 3297 | 3306 | |
| 3307 | +static void bnx2x_xgxs_specific_func(struct bnx2x_phy *phy, | |
| 3308 | + struct link_params *params, | |
| 3309 | + u32 action) | |
| 3310 | +{ | |
| 3311 | + struct bnx2x *bp = params->bp; | |
| 3312 | + switch (action) { | |
| 3313 | + case PHY_INIT: | |
| 3314 | + /* Set correct devad */ | |
| 3315 | + REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + params->port*0x18, 0); | |
| 3316 | + REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + params->port*0x18, | |
| 3317 | + phy->def_md_devad); | |
| 3318 | + break; | |
| 3319 | + } | |
| 3320 | +} | |
| 3321 | + | |
| 3298 | 3322 | static void bnx2x_xgxs_deassert(struct link_params *params) |
| 3299 | 3323 | { |
| 3300 | 3324 | struct bnx2x *bp = params->bp; |
| @@ -3309,10 +3333,8 @@ static void bnx2x_xgxs_deassert(struct link_params *params) · 8 unmodified lines | ||
| 3309 | 3333 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_CLEAR, val); |
| 3310 | 3334 | udelay(500); |
| 3311 | 3335 | REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_3_SET, val); |
| 3312 | − | |
| 3313 | − REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_ST + port*0x18, 0); | |
| 3314 | − REG_WR(bp, NIG_REG_XGXS0_CTRL_MD_DEVAD + port*0x18, | |
| 3315 | − params->phy[INT_PHY].def_md_devad); | |
| 3336 | + bnx2x_xgxs_specific_func(¶ms->phy[INT_PHY], params, | |
| 3337 | + PHY_INIT); | |
| 3316 | 3338 | } |
| 3317 | 3339 | |
| 3318 | 3340 | static void bnx2x_calc_ieee_aneg_adv(struct bnx2x_phy *phy, |
| @@ -3545,14 +3567,11 @@ static void bnx2x_warpcore_set_lpi_passthrough(struct bnx2x_phy *phy, · 226 unmodified lines | ||
| 3545 | 3567 | static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, |
| 3546 | 3568 | struct link_params *params, |
| 3547 | 3569 | struct link_vars *vars) { |
| 3548 | − u16 val16 = 0, lane, i; | |
| 3570 | + u16 lane, i, cl72_ctrl, an_adv = 0; | |
| 3571 | + u16 ucode_ver; | |
| 3549 | 3572 | struct bnx2x *bp = params->bp; |
| 3550 | 3573 | static struct bnx2x_reg_set reg_set[] = { |
| 3551 | 3574 | {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7}, |
| 3552 | − {MDIO_AN_DEVAD, MDIO_WC_REG_PAR_DET_10G_CTRL, 0}, | |
| 3553 | − {MDIO_WC_DEVAD, MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, 0}, | |
| 3554 | − {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0xff}, | |
| 3555 | − {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0x5555}, | |
| 3556 | 3575 | {MDIO_PMA_DEVAD, MDIO_WC_REG_IEEE0BLK_AUTONEGNP, 0x0}, |
| 3557 | 3576 | {MDIO_WC_DEVAD, MDIO_WC_REG_RX66_CONTROL, 0x7415}, |
| 3558 | 3577 | {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_MISC2, 0x6190}, |
| @@ -3565,12 +3584,19 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, · 6 unmodified lines | ||
| 3565 | 3584 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
| 3566 | 3585 | reg_set[i].val); |
| 3567 | 3586 | |
| 3587 | + bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, | |
| 3588 | + MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, &cl72_ctrl); | |
| 3589 | + cl72_ctrl &= 0xf8ff; | |
| 3590 | + cl72_ctrl |= 0x3800; | |
| 3591 | + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, | |
| 3592 | + MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, cl72_ctrl); | |
| 3593 | + | |
| 3568 | 3594 | /* Check adding advertisement for 1G KX */ |
| 3569 | 3595 | if (((vars->line_speed == SPEED_AUTO_NEG) && |
| 3570 | 3596 | (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_1G)) || |
| 3571 | 3597 | (vars->line_speed == SPEED_1000)) { |
| 3572 | 3598 | u32 addr = MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2; |
| 3573 | − val16 |= (1<<5); | |
| 3599 | + an_adv |= (1<<5); | |
| 3574 | 3600 | |
| 3575 | 3601 | /* Enable CL37 1G Parallel Detect */ |
| 3576 | 3602 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, addr, 0x1); |
| @@ -3580,11 +3606,14 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, · 3 unmodified lines | ||
| 3580 | 3606 | (phy->speed_cap_mask & PORT_HW_CFG_SPEED_CAPABILITY_D0_10G)) || |
| 3581 | 3607 | (vars->line_speed == SPEED_10000)) { |
| 3582 | 3608 | /* Check adding advertisement for 10G KR */ |
| 3583 | − val16 |= (1<<7); | |
| 3609 | + an_adv |= (1<<7); | |
| 3584 | 3610 | /* Enable 10G Parallel Detect */ |
| 3611 | + CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK, | |
| 3612 | + MDIO_AER_BLOCK_AER_REG, 0); | |
| 3613 | + | |
| 3585 | 3614 | bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, |
| 3586 | 3615 | MDIO_WC_REG_PAR_DET_10G_CTRL, 1); |
| 3587 | − | |
| 3616 | + bnx2x_set_aer_mmd(params, phy); | |
| 3588 | 3617 | DP(NETIF_MSG_LINK, "Advertize 10G\n"); |
| 3589 | 3618 | } |
| 3590 | 3619 | |
| @@ -3604,7 +3633,7 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, · 13 unmodified lines | ||
| 3604 | 3633 | |
| 3605 | 3634 | /* Advertised speeds */ |
| 3606 | 3635 | bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, |
| 3607 | − MDIO_WC_REG_AN_IEEE1BLK_AN_ADVERTISEMENT1, val16); | |
| 3636 | + MDIO_WC_REG_AN_IEEE1BLK_AN_ADVERTISEMENT1, an_adv); | |
| 3608 | 3637 | |
| 3609 | 3638 | /* Advertised and set FEC (Forward Error Correction) */ |
| 3610 | 3639 | bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, |
| @@ -3628,9 +3657,10 @@ static void bnx2x_warpcore_enable_AN_KR(struct bnx2x_phy *phy, · 17 unmodified lines | ||
| 3628 | 3657 | /* Set KR Autoneg Work-Around flag for Warpcore version older than D108 |
| 3629 | 3658 | */ |
| 3630 | 3659 | bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, |
| 3631 | − MDIO_WC_REG_UC_INFO_B1_VERSION, &val16); | |
| 3632 | − if (val16 < 0xd108) { | |
| 3633 | − DP(NETIF_MSG_LINK, "Enable AN KR work-around\n"); | |
| 3660 | + MDIO_WC_REG_UC_INFO_B1_VERSION, &ucode_ver); | |
| 3661 | + if (ucode_ver < 0xd108) { | |
| 3662 | + DP(NETIF_MSG_LINK, "Enable AN KR work-around. WC ver:0x%x\n", | |
| 3663 | + ucode_ver); | |
| 3634 | 3664 | vars->rx_tx_asic_rst = MAX_KR_LINK_RETRY; |
| 3635 | 3665 | } |
| 3636 | 3666 | bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, |
| @@ -3651,21 +3681,16 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy, · 14 unmodified lines | ||
| 3651 | 3681 | struct link_vars *vars) |
| 3652 | 3682 | { |
| 3653 | 3683 | struct bnx2x *bp = params->bp; |
| 3654 | − u16 i; | |
| 3684 | + u16 val16, i, lane; | |
| 3655 | 3685 | static struct bnx2x_reg_set reg_set[] = { |
| 3656 | 3686 | /* Disable Autoneg */ |
| 3657 | 3687 | {MDIO_WC_DEVAD, MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X2, 0x7}, |
| 3658 | − {MDIO_AN_DEVAD, MDIO_WC_REG_PAR_DET_10G_CTRL, 0}, | |
| 3659 | 3688 | {MDIO_WC_DEVAD, MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, |
| 3660 | 3689 | 0x3f00}, |
| 3661 | 3690 | {MDIO_AN_DEVAD, MDIO_WC_REG_AN_IEEE1BLK_AN_ADVERTISEMENT1, 0}, |
| 3662 | 3691 | {MDIO_AN_DEVAD, MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x0}, |
| 3663 | 3692 | {MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL3_UP1, 0x1}, |
| 3664 | 3693 | {MDIO_WC_DEVAD, MDIO_WC_REG_DIGITAL5_MISC7, 0xa}, |
| 3665 | − /* Disable CL36 PCS Tx */ | |
| 3666 | − {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL0, 0x0}, | |
| 3667 | − /* Double Wide Single Data Rate @ pll rate */ | |
| 3668 | − {MDIO_WC_DEVAD, MDIO_WC_REG_XGXSBLK1_LANECTRL1, 0xFFFF}, | |
| 3669 | 3694 | /* Leave cl72 training enable, needed for KR */ |
| 3670 | 3695 | {MDIO_PMA_DEVAD, |
| 3671 | 3696 | MDIO_WC_REG_PMD_IEEE9BLK_TENGBASE_KR_PMD_CONTROL_REGISTER_150, |
| @@ -3676,11 +3701,24 @@ static void bnx2x_warpcore_set_10G_KR(struct bnx2x_phy *phy, · 4 unmodified lines | ||
| 3676 | 3701 | bnx2x_cl45_write(bp, phy, reg_set[i].devad, reg_set[i].reg, |
| 3677 | 3702 | reg_set[i].val); |
| 3678 | 3703 | |
| 3679 | − /* Leave CL72 enabled */ | |
| 3680 | − bnx2x_cl45_read_or_write(bp, phy, MDIO_WC_DEVAD, | |
| 3681 | − MDIO_WC_REG_CL72_USERB0_CL72_MISC1_CONTROL, | |
| 3682 | − 0x3800); | |
| 3704 | + lane = bnx2x_get_warpcore_lane(phy, params); | |
| 3705 | + /* Global registers */ | |
| 3706 | + CL22_WR_OVER_CL45(bp, phy, MDIO_REG_BANK_AER_BLOCK, | |
| 3707 | + MDIO_AER_BLOCK_AER_REG, 0); | |
| 3708 | + /* Disable CL36 PCS Tx */ | |
| 3709 | + bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, | |
| 3710 | + MDIO_WC_REG_XGXSBLK1_LANECTRL0, &val16); | |
| 3711 | + val16 &= ~(0x0011 << lane); | |
| 3712 | + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, | |
| 3713 | + MDIO_WC_REG_XGXSBLK1_LANECTRL0, val16); | |
| 3683 | 3714 | |
| 3715 | + bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, | |
| 3716 | + MDIO_WC_REG_XGXSBLK1_LANECTRL1, &val16); | |
| 3717 | + val16 |= (0x0303 << (lane << 1)); | |
| 3718 | + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, | |
| 3719 | + MDIO_WC_REG_XGXSBLK1_LANECTRL1, val16); | |
| 3720 | + /* Restore AER */ | |
| 3721 | + bnx2x_set_aer_mmd(params, phy); | |
| 3684 | 3722 | /* Set speed via PMA/PMD register */ |
| 3685 | 3723 | bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, |
| 3686 | 3724 | MDIO_WC_REG_IEEE0BLK_MIICNTL, 0x2040); |
| @@ -4303,7 +4341,7 @@ static void bnx2x_warpcore_link_reset(struct bnx2x_phy *phy, · 616 unmodified lines | ||
| 4303 | 4341 | struct link_params *params) |
| 4304 | 4342 | { |
| 4305 | 4343 | struct bnx2x *bp = params->bp; |
| 4306 | − u16 val16; | |
| 4344 | + u16 val16, lane; | |
| 4307 | 4345 | bnx2x_sfp_e3_set_transmitter(params, phy, 0); |
| 4308 | 4346 | bnx2x_set_mdio_clk(bp, params->chip_id, params->port); |
| 4309 | 4347 | bnx2x_set_aer_mmd(params, phy); |
| @@ -4340,6 +4378,30 @@ static void bnx2x_warpcore_link_reset(struct bnx2x_phy *phy, · 30 unmodified lines | ||
| 4340 | 4378 | MDIO_WC_REG_XGXSBLK1_LANECTRL2, |
| 4341 | 4379 | val16 & 0xff00); |
| 4342 | 4380 | |
| 4381 | + lane = bnx2x_get_warpcore_lane(phy, params); | |
| 4382 | + /* Disable CL36 PCS Tx */ | |
| 4383 | + bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, | |
| 4384 | + MDIO_WC_REG_XGXSBLK1_LANECTRL0, &val16); | |
| 4385 | + val16 |= (0x11 << lane); | |
| 4386 | + if (phy->flags & FLAGS_WC_DUAL_MODE) | |
| 4387 | + val16 |= (0x22 << lane); | |
| 4388 | + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, | |
| 4389 | + MDIO_WC_REG_XGXSBLK1_LANECTRL0, val16); | |
| 4390 | + | |
| 4391 | + bnx2x_cl45_read(bp, phy, MDIO_WC_DEVAD, | |
| 4392 | + MDIO_WC_REG_XGXSBLK1_LANECTRL1, &val16); | |
| 4393 | + val16 &= ~(0x0303 << (lane << 1)); | |
| 4394 | + val16 |= (0x0101 << (lane << 1)); | |
| 4395 | + if (phy->flags & FLAGS_WC_DUAL_MODE) { | |
| 4396 | + val16 &= ~(0x0c0c << (lane << 1)); | |
| 4397 | + val16 |= (0x0404 << (lane << 1)); | |
| 4398 | + } | |
| 4399 | + | |
| 4400 | + bnx2x_cl45_write(bp, phy, MDIO_WC_DEVAD, | |
| 4401 | + MDIO_WC_REG_XGXSBLK1_LANECTRL1, val16); | |
| 4402 | + /* Restore AER */ | |
| 4403 | + bnx2x_set_aer_mmd(params, phy); | |
| 4404 | + | |
| 4343 | 4405 | } |
| 4344 | 4406 | |
| 4345 | 4407 | static void bnx2x_set_warpcore_loopback(struct bnx2x_phy *phy, |
| @@ -6296,15 +6358,7 @@ static int bnx2x_update_link_down(struct link_params *params, · 1950 unmodified lines | ||
| 6296 | 6358 | vars->mac_type = MAC_TYPE_NONE; |
| 6297 | 6359 | |
| 6298 | 6360 | /* Update shared memory */ |
| 6299 | − vars->link_status &= ~(LINK_STATUS_SPEED_AND_DUPLEX_MASK | | |
| 6300 | − LINK_STATUS_LINK_UP | | |
| 6301 | − LINK_STATUS_PHYSICAL_LINK_FLAG | | |
| 6302 | − LINK_STATUS_AUTO_NEGOTIATE_COMPLETE | | |
| 6303 | − LINK_STATUS_RX_FLOW_CONTROL_FLAG_MASK | | |
| 6304 | − LINK_STATUS_TX_FLOW_CONTROL_FLAG_MASK | | |
| 6305 | − LINK_STATUS_PARALLEL_DETECTION_FLAG_MASK | | |
| 6306 | − LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE | | |
| 6307 | − LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE); | |
| 6361 | + vars->link_status &= ~LINK_UPDATE_MASK; | |
| 6308 | 6362 | vars->line_speed = 0; |
| 6309 | 6363 | bnx2x_update_mng(params, vars->link_status); |
| 6310 | 6364 | |
| @@ -6452,6 +6506,7 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars) · 141 unmodified lines | ||
| 6452 | 6506 | u16 ext_phy_line_speed = 0, prev_line_speed = vars->line_speed; |
| 6453 | 6507 | u8 active_external_phy = INT_PHY; |
| 6454 | 6508 | vars->phy_flags &= ~PHY_HALF_OPEN_CONN_FLAG; |
| 6509 | + vars->link_status &= ~LINK_UPDATE_MASK; | |
| 6455 | 6510 | for (phy_index = INT_PHY; phy_index < params->num_phys; |
| 6456 | 6511 | phy_index++) { |
| 6457 | 6512 | phy_vars[phy_index].flow_ctrl = 0; |
| @@ -7579,7 +7634,7 @@ static void bnx2x_warpcore_power_module(struct link_params *params, · 1121 unmodified lines | ||
| 7579 | 7634 | static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy, |
| 7580 | 7635 | struct link_params *params, |
| 7581 | 7636 | u16 addr, u8 byte_cnt, |
| 7582 | − u8 *o_buf) | |
| 7637 | + u8 *o_buf, u8 is_init) | |
| 7583 | 7638 | { |
| 7584 | 7639 | int rc = 0; |
| 7585 | 7640 | u8 i, j = 0, cnt = 0; |
| @@ -7596,10 +7651,10 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy, · 10 unmodified lines | ||
| 7596 | 7651 | /* 4 byte aligned address */ |
| 7597 | 7652 | addr32 = addr & (~0x3); |
| 7598 | 7653 | do { |
| 7599 | − if (cnt == I2C_WA_PWR_ITER) { | |
| 7654 | + if ((!is_init) && (cnt == I2C_WA_PWR_ITER)) { | |
| 7600 | 7655 | bnx2x_warpcore_power_module(params, phy, 0); |
| 7601 | 7656 | /* Note that 100us are not enough here */ |
| 7602 | − usleep_range(1000,1000); | |
| 7657 | + usleep_range(1000, 2000); | |
| 7603 | 7658 | bnx2x_warpcore_power_module(params, phy, 1); |
| 7604 | 7659 | } |
| 7605 | 7660 | rc = bnx2x_bsc_read(params, phy, 0xa0, addr32, 0, byte_cnt, |
| @@ -7719,7 +7774,7 @@ int bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy, · 113 unmodified lines | ||
| 7719 | 7774 | break; |
| 7720 | 7775 | case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT: |
| 7721 | 7776 | rc = bnx2x_warpcore_read_sfp_module_eeprom(phy, params, addr, |
| 7722 | − byte_cnt, o_buf); | |
| 7777 | + byte_cnt, o_buf, 0); | |
| 7723 | 7778 | break; |
| 7724 | 7779 | } |
| 7725 | 7780 | return rc; |
| @@ -7923,6 +7978,7 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy, · 197 unmodified lines | ||
| 7923 | 7978 | |
| 7924 | 7979 | { |
| 7925 | 7980 | u8 val; |
| 7981 | + int rc; | |
| 7926 | 7982 | struct bnx2x *bp = params->bp; |
| 7927 | 7983 | u16 timeout; |
| 7928 | 7984 | /* Initialization time after hot-plug may take up to 300ms for |
| @@ -7930,8 +7986,14 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy, · 1 unmodified line | ||
| 7930 | 7986 | */ |
| 7931 | 7987 | |
| 7932 | 7988 | for (timeout = 0; timeout < 60; timeout++) { |
| 7933 | − if (bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val) | |
| 7934 | − == 0) { | |
| 7989 | + if (phy->type == PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT) | |
| 7990 | + rc = bnx2x_warpcore_read_sfp_module_eeprom(phy, | |
| 7991 | + params, 1, | |
| 7992 | + 1, &val, 1); | |
| 7993 | + else | |
| 7994 | + rc = bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, | |
| 7995 | + &val); | |
| 7996 | + if (rc == 0) { | |
| 7935 | 7997 | DP(NETIF_MSG_LINK, |
| 7936 | 7998 | "SFP+ module initialization took %d ms\n", |
| 7937 | 7999 | timeout * 5); |
| @@ -7939,7 +8001,8 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy, · 1 unmodified line | ||
| 7939 | 8001 | } |
| 7940 | 8002 | usleep_range(5000, 10000); |
| 7941 | 8003 | } |
| 7942 | − return -EINVAL; | |
| 8004 | + rc = bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val); | |
| 8005 | + return rc; | |
| 7943 | 8006 | } |
| 7944 | 8007 | |
| 7945 | 8008 | static void bnx2x_8727_power_module(struct bnx2x *bp, |
| @@ -9878,7 +9941,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy, · 1932 unmodified lines | ||
| 9878 | 9941 | else |
| 9879 | 9942 | rc = bnx2x_8483x_disable_eee(phy, params, vars); |
| 9880 | 9943 | if (rc) { |
| 9881 | − DP(NETIF_MSG_LINK, "Failed to set EEE advertisment\n"); | |
| 9944 | + DP(NETIF_MSG_LINK, "Failed to set EEE advertisement\n"); | |
| 9882 | 9945 | return rc; |
| 9883 | 9946 | } |
| 9884 | 9947 | } else { |
| @@ -10993,7 +11056,7 @@ static struct bnx2x_phy phy_xgxs = { · 1108 unmodified lines | ||
| 10993 | 11056 | .format_fw_ver = (format_fw_ver_t)NULL, |
| 10994 | 11057 | .hw_reset = (hw_reset_t)NULL, |
| 10995 | 11058 | .set_link_led = (set_link_led_t)NULL, |
| 10996 | − .phy_specific_func = (phy_specific_func_t)NULL | |
| 11059 | + .phy_specific_func = (phy_specific_func_t)bnx2x_xgxs_specific_func | |
| 10997 | 11060 | }; |
| 10998 | 11061 | static struct bnx2x_phy phy_warpcore = { |
| 10999 | 11062 | .type = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT, |
| @@ -11465,6 +11528,11 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port, · 465 unmodified lines | ||
| 11465 | 11528 | phy->media_type = ETH_PHY_BASE_T; |
| 11466 | 11529 | break; |
| 11467 | 11530 | case PORT_HW_CFG_NET_SERDES_IF_XFI: |
| 11531 | + phy->supported &= (SUPPORTED_1000baseT_Full | | |
| 11532 | + SUPPORTED_10000baseT_Full | | |
| 11533 | + SUPPORTED_FIBRE | | |
| 11534 | + SUPPORTED_Pause | | |
| 11535 | + SUPPORTED_Asym_Pause); | |
| 11468 | 11536 | phy->media_type = ETH_PHY_XFP_FIBER; |
| 11469 | 11537 | break; |
| 11470 | 11538 | case PORT_HW_CFG_NET_SERDES_IF_SFI: |
| @@ -12919,7 +12987,7 @@ static u8 bnx2x_analyze_link_error(struct link_params *params, · 1448 unmodified lines | ||
| 12919 | 12987 | DP(NETIF_MSG_LINK, "Analyze TX Fault\n"); |
| 12920 | 12988 | break; |
| 12921 | 12989 | default: |
| 12922 | − DP(NETIF_MSG_LINK, "Analyze UNKOWN\n"); | |
| 12990 | + DP(NETIF_MSG_LINK, "Analyze UNKNOWN\n"); | |
| 12923 | 12991 | } |
| 12924 | 12992 | DP(NETIF_MSG_LINK, "Link changed:[%x %x]->%x\n", vars->link_up, |
| 12925 | 12993 | old_status, status); |
| @@ -6794,8 +6794,9 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) · 6793 unmodified lines | ||
| 6794 | 6794 | |
| 6795 | 6795 | bnx2x_init_block(bp, BLOCK_DORQ, init_phase); |
| 6796 | 6796 | |
| 6797 | + bnx2x_init_block(bp, BLOCK_BRB1, init_phase); | |
| 6798 | + | |
| 6797 | 6799 | if (CHIP_IS_E1(bp) || CHIP_IS_E1H(bp)) { |
| 6798 | − bnx2x_init_block(bp, BLOCK_BRB1, init_phase); | |
| 6799 | 6800 | |
| 6800 | 6801 | if (IS_MF(bp)) |
| 6801 | 6802 | low = ((bp->flags & ONE_PORT_FLAG) ? 160 : 246); |
| @@ -11902,7 +11903,15 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, · 5100 unmodified lines | ||
| 11902 | 11903 | /* disable FCOE L2 queue for E1x */ |
| 11903 | 11904 | if (CHIP_IS_E1x(bp)) |
| 11904 | 11905 | bp->flags |= NO_FCOE_FLAG; |
| 11905 | − | |
| 11906 | + /* disable FCOE for 57840 device, until FW supports it */ | |
| 11907 | + switch (ent->driver_data) { | |
| 11908 | + case BCM57840_O: | |
| 11909 | + case BCM57840_4_10: | |
| 11910 | + case BCM57840_2_20: | |
| 11911 | + case BCM57840_MFO: | |
| 11912 | + case BCM57840_MF: | |
| 11913 | + bp->flags |= NO_FCOE_FLAG; | |
| 11914 | + } | |
| 11906 | 11915 | #endif |
| 11907 | 11916 | |
| 11908 | 11917 | |
| @@ -3415,16 +3415,6 @@ static int adap_init0_config(struct adapter *adapter, int reset) · 3414 unmodified lines | ||
| 3415 | 3415 | "mismatch: [fini] csum=%#x, computed csum=%#x\n", |
| 3416 | 3416 | finicsum, cfcsum); |
| 3417 | 3417 | |
| 3418 | − /* | |
| 3419 | − * If we're a pure NIC driver then disable all offloading facilities. | |
| 3420 | − * This will allow the firmware to optimize aspects of the hardware | |
| 3421 | − * configuration which will result in improved performance. | |
| 3422 | − */ | |
| 3423 | − caps_cmd.ofldcaps = 0; | |
| 3424 | − caps_cmd.iscsicaps = 0; | |
| 3425 | − caps_cmd.rdmacaps = 0; | |
| 3426 | − caps_cmd.fcoecaps = 0; | |
| 3427 | − | |
| 3428 | 3418 | /* |
| 3429 | 3419 | * And now tell the firmware to use the configuration we just loaded. |
| 3430 | 3420 | */ |
| @@ -2519,6 +2519,7 @@ int t4_fw_bye(struct adapter *adap, unsigned int mbox) · 2518 unmodified lines | ||
| 2519 | 2519 | { |
| 2520 | 2520 | struct fw_bye_cmd c; |
| 2521 | 2521 | |
| 2522 | + memset(&c, 0, sizeof(c)); | |
| 2522 | 2523 | INIT_CMD(c, BYE, WRITE); |
| 2523 | 2524 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
| 2524 | 2525 | } |
| @@ -2535,6 +2536,7 @@ int t4_early_init(struct adapter *adap, unsigned int mbox) · 10 unmodified lines | ||
| 2535 | 2536 | { |
| 2536 | 2537 | struct fw_initialize_cmd c; |
| 2537 | 2538 | |
| 2539 | + memset(&c, 0, sizeof(c)); | |
| 2538 | 2540 | INIT_CMD(c, INITIALIZE, WRITE); |
| 2539 | 2541 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
| 2540 | 2542 | } |
| @@ -2551,6 +2553,7 @@ int t4_fw_reset(struct adapter *adap, unsigned int mbox, int reset) · 10 unmodified lines | ||
| 2551 | 2553 | { |
| 2552 | 2554 | struct fw_reset_cmd c; |
| 2553 | 2555 | |
| 2556 | + memset(&c, 0, sizeof(c)); | |
| 2554 | 2557 | INIT_CMD(c, RESET, WRITE); |
| 2555 | 2558 | c.val = htonl(reset); |
| 2556 | 2559 | return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL); |
| @@ -2828,7 +2831,7 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size, · 271 unmodified lines | ||
| 2828 | 2831 | HOSTPAGESIZEPF7(sge_hps)); |
| 2829 | 2832 | |
| 2830 | 2833 | t4_set_reg_field(adap, SGE_CONTROL, |
| 2831 | − INGPADBOUNDARY(INGPADBOUNDARY_MASK) | | |
| 2834 | + INGPADBOUNDARY_MASK | | |
| 2832 | 2835 | EGRSTATUSPAGESIZE_MASK, |
| 2833 | 2836 | INGPADBOUNDARY(fl_align_log - 5) | |
| 2834 | 2837 | EGRSTATUSPAGESIZE(stat_len != 64)); |
| @@ -3278,6 +3281,7 @@ int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid, · 443 unmodified lines | ||
| 3278 | 3281 | { |
| 3279 | 3282 | struct fw_vi_enable_cmd c; |
| 3280 | 3283 | |
| 3284 | + memset(&c, 0, sizeof(c)); | |
| 3281 | 3285 | c.op_to_viid = htonl(FW_CMD_OP(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST | |
| 3282 | 3286 | FW_CMD_EXEC | FW_VI_ENABLE_CMD_VIID(viid)); |
| 3283 | 3287 | c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_LED | FW_LEN16(c)); |
| @@ -1353,8 +1353,11 @@ static int gfar_restore(struct device *dev) · 1352 unmodified lines | ||
| 1353 | 1353 | struct gfar_private *priv = dev_get_drvdata(dev); |
| 1354 | 1354 | struct net_device *ndev = priv->ndev; |
| 1355 | 1355 | |
| 1356 | − if (!netif_running(ndev)) | |
| 1356 | + if (!netif_running(ndev)) { | |
| 1357 | + netif_device_attach(ndev); | |
| 1358 | + | |
| 1357 | 1359 | return 0; |
| 1360 | + } | |
| 1358 | 1361 | |
| 1359 | 1362 | gfar_init_bds(ndev); |
| 1360 | 1363 | init_registers(ndev); |
| @@ -2673,6 +2673,9 @@ static int ixgbe_get_ts_info(struct net_device *dev, · 2672 unmodified lines | ||
| 2673 | 2673 | case ixgbe_mac_X540: |
| 2674 | 2674 | case ixgbe_mac_82599EB: |
| 2675 | 2675 | info->so_timestamping = |
| 2676 | + SOF_TIMESTAMPING_TX_SOFTWARE | | |
| 2677 | + SOF_TIMESTAMPING_RX_SOFTWARE | | |
| 2678 | + SOF_TIMESTAMPING_SOFTWARE | | |
| 2676 | 2679 | SOF_TIMESTAMPING_TX_HARDWARE | |
| 2677 | 2680 | SOF_TIMESTAMPING_RX_HARDWARE | |
| 2678 | 2681 | SOF_TIMESTAMPING_RAW_HARDWARE; |
| @@ -1948,10 +1948,10 @@ jme_close(struct net_device *netdev) · 1947 unmodified lines | ||
| 1948 | 1948 | |
| 1949 | 1949 | JME_NAPI_DISABLE(jme); |
| 1950 | 1950 | |
| 1951 | − tasklet_disable(&jme->linkch_task); | |
| 1952 | − tasklet_disable(&jme->txclean_task); | |
| 1953 | − tasklet_disable(&jme->rxclean_task); | |
| 1954 | − tasklet_disable(&jme->rxempty_task); | |
| 1951 | + tasklet_kill(&jme->linkch_task); | |
| 1952 | + tasklet_kill(&jme->txclean_task); | |
| 1953 | + tasklet_kill(&jme->rxclean_task); | |
| 1954 | + tasklet_kill(&jme->rxempty_task); | |
| 1955 | 1955 | |
| 1956 | 1956 | jme_disable_rx_engine(jme); |
| 1957 | 1957 | jme_disable_tx_engine(jme); |
| @@ -4026,7 +4026,7 @@ static void __devexit skge_remove(struct pci_dev *pdev) · 4025 unmodified lines | ||
| 4026 | 4026 | dev0 = hw->dev[0]; |
| 4027 | 4027 | unregister_netdev(dev0); |
| 4028 | 4028 | |
| 4029 | − tasklet_disable(&hw->phy_task); | |
| 4029 | + tasklet_kill(&hw->phy_task); | |
| 4030 | 4030 | |
| 4031 | 4031 | spin_lock_irq(&hw->hw_lock); |
| 4032 | 4032 | hw->intr_mask = 0; |
| @@ -5407,8 +5407,8 @@ static int netdev_close(struct net_device *dev) · 5406 unmodified lines | ||
| 5407 | 5407 | /* Delay for receive task to stop scheduling itself. */ |
| 5408 | 5408 | msleep(2000 / HZ); |
| 5409 | 5409 | |
| 5410 | − tasklet_disable(&hw_priv->rx_tasklet); | |
| 5411 | − tasklet_disable(&hw_priv->tx_tasklet); | |
| 5410 | + tasklet_kill(&hw_priv->rx_tasklet); | |
| 5411 | + tasklet_kill(&hw_priv->tx_tasklet); | |
| 5412 | 5412 | free_irq(dev->irq, hw_priv->dev); |
| 5413 | 5413 | |
| 5414 | 5414 | transmit_cleanup(hw_priv, 0); |
| @@ -1524,6 +1524,7 @@ static int lpc_eth_drv_remove(struct platform_device *pdev) · 1523 unmodified lines | ||
| 1524 | 1524 | pldat->dma_buff_base_p); |
| 1525 | 1525 | free_irq(ndev->irq, ndev); |
| 1526 | 1526 | iounmap(pldat->net_base); |
| 1527 | + mdiobus_unregister(pldat->mii_bus); | |
| 1527 | 1528 | mdiobus_free(pldat->mii_bus); |
| 1528 | 1529 | clk_disable(pldat->clk); |
| 1529 | 1530 | clk_put(pldat->clk); |
| @@ -3827,6 +3827,8 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp) · 3826 unmodified lines | ||
| 3827 | 3827 | void __iomem *ioaddr = tp->mmio_addr; |
| 3828 | 3828 | |
| 3829 | 3829 | switch (tp->mac_version) { |
| 3830 | + case RTL_GIGA_MAC_VER_25: | |
| 3831 | + case RTL_GIGA_MAC_VER_26: | |
| 3830 | 3832 | case RTL_GIGA_MAC_VER_29: |
| 3831 | 3833 | case RTL_GIGA_MAC_VER_30: |
| 3832 | 3834 | case RTL_GIGA_MAC_VER_32: |
| @@ -4519,6 +4521,9 @@ static void rtl_set_rx_mode(struct net_device *dev) · 686 unmodified lines | ||
| 4519 | 4521 | mc_filter[1] = swab32(data); |
| 4520 | 4522 | } |
| 4521 | 4523 | |
| 4524 | + if (tp->mac_version == RTL_GIGA_MAC_VER_35) | |
| 4525 | + mc_filter[1] = mc_filter[0] = 0xffffffff; | |
| 4526 | + | |
| 4522 | 4527 | RTL_W32(MAR0 + 4, mc_filter[1]); |
| 4523 | 4528 | RTL_W32(MAR0 + 0, mc_filter[0]); |
| 4524 | 4529 | |
| @@ -990,7 +990,7 @@ static int axienet_stop(struct net_device *ndev) · 989 unmodified lines | ||
| 990 | 990 | axienet_setoptions(ndev, lp->options & |
| 991 | 991 | ~(XAE_OPTION_TXEN | XAE_OPTION_RXEN)); |
| 992 | 992 | |
| 993 | − tasklet_disable(&lp->dma_err_tasklet); | |
| 993 | + tasklet_kill(&lp->dma_err_tasklet); | |
| 994 | 994 | |
| 995 | 995 | free_irq(lp->tx_irq, ndev); |
| 996 | 996 | free_irq(lp->rx_irq, ndev); |
| @@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus) · 233 unmodified lines | ||
| 234 | 234 | struct mdiobb_ctrl *ctrl = bus->priv; |
| 235 | 235 | |
| 236 | 236 | module_put(ctrl->ops->owner); |
| 237 | + mdiobus_unregister(bus); | |
| 237 | 238 | mdiobus_free(bus); |
| 238 | 239 | } |
| 239 | 240 | EXPORT_SYMBOL(free_mdio_bitbang); |
| @@ -31,6 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/usb/cdc.h> |
| 32 | 32 | #include <linux/usb/usbnet.h> |
| 33 | 33 | #include <linux/gfp.h> |
| 34 | +#include <linux/if_vlan.h> | |
| 34 | 35 | |
| 35 | 36 | |
| 36 | 37 | /* |
| @@ -92,7 +93,7 @@ static int eem_bind(struct usbnet *dev, struct usb_interface *intf) · 55 unmodified lines | ||
| 92 | 93 | |
| 93 | 94 | /* no jumbogram (16K) support for now */ |
| 94 | 95 | |
| 95 | − dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN; | |
| 96 | + dev->net->hard_header_len += EEM_HEAD + ETH_FCS_LEN + VLAN_HLEN; | |
| 96 | 97 | dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; |
| 97 | 98 | |
| 98 | 99 | return 0; |
| @@ -1344,6 +1344,7 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, · 1343 unmodified lines | ||
| 1344 | 1344 | } else { |
| 1345 | 1345 | u32 csum_preamble = smsc95xx_calc_csum_preamble(skb); |
| 1346 | 1346 | skb_push(skb, 4); |
| 1347 | + cpu_to_le32s(&csum_preamble); | |
| 1347 | 1348 | memcpy(skb->data, &csum_preamble, 4); |
| 1348 | 1349 | } |
| 1349 | 1350 | } |
| @@ -359,10 +359,12 @@ static enum skb_state defer_bh(struct usbnet *dev, struct sk_buff *skb, · 358 unmodified lines | ||
| 359 | 359 | void usbnet_defer_kevent (struct usbnet *dev, int work) |
| 360 | 360 | { |
| 361 | 361 | set_bit (work, &dev->flags); |
| 362 | − if (!schedule_work (&dev->kevent)) | |
| 363 | − netdev_err(dev->net, "kevent %d may have been dropped\n", work); | |
| 364 | − else | |
| 362 | + if (!schedule_work (&dev->kevent)) { | |
| 363 | + if (net_ratelimit()) | |
| 364 | + netdev_err(dev->net, "kevent %d may have been dropped\n", work); | |
| 365 | + } else { | |
| 365 | 366 | netdev_dbg(dev->net, "kevent %d scheduled\n", work); |
| 367 | + } | |
| 366 | 368 | } |
| 367 | 369 | EXPORT_SYMBOL_GPL(usbnet_defer_kevent); |
| 368 | 370 | |
| @@ -744,28 +744,43 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx, · 743 unmodified lines | ||
| 744 | 744 | |
| 745 | 745 | for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { |
| 746 | 746 | const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i]; |
| 747 | + u32 buf_size; | |
| 747 | 748 | |
| 748 | − tbi = tq->buf_info + tq->tx_ring.next2fill; | |
| 749 | − tbi->map_type = VMXNET3_MAP_PAGE; | |
| 750 | − tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag, | |
| 751 | − 0, skb_frag_size(frag), | |
| 752 | − DMA_TO_DEVICE); | |
| 749 | + buf_offset = 0; | |
| 750 | + len = skb_frag_size(frag); | |
| 751 | + while (len) { | |
| 752 | + tbi = tq->buf_info + tq->tx_ring.next2fill; | |
| 753 | + if (len < VMXNET3_MAX_TX_BUF_SIZE) { | |
| 754 | + buf_size = len; | |
| 755 | + dw2 |= len; | |
| 756 | + } else { | |
| 757 | + buf_size = VMXNET3_MAX_TX_BUF_SIZE; | |
| 758 | + /* spec says that for TxDesc.len, 0 == 2^14 */ | |
| 759 | + } | |
| 760 | + tbi->map_type = VMXNET3_MAP_PAGE; | |
| 761 | + tbi->dma_addr = skb_frag_dma_map(&adapter->pdev->dev, frag, | |
| 762 | + buf_offset, buf_size, | |
| 763 | + DMA_TO_DEVICE); | |
| 753 | 764 | |
| 754 | − tbi->len = skb_frag_size(frag); | |
| 765 | + tbi->len = buf_size; | |
| 755 | 766 | |
| 756 | − gdesc = tq->tx_ring.base + tq->tx_ring.next2fill; | |
| 757 | − BUG_ON(gdesc->txd.gen == tq->tx_ring.gen); | |
| 767 | + gdesc = tq->tx_ring.base + tq->tx_ring.next2fill; | |
| 768 | + BUG_ON(gdesc->txd.gen == tq->tx_ring.gen); | |
| 758 | 769 | |
| 759 | − gdesc->txd.addr = cpu_to_le64(tbi->dma_addr); | |
| 760 | − gdesc->dword[2] = cpu_to_le32(dw2 | skb_frag_size(frag)); | |
| 761 | − gdesc->dword[3] = 0; | |
| 770 | + gdesc->txd.addr = cpu_to_le64(tbi->dma_addr); | |
| 771 | + gdesc->dword[2] = cpu_to_le32(dw2); | |
| 772 | + gdesc->dword[3] = 0; | |
| 762 | 773 | |
| 763 | − dev_dbg(&adapter->netdev->dev, | |
| 764 | − "txd[%u]: 0x%llu %u %u\n", | |
| 765 | − tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr), | |
| 766 | − le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]); | |
| 767 | − vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring); | |
| 768 | − dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT; | |
| 774 | + dev_dbg(&adapter->netdev->dev, | |
| 775 | + "txd[%u]: 0x%llu %u %u\n", | |
| 776 | + tq->tx_ring.next2fill, le64_to_cpu(gdesc->txd.addr), | |
| 777 | + le32_to_cpu(gdesc->dword[2]), gdesc->dword[3]); | |
| 778 | + vmxnet3_cmd_ring_adv_next2fill(&tq->tx_ring); | |
| 779 | + dw2 = tq->tx_ring.gen << VMXNET3_TXD_GEN_SHIFT; | |
| 780 | + | |
| 781 | + len -= buf_size; | |
| 782 | + buf_offset += buf_size; | |
| 783 | + } | |
| 769 | 784 | } |
| 770 | 785 | |
| 771 | 786 | ctx->eop_txd = gdesc; |
| @@ -886,6 +901,18 @@ vmxnet3_prepare_tso(struct sk_buff *skb, · 114 unmodified lines | ||
| 886 | 901 | } |
| 887 | 902 | } |
| 888 | 903 | |
| 904 | +static int txd_estimate(const struct sk_buff *skb) | |
| 905 | +{ | |
| 906 | + int count = VMXNET3_TXD_NEEDED(skb_headlen(skb)) + 1; | |
| 907 | + int i; | |
| 908 | + | |
| 909 | + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { | |
| 910 | + const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i]; | |
| 911 | + | |
| 912 | + count += VMXNET3_TXD_NEEDED(skb_frag_size(frag)); | |
| 913 | + } | |
| 914 | + return count; | |
| 915 | +} | |
| 889 | 916 | |
| 890 | 917 | /* |
| 891 | 918 | * Transmits a pkt thru a given tq |
| @@ -914,9 +941,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, · 22 unmodified lines | ||
| 914 | 941 | union Vmxnet3_GenericDesc tempTxDesc; |
| 915 | 942 | #endif |
| 916 | 943 | |
| 917 | − /* conservatively estimate # of descriptors to use */ | |
| 918 | − count = VMXNET3_TXD_NEEDED(skb_headlen(skb)) + | |
| 919 | − skb_shinfo(skb)->nr_frags + 1; | |
| 944 | + count = txd_estimate(skb); | |
| 920 | 945 | |
| 921 | 946 | ctx.ipv4 = (vlan_get_protocol(skb) == cpu_to_be16(ETH_P_IP)); |
| 922 | 947 | |
| @@ -816,7 +816,7 @@ static void vxlan_cleanup(unsigned long arg) · 815 unmodified lines | ||
| 816 | 816 | = container_of(p, struct vxlan_fdb, hlist); |
| 817 | 817 | unsigned long timeout; |
| 818 | 818 | |
| 819 | − if (f->state == NUD_PERMANENT) | |
| 819 | + if (f->state & NUD_PERMANENT) | |
| 820 | 820 | continue; |
| 821 | 821 | |
| 822 | 822 | timeout = f->used + vxlan->age_interval * HZ; |
| @@ -312,6 +312,7 @@ static struct ath_buf *ath_tx_get_buffer(struct ath_softc *sc) · 311 unmodified lines | ||
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | bf = list_first_entry(&sc->tx.txbuf, struct ath_buf, list); |
| 315 | + bf->bf_next = NULL; | |
| 315 | 316 | list_del(&bf->list); |
| 316 | 317 | |
| 317 | 318 | spin_unlock_bh(&sc->tx.txbuflock); |
| @@ -393,7 +394,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, · 75 unmodified lines | ||
| 393 | 394 | u16 seq_st = 0, acked_cnt = 0, txfail_cnt = 0, seq_first; |
| 394 | 395 | u32 ba[WME_BA_BMP_SIZE >> 5]; |
| 395 | 396 | int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0; |
| 396 | − bool rc_update = true; | |
| 397 | + bool rc_update = true, isba; | |
| 397 | 398 | struct ieee80211_tx_rate rates[4]; |
| 398 | 399 | struct ath_frame_info *fi; |
| 399 | 400 | int nframes; |
| @@ -437,13 +438,17 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, · 37 unmodified lines | ||
| 437 | 438 | tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK; |
| 438 | 439 | tid = ATH_AN_2_TID(an, tidno); |
| 439 | 440 | seq_first = tid->seq_start; |
| 441 | + isba = ts->ts_flags & ATH9K_TX_BA; | |
| 440 | 442 | |
| 441 | 443 | /* |
| 442 | 444 | * The hardware occasionally sends a tx status for the wrong TID. |
| 443 | 445 | * In this case, the BA status cannot be considered valid and all |
| 444 | 446 | * subframes need to be retransmitted |
| 447 | + * | |
| 448 | + * Only BlockAcks have a TID and therefore normal Acks cannot be | |
| 449 | + * checked | |
| 445 | 450 | */ |
| 446 | − if (tidno != ts->tid) | |
| 451 | + if (isba && tidno != ts->tid) | |
| 447 | 452 | txok = false; |
| 448 | 453 | |
| 449 | 454 | isaggr = bf_isaggr(bf); |
| @@ -1774,6 +1779,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, · 1324 unmodified lines | ||
| 1774 | 1779 | list_add_tail(&bf->list, &bf_head); |
| 1775 | 1780 | bf->bf_state.bf_type = 0; |
| 1776 | 1781 | |
| 1782 | + bf->bf_next = NULL; | |
| 1777 | 1783 | bf->bf_lastbf = bf; |
| 1778 | 1784 | ath_tx_fill_desc(sc, bf, txq, fi->framelen); |
| 1779 | 1785 | ath_tx_txqaddbuf(sc, txq, &bf_head, false); |
| @@ -382,7 +382,7 @@ static void cancel_transfers(struct b43legacy_pioqueue *queue) · 381 unmodified lines | ||
| 382 | 382 | { |
| 383 | 383 | struct b43legacy_pio_txpacket *packet, *tmp_packet; |
| 384 | 384 | |
| 385 | − tasklet_disable(&queue->txtask); | |
| 385 | + tasklet_kill(&queue->txtask); | |
| 386 | 386 | |
| 387 | 387 | list_for_each_entry_safe(packet, tmp_packet, &queue->txrunning, list) |
| 388 | 388 | free_txpacket(packet, 0); |
| @@ -2449,7 +2449,7 @@ static int rt2800_get_gain_calibration_delta(struct rt2x00_dev *rt2x00dev) · 2448 unmodified lines | ||
| 2449 | 2449 | /* |
| 2450 | 2450 | * Check if temperature compensation is supported. |
| 2451 | 2451 | */ |
| 2452 | − if (tssi_bounds[4] == 0xff) | |
| 2452 | + if (tssi_bounds[4] == 0xff || step == 0xff) | |
| 2453 | 2453 | return 0; |
| 2454 | 2454 | |
| 2455 | 2455 | /* |
| @@ -320,10 +320,7 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *), · 319 unmodified lines | ||
| 320 | 320 | } else |
| 321 | 321 | next = dev->bus_list.next; |
| 322 | 322 | |
| 323 | − /* Run device routines with the device locked */ | |
| 324 | − device_lock(&dev->dev); | |
| 325 | 323 | retval = cb(dev, userdata); |
| 326 | − device_unlock(&dev->dev); | |
| 327 | 324 | if (retval) |
| 328 | 325 | break; |
| 329 | 326 | } |
| @@ -398,6 +398,8 @@ static void pci_device_shutdown(struct device *dev) · 397 unmodified lines | ||
| 398 | 398 | struct pci_dev *pci_dev = to_pci_dev(dev); |
| 399 | 399 | struct pci_driver *drv = pci_dev->driver; |
| 400 | 400 | |
| 401 | + pm_runtime_resume(dev); | |
| 402 | + | |
| 401 | 403 | if (drv && drv->shutdown) |
| 402 | 404 | drv->shutdown(pci_dev); |
| 403 | 405 | pci_msi_shutdown(pci_dev); |
| @@ -408,16 +410,6 @@ static void pci_device_shutdown(struct device *dev) · 4 unmodified lines | ||
| 408 | 410 | * continue to do DMA |
| 409 | 411 | */ |
| 410 | 412 | pci_disable_device(pci_dev); |
| 411 | − | |
| 412 | − /* | |
| 413 | − * Devices may be enabled to wake up by runtime PM, but they need not | |
| 414 | − * be supposed to wake up the system from its "power off" state (e.g. | |
| 415 | − * ACPI S5). Therefore disable wakeup for all devices that aren't | |
| 416 | − * supposed to wake up the system at this point. The state argument | |
| 417 | − * will be ignored by pci_enable_wake(). | |
| 418 | − */ | |
| 419 | − if (!device_may_wakeup(dev)) | |
| 420 | − pci_enable_wake(pci_dev, PCI_UNKNOWN, false); | |
| 421 | 413 | } |
| 422 | 414 | |
| 423 | 415 | #ifdef CONFIG_PM |
| @@ -458,40 +458,6 @@ boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf) · 457 unmodified lines | ||
| 458 | 458 | } |
| 459 | 459 | struct device_attribute vga_attr = __ATTR_RO(boot_vga); |
| 460 | 460 | |
| 461 | −static void | |
| 462 | −pci_config_pm_runtime_get(struct pci_dev *pdev) | |
| 463 | −{ | |
| 464 | − struct device *dev = &pdev->dev; | |
| 465 | − struct device *parent = dev->parent; | |
| 466 | − | |
| 467 | − if (parent) | |
| 468 | − pm_runtime_get_sync(parent); | |
| 469 | − pm_runtime_get_noresume(dev); | |
| 470 | − /* | |
| 471 | − * pdev->current_state is set to PCI_D3cold during suspending, | |
| 472 | − * so wait until suspending completes | |
| 473 | − */ | |
| 474 | − pm_runtime_barrier(dev); | |
| 475 | − /* | |
| 476 | − * Only need to resume devices in D3cold, because config | |
| 477 | − * registers are still accessible for devices suspended but | |
| 478 | − * not in D3cold. | |
| 479 | − */ | |
| 480 | − if (pdev->current_state == PCI_D3cold) | |
| 481 | − pm_runtime_resume(dev); | |
| 482 | −} | |
| 483 | − | |
| 484 | −static void | |
| 485 | −pci_config_pm_runtime_put(struct pci_dev *pdev) | |
| 486 | −{ | |
| 487 | − struct device *dev = &pdev->dev; | |
| 488 | − struct device *parent = dev->parent; | |
| 489 | − | |
| 490 | − pm_runtime_put(dev); | |
| 491 | − if (parent) | |
| 492 | − pm_runtime_put_sync(parent); | |
| 493 | −} | |
| 494 | − | |
| 495 | 461 | static ssize_t |
| 496 | 462 | pci_read_config(struct file *filp, struct kobject *kobj, |
| 497 | 463 | struct bin_attribute *bin_attr, |
| @@ -1858,6 +1858,38 @@ bool pci_dev_run_wake(struct pci_dev *dev) · 1857 unmodified lines | ||
| 1858 | 1858 | } |
| 1859 | 1859 | EXPORT_SYMBOL_GPL(pci_dev_run_wake); |
| 1860 | 1860 | |
| 1861 | +void pci_config_pm_runtime_get(struct pci_dev *pdev) | |
| 1862 | +{ | |
| 1863 | + struct device *dev = &pdev->dev; | |
| 1864 | + struct device *parent = dev->parent; | |
| 1865 | + | |
| 1866 | + if (parent) | |
| 1867 | + pm_runtime_get_sync(parent); | |
| 1868 | + pm_runtime_get_noresume(dev); | |
| 1869 | + /* | |
| 1870 | + * pdev->current_state is set to PCI_D3cold during suspending, | |
| 1871 | + * so wait until suspending completes | |
| 1872 | + */ | |
| 1873 | + pm_runtime_barrier(dev); | |
| 1874 | + /* | |
| 1875 | + * Only need to resume devices in D3cold, because config | |
| 1876 | + * registers are still accessible for devices suspended but | |
| 1877 | + * not in D3cold. | |
| 1878 | + */ | |
| 1879 | + if (pdev->current_state == PCI_D3cold) | |
| 1880 | + pm_runtime_resume(dev); | |
| 1881 | +} | |
| 1882 | + | |
| 1883 | +void pci_config_pm_runtime_put(struct pci_dev *pdev) | |
| 1884 | +{ | |
| 1885 | + struct device *dev = &pdev->dev; | |
| 1886 | + struct device *parent = dev->parent; | |
| 1887 | + | |
| 1888 | + pm_runtime_put(dev); | |
| 1889 | + if (parent) | |
| 1890 | + pm_runtime_put_sync(parent); | |
| 1891 | +} | |
| 1892 | + | |
| 1861 | 1893 | /** |
| 1862 | 1894 | * pci_pm_init - Initialize PM functions of given PCI device |
| 1863 | 1895 | * @dev: PCI device to handle. |
| @@ -72,6 +72,8 @@ extern void pci_disable_enabled_device(struct pci_dev *dev); · 71 unmodified lines | ||
| 72 | 72 | extern int pci_finish_runtime_suspend(struct pci_dev *dev); |
| 73 | 73 | extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign); |
| 74 | 74 | extern void pci_wakeup_bus(struct pci_bus *bus); |
| 75 | +extern void pci_config_pm_runtime_get(struct pci_dev *dev); | |
| 76 | +extern void pci_config_pm_runtime_put(struct pci_dev *dev); | |
| 75 | 77 | extern void pci_pm_init(struct pci_dev *dev); |
| 76 | 78 | extern void platform_pci_wakeup_init(struct pci_dev *dev); |
| 77 | 79 | extern void pci_allocate_cap_save_buffers(struct pci_dev *dev); |
| @@ -213,6 +213,7 @@ static int report_error_detected(struct pci_dev *dev, void *data) · 212 unmodified lines | ||
| 213 | 213 | struct aer_broadcast_data *result_data; |
| 214 | 214 | result_data = (struct aer_broadcast_data *) data; |
| 215 | 215 | |
| 216 | + device_lock(&dev->dev); | |
| 216 | 217 | dev->error_state = result_data->state; |
| 217 | 218 | |
| 218 | 219 | if (!dev->driver || |
| @@ -231,12 +232,14 @@ static int report_error_detected(struct pci_dev *dev, void *data) · 12 unmodified lines | ||
| 231 | 232 | dev->driver ? |
| 232 | 233 | "no AER-aware driver" : "no driver"); |
| 233 | 234 | } |
| 234 | − return 0; | |
| 235 | + goto out; | |
| 235 | 236 | } |
| 236 | 237 | |
| 237 | 238 | err_handler = dev->driver->err_handler; |
| 238 | 239 | vote = err_handler->error_detected(dev, result_data->state); |
| 239 | 240 | result_data->result = merge_result(result_data->result, vote); |
| 241 | +out: | |
| 242 | + device_unlock(&dev->dev); | |
| 240 | 243 | return 0; |
| 241 | 244 | } |
| 242 | 245 | |
| @@ -247,14 +250,17 @@ static int report_mmio_enabled(struct pci_dev *dev, void *data) · 4 unmodified lines | ||
| 247 | 250 | struct aer_broadcast_data *result_data; |
| 248 | 251 | result_data = (struct aer_broadcast_data *) data; |
| 249 | 252 | |
| 253 | + device_lock(&dev->dev); | |
| 250 | 254 | if (!dev->driver || |
| 251 | 255 | !dev->driver->err_handler || |
| 252 | 256 | !dev->driver->err_handler->mmio_enabled) |
| 253 | − return 0; | |
| 257 | + goto out; | |
| 254 | 258 | |
| 255 | 259 | err_handler = dev->driver->err_handler; |
| 256 | 260 | vote = err_handler->mmio_enabled(dev); |
| 257 | 261 | result_data->result = merge_result(result_data->result, vote); |
| 262 | +out: | |
| 263 | + device_unlock(&dev->dev); | |
| 258 | 264 | return 0; |
| 259 | 265 | } |
| 260 | 266 | |
| @@ -265,14 +271,17 @@ static int report_slot_reset(struct pci_dev *dev, void *data) · 4 unmodified lines | ||
| 265 | 271 | struct aer_broadcast_data *result_data; |
| 266 | 272 | result_data = (struct aer_broadcast_data *) data; |
| 267 | 273 | |
| 274 | + device_lock(&dev->dev); | |
| 268 | 275 | if (!dev->driver || |
| 269 | 276 | !dev->driver->err_handler || |
| 270 | 277 | !dev->driver->err_handler->slot_reset) |
| 271 | − return 0; | |
| 278 | + goto out; | |
| 272 | 279 | |
| 273 | 280 | err_handler = dev->driver->err_handler; |
| 274 | 281 | vote = err_handler->slot_reset(dev); |
| 275 | 282 | result_data->result = merge_result(result_data->result, vote); |
| 283 | +out: | |
| 284 | + device_unlock(&dev->dev); | |
| 276 | 285 | return 0; |
| 277 | 286 | } |
| 278 | 287 | |
| @@ -280,15 +289,18 @@ static int report_resume(struct pci_dev *dev, void *data) · 1 unmodified line | ||
| 280 | 289 | { |
| 281 | 290 | const struct pci_error_handlers *err_handler; |
| 282 | 291 | |
| 292 | + device_lock(&dev->dev); | |
| 283 | 293 | dev->error_state = pci_channel_io_normal; |
| 284 | 294 | |
| 285 | 295 | if (!dev->driver || |
| 286 | 296 | !dev->driver->err_handler || |
| 287 | 297 | !dev->driver->err_handler->resume) |
| 288 | − return 0; | |
| 298 | + goto out; | |
| 289 | 299 | |
| 290 | 300 | err_handler = dev->driver->err_handler; |
| 291 | 301 | err_handler->resume(dev); |
| 302 | +out: | |
| 303 | + device_unlock(&dev->dev); | |
| 292 | 304 | return 0; |
| 293 | 305 | } |
| 294 | 306 | |
| @@ -272,7 +272,8 @@ static int get_port_device_capability(struct pci_dev *dev) · 271 unmodified lines | ||
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | /* Hot-Plug Capable */ |
| 275 | − if (cap_mask & PCIE_PORT_SERVICE_HP) { | |
| 275 | + if ((cap_mask & PCIE_PORT_SERVICE_HP) && | |
| 276 | + dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) { | |
| 276 | 277 | pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32); |
| 277 | 278 | if (reg32 & PCI_EXP_SLTCAP_HPC) { |
| 278 | 279 | services |= PCIE_PORT_SERVICE_HP; |
| @@ -76,6 +76,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp · 75 unmodified lines | ||
| 76 | 76 | if (!access_ok(VERIFY_WRITE, buf, cnt)) |
| 77 | 77 | return -EINVAL; |
| 78 | 78 | |
| 79 | + pci_config_pm_runtime_get(dev); | |
| 80 | + | |
| 79 | 81 | if ((pos & 1) && cnt) { |
| 80 | 82 | unsigned char val; |
| 81 | 83 | pci_user_read_config_byte(dev, pos, &val); |
| @@ -121,6 +123,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp · 39 unmodified lines | ||
| 121 | 123 | cnt--; |
| 122 | 124 | } |
| 123 | 125 | |
| 126 | + pci_config_pm_runtime_put(dev); | |
| 127 | + | |
| 124 | 128 | *ppos = pos; |
| 125 | 129 | return nbytes; |
| 126 | 130 | } |
| @@ -146,6 +150,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof · 19 unmodified lines | ||
| 146 | 150 | if (!access_ok(VERIFY_READ, buf, cnt)) |
| 147 | 151 | return -EINVAL; |
| 148 | 152 | |
| 153 | + pci_config_pm_runtime_get(dev); | |
| 154 | + | |
| 149 | 155 | if ((pos & 1) && cnt) { |
| 150 | 156 | unsigned char val; |
| 151 | 157 | __get_user(val, buf); |
| @@ -191,6 +197,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof · 39 unmodified lines | ||
| 191 | 197 | cnt--; |
| 192 | 198 | } |
| 193 | 199 | |
| 200 | + pci_config_pm_runtime_put(dev); | |
| 201 | + | |
| 194 | 202 | *ppos = pos; |
| 195 | 203 | i_size_write(ino, dp->size); |
| 196 | 204 | return nbytes; |
| @@ -179,11 +179,13 @@ config PINCTRL_COH901 · 178 unmodified lines | ||
| 179 | 179 | |
| 180 | 180 | config PINCTRL_SAMSUNG |
| 181 | 181 | bool "Samsung pinctrl driver" |
| 182 | + depends on OF && GPIOLIB | |
| 182 | 183 | select PINMUX |
| 183 | 184 | select PINCONF |
| 184 | 185 | |
| 185 | 186 | config PINCTRL_EXYNOS4 |
| 186 | 187 | bool "Pinctrl driver data for Exynos4 SoC" |
| 188 | + depends on OF && GPIOLIB | |
| 187 | 189 | select PINCTRL_SAMSUNG |
| 188 | 190 | |
| 189 | 191 | config PINCTRL_MVEBU |
| @@ -244,7 +244,7 @@ static int spear_pinctrl_endisable(struct pinctrl_dev *pctldev, · 243 unmodified lines | ||
| 244 | 244 | else |
| 245 | 245 | temp = ~muxreg->val; |
| 246 | 246 | |
| 247 | − val |= temp; | |
| 247 | + val |= muxreg->mask & temp; | |
| 248 | 248 | pmx_writel(pmx, val, muxreg->reg); |
| 249 | 249 | } |
| 250 | 250 | } |
| @@ -25,8 +25,8 @@ static const struct pinctrl_pin_desc spear1310_pins[] = { · 24 unmodified lines | ||
| 25 | 25 | }; |
| 26 | 26 | |
| 27 | 27 | /* registers */ |
| 28 | −#define PERIP_CFG 0x32C | |
| 29 | − #define MCIF_SEL_SHIFT 3 | |
| 28 | +#define PERIP_CFG 0x3B0 | |
| 29 | + #define MCIF_SEL_SHIFT 5 | |
| 30 | 30 | #define MCIF_SEL_SD (0x1 << MCIF_SEL_SHIFT) |
| 31 | 31 | #define MCIF_SEL_CF (0x2 << MCIF_SEL_SHIFT) |
| 32 | 32 | #define MCIF_SEL_XD (0x3 << MCIF_SEL_SHIFT) |
| @@ -164,6 +164,10 @@ static const struct pinctrl_pin_desc spear1310_pins[] = { · 131 unmodified lines | ||
| 164 | 164 | #define PMX_SSP0_CS0_MASK (1 << 29) |
| 165 | 165 | #define PMX_SSP0_CS1_2_MASK (1 << 30) |
| 166 | 166 | |
| 167 | +#define PAD_DIRECTION_SEL_0 0x65C | |
| 168 | +#define PAD_DIRECTION_SEL_1 0x660 | |
| 169 | +#define PAD_DIRECTION_SEL_2 0x664 | |
| 170 | + | |
| 167 | 171 | /* combined macros */ |
| 168 | 172 | #define PMX_GMII_MASK (PMX_GMIICLK_MASK | \ |
| 169 | 173 | PMX_GMIICOL_CRS_XFERER_MIITXCLK_MASK | \ |
| @@ -237,6 +241,10 @@ static struct spear_muxreg i2c0_muxreg[] = { · 67 unmodified lines | ||
| 237 | 241 | .reg = PAD_FUNCTION_EN_0, |
| 238 | 242 | .mask = PMX_I2C0_MASK, |
| 239 | 243 | .val = PMX_I2C0_MASK, |
| 244 | + }, { | |
| 245 | + .reg = PAD_DIRECTION_SEL_0, | |
| 246 | + .mask = PMX_I2C0_MASK, | |
| 247 | + .val = PMX_I2C0_MASK, | |
| 240 | 248 | }, |
| 241 | 249 | }; |
| 242 | 250 | |
| @@ -269,6 +277,10 @@ static struct spear_muxreg ssp0_muxreg[] = { · 26 unmodified lines | ||
| 269 | 277 | .reg = PAD_FUNCTION_EN_0, |
| 270 | 278 | .mask = PMX_SSP0_MASK, |
| 271 | 279 | .val = PMX_SSP0_MASK, |
| 280 | + }, { | |
| 281 | + .reg = PAD_DIRECTION_SEL_0, | |
| 282 | + .mask = PMX_SSP0_MASK, | |
| 283 | + .val = PMX_SSP0_MASK, | |
| 272 | 284 | }, |
| 273 | 285 | }; |
| 274 | 286 | |
| @@ -294,6 +306,10 @@ static struct spear_muxreg ssp0_cs0_muxreg[] = { · 19 unmodified lines | ||
| 294 | 306 | .reg = PAD_FUNCTION_EN_2, |
| 295 | 307 | .mask = PMX_SSP0_CS0_MASK, |
| 296 | 308 | .val = PMX_SSP0_CS0_MASK, |
| 309 | + }, { | |
| 310 | + .reg = PAD_DIRECTION_SEL_2, | |
| 311 | + .mask = PMX_SSP0_CS0_MASK, | |
| 312 | + .val = PMX_SSP0_CS0_MASK, | |
| 297 | 313 | }, |
| 298 | 314 | }; |
| 299 | 315 | |
| @@ -319,6 +335,10 @@ static struct spear_muxreg ssp0_cs1_2_muxreg[] = { · 19 unmodified lines | ||
| 319 | 335 | .reg = PAD_FUNCTION_EN_2, |
| 320 | 336 | .mask = PMX_SSP0_CS1_2_MASK, |
| 321 | 337 | .val = PMX_SSP0_CS1_2_MASK, |
| 338 | + }, { | |
| 339 | + .reg = PAD_DIRECTION_SEL_2, | |
| 340 | + .mask = PMX_SSP0_CS1_2_MASK, | |
| 341 | + .val = PMX_SSP0_CS1_2_MASK, | |
| 322 | 342 | }, |
| 323 | 343 | }; |
| 324 | 344 | |
| @@ -352,6 +372,10 @@ static struct spear_muxreg i2s0_muxreg[] = { · 27 unmodified lines | ||
| 352 | 372 | .reg = PAD_FUNCTION_EN_0, |
| 353 | 373 | .mask = PMX_I2S0_MASK, |
| 354 | 374 | .val = PMX_I2S0_MASK, |
| 375 | + }, { | |
| 376 | + .reg = PAD_DIRECTION_SEL_0, | |
| 377 | + .mask = PMX_I2S0_MASK, | |
| 378 | + .val = PMX_I2S0_MASK, | |
| 355 | 379 | }, |
| 356 | 380 | }; |
| 357 | 381 | |
| @@ -384,6 +408,10 @@ static struct spear_muxreg i2s1_muxreg[] = { · 26 unmodified lines | ||
| 384 | 408 | .reg = PAD_FUNCTION_EN_1, |
| 385 | 409 | .mask = PMX_I2S1_MASK, |
| 386 | 410 | .val = PMX_I2S1_MASK, |
| 411 | + }, { | |
| 412 | + .reg = PAD_DIRECTION_SEL_1, | |
| 413 | + .mask = PMX_I2S1_MASK, | |
| 414 | + .val = PMX_I2S1_MASK, | |
| 387 | 415 | }, |
| 388 | 416 | }; |
| 389 | 417 | |
| @@ -418,6 +446,10 @@ static struct spear_muxreg clcd_muxreg[] = { · 28 unmodified lines | ||
| 418 | 446 | .reg = PAD_FUNCTION_EN_0, |
| 419 | 447 | .mask = PMX_CLCD1_MASK, |
| 420 | 448 | .val = PMX_CLCD1_MASK, |
| 449 | + }, { | |
| 450 | + .reg = PAD_DIRECTION_SEL_0, | |
| 451 | + .mask = PMX_CLCD1_MASK, | |
| 452 | + .val = PMX_CLCD1_MASK, | |
| 421 | 453 | }, |
| 422 | 454 | }; |
| 423 | 455 | |
| @@ -443,6 +475,10 @@ static struct spear_muxreg clcd_high_res_muxreg[] = { · 19 unmodified lines | ||
| 443 | 475 | .reg = PAD_FUNCTION_EN_1, |
| 444 | 476 | .mask = PMX_CLCD2_MASK, |
| 445 | 477 | .val = PMX_CLCD2_MASK, |
| 478 | + }, { | |
| 479 | + .reg = PAD_DIRECTION_SEL_1, | |
| 480 | + .mask = PMX_CLCD2_MASK, | |
| 481 | + .val = PMX_CLCD2_MASK, | |
| 446 | 482 | }, |
| 447 | 483 | }; |
| 448 | 484 | |
| @@ -461,7 +497,7 @@ static struct spear_pingroup clcd_high_res_pingroup = { · 12 unmodified lines | ||
| 461 | 497 | .nmodemuxs = ARRAY_SIZE(clcd_high_res_modemux), |
| 462 | 498 | }; |
| 463 | 499 | |
| 464 | −static const char *const clcd_grps[] = { "clcd_grp", "clcd_high_res" }; | |
| 500 | +static const char *const clcd_grps[] = { "clcd_grp", "clcd_high_res_grp" }; | |
| 465 | 501 | static struct spear_function clcd_function = { |
| 466 | 502 | .name = "clcd", |
| 467 | 503 | .groups = clcd_grps, |
| @@ -479,6 +515,14 @@ static struct spear_muxreg arm_gpio_muxreg[] = { · 11 unmodified lines | ||
| 479 | 515 | .reg = PAD_FUNCTION_EN_1, |
| 480 | 516 | .mask = PMX_EGPIO_1_GRP_MASK, |
| 481 | 517 | .val = PMX_EGPIO_1_GRP_MASK, |
| 518 | + }, { | |
| 519 | + .reg = PAD_DIRECTION_SEL_0, | |
| 520 | + .mask = PMX_EGPIO_0_GRP_MASK, | |
| 521 | + .val = PMX_EGPIO_0_GRP_MASK, | |
| 522 | + }, { | |
| 523 | + .reg = PAD_DIRECTION_SEL_1, | |
| 524 | + .mask = PMX_EGPIO_1_GRP_MASK, | |
| 525 | + .val = PMX_EGPIO_1_GRP_MASK, | |
| 482 | 526 | }, |
| 483 | 527 | }; |
| 484 | 528 | |
| @@ -511,6 +555,10 @@ static struct spear_muxreg smi_2_chips_muxreg[] = { · 26 unmodified lines | ||
| 511 | 555 | .reg = PAD_FUNCTION_EN_0, |
| 512 | 556 | .mask = PMX_SMI_MASK, |
| 513 | 557 | .val = PMX_SMI_MASK, |
| 558 | + }, { | |
| 559 | + .reg = PAD_DIRECTION_SEL_0, | |
| 560 | + .mask = PMX_SMI_MASK, | |
| 561 | + .val = PMX_SMI_MASK, | |
| 514 | 562 | }, |
| 515 | 563 | }; |
| 516 | 564 | |
| @@ -539,6 +587,14 @@ static struct spear_muxreg smi_4_chips_muxreg[] = { · 22 unmodified lines | ||
| 539 | 587 | .reg = PAD_FUNCTION_EN_1, |
| 540 | 588 | .mask = PMX_SMINCS2_MASK | PMX_SMINCS3_MASK, |
| 541 | 589 | .val = PMX_SMINCS2_MASK | PMX_SMINCS3_MASK, |
| 590 | + }, { | |
| 591 | + .reg = PAD_DIRECTION_SEL_0, | |
| 592 | + .mask = PMX_SMI_MASK, | |
| 593 | + .val = PMX_SMI_MASK, | |
| 594 | + }, { | |
| 595 | + .reg = PAD_DIRECTION_SEL_1, | |
| 596 | + .mask = PMX_SMINCS2_MASK | PMX_SMINCS3_MASK, | |
| 597 | + .val = PMX_SMINCS2_MASK | PMX_SMINCS3_MASK, | |
| 542 | 598 | }, |
| 543 | 599 | }; |
| 544 | 600 | |
| @@ -573,6 +629,10 @@ static struct spear_muxreg gmii_muxreg[] = { · 28 unmodified lines | ||
| 573 | 629 | .reg = PAD_FUNCTION_EN_0, |
| 574 | 630 | .mask = PMX_GMII_MASK, |
| 575 | 631 | .val = PMX_GMII_MASK, |
| 632 | + }, { | |
| 633 | + .reg = PAD_DIRECTION_SEL_0, | |
| 634 | + .mask = PMX_GMII_MASK, | |
| 635 | + .val = PMX_GMII_MASK, | |
| 576 | 636 | }, |
| 577 | 637 | }; |
| 578 | 638 | |
| @@ -615,6 +675,18 @@ static struct spear_muxreg rgmii_muxreg[] = { · 36 unmodified lines | ||
| 615 | 675 | .reg = PAD_FUNCTION_EN_2, |
| 616 | 676 | .mask = PMX_RGMII_REG2_MASK, |
| 617 | 677 | .val = 0, |
| 678 | + }, { | |
| 679 | + .reg = PAD_DIRECTION_SEL_0, | |
| 680 | + .mask = PMX_RGMII_REG0_MASK, | |
| 681 | + .val = PMX_RGMII_REG0_MASK, | |
| 682 | + }, { | |
| 683 | + .reg = PAD_DIRECTION_SEL_1, | |
| 684 | + .mask = PMX_RGMII_REG1_MASK, | |
| 685 | + .val = PMX_RGMII_REG1_MASK, | |
| 686 | + }, { | |
| 687 | + .reg = PAD_DIRECTION_SEL_2, | |
| 688 | + .mask = PMX_RGMII_REG2_MASK, | |
| 689 | + .val = PMX_RGMII_REG2_MASK, | |
| 618 | 690 | }, |
| 619 | 691 | }; |
| 620 | 692 | |
| @@ -649,6 +721,10 @@ static struct spear_muxreg smii_0_1_2_muxreg[] = { · 28 unmodified lines | ||
| 649 | 721 | .reg = PAD_FUNCTION_EN_1, |
| 650 | 722 | .mask = PMX_SMII_0_1_2_MASK, |
| 651 | 723 | .val = 0, |
| 724 | + }, { | |
| 725 | + .reg = PAD_DIRECTION_SEL_1, | |
| 726 | + .mask = PMX_SMII_0_1_2_MASK, | |
| 727 | + .val = PMX_SMII_0_1_2_MASK, | |
| 652 | 728 | }, |
| 653 | 729 | }; |
| 654 | 730 | |
| @@ -681,6 +757,10 @@ static struct spear_muxreg ras_mii_txclk_muxreg[] = { · 26 unmodified lines | ||
| 681 | 757 | .reg = PAD_FUNCTION_EN_1, |
| 682 | 758 | .mask = PMX_NFCE2_MASK, |
| 683 | 759 | .val = 0, |
| 760 | + }, { | |
| 761 | + .reg = PAD_DIRECTION_SEL_1, | |
| 762 | + .mask = PMX_NFCE2_MASK, | |
| 763 | + .val = PMX_NFCE2_MASK, | |
| 684 | 764 | }, |
| 685 | 765 | }; |
| 686 | 766 | |
| @@ -721,6 +801,14 @@ static struct spear_muxreg nand_8bit_muxreg[] = { · 34 unmodified lines | ||
| 721 | 801 | .reg = PAD_FUNCTION_EN_1, |
| 722 | 802 | .mask = PMX_NAND8BIT_1_MASK, |
| 723 | 803 | .val = PMX_NAND8BIT_1_MASK, |
| 804 | + }, { | |
| 805 | + .reg = PAD_DIRECTION_SEL_0, | |
| 806 | + .mask = PMX_NAND8BIT_0_MASK, | |
| 807 | + .val = PMX_NAND8BIT_0_MASK, | |
| 808 | + }, { | |
| 809 | + .reg = PAD_DIRECTION_SEL_1, | |
| 810 | + .mask = PMX_NAND8BIT_1_MASK, | |
| 811 | + .val = PMX_NAND8BIT_1_MASK, | |
| 724 | 812 | }, |
| 725 | 813 | }; |
| 726 | 814 | |
| @@ -747,6 +835,10 @@ static struct spear_muxreg nand_16bit_muxreg[] = { · 20 unmodified lines | ||
| 747 | 835 | .reg = PAD_FUNCTION_EN_1, |
| 748 | 836 | .mask = PMX_NAND16BIT_1_MASK, |
| 749 | 837 | .val = PMX_NAND16BIT_1_MASK, |
| 838 | + }, { | |
| 839 | + .reg = PAD_DIRECTION_SEL_1, | |
| 840 | + .mask = PMX_NAND16BIT_1_MASK, | |
| 841 | + .val = PMX_NAND16BIT_1_MASK, | |
| 750 | 842 | }, |
| 751 | 843 | }; |
| 752 | 844 | |
| @@ -772,6 +864,10 @@ static struct spear_muxreg nand_4_chips_muxreg[] = { · 19 unmodified lines | ||
| 772 | 864 | .reg = PAD_FUNCTION_EN_1, |
| 773 | 865 | .mask = PMX_NAND_4CHIPS_MASK, |
| 774 | 866 | .val = PMX_NAND_4CHIPS_MASK, |
| 867 | + }, { | |
| 868 | + .reg = PAD_DIRECTION_SEL_1, | |
| 869 | + .mask = PMX_NAND_4CHIPS_MASK, | |
| 870 | + .val = PMX_NAND_4CHIPS_MASK, | |
| 775 | 871 | }, |
| 776 | 872 | }; |
| 777 | 873 | |
| @@ -833,6 +929,10 @@ static struct spear_muxreg keyboard_rowcol6_8_muxreg[] = { · 55 unmodified lines | ||
| 833 | 929 | .reg = PAD_FUNCTION_EN_1, |
| 834 | 930 | .mask = PMX_KBD_ROWCOL68_MASK, |
| 835 | 931 | .val = PMX_KBD_ROWCOL68_MASK, |
| 932 | + }, { | |
| 933 | + .reg = PAD_DIRECTION_SEL_1, | |
| 934 | + .mask = PMX_KBD_ROWCOL68_MASK, | |
| 935 | + .val = PMX_KBD_ROWCOL68_MASK, | |
| 836 | 936 | }, |
| 837 | 937 | }; |
| 838 | 938 | |
| @@ -866,6 +966,10 @@ static struct spear_muxreg uart0_muxreg[] = { · 27 unmodified lines | ||
| 866 | 966 | .reg = PAD_FUNCTION_EN_0, |
| 867 | 967 | .mask = PMX_UART0_MASK, |
| 868 | 968 | .val = PMX_UART0_MASK, |
| 969 | + }, { | |
| 970 | + .reg = PAD_DIRECTION_SEL_0, | |
| 971 | + .mask = PMX_UART0_MASK, | |
| 972 | + .val = PMX_UART0_MASK, | |
| 869 | 973 | }, |
| 870 | 974 | }; |
| 871 | 975 | |
| @@ -891,6 +995,10 @@ static struct spear_muxreg uart0_modem_muxreg[] = { · 19 unmodified lines | ||
| 891 | 995 | .reg = PAD_FUNCTION_EN_1, |
| 892 | 996 | .mask = PMX_UART0_MODEM_MASK, |
| 893 | 997 | .val = PMX_UART0_MODEM_MASK, |
| 998 | + }, { | |
| 999 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1000 | + .mask = PMX_UART0_MODEM_MASK, | |
| 1001 | + .val = PMX_UART0_MODEM_MASK, | |
| 894 | 1002 | }, |
| 895 | 1003 | }; |
| 896 | 1004 | |
| @@ -923,6 +1031,10 @@ static struct spear_muxreg gpt0_tmr0_muxreg[] = { · 26 unmodified lines | ||
| 923 | 1031 | .reg = PAD_FUNCTION_EN_1, |
| 924 | 1032 | .mask = PMX_GPT0_TMR0_MASK, |
| 925 | 1033 | .val = PMX_GPT0_TMR0_MASK, |
| 1034 | + }, { | |
| 1035 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1036 | + .mask = PMX_GPT0_TMR0_MASK, | |
| 1037 | + .val = PMX_GPT0_TMR0_MASK, | |
| 926 | 1038 | }, |
| 927 | 1039 | }; |
| 928 | 1040 | |
| @@ -948,6 +1060,10 @@ static struct spear_muxreg gpt0_tmr1_muxreg[] = { · 19 unmodified lines | ||
| 948 | 1060 | .reg = PAD_FUNCTION_EN_1, |
| 949 | 1061 | .mask = PMX_GPT0_TMR1_MASK, |
| 950 | 1062 | .val = PMX_GPT0_TMR1_MASK, |
| 1063 | + }, { | |
| 1064 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1065 | + .mask = PMX_GPT0_TMR1_MASK, | |
| 1066 | + .val = PMX_GPT0_TMR1_MASK, | |
| 951 | 1067 | }, |
| 952 | 1068 | }; |
| 953 | 1069 | |
| @@ -980,6 +1096,10 @@ static struct spear_muxreg gpt1_tmr0_muxreg[] = { · 26 unmodified lines | ||
| 980 | 1096 | .reg = PAD_FUNCTION_EN_1, |
| 981 | 1097 | .mask = PMX_GPT1_TMR0_MASK, |
| 982 | 1098 | .val = PMX_GPT1_TMR0_MASK, |
| 1099 | + }, { | |
| 1100 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1101 | + .mask = PMX_GPT1_TMR0_MASK, | |
| 1102 | + .val = PMX_GPT1_TMR0_MASK, | |
| 983 | 1103 | }, |
| 984 | 1104 | }; |
| 985 | 1105 | |
| @@ -1005,6 +1125,10 @@ static struct spear_muxreg gpt1_tmr1_muxreg[] = { · 19 unmodified lines | ||
| 1005 | 1125 | .reg = PAD_FUNCTION_EN_1, |
| 1006 | 1126 | .mask = PMX_GPT1_TMR1_MASK, |
| 1007 | 1127 | .val = PMX_GPT1_TMR1_MASK, |
| 1128 | + }, { | |
| 1129 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1130 | + .mask = PMX_GPT1_TMR1_MASK, | |
| 1131 | + .val = PMX_GPT1_TMR1_MASK, | |
| 1008 | 1132 | }, |
| 1009 | 1133 | }; |
| 1010 | 1134 | |
| @@ -1049,6 +1173,20 @@ static const unsigned mcif_pins[] = { 86, 87, 88, 89, 90, 91, 92, 93, 213, 214, · 38 unmodified lines | ||
| 1049 | 1173 | .reg = PAD_FUNCTION_EN_2, \ |
| 1050 | 1174 | .mask = PMX_MCIFALL_2_MASK, \ |
| 1051 | 1175 | .val = PMX_MCIFALL_2_MASK, \ |
| 1176 | + }, { \ | |
| 1177 | + .reg = PAD_DIRECTION_SEL_0, \ | |
| 1178 | + .mask = PMX_MCI_DATA8_15_MASK, \ | |
| 1179 | + .val = PMX_MCI_DATA8_15_MASK, \ | |
| 1180 | + }, { \ | |
| 1181 | + .reg = PAD_DIRECTION_SEL_1, \ | |
| 1182 | + .mask = PMX_MCIFALL_1_MASK | PMX_NFWPRT1_MASK | \ | |
| 1183 | + PMX_NFWPRT2_MASK, \ | |
| 1184 | + .val = PMX_MCIFALL_1_MASK | PMX_NFWPRT1_MASK | \ | |
| 1185 | + PMX_NFWPRT2_MASK, \ | |
| 1186 | + }, { \ | |
| 1187 | + .reg = PAD_DIRECTION_SEL_2, \ | |
| 1188 | + .mask = PMX_MCIFALL_2_MASK, \ | |
| 1189 | + .val = PMX_MCIFALL_2_MASK, \ | |
| 1052 | 1190 | } |
| 1053 | 1191 | |
| 1054 | 1192 | /* sdhci device */ |
| @@ -1154,6 +1292,10 @@ static struct spear_muxreg touch_xy_muxreg[] = { · 99 unmodified lines | ||
| 1154 | 1292 | .reg = PAD_FUNCTION_EN_2, |
| 1155 | 1293 | .mask = PMX_TOUCH_XY_MASK, |
| 1156 | 1294 | .val = PMX_TOUCH_XY_MASK, |
| 1295 | + }, { | |
| 1296 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1297 | + .mask = PMX_TOUCH_XY_MASK, | |
| 1298 | + .val = PMX_TOUCH_XY_MASK, | |
| 1157 | 1299 | }, |
| 1158 | 1300 | }; |
| 1159 | 1301 | |
| @@ -1187,6 +1329,10 @@ static struct spear_muxreg uart1_dis_i2c_muxreg[] = { · 27 unmodified lines | ||
| 1187 | 1329 | .reg = PAD_FUNCTION_EN_0, |
| 1188 | 1330 | .mask = PMX_I2C0_MASK, |
| 1189 | 1331 | .val = 0, |
| 1332 | + }, { | |
| 1333 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1334 | + .mask = PMX_I2C0_MASK, | |
| 1335 | + .val = PMX_I2C0_MASK, | |
| 1190 | 1336 | }, |
| 1191 | 1337 | }; |
| 1192 | 1338 | |
| @@ -1213,6 +1359,12 @@ static struct spear_muxreg uart1_dis_sd_muxreg[] = { · 20 unmodified lines | ||
| 1213 | 1359 | .mask = PMX_MCIDATA1_MASK | |
| 1214 | 1360 | PMX_MCIDATA2_MASK, |
| 1215 | 1361 | .val = 0, |
| 1362 | + }, { | |
| 1363 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1364 | + .mask = PMX_MCIDATA1_MASK | | |
| 1365 | + PMX_MCIDATA2_MASK, | |
| 1366 | + .val = PMX_MCIDATA1_MASK | | |
| 1367 | + PMX_MCIDATA2_MASK, | |
| 1216 | 1368 | }, |
| 1217 | 1369 | }; |
| 1218 | 1370 | |
| @@ -1246,6 +1398,10 @@ static struct spear_muxreg uart2_3_muxreg[] = { · 27 unmodified lines | ||
| 1246 | 1398 | .reg = PAD_FUNCTION_EN_0, |
| 1247 | 1399 | .mask = PMX_I2S0_MASK, |
| 1248 | 1400 | .val = 0, |
| 1401 | + }, { | |
| 1402 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1403 | + .mask = PMX_I2S0_MASK, | |
| 1404 | + .val = PMX_I2S0_MASK, | |
| 1249 | 1405 | }, |
| 1250 | 1406 | }; |
| 1251 | 1407 | |
| @@ -1278,6 +1434,10 @@ static struct spear_muxreg uart4_muxreg[] = { · 26 unmodified lines | ||
| 1278 | 1434 | .reg = PAD_FUNCTION_EN_0, |
| 1279 | 1435 | .mask = PMX_I2S0_MASK | PMX_CLCD1_MASK, |
| 1280 | 1436 | .val = 0, |
| 1437 | + }, { | |
| 1438 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1439 | + .mask = PMX_I2S0_MASK | PMX_CLCD1_MASK, | |
| 1440 | + .val = PMX_I2S0_MASK | PMX_CLCD1_MASK, | |
| 1281 | 1441 | }, |
| 1282 | 1442 | }; |
| 1283 | 1443 | |
| @@ -1310,6 +1470,10 @@ static struct spear_muxreg uart5_muxreg[] = { · 26 unmodified lines | ||
| 1310 | 1470 | .reg = PAD_FUNCTION_EN_0, |
| 1311 | 1471 | .mask = PMX_CLCD1_MASK, |
| 1312 | 1472 | .val = 0, |
| 1473 | + }, { | |
| 1474 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1475 | + .mask = PMX_CLCD1_MASK, | |
| 1476 | + .val = PMX_CLCD1_MASK, | |
| 1313 | 1477 | }, |
| 1314 | 1478 | }; |
| 1315 | 1479 | |
| @@ -1344,6 +1508,10 @@ static struct spear_muxreg rs485_0_1_tdm_0_1_muxreg[] = { · 28 unmodified lines | ||
| 1344 | 1508 | .reg = PAD_FUNCTION_EN_0, |
| 1345 | 1509 | .mask = PMX_CLCD1_MASK, |
| 1346 | 1510 | .val = 0, |
| 1511 | + }, { | |
| 1512 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1513 | + .mask = PMX_CLCD1_MASK, | |
| 1514 | + .val = PMX_CLCD1_MASK, | |
| 1347 | 1515 | }, |
| 1348 | 1516 | }; |
| 1349 | 1517 | |
| @@ -1376,6 +1544,10 @@ static struct spear_muxreg i2c_1_2_muxreg[] = { · 26 unmodified lines | ||
| 1376 | 1544 | .reg = PAD_FUNCTION_EN_0, |
| 1377 | 1545 | .mask = PMX_CLCD1_MASK, |
| 1378 | 1546 | .val = 0, |
| 1547 | + }, { | |
| 1548 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1549 | + .mask = PMX_CLCD1_MASK, | |
| 1550 | + .val = PMX_CLCD1_MASK, | |
| 1379 | 1551 | }, |
| 1380 | 1552 | }; |
| 1381 | 1553 | |
| @@ -1409,6 +1581,10 @@ static struct spear_muxreg i2c3_dis_smi_clcd_muxreg[] = { · 27 unmodified lines | ||
| 1409 | 1581 | .reg = PAD_FUNCTION_EN_0, |
| 1410 | 1582 | .mask = PMX_CLCD1_MASK | PMX_SMI_MASK, |
| 1411 | 1583 | .val = 0, |
| 1584 | + }, { | |
| 1585 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1586 | + .mask = PMX_CLCD1_MASK | PMX_SMI_MASK, | |
| 1587 | + .val = PMX_CLCD1_MASK | PMX_SMI_MASK, | |
| 1412 | 1588 | }, |
| 1413 | 1589 | }; |
| 1414 | 1590 | |
| @@ -1435,6 +1611,10 @@ static struct spear_muxreg i2c3_dis_sd_i2s0_muxreg[] = { · 20 unmodified lines | ||
| 1435 | 1611 | .reg = PAD_FUNCTION_EN_1, |
| 1436 | 1612 | .mask = PMX_I2S1_MASK | PMX_MCIDATA3_MASK, |
| 1437 | 1613 | .val = 0, |
| 1614 | + }, { | |
| 1615 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1616 | + .mask = PMX_I2S1_MASK | PMX_MCIDATA3_MASK, | |
| 1617 | + .val = PMX_I2S1_MASK | PMX_MCIDATA3_MASK, | |
| 1438 | 1618 | }, |
| 1439 | 1619 | }; |
| 1440 | 1620 | |
| @@ -1469,6 +1649,10 @@ static struct spear_muxreg i2c_4_5_dis_smi_muxreg[] = { · 28 unmodified lines | ||
| 1469 | 1649 | .reg = PAD_FUNCTION_EN_0, |
| 1470 | 1650 | .mask = PMX_SMI_MASK, |
| 1471 | 1651 | .val = 0, |
| 1652 | + }, { | |
| 1653 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1654 | + .mask = PMX_SMI_MASK, | |
| 1655 | + .val = PMX_SMI_MASK, | |
| 1472 | 1656 | }, |
| 1473 | 1657 | }; |
| 1474 | 1658 | |
| @@ -1499,6 +1683,14 @@ static struct spear_muxreg i2c4_dis_sd_muxreg[] = { · 24 unmodified lines | ||
| 1499 | 1683 | .reg = PAD_FUNCTION_EN_2, |
| 1500 | 1684 | .mask = PMX_MCIDATA5_MASK, |
| 1501 | 1685 | .val = 0, |
| 1686 | + }, { | |
| 1687 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1688 | + .mask = PMX_MCIDATA4_MASK, | |
| 1689 | + .val = PMX_MCIDATA4_MASK, | |
| 1690 | + }, { | |
| 1691 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1692 | + .mask = PMX_MCIDATA5_MASK, | |
| 1693 | + .val = PMX_MCIDATA5_MASK, | |
| 1502 | 1694 | }, |
| 1503 | 1695 | }; |
| 1504 | 1696 | |
| @@ -1526,6 +1718,12 @@ static struct spear_muxreg i2c5_dis_sd_muxreg[] = { · 21 unmodified lines | ||
| 1526 | 1718 | .mask = PMX_MCIDATA6_MASK | |
| 1527 | 1719 | PMX_MCIDATA7_MASK, |
| 1528 | 1720 | .val = 0, |
| 1721 | + }, { | |
| 1722 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1723 | + .mask = PMX_MCIDATA6_MASK | | |
| 1724 | + PMX_MCIDATA7_MASK, | |
| 1725 | + .val = PMX_MCIDATA6_MASK | | |
| 1726 | + PMX_MCIDATA7_MASK, | |
| 1529 | 1727 | }, |
| 1530 | 1728 | }; |
| 1531 | 1729 | |
| @@ -1560,6 +1758,10 @@ static struct spear_muxreg i2c_6_7_dis_kbd_muxreg[] = { · 28 unmodified lines | ||
| 1560 | 1758 | .reg = PAD_FUNCTION_EN_1, |
| 1561 | 1759 | .mask = PMX_KBD_ROWCOL25_MASK, |
| 1562 | 1760 | .val = 0, |
| 1761 | + }, { | |
| 1762 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1763 | + .mask = PMX_KBD_ROWCOL25_MASK, | |
| 1764 | + .val = PMX_KBD_ROWCOL25_MASK, | |
| 1563 | 1765 | }, |
| 1564 | 1766 | }; |
| 1565 | 1767 | |
| @@ -1587,6 +1789,12 @@ static struct spear_muxreg i2c6_dis_sd_muxreg[] = { · 21 unmodified lines | ||
| 1587 | 1789 | .mask = PMX_MCIIORDRE_MASK | |
| 1588 | 1790 | PMX_MCIIOWRWE_MASK, |
| 1589 | 1791 | .val = 0, |
| 1792 | + }, { | |
| 1793 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1794 | + .mask = PMX_MCIIORDRE_MASK | | |
| 1795 | + PMX_MCIIOWRWE_MASK, | |
| 1796 | + .val = PMX_MCIIORDRE_MASK | | |
| 1797 | + PMX_MCIIOWRWE_MASK, | |
| 1590 | 1798 | }, |
| 1591 | 1799 | }; |
| 1592 | 1800 | |
| @@ -1613,6 +1821,12 @@ static struct spear_muxreg i2c7_dis_sd_muxreg[] = { · 20 unmodified lines | ||
| 1613 | 1821 | .mask = PMX_MCIRESETCF_MASK | |
| 1614 | 1822 | PMX_MCICS0CE_MASK, |
| 1615 | 1823 | .val = 0, |
| 1824 | + }, { | |
| 1825 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1826 | + .mask = PMX_MCIRESETCF_MASK | | |
| 1827 | + PMX_MCICS0CE_MASK, | |
| 1828 | + .val = PMX_MCIRESETCF_MASK | | |
| 1829 | + PMX_MCICS0CE_MASK, | |
| 1616 | 1830 | }, |
| 1617 | 1831 | }; |
| 1618 | 1832 | |
| @@ -1651,6 +1865,14 @@ static struct spear_muxreg can0_dis_nor_muxreg[] = { · 32 unmodified lines | ||
| 1651 | 1865 | .reg = PAD_FUNCTION_EN_1, |
| 1652 | 1866 | .mask = PMX_NFRSTPWDWN3_MASK, |
| 1653 | 1867 | .val = 0, |
| 1868 | + }, { | |
| 1869 | + .reg = PAD_DIRECTION_SEL_0, | |
| 1870 | + .mask = PMX_NFRSTPWDWN2_MASK, | |
| 1871 | + .val = PMX_NFRSTPWDWN2_MASK, | |
| 1872 | + }, { | |
| 1873 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1874 | + .mask = PMX_NFRSTPWDWN3_MASK, | |
| 1875 | + .val = PMX_NFRSTPWDWN3_MASK, | |
| 1654 | 1876 | }, |
| 1655 | 1877 | }; |
| 1656 | 1878 | |
| @@ -1677,6 +1899,10 @@ static struct spear_muxreg can0_dis_sd_muxreg[] = { · 20 unmodified lines | ||
| 1677 | 1899 | .reg = PAD_FUNCTION_EN_2, |
| 1678 | 1900 | .mask = PMX_MCICFINTR_MASK | PMX_MCIIORDY_MASK, |
| 1679 | 1901 | .val = 0, |
| 1902 | + }, { | |
| 1903 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1904 | + .mask = PMX_MCICFINTR_MASK | PMX_MCIIORDY_MASK, | |
| 1905 | + .val = PMX_MCICFINTR_MASK | PMX_MCIIORDY_MASK, | |
| 1680 | 1906 | }, |
| 1681 | 1907 | }; |
| 1682 | 1908 | |
| @@ -1711,6 +1937,10 @@ static struct spear_muxreg can1_dis_sd_muxreg[] = { · 28 unmodified lines | ||
| 1711 | 1937 | .reg = PAD_FUNCTION_EN_2, |
| 1712 | 1938 | .mask = PMX_MCICS1_MASK | PMX_MCIDMAACK_MASK, |
| 1713 | 1939 | .val = 0, |
| 1940 | + }, { | |
| 1941 | + .reg = PAD_DIRECTION_SEL_2, | |
| 1942 | + .mask = PMX_MCICS1_MASK | PMX_MCIDMAACK_MASK, | |
| 1943 | + .val = PMX_MCICS1_MASK | PMX_MCIDMAACK_MASK, | |
| 1714 | 1944 | }, |
| 1715 | 1945 | }; |
| 1716 | 1946 | |
| @@ -1737,6 +1967,10 @@ static struct spear_muxreg can1_dis_kbd_muxreg[] = { · 20 unmodified lines | ||
| 1737 | 1967 | .reg = PAD_FUNCTION_EN_1, |
| 1738 | 1968 | .mask = PMX_KBD_ROWCOL25_MASK, |
| 1739 | 1969 | .val = 0, |
| 1970 | + }, { | |
| 1971 | + .reg = PAD_DIRECTION_SEL_1, | |
| 1972 | + .mask = PMX_KBD_ROWCOL25_MASK, | |
| 1973 | + .val = PMX_KBD_ROWCOL25_MASK, | |
| 1740 | 1974 | }, |
| 1741 | 1975 | }; |
| 1742 | 1976 | |
| @@ -1763,29 +1997,64 @@ static struct spear_function can1_function = { · 20 unmodified lines | ||
| 1763 | 1997 | .ngroups = ARRAY_SIZE(can1_grps), |
| 1764 | 1998 | }; |
| 1765 | 1999 | |
| 1766 | −/* Pad multiplexing for pci device */ | |
| 1767 | −static const unsigned pci_sata_pins[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 18, | |
| 2000 | +/* Pad multiplexing for (ras-ip) pci device */ | |
| 2001 | +static const unsigned pci_pins[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 18, | |
| 1768 | 2002 | 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, |
| 1769 | 2003 | 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, |
| 1770 | 2004 | 55, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 }; |
| 1771 | −#define PCI_SATA_MUXREG \ | |
| 1772 | − { \ | |
| 1773 | − .reg = PAD_FUNCTION_EN_0, \ | |
| 1774 | − .mask = PMX_MCI_DATA8_15_MASK, \ | |
| 1775 | − .val = 0, \ | |
| 1776 | − }, { \ | |
| 1777 | − .reg = PAD_FUNCTION_EN_1, \ | |
| 1778 | − .mask = PMX_PCI_REG1_MASK, \ | |
| 1779 | − .val = 0, \ | |
| 1780 | − }, { \ | |
| 1781 | − .reg = PAD_FUNCTION_EN_2, \ | |
| 1782 | − .mask = PMX_PCI_REG2_MASK, \ | |
| 1783 | − .val = 0, \ | |
| 1784 | − } | |
| 1785 | 2005 | |
| 1786 | −/* pad multiplexing for pcie0 device */ | |
| 2006 | +static struct spear_muxreg pci_muxreg[] = { | |
| 2007 | + { | |
| 2008 | + .reg = PAD_FUNCTION_EN_0, | |
| 2009 | + .mask = PMX_MCI_DATA8_15_MASK, | |
| 2010 | + .val = 0, | |
| 2011 | + }, { | |
| 2012 | + .reg = PAD_FUNCTION_EN_1, | |
| 2013 | + .mask = PMX_PCI_REG1_MASK, | |
| 2014 | + .val = 0, | |
| 2015 | + }, { | |
| 2016 | + .reg = PAD_FUNCTION_EN_2, | |
| 2017 | + .mask = PMX_PCI_REG2_MASK, | |
| 2018 | + .val = 0, | |
| 2019 | + }, { | |
| 2020 | + .reg = PAD_DIRECTION_SEL_0, | |
| 2021 | + .mask = PMX_MCI_DATA8_15_MASK, | |
| 2022 | + .val = PMX_MCI_DATA8_15_MASK, | |
| 2023 | + }, { | |
| 2024 | + .reg = PAD_DIRECTION_SEL_1, | |
| 2025 | + .mask = PMX_PCI_REG1_MASK, | |
| 2026 | + .val = PMX_PCI_REG1_MASK, | |
| 2027 | + }, { | |
| 2028 | + .reg = PAD_DIRECTION_SEL_2, | |
| 2029 | + .mask = PMX_PCI_REG2_MASK, | |
| 2030 | + .val = PMX_PCI_REG2_MASK, | |
| 2031 | + }, | |
| 2032 | +}; | |
| 2033 | + | |
| 2034 | +static struct spear_modemux pci_modemux[] = { | |
| 2035 | + { | |
| 2036 | + .muxregs = pci_muxreg, | |
| 2037 | + .nmuxregs = ARRAY_SIZE(pci_muxreg), | |
| 2038 | + }, | |
| 2039 | +}; | |
| 2040 | + | |
| 2041 | +static struct spear_pingroup pci_pingroup = { | |
| 2042 | + .name = "pci_grp", | |
| 2043 | + .pins = pci_pins, | |
| 2044 | + .npins = ARRAY_SIZE(pci_pins), | |
| 2045 | + .modemuxs = pci_modemux, | |
| 2046 | + .nmodemuxs = ARRAY_SIZE(pci_modemux), | |
| 2047 | +}; | |
| 2048 | + | |
| 2049 | +static const char *const pci_grps[] = { "pci_grp" }; | |
| 2050 | +static struct spear_function pci_function = { | |
| 2051 | + .name = "pci", | |
| 2052 | + .groups = pci_grps, | |
| 2053 | + .ngroups = ARRAY_SIZE(pci_grps), | |
| 2054 | +}; | |
| 2055 | + | |
| 2056 | +/* pad multiplexing for (fix-part) pcie0 device */ | |
| 1787 | 2057 | static struct spear_muxreg pcie0_muxreg[] = { |
| 1788 | − PCI_SATA_MUXREG, | |
| 1789 | 2058 | { |
| 1790 | 2059 | .reg = PCIE_SATA_CFG, |
| 1791 | 2060 | .mask = PCIE_CFG_VAL(0), |
| @@ -1802,15 +2071,12 @@ static struct spear_modemux pcie0_modemux[] = { · 10 unmodified lines | ||
| 1802 | 2071 | |
| 1803 | 2072 | static struct spear_pingroup pcie0_pingroup = { |
| 1804 | 2073 | .name = "pcie0_grp", |
| 1805 | − .pins = pci_sata_pins, | |
| 1806 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1807 | 2074 | .modemuxs = pcie0_modemux, |
| 1808 | 2075 | .nmodemuxs = ARRAY_SIZE(pcie0_modemux), |
| 1809 | 2076 | }; |
| 1810 | 2077 | |
| 1811 | −/* pad multiplexing for pcie1 device */ | |
| 2078 | +/* pad multiplexing for (fix-part) pcie1 device */ | |
| 1812 | 2079 | static struct spear_muxreg pcie1_muxreg[] = { |
| 1813 | − PCI_SATA_MUXREG, | |
| 1814 | 2080 | { |
| 1815 | 2081 | .reg = PCIE_SATA_CFG, |
| 1816 | 2082 | .mask = PCIE_CFG_VAL(1), |
| @@ -1827,15 +2093,12 @@ static struct spear_modemux pcie1_modemux[] = { · 10 unmodified lines | ||
| 1827 | 2093 | |
| 1828 | 2094 | static struct spear_pingroup pcie1_pingroup = { |
| 1829 | 2095 | .name = "pcie1_grp", |
| 1830 | − .pins = pci_sata_pins, | |
| 1831 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1832 | 2096 | .modemuxs = pcie1_modemux, |
| 1833 | 2097 | .nmodemuxs = ARRAY_SIZE(pcie1_modemux), |
| 1834 | 2098 | }; |
| 1835 | 2099 | |
| 1836 | −/* pad multiplexing for pcie2 device */ | |
| 2100 | +/* pad multiplexing for (fix-part) pcie2 device */ | |
| 1837 | 2101 | static struct spear_muxreg pcie2_muxreg[] = { |
| 1838 | − PCI_SATA_MUXREG, | |
| 1839 | 2102 | { |
| 1840 | 2103 | .reg = PCIE_SATA_CFG, |
| 1841 | 2104 | .mask = PCIE_CFG_VAL(2), |
| @@ -1852,22 +2115,20 @@ static struct spear_modemux pcie2_modemux[] = { · 10 unmodified lines | ||
| 1852 | 2115 | |
| 1853 | 2116 | static struct spear_pingroup pcie2_pingroup = { |
| 1854 | 2117 | .name = "pcie2_grp", |
| 1855 | − .pins = pci_sata_pins, | |
| 1856 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1857 | 2118 | .modemuxs = pcie2_modemux, |
| 1858 | 2119 | .nmodemuxs = ARRAY_SIZE(pcie2_modemux), |
| 1859 | 2120 | }; |
| 1860 | 2121 | |
| 1861 | −static const char *const pci_grps[] = { "pcie0_grp", "pcie1_grp", "pcie2_grp" }; | |
| 1862 | −static struct spear_function pci_function = { | |
| 1863 | − .name = "pci", | |
| 1864 | − .groups = pci_grps, | |
| 1865 | − .ngroups = ARRAY_SIZE(pci_grps), | |
| 2122 | +static const char *const pcie_grps[] = { "pcie0_grp", "pcie1_grp", "pcie2_grp" | |
| 2123 | +}; | |
| 2124 | +static struct spear_function pcie_function = { | |
| 2125 | + .name = "pci_express", | |
| 2126 | + .groups = pcie_grps, | |
| 2127 | + .ngroups = ARRAY_SIZE(pcie_grps), | |
| 1866 | 2128 | }; |
| 1867 | 2129 | |
| 1868 | 2130 | /* pad multiplexing for sata0 device */ |
| 1869 | 2131 | static struct spear_muxreg sata0_muxreg[] = { |
| 1870 | − PCI_SATA_MUXREG, | |
| 1871 | 2132 | { |
| 1872 | 2133 | .reg = PCIE_SATA_CFG, |
| 1873 | 2134 | .mask = SATA_CFG_VAL(0), |
| @@ -1884,15 +2145,12 @@ static struct spear_modemux sata0_modemux[] = { · 10 unmodified lines | ||
| 1884 | 2145 | |
| 1885 | 2146 | static struct spear_pingroup sata0_pingroup = { |
| 1886 | 2147 | .name = "sata0_grp", |
| 1887 | − .pins = pci_sata_pins, | |
| 1888 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1889 | 2148 | .modemuxs = sata0_modemux, |
| 1890 | 2149 | .nmodemuxs = ARRAY_SIZE(sata0_modemux), |
| 1891 | 2150 | }; |
| 1892 | 2151 | |
| 1893 | 2152 | /* pad multiplexing for sata1 device */ |
| 1894 | 2153 | static struct spear_muxreg sata1_muxreg[] = { |
| 1895 | − PCI_SATA_MUXREG, | |
| 1896 | 2154 | { |
| 1897 | 2155 | .reg = PCIE_SATA_CFG, |
| 1898 | 2156 | .mask = SATA_CFG_VAL(1), |
| @@ -1909,15 +2167,12 @@ static struct spear_modemux sata1_modemux[] = { · 10 unmodified lines | ||
| 1909 | 2167 | |
| 1910 | 2168 | static struct spear_pingroup sata1_pingroup = { |
| 1911 | 2169 | .name = "sata1_grp", |
| 1912 | − .pins = pci_sata_pins, | |
| 1913 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1914 | 2170 | .modemuxs = sata1_modemux, |
| 1915 | 2171 | .nmodemuxs = ARRAY_SIZE(sata1_modemux), |
| 1916 | 2172 | }; |
| 1917 | 2173 | |
| 1918 | 2174 | /* pad multiplexing for sata2 device */ |
| 1919 | 2175 | static struct spear_muxreg sata2_muxreg[] = { |
| 1920 | − PCI_SATA_MUXREG, | |
| 1921 | 2176 | { |
| 1922 | 2177 | .reg = PCIE_SATA_CFG, |
| 1923 | 2178 | .mask = SATA_CFG_VAL(2), |
| @@ -1934,8 +2189,6 @@ static struct spear_modemux sata2_modemux[] = { · 10 unmodified lines | ||
| 1934 | 2189 | |
| 1935 | 2190 | static struct spear_pingroup sata2_pingroup = { |
| 1936 | 2191 | .name = "sata2_grp", |
| 1937 | − .pins = pci_sata_pins, | |
| 1938 | − .npins = ARRAY_SIZE(pci_sata_pins), | |
| 1939 | 2192 | .modemuxs = sata2_modemux, |
| 1940 | 2193 | .nmodemuxs = ARRAY_SIZE(sata2_modemux), |
| 1941 | 2194 | }; |
| @@ -1957,6 +2210,14 @@ static struct spear_muxreg ssp1_dis_kbd_muxreg[] = { · 15 unmodified lines | ||
| 1957 | 2210 | PMX_KBD_COL0_MASK | PMX_NFIO8_15_MASK | PMX_NFCE1_MASK | |
| 1958 | 2211 | PMX_NFCE2_MASK, |
| 1959 | 2212 | .val = 0, |
| 2213 | + }, { | |
| 2214 | + .reg = PAD_DIRECTION_SEL_1, | |
| 2215 | + .mask = PMX_KBD_ROWCOL25_MASK | PMX_KBD_COL1_MASK | | |
| 2216 | + PMX_KBD_COL0_MASK | PMX_NFIO8_15_MASK | PMX_NFCE1_MASK | | |
| 2217 | + PMX_NFCE2_MASK, | |
| 2218 | + .val = PMX_KBD_ROWCOL25_MASK | PMX_KBD_COL1_MASK | | |
| 2219 | + PMX_KBD_COL0_MASK | PMX_NFIO8_15_MASK | PMX_NFCE1_MASK | | |
| 2220 | + PMX_NFCE2_MASK, | |
| 1960 | 2221 | }, |
| 1961 | 2222 | }; |
| 1962 | 2223 | |
| @@ -1983,6 +2244,12 @@ static struct spear_muxreg ssp1_dis_sd_muxreg[] = { · 20 unmodified lines | ||
| 1983 | 2244 | .mask = PMX_MCIADDR0ALE_MASK | PMX_MCIADDR2_MASK | |
| 1984 | 2245 | PMX_MCICECF_MASK | PMX_MCICEXD_MASK, |
| 1985 | 2246 | .val = 0, |
| 2247 | + }, { | |
| 2248 | + .reg = PAD_DIRECTION_SEL_2, | |
| 2249 | + .mask = PMX_MCIADDR0ALE_MASK | PMX_MCIADDR2_MASK | | |
| 2250 | + PMX_MCICECF_MASK | PMX_MCICEXD_MASK, | |
| 2251 | + .val = PMX_MCIADDR0ALE_MASK | PMX_MCIADDR2_MASK | | |
| 2252 | + PMX_MCICECF_MASK | PMX_MCICEXD_MASK, | |
| 1986 | 2253 | }, |
| 1987 | 2254 | }; |
| 1988 | 2255 | |
| @@ -2017,6 +2284,12 @@ static struct spear_muxreg gpt64_muxreg[] = { · 28 unmodified lines | ||
| 2017 | 2284 | .mask = PMX_MCICDCF1_MASK | PMX_MCICDCF2_MASK | PMX_MCICDXD_MASK |
| 2018 | 2285 | | PMX_MCILEDS_MASK, |
| 2019 | 2286 | .val = 0, |
| 2287 | + }, { | |
| 2288 | + .reg = PAD_DIRECTION_SEL_2, | |
| 2289 | + .mask = PMX_MCICDCF1_MASK | PMX_MCICDCF2_MASK | PMX_MCICDXD_MASK | |
| 2290 | + | PMX_MCILEDS_MASK, | |
| 2291 | + .val = PMX_MCICDCF1_MASK | PMX_MCICDCF2_MASK | PMX_MCICDXD_MASK | |
| 2292 | + | PMX_MCILEDS_MASK, | |
| 2020 | 2293 | }, |
| 2021 | 2294 | }; |
| 2022 | 2295 | |
| @@ -2093,6 +2366,7 @@ static struct spear_pingroup *spear1310_pingroups[] = { · 70 unmodified lines | ||
| 2093 | 2366 | &can0_dis_sd_pingroup, |
| 2094 | 2367 | &can1_dis_sd_pingroup, |
| 2095 | 2368 | &can1_dis_kbd_pingroup, |
| 2369 | + &pci_pingroup, | |
| 2096 | 2370 | &pcie0_pingroup, |
| 2097 | 2371 | &pcie1_pingroup, |
| 2098 | 2372 | &pcie2_pingroup, |
| @@ -2138,6 +2412,7 @@ static struct spear_function *spear1310_functions[] = { · 39 unmodified lines | ||
| 2138 | 2412 | &can0_function, |
| 2139 | 2413 | &can1_function, |
| 2140 | 2414 | &pci_function, |
| 2415 | + &pcie_function, | |
| 2141 | 2416 | &sata_function, |
| 2142 | 2417 | &ssp1_function, |
| 2143 | 2418 | &gpt64_function, |
| @@ -213,7 +213,7 @@ static const struct pinctrl_pin_desc spear1340_pins[] = { · 212 unmodified lines | ||
| 213 | 213 | * Pad multiplexing for making all pads as gpio's. This is done to override the |
| 214 | 214 | * values passed from bootloader and start from scratch. |
| 215 | 215 | */ |
| 216 | −static const unsigned pads_as_gpio_pins[] = { 251 }; | |
| 216 | +static const unsigned pads_as_gpio_pins[] = { 12, 88, 89, 251 }; | |
| 217 | 217 | static struct spear_muxreg pads_as_gpio_muxreg[] = { |
| 218 | 218 | { |
| 219 | 219 | .reg = PAD_FUNCTION_EN_1, |
| @@ -1692,7 +1692,43 @@ static struct spear_pingroup clcd_pingroup = { · 1472 unmodified lines | ||
| 1692 | 1692 | .nmodemuxs = ARRAY_SIZE(clcd_modemux), |
| 1693 | 1693 | }; |
| 1694 | 1694 | |
| 1695 | −static const char *const clcd_grps[] = { "clcd_grp" }; | |
| 1695 | +/* Disable cld runtime to save panel damage */ | |
| 1696 | +static struct spear_muxreg clcd_sleep_muxreg[] = { | |
| 1697 | + { | |
| 1698 | + .reg = PAD_SHARED_IP_EN_1, | |
| 1699 | + .mask = ARM_TRACE_MASK | MIPHY_DBG_MASK, | |
| 1700 | + .val = 0, | |
| 1701 | + }, { | |
| 1702 | + .reg = PAD_FUNCTION_EN_5, | |
| 1703 | + .mask = CLCD_REG4_MASK | CLCD_AND_ARM_TRACE_REG4_MASK, | |
| 1704 | + .val = 0x0, | |
| 1705 | + }, { | |
| 1706 | + .reg = PAD_FUNCTION_EN_6, | |
| 1707 | + .mask = CLCD_AND_ARM_TRACE_REG5_MASK, | |
| 1708 | + .val = 0x0, | |
| 1709 | + }, { | |
| 1710 | + .reg = PAD_FUNCTION_EN_7, | |
| 1711 | + .mask = CLCD_AND_ARM_TRACE_REG6_MASK, | |
| 1712 | + .val = 0x0, | |
| 1713 | + }, | |
| 1714 | +}; | |
| 1715 | + | |
| 1716 | +static struct spear_modemux clcd_sleep_modemux[] = { | |
| 1717 | + { | |
| 1718 | + .muxregs = clcd_sleep_muxreg, | |
| 1719 | + .nmuxregs = ARRAY_SIZE(clcd_sleep_muxreg), | |
| 1720 | + }, | |
| 1721 | +}; | |
| 1722 | + | |
| 1723 | +static struct spear_pingroup clcd_sleep_pingroup = { | |
| 1724 | + .name = "clcd_sleep_grp", | |
| 1725 | + .pins = clcd_pins, | |
| 1726 | + .npins = ARRAY_SIZE(clcd_pins), | |
| 1727 | + .modemuxs = clcd_sleep_modemux, | |
| 1728 | + .nmodemuxs = ARRAY_SIZE(clcd_sleep_modemux), | |
| 1729 | +}; | |
| 1730 | + | |
| 1731 | +static const char *const clcd_grps[] = { "clcd_grp", "clcd_sleep_grp" }; | |
| 1696 | 1732 | static struct spear_function clcd_function = { |
| 1697 | 1733 | .name = "clcd", |
| 1698 | 1734 | .groups = clcd_grps, |
| @@ -1893,6 +1929,7 @@ static struct spear_pingroup *spear1340_pingroups[] = { · 194 unmodified lines | ||
| 1893 | 1929 | &sdhci_pingroup, |
| 1894 | 1930 | &cf_pingroup, |
| 1895 | 1931 | &xd_pingroup, |
| 1932 | + &clcd_sleep_pingroup, | |
| 1896 | 1933 | &clcd_pingroup, |
| 1897 | 1934 | &arm_trace_pingroup, |
| 1898 | 1935 | &miphy_dbg_pingroup, |
| @@ -2239,6 +2239,10 @@ static struct spear_muxreg pwm2_pin_34_muxreg[] = { · 2238 unmodified lines | ||
| 2239 | 2239 | .reg = PMX_CONFIG_REG, |
| 2240 | 2240 | .mask = PMX_SSP_CS_MASK, |
| 2241 | 2241 | .val = 0, |
| 2242 | + }, { | |
| 2243 | + .reg = MODE_CONFIG_REG, | |
| 2244 | + .mask = PMX_PWM_MASK, | |
| 2245 | + .val = PMX_PWM_MASK, | |
| 2242 | 2246 | }, { |
| 2243 | 2247 | .reg = IP_SEL_PAD_30_39_REG, |
| 2244 | 2248 | .mask = PMX_PL_34_MASK, |
| @@ -2956,9 +2960,9 @@ static struct spear_function mii2_function = { · 711 unmodified lines | ||
| 2956 | 2960 | }; |
| 2957 | 2961 | |
| 2958 | 2962 | /* Pad multiplexing for cadence mii 1_2 as smii or rmii device */ |
| 2959 | −static const unsigned smii0_1_pins[] = { 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, | |
| 2963 | +static const unsigned rmii0_1_pins[] = { 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, | |
| 2960 | 2964 | 21, 22, 23, 24, 25, 26, 27 }; |
| 2961 | −static const unsigned rmii0_1_pins[] = { 10, 11, 21, 22, 23, 24, 25, 26, 27 }; | |
| 2965 | +static const unsigned smii0_1_pins[] = { 10, 11, 21, 22, 23, 24, 25, 26, 27 }; | |
| 2962 | 2966 | static struct spear_muxreg mii0_1_muxreg[] = { |
| 2963 | 2967 | { |
| 2964 | 2968 | .reg = PMX_CONFIG_REG, |
| @@ -15,6 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include "pinctrl-spear.h" |
| 16 | 16 | |
| 17 | 17 | /* pad mux declarations */ |
| 18 | +#define PMX_PWM_MASK (1 << 16) | |
| 18 | 19 | #define PMX_FIRDA_MASK (1 << 14) |
| 19 | 20 | #define PMX_I2C_MASK (1 << 13) |
| 20 | 21 | #define PMX_SSP_CS_MASK (1 << 12) |
| @@ -112,9 +112,6 @@ extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *); · 111 unmodified lines | ||
| 112 | 112 | extern void css_reiterate_subchannels(void); |
| 113 | 113 | void css_update_ssd_info(struct subchannel *sch); |
| 114 | 114 | |
| 115 | −#define __MAX_SUBCHANNEL 65535 | |
| 116 | −#define __MAX_SSID 3 | |
| 117 | − | |
| 118 | 115 | struct channel_subsystem { |
| 119 | 116 | u8 cssid; |
| 120 | 117 | int valid; |
| @@ -1424,7 +1424,7 @@ static enum io_sch_action sch_get_action(struct subchannel *sch) · 1423 unmodified lines | ||
| 1424 | 1424 | } |
| 1425 | 1425 | if (device_is_disconnected(cdev)) |
| 1426 | 1426 | return IO_SCH_REPROBE; |
| 1427 | − if (cdev->online) | |
| 1427 | + if (cdev->online && !cdev->private->flags.resuming) | |
| 1428 | 1428 | return IO_SCH_VERIFY; |
| 1429 | 1429 | if (cdev->private->state == DEV_STATE_NOT_OPER) |
| 1430 | 1430 | return IO_SCH_UNREG_ATTACH; |
| @@ -1469,12 +1469,6 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process) · 38 unmodified lines | ||
| 1469 | 1469 | rc = 0; |
| 1470 | 1470 | goto out_unlock; |
| 1471 | 1471 | case IO_SCH_VERIFY: |
| 1472 | − if (cdev->private->flags.resuming == 1) { | |
| 1473 | − if (cio_enable_subchannel(sch, (u32)(addr_t)sch)) { | |
| 1474 | − ccw_device_set_notoper(cdev); | |
| 1475 | − break; | |
| 1476 | − } | |
| 1477 | − } | |
| 1478 | 1472 | /* Trigger path verification. */ |
| 1479 | 1473 | io_subchannel_verify(sch); |
| 1480 | 1474 | rc = 0; |
| @@ -125,8 +125,7 @@ int idset_is_empty(struct idset *set) · 124 unmodified lines | ||
| 125 | 125 | |
| 126 | 126 | void idset_add_set(struct idset *to, struct idset *from) |
| 127 | 127 | { |
| 128 | − int len = min(__BITOPS_WORDS(to->num_ssid * to->num_id), | |
| 129 | − __BITOPS_WORDS(from->num_ssid * from->num_id)); | |
| 128 | + int len = min(to->num_ssid * to->num_id, from->num_ssid * from->num_id); | |
| 130 | 129 | |
| 131 | 130 | bitmap_or(to->bitmap, to->bitmap, from->bitmap, len); |
| 132 | 131 | } |
| @@ -149,6 +149,7 @@ qla2x00_mark_vp_devices_dead(scsi_qla_host_t *vha) · 148 unmodified lines | ||
| 149 | 149 | int |
| 150 | 150 | qla24xx_disable_vp(scsi_qla_host_t *vha) |
| 151 | 151 | { |
| 152 | + unsigned long flags; | |
| 152 | 153 | int ret; |
| 153 | 154 | |
| 154 | 155 | ret = qla24xx_control_vp(vha, VCE_COMMAND_DISABLE_VPS_LOGO_ALL); |
| @@ -156,7 +157,9 @@ qla24xx_disable_vp(scsi_qla_host_t *vha) · 1 unmodified line | ||
| 156 | 157 | atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME); |
| 157 | 158 | |
| 158 | 159 | /* Remove port id from vp target map */ |
| 160 | + spin_lock_irqsave(&vha->hw->vport_slock, flags); | |
| 159 | 161 | qlt_update_vp_map(vha, RESET_AL_PA); |
| 162 | + spin_unlock_irqrestore(&vha->hw->vport_slock, flags); | |
| 160 | 163 | |
| 161 | 164 | qla2x00_mark_vp_devices_dead(vha); |
| 162 | 165 | atomic_set(&vha->vp_state, VP_FAILED); |
| @@ -557,6 +557,7 @@ static bool qlt_check_fcport_exist(struct scsi_qla_host *vha, · 556 unmodified lines | ||
| 557 | 557 | int pmap_len; |
| 558 | 558 | fc_port_t *fcport; |
| 559 | 559 | int global_resets; |
| 560 | + unsigned long flags; | |
| 560 | 561 | |
| 561 | 562 | retry: |
| 562 | 563 | global_resets = atomic_read(&ha->tgt.qla_tgt->tgt_global_resets_count); |
| @@ -625,10 +626,10 @@ retry: · 62 unmodified lines | ||
| 625 | 626 | sess->s_id.b.area, sess->loop_id, fcport->d_id.b.domain, |
| 626 | 627 | fcport->d_id.b.al_pa, fcport->d_id.b.area, fcport->loop_id); |
| 627 | 628 | |
| 628 | − sess->s_id = fcport->d_id; | |
| 629 | − sess->loop_id = fcport->loop_id; | |
| 630 | − sess->conf_compl_supported = !!(fcport->flags & | |
| 631 | − FCF_CONF_COMP_SUPPORTED); | |
| 629 | + spin_lock_irqsave(&ha->hardware_lock, flags); | |
| 630 | + ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id, | |
| 631 | + (fcport->flags & FCF_CONF_COMP_SUPPORTED)); | |
| 632 | + spin_unlock_irqrestore(&ha->hardware_lock, flags); | |
| 632 | 633 | |
| 633 | 634 | res = true; |
| 634 | 635 | |
| @@ -740,10 +741,9 @@ static struct qla_tgt_sess *qlt_create_sess( · 105 unmodified lines | ||
| 740 | 741 | qlt_undelete_sess(sess); |
| 741 | 742 | |
| 742 | 743 | kref_get(&sess->se_sess->sess_kref); |
| 743 | − sess->s_id = fcport->d_id; | |
| 744 | − sess->loop_id = fcport->loop_id; | |
| 745 | − sess->conf_compl_supported = !!(fcport->flags & | |
| 746 | − FCF_CONF_COMP_SUPPORTED); | |
| 744 | + ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id, | |
| 745 | + (fcport->flags & FCF_CONF_COMP_SUPPORTED)); | |
| 746 | + | |
| 747 | 747 | if (sess->local && !local) |
| 748 | 748 | sess->local = 0; |
| 749 | 749 | spin_unlock_irqrestore(&ha->hardware_lock, flags); |
| @@ -796,8 +796,7 @@ static struct qla_tgt_sess *qlt_create_sess( · 46 unmodified lines | ||
| 796 | 796 | */ |
| 797 | 797 | kref_get(&sess->se_sess->sess_kref); |
| 798 | 798 | |
| 799 | − sess->conf_compl_supported = !!(fcport->flags & | |
| 800 | − FCF_CONF_COMP_SUPPORTED); | |
| 799 | + sess->conf_compl_supported = (fcport->flags & FCF_CONF_COMP_SUPPORTED); | |
| 801 | 800 | BUILD_BUG_ON(sizeof(sess->port_name) != sizeof(fcport->port_name)); |
| 802 | 801 | memcpy(sess->port_name, fcport->port_name, sizeof(sess->port_name)); |
| 803 | 802 | |
| @@ -869,10 +868,8 @@ void qlt_fc_port_added(struct scsi_qla_host *vha, fc_port_t *fcport) · 65 unmodified lines | ||
| 869 | 868 | ql_dbg(ql_dbg_tgt_mgt, vha, 0xf007, |
| 870 | 869 | "Reappeared sess %p\n", sess); |
| 871 | 870 | } |
| 872 | − sess->s_id = fcport->d_id; | |
| 873 | − sess->loop_id = fcport->loop_id; | |
| 874 | − sess->conf_compl_supported = !!(fcport->flags & | |
| 875 | − FCF_CONF_COMP_SUPPORTED); | |
| 871 | + ha->tgt.tgt_ops->update_sess(sess, fcport->d_id, fcport->loop_id, | |
| 872 | + (fcport->flags & FCF_CONF_COMP_SUPPORTED)); | |
| 876 | 873 | } |
| 877 | 874 | |
| 878 | 875 | if (sess && sess->local) { |
| @@ -648,6 +648,7 @@ struct qla_tgt_func_tmpl { · 647 unmodified lines | ||
| 648 | 648 | |
| 649 | 649 | int (*check_initiator_node_acl)(struct scsi_qla_host *, unsigned char *, |
| 650 | 650 | void *, uint8_t *, uint16_t); |
| 651 | + void (*update_sess)(struct qla_tgt_sess *, port_id_t, uint16_t, bool); | |
| 651 | 652 | struct qla_tgt_sess *(*find_sess_by_loop_id)(struct scsi_qla_host *, |
| 652 | 653 | const uint16_t); |
| 653 | 654 | struct qla_tgt_sess *(*find_sess_by_s_id)(struct scsi_qla_host *, |
| @@ -237,7 +237,7 @@ static char *tcm_qla2xxx_get_fabric_wwn(struct se_portal_group *se_tpg) · 236 unmodified lines | ||
| 237 | 237 | struct tcm_qla2xxx_tpg, se_tpg); |
| 238 | 238 | struct tcm_qla2xxx_lport *lport = tpg->lport; |
| 239 | 239 | |
| 240 | − return &lport->lport_name[0]; | |
| 240 | + return lport->lport_naa_name; | |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | static char *tcm_qla2xxx_npiv_get_fabric_wwn(struct se_portal_group *se_tpg) |
| @@ -1457,6 +1457,78 @@ static int tcm_qla2xxx_check_initiator_node_acl( · 1213 unmodified lines | ||
| 1457 | 1457 | return 0; |
| 1458 | 1458 | } |
| 1459 | 1459 | |
| 1460 | +static void tcm_qla2xxx_update_sess(struct qla_tgt_sess *sess, port_id_t s_id, | |
| 1461 | + uint16_t loop_id, bool conf_compl_supported) | |
| 1462 | +{ | |
| 1463 | + struct qla_tgt *tgt = sess->tgt; | |
| 1464 | + struct qla_hw_data *ha = tgt->ha; | |
| 1465 | + struct tcm_qla2xxx_lport *lport = ha->tgt.target_lport_ptr; | |
| 1466 | + struct se_node_acl *se_nacl = sess->se_sess->se_node_acl; | |
| 1467 | + struct tcm_qla2xxx_nacl *nacl = container_of(se_nacl, | |
| 1468 | + struct tcm_qla2xxx_nacl, se_node_acl); | |
| 1469 | + u32 key; | |
| 1470 | + | |
| 1471 | + | |
| 1472 | + if (sess->loop_id != loop_id || sess->s_id.b24 != s_id.b24) | |
| 1473 | + pr_info("Updating session %p from port %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x loop_id %d -> %d s_id %x:%x:%x -> %x:%x:%x\n", | |
| 1474 | + sess, | |
| 1475 | + sess->port_name[0], sess->port_name[1], | |
| 1476 | + sess->port_name[2], sess->port_name[3], | |
| 1477 | + sess->port_name[4], sess->port_name[5], | |
| 1478 | + sess->port_name[6], sess->port_name[7], | |
| 1479 | + sess->loop_id, loop_id, | |
| 1480 | + sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa, | |
| 1481 | + s_id.b.domain, s_id.b.area, s_id.b.al_pa); | |
| 1482 | + | |
| 1483 | + if (sess->loop_id != loop_id) { | |
| 1484 | + /* | |
| 1485 | + * Because we can shuffle loop IDs around and we | |
| 1486 | + * update different sessions non-atomically, we might | |
| 1487 | + * have overwritten this session's old loop ID | |
| 1488 | + * already, and we might end up overwriting some other | |
| 1489 | + * session that will be updated later. So we have to | |
| 1490 | + * be extra careful and we can't warn about those things... | |
| 1491 | + */ | |
| 1492 | + if (lport->lport_loopid_map[sess->loop_id].se_nacl == se_nacl) | |
| 1493 | + lport->lport_loopid_map[sess->loop_id].se_nacl = NULL; | |
| 1494 | + | |
| 1495 | + lport->lport_loopid_map[loop_id].se_nacl = se_nacl; | |
| 1496 | + | |
| 1497 | + sess->loop_id = loop_id; | |
| 1498 | + } | |
| 1499 | + | |
| 1500 | + if (sess->s_id.b24 != s_id.b24) { | |
| 1501 | + key = (((u32) sess->s_id.b.domain << 16) | | |
| 1502 | + ((u32) sess->s_id.b.area << 8) | | |
| 1503 | + ((u32) sess->s_id.b.al_pa)); | |
| 1504 | + | |
| 1505 | + if (btree_lookup32(&lport->lport_fcport_map, key)) | |
| 1506 | + WARN(btree_remove32(&lport->lport_fcport_map, key) != se_nacl, | |
| 1507 | + "Found wrong se_nacl when updating s_id %x:%x:%x\n", | |
| 1508 | + sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa); | |
| 1509 | + else | |
| 1510 | + WARN(1, "No lport_fcport_map entry for s_id %x:%x:%x\n", | |
| 1511 | + sess->s_id.b.domain, sess->s_id.b.area, sess->s_id.b.al_pa); | |
| 1512 | + | |
| 1513 | + key = (((u32) s_id.b.domain << 16) | | |
| 1514 | + ((u32) s_id.b.area << 8) | | |
| 1515 | + ((u32) s_id.b.al_pa)); | |
| 1516 | + | |
| 1517 | + if (btree_lookup32(&lport->lport_fcport_map, key)) { | |
| 1518 | + WARN(1, "Already have lport_fcport_map entry for s_id %x:%x:%x\n", | |
| 1519 | + s_id.b.domain, s_id.b.area, s_id.b.al_pa); | |
| 1520 | + btree_update32(&lport->lport_fcport_map, key, se_nacl); | |
| 1521 | + } else { | |
| 1522 | + btree_insert32(&lport->lport_fcport_map, key, se_nacl, GFP_ATOMIC); | |
| 1523 | + } | |
| 1524 | + | |
| 1525 | + sess->s_id = s_id; | |
| 1526 | + nacl->nport_id = key; | |
| 1527 | + } | |
| 1528 | + | |
| 1529 | + sess->conf_compl_supported = conf_compl_supported; | |
| 1530 | +} | |
| 1531 | + | |
| 1460 | 1532 | /* |
| 1461 | 1533 | * Calls into tcm_qla2xxx used by qla2xxx LLD I/O path. |
| 1462 | 1534 | */ |
| @@ -1467,6 +1539,7 @@ static struct qla_tgt_func_tmpl tcm_qla2xxx_template = { · 4 unmodified lines | ||
| 1467 | 1539 | .free_cmd = tcm_qla2xxx_free_cmd, |
| 1468 | 1540 | .free_mcmd = tcm_qla2xxx_free_mcmd, |
| 1469 | 1541 | .free_session = tcm_qla2xxx_free_session, |
| 1542 | + .update_sess = tcm_qla2xxx_update_sess, | |
| 1470 | 1543 | .check_initiator_node_acl = tcm_qla2xxx_check_initiator_node_acl, |
| 1471 | 1544 | .find_sess_by_s_id = tcm_qla2xxx_find_sess_by_s_id, |
| 1472 | 1545 | .find_sess_by_loop_id = tcm_qla2xxx_find_sess_by_loop_id, |
| @@ -1534,6 +1607,7 @@ static struct se_wwn *tcm_qla2xxx_make_lport( · 61 unmodified lines | ||
| 1534 | 1607 | lport->lport_wwpn = wwpn; |
| 1535 | 1608 | tcm_qla2xxx_format_wwn(&lport->lport_name[0], TCM_QLA2XXX_NAMELEN, |
| 1536 | 1609 | wwpn); |
| 1610 | + sprintf(lport->lport_naa_name, "naa.%016llx", (unsigned long long) wwpn); | |
| 1537 | 1611 | |
| 1538 | 1612 | ret = tcm_qla2xxx_init_lport(lport); |
| 1539 | 1613 | if (ret != 0) |
| @@ -1601,6 +1675,7 @@ static struct se_wwn *tcm_qla2xxx_npiv_make_lport( · 61 unmodified lines | ||
| 1601 | 1675 | lport->lport_npiv_wwnn = npiv_wwnn; |
| 1602 | 1676 | tcm_qla2xxx_npiv_format_wwn(&lport->lport_npiv_name[0], |
| 1603 | 1677 | TCM_QLA2XXX_NAMELEN, npiv_wwpn, npiv_wwnn); |
| 1678 | + sprintf(lport->lport_naa_name, "naa.%016llx", (unsigned long long) npiv_wwpn); | |
| 1604 | 1679 | |
| 1605 | 1680 | /* FIXME: tcm_qla2xxx_npiv_make_lport */ |
| 1606 | 1681 | ret = -ENOSYS; |
| @@ -61,6 +61,8 @@ struct tcm_qla2xxx_lport { · 60 unmodified lines | ||
| 61 | 61 | u64 lport_npiv_wwnn; |
| 62 | 62 | /* ASCII formatted WWPN for FC Target Lport */ |
| 63 | 63 | char lport_name[TCM_QLA2XXX_NAMELEN]; |
| 64 | + /* ASCII formatted naa WWPN for VPD page 83 etc */ | |
| 65 | + char lport_naa_name[TCM_QLA2XXX_NAMELEN]; | |
| 64 | 66 | /* ASCII formatted WWPN+WWNN for NPIV FC Target Lport */ |
| 65 | 67 | char lport_npiv_name[TCM_QLA2XXX_NPIV_NAMELEN]; |
| 66 | 68 | /* map for fc_port pointers in 24-bit FC Port ID space */ |
| @@ -1294,26 +1294,19 @@ static struct scsi_host_template qpti_template = { · 1293 unmodified lines | ||
| 1294 | 1294 | static const struct of_device_id qpti_match[]; |
| 1295 | 1295 | static int __devinit qpti_sbus_probe(struct platform_device *op) |
| 1296 | 1296 | { |
| 1297 | − const struct of_device_id *match; | |
| 1298 | − struct scsi_host_template *tpnt; | |
| 1299 | 1297 | struct device_node *dp = op->dev.of_node; |
| 1300 | 1298 | struct Scsi_Host *host; |
| 1301 | 1299 | struct qlogicpti *qpti; |
| 1302 | 1300 | static int nqptis; |
| 1303 | 1301 | const char *fcode; |
| 1304 | 1302 | |
| 1305 | − match = of_match_device(qpti_match, &op->dev); | |
| 1306 | − if (!match) | |
| 1307 | − return -EINVAL; | |
| 1308 | − tpnt = match->data; | |
| 1309 | − | |
| 1310 | 1303 | /* Sometimes Antares cards come up not completely |
| 1311 | 1304 | * setup, and we get a report of a zero IRQ. |
| 1312 | 1305 | */ |
| 1313 | 1306 | if (op->archdata.irqs[0] == 0) |
| 1314 | 1307 | return -ENODEV; |
| 1315 | 1308 | |
| 1316 | − host = scsi_host_alloc(tpnt, sizeof(struct qlogicpti)); | |
| 1309 | + host = scsi_host_alloc(&qpti_template, sizeof(struct qlogicpti)); | |
| 1317 | 1310 | if (!host) |
| 1318 | 1311 | return -ENOMEM; |
| 1319 | 1312 | |
| @@ -1445,19 +1438,15 @@ static int __devexit qpti_sbus_remove(struct platform_device *op) · 125 unmodified lines | ||
| 1445 | 1438 | static const struct of_device_id qpti_match[] = { |
| 1446 | 1439 | { |
| 1447 | 1440 | .name = "ptisp", |
| 1448 | − .data = &qpti_template, | |
| 1449 | 1441 | }, |
| 1450 | 1442 | { |
| 1451 | 1443 | .name = "PTI,ptisp", |
| 1452 | − .data = &qpti_template, | |
| 1453 | 1444 | }, |
| 1454 | 1445 | { |
| 1455 | 1446 | .name = "QLGC,isp", |
| 1456 | − .data = &qpti_template, | |
| 1457 | 1447 | }, |
| 1458 | 1448 | { |
| 1459 | 1449 | .name = "SUNW,isp", |
| 1460 | − .data = &qpti_template, | |
| 1461 | 1450 | }, |
| 1462 | 1451 | {}, |
| 1463 | 1452 | }; |
| @@ -3719,7 +3719,9 @@ restart: · 3718 unmodified lines | ||
| 3719 | 3719 | */ |
| 3720 | 3720 | iscsit_thread_check_cpumask(conn, current, 1); |
| 3721 | 3721 | |
| 3722 | − schedule_timeout_interruptible(MAX_SCHEDULE_TIMEOUT); | |
| 3722 | + wait_event_interruptible(conn->queues_wq, | |
| 3723 | + !iscsit_conn_all_queues_empty(conn) || | |
| 3724 | + ts->status == ISCSI_THREAD_SET_RESET); | |
| 3723 | 3725 | |
| 3724 | 3726 | if ((ts->status == ISCSI_THREAD_SET_RESET) || |
| 3725 | 3727 | signal_pending(current)) |
| @@ -486,6 +486,7 @@ struct iscsi_tmr_req { · 485 unmodified lines | ||
| 486 | 486 | }; |
| 487 | 487 | |
| 488 | 488 | struct iscsi_conn { |
| 489 | + wait_queue_head_t queues_wq; | |
| 489 | 490 | /* Authentication Successful for this connection */ |
| 490 | 491 | u8 auth_complete; |
| 491 | 492 | /* State connection is currently in */ |
| @@ -41,6 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | static int iscsi_login_init_conn(struct iscsi_conn *conn) |
| 43 | 43 | { |
| 44 | + init_waitqueue_head(&conn->queues_wq); | |
| 44 | 45 | INIT_LIST_HEAD(&conn->conn_list); |
| 45 | 46 | INIT_LIST_HEAD(&conn->conn_cmd_list); |
| 46 | 47 | INIT_LIST_HEAD(&conn->immed_queue_list); |
| @@ -488,7 +488,7 @@ void iscsit_add_cmd_to_immediate_queue( · 487 unmodified lines | ||
| 488 | 488 | atomic_set(&conn->check_immediate_queue, 1); |
| 489 | 489 | spin_unlock_bh(&conn->immed_queue_lock); |
| 490 | 490 | |
| 491 | − wake_up_process(conn->thread_set->tx_thread); | |
| 491 | + wake_up(&conn->queues_wq); | |
| 492 | 492 | } |
| 493 | 493 | |
| 494 | 494 | struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_conn *conn) |
| @@ -562,7 +562,7 @@ void iscsit_add_cmd_to_response_queue( · 67 unmodified lines | ||
| 562 | 562 | atomic_inc(&cmd->response_queue_count); |
| 563 | 563 | spin_unlock_bh(&conn->response_queue_lock); |
| 564 | 564 | |
| 565 | − wake_up_process(conn->thread_set->tx_thread); | |
| 565 | + wake_up(&conn->queues_wq); | |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | 568 | struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *conn) |
| @@ -616,6 +616,24 @@ static void iscsit_remove_cmd_from_response_queue( · 47 unmodified lines | ||
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | 618 | |
| 619 | +bool iscsit_conn_all_queues_empty(struct iscsi_conn *conn) | |
| 620 | +{ | |
| 621 | + bool empty; | |
| 622 | + | |
| 623 | + spin_lock_bh(&conn->immed_queue_lock); | |
| 624 | + empty = list_empty(&conn->immed_queue_list); | |
| 625 | + spin_unlock_bh(&conn->immed_queue_lock); | |
| 626 | + | |
| 627 | + if (!empty) | |
| 628 | + return empty; | |
| 629 | + | |
| 630 | + spin_lock_bh(&conn->response_queue_lock); | |
| 631 | + empty = list_empty(&conn->response_queue_list); | |
| 632 | + spin_unlock_bh(&conn->response_queue_lock); | |
| 633 | + | |
| 634 | + return empty; | |
| 635 | +} | |
| 636 | + | |
| 619 | 637 | void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *conn) |
| 620 | 638 | { |
| 621 | 639 | struct iscsi_queue_req *qr, *qr_tmp; |
| @@ -25,6 +25,7 @@ extern struct iscsi_queue_req *iscsit_get_cmd_from_immediate_queue(struct iscsi_ · 24 unmodified lines | ||
| 25 | 25 | extern void iscsit_add_cmd_to_response_queue(struct iscsi_cmd *, struct iscsi_conn *, u8); |
| 26 | 26 | extern struct iscsi_queue_req *iscsit_get_cmd_from_response_queue(struct iscsi_conn *); |
| 27 | 27 | extern void iscsit_remove_cmd_from_tx_queues(struct iscsi_cmd *, struct iscsi_conn *); |
| 28 | +extern bool iscsit_conn_all_queues_empty(struct iscsi_conn *); | |
| 28 | 29 | extern void iscsit_free_queue_reqs_for_conn(struct iscsi_conn *); |
| 29 | 30 | extern void iscsit_release_cmd(struct iscsi_cmd *); |
| 30 | 31 | extern void iscsit_free_cmd(struct iscsi_cmd *); |
| @@ -3206,7 +3206,8 @@ static int __init target_core_init_configfs(void) · 3205 unmodified lines | ||
| 3206 | 3206 | if (ret < 0) |
| 3207 | 3207 | goto out; |
| 3208 | 3208 | |
| 3209 | − if (core_dev_setup_virtual_lun0() < 0) | |
| 3209 | + ret = core_dev_setup_virtual_lun0(); | |
| 3210 | + if (ret < 0) | |
| 3210 | 3211 | goto out; |
| 3211 | 3212 | |
| 3212 | 3213 | return 0; |
| @@ -850,20 +850,20 @@ int se_dev_check_shutdown(struct se_device *dev) · 849 unmodified lines | ||
| 850 | 850 | |
| 851 | 851 | static u32 se_dev_align_max_sectors(u32 max_sectors, u32 block_size) |
| 852 | 852 | { |
| 853 | − u32 tmp, aligned_max_sectors; | |
| 853 | + u32 aligned_max_sectors; | |
| 854 | + u32 alignment; | |
| 854 | 855 | /* |
| 855 | 856 | * Limit max_sectors to a PAGE_SIZE aligned value for modern |
| 856 | 857 | * transport_allocate_data_tasks() operation. |
| 857 | 858 | */ |
| 858 | − tmp = rounddown((max_sectors * block_size), PAGE_SIZE); | |
| 859 | − aligned_max_sectors = (tmp / block_size); | |
| 860 | − if (max_sectors != aligned_max_sectors) { | |
| 861 | − printk(KERN_INFO "Rounding down aligned max_sectors from %u" | |
| 862 | − " to %u\n", max_sectors, aligned_max_sectors); | |
| 863 | − return aligned_max_sectors; | |
| 864 | − } | |
| 859 | + alignment = max(1ul, PAGE_SIZE / block_size); | |
| 860 | + aligned_max_sectors = rounddown(max_sectors, alignment); | |
| 861 | + | |
| 862 | + if (max_sectors != aligned_max_sectors) | |
| 863 | + pr_info("Rounding down aligned max_sectors from %u to %u\n", | |
| 864 | + max_sectors, aligned_max_sectors); | |
| 865 | 865 | |
| 866 | − return max_sectors; | |
| 866 | + return aligned_max_sectors; | |
| 867 | 867 | } |
| 868 | 868 | |
| 869 | 869 | void se_dev_set_default_attribs( |
| @@ -135,6 +135,12 @@ static int sbc_emulate_verify(struct se_cmd *cmd) · 134 unmodified lines | ||
| 135 | 135 | return 0; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | +static int sbc_emulate_noop(struct se_cmd *cmd) | |
| 139 | +{ | |
| 140 | + target_complete_cmd(cmd, GOOD); | |
| 141 | + return 0; | |
| 142 | +} | |
| 143 | + | |
| 138 | 144 | static inline u32 sbc_get_size(struct se_cmd *cmd, u32 sectors) |
| 139 | 145 | { |
| 140 | 146 | return cmd->se_dev->se_sub_dev->se_dev_attrib.block_size * sectors; |
| @@ -531,6 +537,18 @@ int sbc_parse_cdb(struct se_cmd *cmd, struct spc_ops *ops) · 390 unmodified lines | ||
| 531 | 537 | size = 0; |
| 532 | 538 | cmd->execute_cmd = sbc_emulate_verify; |
| 533 | 539 | break; |
| 540 | + case REZERO_UNIT: | |
| 541 | + case SEEK_6: | |
| 542 | + case SEEK_10: | |
| 543 | + /* | |
| 544 | + * There are still clients out there which use these old SCSI-2 | |
| 545 | + * commands. This mainly happens when running VMs with legacy | |
| 546 | + * guest systems, connected via SCSI command pass-through to | |
| 547 | + * iSCSI targets. Make them happy and return status GOOD. | |
| 548 | + */ | |
| 549 | + size = 0; | |
| 550 | + cmd->execute_cmd = sbc_emulate_noop; | |
| 551 | + break; | |
| 534 | 552 | default: |
| 535 | 553 | ret = spc_parse_cdb(cmd, &size); |
| 536 | 554 | if (ret) |
| @@ -605,6 +605,8 @@ static int spc_emulate_inquiry(struct se_cmd *cmd) · 604 unmodified lines | ||
| 605 | 605 | unsigned char buf[SE_INQUIRY_BUF]; |
| 606 | 606 | int p, ret; |
| 607 | 607 | |
| 608 | + memset(buf, 0, SE_INQUIRY_BUF); | |
| 609 | + | |
| 608 | 610 | if (dev == tpg->tpg_virt_lun0.lun_se_dev) |
| 609 | 611 | buf[0] = 0x3f; /* Not connected */ |
| 610 | 612 | else |
| @@ -140,15 +140,15 @@ void core_tmr_abort_task( · 139 unmodified lines | ||
| 140 | 140 | printk("ABORT_TASK: Found referenced %s task_tag: %u\n", |
| 141 | 141 | se_cmd->se_tfo->get_fabric_name(), ref_tag); |
| 142 | 142 | |
| 143 | − spin_lock_irq(&se_cmd->t_state_lock); | |
| 143 | + spin_lock(&se_cmd->t_state_lock); | |
| 144 | 144 | if (se_cmd->transport_state & CMD_T_COMPLETE) { |
| 145 | 145 | printk("ABORT_TASK: ref_tag: %u already complete, skipping\n", ref_tag); |
| 146 | − spin_unlock_irq(&se_cmd->t_state_lock); | |
| 146 | + spin_unlock(&se_cmd->t_state_lock); | |
| 147 | 147 | spin_unlock_irqrestore(&se_sess->sess_cmd_lock, flags); |
| 148 | 148 | goto out; |
| 149 | 149 | } |
| 150 | 150 | se_cmd->transport_state |= CMD_T_ABORTED; |
| 151 | − spin_unlock_irq(&se_cmd->t_state_lock); | |
| 151 | + spin_unlock(&se_cmd->t_state_lock); | |
| 152 | 152 | |
| 153 | 153 | list_del_init(&se_cmd->se_cmd_list); |
| 154 | 154 | kref_get(&se_cmd->cmd_kref); |
| @@ -1616,7 +1616,6 @@ static void target_complete_tmr_failure(struct work_struct *work) · 1615 unmodified lines | ||
| 1616 | 1616 | |
| 1617 | 1617 | se_cmd->se_tmr_req->response = TMR_LUN_DOES_NOT_EXIST; |
| 1618 | 1618 | se_cmd->se_tfo->queue_tm_rsp(se_cmd); |
| 1619 | − transport_generic_free_cmd(se_cmd, 0); | |
| 1620 | 1619 | } |
| 1621 | 1620 | |
| 1622 | 1621 | /** |
| @@ -815,7 +815,7 @@ static struct platform_device_id exynos_tmu_driver_ids[] = { · 814 unmodified lines | ||
| 815 | 815 | }, |
| 816 | 816 | { }, |
| 817 | 817 | }; |
| 818 | −MODULE_DEVICE_TABLE(platform, exynos4_tmu_driver_ids); | |
| 818 | +MODULE_DEVICE_TABLE(platform, exynos_tmu_driver_ids); | |
| 819 | 819 | |
| 820 | 820 | static inline struct exynos_tmu_platform_data *exynos_get_driver_data( |
| 821 | 821 | struct platform_device *pdev) |
| @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) · 209 unmodified lines | ||
| 210 | 210 | goto error_free_priv; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | − zone = thermal_zone_device_register("rcar_thermal", 0, priv, | |
| 213 | + zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv, | |
| 214 | 214 | &rcar_thermal_zone_ops, 0, 0); |
| 215 | 215 | if (IS_ERR(zone)) { |
| 216 | 216 | dev_err(&pdev->dev, "thermal zone device is NULL\n"); |
| @@ -20,6 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/ctype.h> |
| 21 | 21 | #include <linux/etherdevice.h> |
| 22 | 22 | #include <linux/ethtool.h> |
| 23 | +#include <linux/if_vlan.h> | |
| 23 | 24 | |
| 24 | 25 | #include "u_ether.h" |
| 25 | 26 | |
| @@ -295,7 +296,7 @@ static void rx_complete(struct usb_ep *ep, struct usb_request *req) · 269 unmodified lines | ||
| 295 | 296 | while (skb2) { |
| 296 | 297 | if (status < 0 |
| 297 | 298 | || ETH_HLEN > skb2->len |
| 298 | − || skb2->len > ETH_FRAME_LEN) { | |
| 299 | + || skb2->len > VLAN_ETH_FRAME_LEN) { | |
| 299 | 300 | dev->net->stats.rx_errors++; |
| 300 | 301 | dev->net->stats.rx_length_errors++; |
| 301 | 302 | DBG(dev, "rx length %d\n", skb2->len); |
| @@ -641,7 +641,6 @@ static void xenfb_backend_changed(struct xenbus_device *dev, · 640 unmodified lines | ||
| 641 | 641 | case XenbusStateReconfiguring: |
| 642 | 642 | case XenbusStateReconfigured: |
| 643 | 643 | case XenbusStateUnknown: |
| 644 | − case XenbusStateClosed: | |
| 645 | 644 | break; |
| 646 | 645 | |
| 647 | 646 | case XenbusStateInitWait: |
| @@ -670,6 +669,10 @@ InitWait: · 22 unmodified lines | ||
| 670 | 669 | info->feature_resize = val; |
| 671 | 670 | break; |
| 672 | 671 | |
| 672 | + case XenbusStateClosed: | |
| 673 | + if (dev->state == XenbusStateClosed) | |
| 674 | + break; | |
| 675 | + /* Missed the backend's CLOSING state -- fallthrough */ | |
| 673 | 676 | case XenbusStateClosing: |
| 674 | 677 | xenbus_frontend_closed(dev); |
| 675 | 678 | break; |
| @@ -225,8 +225,10 @@ EXPORT_SYMBOL_GPL(register_virtio_device); · 224 unmodified lines | ||
| 225 | 225 | |
| 226 | 226 | void unregister_virtio_device(struct virtio_device *dev) |
| 227 | 227 | { |
| 228 | + int index = dev->index; /* save for after device release */ | |
| 229 | + | |
| 228 | 230 | device_unregister(&dev->dev); |
| 229 | − ida_simple_remove(&virtio_index_ida, dev->index); | |
| 231 | + ida_simple_remove(&virtio_index_ida, index); | |
| 230 | 232 | } |
| 231 | 233 | EXPORT_SYMBOL_GPL(unregister_virtio_device); |
| 232 | 234 | |
| @@ -2,6 +2,7 @@ ifneq ($(CONFIG_ARM),y) · 1 unmodified line | ||
| 2 | 2 | obj-y += manage.o balloon.o |
| 3 | 3 | obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o |
| 4 | 4 | endif |
| 5 | +obj-$(CONFIG_X86) += fallback.o | |
| 5 | 6 | obj-y += grant-table.o features.o events.o |
| 6 | 7 | obj-y += xenbus/ |
| 7 | 8 | |
| @@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) · 1394 unmodified lines | ||
| 1395 | 1395 | { |
| 1396 | 1396 | struct pt_regs *old_regs = set_irq_regs(regs); |
| 1397 | 1397 | |
| 1398 | + irq_enter(); | |
| 1398 | 1399 | #ifdef CONFIG_X86 |
| 1399 | 1400 | exit_idle(); |
| 1400 | 1401 | #endif |
| 1401 | − irq_enter(); | |
| 1402 | 1402 | |
| 1403 | 1403 | __xen_evtchn_do_upcall(); |
| 1404 | 1404 | |
| @@ -0,0 +1,80 @@ | ||
| 1 | +#include <linux/kernel.h> | |
| 2 | +#include <linux/string.h> | |
| 3 | +#include <linux/bug.h> | |
| 4 | +#include <linux/export.h> | |
| 5 | +#include <asm/hypervisor.h> | |
| 6 | +#include <asm/xen/hypercall.h> | |
| 7 | + | |
| 8 | +int xen_event_channel_op_compat(int cmd, void *arg) | |
| 9 | +{ | |
| 10 | + struct evtchn_op op; | |
| 11 | + int rc; | |
| 12 | + | |
| 13 | + op.cmd = cmd; | |
| 14 | + memcpy(&op.u, arg, sizeof(op.u)); | |
| 15 | + rc = _hypercall1(int, event_channel_op_compat, &op); | |
| 16 | + | |
| 17 | + switch (cmd) { | |
| 18 | + case EVTCHNOP_close: | |
| 19 | + case EVTCHNOP_send: | |
| 20 | + case EVTCHNOP_bind_vcpu: | |
| 21 | + case EVTCHNOP_unmask: | |
| 22 | + /* no output */ | |
| 23 | + break; | |
| 24 | + | |
| 25 | +#define COPY_BACK(eop) \ | |
| 26 | + case EVTCHNOP_##eop: \ | |
| 27 | + memcpy(arg, &op.u.eop, sizeof(op.u.eop)); \ | |
| 28 | + break | |
| 29 | + | |
| 30 | + COPY_BACK(bind_interdomain); | |
| 31 | + COPY_BACK(bind_virq); | |
| 32 | + COPY_BACK(bind_pirq); | |
| 33 | + COPY_BACK(status); | |
| 34 | + COPY_BACK(alloc_unbound); | |
| 35 | + COPY_BACK(bind_ipi); | |
| 36 | +#undef COPY_BACK | |
| 37 | + | |
| 38 | + default: | |
| 39 | + WARN_ON(rc != -ENOSYS); | |
| 40 | + break; | |
| 41 | + } | |
| 42 | + | |
| 43 | + return rc; | |
| 44 | +} | |
| 45 | +EXPORT_SYMBOL_GPL(xen_event_channel_op_compat); | |
| 46 | + | |
| 47 | +int HYPERVISOR_physdev_op_compat(int cmd, void *arg) | |
| 48 | +{ | |
| 49 | + struct physdev_op op; | |
| 50 | + int rc; | |
| 51 | + | |
| 52 | + op.cmd = cmd; | |
| 53 | + memcpy(&op.u, arg, sizeof(op.u)); | |
| 54 | + rc = _hypercall1(int, physdev_op_compat, &op); | |
| 55 | + | |
| 56 | + switch (cmd) { | |
| 57 | + case PHYSDEVOP_IRQ_UNMASK_NOTIFY: | |
| 58 | + case PHYSDEVOP_set_iopl: | |
| 59 | + case PHYSDEVOP_set_iobitmap: | |
| 60 | + case PHYSDEVOP_apic_write: | |
| 61 | + /* no output */ | |
| 62 | + break; | |
| 63 | + | |
| 64 | +#define COPY_BACK(pop, fld) \ | |
| 65 | + case PHYSDEVOP_##pop: \ | |
| 66 | + memcpy(arg, &op.u.fld, sizeof(op.u.fld)); \ | |
| 67 | + break | |
| 68 | + | |
| 69 | + COPY_BACK(irq_status_query, irq_status_query); | |
| 70 | + COPY_BACK(apic_read, apic_op); | |
| 71 | + COPY_BACK(ASSIGN_VECTOR, irq_op); | |
| 72 | +#undef COPY_BACK | |
| 73 | + | |
| 74 | + default: | |
| 75 | + WARN_ON(rc != -ENOSYS); | |
| 76 | + break; | |
| 77 | + } | |
| 78 | + | |
| 79 | + return rc; | |
| 80 | +} | |
| @@ -105,6 +105,21 @@ static void gntdev_print_maps(struct gntdev_priv *priv, · 104 unmodified lines | ||
| 105 | 105 | #endif |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | +static void gntdev_free_map(struct grant_map *map) | |
| 109 | +{ | |
| 110 | + if (map == NULL) | |
| 111 | + return; | |
| 112 | + | |
| 113 | + if (map->pages) | |
| 114 | + free_xenballooned_pages(map->count, map->pages); | |
| 115 | + kfree(map->pages); | |
| 116 | + kfree(map->grants); | |
| 117 | + kfree(map->map_ops); | |
| 118 | + kfree(map->unmap_ops); | |
| 119 | + kfree(map->kmap_ops); | |
| 120 | + kfree(map); | |
| 121 | +} | |
| 122 | + | |
| 108 | 123 | static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count) |
| 109 | 124 | { |
| 110 | 125 | struct grant_map *add; |
| @@ -142,12 +157,7 @@ static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count) · 31 unmodified lines | ||
| 142 | 157 | return add; |
| 143 | 158 | |
| 144 | 159 | err: |
| 145 | − kfree(add->pages); | |
| 146 | − kfree(add->grants); | |
| 147 | − kfree(add->map_ops); | |
| 148 | − kfree(add->unmap_ops); | |
| 149 | − kfree(add->kmap_ops); | |
| 150 | − kfree(add); | |
| 160 | + gntdev_free_map(add); | |
| 151 | 161 | return NULL; |
| 152 | 162 | } |
| 153 | 163 | |
| @@ -198,17 +208,9 @@ static void gntdev_put_map(struct grant_map *map) · 44 unmodified lines | ||
| 198 | 208 | evtchn_put(map->notify.event); |
| 199 | 209 | } |
| 200 | 210 | |
| 201 | − if (map->pages) { | |
| 202 | − if (!use_ptemod) | |
| 203 | − unmap_grant_pages(map, 0, map->count); | |
| 204 | − | |
| 205 | − free_xenballooned_pages(map->count, map->pages); | |
| 206 | − } | |
| 207 | − kfree(map->pages); | |
| 208 | − kfree(map->grants); | |
| 209 | − kfree(map->map_ops); | |
| 210 | − kfree(map->unmap_ops); | |
| 211 | − kfree(map); | |
| 211 | + if (map->pages && !use_ptemod) | |
| 212 | + unmap_grant_pages(map, 0, map->count); | |
| 213 | + gntdev_free_map(map); | |
| 212 | 214 | } |
| 213 | 215 | |
| 214 | 216 | /* ------------------------------------------------------------------ */ |
| @@ -458,7 +458,7 @@ static ssize_t xenbus_file_write(struct file *filp, · 457 unmodified lines | ||
| 458 | 458 | goto out; |
| 459 | 459 | |
| 460 | 460 | /* Can't write a xenbus message larger we can buffer */ |
| 461 | − if ((len + u->len) > sizeof(u->u.buffer)) { | |
| 461 | + if (len > sizeof(u->u.buffer) - u->len) { | |
| 462 | 462 | /* On error, dump existing buffer */ |
| 463 | 463 | u->len = 0; |
| 464 | 464 | rc = -EINVAL; |
| @@ -75,6 +75,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size) · 74 unmodified lines | ||
| 75 | 75 | unsigned int sz = sizeof(struct bio) + extra_size; |
| 76 | 76 | struct kmem_cache *slab = NULL; |
| 77 | 77 | struct bio_slab *bslab, *new_bio_slabs; |
| 78 | + unsigned int new_bio_slab_max; | |
| 78 | 79 | unsigned int i, entry = -1; |
| 79 | 80 | |
| 80 | 81 | mutex_lock(&bio_slab_lock); |
| @@ -97,12 +98,13 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size) · 16 unmodified lines | ||
| 97 | 98 | goto out_unlock; |
| 98 | 99 | |
| 99 | 100 | if (bio_slab_nr == bio_slab_max && entry == -1) { |
| 100 | − bio_slab_max <<= 1; | |
| 101 | + new_bio_slab_max = bio_slab_max << 1; | |
| 101 | 102 | new_bio_slabs = krealloc(bio_slabs, |
| 102 | − bio_slab_max * sizeof(struct bio_slab), | |
| 103 | + new_bio_slab_max * sizeof(struct bio_slab), | |
| 103 | 104 | GFP_KERNEL); |
| 104 | 105 | if (!new_bio_slabs) |
| 105 | 106 | goto out_unlock; |
| 107 | + bio_slab_max = new_bio_slab_max; | |
| 106 | 108 | bio_slabs = new_bio_slabs; |
| 107 | 109 | } |
| 108 | 110 | if (entry == -1) |
| @@ -90,6 +90,8 @@ static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len, · 89 unmodified lines | ||
| 90 | 90 | *max_len = handle_length; |
| 91 | 91 | type = 255; |
| 92 | 92 | } |
| 93 | + if (dentry) | |
| 94 | + dput(dentry); | |
| 93 | 95 | return type; |
| 94 | 96 | } |
| 95 | 97 | |
| @@ -224,6 +224,13 @@ sid_to_str(struct cifs_sid *sidptr, char *sidstr) · 223 unmodified lines | ||
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | +static void | |
| 228 | +cifs_copy_sid(struct cifs_sid *dst, const struct cifs_sid *src) | |
| 229 | +{ | |
| 230 | + memcpy(dst, src, sizeof(*dst)); | |
| 231 | + dst->num_subauth = min_t(u8, src->num_subauth, NUM_SUBAUTHS); | |
| 232 | +} | |
| 233 | + | |
| 227 | 234 | static void |
| 228 | 235 | id_rb_insert(struct rb_root *root, struct cifs_sid *sidptr, |
| 229 | 236 | struct cifs_sid_id **psidid, char *typestr) |
| @@ -248,7 +255,7 @@ id_rb_insert(struct rb_root *root, struct cifs_sid *sidptr, · 18 unmodified lines | ||
| 248 | 255 | } |
| 249 | 256 | } |
| 250 | 257 | |
| 251 | − memcpy(&(*psidid)->sid, sidptr, sizeof(struct cifs_sid)); | |
| 258 | + cifs_copy_sid(&(*psidid)->sid, sidptr); | |
| 252 | 259 | (*psidid)->time = jiffies - (SID_MAP_RETRY + 1); |
| 253 | 260 | (*psidid)->refcount = 0; |
| 254 | 261 | |
| @@ -354,7 +361,7 @@ id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid) · 99 unmodified lines | ||
| 354 | 361 | * any fields of the node after a reference is put . |
| 355 | 362 | */ |
| 356 | 363 | if (test_bit(SID_ID_MAPPED, &psidid->state)) { |
| 357 | − memcpy(ssid, &psidid->sid, sizeof(struct cifs_sid)); | |
| 364 | + cifs_copy_sid(ssid, &psidid->sid); | |
| 358 | 365 | psidid->time = jiffies; /* update ts for accessing */ |
| 359 | 366 | goto id_sid_out; |
| 360 | 367 | } |
| @@ -370,14 +377,14 @@ id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid) · 9 unmodified lines | ||
| 370 | 377 | if (IS_ERR(sidkey)) { |
| 371 | 378 | rc = -EINVAL; |
| 372 | 379 | cFYI(1, "%s: Can't map and id to a SID", __func__); |
| 380 | + } else if (sidkey->datalen < sizeof(struct cifs_sid)) { | |
| 381 | + rc = -EIO; | |
| 382 | + cFYI(1, "%s: Downcall contained malformed key " | |
| 383 | + "(datalen=%hu)", __func__, sidkey->datalen); | |
| 373 | 384 | } else { |
| 374 | 385 | lsid = (struct cifs_sid *)sidkey->payload.data; |
| 375 | − memcpy(&psidid->sid, lsid, | |
| 376 | − sidkey->datalen < sizeof(struct cifs_sid) ? | |
| 377 | − sidkey->datalen : sizeof(struct cifs_sid)); | |
| 378 | − memcpy(ssid, &psidid->sid, | |
| 379 | − sidkey->datalen < sizeof(struct cifs_sid) ? | |
| 380 | − sidkey->datalen : sizeof(struct cifs_sid)); | |
| 386 | + cifs_copy_sid(&psidid->sid, lsid); | |
| 387 | + cifs_copy_sid(ssid, &psidid->sid); | |
| 381 | 388 | set_bit(SID_ID_MAPPED, &psidid->state); |
| 382 | 389 | key_put(sidkey); |
| 383 | 390 | kfree(psidid->sidstr); |
| @@ -396,7 +403,7 @@ id_to_sid(unsigned long cid, uint sidtype, struct cifs_sid *ssid) · 12 unmodified lines | ||
| 396 | 403 | return rc; |
| 397 | 404 | } |
| 398 | 405 | if (test_bit(SID_ID_MAPPED, &psidid->state)) |
| 399 | − memcpy(ssid, &psidid->sid, sizeof(struct cifs_sid)); | |
| 406 | + cifs_copy_sid(ssid, &psidid->sid); | |
| 400 | 407 | else |
| 401 | 408 | rc = -EINVAL; |
| 402 | 409 | } |
| @@ -675,8 +682,6 @@ int compare_sids(const struct cifs_sid *ctsid, const struct cifs_sid *cwsid) · 272 unmodified lines | ||
| 675 | 682 | static void copy_sec_desc(const struct cifs_ntsd *pntsd, |
| 676 | 683 | struct cifs_ntsd *pnntsd, __u32 sidsoffset) |
| 677 | 684 | { |
| 678 | − int i; | |
| 679 | − | |
| 680 | 685 | struct cifs_sid *owner_sid_ptr, *group_sid_ptr; |
| 681 | 686 | struct cifs_sid *nowner_sid_ptr, *ngroup_sid_ptr; |
| 682 | 687 | |
| @@ -692,26 +697,14 @@ static void copy_sec_desc(const struct cifs_ntsd *pntsd, · 9 unmodified lines | ||
| 692 | 697 | owner_sid_ptr = (struct cifs_sid *)((char *)pntsd + |
| 693 | 698 | le32_to_cpu(pntsd->osidoffset)); |
| 694 | 699 | nowner_sid_ptr = (struct cifs_sid *)((char *)pnntsd + sidsoffset); |
| 695 | − | |
| 696 | − nowner_sid_ptr->revision = owner_sid_ptr->revision; | |
| 697 | − nowner_sid_ptr->num_subauth = owner_sid_ptr->num_subauth; | |
| 698 | − for (i = 0; i < 6; i++) | |
| 699 | − nowner_sid_ptr->authority[i] = owner_sid_ptr->authority[i]; | |
| 700 | − for (i = 0; i < 5; i++) | |
| 701 | − nowner_sid_ptr->sub_auth[i] = owner_sid_ptr->sub_auth[i]; | |
| 700 | + cifs_copy_sid(nowner_sid_ptr, owner_sid_ptr); | |
| 702 | 701 | |
| 703 | 702 | /* copy group sid */ |
| 704 | 703 | group_sid_ptr = (struct cifs_sid *)((char *)pntsd + |
| 705 | 704 | le32_to_cpu(pntsd->gsidoffset)); |
| 706 | 705 | ngroup_sid_ptr = (struct cifs_sid *)((char *)pnntsd + sidsoffset + |
| 707 | 706 | sizeof(struct cifs_sid)); |
| 708 | − | |
| 709 | − ngroup_sid_ptr->revision = group_sid_ptr->revision; | |
| 710 | − ngroup_sid_ptr->num_subauth = group_sid_ptr->num_subauth; | |
| 711 | − for (i = 0; i < 6; i++) | |
| 712 | − ngroup_sid_ptr->authority[i] = group_sid_ptr->authority[i]; | |
| 713 | − for (i = 0; i < 5; i++) | |
| 714 | − ngroup_sid_ptr->sub_auth[i] = group_sid_ptr->sub_auth[i]; | |
| 707 | + cifs_copy_sid(ngroup_sid_ptr, group_sid_ptr); | |
| 715 | 708 | |
| 716 | 709 | return; |
| 717 | 710 | } |
| @@ -1120,8 +1113,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, · 402 unmodified lines | ||
| 1120 | 1113 | kfree(nowner_sid_ptr); |
| 1121 | 1114 | return rc; |
| 1122 | 1115 | } |
| 1123 | − memcpy(owner_sid_ptr, nowner_sid_ptr, | |
| 1124 | − sizeof(struct cifs_sid)); | |
| 1116 | + cifs_copy_sid(owner_sid_ptr, nowner_sid_ptr); | |
| 1125 | 1117 | kfree(nowner_sid_ptr); |
| 1126 | 1118 | *aclflag = CIFS_ACL_OWNER; |
| 1127 | 1119 | } |
| @@ -1139,8 +1131,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, · 11 unmodified lines | ||
| 1139 | 1131 | kfree(ngroup_sid_ptr); |
| 1140 | 1132 | return rc; |
| 1141 | 1133 | } |
| 1142 | − memcpy(group_sid_ptr, ngroup_sid_ptr, | |
| 1143 | − sizeof(struct cifs_sid)); | |
| 1134 | + cifs_copy_sid(group_sid_ptr, ngroup_sid_ptr); | |
| 1144 | 1135 | kfree(ngroup_sid_ptr); |
| 1145 | 1136 | *aclflag = CIFS_ACL_GROUP; |
| 1146 | 1137 | } |
| @@ -398,7 +398,16 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry, · 397 unmodified lines | ||
| 398 | 398 | * in network traffic in the other paths. |
| 399 | 399 | */ |
| 400 | 400 | if (!(oflags & O_CREAT)) { |
| 401 | − struct dentry *res = cifs_lookup(inode, direntry, 0); | |
| 401 | + struct dentry *res; | |
| 402 | + | |
| 403 | + /* | |
| 404 | + * Check for hashed negative dentry. We have already revalidated | |
| 405 | + * the dentry and it is fine. No need to perform another lookup. | |
| 406 | + */ | |
| 407 | + if (!d_unhashed(direntry)) | |
| 408 | + return -ENOENT; | |
| 409 | + | |
| 410 | + res = cifs_lookup(inode, direntry, 0); | |
| 402 | 411 | if (IS_ERR(res)) |
| 403 | 412 | return PTR_ERR(res); |
| 404 | 413 | |
| @@ -346,7 +346,7 @@ static inline struct epitem *ep_item_from_epqueue(poll_table *p) · 345 unmodified lines | ||
| 346 | 346 | /* Tells if the epoll_ctl(2) operation needs an event copy from userspace */ |
| 347 | 347 | static inline int ep_op_has_event(int op) |
| 348 | 348 | { |
| 349 | − return op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD; | |
| 349 | + return op != EPOLL_CTL_DEL; | |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | /* Initialize the poll safe wake up structure */ |
| @@ -676,34 +676,6 @@ static int ep_remove(struct eventpoll *ep, struct epitem *epi) · 323 unmodified lines | ||
| 676 | 676 | return 0; |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | −/* | |
| 680 | − * Disables a "struct epitem" in the eventpoll set. Returns -EBUSY if the item | |
| 681 | − * had no event flags set, indicating that another thread may be currently | |
| 682 | − * handling that item's events (in the case that EPOLLONESHOT was being | |
| 683 | − * used). Otherwise a zero result indicates that the item has been disabled | |
| 684 | − * from receiving events. A disabled item may be re-enabled via | |
| 685 | − * EPOLL_CTL_MOD. Must be called with "mtx" held. | |
| 686 | − */ | |
| 687 | −static int ep_disable(struct eventpoll *ep, struct epitem *epi) | |
| 688 | −{ | |
| 689 | − int result = 0; | |
| 690 | − unsigned long flags; | |
| 691 | − | |
| 692 | − spin_lock_irqsave(&ep->lock, flags); | |
| 693 | − if (epi->event.events & ~EP_PRIVATE_BITS) { | |
| 694 | − if (ep_is_linked(&epi->rdllink)) | |
| 695 | − list_del_init(&epi->rdllink); | |
| 696 | − /* Ensure ep_poll_callback will not add epi back onto ready | |
| 697 | − list: */ | |
| 698 | − epi->event.events &= EP_PRIVATE_BITS; | |
| 699 | − } | |
| 700 | − else | |
| 701 | − result = -EBUSY; | |
| 702 | − spin_unlock_irqrestore(&ep->lock, flags); | |
| 703 | − | |
| 704 | − return result; | |
| 705 | −} | |
| 706 | − | |
| 707 | 679 | static void ep_free(struct eventpoll *ep) |
| 708 | 680 | { |
| 709 | 681 | struct rb_node *rbp; |
| @@ -1048,6 +1020,8 @@ static void ep_rbtree_insert(struct eventpoll *ep, struct epitem *epi) · 338 unmodified lines | ||
| 1048 | 1020 | rb_insert_color(&epi->rbn, &ep->rbr); |
| 1049 | 1021 | } |
| 1050 | 1022 | |
| 1023 | + | |
| 1024 | + | |
| 1051 | 1025 | #define PATH_ARR_SIZE 5 |
| 1052 | 1026 | /* |
| 1053 | 1027 | * These are the number paths of length 1 to 5, that we are allowing to emanate |
| @@ -1813,12 +1787,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd, · 759 unmodified lines | ||
| 1813 | 1787 | } else |
| 1814 | 1788 | error = -ENOENT; |
| 1815 | 1789 | break; |
| 1816 | − case EPOLL_CTL_DISABLE: | |
| 1817 | − if (epi) | |
| 1818 | − error = ep_disable(ep, epi); | |
| 1819 | − else | |
| 1820 | − error = -ENOENT; | |
| 1821 | − break; | |
| 1822 | 1790 | } |
| 1823 | 1791 | mutex_unlock(&ep->mtx); |
| 1824 | 1792 | |
| @@ -725,6 +725,10 @@ repeat_in_this_group: · 724 unmodified lines | ||
| 725 | 725 | "inode=%lu", ino + 1); |
| 726 | 726 | continue; |
| 727 | 727 | } |
| 728 | + BUFFER_TRACE(inode_bitmap_bh, "get_write_access"); | |
| 729 | + err = ext4_journal_get_write_access(handle, inode_bitmap_bh); | |
| 730 | + if (err) | |
| 731 | + goto fail; | |
| 728 | 732 | ext4_lock_group(sb, group); |
| 729 | 733 | ret2 = ext4_test_and_set_bit(ino, inode_bitmap_bh->b_data); |
| 730 | 734 | ext4_unlock_group(sb, group); |
| @@ -738,6 +742,11 @@ repeat_in_this_group: · 7 unmodified lines | ||
| 738 | 742 | goto out; |
| 739 | 743 | |
| 740 | 744 | got: |
| 745 | + BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata"); | |
| 746 | + err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh); | |
| 747 | + if (err) | |
| 748 | + goto fail; | |
| 749 | + | |
| 741 | 750 | /* We may have to initialize the block bitmap if it isn't already */ |
| 742 | 751 | if (ext4_has_group_desc_csum(sb) && |
| 743 | 752 | gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) { |
| @@ -771,11 +780,6 @@ got: · 27 unmodified lines | ||
| 771 | 780 | goto fail; |
| 772 | 781 | } |
| 773 | 782 | |
| 774 | − BUFFER_TRACE(inode_bitmap_bh, "get_write_access"); | |
| 775 | − err = ext4_journal_get_write_access(handle, inode_bitmap_bh); | |
| 776 | − if (err) | |
| 777 | − goto fail; | |
| 778 | − | |
| 779 | 783 | BUFFER_TRACE(group_desc_bh, "get_write_access"); |
| 780 | 784 | err = ext4_journal_get_write_access(handle, group_desc_bh); |
| 781 | 785 | if (err) |
| @@ -823,11 +827,6 @@ got: · 41 unmodified lines | ||
| 823 | 827 | } |
| 824 | 828 | ext4_unlock_group(sb, group); |
| 825 | 829 | |
| 826 | − BUFFER_TRACE(inode_bitmap_bh, "call ext4_handle_dirty_metadata"); | |
| 827 | − err = ext4_handle_dirty_metadata(handle, NULL, inode_bitmap_bh); | |
| 828 | − if (err) | |
| 829 | − goto fail; | |
| 830 | − | |
| 831 | 830 | BUFFER_TRACE(group_desc_bh, "call ext4_handle_dirty_metadata"); |
| 832 | 831 | err = ext4_handle_dirty_metadata(handle, NULL, group_desc_bh); |
| 833 | 832 | if (err) |
| @@ -900,7 +900,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags) · 899 unmodified lines | ||
| 900 | 900 | return __close_fd(files, fd); |
| 901 | 901 | |
| 902 | 902 | if (fd >= rlimit(RLIMIT_NOFILE)) |
| 903 | − return -EMFILE; | |
| 903 | + return -EBADF; | |
| 904 | 904 | |
| 905 | 905 | spin_lock(&files->file_lock); |
| 906 | 906 | err = expand_files(files, fd); |
| @@ -926,7 +926,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags) · 19 unmodified lines | ||
| 926 | 926 | return -EINVAL; |
| 927 | 927 | |
| 928 | 928 | if (newfd >= rlimit(RLIMIT_NOFILE)) |
| 929 | − return -EMFILE; | |
| 929 | + return -EBADF; | |
| 930 | 930 | |
| 931 | 931 | spin_lock(&files->file_lock); |
| 932 | 932 | err = expand_files(files, newfd); |
| @@ -516,15 +516,13 @@ static int gfs2_mmap(struct file *file, struct vm_area_struct *vma) · 515 unmodified lines | ||
| 516 | 516 | struct gfs2_holder i_gh; |
| 517 | 517 | int error; |
| 518 | 518 | |
| 519 | − gfs2_holder_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, &i_gh); | |
| 520 | − error = gfs2_glock_nq(&i_gh); | |
| 521 | − if (error == 0) { | |
| 522 | − file_accessed(file); | |
| 523 | − gfs2_glock_dq(&i_gh); | |
| 524 | − } | |
| 525 | − gfs2_holder_uninit(&i_gh); | |
| 519 | + error = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, LM_FLAG_ANY, | |
| 520 | + &i_gh); | |
| 526 | 521 | if (error) |
| 527 | 522 | return error; |
| 523 | + /* grab lock to update inode */ | |
| 524 | + gfs2_glock_dq_uninit(&i_gh); | |
| 525 | + file_accessed(file); | |
| 528 | 526 | } |
| 529 | 527 | vma->vm_ops = &gfs2_vm_ops; |
| 530 | 528 | |
| @@ -677,10 +675,8 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov, · 146 unmodified lines | ||
| 677 | 675 | size_t writesize = iov_length(iov, nr_segs); |
| 678 | 676 | struct dentry *dentry = file->f_dentry; |
| 679 | 677 | struct gfs2_inode *ip = GFS2_I(dentry->d_inode); |
| 680 | − struct gfs2_sbd *sdp; | |
| 681 | 678 | int ret; |
| 682 | 679 | |
| 683 | − sdp = GFS2_SB(file->f_mapping->host); | |
| 684 | 680 | ret = gfs2_rs_alloc(ip); |
| 685 | 681 | if (ret) |
| 686 | 682 | return ret; |
| @@ -393,12 +393,10 @@ static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) · 392 unmodified lines | ||
| 393 | 393 | struct gfs2_meta_header *mh; |
| 394 | 394 | struct gfs2_trans *tr; |
| 395 | 395 | |
| 396 | − lock_buffer(bd->bd_bh); | |
| 397 | − gfs2_log_lock(sdp); | |
| 398 | 396 | tr = current->journal_info; |
| 399 | 397 | tr->tr_touched = 1; |
| 400 | 398 | if (!list_empty(&bd->bd_list)) |
| 401 | − goto out; | |
| 399 | + return; | |
| 402 | 400 | set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags); |
| 403 | 401 | set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags); |
| 404 | 402 | mh = (struct gfs2_meta_header *)bd->bd_bh->b_data; |
| @@ -414,9 +412,6 @@ static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) · 9 unmodified lines | ||
| 414 | 412 | sdp->sd_log_num_buf++; |
| 415 | 413 | list_add(&bd->bd_list, &sdp->sd_log_le_buf); |
| 416 | 414 | tr->tr_num_buf_new++; |
| 417 | −out: | |
| 418 | − gfs2_log_unlock(sdp); | |
| 419 | − unlock_buffer(bd->bd_bh); | |
| 420 | 415 | } |
| 421 | 416 | |
| 422 | 417 | static void gfs2_check_magic(struct buffer_head *bh) |
| @@ -621,7 +616,6 @@ static void revoke_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) · 198 unmodified lines | ||
| 621 | 616 | |
| 622 | 617 | static void revoke_lo_before_commit(struct gfs2_sbd *sdp) |
| 623 | 618 | { |
| 624 | − struct gfs2_log_descriptor *ld; | |
| 625 | 619 | struct gfs2_meta_header *mh; |
| 626 | 620 | unsigned int offset; |
| 627 | 621 | struct list_head *head = &sdp->sd_log_le_revoke; |
| @@ -634,7 +628,6 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp) · 6 unmodified lines | ||
| 634 | 628 | |
| 635 | 629 | length = gfs2_struct2blk(sdp, sdp->sd_log_num_revoke, sizeof(u64)); |
| 636 | 630 | page = gfs2_get_log_desc(sdp, GFS2_LOG_DESC_REVOKE, length, sdp->sd_log_num_revoke); |
| 637 | − ld = page_address(page); | |
| 638 | 631 | offset = sizeof(struct gfs2_log_descriptor); |
| 639 | 632 | |
| 640 | 633 | list_for_each_entry(bd, head, bd_list) { |
| @@ -777,12 +770,10 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) · 136 unmodified lines | ||
| 777 | 770 | struct address_space *mapping = bd->bd_bh->b_page->mapping; |
| 778 | 771 | struct gfs2_inode *ip = GFS2_I(mapping->host); |
| 779 | 772 | |
| 780 | − lock_buffer(bd->bd_bh); | |
| 781 | − gfs2_log_lock(sdp); | |
| 782 | 773 | if (tr) |
| 783 | 774 | tr->tr_touched = 1; |
| 784 | 775 | if (!list_empty(&bd->bd_list)) |
| 785 | − goto out; | |
| 776 | + return; | |
| 786 | 777 | set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags); |
| 787 | 778 | set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags); |
| 788 | 779 | if (gfs2_is_jdata(ip)) { |
| @@ -793,9 +784,6 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) · 4 unmodified lines | ||
| 793 | 784 | } else { |
| 794 | 785 | list_add_tail(&bd->bd_list, &sdp->sd_log_le_ordered); |
| 795 | 786 | } |
| 796 | −out: | |
| 797 | − gfs2_log_unlock(sdp); | |
| 798 | − unlock_buffer(bd->bd_bh); | |
| 799 | 787 | } |
| 800 | 788 | |
| 801 | 789 | /** |
| @@ -497,8 +497,11 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid) · 496 unmodified lines | ||
| 497 | 497 | struct gfs2_quota_data **qd; |
| 498 | 498 | int error; |
| 499 | 499 | |
| 500 | − if (ip->i_res == NULL) | |
| 501 | − gfs2_rs_alloc(ip); | |
| 500 | + if (ip->i_res == NULL) { | |
| 501 | + error = gfs2_rs_alloc(ip); | |
| 502 | + if (error) | |
| 503 | + return error; | |
| 504 | + } | |
| 502 | 505 | |
| 503 | 506 | qd = ip->i_res->rs_qa_qd; |
| 504 | 507 | |
| @@ -553,7 +553,6 @@ void gfs2_free_clones(struct gfs2_rgrpd *rgd) · 552 unmodified lines | ||
| 553 | 553 | */ |
| 554 | 554 | int gfs2_rs_alloc(struct gfs2_inode *ip) |
| 555 | 555 | { |
| 556 | − int error = 0; | |
| 557 | 556 | struct gfs2_blkreserv *res; |
| 558 | 557 | |
| 559 | 558 | if (ip->i_res) |
| @@ -561,7 +560,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip) · 1 unmodified line | ||
| 561 | 560 | |
| 562 | 561 | res = kmem_cache_zalloc(gfs2_rsrv_cachep, GFP_NOFS); |
| 563 | 562 | if (!res) |
| 564 | − error = -ENOMEM; | |
| 563 | + return -ENOMEM; | |
| 565 | 564 | |
| 566 | 565 | RB_CLEAR_NODE(&res->rs_node); |
| 567 | 566 | |
| @@ -571,7 +570,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip) · 3 unmodified lines | ||
| 571 | 570 | else |
| 572 | 571 | ip->i_res = res; |
| 573 | 572 | up_write(&ip->i_rw_mutex); |
| 574 | − return error; | |
| 573 | + return 0; | |
| 575 | 574 | } |
| 576 | 575 | |
| 577 | 576 | static void dump_rs(struct seq_file *seq, const struct gfs2_blkreserv *rs) |
| @@ -1263,7 +1262,9 @@ int gfs2_fitrim(struct file *filp, void __user *argp) · 685 unmodified lines | ||
| 1263 | 1262 | int ret = 0; |
| 1264 | 1263 | u64 amt; |
| 1265 | 1264 | u64 trimmed = 0; |
| 1265 | + u64 start, end, minlen; | |
| 1266 | 1266 | unsigned int x; |
| 1267 | + unsigned bs_shift = sdp->sd_sb.sb_bsize_shift; | |
| 1267 | 1268 | |
| 1268 | 1269 | if (!capable(CAP_SYS_ADMIN)) |
| 1269 | 1270 | return -EPERM; |
| @@ -1271,19 +1272,25 @@ int gfs2_fitrim(struct file *filp, void __user *argp) · 1 unmodified line | ||
| 1271 | 1272 | if (!blk_queue_discard(q)) |
| 1272 | 1273 | return -EOPNOTSUPP; |
| 1273 | 1274 | |
| 1274 | − if (argp == NULL) { | |
| 1275 | − r.start = 0; | |
| 1276 | − r.len = ULLONG_MAX; | |
| 1277 | − r.minlen = 0; | |
| 1278 | − } else if (copy_from_user(&r, argp, sizeof(r))) | |
| 1275 | + if (copy_from_user(&r, argp, sizeof(r))) | |
| 1279 | 1276 | return -EFAULT; |
| 1280 | 1277 | |
| 1281 | 1278 | ret = gfs2_rindex_update(sdp); |
| 1282 | 1279 | if (ret) |
| 1283 | 1280 | return ret; |
| 1284 | 1281 | |
| 1285 | − rgd = gfs2_blk2rgrpd(sdp, r.start, 0); | |
| 1286 | − rgd_end = gfs2_blk2rgrpd(sdp, r.start + r.len, 0); | |
| 1282 | + start = r.start >> bs_shift; | |
| 1283 | + end = start + (r.len >> bs_shift); | |
| 1284 | + minlen = max_t(u64, r.minlen, | |
| 1285 | + q->limits.discard_granularity) >> bs_shift; | |
| 1286 | + | |
| 1287 | + rgd = gfs2_blk2rgrpd(sdp, start, 0); | |
| 1288 | + rgd_end = gfs2_blk2rgrpd(sdp, end - 1, 0); | |
| 1289 | + | |
| 1290 | + if (end <= start || | |
| 1291 | + minlen > sdp->sd_max_rg_data || | |
| 1292 | + start > rgd_end->rd_data0 + rgd_end->rd_data) | |
| 1293 | + return -EINVAL; | |
| 1287 | 1294 | |
| 1288 | 1295 | while (1) { |
| 1289 | 1296 | |
| @@ -1295,7 +1302,9 @@ int gfs2_fitrim(struct file *filp, void __user *argp) · 5 unmodified lines | ||
| 1295 | 1302 | /* Trim each bitmap in the rgrp */ |
| 1296 | 1303 | for (x = 0; x < rgd->rd_length; x++) { |
| 1297 | 1304 | struct gfs2_bitmap *bi = rgd->rd_bits + x; |
| 1298 | − ret = gfs2_rgrp_send_discards(sdp, rgd->rd_data0, NULL, bi, r.minlen, &amt); | |
| 1305 | + ret = gfs2_rgrp_send_discards(sdp, | |
| 1306 | + rgd->rd_data0, NULL, bi, minlen, | |
| 1307 | + &amt); | |
| 1299 | 1308 | if (ret) { |
| 1300 | 1309 | gfs2_glock_dq_uninit(&gh); |
| 1301 | 1310 | goto out; |
| @@ -1324,7 +1333,7 @@ int gfs2_fitrim(struct file *filp, void __user *argp) · 22 unmodified lines | ||
| 1324 | 1333 | |
| 1325 | 1334 | out: |
| 1326 | 1335 | r.len = trimmed << 9; |
| 1327 | − if (argp && copy_to_user(argp, &r, sizeof(r))) | |
| 1336 | + if (copy_to_user(argp, &r, sizeof(r))) | |
| 1328 | 1337 | return -EFAULT; |
| 1329 | 1338 | |
| 1330 | 1339 | return ret; |
| @@ -810,7 +810,8 @@ static void gfs2_dirty_inode(struct inode *inode, int flags) · 809 unmodified lines | ||
| 810 | 810 | return; |
| 811 | 811 | } |
| 812 | 812 | need_unlock = 1; |
| 813 | − } | |
| 813 | + } else if (WARN_ON_ONCE(ip->i_gl->gl_state != LM_ST_EXCLUSIVE)) | |
| 814 | + return; | |
| 814 | 815 | |
| 815 | 816 | if (current->journal_info == NULL) { |
| 816 | 817 | ret = gfs2_trans_begin(sdp, RES_DINODE, 0); |
| @@ -155,14 +155,22 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta) · 154 unmodified lines | ||
| 155 | 155 | struct gfs2_sbd *sdp = gl->gl_sbd; |
| 156 | 156 | struct gfs2_bufdata *bd; |
| 157 | 157 | |
| 158 | + lock_buffer(bh); | |
| 159 | + gfs2_log_lock(sdp); | |
| 158 | 160 | bd = bh->b_private; |
| 159 | 161 | if (bd) |
| 160 | 162 | gfs2_assert(sdp, bd->bd_gl == gl); |
| 161 | 163 | else { |
| 164 | + gfs2_log_unlock(sdp); | |
| 165 | + unlock_buffer(bh); | |
| 162 | 166 | gfs2_attach_bufdata(gl, bh, meta); |
| 163 | 167 | bd = bh->b_private; |
| 168 | + lock_buffer(bh); | |
| 169 | + gfs2_log_lock(sdp); | |
| 164 | 170 | } |
| 165 | 171 | lops_add(sdp, bd); |
| 172 | + gfs2_log_unlock(sdp); | |
| 173 | + unlock_buffer(bh); | |
| 166 | 174 | } |
| 167 | 175 | |
| 168 | 176 | void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) |
| @@ -217,7 +217,7 @@ static int nfs_dns_parse(struct cache_detail *cd, char *buf, int buflen) · 216 unmodified lines | ||
| 217 | 217 | { |
| 218 | 218 | char buf1[NFS_DNS_HOSTNAME_MAXLEN+1]; |
| 219 | 219 | struct nfs_dns_ent key, *item; |
| 220 | − unsigned long ttl; | |
| 220 | + unsigned int ttl; | |
| 221 | 221 | ssize_t len; |
| 222 | 222 | int ret = -EINVAL; |
| 223 | 223 | |
| @@ -240,7 +240,8 @@ static int nfs_dns_parse(struct cache_detail *cd, char *buf, int buflen) · 16 unmodified lines | ||
| 240 | 240 | key.namelen = len; |
| 241 | 241 | memset(&key.h, 0, sizeof(key.h)); |
| 242 | 242 | |
| 243 | − ttl = get_expiry(&buf); | |
| 243 | + if (get_uint(&buf, &ttl) < 0) | |
| 244 | + goto out; | |
| 244 | 245 | if (ttl == 0) |
| 245 | 246 | goto out; |
| 246 | 247 | key.h.expiry_time = ttl + seconds_since_boot(); |
| @@ -685,7 +685,10 @@ static void __put_nfs_open_context(struct nfs_open_context *ctx, int is_sync) · 684 unmodified lines | ||
| 685 | 685 | if (ctx->cred != NULL) |
| 686 | 686 | put_rpccred(ctx->cred); |
| 687 | 687 | dput(ctx->dentry); |
| 688 | − nfs_sb_deactive(sb); | |
| 688 | + if (is_sync) | |
| 689 | + nfs_sb_deactive(sb); | |
| 690 | + else | |
| 691 | + nfs_sb_deactive_async(sb); | |
| 689 | 692 | kfree(ctx->mdsthreshold); |
| 690 | 693 | kfree(ctx); |
| 691 | 694 | } |
| @@ -351,10 +351,12 @@ extern int __init register_nfs_fs(void); · 350 unmodified lines | ||
| 351 | 351 | extern void __exit unregister_nfs_fs(void); |
| 352 | 352 | extern void nfs_sb_active(struct super_block *sb); |
| 353 | 353 | extern void nfs_sb_deactive(struct super_block *sb); |
| 354 | +extern void nfs_sb_deactive_async(struct super_block *sb); | |
| 354 | 355 | |
| 355 | 356 | /* namespace.c */ |
| 357 | +#define NFS_PATH_CANONICAL 1 | |
| 356 | 358 | extern char *nfs_path(char **p, struct dentry *dentry, |
| 357 | − char *buffer, ssize_t buflen); | |
| 359 | + char *buffer, ssize_t buflen, unsigned flags); | |
| 358 | 360 | extern struct vfsmount *nfs_d_automount(struct path *path); |
| 359 | 361 | struct vfsmount *nfs_submount(struct nfs_server *, struct dentry *, |
| 360 | 362 | struct nfs_fh *, struct nfs_fattr *); |
| @@ -498,7 +500,7 @@ static inline char *nfs_devname(struct dentry *dentry, · 137 unmodified lines | ||
| 498 | 500 | char *buffer, ssize_t buflen) |
| 499 | 501 | { |
| 500 | 502 | char *dummy; |
| 501 | − return nfs_path(&dummy, dentry, buffer, buflen); | |
| 503 | + return nfs_path(&dummy, dentry, buffer, buflen, NFS_PATH_CANONICAL); | |
| 502 | 504 | } |
| 503 | 505 | |
| 504 | 506 | /* |
| @@ -181,7 +181,7 @@ int nfs_mount(struct nfs_mount_request *info) · 180 unmodified lines | ||
| 181 | 181 | else |
| 182 | 182 | msg.rpc_proc = &mnt_clnt->cl_procinfo[MOUNTPROC_MNT]; |
| 183 | 183 | |
| 184 | − status = rpc_call_sync(mnt_clnt, &msg, 0); | |
| 184 | + status = rpc_call_sync(mnt_clnt, &msg, RPC_TASK_SOFT|RPC_TASK_TIMEOUT); | |
| 185 | 185 | rpc_shutdown_client(mnt_clnt); |
| 186 | 186 | |
| 187 | 187 | if (status < 0) |
| @@ -33,6 +33,7 @@ int nfs_mountpoint_expiry_timeout = 500 * HZ; · 32 unmodified lines | ||
| 33 | 33 | * @dentry - pointer to dentry |
| 34 | 34 | * @buffer - result buffer |
| 35 | 35 | * @buflen - length of buffer |
| 36 | + * @flags - options (see below) | |
| 36 | 37 | * |
| 37 | 38 | * Helper function for constructing the server pathname |
| 38 | 39 | * by arbitrary hashed dentry. |
| @@ -40,8 +41,14 @@ int nfs_mountpoint_expiry_timeout = 500 * HZ; · 1 unmodified line | ||
| 40 | 41 | * This is mainly for use in figuring out the path on the |
| 41 | 42 | * server side when automounting on top of an existing partition |
| 42 | 43 | * and in generating /proc/mounts and friends. |
| 44 | + * | |
| 45 | + * Supported flags: | |
| 46 | + * NFS_PATH_CANONICAL: ensure there is exactly one slash after | |
| 47 | + * the original device (export) name | |
| 48 | + * (if unset, the original name is returned verbatim) | |
| 43 | 49 | */ |
| 44 | −char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen) | |
| 50 | +char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen, | |
| 51 | + unsigned flags) | |
| 45 | 52 | { |
| 46 | 53 | char *end; |
| 47 | 54 | int namelen; |
| @@ -74,7 +81,7 @@ rename_retry: · 26 unmodified lines | ||
| 74 | 81 | rcu_read_unlock(); |
| 75 | 82 | goto rename_retry; |
| 76 | 83 | } |
| 77 | − if (*end != '/') { | |
| 84 | + if ((flags & NFS_PATH_CANONICAL) && *end != '/') { | |
| 78 | 85 | if (--buflen < 0) { |
| 79 | 86 | spin_unlock(&dentry->d_lock); |
| 80 | 87 | rcu_read_unlock(); |
| @@ -91,9 +98,11 @@ rename_retry: · 10 unmodified lines | ||
| 91 | 98 | return end; |
| 92 | 99 | } |
| 93 | 100 | namelen = strlen(base); |
| 94 | − /* Strip off excess slashes in base string */ | |
| 95 | − while (namelen > 0 && base[namelen - 1] == '/') | |
| 96 | − namelen--; | |
| 101 | + if (flags & NFS_PATH_CANONICAL) { | |
| 102 | + /* Strip off excess slashes in base string */ | |
| 103 | + while (namelen > 0 && base[namelen - 1] == '/') | |
| 104 | + namelen--; | |
| 105 | + } | |
| 97 | 106 | buflen -= namelen; |
| 98 | 107 | if (buflen < 0) { |
| 99 | 108 | spin_unlock(&dentry->d_lock); |
| @@ -81,7 +81,8 @@ static char *nfs_path_component(const char *nfspath, const char *end) · 80 unmodified lines | ||
| 81 | 81 | static char *nfs4_path(struct dentry *dentry, char *buffer, ssize_t buflen) |
| 82 | 82 | { |
| 83 | 83 | char *limit; |
| 84 | − char *path = nfs_path(&limit, dentry, buffer, buflen); | |
| 84 | + char *path = nfs_path(&limit, dentry, buffer, buflen, | |
| 85 | + NFS_PATH_CANONICAL); | |
| 85 | 86 | if (!IS_ERR(path)) { |
| 86 | 87 | char *path_component = nfs_path_component(path, limit); |
| 87 | 88 | if (path_component) |
| @@ -339,8 +339,7 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc · 338 unmodified lines | ||
| 339 | 339 | dprintk("%s ERROR: %d Reset session\n", __func__, |
| 340 | 340 | errorcode); |
| 341 | 341 | nfs4_schedule_session_recovery(clp->cl_session, errorcode); |
| 342 | − exception->retry = 1; | |
| 343 | − break; | |
| 342 | + goto wait_on_recovery; | |
| 344 | 343 | #endif /* defined(CONFIG_NFS_V4_1) */ |
| 345 | 344 | case -NFS4ERR_FILE_OPEN: |
| 346 | 345 | if (exception->timeout > HZ) { |
| @@ -1572,9 +1571,11 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata) · 1225 unmodified lines | ||
| 1572 | 1571 | data->timestamp = jiffies; |
| 1573 | 1572 | if (nfs4_setup_sequence(data->o_arg.server, |
| 1574 | 1573 | &data->o_arg.seq_args, |
| 1575 | − &data->o_res.seq_res, task)) | |
| 1576 | − return; | |
| 1577 | − rpc_call_start(task); | |
| 1574 | + &data->o_res.seq_res, | |
| 1575 | + task) != 0) | |
| 1576 | + nfs_release_seqid(data->o_arg.seqid); | |
| 1577 | + else | |
| 1578 | + rpc_call_start(task); | |
| 1578 | 1579 | return; |
| 1579 | 1580 | unlock_no_action: |
| 1580 | 1581 | rcu_read_unlock(); |
| @@ -1748,7 +1749,7 @@ static int nfs4_opendata_access(struct rpc_cred *cred, · 167 unmodified lines | ||
| 1748 | 1749 | |
| 1749 | 1750 | /* even though OPEN succeeded, access is denied. Close the file */ |
| 1750 | 1751 | nfs4_close_state(state, fmode); |
| 1751 | − return -NFS4ERR_ACCESS; | |
| 1752 | + return -EACCES; | |
| 1752 | 1753 | } |
| 1753 | 1754 | |
| 1754 | 1755 | /* |
| @@ -2196,7 +2197,7 @@ static void nfs4_free_closedata(void *data) · 441 unmodified lines | ||
| 2196 | 2197 | nfs4_put_open_state(calldata->state); |
| 2197 | 2198 | nfs_free_seqid(calldata->arg.seqid); |
| 2198 | 2199 | nfs4_put_state_owner(sp); |
| 2199 | − nfs_sb_deactive(sb); | |
| 2200 | + nfs_sb_deactive_async(sb); | |
| 2200 | 2201 | kfree(calldata); |
| 2201 | 2202 | } |
| 2202 | 2203 | |
| @@ -2296,9 +2297,10 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) · 93 unmodified lines | ||
| 2296 | 2297 | if (nfs4_setup_sequence(NFS_SERVER(inode), |
| 2297 | 2298 | &calldata->arg.seq_args, |
| 2298 | 2299 | &calldata->res.seq_res, |
| 2299 | − task)) | |
| 2300 | − goto out; | |
| 2301 | − rpc_call_start(task); | |
| 2300 | + task) != 0) | |
| 2301 | + nfs_release_seqid(calldata->arg.seqid); | |
| 2302 | + else | |
| 2303 | + rpc_call_start(task); | |
| 2302 | 2304 | out: |
| 2303 | 2305 | dprintk("%s: done!\n", __func__); |
| 2304 | 2306 | } |
| @@ -4529,6 +4531,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) · 2224 unmodified lines | ||
| 4529 | 4531 | if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN) |
| 4530 | 4532 | rpc_restart_call_prepare(task); |
| 4531 | 4533 | } |
| 4534 | + nfs_release_seqid(calldata->arg.seqid); | |
| 4532 | 4535 | } |
| 4533 | 4536 | |
| 4534 | 4537 | static void nfs4_locku_prepare(struct rpc_task *task, void *data) |
| @@ -4545,9 +4548,11 @@ static void nfs4_locku_prepare(struct rpc_task *task, void *data) · 10 unmodified lines | ||
| 4545 | 4548 | calldata->timestamp = jiffies; |
| 4546 | 4549 | if (nfs4_setup_sequence(calldata->server, |
| 4547 | 4550 | &calldata->arg.seq_args, |
| 4548 | − &calldata->res.seq_res, task)) | |
| 4549 | − return; | |
| 4550 | − rpc_call_start(task); | |
| 4551 | + &calldata->res.seq_res, | |
| 4552 | + task) != 0) | |
| 4553 | + nfs_release_seqid(calldata->arg.seqid); | |
| 4554 | + else | |
| 4555 | + rpc_call_start(task); | |
| 4551 | 4556 | } |
| 4552 | 4557 | |
| 4553 | 4558 | static const struct rpc_call_ops nfs4_locku_ops = { |
| @@ -4692,7 +4697,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) · 138 unmodified lines | ||
| 4692 | 4697 | /* Do we need to do an open_to_lock_owner? */ |
| 4693 | 4698 | if (!(data->arg.lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED)) { |
| 4694 | 4699 | if (nfs_wait_on_sequence(data->arg.open_seqid, task) != 0) |
| 4695 | − return; | |
| 4700 | + goto out_release_lock_seqid; | |
| 4696 | 4701 | data->arg.open_stateid = &state->stateid; |
| 4697 | 4702 | data->arg.new_lock_owner = 1; |
| 4698 | 4703 | data->res.open_seqid = data->arg.open_seqid; |
| @@ -4701,10 +4706,15 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) · 2 unmodified lines | ||
| 4701 | 4706 | data->timestamp = jiffies; |
| 4702 | 4707 | if (nfs4_setup_sequence(data->server, |
| 4703 | 4708 | &data->arg.seq_args, |
| 4704 | − &data->res.seq_res, task)) | |
| 4709 | + &data->res.seq_res, | |
| 4710 | + task) == 0) { | |
| 4711 | + rpc_call_start(task); | |
| 4705 | 4712 | return; |
| 4706 | − rpc_call_start(task); | |
| 4707 | − dprintk("%s: done!, ret = %d\n", __func__, data->rpc_status); | |
| 4713 | + } | |
| 4714 | + nfs_release_seqid(data->arg.open_seqid); | |
| 4715 | +out_release_lock_seqid: | |
| 4716 | + nfs_release_seqid(data->arg.lock_seqid); | |
| 4717 | + dprintk("%s: done!, ret = %d\n", __func__, task->tk_status); | |
| 4708 | 4718 | } |
| 4709 | 4719 | |
| 4710 | 4720 | static void nfs4_recover_lock_prepare(struct rpc_task *task, void *calldata) |
| @@ -5667,7 +5677,7 @@ static void nfs4_add_and_init_slots(struct nfs4_slot_table *tbl, · 956 unmodified lines | ||
| 5667 | 5677 | tbl->slots = new; |
| 5668 | 5678 | tbl->max_slots = max_slots; |
| 5669 | 5679 | } |
| 5670 | − tbl->highest_used_slotid = -1; /* no slot is currently used */ | |
| 5680 | + tbl->highest_used_slotid = NFS4_NO_SLOT; | |
| 5671 | 5681 | for (i = 0; i < tbl->max_slots; i++) |
| 5672 | 5682 | tbl->slots[i].seq_nr = ivalue; |
| 5673 | 5683 | spin_unlock(&tbl->slot_tbl_lock); |
| @@ -925,8 +925,8 @@ pnfs_find_alloc_layout(struct inode *ino, · 924 unmodified lines | ||
| 925 | 925 | if (likely(nfsi->layout == NULL)) { /* Won the race? */ |
| 926 | 926 | nfsi->layout = new; |
| 927 | 927 | return new; |
| 928 | − } | |
| 929 | − pnfs_free_layout_hdr(new); | |
| 928 | + } else if (new != NULL) | |
| 929 | + pnfs_free_layout_hdr(new); | |
| 930 | 930 | out_existing: |
| 931 | 931 | pnfs_get_layout_hdr(nfsi->layout); |
| 932 | 932 | return nfsi->layout; |
| @@ -54,6 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | #include <linux/parser.h> |
| 55 | 55 | #include <linux/nsproxy.h> |
| 56 | 56 | #include <linux/rcupdate.h> |
| 57 | +#include <linux/kthread.h> | |
| 57 | 58 | |
| 58 | 59 | #include <asm/uaccess.h> |
| 59 | 60 | |
| @@ -415,6 +416,54 @@ void nfs_sb_deactive(struct super_block *sb) · 355 unmodified lines | ||
| 415 | 416 | } |
| 416 | 417 | EXPORT_SYMBOL_GPL(nfs_sb_deactive); |
| 417 | 418 | |
| 419 | +static int nfs_deactivate_super_async_work(void *ptr) | |
| 420 | +{ | |
| 421 | + struct super_block *sb = ptr; | |
| 422 | + | |
| 423 | + deactivate_super(sb); | |
| 424 | + module_put_and_exit(0); | |
| 425 | + return 0; | |
| 426 | +} | |
| 427 | + | |
| 428 | +/* | |
| 429 | + * same effect as deactivate_super, but will do final unmount in kthread | |
| 430 | + * context | |
| 431 | + */ | |
| 432 | +static void nfs_deactivate_super_async(struct super_block *sb) | |
| 433 | +{ | |
| 434 | + struct task_struct *task; | |
| 435 | + char buf[INET6_ADDRSTRLEN + 1]; | |
| 436 | + struct nfs_server *server = NFS_SB(sb); | |
| 437 | + struct nfs_client *clp = server->nfs_client; | |
| 438 | + | |
| 439 | + if (!atomic_add_unless(&sb->s_active, -1, 1)) { | |
| 440 | + rcu_read_lock(); | |
| 441 | + snprintf(buf, sizeof(buf), | |
| 442 | + rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)); | |
| 443 | + rcu_read_unlock(); | |
| 444 | + | |
| 445 | + __module_get(THIS_MODULE); | |
| 446 | + task = kthread_run(nfs_deactivate_super_async_work, sb, | |
| 447 | + "%s-deactivate-super", buf); | |
| 448 | + if (IS_ERR(task)) { | |
| 449 | + pr_err("%s: kthread_run: %ld\n", | |
| 450 | + __func__, PTR_ERR(task)); | |
| 451 | + /* make synchronous call and hope for the best */ | |
| 452 | + deactivate_super(sb); | |
| 453 | + module_put(THIS_MODULE); | |
| 454 | + } | |
| 455 | + } | |
| 456 | +} | |
| 457 | + | |
| 458 | +void nfs_sb_deactive_async(struct super_block *sb) | |
| 459 | +{ | |
| 460 | + struct nfs_server *server = NFS_SB(sb); | |
| 461 | + | |
| 462 | + if (atomic_dec_and_test(&server->active)) | |
| 463 | + nfs_deactivate_super_async(sb); | |
| 464 | +} | |
| 465 | +EXPORT_SYMBOL_GPL(nfs_sb_deactive_async); | |
| 466 | + | |
| 418 | 467 | /* |
| 419 | 468 | * Deliver file system statistics to userspace |
| 420 | 469 | */ |
| @@ -771,7 +820,7 @@ int nfs_show_devname(struct seq_file *m, struct dentry *root) · 350 unmodified lines | ||
| 771 | 820 | int err = 0; |
| 772 | 821 | if (!page) |
| 773 | 822 | return -ENOMEM; |
| 774 | − devname = nfs_path(&dummy, root, page, PAGE_SIZE); | |
| 823 | + devname = nfs_path(&dummy, root, page, PAGE_SIZE, 0); | |
| 775 | 824 | if (IS_ERR(devname)) |
| 776 | 825 | err = PTR_ERR(devname); |
| 777 | 826 | else |
| @@ -95,7 +95,7 @@ static void nfs_async_unlink_release(void *calldata) · 94 unmodified lines | ||
| 95 | 95 | |
| 96 | 96 | nfs_dec_sillycount(data->dir); |
| 97 | 97 | nfs_free_unlinkdata(data); |
| 98 | − nfs_sb_deactive(sb); | |
| 98 | + nfs_sb_deactive_async(sb); | |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | static void nfs_unlink_prepare(struct rpc_task *task, void *calldata) |
| @@ -21,6 +21,7 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new) · 20 unmodified lines | ||
| 21 | 21 | if ((old->path.mnt == new->path.mnt) && |
| 22 | 22 | (old->path.dentry == new->path.dentry)) |
| 23 | 23 | return true; |
| 24 | + break; | |
| 24 | 25 | case (FSNOTIFY_EVENT_NONE): |
| 25 | 26 | return true; |
| 26 | 27 | default: |
| @@ -1866,6 +1866,7 @@ xfs_alloc_fix_freelist( · 1865 unmodified lines | ||
| 1866 | 1866 | /* |
| 1867 | 1867 | * Initialize the args structure. |
| 1868 | 1868 | */ |
| 1869 | + memset(&targs, 0, sizeof(targs)); | |
| 1869 | 1870 | targs.tp = tp; |
| 1870 | 1871 | targs.mp = mp; |
| 1871 | 1872 | targs.agbp = agbp; |
| @@ -2207,7 +2208,7 @@ xfs_alloc_read_agf( · 335 unmodified lines | ||
| 2207 | 2208 | * group or loop over the allocation groups to find the result. |
| 2208 | 2209 | */ |
| 2209 | 2210 | int /* error */ |
| 2210 | −__xfs_alloc_vextent( | |
| 2211 | +xfs_alloc_vextent( | |
| 2211 | 2212 | xfs_alloc_arg_t *args) /* allocation argument structure */ |
| 2212 | 2213 | { |
| 2213 | 2214 | xfs_agblock_t agsize; /* allocation group size */ |
| @@ -2417,46 +2418,6 @@ error0: · 203 unmodified lines | ||
| 2417 | 2418 | return error; |
| 2418 | 2419 | } |
| 2419 | 2420 | |
| 2420 | −static void | |
| 2421 | −xfs_alloc_vextent_worker( | |
| 2422 | − struct work_struct *work) | |
| 2423 | −{ | |
| 2424 | − struct xfs_alloc_arg *args = container_of(work, | |
| 2425 | − struct xfs_alloc_arg, work); | |
| 2426 | − unsigned long pflags; | |
| 2427 | − | |
| 2428 | − /* we are in a transaction context here */ | |
| 2429 | − current_set_flags_nested(&pflags, PF_FSTRANS); | |
| 2430 | − | |
| 2431 | − args->result = __xfs_alloc_vextent(args); | |
| 2432 | − complete(args->done); | |
| 2433 | − | |
| 2434 | − current_restore_flags_nested(&pflags, PF_FSTRANS); | |
| 2435 | −} | |
| 2436 | − | |
| 2437 | −/* | |
| 2438 | − * Data allocation requests often come in with little stack to work on. Push | |
| 2439 | − * them off to a worker thread so there is lots of stack to use. Metadata | |
| 2440 | − * requests, OTOH, are generally from low stack usage paths, so avoid the | |
| 2441 | − * context switch overhead here. | |
| 2442 | − */ | |
| 2443 | −int | |
| 2444 | −xfs_alloc_vextent( | |
| 2445 | − struct xfs_alloc_arg *args) | |
| 2446 | −{ | |
| 2447 | − DECLARE_COMPLETION_ONSTACK(done); | |
| 2448 | − | |
| 2449 | − if (!args->userdata) | |
| 2450 | − return __xfs_alloc_vextent(args); | |
| 2451 | − | |
| 2452 | − | |
| 2453 | − args->done = &done; | |
| 2454 | − INIT_WORK_ONSTACK(&args->work, xfs_alloc_vextent_worker); | |
| 2455 | − queue_work(xfs_alloc_wq, &args->work); | |
| 2456 | − wait_for_completion(&done); | |
| 2457 | − return args->result; | |
| 2458 | −} | |
| 2459 | − | |
| 2460 | 2421 | /* |
| 2461 | 2422 | * Free an extent. |
| 2462 | 2423 | * Just break up the extent address and hand off to xfs_free_ag_extent |
| @@ -120,9 +120,6 @@ typedef struct xfs_alloc_arg { · 119 unmodified lines | ||
| 120 | 120 | char isfl; /* set if is freelist blocks - !acctg */ |
| 121 | 121 | char userdata; /* set if this is user data */ |
| 122 | 122 | xfs_fsblock_t firstblock; /* io first block allocated */ |
| 123 | − struct completion *done; | |
| 124 | − struct work_struct work; | |
| 125 | − int result; | |
| 126 | 123 | } xfs_alloc_arg_t; |
| 127 | 124 | |
| 128 | 125 | /* |
| @@ -121,6 +121,8 @@ xfs_allocbt_free_block( · 120 unmodified lines | ||
| 121 | 121 | xfs_extent_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1, |
| 122 | 122 | XFS_EXTENT_BUSY_SKIP_DISCARD); |
| 123 | 123 | xfs_trans_agbtree_delta(cur->bc_tp, -1); |
| 124 | + | |
| 125 | + xfs_trans_binval(cur->bc_tp, bp); | |
| 124 | 126 | return 0; |
| 125 | 127 | } |
| 126 | 128 | |
| @@ -2437,6 +2437,7 @@ xfs_bmap_btalloc( · 2436 unmodified lines | ||
| 2437 | 2437 | * Normal allocation, done through xfs_alloc_vextent. |
| 2438 | 2438 | */ |
| 2439 | 2439 | tryagain = isaligned = 0; |
| 2440 | + memset(&args, 0, sizeof(args)); | |
| 2440 | 2441 | args.tp = ap->tp; |
| 2441 | 2442 | args.mp = mp; |
| 2442 | 2443 | args.fsbno = ap->blkno; |
| @@ -3082,6 +3083,7 @@ xfs_bmap_extents_to_btree( · 639 unmodified lines | ||
| 3082 | 3083 | * Convert to a btree with two levels, one record in root. |
| 3083 | 3084 | */ |
| 3084 | 3085 | XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_BTREE); |
| 3086 | + memset(&args, 0, sizeof(args)); | |
| 3085 | 3087 | args.tp = tp; |
| 3086 | 3088 | args.mp = mp; |
| 3087 | 3089 | args.firstblock = *firstblock; |
| @@ -3237,6 +3239,7 @@ xfs_bmap_local_to_extents( · 149 unmodified lines | ||
| 3237 | 3239 | xfs_buf_t *bp; /* buffer for extent block */ |
| 3238 | 3240 | xfs_bmbt_rec_host_t *ep;/* extent record pointer */ |
| 3239 | 3241 | |
| 3242 | + memset(&args, 0, sizeof(args)); | |
| 3240 | 3243 | args.tp = tp; |
| 3241 | 3244 | args.mp = ip->i_mount; |
| 3242 | 3245 | args.firstblock = *firstblock; |
| @@ -4616,12 +4619,11 @@ xfs_bmapi_delay( · 1373 unmodified lines | ||
| 4616 | 4619 | |
| 4617 | 4620 | |
| 4618 | 4621 | STATIC int |
| 4619 | −xfs_bmapi_allocate( | |
| 4620 | − struct xfs_bmalloca *bma, | |
| 4621 | − int flags) | |
| 4622 | +__xfs_bmapi_allocate( | |
| 4623 | + struct xfs_bmalloca *bma) | |
| 4622 | 4624 | { |
| 4623 | 4625 | struct xfs_mount *mp = bma->ip->i_mount; |
| 4624 | − int whichfork = (flags & XFS_BMAPI_ATTRFORK) ? | |
| 4626 | + int whichfork = (bma->flags & XFS_BMAPI_ATTRFORK) ? | |
| 4625 | 4627 | XFS_ATTR_FORK : XFS_DATA_FORK; |
| 4626 | 4628 | struct xfs_ifork *ifp = XFS_IFORK_PTR(bma->ip, whichfork); |
| 4627 | 4629 | int tmp_logflags = 0; |
| @@ -4654,24 +4656,27 @@ xfs_bmapi_allocate( · 26 unmodified lines | ||
| 4654 | 4656 | * Indicate if this is the first user data in the file, or just any |
| 4655 | 4657 | * user data. |
| 4656 | 4658 | */ |
| 4657 | − if (!(flags & XFS_BMAPI_METADATA)) { | |
| 4659 | + if (!(bma->flags & XFS_BMAPI_METADATA)) { | |
| 4658 | 4660 | bma->userdata = (bma->offset == 0) ? |
| 4659 | 4661 | XFS_ALLOC_INITIAL_USER_DATA : XFS_ALLOC_USERDATA; |
| 4660 | 4662 | } |
| 4661 | 4663 | |
| 4662 | − bma->minlen = (flags & XFS_BMAPI_CONTIG) ? bma->length : 1; | |
| 4664 | + bma->minlen = (bma->flags & XFS_BMAPI_CONTIG) ? bma->length : 1; | |
| 4663 | 4665 | |
| 4664 | 4666 | /* |
| 4665 | 4667 | * Only want to do the alignment at the eof if it is userdata and |
| 4666 | 4668 | * allocation length is larger than a stripe unit. |
| 4667 | 4669 | */ |
| 4668 | 4670 | if (mp->m_dalign && bma->length >= mp->m_dalign && |
| 4669 | − !(flags & XFS_BMAPI_METADATA) && whichfork == XFS_DATA_FORK) { | |
| 4671 | + !(bma->flags & XFS_BMAPI_METADATA) && whichfork == XFS_DATA_FORK) { | |
| 4670 | 4672 | error = xfs_bmap_isaeof(bma, whichfork); |
| 4671 | 4673 | if (error) |
| 4672 | 4674 | return error; |
| 4673 | 4675 | } |
| 4674 | 4676 | |
| 4677 | + if (bma->flags & XFS_BMAPI_STACK_SWITCH) | |
| 4678 | + bma->stack_switch = 1; | |
| 4679 | + | |
| 4675 | 4680 | error = xfs_bmap_alloc(bma); |
| 4676 | 4681 | if (error) |
| 4677 | 4682 | return error; |
| @@ -4706,7 +4711,7 @@ xfs_bmapi_allocate( · 28 unmodified lines | ||
| 4706 | 4711 | * A wasdelay extent has been initialized, so shouldn't be flagged |
| 4707 | 4712 | * as unwritten. |
| 4708 | 4713 | */ |
| 4709 | − if (!bma->wasdel && (flags & XFS_BMAPI_PREALLOC) && | |
| 4714 | + if (!bma->wasdel && (bma->flags & XFS_BMAPI_PREALLOC) && | |
| 4710 | 4715 | xfs_sb_version_hasextflgbit(&mp->m_sb)) |
| 4711 | 4716 | bma->got.br_state = XFS_EXT_UNWRITTEN; |
| 4712 | 4717 | |
| @@ -4734,6 +4739,45 @@ xfs_bmapi_allocate( · 21 unmodified lines | ||
| 4734 | 4739 | return 0; |
| 4735 | 4740 | } |
| 4736 | 4741 | |
| 4742 | +static void | |
| 4743 | +xfs_bmapi_allocate_worker( | |
| 4744 | + struct work_struct *work) | |
| 4745 | +{ | |
| 4746 | + struct xfs_bmalloca *args = container_of(work, | |
| 4747 | + struct xfs_bmalloca, work); | |
| 4748 | + unsigned long pflags; | |
| 4749 | + | |
| 4750 | + /* we are in a transaction context here */ | |
| 4751 | + current_set_flags_nested(&pflags, PF_FSTRANS); | |
| 4752 | + | |
| 4753 | + args->result = __xfs_bmapi_allocate(args); | |
| 4754 | + complete(args->done); | |
| 4755 | + | |
| 4756 | + current_restore_flags_nested(&pflags, PF_FSTRANS); | |
| 4757 | +} | |
| 4758 | + | |
| 4759 | +/* | |
| 4760 | + * Some allocation requests often come in with little stack to work on. Push | |
| 4761 | + * them off to a worker thread so there is lots of stack to use. Otherwise just | |
| 4762 | + * call directly to avoid the context switch overhead here. | |
| 4763 | + */ | |
| 4764 | +int | |
| 4765 | +xfs_bmapi_allocate( | |
| 4766 | + struct xfs_bmalloca *args) | |
| 4767 | +{ | |
| 4768 | + DECLARE_COMPLETION_ONSTACK(done); | |
| 4769 | + | |
| 4770 | + if (!args->stack_switch) | |
| 4771 | + return __xfs_bmapi_allocate(args); | |
| 4772 | + | |
| 4773 | + | |
| 4774 | + args->done = &done; | |
| 4775 | + INIT_WORK_ONSTACK(&args->work, xfs_bmapi_allocate_worker); | |
| 4776 | + queue_work(xfs_alloc_wq, &args->work); | |
| 4777 | + wait_for_completion(&done); | |
| 4778 | + return args->result; | |
| 4779 | +} | |
| 4780 | + | |
| 4737 | 4781 | STATIC int |
| 4738 | 4782 | xfs_bmapi_convert_unwritten( |
| 4739 | 4783 | struct xfs_bmalloca *bma, |
| @@ -4919,6 +4963,7 @@ xfs_bmapi_write( · 179 unmodified lines | ||
| 4919 | 4963 | bma.conv = !!(flags & XFS_BMAPI_CONVERT); |
| 4920 | 4964 | bma.wasdel = wasdelay; |
| 4921 | 4965 | bma.offset = bno; |
| 4966 | + bma.flags = flags; | |
| 4922 | 4967 | |
| 4923 | 4968 | /* |
| 4924 | 4969 | * There's a 32/64 bit type mismatch between the |
| @@ -4934,7 +4979,7 @@ xfs_bmapi_write( · 9 unmodified lines | ||
| 4934 | 4979 | |
| 4935 | 4980 | ASSERT(len > 0); |
| 4936 | 4981 | ASSERT(bma.length > 0); |
| 4937 | − error = xfs_bmapi_allocate(&bma, flags); | |
| 4982 | + error = xfs_bmapi_allocate(&bma); | |
| 4938 | 4983 | if (error) |
| 4939 | 4984 | goto error0; |
| 4940 | 4985 | if (bma.blkno == NULLFSBLOCK) |
| @@ -77,6 +77,7 @@ typedef struct xfs_bmap_free · 76 unmodified lines | ||
| 77 | 77 | * from written to unwritten, otherwise convert from unwritten to written. |
| 78 | 78 | */ |
| 79 | 79 | #define XFS_BMAPI_CONVERT 0x040 |
| 80 | +#define XFS_BMAPI_STACK_SWITCH 0x080 | |
| 80 | 81 | |
| 81 | 82 | #define XFS_BMAPI_FLAGS \ |
| 82 | 83 | { XFS_BMAPI_ENTIRE, "ENTIRE" }, \ |
| @@ -85,7 +86,8 @@ typedef struct xfs_bmap_free · 2 unmodified lines | ||
| 85 | 86 | { XFS_BMAPI_PREALLOC, "PREALLOC" }, \ |
| 86 | 87 | { XFS_BMAPI_IGSTATE, "IGSTATE" }, \ |
| 87 | 88 | { XFS_BMAPI_CONTIG, "CONTIG" }, \ |
| 88 | − { XFS_BMAPI_CONVERT, "CONVERT" } | |
| 89 | + { XFS_BMAPI_CONVERT, "CONVERT" }, \ | |
| 90 | + { XFS_BMAPI_STACK_SWITCH, "STACK_SWITCH" } | |
| 89 | 91 | |
| 90 | 92 | |
| 91 | 93 | static inline int xfs_bmapi_aflag(int w) |
| @@ -133,6 +135,11 @@ typedef struct xfs_bmalloca { · 41 unmodified lines | ||
| 133 | 135 | char userdata;/* set if is user data */ |
| 134 | 136 | char aeof; /* allocated space at eof */ |
| 135 | 137 | char conv; /* overwriting unwritten extents */ |
| 138 | + char stack_switch; | |
| 139 | + int flags; | |
| 140 | + struct completion *done; | |
| 141 | + struct work_struct work; | |
| 142 | + int result; | |
| 136 | 143 | } xfs_bmalloca_t; |
| 137 | 144 | |
| 138 | 145 | /* |
| @@ -526,7 +526,25 @@ xfs_buf_item_unpin( · 525 unmodified lines | ||
| 526 | 526 | } |
| 527 | 527 | xfs_buf_relse(bp); |
| 528 | 528 | } else if (freed && remove) { |
| 529 | + /* | |
| 530 | + * There are currently two references to the buffer - the active | |
| 531 | + * LRU reference and the buf log item. What we are about to do | |
| 532 | + * here - simulate a failed IO completion - requires 3 | |
| 533 | + * references. | |
| 534 | + * | |
| 535 | + * The LRU reference is removed by the xfs_buf_stale() call. The | |
| 536 | + * buf item reference is removed by the xfs_buf_iodone() | |
| 537 | + * callback that is run by xfs_buf_do_callbacks() during ioend | |
| 538 | + * processing (via the bp->b_iodone callback), and then finally | |
| 539 | + * the ioend processing will drop the IO reference if the buffer | |
| 540 | + * is marked XBF_ASYNC. | |
| 541 | + * | |
| 542 | + * Hence we need to take an additional reference here so that IO | |
| 543 | + * completion processing doesn't free the buffer prematurely. | |
| 544 | + */ | |
| 529 | 545 | xfs_buf_lock(bp); |
| 546 | + xfs_buf_hold(bp); | |
| 547 | + bp->b_flags |= XBF_ASYNC; | |
| 530 | 548 | xfs_buf_ioerror(bp, EIO); |
| 531 | 549 | XFS_BUF_UNDONE(bp); |
| 532 | 550 | xfs_buf_stale(bp); |
| @@ -399,9 +399,26 @@ xfs_growfs_data_private( · 398 unmodified lines | ||
| 399 | 399 | |
| 400 | 400 | /* update secondary superblocks. */ |
| 401 | 401 | for (agno = 1; agno < nagcount; agno++) { |
| 402 | − error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, | |
| 402 | + error = 0; | |
| 403 | + /* | |
| 404 | + * new secondary superblocks need to be zeroed, not read from | |
| 405 | + * disk as the contents of the new area we are growing into is | |
| 406 | + * completely unknown. | |
| 407 | + */ | |
| 408 | + if (agno < oagcount) { | |
| 409 | + error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, | |
| 403 | 410 | XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)), |
| 404 | 411 | XFS_FSS_TO_BB(mp, 1), 0, &bp); |
| 412 | + } else { | |
| 413 | + bp = xfs_trans_get_buf(NULL, mp->m_ddev_targp, | |
| 414 | + XFS_AGB_TO_DADDR(mp, agno, XFS_SB_BLOCK(mp)), | |
| 415 | + XFS_FSS_TO_BB(mp, 1), 0); | |
| 416 | + if (bp) | |
| 417 | + xfs_buf_zero(bp, 0, BBTOB(bp->b_length)); | |
| 418 | + else | |
| 419 | + error = ENOMEM; | |
| 420 | + } | |
| 421 | + | |
| 405 | 422 | if (error) { |
| 406 | 423 | xfs_warn(mp, |
| 407 | 424 | "error %d reading secondary superblock for ag %d", |
| @@ -423,7 +440,7 @@ xfs_growfs_data_private( · 15 unmodified lines | ||
| 423 | 440 | break; /* no point in continuing */ |
| 424 | 441 | } |
| 425 | 442 | } |
| 426 | − return 0; | |
| 443 | + return error; | |
| 427 | 444 | |
| 428 | 445 | error0: |
| 429 | 446 | xfs_trans_cancel(tp, XFS_TRANS_ABORT); |
| @@ -250,6 +250,7 @@ xfs_ialloc_ag_alloc( · 249 unmodified lines | ||
| 250 | 250 | /* boundary */ |
| 251 | 251 | struct xfs_perag *pag; |
| 252 | 252 | |
| 253 | + memset(&args, 0, sizeof(args)); | |
| 253 | 254 | args.tp = tp; |
| 254 | 255 | args.mp = tp->t_mountp; |
| 255 | 256 | |
| @@ -1509,7 +1509,8 @@ xfs_ifree_cluster( · 1508 unmodified lines | ||
| 1509 | 1509 | * to mark all the active inodes on the buffer stale. |
| 1510 | 1510 | */ |
| 1511 | 1511 | bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, blkno, |
| 1512 | − mp->m_bsize * blks_per_cluster, 0); | |
| 1512 | + mp->m_bsize * blks_per_cluster, | |
| 1513 | + XBF_UNMAPPED); | |
| 1513 | 1514 | |
| 1514 | 1515 | if (!bp) |
| 1515 | 1516 | return ENOMEM; |
| @@ -70,7 +70,7 @@ xfs_find_handle( · 69 unmodified lines | ||
| 70 | 70 | int hsize; |
| 71 | 71 | xfs_handle_t handle; |
| 72 | 72 | struct inode *inode; |
| 73 | − struct fd f; | |
| 73 | + struct fd f = {0}; | |
| 74 | 74 | struct path path; |
| 75 | 75 | int error; |
| 76 | 76 | struct xfs_inode *ip; |
| @@ -584,7 +584,9 @@ xfs_iomap_write_allocate( · 583 unmodified lines | ||
| 584 | 584 | * pointer that the caller gave to us. |
| 585 | 585 | */ |
| 586 | 586 | error = xfs_bmapi_write(tp, ip, map_start_fsb, |
| 587 | − count_fsb, 0, &first_block, 1, | |
| 587 | + count_fsb, | |
| 588 | + XFS_BMAPI_STACK_SWITCH, | |
| 589 | + &first_block, 1, | |
| 588 | 590 | imap, &nimaps, &free_list); |
| 589 | 591 | if (error) |
| 590 | 592 | goto trans_cancel; |
| @@ -2387,14 +2387,27 @@ xlog_state_do_callback( · 2386 unmodified lines | ||
| 2387 | 2387 | |
| 2388 | 2388 | |
| 2389 | 2389 | /* |
| 2390 | − * update the last_sync_lsn before we drop the | |
| 2390 | + * Completion of a iclog IO does not imply that | |
| 2391 | + * a transaction has completed, as transactions | |
| 2392 | + * can be large enough to span many iclogs. We | |
| 2393 | + * cannot change the tail of the log half way | |
| 2394 | + * through a transaction as this may be the only | |
| 2395 | + * transaction in the log and moving th etail to | |
| 2396 | + * point to the middle of it will prevent | |
| 2397 | + * recovery from finding the start of the | |
| 2398 | + * transaction. Hence we should only update the | |
| 2399 | + * last_sync_lsn if this iclog contains | |
| 2400 | + * transaction completion callbacks on it. | |
| 2401 | + * | |
| 2402 | + * We have to do this before we drop the | |
| 2391 | 2403 | * icloglock to ensure we are the only one that |
| 2392 | 2404 | * can update it. |
| 2393 | 2405 | */ |
| 2394 | 2406 | ASSERT(XFS_LSN_CMP(atomic64_read(&log->l_last_sync_lsn), |
| 2395 | 2407 | be64_to_cpu(iclog->ic_header.h_lsn)) <= 0); |
| 2396 | − atomic64_set(&log->l_last_sync_lsn, | |
| 2397 | − be64_to_cpu(iclog->ic_header.h_lsn)); | |
| 2408 | + if (iclog->ic_callback) | |
| 2409 | + atomic64_set(&log->l_last_sync_lsn, | |
| 2410 | + be64_to_cpu(iclog->ic_header.h_lsn)); | |
| 2398 | 2411 | |
| 2399 | 2412 | } else |
| 2400 | 2413 | ioerrors++; |
| @@ -3541,7 +3541,7 @@ xlog_do_recovery_pass( · 3540 unmodified lines | ||
| 3541 | 3541 | * - order is important. |
| 3542 | 3542 | */ |
| 3543 | 3543 | error = xlog_bread_offset(log, 0, |
| 3544 | − bblks - split_bblks, hbp, | |
| 3544 | + bblks - split_bblks, dbp, | |
| 3545 | 3545 | offset + BBTOB(split_bblks)); |
| 3546 | 3546 | if (error) |
| 3547 | 3547 | goto bread_err2; |
| @@ -0,0 +1,192 @@ | ||
| 1 | +/* | |
| 2 | + * Statically sized hash table implementation | |
| 3 | + * (C) 2012 Sasha Levin <levinsasha928@gmail.com> | |
| 4 | + */ | |
| 5 | + | |
| 6 | +#ifndef _LINUX_HASHTABLE_H | |
| 7 | +#define _LINUX_HASHTABLE_H | |
| 8 | + | |
| 9 | +#include <linux/list.h> | |
| 10 | +#include <linux/types.h> | |
| 11 | +#include <linux/kernel.h> | |
| 12 | +#include <linux/hash.h> | |
| 13 | +#include <linux/rculist.h> | |
| 14 | + | |
| 15 | +#define DEFINE_HASHTABLE(name, bits) \ | |
| 16 | + struct hlist_head name[1 << (bits)] = \ | |
| 17 | + { [0 ... ((1 << (bits)) - 1)] = HLIST_HEAD_INIT } | |
| 18 | + | |
| 19 | +#define DECLARE_HASHTABLE(name, bits) \ | |
| 20 | + struct hlist_head name[1 << (bits)] | |
| 21 | + | |
| 22 | +#define HASH_SIZE(name) (ARRAY_SIZE(name)) | |
| 23 | +#define HASH_BITS(name) ilog2(HASH_SIZE(name)) | |
| 24 | + | |
| 25 | +/* Use hash_32 when possible to allow for fast 32bit hashing in 64bit kernels. */ | |
| 26 | +#define hash_min(val, bits) \ | |
| 27 | + (sizeof(val) <= 4 ? hash_32(val, bits) : hash_long(val, bits)) | |
| 28 | + | |
| 29 | +static inline void __hash_init(struct hlist_head *ht, unsigned int sz) | |
| 30 | +{ | |
| 31 | + unsigned int i; | |
| 32 | + | |
| 33 | + for (i = 0; i < sz; i++) | |
| 34 | + INIT_HLIST_HEAD(&ht[i]); | |
| 35 | +} | |
| 36 | + | |
| 37 | +/** | |
| 38 | + * hash_init - initialize a hash table | |
| 39 | + * @hashtable: hashtable to be initialized | |
| 40 | + * | |
| 41 | + * Calculates the size of the hashtable from the given parameter, otherwise | |
| 42 | + * same as hash_init_size. | |
| 43 | + * | |
| 44 | + * This has to be a macro since HASH_BITS() will not work on pointers since | |
| 45 | + * it calculates the size during preprocessing. | |
| 46 | + */ | |
| 47 | +#define hash_init(hashtable) __hash_init(hashtable, HASH_SIZE(hashtable)) | |
| 48 | + | |
| 49 | +/** | |
| 50 | + * hash_add - add an object to a hashtable | |
| 51 | + * @hashtable: hashtable to add to | |
| 52 | + * @node: the &struct hlist_node of the object to be added | |
| 53 | + * @key: the key of the object to be added | |
| 54 | + */ | |
| 55 | +#define hash_add(hashtable, node, key) \ | |
| 56 | + hlist_add_head(node, &hashtable[hash_min(key, HASH_BITS(hashtable))]) | |
| 57 | + | |
| 58 | +/** | |
| 59 | + * hash_add_rcu - add an object to a rcu enabled hashtable | |
| 60 | + * @hashtable: hashtable to add to | |
| 61 | + * @node: the &struct hlist_node of the object to be added | |
| 62 | + * @key: the key of the object to be added | |
| 63 | + */ | |
| 64 | +#define hash_add_rcu(hashtable, node, key) \ | |
| 65 | + hlist_add_head_rcu(node, &hashtable[hash_min(key, HASH_BITS(hashtable))]) | |
| 66 | + | |
| 67 | +/** | |
| 68 | + * hash_hashed - check whether an object is in any hashtable | |
| 69 | + * @node: the &struct hlist_node of the object to be checked | |
| 70 | + */ | |
| 71 | +static inline bool hash_hashed(struct hlist_node *node) | |
| 72 | +{ | |
| 73 | + return !hlist_unhashed(node); | |
| 74 | +} | |
| 75 | + | |
| 76 | +static inline bool __hash_empty(struct hlist_head *ht, unsigned int sz) | |
| 77 | +{ | |
| 78 | + unsigned int i; | |
| 79 | + | |
| 80 | + for (i = 0; i < sz; i++) | |
| 81 | + if (!hlist_empty(&ht[i])) | |
| 82 | + return false; | |
| 83 | + | |
| 84 | + return true; | |
| 85 | +} | |
| 86 | + | |
| 87 | +/** | |
| 88 | + * hash_empty - check whether a hashtable is empty | |
| 89 | + * @hashtable: hashtable to check | |
| 90 | + * | |
| 91 | + * This has to be a macro since HASH_BITS() will not work on pointers since | |
| 92 | + * it calculates the size during preprocessing. | |
| 93 | + */ | |
| 94 | +#define hash_empty(hashtable) __hash_empty(hashtable, HASH_SIZE(hashtable)) | |
| 95 | + | |
| 96 | +/** | |
| 97 | + * hash_del - remove an object from a hashtable | |
| 98 | + * @node: &struct hlist_node of the object to remove | |
| 99 | + */ | |
| 100 | +static inline void hash_del(struct hlist_node *node) | |
| 101 | +{ | |
| 102 | + hlist_del_init(node); | |
| 103 | +} | |
| 104 | + | |
| 105 | +/** | |
| 106 | + * hash_del_rcu - remove an object from a rcu enabled hashtable | |
| 107 | + * @node: &struct hlist_node of the object to remove | |
| 108 | + */ | |
| 109 | +static inline void hash_del_rcu(struct hlist_node *node) | |
| 110 | +{ | |
| 111 | + hlist_del_init_rcu(node); | |
| 112 | +} | |
| 113 | + | |
| 114 | +/** | |
| 115 | + * hash_for_each - iterate over a hashtable | |
| 116 | + * @name: hashtable to iterate | |
| 117 | + * @bkt: integer to use as bucket loop cursor | |
| 118 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 119 | + * @obj: the type * to use as a loop cursor for each entry | |
| 120 | + * @member: the name of the hlist_node within the struct | |
| 121 | + */ | |
| 122 | +#define hash_for_each(name, bkt, node, obj, member) \ | |
| 123 | + for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\ | |
| 124 | + hlist_for_each_entry(obj, node, &name[bkt], member) | |
| 125 | + | |
| 126 | +/** | |
| 127 | + * hash_for_each_rcu - iterate over a rcu enabled hashtable | |
| 128 | + * @name: hashtable to iterate | |
| 129 | + * @bkt: integer to use as bucket loop cursor | |
| 130 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 131 | + * @obj: the type * to use as a loop cursor for each entry | |
| 132 | + * @member: the name of the hlist_node within the struct | |
| 133 | + */ | |
| 134 | +#define hash_for_each_rcu(name, bkt, node, obj, member) \ | |
| 135 | + for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\ | |
| 136 | + hlist_for_each_entry_rcu(obj, node, &name[bkt], member) | |
| 137 | + | |
| 138 | +/** | |
| 139 | + * hash_for_each_safe - iterate over a hashtable safe against removal of | |
| 140 | + * hash entry | |
| 141 | + * @name: hashtable to iterate | |
| 142 | + * @bkt: integer to use as bucket loop cursor | |
| 143 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 144 | + * @tmp: a &struct used for temporary storage | |
| 145 | + * @obj: the type * to use as a loop cursor for each entry | |
| 146 | + * @member: the name of the hlist_node within the struct | |
| 147 | + */ | |
| 148 | +#define hash_for_each_safe(name, bkt, node, tmp, obj, member) \ | |
| 149 | + for ((bkt) = 0, node = NULL; node == NULL && (bkt) < HASH_SIZE(name); (bkt)++)\ | |
| 150 | + hlist_for_each_entry_safe(obj, node, tmp, &name[bkt], member) | |
| 151 | + | |
| 152 | +/** | |
| 153 | + * hash_for_each_possible - iterate over all possible objects hashing to the | |
| 154 | + * same bucket | |
| 155 | + * @name: hashtable to iterate | |
| 156 | + * @obj: the type * to use as a loop cursor for each entry | |
| 157 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 158 | + * @member: the name of the hlist_node within the struct | |
| 159 | + * @key: the key of the objects to iterate over | |
| 160 | + */ | |
| 161 | +#define hash_for_each_possible(name, obj, node, member, key) \ | |
| 162 | + hlist_for_each_entry(obj, node, &name[hash_min(key, HASH_BITS(name))], member) | |
| 163 | + | |
| 164 | +/** | |
| 165 | + * hash_for_each_possible_rcu - iterate over all possible objects hashing to the | |
| 166 | + * same bucket in an rcu enabled hashtable | |
| 167 | + * in a rcu enabled hashtable | |
| 168 | + * @name: hashtable to iterate | |
| 169 | + * @obj: the type * to use as a loop cursor for each entry | |
| 170 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 171 | + * @member: the name of the hlist_node within the struct | |
| 172 | + * @key: the key of the objects to iterate over | |
| 173 | + */ | |
| 174 | +#define hash_for_each_possible_rcu(name, obj, node, member, key) \ | |
| 175 | + hlist_for_each_entry_rcu(obj, node, &name[hash_min(key, HASH_BITS(name))], member) | |
| 176 | + | |
| 177 | +/** | |
| 178 | + * hash_for_each_possible_safe - iterate over all possible objects hashing to the | |
| 179 | + * same bucket safe against removals | |
| 180 | + * @name: hashtable to iterate | |
| 181 | + * @obj: the type * to use as a loop cursor for each entry | |
| 182 | + * @node: the &struct list_head to use as a loop cursor for each entry | |
| 183 | + * @tmp: a &struct used for temporary storage | |
| 184 | + * @member: the name of the hlist_node within the struct | |
| 185 | + * @key: the key of the objects to iterate over | |
| 186 | + */ | |
| 187 | +#define hash_for_each_possible_safe(name, obj, node, tmp, member, key) \ | |
| 188 | + hlist_for_each_entry_safe(obj, node, tmp, \ | |
| 189 | + &name[hash_min(key, HASH_BITS(name))], member) | |
| 190 | + | |
| 191 | + | |
| 192 | +#endif | |
| @@ -42,19 +42,8 @@ · 41 unmodified lines | ||
| 42 | 42 | */ |
| 43 | 43 | #define KVM_MEMSLOT_INVALID (1UL << 16) |
| 44 | 44 | |
| 45 | −/* | |
| 46 | − * If we support unaligned MMIO, at most one fragment will be split into two: | |
| 47 | − */ | |
| 48 | −#ifdef KVM_UNALIGNED_MMIO | |
| 49 | −# define KVM_EXTRA_MMIO_FRAGMENTS 1 | |
| 50 | −#else | |
| 51 | −# define KVM_EXTRA_MMIO_FRAGMENTS 0 | |
| 52 | −#endif | |
| 53 | − | |
| 54 | −#define KVM_USER_MMIO_SIZE 8 | |
| 55 | − | |
| 56 | −#define KVM_MAX_MMIO_FRAGMENTS \ | |
| 57 | − (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS) | |
| 45 | +/* Two fragments for cross MMIO pages. */ | |
| 46 | +#define KVM_MAX_MMIO_FRAGMENTS 2 | |
| 58 | 47 | |
| 59 | 48 | /* |
| 60 | 49 | * For the normal pfn, the highest 12 bits should be zero, |
| @@ -137,7 +137,7 @@ struct dw_mci { · 136 unmodified lines | ||
| 137 | 137 | |
| 138 | 138 | dma_addr_t sg_dma; |
| 139 | 139 | void *sg_cpu; |
| 140 | − struct dw_mci_dma_ops *dma_ops; | |
| 140 | + const struct dw_mci_dma_ops *dma_ops; | |
| 141 | 141 | #ifdef CONFIG_MMC_DW_IDMAC |
| 142 | 142 | unsigned int ring_size; |
| 143 | 143 | #else |
| @@ -162,7 +162,7 @@ struct dw_mci { · 18 unmodified lines | ||
| 162 | 162 | u16 data_offset; |
| 163 | 163 | struct device *dev; |
| 164 | 164 | struct dw_mci_board *pdata; |
| 165 | − struct dw_mci_drv_data *drv_data; | |
| 165 | + const struct dw_mci_drv_data *drv_data; | |
| 166 | 166 | void *priv; |
| 167 | 167 | struct clk *biu_clk; |
| 168 | 168 | struct clk *ciu_clk; |
| @@ -186,7 +186,7 @@ struct dw_mci { · 17 unmodified lines | ||
| 186 | 186 | |
| 187 | 187 | struct regulator *vmmc; /* Power regulator */ |
| 188 | 188 | unsigned long irq_flags; /* IRQ flags */ |
| 189 | − unsigned int irq; | |
| 189 | + int irq; | |
| 190 | 190 | }; |
| 191 | 191 | |
| 192 | 192 | /* DMA ops for Internal/External DMAC interface */ |
| @@ -91,6 +91,7 @@ struct sdhci_host { · 90 unmodified lines | ||
| 91 | 91 | unsigned int quirks2; /* More deviations from spec. */ |
| 92 | 92 | |
| 93 | 93 | #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) |
| 94 | +#define SDHCI_QUIRK2_HOST_NO_CMD23 (1<<1) | |
| 94 | 95 | |
| 95 | 96 | int irq; /* Device IRQ */ |
| 96 | 97 | void __iomem *ioaddr; /* Mapped address */ |
| @@ -28,11 +28,13 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } · 27 unmodified lines | ||
| 28 | 28 | #endif |
| 29 | 29 | |
| 30 | 30 | #else /* CONFIG_OF_ADDRESS */ |
| 31 | +#ifndef of_address_to_resource | |
| 31 | 32 | static inline int of_address_to_resource(struct device_node *dev, int index, |
| 32 | 33 | struct resource *r) |
| 33 | 34 | { |
| 34 | 35 | return -EINVAL; |
| 35 | 36 | } |
| 37 | +#endif | |
| 36 | 38 | static inline struct device_node *of_find_matching_node_by_address( |
| 37 | 39 | struct device_node *from, |
| 38 | 40 | const struct of_device_id *matches, |
| @@ -54,7 +54,8 @@ struct ptp_clock_request { · 53 unmodified lines | ||
| 54 | 54 | * clock operations |
| 55 | 55 | * |
| 56 | 56 | * @adjfreq: Adjusts the frequency of the hardware clock. |
| 57 | − * parameter delta: Desired period change in parts per billion. | |
| 57 | + * parameter delta: Desired frequency offset from nominal frequency | |
| 58 | + * in parts per billion | |
| 58 | 59 | * |
| 59 | 60 | * @adjtime: Shifts the time of the hardware clock. |
| 60 | 61 | * parameter delta: Desired change in nanoseconds. |
| @@ -1,2 +0,0 @@ | ||
| 1 | −header-y += md_p.h | |
| 2 | −header-y += md_u.h | |
| @@ -11,149 +11,10 @@ · 10 unmodified lines | ||
| 11 | 11 | (for example /usr/src/linux/COPYING); if not, write to the Free |
| 12 | 12 | Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 13 | 13 | */ |
| 14 | − | |
| 15 | 14 | #ifndef _MD_U_H |
| 16 | 15 | #define _MD_U_H |
| 17 | 16 | |
| 18 | −/* | |
| 19 | − * Different major versions are not compatible. | |
| 20 | − * Different minor versions are only downward compatible. | |
| 21 | − * Different patchlevel versions are downward and upward compatible. | |
| 22 | − */ | |
| 23 | −#define MD_MAJOR_VERSION 0 | |
| 24 | −#define MD_MINOR_VERSION 90 | |
| 25 | −/* | |
| 26 | − * MD_PATCHLEVEL_VERSION indicates kernel functionality. | |
| 27 | − * >=1 means different superblock formats are selectable using SET_ARRAY_INFO | |
| 28 | − * and major_version/minor_version accordingly | |
| 29 | − * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT | |
| 30 | − * in the super status byte | |
| 31 | − * >=3 means that bitmap superblock version 4 is supported, which uses | |
| 32 | − * little-ending representation rather than host-endian | |
| 33 | − */ | |
| 34 | −#define MD_PATCHLEVEL_VERSION 3 | |
| 35 | − | |
| 36 | −/* ioctls */ | |
| 37 | − | |
| 38 | −/* status */ | |
| 39 | −#define RAID_VERSION _IOR (MD_MAJOR, 0x10, mdu_version_t) | |
| 40 | −#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, mdu_array_info_t) | |
| 41 | −#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, mdu_disk_info_t) | |
| 42 | −#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13) | |
| 43 | −#define RAID_AUTORUN _IO (MD_MAJOR, 0x14) | |
| 44 | −#define GET_BITMAP_FILE _IOR (MD_MAJOR, 0x15, mdu_bitmap_file_t) | |
| 45 | − | |
| 46 | −/* configuration */ | |
| 47 | −#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20) | |
| 48 | −#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, mdu_disk_info_t) | |
| 49 | −#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22) | |
| 50 | −#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, mdu_array_info_t) | |
| 51 | −#define SET_DISK_INFO _IO (MD_MAJOR, 0x24) | |
| 52 | −#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25) | |
| 53 | −#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26) | |
| 54 | −#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27) | |
| 55 | −#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28) | |
| 56 | −#define SET_DISK_FAULTY _IO (MD_MAJOR, 0x29) | |
| 57 | −#define HOT_GENERATE_ERROR _IO (MD_MAJOR, 0x2a) | |
| 58 | −#define SET_BITMAP_FILE _IOW (MD_MAJOR, 0x2b, int) | |
| 17 | +#include <uapi/linux/raid/md_u.h> | |
| 59 | 18 | |
| 60 | −/* usage */ | |
| 61 | −#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, mdu_param_t) | |
| 62 | −/* 0x31 was START_ARRAY */ | |
| 63 | −#define STOP_ARRAY _IO (MD_MAJOR, 0x32) | |
| 64 | −#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) | |
| 65 | −#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) | |
| 66 | − | |
| 67 | −/* 63 partitions with the alternate major number (mdp) */ | |
| 68 | −#define MdpMinorShift 6 | |
| 69 | −#ifdef __KERNEL__ | |
| 70 | 19 | extern int mdp_major; |
| 71 | −#endif | |
| 72 | − | |
| 73 | −typedef struct mdu_version_s { | |
| 74 | − int major; | |
| 75 | − int minor; | |
| 76 | − int patchlevel; | |
| 77 | −} mdu_version_t; | |
| 78 | − | |
| 79 | −typedef struct mdu_array_info_s { | |
| 80 | − /* | |
| 81 | − * Generic constant information | |
| 82 | − */ | |
| 83 | − int major_version; | |
| 84 | − int minor_version; | |
| 85 | − int patch_version; | |
| 86 | − int ctime; | |
| 87 | − int level; | |
| 88 | − int size; | |
| 89 | − int nr_disks; | |
| 90 | − int raid_disks; | |
| 91 | − int md_minor; | |
| 92 | − int not_persistent; | |
| 93 | − | |
| 94 | − /* | |
| 95 | − * Generic state information | |
| 96 | − */ | |
| 97 | − int utime; /* 0 Superblock update time */ | |
| 98 | − int state; /* 1 State bits (clean, ...) */ | |
| 99 | − int active_disks; /* 2 Number of currently active disks */ | |
| 100 | − int working_disks; /* 3 Number of working disks */ | |
| 101 | − int failed_disks; /* 4 Number of failed disks */ | |
| 102 | − int spare_disks; /* 5 Number of spare disks */ | |
| 103 | − | |
| 104 | − /* | |
| 105 | − * Personality information | |
| 106 | − */ | |
| 107 | − int layout; /* 0 the array's physical layout */ | |
| 108 | − int chunk_size; /* 1 chunk size in bytes */ | |
| 109 | − | |
| 110 | −} mdu_array_info_t; | |
| 111 | − | |
| 112 | −/* non-obvious values for 'level' */ | |
| 113 | −#define LEVEL_MULTIPATH (-4) | |
| 114 | −#define LEVEL_LINEAR (-1) | |
| 115 | −#define LEVEL_FAULTY (-5) | |
| 116 | − | |
| 117 | −/* we need a value for 'no level specified' and 0 | |
| 118 | − * means 'raid0', so we need something else. This is | |
| 119 | − * for internal use only | |
| 120 | − */ | |
| 121 | −#define LEVEL_NONE (-1000000) | |
| 122 | − | |
| 123 | −typedef struct mdu_disk_info_s { | |
| 124 | − /* | |
| 125 | − * configuration/status of one particular disk | |
| 126 | − */ | |
| 127 | − int number; | |
| 128 | − int major; | |
| 129 | − int minor; | |
| 130 | − int raid_disk; | |
| 131 | − int state; | |
| 132 | − | |
| 133 | −} mdu_disk_info_t; | |
| 134 | − | |
| 135 | −typedef struct mdu_start_info_s { | |
| 136 | − /* | |
| 137 | − * configuration/status of one particular disk | |
| 138 | − */ | |
| 139 | − int major; | |
| 140 | − int minor; | |
| 141 | − int raid_disk; | |
| 142 | − int state; | |
| 143 | − | |
| 144 | −} mdu_start_info_t; | |
| 145 | − | |
| 146 | −typedef struct mdu_bitmap_file_s | |
| 147 | −{ | |
| 148 | − char pathname[4096]; | |
| 149 | −} mdu_bitmap_file_t; | |
| 150 | − | |
| 151 | −typedef struct mdu_param_s | |
| 152 | −{ | |
| 153 | − int personality; /* 1,2,3,4 */ | |
| 154 | − int chunk_size; /* in bytes */ | |
| 155 | − int max_fault; /* unused for now */ | |
| 156 | −} mdu_param_t; | |
| 157 | − | |
| 158 | 20 | #endif |
| 159 | − | |
| @@ -2651,6 +2651,15 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb); · 2650 unmodified lines | ||
| 2651 | 2651 | */ |
| 2652 | 2652 | unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc); |
| 2653 | 2653 | |
| 2654 | +/** | |
| 2655 | + * ieee80211_get_mesh_hdrlen - get mesh extension header length | |
| 2656 | + * @meshhdr: the mesh extension header, only the flags field | |
| 2657 | + * (first byte) will be accessed | |
| 2658 | + * Returns the length of the extension header, which is always at | |
| 2659 | + * least 6 bytes and at most 18 if address 5 and 6 are present. | |
| 2660 | + */ | |
| 2661 | +unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); | |
| 2662 | + | |
| 2654 | 2663 | /** |
| 2655 | 2664 | * DOC: Data path helpers |
| 2656 | 2665 | * |
| @@ -132,6 +132,7 @@ struct snd_card { · 131 unmodified lines | ||
| 132 | 132 | int shutdown; /* this card is going down */ |
| 133 | 133 | int free_on_last_close; /* free in context of file_release */ |
| 134 | 134 | wait_queue_head_t shutdown_sleep; |
| 135 | + atomic_t refcount; /* refcount for disconnection */ | |
| 135 | 136 | struct device *dev; /* device assigned to this card */ |
| 136 | 137 | struct device *card_dev; /* cardX object for sysfs */ |
| 137 | 138 | |
| @@ -189,6 +190,7 @@ struct snd_minor { · 51 unmodified lines | ||
| 189 | 190 | const struct file_operations *f_ops; /* file operations */ |
| 190 | 191 | void *private_data; /* private data for f_ops->open */ |
| 191 | 192 | struct device *dev; /* device for sysfs */ |
| 193 | + struct snd_card *card_ptr; /* assigned card instance */ | |
| 192 | 194 | }; |
| 193 | 195 | |
| 194 | 196 | /* return a device pointer linked to each sound device as a parent */ |
| @@ -295,6 +297,7 @@ int snd_card_info_done(void); · 100 unmodified lines | ||
| 295 | 297 | int snd_component_add(struct snd_card *card, const char *component); |
| 296 | 298 | int snd_card_file_add(struct snd_card *card, struct file *file); |
| 297 | 299 | int snd_card_file_remove(struct snd_card *card, struct file *file); |
| 300 | +void snd_card_unref(struct snd_card *card); | |
| 298 | 301 | |
| 299 | 302 | #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr)) |
| 300 | 303 | |
| @@ -377,6 +377,14 @@ DECLARE_EVENT_CLASS(xen_mmu_pgd, · 376 unmodified lines | ||
| 377 | 377 | DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_pin); |
| 378 | 378 | DEFINE_XEN_MMU_PGD_EVENT(xen_mmu_pgd_unpin); |
| 379 | 379 | |
| 380 | +TRACE_EVENT(xen_mmu_flush_tlb_all, | |
| 381 | + TP_PROTO(int x), | |
| 382 | + TP_ARGS(x), | |
| 383 | + TP_STRUCT__entry(__array(char, x, 0)), | |
| 384 | + TP_fast_assign((void)x), | |
| 385 | + TP_printk("%s", "") | |
| 386 | + ); | |
| 387 | + | |
| 380 | 388 | TRACE_EVENT(xen_mmu_flush_tlb, |
| 381 | 389 | TP_PROTO(int x), |
| 382 | 390 | TP_ARGS(x), |
| @@ -25,7 +25,6 @@ · 24 unmodified lines | ||
| 25 | 25 | #define EPOLL_CTL_ADD 1 |
| 26 | 26 | #define EPOLL_CTL_DEL 2 |
| 27 | 27 | #define EPOLL_CTL_MOD 3 |
| 28 | −#define EPOLL_CTL_DISABLE 4 | |
| 29 | 28 | |
| 30 | 29 | /* |
| 31 | 30 | * Request the handling of system wakeup events so as to prevent system suspends |
| @@ -1 +1,3 @@ | ||
| 1 | 1 | # UAPI Header export list |
| 2 | +header-y += md_p.h | |
| 3 | +header-y += md_u.h | |
File renamed without changes.
| @@ -0,0 +1,155 @@ | ||
| 1 | +/* | |
| 2 | + md_u.h : user <=> kernel API between Linux raidtools and RAID drivers | |
| 3 | + Copyright (C) 1998 Ingo Molnar | |
| 4 | + | |
| 5 | + This program is free software; you can redistribute it and/or modify | |
| 6 | + it under the terms of the GNU General Public License as published by | |
| 7 | + the Free Software Foundation; either version 2, or (at your option) | |
| 8 | + any later version. | |
| 9 | + | |
| 10 | + You should have received a copy of the GNU General Public License | |
| 11 | + (for example /usr/src/linux/COPYING); if not, write to the Free | |
| 12 | + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 13 | +*/ | |
| 14 | + | |
| 15 | +#ifndef _UAPI_MD_U_H | |
| 16 | +#define _UAPI_MD_U_H | |
| 17 | + | |
| 18 | +/* | |
| 19 | + * Different major versions are not compatible. | |
| 20 | + * Different minor versions are only downward compatible. | |
| 21 | + * Different patchlevel versions are downward and upward compatible. | |
| 22 | + */ | |
| 23 | +#define MD_MAJOR_VERSION 0 | |
| 24 | +#define MD_MINOR_VERSION 90 | |
| 25 | +/* | |
| 26 | + * MD_PATCHLEVEL_VERSION indicates kernel functionality. | |
| 27 | + * >=1 means different superblock formats are selectable using SET_ARRAY_INFO | |
| 28 | + * and major_version/minor_version accordingly | |
| 29 | + * >=2 means that Internal bitmaps are supported by setting MD_SB_BITMAP_PRESENT | |
| 30 | + * in the super status byte | |
| 31 | + * >=3 means that bitmap superblock version 4 is supported, which uses | |
| 32 | + * little-ending representation rather than host-endian | |
| 33 | + */ | |
| 34 | +#define MD_PATCHLEVEL_VERSION 3 | |
| 35 | + | |
| 36 | +/* ioctls */ | |
| 37 | + | |
| 38 | +/* status */ | |
| 39 | +#define RAID_VERSION _IOR (MD_MAJOR, 0x10, mdu_version_t) | |
| 40 | +#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, mdu_array_info_t) | |
| 41 | +#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, mdu_disk_info_t) | |
| 42 | +#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13) | |
| 43 | +#define RAID_AUTORUN _IO (MD_MAJOR, 0x14) | |
| 44 | +#define GET_BITMAP_FILE _IOR (MD_MAJOR, 0x15, mdu_bitmap_file_t) | |
| 45 | + | |
| 46 | +/* configuration */ | |
| 47 | +#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20) | |
| 48 | +#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, mdu_disk_info_t) | |
| 49 | +#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22) | |
| 50 | +#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, mdu_array_info_t) | |
| 51 | +#define SET_DISK_INFO _IO (MD_MAJOR, 0x24) | |
| 52 | +#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25) | |
| 53 | +#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26) | |
| 54 | +#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27) | |
| 55 | +#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28) | |
| 56 | +#define SET_DISK_FAULTY _IO (MD_MAJOR, 0x29) | |
| 57 | +#define HOT_GENERATE_ERROR _IO (MD_MAJOR, 0x2a) | |
| 58 | +#define SET_BITMAP_FILE _IOW (MD_MAJOR, 0x2b, int) | |
| 59 | + | |
| 60 | +/* usage */ | |
| 61 | +#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, mdu_param_t) | |
| 62 | +/* 0x31 was START_ARRAY */ | |
| 63 | +#define STOP_ARRAY _IO (MD_MAJOR, 0x32) | |
| 64 | +#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) | |
| 65 | +#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) | |
| 66 | + | |
| 67 | +/* 63 partitions with the alternate major number (mdp) */ | |
| 68 | +#define MdpMinorShift 6 | |
| 69 | + | |
| 70 | +typedef struct mdu_version_s { | |
| 71 | + int major; | |
| 72 | + int minor; | |
| 73 | + int patchlevel; | |
| 74 | +} mdu_version_t; | |
| 75 | + | |
| 76 | +typedef struct mdu_array_info_s { | |
| 77 | + /* | |
| 78 | + * Generic constant information | |
| 79 | + */ | |
| 80 | + int major_version; | |
| 81 | + int minor_version; | |
| 82 | + int patch_version; | |
| 83 | + int ctime; | |
| 84 | + int level; | |
| 85 | + int size; | |
| 86 | + int nr_disks; | |
| 87 | + int raid_disks; | |
| 88 | + int md_minor; | |
| 89 | + int not_persistent; | |
| 90 | + | |
| 91 | + /* | |
| 92 | + * Generic state information | |
| 93 | + */ | |
| 94 | + int utime; /* 0 Superblock update time */ | |
| 95 | + int state; /* 1 State bits (clean, ...) */ | |
| 96 | + int active_disks; /* 2 Number of currently active disks */ | |
| 97 | + int working_disks; /* 3 Number of working disks */ | |
| 98 | + int failed_disks; /* 4 Number of failed disks */ | |
| 99 | + int spare_disks; /* 5 Number of spare disks */ | |
| 100 | + | |
| 101 | + /* | |
| 102 | + * Personality information | |
| 103 | + */ | |
| 104 | + int layout; /* 0 the array's physical layout */ | |
| 105 | + int chunk_size; /* 1 chunk size in bytes */ | |
| 106 | + | |
| 107 | +} mdu_array_info_t; | |
| 108 | + | |
| 109 | +/* non-obvious values for 'level' */ | |
| 110 | +#define LEVEL_MULTIPATH (-4) | |
| 111 | +#define LEVEL_LINEAR (-1) | |
| 112 | +#define LEVEL_FAULTY (-5) | |
| 113 | + | |
| 114 | +/* we need a value for 'no level specified' and 0 | |
| 115 | + * means 'raid0', so we need something else. This is | |
| 116 | + * for internal use only | |
| 117 | + */ | |
| 118 | +#define LEVEL_NONE (-1000000) | |
| 119 | + | |
| 120 | +typedef struct mdu_disk_info_s { | |
| 121 | + /* | |
| 122 | + * configuration/status of one particular disk | |
| 123 | + */ | |
| 124 | + int number; | |
| 125 | + int major; | |
| 126 | + int minor; | |
| 127 | + int raid_disk; | |
| 128 | + int state; | |
| 129 | + | |
| 130 | +} mdu_disk_info_t; | |
| 131 | + | |
| 132 | +typedef struct mdu_start_info_s { | |
| 133 | + /* | |
| 134 | + * configuration/status of one particular disk | |
| 135 | + */ | |
| 136 | + int major; | |
| 137 | + int minor; | |
| 138 | + int raid_disk; | |
| 139 | + int state; | |
| 140 | + | |
| 141 | +} mdu_start_info_t; | |
| 142 | + | |
| 143 | +typedef struct mdu_bitmap_file_s | |
| 144 | +{ | |
| 145 | + char pathname[4096]; | |
| 146 | +} mdu_bitmap_file_t; | |
| 147 | + | |
| 148 | +typedef struct mdu_param_s | |
| 149 | +{ | |
| 150 | + int personality; /* 1,2,3,4 */ | |
| 151 | + int chunk_size; /* in bytes */ | |
| 152 | + int max_fault; /* unused for now */ | |
| 153 | +} mdu_param_t; | |
| 154 | + | |
| 155 | +#endif /* _UAPI_MD_U_H */ | |
| @@ -5,6 +5,36 @@ · 4 unmodified lines | ||
| 5 | 5 | #include <xen/interface/hvm/params.h> |
| 6 | 6 | #include <asm/xen/hypercall.h> |
| 7 | 7 | |
| 8 | +static const char *param_name(int op) | |
| 9 | +{ | |
| 10 | +#define PARAM(x) [HVM_PARAM_##x] = #x | |
| 11 | + static const char *const names[] = { | |
| 12 | + PARAM(CALLBACK_IRQ), | |
| 13 | + PARAM(STORE_PFN), | |
| 14 | + PARAM(STORE_EVTCHN), | |
| 15 | + PARAM(PAE_ENABLED), | |
| 16 | + PARAM(IOREQ_PFN), | |
| 17 | + PARAM(BUFIOREQ_PFN), | |
| 18 | + PARAM(TIMER_MODE), | |
| 19 | + PARAM(HPET_ENABLED), | |
| 20 | + PARAM(IDENT_PT), | |
| 21 | + PARAM(DM_DOMAIN), | |
| 22 | + PARAM(ACPI_S_STATE), | |
| 23 | + PARAM(VM86_TSS), | |
| 24 | + PARAM(VPT_ALIGN), | |
| 25 | + PARAM(CONSOLE_PFN), | |
| 26 | + PARAM(CONSOLE_EVTCHN), | |
| 27 | + }; | |
| 28 | +#undef PARAM | |
| 29 | + | |
| 30 | + if (op >= ARRAY_SIZE(names)) | |
| 31 | + return "unknown"; | |
| 32 | + | |
| 33 | + if (!names[op]) | |
| 34 | + return "reserved"; | |
| 35 | + | |
| 36 | + return names[op]; | |
| 37 | +} | |
| 8 | 38 | static inline int hvm_get_parameter(int idx, uint64_t *value) |
| 9 | 39 | { |
| 10 | 40 | struct xen_hvm_param xhv; |
| @@ -14,8 +44,8 @@ static inline int hvm_get_parameter(int idx, uint64_t *value) · 3 unmodified lines | ||
| 14 | 44 | xhv.index = idx; |
| 15 | 45 | r = HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); |
| 16 | 46 | if (r < 0) { |
| 17 | − printk(KERN_ERR "Cannot get hvm parameter %d: %d!\n", | |
| 18 | − idx, r); | |
| 47 | + printk(KERN_ERR "Cannot get hvm parameter %s (%d): %d!\n", | |
| 48 | + param_name(idx), idx, r); | |
| 19 | 49 | return r; |
| 20 | 50 | } |
| 21 | 51 | *value = xhv.value; |
| @@ -442,9 +442,11 @@ void __init __weak smp_setup_processor_id(void) · 441 unmodified lines | ||
| 442 | 442 | { |
| 443 | 443 | } |
| 444 | 444 | |
| 445 | +# if THREAD_SIZE >= PAGE_SIZE | |
| 445 | 446 | void __init __weak thread_info_cache_init(void) |
| 446 | 447 | { |
| 447 | 448 | } |
| 449 | +#endif | |
| 448 | 450 | |
| 449 | 451 | /* |
| 450 | 452 | * Set up kernel memory allocators |
| @@ -2293,12 +2293,17 @@ static void layout_symtab(struct module *mod, struct load_info *info) · 2292 unmodified lines | ||
| 2293 | 2293 | src = (void *)info->hdr + symsect->sh_offset; |
| 2294 | 2294 | nsrc = symsect->sh_size / sizeof(*src); |
| 2295 | 2295 | |
| 2296 | + /* strtab always starts with a nul, so offset 0 is the empty string. */ | |
| 2297 | + strtab_size = 1; | |
| 2298 | + | |
| 2296 | 2299 | /* Compute total space required for the core symbols' strtab. */ |
| 2297 | − for (ndst = i = strtab_size = 1; i < nsrc; ++i, ++src) | |
| 2298 | − if (is_core_symbol(src, info->sechdrs, info->hdr->e_shnum)) { | |
| 2299 | − strtab_size += strlen(&info->strtab[src->st_name]) + 1; | |
| 2300 | + for (ndst = i = 0; i < nsrc; i++) { | |
| 2301 | + if (i == 0 || | |
| 2302 | + is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum)) { | |
| 2303 | + strtab_size += strlen(&info->strtab[src[i].st_name])+1; | |
| 2300 | 2304 | ndst++; |
| 2301 | 2305 | } |
| 2306 | + } | |
| 2302 | 2307 | |
| 2303 | 2308 | /* Append room for core symbols at end of core part. */ |
| 2304 | 2309 | info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1); |
| @@ -2332,15 +2337,15 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) · 27 unmodified lines | ||
| 2332 | 2337 | mod->core_symtab = dst = mod->module_core + info->symoffs; |
| 2333 | 2338 | mod->core_strtab = s = mod->module_core + info->stroffs; |
| 2334 | 2339 | src = mod->symtab; |
| 2335 | − *dst = *src; | |
| 2336 | 2340 | *s++ = 0; |
| 2337 | − for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { | |
| 2338 | − if (!is_core_symbol(src, info->sechdrs, info->hdr->e_shnum)) | |
| 2339 | − continue; | |
| 2340 | − | |
| 2341 | − dst[ndst] = *src; | |
| 2342 | − dst[ndst++].st_name = s - mod->core_strtab; | |
| 2343 | − s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1; | |
| 2341 | + for (ndst = i = 0; i < mod->num_symtab; i++) { | |
| 2342 | + if (i == 0 || | |
| 2343 | + is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum)) { | |
| 2344 | + dst[ndst] = src[i]; | |
| 2345 | + dst[ndst++].st_name = s - mod->core_strtab; | |
| 2346 | + s += strlcpy(s, &mod->strtab[src[i].st_name], | |
| 2347 | + KSYM_NAME_LEN) + 1; | |
| 2348 | + } | |
| 2344 | 2349 | } |
| 2345 | 2350 | mod->core_num_syms = ndst; |
| 2346 | 2351 | } |
| @@ -3017,6 +3017,8 @@ static int kswapd(void *p) · 3016 unmodified lines | ||
| 3017 | 3017 | &balanced_classzone_idx); |
| 3018 | 3018 | } |
| 3019 | 3019 | } |
| 3020 | + | |
| 3021 | + current->reclaim_state = NULL; | |
| 3020 | 3022 | return 0; |
| 3021 | 3023 | } |
| 3022 | 3024 | |
| @@ -2300,10 +2300,11 @@ restart: · 2299 unmodified lines | ||
| 2300 | 2300 | mutex_unlock(&con->mutex); |
| 2301 | 2301 | return; |
| 2302 | 2302 | } else { |
| 2303 | − con->ops->put(con); | |
| 2304 | 2303 | dout("con_work %p FAILED to back off %lu\n", con, |
| 2305 | 2304 | con->delay); |
| 2305 | + set_bit(CON_FLAG_BACKOFF, &con->flags); | |
| 2306 | 2306 | } |
| 2307 | + goto done; | |
| 2307 | 2308 | } |
| 2308 | 2309 | |
| 2309 | 2310 | if (con->state == CON_STATE_STANDBY) { |
| @@ -2749,7 +2750,8 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip) · 439 unmodified lines | ||
| 2749 | 2750 | msg = con->ops->alloc_msg(con, hdr, skip); |
| 2750 | 2751 | mutex_lock(&con->mutex); |
| 2751 | 2752 | if (con->state != CON_STATE_OPEN) { |
| 2752 | − ceph_msg_put(msg); | |
| 2753 | + if (msg) | |
| 2754 | + ceph_msg_put(msg); | |
| 2753 | 2755 | return -EAGAIN; |
| 2754 | 2756 | } |
| 2755 | 2757 | con->in_msg = msg; |
| @@ -1666,7 +1666,7 @@ static inline int deliver_skb(struct sk_buff *skb, · 1665 unmodified lines | ||
| 1666 | 1666 | |
| 1667 | 1667 | static inline bool skb_loop_sk(struct packet_type *ptype, struct sk_buff *skb) |
| 1668 | 1668 | { |
| 1669 | − if (ptype->af_packet_priv == NULL) | |
| 1669 | + if (!ptype->af_packet_priv || !skb->sk) | |
| 1670 | 1670 | return false; |
| 1671 | 1671 | |
| 1672 | 1672 | if (ptype->id_match) |
| @@ -2192,7 +2192,8 @@ static int nlmsg_populate_fdb(struct sk_buff *skb, · 2191 unmodified lines | ||
| 2192 | 2192 | goto skip; |
| 2193 | 2193 | |
| 2194 | 2194 | err = nlmsg_populate_fdb_fill(skb, dev, ha->addr, |
| 2195 | − portid, seq, 0, NTF_SELF); | |
| 2195 | + portid, seq, | |
| 2196 | + RTM_NEWNEIGH, NTF_SELF); | |
| 2196 | 2197 | if (err < 0) |
| 2197 | 2198 | return err; |
| 2198 | 2199 | skip: |
| @@ -892,13 +892,16 @@ static int __inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, · 891 unmodified lines | ||
| 892 | 892 | struct inet_diag_req_v2 *r, struct nlattr *bc) |
| 893 | 893 | { |
| 894 | 894 | const struct inet_diag_handler *handler; |
| 895 | + int err = 0; | |
| 895 | 896 | |
| 896 | 897 | handler = inet_diag_lock_handler(r->sdiag_protocol); |
| 897 | 898 | if (!IS_ERR(handler)) |
| 898 | 899 | handler->dump(skb, cb, r, bc); |
| 900 | + else | |
| 901 | + err = PTR_ERR(handler); | |
| 899 | 902 | inet_diag_unlock_handler(handler); |
| 900 | 903 | |
| 901 | − return skb->len; | |
| 904 | + return err ? : skb->len; | |
| 902 | 905 | } |
| 903 | 906 | |
| 904 | 907 | static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) |
| @@ -184,7 +184,8 @@ nf_nat_ipv4_out(unsigned int hooknum, · 183 unmodified lines | ||
| 184 | 184 | |
| 185 | 185 | if ((ct->tuplehash[dir].tuple.src.u3.ip != |
| 186 | 186 | ct->tuplehash[!dir].tuple.dst.u3.ip) || |
| 187 | − (ct->tuplehash[dir].tuple.src.u.all != | |
| 187 | + (ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMP && | |
| 188 | + ct->tuplehash[dir].tuple.src.u.all != | |
| 188 | 189 | ct->tuplehash[!dir].tuple.dst.u.all)) |
| 189 | 190 | if (nf_xfrm_me_harder(skb, AF_INET) < 0) |
| 190 | 191 | ret = NF_DROP; |
| @@ -221,6 +222,7 @@ nf_nat_ipv4_local_fn(unsigned int hooknum, · 30 unmodified lines | ||
| 221 | 222 | } |
| 222 | 223 | #ifdef CONFIG_XFRM |
| 223 | 224 | else if (!(IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED) && |
| 225 | + ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMP && | |
| 224 | 226 | ct->tuplehash[dir].tuple.dst.u.all != |
| 225 | 227 | ct->tuplehash[!dir].tuple.src.u.all) |
| 226 | 228 | if (nf_xfrm_me_harder(skb, AF_INET) < 0) |
| @@ -313,11 +313,13 @@ static void tcp_illinois_info(struct sock *sk, u32 ext, · 312 unmodified lines | ||
| 313 | 313 | .tcpv_rttcnt = ca->cnt_rtt, |
| 314 | 314 | .tcpv_minrtt = ca->base_rtt, |
| 315 | 315 | }; |
| 316 | − u64 t = ca->sum_rtt; | |
| 317 | 316 | |
| 318 | − do_div(t, ca->cnt_rtt); | |
| 319 | − info.tcpv_rtt = t; | |
| 317 | + if (info.tcpv_rttcnt > 0) { | |
| 318 | + u64 t = ca->sum_rtt; | |
| 320 | 319 | |
| 320 | + do_div(t, info.tcpv_rttcnt); | |
| 321 | + info.tcpv_rtt = t; | |
| 322 | + } | |
| 321 | 323 | nla_put(skb, INET_DIAG_VEGASINFO, sizeof(info), &info); |
| 322 | 324 | } |
| 323 | 325 | } |
| @@ -4529,6 +4529,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) · 4528 unmodified lines | ||
| 4529 | 4529 | struct tcphdr *th; |
| 4530 | 4530 | bool fragstolen; |
| 4531 | 4531 | |
| 4532 | + if (size == 0) | |
| 4533 | + return 0; | |
| 4534 | + | |
| 4532 | 4535 | skb = alloc_skb(size + sizeof(*th), sk->sk_allocation); |
| 4533 | 4536 | if (!skb) |
| 4534 | 4537 | goto err; |
| @@ -864,7 +864,7 @@ static int parse_nl_addr(struct genl_info *info, struct inetpeer_addr *addr, · 863 unmodified lines | ||
| 864 | 864 | } |
| 865 | 865 | a = info->attrs[TCP_METRICS_ATTR_ADDR_IPV6]; |
| 866 | 866 | if (a) { |
| 867 | − if (nla_len(a) != sizeof(sizeof(struct in6_addr))) | |
| 867 | + if (nla_len(a) != sizeof(struct in6_addr)) | |
| 868 | 868 | return -EINVAL; |
| 869 | 869 | addr->family = AF_INET6; |
| 870 | 870 | memcpy(addr->addr.a6, nla_data(a), sizeof(addr->addr.a6)); |
| @@ -1633,9 +1633,9 @@ static size_t ip6gre_get_size(const struct net_device *dev) · 1632 unmodified lines | ||
| 1633 | 1633 | /* IFLA_GRE_OKEY */ |
| 1634 | 1634 | nla_total_size(4) + |
| 1635 | 1635 | /* IFLA_GRE_LOCAL */ |
| 1636 | − nla_total_size(4) + | |
| 1636 | + nla_total_size(sizeof(struct in6_addr)) + | |
| 1637 | 1637 | /* IFLA_GRE_REMOTE */ |
| 1638 | − nla_total_size(4) + | |
| 1638 | + nla_total_size(sizeof(struct in6_addr)) + | |
| 1639 | 1639 | /* IFLA_GRE_TTL */ |
| 1640 | 1640 | nla_total_size(1) + |
| 1641 | 1641 | /* IFLA_GRE_TOS */ |
| @@ -1659,8 +1659,8 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) · 17 unmodified lines | ||
| 1659 | 1659 | nla_put_be16(skb, IFLA_GRE_OFLAGS, p->o_flags) || |
| 1660 | 1660 | nla_put_be32(skb, IFLA_GRE_IKEY, p->i_key) || |
| 1661 | 1661 | nla_put_be32(skb, IFLA_GRE_OKEY, p->o_key) || |
| 1662 | − nla_put(skb, IFLA_GRE_LOCAL, sizeof(struct in6_addr), &p->raddr) || | |
| 1663 | − nla_put(skb, IFLA_GRE_REMOTE, sizeof(struct in6_addr), &p->laddr) || | |
| 1662 | + nla_put(skb, IFLA_GRE_LOCAL, sizeof(struct in6_addr), &p->laddr) || | |
| 1663 | + nla_put(skb, IFLA_GRE_REMOTE, sizeof(struct in6_addr), &p->raddr) || | |
| 1664 | 1664 | nla_put_u8(skb, IFLA_GRE_TTL, p->hop_limit) || |
| 1665 | 1665 | /*nla_put_u8(skb, IFLA_GRE_TOS, t->priority) ||*/ |
| 1666 | 1666 | nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) || |
| @@ -535,7 +535,7 @@ static void ndisc_send_unsol_na(struct net_device *dev) · 534 unmodified lines | ||
| 535 | 535 | { |
| 536 | 536 | struct inet6_dev *idev; |
| 537 | 537 | struct inet6_ifaddr *ifa; |
| 538 | − struct in6_addr mcaddr; | |
| 538 | + struct in6_addr mcaddr = IN6ADDR_LINKLOCAL_ALLNODES_INIT; | |
| 539 | 539 | |
| 540 | 540 | idev = in6_dev_get(dev); |
| 541 | 541 | if (!idev) |
| @@ -543,7 +543,6 @@ static void ndisc_send_unsol_na(struct net_device *dev) · 1 unmodified line | ||
| 543 | 543 | |
| 544 | 544 | read_lock_bh(&idev->lock); |
| 545 | 545 | list_for_each_entry(ifa, &idev->addr_list, if_list) { |
| 546 | − addrconf_addr_solict_mult(&ifa->addr, &mcaddr); | |
| 547 | 546 | ndisc_send_na(dev, NULL, &mcaddr, &ifa->addr, |
| 548 | 547 | /*router=*/ !!idev->cnf.forwarding, |
| 549 | 548 | /*solicited=*/ false, /*override=*/ true, |
| @@ -186,7 +186,8 @@ nf_nat_ipv6_out(unsigned int hooknum, · 185 unmodified lines | ||
| 186 | 186 | |
| 187 | 187 | if (!nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.src.u3, |
| 188 | 188 | &ct->tuplehash[!dir].tuple.dst.u3) || |
| 189 | − (ct->tuplehash[dir].tuple.src.u.all != | |
| 189 | + (ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMPV6 && | |
| 190 | + ct->tuplehash[dir].tuple.src.u.all != | |
| 190 | 191 | ct->tuplehash[!dir].tuple.dst.u.all)) |
| 191 | 192 | if (nf_xfrm_me_harder(skb, AF_INET6) < 0) |
| 192 | 193 | ret = NF_DROP; |
| @@ -222,6 +223,7 @@ nf_nat_ipv6_local_fn(unsigned int hooknum, · 29 unmodified lines | ||
| 222 | 223 | } |
| 223 | 224 | #ifdef CONFIG_XFRM |
| 224 | 225 | else if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) && |
| 226 | + ct->tuplehash[dir].tuple.dst.protonum != IPPROTO_ICMPV6 && | |
| 225 | 227 | ct->tuplehash[dir].tuple.dst.u.all != |
| 226 | 228 | ct->tuplehash[!dir].tuple.src.u.all) |
| 227 | 229 | if (nf_xfrm_me_harder(skb, AF_INET6)) |
| @@ -85,7 +85,7 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = { · 84 unmodified lines | ||
| 85 | 85 | { } |
| 86 | 86 | }; |
| 87 | 87 | |
| 88 | −static int __net_init nf_ct_frag6_sysctl_register(struct net *net) | |
| 88 | +static int nf_ct_frag6_sysctl_register(struct net *net) | |
| 89 | 89 | { |
| 90 | 90 | struct ctl_table *table; |
| 91 | 91 | struct ctl_table_header *hdr; |
| @@ -127,7 +127,7 @@ static void __net_exit nf_ct_frags6_sysctl_unregister(struct net *net) · 35 unmodified lines | ||
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | #else |
| 130 | −static int __net_init nf_ct_frag6_sysctl_register(struct net *net) | |
| 130 | +static int nf_ct_frag6_sysctl_register(struct net *net) | |
| 131 | 131 | { |
| 132 | 132 | return 0; |
| 133 | 133 | } |
| @@ -291,6 +291,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p · 290 unmodified lines | ||
| 291 | 291 | |
| 292 | 292 | out_del_dev: |
| 293 | 293 | free_netdev(dev); |
| 294 | + spriv->dev = NULL; | |
| 294 | 295 | out_del_session: |
| 295 | 296 | l2tp_session_delete(session); |
| 296 | 297 | out: |
| @@ -1108,7 +1108,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, · 1107 unmodified lines | ||
| 1108 | 1108 | sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH; |
| 1109 | 1109 | sdata->u.ibss.ibss_join_req = jiffies; |
| 1110 | 1110 | |
| 1111 | − memcpy(sdata->u.ibss.ssid, params->ssid, IEEE80211_MAX_SSID_LEN); | |
| 1111 | + memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len); | |
| 1112 | 1112 | sdata->u.ibss.ssid_len = params->ssid_len; |
| 1113 | 1113 | |
| 1114 | 1114 | mutex_unlock(&sdata->u.ibss.mtx); |
| @@ -531,6 +531,11 @@ ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx) · 530 unmodified lines | ||
| 531 | 531 | |
| 532 | 532 | if (ieee80211_is_action(hdr->frame_control)) { |
| 533 | 533 | u8 category; |
| 534 | + | |
| 535 | + /* make sure category field is present */ | |
| 536 | + if (rx->skb->len < IEEE80211_MIN_ACTION_SIZE) | |
| 537 | + return RX_DROP_MONITOR; | |
| 538 | + | |
| 534 | 539 | mgmt = (struct ieee80211_mgmt *)hdr; |
| 535 | 540 | category = mgmt->u.action.category; |
| 536 | 541 | if (category != WLAN_CATEGORY_MESH_ACTION && |
| @@ -883,14 +888,16 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) · 346 unmodified lines | ||
| 883 | 888 | */ |
| 884 | 889 | if (rx->sta && rx->sdata->vif.type == NL80211_IFTYPE_STATION && |
| 885 | 890 | ieee80211_is_data_present(hdr->frame_control)) { |
| 886 | − u16 ethertype; | |
| 887 | − u8 *payload; | |
| 888 | − | |
| 889 | − payload = rx->skb->data + | |
| 890 | − ieee80211_hdrlen(hdr->frame_control); | |
| 891 | − ethertype = (payload[6] << 8) | payload[7]; | |
| 892 | − if (cpu_to_be16(ethertype) == | |
| 893 | − rx->sdata->control_port_protocol) | |
| 891 | + unsigned int hdrlen; | |
| 892 | + __be16 ethertype; | |
| 893 | + | |
| 894 | + hdrlen = ieee80211_hdrlen(hdr->frame_control); | |
| 895 | + | |
| 896 | + if (rx->skb->len < hdrlen + 8) | |
| 897 | + return RX_DROP_MONITOR; | |
| 898 | + | |
| 899 | + skb_copy_bits(rx->skb, hdrlen + 6, ðertype, 2); | |
| 900 | + if (ethertype == rx->sdata->control_port_protocol) | |
| 894 | 901 | return RX_CONTINUE; |
| 895 | 902 | } |
| 896 | 903 | |
| @@ -1462,11 +1469,14 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) · 565 unmodified lines | ||
| 1462 | 1469 | |
| 1463 | 1470 | hdr = (struct ieee80211_hdr *)rx->skb->data; |
| 1464 | 1471 | fc = hdr->frame_control; |
| 1472 | + | |
| 1473 | + if (ieee80211_is_ctl(fc)) | |
| 1474 | + return RX_CONTINUE; | |
| 1475 | + | |
| 1465 | 1476 | sc = le16_to_cpu(hdr->seq_ctrl); |
| 1466 | 1477 | frag = sc & IEEE80211_SCTL_FRAG; |
| 1467 | 1478 | |
| 1468 | 1479 | if (likely((!ieee80211_has_morefrags(fc) && frag == 0) || |
| 1469 | − (rx->skb)->len < 24 || | |
| 1470 | 1480 | is_multicast_ether_addr(hdr->addr1))) { |
| 1471 | 1481 | /* not fragmented */ |
| 1472 | 1482 | goto out; |
| @@ -1889,6 +1899,20 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) · 416 unmodified lines | ||
| 1889 | 1899 | |
| 1890 | 1900 | hdr = (struct ieee80211_hdr *) skb->data; |
| 1891 | 1901 | hdrlen = ieee80211_hdrlen(hdr->frame_control); |
| 1902 | + | |
| 1903 | + /* make sure fixed part of mesh header is there, also checks skb len */ | |
| 1904 | + if (!pskb_may_pull(rx->skb, hdrlen + 6)) | |
| 1905 | + return RX_DROP_MONITOR; | |
| 1906 | + | |
| 1907 | + mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); | |
| 1908 | + | |
| 1909 | + /* make sure full mesh header is there, also checks skb len */ | |
| 1910 | + if (!pskb_may_pull(rx->skb, | |
| 1911 | + hdrlen + ieee80211_get_mesh_hdrlen(mesh_hdr))) | |
| 1912 | + return RX_DROP_MONITOR; | |
| 1913 | + | |
| 1914 | + /* reload pointers */ | |
| 1915 | + hdr = (struct ieee80211_hdr *) skb->data; | |
| 1892 | 1916 | mesh_hdr = (struct ieee80211s_hdr *) (skb->data + hdrlen); |
| 1893 | 1917 | |
| 1894 | 1918 | /* frame is in RMC, don't forward */ |
| @@ -1897,7 +1921,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) · 2 unmodified lines | ||
| 1897 | 1921 | mesh_rmc_check(hdr->addr3, mesh_hdr, rx->sdata)) |
| 1898 | 1922 | return RX_DROP_MONITOR; |
| 1899 | 1923 | |
| 1900 | − if (!ieee80211_is_data(hdr->frame_control)) | |
| 1924 | + if (!ieee80211_is_data(hdr->frame_control) || | |
| 1925 | + !(status->rx_flags & IEEE80211_RX_RA_MATCH)) | |
| 1901 | 1926 | return RX_CONTINUE; |
| 1902 | 1927 | |
| 1903 | 1928 | if (!mesh_hdr->ttl) |
| @@ -1911,9 +1936,12 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) · 7 unmodified lines | ||
| 1911 | 1936 | if (is_multicast_ether_addr(hdr->addr1)) { |
| 1912 | 1937 | mpp_addr = hdr->addr3; |
| 1913 | 1938 | proxied_addr = mesh_hdr->eaddr1; |
| 1914 | − } else { | |
| 1939 | + } else if (mesh_hdr->flags & MESH_FLAGS_AE_A5_A6) { | |
| 1940 | + /* has_a4 already checked in ieee80211_rx_mesh_check */ | |
| 1915 | 1941 | mpp_addr = hdr->addr4; |
| 1916 | 1942 | proxied_addr = mesh_hdr->eaddr2; |
| 1943 | + } else { | |
| 1944 | + return RX_DROP_MONITOR; | |
| 1917 | 1945 | } |
| 1918 | 1946 | |
| 1919 | 1947 | rcu_read_lock(); |
| @@ -1941,12 +1969,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) · 21 unmodified lines | ||
| 1941 | 1969 | } |
| 1942 | 1970 | skb_set_queue_mapping(skb, q); |
| 1943 | 1971 | |
| 1944 | − if (!(status->rx_flags & IEEE80211_RX_RA_MATCH)) | |
| 1945 | − goto out; | |
| 1946 | − | |
| 1947 | 1972 | if (!--mesh_hdr->ttl) { |
| 1948 | 1973 | IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl); |
| 1949 | − return RX_DROP_MONITOR; | |
| 1974 | + goto out; | |
| 1950 | 1975 | } |
| 1951 | 1976 | |
| 1952 | 1977 | if (!ifmsh->mshcfg.dot11MeshForwarding) |
| @@ -2353,6 +2378,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) · 400 unmodified lines | ||
| 2353 | 2378 | } |
| 2354 | 2379 | break; |
| 2355 | 2380 | case WLAN_CATEGORY_SELF_PROTECTED: |
| 2381 | + if (len < (IEEE80211_MIN_ACTION_SIZE + | |
| 2382 | + sizeof(mgmt->u.action.u.self_prot.action_code))) | |
| 2383 | + break; | |
| 2384 | + | |
| 2356 | 2385 | switch (mgmt->u.action.u.self_prot.action_code) { |
| 2357 | 2386 | case WLAN_SP_MESH_PEERING_OPEN: |
| 2358 | 2387 | case WLAN_SP_MESH_PEERING_CLOSE: |
| @@ -2371,6 +2400,10 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) · 12 unmodified lines | ||
| 2371 | 2400 | } |
| 2372 | 2401 | break; |
| 2373 | 2402 | case WLAN_CATEGORY_MESH_ACTION: |
| 2403 | + if (len < (IEEE80211_MIN_ACTION_SIZE + | |
| 2404 | + sizeof(mgmt->u.action.u.mesh_action.action_code))) | |
| 2405 | + break; | |
| 2406 | + | |
| 2374 | 2407 | if (!ieee80211_vif_is_mesh(&sdata->vif)) |
| 2375 | 2408 | break; |
| 2376 | 2409 | if (mesh_action_is_path_sel(mgmt) && |
| @@ -2913,10 +2946,15 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, · 536 unmodified lines | ||
| 2913 | 2946 | if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc)) |
| 2914 | 2947 | local->dot11ReceivedFragmentCount++; |
| 2915 | 2948 | |
| 2916 | − if (ieee80211_is_mgmt(fc)) | |
| 2917 | − err = skb_linearize(skb); | |
| 2918 | − else | |
| 2949 | + if (ieee80211_is_mgmt(fc)) { | |
| 2950 | + /* drop frame if too short for header */ | |
| 2951 | + if (skb->len < ieee80211_hdrlen(fc)) | |
| 2952 | + err = -ENOBUFS; | |
| 2953 | + else | |
| 2954 | + err = skb_linearize(skb); | |
| 2955 | + } else { | |
| 2919 | 2956 | err = !pskb_may_pull(skb, ieee80211_hdrlen(fc)); |
| 2957 | + } | |
| 2920 | 2958 | |
| 2921 | 2959 | if (err) { |
| 2922 | 2960 | dev_kfree_skb(skb); |
| @@ -643,13 +643,41 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, · 642 unmodified lines | ||
| 643 | 643 | break; |
| 644 | 644 | } |
| 645 | 645 | |
| 646 | − if (id != WLAN_EID_VENDOR_SPECIFIC && | |
| 647 | − id != WLAN_EID_QUIET && | |
| 648 | − test_bit(id, seen_elems)) { | |
| 649 | − elems->parse_error = true; | |
| 650 | − left -= elen; | |
| 651 | − pos += elen; | |
| 652 | − continue; | |
| 646 | + switch (id) { | |
| 647 | + case WLAN_EID_SSID: | |
| 648 | + case WLAN_EID_SUPP_RATES: | |
| 649 | + case WLAN_EID_FH_PARAMS: | |
| 650 | + case WLAN_EID_DS_PARAMS: | |
| 651 | + case WLAN_EID_CF_PARAMS: | |
| 652 | + case WLAN_EID_TIM: | |
| 653 | + case WLAN_EID_IBSS_PARAMS: | |
| 654 | + case WLAN_EID_CHALLENGE: | |
| 655 | + case WLAN_EID_RSN: | |
| 656 | + case WLAN_EID_ERP_INFO: | |
| 657 | + case WLAN_EID_EXT_SUPP_RATES: | |
| 658 | + case WLAN_EID_HT_CAPABILITY: | |
| 659 | + case WLAN_EID_HT_OPERATION: | |
| 660 | + case WLAN_EID_VHT_CAPABILITY: | |
| 661 | + case WLAN_EID_VHT_OPERATION: | |
| 662 | + case WLAN_EID_MESH_ID: | |
| 663 | + case WLAN_EID_MESH_CONFIG: | |
| 664 | + case WLAN_EID_PEER_MGMT: | |
| 665 | + case WLAN_EID_PREQ: | |
| 666 | + case WLAN_EID_PREP: | |
| 667 | + case WLAN_EID_PERR: | |
| 668 | + case WLAN_EID_RANN: | |
| 669 | + case WLAN_EID_CHANNEL_SWITCH: | |
| 670 | + case WLAN_EID_EXT_CHANSWITCH_ANN: | |
| 671 | + case WLAN_EID_COUNTRY: | |
| 672 | + case WLAN_EID_PWR_CONSTRAINT: | |
| 673 | + case WLAN_EID_TIMEOUT_INTERVAL: | |
| 674 | + if (test_bit(id, seen_elems)) { | |
| 675 | + elems->parse_error = true; | |
| 676 | + left -= elen; | |
| 677 | + pos += elen; | |
| 678 | + continue; | |
| 679 | + } | |
| 680 | + break; | |
| 653 | 681 | } |
| 654 | 682 | |
| 655 | 683 | if (calc_crc && id < 64 && (filter & (1ULL << id))) |
| @@ -753,7 +753,8 @@ static int callforward_do_filter(const union nf_inet_addr *src, · 752 unmodified lines | ||
| 753 | 753 | flowi4_to_flowi(&fl1), false)) { |
| 754 | 754 | if (!afinfo->route(&init_net, (struct dst_entry **)&rt2, |
| 755 | 755 | flowi4_to_flowi(&fl2), false)) { |
| 756 | − if (rt1->rt_gateway == rt2->rt_gateway && | |
| 756 | + if (rt_nexthop(rt1, fl1.daddr) == | |
| 757 | + rt_nexthop(rt2, fl2.daddr) && | |
| 757 | 758 | rt1->dst.dev == rt2->dst.dev) |
| 758 | 759 | ret = 1; |
| 759 | 760 | dst_release(&rt2->dst); |
| @@ -84,18 +84,19 @@ · 83 unmodified lines | ||
| 84 | 84 | * grp->index is the index of the group; and grp->slot_shift |
| 85 | 85 | * is the shift for the corresponding (scaled) sigma_i. |
| 86 | 86 | */ |
| 87 | −#define QFQ_MAX_INDEX 19 | |
| 88 | −#define QFQ_MAX_WSHIFT 16 | |
| 87 | +#define QFQ_MAX_INDEX 24 | |
| 88 | +#define QFQ_MAX_WSHIFT 12 | |
| 89 | 89 | |
| 90 | 90 | #define QFQ_MAX_WEIGHT (1<<QFQ_MAX_WSHIFT) |
| 91 | −#define QFQ_MAX_WSUM (2*QFQ_MAX_WEIGHT) | |
| 91 | +#define QFQ_MAX_WSUM (16*QFQ_MAX_WEIGHT) | |
| 92 | 92 | |
| 93 | 93 | #define FRAC_BITS 30 /* fixed point arithmetic */ |
| 94 | 94 | #define ONE_FP (1UL << FRAC_BITS) |
| 95 | 95 | #define IWSUM (ONE_FP/QFQ_MAX_WSUM) |
| 96 | 96 | |
| 97 | −#define QFQ_MTU_SHIFT 11 | |
| 97 | +#define QFQ_MTU_SHIFT 16 /* to support TSO/GSO */ | |
| 98 | 98 | #define QFQ_MIN_SLOT_SHIFT (FRAC_BITS + QFQ_MTU_SHIFT - QFQ_MAX_INDEX) |
| 99 | +#define QFQ_MIN_LMAX 256 /* min possible lmax for a class */ | |
| 99 | 100 | |
| 100 | 101 | /* |
| 101 | 102 | * Possible group states. These values are used as indexes for the bitmaps |
| @@ -231,6 +232,32 @@ static void qfq_update_class_params(struct qfq_sched *q, struct qfq_class *cl, · 129 unmodified lines | ||
| 231 | 232 | q->wsum += delta_w; |
| 232 | 233 | } |
| 233 | 234 | |
| 235 | +static void qfq_update_reactivate_class(struct qfq_sched *q, | |
| 236 | + struct qfq_class *cl, | |
| 237 | + u32 inv_w, u32 lmax, int delta_w) | |
| 238 | +{ | |
| 239 | + bool need_reactivation = false; | |
| 240 | + int i = qfq_calc_index(inv_w, lmax); | |
| 241 | + | |
| 242 | + if (&q->groups[i] != cl->grp && cl->qdisc->q.qlen > 0) { | |
| 243 | + /* | |
| 244 | + * shift cl->F back, to not charge the | |
| 245 | + * class for the not-yet-served head | |
| 246 | + * packet | |
| 247 | + */ | |
| 248 | + cl->F = cl->S; | |
| 249 | + /* remove class from its slot in the old group */ | |
| 250 | + qfq_deactivate_class(q, cl); | |
| 251 | + need_reactivation = true; | |
| 252 | + } | |
| 253 | + | |
| 254 | + qfq_update_class_params(q, cl, lmax, inv_w, delta_w); | |
| 255 | + | |
| 256 | + if (need_reactivation) /* activate in new group */ | |
| 257 | + qfq_activate_class(q, cl, qdisc_peek_len(cl->qdisc)); | |
| 258 | +} | |
| 259 | + | |
| 260 | + | |
| 234 | 261 | static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, |
| 235 | 262 | struct nlattr **tca, unsigned long *arg) |
| 236 | 263 | { |
| @@ -238,7 +265,7 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, · 1 unmodified line | ||
| 238 | 265 | struct qfq_class *cl = (struct qfq_class *)*arg; |
| 239 | 266 | struct nlattr *tb[TCA_QFQ_MAX + 1]; |
| 240 | 267 | u32 weight, lmax, inv_w; |
| 241 | − int i, err; | |
| 268 | + int err; | |
| 242 | 269 | int delta_w; |
| 243 | 270 | |
| 244 | 271 | if (tca[TCA_OPTIONS] == NULL) { |
| @@ -270,16 +297,14 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, · 25 unmodified lines | ||
| 270 | 297 | |
| 271 | 298 | if (tb[TCA_QFQ_LMAX]) { |
| 272 | 299 | lmax = nla_get_u32(tb[TCA_QFQ_LMAX]); |
| 273 | − if (!lmax || lmax > (1UL << QFQ_MTU_SHIFT)) { | |
| 300 | + if (lmax < QFQ_MIN_LMAX || lmax > (1UL << QFQ_MTU_SHIFT)) { | |
| 274 | 301 | pr_notice("qfq: invalid max length %u\n", lmax); |
| 275 | 302 | return -EINVAL; |
| 276 | 303 | } |
| 277 | 304 | } else |
| 278 | − lmax = 1UL << QFQ_MTU_SHIFT; | |
| 305 | + lmax = psched_mtu(qdisc_dev(sch)); | |
| 279 | 306 | |
| 280 | 307 | if (cl != NULL) { |
| 281 | − bool need_reactivation = false; | |
| 282 | − | |
| 283 | 308 | if (tca[TCA_RATE]) { |
| 284 | 309 | err = gen_replace_estimator(&cl->bstats, &cl->rate_est, |
| 285 | 310 | qdisc_root_sleeping_lock(sch), |
| @@ -291,24 +316,8 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, · 5 unmodified lines | ||
| 291 | 316 | if (lmax == cl->lmax && inv_w == cl->inv_w) |
| 292 | 317 | return 0; /* nothing to update */ |
| 293 | 318 | |
| 294 | − i = qfq_calc_index(inv_w, lmax); | |
| 295 | 319 | sch_tree_lock(sch); |
| 296 | − if (&q->groups[i] != cl->grp && cl->qdisc->q.qlen > 0) { | |
| 297 | − /* | |
| 298 | − * shift cl->F back, to not charge the | |
| 299 | − * class for the not-yet-served head | |
| 300 | − * packet | |
| 301 | − */ | |
| 302 | − cl->F = cl->S; | |
| 303 | − /* remove class from its slot in the old group */ | |
| 304 | − qfq_deactivate_class(q, cl); | |
| 305 | − need_reactivation = true; | |
| 306 | − } | |
| 307 | − | |
| 308 | − qfq_update_class_params(q, cl, lmax, inv_w, delta_w); | |
| 309 | − | |
| 310 | − if (need_reactivation) /* activate in new group */ | |
| 311 | − qfq_activate_class(q, cl, qdisc_peek_len(cl->qdisc)); | |
| 320 | + qfq_update_reactivate_class(q, cl, inv_w, lmax, delta_w); | |
| 312 | 321 | sch_tree_unlock(sch); |
| 313 | 322 | |
| 314 | 323 | return 0; |
| @@ -663,15 +672,48 @@ static void qfq_make_eligible(struct qfq_sched *q, u64 old_V) · 348 unmodified lines | ||
| 663 | 672 | |
| 664 | 673 | |
| 665 | 674 | /* |
| 666 | − * XXX we should make sure that slot becomes less than 32. | |
| 667 | − * This is guaranteed by the input values. | |
| 668 | − * roundedS is always cl->S rounded on grp->slot_shift bits. | |
| 675 | + * If the weight and lmax (max_pkt_size) of the classes do not change, | |
| 676 | + * then QFQ guarantees that the slot index is never higher than | |
| 677 | + * 2 + ((1<<QFQ_MTU_SHIFT)/QFQ_MIN_LMAX) * (QFQ_MAX_WEIGHT/QFQ_MAX_WSUM). | |
| 678 | + * | |
| 679 | + * With the current values of the above constants, the index is | |
| 680 | + * then guaranteed to never be higher than 2 + 256 * (1 / 16) = 18. | |
| 681 | + * | |
| 682 | + * When the weight of a class is increased or the lmax of the class is | |
| 683 | + * decreased, a new class with smaller slot size may happen to be | |
| 684 | + * activated. The activation of this class should be properly delayed | |
| 685 | + * to when the service of the class has finished in the ideal system | |
| 686 | + * tracked by QFQ. If the activation of the class is not delayed to | |
| 687 | + * this reference time instant, then this class may be unjustly served | |
| 688 | + * before other classes waiting for service. This may cause | |
| 689 | + * (unfrequently) the above bound to the slot index to be violated for | |
| 690 | + * some of these unlucky classes. | |
| 691 | + * | |
| 692 | + * Instead of delaying the activation of the new class, which is quite | |
| 693 | + * complex, the following inaccurate but simple solution is used: if | |
| 694 | + * the slot index is higher than QFQ_MAX_SLOTS-2, then the timestamps | |
| 695 | + * of the class are shifted backward so as to let the slot index | |
| 696 | + * become equal to QFQ_MAX_SLOTS-2. This threshold is used because, if | |
| 697 | + * the slot index is above it, then the data structure implementing | |
| 698 | + * the bucket list either gets immediately corrupted or may get | |
| 699 | + * corrupted on a possible next packet arrival that causes the start | |
| 700 | + * time of the group to be shifted backward. | |
| 669 | 701 | */ |
| 670 | 702 | static void qfq_slot_insert(struct qfq_group *grp, struct qfq_class *cl, |
| 671 | 703 | u64 roundedS) |
| 672 | 704 | { |
| 673 | 705 | u64 slot = (roundedS - grp->S) >> grp->slot_shift; |
| 674 | − unsigned int i = (grp->front + slot) % QFQ_MAX_SLOTS; | |
| 706 | + unsigned int i; /* slot index in the bucket list */ | |
| 707 | + | |
| 708 | + if (unlikely(slot > QFQ_MAX_SLOTS - 2)) { | |
| 709 | + u64 deltaS = roundedS - grp->S - | |
| 710 | + ((u64)(QFQ_MAX_SLOTS - 2)<<grp->slot_shift); | |
| 711 | + cl->S -= deltaS; | |
| 712 | + cl->F -= deltaS; | |
| 713 | + slot = QFQ_MAX_SLOTS - 2; | |
| 714 | + } | |
| 715 | + | |
| 716 | + i = (grp->front + slot) % QFQ_MAX_SLOTS; | |
| 675 | 717 | |
| 676 | 718 | hlist_add_head(&cl->next, &grp->slots[i]); |
| 677 | 719 | __set_bit(slot, &grp->full_slots); |
| @@ -892,6 +934,13 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch) · 214 unmodified lines | ||
| 892 | 934 | } |
| 893 | 935 | pr_debug("qfq_enqueue: cl = %x\n", cl->common.classid); |
| 894 | 936 | |
| 937 | + if (unlikely(cl->lmax < qdisc_pkt_len(skb))) { | |
| 938 | + pr_debug("qfq: increasing maxpkt from %u to %u for class %u", | |
| 939 | + cl->lmax, qdisc_pkt_len(skb), cl->common.classid); | |
| 940 | + qfq_update_reactivate_class(q, cl, cl->inv_w, | |
| 941 | + qdisc_pkt_len(skb), 0); | |
| 942 | + } | |
| 943 | + | |
| 895 | 944 | err = qdisc_enqueue(skb, cl->qdisc); |
| 896 | 945 | if (unlikely(err != NET_XMIT_SUCCESS)) { |
| 897 | 946 | pr_debug("qfq_enqueue: enqueue failed %d\n", err); |
| @@ -974,7 +974,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk, · 973 unmodified lines | ||
| 974 | 974 | void *addr_buf; |
| 975 | 975 | struct sctp_af *af; |
| 976 | 976 | |
| 977 | − SCTP_DEBUG_PRINTK("sctp_setsocktopt_bindx: sk %p addrs %p" | |
| 977 | + SCTP_DEBUG_PRINTK("sctp_setsockopt_bindx: sk %p addrs %p" | |
| 978 | 978 | " addrs_size %d opt %d\n", sk, addrs, addrs_size, op); |
| 979 | 979 | |
| 980 | 980 | if (unlikely(addrs_size <= 0)) |
| @@ -172,7 +172,7 @@ out_free: · 171 unmodified lines | ||
| 172 | 172 | xprt_free_allocation(req); |
| 173 | 173 | |
| 174 | 174 | dprintk("RPC: setup backchannel transport failed\n"); |
| 175 | − return -1; | |
| 175 | + return -ENOMEM; | |
| 176 | 176 | } |
| 177 | 177 | EXPORT_SYMBOL_GPL(xprt_setup_backchannel); |
| 178 | 178 | |
| @@ -116,7 +116,6 @@ void tipc_handler_stop(void) · 115 unmodified lines | ||
| 116 | 116 | return; |
| 117 | 117 | |
| 118 | 118 | handler_enabled = 0; |
| 119 | − tasklet_disable(&tipc_tasklet); | |
| 120 | 119 | tasklet_kill(&tipc_tasklet); |
| 121 | 120 | |
| 122 | 121 | spin_lock_bh(&qitem_lock); |
| @@ -526,8 +526,7 @@ int wiphy_register(struct wiphy *wiphy) · 525 unmodified lines | ||
| 526 | 526 | for (i = 0; i < sband->n_channels; i++) { |
| 527 | 527 | sband->channels[i].orig_flags = |
| 528 | 528 | sband->channels[i].flags; |
| 529 | − sband->channels[i].orig_mag = | |
| 530 | − sband->channels[i].max_antenna_gain; | |
| 529 | + sband->channels[i].orig_mag = INT_MAX; | |
| 531 | 530 | sband->channels[i].orig_mpwr = |
| 532 | 531 | sband->channels[i].max_power; |
| 533 | 532 | sband->channels[i].band = band; |
| @@ -908,7 +908,7 @@ static void handle_channel(struct wiphy *wiphy, · 907 unmodified lines | ||
| 908 | 908 | map_regdom_flags(reg_rule->flags) | bw_flags; |
| 909 | 909 | chan->max_antenna_gain = chan->orig_mag = |
| 910 | 910 | (int) MBI_TO_DBI(power_rule->max_antenna_gain); |
| 911 | − chan->max_power = chan->orig_mpwr = | |
| 911 | + chan->max_reg_power = chan->max_power = chan->orig_mpwr = | |
| 912 | 912 | (int) MBM_TO_DBM(power_rule->max_eirp); |
| 913 | 913 | return; |
| 914 | 914 | } |
| @@ -1331,7 +1331,8 @@ static void handle_channel_custom(struct wiphy *wiphy, · 416 unmodified lines | ||
| 1331 | 1331 | |
| 1332 | 1332 | chan->flags |= map_regdom_flags(reg_rule->flags) | bw_flags; |
| 1333 | 1333 | chan->max_antenna_gain = (int) MBI_TO_DBI(power_rule->max_antenna_gain); |
| 1334 | − chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp); | |
| 1334 | + chan->max_reg_power = chan->max_power = | |
| 1335 | + (int) MBM_TO_DBM(power_rule->max_eirp); | |
| 1335 | 1336 | } |
| 1336 | 1337 | |
| 1337 | 1338 | static void handle_band_custom(struct wiphy *wiphy, enum ieee80211_band band, |
| @@ -309,23 +309,21 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb) · 308 unmodified lines | ||
| 309 | 309 | } |
| 310 | 310 | EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb); |
| 311 | 311 | |
| 312 | −static int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) | |
| 312 | +unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr) | |
| 313 | 313 | { |
| 314 | 314 | int ae = meshhdr->flags & MESH_FLAGS_AE; |
| 315 | − /* 7.1.3.5a.2 */ | |
| 315 | + /* 802.11-2012, 8.2.4.7.3 */ | |
| 316 | 316 | switch (ae) { |
| 317 | + default: | |
| 317 | 318 | case 0: |
| 318 | 319 | return 6; |
| 319 | 320 | case MESH_FLAGS_AE_A4: |
| 320 | 321 | return 12; |
| 321 | 322 | case MESH_FLAGS_AE_A5_A6: |
| 322 | 323 | return 18; |
| 323 | − case (MESH_FLAGS_AE_A4 | MESH_FLAGS_AE_A5_A6): | |
| 324 | − return 24; | |
| 325 | − default: | |
| 326 | − return 6; | |
| 327 | 324 | } |
| 328 | 325 | } |
| 326 | +EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen); | |
| 329 | 327 | |
| 330 | 328 | int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr, |
| 331 | 329 | enum nl80211_iftype iftype) |
| @@ -373,6 +371,8 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr, · 41 unmodified lines | ||
| 373 | 371 | /* make sure meshdr->flags is on the linear part */ |
| 374 | 372 | if (!pskb_may_pull(skb, hdrlen + 1)) |
| 375 | 373 | return -1; |
| 374 | + if (meshdr->flags & MESH_FLAGS_AE_A4) | |
| 375 | + return -1; | |
| 376 | 376 | if (meshdr->flags & MESH_FLAGS_AE_A5_A6) { |
| 377 | 377 | skb_copy_bits(skb, hdrlen + |
| 378 | 378 | offsetof(struct ieee80211s_hdr, eaddr1), |
| @@ -397,6 +397,8 @@ int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr, · 18 unmodified lines | ||
| 397 | 397 | /* make sure meshdr->flags is on the linear part */ |
| 398 | 398 | if (!pskb_may_pull(skb, hdrlen + 1)) |
| 399 | 399 | return -1; |
| 400 | + if (meshdr->flags & MESH_FLAGS_AE_A5_A6) | |
| 401 | + return -1; | |
| 400 | 402 | if (meshdr->flags & MESH_FLAGS_AE_A4) |
| 401 | 403 | skb_copy_bits(skb, hdrlen + |
| 402 | 404 | offsetof(struct ieee80211s_hdr, eaddr1), |
| @@ -16,8 +16,9 @@ PHONY += $(modules) · 15 unmodified lines | ||
| 16 | 16 | __modinst: $(modules) |
| 17 | 17 | @: |
| 18 | 18 | |
| 19 | +# Don't stop modules_install if we can't sign external modules. | |
| 19 | 20 | quiet_cmd_modules_install = INSTALL $@ |
| 20 | − cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@) | |
| 21 | + cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD)) | |
| 21 | 22 | |
| 22 | 23 | # Modules built outside the kernel source tree go into extra by default |
| 23 | 24 | INSTALL_MOD_DIR ?= extra |
| @@ -1890,8 +1890,10 @@ sub process { · 1889 unmodified lines | ||
| 1890 | 1890 | } |
| 1891 | 1891 | |
| 1892 | 1892 | if ($realfile =~ m@^(drivers/net/|net/)@ && |
| 1893 | − $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ && | |
| 1894 | − $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) { | |
| 1893 | + $rawline !~ m@^\+[ \t]*\*/[ \t]*$@ && #trailing */ | |
| 1894 | + $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ && #inline /*...*/ | |
| 1895 | + $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ && #trailing **/ | |
| 1896 | + $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) { #non blank */ | |
| 1895 | 1897 | WARN("NETWORKING_BLOCK_COMMENT_STYLE", |
| 1896 | 1898 | "networking block comments put the trailing */ on a separate line\n" . $herecurr); |
| 1897 | 1899 | } |
| @@ -100,12 +100,15 @@ static int snd_compr_open(struct inode *inode, struct file *f) · 99 unmodified lines | ||
| 100 | 100 | |
| 101 | 101 | if (dirn != compr->direction) { |
| 102 | 102 | pr_err("this device doesn't support this direction\n"); |
| 103 | + snd_card_unref(compr->card); | |
| 103 | 104 | return -EINVAL; |
| 104 | 105 | } |
| 105 | 106 | |
| 106 | 107 | data = kzalloc(sizeof(*data), GFP_KERNEL); |
| 107 | − if (!data) | |
| 108 | + if (!data) { | |
| 109 | + snd_card_unref(compr->card); | |
| 108 | 110 | return -ENOMEM; |
| 111 | + } | |
| 109 | 112 | data->stream.ops = compr->ops; |
| 110 | 113 | data->stream.direction = dirn; |
| 111 | 114 | data->stream.private_data = compr->private_data; |
| @@ -113,6 +116,7 @@ static int snd_compr_open(struct inode *inode, struct file *f) · 1 unmodified line | ||
| 113 | 116 | runtime = kzalloc(sizeof(*runtime), GFP_KERNEL); |
| 114 | 117 | if (!runtime) { |
| 115 | 118 | kfree(data); |
| 119 | + snd_card_unref(compr->card); | |
| 116 | 120 | return -ENOMEM; |
| 117 | 121 | } |
| 118 | 122 | runtime->state = SNDRV_PCM_STATE_OPEN; |
| @@ -126,7 +130,8 @@ static int snd_compr_open(struct inode *inode, struct file *f) · 7 unmodified lines | ||
| 126 | 130 | kfree(runtime); |
| 127 | 131 | kfree(data); |
| 128 | 132 | } |
| 129 | − return ret; | |
| 133 | + snd_card_unref(compr->card); | |
| 134 | + return 0; | |
| 130 | 135 | } |
| 131 | 136 | |
| 132 | 137 | static int snd_compr_free(struct inode *inode, struct file *f) |
| @@ -86,6 +86,7 @@ static int snd_ctl_open(struct inode *inode, struct file *file) · 85 unmodified lines | ||
| 86 | 86 | write_lock_irqsave(&card->ctl_files_rwlock, flags); |
| 87 | 87 | list_add_tail(&ctl->list, &card->ctl_files); |
| 88 | 88 | write_unlock_irqrestore(&card->ctl_files_rwlock, flags); |
| 89 | + snd_card_unref(card); | |
| 89 | 90 | return 0; |
| 90 | 91 | |
| 91 | 92 | __error: |
| @@ -93,6 +94,8 @@ static int snd_ctl_open(struct inode *inode, struct file *file) · 1 unmodified line | ||
| 93 | 94 | __error2: |
| 94 | 95 | snd_card_file_remove(card, file); |
| 95 | 96 | __error1: |
| 97 | + if (card) | |
| 98 | + snd_card_unref(card); | |
| 96 | 99 | return err; |
| 97 | 100 | } |
| 98 | 101 | |
| @@ -1434,6 +1437,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer, · 1335 unmodified lines | ||
| 1434 | 1437 | spin_unlock_irq(&ctl->read_lock); |
| 1435 | 1438 | schedule(); |
| 1436 | 1439 | remove_wait_queue(&ctl->change_sleep, &wait); |
| 1440 | + if (ctl->card->shutdown) | |
| 1441 | + return -ENODEV; | |
| 1437 | 1442 | if (signal_pending(current)) |
| 1438 | 1443 | return -ERESTARTSYS; |
| 1439 | 1444 | spin_lock_irq(&ctl->read_lock); |
| @@ -100,8 +100,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file) · 99 unmodified lines | ||
| 100 | 100 | if (hw == NULL) |
| 101 | 101 | return -ENODEV; |
| 102 | 102 | |
| 103 | − if (!try_module_get(hw->card->module)) | |
| 103 | + if (!try_module_get(hw->card->module)) { | |
| 104 | + snd_card_unref(hw->card); | |
| 104 | 105 | return -EFAULT; |
| 106 | + } | |
| 105 | 107 | |
| 106 | 108 | init_waitqueue_entry(&wait, current); |
| 107 | 109 | add_wait_queue(&hw->open_wait, &wait); |
| @@ -129,6 +131,10 @@ static int snd_hwdep_open(struct inode *inode, struct file * file) · 21 unmodified lines | ||
| 129 | 131 | mutex_unlock(&hw->open_mutex); |
| 130 | 132 | schedule(); |
| 131 | 133 | mutex_lock(&hw->open_mutex); |
| 134 | + if (hw->card->shutdown) { | |
| 135 | + err = -ENODEV; | |
| 136 | + break; | |
| 137 | + } | |
| 132 | 138 | if (signal_pending(current)) { |
| 133 | 139 | err = -ERESTARTSYS; |
| 134 | 140 | break; |
| @@ -148,6 +154,7 @@ static int snd_hwdep_open(struct inode *inode, struct file * file) · 13 unmodified lines | ||
| 148 | 154 | mutex_unlock(&hw->open_mutex); |
| 149 | 155 | if (err < 0) |
| 150 | 156 | module_put(hw->card->module); |
| 157 | + snd_card_unref(hw->card); | |
| 151 | 158 | return err; |
| 152 | 159 | } |
| 153 | 160 | |
| @@ -459,12 +466,15 @@ static int snd_hwdep_dev_disconnect(struct snd_device *device) · 305 unmodified lines | ||
| 459 | 466 | mutex_unlock(®ister_mutex); |
| 460 | 467 | return -EINVAL; |
| 461 | 468 | } |
| 469 | + mutex_lock(&hwdep->open_mutex); | |
| 470 | + wake_up(&hwdep->open_wait); | |
| 462 | 471 | #ifdef CONFIG_SND_OSSEMUL |
| 463 | 472 | if (hwdep->ossreg) |
| 464 | 473 | snd_unregister_oss_device(hwdep->oss_type, hwdep->card, hwdep->device); |
| 465 | 474 | #endif |
| 466 | 475 | snd_unregister_device(SNDRV_DEVICE_TYPE_HWDEP, hwdep->card, hwdep->device); |
| 467 | 476 | list_del_init(&hwdep->list); |
| 477 | + mutex_unlock(&hwdep->open_mutex); | |
| 468 | 478 | mutex_unlock(®ister_mutex); |
| 469 | 479 | return 0; |
| 470 | 480 | } |
| @@ -213,6 +213,7 @@ int snd_card_create(int idx, const char *xid, · 212 unmodified lines | ||
| 213 | 213 | spin_lock_init(&card->files_lock); |
| 214 | 214 | INIT_LIST_HEAD(&card->files_list); |
| 215 | 215 | init_waitqueue_head(&card->shutdown_sleep); |
| 216 | + atomic_set(&card->refcount, 0); | |
| 216 | 217 | #ifdef CONFIG_PM |
| 217 | 218 | mutex_init(&card->power_lock); |
| 218 | 219 | init_waitqueue_head(&card->power_sleep); |
| @@ -446,21 +447,36 @@ static int snd_card_do_free(struct snd_card *card) · 227 unmodified lines | ||
| 446 | 447 | return 0; |
| 447 | 448 | } |
| 448 | 449 | |
| 450 | +/** | |
| 451 | + * snd_card_unref - release the reference counter | |
| 452 | + * @card: the card instance | |
| 453 | + * | |
| 454 | + * Decrements the reference counter. When it reaches to zero, wake up | |
| 455 | + * the sleeper and call the destructor if needed. | |
| 456 | + */ | |
| 457 | +void snd_card_unref(struct snd_card *card) | |
| 458 | +{ | |
| 459 | + if (atomic_dec_and_test(&card->refcount)) { | |
| 460 | + wake_up(&card->shutdown_sleep); | |
| 461 | + if (card->free_on_last_close) | |
| 462 | + snd_card_do_free(card); | |
| 463 | + } | |
| 464 | +} | |
| 465 | +EXPORT_SYMBOL(snd_card_unref); | |
| 466 | + | |
| 449 | 467 | int snd_card_free_when_closed(struct snd_card *card) |
| 450 | 468 | { |
| 451 | − int free_now = 0; | |
| 452 | − int ret = snd_card_disconnect(card); | |
| 453 | − if (ret) | |
| 454 | − return ret; | |
| 469 | + int ret; | |
| 455 | 470 | |
| 456 | − spin_lock(&card->files_lock); | |
| 457 | − if (list_empty(&card->files_list)) | |
| 458 | − free_now = 1; | |
| 459 | − else | |
| 460 | − card->free_on_last_close = 1; | |
| 461 | − spin_unlock(&card->files_lock); | |
| 471 | + atomic_inc(&card->refcount); | |
| 472 | + ret = snd_card_disconnect(card); | |
| 473 | + if (ret) { | |
| 474 | + atomic_dec(&card->refcount); | |
| 475 | + return ret; | |
| 476 | + } | |
| 462 | 477 | |
| 463 | − if (free_now) | |
| 478 | + card->free_on_last_close = 1; | |
| 479 | + if (atomic_dec_and_test(&card->refcount)) | |
| 464 | 480 | snd_card_do_free(card); |
| 465 | 481 | return 0; |
| 466 | 482 | } |
| @@ -474,7 +490,7 @@ int snd_card_free(struct snd_card *card) · 7 unmodified lines | ||
| 474 | 490 | return ret; |
| 475 | 491 | |
| 476 | 492 | /* wait, until all devices are ready for the free operation */ |
| 477 | − wait_event(card->shutdown_sleep, list_empty(&card->files_list)); | |
| 493 | + wait_event(card->shutdown_sleep, !atomic_read(&card->refcount)); | |
| 478 | 494 | snd_card_do_free(card); |
| 479 | 495 | return 0; |
| 480 | 496 | } |
| @@ -886,6 +902,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file) · 405 unmodified lines | ||
| 886 | 902 | return -ENODEV; |
| 887 | 903 | } |
| 888 | 904 | list_add(&mfile->list, &card->files_list); |
| 905 | + atomic_inc(&card->refcount); | |
| 889 | 906 | spin_unlock(&card->files_lock); |
| 890 | 907 | return 0; |
| 891 | 908 | } |
| @@ -908,7 +925,6 @@ EXPORT_SYMBOL(snd_card_file_add); · 16 unmodified lines | ||
| 908 | 925 | int snd_card_file_remove(struct snd_card *card, struct file *file) |
| 909 | 926 | { |
| 910 | 927 | struct snd_monitor_file *mfile, *found = NULL; |
| 911 | − int last_close = 0; | |
| 912 | 928 | |
| 913 | 929 | spin_lock(&card->files_lock); |
| 914 | 930 | list_for_each_entry(mfile, &card->files_list, list) { |
| @@ -923,19 +939,13 @@ int snd_card_file_remove(struct snd_card *card, struct file *file) · 8 unmodified lines | ||
| 923 | 939 | break; |
| 924 | 940 | } |
| 925 | 941 | } |
| 926 | − if (list_empty(&card->files_list)) | |
| 927 | − last_close = 1; | |
| 928 | 942 | spin_unlock(&card->files_lock); |
| 929 | − if (last_close) { | |
| 930 | − wake_up(&card->shutdown_sleep); | |
| 931 | − if (card->free_on_last_close) | |
| 932 | − snd_card_do_free(card); | |
| 933 | − } | |
| 934 | 943 | if (!found) { |
| 935 | 944 | snd_printk(KERN_ERR "ALSA card file remove problem (%p)\n", file); |
| 936 | 945 | return -ENOENT; |
| 937 | 946 | } |
| 938 | 947 | kfree(found); |
| 948 | + snd_card_unref(card); | |
| 939 | 949 | return 0; |
| 940 | 950 | } |
| 941 | 951 | |
| @@ -52,14 +52,19 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file) · 51 unmodified lines | ||
| 52 | 52 | SNDRV_OSS_DEVICE_TYPE_MIXER); |
| 53 | 53 | if (card == NULL) |
| 54 | 54 | return -ENODEV; |
| 55 | − if (card->mixer_oss == NULL) | |
| 55 | + if (card->mixer_oss == NULL) { | |
| 56 | + snd_card_unref(card); | |
| 56 | 57 | return -ENODEV; |
| 58 | + } | |
| 57 | 59 | err = snd_card_file_add(card, file); |
| 58 | − if (err < 0) | |
| 60 | + if (err < 0) { | |
| 61 | + snd_card_unref(card); | |
| 59 | 62 | return err; |
| 63 | + } | |
| 60 | 64 | fmixer = kzalloc(sizeof(*fmixer), GFP_KERNEL); |
| 61 | 65 | if (fmixer == NULL) { |
| 62 | 66 | snd_card_file_remove(card, file); |
| 67 | + snd_card_unref(card); | |
| 63 | 68 | return -ENOMEM; |
| 64 | 69 | } |
| 65 | 70 | fmixer->card = card; |
| @@ -68,8 +73,10 @@ static int snd_mixer_oss_open(struct inode *inode, struct file *file) · 2 unmodified lines | ||
| 68 | 73 | if (!try_module_get(card->module)) { |
| 69 | 74 | kfree(fmixer); |
| 70 | 75 | snd_card_file_remove(card, file); |
| 76 | + snd_card_unref(card); | |
| 71 | 77 | return -EFAULT; |
| 72 | 78 | } |
| 79 | + snd_card_unref(card); | |
| 73 | 80 | return 0; |
| 74 | 81 | } |
| 75 | 82 | |
| @@ -2441,6 +2441,10 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) · 2440 unmodified lines | ||
| 2441 | 2441 | mutex_unlock(&pcm->open_mutex); |
| 2442 | 2442 | schedule(); |
| 2443 | 2443 | mutex_lock(&pcm->open_mutex); |
| 2444 | + if (pcm->card->shutdown) { | |
| 2445 | + err = -ENODEV; | |
| 2446 | + break; | |
| 2447 | + } | |
| 2444 | 2448 | if (signal_pending(current)) { |
| 2445 | 2449 | err = -ERESTARTSYS; |
| 2446 | 2450 | break; |
| @@ -2450,6 +2454,7 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) · 3 unmodified lines | ||
| 2450 | 2454 | mutex_unlock(&pcm->open_mutex); |
| 2451 | 2455 | if (err < 0) |
| 2452 | 2456 | goto __error; |
| 2457 | + snd_card_unref(pcm->card); | |
| 2453 | 2458 | return err; |
| 2454 | 2459 | |
| 2455 | 2460 | __error: |
| @@ -2457,6 +2462,8 @@ static int snd_pcm_oss_open(struct inode *inode, struct file *file) · 1 unmodified line | ||
| 2457 | 2462 | __error2: |
| 2458 | 2463 | snd_card_file_remove(pcm->card, file); |
| 2459 | 2464 | __error1: |
| 2465 | + if (pcm) | |
| 2466 | + snd_card_unref(pcm->card); | |
| 2460 | 2467 | return err; |
| 2461 | 2468 | } |
| 2462 | 2469 | |
| @@ -1086,11 +1086,19 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) · 1085 unmodified lines | ||
| 1086 | 1086 | if (list_empty(&pcm->list)) |
| 1087 | 1087 | goto unlock; |
| 1088 | 1088 | |
| 1089 | + mutex_lock(&pcm->open_mutex); | |
| 1090 | + wake_up(&pcm->open_wait); | |
| 1089 | 1091 | list_del_init(&pcm->list); |
| 1090 | 1092 | for (cidx = 0; cidx < 2; cidx++) |
| 1091 | − for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) | |
| 1092 | − if (substream->runtime) | |
| 1093 | + for (substream = pcm->streams[cidx].substream; substream; substream = substream->next) { | |
| 1094 | + snd_pcm_stream_lock_irq(substream); | |
| 1095 | + if (substream->runtime) { | |
| 1093 | 1096 | substream->runtime->status->state = SNDRV_PCM_STATE_DISCONNECTED; |
| 1097 | + wake_up(&substream->runtime->sleep); | |
| 1098 | + wake_up(&substream->runtime->tsleep); | |
| 1099 | + } | |
| 1100 | + snd_pcm_stream_unlock_irq(substream); | |
| 1101 | + } | |
| 1094 | 1102 | list_for_each_entry(notify, &snd_pcm_notify_list, list) { |
| 1095 | 1103 | notify->n_disconnect(pcm); |
| 1096 | 1104 | } |
| @@ -1110,6 +1118,7 @@ static int snd_pcm_dev_disconnect(struct snd_device *device) · 13 unmodified lines | ||
| 1110 | 1118 | pcm->streams[cidx].chmap_kctl = NULL; |
| 1111 | 1119 | } |
| 1112 | 1120 | } |
| 1121 | + mutex_unlock(&pcm->open_mutex); | |
| 1113 | 1122 | unlock: |
| 1114 | 1123 | mutex_unlock(®ister_mutex); |
| 1115 | 1124 | return 0; |
| @@ -369,6 +369,14 @@ static int period_to_usecs(struct snd_pcm_runtime *runtime) · 368 unmodified lines | ||
| 369 | 369 | return usecs; |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | +static void snd_pcm_set_state(struct snd_pcm_substream *substream, int state) | |
| 373 | +{ | |
| 374 | + snd_pcm_stream_lock_irq(substream); | |
| 375 | + if (substream->runtime->status->state != SNDRV_PCM_STATE_DISCONNECTED) | |
| 376 | + substream->runtime->status->state = state; | |
| 377 | + snd_pcm_stream_unlock_irq(substream); | |
| 378 | +} | |
| 379 | + | |
| 372 | 380 | static int snd_pcm_hw_params(struct snd_pcm_substream *substream, |
| 373 | 381 | struct snd_pcm_hw_params *params) |
| 374 | 382 | { |
| @@ -452,7 +460,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, · 77 unmodified lines | ||
| 452 | 460 | runtime->boundary *= 2; |
| 453 | 461 | |
| 454 | 462 | snd_pcm_timer_resolution_change(substream); |
| 455 | − runtime->status->state = SNDRV_PCM_STATE_SETUP; | |
| 463 | + snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP); | |
| 456 | 464 | |
| 457 | 465 | if (pm_qos_request_active(&substream->latency_pm_qos_req)) |
| 458 | 466 | pm_qos_remove_request(&substream->latency_pm_qos_req); |
| @@ -464,7 +472,7 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream, · 5 unmodified lines | ||
| 464 | 472 | /* hardware might be unusable from this time, |
| 465 | 473 | so we force application to retry to set |
| 466 | 474 | the correct hardware parameter settings */ |
| 467 | − runtime->status->state = SNDRV_PCM_STATE_OPEN; | |
| 475 | + snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN); | |
| 468 | 476 | if (substream->ops->hw_free != NULL) |
| 469 | 477 | substream->ops->hw_free(substream); |
| 470 | 478 | return err; |
| @@ -512,7 +520,7 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream) · 41 unmodified lines | ||
| 512 | 520 | return -EBADFD; |
| 513 | 521 | if (substream->ops->hw_free) |
| 514 | 522 | result = substream->ops->hw_free(substream); |
| 515 | − runtime->status->state = SNDRV_PCM_STATE_OPEN; | |
| 523 | + snd_pcm_set_state(substream, SNDRV_PCM_STATE_OPEN); | |
| 516 | 524 | pm_qos_remove_request(&substream->latency_pm_qos_req); |
| 517 | 525 | return result; |
| 518 | 526 | } |
| @@ -1320,7 +1328,7 @@ static void snd_pcm_post_prepare(struct snd_pcm_substream *substream, int state) · 801 unmodified lines | ||
| 1320 | 1328 | { |
| 1321 | 1329 | struct snd_pcm_runtime *runtime = substream->runtime; |
| 1322 | 1330 | runtime->control->appl_ptr = runtime->status->hw_ptr; |
| 1323 | − runtime->status->state = SNDRV_PCM_STATE_PREPARED; | |
| 1331 | + snd_pcm_set_state(substream, SNDRV_PCM_STATE_PREPARED); | |
| 1324 | 1332 | } |
| 1325 | 1333 | |
| 1326 | 1334 | static struct action_ops snd_pcm_action_prepare = { |
| @@ -1510,6 +1518,10 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, · 183 unmodified lines | ||
| 1510 | 1518 | down_read(&snd_pcm_link_rwsem); |
| 1511 | 1519 | snd_pcm_stream_lock_irq(substream); |
| 1512 | 1520 | remove_wait_queue(&to_check->sleep, &wait); |
| 1521 | + if (card->shutdown) { | |
| 1522 | + result = -ENODEV; | |
| 1523 | + break; | |
| 1524 | + } | |
| 1513 | 1525 | if (tout == 0) { |
| 1514 | 1526 | if (substream->runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) |
| 1515 | 1527 | result = -ESTRPIPE; |
| @@ -1634,6 +1646,7 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd) · 118 unmodified lines | ||
| 1634 | 1646 | write_unlock_irq(&snd_pcm_link_rwlock); |
| 1635 | 1647 | up_write(&snd_pcm_link_rwsem); |
| 1636 | 1648 | _nolock: |
| 1649 | + snd_card_unref(substream1->pcm->card); | |
| 1637 | 1650 | fput_light(file, fput_needed); |
| 1638 | 1651 | if (res < 0) |
| 1639 | 1652 | kfree(group); |
| @@ -2108,7 +2121,10 @@ static int snd_pcm_playback_open(struct inode *inode, struct file *file) · 468 unmodified lines | ||
| 2108 | 2121 | return err; |
| 2109 | 2122 | pcm = snd_lookup_minor_data(iminor(inode), |
| 2110 | 2123 | SNDRV_DEVICE_TYPE_PCM_PLAYBACK); |
| 2111 | − return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK); | |
| 2124 | + err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_PLAYBACK); | |
| 2125 | + if (pcm) | |
| 2126 | + snd_card_unref(pcm->card); | |
| 2127 | + return err; | |
| 2112 | 2128 | } |
| 2113 | 2129 | |
| 2114 | 2130 | static int snd_pcm_capture_open(struct inode *inode, struct file *file) |
| @@ -2119,7 +2135,10 @@ static int snd_pcm_capture_open(struct inode *inode, struct file *file) · 4 unmodified lines | ||
| 2119 | 2135 | return err; |
| 2120 | 2136 | pcm = snd_lookup_minor_data(iminor(inode), |
| 2121 | 2137 | SNDRV_DEVICE_TYPE_PCM_CAPTURE); |
| 2122 | − return snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE); | |
| 2138 | + err = snd_pcm_open(file, pcm, SNDRV_PCM_STREAM_CAPTURE); | |
| 2139 | + if (pcm) | |
| 2140 | + snd_card_unref(pcm->card); | |
| 2141 | + return err; | |
| 2123 | 2142 | } |
| 2124 | 2143 | |
| 2125 | 2144 | static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream) |
| @@ -2156,6 +2175,10 @@ static int snd_pcm_open(struct file *file, struct snd_pcm *pcm, int stream) · 30 unmodified lines | ||
| 2156 | 2175 | mutex_unlock(&pcm->open_mutex); |
| 2157 | 2176 | schedule(); |
| 2158 | 2177 | mutex_lock(&pcm->open_mutex); |
| 2178 | + if (pcm->card->shutdown) { | |
| 2179 | + err = -ENODEV; | |
| 2180 | + break; | |
| 2181 | + } | |
| 2159 | 2182 | if (signal_pending(current)) { |
| 2160 | 2183 | err = -ERESTARTSYS; |
| 2161 | 2184 | break; |
| @@ -379,8 +379,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) · 378 unmodified lines | ||
| 379 | 379 | if (rmidi == NULL) |
| 380 | 380 | return -ENODEV; |
| 381 | 381 | |
| 382 | − if (!try_module_get(rmidi->card->module)) | |
| 382 | + if (!try_module_get(rmidi->card->module)) { | |
| 383 | + snd_card_unref(rmidi->card); | |
| 383 | 384 | return -ENXIO; |
| 385 | + } | |
| 384 | 386 | |
| 385 | 387 | mutex_lock(&rmidi->open_mutex); |
| 386 | 388 | card = rmidi->card; |
| @@ -422,6 +424,10 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) · 35 unmodified lines | ||
| 422 | 424 | mutex_unlock(&rmidi->open_mutex); |
| 423 | 425 | schedule(); |
| 424 | 426 | mutex_lock(&rmidi->open_mutex); |
| 427 | + if (rmidi->card->shutdown) { | |
| 428 | + err = -ENODEV; | |
| 429 | + break; | |
| 430 | + } | |
| 425 | 431 | if (signal_pending(current)) { |
| 426 | 432 | err = -ERESTARTSYS; |
| 427 | 433 | break; |
| @@ -440,6 +446,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) · 12 unmodified lines | ||
| 440 | 446 | #endif |
| 441 | 447 | file->private_data = rawmidi_file; |
| 442 | 448 | mutex_unlock(&rmidi->open_mutex); |
| 449 | + snd_card_unref(rmidi->card); | |
| 443 | 450 | return 0; |
| 444 | 451 | |
| 445 | 452 | __error: |
| @@ -447,6 +454,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) · 1 unmodified line | ||
| 447 | 454 | __error_card: |
| 448 | 455 | mutex_unlock(&rmidi->open_mutex); |
| 449 | 456 | module_put(rmidi->card->module); |
| 457 | + snd_card_unref(rmidi->card); | |
| 450 | 458 | return err; |
| 451 | 459 | } |
| 452 | 460 | |
| @@ -991,6 +999,8 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun · 538 unmodified lines | ||
| 991 | 999 | spin_unlock_irq(&runtime->lock); |
| 992 | 1000 | schedule(); |
| 993 | 1001 | remove_wait_queue(&runtime->sleep, &wait); |
| 1002 | + if (rfile->rmidi->card->shutdown) | |
| 1003 | + return -ENODEV; | |
| 994 | 1004 | if (signal_pending(current)) |
| 995 | 1005 | return result > 0 ? result : -ERESTARTSYS; |
| 996 | 1006 | if (!runtime->avail) |
| @@ -1234,6 +1244,8 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf, · 237 unmodified lines | ||
| 1234 | 1244 | spin_unlock_irq(&runtime->lock); |
| 1235 | 1245 | timeout = schedule_timeout(30 * HZ); |
| 1236 | 1246 | remove_wait_queue(&runtime->sleep, &wait); |
| 1247 | + if (rfile->rmidi->card->shutdown) | |
| 1248 | + return -ENODEV; | |
| 1237 | 1249 | if (signal_pending(current)) |
| 1238 | 1250 | return result > 0 ? result : -ERESTARTSYS; |
| 1239 | 1251 | if (!runtime->avail && !timeout) |
| @@ -1609,9 +1621,20 @@ static int snd_rawmidi_dev_register(struct snd_device *device) · 369 unmodified lines | ||
| 1609 | 1621 | static int snd_rawmidi_dev_disconnect(struct snd_device *device) |
| 1610 | 1622 | { |
| 1611 | 1623 | struct snd_rawmidi *rmidi = device->device_data; |
| 1624 | + int dir; | |
| 1612 | 1625 | |
| 1613 | 1626 | mutex_lock(®ister_mutex); |
| 1627 | + mutex_lock(&rmidi->open_mutex); | |
| 1628 | + wake_up(&rmidi->open_wait); | |
| 1614 | 1629 | list_del_init(&rmidi->list); |
| 1630 | + for (dir = 0; dir < 2; dir++) { | |
| 1631 | + struct snd_rawmidi_substream *s; | |
| 1632 | + list_for_each_entry(s, &rmidi->streams[dir].substreams, list) { | |
| 1633 | + if (s->runtime) | |
| 1634 | + wake_up(&s->runtime->sleep); | |
| 1635 | + } | |
| 1636 | + } | |
| 1637 | + | |
| 1615 | 1638 | #ifdef CONFIG_SND_OSSEMUL |
| 1616 | 1639 | if (rmidi->ossreg) { |
| 1617 | 1640 | if ((int)rmidi->device == midi_map[rmidi->card->number]) { |
| @@ -1626,6 +1649,7 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device) · 8 unmodified lines | ||
| 1626 | 1649 | } |
| 1627 | 1650 | #endif /* CONFIG_SND_OSSEMUL */ |
| 1628 | 1651 | snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device); |
| 1652 | + mutex_unlock(&rmidi->open_mutex); | |
| 1629 | 1653 | mutex_unlock(®ister_mutex); |
| 1630 | 1654 | return 0; |
| 1631 | 1655 | } |
| @@ -98,6 +98,10 @@ static void snd_request_other(int minor) · 97 unmodified lines | ||
| 98 | 98 | * |
| 99 | 99 | * Checks that a minor device with the specified type is registered, and returns |
| 100 | 100 | * its user data pointer. |
| 101 | + * | |
| 102 | + * This function increments the reference counter of the card instance | |
| 103 | + * if an associated instance with the given minor number and type is found. | |
| 104 | + * The caller must call snd_card_unref() appropriately later. | |
| 101 | 105 | */ |
| 102 | 106 | void *snd_lookup_minor_data(unsigned int minor, int type) |
| 103 | 107 | { |
| @@ -108,9 +112,11 @@ void *snd_lookup_minor_data(unsigned int minor, int type) · 4 unmodified lines | ||
| 108 | 112 | return NULL; |
| 109 | 113 | mutex_lock(&sound_mutex); |
| 110 | 114 | mreg = snd_minors[minor]; |
| 111 | − if (mreg && mreg->type == type) | |
| 115 | + if (mreg && mreg->type == type) { | |
| 112 | 116 | private_data = mreg->private_data; |
| 113 | − else | |
| 117 | + if (private_data && mreg->card_ptr) | |
| 118 | + atomic_inc(&mreg->card_ptr->refcount); | |
| 119 | + } else | |
| 114 | 120 | private_data = NULL; |
| 115 | 121 | mutex_unlock(&sound_mutex); |
| 116 | 122 | return private_data; |
| @@ -275,6 +281,7 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev, · 158 unmodified lines | ||
| 275 | 281 | preg->device = dev; |
| 276 | 282 | preg->f_ops = f_ops; |
| 277 | 283 | preg->private_data = private_data; |
| 284 | + preg->card_ptr = card; | |
| 278 | 285 | mutex_lock(&sound_mutex); |
| 279 | 286 | #ifdef CONFIG_SND_DYNAMIC_MINORS |
| 280 | 287 | minor = snd_find_free_minor(type); |
| @@ -40,6 +40,9 @@ · 39 unmodified lines | ||
| 40 | 40 | static struct snd_minor *snd_oss_minors[SNDRV_OSS_MINORS]; |
| 41 | 41 | static DEFINE_MUTEX(sound_oss_mutex); |
| 42 | 42 | |
| 43 | +/* NOTE: This function increments the refcount of the associated card like | |
| 44 | + * snd_lookup_minor_data(); the caller must call snd_card_unref() appropriately | |
| 45 | + */ | |
| 43 | 46 | void *snd_lookup_oss_minor_data(unsigned int minor, int type) |
| 44 | 47 | { |
| 45 | 48 | struct snd_minor *mreg; |
| @@ -49,9 +52,11 @@ void *snd_lookup_oss_minor_data(unsigned int minor, int type) · 3 unmodified lines | ||
| 49 | 52 | return NULL; |
| 50 | 53 | mutex_lock(&sound_oss_mutex); |
| 51 | 54 | mreg = snd_oss_minors[minor]; |
| 52 | − if (mreg && mreg->type == type) | |
| 55 | + if (mreg && mreg->type == type) { | |
| 53 | 56 | private_data = mreg->private_data; |
| 54 | − else | |
| 57 | + if (private_data && mreg->card_ptr) | |
| 58 | + atomic_inc(&mreg->card_ptr->refcount); | |
| 59 | + } else | |
| 55 | 60 | private_data = NULL; |
| 56 | 61 | mutex_unlock(&sound_oss_mutex); |
| 57 | 62 | return private_data; |
| @@ -123,6 +128,7 @@ int snd_register_oss_device(int type, struct snd_card *card, int dev, · 65 unmodified lines | ||
| 123 | 128 | preg->device = dev; |
| 124 | 129 | preg->f_ops = f_ops; |
| 125 | 130 | preg->private_data = private_data; |
| 131 | + preg->card_ptr = card; | |
| 126 | 132 | mutex_lock(&sound_oss_mutex); |
| 127 | 133 | snd_oss_minors[minor] = preg; |
| 128 | 134 | minor_unit = SNDRV_MINOR_OSS_DEVICE(minor); |
| @@ -426,7 +426,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = { · 425 unmodified lines | ||
| 426 | 426 | }, |
| 427 | 427 | { |
| 428 | 428 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
| 429 | − .name = "IEC958 Preample Capture Default", | |
| 429 | + .name = "IEC958 Preamble Capture Default", | |
| 430 | 430 | .access = SNDRV_CTL_ELEM_ACCESS_READ | |
| 431 | 431 | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
| 432 | 432 | .info = snd_ak4113_spdif_pinfo, |
| @@ -401,7 +401,7 @@ static struct snd_kcontrol_new snd_ak4114_iec958_controls[] = { · 400 unmodified lines | ||
| 401 | 401 | }, |
| 402 | 402 | { |
| 403 | 403 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
| 404 | − .name = "IEC958 Preample Capture Default", | |
| 404 | + .name = "IEC958 Preamble Capture Default", | |
| 405 | 405 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
| 406 | 406 | .info = snd_ak4114_spdif_pinfo, |
| 407 | 407 | .get = snd_ak4114_spdif_pget, |
| @@ -380,7 +380,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = { · 379 unmodified lines | ||
| 380 | 380 | }, |
| 381 | 381 | { |
| 382 | 382 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
| 383 | − .name = "IEC958 Preample Capture Default", | |
| 383 | + .name = "IEC958 Preamble Capture Default", | |
| 384 | 384 | .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
| 385 | 385 | .info = snd_ak4117_spdif_pinfo, |
| 386 | 386 | .get = snd_ak4117_spdif_pget, |
| @@ -2655,6 +2655,8 @@ static struct ess_device_list pm_whitelist[] __devinitdata = { · 2654 unmodified lines | ||
| 2655 | 2655 | { TYPE_MAESTRO2E, 0x1179 }, |
| 2656 | 2656 | { TYPE_MAESTRO2E, 0x14c0 }, /* HP omnibook 4150 */ |
| 2657 | 2657 | { TYPE_MAESTRO2E, 0x1558 }, |
| 2658 | + { TYPE_MAESTRO2E, 0x125d }, /* a PCI card, e.g. Terratec DMX */ | |
| 2659 | + { TYPE_MAESTRO2, 0x125d }, /* a PCI card, e.g. SF64-PCE2 */ | |
| 2658 | 2660 | }; |
| 2659 | 2661 | |
| 2660 | 2662 | static struct ess_device_list mpu_blacklist[] __devinitdata = { |
| @@ -3563,6 +3563,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { · 3562 unmodified lines | ||
| 3563 | 3563 | /* Teradici */ |
| 3564 | 3564 | { PCI_DEVICE(0x6549, 0x1200), |
| 3565 | 3565 | .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT }, |
| 3566 | + { PCI_DEVICE(0x6549, 0x2200), | |
| 3567 | + .driver_data = AZX_DRIVER_TERA | AZX_DCAPS_NO_64BIT }, | |
| 3566 | 3568 | /* Creative X-Fi (CA0110-IBG) */ |
| 3567 | 3569 | /* CTHDA chips */ |
| 3568 | 3570 | { PCI_DEVICE(0x1102, 0x0010), |
| @@ -545,6 +545,7 @@ static int ad198x_build_pcms(struct hda_codec *codec) · 544 unmodified lines | ||
| 545 | 545 | if (spec->multiout.dig_out_nid) { |
| 546 | 546 | info++; |
| 547 | 547 | codec->num_pcms++; |
| 548 | + codec->spdif_status_reset = 1; | |
| 548 | 549 | info->name = "AD198x Digital"; |
| 549 | 550 | info->pcm_type = HDA_PCM_TYPE_SPDIF; |
| 550 | 551 | info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback; |
| @@ -101,8 +101,8 @@ enum { · 100 unmodified lines | ||
| 101 | 101 | #define CS420X_VENDOR_NID 0x11 |
| 102 | 102 | #define CS_DIG_OUT1_PIN_NID 0x10 |
| 103 | 103 | #define CS_DIG_OUT2_PIN_NID 0x15 |
| 104 | −#define CS_DMIC1_PIN_NID 0x12 | |
| 105 | −#define CS_DMIC2_PIN_NID 0x0e | |
| 104 | +#define CS_DMIC1_PIN_NID 0x0e | |
| 105 | +#define CS_DMIC2_PIN_NID 0x12 | |
| 106 | 106 | |
| 107 | 107 | /* coef indices */ |
| 108 | 108 | #define IDX_SPDIF_STAT 0x0000 |
| @@ -1079,14 +1079,18 @@ static void init_input(struct hda_codec *codec) · 970 unmodified lines | ||
| 1079 | 1079 | cs_automic(codec, NULL); |
| 1080 | 1080 | |
| 1081 | 1081 | coef = 0x000a; /* ADC1/2 - Digital and Analog Soft Ramp */ |
| 1082 | + cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | |
| 1083 | + | |
| 1084 | + coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG); | |
| 1082 | 1085 | if (is_active_pin(codec, CS_DMIC2_PIN_NID)) |
| 1083 | − coef |= 0x0500; /* DMIC2 2 chan on, GPIO1 off */ | |
| 1086 | + coef |= 1 << 4; /* DMIC2 2 chan on, GPIO1 off */ | |
| 1084 | 1087 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) |
| 1085 | − coef |= 0x1800; /* DMIC1 2 chan on, GPIO0 off | |
| 1088 | + coef |= 1 << 3; /* DMIC1 2 chan on, GPIO0 off | |
| 1086 | 1089 | * No effect if SPDIF_OUT2 is |
| 1087 | 1090 | * selected in IDX_SPDIF_CTL. |
| 1088 | 1091 | */ |
| 1089 | − cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | |
| 1092 | + | |
| 1093 | + cs_vendor_coef_set(codec, IDX_BEEP_CFG, coef); | |
| 1090 | 1094 | } else { |
| 1091 | 1095 | if (spec->mic_detect) |
| 1092 | 1096 | cs_automic(codec, NULL); |
| @@ -1107,7 +1111,7 @@ static const struct hda_verb cs_coef_init_verbs[] = { · 14 unmodified lines | ||
| 1107 | 1111 | | 0x0400 /* Disable Coefficient Auto increment */ |
| 1108 | 1112 | )}, |
| 1109 | 1113 | /* Beep */ |
| 1110 | − {0x11, AC_VERB_SET_COEF_INDEX, IDX_DAC_CFG}, | |
| 1114 | + {0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG}, | |
| 1111 | 1115 | {0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */ |
| 1112 | 1116 | |
| 1113 | 1117 | {} /* terminator */ |
| @@ -1728,8 +1732,7 @@ static int cs421x_mux_enum_put(struct snd_kcontrol *kcontrol, · 614 unmodified lines | ||
| 1728 | 1732 | |
| 1729 | 1733 | } |
| 1730 | 1734 | |
| 1731 | −static struct snd_kcontrol_new cs421x_capture_source = { | |
| 1732 | − | |
| 1735 | +static const struct snd_kcontrol_new cs421x_capture_source = { | |
| 1733 | 1736 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 1734 | 1737 | .name = "Capture Source", |
| 1735 | 1738 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
| @@ -1946,7 +1949,7 @@ static int cs421x_suspend(struct hda_codec *codec) · 210 unmodified lines | ||
| 1946 | 1949 | } |
| 1947 | 1950 | #endif |
| 1948 | 1951 | |
| 1949 | −static struct hda_codec_ops cs421x_patch_ops = { | |
| 1952 | +static const struct hda_codec_ops cs421x_patch_ops = { | |
| 1950 | 1953 | .build_controls = cs421x_build_controls, |
| 1951 | 1954 | .build_pcms = cs_build_pcms, |
| 1952 | 1955 | .init = cs421x_init, |
| @@ -5840,7 +5840,7 @@ static int alc269_parse_auto_config(struct hda_codec *codec) · 5839 unmodified lines | ||
| 5840 | 5840 | return alc_parse_auto_config(codec, alc269_ignore, ssids); |
| 5841 | 5841 | } |
| 5842 | 5842 | |
| 5843 | −static void alc269_toggle_power_output(struct hda_codec *codec, int power_up) | |
| 5843 | +static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up) | |
| 5844 | 5844 | { |
| 5845 | 5845 | int val = alc_read_coef_idx(codec, 0x04); |
| 5846 | 5846 | if (power_up) |
| @@ -5857,10 +5857,10 @@ static void alc269_shutup(struct hda_codec *codec) · 10 unmodified lines | ||
| 5857 | 5857 | if (spec->codec_variant != ALC269_TYPE_ALC269VB) |
| 5858 | 5858 | return; |
| 5859 | 5859 | |
| 5860 | − if ((alc_get_coef0(codec) & 0x00ff) == 0x017) | |
| 5861 | − alc269_toggle_power_output(codec, 0); | |
| 5862 | − if ((alc_get_coef0(codec) & 0x00ff) == 0x018) { | |
| 5863 | − alc269_toggle_power_output(codec, 0); | |
| 5860 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB) | |
| 5861 | + alc269vb_toggle_power_output(codec, 0); | |
| 5862 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB && | |
| 5863 | + (alc_get_coef0(codec) & 0x00ff) == 0x018) { | |
| 5864 | 5864 | msleep(150); |
| 5865 | 5865 | } |
| 5866 | 5866 | } |
| @@ -5870,24 +5870,22 @@ static int alc269_resume(struct hda_codec *codec) · 3 unmodified lines | ||
| 5870 | 5870 | { |
| 5871 | 5871 | struct alc_spec *spec = codec->spec; |
| 5872 | 5872 | |
| 5873 | − if (spec->codec_variant == ALC269_TYPE_ALC269VB || | |
| 5873 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB) | |
| 5874 | + alc269vb_toggle_power_output(codec, 0); | |
| 5875 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB && | |
| 5874 | 5876 | (alc_get_coef0(codec) & 0x00ff) == 0x018) { |
| 5875 | − alc269_toggle_power_output(codec, 0); | |
| 5876 | 5877 | msleep(150); |
| 5877 | 5878 | } |
| 5878 | 5879 | |
| 5879 | 5880 | codec->patch_ops.init(codec); |
| 5880 | 5881 | |
| 5881 | − if (spec->codec_variant == ALC269_TYPE_ALC269VB || | |
| 5882 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB) | |
| 5883 | + alc269vb_toggle_power_output(codec, 1); | |
| 5884 | + if (spec->codec_variant == ALC269_TYPE_ALC269VB && | |
| 5882 | 5885 | (alc_get_coef0(codec) & 0x00ff) == 0x017) { |
| 5883 | − alc269_toggle_power_output(codec, 1); | |
| 5884 | 5886 | msleep(200); |
| 5885 | 5887 | } |
| 5886 | 5888 | |
| 5887 | − if (spec->codec_variant == ALC269_TYPE_ALC269VB || | |
| 5888 | − (alc_get_coef0(codec) & 0x00ff) == 0x018) | |
| 5889 | − alc269_toggle_power_output(codec, 1); | |
| 5890 | − | |
| 5891 | 5889 | snd_hda_codec_resume_amp(codec); |
| 5892 | 5890 | snd_hda_codec_resume_cache(codec); |
| 5893 | 5891 | hda_call_check_power_status(codec, 0x01); |
| @@ -7079,6 +7077,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { · 1185 unmodified lines | ||
| 7079 | 7077 | .patch = patch_alc662 }, |
| 7080 | 7078 | { .id = 0x10ec0663, .name = "ALC663", .patch = patch_alc662 }, |
| 7081 | 7079 | { .id = 0x10ec0665, .name = "ALC665", .patch = patch_alc662 }, |
| 7080 | + { .id = 0x10ec0668, .name = "ALC668", .patch = patch_alc662 }, | |
| 7082 | 7081 | { .id = 0x10ec0670, .name = "ALC670", .patch = patch_alc662 }, |
| 7083 | 7082 | { .id = 0x10ec0680, .name = "ALC680", .patch = patch_alc680 }, |
| 7084 | 7083 | { .id = 0x10ec0880, .name = "ALC880", .patch = patch_alc880 }, |
| @@ -7096,6 +7095,7 @@ static const struct hda_codec_preset snd_hda_preset_realtek[] = { · 11 unmodified lines | ||
| 7096 | 7095 | { .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc882 }, |
| 7097 | 7096 | { .id = 0x10ec0892, .name = "ALC892", .patch = patch_alc662 }, |
| 7098 | 7097 | { .id = 0x10ec0899, .name = "ALC898", .patch = patch_alc882 }, |
| 7098 | + { .id = 0x10ec0900, .name = "ALC1150", .patch = patch_alc882 }, | |
| 7099 | 7099 | {} /* terminator */ |
| 7100 | 7100 | }; |
| 7101 | 7101 | |
| @@ -1763,6 +1763,8 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { · 1762 unmodified lines | ||
| 1763 | 1763 | "HP", STAC_HP_ZEPHYR), |
| 1764 | 1764 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3660, |
| 1765 | 1765 | "HP Mini", STAC_92HD83XXX_HP_LED), |
| 1766 | + SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x144E, | |
| 1767 | + "HP Pavilion dv5", STAC_92HD83XXX_HP_INV_LED), | |
| 1766 | 1768 | {} /* terminator */ |
| 1767 | 1769 | }; |
| 1768 | 1770 | |
| @@ -1809,11 +1809,11 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec) · 1808 unmodified lines | ||
| 1809 | 1809 | { |
| 1810 | 1810 | struct via_spec *spec = codec->spec; |
| 1811 | 1811 | const struct auto_pin_cfg *cfg = &spec->autocfg; |
| 1812 | − int i, dac_num; | |
| 1812 | + int i; | |
| 1813 | 1813 | hda_nid_t nid; |
| 1814 | 1814 | |
| 1815 | + spec->multiout.num_dacs = 0; | |
| 1815 | 1816 | spec->multiout.dac_nids = spec->private_dac_nids; |
| 1816 | − dac_num = 0; | |
| 1817 | 1817 | for (i = 0; i < cfg->line_outs; i++) { |
| 1818 | 1818 | hda_nid_t dac = 0; |
| 1819 | 1819 | nid = cfg->line_out_pins[i]; |
| @@ -1824,16 +1824,13 @@ static int via_auto_fill_dac_nids(struct hda_codec *codec) · 4 unmodified lines | ||
| 1824 | 1824 | if (!i && parse_output_path(codec, nid, dac, 1, |
| 1825 | 1825 | &spec->out_mix_path)) |
| 1826 | 1826 | dac = spec->out_mix_path.path[0]; |
| 1827 | − if (dac) { | |
| 1828 | − spec->private_dac_nids[i] = dac; | |
| 1829 | − dac_num++; | |
| 1830 | − } | |
| 1827 | + if (dac) | |
| 1828 | + spec->private_dac_nids[spec->multiout.num_dacs++] = dac; | |
| 1831 | 1829 | } |
| 1832 | 1830 | if (!spec->out_path[0].depth && spec->out_mix_path.depth) { |
| 1833 | 1831 | spec->out_path[0] = spec->out_mix_path; |
| 1834 | 1832 | spec->out_mix_path.depth = 0; |
| 1835 | 1833 | } |
| 1836 | − spec->multiout.num_dacs = dac_num; | |
| 1837 | 1834 | return 0; |
| 1838 | 1835 | } |
| 1839 | 1836 | |
| @@ -3628,6 +3625,7 @@ static void set_widgets_power_state_vt2002P(struct hda_codec *codec) · 1788 unmodified lines | ||
| 3628 | 3625 | */ |
| 3629 | 3626 | enum { |
| 3630 | 3627 | VIA_FIXUP_INTMIC_BOOST, |
| 3628 | + VIA_FIXUP_ASUS_G75, | |
| 3631 | 3629 | }; |
| 3632 | 3630 | |
| 3633 | 3631 | static void via_fixup_intmic_boost(struct hda_codec *codec, |
| @@ -3642,13 +3640,35 @@ static const struct hda_fixup via_fixups[] = { · 8 unmodified lines | ||
| 3642 | 3640 | .type = HDA_FIXUP_FUNC, |
| 3643 | 3641 | .v.func = via_fixup_intmic_boost, |
| 3644 | 3642 | }, |
| 3643 | + [VIA_FIXUP_ASUS_G75] = { | |
| 3644 | + .type = HDA_FIXUP_PINS, | |
| 3645 | + .v.pins = (const struct hda_pintbl[]) { | |
| 3646 | + /* set 0x24 and 0x33 as speakers */ | |
| 3647 | + { 0x24, 0x991301f0 }, | |
| 3648 | + { 0x33, 0x991301f1 }, /* subwoofer */ | |
| 3649 | + { } | |
| 3650 | + } | |
| 3651 | + }, | |
| 3645 | 3652 | }; |
| 3646 | 3653 | |
| 3647 | 3654 | static const struct snd_pci_quirk vt2002p_fixups[] = { |
| 3655 | + SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75), | |
| 3648 | 3656 | SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST), |
| 3649 | 3657 | {} |
| 3650 | 3658 | }; |
| 3651 | 3659 | |
| 3660 | +/* NIDs 0x24 and 0x33 on VT1802 have connections to non-existing NID 0x3e | |
| 3661 | + * Replace this with mixer NID 0x1c | |
| 3662 | + */ | |
| 3663 | +static void fix_vt1802_connections(struct hda_codec *codec) | |
| 3664 | +{ | |
| 3665 | + static hda_nid_t conn_24[] = { 0x14, 0x1c }; | |
| 3666 | + static hda_nid_t conn_33[] = { 0x1c }; | |
| 3667 | + | |
| 3668 | + snd_hda_override_conn_list(codec, 0x24, ARRAY_SIZE(conn_24), conn_24); | |
| 3669 | + snd_hda_override_conn_list(codec, 0x33, ARRAY_SIZE(conn_33), conn_33); | |
| 3670 | +} | |
| 3671 | + | |
| 3652 | 3672 | /* patch for vt2002P */ |
| 3653 | 3673 | static int patch_vt2002P(struct hda_codec *codec) |
| 3654 | 3674 | { |
| @@ -3663,6 +3683,8 @@ static int patch_vt2002P(struct hda_codec *codec) · 8 unmodified lines | ||
| 3663 | 3683 | spec->aa_mix_nid = 0x21; |
| 3664 | 3684 | override_mic_boost(codec, 0x2b, 0, 3, 40); |
| 3665 | 3685 | override_mic_boost(codec, 0x29, 0, 3, 40); |
| 3686 | + if (spec->codec_type == VT1802) | |
| 3687 | + fix_vt1802_connections(codec); | |
| 3666 | 3688 | add_secret_dac_path(codec); |
| 3667 | 3689 | |
| 3668 | 3690 | snd_hda_pick_fixup(codec, NULL, vt2002p_fixups, via_fixups); |
| @@ -2859,7 +2859,12 @@ static int snd_vt1724_resume(struct device *dev) · 2858 unmodified lines | ||
| 2859 | 2859 | ice->set_spdif_clock(ice, 0); |
| 2860 | 2860 | } else { |
| 2861 | 2861 | /* internal on-card clock */ |
| 2862 | − snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1); | |
| 2862 | + int rate; | |
| 2863 | + if (ice->cur_rate) | |
| 2864 | + rate = ice->cur_rate; | |
| 2865 | + else | |
| 2866 | + rate = ice->pro_rate_default; | |
| 2867 | + snd_vt1724_set_pro_rate(ice, rate, 1); | |
| 2863 | 2868 | } |
| 2864 | 2869 | |
| 2865 | 2870 | update_spdif_bits(ice, ice->pm_saved_spdif_ctrl); |
| @@ -3979,7 +3979,8 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol, · 3978 unmodified lines | ||
| 3979 | 3979 | case 8: /* SYNC IN */ |
| 3980 | 3980 | val = hdspm_sync_in_sync_check(hdspm); break; |
| 3981 | 3981 | default: |
| 3982 | − val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1); | |
| 3982 | + val = hdspm_s1_sync_check(hdspm, | |
| 3983 | + kcontrol->private_value-1); | |
| 3983 | 3984 | } |
| 3984 | 3985 | break; |
| 3985 | 3986 | |
| @@ -4899,7 +4900,7 @@ snd_hdspm_proc_read_madi(struct snd_info_entry * entry, · 913 unmodified lines | ||
| 4899 | 4900 | insel = "Coaxial"; |
| 4900 | 4901 | break; |
| 4901 | 4902 | default: |
| 4902 | − insel = "Unkown"; | |
| 4903 | + insel = "Unknown"; | |
| 4903 | 4904 | } |
| 4904 | 4905 | |
| 4905 | 4906 | snd_iprintf(buffer, |
| @@ -763,7 +763,7 @@ static int cs42l52_set_sysclk(struct snd_soc_dai *codec_dai, · 762 unmodified lines | ||
| 763 | 763 | if ((freq >= CS42L52_MIN_CLK) && (freq <= CS42L52_MAX_CLK)) { |
| 764 | 764 | cs42l52->sysclk = freq; |
| 765 | 765 | } else { |
| 766 | − dev_err(codec->dev, "Invalid freq paramter\n"); | |
| 766 | + dev_err(codec->dev, "Invalid freq parameter\n"); | |
| 767 | 767 | return -EINVAL; |
| 768 | 768 | } |
| 769 | 769 | return 0; |
| @@ -3722,7 +3722,7 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) · 3721 unmodified lines | ||
| 3722 | 3722 | } while (count--); |
| 3723 | 3723 | |
| 3724 | 3724 | if (count == 0) |
| 3725 | − dev_warn(codec->dev, "No impedence range reported for jack\n"); | |
| 3725 | + dev_warn(codec->dev, "No impedance range reported for jack\n"); | |
| 3726 | 3726 | |
| 3727 | 3727 | #ifndef CONFIG_SND_SOC_WM8994_MODULE |
| 3728 | 3728 | trace_snd_soc_jack_irq(dev_name(codec->dev)); |
| @@ -464,9 +464,9 @@ static __devinit int asoc_dmic_probe(struct platform_device *pdev) · 463 unmodified lines | ||
| 464 | 464 | |
| 465 | 465 | mutex_init(&dmic->mutex); |
| 466 | 466 | |
| 467 | − dmic->fclk = clk_get(dmic->dev, "dmic_fck"); | |
| 467 | + dmic->fclk = clk_get(dmic->dev, "fck"); | |
| 468 | 468 | if (IS_ERR(dmic->fclk)) { |
| 469 | − dev_err(dmic->dev, "cant get dmic_fck\n"); | |
| 469 | + dev_err(dmic->dev, "cant get fck\n"); | |
| 470 | 470 | return -ENODEV; |
| 471 | 471 | } |
| 472 | 472 | |
| @@ -21,15 +21,14 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <linux/clk.h> |
| 23 | 23 | #include <linux/platform_device.h> |
| 24 | +#include <linux/gpio.h> | |
| 24 | 25 | #include <sound/core.h> |
| 25 | 26 | #include <sound/pcm.h> |
| 26 | 27 | #include <sound/soc.h> |
| 27 | 28 | |
| 28 | 29 | #include <asm/mach-types.h> |
| 29 | −#include <mach/hardware.h> | |
| 30 | −#include <mach/gpio.h> | |
| 31 | −#include <mach/board-zoom.h> | |
| 32 | 30 | #include <linux/platform_data/asoc-ti-mcbsp.h> |
| 31 | +#include <linux/platform_data/gpio-omap.h> | |
| 33 | 32 | |
| 34 | 33 | /* Register descriptions for twl4030 codec part */ |
| 35 | 34 | #include <linux/mfd/twl4030-audio.h> |
| @@ -339,7 +339,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, · 338 unmodified lines | ||
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | mutex_init(&chip->mutex); |
| 342 | − mutex_init(&chip->shutdown_mutex); | |
| 342 | + init_rwsem(&chip->shutdown_rwsem); | |
| 343 | 343 | chip->index = idx; |
| 344 | 344 | chip->dev = dev; |
| 345 | 345 | chip->card = card; |
| @@ -560,7 +560,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, · 214 unmodified lines | ||
| 560 | 560 | |
| 561 | 561 | card = chip->card; |
| 562 | 562 | mutex_lock(®ister_mutex); |
| 563 | − mutex_lock(&chip->shutdown_mutex); | |
| 563 | + down_write(&chip->shutdown_rwsem); | |
| 564 | 564 | chip->shutdown = 1; |
| 565 | 565 | chip->num_interfaces--; |
| 566 | 566 | if (chip->num_interfaces <= 0) { |
| @@ -582,11 +582,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, · 15 unmodified lines | ||
| 582 | 582 | snd_usb_mixer_disconnect(p); |
| 583 | 583 | } |
| 584 | 584 | usb_chip[chip->index] = NULL; |
| 585 | − mutex_unlock(&chip->shutdown_mutex); | |
| 585 | + up_write(&chip->shutdown_rwsem); | |
| 586 | 586 | mutex_unlock(®ister_mutex); |
| 587 | 587 | snd_card_free_when_closed(card); |
| 588 | 588 | } else { |
| 589 | − mutex_unlock(&chip->shutdown_mutex); | |
| 589 | + up_write(&chip->shutdown_rwsem); | |
| 590 | 590 | mutex_unlock(®ister_mutex); |
| 591 | 591 | } |
| 592 | 592 | } |
| @@ -618,16 +618,20 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) · 25 unmodified lines | ||
| 618 | 618 | { |
| 619 | 619 | int err = -ENODEV; |
| 620 | 620 | |
| 621 | + down_read(&chip->shutdown_rwsem); | |
| 621 | 622 | if (!chip->shutdown && !chip->probing) |
| 622 | 623 | err = usb_autopm_get_interface(chip->pm_intf); |
| 624 | + up_read(&chip->shutdown_rwsem); | |
| 623 | 625 | |
| 624 | 626 | return err; |
| 625 | 627 | } |
| 626 | 628 | |
| 627 | 629 | void snd_usb_autosuspend(struct snd_usb_audio *chip) |
| 628 | 630 | { |
| 631 | + down_read(&chip->shutdown_rwsem); | |
| 629 | 632 | if (!chip->shutdown && !chip->probing) |
| 630 | 633 | usb_autopm_put_interface(chip->pm_intf); |
| 634 | + up_read(&chip->shutdown_rwsem); | |
| 631 | 635 | } |
| 632 | 636 | |
| 633 | 637 | static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) |
| @@ -126,6 +126,7 @@ struct snd_usb_substream { · 125 unmodified lines | ||
| 126 | 126 | struct snd_usb_endpoint *sync_endpoint; |
| 127 | 127 | unsigned long flags; |
| 128 | 128 | bool need_setup_ep; /* (re)configure EP at prepare? */ |
| 129 | + unsigned int speed; /* USB_SPEED_XXX */ | |
| 129 | 130 | |
| 130 | 131 | u64 formats; /* format bitmasks (all or'ed) */ |
| 131 | 132 | unsigned int num_formats; /* number of supported audio formats (list) */ |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | |
| 36 | 36 | #define EP_FLAG_ACTIVATED 0 |
| 37 | 37 | #define EP_FLAG_RUNNING 1 |
| 38 | +#define EP_FLAG_STOPPING 2 | |
| 38 | 39 | |
| 39 | 40 | /* |
| 40 | 41 | * snd_usb_endpoint is a model that abstracts everything related to an |
| @@ -502,10 +503,20 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) · 461 unmodified lines | ||
| 502 | 503 | if (alive) |
| 503 | 504 | snd_printk(KERN_ERR "timeout: still %d active urbs on EP #%x\n", |
| 504 | 505 | alive, ep->ep_num); |
| 506 | + clear_bit(EP_FLAG_STOPPING, &ep->flags); | |
| 505 | 507 | |
| 506 | 508 | return 0; |
| 507 | 509 | } |
| 508 | 510 | |
| 511 | +/* sync the pending stop operation; | |
| 512 | + * this function itself doesn't trigger the stop operation | |
| 513 | + */ | |
| 514 | +void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep) | |
| 515 | +{ | |
| 516 | + if (ep && test_bit(EP_FLAG_STOPPING, &ep->flags)) | |
| 517 | + wait_clear_urbs(ep); | |
| 518 | +} | |
| 519 | + | |
| 509 | 520 | /* |
| 510 | 521 | * unlink active urbs. |
| 511 | 522 | */ |
| @@ -918,6 +929,8 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, · 406 unmodified lines | ||
| 918 | 929 | |
| 919 | 930 | if (wait) |
| 920 | 931 | wait_clear_urbs(ep); |
| 932 | + else | |
| 933 | + set_bit(EP_FLAG_STOPPING, &ep->flags); | |
| 921 | 934 | } |
| 922 | 935 | } |
| 923 | 936 | |
| @@ -19,6 +19,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, · 18 unmodified lines | ||
| 19 | 19 | int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, int can_sleep); |
| 20 | 20 | void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep, |
| 21 | 21 | int force, int can_sleep, int wait); |
| 22 | +void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep); | |
| 22 | 23 | int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep); |
| 23 | 24 | int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep); |
| 24 | 25 | void snd_usb_endpoint_free(struct list_head *head); |
| @@ -287,25 +287,32 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v · 286 unmodified lines | ||
| 287 | 287 | unsigned char buf[2]; |
| 288 | 288 | int val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1; |
| 289 | 289 | int timeout = 10; |
| 290 | − int err; | |
| 290 | + int idx = 0, err; | |
| 291 | 291 | |
| 292 | 292 | err = snd_usb_autoresume(cval->mixer->chip); |
| 293 | 293 | if (err < 0) |
| 294 | 294 | return -EIO; |
| 295 | + down_read(&chip->shutdown_rwsem); | |
| 295 | 296 | while (timeout-- > 0) { |
| 297 | + if (chip->shutdown) | |
| 298 | + break; | |
| 299 | + idx = snd_usb_ctrl_intf(chip) | (cval->id << 8); | |
| 296 | 300 | if (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request, |
| 297 | 301 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, |
| 298 | − validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), | |
| 299 | − buf, val_len) >= val_len) { | |
| 302 | + validx, idx, buf, val_len) >= val_len) { | |
| 300 | 303 | *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len)); |
| 301 | − snd_usb_autosuspend(cval->mixer->chip); | |
| 302 | − return 0; | |
| 304 | + err = 0; | |
| 305 | + goto out; | |
| 303 | 306 | } |
| 304 | 307 | } |
| 305 | − snd_usb_autosuspend(cval->mixer->chip); | |
| 306 | 308 | snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", |
| 307 | − request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type); | |
| 308 | − return -EINVAL; | |
| 309 | + request, validx, idx, cval->val_type); | |
| 310 | + err = -EINVAL; | |
| 311 | + | |
| 312 | + out: | |
| 313 | + up_read(&chip->shutdown_rwsem); | |
| 314 | + snd_usb_autosuspend(cval->mixer->chip); | |
| 315 | + return err; | |
| 309 | 316 | } |
| 310 | 317 | |
| 311 | 318 | static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret) |
| @@ -313,7 +320,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v · 1 unmodified line | ||
| 313 | 320 | struct snd_usb_audio *chip = cval->mixer->chip; |
| 314 | 321 | unsigned char buf[2 + 3*sizeof(__u16)]; /* enough space for one range */ |
| 315 | 322 | unsigned char *val; |
| 316 | − int ret, size; | |
| 323 | + int idx = 0, ret, size; | |
| 317 | 324 | __u8 bRequest; |
| 318 | 325 | |
| 319 | 326 | if (request == UAC_GET_CUR) { |
| @@ -330,16 +337,22 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v · 10 unmodified lines | ||
| 330 | 337 | if (ret) |
| 331 | 338 | goto error; |
| 332 | 339 | |
| 333 | − ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest, | |
| 340 | + down_read(&chip->shutdown_rwsem); | |
| 341 | + if (chip->shutdown) | |
| 342 | + ret = -ENODEV; | |
| 343 | + else { | |
| 344 | + idx = snd_usb_ctrl_intf(chip) | (cval->id << 8); | |
| 345 | + ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest, | |
| 334 | 346 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, |
| 335 | − validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), | |
| 336 | − buf, size); | |
| 347 | + validx, idx, buf, size); | |
| 348 | + } | |
| 349 | + up_read(&chip->shutdown_rwsem); | |
| 337 | 350 | snd_usb_autosuspend(chip); |
| 338 | 351 | |
| 339 | 352 | if (ret < 0) { |
| 340 | 353 | error: |
| 341 | 354 | snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", |
| 342 | − request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type); | |
| 355 | + request, validx, idx, cval->val_type); | |
| 343 | 356 | return ret; |
| 344 | 357 | } |
| 345 | 358 | |
| @@ -417,7 +430,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, · 71 unmodified lines | ||
| 417 | 430 | { |
| 418 | 431 | struct snd_usb_audio *chip = cval->mixer->chip; |
| 419 | 432 | unsigned char buf[2]; |
| 420 | − int val_len, err, timeout = 10; | |
| 433 | + int idx = 0, val_len, err, timeout = 10; | |
| 421 | 434 | |
| 422 | 435 | if (cval->mixer->protocol == UAC_VERSION_1) { |
| 423 | 436 | val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1; |
| @@ -440,19 +453,27 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, · 16 unmodified lines | ||
| 440 | 453 | err = snd_usb_autoresume(chip); |
| 441 | 454 | if (err < 0) |
| 442 | 455 | return -EIO; |
| 443 | − while (timeout-- > 0) | |
| 456 | + down_read(&chip->shutdown_rwsem); | |
| 457 | + while (timeout-- > 0) { | |
| 458 | + if (chip->shutdown) | |
| 459 | + break; | |
| 460 | + idx = snd_usb_ctrl_intf(chip) | (cval->id << 8); | |
| 444 | 461 | if (snd_usb_ctl_msg(chip->dev, |
| 445 | 462 | usb_sndctrlpipe(chip->dev, 0), request, |
| 446 | 463 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, |
| 447 | − validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), | |
| 448 | − buf, val_len) >= 0) { | |
| 449 | − snd_usb_autosuspend(chip); | |
| 450 | − return 0; | |
| 464 | + validx, idx, buf, val_len) >= 0) { | |
| 465 | + err = 0; | |
| 466 | + goto out; | |
| 451 | 467 | } |
| 452 | − snd_usb_autosuspend(chip); | |
| 468 | + } | |
| 453 | 469 | snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n", |
| 454 | − request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type, buf[0], buf[1]); | |
| 455 | − return -EINVAL; | |
| 470 | + request, validx, idx, cval->val_type, buf[0], buf[1]); | |
| 471 | + err = -EINVAL; | |
| 472 | + | |
| 473 | + out: | |
| 474 | + up_read(&chip->shutdown_rwsem); | |
| 475 | + snd_usb_autosuspend(chip); | |
| 476 | + return err; | |
| 456 | 477 | } |
| 457 | 478 | |
| 458 | 479 | static int set_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int value) |
| @@ -283,6 +283,11 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e · 282 unmodified lines | ||
| 283 | 283 | if (value > 1) |
| 284 | 284 | return -EINVAL; |
| 285 | 285 | changed = value != mixer->audigy2nx_leds[index]; |
| 286 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 287 | + if (mixer->chip->shutdown) { | |
| 288 | + err = -ENODEV; | |
| 289 | + goto out; | |
| 290 | + } | |
| 286 | 291 | if (mixer->chip->usb_id == USB_ID(0x041e, 0x3042)) |
| 287 | 292 | err = snd_usb_ctl_msg(mixer->chip->dev, |
| 288 | 293 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, |
| @@ -299,6 +304,8 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e · 10 unmodified lines | ||
| 299 | 304 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, |
| 300 | 305 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
| 301 | 306 | value, index + 2, NULL, 0); |
| 307 | + out: | |
| 308 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 302 | 309 | if (err < 0) |
| 303 | 310 | return err; |
| 304 | 311 | mixer->audigy2nx_leds[index] = value; |
| @@ -392,11 +399,16 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry, · 87 unmodified lines | ||
| 392 | 399 | |
| 393 | 400 | for (i = 0; jacks[i].name; ++i) { |
| 394 | 401 | snd_iprintf(buffer, "%s: ", jacks[i].name); |
| 395 | − err = snd_usb_ctl_msg(mixer->chip->dev, | |
| 402 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 403 | + if (mixer->chip->shutdown) | |
| 404 | + err = 0; | |
| 405 | + else | |
| 406 | + err = snd_usb_ctl_msg(mixer->chip->dev, | |
| 396 | 407 | usb_rcvctrlpipe(mixer->chip->dev, 0), |
| 397 | 408 | UAC_GET_MEM, USB_DIR_IN | USB_TYPE_CLASS | |
| 398 | 409 | USB_RECIP_INTERFACE, 0, |
| 399 | 410 | jacks[i].unitid << 8, buf, 3); |
| 411 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 400 | 412 | if (err == 3 && (buf[0] == 3 || buf[0] == 6)) |
| 401 | 413 | snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]); |
| 402 | 414 | else |
| @@ -426,10 +438,15 @@ static int snd_xonar_u1_switch_put(struct snd_kcontrol *kcontrol, · 23 unmodified lines | ||
| 426 | 438 | else |
| 427 | 439 | new_status = old_status & ~0x02; |
| 428 | 440 | changed = new_status != old_status; |
| 429 | − err = snd_usb_ctl_msg(mixer->chip->dev, | |
| 441 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 442 | + if (mixer->chip->shutdown) | |
| 443 | + err = -ENODEV; | |
| 444 | + else | |
| 445 | + err = snd_usb_ctl_msg(mixer->chip->dev, | |
| 430 | 446 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x08, |
| 431 | 447 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
| 432 | 448 | 50, 0, &new_status, 1); |
| 449 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 433 | 450 | if (err < 0) |
| 434 | 451 | return err; |
| 435 | 452 | mixer->xonar_u1_status = new_status; |
| @@ -468,11 +485,17 @@ static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol, · 32 unmodified lines | ||
| 468 | 485 | u8 bRequest = (kcontrol->private_value >> 16) & 0xff; |
| 469 | 486 | u16 wIndex = kcontrol->private_value & 0xffff; |
| 470 | 487 | u8 tmp; |
| 488 | + int ret; | |
| 471 | 489 | |
| 472 | − int ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest, | |
| 490 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 491 | + if (mixer->chip->shutdown) | |
| 492 | + ret = -ENODEV; | |
| 493 | + else | |
| 494 | + ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest, | |
| 473 | 495 | USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN, |
| 474 | 496 | 0, cpu_to_le16(wIndex), |
| 475 | 497 | &tmp, sizeof(tmp), 1000); |
| 498 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 476 | 499 | |
| 477 | 500 | if (ret < 0) { |
| 478 | 501 | snd_printk(KERN_ERR |
| @@ -493,11 +516,17 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol, · 14 unmodified lines | ||
| 493 | 516 | u8 bRequest = (kcontrol->private_value >> 16) & 0xff; |
| 494 | 517 | u16 wIndex = kcontrol->private_value & 0xffff; |
| 495 | 518 | u16 wValue = ucontrol->value.integer.value[0]; |
| 519 | + int ret; | |
| 496 | 520 | |
| 497 | − int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest, | |
| 521 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 522 | + if (mixer->chip->shutdown) | |
| 523 | + ret = -ENODEV; | |
| 524 | + else | |
| 525 | + ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest, | |
| 498 | 526 | USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT, |
| 499 | 527 | cpu_to_le16(wValue), cpu_to_le16(wIndex), |
| 500 | 528 | NULL, 0, 1000); |
| 529 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 501 | 530 | |
| 502 | 531 | if (ret < 0) { |
| 503 | 532 | snd_printk(KERN_ERR |
| @@ -656,11 +685,16 @@ static int snd_ftu_eff_switch_get(struct snd_kcontrol *kctl, · 152 unmodified lines | ||
| 656 | 685 | return -EINVAL; |
| 657 | 686 | |
| 658 | 687 | |
| 659 | − err = snd_usb_ctl_msg(chip->dev, | |
| 688 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 689 | + if (mixer->chip->shutdown) | |
| 690 | + err = -ENODEV; | |
| 691 | + else | |
| 692 | + err = snd_usb_ctl_msg(chip->dev, | |
| 660 | 693 | usb_rcvctrlpipe(chip->dev, 0), UAC_GET_CUR, |
| 661 | 694 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, |
| 662 | 695 | validx << 8, snd_usb_ctrl_intf(chip) | (id << 8), |
| 663 | 696 | value, val_len); |
| 697 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 664 | 698 | if (err < 0) |
| 665 | 699 | return err; |
| 666 | 700 | |
| @@ -703,11 +737,16 @@ static int snd_ftu_eff_switch_put(struct snd_kcontrol *kctl, · 36 unmodified lines | ||
| 703 | 737 | |
| 704 | 738 | if (!pval->is_cached) { |
| 705 | 739 | /* Read current value */ |
| 706 | − err = snd_usb_ctl_msg(chip->dev, | |
| 740 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 741 | + if (mixer->chip->shutdown) | |
| 742 | + err = -ENODEV; | |
| 743 | + else | |
| 744 | + err = snd_usb_ctl_msg(chip->dev, | |
| 707 | 745 | usb_rcvctrlpipe(chip->dev, 0), UAC_GET_CUR, |
| 708 | 746 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, |
| 709 | 747 | validx << 8, snd_usb_ctrl_intf(chip) | (id << 8), |
| 710 | 748 | value, val_len); |
| 749 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 711 | 750 | if (err < 0) |
| 712 | 751 | return err; |
| 713 | 752 | |
| @@ -719,11 +758,16 @@ static int snd_ftu_eff_switch_put(struct snd_kcontrol *kctl, · 5 unmodified lines | ||
| 719 | 758 | if (cur_val != new_val) { |
| 720 | 759 | value[0] = new_val; |
| 721 | 760 | value[1] = 0; |
| 722 | − err = snd_usb_ctl_msg(chip->dev, | |
| 761 | + down_read(&mixer->chip->shutdown_rwsem); | |
| 762 | + if (mixer->chip->shutdown) | |
| 763 | + err = -ENODEV; | |
| 764 | + else | |
| 765 | + err = snd_usb_ctl_msg(chip->dev, | |
| 723 | 766 | usb_sndctrlpipe(chip->dev, 0), UAC_SET_CUR, |
| 724 | 767 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT, |
| 725 | 768 | validx << 8, snd_usb_ctrl_intf(chip) | (id << 8), |
| 726 | 769 | value, val_len); |
| 770 | + up_read(&mixer->chip->shutdown_rwsem); | |
| 727 | 771 | if (err < 0) |
| 728 | 772 | return err; |
| 729 | 773 | |
| @@ -71,6 +71,8 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream · 70 unmodified lines | ||
| 71 | 71 | unsigned int hwptr_done; |
| 72 | 72 | |
| 73 | 73 | subs = (struct snd_usb_substream *)substream->runtime->private_data; |
| 74 | + if (subs->stream->chip->shutdown) | |
| 75 | + return SNDRV_PCM_POS_XRUN; | |
| 74 | 76 | spin_lock(&subs->lock); |
| 75 | 77 | hwptr_done = subs->hwptr_done; |
| 76 | 78 | substream->runtime->delay = snd_usb_pcm_delay(subs, |
| @@ -444,7 +446,6 @@ static int configure_endpoint(struct snd_usb_substream *subs) · 367 unmodified lines | ||
| 444 | 446 | { |
| 445 | 447 | int ret; |
| 446 | 448 | |
| 447 | − mutex_lock(&subs->stream->chip->shutdown_mutex); | |
| 448 | 449 | /* format changed */ |
| 449 | 450 | stop_endpoints(subs, 0, 0, 0); |
| 450 | 451 | ret = snd_usb_endpoint_set_params(subs->data_endpoint, |
| @@ -455,7 +456,7 @@ static int configure_endpoint(struct snd_usb_substream *subs) · 4 unmodified lines | ||
| 455 | 456 | subs->cur_audiofmt, |
| 456 | 457 | subs->sync_endpoint); |
| 457 | 458 | if (ret < 0) |
| 458 | − goto unlock; | |
| 459 | + return ret; | |
| 459 | 460 | |
| 460 | 461 | if (subs->sync_endpoint) |
| 461 | 462 | ret = snd_usb_endpoint_set_params(subs->data_endpoint, |
| @@ -465,9 +466,6 @@ static int configure_endpoint(struct snd_usb_substream *subs) · 3 unmodified lines | ||
| 465 | 466 | subs->cur_rate, |
| 466 | 467 | subs->cur_audiofmt, |
| 467 | 468 | NULL); |
| 468 | − | |
| 469 | −unlock: | |
| 470 | − mutex_unlock(&subs->stream->chip->shutdown_mutex); | |
| 471 | 469 | return ret; |
| 472 | 470 | } |
| 473 | 471 | |
| @@ -505,7 +503,13 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream, · 31 unmodified lines | ||
| 505 | 503 | return -EINVAL; |
| 506 | 504 | } |
| 507 | 505 | |
| 508 | − if ((ret = set_format(subs, fmt)) < 0) | |
| 506 | + down_read(&subs->stream->chip->shutdown_rwsem); | |
| 507 | + if (subs->stream->chip->shutdown) | |
| 508 | + ret = -ENODEV; | |
| 509 | + else | |
| 510 | + ret = set_format(subs, fmt); | |
| 511 | + up_read(&subs->stream->chip->shutdown_rwsem); | |
| 512 | + if (ret < 0) | |
| 509 | 513 | return ret; |
| 510 | 514 | |
| 511 | 515 | subs->interface = fmt->iface; |
| @@ -527,10 +531,12 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) · 15 unmodified lines | ||
| 527 | 531 | subs->cur_audiofmt = NULL; |
| 528 | 532 | subs->cur_rate = 0; |
| 529 | 533 | subs->period_bytes = 0; |
| 530 | − mutex_lock(&subs->stream->chip->shutdown_mutex); | |
| 531 | − stop_endpoints(subs, 0, 1, 1); | |
| 532 | − deactivate_endpoints(subs); | |
| 533 | − mutex_unlock(&subs->stream->chip->shutdown_mutex); | |
| 534 | + down_read(&subs->stream->chip->shutdown_rwsem); | |
| 535 | + if (!subs->stream->chip->shutdown) { | |
| 536 | + stop_endpoints(subs, 0, 1, 1); | |
| 537 | + deactivate_endpoints(subs); | |
| 538 | + } | |
| 539 | + up_read(&subs->stream->chip->shutdown_rwsem); | |
| 534 | 540 | return snd_pcm_lib_free_vmalloc_buffer(substream); |
| 535 | 541 | } |
| 536 | 542 | |
| @@ -552,12 +558,22 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) · 15 unmodified lines | ||
| 552 | 558 | return -ENXIO; |
| 553 | 559 | } |
| 554 | 560 | |
| 555 | − if (snd_BUG_ON(!subs->data_endpoint)) | |
| 556 | − return -EIO; | |
| 561 | + down_read(&subs->stream->chip->shutdown_rwsem); | |
| 562 | + if (subs->stream->chip->shutdown) { | |
| 563 | + ret = -ENODEV; | |
| 564 | + goto unlock; | |
| 565 | + } | |
| 566 | + if (snd_BUG_ON(!subs->data_endpoint)) { | |
| 567 | + ret = -EIO; | |
| 568 | + goto unlock; | |
| 569 | + } | |
| 570 | + | |
| 571 | + snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint); | |
| 572 | + snd_usb_endpoint_sync_pending_stop(subs->data_endpoint); | |
| 557 | 573 | |
| 558 | 574 | ret = set_format(subs, subs->cur_audiofmt); |
| 559 | 575 | if (ret < 0) |
| 560 | − return ret; | |
| 576 | + goto unlock; | |
| 561 | 577 | |
| 562 | 578 | iface = usb_ifnum_to_if(subs->dev, subs->cur_audiofmt->iface); |
| 563 | 579 | alts = &iface->altsetting[subs->cur_audiofmt->altset_idx]; |
| @@ -567,12 +583,12 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) · 3 unmodified lines | ||
| 567 | 583 | subs->cur_audiofmt, |
| 568 | 584 | subs->cur_rate); |
| 569 | 585 | if (ret < 0) |
| 570 | − return ret; | |
| 586 | + goto unlock; | |
| 571 | 587 | |
| 572 | 588 | if (subs->need_setup_ep) { |
| 573 | 589 | ret = configure_endpoint(subs); |
| 574 | 590 | if (ret < 0) |
| 575 | − return ret; | |
| 591 | + goto unlock; | |
| 576 | 592 | subs->need_setup_ep = false; |
| 577 | 593 | } |
| 578 | 594 | |
| @@ -592,9 +608,11 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) · 13 unmodified lines | ||
| 592 | 608 | /* for playback, submit the URBs now; otherwise, the first hwptr_done |
| 593 | 609 | * updates for all URBs would happen at the same time when starting */ |
| 594 | 610 | if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) |
| 595 | − return start_endpoints(subs, 1); | |
| 611 | + ret = start_endpoints(subs, 1); | |
| 596 | 612 | |
| 597 | − return 0; | |
| 613 | + unlock: | |
| 614 | + up_read(&subs->stream->chip->shutdown_rwsem); | |
| 615 | + return ret; | |
| 598 | 616 | } |
| 599 | 617 | |
| 600 | 618 | static struct snd_pcm_hardware snd_usb_hardware = |
| @@ -647,7 +665,7 @@ static int hw_check_valid_format(struct snd_usb_substream *subs, · 46 unmodified lines | ||
| 647 | 665 | return 0; |
| 648 | 666 | } |
| 649 | 667 | /* check whether the period time is >= the data packet interval */ |
| 650 | − if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL) { | |
| 668 | + if (subs->speed != USB_SPEED_FULL) { | |
| 651 | 669 | ptime = 125 * (1 << fp->datainterval); |
| 652 | 670 | if (ptime > pt->max || (ptime == pt->max && pt->openmax)) { |
| 653 | 671 | hwc_debug(" > check: ptime %u > max %u\n", ptime, pt->max); |
| @@ -925,7 +943,7 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre · 271 unmodified lines | ||
| 925 | 943 | return err; |
| 926 | 944 | |
| 927 | 945 | param_period_time_if_needed = SNDRV_PCM_HW_PARAM_PERIOD_TIME; |
| 928 | − if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL) | |
| 946 | + if (subs->speed == USB_SPEED_FULL) | |
| 929 | 947 | /* full speed devices have fixed data packet interval */ |
| 930 | 948 | ptmin = 1000; |
| 931 | 949 | if (ptmin == 1000) |
| @@ -108,7 +108,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s · 107 unmodified lines | ||
| 108 | 108 | } |
| 109 | 109 | snd_iprintf(buffer, "\n"); |
| 110 | 110 | } |
| 111 | − if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL) | |
| 111 | + if (subs->speed != USB_SPEED_FULL) | |
| 112 | 112 | snd_iprintf(buffer, " Data packet interval: %d us\n", |
| 113 | 113 | 125 * (1 << fp->datainterval)); |
| 114 | 114 | // snd_iprintf(buffer, " Max Packet Size = %d\n", fp->maxpacksize); |
| @@ -124,7 +124,7 @@ static void proc_dump_ep_status(struct snd_usb_substream *subs, · 9 unmodified lines | ||
| 124 | 124 | return; |
| 125 | 125 | snd_iprintf(buffer, " Packet Size = %d\n", ep->curpacksize); |
| 126 | 126 | snd_iprintf(buffer, " Momentary freq = %u Hz (%#x.%04x)\n", |
| 127 | − snd_usb_get_speed(subs->dev) == USB_SPEED_FULL | |
| 127 | + subs->speed == USB_SPEED_FULL | |
| 128 | 128 | ? get_full_speed_hz(ep->freqm) |
| 129 | 129 | : get_high_speed_hz(ep->freqm), |
| 130 | 130 | ep->freqm >> 16, ep->freqm & 0xffff); |
| @@ -90,6 +90,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as, · 89 unmodified lines | ||
| 90 | 90 | subs->direction = stream; |
| 91 | 91 | subs->dev = as->chip->dev; |
| 92 | 92 | subs->txfr_quirk = as->chip->txfr_quirk; |
| 93 | + subs->speed = snd_usb_get_speed(subs->dev); | |
| 93 | 94 | |
| 94 | 95 | snd_usb_set_pcm_ops(as->pcm, stream); |
| 95 | 96 | |
| @@ -37,7 +37,7 @@ struct snd_usb_audio { · 36 unmodified lines | ||
| 37 | 37 | struct usb_interface *pm_intf; |
| 38 | 38 | u32 usb_id; |
| 39 | 39 | struct mutex mutex; |
| 40 | − struct mutex shutdown_mutex; | |
| 40 | + struct rw_semaphore shutdown_rwsem; | |
| 41 | 41 | unsigned int shutdown:1; |
| 42 | 42 | unsigned int probing:1; |
| 43 | 43 | unsigned int autosuspended:1; |
| @@ -1,4 +1,4 @@ | ||
| 1 | −TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug epoll | |
| 1 | +TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug | |
| 2 | 2 | |
| 3 | 3 | all: |
| 4 | 4 | for TARGET in $(TARGETS); do \ |
| @@ -1,11 +0,0 @@ | ||
| 1 | −# Makefile for epoll selftests | |
| 2 | − | |
| 3 | −all: test_epoll | |
| 4 | −%: %.c | |
| 5 | − gcc -pthread -g -o $@ $^ | |
| 6 | − | |
| 7 | −run_tests: all | |
| 8 | − ./test_epoll | |
| 9 | − | |
| 10 | −clean: | |
| 11 | − $(RM) test_epoll | |
| @@ -1,344 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * tools/testing/selftests/epoll/test_epoll.c | |
| 3 | − * | |
| 4 | − * Copyright 2012 Adobe Systems Incorporated | |
| 5 | − * | |
| 6 | − * This program is free software; you can redistribute it and/or modify | |
| 7 | − * it under the terms of the GNU General Public License as published by | |
| 8 | − * the Free Software Foundation; either version 2 of the License, or | |
| 9 | − * (at your option) any later version. | |
| 10 | − * | |
| 11 | − * Paton J. Lewis <palewis@adobe.com> | |
| 12 | − * | |
| 13 | − */ | |
| 14 | − | |
| 15 | −#include <errno.h> | |
| 16 | −#include <fcntl.h> | |
| 17 | −#include <pthread.h> | |
| 18 | −#include <stdio.h> | |
| 19 | −#include <stdlib.h> | |
| 20 | −#include <unistd.h> | |
| 21 | −#include <sys/epoll.h> | |
| 22 | −#include <sys/socket.h> | |
| 23 | − | |
| 24 | −/* | |
| 25 | − * A pointer to an epoll_item_private structure will be stored in the epoll | |
| 26 | − * item's event structure so that we can get access to the epoll_item_private | |
| 27 | − * data after calling epoll_wait: | |
| 28 | − */ | |
| 29 | −struct epoll_item_private { | |
| 30 | − int index; /* Position of this struct within the epoll_items array. */ | |
| 31 | − int fd; | |
| 32 | − uint32_t events; | |
| 33 | − pthread_mutex_t mutex; /* Guards the following variables... */ | |
| 34 | − int stop; | |
| 35 | − int status; /* Stores any error encountered while handling item. */ | |
| 36 | − /* The following variable allows us to test whether we have encountered | |
| 37 | − a problem while attempting to cancel and delete the associated | |
| 38 | − event. When the test program exits, 'deleted' should be exactly | |
| 39 | − one. If it is greater than one, then the failed test reflects a real | |
| 40 | − world situation where we would have tried to access the epoll item's | |
| 41 | − private data after deleting it: */ | |
| 42 | − int deleted; | |
| 43 | −}; | |
| 44 | − | |
| 45 | −struct epoll_item_private *epoll_items; | |
| 46 | − | |
| 47 | −/* | |
| 48 | − * Delete the specified item from the epoll set. In a real-world secneario this | |
| 49 | − * is where we would free the associated data structure, but in this testing | |
| 50 | − * environment we retain the structure so that we can test for double-deletion: | |
| 51 | − */ | |
| 52 | −void delete_item(int index) | |
| 53 | −{ | |
| 54 | − __sync_fetch_and_add(&epoll_items[index].deleted, 1); | |
| 55 | −} | |
| 56 | − | |
| 57 | −/* | |
| 58 | − * A pointer to a read_thread_data structure will be passed as the argument to | |
| 59 | − * each read thread: | |
| 60 | − */ | |
| 61 | −struct read_thread_data { | |
| 62 | − int stop; | |
| 63 | − int status; /* Indicates any error encountered by the read thread. */ | |
| 64 | − int epoll_set; | |
| 65 | −}; | |
| 66 | − | |
| 67 | −/* | |
| 68 | − * The function executed by the read threads: | |
| 69 | − */ | |
| 70 | −void *read_thread_function(void *function_data) | |
| 71 | −{ | |
| 72 | − struct read_thread_data *thread_data = | |
| 73 | − (struct read_thread_data *)function_data; | |
| 74 | − struct epoll_event event_data; | |
| 75 | − struct epoll_item_private *item_data; | |
| 76 | − char socket_data; | |
| 77 | − | |
| 78 | − /* Handle events until we encounter an error or this thread's 'stop' | |
| 79 | − condition is set: */ | |
| 80 | − while (1) { | |
| 81 | − int result = epoll_wait(thread_data->epoll_set, | |
| 82 | − &event_data, | |
| 83 | − 1, /* Number of desired events */ | |
| 84 | − 1000); /* Timeout in ms */ | |
| 85 | − if (result < 0) { | |
| 86 | − /* Breakpoints signal all threads. Ignore that while | |
| 87 | − debugging: */ | |
| 88 | − if (errno == EINTR) | |
| 89 | − continue; | |
| 90 | − thread_data->status = errno; | |
| 91 | − return 0; | |
| 92 | − } else if (thread_data->stop) | |
| 93 | − return 0; | |
| 94 | − else if (result == 0) /* Timeout */ | |
| 95 | − continue; | |
| 96 | − | |
| 97 | − /* We need the mutex here because checking for the stop | |
| 98 | − condition and re-enabling the epoll item need to be done | |
| 99 | − together as one atomic operation when EPOLL_CTL_DISABLE is | |
| 100 | − available: */ | |
| 101 | − item_data = (struct epoll_item_private *)event_data.data.ptr; | |
| 102 | − pthread_mutex_lock(&item_data->mutex); | |
| 103 | − | |
| 104 | − /* Remove the item from the epoll set if we want to stop | |
| 105 | − handling that event: */ | |
| 106 | − if (item_data->stop) | |
| 107 | − delete_item(item_data->index); | |
| 108 | − else { | |
| 109 | − /* Clear the data that was written to the other end of | |
| 110 | − our non-blocking socket: */ | |
| 111 | − do { | |
| 112 | − if (read(item_data->fd, &socket_data, 1) < 1) { | |
| 113 | − if ((errno == EAGAIN) || | |
| 114 | − (errno == EWOULDBLOCK)) | |
| 115 | − break; | |
| 116 | − else | |
| 117 | − goto error_unlock; | |
| 118 | − } | |
| 119 | − } while (item_data->events & EPOLLET); | |
| 120 | − | |
| 121 | − /* The item was one-shot, so re-enable it: */ | |
| 122 | − event_data.events = item_data->events; | |
| 123 | − if (epoll_ctl(thread_data->epoll_set, | |
| 124 | − EPOLL_CTL_MOD, | |
| 125 | − item_data->fd, | |
| 126 | − &event_data) < 0) | |
| 127 | − goto error_unlock; | |
| 128 | − } | |
| 129 | − | |
| 130 | − pthread_mutex_unlock(&item_data->mutex); | |
| 131 | − } | |
| 132 | − | |
| 133 | −error_unlock: | |
| 134 | − thread_data->status = item_data->status = errno; | |
| 135 | − pthread_mutex_unlock(&item_data->mutex); | |
| 136 | − return 0; | |
| 137 | −} | |
| 138 | − | |
| 139 | −/* | |
| 140 | − * A pointer to a write_thread_data structure will be passed as the argument to | |
| 141 | − * the write thread: | |
| 142 | − */ | |
| 143 | −struct write_thread_data { | |
| 144 | − int stop; | |
| 145 | − int status; /* Indicates any error encountered by the write thread. */ | |
| 146 | − int n_fds; | |
| 147 | − int *fds; | |
| 148 | −}; | |
| 149 | − | |
| 150 | −/* | |
| 151 | − * The function executed by the write thread. It writes a single byte to each | |
| 152 | − * socket in turn until the stop condition for this thread is set. If writing to | |
| 153 | − * a socket would block (i.e. errno was EAGAIN), we leave that socket alone for | |
| 154 | − * the moment and just move on to the next socket in the list. We don't care | |
| 155 | − * about the order in which we deliver events to the epoll set. In fact we don't | |
| 156 | − * care about the data we're writing to the pipes at all; we just want to | |
| 157 | − * trigger epoll events: | |
| 158 | − */ | |
| 159 | −void *write_thread_function(void *function_data) | |
| 160 | −{ | |
| 161 | − const char data = 'X'; | |
| 162 | − int index; | |
| 163 | − struct write_thread_data *thread_data = | |
| 164 | − (struct write_thread_data *)function_data; | |
| 165 | − while (!thread_data->stop) | |
| 166 | − for (index = 0; | |
| 167 | − !thread_data->stop && (index < thread_data->n_fds); | |
| 168 | − ++index) | |
| 169 | − if ((write(thread_data->fds[index], &data, 1) < 1) && | |
| 170 | − (errno != EAGAIN) && | |
| 171 | − (errno != EWOULDBLOCK)) { | |
| 172 | − thread_data->status = errno; | |
| 173 | − return; | |
| 174 | − } | |
| 175 | −} | |
| 176 | − | |
| 177 | −/* | |
| 178 | − * Arguments are currently ignored: | |
| 179 | − */ | |
| 180 | −int main(int argc, char **argv) | |
| 181 | −{ | |
| 182 | − const int n_read_threads = 100; | |
| 183 | − const int n_epoll_items = 500; | |
| 184 | − int index; | |
| 185 | − int epoll_set = epoll_create1(0); | |
| 186 | − struct write_thread_data write_thread_data = { | |
| 187 | − 0, 0, n_epoll_items, malloc(n_epoll_items * sizeof(int)) | |
| 188 | − }; | |
| 189 | − struct read_thread_data *read_thread_data = | |
| 190 | − malloc(n_read_threads * sizeof(struct read_thread_data)); | |
| 191 | − pthread_t *read_threads = malloc(n_read_threads * sizeof(pthread_t)); | |
| 192 | − pthread_t write_thread; | |
| 193 | − | |
| 194 | − printf("-----------------\n"); | |
| 195 | − printf("Runing test_epoll\n"); | |
| 196 | − printf("-----------------\n"); | |
| 197 | − | |
| 198 | − epoll_items = malloc(n_epoll_items * sizeof(struct epoll_item_private)); | |
| 199 | − | |
| 200 | − if (epoll_set < 0 || epoll_items == 0 || write_thread_data.fds == 0 || | |
| 201 | − read_thread_data == 0 || read_threads == 0) | |
| 202 | − goto error; | |
| 203 | − | |
| 204 | − if (sysconf(_SC_NPROCESSORS_ONLN) < 2) { | |
| 205 | − printf("Error: please run this test on a multi-core system.\n"); | |
| 206 | − goto error; | |
| 207 | − } | |
| 208 | − | |
| 209 | − /* Create the socket pairs and epoll items: */ | |
| 210 | − for (index = 0; index < n_epoll_items; ++index) { | |
| 211 | − int socket_pair[2]; | |
| 212 | − struct epoll_event event_data; | |
| 213 | − if (socketpair(AF_UNIX, | |
| 214 | − SOCK_STREAM | SOCK_NONBLOCK, | |
| 215 | − 0, | |
| 216 | − socket_pair) < 0) | |
| 217 | − goto error; | |
| 218 | − write_thread_data.fds[index] = socket_pair[0]; | |
| 219 | − epoll_items[index].index = index; | |
| 220 | − epoll_items[index].fd = socket_pair[1]; | |
| 221 | − if (pthread_mutex_init(&epoll_items[index].mutex, NULL) != 0) | |
| 222 | − goto error; | |
| 223 | − /* We always use EPOLLONESHOT because this test is currently | |
| 224 | − structured to demonstrate the need for EPOLL_CTL_DISABLE, | |
| 225 | − which only produces useful information in the EPOLLONESHOT | |
| 226 | − case (without EPOLLONESHOT, calling epoll_ctl with | |
| 227 | − EPOLL_CTL_DISABLE will never return EBUSY). If support for | |
| 228 | − testing events without EPOLLONESHOT is desired, it should | |
| 229 | − probably be implemented in a separate unit test. */ | |
| 230 | − epoll_items[index].events = EPOLLIN | EPOLLONESHOT; | |
| 231 | − if (index < n_epoll_items / 2) | |
| 232 | − epoll_items[index].events |= EPOLLET; | |
| 233 | − epoll_items[index].stop = 0; | |
| 234 | − epoll_items[index].status = 0; | |
| 235 | − epoll_items[index].deleted = 0; | |
| 236 | − event_data.events = epoll_items[index].events; | |
| 237 | − event_data.data.ptr = &epoll_items[index]; | |
| 238 | − if (epoll_ctl(epoll_set, | |
| 239 | − EPOLL_CTL_ADD, | |
| 240 | − epoll_items[index].fd, | |
| 241 | − &event_data) < 0) | |
| 242 | − goto error; | |
| 243 | − } | |
| 244 | − | |
| 245 | − /* Create and start the read threads: */ | |
| 246 | − for (index = 0; index < n_read_threads; ++index) { | |
| 247 | − read_thread_data[index].stop = 0; | |
| 248 | − read_thread_data[index].status = 0; | |
| 249 | − read_thread_data[index].epoll_set = epoll_set; | |
| 250 | − if (pthread_create(&read_threads[index], | |
| 251 | − NULL, | |
| 252 | − read_thread_function, | |
| 253 | − &read_thread_data[index]) != 0) | |
| 254 | − goto error; | |
| 255 | − } | |
| 256 | − | |
| 257 | − if (pthread_create(&write_thread, | |
| 258 | − NULL, | |
| 259 | − write_thread_function, | |
| 260 | − &write_thread_data) != 0) | |
| 261 | − goto error; | |
| 262 | − | |
| 263 | − /* Cancel all event pollers: */ | |
| 264 | −#ifdef EPOLL_CTL_DISABLE | |
| 265 | − for (index = 0; index < n_epoll_items; ++index) { | |
| 266 | − pthread_mutex_lock(&epoll_items[index].mutex); | |
| 267 | − ++epoll_items[index].stop; | |
| 268 | − if (epoll_ctl(epoll_set, | |
| 269 | − EPOLL_CTL_DISABLE, | |
| 270 | − epoll_items[index].fd, | |
| 271 | − NULL) == 0) | |
| 272 | − delete_item(index); | |
| 273 | − else if (errno != EBUSY) { | |
| 274 | − pthread_mutex_unlock(&epoll_items[index].mutex); | |
| 275 | − goto error; | |
| 276 | − } | |
| 277 | − /* EBUSY means events were being handled; allow the other thread | |
| 278 | − to delete the item. */ | |
| 279 | − pthread_mutex_unlock(&epoll_items[index].mutex); | |
| 280 | − } | |
| 281 | −#else | |
| 282 | − for (index = 0; index < n_epoll_items; ++index) { | |
| 283 | − pthread_mutex_lock(&epoll_items[index].mutex); | |
| 284 | − ++epoll_items[index].stop; | |
| 285 | − pthread_mutex_unlock(&epoll_items[index].mutex); | |
| 286 | − /* Wait in case a thread running read_thread_function is | |
| 287 | − currently executing code between epoll_wait and | |
| 288 | − pthread_mutex_lock with this item. Note that a longer delay | |
| 289 | − would make double-deletion less likely (at the expense of | |
| 290 | − performance), but there is no guarantee that any delay would | |
| 291 | − ever be sufficient. Note also that we delete all event | |
| 292 | − pollers at once for testing purposes, but in a real-world | |
| 293 | − environment we are likely to want to be able to cancel event | |
| 294 | − pollers at arbitrary times. Therefore we can't improve this | |
| 295 | − situation by just splitting this loop into two loops | |
| 296 | − (i.e. signal 'stop' for all items, sleep, and then delete all | |
| 297 | − items). We also can't fix the problem via EPOLL_CTL_DEL | |
| 298 | − because that command can't prevent the case where some other | |
| 299 | − thread is executing read_thread_function within the region | |
| 300 | − mentioned above: */ | |
| 301 | − usleep(1); | |
| 302 | − pthread_mutex_lock(&epoll_items[index].mutex); | |
| 303 | − if (!epoll_items[index].deleted) | |
| 304 | − delete_item(index); | |
| 305 | − pthread_mutex_unlock(&epoll_items[index].mutex); | |
| 306 | − } | |
| 307 | −#endif | |
| 308 | − | |
| 309 | − /* Shut down the read threads: */ | |
| 310 | − for (index = 0; index < n_read_threads; ++index) | |
| 311 | − __sync_fetch_and_add(&read_thread_data[index].stop, 1); | |
| 312 | − for (index = 0; index < n_read_threads; ++index) { | |
| 313 | − if (pthread_join(read_threads[index], NULL) != 0) | |
| 314 | − goto error; | |
| 315 | − if (read_thread_data[index].status) | |
| 316 | − goto error; | |
| 317 | − } | |
| 318 | − | |
| 319 | − /* Shut down the write thread: */ | |
| 320 | − __sync_fetch_and_add(&write_thread_data.stop, 1); | |
| 321 | − if ((pthread_join(write_thread, NULL) != 0) || write_thread_data.status) | |
| 322 | − goto error; | |
| 323 | − | |
| 324 | − /* Check for final error conditions: */ | |
| 325 | − for (index = 0; index < n_epoll_items; ++index) { | |
| 326 | − if (epoll_items[index].status != 0) | |
| 327 | − goto error; | |
| 328 | − if (pthread_mutex_destroy(&epoll_items[index].mutex) < 0) | |
| 329 | − goto error; | |
| 330 | − } | |
| 331 | − for (index = 0; index < n_epoll_items; ++index) | |
| 332 | − if (epoll_items[index].deleted != 1) { | |
| 333 | − printf("Error: item data deleted %1d times.\n", | |
| 334 | − epoll_items[index].deleted); | |
| 335 | − goto error; | |
| 336 | − } | |
| 337 | − | |
| 338 | − printf("[PASS]\n"); | |
| 339 | − return 0; | |
| 340 | − | |
| 341 | − error: | |
| 342 | − printf("[FAIL]\n"); | |
| 343 | − return errno; | |
| 344 | −} | |