| Message ID | 1479122995-50330-13-git-send-email-heyi.guo@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Nov 14, 2016 at 07:29:39PM +0800, Heyi Guo wrote: > In the Hip06 SoC, the RoCE Engine is part of the HiSilicon > Network Subsystem and is dependent upon DSAF module. Therefore, > certain functions like RESET are exposed through the common > registers of HNS module which are memory-mapped by the HNS > driver and currently can only be accessed through DT/syscon > interface. > > This patch adds the support of the RoCE Reset functionality > through ACPI interface. This functionality would be exposed to > the HiSilicon HNS Driver using the _DSM() ACPI Method. This > method shall be called by the wrapper API in HNS driver. > Further, HiSilicon RoCE driver shall call the HNS Driver > exported RoCE Reset API. > > In this patch, DSDT ACPI Table have been amended to facilitate > such support. > Review-by: Graeme Gregory <graeme.gregory@linaro.org> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Salil Mehta <salil.mehta@huawei.com> > --- > .../Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl | 79 +++++++++++++++++++++- > 1 file changed, 77 insertions(+), 2 deletions(-) > > diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl > index 83cea5e..192e76d 100644 > --- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl > +++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl > @@ -115,6 +115,33 @@ Scope(_SB) > , 31, //RESERVED > } > > + // DSAF Channel RESET > + OperationRegion(DCRR, SystemMemory, 0xC0000AA8, 8) > + Field(DCRR, DWordAcc, NoLock, Preserve) { > + DCRE, 1, > + , 31, //RESERVED > + DCRD, 1, > + , 31, //RESERVED > + } > + > + // RoCE RESET > + OperationRegion(RKRR, SystemMemory, 0xC0000A50, 8) > + Field(RKRR, DWordAcc, NoLock, Preserve) { > + RKRE, 1, > + , 31, //RESERVED > + RKRD, 1, > + , 31, //RESERVED > + } > + > + // RoCE Clock enable/disable > + OperationRegion(RKCR, SystemMemory, 0xC0000328, 8) > + Field(RKCR, DWordAcc, NoLock, Preserve) { > + RCLE, 1, > + , 31, //RESERVED > + RCLD, 1, > + , 31, //RESERVED > + } > + > // Hilink access sel cfg reg > OperationRegion(HSER, SystemMemory, 0xC2240008, 0x4) > Field(HSER, DWordAcc, NoLock, Preserve) { > @@ -254,6 +281,30 @@ Scope(_SB) > } > } > > + //reset DSAF channels > + //Arg0 : mask > + //Arg1 : 0 reset, 1 de-reset > + Method(DCRT, 2, Serialized) { > + If (LEqual (Arg1, 0)) { > + Store(Arg0, DCRE) > + } Else { > + Store(Arg0, DCRD) > + } > + } > + > + //reset RoCE > + //Arg0 : 0 reset, 1 de-reset > + Method(RRST, 1, Serialized) { > + If (LEqual (Arg0, 0)) { > + Store(0x1, RKRE) > + } Else { > + Store(0x1, RCLD) > + Store(0x1, RKRD) > + sleep(20) > + Store(0x1, RCLE) > + } > + } > + > // Set Serdes Loopback > //Arg0 : port > //Arg1 : 0 disable, 1 enable > @@ -307,7 +358,7 @@ Scope(_SB) > } > > //Reset > - //Arg0 : reset type (1: dsaf; 2: ppe; 3:XGE core; 4:XGE; 5:G3) > + //Arg0 : reset type (1: dsaf; 2: ppe; 3:xge core; 4:xge; 5:ge; 6:dchan; 7:roce) > //Arg1 : port > //Arg2 : 0 disable, 1 enable > Method(DRST, 3, Serialized) > @@ -363,6 +414,22 @@ Scope(_SB) > Store (Arg2, Local1) > GRST (Local0, Local1) > } > + > + //Reset DSAF Channels > + case (0x6) > + { > + Store (Arg1, Local0) > + Store (Arg2, Local1) > + DCRT (Local0, Local1) > + } > + > + //Reset RoCE > + case (0x7) > + { > + // Discarding Arg1 as it is always 0 > + Store (Arg2, Local0) > + RRST (Local0) > + } > } > } > > @@ -373,7 +440,7 @@ Scope(_SB) > // Arg2: Integer Function Index > // 0 : Return Supported Functions bit mask > // 1 : Reset Sequence > - // Arg3[0] : reset type (1:dsaf; 2:ppe; 3:xge core; 4:xge; 5: ge) > + // Arg3[0] : reset type (1:dsaf; 2:ppe; 3:xge core; 4:xge; 5:ge; 6:dchan; 7:roce) > // Arg3[1] : port index in dsaf > // Arg3[2] : 0 reset, 1 cancle reset > // 2 : Set Serdes Loopback > @@ -612,5 +679,13 @@ Scope(_SB) > 746, 747, 748, 749, 750, 751, 752, 753, 785, 754, > } > }) > + Name (_PRS, ResourceTemplate (){ > + Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive,,,) > + { > + 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, > + 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, > + 746, 747, 748, 749, 750, 751, 752, 753, 785, 754, > + } > + }) > } > } > -- > 1.9.1 >
diff --git a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl index 83cea5e..192e76d 100644 --- a/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl +++ b/Chips/Hisilicon/Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl @@ -115,6 +115,33 @@ Scope(_SB) , 31, //RESERVED } + // DSAF Channel RESET + OperationRegion(DCRR, SystemMemory, 0xC0000AA8, 8) + Field(DCRR, DWordAcc, NoLock, Preserve) { + DCRE, 1, + , 31, //RESERVED + DCRD, 1, + , 31, //RESERVED + } + + // RoCE RESET + OperationRegion(RKRR, SystemMemory, 0xC0000A50, 8) + Field(RKRR, DWordAcc, NoLock, Preserve) { + RKRE, 1, + , 31, //RESERVED + RKRD, 1, + , 31, //RESERVED + } + + // RoCE Clock enable/disable + OperationRegion(RKCR, SystemMemory, 0xC0000328, 8) + Field(RKCR, DWordAcc, NoLock, Preserve) { + RCLE, 1, + , 31, //RESERVED + RCLD, 1, + , 31, //RESERVED + } + // Hilink access sel cfg reg OperationRegion(HSER, SystemMemory, 0xC2240008, 0x4) Field(HSER, DWordAcc, NoLock, Preserve) { @@ -254,6 +281,30 @@ Scope(_SB) } } + //reset DSAF channels + //Arg0 : mask + //Arg1 : 0 reset, 1 de-reset + Method(DCRT, 2, Serialized) { + If (LEqual (Arg1, 0)) { + Store(Arg0, DCRE) + } Else { + Store(Arg0, DCRD) + } + } + + //reset RoCE + //Arg0 : 0 reset, 1 de-reset + Method(RRST, 1, Serialized) { + If (LEqual (Arg0, 0)) { + Store(0x1, RKRE) + } Else { + Store(0x1, RCLD) + Store(0x1, RKRD) + sleep(20) + Store(0x1, RCLE) + } + } + // Set Serdes Loopback //Arg0 : port //Arg1 : 0 disable, 1 enable @@ -307,7 +358,7 @@ Scope(_SB) } //Reset - //Arg0 : reset type (1: dsaf; 2: ppe; 3:XGE core; 4:XGE; 5:G3) + //Arg0 : reset type (1: dsaf; 2: ppe; 3:xge core; 4:xge; 5:ge; 6:dchan; 7:roce) //Arg1 : port //Arg2 : 0 disable, 1 enable Method(DRST, 3, Serialized) @@ -363,6 +414,22 @@ Scope(_SB) Store (Arg2, Local1) GRST (Local0, Local1) } + + //Reset DSAF Channels + case (0x6) + { + Store (Arg1, Local0) + Store (Arg2, Local1) + DCRT (Local0, Local1) + } + + //Reset RoCE + case (0x7) + { + // Discarding Arg1 as it is always 0 + Store (Arg2, Local0) + RRST (Local0) + } } } @@ -373,7 +440,7 @@ Scope(_SB) // Arg2: Integer Function Index // 0 : Return Supported Functions bit mask // 1 : Reset Sequence - // Arg3[0] : reset type (1:dsaf; 2:ppe; 3:xge core; 4:xge; 5: ge) + // Arg3[0] : reset type (1:dsaf; 2:ppe; 3:xge core; 4:xge; 5:ge; 6:dchan; 7:roce) // Arg3[1] : port index in dsaf // Arg3[2] : 0 reset, 1 cancle reset // 2 : Set Serdes Loopback @@ -612,5 +679,13 @@ Scope(_SB) 746, 747, 748, 749, 750, 751, 752, 753, 785, 754, } }) + Name (_PRS, ResourceTemplate (){ + Interrupt (ResourceConsumer, Edge, ActiveHigh, Exclusive,,,) + { + 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, + 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, + 746, 747, 748, 749, 750, 751, 752, 753, 785, 754, + } + }) } }
In the Hip06 SoC, the RoCE Engine is part of the HiSilicon Network Subsystem and is dependent upon DSAF module. Therefore, certain functions like RESET are exposed through the common registers of HNS module which are memory-mapped by the HNS driver and currently can only be accessed through DT/syscon interface. This patch adds the support of the RoCE Reset functionality through ACPI interface. This functionality would be exposed to the HiSilicon HNS Driver using the _DSM() ACPI Method. This method shall be called by the wrapper API in HNS driver. Further, HiSilicon RoCE driver shall call the HNS Driver exported RoCE Reset API. In this patch, DSDT ACPI Table have been amended to facilitate such support. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Salil Mehta <salil.mehta@huawei.com> --- .../Hi1610/Hi1610AcpiTables/Dsdt/D03Hns.asl | 79 +++++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-)