Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
be825f02
Commit
be825f02
authored
May 19, 2004
by
Dave Jones
Committed by
Dave Jones
May 19, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AGPGART] Remove lots of trailing whitespace from amd64 gart driver.
No code changes.
parent
cd141477
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
67 additions
and
69 deletions
+67
-69
drivers/char/agp/amd64-agp.c
drivers/char/agp/amd64-agp.c
+67
-69
No files found.
drivers/char/agp/amd64-agp.c
View file @
be825f02
/*
/*
* Copyright 2001-2003 SuSE Labs.
* Copyright 2001-2003 SuSE Labs.
* Distributed under the GNU public license, v2.
* Distributed under the GNU public license, v2.
*
*
* This is a GART driver for the AMD Opteron/Athlon64 on-CPU northbridge.
* This is a GART driver for the AMD Opteron/Athlon64 on-CPU northbridge.
* It also includes support for the AMD 8151 AGP bridge,
* It also includes support for the AMD 8151 AGP bridge,
* although it doesn't actually do much, as all the real
* although it doesn't actually do much, as all the real
...
@@ -194,7 +194,7 @@ static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table)
...
@@ -194,7 +194,7 @@ static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table)
/* keep CPU's coherent. */
/* keep CPU's coherent. */
flush_amd64_tlb
(
hammer
);
flush_amd64_tlb
(
hammer
);
return
aper_base
;
return
aper_base
;
}
}
...
@@ -261,53 +261,53 @@ struct agp_bridge_driver amd_8151_driver = {
...
@@ -261,53 +261,53 @@ struct agp_bridge_driver amd_8151_driver = {
/* Some basic sanity checks for the aperture. */
/* Some basic sanity checks for the aperture. */
static
int
__devinit
aperture_valid
(
u64
aper
,
u32
size
)
static
int
__devinit
aperture_valid
(
u64
aper
,
u32
size
)
{
{
u32
pfn
,
c
;
u32
pfn
,
c
;
if
(
aper
==
0
)
{
if
(
aper
==
0
)
{
printk
(
KERN_ERR
PFX
"No aperture
\n
"
);
printk
(
KERN_ERR
PFX
"No aperture
\n
"
);
return
0
;
return
0
;
}
}
if
(
size
<
32
*
1024
*
1024
)
{
if
(
size
<
32
*
1024
*
1024
)
{
printk
(
KERN_ERR
PFX
"Aperture too small (%d MB)
\n
"
,
size
>>
20
);
printk
(
KERN_ERR
PFX
"Aperture too small (%d MB)
\n
"
,
size
>>
20
);
return
0
;
return
0
;
}
}
if
(
aper
+
size
>
0xffffffff
)
{
if
(
aper
+
size
>
0xffffffff
)
{
printk
(
KERN_ERR
PFX
"Aperture out of bounds
\n
"
);
printk
(
KERN_ERR
PFX
"Aperture out of bounds
\n
"
);
return
0
;
return
0
;
}
}
pfn
=
aper
>>
PAGE_SHIFT
;
pfn
=
aper
>>
PAGE_SHIFT
;
for
(
c
=
0
;
c
<
size
/
PAGE_SIZE
;
c
++
)
{
for
(
c
=
0
;
c
<
size
/
PAGE_SIZE
;
c
++
)
{
if
(
!
pfn_valid
(
pfn
+
c
))
if
(
!
pfn_valid
(
pfn
+
c
))
break
;
break
;
if
(
!
PageReserved
(
pfn_to_page
(
pfn
+
c
)))
{
if
(
!
PageReserved
(
pfn_to_page
(
pfn
+
c
)))
{
printk
(
KERN_ERR
PFX
"Aperture pointing to RAM
\n
"
);
printk
(
KERN_ERR
PFX
"Aperture pointing to RAM
\n
"
);
return
0
;
return
0
;
}
}
}
}
/* Request the Aperture. This catches cases when someone else
/* Request the Aperture. This catches cases when someone else
already put a mapping in there - happens with some very broken BIOS
already put a mapping in there - happens with some very broken BIOS
Maybe better to use pci_assign_resource/pci_enable_device instead
trusting
Maybe better to use pci_assign_resource/pci_enable_device instead
the bridges? */
t
rusting t
he bridges? */
if
(
!
aperture_resource
&&
if
(
!
aperture_resource
&&
!
(
aperture_resource
=
request_mem_region
(
aper
,
size
,
"aperture"
)))
{
!
(
aperture_resource
=
request_mem_region
(
aper
,
size
,
"aperture"
)))
{
printk
(
KERN_ERR
PFX
"Aperture conflicts with PCI mapping.
\n
"
);
printk
(
KERN_ERR
PFX
"Aperture conflicts with PCI mapping.
\n
"
);
return
0
;
return
0
;
}
}
return
1
;
return
1
;
}
}
/*
/*
* W*s centric BIOS sometimes only set up the aperture in the AGP
* W*s centric BIOS sometimes only set up the aperture in the AGP
* bridge, not the northbridge. On AMD64 this is handled early
* bridge, not the northbridge. On AMD64 this is handled early
* in aperture.c, but when GART_IOMMU is not enabled or we run
* in aperture.c, but when GART_IOMMU is not enabled or we run
* on a 32bit kernel this needs to be redone.
* on a 32bit kernel this needs to be redone.
* Unfortunately it is impossible to fix the aperture here because it's too late
* Unfortunately it is impossible to fix the aperture here because it's too late
* to allocate that much memory. But at least error out cleanly instead of
* to allocate that much memory. But at least error out cleanly instead of
* crashing.
* crashing.
*/
*/
static
__devinit
int
fix_northbridge
(
struct
pci_dev
*
nb
,
struct
pci_dev
*
agp
,
static
__devinit
int
fix_northbridge
(
struct
pci_dev
*
nb
,
struct
pci_dev
*
agp
,
u16
cap
)
u16
cap
)
{
{
u32
aper_low
,
aper_hi
;
u32
aper_low
,
aper_hi
;
...
@@ -316,38 +316,38 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
...
@@ -316,38 +316,38 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
u32
nb_order
,
nb_base
;
u32
nb_order
,
nb_base
;
u16
apsize
;
u16
apsize
;
pci_read_config_dword
(
nb
,
0x90
,
&
nb_order
);
pci_read_config_dword
(
nb
,
0x90
,
&
nb_order
);
nb_order
=
(
nb_order
>>
1
)
&
7
;
nb_order
=
(
nb_order
>>
1
)
&
7
;
pci_read_config_dword
(
nb
,
0x94
,
&
nb_base
);
pci_read_config_dword
(
nb
,
0x94
,
&
nb_base
);
nb_aper
=
nb_base
<<
25
;
nb_aper
=
nb_base
<<
25
;
if
(
aperture_valid
(
nb_aper
,
(
32
*
1024
*
1024
)
<<
nb_order
))
{
if
(
aperture_valid
(
nb_aper
,
(
32
*
1024
*
1024
)
<<
nb_order
))
{
return
0
;
return
0
;
}
}
/* Northbridge seems to contain crap. Try the AGP bridge. */
/* Northbridge seems to contain crap. Try the AGP bridge. */
pci_read_config_word
(
agp
,
cap
+
0x14
,
&
apsize
);
pci_read_config_word
(
agp
,
cap
+
0x14
,
&
apsize
);
if
(
apsize
==
0xffff
)
if
(
apsize
==
0xffff
)
return
-
1
;
return
-
1
;
apsize
&=
0xfff
;
apsize
&=
0xfff
;
/* Some BIOS use weird encodings not in the AGPv3 table. */
/* Some BIOS use weird encodings not in the AGPv3 table. */
if
(
apsize
&
0xff
)
if
(
apsize
&
0xff
)
apsize
|=
0xf00
;
apsize
|=
0xf00
;
order
=
7
-
hweight16
(
apsize
);
order
=
7
-
hweight16
(
apsize
);
pci_read_config_dword
(
agp
,
0x10
,
&
aper_low
);
pci_read_config_dword
(
agp
,
0x10
,
&
aper_low
);
pci_read_config_dword
(
agp
,
0x14
,
&
aper_hi
);
pci_read_config_dword
(
agp
,
0x14
,
&
aper_hi
);
aper
=
(
aper_low
&
~
((
1
<<
22
)
-
1
))
|
((
u64
)
aper_hi
<<
32
);
aper
=
(
aper_low
&
~
((
1
<<
22
)
-
1
))
|
((
u64
)
aper_hi
<<
32
);
printk
(
KERN_INFO
PFX
"Aperture from AGP @ %Lx size %u MB
\n
"
,
aper
,
32
<<
order
);
printk
(
KERN_INFO
PFX
"Aperture from AGP @ %Lx size %u MB
\n
"
,
aper
,
32
<<
order
);
if
(
order
<
0
||
!
aperture_valid
(
aper
,
(
32
*
1024
*
1024
)
<<
order
))
if
(
order
<
0
||
!
aperture_valid
(
aper
,
(
32
*
1024
*
1024
)
<<
order
))
return
-
1
;
return
-
1
;
pci_write_config_dword
(
nb
,
0x90
,
order
<<
1
);
pci_write_config_dword
(
nb
,
0x90
,
order
<<
1
);
pci_write_config_dword
(
nb
,
0x94
,
aper
>>
25
);
pci_write_config_dword
(
nb
,
0x94
,
aper
>>
25
);
return
0
;
return
0
;
}
}
static
__devinit
int
cache_nbs
(
struct
pci_dev
*
pdev
,
u32
cap_ptr
)
static
__devinit
int
cache_nbs
(
struct
pci_dev
*
pdev
,
u32
cap_ptr
)
{
{
...
@@ -355,19 +355,19 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
...
@@ -355,19 +355,19 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
int
i
=
0
;
int
i
=
0
;
/* cache pci_devs of northbridges. */
/* cache pci_devs of northbridges. */
while
((
loop_dev
=
pci_find_device
(
PCI_VENDOR_ID_AMD
,
0x1103
,
loop_dev
))
while
((
loop_dev
=
pci_find_device
(
PCI_VENDOR_ID_AMD
,
0x1103
,
loop_dev
))
!=
NULL
)
{
!=
NULL
)
{
if
(
i
==
MAX_HAMMER_GARTS
)
{
if
(
i
==
MAX_HAMMER_GARTS
)
{
printk
(
KERN_ERR
PFX
"Too many northbridges for AGP
\n
"
);
printk
(
KERN_ERR
PFX
"Too many northbridges for AGP
\n
"
);
return
-
1
;
return
-
1
;
}
}
if
(
fix_northbridge
(
loop_dev
,
pdev
,
cap_ptr
)
<
0
)
{
if
(
fix_northbridge
(
loop_dev
,
pdev
,
cap_ptr
)
<
0
)
{
printk
(
KERN_ERR
PFX
"No usable aperture found.
\n
"
);
printk
(
KERN_ERR
PFX
"No usable aperture found.
\n
"
);
#ifdef __x86_64__
#ifdef __x86_64__
/* should port this to i386 */
/* should port this to i386 */
printk
(
KERN_ERR
PFX
"Consider rebooting with iommu=memaper=2 to get a good aperture.
\n
"
);
printk
(
KERN_ERR
PFX
"Consider rebooting with iommu=memaper=2 to get a good aperture.
\n
"
);
#endif
#endif
return
-
1
;
return
-
1
;
}
}
hammers
[
i
++
]
=
loop_dev
;
hammers
[
i
++
]
=
loop_dev
;
}
}
...
@@ -377,8 +377,7 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
...
@@ -377,8 +377,7 @@ static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
/* Handle AMD 8151 quirks */
/* Handle AMD 8151 quirks */
static
void
__devinit
amd8151_init
(
struct
pci_dev
*
pdev
,
struct
agp_bridge_data
*
bridge
)
static
void
__devinit
amd8151_init
(
struct
pci_dev
*
pdev
,
struct
agp_bridge_data
*
bridge
)
{
{
char
*
revstring
;
char
*
revstring
;
u8
rev_id
;
u8
rev_id
;
...
@@ -417,12 +416,12 @@ static struct aper_size_info_32 nforce3_sizes[5] =
...
@@ -417,12 +416,12 @@ static struct aper_size_info_32 nforce3_sizes[5] =
/* Handle shadow device of the Nvidia NForce3 */
/* Handle shadow device of the Nvidia NForce3 */
/* CHECK-ME original 2.4 version set up some IORRs. Check if that is needed. */
/* CHECK-ME original 2.4 version set up some IORRs. Check if that is needed. */
static
int
__devinit
nforce3_agp_init
(
struct
pci_dev
*
pdev
)
static
int
__devinit
nforce3_agp_init
(
struct
pci_dev
*
pdev
)
{
{
u32
tmp
,
apbase
,
apbar
,
aplimit
;
u32
tmp
,
apbase
,
apbar
,
aplimit
;
struct
pci_dev
*
dev1
;
struct
pci_dev
*
dev1
;
int
i
;
int
i
;
unsigned
size
=
amd64_fetch_size
();
unsigned
size
=
amd64_fetch_size
();
printk
(
KERN_INFO
PFX
"Setting up Nforce3 AGP.
\n
"
);
printk
(
KERN_INFO
PFX
"Setting up Nforce3 AGP.
\n
"
);
...
@@ -432,17 +431,17 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev)
...
@@ -432,17 +431,17 @@ static int __devinit nforce3_agp_init(struct pci_dev *pdev)
"nForce3 chipset, but could not find "
"nForce3 chipset, but could not find "
"the secondary device.
\n
"
);
"the secondary device.
\n
"
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
nforce3_sizes
);
i
++
)
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
nforce3_sizes
);
i
++
)
if
(
nforce3_sizes
[
i
].
size
==
size
)
if
(
nforce3_sizes
[
i
].
size
==
size
)
break
;
break
;
if
(
i
==
ARRAY_SIZE
(
nforce3_sizes
))
{
if
(
i
==
ARRAY_SIZE
(
nforce3_sizes
))
{
printk
(
KERN_INFO
PFX
"No NForce3 size found for %d
\n
"
,
size
);
printk
(
KERN_INFO
PFX
"No NForce3 size found for %d
\n
"
,
size
);
return
-
ENODEV
;
return
-
ENODEV
;
}
}
pci_read_config_dword
(
dev1
,
NVIDIA_X86_64_1_APSIZE
,
&
tmp
);
pci_read_config_dword
(
dev1
,
NVIDIA_X86_64_1_APSIZE
,
&
tmp
);
tmp
&=
~
(
0xf
);
tmp
&=
~
(
0xf
);
tmp
|=
nforce3_sizes
[
i
].
size_value
;
tmp
|=
nforce3_sizes
[
i
].
size_value
;
...
@@ -491,8 +490,7 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
...
@@ -491,8 +490,7 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
pdev
->
device
==
PCI_DEVICE_ID_AMD_8151_0
)
{
pdev
->
device
==
PCI_DEVICE_ID_AMD_8151_0
)
{
amd8151_init
(
pdev
,
bridge
);
amd8151_init
(
pdev
,
bridge
);
}
else
{
}
else
{
printk
(
KERN_INFO
PFX
"Detected AGP bridge %x
\n
"
,
printk
(
KERN_INFO
PFX
"Detected AGP bridge %x
\n
"
,
pdev
->
devfn
);
pdev
->
devfn
);
}
}
bridge
->
driver
=
&
amd_8151_driver
;
bridge
->
driver
=
&
amd_8151_driver
;
...
@@ -507,10 +505,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
...
@@ -507,10 +505,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev,
return
-
ENODEV
;
return
-
ENODEV
;
}
}
if
(
pdev
->
vendor
==
PCI_VENDOR_ID_NVIDIA
)
{
if
(
pdev
->
vendor
==
PCI_VENDOR_ID_NVIDIA
)
{
int
ret
=
nforce3_agp_init
(
pdev
);
int
ret
=
nforce3_agp_init
(
pdev
);
if
(
ret
)
{
if
(
ret
)
{
agp_put_bridge
(
bridge
);
agp_put_bridge
(
bridge
);
return
ret
;
return
ret
;
}
}
}
}
...
@@ -523,8 +521,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
...
@@ -523,8 +521,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
{
{
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
struct
agp_bridge_data
*
bridge
=
pci_get_drvdata
(
pdev
);
release_mem_region
(
virt_to_phys
(
bridge
->
gatt_table_real
),
release_mem_region
(
virt_to_phys
(
bridge
->
gatt_table_real
),
amd64_aperture_sizes
[
bridge
->
aperture_size_idx
].
size
);
amd64_aperture_sizes
[
bridge
->
aperture_size_idx
].
size
);
agp_remove_bridge
(
bridge
);
agp_remove_bridge
(
bridge
);
agp_put_bridge
(
bridge
);
agp_put_bridge
(
bridge
);
}
}
...
@@ -609,15 +607,15 @@ int __init agp_amd64_init(void)
...
@@ -609,15 +607,15 @@ int __init agp_amd64_init(void)
int
err
=
0
;
int
err
=
0
;
if
(
agp_off
)
if
(
agp_off
)
return
-
EINVAL
;
return
-
EINVAL
;
if
(
pci_module_init
(
&
agp_amd64_pci_driver
)
>
0
)
{
if
(
pci_module_init
(
&
agp_amd64_pci_driver
)
>
0
)
{
struct
pci_dev
*
dev
;
struct
pci_dev
*
dev
;
if
(
!
agp_try_unsupported
&&
!
agp_try_unsupported_boot
)
{
if
(
!
agp_try_unsupported
&&
!
agp_try_unsupported_boot
)
{
printk
(
KERN_INFO
PFX
"No supported AGP bridge found.
\n
"
);
printk
(
KERN_INFO
PFX
"No supported AGP bridge found.
\n
"
);
#ifdef MODULE
#ifdef MODULE
printk
(
KERN_INFO
PFX
"You can try agp_try_unsupported=1
\n
"
);
printk
(
KERN_INFO
PFX
"You can try agp_try_unsupported=1
\n
"
);
#else
#else
printk
(
KERN_INFO
PFX
"You can boot with agp=try_unsupported
\n
"
);
printk
(
KERN_INFO
PFX
"You can boot with agp=try_unsupported
\n
"
);
#endif
#endif
return
-
ENODEV
;
return
-
ENODEV
;
}
}
...
@@ -631,12 +629,12 @@ int __init agp_amd64_init(void)
...
@@ -631,12 +629,12 @@ int __init agp_amd64_init(void)
while
((
dev
=
pci_find_device
(
PCI_ANY_ID
,
PCI_ANY_ID
,
dev
)))
{
while
((
dev
=
pci_find_device
(
PCI_ANY_ID
,
PCI_ANY_ID
,
dev
)))
{
if
(
!
pci_find_capability
(
dev
,
PCI_CAP_ID_AGP
))
if
(
!
pci_find_capability
(
dev
,
PCI_CAP_ID_AGP
))
continue
;
continue
;
/* Only one bridge supported right now */
/* Only one bridge supported right now */
if
(
agp_amd64_probe
(
dev
,
NULL
)
==
0
)
{
if
(
agp_amd64_probe
(
dev
,
NULL
)
==
0
)
{
err
=
0
;
err
=
0
;
break
;
break
;
}
}
}
}
}
}
return
err
;
return
err
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment