Commit d71e0644 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - loongson64 irq rework

 - dmi support loongson

 - replace setup_irq() by request_irq()

 - jazz cleanups

 - minor cleanups and fixes

* tag 'mips_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (44 commits)
  MIPS: ralink: mt7621: Fix soc_device introduction
  MIPS: Exclude more dsemul code when CONFIG_MIPS_FP_SUPPORT=n
  MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3
  MIPS: do not compile generic functions for CONFIG_CAVIUM_OCTEON_SOC
  MAINTAINERS: Update Loongson64 entry
  MIPS: Loongson64: Load built-in dtbs
  MIPS: Loongson64: Add generic dts
  dt-bindings: mips: Add loongson boards
  MIPS: Loongson64: Drop legacy IRQ code
  dt-bindings: interrupt-controller: Add Loongson-3 HTPIC
  irqchip: Add driver for Loongson-3 HyperTransport PIC controller
  dt-bindings: interrupt-controller: Add Loongson LIOINTC
  irqchip: loongson-liointc: Workaround LPC IRQ Errata
  irqchip: Add driver for Loongson I/O Local Interrupt Controller
  docs: mips: remove no longer needed au1xxx_ide.rst documentation
  MIPS: Alchemy: remove no longer used au1xxx_ide.h header
  ide: remove no longer used au1xxx-ide driver
  MIPS: Add support for Desktop Management Interface (DMI)
  firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START
  MIPS: ralink: mt7621: introduce 'soc_device' initialization
  ...
parents 58233ccf ba155332

Documentation/devicetree/bindings/interrupt-controller/loongson,htpic.yaml

0 → 100644
+59 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/interrupt-controller/loongson,htpic.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Loongson-3 HyperTransport Interrupt Controller



maintainers:

  - Jiaxun Yang <jiaxun.yang@flygoat.com>



allOf:

  - $ref: /schemas/interrupt-controller.yaml#



description: |

  This interrupt controller is found in the Loongson-3 family of chips to transmit

  interrupts from PCH PIC connected on HyperTransport bus.



properties:

  compatible:

    const: loongson,htpic-1.0



  reg:

    maxItems: 1



  interrupts:

    minItems: 1

    maxItems: 4

    description: |

      Four parent interrupts that receive chained interrupts.



  interrupt-controller: true



  '#interrupt-cells':

    const: 1



required:

  - compatible

  - reg

  - interrupts

  - interrupt-controller

  - '#interrupt-cells'



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    htintc: interrupt-controller@1fb000080 {

      compatible = "loongson,htintc-1.0";

      reg = <0xfb000080 0x40>;

      interrupt-controller;

      #interrupt-cells = <1>;



      interrupt-parent = <&liointc>;

      interrupts = <24 IRQ_TYPE_LEVEL_HIGH>,

                    <25 IRQ_TYPE_LEVEL_HIGH>,

                    <26 IRQ_TYPE_LEVEL_HIGH>,

                    <27 IRQ_TYPE_LEVEL_HIGH>;

    };

...

Documentation/devicetree/bindings/interrupt-controller/loongson,liointc.yaml

0 → 100644
+93 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/interrupt-controller/loongson,liointc.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Loongson Local I/O Interrupt Controller



maintainers:

  - Jiaxun Yang <jiaxun.yang@flygoat.com>



description: |

  This interrupt controller is found in the Loongson-3 family of chips as the primary

  package interrupt controller which can route local I/O interrupt to interrupt lines

  of cores.



allOf:

  - $ref: /schemas/interrupt-controller.yaml#



properties:

  compatible:

    oneOf:

      - const: loongson,liointc-1.0

      - const: loongson,liointc-1.0a



  reg:

    maxItems: 1



  interrupt-controller: true



  interrupts:

    description:

      Interrupt source of the CPU interrupts.

    minItems: 1

    maxItems: 4



  interrupt-names:

    description: List of names for the parent interrupts.

    items:

      - const: int0

      - const: int1

      - const: int2

      - const: int3

    minItems: 1

    maxItems: 4



  '#interrupt-cells':

    const: 2



  'loongson,parent_int_map':

    description: |

      This property points how the children interrupts will be mapped into CPU

      interrupt lines. Each cell refers to a parent interrupt line from 0 to 3

      and each bit in the cell refers to a children interrupt fron 0 to 31.

      If a CPU interrupt line didn't connected with liointc, then keep it's

      cell with zero.

    allOf:

      - $ref: /schemas/types.yaml#/definitions/uint32-array

      - items:

          minItems: 4

          maxItems: 4





required:

  - compatible

  - reg

  - interrupts

  - interrupt-controller

  - '#interrupt-cells'

  - 'loongson,parent_int_map'





examples:

  - |

    iointc: interrupt-controller@3ff01400 {

      compatible = "loongson,liointc-1.0";

      reg = <0x3ff01400 0x64>;



      interrupt-controller;

      #interrupt-cells = <2>;



      interrupt-parent = <&cpuintc>;

      interrupts = <2>, <3>;

      interrupt-names = "int0", "int1";



      loongson,parent_int_map = <0xf0ffffff>, /* int0 */

                                <0x0f000000>, /* int1 */

                                <0x00000000>, /* int2 */

                                <0x00000000>; /* int3 */



    };



...

Documentation/devicetree/bindings/mips/loongson/devices.yaml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/mips/loongson/devices.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Loongson based Platforms Device Tree Bindings



maintainers:

  - Jiaxun Yang <jiaxun.yang@flygoat.com>

description: |

  Devices with a Loongson CPU shall have the following properties.



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:



      - description: Generic Loongson3 Quad Core + RS780E

        items:

          - const: loongson,loongson3-4core-rs780e



      - description: Generic Loongson3 Octa Core + RS780E

        items:

          - const: loongson,loongson3-8core-rs780e

...

Documentation/mips/au1xxx_ide.rst

deleted100644 → 0
+0 −130
Original line number Diff line number Diff line 
.. include:: <isonum.txt>



======================

MIPS AU1XXX IDE driver

======================



Released 2005-07-15



About

=====



This file describes the 'drivers/ide/au1xxx-ide.c', related files and the

services they provide.



If you are short in patience and just want to know how to add your hard disc to

the white or black list, go to the 'ADD NEW HARD DISC TO WHITE OR BLACK LIST'

section.





License

=======



:Copyright: |copy| 2003-2005 AMD, Personal Connectivity Solutions



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.



THIS SOFTWARE IS PROVIDED ``AS IS`` AND ANY EXPRESS OR IMPLIED WARRANTIES,

INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

POSSIBILITY OF SUCH DAMAGE.



You should have received a copy of the GNU General Public License along with

this program; if not, write to the Free Software Foundation, Inc.,

675 Mass Ave, Cambridge, MA 02139, USA.



Note:

      for more information, please refer "AMD Alchemy Au1200/Au1550 IDE

      Interface and Linux Device Driver" Application Note.





Files, Configs and Compatibility

================================



Two files are introduced:



  a) 'arch/mips/include/asm/mach-au1x00/au1xxx_ide.h'

     contains : struct _auide_hwif



                - timing parameters for PIO mode 0/1/2/3/4

                - timing parameters for MWDMA 0/1/2



  b) 'drivers/ide/mips/au1xxx-ide.c'

     contains the functionality of the AU1XXX IDE driver



Following extra configs variables are introduced:



  CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA

	- enable the PIO+DBDMA mode

  CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	- enable the MWDMA mode





Supported IDE Modes

===================



The AU1XXX IDE driver supported all PIO modes - PIO mode 0/1/2/3/4 - and all

MWDMA modes - MWDMA 0/1/2 -. There is no support for SWDMA and UDMA mode.



To change the PIO mode use the program hdparm with option -p, e.g.

'hdparm -p0 [device]' for PIO mode 0. To enable the MWDMA mode use the option

-X, e.g. 'hdparm -X32 [device]' for MWDMA mode 0.





Performance Configurations

==========================



If the used system doesn't need USB support enable the following kernel

configs::



    CONFIG_IDE=y

    CONFIG_BLK_DEV_IDE=y

    CONFIG_IDE_GENERIC=y

    CONFIG_BLK_DEV_IDEPCI=y

    CONFIG_BLK_DEV_GENERIC=y

    CONFIG_BLK_DEV_IDEDMA_PCI=y

    CONFIG_BLK_DEV_IDE_AU1XXX=y

    CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

    CONFIG_BLK_DEV_IDEDMA=y



Also define 'IDE_AU1XXX_BURSTMODE' in 'drivers/ide/mips/au1xxx-ide.c' to enable

the burst support on DBDMA controller.



If the used system need the USB support enable the following kernel configs for

high IDE to USB throughput.



::



    CONFIG_IDE_GENERIC=y

    CONFIG_BLK_DEV_IDEPCI=y

    CONFIG_BLK_DEV_GENERIC=y

    CONFIG_BLK_DEV_IDEDMA_PCI=y

    CONFIG_BLK_DEV_IDE_AU1XXX=y

    CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA=y

    CONFIG_BLK_DEV_IDEDMA=y



Also undefine 'IDE_AU1XXX_BURSTMODE' in 'drivers/ide/mips/au1xxx-ide.c' to

disable the burst support on DBDMA controller.





Acknowledgments

===============



These drivers wouldn't have been done without the base of kernel 2.4.x AU1XXX

IDE driver from AMD.



Additional input also from:

Matthias Lenk <matthias.lenk@amd.com>



Happy hacking!



Enrico Walther <enrico.walther@amd.com>

Documentation/mips/index.rst

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ MIPS-specific Documentation 


   ingenic-tcu



   au1xxx_ide



.. only::  subproject and html



   Indices

CRA Git | Maintained and supported by SUSTech CRA and CCSE