aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-19m68k/mac: Make SCC reset work more reliablyFinn Thain1-1/+3
For SCC initialization we cannot assume that the control register is in the correct state to accept a register pointer. So first read from the control register in order to "sync" up. Signed-off-by: Finn Thain <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2014-01-13m68k/irq - Use polled IRQ flag for MFP timer cascaded interruptsMichael Schmitz1-0/+3
Some Atari hardware has no capacity to raise interrupts (e.g. network or USB adapter hardware attached via ROM port). The driver interrupt routine is called from a timer interrupt (timer D) in these cases, using chained device specific pseudo interrupts (IRQ_MFP_TIMER1 ff.) These interrupts will more often than not, return IRQ_NONE as there is not always work for the device handler when called. Too many unhandled interrupts will result in the interrupt being disabled by the stuck interrupt watchdog. As preferred option to flag interrupts as needing exclusion from the watchdog mechanism, tglx added the IRQ_IS_POLLED flag for use in such a case. Currently, two interrupts need to use this flag. Add more users as needed. Signed-off-by: Michael Schmitz <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k: Update defconfigs for v3.13-rc1Geert Uytterhoeven12-52/+456
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k/defconfig: Enable EARLY_PRINTKGeert Uytterhoeven3-0/+3
It's too valuable for debugging to be disabled. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k/mm: kmap spelling/grammar fixesGeert Uytterhoeven1-5/+5
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k: Convert arch/m68k/kernel/traps.c to pr_*()Geert Uytterhoeven1-131/+101
Also fix a few printf-style formats, to get rid of the following compiler warnings when DEBUG is enabled: arch/m68k/kernel/traps.c: In function ‘access_error060’: arch/m68k/kernel/traps.c:166: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘long unsigned int’ arch/m68k/kernel/traps.c: In function ‘bus_error030’: arch/m68k/kernel/traps.c:568: warning: format ‘%#lx’ expects type ‘long unsigned int’, but argument 2 has type ‘void *’ arch/m68k/kernel/traps.c:682: warning: format ‘%#lx’ expects type ‘long unsigned int’, but argument 2 has type ‘void *’ Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k: Convert arch/m68k/mm/fault.c to pr_*()Geert Uytterhoeven1-15/+8
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k/mm: Check for mm != NULL in do_page_fault() debug codeGeert Uytterhoeven1-2/+1
When DEBUG is enabled, do_page_fault() may dereference a NULL pointer, causing recursive bus errors. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-30m68k/defconfig: Disable /sbin/hotplug fork-bomb by defaultGeert Uytterhoeven12-12/+0
Cfr. commit 7934779a69f1184f29d786b89e77dd14519bd226 ("Driver-Core: disable /sbin/hotplug by default"). Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k/atari: Hide RTC_PORT() macro from rtc-cmosGeert Uytterhoeven1-5/+5
Rename RTC_PORT() to ATARI_RTC_PORT(), as the rtc-cmos RTC driver uses the presence of this macro to enable support for the second NVRAM bank, which Atari doesn't have ("Unable to handle kernel access at virtual address 00ff8965"). Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k/amiga,atari: Fix specifying multiple debug= parametersGeert Uytterhoeven2-6/+18
Since commit d6713b4091a99fa2af2fabdcd2f3fb97f32ecf2e ("m68k: early parameter support"), the user can specify multiple debug consoles using the "debug=" kernel command line parameter. However, as there's only a single struct console object, which is reused, it would actually register the same console object multiple times, causing the following warning: WARNING: CPU: 0 PID: 0 at kernel/printk/printk.c:2233 register_console+0x36/ console 'debug0' already registered Make sure to register the console object only once, to avoid the warning. Note that still only one console (the one corresponding to the last "debug=" parameter) will be active at the same time, as the .write() method of the already registered console object is overwritten by a subsequent "debug=" parameter. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k/defconfig: Use ext4 for ext2/ext3 file systemsGeert Uytterhoeven12-48/+0
This reduces the kernel image size by ca. 160 KiB. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k: Add support to export bootinfo in procfsGeert Uytterhoeven5-0/+102
Add optional support to export the bootinfo used to boot the kernel in a "bootinfo" file in procfs. This is useful with kexec. This is based on the similar feature for ATAGS on ARM. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k: Add kexec supportGeert Uytterhoeven7-0/+269
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-12-08m68k/mac: Mark Mac IIsi ADB driver BROKENGeert Uytterhoeven1-1/+1
As reported by Finn Thain, the Mac IIsi ADB driver should be disabled because it will crash. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/amiga: Provide mach_random_get_entropy()Geert Uytterhoeven1-0/+10
Use the beam position registers, which provide at least 17 bits of data changing at 1.79 MHz. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: Add infrastructure for machine-specific random_get_entropy()Geert Uytterhoeven2-0/+14
On m68k, get_cycles() (the default implementation for random_get_entropy()) always returns zero, providing no entropy for the random driver. Add a hook where platforms can provide their own implementation, and wire it up in the infrastructure provided by commit 61875f30daf60305712e25b209ef41ced2635bad ("random: allow architectures to optionally define random_get_entropy()"). Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/atari: Call paging_init() before nf_init()Geert Uytterhoeven1-2/+2
nf_init() uses virt_to_phys(), which depends on m68k_memoffset being set and module_fixup() having been called, but this is only done in paging_init(). Hence call paging_init() before nf_init(). This went unnoticed, as virt_to_phys() is a no-op on Atari, unless you start fiddling with the memory blocks in the bootinfo manually. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: Remove superfluous inclusions of <asm/bootinfo.h>Geert Uytterhoeven9-9/+0
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>Geert Uytterhoeven16-98/+124
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move VME Board ID definition to <asm/bootinfo-vme.h>Geert Uytterhoeven2-17/+23
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move Macintosh model definitions to <asm/bootinfo-mac.h>Geert Uytterhoeven2-59/+63
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move HP300 model definitions to <asm/bootinfo-hp300.h>Geert Uytterhoeven2-18/+27
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move Apollo model definitions to <asm/bootinfo-apollo.h>Geert Uytterhoeven2-9/+14
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move Amiga model/chipset definitions to <asm/bootinfo-amiga.h>Geert Uytterhoeven2-25/+33
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Move generic definitions to <asm/bootinfo.h>Geert Uytterhoeven6-95/+85
Move generic definitions used by bootstraps to uapi/asm/bootinfo.h: - Machine types, - CPU, FPU, and MMU types, - struct mem_info. Keep a copy of struct mem_info for in-kernel use, and rename it to struct m68k_mem_info, as the exported one will be modified later. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.hGeert Uytterhoeven20-213/+356
Export the bootinfo definitions that are used by bootstrap loaders, and split them up in generic and platform-specific parts. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/vme: Remove unused mvme_bdid_ptrGeert Uytterhoeven1-2/+0
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/mac: Move struct mac_booter_data to <asm/macintosh.h>Geert Uytterhoeven3-41/+23
struct mac_booter_data is no longer part of the bootinfo API, hence move it from <asm/bootinfo.h> to <asm/macintosh.h>, dropping all unused fields in the process. Also remove the no longer used mac_booter_data pointer from head.S. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: Drop remainings and API of BOOTINFO_COMPAT_1_0Geert Uytterhoeven3-114/+0
Drop remainings and API for backwards compatibility with bootinfo interface version 1.0. This was used when booting a 2.1.x or newer kernel on Amiga, Atari, or Mac using a bootstrap for kernel 2.0.x. Everybody upgraded his bootstrap a long time ago, so this can go. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: head.S - Correct date and spellingGeert Uytterhoeven1-1/+1
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: The bootinfo is located right after the kernelGeert Uytterhoeven3-3/+3
Since the introduction of init sections (which are located after BSS), the bootinfo is no longer located right after the BSS, but after all kernel sections. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26block/z2ram: Remove duplicate external declarationsGeert Uytterhoeven1-3/+0
Remove the external declarations for m68k_realnum_memory and m68k_memory, which are already provided by <asm/setup.h>, to avoid conflicts later. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro/UAPI: Use proper types (endianness/size) in <linux/zorro.h>Geert Uytterhoeven8-46/+72
Fix member definitions for non-native userspace handling: - All multi-byte values are big-endian, hence use __be*, - All pointers are 32-bit pointers under AmigaOS, but unused (except for cd_BoardAddr) under Linux, hence use __be32. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro/UAPI: Disintegrate include/linux/zorro*.hGeert Uytterhoeven5-102/+119
The Zorro definitions and device IDs are used by bootstraps, hence they should be exported through UAPI. Unfortunately zorro.h was never marked for export when headers_install was introduced, so it was forgotten during the big UAPI disintegration. In addition, the removal of zorro_ids.h had been sneaked into commit 7e7a43c32a8970ea2bfc3d1af353dcb1a9237769 ("PCI: don't export device IDs to userspace") before, so it was also forgotten. Split off and export the Zorro definitions used by bootstraps. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro: ZTWO_VADDR() should return "void __iomem *"Geert Uytterhoeven17-22/+22
ZTWO_VADDR() converts from physical to virtual I/O addresses, so it should return "void __iomem *" instead of "unsigned long". This allows to drop several casts, but requires adding a few casts to accomodate legacy driver frameworks that store "unsigned long" I/O addresses. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro: Let the driver core handle device enumerationGeert Uytterhoeven2-7/+8
Filling in dev_name of the Zorro bus type and dev.id of each device allows the driver core to enumerate devices, so we don't have to do that ourselves. This changes the names of devices in sysfs from "%02x" to "zorro%u". Note that filling in dev.id is also needed to support MFD Zorro devices. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro: Refactor conditional handling of Zorro device name databaseGeert Uytterhoeven3-11/+7
Using an empty static inline function in the CONFIG_ZORRO_NAMES=n case allows to drop compilation of names.c. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro: Don't fill in dummy names in zorro_name_device()Geert Uytterhoeven1-1/+0
If the device is not found in the database, it's not needed to fill in a dummy name. The caller of zorro_name_device() has already taken care of that to support CONFIG_ZORRO_NAMES=n. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26zorro: Do not allocate zorro_autocon[] staticallyGeert Uytterhoeven4-9/+38
Currently the array of Zorro devices is allocated statically, wasting up to 4.5 KiB when running an Amiga or multi-platform kernel on a machine with no or a handful of Zorro expansion cards. Convert it to conditional dynamic memory allocation to fix this. amiga_parse_bootinfo() still needs to store some information about the detected Zorro devices, at a time even the bootmem allocator is not yet available. This is now handled using a much smaller array (typically less than 0.5 KiB), which is __initdata and thus freed later. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26Documentation/zorro.txt: Update path to arch-specific header filesGeert Uytterhoeven1-1/+1
- Arch-specific headers were moved to arch/<arch/>/include/asm, - APUS support was dropped a long time ago Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/setup: Use pr_*() and __func__ instead of plain printk()Geert Uytterhoeven1-9/+10
Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/defconfig: Make NFS_V4 modular instead of builtinGeert Uytterhoeven12-12/+12
This reduces the kernel image size by ca. 100 KiB, while still allowing NFS root. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/mac: Fix comment about iop_*_present flags setup timingGeert Uytterhoeven1-2/+2
This is no longer done from iop_init() Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k/sun3: Dynamically allocate the table to track IOMMU useGeert Uytterhoeven1-2/+3
As Sun 3 kernels cannot be multi-platform due to the different Sun 3 MMU type, it made sense to statically allocate the table to track IOMMU use. However, Sun 3x kernels can be multi-platform. Furthermore, Sun 3x uses a larger table than Sun 3 (8192 bytes instead of 512 bytes). Hence switch to dynamic allocation of this table using the bootmem allocator to avoid wasting 8192 bytes when not running on a Sun 3x. As this allocator returns zeroed memory, there's no need to explicitly initialize the table to zeroes. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-26m68k: Mark functions only called from setup_arch() __initGeert Uytterhoeven12-21/+22
Some functions that are only called (indirectly) from setup_arch() lack __init annotations. Signed-off-by: Geert Uytterhoeven <[email protected]>
2013-11-22Linux 3.13-rc1Linus Torvalds1-2/+2
2013-11-22Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of ↵Linus Torvalds1-6/+2
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs Pull minor eCryptfs fix from Tyler Hicks: "Quiet static checkers by removing unneeded conditionals" * tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs: eCryptfs: file->private_data is always valid
2013-11-22Merge tag 'sound-fix2-3.13-rc1' of ↵Linus Torvalds9-47/+161
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull second set of sound fixes from Takashi Iwai: "A collection of small fixes in HD-audio quirks and runtime PM, ASoC rcar, abs8500 and other codecs. Most of commits are for stable kernels, too" * tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial) ALSA: hda - Provide missing pin configs for VAIO with ALC260 ALSA: hda - Add headset quirk for Dell Inspiron 3135 ALSA: hda - Fix the headphone jack detection on Sony VAIO TX ALSA: hda - Fix missing bass speaker on ASUS N550 ALSA: hda - Fix unbalanced runtime PM notification at resume ASoC: arizona: Set FLL to free-run before disabling ALSA: hda - A casual Dell Headset quirk ASoC: rcar: fixup dma_async_issue_pending() timing ASoC: rcar: off by one in rsnd_scu_set_route() ASoC: wm5110: Add post SYSCLK register patch for rev D chip ASoC: ab8500: Revert to using custom I/O functions ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixup ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_t ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSP ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codec ASoC: rcar: fixup mod access before checking
2013-11-22Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linuxLinus Torvalds54-324/+1057
Pull DRM fixes from Dave Airlie: "I was going to leave this until post -rc1 but sysfs fixes broke hotplug in userspace, so I had to fix it harder, otherwise a set of pulls from intel, radeon and vmware, The vmware/ttm changes are bit larger but since its early and they are unlikely to break anything else I put them in, it lets vmware work with dri3" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (36 commits) drm/sysfs: fix hotplug regression since lifetime changes drm/exynos: g2d: fix memory leak to userptr drm/i915: Fix gen3 self-refresh watermarks drm/ttm: Remove set_need_resched from the ttm fault handler drm/ttm: Don't move non-existing data drm/radeon: hook up backlight functions for CI and KV family. drm/i915: Replicate BIOS eDP bpp clamping hack for hsw drm/i915: Do not enable package C8 on unsupported hardware drm/i915: Hold pc8 lock around toggling pc8.gpu_idle drm/i915: encoder->get_config is no longer optional drm/i915/tv: add ->get_config callback drm/radeon/cik: Add macrotile mode array query drm/radeon/cik: Return backend map information to userspace drm/vmwgfx: Make vmwgfx dma buffers prime aware drm/vmwgfx: Make surfaces prime-aware drm/vmwgfx: Hook up the prime ioctls drm/ttm: Add a minimal prime implementation for ttm base objects drm/vmwgfx: Fix false lockdep warning drm/ttm: Allow execbuf util reserves without ticket drm/i915: restore the early forcewake cleanup ...
Powered by cgit, Gruvboxed by Blaster4385.