Skip to contentSkip to conversation

drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS

PATCH In review Benjamin Herrenschmidt 4 participants 39 messages Feb 23, 2017 – Feb 24, 2017

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

PATCH 1/12 drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS

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

The current POST code for the AST2300/2400 family doesn't work properly if the chip hasn't been initialized previously by either the BMC own FW or the VBIOS. This fixes it.

---
 drivers/gpu/drm/ast/ast_post.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_post.c +35 -3
index 5331ee1..6c5391c 100644
@@ -1638,12 +1638,44 @@ static void ast_init_dram_2300(struct drm_device *dev)
 		temp |= 0x73;
 		ast_write32(ast, 0x12008, temp);
 
+		param.dram_freq = 396;
 		param.dram_type = AST_DDR3;
+		temp = ast_mindwm(ast, 0x1e6e2070);
 		if (temp & 0x01000000)
 			param.dram_type = AST_DDR2;
-		param.dram_chipid = ast->dram_type;
-		param.dram_freq = ast->mclk;
-		param.vram_size = ast->vram_size;
+                switch (temp & 0x18000000) {
+		case 0:
+			param.dram_chipid = AST_DRAM_512Mx16;
+			break;
+		default:
+		case 0x08000000:
+			param.dram_chipid = AST_DRAM_1Gx16;
+			break;
+		case 0x10000000:
+			param.dram_chipid = AST_DRAM_2Gx16;
+			break;
+		case 0x18000000:
+			param.dram_chipid = AST_DRAM_4Gx16;
+			break;
+		}
+                switch (temp & 0x0c) {
+                default:
+		case 0x00:
+			param.vram_size = AST_VIDMEM_SIZE_8M;
+			break;
+
+		case 0x04:
+			param.vram_size = AST_VIDMEM_SIZE_16M;
+			break;
+
+		case 0x08:
+			param.vram_size = AST_VIDMEM_SIZE_32M;
+			break;
+
+		case 0x0c:
+			param.vram_size = AST_VIDMEM_SIZE_64M;
+			break;
+		}
 
 		if (param.dram_type == AST_DDR3) {
 			get_ddr3_info(ast, &param);
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/12 drm/ast: Handle configuration without P2A bridge

From: Russell Currey <[email protected]>

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)
v4. [BenH]
- Only devices with the AST2000 PCI ID have a P2A bridge
- Update the P2A presence test to account for VGA only mode as provided by Y.C. Chen.

---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +-
 drivers/gpu/drm/ast/ast_main.c | 262 +++++++++++++++++++++++++----------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-
 3 files changed, 166 insertions(+), 109 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 +159 -103

312 lines not on this page · raw message

drivers/gpu/drm/ast/ast_post.c +2 -5
index 6c5391c..64549ce 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
#2 lore raw

Re: [PATCH 02/12] drm/ast: Handle configuration without P2A bridge

Quoted 13 lines · Benjamin Herrenschmidt

static int ast_get_dram_info(struct drm_device *dev) {

drivers/gpu/drm/ast/ast_main.c +5 -4
+       struct device_node *np = dev->pdev->dev.of_node;
        struct ast_private *ast = dev->dev_private;
-       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;
 
-       if (ast->DisableP2A)
-       {
+       switch (ast->config_mode) {
+       case ast_use_dt:

drivers/gpu/drm/ast/ast_main.c static int ast_detect_chip(struct drm_device *dev, bool *need_post) · line 279

Quoted 10 lines
drivers/gpu/drm/ast/ast_main.c +10 -0
+               /*
+                * If some properties are missing, use reasonable
+                * defaults for AST2400
+                */
+               if (of_property_read_u32(np, "ast,mcr-configuration", &mcr_cfg))
+                       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",

Are these properties supposed to repeat the prefix "ast,ast"?

We've chosen aspeed as the vendor prefix for Aspeed stuff.

Quoted 109 lines
drivers/gpu/drm/ast/ast_main.c +37 -61
+                                        &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;
+               return 0;
        }
-       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;
-
-               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;
-                               else
-                                       ast->dram_type = AST_DRAM_512Mx32;
-                               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;
 
-               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;
-               case 2:
+               default:
                case 1:
-                       div = 0x2;
+                       ast->dram_type = AST_DRAM_1Gx16;
                        break;
-               default:
-                       div = 0x1;
+               case 2:
+                       ast->dram_type = AST_DRAM_2Gx16;
+                       break;
+               case 3:
+                       ast->dram_type = AST_DRAM_4Gx16;
                        break;
                }
-               ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
+       } 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;

drivers/gpu/drm/ast/ast_main.c static int ast_detect_chip(struct drm_device *dev, bool *need_post) · line 337

Quoted 10 lines
drivers/gpu/drm/ast/ast_main.c +10 -0
+                       else
+                               ast->dram_type = AST_DRAM_512Mx32;
+                       break;
+               case 0xc:
+                       ast->dram_type = AST_DRAM_1Gx32;
+                       break;
+               }
+       }
+
+       if (mcr_scu_strap & 0x2000)

This bit confused me. Bit 13 of the strap (SCU70) is the SPI mode.

drivers/gpu/drm/ast/ast_main.c static int ast_detect_chip(struct drm_device *dev, bool *need_post) · line 344

Quoted 7 lines
drivers/gpu/drm/ast/ast_main.c +7 -0
+               ref_pll = 14318;
+       else
+               ref_pll = 12000;
+
+       denum = mcr_scu_mpll & 0x1f;
+       num = (mcr_scu_mpll & 0x3fe0) >> 5;
+       dsel = (mcr_scu_mpll & 0xc000) >> 14;

These calculations don't make sense for the ast2400 or ast2500.

Quoted 15 lines
drivers/gpu/drm/ast/ast_main.c +12 -0
+       switch (dsel) {
+       case 3:
+               div = 0x4;
+               break;
+       case 2:
+       case 1:
+               div = 0x2;
+               break;
+       default:
+               div = 0x1;
+               break;
        }
+       ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
        return 0;
 }
#3 lore raw

Re: [PATCH 02/12] drm/ast: Handle configuration without P2A bridge

Quoted 3 lines · Joel Stanley

Are these properties supposed to repeat the prefix "ast,ast"?

We've chosen aspeed as the vendor prefix for Aspeed stuff.

Argh no, that's a typo... must have worked in my tests bcs the defaults are fine. I'll update.

Cheers,
Ben.

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

#4 lore raw

Re: [PATCH 02/12] drm/ast: Handle configuration without P2A bridge

In reply to Joel Stanley
Quoted 4 lines · Joel Stanley

Are these properties supposed to repeat the prefix "ast,ast"?

We've chosen aspeed as the vendor prefix for Aspeed stuff.

Sent my reply too early ... so yes, I can change that, our FW hasn't merge the FW side yet. I'll respin now.

Quoted 3 lines
Quoted 1 line

+       if (mcr_scu_strap & 0x2000)

This bit confused me. Bit 13 of the strap (SCU70) is the SPI mode.

The register is actually "MCR170: AST2000 Backward Compatible SCU Hardware Strapping Value"

Quoted 9 lines
Quoted 7 lines

+               ref_pll = 14318;
+       else
+               ref_pll = 12000;
+
+       denum = mcr_scu_mpll & 0x1f;
+       num = (mcr_scu_mpll & 0x3fe0) >> 5;
+       dsel = (mcr_scu_mpll & 0xc000) >> 14;

These calculations don't make sense for the ast2400 or ast2500.

They do if you look at this:

MCR120: AST2000 Backward Compatible SCU MPLL Parameter

It's not the SCU version of the register it's the MCU "copy" of it that maintains some kind of legacy layout. Hence "mcr_scu" prefix not "scu".

Quoted 8 lines
Quoted 8 lines

+       switch (dsel) {
+       case 3:
+               div = 0x4;
+               break;
+       case 2:
+       case 1:
+               div = 0x2;
+               break;

Quoted 8 lines
Quoted 8 lines

+       default:
+               div = 0x1;
+               break;
        }
+       ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * 1000);
        return 0;
 }

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

#5 lore raw

PATCH v5 2/12 drm/ast: Handle configuration without P2A bridge

In reply to Joel Stanley

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)
v4. [BenH]
- Only devices with the AST2000 PCI ID have a P2A bridge
- Update the P2A presence test to account for VGA only mode as provided by Y.C. Chen.
v5. [BenH]
- Fixup prefix of OF properties based on Joel Stanley review comments.

---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +-
 drivers/gpu/drm/ast/ast_main.c | 264 +++++++++++++++++++++++++----------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-
 3 files changed, 168 insertions(+), 109 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 +161 -103

314 lines not on this page · raw message

drivers/gpu/drm/ast/ast_post.c +2 -5
index 6c5391c..64549ce 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 */
 	}

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

Acked-by on v5 2/12
#6 lore raw

Re: [PATCH v5 2/12] drm/ast: Handle configuration without P2A bridge

Quoted 42 lines · Benjamin Herrenschmidt

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

Quoted 12 lines

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)
v4. [BenH]
- Only devices with the AST2000 PCI ID have a P2A bridge
- Update the P2A presence test to account for VGA only mode as provided by Y.C. Chen.
v5. [BenH]
- Fixup prefix of OF properties based on Joel Stanley review comments.

LGTM. Thanks for the explaining the mcr regs, that stuff checks out now.

Quoted 6 lines
---
 drivers/gpu/drm/ast/ast_drv.h  |   6 +-
 drivers/gpu/drm/ast/ast_main.c | 264 +++++++++++++++++++++++++----------------
 drivers/gpu/drm/ast/ast_post.c |   7 +-
 3 files changed, 168 insertions(+), 109 deletions(-)
Tested-by on v1 2/12
#7 lore raw

RE: [PATCH 02/12] drm/ast: Handle configuration without P2A bridge

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 02/12] drm/ast: Handle configuration without P2A bridge

From: Russell Currey <[email protected]>

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.

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

#8 lore raw

PATCH 3/12 drm/ast: const'ify mode setting tables

In reply to Benjamin Herrenschmidt

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
Acked-by on v1 3/12
#9 lore raw

Re: [PATCH 03/12] drm/ast: const'ify mode setting tables

Quoted 3 lines · Benjamin Herrenschmidt

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

Quoted 5 lines
---
 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(-)
#10 lore raw

PATCH 4/12 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 36932a3..718c15b 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
#12 lore raw

PATCH 5/12 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 718c15b..d194af3 100644
@@ -352,7 +352,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;
 }
 
@@ -496,7 +496,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
#13 lore raw

Re: [PATCH 05/12] drm/ast: Fix calculation of MCLK

Quoted 4 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.

Y. C. Chen, can you point out this calculation in the programming guide?

All of the PLL calculations I can find in the ast2400 documentation are different to this one.

Cheers,

Joel

Quoted 38 lines

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 -3
index 718c15b..d194af3 100644
@@ -352,7 +352,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;
 }
 
@@ -496,7 +496,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)
--

2.9.3

#14 lore raw

Re: [PATCH 05/12] drm/ast: Fix calculation of MCLK

Quoted 4 lines · Joel Stanley
Quoted 2 lines · Benjamin Herrenschmidt

Some braces were missing causing an incorrect calculation.

Quoted 8 lines
Quoted 2 lines

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

Y. C. Chen, can you point out this calculation in the programming guide?

All of the PLL calculations I can find in the ast2400 documentation are different to this one.

Different PLL register, see my other email. I've checked the result of the calculation on our AST2500 and AST2400 machines.

Cheers,
Ben.

Quoted 49 lines

Cheers,

Joel

Quoted 45 lines

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 +1 -1
index 718c15b..d194af3 100644
@@ -352,7 +352,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;
 }

drivers/gpu/drm/ast/ast_main.c +3 -1
@@ -496,7 +496,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)
--
2.9.3

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

Acked-by
#15 lore raw

Re: [PATCH 05/12] drm/ast: Fix calculation of MCLK

Quoted 8 lines · Benjamin Herrenschmidt
Quoted 7 lines · Joel Stanley
Quoted 4 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.

Quoted 8 lines
Quoted 5 lines

Y. C. Chen, can you point out this calculation in the programming guide?

All of the PLL calculations I can find in the ast2400 documentation are different to this one.

Different PLL register, see my other email. I've checked the result of the calculation on our AST2500 and AST2400 machines.

I see now. It woudl be good to see the calculation added to Aspeed's documentation in the future.

Cheers,

Joel

Tested-by on v1 5/12
#16 lore raw

RE: [PATCH 05/12] drm/ast: Fix calculation of MCLK

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 05/12] drm/ast: Fix calculation of MCLK

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

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

#17 lore raw

PATCH 6/12 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.

---

v2. Add 800Mhz default mclk for AST2500

---
 drivers/gpu/drm/ast/ast_drv.h    |  2 ++
 drivers/gpu/drm/ast/ast_main.c   | 32 +++++++++++++++++++---
 drivers/gpu/drm/ast/ast_mode.c   | 30 ++++++++++++++++-----
 drivers/gpu/drm/ast/ast_tables.h | 58 +++++++++++++++++++++++++++++++++-------
 4 files changed, 103 insertions(+), 19 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 +29 -3
index d194af3..f19669f 100644
@@ -141,7 +141,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) {
@@ -195,6 +198,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;
 	}
@@ -289,7 +295,10 @@ static int ast_get_dram_info(struct drm_device *dev)
 	default:
 		ast->dram_bus_width = 16;
 		ast->dram_type = AST_DRAM_1Gx16;
-		ast->mclk = 396;
+		if (ast->chip == AST2500)
+			ast->mclk = 800;
+		else
+			ast->mclk = 396;
 		return 0;
 	}
 
@@ -298,7 +307,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;
@@ -521,6 +546,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
Acked-by on v1 6/12
#18 lore raw

Re: [PATCH 06/12] drm/ast: Base support for AST2500

Quoted 9 lines · 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.

Quoted 10 lines

---

v2. Add 800Mhz default mclk for AST2500

---
 drivers/gpu/drm/ast/ast_drv.h    |  2 ++
 drivers/gpu/drm/ast/ast_main.c   | 32 +++++++++++++++++++---
 drivers/gpu/drm/ast/ast_mode.c   | 30 ++++++++++++++++-----
 drivers/gpu/drm/ast/ast_tables.h | 58 +++++++++++++++++++++++++++++++++-------
 4 files changed, 103 insertions(+), 19 deletions(-)
#19 lore raw

PATCH 7/12 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 f19669f..8684f3c 100644
@@ -516,6 +516,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)
@@ -526,9 +529,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 64549ce..e802450 100644
@@ -79,7 +79,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
Acked-by on v1 7/12
#20 lore raw

Re: [PATCH 07/12] drm/ast: Fixed vram size incorrect issue on POWER

Quoted 6 lines · Benjamin Herrenschmidt

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

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

Quoted 4 lines
---
 drivers/gpu/drm/ast/ast_main.c | 6 +++---
 drivers/gpu/drm/ast/ast_post.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Tested-by on v1 7/12
#21 lore raw

RE: [PATCH 07/12] drm/ast: Fixed vram size incorrect issue on POWER

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 07/12] drm/ast: Fixed vram size incorrect issue on POWER

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

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

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

#22 lore raw

PATCH 8/12 drm/ast: Factor mmc_test code in POST code

In reply to Benjamin Herrenschmidt

There's a some duplication for what's essentially copies of two loops, so factor it. The upcoming AST2500 POST code adds more of them. Also cleanup return types for the test functions, most of them return a boolean, some return a u32.

--

v2. - Keep the split between the "test" and "test2" functions
as they have a different exit condition in the loop and a different return type.
- Fix the return types accross the call chain

---
 drivers/gpu/drm/ast/ast_post.c | 82 ++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 51 deletions(-)
drivers/gpu/drm/ast/ast_post.c +31 -51
index e802450..c55067c 100644
@@ -445,85 +445,65 @@ static const u32 pattern[8] = {
 	0x7C61D253
 };
 
-static int mmc_test_burst(struct ast_private *ast, u32 datagen)
+static bool 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;
-		}
+		if (data & 0x2000)
+			return false;
 		if (++timeout > TIMEOUT) {
 			ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-			return 0;
+			return false;
 		}
 	} while (!data);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	return 1;
+	ast_moutdwm(ast, 0x1e6e0070, 0x0);
+	return true;
 }
 
-static int mmc_test_burst2(struct ast_private *ast, u32 datagen)
+static u32 mmc_test2(struct ast_private *ast, u32 datagen, u8 test_ctl)
 {
 	u32 data, timeout;
 
 	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
-	ast_moutdwm(ast, 0x1e6e0070, 0x00000041 | (datagen << 3));
+	ast_moutdwm(ast, 0x1e6e0070, (datagen << 3) | test_ctl);
 	timeout = 0;
 	do {
 		data = ast_mindwm(ast, 0x1e6e0070) & 0x1000;
 		if (++timeout > TIMEOUT) {
 			ast_moutdwm(ast, 0x1e6e0070, 0x0);
-			return -1;
+			return 0xffffffff;
 		}
 	} while (!data);
 	data = ast_mindwm(ast, 0x1e6e0078);
 	data = (data | (data >> 16)) & 0xffff;
-	ast_moutdwm(ast, 0x1e6e0070, 0x0);
+	ast_moutdwm(ast, 0x1e6e0070, 0x00000000);
 	return data;
 }
 
-static int mmc_test_single(struct ast_private *ast, u32 datagen)
+
+static bool 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, 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;
+static u32 mmc_test_burst2(struct ast_private *ast, u32 datagen)
+{
+	return mmc_test2(ast, datagen, 0x41);
 }
 
-static int mmc_test_single2(struct ast_private *ast, u32 datagen)
+static bool mmc_test_single(struct ast_private *ast, u32 datagen)
 {
-	u32 data, timeout;
+	return mmc_test(ast, datagen, 0xc5);
+}
 
-	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 u32 mmc_test_single2(struct ast_private *ast, u32 datagen)
+{
+	return mmc_test2(ast, datagen, 0x05);
 }
 
 static int cbr_test(struct ast_private *ast)
@@ -601,16 +581,16 @@ static u32 cbr_scan2(struct ast_private *ast)
 	return data2;
 }
 
-static u32 cbr_test3(struct ast_private *ast)
+static bool cbr_test3(struct ast_private *ast)
 {
 	if (!mmc_test_burst(ast, 0))
-		return 0;
+		return false;
 	if (!mmc_test_single(ast, 0))
-		return 0;
-	return 1;
+		return false;
+	return true;
 }
 
-static u32 cbr_scan3(struct ast_private *ast)
+static bool cbr_scan3(struct ast_private *ast)
 {
 	u32 patcnt, loop;
 
@@ -621,9 +601,9 @@ static u32 cbr_scan3(struct ast_private *ast)
 				break;
 		}
 		if (loop == 2)
-			return 0;
+			return false;
 	}
-	return 1;
+	return true;
 }
 
 static bool finetuneDQI_L(struct ast_private *ast, 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
Acked-by on v1 8/12
#23 lore raw

Re: [PATCH 08/12] drm/ast: Factor mmc_test code in POST code

Quoted 6 lines · Benjamin Herrenschmidt

There's a some duplication for what's essentially copies of two loops, so factor it. The upcoming AST2500 POST code adds more of them. Also cleanup return types for the test functions, most of them return a boolean, some return a u32.

Quoted 9 lines

--

v2. - Keep the split between the "test" and "test2" functions
as they have a different exit condition in the loop and a different return type.
- Fix the return types accross the call chain

---
 drivers/gpu/drm/ast/ast_post.c | 82 ++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 51 deletions(-)
Tested-by on v1 8/12
#24 lore raw

RE: [PATCH 08/12] drm/ast: Factor mmc_test code in POST code

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 08/12] drm/ast: Factor mmc_test code in POST code

There's a some duplication for what's essentially copies of two loops, so factor it. The upcoming AST2500 POST code adds more of them. Also cleanup return types for the test functions, most of them return a boolean, some return a u32.

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

#25 lore raw

PATCH 9/12 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 c55067c..561fd7d 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);
 
@@ -1589,7 +1589,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 · 1 line
2.9.3
Acked-by on v1 9/12
#26 lore raw

Re: [PATCH 09/12] drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300

Quoted 5 lines · 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.

Quoted 3 lines
---
 drivers/gpu/drm/ast/ast_post.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Tested-by on v1 9/12
#27 lore raw

RE: [PATCH 09/12] drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 09/12] drm/ast: Rename ast_init_dram_2300 to ast_post_chip_2300

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.

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

#28 lore raw

PATCH 10/12 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.

--

v2. - Fix bug in ddr_test_2500 reported by Emil Velikov
- Rebase on updated mmc_test factoring patch
- Fix missing else statement in 2500 POST code

---
 drivers/gpu/drm/ast/ast_dram_tables.h |  62 +++++
 drivers/gpu/drm/ast/ast_post.c        | 417 +++++++++++++++++++++++++++++++++-
 2 files changed, 476 insertions(+), 3 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 +414 -3

450 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
Acked-by on v1 10/12
#29 lore raw

Re: [PATCH 10/12] drm/ast: POST code for the new AST2500

Quoted 10 lines · 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.

Quoted 30 lines

--

v2. - Fix bug in ddr_test_2500 reported by Emil Velikov
- Rebase on updated mmc_test factoring patch
- Fix missing else statement in 2500 POST code

---
 drivers/gpu/drm/ast/ast_dram_tables.h |  62 +++++
 drivers/gpu/drm/ast/ast_post.c        | 417 +++++++++++++++++++++++++++++++++-
 2 files changed, 476 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_post.c +19 -0
+void ast_post_chip_2500(struct drm_device *dev)
+{
+       struct ast_private *ast = dev->dev_private;
+       u32 temp;
+       u8 reg;
+
+       reg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
+       if ((reg & 0x80) == 0) {/* vga only */
+               /* Clear bus lock condition */
+               ast_moutdwm(ast, 0x1e600000, 0xAEED1A03);
+               ast_moutdwm(ast, 0x1e600084, 0x00010000);
+               ast_moutdwm(ast, 0x1e600088, 0x00000000);
+               ast_moutdwm(ast, 0x1e6e2000, 0x1688A8A8);
+               ast_write32(ast, 0xf004, 0x1e6e0000);
+               ast_write32(ast, 0xf000, 0x1);
+               ast_write32(ast, 0x12000, 0x1688a8a8);
+               while (ast_read32(ast, 0x12000) != 0x1)
+                       ;
+

drivers/gpu/drm/ast/ast_post.c static void ast_post_chip_2300(struct drm_device *dev) · line 2062

Quoted 10 lines
drivers/gpu/drm/ast/ast_post.c +10 -0
+               ast_write32(ast, 0x10000, 0xfc600309);
+               while (ast_read32(ast, 0x10000) != 0x1)
+                       ;
+
+               /* Slow down CPU/AHB CLK in VGA only mode */
+               temp = ast_read32(ast, 0x12008);
+               temp |= 0x73;
+               ast_write32(ast, 0x12008, temp);
+
+               /* Reset USB port to patch USB unknown device issue */

Really?!

Quoted 26 lines
drivers/gpu/drm/ast/ast_post.c +23 -1
+               ast_moutdwm(ast, 0x1e6e2090, 0x20000000);
+               temp  = ast_mindwm(ast, 0x1e6e2094);
+               temp |= 0x00004000;
+               ast_moutdwm(ast, 0x1e6e2094, temp);
+               temp  = ast_mindwm(ast, 0x1e6e2070);
+               if (temp & 0x00800000) {
+                       ast_moutdwm(ast, 0x1e6e207c, 0x00800000);
+                       mdelay(100);
+                       ast_moutdwm(ast, 0x1e6e2070, 0x00800000);
+               }
+
+               if (!ast_dram_init_2500(ast))
+                       DRM_ERROR("DRAM init failed !\n");
+
+               temp = ast_mindwm(ast, 0x1e6e2040);
+               ast_moutdwm(ast, 0x1e6e2040, temp | 0x40);
+       }
+
+       /* wait ready */
+       do {
+               reg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xd0, 0xff);
+       } while ((reg & 0x40) == 0);
+}
--

2.9.3

#31 lore raw

PATCH 11/12 drm/ast: Fix test for VGA enabled

