Re: [PATCH] scsi: remove useless variable assignment

[James Bottomley]

On Wed, 2017-05-17 at 19:30 -0500, Gustavo A. R. Silva wrote:
> Remove this assignment once the value stored in variable _k_ is
> overwritten after a few lines.
> 
> Addresses-Coverity-ID: 1226927
> Signed-off-by: Gustavo A. R. Silva 
> ---
>  drivers/scsi/qlogicfas408.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/scsi/qlogicfas408.c
> b/drivers/scsi/qlogicfas408.c
> index c3a9151..269440a 100644
> --- a/drivers/scsi/qlogicfas408.c
> +++ b/drivers/scsi/qlogicfas408.c
> @@ -329,7 +329,6 @@ static unsigned int ql_pcmd(struct scsi_cmnd
> *cmd)
>*/
>   if ((k = ql_wai(priv)))
>   return (k << 16);
> - k = inb(qbase + 5); /* should be 0x10, bus
> service */

That doesn't look right to me.  inb() is a statement which has an
effect on the I/O device regardless of whether the returned value is
used or discarded.  In this case I think it's being used to clear
pending interrupts, so removing it will likely cause a phase error.

James

[PATCH] scsi: remove useless variable assignment

[Gustavo A. R. Silva]

Remove both variable assignments once the value stored in variable _reqlen_
is overwritten at some point either by line 2321: reqlen = mptr - msg;
or by line 2330: reqlen = 12;

Addresses-Coverity-ID: 1226930
Addresses-Coverity-ID: 1226931
Signed-off-by: Gustavo A. R. Silva 
---
 drivers/scsi/dpt_i2o.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 256dd67..acad668 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -2292,11 +2292,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct 
scsi_cmnd* cmd, struct adpt_d
mptr+=4;
lenptr=mptr++;  /* Remember me - fill in when we know */
if (dpt_dma64(pHba)) {
-   reqlen = 16;// SINGLE SGE
*mptr++ = (0x7C<<24)+(2<<16)+0x02; /* Enable 64 bit */
*mptr++ = 1 << PAGE_SHIFT;
-   } else {
-   reqlen = 14;// SINGLE SGE
}
/* Now fill in the SGList and command */
 
-- 
2.5.0

[PATCH] scsi: remove useless variable assignment

[Gustavo A. R. Silva]

Remove this assignment once the value stored in variable _k_ is
overwritten after a few lines.

Addresses-Coverity-ID: 1226927
Signed-off-by: Gustavo A. R. Silva 
---
 drivers/scsi/qlogicfas408.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index c3a9151..269440a 100644
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -329,7 +329,6 @@ static unsigned int ql_pcmd(struct scsi_cmnd *cmd)
 */
if ((k = ql_wai(priv)))
return (k << 16);
-   k = inb(qbase + 5); /* should be 0x10, bus service */
}
 
/*
-- 
2.5.0

Re: [PATCH] lpfc: fix build issue if NVME_FC_TARGET is not defined

[Martin K. Petersen]

James,

> fix build issue if NVME_FC_TARGET is not defined. noop the code.
> The code will never be invoked if target mode is not enabled.

Applied to 4.12/scsi-fixes. Thanks!

-- 
Martin K. Petersen  Oracle Linux Engineering

Re: [PATCH] lpfc: Fix NULL pointer dereference during PCI error recovery

[Martin K. Petersen]

Guilherme,

> Recent commit on patchset "lpfc updates for 11.2.0.14" fixed an issue
> about dereferencing a NULL pointer on port reset. The specific commit,
> named "lpfc: Fix system crash when port is reset.", is missing a check
> against NULL pointer on lpfc_els_flush_cmd() though.
>
> Since we destroy the queues on adapter resets, like in PCI error
> recovery path, we need the validation present on this patch in order
> to avoid a NULL pointer dereference when trying to flush commands of
> ELS wq, after it has been destroyed (which would lead to a kernel
> oops).

Applied to 4.12/scsi-fixes. Thank you!

-- 
Martin K. Petersen  Oracle Linux Engineering

Re: [PATCH] ses: fix error message in ses_intf_add()

[Martin K. Petersen]

Ewan,

> This looks OK but I think we should consider suppressing these
> messages.  There are a lot of devices that return page 0 instead of
> the correct page, we should either say something like "enclosure
> services not supported", or else work with what we get instead of
> logging a message on every device probe that make it sound like
> the device is failing.

I agree.

> I've received several complaints about this.

Me too. There appears to be a ton of bad devices out there.

-- 
Martin K. Petersen  Oracle Linux Engineering

Re: [PATCH] scsi: zero per-cmd driver data for each MQ I/O

[Bart Van Assche]

On Tue, 2017-05-16 at 17:31 +, Long Li wrote:
> > -Original Message-
> > From: Bart Van Assche [mailto:bart.vanass...@sandisk.com]
> > Sent: Monday, May 15, 2017 5:01 PM
> > To: j...@linux.vnet.ibm.com; linux-scsi@vger.kernel.org; linux-
> > ker...@vger.kernel.org; Long Li ;
> > martin.peter...@oracle.com
> > Cc: Stephen Hemminger ; KY Srinivasan
> > 
> > Subject: Re: [PATCH] scsi: zero per-cmd driver data for each MQ I/O
> > 
> > On Mon, 2017-05-15 at 23:32 +, Long Li wrote:
> > > Thanks for looking! Yes this is for chasing a bug.
> > > 
> > > With the patch, we also zero the private data used by lower layer
> > > driver, in addition to the private data in scsi_cmnd.
> > 
> > Hello Long,
> > 
> > What bug did you encounter, with which combination of ULP (sd?) and LLD SCSI
> > driver(s) and for which request type (REQ_OP_*)? You will have to mention
> > that information in the patch description anyway if you want your patch to 
> > get
> > accepted.
> > 
> > If the bug that you encountered only occurs with a single LLD, would it be
> > possible to implement a fix by modifying the LLD instead of the SCSI core?
> 
> The bug I encounter is that in hv_storvsc (a LLD), sometime we are getting 
> stale data in the private driver data memory allocated by SCSI. As a LLD, we 
> expect the memory allocated by SCSI to be zeroed. If not we may send 
> unexpected commands to the device.
> 
> A little background on private data: In LLD's scsi_host_template, the driver 
> may optionally ask SCSI to allocate its private driver memory for each 
> command, by specifying cmd_size. This memory is allocated at the end of 
> scsi_cmnd by SCSI. Later when SCSI queues a command, the LLD can use 
> scsi_cmd_priv to get its private data.
> 
> hv_storvsc doesn't clear its private data before use. I'm not sure about 
> other LLD drivers. Although it's possible to fix it in LLD not SCSI core, I 
> think that is not the ideal place to do it. Whoever is allocating the SCSI 
> command should also zero it.
> 
> There is a similar patch that fixed a similar issue for non-MQ case:
> commit ee5242360424b9b967454e9183767323d10cf985
> 
> I'm sorry I should have put more details in the patch. 

Hello Long,

Thank you for the feedback. I'm working on a patch series that merges the 
scsi-sq
and scsi-mq code paths for command initialization and that should fix the bug 
you
encountered.

Bart.

Re: [PATCH v2 02/15] lpfc: Fix system crash when port is reset.

[Guilherme G. Piccoli]

On 05/17/2017 03:49 PM, James Smart wrote:
> Your patch is still needed.  Can you repost your patch with a new 
> subject and add my signature:
> 
> Signed-off-by: James Smart 
> 
> Sorry, I didn't see it to roll it into the set.

No problem James, already sent it to linux-scsi:
https://marc.info/?l=linux-scsi=149505857715991

Cheers,


Guilherme

> 
> -- james
> 
> 
> 
> ___
> Linux-nvme mailing list
> linux-n...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
> 

[PATCH] lpfc: Fix NULL pointer dereference during PCI error recovery

[Guilherme G. Piccoli]

Recent commit on patchset "lpfc updates for 11.2.0.14" fixed an issue
about dereferencing a NULL pointer on port reset. The specific commit,
named "lpfc: Fix system crash when port is reset.", is missing a check
against NULL pointer on lpfc_els_flush_cmd() though.

Since we destroy the queues on adapter resets, like in PCI error
recovery path, we need the validation present on this patch in order
to avoid a NULL pointer dereference when trying to flush commands of
ELS wq, after it has been destroyed (which would lead to a kernel oops).

Tested-by: Raphael Silva 
Signed-off-by: Guilherme G. Piccoli 
Signed-off-by: James Smart 
---

This patch was rebased against 4.12/scsi-fixes on mkp tree.
I couldn't figure a better way to refer to commits in this
message because they weren't merged on linus tree yet, so
the sha hashes wouldn't make sense. If you have some idea,
please let me know and I can send v2 if desired.

 drivers/scsi/lpfc/lpfc_els.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 1d36f82fa369..8e532b39ae93 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -7451,6 +7451,13 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport)
 */
spin_lock_irq(>hbalock);
pring = lpfc_phba_elsring(phba);
+
+   /* Bail out if we've no ELS wq, like in PCI error recovery case. */
+   if (unlikely(!pring)) {
+   spin_unlock_irq(>hbalock);
+   return;
+   }
+
if (phba->sli_rev == LPFC_SLI_REV4)
spin_lock(>ring_lock);
 
-- 
2.12.0.rc0

[PATCH] scsi: libiscsi: use kvzalloc for iscsi_pool_init

[Kyle Fortin]

iscsiadm session login can fail with the following error:

iscsiadm: Could not login to [iface: default, target: iqn.1986-03.com...
iscsiadm: initiator reported error (9 - internal error)

When /etc/iscsi/iscsid.conf sets node.session.cmds_max = 4096, it results
in 64K-sized kmallocs per session.  A system under fragmented slab
pressure may not have any 64K objects available and fail iscsiadm session
login. Even though memory objects of a smaller size are available, the
large order allocation ends up failing.

The kernel prints a warning and does dump_stack, like below:

iscsid: page allocation failure: order:4, mode:0xc0d0
CPU: 0 PID: 2456 Comm: iscsid Not tainted 4.1.12-61.1.28.el6uek.x86_64 #2
Call Trace:
 [] dump_stack+0x63/0x83
 [] warn_alloc_failed+0xea/0x140
 [] __alloc_pages_slowpath+0x409/0x760
 [] __alloc_pages_nodemask+0x2b1/0x2d0
 [] ? dev_attr_host_ipaddress+0x20/0xc722
 [] alloc_pages_current+0xaf/0x170
 [] alloc_kmem_pages+0x31/0xd0
 [] ? iscsi_transport_group+0x20/0xc7e2
 [] kmalloc_order+0x18/0x50
 [] kmalloc_order_trace+0x34/0xe0
 [] ? transport_remove_classdev+0x70/0x70
 [] __kmalloc+0x27d/0x2a0
 [] ? complete_all+0x4d/0x60
 [] iscsi_pool_init+0x69/0x160 [libiscsi]
 [] ? device_initialize+0xb0/0xd0
 [] iscsi_session_setup+0x180/0x2f4 [libiscsi]
 [] ? iscsi_max_lun+0x20/0xfa9e [iscsi_tcp]
 [] iscsi_sw_tcp_session_create+0xcf/0x150 [iscsi_tcp]
 [] ? iscsi_max_lun+0x20/0xfa9e [iscsi_tcp]
 [] iscsi_if_create_session+0x33/0xd0
 [] ? iscsi_max_lun+0x20/0xfa9e [iscsi_tcp]
 [] iscsi_if_recv_msg+0x508/0x8c0 [scsi_transport_iscsi]
 [] ? __alloc_pages_nodemask+0x19b/0x2d0
 [] ? __kmalloc_node_track_caller+0x209/0x2c0
 [] iscsi_if_rx+0x7c/0x200 [scsi_transport_iscsi]
 [] netlink_unicast+0x126/0x1c0
 [] netlink_sendmsg+0x36c/0x400
 [] sock_sendmsg+0x4d/0x60
 [] ___sys_sendmsg+0x30a/0x330
 [] ? handle_pte_fault+0x20c/0x230
 [] ? __handle_mm_fault+0x1bc/0x330
 [] ? handle_mm_fault+0xb2/0x1a0
 [] __sys_sendmsg+0x49/0x90
 [] SyS_sendmsg+0x19/0x20
 [] system_call_fastpath+0x12/0x71

Use kvzalloc for iscsi_pool in iscsi_pool_init.

Signed-off-by: Kyle Fortin 
Tested-by: Kyle Fortin 
Reviewed-by: Joseph Slember 
Reviewed-by: Lance Hartmann 
---
 drivers/scsi/libiscsi.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index dd6828f..42381ad 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2556,7 +2556,7 @@ int iscsi_eh_recover_target(struct scsi_cmnd *sc)
 * the array. */
if (items)
num_arrays++;
-   q->pool = kzalloc(num_arrays * max * sizeof(void*), GFP_KERNEL);
+   q->pool = kvzalloc(num_arrays * max * sizeof(void*), GFP_KERNEL);
if (q->pool == NULL)
return -ENOMEM;
 
@@ -2590,7 +2590,7 @@ void iscsi_pool_free(struct iscsi_pool *q)
 
for (i = 0; i < q->max; i++)
kfree(q->pool[i]);
-   kfree(q->pool);
+   kvfree(q->pool);
 }
 EXPORT_SYMBOL_GPL(iscsi_pool_free);
 
-- 
1.7.1

Re: [PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[Arnd Bergmann]

On Wed, May 17, 2017 at 6:45 PM, John Garry  wrote:
> On 17/05/2017 15:13, Arnd Bergmann wrote:
>> On Wed, May 17, 2017 at 3:37 PM, John Garry  wrote:
>>> On 17/05/2017 13:37, Arnd Bergmann wrote:
>>> As for your suggestion, in theory it could be ok to have a
>>> pci_dev->fwnode,
>>> and this would work for Unified Device Properties Interface (if that is
>>> indeed what you mean). But how to create/match this fwnode?
>>
>>
>> pci_scan_device sets the dev->of_node field for DT based probing, we
>> could add a trivial patch to set the fwnode field as well if that isn't
>> already done elsewhere.
>>
>>> From what I can tell, the ACPI code sets up a 'companion' device for
>>
>> any PCI device that is listed in the ACPI tables, at least it refers to
>> that later on, but I could not figure out where it actually gets set.
>>
>
> Hi Arnd,
>
> Currently there is no pci device listed in the ACPI tables.
>
> What I am doing is declaring a fake device in the root of the System bus
> tree of the ACPI tables, and in the kernel driver finding it by matching the
> name. It is not the ACPI companion for the pci device.
>
> So I think that we can define the pci device under the pci bus in the ACPI
> tables, and define the ADR and DSD. Then we would have an ACPI companion for
> the device, and from that get the SAS address.

Yes, that would be much better, and allow us to use the device properties
interface directly. An additional advantage is that the property definition
can be exactly the same as for the v1/v2 platform_device properties
for anything that might be needed across all versions.  sas-addr already
fits in there, and there might be additional properties you need in the
future.

> An alternative to this ACPI device method is for UEFI to write the SAS
> address to a defined free location in device's pci config space, which the
> driver can read.

That sounds ok as well, it would be nice to not rely on firmware data here,
but I'd have to see how the implementation ends up: IIRC you should
not just put the data at a fixed location in the config space but instead use
the 'extended capabilities' infrastructure to find the data.
PCI_EXT_CAP_ID_VNDR might be the right one here, but I don't
know enough about this, so please consult with someone who does
(or the PCIe specification).

  Arnd

Re: [PATCH v2 02/15] lpfc: Fix system crash when port is reset.

[James Smart]

On 5/16/2017 5:26 AM, Guilherme G. Piccoli wrote:

On 05/15/2017 07:20 PM, James Smart wrote:

The driver panic when using the els_wq during port reset.

Check for NULL els_wq before dereferencing.


James/Dick, if possible please take a look on:
https://marc.info/?l=linux-scsi=149487670315697

For some reason that email didn't get threaded as I expect. And also I
forgot to include James' Gmail address, sorry.

Thanks in advance,


Guilherme


Gilherme,

Your patch is still needed.  Can you repost your patch with a new 
subject and add my signature:


Signed-off-by: James Smart 

Sorry, I didn't see it to roll it into the set.

-- james

Re: [PREEMPT-RT] [REEEEPOST] bnx2i + bnx2fc: convert to generic workqueue (#3)

[Sebastian Andrzej Siewior]

On 2017-05-17 17:07:34 [+0200], To Chad Dupuis wrote:
> > > Sebastian, can you add this change to your patch set?
> > 
> > Are sure that you can reliably reproduce the issue and fix it with the
> > patch above? Because this patch:
> 
> oh. Okay. Now it clicked. It can fix the issue but it is still possible,
> that CPU0 goes down between your check for it and schedule_work_on()
> returning. Let my think of something…

Oh wait. I already thought about this: it may take bnx2fc_percpu from
CPU7 and run the worker on CPU3. The job isn't lost, because the worker
does:

| static void bnx2fc_percpu_io_work(struct work_struct *work_s)
| {
| struct bnx2fc_percpu_s *p;
 …
| p = container_of(work_s, struct bnx2fc_percpu_s, work);
| 
| spin_lock_bh(>fp_work_lock);

and so will access bnx2fc_percpu of CPU7 running on CPU3. So I *think*
that your patch should make no difference and there should be no leak if
schedule_work_on() is invoked on an offline CPU.
 
Sebastian

Re: [PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[John Garry]

On 17/05/2017 15:13, Arnd Bergmann wrote:

On Wed, May 17, 2017 at 3:37 PM, John Garry  wrote:

On 17/05/2017 13:37, Arnd Bergmann wrote:



Since this uses the _DSD information that was introduced for compatibility
between device tree and ACPI based data, why not write the code so that
it can work for both?

Ideally this should just look up the property for pci_dev->fwnode, but I'm
not entirely sure if this works the same way on ACPI and DT today.



Hi Arnd,

There is no relation at all between the pci device and the ACPI DSDT, apart
from the fact that the device node name is known by the driver, that being
"SAS0". I am not 100% comfortable with this, as we are introducing some sort
of device indexing in the driver.

Please note that Cavium did something similar on their thunderx network
driver:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?h=v4.12-rc1#n1162

As for your suggestion, in theory it could be ok to have a pci_dev->fwnode,
and this would work for Unified Device Properties Interface (if that is
indeed what you mean). But how to create/match this fwnode?


pci_scan_device sets the dev->of_node field for DT based probing, we
could add a trivial patch to set the fwnode field as well if that isn't
already done elsewhere.


From what I can tell, the ACPI code sets up a 'companion' device for

any PCI device that is listed in the ACPI tables, at least it refers to
that later on, but I could not figure out where it actually gets set.



Hi Arnd,

Currently there is no pci device listed in the ACPI tables.

What I am doing is declaring a fake device in the root of the System bus 
tree of the ACPI tables, and in the kernel driver finding it by matching 
the name. It is not the ACPI companion for the pci device.


So I think that we can define the pci device under the pci bus in the 
ACPI tables, and define the ADR and DSD. Then we would have an ACPI 
companion for the device, and from that get the SAS address.


An alternative to this ACPI device method is for UEFI to write the SAS 
address to a defined free location in device's pci config space, which 
the driver can read.


Much appreciated,
John


Arnd

.

Re: [PREEMPT-RT] [REEEEPOST] bnx2i + bnx2fc: convert to generic workqueue (#3)

[Sebastian Andrzej Siewior]

On 2017-05-17 17:01:53 [+0200], To Chad Dupuis wrote:
> On 2017-05-12 11:55:52 [-0400], Chad Dupuis wrote:
> > Ok, I believe I've found the issue here.  The machine that the test has 
> > performed on had many more possible CPUs than active CPUs.  We calculate 
> > which CPU to the work time on in bnx2fc_process_new_cqes() like this:
> > 
> > unsigned int cpu = wqe % num_possible_cpus();
> > 
> > Since not all CPUs are active, we were trying to schedule work on 
> > non-active CPUs which meant that the upper layers were never notified of 
> > the completion.  With this change:
> > 
> > diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c 
> > b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > index c2288d6..6f08e43 100644
> > --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > @@ -1042,7 +1042,12 @@ static int bnx2fc_process_new_cqes(struct 
> > bnx2fc_rport *tgt)
> > /* Pending work request completion */
> > struct bnx2fc_work *work = NULL;
> > struct bnx2fc_percpu_s *fps = NULL;
> > -   unsigned int cpu = wqe % num_possible_cpus();
> > +   unsigned int cpu = wqe % num_active_cpus();
> > +
> > +   /* Sanity check cpu to make sure it's online */
> > +   if (!cpu_active(cpu))
> > +   /* Default to CPU 0 */
> > +   cpu = 0;
> >  
> > work = bnx2fc_alloc_work(tgt, wqe);
> > if (work) {
> > 
> > The issue is fixed.
> > 
> > Sebastian, can you add this change to your patch set?
> 
> Are sure that you can reliably reproduce the issue and fix it with the
> patch above? Because this patch:

oh. Okay. Now it clicked. It can fix the issue but it is still possible,
that CPU0 goes down between your check for it and schedule_work_on()
returning. Let my think of something…

Sebastian

Re: [REEEEPOST] bnx2i + bnx2fc: convert to generic workqueue (#3)

[Chad Dupuis]

On Wed, 17 May 2017, 11:01am, Sebastian Andrzej Siewior wrote:

> On 2017-05-12 11:55:52 [-0400], Chad Dupuis wrote:
> > Ok, I believe I've found the issue here.  The machine that the test has 
> > performed on had many more possible CPUs than active CPUs.  We calculate 
> > which CPU to the work time on in bnx2fc_process_new_cqes() like this:
> > 
> > unsigned int cpu = wqe % num_possible_cpus();
> > 
> > Since not all CPUs are active, we were trying to schedule work on 
> > non-active CPUs which meant that the upper layers were never notified of 
> > the completion.  With this change:
> > 
> > diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c 
> > b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > index c2288d6..6f08e43 100644
> > --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> > @@ -1042,7 +1042,12 @@ static int bnx2fc_process_new_cqes(struct 
> > bnx2fc_rport *tgt)
> > /* Pending work request completion */
> > struct bnx2fc_work *work = NULL;
> > struct bnx2fc_percpu_s *fps = NULL;
> > -   unsigned int cpu = wqe % num_possible_cpus();
> > +   unsigned int cpu = wqe % num_active_cpus();
> > +
> > +   /* Sanity check cpu to make sure it's online */
> > +   if (!cpu_active(cpu))
> > +   /* Default to CPU 0 */
> > +   cpu = 0;
> >  
> > work = bnx2fc_alloc_work(tgt, wqe);
> > if (work) {
> > 
> > The issue is fixed.
> > 
> > Sebastian, can you add this change to your patch set?
> 
> Are sure that you can reliably reproduce the issue and fix it with the
> patch above? Because this patch:

Yes it was reproducible each time we would start the FCoE interface.  With 
the above patch, our sanity test passed with no issues seen.

> 
> diff --git a/init/main.c b/init/main.c
> index b0c11cbf5ddf..483a971b1fd2 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -997,6 +997,12 @@ static int __ref kernel_init(void *unused)
>   "See Linux Documentation/admin-guide/init.rst for guidance.");
>  }
>  
> +static void workfn(struct work_struct *work)
> +{
> +   pr_err("%s() %d\n", __func__, raw_smp_processor_id());
> +}
> +static DECLARE_WORK(work, workfn);
> +
>  static noinline void __init kernel_init_freeable(void)
>  {
> /*
> @@ -1040,6 +1046,15 @@ static noinline void __init kernel_init_freeable(void)
>  
> (void) sys_dup(0);
> (void) sys_dup(0);
> +   {
> +
> +   cpu_down(3);
> +   pr_err("%s() num possible: %d\n", __func__, 
> num_possible_cpus());
> +   pr_err("%s() num online  : %d\n", __func__, 
> num_online_cpus());
> +   pr_err("%s() 3 active: %d\n", __func__, cpu_active(3));
> +   schedule_work_on(3, );
> +   ssleep(5);
> +   }
> /*
>  * check if there is an early userspace init.  If yes, let it do all
>  * the work
> 
> produces this output:
> [1.960313] Unregister pv shared memory for cpu 3
> [1.997000] kernel_init_freeable() num possible: 8
> [1.998073] kernel_init_freeable() num online  : 7
> [1.999125] kernel_init_freeable() 3 active: 0
> [2.000337] workfn() 1
> 
> which means, CPU3 is offline and work runs on CPU1 instead. So it does
> already what you suggest except that chances are, that it is not run on
> CPU0 in this case (but on another CPU).
> 
> So it either takes some time for wait_for_completion(_req->tm_done);
> to come back _or_ there is a leak somewhere where a complete() is
> somehow missing / racing against something.
> 
> Sebastian
> 

Re: [REEEEPOST] bnx2i + bnx2fc: convert to generic workqueue (#3)

[Sebastian Andrzej Siewior]

On 2017-05-12 11:55:52 [-0400], Chad Dupuis wrote:
> Ok, I believe I've found the issue here.  The machine that the test has 
> performed on had many more possible CPUs than active CPUs.  We calculate 
> which CPU to the work time on in bnx2fc_process_new_cqes() like this:
> 
> unsigned int cpu = wqe % num_possible_cpus();
> 
> Since not all CPUs are active, we were trying to schedule work on 
> non-active CPUs which meant that the upper layers were never notified of 
> the completion.  With this change:
> 
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c 
> b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> index c2288d6..6f08e43 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
> @@ -1042,7 +1042,12 @@ static int bnx2fc_process_new_cqes(struct 
> bnx2fc_rport *tgt)
> /* Pending work request completion */
> struct bnx2fc_work *work = NULL;
> struct bnx2fc_percpu_s *fps = NULL;
> -   unsigned int cpu = wqe % num_possible_cpus();
> +   unsigned int cpu = wqe % num_active_cpus();
> +
> +   /* Sanity check cpu to make sure it's online */
> +   if (!cpu_active(cpu))
> +   /* Default to CPU 0 */
> +   cpu = 0;
>  
> work = bnx2fc_alloc_work(tgt, wqe);
> if (work) {
> 
> The issue is fixed.
> 
> Sebastian, can you add this change to your patch set?

Are sure that you can reliably reproduce the issue and fix it with the
patch above? Because this patch:

diff --git a/init/main.c b/init/main.c
index b0c11cbf5ddf..483a971b1fd2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -997,6 +997,12 @@ static int __ref kernel_init(void *unused)
  "See Linux Documentation/admin-guide/init.rst for guidance.");
 }
 
+static void workfn(struct work_struct *work)
+{
+   pr_err("%s() %d\n", __func__, raw_smp_processor_id());
+}
+static DECLARE_WORK(work, workfn);
+
 static noinline void __init kernel_init_freeable(void)
 {
/*
@@ -1040,6 +1046,15 @@ static noinline void __init kernel_init_freeable(void)
 
(void) sys_dup(0);
(void) sys_dup(0);
+   {
+
+   cpu_down(3);
+   pr_err("%s() num possible: %d\n", __func__, 
num_possible_cpus());
+   pr_err("%s() num online  : %d\n", __func__, num_online_cpus());
+   pr_err("%s() 3 active: %d\n", __func__, cpu_active(3));
+   schedule_work_on(3, );
+   ssleep(5);
+   }
/*
 * check if there is an early userspace init.  If yes, let it do all
 * the work

produces this output:
[1.960313] Unregister pv shared memory for cpu 3
[1.997000] kernel_init_freeable() num possible: 8
[1.998073] kernel_init_freeable() num online  : 7
[1.999125] kernel_init_freeable() 3 active: 0
[2.000337] workfn() 1

which means, CPU3 is offline and work runs on CPU1 instead. So it does
already what you suggest except that chances are, that it is not run on
CPU0 in this case (but on another CPU).

So it either takes some time for wait_for_completion(_req->tm_done);
to come back _or_ there is a leak somewhere where a complete() is
somehow missing / racing against something.

Sebastian

[PATCH] scsi: csiostor: add support for Chelsio T6 adapters

[Varun Prakash]

Signed-off-by: Varun Prakash 
---
 drivers/scsi/csiostor/csio_hw.c  | 79 ++--
 drivers/scsi/csiostor/csio_hw_chip.h | 14 +++
 drivers/scsi/csiostor/csio_hw_t5.c   | 29 +
 drivers/scsi/csiostor/csio_init.c|  6 ++-
 drivers/scsi/csiostor/csio_wr.c  |  4 +-
 5 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 622bdab..5ca4099 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -794,18 +794,24 @@ csio_hw_dev_ready(struct csio_hw *hw)
 {
uint32_t reg;
int cnt = 6;
+   int src_pf;
 
while (((reg = csio_rd_reg32(hw, PL_WHOAMI_A)) == 0x) &&
   (--cnt != 0))
mdelay(100);
 
-   if ((cnt == 0) && (((int32_t)(SOURCEPF_G(reg)) < 0) ||
-  (SOURCEPF_G(reg) >= CSIO_MAX_PFN))) {
+   if (csio_is_t5(hw->pdev->device & CSIO_HW_CHIP_MASK))
+   src_pf = SOURCEPF_G(reg);
+   else
+   src_pf = T6_SOURCEPF_G(reg);
+
+   if ((cnt == 0) && (((int32_t)(src_pf) < 0) ||
+  (src_pf >= CSIO_MAX_PFN))) {
csio_err(hw, "PL_WHOAMI returned 0x%x, cnt:%d\n", reg, cnt);
return -EIO;
}
 
-   hw->pfn = SOURCEPF_G(reg);
+   hw->pfn = src_pf;
 
return 0;
 }
@@ -1581,10 +1587,16 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
*fw_cfg_param, char *path)
unsigned int mtype = 0, maddr = 0;
uint32_t *cfg_data;
int value_to_add = 0;
+   const char *fw_cfg_file;
+
+   if (csio_is_t5(pci_dev->device & CSIO_HW_CHIP_MASK))
+   fw_cfg_file = FW_CFG_NAME_T5;
+   else
+   fw_cfg_file = FW_CFG_NAME_T6;
 
-   if (request_firmware(, FW_CFG_NAME_T5, dev) < 0) {
+   if (request_firmware(, fw_cfg_file, dev) < 0) {
csio_err(hw, "could not find config file %s, err: %d\n",
-FW_CFG_NAME_T5, ret);
+fw_cfg_file, ret);
return -ENOENT;
}
 
@@ -1623,9 +1635,8 @@ csio_hw_flash_config(struct csio_hw *hw, u32 
*fw_cfg_param, char *path)
ret = csio_memory_write(hw, mtype, maddr + size, 4, );
}
if (ret == 0) {
-   csio_info(hw, "config file upgraded to %s\n",
- FW_CFG_NAME_T5);
-   snprintf(path, 64, "%s%s", "/lib/firmware/", FW_CFG_NAME_T5);
+   csio_info(hw, "config file upgraded to %s\n", fw_cfg_file);
+   snprintf(path, 64, "%s%s", "/lib/firmware/", fw_cfg_file);
}
 
 leave:
@@ -1883,6 +1894,19 @@ static struct fw_info fw_info_array[] = {
.intfver_iscsi = FW_INTFVER(T5, ISCSI),
.intfver_fcoe = FW_INTFVER(T5, FCOE),
},
+   }, {
+   .chip = CHELSIO_T6,
+   .fs_name = FW_CFG_NAME_T6,
+   .fw_mod_name = FW_FNAME_T6,
+   .fw_hdr = {
+   .chip = FW_HDR_CHIP_T6,
+   .fw_ver = __cpu_to_be32(FW_VERSION(T6)),
+   .intfver_nic = FW_INTFVER(T6, NIC),
+   .intfver_vnic = FW_INTFVER(T6, VNIC),
+   .intfver_ri = FW_INTFVER(T6, RI),
+   .intfver_iscsi = FW_INTFVER(T6, ISCSI),
+   .intfver_fcoe = FW_INTFVER(T6, FCOE),
+   },
}
 };
 
@@ -1999,6 +2023,7 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
struct device *dev = _dev->dev ;
const u8 *fw_data = NULL;
unsigned int fw_size = 0;
+   const char *fw_bin_file;
 
/* This is the firmware whose headers the driver was compiled
 * against
@@ -2011,9 +2036,14 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
return -EINVAL;
}
 
-   if (request_firmware(, FW_FNAME_T5, dev) < 0) {
+   if (csio_is_t5(pci_dev->device & CSIO_HW_CHIP_MASK))
+   fw_bin_file = FW_FNAME_T5;
+   else
+   fw_bin_file = FW_FNAME_T6;
+
+   if (request_firmware(, fw_bin_file, dev) < 0) {
csio_err(hw, "could not find firmware image %s, err: %d\n",
-FW_FNAME_T5, ret);
+fw_bin_file, ret);
} else {
fw_data = fw->data;
fw_size = fw->size;
@@ -2238,9 +2268,14 @@ static void
 csio_hw_intr_enable(struct csio_hw *hw)
 {
uint16_t vec = (uint16_t)csio_get_mb_intr_idx(csio_hw_to_mbm(hw));
-   uint32_t pf = SOURCEPF_G(csio_rd_reg32(hw, PL_WHOAMI_A));
+   u32 pf = 0;
uint32_t pl = csio_rd_reg32(hw, PL_INT_ENABLE_A);
 
+   if (csio_is_t5(hw->pdev->device & CSIO_HW_CHIP_MASK))
+   pf = SOURCEPF_G(csio_rd_reg32(hw, PL_WHOAMI_A));
+   else
+   pf = T6_SOURCEPF_G(csio_rd_reg32(hw, PL_WHOAMI_A));

[PATCH] scsi: csiostor: fix use after free in csio_hw_use_fwconfig()

[Varun Prakash]

mbp pointer is passed to csio_hw_validate_caps() so call
mempool_free() after calling csio_hw_validate_caps().

Signed-off-by: Varun Prakash 
---
 drivers/scsi/csiostor/csio_hw.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 5ca4099..c6e1814 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -1780,7 +1780,6 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 
*fw_cfg_param)
goto bye;
}
 
-   mempool_free(mbp, hw->mb_mempool);
if (finicsum != cfcsum) {
csio_warn(hw,
  "Config File checksum mismatch: csum=%#x, computed=%#x\n",
@@ -1791,6 +1790,10 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 
*fw_cfg_param)
rv = csio_hw_validate_caps(hw, mbp);
if (rv != 0)
goto bye;
+
+   mempool_free(mbp, hw->mb_mempool);
+   mbp = NULL;
+
/*
 * Note that we're operating with parameters
 * not supplied by the driver, rather than from hard-wired
-- 
2.0.2

Re: [PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[Arnd Bergmann]

On Wed, May 17, 2017 at 3:37 PM, John Garry  wrote:
> On 17/05/2017 13:37, Arnd Bergmann wrote:

>> Since this uses the _DSD information that was introduced for compatibility
>> between device tree and ACPI based data, why not write the code so that
>> it can work for both?
>>
>> Ideally this should just look up the property for pci_dev->fwnode, but I'm
>> not entirely sure if this works the same way on ACPI and DT today.
>>
>
> Hi Arnd,
>
> There is no relation at all between the pci device and the ACPI DSDT, apart
> from the fact that the device node name is known by the driver, that being
> "SAS0". I am not 100% comfortable with this, as we are introducing some sort
> of device indexing in the driver.
>
> Please note that Cavium did something similar on their thunderx network
> driver:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?h=v4.12-rc1#n1162
>
> As for your suggestion, in theory it could be ok to have a pci_dev->fwnode,
> and this would work for Unified Device Properties Interface (if that is
> indeed what you mean). But how to create/match this fwnode?

pci_scan_device sets the dev->of_node field for DT based probing, we
could add a trivial patch to set the fwnode field as well if that isn't
already done elsewhere.

>From what I can tell, the ACPI code sets up a 'companion' device for
any PCI device that is listed in the ACPI tables, at least it refers to
that later on, but I could not figure out where it actually gets set.

Arnd

Re: [PATCH] ses: fix error message in ses_intf_add()

[Ewan D. Milne]

On Wed, 2017-05-17 at 15:00 +0200, Maurizio Lombardi wrote:
> The "result" variable contains a negative error code and
> should not be logged as an hex value.
> This fixes the following error message:
> 
> [  250.068869] scsi 8:0:2:254: Wrong diagnostic page; asked for 2 got 0
> [  250.068872] scsi 8:0:2:254: Failed to get diagnostic page 0xffea
> 
> Signed-off-by: Maurizio Lombardi 
> ---
>  drivers/scsi/ses.c | 21 +
>  1 file changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
> index f1cdf32..0ac45be 100644
> --- a/drivers/scsi/ses.c
> +++ b/drivers/scsi/ses.c
> @@ -604,6 +604,7 @@ static int ses_intf_add(struct device *cdev,
>   unsigned char *buf = NULL, *hdr_buf, *type_ptr;
>   struct ses_device *ses_dev;
>   u32 result;
> + int page;
>   int i, types, len, components = 0;
>   int err = -ENOMEM;
>   int num_enclosures;
> @@ -630,7 +631,8 @@ static int ses_intf_add(struct device *cdev,
>   if (!hdr_buf || !ses_dev)
>   goto err_init_free;
>  
> - result = ses_recv_diag(sdev, 1, hdr_buf, INIT_ALLOC_SIZE);
> + page = 1;
> + result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
>   if (result)
>   goto recv_failed;
>  
> @@ -639,7 +641,7 @@ static int ses_intf_add(struct device *cdev,
>   if (!buf)
>   goto err_free;
>  
> - result = ses_recv_diag(sdev, 1, buf, len);
> + result = ses_recv_diag(sdev, page, buf, len);
>   if (result)
>   goto recv_failed;
>  
> @@ -669,7 +671,8 @@ static int ses_intf_add(struct device *cdev,
>   ses_dev->page1_len = len;
>   buf = NULL;
>  
> - result = ses_recv_diag(sdev, 2, hdr_buf, INIT_ALLOC_SIZE);
> + page = 2;
> + result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
>   if (result)
>   goto recv_failed;
>  
> @@ -679,7 +682,7 @@ static int ses_intf_add(struct device *cdev,
>   goto err_free;
>  
>   /* make sure getting page 2 actually works */
> - result = ses_recv_diag(sdev, 2, buf, len);
> + result = ses_recv_diag(sdev, page, buf, len);
>   if (result)
>   goto recv_failed;
>   ses_dev->page2 = buf;
> @@ -688,7 +691,8 @@ static int ses_intf_add(struct device *cdev,
>  
>   /* The additional information page --- allows us
>* to match up the devices */
> - result = ses_recv_diag(sdev, 10, hdr_buf, INIT_ALLOC_SIZE);
> + page = 10;
> + result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
>   if (!result) {
>  
>   len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
> @@ -696,7 +700,7 @@ static int ses_intf_add(struct device *cdev,
>   if (!buf)
>   goto err_free;
>  
> - result = ses_recv_diag(sdev, 10, buf, len);
> + result = ses_recv_diag(sdev, page, buf, len);
>   if (result)
>   goto recv_failed;
>   ses_dev->page10 = buf;
> @@ -733,8 +737,9 @@ static int ses_intf_add(struct device *cdev,
>   return 0;
>  
>   recv_failed:
> - sdev_printk(KERN_ERR, sdev, "Failed to get diagnostic page 0x%x\n",
> - result);
> + sdev_printk(KERN_ERR, sdev,
> + "Failed to get diagnostic page %d with error %d\n",
> + page, result);
>   err = -ENODEV;
>   err_free:
>   kfree(buf);

This looks OK but I think we should consider suppressing these
messages.  There are a lot of devices that return page 0 instead of
the correct page, we should either say something like "enclosure
services not supported", or else work with what we get instead of
logging a message on every device probe that make it sound like
the device is failing.  I've received several complaints about this.

Reviewed-by: Ewan D. Milne 

Re: [PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[John Garry]

On 17/05/2017 13:37, Arnd Bergmann wrote:

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:

> For a pci-based controller, retrieve the SAS address from the
> ACPI tables.
>
> The retrieval is based on the ACPI device node name. Sample is
> as follows:
> Scope(_SB)
> {
> Device(SAS0) {
> Name(_HID, "HISI0163")
> Name (_DSD, Package () {
>   ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>   Package () {
> Package (2) {"sas-addr", Package() {0x50, 
0x01, 0x88, 0x20, 0x16, 00, 00, 0x00}},
>   }
>   })
> }
> }
>
> If the ACPI node or node property is not available, then we fall
> back on a default address.
>
> Signed-off-by: John Garry 

Since this uses the _DSD information that was introduced for compatibility
between device tree and ACPI based data, why not write the code so that
it can work for both?

Ideally this should just look up the property for pci_dev->fwnode, but I'm
not entirely sure if this works the same way on ACPI and DT today.



Hi Arnd,

There is no relation at all between the pci device and the ACPI DSDT, 
apart from the fact that the device node name is known by the driver, 
that being "SAS0". I am not 100% comfortable with this, as we are 
introducing some sort of device indexing in the driver.


Please note that Cavium did something similar on their thunderx network 
driver:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?h=v4.12-rc1#n1162

As for your suggestion, in theory it could be ok to have a 
pci_dev->fwnode, and this would work for Unified Device Properties 
Interface (if that is indeed what you mean). But how to create/match 
this fwnode?


Thanks,
John


 Arnd

Re: [PATCH 07/22] scsi: hisi_sas: add the initialisation for pci-based controller

[John Garry]

On 17/05/2017 13:33, Arnd Bergmann wrote:

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:

> Add the code to initialise controller which is based on pci device
> in hisi_sas_pci_init.c
>
> The main functionality added is for probing and initialisation of
> the controller based on pci device.
>
> The core controller routines are still in hisi_sas_main.c; some
> common initialisation functions and structures are also exported from
> hisi_sas_main.c for pci init.
>
> For platform device-based controller, controller properties - like
> phy count - were read from the firmware. For pci-based controller this
> information is hard-coded in the driver, in new struct hisi_sas_pci_hw.
>

Do you plan to add further PCI based front-ends besides the v3 driver
in the future? If not, you can save one level of indirection here and merge
pci_init.c into the v3 implementation.

 Arnd


Hi Arnd,

I think for now, any hw revisions will be very closely based on v3. And, 
for future revisions, the driver has been well abstracted so we can 
still support any updated features in another version of hisi_sas_hw in 
v3 driver.


I actually kept v3 driver and pci_init.c separate as initially I thought 
we could merge v2 and v3 driver eventually. But with different 
functionality, register format, interrupts, I am not 100% confident. Now 
my only concern is that layout differences between v1/2 and v3 driver, 
but this is not critical. Anyway, I think we can merge them for now.


Cheers,
John

[PATCH] ses: fix error message in ses_intf_add()

[Maurizio Lombardi]

The "result" variable contains a negative error code and
should not be logged as an hex value.
This fixes the following error message:

[  250.068869] scsi 8:0:2:254: Wrong diagnostic page; asked for 2 got 0
[  250.068872] scsi 8:0:2:254: Failed to get diagnostic page 0xffea

Signed-off-by: Maurizio Lombardi 
---
 drivers/scsi/ses.c | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index f1cdf32..0ac45be 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -604,6 +604,7 @@ static int ses_intf_add(struct device *cdev,
unsigned char *buf = NULL, *hdr_buf, *type_ptr;
struct ses_device *ses_dev;
u32 result;
+   int page;
int i, types, len, components = 0;
int err = -ENOMEM;
int num_enclosures;
@@ -630,7 +631,8 @@ static int ses_intf_add(struct device *cdev,
if (!hdr_buf || !ses_dev)
goto err_init_free;
 
-   result = ses_recv_diag(sdev, 1, hdr_buf, INIT_ALLOC_SIZE);
+   page = 1;
+   result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
if (result)
goto recv_failed;
 
@@ -639,7 +641,7 @@ static int ses_intf_add(struct device *cdev,
if (!buf)
goto err_free;
 
-   result = ses_recv_diag(sdev, 1, buf, len);
+   result = ses_recv_diag(sdev, page, buf, len);
if (result)
goto recv_failed;
 
@@ -669,7 +671,8 @@ static int ses_intf_add(struct device *cdev,
ses_dev->page1_len = len;
buf = NULL;
 
-   result = ses_recv_diag(sdev, 2, hdr_buf, INIT_ALLOC_SIZE);
+   page = 2;
+   result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
if (result)
goto recv_failed;
 
@@ -679,7 +682,7 @@ static int ses_intf_add(struct device *cdev,
goto err_free;
 
/* make sure getting page 2 actually works */
-   result = ses_recv_diag(sdev, 2, buf, len);
+   result = ses_recv_diag(sdev, page, buf, len);
if (result)
goto recv_failed;
ses_dev->page2 = buf;
@@ -688,7 +691,8 @@ static int ses_intf_add(struct device *cdev,
 
/* The additional information page --- allows us
 * to match up the devices */
-   result = ses_recv_diag(sdev, 10, hdr_buf, INIT_ALLOC_SIZE);
+   page = 10;
+   result = ses_recv_diag(sdev, page, hdr_buf, INIT_ALLOC_SIZE);
if (!result) {
 
len = (hdr_buf[2] << 8) + hdr_buf[3] + 4;
@@ -696,7 +700,7 @@ static int ses_intf_add(struct device *cdev,
if (!buf)
goto err_free;
 
-   result = ses_recv_diag(sdev, 10, buf, len);
+   result = ses_recv_diag(sdev, page, buf, len);
if (result)
goto recv_failed;
ses_dev->page10 = buf;
@@ -733,8 +737,9 @@ static int ses_intf_add(struct device *cdev,
return 0;
 
  recv_failed:
-   sdev_printk(KERN_ERR, sdev, "Failed to get diagnostic page 0x%x\n",
-   result);
+   sdev_printk(KERN_ERR, sdev,
+   "Failed to get diagnostic page %d with error %d\n",
+   page, result);
err = -ENODEV;
  err_free:
kfree(buf);
-- 
Maurizio Lombardi

Re: [PATCH 20/22] scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error

[John Garry]

On 17/05/2017 13:27, Arnd Bergmann wrote:

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:

> From: Xiang Chen 
>
> For ECC 1bit error, logic can recover it, so we only print a warning.
> For ECC multi-bit and AXI bus fatal error, we panic.
>
> Signed-off-by: John Garry 
> Signed-off-by: Xiang Chen 

This one is tricky as there are conflicting requirements:

- For debugging purposes, you want to continue running the system
  to figure out what exactly went wrong. Often enough, having the
  kernel panic means you don't get to see the panic message because
  console access is unavailable and you cannot log in any more

- For data consistency purposes you want to stop the system as
  soon as there is any uncorrectable data error

I see that most scsi drivers don't ever call panic or BUG(), though
you already do so for v1 and v2 hw.

Maybe the SCSI maintainers can provide some more guidance here.

  Arnd

.



Hi Arnd,

Actually latest code for v2 has been updated to do a controller reset, 
and not panic, for unrecoverable error:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c?h=v4.12-rc1#n2926

We never got around to implementing controller reset for v1 as this 
platform (hip05) is not used much anymore.


As for v3, we will change to to do same once controller reset is 
implemented. I should have added this to the commit log.


Thanks,
John

Re: [PATCH 00/22] hisi_sas: hip08 support

[Arnd Bergmann]

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:
> This patchset adds support for the HiSilicon SAS controller
> in the hip08 chipset.
>
> The key difference compared to earlier chipsets is that the
> controller is an integrated PCI endpoint in hip08.
> As such, the controller is a pci device (not a platform device,
> like v2 hw in hip07).
>
> The driver is refactored so it can support both platform and
> pci device-based controllers.
>
> File hisi_sas_pci_init.c is introduced for pci device probing
> and initialization. Common functionality is still in
> hisi_sas_main.c, along with platform device probing and
> initialization.
>
> New hw layer file hisi_sas_v3_hw.c is added for hip08
> controller support. HW revisions v2 and v3 are very similar,
> but it was decided to keep support in separate files for now.
>
> As for the patches, (ignoring #1 and #2) the first few
> reorganise some functions from v2 hw.c into main.c, as they
> are required for v3 hw. Then support is added for pci
> device-based controller in subsequent patches.
> And then hip08 support is added in the final patches.

Looks good overall, but I have some high-level comments
on a couple of patches. I'm sure we can resolve them all
easily.

  Arnd

Re: [PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[Arnd Bergmann]

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:
> For a pci-based controller, retrieve the SAS address from the
> ACPI tables.
>
> The retrieval is based on the ACPI device node name. Sample is
> as follows:
> Scope(_SB)
> {
> Device(SAS0) {
> Name(_HID, "HISI0163")
> Name (_DSD, Package () {
>   ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>   Package () {
> Package (2) {"sas-addr", Package() {0x50, 
> 0x01, 0x88, 0x20, 0x16, 00, 00, 0x00}},
>   }
>   })
> }
> }
>
> If the ACPI node or node property is not available, then we fall
> back on a default address.
>
> Signed-off-by: John Garry 

Since this uses the _DSD information that was introduced for compatibility
between device tree and ACPI based data, why not write the code so that
it can work for both?

Ideally this should just look up the property for pci_dev->fwnode, but I'm
not entirely sure if this works the same way on ACPI and DT today.

 Arnd

Re: [PATCH 07/22] scsi: hisi_sas: add the initialisation for pci-based controller

[Arnd Bergmann]

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:
> Add the code to initialise controller which is based on pci device
> in hisi_sas_pci_init.c
>
> The main functionality added is for probing and initialisation of
> the controller based on pci device.
>
> The core controller routines are still in hisi_sas_main.c; some
> common initialisation functions and structures are also exported from
> hisi_sas_main.c for pci init.
>
> For platform device-based controller, controller properties - like
> phy count - were read from the firmware. For pci-based controller this
> information is hard-coded in the driver, in new struct hisi_sas_pci_hw.
>

Do you plan to add further PCI based front-ends besides the v3 driver
in the future? If not, you can save one level of indirection here and merge
pci_init.c into the v3 implementation.

 Arnd

Re: [PATCH 20/22] scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error

[Arnd Bergmann]

On Wed, May 17, 2017 at 12:49 PM, John Garry  wrote:
> From: Xiang Chen 
>
> For ECC 1bit error, logic can recover it, so we only print a warning.
> For ECC multi-bit and AXI bus fatal error, we panic.
>
> Signed-off-by: John Garry 
> Signed-off-by: Xiang Chen 

This one is tricky as there are conflicting requirements:

- For debugging purposes, you want to continue running the system
  to figure out what exactly went wrong. Often enough, having the
  kernel panic means you don't get to see the panic message because
  console access is unavailable and you cannot log in any more

- For data consistency purposes you want to stop the system as
  soon as there is any uncorrectable data error

I see that most scsi drivers don't ever call panic or BUG(), though
you already do so for v1 and v2 hw.

Maybe the SCSI maintainers can provide some more guidance here.

  Arnd

[PATCH 02/22] scsi: hisi_sas: optimise the usage of hisi_hba.lock

[John Garry]

From: Xiang Chen 

Currently hisi_hba.lock is locked to deliver and receive a
command to/from any hw queue. This causes much
contention at high data-rates.

To boost performance, lock on a per queue basis for
sending and receiving commands to/from hw.

Certain critical regions still need to be locked in the delivery
and completion stages with hisi_hba.lock.

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  8 ++---
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 59 ++
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 23 +
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 30 -
 4 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 4e28f32..88f06be 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -102,8 +102,10 @@ struct hisi_sas_cq {
 
 struct hisi_sas_dq {
struct hisi_hba *hisi_hba;
+   spinlock_t lock;
int wr_point;
int id;
+   struct hisi_sas_slot*slot_prep;
 };
 
 struct hisi_sas_device {
@@ -154,9 +156,8 @@ struct hisi_sas_hw {
struct domain_device *device);
struct hisi_sas_device *(*alloc_dev)(struct domain_device *device);
void (*sl_notify)(struct hisi_hba *hisi_hba, int phy_no);
-   int (*get_free_slot)(struct hisi_hba *hisi_hba, u32 dev_id,
-   int *q, int *s);
-   void (*start_delivery)(struct hisi_hba *hisi_hba);
+   int (*get_free_slot)(struct hisi_hba *hisi_hba, struct hisi_sas_dq *dq);
+   void (*start_delivery)(struct hisi_sas_dq *dq);
int (*prep_ssp)(struct hisi_hba *hisi_hba,
struct hisi_sas_slot *slot, int is_tmf,
struct hisi_sas_tmf_task *tmf);
@@ -217,7 +218,6 @@ struct hisi_hba {
struct hisi_sas_port port[HISI_SAS_MAX_PHYS];
 
int queue_count;
-   struct hisi_sas_slot*slot_prep;
 
struct dma_pool *sge_page_pool;
struct hisi_sas_device  devices[HISI_SAS_MAX_DEVICES];
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 98535aa..c986618 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -179,10 +179,11 @@ static void hisi_sas_slot_abort(struct work_struct *work)
task->task_done(task);
 }
 
-static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba,
- int is_tmf, struct hisi_sas_tmf_task *tmf,
- int *pass)
+static int hisi_sas_task_prep(struct sas_task *task, struct hisi_sas_dq
+   *dq, int is_tmf, struct hisi_sas_tmf_task *tmf,
+   int *pass)
 {
+   struct hisi_hba *hisi_hba = dq->hisi_hba;
struct domain_device *device = task->dev;
struct hisi_sas_device *sas_dev = device->lldd_dev;
struct hisi_sas_port *port;
@@ -240,18 +241,24 @@ static int hisi_sas_task_prep(struct sas_task *task, 
struct hisi_hba *hisi_hba,
} else
n_elem = task->num_scatter;
 
+   spin_lock_irqsave(_hba->lock, flags);
if (hisi_hba->hw->slot_index_alloc)
rc = hisi_hba->hw->slot_index_alloc(hisi_hba, _idx,
device);
else
rc = hisi_sas_slot_index_alloc(hisi_hba, _idx);
-   if (rc)
+   if (rc) {
+   spin_unlock_irqrestore(_hba->lock, flags);
goto err_out;
-   rc = hisi_hba->hw->get_free_slot(hisi_hba, sas_dev->device_id,
-   _queue, _queue_slot);
+   }
+   spin_unlock_irqrestore(_hba->lock, flags);
+
+   rc = hisi_hba->hw->get_free_slot(hisi_hba, dq);
if (rc)
goto err_out_tag;
 
+   dlvry_queue = dq->id;
+   dlvry_queue_slot = dq->wr_point;
slot = _hba->slot_info[slot_idx];
memset(slot, 0, sizeof(struct hisi_sas_slot));
 
@@ -316,7 +323,7 @@ static int hisi_sas_task_prep(struct sas_task *task, struct 
hisi_hba *hisi_hba,
task->task_state_flags |= SAS_TASK_AT_INITIATOR;
spin_unlock_irqrestore(>task_state_lock, flags);
 
-   hisi_hba->slot_prep = slot;
+   dq->slot_prep = slot;
 
atomic64_inc(_dev->running_req);
++(*pass);
@@ -354,19 +361,23 @@ static int hisi_sas_task_exec(struct sas_task *task, 
gfp_t gfp_flags,
unsigned long flags;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(task->dev);
struct device *dev = _hba->pdev->dev;
+   struct domain_device *device = task->dev;
+   struct hisi_sas_device *sas_dev = device->lldd_dev;
+   int queue_id = sas_dev->device_id % hisi_hba->queue_count;
+   struct hisi_sas_dq *dq = _hba->dq[queue_id];
 

[PATCH 10/22] scsi: hisi_sas: add v3 hw init

[John Garry]

From: Xiang Chen 

Add code to initialise v3 hardware.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 275 +
 1 file changed, 275 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 68b9b0e..f2ea8c8 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -11,7 +11,282 @@
 #include "hisi_sas.h"
 #define DRV_NAME "hisi_sas_v3_hw"
 
+/* global registers need init*/
+#define DLVRY_QUEUE_ENABLE 0x0
+#define IOST_BASE_ADDR_LO  0x8
+#define IOST_BASE_ADDR_HI  0xc
+#define ITCT_BASE_ADDR_LO  0x10
+#define ITCT_BASE_ADDR_HI  0x14
+#define IO_BROKEN_MSG_ADDR_LO  0x18
+#define IO_BROKEN_MSG_ADDR_HI  0x1c
+#define AXI_AHB_CLK_CFG0x3c
+#define AXI_USER1  0x48
+#define AXI_USER2  0x4c
+#define IO_SATA_BROKEN_MSG_ADDR_LO 0x58
+#define IO_SATA_BROKEN_MSG_ADDR_HI 0x5c
+#define SATA_INITI_D2H_STORE_ADDR_LO   0x60
+#define SATA_INITI_D2H_STORE_ADDR_HI   0x64
+#define CFG_MAX_TAG0x68
+#define HGC_SAS_TX_OPEN_FAIL_RETRY_CTRL0x84
+#define HGC_SAS_TXFAIL_RETRY_CTRL  0x88
+#define HGC_GET_ITV_TIME   0x90
+#define DEVICE_MSG_WORK_MODE   0x94
+#define OPENA_WT_CONTI_TIME0x9c
+#define I_T_NEXUS_LOSS_TIME0xa0
+#define MAX_CON_TIME_LIMIT_TIME0xa4
+#define BUS_INACTIVE_LIMIT_TIME0xa8
+#define REJECT_TO_OPEN_LIMIT_TIME  0xac
+#define CFG_AGING_TIME 0xbc
+#define HGC_DFX_CFG2   0xc0
+#define CFG_ABT_SET_QUERY_IPTT 0xd4
+#define CFG_SET_ABORTED_IPTT_OFF   0
+#define CFG_SET_ABORTED_IPTT_MSK   (0xfff << CFG_SET_ABORTED_IPTT_OFF)
+#define CFG_1US_TIMER_TRSH 0xcc
+#define INT_COAL_EN0x19c
+#define OQ_INT_COAL_TIME   0x1a0
+#define OQ_INT_COAL_CNT0x1a4
+#define ENT_INT_COAL_TIME  0x1a8
+#define ENT_INT_COAL_CNT   0x1ac
+#define OQ_INT_SRC 0x1b0
+#define OQ_INT_SRC_MSK 0x1b4
+#define ENT_INT_SRC1   0x1b8
+#define ENT_INT_SRC1_D2H_FIS_CH0_OFF   0
+#define ENT_INT_SRC1_D2H_FIS_CH0_MSK   (0x1 << ENT_INT_SRC1_D2H_FIS_CH0_OFF)
+#define ENT_INT_SRC1_D2H_FIS_CH1_OFF   8
+#define ENT_INT_SRC1_D2H_FIS_CH1_MSK   (0x1 << ENT_INT_SRC1_D2H_FIS_CH1_OFF)
+#define ENT_INT_SRC2   0x1bc
+#define ENT_INT_SRC3   0x1c0
+#define ENT_INT_SRC3_WP_DEPTH_OFF  8
+#define ENT_INT_SRC3_IPTT_SLOT_NOMATCH_OFF 9
+#define ENT_INT_SRC3_RP_DEPTH_OFF  10
+#define ENT_INT_SRC3_AXI_OFF   11
+#define ENT_INT_SRC3_FIFO_OFF  12
+#define ENT_INT_SRC3_LM_OFF14
+#define ENT_INT_SRC3_ITC_INT_OFF   15
+#define ENT_INT_SRC3_ITC_INT_MSK   (0x1 << ENT_INT_SRC3_ITC_INT_OFF)
+#define ENT_INT_SRC3_ABT_OFF   16
+#define ENT_INT_SRC_MSK1   0x1c4
+#define ENT_INT_SRC_MSK2   0x1c8
+#define ENT_INT_SRC_MSK3   0x1cc
+#define CHNL_PHYUPDOWN_INT_MSK 0x1d0
+#define CHNL_ENT_INT_MSK   0x1d4
+#define HGC_COM_INT_MSK0x1d8
+#define SAS_ECC_INTR   0x1e8
+#define SAS_ECC_INTR_MSK   0x1ec
+#define HGC_ERR_STAT_EN0x238
+#define DLVRY_Q_0_BASE_ADDR_LO 0x260
+#define DLVRY_Q_0_BASE_ADDR_HI 0x264
+#define DLVRY_Q_0_DEPTH0x268
+#define DLVRY_Q_0_WR_PTR   0x26c
+#define DLVRY_Q_0_RD_PTR   0x270
+#define HYPER_STREAM_ID_EN_CFG 0xc80
+#define OQ0_INT_SRC_MSK0xc90
+#define COMPL_Q_0_BASE_ADDR_LO 0x4e0
+#define COMPL_Q_0_BASE_ADDR_HI 0x4e4
+#define COMPL_Q_0_DEPTH0x4e8
+#define COMPL_Q_0_WR_PTR   0x4ec
+#define COMPL_Q_0_RD_PTR   0x4f0
+#define AWQOS_AWCACHE_CFG  0xc84
+#define ARQOS_ARCACHE_CFG  0xc88
+
+/* phy registers requiring init */
+#define PORT_BASE  (0x2000)
+#define PROG_PHY_LINK_RATE (PORT_BASE + 0x8)
+#define PHY_CTRL   (PORT_BASE + 0x14)
+#define PHY_CTRL_RESET_OFF 0
+#define PHY_CTRL_RESET_MSK (0x1 << PHY_CTRL_RESET_OFF)
+#define SL_CFG (PORT_BASE + 0x84)
+#define RXOP_CHECK_CFG_H   (PORT_BASE + 0xfc)
+#define SAS_SSP_CON_TIMER_CFG  (PORT_BASE + 0x134)
+#define SAS_SMP_CON_TIMER_CFG  (PORT_BASE + 0x138)
+#define SAS_STP_CON_TIMER_CFG  (PORT_BASE + 0x13c)
+#define CHL_INT0   (PORT_BASE + 0x1b4)
+#define 

[PATCH 05/22] scsi: hisi_sas: relocate get_ncq_tag_v2_hw()

[John Garry]

From: Xiang Chen 

Relocate get_ncq_tag_v2_hw() to a common location, as
future hw versions will require it.
Also rename with "hisi_sas_" prefix for consistency.

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  1 +
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 15 +++
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 16 +---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index d0c0844..210daec 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -359,6 +359,7 @@ struct hisi_sas_command_table_ssp {
 extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
 extern void hisi_sas_sata_done(struct sas_task *task,
struct hisi_sas_slot *slot);
+extern int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag);
 extern int hisi_sas_probe(struct platform_device *pdev,
  const struct hisi_sas_hw *ops);
 extern int hisi_sas_remove(struct platform_device *pdev);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 335f3ba4..12fece3 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -103,6 +103,21 @@ void hisi_sas_sata_done(struct sas_task *task,
 }
 EXPORT_SYMBOL_GPL(hisi_sas_sata_done);
 
+int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag)
+{
+   struct ata_queued_cmd *qc = task->uldd_task;
+
+   if (qc) {
+   if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
+   qc->tf.command == ATA_CMD_FPDMA_READ) {
+   *tag = qc->tag;
+   return 1;
+   }
+   }
+   return 0;
+}
+EXPORT_SYMBOL_GPL(hisi_sas_get_ncq_tag);
+
 static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
 {
return device->port->ha->lldd_ha;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 51140dc..e64047c 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2328,20 +2328,6 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
return sts;
 }
 
-static int get_ncq_tag_v2_hw(struct sas_task *task, u32 *tag)
-{
-   struct ata_queued_cmd *qc = task->uldd_task;
-
-   if (qc) {
-   if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
-   qc->tf.command == ATA_CMD_FPDMA_READ) {
-   *tag = qc->tag;
-   return 1;
-   }
-   }
-   return 0;
-}
-
 static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
  struct hisi_sas_slot *slot)
 {
@@ -2389,7 +2375,7 @@ static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
hdr->dw1 = cpu_to_le32(dw1);
 
/* dw2 */
-   if (task->ata_task.use_ncq && get_ncq_tag_v2_hw(task, _tag)) {
+   if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, _tag)) {
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;
}
-- 
1.9.1

[PATCH 17/22] scsi: hisi_sas: add v3 code for itct setup and free

[John Garry]

From: Xiang Chen 

Add code for itct setup and free for v3 hw.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 115 +
 1 file changed, 115 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 976c6e6..cbc2640 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -24,6 +24,11 @@
 #define PHY_PORT_NUM_MA0x28
 #define PHY_CONN_RATE  0x30
 #define AXI_AHB_CLK_CFG0x3c
+#define ITCT_CLR   0x44
+#define ITCT_CLR_EN_OFF16
+#define ITCT_CLR_EN_MSK(0x1 << ITCT_CLR_EN_OFF)
+#define ITCT_DEV_OFF   0
+#define ITCT_DEV_MSK   (0x7ff << ITCT_DEV_OFF)
 #define AXI_USER1  0x48
 #define AXI_USER2  0x4c
 #define IO_SATA_BROKEN_MSG_ADDR_LO 0x58
@@ -226,6 +231,27 @@
 #define CMPLT_HDR_IO_IN_TARGET_OFF 17
 #define CMPLT_HDR_IO_IN_TARGET_MSK (0x1 << CMPLT_HDR_IO_IN_TARGET_OFF)
 
+/* ITCT header */
+/* qw0 */
+#define ITCT_HDR_DEV_TYPE_OFF  0
+#define ITCT_HDR_DEV_TYPE_MSK  (0x3 << ITCT_HDR_DEV_TYPE_OFF)
+#define ITCT_HDR_VALID_OFF 2
+#define ITCT_HDR_VALID_MSK (0x1 << ITCT_HDR_VALID_OFF)
+#define ITCT_HDR_MCR_OFF   5
+#define ITCT_HDR_MCR_MSK   (0xf << ITCT_HDR_MCR_OFF)
+#define ITCT_HDR_VLN_OFF   9
+#define ITCT_HDR_VLN_MSK   (0xf << ITCT_HDR_VLN_OFF)
+#define ITCT_HDR_SMP_TIMEOUT_OFF   16
+#define ITCT_HDR_AWT_CONTINUE_OFF  25
+#define ITCT_HDR_PORT_ID_OFF   28
+#define ITCT_HDR_PORT_ID_MSK   (0xf << ITCT_HDR_PORT_ID_OFF)
+/* qw2 */
+#define ITCT_HDR_INLT_OFF  0
+#define ITCT_HDR_INLT_MSK  (0xULL << ITCT_HDR_INLT_OFF)
+#define ITCT_HDR_RTOLT_OFF 48
+#define ITCT_HDR_RTOLT_MSK (0xULL << ITCT_HDR_RTOLT_OFF)
+
+
 struct hisi_sas_complete_v3_hdr {
__le32 dw0;
__le32 dw1;
@@ -444,6 +470,93 @@ static void config_id_frame_v3_hw(struct hisi_hba 
*hisi_hba, int phy_no)
__swab32(identify_buffer[5]));
 }
 
+static void setup_itct_v3_hw(struct hisi_hba *hisi_hba,
+struct hisi_sas_device *sas_dev)
+{
+   struct domain_device *device = sas_dev->sas_device;
+   struct device *dev = hisi_hba->dev;
+   u64 qw0, device_id = sas_dev->device_id;
+   struct hisi_sas_itct *itct = _hba->itct[device_id];
+   struct domain_device *parent_dev = device->parent;
+   struct asd_sas_port *sas_port = device->port;
+   struct hisi_sas_port *port = to_hisi_sas_port(sas_port);
+
+   memset(itct, 0, sizeof(*itct));
+
+   /* qw0 */
+   qw0 = 0;
+   switch (sas_dev->dev_type) {
+   case SAS_END_DEVICE:
+   case SAS_EDGE_EXPANDER_DEVICE:
+   case SAS_FANOUT_EXPANDER_DEVICE:
+   qw0 = HISI_SAS_DEV_TYPE_SSP << ITCT_HDR_DEV_TYPE_OFF;
+   break;
+   case SAS_SATA_DEV:
+   case SAS_SATA_PENDING:
+   if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))
+   qw0 = HISI_SAS_DEV_TYPE_STP << ITCT_HDR_DEV_TYPE_OFF;
+   else
+   qw0 = HISI_SAS_DEV_TYPE_SATA << ITCT_HDR_DEV_TYPE_OFF;
+   break;
+   default:
+   dev_warn(dev, "setup itct: unsupported dev type (%d)\n",
+sas_dev->dev_type);
+   }
+
+   qw0 |= ((1 << ITCT_HDR_VALID_OFF) |
+   (device->linkrate << ITCT_HDR_MCR_OFF) |
+   (1 << ITCT_HDR_VLN_OFF) |
+   (0xfa << ITCT_HDR_SMP_TIMEOUT_OFF) |
+   (1 << ITCT_HDR_AWT_CONTINUE_OFF) |
+   (port->id << ITCT_HDR_PORT_ID_OFF));
+   itct->qw0 = cpu_to_le64(qw0);
+
+   /* qw1 */
+   memcpy(>sas_addr, device->sas_addr, SAS_ADDR_SIZE);
+   itct->sas_addr = __swab64(itct->sas_addr);
+
+   /* qw2 */
+   if (!dev_is_sata(device))
+   itct->qw2 = cpu_to_le64((5000ULL << ITCT_HDR_INLT_OFF) |
+   (0x1ULL << ITCT_HDR_RTOLT_OFF));
+}
+
+static void free_device_v3_hw(struct hisi_hba *hisi_hba,
+ struct hisi_sas_device *sas_dev)
+{
+   u64 dev_id = sas_dev->device_id;
+   struct device *dev = hisi_hba->dev;
+   struct hisi_sas_itct *itct = _hba->itct[dev_id];
+   u32 reg_val = hisi_sas_read32(hisi_hba, ENT_INT_SRC3);
+
+   /* clear the itct interrupt state */
+   if (ENT_INT_SRC3_ITC_INT_MSK & reg_val)
+   hisi_sas_write32(hisi_hba, ENT_INT_SRC3,
+ENT_INT_SRC3_ITC_INT_MSK);
+
+   /* clear the itct table*/
+   reg_val = 

[PATCH 11/22] scsi: hisi_sas: add v3 hw PHY init

[John Garry]

From: Xiang Chen 

Add code to configure PHYs for v3 hw.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 126 +
 1 file changed, 126 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index f2ea8c8..ea18582 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -19,6 +19,10 @@
 #define ITCT_BASE_ADDR_HI  0x14
 #define IO_BROKEN_MSG_ADDR_LO  0x18
 #define IO_BROKEN_MSG_ADDR_HI  0x1c
+#define PHY_CONTEXT0x20
+#define PHY_STATE  0x24
+#define PHY_PORT_NUM_MA0x28
+#define PHY_CONN_RATE  0x30
 #define AXI_AHB_CLK_CFG0x3c
 #define AXI_USER1  0x48
 #define AXI_USER2  0x4c
@@ -42,6 +46,7 @@
 #define CFG_SET_ABORTED_IPTT_OFF   0
 #define CFG_SET_ABORTED_IPTT_MSK   (0xfff << CFG_SET_ABORTED_IPTT_OFF)
 #define CFG_1US_TIMER_TRSH 0xcc
+#define CHNL_INT_STATUS0x148
 #define INT_COAL_EN0x19c
 #define OQ_INT_COAL_TIME   0x1a0
 #define OQ_INT_COAL_CNT0x1a4
@@ -68,9 +73,11 @@
 #define ENT_INT_SRC_MSK1   0x1c4
 #define ENT_INT_SRC_MSK2   0x1c8
 #define ENT_INT_SRC_MSK3   0x1cc
+#define ENT_INT_SRC_MSK3_ENT95_MSK_OFF 31
 #define CHNL_PHYUPDOWN_INT_MSK 0x1d0
 #define CHNL_ENT_INT_MSK   0x1d4
 #define HGC_COM_INT_MSK0x1d8
+#define ENT_INT_SRC_MSK3_ENT95_MSK_MSK (0x1 << ENT_INT_SRC_MSK3_ENT95_MSK_OFF)
 #define SAS_ECC_INTR   0x1e8
 #define SAS_ECC_INTR_MSK   0x1ec
 #define HGC_ERR_STAT_EN0x238
@@ -91,11 +98,33 @@
 
 /* phy registers requiring init */
 #define PORT_BASE  (0x2000)
+#define PHY_CFG(PORT_BASE + 0x0)
+#define HARD_PHY_LINKRATE  (PORT_BASE + 0x4)
+#define PHY_CFG_ENA_OFF0
+#define PHY_CFG_ENA_MSK(0x1 << PHY_CFG_ENA_OFF)
+#define PHY_CFG_DC_OPT_OFF 2
+#define PHY_CFG_DC_OPT_MSK (0x1 << PHY_CFG_DC_OPT_OFF)
 #define PROG_PHY_LINK_RATE (PORT_BASE + 0x8)
 #define PHY_CTRL   (PORT_BASE + 0x14)
 #define PHY_CTRL_RESET_OFF 0
 #define PHY_CTRL_RESET_MSK (0x1 << PHY_CTRL_RESET_OFF)
 #define SL_CFG (PORT_BASE + 0x84)
+#define SL_CONTROL (PORT_BASE + 0x94)
+#define SL_CONTROL_NOTIFY_EN_OFF   0
+#define SL_CONTROL_NOTIFY_EN_MSK   (0x1 << SL_CONTROL_NOTIFY_EN_OFF)
+#define SL_CTA_OFF 17
+#define SL_CTA_MSK (0x1 << SL_CTA_OFF)
+#define TX_ID_DWORD0   (PORT_BASE + 0x9c)
+#define TX_ID_DWORD1   (PORT_BASE + 0xa0)
+#define TX_ID_DWORD2   (PORT_BASE + 0xa4)
+#define TX_ID_DWORD3   (PORT_BASE + 0xa8)
+#define TX_ID_DWORD4   (PORT_BASE + 0xaC)
+#define TX_ID_DWORD5   (PORT_BASE + 0xb0)
+#define TX_ID_DWORD6   (PORT_BASE + 0xb4)
+#define TXID_AUTO  (PORT_BASE + 0xb8)
+#define CT3_OFF1
+#define CT3_MSK(0x1 << CT3_OFF)
+#define RX_IDAF_DWORD0 (PORT_BASE + 0xc4)
 #define RXOP_CHECK_CFG_H   (PORT_BASE + 0xfc)
 #define SAS_SSP_CON_TIMER_CFG  (PORT_BASE + 0x134)
 #define SAS_SMP_CON_TIMER_CFG  (PORT_BASE + 0x138)
@@ -135,6 +164,13 @@ struct hisi_sas_complete_v3_hdr {
 };
 
 #define HISI_SAS_COMMAND_ENTRIES_V3_HW 4096
+#define HISI_SAS_MSI_COUNT_V3_HW 32
+
+enum {
+   HISI_SAS_PHY_PHY_UPDOWN,
+   HISI_SAS_PHY_CHNL_INT,
+   HISI_SAS_PHY_INT_NR
+};
 
 static void hisi_sas_write32(struct hisi_hba *hisi_hba, u32 off, u32 val)
 {
@@ -151,6 +187,14 @@ static void hisi_sas_phy_write32(struct hisi_hba 
*hisi_hba, int phy_no,
writel(val, regs);
 }
 
+static u32 hisi_sas_phy_read32(struct hisi_hba *hisi_hba,
+ int phy_no, u32 off)
+{
+   void __iomem *regs = hisi_hba->regs + (0x400 * phy_no) + off;
+
+   return readl(regs);
+}
+
 static void init_reg_v3_hw(struct hisi_hba *hisi_hba)
 {
int i;
@@ -265,6 +309,45 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)
 upper_32_bits(hisi_hba->initial_fis_dma));
 }
 
+static void config_phy_opt_mode_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+   u32 cfg = hisi_sas_phy_read32(hisi_hba, phy_no, PHY_CFG);
+
+   cfg &= ~PHY_CFG_DC_OPT_MSK;
+   cfg |= 1 << PHY_CFG_DC_OPT_OFF;
+   hisi_sas_phy_write32(hisi_hba, phy_no, PHY_CFG, cfg);
+}
+
+static void 

[PATCH 08/22] scsi: hisi_sas: add bare v3 hw driver

[John Garry]

Add new file hisi_sas_v3_hw.c for hip08 support.

The controller design is quite similar to v2 hw in hip07.

However key differences include:
-All v2 hw bugs are fixed (hopefully), so workarounds are not
required
-support for device deregistration
-some interrupt modifications
-configurable max device support

Not yet supported:
- controller reset

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/Makefile |  1 +
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 57 ++
 2 files changed, 58 insertions(+)
 create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

diff --git a/drivers/scsi/hisi_sas/Makefile b/drivers/scsi/hisi_sas/Makefile
index 3a036a8..54774a4 100644
--- a/drivers/scsi/hisi_sas/Makefile
+++ b/drivers/scsi/hisi_sas/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_SCSI_HISI_SAS)+= hisi_sas_main.o
 obj-$(CONFIG_SCSI_HISI_SAS)+= hisi_sas_v1_hw.o hisi_sas_v2_hw.o
 obj-$(CONFIG_SCSI_HISI_SAS_PCI)+= hisi_sas_pci_init.o
+obj-$(CONFIG_SCSI_HISI_SAS_PCI)+= hisi_sas_v3_hw.o
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
new file mode 100644
index 000..80707f6
--- /dev/null
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017 Hisilicon Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include "hisi_sas.h"
+#define DRV_NAME "hisi_sas_v3_hw"
+
+static const struct hisi_sas_hw hisi_sas_v3_hw = {
+};
+
+enum {
+   /* instances of the controller */
+   hip08,
+};
+
+static const struct hisi_sas_pci_hw hisi_sas_pci_hw_info[] = {
+   [hip08] = {8, 16, _sas_v3_hw},
+};
+
+static const struct pci_device_id sas_v3_pci_table[] = {
+   { PCI_VDEVICE(HUAWEI, 0xa230), hip08},
+   {}
+};
+
+static int
+hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+   const struct hisi_sas_pci_hw *hw;
+
+   hw = _sas_pci_hw_info[ent->driver_data];
+   return hisi_sas_pci_probe(pdev, hw);
+}
+
+static void hisi_sas_v3_remove(struct pci_dev *pdev)
+{
+   hisi_sas_pci_remove(pdev);
+}
+
+static struct pci_driver sas_v3_pci_driver = {
+   .name   = DRV_NAME,
+   .id_table   = sas_v3_pci_table,
+   .probe  = hisi_sas_v3_probe,
+   .remove = hisi_sas_v3_remove,
+};
+
+module_pci_driver(sas_v3_pci_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("John Garry ");
+MODULE_DESCRIPTION("HISILICON SAS controller v3 hw driver");
+MODULE_ALIAS("platform:" DRV_NAME);
-- 
1.9.1

[PATCH 15/22] scsi: hisi_sas: add v3 code to send SMP frame

[John Garry]

From: Xiang Chen 

Add code to prepare SMP frame.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 74 ++
 1 file changed, 74 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 77616ff..396bb4c 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -186,6 +186,9 @@
 #define CMD_HDR_MRFL_MSK   (0x1ff << CMD_HDR_MRFL_OFF)
 #define CMD_HDR_SG_MOD_OFF 24
 #define CMD_HDR_SG_MOD_MSK (0x3 << CMD_HDR_SG_MOD_OFF)
+/* dw3 */
+#define CMD_HDR_IPTT_OFF   0
+#define CMD_HDR_IPTT_MSK   (0x << CMD_HDR_IPTT_OFF)
 /* dw6 */
 #define CMD_HDR_DIF_SGL_LEN_OFF0
 #define CMD_HDR_DIF_SGL_LEN_MSK(0x << 
CMD_HDR_DIF_SGL_LEN_OFF)
@@ -636,6 +639,76 @@ static int prep_ssp_v3_hw(struct hisi_hba *hisi_hba,
return 0;
 }
 
+static int prep_smp_v3_hw(struct hisi_hba *hisi_hba,
+ struct hisi_sas_slot *slot)
+{
+   struct sas_task *task = slot->task;
+   struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;
+   struct domain_device *device = task->dev;
+   struct device *dev = hisi_hba->dev;
+   struct hisi_sas_port *port = slot->port;
+   struct scatterlist *sg_req, *sg_resp;
+   struct hisi_sas_device *sas_dev = device->lldd_dev;
+   dma_addr_t req_dma_addr;
+   unsigned int req_len, resp_len;
+   int elem, rc;
+
+   /*
+* DMA-map SMP request, response buffers
+*/
+   /* req */
+   sg_req = >smp_task.smp_req;
+   elem = dma_map_sg(dev, sg_req, 1, DMA_TO_DEVICE);
+   if (!elem)
+   return -ENOMEM;
+   req_len = sg_dma_len(sg_req);
+   req_dma_addr = sg_dma_address(sg_req);
+
+   /* resp */
+   sg_resp = >smp_task.smp_resp;
+   elem = dma_map_sg(dev, sg_resp, 1, DMA_FROM_DEVICE);
+   if (!elem) {
+   rc = -ENOMEM;
+   goto err_out_req;
+   }
+   resp_len = sg_dma_len(sg_resp);
+   if ((req_len & 0x3) || (resp_len & 0x3)) {
+   rc = -EINVAL;
+   goto err_out_resp;
+   }
+
+   /* create header */
+   /* dw0 */
+   hdr->dw0 = cpu_to_le32((port->id << CMD_HDR_PORT_OFF) |
+  (1 << CMD_HDR_PRIORITY_OFF) | /* high pri */
+  (2 << CMD_HDR_CMD_OFF)); /* smp */
+
+   /* map itct entry */
+   hdr->dw1 = cpu_to_le32((sas_dev->device_id << CMD_HDR_DEV_ID_OFF) |
+  (1 << CMD_HDR_FRAME_TYPE_OFF) |
+  (DIR_NO_DATA << CMD_HDR_DIR_OFF));
+
+   /* dw2 */
+   hdr->dw2 = cpu_to_le32req_len - 4) / 4) << CMD_HDR_CFL_OFF) |
+  (HISI_SAS_MAX_SMP_RESP_SZ / 4 <<
+  CMD_HDR_MRFL_OFF));
+
+   hdr->transfer_tags = cpu_to_le32(slot->idx << CMD_HDR_IPTT_OFF);
+
+   hdr->cmd_table_addr = cpu_to_le64(req_dma_addr);
+   hdr->sts_buffer_addr = cpu_to_le64(slot->status_buffer_dma);
+
+   return 0;
+
+err_out_resp:
+   dma_unmap_sg(dev, >task->smp_task.smp_resp, 1,
+DMA_FROM_DEVICE);
+err_out_req:
+   dma_unmap_sg(dev, >task->smp_task.smp_req, 1,
+DMA_TO_DEVICE);
+   return rc;
+}
+
 static int phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
 {
int i, res = 0;
@@ -1231,6 +1304,7 @@ static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
.sl_notify = sl_notify_v3_hw,
.complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr),
.prep_ssp = prep_ssp_v3_hw,
+   .prep_smp = prep_smp_v3_hw,
.get_free_slot = get_free_slot_v3_hw,
.start_delivery = start_delivery_v3_hw,
.slot_complete = slot_complete_v3_hw,
-- 
1.9.1

[PATCH 14/22] scsi: hisi_sas: add v3 code to send SSP frame

[John Garry]

From: Xiang Chen 

Add code to prepare SSP frame and deliver it to hardware.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 209 +
 1 file changed, 209 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index b33781b..77616ff 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -157,6 +157,41 @@
 #define SL_RX_BCAST_CHK_MSK(PORT_BASE + 0x2c0)
 #define PHYCTRL_OOB_RESTART_MSK(PORT_BASE + 0x2c4)
 
+/* HW dma structures */
+/* Delivery queue header */
+/* dw0 */
+#define CMD_HDR_RESP_REPORT_OFF5
+#define CMD_HDR_RESP_REPORT_MSK(0x1 << CMD_HDR_RESP_REPORT_OFF)
+#define CMD_HDR_TLR_CTRL_OFF   6
+#define CMD_HDR_TLR_CTRL_MSK   (0x3 << CMD_HDR_TLR_CTRL_OFF)
+#define CMD_HDR_PORT_OFF   18
+#define CMD_HDR_PORT_MSK   (0xf << CMD_HDR_PORT_OFF)
+#define CMD_HDR_PRIORITY_OFF   27
+#define CMD_HDR_PRIORITY_MSK   (0x1 << CMD_HDR_PRIORITY_OFF)
+#define CMD_HDR_CMD_OFF29
+#define CMD_HDR_CMD_MSK(0x7 << CMD_HDR_CMD_OFF)
+/* dw1 */
+#define CMD_HDR_DIR_OFF5
+#define CMD_HDR_DIR_MSK(0x3 << CMD_HDR_DIR_OFF)
+#define CMD_HDR_VDTL_OFF   10
+#define CMD_HDR_VDTL_MSK   (0x1 << CMD_HDR_VDTL_OFF)
+#define CMD_HDR_FRAME_TYPE_OFF 11
+#define CMD_HDR_FRAME_TYPE_MSK (0x1f << CMD_HDR_FRAME_TYPE_OFF)
+#define CMD_HDR_DEV_ID_OFF 16
+#define CMD_HDR_DEV_ID_MSK (0x << CMD_HDR_DEV_ID_OFF)
+/* dw2 */
+#define CMD_HDR_CFL_OFF0
+#define CMD_HDR_CFL_MSK(0x1ff << CMD_HDR_CFL_OFF)
+#define CMD_HDR_MRFL_OFF   15
+#define CMD_HDR_MRFL_MSK   (0x1ff << CMD_HDR_MRFL_OFF)
+#define CMD_HDR_SG_MOD_OFF 24
+#define CMD_HDR_SG_MOD_MSK (0x3 << CMD_HDR_SG_MOD_OFF)
+/* dw6 */
+#define CMD_HDR_DIF_SGL_LEN_OFF0
+#define CMD_HDR_DIF_SGL_LEN_MSK(0x << 
CMD_HDR_DIF_SGL_LEN_OFF)
+#define CMD_HDR_DATA_SGL_LEN_OFF   16
+#define CMD_HDR_DATA_SGL_LEN_MSK   (0x << CMD_HDR_DATA_SGL_LEN_OFF)
+
 /* Completion header */
 /* dw0 */
 #define CMPLT_HDR_CMPLT_OFF0
@@ -201,6 +236,11 @@ enum {
HISI_SAS_PHY_INT_NR
 };
 
+#define DIR_NO_DATA 0
+#define DIR_TO_INI 1
+#define DIR_TO_DEVICE 2
+#define DIR_RESERVED 3
+
 static u32 hisi_sas_read32(struct hisi_hba *hisi_hba, u32 off)
 {
void __iomem *regs = hisi_hba->regs + off;
@@ -208,6 +248,13 @@ static u32 hisi_sas_read32(struct hisi_hba *hisi_hba, u32 
off)
return readl(regs);
 }
 
+static u32 hisi_sas_read32_relaxed(struct hisi_hba *hisi_hba, u32 off)
+{
+   void __iomem *regs = hisi_hba->regs + off;
+
+   return readl_relaxed(regs);
+}
+
 static void hisi_sas_write32(struct hisi_hba *hisi_hba, u32 off, u32 val)
 {
void __iomem *regs = hisi_hba->regs + off;
@@ -432,6 +479,163 @@ static void sl_notify_v3_hw(struct hisi_hba *hisi_hba, 
int phy_no)
hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control);
 }
 
+/**
+ * The callpath to this function and upto writing the write
+ * queue pointer should be safe from interruption.
+ */
+static int
+get_free_slot_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_dq *dq)
+{
+   struct device *dev = hisi_hba->dev;
+   int queue = dq->id;
+   u32 r, w;
+
+   w = dq->wr_point;
+   r = hisi_sas_read32_relaxed(hisi_hba,
+   DLVRY_Q_0_RD_PTR + (queue * 0x14));
+   if (r == (w+1) % HISI_SAS_QUEUE_SLOTS) {
+   dev_warn(dev, "full queue=%d r=%d w=%d\n\n",
+   queue, r, w);
+   return -EAGAIN;
+   }
+
+   return 0;
+}
+
+static void start_delivery_v3_hw(struct hisi_sas_dq *dq)
+{
+   struct hisi_hba *hisi_hba = dq->hisi_hba;
+   int dlvry_queue = dq->slot_prep->dlvry_queue;
+   int dlvry_queue_slot = dq->slot_prep->dlvry_queue_slot;
+
+   dq->wr_point = ++dlvry_queue_slot % HISI_SAS_QUEUE_SLOTS;
+   hisi_sas_write32(hisi_hba, DLVRY_Q_0_WR_PTR + (dlvry_queue * 0x14),
+dq->wr_point);
+}
+
+static int prep_prd_sge_v3_hw(struct hisi_hba *hisi_hba,
+ struct hisi_sas_slot *slot,
+ struct hisi_sas_cmd_hdr *hdr,
+ struct scatterlist *scatter,
+ int n_elem)
+{
+   struct device *dev = hisi_hba->dev;
+   struct scatterlist *sg;
+   int i;
+
+   if (n_elem > HISI_SAS_SGE_PAGE_CNT) {
+   dev_err(dev, "prd err: n_elem(%d) > HISI_SAS_SGE_PAGE_CNT",
+   n_elem);
+   

[PATCH 12/22] scsi: hisi_sas: add phy up/down/bcast and channel ISR

[John Garry]

From: Xiang Chen 

Add code to initialise interrupts and add some interrupt handlers.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 281 +
 1 file changed, 281 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index ea18582..f7872c5 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -172,6 +172,13 @@ enum {
HISI_SAS_PHY_INT_NR
 };
 
+static u32 hisi_sas_read32(struct hisi_hba *hisi_hba, u32 off)
+{
+   void __iomem *regs = hisi_hba->regs + off;
+
+   return readl(regs);
+}
+
 static void hisi_sas_write32(struct hisi_hba *hisi_hba, u32 off, u32 val)
 {
void __iomem *regs = hisi_hba->regs + off;
@@ -396,6 +403,276 @@ static void sl_notify_v3_hw(struct hisi_hba *hisi_hba, 
int phy_no)
hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control);
 }
 
+static int phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
+{
+   int i, res = 0;
+   u32 context, port_id, link_rate, hard_phy_linkrate;
+   struct hisi_sas_phy *phy = _hba->phy[phy_no];
+   struct asd_sas_phy *sas_phy = >sas_phy;
+   struct device *dev = hisi_hba->dev;
+
+   hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 1);
+
+   port_id = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);
+   port_id = (port_id >> (4 * phy_no)) & 0xf;
+   link_rate = hisi_sas_read32(hisi_hba, PHY_CONN_RATE);
+   link_rate = (link_rate >> (phy_no * 4)) & 0xf;
+
+   if (port_id == 0xf) {
+   dev_err(dev, "phyup: phy%d invalid portid\n", phy_no);
+   res = IRQ_NONE;
+   goto end;
+   }
+   sas_phy->linkrate = link_rate;
+   hard_phy_linkrate = hisi_sas_phy_read32(hisi_hba, phy_no,
+   HARD_PHY_LINKRATE);
+   phy->maximum_linkrate = hard_phy_linkrate & 0xf;
+   phy->minimum_linkrate = (hard_phy_linkrate >> 4) & 0xf;
+   phy->phy_type &= ~(PORT_TYPE_SAS | PORT_TYPE_SATA);
+
+   /* Check for SATA dev */
+   context = hisi_sas_read32(hisi_hba, PHY_CONTEXT);
+   if (context & (1 << phy_no)) {
+   struct hisi_sas_initial_fis *initial_fis;
+   struct dev_to_host_fis *fis;
+   u8 attached_sas_addr[SAS_ADDR_SIZE] = {0};
+
+   dev_info(dev, "phyup: phy%d link_rate=%d\n", phy_no, link_rate);
+   initial_fis = _hba->initial_fis[phy_no];
+   fis = _fis->fis;
+   sas_phy->oob_mode = SATA_OOB_MODE;
+   attached_sas_addr[0] = 0x50;
+   attached_sas_addr[7] = phy_no;
+   memcpy(sas_phy->attached_sas_addr,
+  attached_sas_addr,
+  SAS_ADDR_SIZE);
+   memcpy(sas_phy->frame_rcvd, fis,
+  sizeof(struct dev_to_host_fis));
+   phy->phy_type |= PORT_TYPE_SATA;
+   phy->identify.device_type = SAS_SATA_DEV;
+   phy->frame_rcvd_size = sizeof(struct dev_to_host_fis);
+   phy->identify.target_port_protocols = SAS_PROTOCOL_SATA;
+   } else {
+   u32 *frame_rcvd = (u32 *)sas_phy->frame_rcvd;
+   struct sas_identify_frame *id =
+   (struct sas_identify_frame *)frame_rcvd;
+
+   dev_info(dev, "phyup: phy%d link_rate=%d\n", phy_no, link_rate);
+   for (i = 0; i < 6; i++) {
+   u32 idaf = hisi_sas_phy_read32(hisi_hba, phy_no,
+  RX_IDAF_DWORD0 + (i * 4));
+   frame_rcvd[i] = __swab32(idaf);
+   }
+   sas_phy->oob_mode = SAS_OOB_MODE;
+   memcpy(sas_phy->attached_sas_addr,
+  >sas_addr,
+  SAS_ADDR_SIZE);
+   phy->phy_type |= PORT_TYPE_SAS;
+   phy->identify.device_type = id->dev_type;
+   phy->frame_rcvd_size = sizeof(struct sas_identify_frame);
+   if (phy->identify.device_type == SAS_END_DEVICE)
+   phy->identify.target_port_protocols =
+   SAS_PROTOCOL_SSP;
+   else if (phy->identify.device_type != SAS_PHY_UNUSED)
+   phy->identify.target_port_protocols =
+   SAS_PROTOCOL_SMP;
+   }
+
+   phy->port_id = port_id;
+   phy->phy_attached = 1;
+   queue_work(hisi_hba->wq, >phyup_ws);
+
+end:
+   hisi_sas_phy_write32(hisi_hba, phy_no, CHL_INT0,
+CHL_INT0_SL_PHY_ENABLE_MSK);
+   hisi_sas_phy_write32(hisi_hba, phy_no, PHYCTRL_PHY_ENA_MSK, 0);
+
+   return res;
+}
+
+static int phy_down_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
+{
+   int res = 0;
+   u32 phy_state, 

[PATCH 22/22] scsi: hisi_sas: modify internal abort dev flow for v3 hw

[John Garry]

From: Xiang Chen 

There is a change for abort dev for v3 hw: add registers to configure
unaborted iptt for a device, and then inform this to logic.

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  2 ++
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 15 +++
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 28 
 3 files changed, 45 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index c7d1144..757a134 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -181,6 +181,8 @@ struct hisi_sas_hw {
void (*free_device)(struct hisi_hba *hisi_hba,
struct hisi_sas_device *dev);
int (*get_wideport_bitmap)(struct hisi_hba *hisi_hba, int port_id);
+   void (*dereg_device)(struct hisi_hba *hisi_hba,
+   struct domain_device *device);
int (*soft_reset)(struct hisi_hba *hisi_hba);
int max_command_entries;
int complete_hdr_size;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 156b66b..80ffba4 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -760,6 +760,13 @@ static void hisi_sas_release_tasks(struct hisi_hba 
*hisi_hba)
}
 }
 
+static void hisi_sas_dereg_device(struct hisi_hba *hisi_hba,
+   struct domain_device *device)
+{
+   if (hisi_hba->hw->dereg_device)
+   hisi_hba->hw->dereg_device(hisi_hba, device);
+}
+
 static void hisi_sas_dev_gone(struct domain_device *device)
 {
struct hisi_sas_device *sas_dev = device->lldd_dev;
@@ -773,6 +780,8 @@ static void hisi_sas_dev_gone(struct domain_device *device)
hisi_sas_internal_task_abort(hisi_hba, device,
 HISI_SAS_INT_ABT_DEV, 0);
 
+   hisi_sas_dereg_device(hisi_hba, device);
+
hisi_hba->hw->free_device(hisi_hba, sas_dev);
device->lldd_dev = NULL;
memset(sas_dev, 0, sizeof(*sas_dev));
@@ -1104,6 +1113,7 @@ static int hisi_sas_abort_task(struct sas_task *task)
if (task->dev->dev_type == SAS_SATA_DEV) {
hisi_sas_internal_task_abort(hisi_hba, device,
 HISI_SAS_INT_ABT_DEV, 0);
+   hisi_sas_dereg_device(hisi_hba, device);
rc = hisi_sas_softreset_ata_disk(device);
}
} else if (task->task_proto & SAS_PROTOCOL_SMP) {
@@ -1170,6 +1180,10 @@ static int hisi_sas_I_T_nexus_reset(struct domain_device 
*device)
return TMF_RESP_FUNC_FAILED;
sas_dev->dev_status = HISI_SAS_DEV_NORMAL;
 
+   hisi_sas_internal_task_abort(hisi_hba, device,
+   HISI_SAS_INT_ABT_DEV, 0);
+   hisi_sas_dereg_device(hisi_hba, device);
+
rc = hisi_sas_debug_I_T_nexus_reset(device);
 
if (rc == TMF_RESP_FUNC_COMPLETE) {
@@ -1197,6 +1211,7 @@ static int hisi_sas_lu_reset(struct domain_device 
*device, u8 *lun)
  HISI_SAS_INT_ABT_DEV, 0);
if (rc == TMF_RESP_FUNC_FAILED)
goto out;
+   hisi_sas_dereg_device(hisi_hba, device);
 
phy = sas_get_local_phy(device);
 
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 766455a..54546cf 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -50,6 +50,10 @@
 #define CFG_ABT_SET_QUERY_IPTT 0xd4
 #define CFG_SET_ABORTED_IPTT_OFF   0
 #define CFG_SET_ABORTED_IPTT_MSK   (0xfff << CFG_SET_ABORTED_IPTT_OFF)
+#define CFG_SET_ABORTED_EN_OFF 12
+#define CFG_ABT_SET_IPTT_DONE  0xd8
+#define CFG_ABT_SET_IPTT_DONE_OFF  0
+#define HGC_IOMB_PROC1_STATUS  0x104
 #define CFG_1US_TIMER_TRSH 0xcc
 #define HGC_LM_DFX_STATUS2 0x128
 #define HGC_LM_DFX_STATUS2_IOSTLIST_OFF0
@@ -1997,6 +2001,29 @@ enum sas_linkrate phy_get_max_linkrate_v3_hw(void)
return SAS_LINK_RATE_12_0_GBPS;
 }
 
+static void dereg_device_v3_hw(struct hisi_hba *hisi_hba,
+   struct domain_device *device)
+{
+   struct hisi_sas_slot *slot, *slot2;
+   struct hisi_sas_device *sas_dev = device->lldd_dev;
+   u32 cfg_abt_set_query_iptt;
+
+   cfg_abt_set_query_iptt = hisi_sas_read32(hisi_hba,
+   CFG_ABT_SET_QUERY_IPTT);
+   list_for_each_entry_safe(slot, slot2, _dev->list, entry) {
+   cfg_abt_set_query_iptt &= ~CFG_SET_ABORTED_IPTT_MSK;
+   cfg_abt_set_query_iptt |= (1 << CFG_SET_ABORTED_EN_OFF) |
+   (slot->idx << CFG_SET_ABORTED_IPTT_OFF);
+   

[PATCH 18/22] scsi: hisi_sas: add v3 code to send internal abort command

[John Garry]

From: Xiang Chen 

Add code to prepare internal abort command.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index cbc2640..9d5047e 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -165,6 +165,10 @@
 /* HW dma structures */
 /* Delivery queue header */
 /* dw0 */
+#define CMD_HDR_ABORT_FLAG_OFF 0
+#define CMD_HDR_ABORT_FLAG_MSK (0x3 << CMD_HDR_ABORT_FLAG_OFF)
+#define CMD_HDR_ABORT_DEVICE_TYPE_OFF  2
+#define CMD_HDR_ABORT_DEVICE_TYPE_MSK  (0x1 << CMD_HDR_ABORT_DEVICE_TYPE_OFF)
 #define CMD_HDR_RESP_REPORT_OFF5
 #define CMD_HDR_RESP_REPORT_MSK(0x1 << CMD_HDR_RESP_REPORT_OFF)
 #define CMD_HDR_TLR_CTRL_OFF   6
@@ -204,6 +208,11 @@
 #define CMD_HDR_DIF_SGL_LEN_MSK(0x << 
CMD_HDR_DIF_SGL_LEN_OFF)
 #define CMD_HDR_DATA_SGL_LEN_OFF   16
 #define CMD_HDR_DATA_SGL_LEN_MSK   (0x << CMD_HDR_DATA_SGL_LEN_OFF)
+/* dw7 */
+#define CMD_HDR_ADDR_MODE_SEL_OFF  15
+#define CMD_HDR_ADDR_MODE_SEL_MSK  (1 << CMD_HDR_ADDR_MODE_SEL_OFF)
+#define CMD_HDR_ABORT_IPTT_OFF 16
+#define CMD_HDR_ABORT_IPTT_MSK (0x << CMD_HDR_ABORT_IPTT_OFF)
 
 /* Completion header */
 /* dw0 */
@@ -927,6 +936,34 @@ static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
return 0;
 }
 
+static int prep_abort_v3_hw(struct hisi_hba *hisi_hba,
+   struct hisi_sas_slot *slot,
+   int device_id, int abort_flag, int tag_to_abort)
+{
+   struct sas_task *task = slot->task;
+   struct domain_device *dev = task->dev;
+   struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;
+   struct hisi_sas_port *port = slot->port;
+
+   /* dw0 */
+   hdr->dw0 = cpu_to_le32((5 << CMD_HDR_CMD_OFF) | /*abort*/
+  (port->id << CMD_HDR_PORT_OFF) |
+  ((dev_is_sata(dev) ? 1:0)
+   << CMD_HDR_ABORT_DEVICE_TYPE_OFF) |
+   (abort_flag
+<< CMD_HDR_ABORT_FLAG_OFF));
+
+   /* dw1 */
+   hdr->dw1 = cpu_to_le32(device_id
+   << CMD_HDR_DEV_ID_OFF);
+
+   /* dw7 */
+   hdr->dw7 = cpu_to_le32(tag_to_abort << CMD_HDR_ABORT_IPTT_OFF);
+   hdr->transfer_tags = cpu_to_le32(slot->idx);
+
+   return 0;
+}
+
 static int phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)
 {
int i, res = 0;
@@ -1526,6 +1563,7 @@ static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
.prep_ssp = prep_ssp_v3_hw,
.prep_smp = prep_smp_v3_hw,
.prep_stp = prep_ata_v3_hw,
+   .prep_abort = prep_abort_v3_hw,
.get_free_slot = get_free_slot_v3_hw,
.start_delivery = start_delivery_v3_hw,
.slot_complete = slot_complete_v3_hw,
-- 
1.9.1

[PATCH 21/22] scsi: hisi_sas: add v3 code to fill some more hw function pointers

[John Garry]

From: Xiang Chen 

Add code to fill the interface of phy_hard_reset, phy_get_max_linkrate,
and phy enable/disable.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 39 ++
 1 file changed, 39 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 195276b..766455a 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -195,6 +195,8 @@
 #define TXID_AUTO  (PORT_BASE + 0xb8)
 #define CT3_OFF1
 #define CT3_MSK(0x1 << CT3_OFF)
+#define TX_HARDRST_OFF  2
+#define TX_HARDRST_MSK  (0x1 << TX_HARDRST_OFF)
 #define RX_IDAF_DWORD0 (PORT_BASE + 0xc4)
 #define RXOP_CHECK_CFG_H   (PORT_BASE + 0xfc)
 #define SAS_SSP_CON_TIMER_CFG  (PORT_BASE + 0x134)
@@ -648,6 +650,14 @@ static void enable_phy_v3_hw(struct hisi_hba *hisi_hba, 
int phy_no)
hisi_sas_phy_write32(hisi_hba, phy_no, PHY_CFG, cfg);
 }
 
+static void disable_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+   u32 cfg = hisi_sas_phy_read32(hisi_hba, phy_no, PHY_CFG);
+
+   cfg &= ~PHY_CFG_ENA_MSK;
+   hisi_sas_phy_write32(hisi_hba, phy_no, PHY_CFG, cfg);
+}
+
 static void start_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
 {
config_id_frame_v3_hw(hisi_hba, phy_no);
@@ -655,6 +665,11 @@ static void start_phy_v3_hw(struct hisi_hba *hisi_hba, int 
phy_no)
enable_phy_v3_hw(hisi_hba, phy_no);
 }
 
+static void stop_phy_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+   disable_phy_v3_hw(hisi_hba, phy_no);
+}
+
 static void start_phys_v3_hw(struct hisi_hba *hisi_hba)
 {
int i;
@@ -663,6 +678,22 @@ static void start_phys_v3_hw(struct hisi_hba *hisi_hba)
start_phy_v3_hw(hisi_hba, i);
 }
 
+static void phy_hard_reset_v3_hw(struct hisi_hba *hisi_hba, int phy_no)
+{
+   struct hisi_sas_phy *phy = _hba->phy[phy_no];
+   u32 txid_auto;
+
+   stop_phy_v3_hw(hisi_hba, phy_no);
+   if (phy->identify.device_type == SAS_END_DEVICE) {
+   txid_auto = hisi_sas_phy_read32(hisi_hba, phy_no, TXID_AUTO);
+   hisi_sas_phy_write32(hisi_hba, phy_no, TXID_AUTO,
+   txid_auto | TX_HARDRST_MSK);
+   }
+   msleep(100);
+   start_phy_v3_hw(hisi_hba, phy_no);
+}
+
+
 static void phys_init_v3_hw(struct hisi_hba *hisi_hba)
 {
start_phys_v3_hw(hisi_hba);
@@ -1961,6 +1992,10 @@ static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
return 0;
 }
 
+enum sas_linkrate phy_get_max_linkrate_v3_hw(void)
+{
+   return SAS_LINK_RATE_12_0_GBPS;
+}
 
 static const struct hisi_sas_hw hisi_sas_v3_hw = {
.hw_init = hisi_sas_v3_init,
@@ -1978,6 +2013,10 @@ static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
.start_delivery = start_delivery_v3_hw,
.slot_complete = slot_complete_v3_hw,
.phys_init = phys_init_v3_hw,
+   .phy_enable = enable_phy_v3_hw,
+   .phy_disable = disable_phy_v3_hw,
+   .phy_hard_reset = phy_hard_reset_v3_hw,
+   .phy_get_max_linkrate = phy_get_max_linkrate_v3_hw,
 };
 
 enum {
-- 
1.9.1

[PATCH 16/22] scsi: hisi_sas: add v3 code to send ATA frame

[John Garry]

From: Xiang Chen 

Add code to prepare ATA frame for v3 hw

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 106 +
 1 file changed, 106 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 396bb4c..976c6e6 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -171,8 +171,11 @@
 #define CMD_HDR_CMD_OFF29
 #define CMD_HDR_CMD_MSK(0x7 << CMD_HDR_CMD_OFF)
 /* dw1 */
+#define CMD_HDR_UNCON_CMD_OFF  3
 #define CMD_HDR_DIR_OFF5
 #define CMD_HDR_DIR_MSK(0x3 << CMD_HDR_DIR_OFF)
+#define CMD_HDR_RESET_OFF  7
+#define CMD_HDR_RESET_MSK  (0x1 << CMD_HDR_RESET_OFF)
 #define CMD_HDR_VDTL_OFF   10
 #define CMD_HDR_VDTL_MSK   (0x1 << CMD_HDR_VDTL_OFF)
 #define CMD_HDR_FRAME_TYPE_OFF 11
@@ -182,6 +185,8 @@
 /* dw2 */
 #define CMD_HDR_CFL_OFF0
 #define CMD_HDR_CFL_MSK(0x1ff << CMD_HDR_CFL_OFF)
+#define CMD_HDR_NCQ_TAG_OFF10
+#define CMD_HDR_NCQ_TAG_MSK(0x1f << CMD_HDR_NCQ_TAG_OFF)
 #define CMD_HDR_MRFL_OFF   15
 #define CMD_HDR_MRFL_MSK   (0x1ff << CMD_HDR_MRFL_OFF)
 #define CMD_HDR_SG_MOD_OFF 24
@@ -244,6 +249,11 @@ enum {
 #define DIR_TO_DEVICE 2
 #define DIR_RESERVED 3
 
+#define CMD_IS_UNCONSTRAINT(cmd) \
+   ((cmd == ATA_CMD_READ_LOG_EXT) || \
+   (cmd == ATA_CMD_READ_LOG_DMA_EXT) || \
+   (cmd == ATA_CMD_DEV_RESET))
+
 static u32 hisi_sas_read32(struct hisi_hba *hisi_hba, u32 off)
 {
void __iomem *regs = hisi_hba->regs + off;
@@ -709,6 +719,101 @@ static int prep_smp_v3_hw(struct hisi_hba *hisi_hba,
return rc;
 }
 
+static int get_ncq_tag_v3_hw(struct sas_task *task, u32 *tag)
+{
+   struct ata_queued_cmd *qc = task->uldd_task;
+
+   if (qc) {
+   if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
+   qc->tf.command == ATA_CMD_FPDMA_READ) {
+   *tag = qc->tag;
+   return 1;
+   }
+   }
+   return 0;
+}
+
+static int prep_ata_v3_hw(struct hisi_hba *hisi_hba,
+ struct hisi_sas_slot *slot)
+{
+   struct sas_task *task = slot->task;
+   struct domain_device *device = task->dev;
+   struct domain_device *parent_dev = device->parent;
+   struct hisi_sas_device *sas_dev = device->lldd_dev;
+   struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;
+   struct asd_sas_port *sas_port = device->port;
+   struct hisi_sas_port *port = to_hisi_sas_port(sas_port);
+   u8 *buf_cmd;
+   int has_data = 0, rc = 0, hdr_tag = 0;
+   u32 dw1 = 0, dw2 = 0;
+
+   hdr->dw0 = cpu_to_le32(port->id << CMD_HDR_PORT_OFF);
+   if (parent_dev && DEV_IS_EXPANDER(parent_dev->dev_type))
+   hdr->dw0 |= cpu_to_le32(3 << CMD_HDR_CMD_OFF);
+   else
+   hdr->dw0 |= cpu_to_le32(4 << CMD_HDR_CMD_OFF);
+
+   switch (task->data_dir) {
+   case DMA_TO_DEVICE:
+   has_data = 1;
+   dw1 |= DIR_TO_DEVICE << CMD_HDR_DIR_OFF;
+   break;
+   case DMA_FROM_DEVICE:
+   has_data = 1;
+   dw1 |= DIR_TO_INI << CMD_HDR_DIR_OFF;
+   break;
+   default:
+   dw1 &= ~CMD_HDR_DIR_MSK;
+   }
+
+   if ((task->ata_task.fis.command == ATA_CMD_DEV_RESET) &&
+   (task->ata_task.fis.control & ATA_SRST))
+   dw1 |= 1 << CMD_HDR_RESET_OFF;
+
+   dw1 |= (hisi_sas_get_ata_protocol(
+   task->ata_task.fis.command, task->data_dir))
+   << CMD_HDR_FRAME_TYPE_OFF;
+   dw1 |= sas_dev->device_id << CMD_HDR_DEV_ID_OFF;
+
+   if (CMD_IS_UNCONSTRAINT(task->ata_task.fis.command))
+   dw1 |= 1 << CMD_HDR_UNCON_CMD_OFF;
+
+   hdr->dw1 = cpu_to_le32(dw1);
+
+   /* dw2 */
+   if (task->ata_task.use_ncq && get_ncq_tag_v3_hw(task, _tag)) {
+   task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
+   dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;
+   }
+
+   dw2 |= (HISI_SAS_MAX_STP_RESP_SZ / 4) << CMD_HDR_CFL_OFF |
+   2 << CMD_HDR_SG_MOD_OFF;
+   hdr->dw2 = cpu_to_le32(dw2);
+
+   /* dw3 */
+   hdr->transfer_tags = cpu_to_le32(slot->idx);
+
+   if (has_data) {
+   rc = prep_prd_sge_v3_hw(hisi_hba, slot, hdr, task->scatter,
+   slot->n_elem);
+   if (rc)
+   return rc;
+   }
+
+   hdr->data_transfer_len = cpu_to_le32(task->total_xfer_len);
+   hdr->cmd_table_addr = cpu_to_le64(slot->command_table_dma);
+   

[PATCH 07/22] scsi: hisi_sas: add the initialisation for pci-based controller

[John Garry]

Add the code to initialise controller which is based on pci device
in hisi_sas_pci_init.c

The main functionality added is for probing and initialisation of
the controller based on pci device.

The core controller routines are still in hisi_sas_main.c; some
common initialisation functions and structures are also exported from
hisi_sas_main.c for pci init.

For platform device-based controller, controller properties - like
phy count - were read from the firmware. For pci-based controller this
information is hard-coded in the driver, in new struct hisi_sas_pci_hw.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/Kconfig |  10 +-
 drivers/scsi/hisi_sas/Makefile|   1 +
 drivers/scsi/hisi_sas/hisi_sas.h  |  19 
 drivers/scsi/hisi_sas/hisi_sas_main.c |  18 ++-
 drivers/scsi/hisi_sas/hisi_sas_pci_init.c | 182 ++
 5 files changed, 223 insertions(+), 7 deletions(-)
 create mode 100644 drivers/scsi/hisi_sas/hisi_sas_pci_init.c

diff --git a/drivers/scsi/hisi_sas/Kconfig b/drivers/scsi/hisi_sas/Kconfig
index 374a329..d42f29a 100644
--- a/drivers/scsi/hisi_sas/Kconfig
+++ b/drivers/scsi/hisi_sas/Kconfig
@@ -6,4 +6,12 @@ config SCSI_HISI_SAS
select BLK_DEV_INTEGRITY
depends on ATA
help
-   This driver supports HiSilicon's SAS HBA
+   This driver supports HiSilicon's SAS HBA, including support 
based
+   on platform device
+
+config SCSI_HISI_SAS_PCI
+   tristate "HiSilicon SAS on PCI bus"
+   depends on SCSI_HISI_SAS
+   depends on PCI
+   help
+   This driver supports HiSilicon's SAS HBA based on PCI device
diff --git a/drivers/scsi/hisi_sas/Makefile b/drivers/scsi/hisi_sas/Makefile
index c6d3a1b..3a036a8 100644
--- a/drivers/scsi/hisi_sas/Makefile
+++ b/drivers/scsi/hisi_sas/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_SCSI_HISI_SAS)+= hisi_sas_main.o
 obj-$(CONFIG_SCSI_HISI_SAS)+= hisi_sas_v1_hw.o hisi_sas_v2_hw.o
+obj-$(CONFIG_SCSI_HISI_SAS_PCI)+= hisi_sas_pci_init.o
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 18044b7..9bc9550 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -186,6 +186,12 @@ struct hisi_sas_hw {
int complete_hdr_size;
 };
 
+struct hisi_sas_pci_hw {
+   int n_phy;
+   int queue_count;
+   const struct hisi_sas_hw *hw;
+};
+
 struct hisi_hba {
/* This must be the first element, used by SHOST_TO_SAS_HA */
struct sas_ha_struct *p;
@@ -359,6 +365,19 @@ struct hisi_sas_command_table_ssp {
struct hisi_sas_command_table_stp stp;
 };
 
+extern struct scsi_transport_template *hisi_sas_stt;
+extern struct scsi_host_template *hisi_sas_sht;
+
+extern void hisi_sas_init_add(struct hisi_hba *hisi_hba);
+extern int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost);
+extern void hisi_sas_free(struct hisi_hba *hisi_hba);
+
+#if IS_ENABLED(CONFIG_SCSI_HISI_SAS_PCI)
+extern int hisi_sas_pci_probe(struct pci_dev *pdev,
+  const struct hisi_sas_pci_hw *hw);
+extern void hisi_sas_pci_remove(struct pci_dev *pdev);
+#endif
+
 extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction);
 extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
 extern void hisi_sas_sata_done(struct sas_task *task,
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index d20a2f2..33bd3c45 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1476,9 +1476,10 @@ void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, 
u32 old_state,
 }
 EXPORT_SYMBOL_GPL(hisi_sas_rescan_topology);
 
-static struct scsi_transport_template *hisi_sas_stt;
+struct scsi_transport_template *hisi_sas_stt;
+EXPORT_SYMBOL_GPL(hisi_sas_stt);
 
-static struct scsi_host_template hisi_sas_sht = {
+static struct scsi_host_template _hisi_sas_sht = {
.module = THIS_MODULE,
.name   = DRV_NAME,
.queuecommand   = sas_queuecommand,
@@ -1498,6 +1499,8 @@ void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, 
u32 old_state,
.target_destroy = sas_target_destroy,
.ioctl  = sas_ioctl,
 };
+struct scsi_host_template *hisi_sas_sht = &_hisi_sas_sht;
+EXPORT_SYMBOL_GPL(hisi_sas_sht);
 
 static struct sas_domain_function_template hisi_sas_transport_ops = {
.lldd_dev_found = hisi_sas_dev_found,
@@ -1545,7 +1548,7 @@ void hisi_sas_init_mem(struct hisi_hba *hisi_hba)
 }
 EXPORT_SYMBOL_GPL(hisi_sas_init_mem);
 
-static int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
+int hisi_sas_alloc(struct hisi_hba *hisi_hba, struct Scsi_Host *shost)
 {
struct device *dev = hisi_hba->dev;
int i, s, 

[PATCH 13/22] scsi: hisi_sas: add v3 cq interrupt handler

[John Garry]

From: Xiang Chen 

Add v3 cq interrupt handler.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |   1 +
 drivers/scsi/hisi_sas/hisi_sas_main.c  |  32 
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 332 +
 3 files changed, 365 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 9fd874d..c7d1144 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -385,6 +385,7 @@ extern int hisi_sas_pci_probe(struct pci_dev *pdev,
 extern void hisi_sas_sata_done(struct sas_task *task,
struct hisi_sas_slot *slot);
 extern int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag);
+extern bool hisi_sas_is_rw_cmd(struct sas_task *task);
 extern int hisi_sas_probe(struct platform_device *pdev,
  const struct hisi_sas_hw *ops);
 extern int hisi_sas_remove(struct platform_device *pdev);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 33bd3c45..156b66b 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -118,6 +118,38 @@ int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag)
 }
 EXPORT_SYMBOL_GPL(hisi_sas_get_ncq_tag);
 
+bool hisi_sas_is_rw_cmd(struct sas_task *task)
+{
+   switch (task->task_proto) {
+   case SAS_PROTOCOL_SSP:
+   {
+   unsigned char op = task->ssp_task.cmd->cmnd[0];
+
+   if (op == READ_6 || op == WRITE_6 ||
+   op == READ_10 || op == WRITE_10 ||
+   op == READ_12 || op == WRITE_12 ||
+   op == READ_16 || op == WRITE_16)
+   return true;
+   break;
+   }
+   case SAS_PROTOCOL_SATA:
+   case SAS_PROTOCOL_STP:
+   case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
+   {
+   u32 cmd_proto = hisi_sas_get_ata_protocol(
+   task->ata_task.fis.command,
+   task->data_dir);
+   if (cmd_proto != SATA_PROTOCOL_NONDATA)
+   return true;
+   break;
+   }
+   default:
+   break;
+   }
+   return false;
+}
+EXPORT_SYMBOL_GPL(hisi_sas_is_rw_cmd);
+
 static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
 {
return device->port->ha->lldd_ha;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index f7872c5..b33781b 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -156,6 +156,33 @@
 #define PHYCTRL_PHY_ENA_MSK(PORT_BASE + 0x2bc)
 #define SL_RX_BCAST_CHK_MSK(PORT_BASE + 0x2c0)
 #define PHYCTRL_OOB_RESTART_MSK(PORT_BASE + 0x2c4)
+
+/* Completion header */
+/* dw0 */
+#define CMPLT_HDR_CMPLT_OFF0
+#define CMPLT_HDR_CMPLT_MSK(0x3 << CMPLT_HDR_CMPLT_OFF)
+#define CMPLT_HDR_ERROR_PHASE_OFF   2
+#define CMPLT_HDR_ERROR_PHASE_MSK   (0xff << CMPLT_HDR_ERROR_PHASE_OFF)
+#define CMPLT_HDR_RSPNS_XFRD_OFF   10
+#define CMPLT_HDR_RSPNS_XFRD_MSK   (0x1 << CMPLT_HDR_RSPNS_XFRD_OFF)
+#define CMPLT_HDR_ERX_OFF  12
+#define CMPLT_HDR_ERX_MSK  (0x1 << CMPLT_HDR_ERX_OFF)
+#define CMPLT_HDR_ABORT_STAT_OFF   13
+#define CMPLT_HDR_ABORT_STAT_MSK   (0x7 << CMPLT_HDR_ABORT_STAT_OFF)
+/* abort_stat */
+#define STAT_IO_NOT_VALID  0x1
+#define STAT_IO_NO_DEVICE  0x2
+#define STAT_IO_COMPLETE   0x3
+#define STAT_IO_ABORTED0x4
+/* dw1 */
+#define CMPLT_HDR_IPTT_OFF 0
+#define CMPLT_HDR_IPTT_MSK (0x << CMPLT_HDR_IPTT_OFF)
+#define CMPLT_HDR_DEV_ID_OFF   16
+#define CMPLT_HDR_DEV_ID_MSK   (0x << CMPLT_HDR_DEV_ID_OFF)
+/* dw3 */
+#define CMPLT_HDR_IO_IN_TARGET_OFF 17
+#define CMPLT_HDR_IO_IN_TARGET_MSK (0x1 << CMPLT_HDR_IO_IN_TARGET_OFF)
+
 struct hisi_sas_complete_v3_hdr {
__le32 dw0;
__le32 dw1;
@@ -163,6 +190,8 @@ struct hisi_sas_complete_v3_hdr {
__le32 dw3;
 };
 
+#define IO_RX_DATA_LEN_UNDERFLOW_OFF   6
+#define IO_RX_DATA_LEN_UNDERFLOW_MSK   (1 << IO_RX_DATA_LEN_UNDERFLOW_OFF)
 #define HISI_SAS_COMMAND_ENTRIES_V3_HW 4096
 #define HISI_SAS_MSI_COUNT_V3_HW 32
 
@@ -624,6 +653,286 @@ static irqreturn_t int_chnl_int_v3_hw(int irq_no, void *p)
return IRQ_HANDLED;
 }
 
+static void slot_err_v3_hw(struct hisi_hba *hisi_hba,
+   struct sas_task *task,
+   struct hisi_sas_slot *slot)
+{
+   struct task_status_struct *ts = >task_status;
+   struct hisi_sas_complete_v3_hdr *complete_queue =
+   hisi_hba->complete_hdr[slot->cmplt_queue];
+   struct 

[PATCH 04/22] scsi: hisi_sas: relocate sata_done_v2_hw()

[John Garry]

From: Xiang Chen 

Relocate get_ata_protocol() to a common location, as future hw
versions will require it.
Also rename with "hisi_sas_" prefix for consistency.

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  2 ++
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 15 +++
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 18 ++
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 02ec10b..d0c0844 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -357,6 +357,8 @@ struct hisi_sas_command_table_ssp {
 
 extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction);
 extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
+extern void hisi_sas_sata_done(struct sas_task *task,
+   struct hisi_sas_slot *slot);
 extern int hisi_sas_probe(struct platform_device *pdev,
  const struct hisi_sas_hw *ops);
 extern int hisi_sas_remove(struct platform_device *pdev);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 437eefe..335f3ba4 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -88,6 +88,21 @@ u8 hisi_sas_get_ata_protocol(u8 cmd, int direction)
 }
 EXPORT_SYMBOL_GPL(hisi_sas_get_ata_protocol);
 
+void hisi_sas_sata_done(struct sas_task *task,
+   struct hisi_sas_slot *slot)
+{
+   struct task_status_struct *ts = >task_status;
+   struct ata_task_resp *resp = (struct ata_task_resp *)ts->buf;
+   struct dev_to_host_fis *d2h = slot->status_buffer +
+ sizeof(struct hisi_sas_err_record);
+
+   resp->frame_len = sizeof(struct dev_to_host_fis);
+   memcpy(>ending_fis[0], d2h, sizeof(struct dev_to_host_fis));
+
+   ts->buf_valid_size = sizeof(*resp);
+}
+EXPORT_SYMBOL_GPL(hisi_sas_sata_done);
+
 static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
 {
return device->port->ha->lldd_ha;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 397f01e..51140dc 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -1679,20 +1679,6 @@ static int prep_ssp_v2_hw(struct hisi_hba *hisi_hba,
return 0;
 }
 
-static void sata_done_v2_hw(struct hisi_hba *hisi_hba, struct sas_task *task,
-   struct hisi_sas_slot *slot)
-{
-   struct task_status_struct *ts = >task_status;
-   struct ata_task_resp *resp = (struct ata_task_resp *)ts->buf;
-   struct dev_to_host_fis *d2h = slot->status_buffer +
- sizeof(struct hisi_sas_err_record);
-
-   resp->frame_len = sizeof(struct dev_to_host_fis);
-   memcpy(>ending_fis[0], d2h, sizeof(struct dev_to_host_fis));
-
-   ts->buf_valid_size = sizeof(*resp);
-}
-
 #define TRANS_TX_ERR   0
 #define TRANS_RX_ERR   1
 #define DMA_TX_ERR 2
@@ -2185,7 +2171,7 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
break;
}
}
-   sata_done_v2_hw(hisi_hba, task, slot);
+   hisi_sas_sata_done(task, slot);
}
break;
default:
@@ -2313,7 +2299,7 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
{
ts->stat = SAM_STAT_GOOD;
-   sata_done_v2_hw(hisi_hba, task, slot);
+   hisi_sas_sata_done(task, slot);
break;
}
default:
-- 
1.9.1

[PATCH 19/22] scsi: hisi_sas: add get_wideport_bitmap_v3_hw()

[John Garry]

From: Xiang Chen 

Add code for interface get_wide_port_bitmap_v3_hw().

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 9d5047e..fa686e5 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -614,6 +614,18 @@ static void sl_notify_v3_hw(struct hisi_hba *hisi_hba, int 
phy_no)
hisi_sas_phy_write32(hisi_hba, phy_no, SL_CONTROL, sl_control);
 }
 
+static int get_wideport_bitmap_v3_hw(struct hisi_hba *hisi_hba, int port_id)
+{
+   int i, bitmap = 0;
+   u32 phy_port_num_ma = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);
+
+   for (i = 0; i < hisi_hba->n_phy; i++)
+   if (((phy_port_num_ma >> (i * 4)) & 0xf) == port_id)
+   bitmap |= 1 << i;
+
+   return bitmap;
+}
+
 /**
  * The callpath to this function and upto writing the write
  * queue pointer should be safe from interruption.
@@ -1558,6 +1570,7 @@ static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
.setup_itct = setup_itct_v3_hw,
.max_command_entries = HISI_SAS_COMMAND_ENTRIES_V3_HW,
.sl_notify = sl_notify_v3_hw,
+   .get_wideport_bitmap = get_wideport_bitmap_v3_hw,
.complete_hdr_size = sizeof(struct hisi_sas_complete_v3_hdr),
.free_device = free_device_v3_hw,
.prep_ssp = prep_ssp_v3_hw,
-- 
1.9.1

[PATCH 09/22] scsi: hisi_sas: retrieve SAS address for pci-based controller

[John Garry]

For a pci-based controller, retrieve the SAS address from the
ACPI tables.

The retrieval is based on the ACPI device node name. Sample is
as follows:
Scope(_SB)
{
Device(SAS0) {
Name(_HID, "HISI0163")
Name (_DSD, Package () {
  ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
  Package () {
Package (2) {"sas-addr", Package() {0x50, 0x01, 
0x88, 0x20, 0x16, 00, 00, 0x00}},
  }
  })
}
}

If the ACPI node or node property is not available, then we fall
back on a default address.

Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h  |   2 +
 drivers/scsi/hisi_sas/hisi_sas_pci_init.c | 104 ++
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c|   2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 9bc9550..9fd874d 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -190,6 +190,7 @@ struct hisi_sas_pci_hw {
int n_phy;
int queue_count;
const struct hisi_sas_hw *hw;
+   const char *fw_name;
 };
 
 struct hisi_hba {
@@ -250,6 +251,7 @@ struct hisi_hba {
struct hisi_sas_slot*slot_info;
unsigned long flags;
const struct hisi_sas_hw *hw;   /* Low level hw interface */
+   const char *fw_name;
unsigned long sata_dev_bitmap[BITS_TO_LONGS(HISI_SAS_MAX_DEVICES)];
struct work_struct rst_work;
 };
diff --git a/drivers/scsi/hisi_sas/hisi_sas_pci_init.c 
b/drivers/scsi/hisi_sas/hisi_sas_pci_init.c
index e00b482..6d92893 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_pci_init.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_pci_init.c
@@ -11,6 +11,107 @@
 #include "hisi_sas.h"
 #define DRV_NAME "hisi_sas_pci"
 
+
+static const u8 default_sas_addr[SAS_ADDR_SIZE] = {
+   0x50, 0x01, 0x88, 0x20, 0x16, 0x0, 0x0, 0x0};
+static void hisi_sas_pci_set_sas_addr(struct hisi_hba *hisi_hba);
+
+static void
+hisi_sas_pci_set_default_sas_addr(struct hisi_hba *hisi_hba)
+{
+   dev_warn(hisi_hba->dev, "using default SAS ADDR\n");
+   memcpy(hisi_hba->sas_addr, default_sas_addr, SAS_ADDR_SIZE);
+}
+
+#if defined(CONFIG_ACPI)
+static int
+acpi_get_sas_address(struct device *dev, struct acpi_device *adev,
+   u8 *dst)
+{
+   u8 addr[SAS_ADDR_SIZE];
+   int rc;
+
+   rc = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),
+   "sas-addr", addr, SAS_ADDR_SIZE);
+   if (rc) {
+   dev_warn(dev, "could not read sas-addr (%d)\n", rc);
+   return rc;
+   }
+
+   dev_info(dev, "SAS address set to: %pM\n", addr);
+
+   memcpy(dst, addr, SAS_ADDR_SIZE);
+
+   return 0;
+}
+
+static acpi_status
+hisi_sas_acpi_match_id(acpi_handle handle, u32 lvl,
+  void *context, void **ret_val)
+{
+   struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
+   struct hisi_hba *hisi_hba = context;
+   struct device *dev = hisi_hba->dev;
+   struct acpi_device *adev;
+   int rc;
+
+   if (ACPI_FAILURE(acpi_get_name(handle, ACPI_SINGLE_NAME, ))) {
+   dev_warn(dev, "Invalid link device\n");
+   return AE_OK;
+   }
+
+   if (strncmp(string.pointer, hisi_hba->fw_name, 4))
+   return AE_OK;
+
+   rc = acpi_bus_get_device(handle, );
+
+   if (rc == 0)
+   rc = acpi_get_sas_address(dev, adev, hisi_hba->sas_addr);
+   else
+   dev_warn(dev, "could not get acpi bus device (%d)\n", rc);
+
+   if (rc == 0)
+   *(acpi_handle *)ret_val = handle;
+
+   kfree(string.pointer);
+   return AE_CTRL_TERMINATE;
+}
+
+static acpi_status
+hisi_sas_acpi_set_sas_addr(struct hisi_hba *hisi_hba)
+{
+   acpi_status status1;
+   acpi_handle *acpi_handle = NULL;
+
+   status1 = acpi_get_devices(NULL, hisi_sas_acpi_match_id,
+  hisi_hba, (void **)_handle);
+
+   if (status1 != AE_OK)
+   return status1;
+
+   if (!acpi_handle)
+   return AE_ERROR;
+
+   return AE_OK;
+}
+#else
+static acpi_status
+hisi_sas_acpi_set_sas_addr(struct hisi_hba *hisi_hba)
+{
+   return AE_ERROR;
+}
+#endif
+
+static void hisi_sas_pci_set_sas_addr(struct hisi_hba *hisi_hba)
+{
+   acpi_status status = AE_ERROR;
+   if (!acpi_disabled)
+   status = hisi_sas_acpi_set_sas_addr(hisi_hba);
+   if (status == AE_OK)
+   return;
+   hisi_sas_pci_set_default_sas_addr(hisi_hba);
+}
+
 static struct Scsi_Host *
 hisi_sas_shost_alloc_pci(struct pci_dev *pdev,
 const struct hisi_sas_pci_hw *hw)
@@ -32,6 +133,9 @@
hisi_hba->shost = shost;
SHOST_TO_SAS_HA(shost) = _hba->sha;
 
+   hisi_hba->fw_name = 

[PATCH 20/22] scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error

[John Garry]

From: Xiang Chen 

For ECC 1bit error, logic can recover it, so we only print a warning.
For ECC multi-bit and AXI bus fatal error, we panic.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 401 -
 1 file changed, 399 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index fa686e5..195276b 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -51,7 +51,39 @@
 #define CFG_SET_ABORTED_IPTT_OFF   0
 #define CFG_SET_ABORTED_IPTT_MSK   (0xfff << CFG_SET_ABORTED_IPTT_OFF)
 #define CFG_1US_TIMER_TRSH 0xcc
+#define HGC_LM_DFX_STATUS2 0x128
+#define HGC_LM_DFX_STATUS2_IOSTLIST_OFF0
+#define HGC_LM_DFX_STATUS2_IOSTLIST_MSK(0xfff <<\
+   HGC_LM_DFX_STATUS2_IOSTLIST_OFF)
+#define HGC_LM_DFX_STATUS2_ITCTLIST_OFF12
+#define HGC_LM_DFX_STATUS2_ITCTLIST_MSK(0x7ff <<\
+   HGC_LM_DFX_STATUS2_ITCTLIST_OFF)
+#define HGC_CQE_ECC_ADDR   0x13c
+#define HGC_CQE_ECC_1B_ADDR_OFF0
+#define HGC_CQE_ECC_1B_ADDR_MSK(0x3f << 
HGC_CQE_ECC_1B_ADDR_OFF)
+#define HGC_CQE_ECC_MB_ADDR_OFF8
+#define HGC_CQE_ECC_MB_ADDR_MSK(0x3f << 
HGC_CQE_ECC_MB_ADDR_OFF)
+#define HGC_IOST_ECC_ADDR  0x140
+#define HGC_IOST_ECC_1B_ADDR_OFF   0
+#define HGC_IOST_ECC_1B_ADDR_MSK   (0x3ff << HGC_IOST_ECC_1B_ADDR_OFF)
+#define HGC_IOST_ECC_MB_ADDR_OFF   16
+#define HGC_IOST_ECC_MB_ADDR_MSK   (0x3ff << HGC_IOST_ECC_MB_ADDR_OFF)
+#define HGC_DQE_ECC_ADDR   0x144
+#define HGC_DQE_ECC_1B_ADDR_OFF0
+#define HGC_DQE_ECC_1B_ADDR_MSK(0xfff << 
HGC_DQE_ECC_1B_ADDR_OFF)
+#define HGC_DQE_ECC_MB_ADDR_OFF16
+#define HGC_DQE_ECC_MB_ADDR_MSK(0xfff << 
HGC_DQE_ECC_MB_ADDR_OFF)
 #define CHNL_INT_STATUS0x148
+#define HGC_ITCT_ECC_ADDR  0x150
+#define HGC_ITCT_ECC_1B_ADDR_OFF   0
+#define HGC_ITCT_ECC_1B_ADDR_MSK   (0x3ff << HGC_ITCT_ECC_1B_ADDR_OFF)
+#define HGC_ITCT_ECC_MB_ADDR_OFF   16
+#define HGC_ITCT_ECC_MB_ADDR_MSK   (0x3ff << HGC_ITCT_ECC_MB_ADDR_OFF)
+#define HGC_AXI_FIFO_ERR_INFO  0x154
+#define AXI_ERR_INFO_OFF   0
+#define AXI_ERR_INFO_MSK   (0xff << AXI_ERR_INFO_OFF)
+#define FIFO_ERR_INFO_OFF  8
+#define FIFO_ERR_INFO_MSK  (0xff << FIFO_ERR_INFO_OFF)
 #define INT_COAL_EN0x19c
 #define OQ_INT_COAL_TIME   0x1a0
 #define OQ_INT_COAL_CNT0x1a4
@@ -85,6 +117,26 @@
 #define ENT_INT_SRC_MSK3_ENT95_MSK_MSK (0x1 << ENT_INT_SRC_MSK3_ENT95_MSK_OFF)
 #define SAS_ECC_INTR   0x1e8
 #define SAS_ECC_INTR_MSK   0x1ec
+#define SAS_ECC_INTR_DQE_ECC_1B_OFF0
+#define SAS_ECC_INTR_DQE_ECC_MB_OFF1
+#define SAS_ECC_INTR_IOST_ECC_1B_OFF   2
+#define SAS_ECC_INTR_IOST_ECC_MB_OFF   3
+#define SAS_ECC_INTR_ITCT_ECC_MB_OFF   4
+#define SAS_ECC_INTR_ITCT_ECC_1B_OFF   5
+#define SAS_ECC_INTR_IOSTLIST_ECC_MB_OFF   6
+#define SAS_ECC_INTR_IOSTLIST_ECC_1B_OFF   7
+#define SAS_ECC_INTR_ITCTLIST_ECC_MB_OFF   8
+#define SAS_ECC_INTR_ITCTLIST_ECC_1B_OFF   9
+#define SAS_ECC_INTR_CQE_ECC_1B_OFF10
+#define SAS_ECC_INTR_CQE_ECC_MB_OFF11
+#define SAS_ECC_INTR_NCQ_MEM0_ECC_MB_OFF   12
+#define SAS_ECC_INTR_NCQ_MEM0_ECC_1B_OFF   13
+#define SAS_ECC_INTR_NCQ_MEM1_ECC_MB_OFF   14
+#define SAS_ECC_INTR_NCQ_MEM1_ECC_1B_OFF   15
+#define SAS_ECC_INTR_NCQ_MEM2_ECC_MB_OFF   16
+#define SAS_ECC_INTR_NCQ_MEM2_ECC_1B_OFF   17
+#define SAS_ECC_INTR_NCQ_MEM3_ECC_MB_OFF   18
+#define SAS_ECC_INTR_NCQ_MEM3_ECC_1B_OFF   19
 #define HGC_ERR_STAT_EN0x238
 #define DLVRY_Q_0_BASE_ADDR_LO 0x260
 #define DLVRY_Q_0_BASE_ADDR_HI 0x264
@@ -98,6 +150,20 @@
 #define COMPL_Q_0_DEPTH0x4e8
 #define COMPL_Q_0_WR_PTR   0x4ec
 #define COMPL_Q_0_RD_PTR   0x4f0
+#define HGC_RXM_DFX_STATUS14   0xae8
+#define HGC_RXM_DFX_STATUS14_MEM0_OFF  0
+#define HGC_RXM_DFX_STATUS14_MEM0_MSK  (0x1ff <<\
+   HGC_RXM_DFX_STATUS14_MEM0_OFF)
+#define HGC_RXM_DFX_STATUS14_MEM1_OFF  9
+#define HGC_RXM_DFX_STATUS14_MEM1_MSK  (0x1ff <<\
+   HGC_RXM_DFX_STATUS14_MEM1_OFF)
+#define HGC_RXM_DFX_STATUS14_MEM2_OFF  18
+#define HGC_RXM_DFX_STATUS14_MEM2_MSK  (0x1ff <<\
+   HGC_RXM_DFX_STATUS14_MEM2_OFF)
+#define HGC_RXM_DFX_STATUS15  

[PATCH 03/22] scsi: hisi_sas: relocate get_ata_protocol()

[John Garry]

From: Xiang Chen 

Relocate get_ata_protocol() to a common location, as future
hw versions will require it.
Also rename with "hisi_sas_" prefix for consistency.

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  1 +
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 65 +
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 67 +-
 3 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 88f06be..02ec10b 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -355,6 +355,7 @@ struct hisi_sas_command_table_ssp {
struct hisi_sas_command_table_stp stp;
 };
 
+extern u8 hisi_sas_get_ata_protocol(u8 cmd, int direction);
 extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
 extern int hisi_sas_probe(struct platform_device *pdev,
  const struct hisi_sas_hw *ops);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index c986618..437eefe 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -15,6 +15,12 @@
 #define DEV_IS_GONE(dev) \
((!dev) || (dev->dev_type == SAS_PHY_UNUSED))
 
+#define SATA_PROTOCOL_NONDATA  0x1
+#define SATA_PROTOCOL_PIO  0x2
+#define SATA_PROTOCOL_DMA  0x4
+#define SATA_PROTOCOL_FPDMA0x8
+#define SATA_PROTOCOL_ATAPI0x10
+
 static int hisi_sas_debug_issue_ssp_tmf(struct domain_device *device,
u8 *lun, struct hisi_sas_tmf_task *tmf);
 static int
@@ -23,6 +29,65 @@ static int hisi_sas_debug_issue_ssp_tmf(struct domain_device 
*device,
 int abort_flag, int tag);
 static int hisi_sas_softreset_ata_disk(struct domain_device *device);
 
+u8 hisi_sas_get_ata_protocol(u8 cmd, int direction)
+{
+   switch (cmd) {
+   case ATA_CMD_FPDMA_WRITE:
+   case ATA_CMD_FPDMA_READ:
+   case ATA_CMD_FPDMA_RECV:
+   case ATA_CMD_FPDMA_SEND:
+   case ATA_CMD_NCQ_NON_DATA:
+   return SATA_PROTOCOL_FPDMA;
+
+   case ATA_CMD_DOWNLOAD_MICRO:
+   case ATA_CMD_ID_ATA:
+   case ATA_CMD_PMP_READ:
+   case ATA_CMD_READ_LOG_EXT:
+   case ATA_CMD_PIO_READ:
+   case ATA_CMD_PIO_READ_EXT:
+   case ATA_CMD_PMP_WRITE:
+   case ATA_CMD_WRITE_LOG_EXT:
+   case ATA_CMD_PIO_WRITE:
+   case ATA_CMD_PIO_WRITE_EXT:
+   return SATA_PROTOCOL_PIO;
+
+   case ATA_CMD_DSM:
+   case ATA_CMD_DOWNLOAD_MICRO_DMA:
+   case ATA_CMD_PMP_READ_DMA:
+   case ATA_CMD_PMP_WRITE_DMA:
+   case ATA_CMD_READ:
+   case ATA_CMD_READ_EXT:
+   case ATA_CMD_READ_LOG_DMA_EXT:
+   case ATA_CMD_READ_STREAM_DMA_EXT:
+   case ATA_CMD_TRUSTED_RCV_DMA:
+   case ATA_CMD_TRUSTED_SND_DMA:
+   case ATA_CMD_WRITE:
+   case ATA_CMD_WRITE_EXT:
+   case ATA_CMD_WRITE_FUA_EXT:
+   case ATA_CMD_WRITE_QUEUED:
+   case ATA_CMD_WRITE_LOG_DMA_EXT:
+   case ATA_CMD_WRITE_STREAM_DMA_EXT:
+   return SATA_PROTOCOL_DMA;
+
+   case ATA_CMD_CHK_POWER:
+   case ATA_CMD_DEV_RESET:
+   case ATA_CMD_EDD:
+   case ATA_CMD_FLUSH:
+   case ATA_CMD_FLUSH_EXT:
+   case ATA_CMD_VERIFY:
+   case ATA_CMD_VERIFY_EXT:
+   case ATA_CMD_SET_FEATURES:
+   case ATA_CMD_STANDBY:
+   case ATA_CMD_STANDBYNOW1:
+   return SATA_PROTOCOL_NONDATA;
+   default:
+   if (direction == DMA_NONE)
+   return SATA_PROTOCOL_NONDATA;
+   return SATA_PROTOCOL_PIO;
+   }
+}
+EXPORT_SYMBOL_GPL(hisi_sas_get_ata_protocol);
+
 static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
 {
return device->port->ha->lldd_ha;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c 
b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 193cc43..397f01e 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -554,12 +554,6 @@ enum {
 #define DIR_TO_DEVICE 2
 #define DIR_RESERVED 3
 
-#define SATA_PROTOCOL_NONDATA  0x1
-#define SATA_PROTOCOL_PIO  0x2
-#define SATA_PROTOCOL_DMA  0x4
-#define SATA_PROTOCOL_FPDMA0x8
-#define SATA_PROTOCOL_ATAPI0x10
-
 #define ERR_ON_TX_PHASE(err_phase) (err_phase == 0x2 || \
err_phase == 0x4 || err_phase == 0x8 ||\
err_phase == 0x6 || err_phase == 0xa)
@@ -2348,64 +2342,6 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
return sts;
 }
 
