Commit f98982ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform changes from Ingo Molnar:

 - Support for the Technologic Systems TS-5500 platform, by Vivien
   Didelot

 - Improved NUMA support on AMD systems:

   Add support for federated systems where multiple memory controllers
   can exist and see each other over multiple PCI domains.  This
   basically means that AMD node ids can be more than 8 now and the code
   handling this is taught to incorporate PCI domain into those IDs.

 - Support for the Goldfish virtual Android emulator, by Jun Nakajima,
   Intel, Google, et al.

 - Misc fixlets.

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Add TS-5500 platform support
  x86/srat: Simplify memory affinity init error handling
  x86/apb/timer: Remove unnecessary "if"
  goldfish: platform device for x86
  amd64_edac: Fix type usage in NB IDs and memory ranges
  amd64_edac: Fix PCI function lookup
  x86, AMD, NB: Use u16 for northbridge IDs in amd_get_nb_id
  x86, AMD, NB: Add multi-domain support
parents 29d50523 7d029125

Documentation/ABI/testing/sysfs-platform-ts5500

0 → 100644
+47 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/ts5500/adc

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Indicates the presence of an A/D Converter. If it is present,

		it will display "1", otherwise "0".



What:		/sys/devices/platform/ts5500/ereset

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Indicates the presence of an external reset. If it is present,

		it will display "1", otherwise "0".



What:		/sys/devices/platform/ts5500/id

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Product ID of the TS board. TS-5500 ID is 0x60.



What:		/sys/devices/platform/ts5500/jumpers

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Bitfield showing the jumpers' state. If a jumper is present,

		the corresponding bit is set. For instance, 0x0e means jumpers

		2, 3 and 4 are set.



What:		/sys/devices/platform/ts5500/rs485

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Indicates the presence of the RS485 option. If it is present,

		it will display "1", otherwise "0".



What:		/sys/devices/platform/ts5500/sram

Date:		January 2013

KernelVersion:	3.7

Contact:	"Savoir-faire Linux Inc." <kernel@savoirfairelinux.com>

Description:

		Indicates the presence of the SRAM option. If it is present,

		it will display "1", otherwise "0".

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -7533,6 +7533,11 @@ F: drivers/net/team/ 
F:	include/linux/if_team.h

F:	include/uapi/linux/if_team.h



TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT

M:	Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>

S:	Maintained

F:	arch/x86/platform/ts5500/



TECHNOTREND USB IR RECEIVER

M:	Sean Young <sean@mess.org>

L:	linux-media@vger.kernel.org

arch/x86/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -323,6 +323,10 @@ config X86_BIGSMP 
	---help---

	  This option is needed for the systems that have more than 8 CPUs



config GOLDFISH

       def_bool y

       depends on X86_GOLDFISH



if X86_32

config X86_EXTENDED_PLATFORM

	bool "Support for extended (non-PC) x86 platforms"
@@ -405,6 +409,14 @@ config X86_UV 
# Following is an alphabetically sorted list of 32 bit extended platforms

# Please maintain the alphabetic order if and when there are additions



config X86_GOLDFISH

       bool "Goldfish (Virtual Platform)"

       depends on X86_32

       ---help---

	 Enable support for the Goldfish virtual platform used primarily

	 for Android development. Unless you are building for the Android

	 Goldfish emulator say N here.



config X86_INTEL_CE

	bool "CE4100 TV platform"

	depends on PCI
@@ -2191,6 +2203,15 @@ config GEOS 
	---help---

	  This option enables system support for the Traverse Technologies GEOS.



config TS5500

	bool "Technologic Systems TS-5500 platform support"

	depends on MELAN

	select CHECK_SIGNATURE

	select NEW_LEDS

	select LEDS_CLASS

	---help---

	  This option enables system support for the Technologic Systems TS-5500.



endif # X86_32



config AMD_NB

arch/x86/include/asm/amd_nb.h

+17 −0
Original line number Diff line number Diff line
@@ -81,6 +81,23 @@ static inline struct amd_northbridge *node_to_amd_nb(int node) 
	return (node < amd_northbridges.num) ? &amd_northbridges.nb[node] : NULL;

}



static inline u16 amd_get_node_id(struct pci_dev *pdev)

{

	struct pci_dev *misc;

	int i;



	for (i = 0; i != amd_nb_num(); i++) {

		misc = node_to_amd_nb(i)->misc;



		if (pci_domain_nr(misc->bus) == pci_domain_nr(pdev->bus) &&

		    PCI_SLOT(misc->devfn) == PCI_SLOT(pdev->devfn))

			return i;

	}



	WARN(1, "Unable to find AMD Northbridge id for %s\n", pci_name(pdev));

	return 0;

}



#else



#define amd_nb_num(x)		0

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip, 
extern int get_tsc_mode(unsigned long adr);

extern int set_tsc_mode(unsigned int val);



extern int amd_get_nb_id(int cpu);

extern u16 amd_get_nb_id(int cpu);



struct aperfmperf {

	u64 aperf, mperf;

CRA Git | Maintained and supported by SUSTech CRA and CCSE