Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

goldfish: platform device for x86

Based on code by Jun Nakajima but stripped of all the old x86 mach-foo
stuff and turned into a single file for the Goldfish virtual bus layer.

The actual created platform device and bus enumeration is portable between the
ARM and x86 Goldfish emulations.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Link: http://lkml.kernel.org/r/20130121172205.19517.22535.stgit@bob.linux.org.uk
Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
[Ported to 3.7 and reorganised so that we can keep most of the code
shared properly]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>

authored by

Jun Nakajima and committed by
H. Peter Anvin
ddd70cf9 7d1f9aef

+65
+12
arch/x86/Kconfig
··· 320 320 ---help--- 321 321 This option is needed for the systems that have more than 8 CPUs 322 322 323 + config GOLDFISH 324 + def_bool y 325 + depends on X86_GOLDFISH 326 + 323 327 if X86_32 324 328 config X86_EXTENDED_PLATFORM 325 329 bool "Support for extended (non-PC) x86 platforms" ··· 405 401 406 402 # Following is an alphabetically sorted list of 32 bit extended platforms 407 403 # Please maintain the alphabetic order if and when there are additions 404 + 405 + config X86_GOLDFISH 406 + bool "Goldfish (Virtual Platform)" 407 + depends on X86_32 408 + ---help--- 409 + Enable support for the Goldfish virtual platform used primarily 410 + for Android development. Unless you are building for the Android 411 + Goldfish emulator say N here. 408 412 409 413 config X86_INTEL_CE 410 414 bool "CE4100 TV platform"
+1
arch/x86/platform/Makefile
··· 2 2 obj-y += ce4100/ 3 3 obj-y += efi/ 4 4 obj-y += geode/ 5 + obj-y += goldfish/ 5 6 obj-y += iris/ 6 7 obj-y += mrst/ 7 8 obj-y += olpc/
+1
arch/x86/platform/goldfish/Makefile
··· 1 + obj-$(CONFIG_GOLDFISH) += goldfish.o
+51
arch/x86/platform/goldfish/goldfish.c
··· 1 + /* 2 + * Copyright (C) 2007 Google, Inc. 3 + * Copyright (C) 2011 Intel, Inc. 4 + * Copyright (C) 2013 Intel, Inc. 5 + * 6 + * This software is licensed under the terms of the GNU General Public 7 + * License version 2, as published by the Free Software Foundation, and 8 + * may be copied, distributed, and modified under those terms. 9 + * 10 + * This program is distributed in the hope that it will be useful, 11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 + * GNU General Public License for more details. 14 + * 15 + */ 16 + 17 + #include <linux/kernel.h> 18 + #include <linux/irq.h> 19 + #include <linux/platform_device.h> 20 + 21 + /* 22 + * Where in virtual device memory the IO devices (timers, system controllers 23 + * and so on) 24 + */ 25 + 26 + #define GOLDFISH_PDEV_BUS_BASE (0xff001000) 27 + #define GOLDFISH_PDEV_BUS_END (0xff7fffff) 28 + #define GOLDFISH_PDEV_BUS_IRQ (4) 29 + 30 + #define GOLDFISH_TTY_BASE (0x2000) 31 + 32 + static struct resource goldfish_pdev_bus_resources[] = { 33 + { 34 + .start = GOLDFISH_PDEV_BUS_BASE, 35 + .end = GOLDFISH_PDEV_BUS_END, 36 + .flags = IORESOURCE_MEM, 37 + }, 38 + { 39 + .start = GOLDFISH_PDEV_BUS_IRQ, 40 + .end = GOLDFISH_PDEV_BUS_IRQ, 41 + .flags = IORESOURCE_IRQ, 42 + } 43 + }; 44 + 45 + static int __init goldfish_init(void) 46 + { 47 + platform_device_register_simple("goldfish_pdev_bus", -1, 48 + goldfish_pdev_bus_resources, 2); 49 + return 0; 50 + } 51 + device_initcall(goldfish_init);