[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <48BB0D62.7070407@nsys.by>
Date: Mon, 01 Sep 2008 00:30:10 +0300
From: Vladislav Bogdanov <slava_reg@...s.by>
To: Adrian Bunk <bunk@...nel.org>
CC: Andrew Morton <akpm@...ux-foundation.org>,
Douglas Thompson <dougthompson@...ssion.com>,
Tim Small <tim@...tersideup.com>, Greg KH <greg@...ah.com>,
bluesmoke-devel@...ts.sourceforge.net, linux-kernel@...r.kernel.org
Subject: Re: [RFC: 2.6 patch] remove the broken i82443bxgx_edac driver
Adrian Bunk wrote:
> The i82443bxgx_edac driver was added more than one year ago, but after
> only 3 seconds in Linus' tree it got a dependency on BROKEN with Andrew
> stating:
>
> It will claim the PCI devices from under intel_agp.ko's feet.
> Greg is brewing some fix for that.
>
> Since noone seems to care enough about this driver to get it working we
> can as well remove it.
>
Why not just make the same hack as in i3000_edac.c, i82860_edac.c,
i82875p_edac.c and i82975x_edac.c?
I mean code around all occuriencies of 'mci_pdev'.
This hack still needs some polishing (at least for i82875p and i82975x), but it
works for me (I have AGP stuff compiled into kernel).
I attach 10-minutes copy-paste patch (completely untested, sorry, idea only).
I have 443gx just upgraded to 2.6 so I'll try to test it in next few days.
Best,
Vladislav
Signed-off-by: Vladislav Bogdanov <slava@...s.by>
---
--- a/drivers/edac/i82443bxgx_edac.c 2008-02-18 15:04:39.000000000 +0200
+++ a/drivers/edac/i82443bxgx_edac.c 2008-09-01 00:14:45.000000000 +0300
@@ -114,6 +114,12 @@ struct i82443bxgx_edacmc_error_info {
static struct edac_pci_ctl_info *i82443bxgx_pci;
+static struct pci_dev *mci_pdev; /* init dev: in case that AGP code has
+ * already registered driver
+ */
+
+static int 82443bxgx_registered = 1;
+
static void i82443bxgx_edacmc_get_error_info(struct mem_ctl_info *mci,
struct i82443bxgx_edacmc_error_info
*info)
@@ -345,10 +351,17 @@ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_prob
static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
+ int rc;
+
debugf0("MC: " __FILE__ ": %s()\n", __func__);
/* don't need to call pci_device_enable() */
- return i82443bxgx_edacmc_probe1(pdev, ent->driver_data);
+ rc = i82443bxgx_edacmc_probe1(pdev, ent->driver_data);
+
+ if (!mci_pdev)
+ mci_pdev = pci_dev_get(pdev);
+
+ return rc;
}
static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
@@ -390,12 +403,57 @@ static int __init i82443bxgx_edacmc_init
/* Ensure that the OPSTATE is set correctly for POLL or NMI */
opstate_init();
- return pci_register_driver(&i82443bxgx_edacmc_driver);
+ pci_rc = pci_register_driver(&i82443bxgx_edacmc_driver);
+ if (pci_rc < 0)
+ goto fail0;
+
+ if (!mci_pdev) {
+ const struct pci_device_id *id = &i82443bxgx_pci_tbl[0];
+ int i = 0;
+ 82443bxgx_registered = 0;
+
+ while (mci_pdev == NULL && id->vendor != 0) {
+ mci_pdev = pci_get_device(id->vendor,
+ id->device, NULL);
+ i++;
+ id = &i82443bxgx_pci_tbl[i];
+ }
+ if (!mci_pdev) {
+ debugf0("i82443bxgx pci_get_device fail\n");
+ pci_rc = -ENODEV;
+ goto fail1;
+ }
+
+ pci_rc = i82443bxgx_init_one(mci_pdev, i82443bxgx_pci_tbl);
+
+ if (pci_rc < 0) {
+ debugf0("i82443bxgx init fail\n");
+ pci_rc = -ENODEV;
+ goto fail1;
+ }
+ }
+
+ return 0;
+
+fail1:
+ pci_unregister_driver(&i82975x_driver);
+
+fail0:
+ if (mci_pdev)
+ pci_dev_put(mci_pdev);
+
+ return pci_rc;
}
static void __exit i82443bxgx_edacmc_exit(void)
{
pci_unregister_driver(&i82443bxgx_edacmc_driver);
+
+ if (!i82443bxgx_registered)
+ i82443bxgx_remove_one(mci_pdev);
+
+ if (mci_pdev)
+ pci_dev_put(mci_pdev);
}
module_init(i82443bxgx_edacmc_init);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists