From: Jeff Garzik <jeff@garzik.org>
To: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>, akpm@osdl.org
Cc: Greg KH <greg@kroah.com>, Rajesh Shah <rajesh.shah@intel.com>,
Grant Grundler <grundler@parisc-linux.org>,
"bibo,mao" <bibo.mao@intel.com>,
linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz
Subject: Re: [PATCH 3/4] Make Intel e1000 driver legacy I/O port free
Date: Thu, 08 Jun 2006 08:31:55 -0400 [thread overview]
Message-ID: <448818BB.6020503@garzik.org> (raw)
In-Reply-To: <448644A2.7000208@jp.fujitsu.com>
Kenji Kaneshige wrote:
> static struct pci_device_id e1000_pci_tbl[] = {
> - INTEL_E1000_ETHERNET_DEVICE(0x1000),
> - INTEL_E1000_ETHERNET_DEVICE(0x1001),
> - INTEL_E1000_ETHERNET_DEVICE(0x1004),
> - INTEL_E1000_ETHERNET_DEVICE(0x1008),
> - INTEL_E1000_ETHERNET_DEVICE(0x1009),
> - INTEL_E1000_ETHERNET_DEVICE(0x100C),
> - INTEL_E1000_ETHERNET_DEVICE(0x100D),
> - INTEL_E1000_ETHERNET_DEVICE(0x100E),
> - INTEL_E1000_ETHERNET_DEVICE(0x100F),
> - INTEL_E1000_ETHERNET_DEVICE(0x1010),
> - INTEL_E1000_ETHERNET_DEVICE(0x1011),
> - INTEL_E1000_ETHERNET_DEVICE(0x1012),
> - INTEL_E1000_ETHERNET_DEVICE(0x1013),
> - INTEL_E1000_ETHERNET_DEVICE(0x1014),
> - INTEL_E1000_ETHERNET_DEVICE(0x1015),
> - INTEL_E1000_ETHERNET_DEVICE(0x1016),
> - INTEL_E1000_ETHERNET_DEVICE(0x1017),
> - INTEL_E1000_ETHERNET_DEVICE(0x1018),
> - INTEL_E1000_ETHERNET_DEVICE(0x1019),
> - INTEL_E1000_ETHERNET_DEVICE(0x101A),
> - INTEL_E1000_ETHERNET_DEVICE(0x101D),
> - INTEL_E1000_ETHERNET_DEVICE(0x101E),
> - INTEL_E1000_ETHERNET_DEVICE(0x1026),
> - INTEL_E1000_ETHERNET_DEVICE(0x1027),
> - INTEL_E1000_ETHERNET_DEVICE(0x1028),
> - INTEL_E1000_ETHERNET_DEVICE(0x105E),
> - INTEL_E1000_ETHERNET_DEVICE(0x105F),
> - INTEL_E1000_ETHERNET_DEVICE(0x1060),
> - INTEL_E1000_ETHERNET_DEVICE(0x1075),
> - INTEL_E1000_ETHERNET_DEVICE(0x1076),
> - INTEL_E1000_ETHERNET_DEVICE(0x1077),
> - INTEL_E1000_ETHERNET_DEVICE(0x1078),
> - INTEL_E1000_ETHERNET_DEVICE(0x1079),
> - INTEL_E1000_ETHERNET_DEVICE(0x107A),
> - INTEL_E1000_ETHERNET_DEVICE(0x107B),
> - INTEL_E1000_ETHERNET_DEVICE(0x107C),
> - INTEL_E1000_ETHERNET_DEVICE(0x107D),
> - INTEL_E1000_ETHERNET_DEVICE(0x107E),
> - INTEL_E1000_ETHERNET_DEVICE(0x107F),
> - INTEL_E1000_ETHERNET_DEVICE(0x108A),
> - INTEL_E1000_ETHERNET_DEVICE(0x108B),
> - INTEL_E1000_ETHERNET_DEVICE(0x108C),
> - INTEL_E1000_ETHERNET_DEVICE(0x1096),
> - INTEL_E1000_ETHERNET_DEVICE(0x1098),
> - INTEL_E1000_ETHERNET_DEVICE(0x1099),
> - INTEL_E1000_ETHERNET_DEVICE(0x109A),
> - INTEL_E1000_ETHERNET_DEVICE(0x10B5),
> - INTEL_E1000_ETHERNET_DEVICE(0x10B9),
> + INTEL_E1000_ETHERNET_DEVICE(0x1000, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1001, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1004, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1008, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1009, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x100C, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x100D, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x100E, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x100F, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1010, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1011, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1012, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1013, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1014, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1015, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1016, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1017, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1018, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1019, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x101A, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x101D, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x101E, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1026, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1027, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1028, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x105E, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x105F, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1060, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1075, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1076, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1077, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1078, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1079, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x107A, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x107B, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x107C, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x107D, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x107E, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x107F, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x108A, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x108B, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x108C, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x1096, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1098, 0),
> + INTEL_E1000_ETHERNET_DEVICE(0x1099, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x109A, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x10B5, E1000_NO_IOPORT),
> + INTEL_E1000_ETHERNET_DEVICE(0x10B9, 0),
> /* required last entry */
> {0,}
> };
Why change all the entries? I would just change the ones with flags...
> @@ -621,7 +621,14 @@
> int i, err, pci_using_dac;
> uint16_t eeprom_data;
> uint16_t eeprom_apme_mask = E1000_EEPROM_APME;
> - if ((err = pci_enable_device(pdev)))
> + int bars;
> +
> + if (ent->driver_data & E1000_NO_IOPORT)
> + bars = pci_select_bars(pdev, IORESOURCE_MEM);
> + else
> + bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
> +
> + if ((err = pci_enable_device_bars(pdev, bars)))
> return err;
NAK, this is an obvious regression.
pci_enable_device() also powers up the device, and enables irq delivery
(on e.g. cardbus), and is allowed to do other platform-specific device
bring-up tasks.
Jeff
next prev parent reply other threads:[~2006-06-08 12:32 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-01 7:05 [BUG](-mm)pci_disable_device function clear bars_enabled element bibo,mao
2006-06-01 9:46 ` Rajesh Shah
2006-06-01 17:15 ` Grant Grundler
2006-06-01 18:36 ` Rajesh Shah
2006-06-02 2:57 ` Kenji Kaneshige
2006-06-02 5:56 ` Grant Grundler
2006-06-02 7:31 ` Kenji Kaneshige
2006-06-03 23:21 ` Grant Grundler
2006-06-04 21:01 ` Greg KH
2006-06-05 12:40 ` [BUG][PATCH 2.6.17-rc5-mm3] bugfix: PCI legacy I/O port free driver Kenji Kaneshige
2006-06-06 7:58 ` Greg KH
2006-06-06 8:17 ` Kenji Kaneshige
2006-06-07 3:10 ` Kenji Kaneshige
2006-06-07 3:12 ` [PATCH 1/4] Changes to generic pci code Kenji Kaneshige
2006-06-07 3:13 ` [PATCH 2/4] Update Documentation/pci.txt Kenji Kaneshige
2006-06-07 3:14 ` [PATCH 3/4] Make Intel e1000 driver legacy I/O port free Kenji Kaneshige
2006-06-07 5:10 ` Auke Kok
2006-06-07 7:39 ` Kenji Kaneshige
2006-06-07 14:40 ` Auke Kok
2006-06-08 12:31 ` Jeff Garzik [this message]
2006-06-08 13:35 ` Kenji Kaneshige
2006-06-08 14:46 ` Jeff Garzik
2006-06-08 17:00 ` Kenji Kaneshige
2006-06-07 3:15 ` [PATCH 4/4] Make Emulex lpfc " Kenji Kaneshige
2006-06-07 8:24 ` Christoph Hellwig
2006-06-07 12:23 ` Kenji Kaneshige
2006-06-07 12:43 ` Christoph Hellwig
2006-06-07 13:11 ` Kenji Kaneshige
2006-06-07 13:40 ` Christoph Hellwig
2006-06-07 13:56 ` Kenji Kaneshige
2006-06-07 14:52 ` Christoph Hellwig
2006-06-07 17:26 ` Rajesh Shah
2006-06-02 4:42 ` [BUG](-mm)pci_disable_device function clear bars_enabled element Grant Grundler
2006-06-02 16:50 ` Rajesh Shah
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=448818BB.6020503@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@osdl.org \
--cc=bibo.mao@intel.com \
--cc=greg@kroah.com \
--cc=grundler@parisc-linux.org \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=rajesh.shah@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox