On Thu, Jan 14, 2016 at 11:16:21PM -0800, Raghava Aditya Renukunta wrote:
> From: Raghava Aditya Renukunta <raghavaaditya.renukunta@xxxxxxxx>
>
> 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.
>
> Changes in V2:
> Added macros to track character device state
>
> Changes in V3:
> None
>
> Signed-off-by: Raghava Aditya Renukunta <raghavaaditya.renukunta@xxxxxxxx>
> Reviewed-by: Shane Seymour <shane.seymour@xxxxxxx>
> ---
> drivers/scsi/aacraid/aacraid.h | 7 +++++++
> drivers/scsi/aacraid/linit.c | 21 ++++++++++++++-------
> 2 files changed, 21 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
> index 3473668..4b669ef 100644
> --- a/drivers/scsi/aacraid/aacraid.h
> +++ b/drivers/scsi/aacraid/aacraid.h
> @@ -94,6 +94,13 @@ enum {
> #define aac_phys_to_logical(x) ((x)+1)
> #define aac_logical_to_phys(x) ((x)?(x)-1:0)
>
> +/*
> + * These macros are for keeping track of
> + * character device state.
> + */
> +#define AAC_CHARDEV_UNREGISTERED (-1)
> +#define AAC_CHARDEV_NEEDS_REINIT (-2)
> +
> /* #define AAC_DETAILED_STATUS_INFO */
>
> struct diskparm
> diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
> index 27b3fcd..057c07c 100644
> --- a/drivers/scsi/aacraid/linit.c
> +++ b/drivers/scsi/aacraid/linit.c
> @@ -80,7 +80,7 @@ MODULE_VERSION(AAC_DRIVER_FULL_VERSION);
>
> static DEFINE_MUTEX(aac_mutex);
> static LIST_HEAD(aac_devices);
> -static int aac_cfg_major = -1;
> +static int aac_cfg_major = AAC_CHARDEV_UNREGISTERED;
> char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
>
> /*
> @@ -1125,6 +1125,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)
> {
> @@ -1182,6 +1189,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 == AAC_CHARDEV_NEEDS_REINIT)
> + aac_init_char();
> +
> aac = (struct aac_dev *)shost->hostdata;
> aac->base_start = pci_resource_start(pdev, 0);
> aac->scsi_host_ptr = shost;
> @@ -1519,7 +1529,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 = AAC_CHARDEV_NEEDS_REINIT;
> }
> }
>
> @@ -1681,11 +1691,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;
> }
> --
> 1.9.1
>
Looks good
Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx>
--
Johannes Thumshirn Storage
jthumshirn@xxxxxxx +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