-static u8 get_ata_protocol(u8 cmd, int direction)
-{
-   switch (cmd) {
-   case ATA_CMD_FPDMA_WRITE:
-   case ATA_CMD_FPDMA_READ:
-   case ATA_CMD_FPDMA_RECV:
-   case ATA_CMD_FPDMA_SEND:
-   case ATA_CMD_NCQ_NON_DATA:
- 

[PATCH 01/22] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort()

[John Garry]

From: Xiang Chen 

We need to check for timeout before task status, or the task will be
mistook as completed internal abort command.
Also add protection for sas_task.task_state_flags in
hisi_sas_tmf_timedout().

Signed-off-by: Xiang Chen 
Signed-off-by: John Garry 
---
 drivers/scsi/hisi_sas/hisi_sas_main.c | 25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index d622db5..98535aa 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -691,8 +691,13 @@ static void hisi_sas_task_done(struct sas_task *task)
 static void hisi_sas_tmf_timedout(unsigned long data)
 {
struct sas_task *task = (struct sas_task *)data;
+   unsigned long flags;
+
+   spin_lock_irqsave(>task_state_lock, flags);
+   if (!(task->task_state_flags & SAS_TASK_STATE_DONE))
+   task->task_state_flags |= SAS_TASK_STATE_ABORTED;
+   spin_unlock_irqrestore(>task_state_lock, flags);
 
-   task->task_state_flags |= SAS_TASK_STATE_ABORTED;
complete(>slow_task->completion);
 }
 
@@ -1247,6 +1252,17 @@ static int hisi_sas_query_task(struct sas_task *task)
wait_for_completion(>slow_task->completion);
res = TMF_RESP_FUNC_FAILED;
 
+   /* Internal abort timed out */
+   if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
+   if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
+   struct hisi_sas_slot *slot = task->lldd_task;
+
+   if (slot)
+   slot->task = NULL;
+   dev_err(dev, "internal task abort: timeout.\n");
+   }
+   }
+
if (task->task_status.resp == SAS_TASK_COMPLETE &&
task->task_status.stat == TMF_RESP_FUNC_COMPLETE) {
res = TMF_RESP_FUNC_COMPLETE;
@@ -1259,13 +1275,6 @@ static int hisi_sas_query_task(struct sas_task *task)
goto exit;
}
 
-   /* Internal abort timed out */
-   if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
-   if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
-   dev_err(dev, "internal task abort: timeout.\n");
-   }
-   }
-
 exit:
dev_dbg(dev, "internal task abort: task to dev %016llx task=%p "
"resp: 0x%x sts 0x%x\n",
-- 
1.9.1

[PATCH 06/22] scsi: hisi_sas: add pci_dev in hisi_hba struct

[John Garry]

Since hip08 SAS controller is based on pci device, add hisi_hba.pci_dev
for hip08 (will be v3), and also rename hisi_hba.pdev to .platform_dev
for clarity.

In addition, for common code which wants to reference the controller
device struct, add hisi_hba.dev, and change the common code to use
it.

Signed-off-by: John Garry 
Signed-off-by: Xiang Chen 
---
 drivers/scsi/hisi_sas/hisi_sas.h   |  6 -
 drivers/scsi/hisi_sas/hisi_sas_main.c  | 36 ++--
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 28 +++---
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 44 +-
 4 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 210daec..18044b7 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -189,7 +190,10 @@ struct hisi_hba {
/* This must be the first element, used by SHOST_TO_SAS_HA */
struct sas_ha_struct *p;
 
-   struct platform_device *pdev;
+   struct platform_device *platform_dev;
+   struct pci_dev *pci_dev;
+   struct device *dev;
+
void __iomem *regs;
struct regmap *ctrl;
u32 ctrl_reset_reg;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c 
b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 12fece3..d20a2f2 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -174,7 +174,7 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, 
struct sas_task *task,
 {
 
if (task) {
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
struct domain_device *device = task->dev;
struct hisi_sas_device *sas_dev = device->lldd_dev;
 
@@ -251,7 +251,7 @@ static void hisi_sas_slot_abort(struct work_struct *work)
struct scsi_cmnd *cmnd = task->uldd_task;
struct hisi_sas_tmf_task tmf_task;
struct scsi_lun lun;
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
int tag = abort_slot->idx;
unsigned long flags;
 
@@ -285,7 +285,7 @@ static int hisi_sas_task_prep(struct sas_task *task, struct 
hisi_sas_dq
struct hisi_sas_slot *slot;
struct hisi_sas_cmd_hdr *cmd_hdr_base;
struct asd_sas_port *sas_port = device->port;
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
int dlvry_queue_slot, dlvry_queue, n_elem = 0, rc, slot_idx;
unsigned long flags;
 
@@ -455,7 +455,7 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t 
gfp_flags,
u32 pass = 0;
unsigned long flags;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(task->dev);
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
struct domain_device *device = task->dev;
struct hisi_sas_device *sas_dev = device->lldd_dev;
int queue_id = sas_dev->device_id % hisi_hba->queue_count;
@@ -547,7 +547,7 @@ static int hisi_sas_dev_found(struct domain_device *device)
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
struct domain_device *parent_dev = device->parent;
struct hisi_sas_device *sas_dev;
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
 
if (hisi_hba->hw->alloc_dev)
sas_dev = hisi_hba->hw->alloc_dev(device);
@@ -732,7 +732,7 @@ static void hisi_sas_dev_gone(struct domain_device *device)
 {
struct hisi_sas_device *sas_dev = device->lldd_dev;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
u64 dev_id = sas_dev->device_id;
 
dev_info(dev, "found dev[%lld:%x] is gone\n",
@@ -815,7 +815,7 @@ static int hisi_sas_exec_internal_tmf_task(struct 
domain_device *device,
 {
struct hisi_sas_device *sas_dev = device->lldd_dev;
struct hisi_hba *hisi_hba = sas_dev->hisi_hba;
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
struct sas_task *task;
int res, retry;
 
@@ -932,7 +932,7 @@ static int hisi_sas_softreset_ata_disk(struct domain_device 
*device)
struct ata_link *link;
int rc = TMF_RESP_FUNC_FAILED;
struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
-   struct device *dev = _hba->pdev->dev;
+   struct device *dev = hisi_hba->dev;
int s = sizeof(struct host_to_dev_fis);
unsigned long flags;
 
@@ -990,7 +990,7 @@ static int hisi_sas_controller_reset(struct hisi_hba 
*hisi_hba)
return -1;
 
if (!test_and_set_bit(HISI_SAS_RESET_BIT, _hba->flags)) {
-   struct device *dev = 

[PATCH 00/22] hisi_sas: hip08 support

[John Garry]

This patchset adds support for the HiSilicon SAS controller
in the hip08 chipset.

The key difference compared to earlier chipsets is that the
controller is an integrated PCI endpoint in hip08.
As such, the controller is a pci device (not a platform device,
like v2 hw in hip07).

The driver is refactored so it can support both platform and 
pci device-based controllers.

File hisi_sas_pci_init.c is introduced for pci device probing
and initialization. Common functionality is still in
hisi_sas_main.c, along with platform device probing and
initialization.

New hw layer file hisi_sas_v3_hw.c is added for hip08
controller support. HW revisions v2 and v3 are very similar,
but it was decided to keep support in separate files for now.

As for the patches, (ignoring #1 and #2) the first few
reorganise some functions from v2 hw.c into main.c, as they
are required for v3 hw. Then support is added for pci
device-based controller in subsequent patches.
And then hip08 support is added in the final patches.

John Garry (4):
  scsi: hisi_sas: add pci_dev in hisi_hba struct
  scsi: hisi_sas: add the initialisation for pci-based controller
  scsi: hisi_sas: add bare v3 hw driver
  scsi: hisi_sas: retrieve SAS address for pci-based controller

Xiang Chen (18):
  scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort()
  scsi: hisi_sas: optimise the usage of hisi_hba.lock
  scsi: hisi_sas: relocate get_ata_protocol()
  scsi: hisi_sas: relocate sata_done_v2_hw()
  scsi: hisi_sas: relocate get_ncq_tag_v2_hw()
  scsi: hisi_sas: add v3 hw init
  scsi: hisi_sas: add v3 hw PHY init
  scsi: hisi_sas: add phy up/down/bcast and channel ISR
  scsi: hisi_sas: add v3 cq interrupt handler
  scsi: hisi_sas: add v3 code to send SSP frame
  scsi: hisi_sas: add v3 code to send SMP frame
  scsi: hisi_sas: add v3 code to send ATA frame
  scsi: hisi_sas: add v3 code for itct setup and free
  scsi: hisi_sas: add v3 code to send internal abort command
  scsi: hisi_sas: add get_wideport_bitmap_v3_hw()
  scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error
  scsi: hisi_sas: add v3 code to fill some more hw function pointers
  scsi: hisi_sas: modify internal abort dev flow for v3 hw

 drivers/scsi/hisi_sas/Kconfig |   10 +-
 drivers/scsi/hisi_sas/Makefile|2 +
 drivers/scsi/hisi_sas/hisi_sas.h  |   42 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c |  280 +++-
 drivers/scsi/hisi_sas/hisi_sas_pci_init.c |  286 
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c|   51 +-
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c|  175 +--
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c| 2090 +
 8 files changed, 2714 insertions(+), 222 deletions(-)
 create mode 100644 drivers/scsi/hisi_sas/hisi_sas_pci_init.c
 create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

-- 
1.9.1