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
b66fa17c
Commit
b66fa17c
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.3.99pre5
parent
de0d207b
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
578 additions
and
478 deletions
+578
-478
Makefile
Makefile
+1
-1
arch/i386/kernel/Makefile
arch/i386/kernel/Makefile
+1
-1
arch/i386/kernel/pci-i386.h
arch/i386/kernel/pci-i386.h
+39
-1
arch/i386/kernel/pci-irq.c
arch/i386/kernel/pci-irq.c
+431
-0
arch/i386/kernel/pci-pc.c
arch/i386/kernel/pci-pc.c
+75
-460
drivers/net/Space.c
drivers/net/Space.c
+1
-1
drivers/pci/pci.c
drivers/pci/pci.c
+18
-1
drivers/usb/usb.c
drivers/usb/usb.c
+6
-8
fs/namei.c
fs/namei.c
+1
-1
fs/nfs/inode.c
fs/nfs/inode.c
+1
-1
include/linux/pci.h
include/linux/pci.h
+3
-1
include/linux/usb.h
include/linux/usb.h
+1
-2
No files found.
Makefile
View file @
b66fa17c
VERSION
=
2
VERSION
=
2
PATCHLEVEL
=
3
PATCHLEVEL
=
3
SUBLEVEL
=
99
SUBLEVEL
=
99
EXTRAVERSION
=
-pre
4
EXTRAVERSION
=
-pre
5
KERNELRELEASE
=
$(VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)$(EXTRAVERSION)
KERNELRELEASE
=
$(VERSION)
.
$(PATCHLEVEL)
.
$(SUBLEVEL)$(EXTRAVERSION)
...
...
arch/i386/kernel/Makefile
View file @
b66fa17c
...
@@ -24,7 +24,7 @@ O_OBJS += pci-i386.o
...
@@ -24,7 +24,7 @@ O_OBJS += pci-i386.o
ifdef
CONFIG_VISWS
ifdef
CONFIG_VISWS
O_OBJS
+=
pci-visws.o
O_OBJS
+=
pci-visws.o
else
else
O_OBJS
+=
pci-pc.o
O_OBJS
+=
pci-pc.o
pci-irq.o
endif
endif
endif
endif
...
...
arch/i386/kernel/pci-i386.h
View file @
b66fa17c
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
#define PCI_NO_SORT 0x100
#define PCI_NO_SORT 0x100
#define PCI_BIOS_SORT 0x200
#define PCI_BIOS_SORT 0x200
#define PCI_NO_CHECKS 0x400
#define PCI_NO_CHECKS 0x400
#define PCI_PEER_FIXUP 0x800
#define PCI_ASSIGN_ROMS 0x1000
#define PCI_ASSIGN_ROMS 0x1000
#define PCI_BIOS_IRQ_SCAN 0x2000
#define PCI_BIOS_IRQ_SCAN 0x2000
...
@@ -28,3 +27,42 @@ extern unsigned int pci_probe;
...
@@ -28,3 +27,42 @@ extern unsigned int pci_probe;
void
pcibios_resource_survey
(
void
);
void
pcibios_resource_survey
(
void
);
int
pcibios_enable_resources
(
struct
pci_dev
*
);
int
pcibios_enable_resources
(
struct
pci_dev
*
);
/* pci-pc.c */
extern
int
pcibios_last_bus
;
extern
struct
pci_bus
*
pci_root_bus
;
extern
struct
pci_ops
*
pci_root_ops
;
struct
irq_routing_table
*
pcibios_get_irq_routing_table
(
void
);
int
pcibios_set_irq_routing
(
struct
pci_dev
*
dev
,
int
pin
,
int
irq
);
/* pci-irq.c */
struct
irq_info
{
u8
bus
,
devfn
;
/* Bus, device and function */
struct
{
u8
link
;
/* IRQ line ID, chipset dependent, 0=not routed */
u16
bitmap
;
/* Available IRQs */
}
__attribute__
((
packed
))
irq
[
4
];
u8
slot
;
/* Slot number, 0=onboard */
u8
rfu
;
}
__attribute__
((
packed
));
struct
irq_routing_table
{
u32
signature
;
/* PIRQ_SIGNATURE should be here */
u16
version
;
/* PIRQ_VERSION */
u16
size
;
/* Table size in bytes */
u8
rtr_bus
,
rtr_devfn
;
/* Where the interrupt router lies */
u16
exclusive_irqs
;
/* IRQs devoted exclusively to PCI usage */
u16
rtr_vendor
,
rtr_device
;
/* Vendor and device ID of interrupt router */
u32
miniport_data
;
/* Crap */
u8
rfu
[
11
];
u8
checksum
;
/* Modulo 256 checksum must give zero */
struct
irq_info
slots
[
0
];
}
__attribute__
((
packed
));
extern
unsigned
int
pcibios_irq_mask
;
void
pcibios_fixup_irqs
(
void
);
int
pcibios_lookup_irq
(
struct
pci_dev
*
dev
,
int
assign
);
arch/i386/kernel/pci-irq.c
0 → 100644
View file @
b66fa17c
This diff is collapsed.
Click to expand it.
arch/i386/kernel/pci-pc.c
View file @
b66fa17c
This diff is collapsed.
Click to expand it.
drivers/net/Space.c
View file @
b66fa17c
...
@@ -186,7 +186,7 @@ struct devprobe eisa_probes[] __initdata = {
...
@@ -186,7 +186,7 @@ struct devprobe eisa_probes[] __initdata = {
{
ne3210_probe
,
0
},
{
ne3210_probe
,
0
},
#endif
#endif
#ifdef CONFIG_DEFXX
#ifdef CONFIG_DEFXX
{
dfx_probe
,
0
}
.
{
dfx_probe
,
0
}
,
#endif
#endif
{
NULL
,
0
},
{
NULL
,
0
},
};
};
...
...
drivers/pci/pci.c
View file @
b66fa17c
...
@@ -254,6 +254,23 @@ pci_enable_device(struct pci_dev *dev)
...
@@ -254,6 +254,23 @@ pci_enable_device(struct pci_dev *dev)
return
0
;
return
0
;
}
}
int
pci_get_interrupt_pin
(
struct
pci_dev
*
dev
,
struct
pci_dev
**
bridge
)
{
u8
pin
;
pci_read_config_byte
(
dev
,
PCI_INTERRUPT_PIN
,
&
pin
);
if
(
!
pin
)
return
-
1
;
pin
--
;
while
(
dev
->
bus
->
self
)
{
pin
=
(
pin
+
PCI_SLOT
(
dev
->
devfn
))
%
4
;
dev
=
dev
->
bus
->
self
;
}
*
bridge
=
dev
;
return
pin
;
}
/*
/*
* Registration of PCI drivers and handling of hot-pluggable devices.
* Registration of PCI drivers and handling of hot-pluggable devices.
*/
*/
...
@@ -961,7 +978,7 @@ static unsigned int __init pci_do_scan_bus(struct pci_bus *bus)
...
@@ -961,7 +978,7 @@ static unsigned int __init pci_do_scan_bus(struct pci_bus *bus)
return
max
;
return
max
;
}
}
static
int
__init
pci_bus_exists
(
const
struct
list_head
*
list
,
int
nr
)
int
__init
pci_bus_exists
(
const
struct
list_head
*
list
,
int
nr
)
{
{
const
struct
list_head
*
l
;
const
struct
list_head
*
l
;
...
...
drivers/usb/usb.c
View file @
b66fa17c
...
@@ -1720,11 +1720,15 @@ int usb_new_device(struct usb_device *dev)
...
@@ -1720,11 +1720,15 @@ int usb_new_device(struct usb_device *dev)
info
(
"USB new device connect, assigned device number %d"
,
dev
->
devnum
);
info
(
"USB new device connect, assigned device number %d"
,
dev
->
devnum
);
dev
->
maxpacketsize
=
0
;
/* Default to 8 byte max packet size */
/* USB v1.1 5.5.3 */
/* We read the first 8 bytes from the device descriptor to get to */
/* the bMaxPacketSize0 field. Then we set the maximum packet size */
/* for the control pipe, and retrieve the rest */
dev
->
epmaxpacketin
[
0
]
=
8
;
dev
->
epmaxpacketin
[
0
]
=
8
;
dev
->
epmaxpacketout
[
0
]
=
8
;
dev
->
epmaxpacketout
[
0
]
=
8
;
/* We still haven't set the Address yet */
/* Even though we have assigned an address for the device, we */
/* haven't told it what it's address is yet */
addr
=
dev
->
devnum
;
addr
=
dev
->
devnum
;
dev
->
devnum
=
0
;
dev
->
devnum
=
0
;
...
@@ -1740,12 +1744,6 @@ int usb_new_device(struct usb_device *dev)
...
@@ -1740,12 +1744,6 @@ int usb_new_device(struct usb_device *dev)
}
}
dev
->
epmaxpacketin
[
0
]
=
dev
->
descriptor
.
bMaxPacketSize0
;
dev
->
epmaxpacketin
[
0
]
=
dev
->
descriptor
.
bMaxPacketSize0
;
dev
->
epmaxpacketout
[
0
]
=
dev
->
descriptor
.
bMaxPacketSize0
;
dev
->
epmaxpacketout
[
0
]
=
dev
->
descriptor
.
bMaxPacketSize0
;
switch
(
dev
->
descriptor
.
bMaxPacketSize0
)
{
case
8
:
dev
->
maxpacketsize
=
0
;
break
;
case
16
:
dev
->
maxpacketsize
=
1
;
break
;
case
32
:
dev
->
maxpacketsize
=
2
;
break
;
case
64
:
dev
->
maxpacketsize
=
3
;
break
;
}
dev
->
devnum
=
addr
;
dev
->
devnum
=
addr
;
...
...
fs/namei.c
View file @
b66fa17c
...
@@ -522,7 +522,7 @@ static inline int
...
@@ -522,7 +522,7 @@ static inline int
walk_init_root
(
const
char
*
name
,
unsigned
flags
,
struct
nameidata
*
nd
)
walk_init_root
(
const
char
*
name
,
unsigned
flags
,
struct
nameidata
*
nd
)
{
{
if
(
current
->
personality
!=
PER_LINUX
)
if
(
current
->
personality
!=
PER_LINUX
)
if
(
__emul_lookup_dentry
(
name
,
flags
,
nd
))
;
if
(
__emul_lookup_dentry
(
name
,
flags
,
nd
))
return
0
;
return
0
;
nd
->
mnt
=
mntget
(
current
->
fs
->
rootmnt
);
nd
->
mnt
=
mntget
(
current
->
fs
->
rootmnt
);
nd
->
dentry
=
dget
(
current
->
fs
->
root
);
nd
->
dentry
=
dget
(
current
->
fs
->
root
);
...
...
fs/nfs/inode.c
View file @
b66fa17c
...
@@ -198,7 +198,7 @@ nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)
...
@@ -198,7 +198,7 @@ nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)
static
inline
unsigned
long
static
inline
unsigned
long
nfs_calc_block_size
(
u64
tsize
)
nfs_calc_block_size
(
u64
tsize
)
{
{
loff_t
used
=
(
tsize
+
511
)
/
512
;
loff_t
used
=
(
tsize
+
511
)
>>
9
;
return
(
used
>
ULONG_MAX
)
?
ULONG_MAX
:
used
;
return
(
used
>
ULONG_MAX
)
?
ULONG_MAX
:
used
;
}
}
...
...
include/linux/pci.h
View file @
b66fa17c
...
@@ -465,6 +465,7 @@ int pcibios_find_device (unsigned short vendor, unsigned short dev_id,
...
@@ -465,6 +465,7 @@ int pcibios_find_device (unsigned short vendor, unsigned short dev_id,
/* Generic PCI functions used internally */
/* Generic PCI functions used internally */
void
pci_init
(
void
);
void
pci_init
(
void
);
int
pci_bus_exists
(
const
struct
list_head
*
list
,
int
nr
);
struct
pci_bus
*
pci_scan_bus
(
int
bus
,
struct
pci_ops
*
ops
,
void
*
sysdata
);
struct
pci_bus
*
pci_scan_bus
(
int
bus
,
struct
pci_ops
*
ops
,
void
*
sysdata
);
struct
pci_bus
*
pci_alloc_primary_bus
(
int
bus
);
struct
pci_bus
*
pci_alloc_primary_bus
(
int
bus
);
struct
pci_dev
*
pci_scan_slot
(
struct
pci_dev
*
temp
);
struct
pci_dev
*
pci_scan_slot
(
struct
pci_dev
*
temp
);
...
@@ -474,7 +475,8 @@ void pci_name_device(struct pci_dev *dev);
...
@@ -474,7 +475,8 @@ void pci_name_device(struct pci_dev *dev);
char
*
pci_class_name
(
u32
class
);
char
*
pci_class_name
(
u32
class
);
void
pci_read_bridge_bases
(
struct
pci_bus
*
child
);
void
pci_read_bridge_bases
(
struct
pci_bus
*
child
);
struct
resource
*
pci_find_parent_resource
(
const
struct
pci_dev
*
dev
,
struct
resource
*
res
);
struct
resource
*
pci_find_parent_resource
(
const
struct
pci_dev
*
dev
,
struct
resource
*
res
);
int
pci_setup_device
(
struct
pci_dev
*
dev
);
int
pci_setup_device
(
struct
pci_dev
*
dev
);
int
pci_get_interrupt_pin
(
struct
pci_dev
*
dev
,
struct
pci_dev
**
bridge
);
/* Generic PCI functions exported to card drivers */
/* Generic PCI functions exported to card drivers */
...
...
include/linux/usb.h
View file @
b66fa17c
...
@@ -539,7 +539,6 @@ struct usb_device {
...
@@ -539,7 +539,6 @@ struct usb_device {
atomic_t
refcnt
;
/* Reference count */
atomic_t
refcnt
;
/* Reference count */
int
maxpacketsize
;
/* Maximum packet size; encoded as 0,1,2,3 = 8,16,32,64 */
unsigned
int
toggle
[
2
];
/* one bit for each endpoint ([0] = IN, [1] = OUT) */
unsigned
int
toggle
[
2
];
/* one bit for each endpoint ([0] = IN, [1] = OUT) */
unsigned
int
halted
[
2
];
/* endpoint halts; one bit per endpoint # & direction; */
unsigned
int
halted
[
2
];
/* endpoint halts; one bit per endpoint # & direction; */
/* [0] = IN, [1] = OUT */
/* [0] = IN, [1] = OUT */
...
@@ -686,7 +685,7 @@ int usb_get_current_frame_number (struct usb_device *usb_dev);
...
@@ -686,7 +685,7 @@ int usb_get_current_frame_number (struct usb_device *usb_dev);
static
inline
unsigned
int
__create_pipe
(
struct
usb_device
*
dev
,
unsigned
int
endpoint
)
static
inline
unsigned
int
__create_pipe
(
struct
usb_device
*
dev
,
unsigned
int
endpoint
)
{
{
return
(
dev
->
devnum
<<
8
)
|
(
endpoint
<<
15
)
|
(
dev
->
slow
<<
26
)
|
dev
->
maxpacketsize
;
return
(
dev
->
devnum
<<
8
)
|
(
endpoint
<<
15
)
|
(
dev
->
slow
<<
26
);
}
}
static
inline
unsigned
int
__default_pipe
(
struct
usb_device
*
dev
)
static
inline
unsigned
int
__default_pipe
(
struct
usb_device
*
dev
)
...
...
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