Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
843ad02f
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
152
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
843ad02f
编写于
3月 24, 2009
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/intel8x0' into for-linus
上级
60c4e7c1
14ab0861
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
72 addition
and
25 deletion
+72
-25
sound/pci/ac97/ac97_codec.c
sound/pci/ac97/ac97_codec.c
+1
-1
sound/pci/ac97/ac97_proc.c
sound/pci/ac97/ac97_proc.c
+2
-0
sound/pci/intel8x0.c
sound/pci/intel8x0.c
+59
-20
sound/pci/intel8x0m.c
sound/pci/intel8x0m.c
+10
-4
未找到文件。
sound/pci/ac97/ac97_codec.c
浏览文件 @
843ad02f
...
...
@@ -384,7 +384,7 @@ int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned sho
EXPORT_SYMBOL
(
snd_ac97_update_bits
);
/* no lock version - see snd_ac97_updat_bits() */
/* no lock version - see snd_ac97_updat
e
_bits() */
int
snd_ac97_update_bits_nolock
(
struct
snd_ac97
*
ac97
,
unsigned
short
reg
,
unsigned
short
mask
,
unsigned
short
value
)
{
...
...
sound/pci/ac97/ac97_proc.c
浏览文件 @
843ad02f
...
...
@@ -125,6 +125,8 @@ static void snd_ac97_proc_read_main(struct snd_ac97 *ac97, struct snd_info_buffe
snd_iprintf
(
buffer
,
"PCI Subsys Device: 0x%04x
\n\n
"
,
ac97
->
subsystem_device
);
snd_iprintf
(
buffer
,
"Flags: %x
\n
"
,
ac97
->
flags
);
if
((
ac97
->
ext_id
&
AC97_EI_REV_MASK
)
>=
AC97_EI_REV_23
)
{
val
=
snd_ac97_read
(
ac97
,
AC97_INT_PAGING
);
snd_ac97_update_bits
(
ac97
,
AC97_INT_PAGING
,
...
...
sound/pci/intel8x0.c
浏览文件 @
843ad02f
...
...
@@ -689,7 +689,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
bdbar
[
idx
+
1
]
=
cpu_to_le32
(
0x80000000
|
/* interrupt on completion */
ichdev
->
fragsize
>>
ichdev
->
pos_shift
);
#if 0
printk("bdbar[%i] = 0x%x [0x%x]\n",
printk(
KERN_DEBUG
"bdbar[%i] = 0x%x [0x%x]\n",
idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
#endif
}
...
...
@@ -701,8 +701,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
ichdev
->
lvi_frag
=
ICH_REG_LVI_MASK
%
ichdev
->
frags
;
ichdev
->
position
=
0
;
#if 0
printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
"period_size1 = 0x%x\n",
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
ichdev->fragsize1);
#endif
/* clear interrupts */
iputbyte
(
chip
,
port
+
ichdev
->
roff_sr
,
ICH_FIFOE
|
ICH_BCIS
|
ICH_LVBCI
);
...
...
@@ -768,7 +770,8 @@ static inline void snd_intel8x0_update(struct intel8x0 *chip, struct ichdev *ich
ichdev
->
lvi_frag
%=
ichdev
->
frags
;
ichdev
->
bdbar
[
ichdev
->
lvi
*
2
]
=
cpu_to_le32
(
ichdev
->
physbuf
+
ichdev
->
lvi_frag
*
ichdev
->
fragsize1
);
#if 0
printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, "
"all = 0x%x, 0x%x\n",
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
inl(port + 4), inb(port + ICH_REG_OFF_CR));
...
...
@@ -2287,23 +2290,23 @@ static void do_ali_reset(struct intel8x0 *chip)
iputdword
(
chip
,
ICHREG
(
ALI_INTERRUPTSR
),
0x00000000
);
}
static
int
snd_intel8x0_ich_chip_init
(
struct
intel8x0
*
chip
,
int
probing
)
{
unsigned
long
end_time
;
unsigned
int
cnt
,
status
,
nstatus
;
/* put logic to right state */
/* first clear status bits */
status
=
ICH_RCS
|
ICH_MCINT
|
ICH_POINT
|
ICH_PIINT
;
if
(
chip
->
device_type
==
DEVICE_NFORCE
)
status
|=
ICH_NVSPINT
;
cnt
=
igetdword
(
chip
,
ICHREG
(
GLOB_STA
));
iputdword
(
chip
,
ICHREG
(
GLOB_STA
),
cnt
&
status
);
#ifdef CONFIG_SND_AC97_POWER_SAVE
static
struct
snd_pci_quirk
ich_chip_reset_mode
[]
=
{
SND_PCI_QUIRK
(
0x1014
,
0x051f
,
"Thinkpad R32"
,
1
),
{
}
/* end */
};
static
int
snd_intel8x0_ich_chip_cold_reset
(
struct
intel8x0
*
chip
)
{
unsigned
int
cnt
;
/* ACLink on, 2 channels */
if
(
snd_pci_quirk_lookup
(
chip
->
pci
,
ich_chip_reset_mode
))
return
-
EIO
;
cnt
=
igetdword
(
chip
,
ICHREG
(
GLOB_CNT
));
cnt
&=
~
(
ICH_ACLINK
|
ICH_PCM_246_MASK
);
#ifdef CONFIG_SND_AC97_POWER_SAVE
/* do cold reset - the full ac97 powerdown may leave the controller
* in a warm state but actually it cannot communicate with the codec.
*/
...
...
@@ -2312,22 +2315,58 @@ static int snd_intel8x0_ich_chip_init(struct intel8x0 *chip, int probing)
udelay
(
10
);
iputdword
(
chip
,
ICHREG
(
GLOB_CNT
),
cnt
|
ICH_AC97COLD
);
msleep
(
1
);
return
0
;
}
#define snd_intel8x0_ich_chip_can_cold_reset(chip) \
(!snd_pci_quirk_lookup(chip->pci, ich_chip_reset_mode))
#else
#define snd_intel8x0_ich_chip_cold_reset(chip) 0
#define snd_intel8x0_ich_chip_can_cold_reset(chip) (0)
#endif
static
int
snd_intel8x0_ich_chip_reset
(
struct
intel8x0
*
chip
)
{
unsigned
long
end_time
;
unsigned
int
cnt
;
/* ACLink on, 2 channels */
cnt
=
igetdword
(
chip
,
ICHREG
(
GLOB_CNT
));
cnt
&=
~
(
ICH_ACLINK
|
ICH_PCM_246_MASK
);
/* finish cold or do warm reset */
cnt
|=
(
cnt
&
ICH_AC97COLD
)
==
0
?
ICH_AC97COLD
:
ICH_AC97WARM
;
iputdword
(
chip
,
ICHREG
(
GLOB_CNT
),
cnt
);
end_time
=
(
jiffies
+
(
HZ
/
4
))
+
1
;
do
{
if
((
igetdword
(
chip
,
ICHREG
(
GLOB_CNT
))
&
ICH_AC97WARM
)
==
0
)
goto
__ok
;
return
0
;
schedule_timeout_uninterruptible
(
1
);
}
while
(
time_after_eq
(
end_time
,
jiffies
));
snd_printk
(
KERN_ERR
"AC'97 warm reset still in progress? [0x%x]
\n
"
,
igetdword
(
chip
,
ICHREG
(
GLOB_CNT
)));
return
-
EIO
;
}
static
int
snd_intel8x0_ich_chip_init
(
struct
intel8x0
*
chip
,
int
probing
)
{
unsigned
long
end_time
;
unsigned
int
status
,
nstatus
;
unsigned
int
cnt
;
int
err
;
/* put logic to right state */
/* first clear status bits */
status
=
ICH_RCS
|
ICH_MCINT
|
ICH_POINT
|
ICH_PIINT
;
if
(
chip
->
device_type
==
DEVICE_NFORCE
)
status
|=
ICH_NVSPINT
;
cnt
=
igetdword
(
chip
,
ICHREG
(
GLOB_STA
));
iputdword
(
chip
,
ICHREG
(
GLOB_STA
),
cnt
&
status
);
if
(
snd_intel8x0_ich_chip_can_cold_reset
(
chip
))
err
=
snd_intel8x0_ich_chip_cold_reset
(
chip
);
else
err
=
snd_intel8x0_ich_chip_reset
(
chip
);
if
(
err
<
0
)
return
err
;
__ok:
#endif
if
(
probing
)
{
/* wait for any codec ready status.
* Once it becomes ready it should remain ready
...
...
sound/pci/intel8x0m.c
浏览文件 @
843ad02f
...
...
@@ -411,7 +411,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
bdbar
[
idx
+
0
]
=
cpu_to_le32
(
ichdev
->
physbuf
+
(((
idx
>>
1
)
*
ichdev
->
fragsize
)
%
ichdev
->
size
));
bdbar
[
idx
+
1
]
=
cpu_to_le32
(
0x80000000
|
/* interrupt on completion */
ichdev
->
fragsize
>>
chip
->
pcm_pos_shift
);
// printk("bdbar[%i] = 0x%x [0x%x]\n", idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
/*
printk(KERN_DEBUG "bdbar[%i] = 0x%x [0x%x]\n",
idx + 0, bdbar[idx + 0], bdbar[idx + 1]);
*/
}
ichdev
->
frags
=
ichdev
->
size
/
ichdev
->
fragsize
;
}
...
...
@@ -421,8 +424,10 @@ static void snd_intel8x0_setup_periods(struct intel8x0m *chip, struct ichdev *ic
ichdev
->
lvi_frag
=
ICH_REG_LVI_MASK
%
ichdev
->
frags
;
ichdev
->
position
=
0
;
#if 0
printk("lvi_frag = %i, frags = %i, period_size = 0x%x, period_size1 = 0x%x\n",
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize, ichdev->fragsize1);
printk(KERN_DEBUG "lvi_frag = %i, frags = %i, period_size = 0x%x, "
"period_size1 = 0x%x\n",
ichdev->lvi_frag, ichdev->frags, ichdev->fragsize,
ichdev->fragsize1);
#endif
/* clear interrupts */
iputbyte
(
chip
,
port
+
ichdev
->
roff_sr
,
ICH_FIFOE
|
ICH_BCIS
|
ICH_LVBCI
);
...
...
@@ -465,7 +470,8 @@ static inline void snd_intel8x0_update(struct intel8x0m *chip, struct ichdev *ic
ichdev
->
lvi_frag
*
ichdev
->
fragsize1
);
#if 0
printk("new: bdbar[%i] = 0x%x [0x%x], prefetch = %i, all = 0x%x, 0x%x\n",
printk(KERN_DEBUG "new: bdbar[%i] = 0x%x [0x%x], "
"prefetch = %i, all = 0x%x, 0x%x\n",
ichdev->lvi * 2, ichdev->bdbar[ichdev->lvi * 2],
ichdev->bdbar[ichdev->lvi * 2 + 1], inb(ICH_REG_OFF_PIV + port),
inl(port + 4), inb(port + ICH_REG_OFF_CR));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录