On Wednesday, March 07, 2012 04:39:47 PM Arvind Kumar wrote:
> Try setting host->max_id as suggested by the device.
>
> Fetch the config page from the device to learn max target id to set
> host->max_id.
>
> Also, fix some indentation issues and update the 'Maintained by' field.
>
> From: Arvind Kumar <arvindkumar@xxxxxxxxxx>
>
> Signed-off-by: Arvind Kumar <arvindkumar@xxxxxxxxxx>
> Cc: Alok N Kataria <akataria@xxxxxxxxxx>
> ---
> drivers/scsi/vmw_pvscsi.c | 65 +++++++++++++++++++++++++++-
> drivers/scsi/vmw_pvscsi.h | 107
> +++++++++++++++++++++++++++++++++++---------- 2 files changed, 148
> insertions(+), 24 deletions(-)
>
> diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
> index 7264116..92c941f 100644
> --- a/drivers/scsi/vmw_pvscsi.c
> +++ b/drivers/scsi/vmw_pvscsi.c
> @@ -17,7 +17,7 @@
> * along with this program; if not, write to the Free Software
> * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
> USA. *
> - * Maintained by: Alok N Kataria <akataria@xxxxxxxxxx>
> + * Maintained by: Arvind Kumar <arvindkumar@xxxxxxxxxx>
> *
> */
>
> @@ -1178,6 +1178,63 @@ static int __devinit pvscsi_allocate_sg(struct
> pvscsi_adapter *adapter) return 0;
> }
>
> +/*
> + * Query the device, fetch the config info and return the
> + * maximum number of targets on the adapter. In case of
> + * failure due to any reason return default i.e. 16.
> + */
> +static u32 pvscsi_get_max_targets(struct pvscsi_adapter *adapter)
> +{
> + struct PVSCSICmdDescConfigCmd cmd;
> + struct PVSCSIConfigPageHeader *header;
> + dma_addr_t configPagePA;
> + void *config_page;
> + u32 numPhys;
> +
> + numPhys = 16;
Just do
u32 numPhys = 16;
> + config_page = pci_alloc_consistent(adapter->dev, PAGE_SIZE,
> + &configPagePA);
> + if (!config_page) {
> + printk(KERN_INFO "vmw_pvscsi: failed to allocate memory for"
> + " config page\n");
This should be dev_warn() (or maybe dev_dbg() if we expect this to fail) and
the string should not be split (it is OK to run over 80 columns limit for
messges).
> + goto exit;
> + }
> + BUG_ON(configPagePA & ~PAGE_MASK);
> +
> + /* Fetch config info from the device. */
> + cmd.configPageAddress = (((u64)(PVSCSI_CONFIG_CONTROLLER_ADDRESS))
> + << 32);
Too many parens...
> + cmd.configPageNum = PVSCSI_CONFIG_PAGE_CONTROLLER;
> + cmd.cmpAddr = configPagePA;
> + cmd._pad = 0;
> +
> + /*
> + * Mark the completion page header with error values. If the device
> + * completes the command successfully, it sets the status values to
> + * indicate success.
> + */
> + header = config_page;
> + memset(header, 0, sizeof *header);
> + header->hostStatus = BTSTAT_INVPARAM;
> + header->scsiStatus = SDSTAT_CHECK;
> +
> + pvscsi_write_cmd_desc(adapter, PVSCSI_CMD_CONFIG, &cmd, sizeof cmd);
> +
> + if (header->hostStatus == BTSTAT_SUCCESS &&
> + header->scsiStatus == SDSTAT_GOOD) {
> + struct PVSCSIConfigPageController *config;
> +
> + config = config_page;
> + numPhys = config->numPhys;
> + } else
> + printk(KERN_INFO "vmw_pvscsi: PVSCSI_CMD_CONFIG failed."
> + " hostStatus = 0x%x, scsiStatus = 0x%x\n",
> + header->hostStatus, header->scsiStatus);
dev_warn() or dev_dbg() here as well.
> + pci_free_consistent(adapter->dev, PAGE_SIZE, config_page, configPagePA);
> +exit:
> + return numPhys;
> +}
> +
> static int __devinit pvscsi_probe(struct pci_dev *pdev,
> const struct pci_device_id *id)
> {
> @@ -1272,6 +1329,12 @@ static int __devinit pvscsi_probe(struct pci_dev
> *pdev, }
>
> /*
> + * Ask the device for max number of targets.
> + */
> + host->max_id = pvscsi_get_max_targets(adapter);
> + printk(KERN_INFO "vmw_pvscsi: host->max_id: %u\n", host->max_id);
> +
dev_dbg()? Or dev_info().
Thanks.
--
Dmitry
--
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
