| Message ID | 1448973589-9216-10-git-send-email-RaghavaAditya.Renukunta@pmcs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Raghava, On Tue, 2015-12-01 at 04:39 -0800, Raghava Aditya Renukunta wrote: > From: Raghava Aditya Renukunta <raghavaaditya.renukunta@pmcs.com> > > During EEH PCI hotplug activity kernel unloads and loads the driver, > causing character device to be unregistered(aac_remove_one).When the > driver is loaded back using aac_probe_one the character device needs > to be registered again for the AIF management tools to work. > > Fixed by adding code to register character device in aac_probe_one if > it is unregistered in aac_remove_one. > > Signed-off-by: Raghava Aditya Renukunta <raghavaaditya.renukunta@pmcs.com> > --- > drivers/scsi/aacraid/linit.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c > index 2094842..7142578 100644 > --- a/drivers/scsi/aacraid/linit.c > +++ b/drivers/scsi/aacraid/linit.c > @@ -1123,6 +1123,13 @@ static void __aac_shutdown(struct aac_dev * aac) > else if (aac->max_msix > 1) > pci_disable_msix(aac->pdev); > } > +static void aac_init_char(void) > +{ > + aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops); > + if (aac_cfg_major < 0) { > + pr_err("aacraid: unable to register \"aac\" device.\n"); > + } > +} > > static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id > *id) > { > @@ -1185,6 +1192,9 @@ static int aac_probe_one(struct pci_dev *pdev, const > struct pci_device_id *id) > shost->max_cmd_len = 16; > shost->use_cmd_list = 1; > > + if (aac_cfg_major == -2) > + aac_init_char(); > + > aac = (struct aac_dev *)shost->hostdata; > aac->base_start = pci_resource_start(pdev, 0); > aac->scsi_host_ptr = shost; > @@ -1536,7 +1546,7 @@ static void aac_remove_one(struct pci_dev *pdev) > pci_disable_device(pdev); > if (list_empty(&aac_devices)) { > unregister_chrdev(aac_cfg_major, "aac"); > - aac_cfg_major = -1; > + aac_cfg_major = -2; Please add something like #define AAC_CHARDEV_UNREGISTERED -1 #define AAC_CHARDEV_NEEDS_REINIT -2 so it's obvious what you're doing. > } > } > > @@ -1697,11 +1707,8 @@ static int __init aac_init(void) > if (error < 0) > return error; > > - aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops); > - if (aac_cfg_major < 0) { > - printk(KERN_WARNING > - "aacraid: unable to register \"aac\" device.\n"); > - } > + aac_init_char(); > + > > return 0; > } -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
SGVsbG8gSm9oYW5uZXMsDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTog Sm9oYW5uZXMgVGh1bXNoaXJuIFttYWlsdG86anRodW1zaGlybkBzdXNlLmRlXQ0KPiBTZW50OiBX ZWRuZXNkYXksIERlY2VtYmVyIDIsIDIwMTUgMjoxNCBBTQ0KPiBUbzogUmFnaGF2YSBBZGl0eWEg UmVudWt1bnRhOyBKQm90dG9tbGV5QFBhcmFsbGVscy5jb207IGxpbnV4LQ0KPiBzY3NpQHZnZXIu a2VybmVsLm9yZw0KPiBDYzogTWFoZXNoIFJhamFzaGVraGFyYTsgTXVydGh5IEJoYXQ7IFNhbnRv c2ggQWt1bGE7IEdhbmEgU3JpZGFyYW47DQo+IGFhY3JhaWRAcG1jLXNpZXJyYS5jb207IFJpY2gg Qm9ubw0KPiBTdWJqZWN0OiBSZTogW1BBVENIIDA5LzEwXSBhYWNyYWlkOiBGaXggY2hhcmFjdGVy IGRldmljZSByZS1pbml0aWFsaXphdGlvbg0KPiANCj4gSGkgUmFnaGF2YSwNCj4gDQo+IE9uIFR1 ZSwgMjAxNS0xMi0wMSBhdCAwNDozOSAtMDgwMCwgUmFnaGF2YSBBZGl0eWEgUmVudWt1bnRhIHdy b3RlOg0KPiA+IEZyb206IFJhZ2hhdmEgQWRpdHlhIFJlbnVrdW50YSA8cmFnaGF2YWFkaXR5YS5y ZW51a3VudGFAcG1jcy5jb20+DQo+ID4NCj4gPiBEdXJpbmcgRUVIIFBDSSBob3RwbHVnIGFjdGl2 aXR5IGtlcm5lbCB1bmxvYWRzIGFuZCBsb2FkcyB0aGUgZHJpdmVyLA0KPiA+IGNhdXNpbmcgY2hh cmFjdGVyIGRldmljZSB0byBiZSB1bnJlZ2lzdGVyZWQoYWFjX3JlbW92ZV9vbmUpLldoZW4gdGhl DQo+ID4gZHJpdmVyIGlzIGxvYWRlZCBiYWNrIHVzaW5nIGFhY19wcm9iZV9vbmUgdGhlIGNoYXJh Y3RlciBkZXZpY2UgbmVlZHMNCj4gPiB0byBiZSByZWdpc3RlcmVkIGFnYWluIGZvciB0aGUgQUlG IG1hbmFnZW1lbnQgdG9vbHMgdG8gd29yay4NCj4gPg0KPiA+IEZpeGVkIGJ5IGFkZGluZyBjb2Rl IHRvIHJlZ2lzdGVyIGNoYXJhY3RlciBkZXZpY2UgaW4gYWFjX3Byb2JlX29uZSBpZg0KPiA+IGl0 IGlzIHVucmVnaXN0ZXJlZCBpbiBhYWNfcmVtb3ZlX29uZS4NCj4gPg0KPiA+IFNpZ25lZC1vZmYt Ynk6IFJhZ2hhdmEgQWRpdHlhIFJlbnVrdW50YQ0KPiA+IDxyYWdoYXZhYWRpdHlhLnJlbnVrdW50 YUBwbWNzLmNvbT4NCj4gPiAtLS0NCj4gPiDCoGRyaXZlcnMvc2NzaS9hYWNyYWlkL2xpbml0LmMg fCAxOSArKysrKysrKysrKysrLS0tLS0tDQo+ID4gwqAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0 aW9ucygrKSwgNiBkZWxldGlvbnMoLSkNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Nj c2kvYWFjcmFpZC9saW5pdC5jDQo+ID4gYi9kcml2ZXJzL3Njc2kvYWFjcmFpZC9saW5pdC5jIGlu ZGV4IDIwOTQ4NDIuLjcxNDI1NzggMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9zY3NpL2FhY3Jh aWQvbGluaXQuYw0KPiA+ICsrKyBiL2RyaXZlcnMvc2NzaS9hYWNyYWlkL2xpbml0LmMNCj4gPiBA QCAtMTEyMyw2ICsxMTIzLDEzIEBAIHN0YXRpYyB2b2lkIF9fYWFjX3NodXRkb3duKHN0cnVjdCBh YWNfZGV2ICoNCj4gYWFjKQ0KPiA+IMKgCWVsc2UgaWYgKGFhYy0+bWF4X21zaXggPiAxKQ0KPiA+ IMKgCQlwY2lfZGlzYWJsZV9tc2l4KGFhYy0+cGRldik7DQo+ID4gwqB9DQo+ID4gK3N0YXRpYyB2 b2lkIGFhY19pbml0X2NoYXIodm9pZCkNCj4gPiArew0KPiA+ICsJYWFjX2NmZ19tYWpvciA9IHJl Z2lzdGVyX2NocmRldigwLCAiYWFjIiwgJmFhY19jZmdfZm9wcyk7DQo+ID4gKwlpZiAoYWFjX2Nm Z19tYWpvciA8IDApIHsNCj4gPiArCQlwcl9lcnIoImFhY3JhaWQ6IHVuYWJsZSB0byByZWdpc3Rl ciBcImFhY1wiIGRldmljZS5cbiIpOw0KPiA+ICsJfQ0KPiA+ICt9DQo+ID4NCj4gPiDCoHN0YXRp YyBpbnQgYWFjX3Byb2JlX29uZShzdHJ1Y3QgcGNpX2RldiAqcGRldiwgY29uc3Qgc3RydWN0DQo+ ID4gcGNpX2RldmljZV9pZA0KPiA+ICppZCkNCj4gPiDCoHsNCj4gPiBAQCAtMTE4NSw2ICsxMTky LDkgQEAgc3RhdGljIGludCBhYWNfcHJvYmVfb25lKHN0cnVjdCBwY2lfZGV2ICpwZGV2LA0KPiA+ IGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICppZCkNCj4gPiDCoAlzaG9zdC0+bWF4X2NtZF9s ZW4gPSAxNjsNCj4gPiDCoAlzaG9zdC0+dXNlX2NtZF9saXN0ID0gMTsNCj4gPg0KPiA+ICsJaWYg KGFhY19jZmdfbWFqb3IgPT0gLTIpDQo+ID4gKwkJYWFjX2luaXRfY2hhcigpOw0KPiA+ICsNCj4g PiDCoAlhYWMgPSAoc3RydWN0IGFhY19kZXYgKilzaG9zdC0+aG9zdGRhdGE7DQo+ID4gwqAJYWFj LT5iYXNlX3N0YXJ0ID0gcGNpX3Jlc291cmNlX3N0YXJ0KHBkZXYsIDApOw0KPiA+IMKgCWFhYy0+ c2NzaV9ob3N0X3B0ciA9IHNob3N0Ow0KPiA+IEBAIC0xNTM2LDcgKzE1NDYsNyBAQCBzdGF0aWMg dm9pZCBhYWNfcmVtb3ZlX29uZShzdHJ1Y3QgcGNpX2Rldg0KPiAqcGRldikNCj4gPiDCoAlwY2lf ZGlzYWJsZV9kZXZpY2UocGRldik7DQo+ID4gwqAJaWYgKGxpc3RfZW1wdHkoJmFhY19kZXZpY2Vz KSkgew0KPiA+IMKgCQl1bnJlZ2lzdGVyX2NocmRldihhYWNfY2ZnX21ham9yLCAiYWFjIik7DQo+ ID4gLQkJYWFjX2NmZ19tYWpvciA9IC0xOw0KPiA+ICsJCWFhY19jZmdfbWFqb3IgPSAtMjsNCj4g DQo+IFBsZWFzZSBhZGQgc29tZXRoaW5nIGxpa2UNCj4gI2RlZmluZSBBQUNfQ0hBUkRFVl9VTlJF R0lTVEVSRUQgLTENCj4gI2RlZmluZSBBQUNfQ0hBUkRFVl9ORUVEU19SRUlOSVQgLTINCj4gDQo+ IHNvIGl0J3Mgb2J2aW91cyB3aGF0IHlvdSdyZSBkb2luZy4NCg0KVGhhbmsgeW91IGZvciBwb2lu dGluZyB0aGF0IG91dCwgSSB3aWxsIG1ha2UNCnRoZSBuZWNlc3NhcnkgY2hhbmdlcyBpbiB0aGUg bmV4dCBpdGVyYXRpb24uDQoNCj4gDQo+ID4gwqAJfQ0KPiA+IMKgfQ0KPiA+DQo+ID4gQEAgLTE2 OTcsMTEgKzE3MDcsOCBAQCBzdGF0aWMgaW50IF9faW5pdCBhYWNfaW5pdCh2b2lkKQ0KPiA+IMKg CWlmIChlcnJvciA8IDApDQo+ID4gwqAJCXJldHVybiBlcnJvcjsNCj4gPg0KPiA+IC0JYWFjX2Nm Z19tYWpvciA9IHJlZ2lzdGVyX2NocmRldiggMCwgImFhYyIsICZhYWNfY2ZnX2ZvcHMpOw0KPiA+ IC0JaWYgKGFhY19jZmdfbWFqb3IgPCAwKSB7DQo+ID4gLQkJcHJpbnRrKEtFUk5fV0FSTklORw0K PiA+IC0JCQkiYWFjcmFpZDogdW5hYmxlIHRvIHJlZ2lzdGVyIFwiYWFjXCIgZGV2aWNlLlxuIik7 DQo+ID4gLQl9DQo+ID4gKwlhYWNfaW5pdF9jaGFyKCk7DQo+ID4gKw0KPiA+DQo+ID4gwqAJcmV0 dXJuIDA7DQo+ID4gwqB9DQoNClJlZ2FyZHMsDQpSYWdoYXZhIEFkaXR5YQ0K -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" 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/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 2094842..7142578 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -1123,6 +1123,13 @@ static void __aac_shutdown(struct aac_dev * aac) else if (aac->max_msix > 1) pci_disable_msix(aac->pdev); } +static void aac_init_char(void) +{ + aac_cfg_major = register_chrdev(0, "aac", &aac_cfg_fops); + if (aac_cfg_major < 0) { + pr_err("aacraid: unable to register \"aac\" device.\n"); + } +} static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -1185,6 +1192,9 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_cmd_len = 16; shost->use_cmd_list = 1; + if (aac_cfg_major == -2) + aac_init_char(); + aac = (struct aac_dev *)shost->hostdata; aac->base_start = pci_resource_start(pdev, 0); aac->scsi_host_ptr = shost; @@ -1536,7 +1546,7 @@ static void aac_remove_one(struct pci_dev *pdev) pci_disable_device(pdev); if (list_empty(&aac_devices)) { unregister_chrdev(aac_cfg_major, "aac"); - aac_cfg_major = -1; + aac_cfg_major = -2; } } @@ -1697,11 +1707,8 @@ static int __init aac_init(void) if (error < 0) return error; - aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops); - if (aac_cfg_major < 0) { - printk(KERN_WARNING - "aacraid: unable to register \"aac\" device.\n"); - } + aac_init_char(); + return 0; }