GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

azalia: Treat all negative return values as errors 

Instead of checking whether the return value equals -1, just check if it
is negative. Some Azalia implementations already do it, but most do not.

Change-Id: I43ce72a01c07eff62d645db28c09584b386532ff
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46727
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-10-24 23:23:07 +02:00 committed by Patrick Georgi
parent 90cdf705aa
commit 554713ee0a
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/device/azalia_device.c
View File

@ -40,7 +40,7 @@ static int codec_detect(u8 *base)
int count;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* clear STATESTS bits (BAR + 0xe)[2:0] */
@ -62,11 +62,11 @@ static int codec_detect(u8 *base)
goto no_codec;
/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
goto no_codec;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */
@ -166,7 +166,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "azalia_audio: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -174,7 +174,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -192,12 +192,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "azalia_audio: verb loaded.\n");

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

@ -46,7 +46,7 @@ static int codec_detect(u8 *base)
u8 reg8;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Write back the value once reset bit is set. */
@ -142,7 +142,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -150,7 +150,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -168,12 +168,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@ -188,12 +188,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
}
for (i = 0; i < pc_beep_verbs_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, pc_beep_verbs[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
}

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

@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
u32 reg32;
/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
goto no_codec;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */
@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "Azalia: verb loaded.\n");

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

@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
u32 reg32;
/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
goto no_codec;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */
@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@ -187,12 +187,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
}
for (i = 0; i < pc_beep_verbs_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, pc_beep_verbs[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
}

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

@ -43,11 +43,11 @@ static int codec_detect(u8 *base)
u32 reg32;
/* Set Bit 0 to 0 to enter reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, 0) < 0)
goto no_codec;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */
@ -140,7 +140,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -148,7 +148,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -166,12 +166,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@ -187,12 +187,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
}
for (i = 0; i < pc_beep_verbs_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, pc_beep_verbs[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
}

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

@ -42,7 +42,7 @@ static int codec_detect(u8 *base)
u8 reg8;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) == -1)
if (set_bits(base + HDA_GCTL_REG, 1, HDA_GCTL_CRST) < 0)
goto no_codec;
/* Write back the value once reset bit is set. */
@ -138,7 +138,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "Azalia: Initializing codec #%d\n", addr);
/* 1 */
if (wait_for_ready(base) == -1) {
if (wait_for_ready(base) < 0) {
printk(BIOS_DEBUG, " codec not ready.\n");
return;
}
@ -146,7 +146,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
reg32 = (addr << 28) | 0x000f0000;
write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) {
if (wait_for_valid(base) < 0) {
printk(BIOS_DEBUG, " codec not valid.\n");
return;
}
@ -164,12 +164,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 3 */
for (i = 0; i < verb_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
printk(BIOS_DEBUG, "Azalia: verb loaded.\n");
@ -185,12 +185,12 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
}
for (i = 0; i < pc_beep_verbs_size; i++) {
if (wait_for_ready(base) == -1)
if (wait_for_ready(base) < 0)
return;
write32(base + HDA_IC_REG, pc_beep_verbs[i]);
if (wait_for_valid(base) == -1)
if (wait_for_valid(base) < 0)
return;
}
}