In reply to Benjamin Herrenschmidt

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

(Get better description from Aspeed)

---
 drivers/gpu/drm/ast/ast_post.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/ast/ast_post.c +2 -6
index c15f643..a5a7809 100644
@@ -59,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev)
 		/* TODO 1180 */
 	} else {
 		ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
-		if (ch) {
-			ast_open_key(ast);
-			ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff);
-			return ch & 0x04;
-		}
+		return !!(ch & 0x01);
 	}
-	return 0;
+	return false;
 }
 
 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
Signature · 1 line
2.9.3
#32 lore raw

Re: [PATCH 11/12] drm/ast: Fix test for VGA enabled

Quoted 3 lines · Benjamin Herrenschmidt

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

(Get better description from Aspeed)

And this should have been:

<<
The test to see if VGA was already enabled is doing an unnecessary second test from a register that may or may not have been initialized to a valid value. Remove it.

Quoted 1 line
Quoted 1 line

If you prefer you can find the whole thing (already fixed up) at [email protected]:ozbenh/linux-ast.git

Cheers,
Ben.

Quoted 28 lines

---
 drivers/gpu/drm/ast/ast_post.c | 8 ++------

 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/ast/ast_post.c +2 -6
index c15f643..a5a7809 100644
@@ -59,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev)
  		/* TODO 1180 */
  	} else {
  		ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
-		if (ch) {
-			ast_open_key(ast);
-			ch = ast_get_index_reg_mask(ast,
 AST_IO_CRTC_PORT, 0xb6, 0xff);
-			return ch & 0x04;
-		}
+		return !!(ch & 0x01);
  	}
-	return 0;
+	return false;
  }


 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };

Tested-by on v1 11/12
#33 lore raw

RE: [PATCH 11/12] drm/ast: Fix test for VGA enabled

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 11/12] drm/ast: Fix test for VGA enabled

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

(Get better description from Aspeed)

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

#34 lore raw

PATCH 12/12 drm/ast: Call open_key before enable_mmio in POST code

In reply to Benjamin Herrenschmidt

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

open_key enables access the registers used by enable_mmio

---
 drivers/gpu/drm/ast/ast_post.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_post.c +1 -1
index a5a7809..f7d4213 100644
@@ -374,8 +374,8 @@ void ast_post_gpu(struct drm_device *dev)
 	pci_write_config_dword(ast->dev->pdev, 0x04, reg);
 
 	ast_enable_vga(dev);
-	ast_enable_mmio(dev);
 	ast_open_key(ast);
+	ast_enable_mmio(dev);
 	ast_set_def_ext_reg(dev);
 
 	if (ast->config_mode == ast_use_p2a) {
Signature · 6 lines
2.9.3

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

Re: [PATCH 12/12] drm/ast: Call open_key before enable_mmio in POST code

Quoted 6 lines · Benjamin Herrenschmidt

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

open_key enables access the registers used by enable_mmio

Quoted 3 lines
---
 drivers/gpu/drm/ast/ast_post.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tested-by on v1 12/12
#36 lore raw

RE: [PATCH 12/12] drm/ast: Call open_key before enable_mmio in POST code

In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 12/12] drm/ast: Call open_key before enable_mmio in POST code

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

open_key enables access the registers used by enable_mmio

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

Acked-by on v1 1/12
#37 lore raw
In reply to Benjamin Herrenschmidt
Quoted 8 lines · Benjamin Herrenschmidt

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

The current POST code for the AST2300/2400 family doesn't work properly if the chip hasn't been initialized previously by either the BMC own FW or the VBIOS. This fixes it.

Quoted 4 lines
---
 drivers/gpu/drm/ast/ast_post.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)
Tested-by on v1 1/12
#38 lore raw
In reply to Benjamin Herrenschmidt

-----Original Message-----
From: Benjamin Herrenschmidt [mailto:[email protected]]
Sent: Friday, February 24, 2017 6:54 AM
To: [email protected]
Cc: YC Chen <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH 01/12] drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS

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

The current POST code for the AST2300/2400 family doesn't work properly if the chip hasn't been initialized previously by either the BMC own FW or the VBIOS. This fixes it.

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