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

Merge tag 'irq-urgent-2022-02-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "Interrupt chip driver fixes:

   - Don't install an hotplug notifier for GICV3-ITS on systems which do
     not need it to prevent a warning in the notifier about inconsistent
     state

   - Add the missing device tree matching for the T-HEAD PLIC variant so
     the related SoC is properly supported"

* tag 'irq-urgent-2022-02-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/sifive-plic: Add missing thead,c900-plic match string
  dt-bindings: update riscv plic compatible string
  irqchip/gic-v3-its: Skip HP notifier when no ITS is registered
parents 42964a18 1e34064b

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+15 −6
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ description: 
  contains a specific memory layout, which is documented in chapter 8 of the

  SiFive U5 Coreplex Series Manual <https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf>.



  The thead,c900-plic is different from sifive,plic-1.0.0 in opensbi, the

  T-HEAD PLIC implementation requires setting a delegation bit to allow access

  from S-mode. So add thead,c900-plic to distinguish them.



maintainers:

  - Sagar Kadam <sagar.kadam@sifive.com>

  - Paul Walmsley  <paul.walmsley@sifive.com>
@@ -42,12 +46,17 @@ maintainers: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - sifive,fu540-c000-plic

              - starfive,jh7100-plic

              - canaan,k210-plic

          - const: sifive,plic-1.0.0

      - items:

          - enum:

              - allwinner,sun20i-d1-plic

          - const: thead,c900-plic



  reg:

    maxItems: 1

drivers/irqchip/irq-gic-v3-its.c

+3 −0
Original line number Diff line number Diff line
@@ -5517,6 +5517,9 @@ int __init its_lpi_memreserve_init(void) 
	if (!efi_enabled(EFI_CONFIG_TABLES))

		return 0;



	if (list_empty(&its_nodes))

		return 0;



	gic_rdists->cpuhp_memreserve_state = CPUHP_INVALID;

	state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,

				  "irqchip/arm/gicv3/memreserve:online",

drivers/irqchip/irq-sifive-plic.c

+1 −0
Original line number Diff line number Diff line
@@ -398,3 +398,4 @@ static int __init plic_init(struct device_node *node, 


IRQCHIP_DECLARE(sifive_plic, "sifive,plic-1.0.0", plic_init);

IRQCHIP_DECLARE(riscv_plic0, "riscv,plic0", plic_init); /* for legacy systems */

IRQCHIP_DECLARE(thead_c900_plic, "thead,c900-plic", plic_init); /* for firmware driver */