Skip to contentSkip to conversation

drm/ast: Handle configuration without P2A bridge

PATCH Superseded Benjamin Herrenschmidt 2 participants 16 messages Feb 17, 2017 – Feb 18, 2017

Subsystems (3)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 drm/ast: Handle configuration without P2A bridge

The ast driver configures a window to enable access into BMC memory space in order to read some configuration registers.

If this window is disabled, which it can be from the BMC side, the ast driver can't function.

Closing this window is a necessity for security if a machine's host side and BMC side are controlled by different parties; i.e. a cloud provider offering machines "bare metal".

A recent patch went in to try to check if that window is open but it does so by trying to access the registers in question and testing if the result is 0xffffffff.

This method will trigger a PCIe error when the window is closed which on some systems will be fatal (it will trigger an EEH for example on POWER which will take out the device).

This patch improves this in two ways:

- First, if the firmware has put properties in the device-tree
containing the relevant configuration information, we use these.

- Otherwise, a bit in one of the SCU scratch registers (which
are readable via the VGA register space and writeable by the BMC) will indicate if the BMC has closed the window. This bit has been defined by Y.C Chen from Aspeed.

If the window is closed and the configuration isn't available from the device-tree, some sane defaults are used. Those defaults are hopefully sufficient for standard video modes used on a server.

--

v2. [BenH]
- Reworked on top of Aspeed P2A patch
- Cleanup overall detection via a "config_mode" and log the selected mode for diagnostics purposes
- Add a property for the SCU straps

v3. [BenH]
- Moved the config mode detection to a separate functionn
- Add reading of SCU 0x40 D[12] to detect the window is closed as to not trigger a bus error by just "trying". (change provided by Y.C. Chen)

---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +-
 drivers/gpu/drm/ast/ast_main.c | 223 +++++++++++++++++++++++++----------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-
 3 files changed, 141 insertions(+), 95 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +5 -1
