Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 12:37 +0300, Ivan Kokshaysky wrote:
> On Tue, Dec 18, 2007 at 11:02:37AM +1100, Benjamin Herrenschmidt wrote:
> > +EXPORT_SYMBOL(pci_enable_device_io);
> > +EXPORT_SYMBOL(pci_enable_device_mem);
> > EXPORT_SYMBOL(pci_enable_device);
>
> Wouldn't it be better to export only the pci_enable_device_flags()
> and make these three just "static inline" wrappers in pci.h?
Been thinking about it yeah. I don't want drivers to start using
the _flags version directly tho, which is why I preferred going that
way but if people prefer the inline version, I'll do that.
> > EXPORT_SYMBOL(pcim_enable_device);
>
> Looks like many SATA drivers would benefit from pcim_* equivalents
> of pci_enable_device_{io,mem}, as they could happily work with just
> a single MMIO BAR... Alan?
I have no experience with the pcim stuff, I would appreciate if somebody
took care of that part.
Cheers,
Ben.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, Dec 18, 2007 at 11:02:37AM +1100, Benjamin Herrenschmidt wrote:
> +EXPORT_SYMBOL(pci_enable_device_io);
> +EXPORT_SYMBOL(pci_enable_device_mem);
> EXPORT_SYMBOL(pci_enable_device);
Wouldn't it be better to export only the pci_enable_device_flags()
and make these three just "static inline" wrappers in pci.h?
> EXPORT_SYMBOL(pcim_enable_device);
Looks like many SATA drivers would benefit from pcim_* equivalents
of pci_enable_device_{io,mem}, as they could happily work with just
a single MMIO BAR... Alan?
Ivan.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, Dec 18, 2007 at 11:02:37AM +1100, Benjamin Herrenschmidt wrote:
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
Wouldn't it be better to export only the pci_enable_device_flags()
and make these three just static inline wrappers in pci.h?
EXPORT_SYMBOL(pcim_enable_device);
Looks like many SATA drivers would benefit from pcim_* equivalents
of pci_enable_device_{io,mem}, as they could happily work with just
a single MMIO BAR... Alan?
Ivan.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 12:37 +0300, Ivan Kokshaysky wrote:
On Tue, Dec 18, 2007 at 11:02:37AM +1100, Benjamin Herrenschmidt wrote:
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
Wouldn't it be better to export only the pci_enable_device_flags()
and make these three just static inline wrappers in pci.h?
Been thinking about it yeah. I don't want drivers to start using
the _flags version directly tho, which is why I preferred going that
way but if people prefer the inline version, I'll do that.
EXPORT_SYMBOL(pcim_enable_device);
Looks like many SATA drivers would benefit from pcim_* equivalents
of pci_enable_device_{io,mem}, as they could happily work with just
a single MMIO BAR... Alan?
I have no experience with the pcim stuff, I would appreciate if somebody
took care of that part.
Cheers,
Ben.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 00:49 +0100, Johannes Weiner wrote:
> These two functions should be refactored, the only difference is the
> flag checking.
FYI. Here's what it looks like in my next version of the patch:
Index: linux-work/drivers/pci/pci.c
===
--- linux-work.orig/drivers/pci/pci.c 2007-10-15 11:19:38.0 +1000
+++ linux-work/drivers/pci/pci.c2007-12-18 11:01:20.0 +1100
@@ -736,6 +736,51 @@ pci_enable_device_bars(struct pci_dev *d
return err;
}
+static int __pci_enable_device_flags(struct pci_dev *dev,
+resource_size_t flags)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, >enable_cnt) > 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
+ if (dev->resource[i].flags & flags)
+ bars |= (1 << i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err < 0)
+ atomic_dec(>enable_cnt);
+ return err;
+}
+
+/**
+ * pci_enable_device_io - Initialize a device for use with IO space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable I/O resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_io(struct pci_dev *dev)
+{
+ return __pci_enable_device_flags(dev, IORESOURCE_IO);
+}
+
+/**
+ * pci_enable_device_mem - Initialize a device for use with Memory space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable Memory resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_mem(struct pci_dev *dev)
+{
+ return __pci_enable_device_flags(dev, IORESOURCE_MEM);
+}
+
/**
* pci_enable_device - Initialize device before it's used by a driver.
* @dev: PCI device to be initialized
@@ -749,7 +794,7 @@ pci_enable_device_bars(struct pci_dev *d
*/
int pci_enable_device(struct pci_dev *dev)
{
- return pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
+ return __pci_enable_device_flags(dev, IORESOURCE_MEM | IORESOURCE_IO);
}
/*
@@ -1621,6 +1666,8 @@ device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(pci_reenable_device);
EXPORT_SYMBOL(pci_enable_device_bars);
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
EXPORT_SYMBOL(pcim_enable_device);
EXPORT_SYMBOL(pcim_pin_device);
Index: linux-work/include/linux/pci.h
===
--- linux-work.orig/include/linux/pci.h 2007-12-18 11:00:32.0 +1100
+++ linux-work/include/linux/pci.h 2007-12-18 11:00:33.0 +1100
@@ -548,6 +548,8 @@ static inline int pci_write_config_dword
int __must_check pci_enable_device(struct pci_dev *dev);
int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_enable_device_io(struct pci_dev *dev);
+int __must_check pci_enable_device_mem(struct pci_dev *dev);
int __must_check pci_reenable_device(struct pci_dev *);
int __must_check pcim_enable_device(struct pci_dev *pdev);
void pcim_pin_device(struct pci_dev *pdev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 00:49 +0100, Johannes Weiner wrote: > > These two functions should be refactored, the only difference is the > flag checking. Yeah, I somewhat though about it... anyway, it's not important right now, I'm waiting for feedback on the approach itself. I'll send a new patch with a nicer implementation later. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
Hi Benjamin,
Benjamin Herrenschmidt <[EMAIL PROTECTED]> writes:
> --- linux-work.orig/drivers/pci/pci.c 2007-12-18 09:37:56.0 +1100
> +++ linux-work/drivers/pci/pci.c 2007-12-18 09:38:25.0 +1100
> [...]
> +int pci_enable_device_io(struct pci_dev *dev)
> +{
> + int err;
> + int i, bars = 0;
> +
> + if (atomic_add_return(1, >enable_cnt) > 1)
> + return 0; /* already enabled */
> +
> + for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
> + if (dev->resource[i].flags & IORESOURCE_IO)
> + bars |= (1 << i);
> +
> + err = do_pci_enable_device(dev, bars);
> + if (err < 0)
> + atomic_dec(>enable_cnt);
> + return err;
> +}
> [...]
> +int pci_enable_device_mem(struct pci_dev *dev)
> +{
> + int err;
> + int i, bars = 0;
> +
> + if (atomic_add_return(1, >enable_cnt) > 1)
> + return 0; /* already enabled */
> +
> + for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
> + if (dev->resource[i].flags & IORESOURCE_MEM)
> + bars |= (1 << i);
> +
> + err = do_pci_enable_device(dev, bars);
> + if (err < 0)
> + atomic_dec(>enable_cnt);
> + return err;
> +}
These two functions should be refactored, the only difference is the
flag checking.
Hannes
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
The pci_enable_device_bars() interface isn't well suited to PCI
because you can't actually enable/disable BARs individually on
a device. So for example, if a device has 2 memory BARs 0 and 1,
and one of them (let's say 1) has not been successfully allocated
by the firmware or the kernel, then enabling memory decoding
shouldn't be permitted for the entire device since it will decode
whatever random address is still in that BAR 1.
So a device must be either fully enabled for IO, for Memory, or
for both. Not on a per-BAR basis.
This provides two new functions, pci_enable_device_io() and
pci_enable_device_mem() to replace pci_enable_device_bars(). The
implementation internally builds a BAR mask in order to be able
to use existing arch infrastructure.
Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
---
drivers/pci/pci.c | 54
include/linux/pci.h |2 +
2 files changed, 56 insertions(+)
--- linux-work.orig/drivers/pci/pci.c 2007-12-18 09:37:56.0 +1100
+++ linux-work/drivers/pci/pci.c2007-12-18 09:38:25.0 +1100
@@ -737,6 +737,58 @@ pci_enable_device_bars(struct pci_dev *d
}
/**
+ * pci_enable_device_io - Initialize a device for use with IO space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable I/O resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_io(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, >enable_cnt) > 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
+ if (dev->resource[i].flags & IORESOURCE_IO)
+ bars |= (1 << i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err < 0)
+ atomic_dec(>enable_cnt);
+ return err;
+}
+
+/**
+ * pci_enable_device_mem - Initialize a device for use with Memory space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable Memory resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_mem(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, >enable_cnt) > 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
+ if (dev->resource[i].flags & IORESOURCE_MEM)
+ bars |= (1 << i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err < 0)
+ atomic_dec(>enable_cnt);
+ return err;
+}
+
+/**
* pci_enable_device - Initialize device before it's used by a driver.
* @dev: PCI device to be initialized
*
@@ -1621,6 +1673,8 @@ device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(pci_reenable_device);
EXPORT_SYMBOL(pci_enable_device_bars);
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
EXPORT_SYMBOL(pcim_enable_device);
EXPORT_SYMBOL(pcim_pin_device);
Index: linux-work/include/linux/pci.h
===
--- linux-work.orig/include/linux/pci.h 2007-12-18 09:38:36.0 +1100
+++ linux-work/include/linux/pci.h 2007-12-18 09:38:53.0 +1100
@@ -548,6 +548,8 @@ static inline int pci_write_config_dword
int __must_check pci_enable_device(struct pci_dev *dev);
int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_enable_device_io(struct pci_dev *dev);
+int __must_check pci_enable_device_mem(struct pci_dev *dev);
int __must_check pci_reenable_device(struct pci_dev *);
int __must_check pcim_enable_device(struct pci_dev *pdev);
void pcim_pin_device(struct pci_dev *pdev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
The pci_enable_device_bars() interface isn't well suited to PCI
because you can't actually enable/disable BARs individually on
a device. So for example, if a device has 2 memory BARs 0 and 1,
and one of them (let's say 1) has not been successfully allocated
by the firmware or the kernel, then enabling memory decoding
shouldn't be permitted for the entire device since it will decode
whatever random address is still in that BAR 1.
So a device must be either fully enabled for IO, for Memory, or
for both. Not on a per-BAR basis.
This provides two new functions, pci_enable_device_io() and
pci_enable_device_mem() to replace pci_enable_device_bars(). The
implementation internally builds a BAR mask in order to be able
to use existing arch infrastructure.
Signed-off-by: Benjamin Herrenschmidt [EMAIL PROTECTED]
---
drivers/pci/pci.c | 54
include/linux/pci.h |2 +
2 files changed, 56 insertions(+)
--- linux-work.orig/drivers/pci/pci.c 2007-12-18 09:37:56.0 +1100
+++ linux-work/drivers/pci/pci.c2007-12-18 09:38:25.0 +1100
@@ -737,6 +737,58 @@ pci_enable_device_bars(struct pci_dev *d
}
/**
+ * pci_enable_device_io - Initialize a device for use with IO space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable I/O resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_io(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, dev-enable_cnt) 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i DEVICE_COUNT_RESOURCE; i++)
+ if (dev-resource[i].flags IORESOURCE_IO)
+ bars |= (1 i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err 0)
+ atomic_dec(dev-enable_cnt);
+ return err;
+}
+
+/**
+ * pci_enable_device_mem - Initialize a device for use with Memory space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable Memory resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_mem(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, dev-enable_cnt) 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i DEVICE_COUNT_RESOURCE; i++)
+ if (dev-resource[i].flags IORESOURCE_MEM)
+ bars |= (1 i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err 0)
+ atomic_dec(dev-enable_cnt);
+ return err;
+}
+
+/**
* pci_enable_device - Initialize device before it's used by a driver.
* @dev: PCI device to be initialized
*
@@ -1621,6 +1673,8 @@ device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(pci_reenable_device);
EXPORT_SYMBOL(pci_enable_device_bars);
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
EXPORT_SYMBOL(pcim_enable_device);
EXPORT_SYMBOL(pcim_pin_device);
Index: linux-work/include/linux/pci.h
===
--- linux-work.orig/include/linux/pci.h 2007-12-18 09:38:36.0 +1100
+++ linux-work/include/linux/pci.h 2007-12-18 09:38:53.0 +1100
@@ -548,6 +548,8 @@ static inline int pci_write_config_dword
int __must_check pci_enable_device(struct pci_dev *dev);
int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_enable_device_io(struct pci_dev *dev);
+int __must_check pci_enable_device_mem(struct pci_dev *dev);
int __must_check pci_reenable_device(struct pci_dev *);
int __must_check pcim_enable_device(struct pci_dev *pdev);
void pcim_pin_device(struct pci_dev *pdev);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
Hi Benjamin,
Benjamin Herrenschmidt [EMAIL PROTECTED] writes:
--- linux-work.orig/drivers/pci/pci.c 2007-12-18 09:37:56.0 +1100
+++ linux-work/drivers/pci/pci.c 2007-12-18 09:38:25.0 +1100
[...]
+int pci_enable_device_io(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, dev-enable_cnt) 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i DEVICE_COUNT_RESOURCE; i++)
+ if (dev-resource[i].flags IORESOURCE_IO)
+ bars |= (1 i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err 0)
+ atomic_dec(dev-enable_cnt);
+ return err;
+}
[...]
+int pci_enable_device_mem(struct pci_dev *dev)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, dev-enable_cnt) 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i DEVICE_COUNT_RESOURCE; i++)
+ if (dev-resource[i].flags IORESOURCE_MEM)
+ bars |= (1 i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err 0)
+ atomic_dec(dev-enable_cnt);
+ return err;
+}
These two functions should be refactored, the only difference is the
flag checking.
Hannes
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 00:49 +0100, Johannes Weiner wrote: These two functions should be refactored, the only difference is the flag checking. Yeah, I somewhat though about it... anyway, it's not important right now, I'm waiting for feedback on the approach itself. I'll send a new patch with a nicer implementation later. Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC/PATCH 1/4] pci: Add pci_enable_device_{io,mem} intefaces
On Tue, 2007-12-18 at 00:49 +0100, Johannes Weiner wrote:
These two functions should be refactored, the only difference is the
flag checking.
FYI. Here's what it looks like in my next version of the patch:
Index: linux-work/drivers/pci/pci.c
===
--- linux-work.orig/drivers/pci/pci.c 2007-10-15 11:19:38.0 +1000
+++ linux-work/drivers/pci/pci.c2007-12-18 11:01:20.0 +1100
@@ -736,6 +736,51 @@ pci_enable_device_bars(struct pci_dev *d
return err;
}
+static int __pci_enable_device_flags(struct pci_dev *dev,
+resource_size_t flags)
+{
+ int err;
+ int i, bars = 0;
+
+ if (atomic_add_return(1, dev-enable_cnt) 1)
+ return 0; /* already enabled */
+
+ for (i = 0; i DEVICE_COUNT_RESOURCE; i++)
+ if (dev-resource[i].flags flags)
+ bars |= (1 i);
+
+ err = do_pci_enable_device(dev, bars);
+ if (err 0)
+ atomic_dec(dev-enable_cnt);
+ return err;
+}
+
+/**
+ * pci_enable_device_io - Initialize a device for use with IO space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable I/O resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_io(struct pci_dev *dev)
+{
+ return __pci_enable_device_flags(dev, IORESOURCE_IO);
+}
+
+/**
+ * pci_enable_device_mem - Initialize a device for use with Memory space
+ * @dev: PCI device to be initialized
+ *
+ * Initialize device before it's used by a driver. Ask low-level code
+ * to enable Memory resources. Wake up the device if it was suspended.
+ * Beware, this function can fail.
+ */
+int pci_enable_device_mem(struct pci_dev *dev)
+{
+ return __pci_enable_device_flags(dev, IORESOURCE_MEM);
+}
+
/**
* pci_enable_device - Initialize device before it's used by a driver.
* @dev: PCI device to be initialized
@@ -749,7 +794,7 @@ pci_enable_device_bars(struct pci_dev *d
*/
int pci_enable_device(struct pci_dev *dev)
{
- return pci_enable_device_bars(dev, (1 PCI_NUM_RESOURCES) - 1);
+ return __pci_enable_device_flags(dev, IORESOURCE_MEM | IORESOURCE_IO);
}
/*
@@ -1621,6 +1666,8 @@ device_initcall(pci_init);
EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(pci_reenable_device);
EXPORT_SYMBOL(pci_enable_device_bars);
+EXPORT_SYMBOL(pci_enable_device_io);
+EXPORT_SYMBOL(pci_enable_device_mem);
EXPORT_SYMBOL(pci_enable_device);
EXPORT_SYMBOL(pcim_enable_device);
EXPORT_SYMBOL(pcim_pin_device);
Index: linux-work/include/linux/pci.h
===
--- linux-work.orig/include/linux/pci.h 2007-12-18 11:00:32.0 +1100
+++ linux-work/include/linux/pci.h 2007-12-18 11:00:33.0 +1100
@@ -548,6 +548,8 @@ static inline int pci_write_config_dword
int __must_check pci_enable_device(struct pci_dev *dev);
int __must_check pci_enable_device_bars(struct pci_dev *dev, int mask);
+int __must_check pci_enable_device_io(struct pci_dev *dev);
+int __must_check pci_enable_device_mem(struct pci_dev *dev);
int __must_check pci_reenable_device(struct pci_dev *);
int __must_check pcim_enable_device(struct pci_dev *pdev);
void pcim_pin_device(struct pci_dev *pdev);
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
