diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-09 17:38:23 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-20 21:37:11 +0000 |
| commit | ff9ba54ce190da0b5df5306b1fe99c796265e30e (patch) | |
| tree | b193c84fe9462dc9df4cf465b8ffac36b088ff26 /src/soc | |
| parent | b484609a0230cb8fc4ab3f01f348c767054c8873 (diff) | |
sb,soc/amd: Drop OSFL method in ASL
Variable OSVR had a static value of 3 and OSFL() did not
actually call _OSI or _OS methods.
The conditional in HDA _INI method of OSVR is dropped and
use of DMA NoSnoop attribute remains disabled to retain
previous behaviour. For soc/amd/picasso a different decision
was made in CB:40782 as HDA _INI method was just dropped and
default configuration enables use of DMA NoSnoop attribute.
Change-Id: I967b7b2afbb43253cccb4b77f6c44db45e2989e4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50592
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl | 24 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 12 |
2 files changed, 3 insertions, 33 deletions
diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl index 2c4bdbf547..40e882c004 100644 --- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl +++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl @@ -134,9 +134,6 @@ Method(_INI, 0, Serialized) { /* DBGO(\_REV) */ /* DBGO("\n") */ - /* Determine the OS we're running on */ - OSFL() - /* Send ALIB Function 1 the AC/DC state */ Name(F1BF, Buffer(0x03){}) CreateWordField(F1BF, 0, F1SZ) @@ -149,27 +146,6 @@ Method(_INI, 0, Serialized) { } /* End Method(_SB._INI) */ -Method(OSFL, 0){ - - if (OSVR != Ones) {Return (OSVR)} /* OS version was already detected */ - - if (CondRefOf(\_OSI)) - { - OSVR = 1 /* Assume some form of XP */ - if (\_OSI("Windows 2006")) /* Vista */ - { - OSVR = 2 - } - } else { - If (WCMP(\_OS,"Linux")) { - OSVR = 3 /* Linux */ - } Else { - OSVR = 4 /* Gotta be WinCE */ - } - } - Return (OSVR) -} - OperationRegion(SMIC, SystemMemory, 0xfed80000, 0x80000) Field( SMIC, ByteAcc, NoLock, Preserve) { /* MISC registers */ diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 2c90d04ff9..eb59cdce4c 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -519,23 +519,17 @@ void hda_soc_ssdt_quirks(const struct device *dev) /* * Method (_INI, 0, NotSerialized) { - * If (LEqual (OSVR, 0x03)) { - * Store (Zero, NSEN) - * Store (One, NSDO) - * Store (One, NSDI) - * } + * Store (Zero, NSEN) + * Store (One, NSDO) + * Store (One, NSDI) * } */ acpigen_write_method("_INI", 0); - acpigen_write_if_lequal_namestr_int("OSVR", 0x03); - acpigen_write_store_op_to_namestr(ZERO_OP, "NSEN"); acpigen_write_store_op_to_namestr(ONE_OP, "NSDO"); acpigen_write_store_op_to_namestr(ONE_OP, "NSDI"); - acpigen_pop_len(); /* If */ - acpigen_pop_len(); /* Method _INI */ acpigen_pop_len(); /* Scope */ |