index 7abda94..3bedcf7 100644
@@ -113,7 +113,11 @@ struct ast_private {
 	struct ttm_bo_kmap_obj cache_kmap;
 	int next_cursor;
 	bool support_wide_screen;
-	bool DisableP2A;
+	enum {
+		ast_use_p2a,
+		ast_use_dt,
+		ast_use_defaults
+	} config_mode;
 
 	enum ast_tx_chip tx_chip_type;
 	u8 dp501_maxclk;
drivers/gpu/drm/ast/ast_main.c +134 -89

273 lines not on this page · raw message

drivers/gpu/drm/ast/ast_post.c +2 -5
index 5331ee1..7197635 100644
@@ -379,17 +379,14 @@ void ast_post_gpu(struct drm_device *dev)
 	ast_open_key(ast);
 	ast_set_def_ext_reg(dev);
 
-	if (ast->DisableP2A == false)
-	{
+	if (ast->config_mode == ast_use_p2a) {
 		if (ast->chip == AST2300 || ast->chip == AST2400)
 			ast_init_dram_2300(dev);
 		else
 			ast_init_dram_reg(dev);
 
 		ast_init_3rdtx(dev);
-	}
-	else
-	{
+	} else {
 		if (ast->tx_chip_type != AST_TX_NONE)
 			ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80);	/* Enable DVO */
 	}
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/9 drm/ast: const'ify mode setting tables

And fix some comment alignment & space/tabs while at it

---
 drivers/gpu/drm/ast/ast_drv.h    |   4 +-
 drivers/gpu/drm/ast/ast_mode.c   |   8 +--
 drivers/gpu/drm/ast/ast_tables.h | 106 +++++++++++++++++++--------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +2 -2
index 3bedcf7..3fd9d6e 100644
@@ -304,8 +304,8 @@ struct ast_vbios_dclk_info {
 };
 
 struct ast_vbios_mode_info {
-	struct ast_vbios_stdtable *std_table;
-	struct ast_vbios_enhtable *enh_table;
+	const struct ast_vbios_stdtable *std_table;
+	const struct ast_vbios_enhtable *enh_table;
 };
 
 extern int ast_mode_init(struct drm_device *dev);
drivers/gpu/drm/ast/ast_mode.c +4 -4
index e26c98f..1ff596e 100644
@@ -80,9 +80,9 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
 {
 	struct ast_private *ast = crtc->dev->dev_private;
 	u32 refresh_rate_index = 0, mode_id, color_index, refresh_rate;
+	const struct ast_vbios_enhtable *best = NULL;
 	u32 hborder, vborder;
 	bool check_sync;
-	struct ast_vbios_enhtable *best = NULL;
 
 	switch (crtc->primary->fb->bits_per_pixel) {
 	case 8:
@@ -146,7 +146,7 @@ static bool ast_get_vbios_mode_info(struct drm_crtc *crtc, struct drm_display_mo
 	refresh_rate = drm_mode_vrefresh(mode);
 	check_sync = vbios_mode->enh_table->flags & WideScreenMode;
 	do {
-		struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
+		const struct ast_vbios_enhtable *loop = vbios_mode->enh_table;
 
 		while (loop->refresh_rate != 0xff) {
 			if ((check_sync) &&
@@ -225,7 +225,7 @@ static void ast_set_std_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
 			    struct ast_vbios_mode_info *vbios_mode)
 {
 	struct ast_private *ast = crtc->dev->dev_private;
-	struct ast_vbios_stdtable *stdtable;
+	const struct ast_vbios_stdtable *stdtable;
 	u32 i;
 	u8 jreg;
 
@@ -381,7 +381,7 @@ static void ast_set_dclk_reg(struct drm_device *dev, struct drm_display_mode *mo
 			     struct ast_vbios_mode_info *vbios_mode)
 {
 	struct ast_private *ast = dev->dev_private;
-	struct ast_vbios_dclk_info *clk_info;
+	const struct ast_vbios_dclk_info *clk_info;
 
 	clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
 
drivers/gpu/drm/ast/ast_tables.h +53 -53

188 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/9
#2 lore raw

Re: [PATCH 2/9] drm/ast: const'ify mode setting tables

Quoted 3 lines · Benjamin Herrenschmidt

And fix some comment alignment & space/tabs while at it

Could have kept the white space changes separate, but that's me being pedantic :-]
Either way:

-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

PATCH 3/9 drm/ast: Remove spurrious include

In reply to Benjamin Herrenschmidt
---
 drivers/gpu/drm/ast/ast_main.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/ast/ast_main.c +0 -2
index 823c68f..b593a53 100644
@@ -32,8 +32,6 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 
-#include "ast_dram_tables.h"
-
 void ast_set_index_reg_mask(struct ast_private *ast,
 			    uint32_t base, uint8_t index,
 			    uint8_t mask, uint8_t val)
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#5 lore raw

PATCH 4/9 drm/ast: Fix calculation of MCLK

In reply to Benjamin Herrenschmidt

Some braces were missing causing an incorrect calculation.

Y.C. Chen from Aspeed provided me with the right formula which I tested on AST2400 and 2500.

The MCLK isn't currently used by the driver (it will eventually to filter modes) so the issue isn't catastrophic.

Also make the printed value a bit more meaningful

---
 drivers/gpu/drm/ast/ast_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_main.c +4 -2
index b593a53..eb6ba3e 100644
@@ -341,7 +341,7 @@ static int ast_get_dram_info(struct drm_device *dev)
 		div = 0x1;
 		break;
 	}
-	ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
+	ast->mclk = ref_pll * (num + 2) / ((denum + 2) * (div * 1000));
 	return 0;
 }
 
@@ -485,7 +485,9 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
 		if (ret)
 			goto out_free;
 		ast->vram_size = ast_get_vram_info(dev);
-		DRM_INFO("dram %d %d %d %08x\n", ast->mclk, ast->dram_type, ast->dram_bus_width, ast->vram_size);
+		DRM_INFO("dram MCLK=%u Mhz type=%d bus_width=%d size=%08x\n",
+			 ast->mclk, ast->dram_type,
+			 ast->dram_bus_width, ast->vram_size);
 	}
 
 	if (need_post)
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 4/9
#6 lore raw

Re: [PATCH 4/9] drm/ast: Fix calculation of MCLK

Quoted 11 lines · Benjamin Herrenschmidt

Some braces were missing causing an incorrect calculation.

Y.C. Chen from Aspeed provided me with the right formula which I tested on AST2400 and 2500.

The MCLK isn't currently used by the driver (it will eventually to filter modes) so the issue isn't catastrophic.

Also make the printed value a bit more meaningful

-Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#7 lore raw

PATCH 5/9 drm/ast: Base support for AST2500

In reply to Benjamin Herrenschmidt

From: "Y.C. Chen" <[email protected]>

Add detection and mode setting updates for AST2500 generation chip, code originally from Aspeed and slightly reworked for coding style mostly by Ben. This doesn't contain the BMC DRAM POST code which is in a separate patch.

---

---
 drivers/gpu/drm/ast/ast_drv.h    |  2 ++
 drivers/gpu/drm/ast/ast_main.c   | 27 +++++++++++++++++--
 drivers/gpu/drm/ast/ast_mode.c   | 30 ++++++++++++++++-----
 drivers/gpu/drm/ast/ast_tables.h | 58 +++++++++++++++++++++++++++++++++-------
 4 files changed, 99 insertions(+), 18 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +2 -0
index 3fd9d6e..d1c1d53 100644
@@ -64,6 +64,7 @@ enum ast_chip {
 	AST2150,
 	AST2300,
 	AST2400,
+	AST2500,
 	AST1180,
 };
 
@@ -80,6 +81,7 @@ enum ast_tx_chip {
 #define AST_DRAM_1Gx32   3
 #define AST_DRAM_2Gx16   6
 #define AST_DRAM_4Gx16   7
+#define AST_DRAM_8Gx16   8
 
 struct ast_fbdev;
 
drivers/gpu/drm/ast/ast_main.c +25 -2
index eb6ba3e..f9128b9 100644
@@ -116,7 +116,10 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 		ast->chip = AST1100;
 		DRM_INFO("AST 1180 detected\n");
 	} else {
-		if (dev->pdev->revision >= 0x30) {
+		if (dev->pdev->revision >= 0x40) {
+			ast->chip = AST2500;
+			DRM_INFO("AST 2500 detected\n");
+		} else if (dev->pdev->revision >= 0x30) {
 			ast->chip = AST2400;
 			DRM_INFO("AST 2400 detected\n");
 		} else if (dev->pdev->revision >= 0x20) {
@@ -184,6 +187,9 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
 			if (ast->chip == AST2400 &&
 			    (scu_rev & 0x300) == 0x100) /* ast1400 */
 				ast->support_wide_screen = true;
+			if (ast->chip == AST2500 &&
+			    scu_rev == 0x100)           /* ast2510 */
+				ast->support_wide_screen = true;
 		}
 		break;
 	}
@@ -287,7 +293,23 @@ static int ast_get_dram_info(struct drm_device *dev)
 	else
 		ast->dram_bus_width = 32;
 
-	if (ast->chip == AST2300 || ast->chip == AST2400) {
+	if (ast->chip == AST2500) {
+		switch (mcr_cfg & 0x03) {
+		case 0:
+			ast->dram_type = AST_DRAM_1Gx16;
+			break;
+		default:
+		case 1:
+			ast->dram_type = AST_DRAM_2Gx16;
+			break;
+		case 2:
+			ast->dram_type = AST_DRAM_4Gx16;
+			break;
+		case 3:
+			ast->dram_type = AST_DRAM_8Gx16;
+			break;
+		}
+	} else if (ast->chip == AST2300 || ast->chip == AST2400) {
 		switch (mcr_cfg & 0x03) {
 		case 0:
 			ast->dram_type = AST_DRAM_512Mx16;
@@ -510,6 +532,7 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
 	    ast->chip == AST2200 ||
 	    ast->chip == AST2300 ||
 	    ast->chip == AST2400 ||
+	    ast->chip == AST2500 ||
 	    ast->chip == AST1180) {
 		dev->mode_config.max_width = 1920;
 		dev->mode_config.max_height = 2048;
drivers/gpu/drm/ast/ast_mode.c +23 -7
index 1ff596e..e4db1c72 100644
@@ -271,7 +271,11 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
 {
 	struct ast_private *ast = crtc->dev->dev_private;
 	u8 jreg05 = 0, jreg07 = 0, jreg09 = 0, jregAC = 0, jregAD = 0, jregAE = 0;
-	u16 temp;
+	u16 temp, precache = 0;
+
+	if ((ast->chip == AST2500) &&
+	    (vbios_mode->enh_table->flags & AST2500PreCatchCRT))
+		precache = 40;
 
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x00);
 
@@ -297,12 +301,12 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
 		jregAD |= 0x01;  /* HBE D[5] */
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x03, 0xE0, (temp & 0x1f));
 
-	temp = (mode->crtc_hsync_start >> 3) - 1;
+	temp = ((mode->crtc_hsync_start-precache) >> 3) - 1;
 	if (temp & 0x100)
 		jregAC |= 0x40; /* HRS D[5] */
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x04, 0x00, temp);
 
-	temp = ((mode->crtc_hsync_end >> 3) - 1) & 0x3f;
+	temp = (((mode->crtc_hsync_end-precache) >> 3) - 1) & 0x3f;
 	if (temp & 0x20)
 		jregAD |= 0x04; /* HRE D[5] */
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x05, 0x60, (u8)((temp & 0x1f) | jreg05));
@@ -363,6 +367,11 @@ static void ast_set_crtc_reg(struct drm_crtc *crtc, struct drm_display_mode *mod
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x09, 0xdf, jreg09);
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xAE, 0x00, (jregAE | 0x80));
 
+	if (precache)
+		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x80);
+	else
+		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0x3f, 0x00);
+
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0x11, 0x7f, 0x80);
 }
 
@@ -383,12 +392,16 @@ static void ast_set_dclk_reg(struct drm_device *dev, struct drm_display_mode *mo
 	struct ast_private *ast = dev->dev_private;
 	const struct ast_vbios_dclk_info *clk_info;
 
-	clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
+	if (ast->chip == AST2500)
+		clk_info = &dclk_table_ast2500[vbios_mode->enh_table->dclk_index];
+	else
+		clk_info = &dclk_table[vbios_mode->enh_table->dclk_index];
 
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc0, 0x00, clk_info->param1);
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xc1, 0x00, clk_info->param2);
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xbb, 0x0f,
-			       (clk_info->param3 & 0x80) | ((clk_info->param3 & 0x3) << 4));
+			       (clk_info->param3 & 0xc0) |
+			       ((clk_info->param3 & 0x3) << 4));
 }
 
 static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode,
@@ -421,7 +434,8 @@ static void ast_set_ext_reg(struct drm_crtc *crtc, struct drm_display_mode *mode
 	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa8, 0xfd, jregA8);
 
 	/* Set Threshold */
-	if (ast->chip == AST2300 || ast->chip == AST2400) {
+	if (ast->chip == AST2300 || ast->chip == AST2400 ||
+	    ast->chip == AST2500) {
 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa7, 0x78);
 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa6, 0x60);
 	} else if (ast->chip == AST2100 ||
@@ -794,7 +808,9 @@ static int ast_mode_valid(struct drm_connector *connector,
 		if ((mode->hdisplay == 1600) && (mode->vdisplay == 900))
 			return MODE_OK;
 
-		if ((ast->chip == AST2100) || (ast->chip == AST2200) || (ast->chip == AST2300) || (ast->chip == AST2400) || (ast->chip == AST1180)) {
+		if ((ast->chip == AST2100) || (ast->chip == AST2200) ||
+		    (ast->chip == AST2300) || (ast->chip == AST2400) ||
+		    (ast->chip == AST2500) || (ast->chip == AST1180)) {
 			if ((mode->hdisplay == 1920) && (mode->vdisplay == 1080))
 				return MODE_OK;
 
drivers/gpu/drm/ast/ast_tables.h +49 -9

112 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#8 lore raw

PATCH 6/9 drm/ast: Factor mmc_test code in POST code

In reply to Benjamin Herrenschmidt

There's a lot of duplication for what's essentially N copies of the same loop, so factor it. The upcoming AST2500 POST code adds more of this.

---
 drivers/gpu/drm/ast/ast_post.c | 76 ++++++++++++------------------------------
 1 file changed, 22 insertions(+), 54 deletions(-)
drivers/gpu/drm/ast/ast_post.c +22 -54
index 7197635..33ea1ea 100644
@@ -445,85 +445,53 @@ static const u32 pattern[8] = {
 	0x7C61D253
 };
 
-static int mmc_test_burst(struct ast_private *ast, u32 datagen)
+static int mmc_test(struct ast_private *ast, u32 datagen, u8 test_ctl)
 {
 	u32 data, timeout;
 
 	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x000000c1 | (datagen << 3));
+	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
 	timeout = 0;
 	do {
 		data = ast_mindwm(ast, 0x1e6e0070) & 0x3000;
 		if (data & 0x2000) {
-			return 0;
+			return -1;
 		}
 		if (++timeout > TIMEOUT) {
 			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-			return 0;
+			return -1;
 		}
 	} while (!data);
+	data = ast_mindwm(ast, 0x1e6e0078);
+	data = (data | (data >> 16)) & 0xffff;
 	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	return 1;
+	return data;
 }
 
-static int mmc_test_burst2(struct ast_private *ast, u32 datagen)
+
+static int mmc_test_burst(struct ast_private *ast, u32 datagen)
 {
-	u32 data, timeout;
+	return mmc_test(ast, datagen, 0xc1);
+}
 
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000041 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
-		if (++timeout > TIMEOUT) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x0);
-			return -1;
-		}
-	} while (!data);
-	data = ast_mindwm(ast, 0x1e6e0078);
-	data = (data | (data >> 16)) & 0xffff;
-	ast_moutdwm(ast, 0x1e6e0070, 0x0);
-	return data;
+static int mmc_test_burst2(struct ast_private *ast, u32 datagen)
+{
+	return mmc_test(ast, datagen, 0x41);
 }
 
 static int mmc_test_single(struct ast_private *ast, u32 datagen)
 {
-	u32 data, timeout;
-
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x000000c5 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x3000;
-		if (data & 0x2000)
-			return 0;
-		if (++timeout > TIMEOUT) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x0);
-			return 0;
-		}
-	} while (!data);
-	ast_moutdwm(ast, 0x1e6e0070, 0x0);
-	return 1;
+	return mmc_test(ast, datagen, 0xc5);
 }
 
 static int mmc_test_single2(struct ast_private *ast, u32 datagen)
 {
-	u32 data, timeout;
+	return mmc_test(ast, datagen, 0x05);
+}
 
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000005 | (datagen << 3));
-	timeout = 0;
-	do {
-		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
-		if (++timeout > TIMEOUT) {
-			ast_moutdwm(ast, 0x1e6e0070, 0x0);
-			return -1;
-		}
-	} while (!data);
-	data = ast_mindwm(ast, 0x1e6e0078);
-	data = (data | (data >> 16)) & 0xffff;
-	ast_moutdwm(ast, 0x1e6e0070, 0x0);
-	return data;
+static int mmc_test_single_2500(struct ast_private *ast, u32 datagen)
+{
+	return mmc_test(ast, datagen, 0x85);
 }
 
 static int cbr_test(struct ast_private *ast)
@@ -603,9 +571,9 @@ static u32 cbr_scan2(struct ast_private *ast)
 
 static u32 cbr_test3(struct ast_private *ast)
 {
-	if (!mmc_test_burst(ast, 0))
+	if (mmc_test_burst(ast, 0) < 0)
 		return 0;
-	if (!mmc_test_single(ast, 0))
+	if (mmc_test_single(ast, 0) < 0)
 		return 0;
 	return 1;
 }
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#9 lore raw

Re: [PATCH 6/9] drm/ast: Factor mmc_test code in POST code

Quoted 5 lines · Benjamin Herrenschmidt

There's a lot of duplication for what's essentially N copies of the same loop, so factor it. The upcoming AST2500 POST code adds more of this.

Here is where things go fun:

Original code does the following data flexing only for the mmc_*test2 code, while this patch adds it to both test and test2.

       data = ast_mindwm(...);
       data = (data | (data >> 16)) & 0xffff;
//       ast_moutdwm(...);
       return data;

Afaict you have addressed that in the github branch/patch so things are back to normal.
Tests are still a bit magical but not much you can/should do about it.

Regards,
Emil
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#10 lore raw

Re: [PATCH 6/9] drm/ast: Factor mmc_test code in POST code

Quoted 7 lines · Emil Velikov

Original code does the following data flexing only for the mmc_*test2 code, while this patch adds it to both test and test2.

       data = ast_mindwm(...);
       data = (data | (data >> 16)) & 0xffff;
//       ast_moutdwm(...);
       return data;

Actually that reading of the data isn't much of a problem from my understanding of the spec, however it's the different exit condition of the loop that could be.

Cheers,
Ben.

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#11 lore raw

PATCH 7/9 drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300

In reply to Benjamin Herrenschmidt

The function does more than initializing the DRAM and in turns calls other functions to do the actual init. This will keeping things more consistent with the upcoming AST2500 POST code.

---
 drivers/gpu/drm/ast/ast_post.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_post.c +3 -3
index 33ea1ea..a36a544 100644
@@ -31,7 +31,7 @@
 
 #include "ast_dram_tables.h"
 
-static void ast_init_dram_2300(struct drm_device *dev);
+static void ast_post_chip_2300(struct drm_device *dev);
 
 void ast_enable_vga(struct drm_device *dev)
 {
@@ -381,7 +381,7 @@ void ast_post_gpu(struct drm_device *dev)
 
 	if (ast->config_mode == ast_use_p2a) {
 		if (ast->chip == AST2300 || ast->chip == AST2400)
-			ast_init_dram_2300(dev);
+			ast_post_chip_2300(dev);
 		else
 			ast_init_dram_reg(dev);
 
@@ -1577,7 +1577,7 @@ static void ddr2_init(struct ast_private *ast, struct ast2300_dram_param *param)
 
 }
 
-static void ast_init_dram_2300(struct drm_device *dev)
+static void ast_post_chip_2300(struct drm_device *dev)
 {
 	struct ast_private *ast = dev->dev_private;
 	struct ast2300_dram_param param;
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#12 lore raw

PATCH 8/9 drm/ast: POST code for the new AST2500

In reply to Benjamin Herrenschmidt

From: "Y.C. Chen" <[email protected]>

This is used when the BMC isn't running any code and thus has to be initialized by the host.

The code originates from Aspeed (Y.C. Chen) and has been cleaned up for coding style purposes by BenH.

---
 drivers/gpu/drm/ast/ast_dram_tables.h |  62 +++++
 drivers/gpu/drm/ast/ast_post.c        | 410 +++++++++++++++++++++++++++++++++-
 2 files changed, 470 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_dram_tables.h +62 -0
index cc04539..1d9c4e7 100644
@@ -141,4 +141,66 @@ static const struct ast_dramstruct ast2100_dram_table_data[] = {
 	{ 0xffff, 0xffffffff },
 };
 
+/*
+ * AST2500 DRAM settings modules
+ */
+#define REGTBL_NUM           17
+#define REGIDX_010           0
+#define REGIDX_014           1
+#define REGIDX_018           2
+#define REGIDX_020           3
+#define REGIDX_024           4
+#define REGIDX_02C           5
+#define REGIDX_030           6
+#define REGIDX_214           7
+#define REGIDX_2E0           8
+#define REGIDX_2E4           9
+#define REGIDX_2E8           10
+#define REGIDX_2EC           11
+#define REGIDX_2F0           12
+#define REGIDX_2F4           13
+#define REGIDX_2F8           14
+#define REGIDX_RFC           15
+#define REGIDX_PLL           16
+
+static const u32 ast2500_ddr3_1600_timing_table[REGTBL_NUM] = {
+	0x64604D38,		     /* 0x010 */
+	0x29690599,		     /* 0x014 */
+	0x00000300,		     /* 0x018 */
+	0x00000000,		     /* 0x020 */
+	0x00000000,		     /* 0x024 */
+	0x02181E70,		     /* 0x02C */
+	0x00000040,		     /* 0x030 */
+	0x00000024,		     /* 0x214 */
+	0x02001300,		     /* 0x2E0 */
+	0x0E0000A0,		     /* 0x2E4 */
+	0x000E001B,		     /* 0x2E8 */
+	0x35B8C105,		     /* 0x2EC */
+	0x08090408,		     /* 0x2F0 */
+	0x9B000800,		     /* 0x2F4 */
+	0x0E400A00,		     /* 0x2F8 */
+	0x9971452F,		     /* tRFC  */
+	0x000071C1		     /* PLL   */
+};
+
+static const u32 ast2500_ddr4_1600_timing_table[REGTBL_NUM] = {
+	0x63604E37,		     /* 0x010 */
+	0xE97AFA99,		     /* 0x014 */
+	0x00019000,		     /* 0x018 */
+	0x08000000,		     /* 0x020 */
+	0x00000400,		     /* 0x024 */
+	0x00000410,		     /* 0x02C */
+	0x00000101,		     /* 0x030 */
+	0x00000024,		     /* 0x214 */
+	0x03002900,		     /* 0x2E0 */
+	0x0E0000A0,		     /* 0x2E4 */
+	0x000E001C,		     /* 0x2E8 */
+	0x35B8C106,		     /* 0x2EC */
+	0x08080607,		     /* 0x2F0 */
+	0x9B000900,		     /* 0x2F4 */
+	0x0E400A00,		     /* 0x2F8 */
+	0x99714545,		     /* tRFC  */
+	0x000071C1		     /* PLL   */
+};
+
 #endif
drivers/gpu/drm/ast/ast_post.c +408 -2

437 lines not on this page · raw message

Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#13 lore raw

PATCH 9/9 drm/ast: Fixed vram size incorrect issue on POWER

In reply to Benjamin Herrenschmidt

From: "Y.C. Chen" <[email protected]>

The default value of VGA scratch may incorrect.
Should initial h/w before get vram info.

---
 drivers/gpu/drm/ast/ast_main.c | 6 +++---
 drivers/gpu/drm/ast/ast_post.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/ast/ast_main.c +3 -3
index f9128b9..839e456 100644
@@ -502,6 +502,9 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
 
 	ast_detect_chip(dev, &need_post);
 
+	if (need_post)
+		ast_post_gpu(dev);
+
 	if (ast->chip != AST1180) {
 		ret = ast_get_dram_info(dev);
 		if (ret)
@@ -512,9 +515,6 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)
 			 ast->dram_bus_width, ast->vram_size);
 	}
 
-	if (need_post)
-		ast_post_gpu(dev);
-
 	ret = ast_mm_init(ast);
 	if (ret)
 		goto out_free;
drivers/gpu/drm/ast/ast_post.c +1 -1
index 484138b..90000f9 100644
@@ -80,7 +80,7 @@ ast_set_def_ext_reg(struct drm_device *dev)
 	const u8 *ext_reg_info;
 
 	/* reset scratch */
-	for (i = 0x81; i <= 0x8f; i++)
+	for (i = 0x81; i <= 0x9f; i++)
 		ast_set_index_reg(ast, AST_IO_CRTC_PORT, i, 0x00);
 
 	if (ast->chip == AST2300 || ast->chip == AST2400 ||
Signature · 6 lines
2.9.3

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#14 lore raw
In reply to Benjamin Herrenschmidt

On Fri, 2017-02-17 at 16:32 +1100, Benjamin Herrenschmidt wrote:

Make this

From: Russell Currey <[email protected]>

Git ate it when I amended (citool bug) and I forgot to fix it up.

Quoted 401 lines

The ast driver configures a window to enable access into BMC memory space in order to read some configuration registers.

If this window is disabled, which it can be from the BMC side, the ast driver can't function.

Closing this window is a necessity for security if a machine's host side and BMC side are controlled by different parties; i.e. a cloud provider offering machines "bare metal".

A recent patch went in to try to check if that window is open but it does so by trying to access the registers in question and testing if the result is 0xffffffff.

This method will trigger a PCIe error when the window is closed which on some systems will be fatal (it will trigger an EEH for example on POWER which will take out the device).

This patch improves this in two ways:

 - First, if the firmware has put properties in the device-tree containing the relevant configuration information, we use these.

 - Otherwise, a bit in one of the SCU scratch registers (which are readable via the VGA register space and writeable by the BMC) will indicate if the BMC has closed the window. This bit has been defined by Y.C Chen from Aspeed.

If the window is closed and the configuration isn't available from the device-tree, some sane defaults are used. Those defaults are hopefully sufficient for standard video modes used on a server.

--

v2. [BenH]
    - Reworked on top of Aspeed P2A patch
    - Cleanup overall detection via a "config_mode" and log the selected mode for diagnostics purposes
    - Add a property for the SCU straps

v3. [BenH]
    - Moved the config mode detection to a separate functionn
    - Add reading of SCU 0x40 D[12] to detect the window is closed as to not trigger a bus error by just "trying". (change provided by Y.C. Chen)
---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +- drivers/gpu/drm/ast/ast_main.c | 223 +++++++++++++++++++++++++----
------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-

 3 files changed, 141 insertions(+), 95 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +5 -1
index 7abda94..3bedcf7 100644
@@ -113,7 +113,11 @@ struct ast_private {
  	struct ttm_bo_kmap_obj cache_kmap;
  	int next_cursor;
  	bool support_wide_screen;
-	bool DisableP2A;
+	enum {
+		ast_use_p2a,
+		ast_use_dt,
+		ast_use_defaults
+	} config_mode;


  enum ast_tx_chip tx_chip_type;
  u8 dp501_maxclk;

drivers/gpu/drm/ast/ast_main.c +0 -0
index 533e762..823c68f 100644
@@ -62,13 +62,58 @@ uint8_t ast_get_index_reg_mask(struct ast_private
 *ast,
  	return ret;
  }


+static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)

drivers/gpu/drm/ast/ast_main.c +7 -0
+{
+	struct device_node *np = dev->pdev->dev.of_node;
+	struct ast_private *ast = dev->dev_private;
+	uint32_t data, jreg;
+
+	/* Check if we have device-tree properties */
+	if (np && !of_property_read_u32(np, "ast,scu-revision-id",

scu_rev)) {

drivers/gpu/drm/ast/ast_main.c +11 -0
+		/* We do, disable P2A access */
+		ast->config_mode = ast_use_dt;
+		DRM_INFO("Using device-tree for configuration\n");
+		return;
+	}
+
+	/*
+	 * The BMC will set SCU 0x40 D[12] to 1 if the P2 bridge
+	 * is disabled
+	 */
+	jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1,

0xff);

drivers/gpu/drm/ast/ast_main.c +8 -0
+	if (!(jreg & 0x10)) {
+		/* Double check it's actually working */
+		data = ast_read32(ast, 0xf004);
+		if (data != 0xFFFFFFFF) {
+			/* P2A works, grab silicon revision */
+			ast->config_mode = ast_use_p2a;
+
+			DRM_INFO("Using P2A bridge for

configuration\n");

drivers/gpu/drm/ast/ast_main.c +10 -0
+
+			/* Read SCU7c (silicon revision register) */
+			ast_write32(ast, 0xf004, 0x1e6e0000);
+			ast_write32(ast, 0xf000, 0x1);
+			*scu_rev = ast_read32(ast, 0x1207c);
+			return;
+		}
+	}
+
+	DRM_INFO("P2A bridge disabled, using default

configuration\n");

drivers/gpu/drm/ast/ast_main.c +3 -0
+	ast->config_mode = ast_use_defaults;
+	*scu_rev = 0xffffffff;
+}


 static int ast_detect_chip(struct drm_device *dev, bool *need_post) {
  struct ast_private *ast = dev->dev_private;

drivers/gpu/drm/ast/ast_main.c +2 -1
-	uint32_t data, jreg;
+	uint32_t jreg, scu_rev;
+

  ast_open_key(ast);

drivers/gpu/drm/ast/ast_main.c +1 -0
+	/* Find out whether P2A works or whether to use device-tree

*/

drivers/gpu/drm/ast/ast_main.c +3 -0
+	ast_detect_config_mode(dev, &scu_rev);
+
+	/* Identify chipset */

  if (dev->pdev->device == PCI_CHIP_AST1180) { ast->chip = AST1100; DRM_INFO("AST 1180 detected\n");

drivers/gpu/drm/ast/ast_main.c +1 -6
@@ -80,12 +125,7 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  			ast->chip = AST2300;
  			DRM_INFO("AST 2300 detected\n");
  		} else if (dev->pdev->revision >= 0x10) {
-			uint32_t data;
-			ast_write32(ast, 0xf004, 0x1e6e0000);
-			ast_write32(ast, 0xf000, 0x1);
-
-			data = ast_read32(ast, 0x1207c);
-			switch (data & 0x0300) {
+			switch (scu_rev & 0x0300) {

  case 0x0200:
  ast->chip = AST1100; DRM_INFO("AST 1100 detected\n");

drivers/gpu/drm/ast/ast_main.c +0 -0
@@ -124,12 +164,6 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  	} else
  		*need_post = false;

drivers/gpu/drm/ast/ast_main.c +0 -6
-	/* Check P2A Access */
-	ast->DisableP2A = true;
-	data = ast_read32(ast, 0xf004);
-	if (data != 0xFFFFFFFF)
-		ast->DisableP2A = false;
-

  /* Check if we support wide screen */
  switch (ast->chip) {
  case AST1180:

drivers/gpu/drm/ast/ast_main.c +0 -2
@@ -146,17 +180,12 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  			ast->support_wide_screen = true;
  		else {
  			ast->support_wide_screen = false;
-			if (ast->DisableP2A == false) {
-				/* Read SCU7c (silicon revision

register) */

drivers/gpu/drm/ast/ast_main.c +0 -1
-				ast_write32(ast, 0xf004,

0x1e6e0000);

drivers/gpu/drm/ast/ast_main.c +0 -4
-				ast_write32(ast, 0xf000, 0x1);
-				data = ast_read32(ast, 0x1207c);
-				data &= 0x300;
-				if (ast->chip == AST2300 && data ==

0x0) /* ast1300 */

drivers/gpu/drm/ast/ast_main.c +0 -1
-					ast->support_wide_screen =

true;

drivers/gpu/drm/ast/ast_main.c +0 -1
-				if (ast->chip == AST2400 && data ==

0x100) /* ast1400 */

drivers/gpu/drm/ast/ast_main.c +0 -1
-					ast->support_wide_screen =

true;

drivers/gpu/drm/ast/ast_main.c +5 -1
-			}
+			if (ast->chip == AST2300 &&
+			    (scu_rev & 0x300) == 0x0) /* ast1300 */
+				ast->support_wide_screen = true;
+			if (ast->chip == AST2400 &&
+			    (scu_rev & 0x300) == 0x100) /* ast1400

*/

drivers/gpu/drm/ast/ast_main.c +1 -0
+				ast->support_wide_screen = true;

  }
  break;
  }

drivers/gpu/drm/ast/ast_main.c +0 -0
@@ -220,85 +249,101 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)


 static int ast_get_dram_info(struct drm_device *dev) {

drivers/gpu/drm/ast/ast_main.c +1 -0
+	struct device_node *np = dev->pdev->dev.of_node;

  struct ast_private *ast = dev->dev_private;

drivers/gpu/drm/ast/ast_main.c +2 -2
-	uint32_t data, data2;
-	uint32_t denum, num, div, ref_pll;
+	uint32_t mcr_cfg, mcr_scu_mpll, mcr_scu_strap;
+	uint32_t denum, num, div, ref_pll, dsel;

drivers/gpu/drm/ast/ast_main.c +7 -2
-	if (ast->DisableP2A)
-	{
+	switch (ast->config_mode) {
+	case ast_use_dt:
+		/*
+		 * If some properties are missing, use reasonable
+		 * defaults for AST2400
+		 */
+		if (of_property_read_u32(np, "ast,mcr-

configuration", &mcr_cfg))

drivers/gpu/drm/ast/ast_main.c +5 -0
+			mcr_cfg = 0x00000577;
+		if (of_property_read_u32(np, "ast,ast,mcr-scu-mpll",
+					 &mcr_scu_mpll))
+			mcr_scu_mpll = 0x000050C0;
+		if (of_property_read_u32(np, "ast,ast,mcr-scu-

strap",

drivers/gpu/drm/ast/ast_main.c +12 -0
+					 &mcr_scu_strap))
+			mcr_scu_strap = 0;
+		break;
+	case ast_use_p2a:
+		ast_write32(ast, 0xf004, 0x1e6e0000);
+		ast_write32(ast, 0xf000, 0x1);
+		mcr_cfg = ast_read32(ast, 0x10004);
+		mcr_scu_mpll = ast_read32(ast, 0x10120);
+		mcr_scu_strap = ast_read32(ast, 0x10170);
+		break;
+	case ast_use_defaults:
+	default:

  ast->dram_bus_width = 16;
  ast->dram_type = AST_DRAM_1Gx16;
  ast->mclk = 396;

drivers/gpu/drm/ast/ast_main.c +1 -0
+		return 0;

  }

drivers/gpu/drm/ast/ast_main.c +0 -10
-	else
-	{
-		ast_write32(ast, 0xf004, 0x1e6e0000);
-		ast_write32(ast, 0xf000, 0x1);
-		data = ast_read32(ast, 0x10004);
-
-		if (data & 0x40)
-			ast->dram_bus_width = 16;
-		else
-			ast->dram_bus_width = 32;

drivers/gpu/drm/ast/ast_main.c +0 -25
-		if (ast->chip == AST2300 || ast->chip == AST2400) {
-			switch (data & 0x03) {
-			case 0:
-				ast->dram_type = AST_DRAM_512Mx16;
-				break;
-			default:
-			case 1:
-				ast->dram_type = AST_DRAM_1Gx16;
-				break;
-			case 2:
-				ast->dram_type = AST_DRAM_2Gx16;
-				break;
-			case 3:
-				ast->dram_type = AST_DRAM_4Gx16;
-				break;
-			}
-		} else {
-			switch (data & 0x0c) {
-			case 0:
-			case 4:
-				ast->dram_type = AST_DRAM_512Mx16;
-				break;
-			case 8:
-				if (data & 0x40)
-					ast->dram_type =

AST_DRAM_1Gx16;

drivers/gpu/drm/ast/ast_main.c +0 -2
-				else
-					ast->dram_type =

AST_DRAM_512Mx32;

drivers/gpu/drm/ast/ast_main.c +4 -6
-				break;
-			case 0xc:
-				ast->dram_type = AST_DRAM_1Gx32;
-				break;
-			}
-		}
+	if (mcr_cfg & 0x40)
+		ast->dram_bus_width = 16;
+	else
+		ast->dram_bus_width = 32;

drivers/gpu/drm/ast/ast_main.c +4 -13
-		data = ast_read32(ast, 0x10120);
-		data2 = ast_read32(ast, 0x10170);
-		if (data2 & 0x2000)
-			ref_pll = 14318;
-		else
-			ref_pll = 12000;
-
-		denum = data & 0x1f;
-		num = (data & 0x3fe0) >> 5;
-		data = (data & 0xc000) >> 14;
-		switch (data) {
-		case 3:
-			div = 0x4;
+	if (ast->chip == AST2300 || ast->chip == AST2400) {
+		switch (mcr_cfg & 0x03) {
+		case 0:
+			ast->dram_type = AST_DRAM_512Mx16;

  break;

drivers/gpu/drm/ast/ast_main.c +1 -1
-		case 2:
+		default:

  case 1:

drivers/gpu/drm/ast/ast_main.c +1 -1
-			div = 0x2;
+			ast->dram_type = AST_DRAM_1Gx16;

  break;

drivers/gpu/drm/ast/ast_main.c +5 -2
-		default:
-			div = 0x1;
+		case 2:
+			ast->dram_type = AST_DRAM_2Gx16;
+			break;
+		case 3:
+			ast->dram_type = AST_DRAM_4Gx16;

  break;
  }

drivers/gpu/drm/ast/ast_main.c +0 -1
-		ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div

* 1000);

drivers/gpu/drm/ast/ast_main.c +37 -0
+	} else {
+		switch (mcr_cfg & 0x0c) {
+		case 0:
+		case 4:
+			ast->dram_type = AST_DRAM_512Mx16;
+			break;
+		case 8:
+			if (mcr_cfg & 0x40)
+				ast->dram_type = AST_DRAM_1Gx16;
+			else
+				ast->dram_type = AST_DRAM_512Mx32;
+			break;
+		case 0xc:
+			ast->dram_type = AST_DRAM_1Gx32;
+			break;
+		}
+	}
+
+	if (mcr_scu_strap & 0x2000)
+		ref_pll = 14318;
+	else
+		ref_pll = 12000;
+
+	denum = mcr_scu_mpll & 0x1f;
+	num = (mcr_scu_mpll & 0x3fe0) >> 5;
+	dsel = (mcr_scu_mpll & 0xc000) >> 14;
+	switch (dsel) {
+	case 3:
+		div = 0x4;
+		break;
+	case 2:
+	case 1:
+		div = 0x2;
+		break;
+	default:
+		div = 0x1;
+		break;

  }

drivers/gpu/drm/ast/ast_main.c +1 -0
+	ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div *

1000);
  return 0;
 }

drivers/gpu/drm/ast/ast_post.c +0 -0
index 5331ee1..7197635 100644
@@ -379,17 +379,14 @@ void ast_post_gpu(struct drm_device *dev)
  	ast_open_key(ast);
  	ast_set_def_ext_reg(dev);

drivers/gpu/drm/ast/ast_post.c +1 -2
-	if (ast->DisableP2A == false)
-	{
+	if (ast->config_mode == ast_use_p2a) {

  if (ast->chip == AST2300 || ast->chip == AST2400) ast_init_dram_2300(dev);
  else
  ast_init_dram_reg(dev);

  ast_init_3rdtx(dev);

drivers/gpu/drm/ast/ast_post.c +1 -3
-	}
-	else
-	{
+	} else {
Quoted 4 lines

  if (ast->tx_chip_type != AST_TX_NONE) ast_set_index_reg_mask(ast,
AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80); /* Enable DVO */
  }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#15 lore raw
In reply to Benjamin Herrenschmidt
Quoted 2 lines · Benjamin Herrenschmidt

The ast driver configures a window to enable access into BMC memory space in order to read some configuration registers.

Aspeed suggested a couple of refinements for some chipsets, so I'll respin either this week-end or monday.

Quoted 398 lines

If this window is disabled, which it can be from the BMC side, the ast driver can't function.

Closing this window is a necessity for security if a machine's host side and BMC side are controlled by different parties; i.e. a cloud provider offering machines "bare metal".

A recent patch went in to try to check if that window is open but it does so by trying to access the registers in question and testing if the result is 0xffffffff.

This method will trigger a PCIe error when the window is closed which on some systems will be fatal (it will trigger an EEH for example on POWER which will take out the device).

This patch improves this in two ways:

 - First, if the firmware has put properties in the device-tree containing the relevant configuration information, we use these.

 - Otherwise, a bit in one of the SCU scratch registers (which are readable via the VGA register space and writeable by the BMC) will indicate if the BMC has closed the window. This bit has been defined by Y.C Chen from Aspeed.

If the window is closed and the configuration isn't available from the device-tree, some sane defaults are used. Those defaults are hopefully sufficient for standard video modes used on a server.

--

v2. [BenH]
    - Reworked on top of Aspeed P2A patch
    - Cleanup overall detection via a "config_mode" and log the selected mode for diagnostics purposes
    - Add a property for the SCU straps

v3. [BenH]
    - Moved the config mode detection to a separate functionn
    - Add reading of SCU 0x40 D[12] to detect the window is closed as to not trigger a bus error by just "trying". (change provided by Y.C. Chen)
---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +- drivers/gpu/drm/ast/ast_main.c | 223 +++++++++++++++++++++++++----
------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-

 3 files changed, 141 insertions(+), 95 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +5 -1
index 7abda94..3bedcf7 100644
@@ -113,7 +113,11 @@ struct ast_private {
  	struct ttm_bo_kmap_obj cache_kmap;
  	int next_cursor;
  	bool support_wide_screen;
-	bool DisableP2A;
+	enum {
+		ast_use_p2a,
+		ast_use_dt,
+		ast_use_defaults
+	} config_mode;


  enum ast_tx_chip tx_chip_type;
  u8 dp501_maxclk;

drivers/gpu/drm/ast/ast_main.c +0 -0
index 533e762..823c68f 100644
@@ -62,13 +62,58 @@ uint8_t ast_get_index_reg_mask(struct ast_private
 *ast,
  	return ret;
  }


+static void ast_detect_config_mode(struct drm_device *dev, u32 *scu_rev)

drivers/gpu/drm/ast/ast_main.c +7 -0
+{
+	struct device_node *np = dev->pdev->dev.of_node;
+	struct ast_private *ast = dev->dev_private;
+	uint32_t data, jreg;
+
+	/* Check if we have device-tree properties */
+	if (np && !of_property_read_u32(np, "ast,scu-revision-id",

scu_rev)) {

drivers/gpu/drm/ast/ast_main.c +11 -0
+		/* We do, disable P2A access */
+		ast->config_mode = ast_use_dt;
+		DRM_INFO("Using device-tree for configuration\n");
+		return;
+	}
+
+	/*
+	 * The BMC will set SCU 0x40 D[12] to 1 if the P2 bridge
+	 * is disabled
+	 */
+	jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd1,

0xff);

drivers/gpu/drm/ast/ast_main.c +8 -0
+	if (!(jreg & 0x10)) {
+		/* Double check it's actually working */
+		data = ast_read32(ast, 0xf004);
+		if (data != 0xFFFFFFFF) {
+			/* P2A works, grab silicon revision */
+			ast->config_mode = ast_use_p2a;
+
+			DRM_INFO("Using P2A bridge for

configuration\n");

drivers/gpu/drm/ast/ast_main.c +10 -0
+
+			/* Read SCU7c (silicon revision register) */
+			ast_write32(ast, 0xf004, 0x1e6e0000);
+			ast_write32(ast, 0xf000, 0x1);
+			*scu_rev = ast_read32(ast, 0x1207c);
+			return;
+		}
+	}
+
+	DRM_INFO("P2A bridge disabled, using default

configuration\n");

drivers/gpu/drm/ast/ast_main.c +3 -0
+	ast->config_mode = ast_use_defaults;
+	*scu_rev = 0xffffffff;
+}


 static int ast_detect_chip(struct drm_device *dev, bool *need_post) {
  struct ast_private *ast = dev->dev_private;

drivers/gpu/drm/ast/ast_main.c +2 -1
-	uint32_t data, jreg;
+	uint32_t jreg, scu_rev;
+

  ast_open_key(ast);

drivers/gpu/drm/ast/ast_main.c +1 -0
+	/* Find out whether P2A works or whether to use device-tree

*/

drivers/gpu/drm/ast/ast_main.c +3 -0
+	ast_detect_config_mode(dev, &scu_rev);
+
+	/* Identify chipset */

  if (dev->pdev->device == PCI_CHIP_AST1180) { ast->chip = AST1100; DRM_INFO("AST 1180 detected\n");

drivers/gpu/drm/ast/ast_main.c +1 -6
@@ -80,12 +125,7 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  			ast->chip = AST2300;
  			DRM_INFO("AST 2300 detected\n");
  		} else if (dev->pdev->revision >= 0x10) {
-			uint32_t data;
-			ast_write32(ast, 0xf004, 0x1e6e0000);
-			ast_write32(ast, 0xf000, 0x1);
-
-			data = ast_read32(ast, 0x1207c);
-			switch (data & 0x0300) {
+			switch (scu_rev & 0x0300) {

  case 0x0200:
  ast->chip = AST1100; DRM_INFO("AST 1100 detected\n");

drivers/gpu/drm/ast/ast_main.c +0 -0
@@ -124,12 +164,6 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  	} else
  		*need_post = false;

drivers/gpu/drm/ast/ast_main.c +0 -6
-	/* Check P2A Access */
-	ast->DisableP2A = true;
-	data = ast_read32(ast, 0xf004);
-	if (data != 0xFFFFFFFF)
-		ast->DisableP2A = false;
-

  /* Check if we support wide screen */
  switch (ast->chip) {
  case AST1180:

drivers/gpu/drm/ast/ast_main.c +0 -2
@@ -146,17 +180,12 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)
  			ast->support_wide_screen = true;
  		else {
  			ast->support_wide_screen = false;
-			if (ast->DisableP2A == false) {
-				/* Read SCU7c (silicon revision

register) */

drivers/gpu/drm/ast/ast_main.c +0 -1
-				ast_write32(ast, 0xf004,

0x1e6e0000);

drivers/gpu/drm/ast/ast_main.c +0 -4
-				ast_write32(ast, 0xf000, 0x1);
-				data = ast_read32(ast, 0x1207c);
-				data &= 0x300;
-				if (ast->chip == AST2300 && data ==

0x0) /* ast1300 */

drivers/gpu/drm/ast/ast_main.c +0 -1
-					ast->support_wide_screen =

true;

drivers/gpu/drm/ast/ast_main.c +0 -1
-				if (ast->chip == AST2400 && data ==

0x100) /* ast1400 */

drivers/gpu/drm/ast/ast_main.c +0 -1
-					ast->support_wide_screen =

true;

drivers/gpu/drm/ast/ast_main.c +5 -1
-			}
+			if (ast->chip == AST2300 &&
+			    (scu_rev & 0x300) == 0x0) /* ast1300 */
+				ast->support_wide_screen = true;
+			if (ast->chip == AST2400 &&
+			    (scu_rev & 0x300) == 0x100) /* ast1400

*/

drivers/gpu/drm/ast/ast_main.c +1 -0
+				ast->support_wide_screen = true;

  }
  break;
  }

drivers/gpu/drm/ast/ast_main.c +0 -0
@@ -220,85 +249,101 @@ static int ast_detect_chip(struct drm_device
 *dev, bool *need_post)


 static int ast_get_dram_info(struct drm_device *dev) {

drivers/gpu/drm/ast/ast_main.c +1 -0
+	struct device_node *np = dev->pdev->dev.of_node;

  struct ast_private *ast = dev->dev_private;

drivers/gpu/drm/ast/ast_main.c +2 -2
-	uint32_t data, data2;
-	uint32_t denum, num, div, ref_pll;
+	uint32_t mcr_cfg, mcr_scu_mpll, mcr_scu_strap;
+	uint32_t denum, num, div, ref_pll, dsel;

drivers/gpu/drm/ast/ast_main.c +7 -2
-	if (ast->DisableP2A)
-	{
+	switch (ast->config_mode) {
+	case ast_use_dt:
+		/*
+		 * If some properties are missing, use reasonable
+		 * defaults for AST2400
+		 */
+		if (of_property_read_u32(np, "ast,mcr-

configuration", &mcr_cfg))

drivers/gpu/drm/ast/ast_main.c +5 -0
+			mcr_cfg = 0x00000577;
+		if (of_property_read_u32(np, "ast,ast,mcr-scu-mpll",
+					 &mcr_scu_mpll))
+			mcr_scu_mpll = 0x000050C0;
+		if (of_property_read_u32(np, "ast,ast,mcr-scu-

strap",

drivers/gpu/drm/ast/ast_main.c +12 -0
+					 &mcr_scu_strap))
+			mcr_scu_strap = 0;
+		break;
+	case ast_use_p2a:
+		ast_write32(ast, 0xf004, 0x1e6e0000);
+		ast_write32(ast, 0xf000, 0x1);
+		mcr_cfg = ast_read32(ast, 0x10004);
+		mcr_scu_mpll = ast_read32(ast, 0x10120);
+		mcr_scu_strap = ast_read32(ast, 0x10170);
+		break;
+	case ast_use_defaults:
+	default:

  ast->dram_bus_width = 16;
  ast->dram_type = AST_DRAM_1Gx16;
  ast->mclk = 396;

drivers/gpu/drm/ast/ast_main.c +1 -0
+		return 0;

  }

drivers/gpu/drm/ast/ast_main.c +0 -10
-	else
-	{
-		ast_write32(ast, 0xf004, 0x1e6e0000);
-		ast_write32(ast, 0xf000, 0x1);
-		data = ast_read32(ast, 0x10004);
-
-		if (data & 0x40)
-			ast->dram_bus_width = 16;
-		else
-			ast->dram_bus_width = 32;

drivers/gpu/drm/ast/ast_main.c +0 -25
-		if (ast->chip == AST2300 || ast->chip == AST2400) {
-			switch (data & 0x03) {
-			case 0:
-				ast->dram_type = AST_DRAM_512Mx16;
-				break;
-			default:
-			case 1:
-				ast->dram_type = AST_DRAM_1Gx16;
-				break;
-			case 2:
-				ast->dram_type = AST_DRAM_2Gx16;
-				break;
-			case 3:
-				ast->dram_type = AST_DRAM_4Gx16;
-				break;
-			}
-		} else {
-			switch (data & 0x0c) {
-			case 0:
-			case 4:
-				ast->dram_type = AST_DRAM_512Mx16;
-				break;
-			case 8:
-				if (data & 0x40)
-					ast->dram_type =

AST_DRAM_1Gx16;

drivers/gpu/drm/ast/ast_main.c +0 -2
-				else
-					ast->dram_type =

AST_DRAM_512Mx32;

drivers/gpu/drm/ast/ast_main.c +4 -6
-				break;
-			case 0xc:
-				ast->dram_type = AST_DRAM_1Gx32;
-				break;
-			}
-		}
+	if (mcr_cfg & 0x40)
+		ast->dram_bus_width = 16;
+	else
+		ast->dram_bus_width = 32;

drivers/gpu/drm/ast/ast_main.c +4 -13
-		data = ast_read32(ast, 0x10120);
-		data2 = ast_read32(ast, 0x10170);
-		if (data2 & 0x2000)
-			ref_pll = 14318;
-		else
-			ref_pll = 12000;
-
-		denum = data & 0x1f;
-		num = (data & 0x3fe0) >> 5;
-		data = (data & 0xc000) >> 14;
-		switch (data) {
-		case 3:
-			div = 0x4;
+	if (ast->chip == AST2300 || ast->chip == AST2400) {
+		switch (mcr_cfg & 0x03) {
+		case 0:
+			ast->dram_type = AST_DRAM_512Mx16;

  break;

drivers/gpu/drm/ast/ast_main.c +1 -1
-		case 2:
+		default:

  case 1:

drivers/gpu/drm/ast/ast_main.c +1 -1
-			div = 0x2;
+			ast->dram_type = AST_DRAM_1Gx16;

  break;

drivers/gpu/drm/ast/ast_main.c +5 -2
-		default:
-			div = 0x1;
+		case 2:
+			ast->dram_type = AST_DRAM_2Gx16;
+			break;
+		case 3:
+			ast->dram_type = AST_DRAM_4Gx16;

  break;
  }

drivers/gpu/drm/ast/ast_main.c +0 -1
-		ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div

* 1000);

drivers/gpu/drm/ast/ast_main.c +37 -0
+	} else {
+		switch (mcr_cfg & 0x0c) {
+		case 0:
+		case 4:
+			ast->dram_type = AST_DRAM_512Mx16;
+			break;
+		case 8:
+			if (mcr_cfg & 0x40)
+				ast->dram_type = AST_DRAM_1Gx16;
+			else
+				ast->dram_type = AST_DRAM_512Mx32;
+			break;
+		case 0xc:
+			ast->dram_type = AST_DRAM_1Gx32;
+			break;
+		}
+	}
+
+	if (mcr_scu_strap & 0x2000)
+		ref_pll = 14318;
+	else
+		ref_pll = 12000;
+
+	denum = mcr_scu_mpll & 0x1f;
+	num = (mcr_scu_mpll & 0x3fe0) >> 5;
+	dsel = (mcr_scu_mpll & 0xc000) >> 14;
+	switch (dsel) {
+	case 3:
+		div = 0x4;
+		break;
+	case 2:
+	case 1:
+		div = 0x2;
+		break;
+	default:
+		div = 0x1;
+		break;

  }

drivers/gpu/drm/ast/ast_main.c +1 -0
+	ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div *

1000);
  return 0;
 }

drivers/gpu/drm/ast/ast_post.c +0 -0
index 5331ee1..7197635 100644
@@ -379,17 +379,14 @@ void ast_post_gpu(struct drm_device *dev)
  	ast_open_key(ast);
  	ast_set_def_ext_reg(dev);

drivers/gpu/drm/ast/ast_post.c +1 -2
-	if (ast->DisableP2A == false)
-	{
+	if (ast->config_mode == ast_use_p2a) {

  if (ast->chip == AST2300 || ast->chip == AST2400) ast_init_dram_2300(dev);
  else
  ast_init_dram_reg(dev);

  ast_init_3rdtx(dev);

drivers/gpu/drm/ast/ast_post.c +1 -3
-	}
-	else
-	{
+	} else {
Quoted 4 lines

  if (ast->tx_chip_type != AST_TX_NONE) ast_set_index_reg_mask(ast,
AST_IO_CRTC_PORT, 0xa3, 0xcf, 0x80); /* Enable DVO */
  }

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel