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
Kirill Smelkov
linux
Commits
dc71d7c6
Commit
dc71d7c6
authored
Nov 30, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
f0594f08
37283048
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
1 deletion
+31
-1
arch/i386/pci/mmconfig.c
arch/i386/pci/mmconfig.c
+7
-0
arch/x86_64/pci/mmconfig.c
arch/x86_64/pci/mmconfig.c
+7
-0
drivers/pci/hotplug/cpqphp_pci.c
drivers/pci/hotplug/cpqphp_pci.c
+1
-1
drivers/pci/hotplug/pciehp_hpc.c
drivers/pci/hotplug/pciehp_hpc.c
+3
-0
drivers/pci/hotplug/shpchp_hpc.c
drivers/pci/hotplug/shpchp_hpc.c
+3
-0
drivers/pci/pci-sysfs.c
drivers/pci/pci-sysfs.c
+10
-0
No files found.
arch/i386/pci/mmconfig.c
View file @
dc71d7c6
...
...
@@ -102,6 +102,13 @@ static int __init pci_mmcfg_init(void)
if
(
!
pci_mmcfg_base_addr
)
goto
out
;
/* Kludge for now. Don't use mmconfig on AMD systems because
those have some busses where mmconfig doesn't work,
and we don't parse ACPI MCFG well enough to handle that.
Remove when proper handling is added. */
if
(
boot_cpu_data
.
x86_vendor
==
X86_VENDOR_AMD
)
goto
out
;
printk
(
KERN_INFO
"PCI: Using MMCONFIG
\n
"
);
raw_pci_ops
=
&
pci_mmcfg
;
pci_probe
=
(
pci_probe
&
~
PCI_PROBE_MASK
)
|
PCI_PROBE_MMCONF
;
...
...
arch/x86_64/pci/mmconfig.c
View file @
dc71d7c6
...
...
@@ -78,6 +78,13 @@ static int __init pci_mmcfg_init(void)
if
(
!
pci_mmcfg_base_addr
)
return
0
;
/* Kludge for now. Don't use mmconfig on AMD systems because
those have some busses where mmconfig doesn't work,
and we don't parse ACPI MCFG well enough to handle that.
Remove when proper handling is added. */
if
(
boot_cpu_data
.
x86_vendor
==
X86_VENDOR_AMD
)
return
0
;
/* RED-PEN i386 doesn't do _nocache right now */
pci_mmcfg_virt
=
ioremap_nocache
(
pci_mmcfg_base_addr
,
MMCONFIG_APER_SIZE
);
if
(
!
pci_mmcfg_virt
)
{
...
...
drivers/pci/hotplug/cpqphp_pci.c
View file @
dc71d7c6
...
...
@@ -194,7 +194,7 @@ static int PCI_ScanBusNonBridge (u8 bus, u8 device)
static
int
PCI_ScanBusForNonBridge
(
struct
controller
*
ctrl
,
u8
bus_num
,
u8
*
dev_num
)
{
u
8
tdevice
;
u
16
tdevice
;
u32
work
;
u8
tbus
;
...
...
drivers/pci/hotplug/pciehp_hpc.c
View file @
dc71d7c6
...
...
@@ -1347,6 +1347,9 @@ int pcie_init(struct controller * ctrl,
info
(
"HPC vendor_id %x device_id %x ss_vid %x ss_did %x
\n
"
,
pdev
->
vendor
,
pdev
->
device
,
pdev
->
subsystem_vendor
,
pdev
->
subsystem_device
);
if
(
pci_enable_device
(
pdev
))
goto
abort_free_ctlr
;
init_MUTEX
(
&
ctrl
->
crit_sect
);
/* setup wait queue */
init_waitqueue_head
(
&
ctrl
->
queue
);
...
...
drivers/pci/hotplug/shpchp_hpc.c
View file @
dc71d7c6
...
...
@@ -1487,6 +1487,9 @@ int shpc_init(struct controller * ctrl,
info
(
"HPC vendor_id %x device_id %x ss_vid %x ss_did %x
\n
"
,
pdev
->
vendor
,
pdev
->
device
,
pdev
->
subsystem_vendor
,
pdev
->
subsystem_device
);
if
(
pci_enable_device
(
pdev
))
goto
abort_free_ctlr
;
if
(
!
request_mem_region
(
pci_resource_start
(
pdev
,
0
)
+
shpc_base_offset
,
pci_resource_len
(
pdev
,
0
),
MY_NAME
))
{
err
(
"%s: cannot reserve MMIO region
\n
"
,
__FUNCTION__
);
...
...
drivers/pci/pci-sysfs.c
View file @
dc71d7c6
...
...
@@ -19,6 +19,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/stat.h>
#include <linux/topology.h>
#include "pci.h"
...
...
@@ -42,6 +43,14 @@ pci_config_attr(subsystem_device, "0x%04x\n");
pci_config_attr
(
class
,
"0x%06x
\n
"
);
pci_config_attr
(
irq
,
"%u
\n
"
);
static
ssize_t
local_cpus_show
(
struct
device
*
dev
,
char
*
buf
)
{
cpumask_t
mask
=
pcibus_to_cpumask
(
to_pci_dev
(
dev
)
->
bus
->
number
);
int
len
=
cpumask_scnprintf
(
buf
,
PAGE_SIZE
-
2
,
mask
);
strcat
(
buf
,
"
\n
"
);
return
1
+
len
;
}
/* show resources */
static
ssize_t
resource_show
(
struct
device
*
dev
,
char
*
buf
)
...
...
@@ -71,6 +80,7 @@ struct device_attribute pci_dev_attrs[] = {
__ATTR_RO
(
subsystem_device
),
__ATTR_RO
(
class
),
__ATTR_RO
(
irq
),
__ATTR_RO
(
local_cpus
),
__ATTR_NULL
,
};
...
...
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