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

device/azalia_device.c: Correct STATESTS access width

Browse Source 
The HD Audio spec states that the STATESTS register is 16 bits wide.

Change-Id: If7859ed33e58d907a91c4ac8675892e37998cf41
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50790
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Angel Pons
2021-03-18 15:43:42 +01:00
committed by Patrick Georgi
parent fa1befcb57
commit 6da78660d0
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/device/azalia_device.c
View File

@@ -47,18 +47,18 @@ int azalia_exit_reset(u8 *base)
return azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST); return azalia_set_bits(base + HDA_GCTL_REG, HDA_GCTL_CRST, HDA_GCTL_CRST);
} }
static int codec_detect(u8 *base) static u16 codec_detect(u8 *base)
{ {
struct stopwatch sw; struct stopwatch sw;
u32 reg32; u16 reg16;
if (azalia_exit_reset(base) < 0) if (azalia_exit_reset(base) < 0)
goto no_codec; goto no_codec;
/* clear STATESTS bits (BAR + 0xe)[2:0] */ /* clear STATESTS bits (BAR + 0xe)[2:0] */
reg32 = read32(base + HDA_STATESTS_REG); reg16 = read16(base + HDA_STATESTS_REG);
reg32 |= 7; reg16 |= 7;
write32(base + HDA_STATESTS_REG, reg32); write16(base + HDA_STATESTS_REG, reg16);
/* Wait for readback of register to /* Wait for readback of register to
* match what was just written to it * match what was just written to it
@@ -67,8 +67,8 @@ static int codec_detect(u8 *base)
do { do {
/* Wait 1ms based on BKDG wait time */ /* Wait 1ms based on BKDG wait time */
mdelay(1); mdelay(1);
reg32 = read32(base + HDA_STATESTS_REG); reg16 = read16(base + HDA_STATESTS_REG);
} while ((reg32 != 0) && !stopwatch_expired(&sw)); } while ((reg16 != 0) && !stopwatch_expired(&sw));
/* Timeout occurred */ /* Timeout occurred */
if (stopwatch_expired(&sw)) if (stopwatch_expired(&sw))
@@ -81,12 +81,12 @@ static int codec_detect(u8 *base)
goto no_codec; goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0] */ /* Read in Codec location (BAR + 0xe)[2..0] */
reg32 = read32(base + HDA_STATESTS_REG); reg16 = read16(base + HDA_STATESTS_REG);
reg32 &= 0x0f; reg16 &= 0x0f;
if (!reg32) if (!reg16)
goto no_codec; goto no_codec;
return reg32; return reg16;
no_codec: no_codec:
/* Codec Not found */ /* Codec Not found */
@@ -261,7 +261,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
mainboard_azalia_program_runtime_verbs(base, reg32); mainboard_azalia_program_runtime_verbs(base, reg32);
} }
static void codecs_init(struct device *dev, u8 *base, u32 codec_mask) static void codecs_init(struct device *dev, u8 *base, u16 codec_mask)
{ {
int i; int i;
@@ -275,7 +275,7 @@ void azalia_audio_init(struct device *dev)
{ {
u8 *base; u8 *base;
struct resource *res; struct resource *res;
u32 codec_mask; u16 codec_mask;
res = find_resource(dev, PCI_BASE_ADDRESS_0); res = find_resource(dev, PCI_BASE_ADDRESS_0);
if (!res) if (!res)