| Message ID | 20140103201024.08ca11fb@skate |
|---|---|
| State | Not Applicable |
| Headers | show |
On Friday 03 January 2014 20:10:24 Thomas Petazzoni wrote: > Dear Arnd Bergmann, > > On Fri, 03 Jan 2014 20:04:57 +0100, Arnd Bergmann wrote: > > > > Digging in the LAKML archive, I found a lspci -v output about the > > > e1000e, and it has an I/O space: > > > > Ok, thanks for the confirmation! > > > > Do you mind posting your hack here? It may be useful for others as > > well, such as the xgene developers that seem to be doing funny things > > with their I/O space. > > The current hack is the following very ugly piece of code... It runs > some command and reads back some registers, and you should see some > well-known values (which can be found in the e1000 datasheet, I don't > remember them right now). Totally enough for the purpose, thanks! Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index fbf75fd..739ca10 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6045,7 +6045,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (aspm_disable_flag) e1000e_disable_aspm(pdev, aspm_disable_flag); - err = pci_enable_device_mem(pdev); + err = pci_enable_device(pdev); if (err) return err; @@ -6073,6 +6073,34 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_pci_reg; + dev_info(&pdev->dev, "==> e1000e: I/O start 0x%x, len 0x%x\n", + pci_resource_start(pdev, 2), + pci_resource_len(pdev, 2)); + + + { + unsigned long ioport_base = pci_resource_start(pdev, 2); + dev_info(&pdev->dev, "1. 0x%x 0x%x 0x%x 0x%x\n", + inl(ioport_base), + inl(ioport_base + 4), + inl(ioport_base + 8), + inl(ioport_base + 12)); + outl(0x38, ioport_base); + dev_info(&pdev->dev, "2. 0x%x 0x%x 0x%x 0x%x\n", + inl(ioport_base), + inl(ioport_base + 4), + inl(ioport_base + 8), + inl(ioport_base + 12)); + } + + err = pci_request_selected_regions_exclusive(pdev, + pci_select_bars(pdev, IORESOURCE_IO), + e1000e_driver_name); + if (err) { + dev_err(&pdev->dev, "Cannot get I/O region\n"); + goto err_pci_reg; + } + /* AER (Advanced Error Reporting) hooks */ pci_enable_pcie_error_reporting(pdev);