[PATCH] NVMe: Write CC before calling enable.

[PATCH] NVMe: Write CC before calling enable.

[Dan McLeran]

Write the controller configuration register to configure queue sizes,
memory page size, etc. from within nvme_configure_admin_queue before
calling nvme_enable_ctrl.

Signed-off-by: Dan McLeran <daniel.mcleran at intel.com>
---
 drivers/block/nvme-core.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 28aec2d..58281d2 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1512,6 +1512,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
 	writel(aqa, &dev->bar->aqa);
 	writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
 	writeq(nvmeq->cq_dma_addr, &dev->bar->acq);
+	writel(dev->ctrl_config, &dev->bar->cc);
 
 	result = nvme_enable_ctrl(dev, cap);
 	if (result)
-- 
1.7.10.4

[PATCH] NVMe: Write CC before calling enable.

[Keith Busch]

On Tue, 1 Jul 2014, Dan McLeran wrote:
> Write the controller configuration register to configure queue sizes,
> memory page size, etc. from within nvme_configure_admin_queue before
> calling nvme_enable_ctrl.

I can see that you're doing that, but why? Is this fixing something?

> Signed-off-by: Dan McLeran <daniel.mcleran at intel.com>
> ---
> drivers/block/nvme-core.c |    1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index 28aec2d..58281d2 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -1512,6 +1512,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
> 	writel(aqa, &dev->bar->aqa);
> 	writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
> 	writeq(nvmeq->cq_dma_addr, &dev->bar->acq);
> +	writel(dev->ctrl_config, &dev->bar->cc);
>
> 	result = nvme_enable_ctrl(dev, cap);
> 	if (result)
> -- 
> 1.7.10.4
>
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
>

[PATCH] NVMe: Write CC before calling enable.

[Matthew Wilcox]

On Wed, Jul 02, 2014@12:33:08PM -0600, Keith Busch wrote:
> On Tue, 1 Jul 2014, Dan McLeran wrote:
> >Write the controller configuration register to configure queue sizes,
> >memory page size, etc. from within nvme_configure_admin_queue before
> >calling nvme_enable_ctrl.
> 
> I can see that you're doing that, but why? Is this fixing something?

I think I have created this confusion.  In Dan's earlier patch, this
writel() was left in.  I took it out as part of merging his patch (as
Dan himself had done in an earlier version of this patch).  I didn't
see the point of writing everything but enable, then writing the enable
bit separately.

> >Signed-off-by: Dan McLeran <daniel.mcleran at intel.com>
> >---
> >drivers/block/nvme-core.c |    1 +
> >1 file changed, 1 insertion(+)
> >
> >diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> >index 28aec2d..58281d2 100644
> >--- a/drivers/block/nvme-core.c
> >+++ b/drivers/block/nvme-core.c
> >@@ -1512,6 +1512,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
> >	writel(aqa, &dev->bar->aqa);
> >	writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
> >	writeq(nvmeq->cq_dma_addr, &dev->bar->acq);
> >+	writel(dev->ctrl_config, &dev->bar->cc);
> >
> >	result = nvme_enable_ctrl(dev, cap);
> >	if (result)
> >-- 
> >1.7.10.4
> >
> >
> >_______________________________________________
> >Linux-nvme mailing list
> >Linux-nvme at lists.infradead.org
> >http://lists.infradead.org/mailman/listinfo/linux-nvme
> >
> 
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme

[PATCH] NVMe: Write CC before calling enable.

[Dan McLeran]

Yes, I think I got confused there. This is not necessary.

On Wed, 2 Jul 2014, Matthew Wilcox wrote:

> On Wed, Jul 02, 2014@12:33:08PM -0600, Keith Busch wrote:
>> On Tue, 1 Jul 2014, Dan McLeran wrote:
>>> Write the controller configuration register to configure queue sizes,
>>> memory page size, etc. from within nvme_configure_admin_queue before
>>> calling nvme_enable_ctrl.
>>
>> I can see that you're doing that, but why? Is this fixing something?
>
> I think I have created this confusion.  In Dan's earlier patch, this
> writel() was left in.  I took it out as part of merging his patch (as
> Dan himself had done in an earlier version of this patch).  I didn't
> see the point of writing everything but enable, then writing the enable
> bit separately.
>
>>> Signed-off-by: Dan McLeran <daniel.mcleran at intel.com>
>>> ---
>>> drivers/block/nvme-core.c |    1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
>>> index 28aec2d..58281d2 100644
>>> --- a/drivers/block/nvme-core.c
>>> +++ b/drivers/block/nvme-core.c
>>> @@ -1512,6 +1512,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
>>> 	writel(aqa, &dev->bar->aqa);
>>> 	writeq(nvmeq->sq_dma_addr, &dev->bar->asq);
>>> 	writeq(nvmeq->cq_dma_addr, &dev->bar->acq);
>>> +	writel(dev->ctrl_config, &dev->bar->cc);
>>>
>>> 	result = nvme_enable_ctrl(dev, cap);
>>> 	if (result)
>>> --
>>> 1.7.10.4
>>>
>>>
>>> _______________________________________________
>>> Linux-nvme mailing list
>>> Linux-nvme at lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-nvme
>>>
>>
>> _______________________________________________
>> Linux-nvme mailing list
>> Linux-nvme at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-nvme
>