Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755091AbaGWC3s (ORCPT ); Tue, 22 Jul 2014 22:29:48 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:49237 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbaGWC3b (ORCPT ); Tue, 22 Jul 2014 22:29:31 -0400 Message-ID: <53CF1E02.4000602@linux.vnet.ibm.com> Date: Wed, 23 Jul 2014 10:29:22 +0800 From: Mike Qiu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: Tejun Heo CC: Jesse Brandeburg , "linux-kernel@vger.kernel.org" , linux-ide@vger.kernel.org, wenxiong@linux.vnet.ibm.com, brking@linux.vnet.ibm.com, zhenghch@cn.ibm.com, haokexin@gmail.com Subject: Re: [PATCH 2/2] libata: Fix NULL pointer of scsi_host in ata_port References: <1406040688-1762-1-git-send-email-qiudayu@linux.vnet.ibm.com> <53CE7C29.6050908@linux.vnet.ibm.com> <20140722201109.GN13851@htj.dyndns.org> In-Reply-To: <20140722201109.GN13851@htj.dyndns.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14072302-8878-0000-0000-000000225D89 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I have tested with the ipr IOA, passed. Reviewed-and Tested-by: Mike Qiu On 07/23/2014 04:11 AM, Tejun Heo wrote: > Hello, > > Can you please test the following patch? > > diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c > index d19c37a7..773f4e6 100644 > --- a/drivers/ata/libata-core.c > +++ b/drivers/ata/libata-core.c > @@ -4798,9 +4798,8 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) > static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap) > { > struct ata_queued_cmd *qc = NULL; > - unsigned int i, tag, max_queue; > - > - max_queue = ap->scsi_host->can_queue; > + unsigned int max_queue = ap->host->n_tags; > + unsigned int i, tag; > > /* no command while frozen */ > if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) > @@ -6094,6 +6093,7 @@ void ata_host_init(struct ata_host *host, struct device *dev, > { > spin_lock_init(&host->lock); > mutex_init(&host->eh_mutex); > + host->n_tags = ATA_MAX_QUEUE; > host->dev = dev; > host->ops = ops; > } > @@ -6179,11 +6179,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) > * The max queue supported by hardware must not be greater than > * ATA_MAX_QUEUE. > */ > - if (sht->can_queue > ATA_MAX_QUEUE) { > - dev_err(host->dev, "BUG: the hardware max queue is too large\n"); > - WARN_ON(1); > - return -EINVAL; > - } > + host->n_tags = clamp(sht->can_queue, 1, ATA_MAX_QUEUE); > > /* host must have been started */ > if (!(host->flags & ATA_HOST_STARTED)) { > diff --git a/include/linux/libata.h b/include/linux/libata.h > index 5ab4e3a..92abb49 100644 > --- a/include/linux/libata.h > +++ b/include/linux/libata.h > @@ -593,6 +593,7 @@ struct ata_host { > struct device *dev; > void __iomem * const *iomap; > unsigned int n_ports; > + unsigned int n_tags; /* nr of NCQ tags */ > void *private_data; > struct ata_port_operations *ops; > unsigned long flags; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/