sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

azalia: Get rid of "return {-1,0}

Browse Source 
Use 'enum cb_err' instead of {-1,0}.

Change-Id: Icea33ea3e6a5e3c7bbfedc29045026cd722ac23e
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83503
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Elyes Haouas 2024-07-17 12:22:43 +02:00 committed by Felix Held
parent af0d4bce65
commit 96719adda3
9 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/device/azalia_device.c
View File

@ -9,7 +9,7 @@
#include <timer.h>
#include <types.h>
int azalia_set_bits(void *port, u32 mask, u32 val)
static enum cb_err azalia_set_bits(void *port, u32 mask, u32 val)
{
struct stopwatch sw;
u32 reg32;
@ -32,17 +32,17 @@ int azalia_set_bits(void *port, u32 mask, u32 val)
/* Timeout occurred */
if (stopwatch_expired(&sw))
return -1;
return 0;
return CB_ERR;
return CB_SUCCESS;
}
int azalia_enter_reset(u8 *base)
enum cb_err azalia_enter_reset(u8 *base)
{
/* Set bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
return azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, 0);
}
int azalia_exit_reset(u8 *base)
enum cb_err azalia_exit_reset(u8 *base)
{
/* Set bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
return azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST);
@ -53,7 +53,7 @@ static u16 codec_detect(u8 *base)
struct stopwatch sw;
u16 reg16;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/*
@ -89,10 +89,10 @@ static u16 codec_detect(u8 *base)
if (stopwatch_expired(&sw))
goto no_codec;
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0x0e)[14:0] */

7
src/include/device/azalia_device.h
View File

@ -6,7 +6,7 @@
#include <acpi/acpi.h>
#include <device/device.h>
#include <device/mmio.h>
#include <stdint.h>
#include <types.h>
#define HDA_GCAP_REG 0x00
#define HDA_GCTL_REG 0x08
@ -20,9 +20,8 @@
#define AZALIA_MAX_CODECS 15
int azalia_set_bits(void *port, u32 mask, u32 val);
int azalia_enter_reset(u8 *base);
int azalia_exit_reset(u8 *base);
enum cb_err azalia_enter_reset(u8 *base);
enum cb_err azalia_exit_reset(u8 *base);
u32 azalia_find_verb(const u32 *verb_table, u32 verb_table_bytes, u32 viddid, const u32 **verb);
int azalia_program_verb_table(u8 *base, const u32 *verbs, u32 verb_size);
void azalia_codec_init(u8 *base, int addr, const u32 *verb_table, u32 verb_table_bytes);

8
src/soc/intel/common/hda_verb.c
View File

@ -4,7 +4,7 @@
#include <delay.h>
#include <device/azalia_device.h>
#include <device/mmio.h>
#include <stdint.h>
#include <types.h>
#include "hda_verb.h"
@ -13,7 +13,7 @@ int hda_codec_detect(u8 *base)
u8 reg8;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Write back the value once reset bit is set. */
@ -26,11 +26,11 @@ int hda_codec_detect(u8 *base)
write8(base + HDA_STATESTS_REG, 0xf);
/* Turn off the link and poll RESET# bit until it reads back as 0 */
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
/* Turn on the link and poll RESET# bit until it reads back as 1 */
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */

3
src/southbridge/intel/bd82x6x/azalia.c
View File

@ -8,6 +8,7 @@
#include <device/mmio.h>
#include <delay.h>
#include <device/azalia_device.h>
#include <types.h>
#include "chip.h"
#include "pch.h"
@ -16,7 +17,7 @@ static int codec_detect(u8 *base)
{
u8 reg8;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Write back the value once reset bit is set. */

7
src/southbridge/intel/i82801gx/azalia.c
View File

@ -8,7 +8,8 @@
#include <device/mmio.h>
#include <delay.h>
#include <device/azalia_device.h>
#include <stdint.h>
#include <types.h>
#include "chip.h"
#include "i82801gx.h"
@ -16,10 +17,10 @@ static int codec_detect(u8 *base)
{
u32 reg32;
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */

6
src/southbridge/intel/i82801ix/azalia.c
View File

@ -7,6 +7,8 @@
#include <device/pci_ops.h>
#include <device/mmio.h>
#include <device/azalia_device.h>
#include <types.h>
#include "chip.h"
#include "i82801ix.h"
@ -14,10 +16,10 @@ static int codec_detect(u8 *base)
{
u32 reg32;
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */

6
src/southbridge/intel/i82801jx/azalia.c
View File

@ -7,6 +7,8 @@
#include <device/pci_ops.h>
#include <device/mmio.h>
#include <device/azalia_device.h>
#include <types.h>
#include "chip.h"
#include "i82801jx.h"
@ -14,10 +16,10 @@ static int codec_detect(u8 *base)
{
u32 reg32;
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */

4
src/southbridge/intel/ibexpeak/azalia.c
View File

@ -8,13 +8,15 @@
#include <device/mmio.h>
#include <delay.h>
#include <device/azalia_device.h>
#include <types.h>
#include "pch.h"
static int codec_detect(u8 *base)
{
u8 reg8;
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Write back the value once reset bit is set. */

7
src/southbridge/intel/lynxpoint/hda_verb.c
View File

@ -3,6 +3,7 @@
#include <console/console.h>
#include <device/azalia_device.h>
#include <device/mmio.h>
#include <types.h>
#include "hda_verb.h"
@ -11,7 +12,7 @@ int hda_codec_detect(u8 *base)
u8 reg8;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Write back the value once reset bit is set. */
@ -24,11 +25,11 @@ int hda_codec_detect(u8 *base)
write8(base + HDA_STATESTS_REG, 0xf);
/* Turn off the link and poll RESET# bit until it reads back as 0 */
if (azalia_enter_reset(base) < 0)
if (azalia_enter_reset(base) != CB_SUCCESS)
goto no_codec;
/* Turn on the link and poll RESET# bit until it reads back as 1 */
if (azalia_exit_reset(base) < 0)
if (azalia_exit_reset(base) != CB_SUCCESS)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */