AGESA Hudson: Fix typecasts in Fch_Oem_config()
Like many other (but not all) BiosCallouts, StdHeader is also passed as ConfigPtr argument. Use that instead to make no assumptions of the real type of FchData as it changes depending of the StdHeader. Change-Id: Ibdf01d08e63b9e1b8e99ac16abb7f807d37a056e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/6240 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
parent
37ab729ec3
commit
dfad070831
|
@ -191,13 +191,13 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
|
||||||
*/
|
*/
|
||||||
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
FCH_RESET_DATA_BLOCK *FchParams = (FCH_RESET_DATA_BLOCK *)FchData;
|
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
|
||||||
|
|
||||||
if (FchParams->StdHeader->Func == AMD_INIT_RESET) {
|
if (StdHeader->Func == AMD_INIT_RESET) {
|
||||||
//FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
//FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
||||||
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
||||||
} else if (FchParams->StdHeader->Func == AMD_INIT_ENV) {
|
} else if (StdHeader->Func == AMD_INIT_ENV) {
|
||||||
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
||||||
|
|
||||||
|
|
|
@ -191,14 +191,14 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
|
||||||
*/
|
*/
|
||||||
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
FCH_RESET_DATA_BLOCK *FchParams = (FCH_RESET_DATA_BLOCK *)FchData;
|
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
|
||||||
|
|
||||||
if (FchParams->StdHeader->Func == AMD_INIT_RESET) {
|
if (StdHeader->Func == AMD_INIT_RESET) {
|
||||||
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
||||||
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
||||||
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
||||||
} else if (FchParams->StdHeader->Func == AMD_INIT_ENV) {
|
} else if (StdHeader->Func == AMD_INIT_ENV) {
|
||||||
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
||||||
|
|
||||||
|
|
|
@ -304,13 +304,13 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
|
||||||
*/
|
*/
|
||||||
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
FCH_RESET_DATA_BLOCK *FchParams = (FCH_RESET_DATA_BLOCK *)FchData;
|
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
|
||||||
|
|
||||||
if (FchParams->StdHeader->Func == AMD_INIT_RESET) {
|
if (StdHeader->Func == AMD_INIT_RESET) {
|
||||||
//FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
//FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
||||||
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
||||||
} else if (FchParams->StdHeader->Func == AMD_INIT_ENV) {
|
} else if (StdHeader->Func == AMD_INIT_ENV) {
|
||||||
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
||||||
|
|
||||||
|
|
|
@ -80,13 +80,13 @@ static const CODEC_TBL_LIST CodecTableList[] =
|
||||||
*/
|
*/
|
||||||
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
FCH_RESET_DATA_BLOCK *FchParams = (FCH_RESET_DATA_BLOCK *)FchData;
|
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
|
||||||
|
|
||||||
if (FchParams->StdHeader->Func == AMD_INIT_RESET) {
|
if (StdHeader->Func == AMD_INIT_RESET) {
|
||||||
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
||||||
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
||||||
} else if (FchParams->StdHeader->Func == AMD_INIT_ENV) {
|
} else if (StdHeader->Func == AMD_INIT_ENV) {
|
||||||
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
||||||
|
|
||||||
|
|
|
@ -187,14 +187,14 @@ static void oem_fan_control(FCH_DATA_BLOCK *FchParams)
|
||||||
*/
|
*/
|
||||||
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
|
||||||
{
|
{
|
||||||
FCH_RESET_DATA_BLOCK *FchParams = (FCH_RESET_DATA_BLOCK *)FchData;
|
AMD_CONFIG_PARAMS *StdHeader = ConfigPtr;
|
||||||
|
|
||||||
if (FchParams->StdHeader->Func == AMD_INIT_RESET) {
|
if (StdHeader->Func == AMD_INIT_RESET) {
|
||||||
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
FCH_RESET_DATA_BLOCK *FchParams_reset = (FCH_RESET_DATA_BLOCK *) FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT RESET ");
|
||||||
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
//FchParams_reset->EcChannel0 = TRUE; /* logical devicd 3 */
|
||||||
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
FchParams_reset->LegacyFree = IS_ENABLED(CONFIG_HUDSON_LEGACY_FREE);
|
||||||
} else if (FchParams->StdHeader->Func == AMD_INIT_ENV) {
|
} else if (StdHeader->Func == AMD_INIT_ENV) {
|
||||||
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;
|
||||||
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue