Skip to contentSkip to conversation

x86/platforms for v3.15

GIT PULL Ingo Molnar 4 participants 6 messages Apr 1, 2014 – Apr 3, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-platform-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus

# HEAD: 936329de1e6bf3dfa8c056074e6fc6b673e7b1d0 x86, calgary: Use 8M TCE table size by default

Intel IOSF updates, Intel GPU memory init updates, Calgary update.

out-of-topic modifications in x86-platform-for-linus:
-------------------------------------------------------
include/drm/i915_drm.h # a4dff76: x86/gpu: Add Intel graphics stole

Thanks,

Ingo

------------------>
David E. Box (2):
x86, iosf: Add dummy functions for loadable modules x86, iosf: Change IOSF_MBI Kconfig to default y

Ville Syrjälä (3):
x86/gpu: Add vfunc for Intel graphics stolen memory base address x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms x86/gpu: Print the Intel graphics stolen memory range

WANG Chao (1):
x86, calgary: Use 8M TCE table size by default

 arch/x86/Kconfig                 |   5 +-
 arch/x86/include/asm/iosf_mbi.h  |  33 ++++++
 arch/x86/kernel/early-quirks.c   | 211 +++++++++++++++++++++++++++++++++------
 arch/x86/kernel/iosf_mbi.c       |   6 ++
 arch/x86/kernel/pci-calgary_64.c |  31 +++---
 include/drm/i915_drm.h           |  20 ++++
 6 files changed, 263 insertions(+), 43 deletions(-)
arch/x86/Kconfig +3 -2
index 0af5250..1487fdd 100644
@@ -2413,11 +2413,12 @@ config X86_DMA_REMAP
 	depends on STA2X11
 
 config IOSF_MBI
-	bool
+	bool "IOSF MBI support" if EXPERT
+	default y
 	depends on PCI
 	---help---
 	  To be selected by modules requiring access to the Intel OnChip System
-	  Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms
+	  Fabric (IOSF) Sideband MailBox Interface (MBI). For IOSF platforms
 	  enumerable by PCI.
 
 source "net/Kconfig"
arch/x86/include/asm/iosf_mbi.h +33 -0
index 8e71c79..9fc5402 100644
@@ -5,6 +5,8 @@
 #ifndef IOSF_MBI_SYMS_H
 #define IOSF_MBI_SYMS_H
 
+#ifdef CONFIG_IOSF_MBI
+
 #define MBI_MCR_OFFSET		0xD0
 #define MBI_MDR_OFFSET		0xD4
 #define MBI_MCRX_OFFSET		0xD8
@@ -50,6 +52,8 @@
 #define BT_MBI_PCIE_READ	0x00
 #define BT_MBI_PCIE_WRITE	0x01
 
+bool iosf_mbi_available(void);
+
 /**
  * iosf_mbi_read() - MailBox Interface read command
  * @port:	port indicating subunit being accessed
@@ -87,4 +91,33 @@ int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr);
  */
 int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask);
 
+#else /* CONFIG_IOSF_MBI is not enabled */
+static inline
+bool iosf_mbi_available(void)
+{
+	return false;
+}
+
+static inline
+int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr)
+{
+	WARN();
+	return -EPERM;
+}
+
+static inline
+int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr)
+{
+	WARN();
+	return -EPERM;
+}
+
+static inline
+int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask)
+{
+	WARN();
+	return -EPERM;
+}
+#endif /* CONFIG_IOSF_MBI */
+
 #endif /* IOSF_MBI_SYMS_H */
arch/x86/kernel/early-quirks.c +182 -29

244 lines not on this page · raw message

arch/x86/kernel/iosf_mbi.c +6 -0
index c3aae66..d3803c6 100644
@@ -177,6 +177,12 @@ int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask)
 }
 EXPORT_SYMBOL(iosf_mbi_modify);
 
+bool iosf_mbi_available(void)
+{
+	return mbi_pdev;
+}
+EXPORT_SYMBOL(iosf_mbi_available);
+
 static int iosf_mbi_probe(struct pci_dev *pdev,
 			  const struct pci_device_id *unused)
 {
arch/x86/kernel/pci-calgary_64.c +19 -12
index 299d493..0497f71 100644
@@ -1207,23 +1207,31 @@ error:
 	return ret;
 }
 
-static inline int __init determine_tce_table_size(u64 ram)
+static inline int __init determine_tce_table_size(void)
 {
 	int ret;
 
 	if (specified_table_size != TCE_TABLE_SIZE_UNSPECIFIED)
 		return specified_table_size;
 
-	/*
-	 * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to
-	 * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each
-	 * larger table size has twice as many entries, so shift the
-	 * max ram address by 13 to divide by 8K and then look at the
-	 * order of the result to choose between 0-7.
-	 */
-	ret = get_order(ram >> 13);
-	if (ret > TCE_TABLE_SIZE_8M)
+	if (is_kdump_kernel() && saved_max_pfn) {
+		/*
+		 * Table sizes are from 0 to 7 (TCE_TABLE_SIZE_64K to
+		 * TCE_TABLE_SIZE_8M). Table size 0 has 8K entries and each
+		 * larger table size has twice as many entries, so shift the
+		 * max ram address by 13 to divide by 8K and then look at the
+		 * order of the result to choose between 0-7.
+		 */
+		ret = get_order((saved_max_pfn * PAGE_SIZE) >> 13);
+		if (ret > TCE_TABLE_SIZE_8M)
+			ret = TCE_TABLE_SIZE_8M;
+	} else {
+		/*
+		 * Use 8M by default (suggested by Muli) if it's not
+		 * kdump kernel and saved_max_pfn isn't set.
+		 */
 		ret = TCE_TABLE_SIZE_8M;
+	}
 
 	return ret;
 }
@@ -1418,8 +1426,7 @@ int __init detect_calgary(void)
 		return -ENOMEM;
 	}
 
-	specified_table_size = determine_tce_table_size((is_kdump_kernel() ?
-					saved_max_pfn : max_pfn) * PAGE_SIZE);
+	specified_table_size = determine_tce_table_size();
 
 	for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {
 		struct calgary_bus_info *info = &bus_info[bus];
include/drm/i915_drm.h +20 -0
index 97d5497..595f85c 100644
@@ -56,6 +56,12 @@ extern bool i915_gpu_turbo_disable(void);
 
 #define I830_GMCH_CTRL			0x52
 
+#define I830_GMCH_GMS_MASK		0x70
+#define I830_GMCH_GMS_LOCAL		0x10
+#define I830_GMCH_GMS_STOLEN_512	0x20
+#define I830_GMCH_GMS_STOLEN_1024	0x30
+#define I830_GMCH_GMS_STOLEN_8192	0x40
+
 #define I855_GMCH_GMS_MASK		0xF0
 #define I855_GMCH_GMS_STOLEN_0M		0x0
 #define I855_GMCH_GMS_STOLEN_1M		(0x1 << 4)
@@ -72,4 +78,18 @@ extern bool i915_gpu_turbo_disable(void);
 #define INTEL_GMCH_GMS_STOLEN_224M	(0xc << 4)
 #define INTEL_GMCH_GMS_STOLEN_352M	(0xd << 4)
 
+#define I830_DRB3		0x63
+#define I85X_DRB3		0x43
+#define I865_TOUD		0xc4
+
+#define I830_ESMRAMC		0x91
+#define I845_ESMRAMC		0x9e
+#define I85X_ESMRAMC		0x61
+#define    TSEG_ENABLE		(1 << 0)
+#define    I830_TSEG_SIZE_512K	(0 << 1)
+#define    I830_TSEG_SIZE_1M	(1 << 1)
+#define    I845_TSEG_SIZE_MASK	(3 << 1)
+#define    I845_TSEG_SIZE_512K	(2 << 1)
+#define    I845_TSEG_SIZE_1M	(3 << 1)
+
 #endif				/* _I915_DRM_H_ */
#1 lore raw
Quoted 3 lines · Ingo Molnar

David E. Box (2):
x86, iosf: Change IOSF_MBI Kconfig to default y

Why? This change looks completely and utterly bogus.

That IOSF_MBI Kconfig value shouldn't be exposed at all, since it is supposed to be selected by modules that need it. And if it is exposed, why the f*ck should it be on by default? With no help messages about why you should enable it (quite the reverse)?

Guys, this is crap. It looks like another example of a developer who thinks that *his* particular meaningless code is _so_ so special that it needs to be enabled for everybody. That's utter bullshit, guys.

This is a Kconfig entry for a piece of hardware that

(a) people don't know about, so asking people about it is f*cking
retarded to begin with

(b) only exists on some Atom-based SoC chips, so it's not like we
expect *any* normal kernel developer to enable it unless they have special hardware

(c) if they have the hardware, they need to enable the drivers that
use this for the doorbell driver to be useful to begin with, so why the hell would you ask about this?

(d) the entry has no real documentation for what it is, and the docs
it *does* have explicitly state that the sane thing is for drivers (that people may actually be *aware* of and thus validly answer questions about) to select it.

Notice? Exposing it at all is a disgrace. making it "default y" is doubly so. Tell me _one_ reason for why it should have a question to begin with, and why it should default to "y".

And no, reasons like "I wrote this code and I love it so much that I want to force it on others" is not a valid reason.

Neither is "I hate all my users, and I want to terminally confuse them and discourage people from compiling their own kernels, so I'll ask annoying and idiotic questions at configure time".

Any _real_ reason?

In the absence of real reasons, I'm not pulling crap like this. Get your act together. Why the heck should _I_ be the one that notices that this commit is insane and stupid?

Yes, this is a pet peeve of mine. Our configuration phase is absolutely *the* single worst part of the kernel, and it's not because our Kconfig language is complex. It's because it scares people away from building their own kernels and testing, because we make it insanely hard to answer the questions, and we seem to actively encourage people to enable features that are pointless and just bloat things and make the build process slower and harder.

Christ, even *I* find our configuration process tedious. I can only imagine how many casual users we scare away.

This cavalier attitude about asking people idiotic questions MUST STOP. Seriously. This is not some "small harmless bug". This mindset of crazy questions is a major issue!

Linus

#2 lore raw

Hi Linus,

This one is largely my fault, but it is not for not asking the questions.

This patch is part of the work of modularizing the IOSF drivers, because of course standard distros don't want to compile them in. However, this results in odd problems when IOSF-aware drivers (some of which are present on non-IOSF hardware, as there are drivers that operate on both PCI and IOSF, some of which are still coming down the pipe toward mainline.)

It is these dual-mode drivers that make things a bit more complicated than it ought to be.

I have explicitly asked David to work on modularizing the IOSF core, even though it is small, exactly to avoid this mess. However, that change didn't make it in time, and I guess I should just have said "no" at that point.

I did not want to not have an option to disable it for EXPERT configurations, because we also have people working very hard at shaving down the size of the x86 kernel so that Linux rather than "random RTOS of the month" can be used in deep embedded configurations.

On this issue:

Quoted 2 lines

(a) people don't know about, so asking people about it is f*cking
retarded to begin with

Well, that is why it is an EXPERT option.

+ bool "IOSF MBI support" if EXPERT

-hpa

#3 lore raw
Quoted 5 lines · H. Peter Anvin
Quoted 3 lines

(a) people don't know about, so asking people about it is f*cking
retarded to begin with

Well, that is why it is an EXPERT option.

That's a cop-out. Because if you're *not* an expert, now it won't ask about it, but it will just enable it because it's "default y".

So you got rid of the question, but you silently enabled the code THAT MAKES NO SENSE FOR 99.9% of all users.

When I do "make oldconfig" on all my machines I sure as hell don't suddenly want to find some driver that makes no sense in my configuration.

See? It's stupid. It's wrong. It's *bad*.

And I'm not pulling stupid and wrong things (ok, well, I probably do pull bad stuff all the time, but at least not intentionally and knowingly).

Linus

#4 lore raw
Quoted 17 lines · Linus Torvalds
Quoted 5 lines · H. Peter Anvin
Quoted 3 lines

(a) people don't know about, so asking people about it is f*cking
retarded to begin with

Well, that is why it is an EXPERT option.

That's a cop-out. Because if you're *not* an expert, now it won't ask about it, but it will just enable it because it's "default y".

So you got rid of the question, but you silently enabled the code THAT MAKES NO SENSE FOR 99.9% of all users.

When I do "make oldconfig" on all my machines I sure as hell don't suddenly want to find some driver that makes no sense in my configuration.

Quoted 6 lines

See? It's stupid. It's wrong. It's *bad*.

And I'm not pulling stupid and wrong things (ok, well, I probably do pull bad stuff all the time, but at least not intentionally and knowingly).

Yes, please drop it. Next cycle we'll get it properly modularized.

-hpa

#5 lore raw
In reply to H. Peter Anvin

Hi Linus,

My apologies for not getting to address hpa's issues sooner. FWIW I simply didn't want to force a dependancy on the mbi driver for those drivers that run on both big core and soc systems, risking that the driver wouldn't run on big core systems that don't have the mbi compiled in. Luckily we should be able to make the mbi modular and simply default m and avoid this issue.

David Box

Quoted 33 lines · H. Peter Anvin

Hi Linus,

This one is largely my fault, but it is not for not asking the questions.

This patch is part of the work of modularizing the IOSF drivers, because of course standard distros don't want to compile them in. However, this results in odd problems when IOSF-aware drivers (some of which are present on non-IOSF hardware, as there are drivers that operate on both PCI and IOSF, some of which are still coming down the pipe toward mainline.)

It is these dual-mode drivers that make things a bit more complicated than it ought to be.

I have explicitly asked David to work on modularizing the IOSF core, even though it is small, exactly to avoid this mess. However, that change didn't make it in time, and I guess I should just have said "no" at that point.

I did not want to not have an option to disable it for EXPERT configurations, because we also have people working very hard at shaving down the size of the x86 kernel so that Linux rather than "random RTOS of the month" can be used in deep embedded configurations.

On this issue:

Quoted 2 lines

(a) people don't know about, so asking people about it is f*cking
retarded to begin with

Well, that is why it is an EXPERT option.

arch/x86/Kconfig +1 -0
+	bool "IOSF MBI support" if EXPERT

-hpa