Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aaf8630 authored Oct 17, 2016 by David S. Miller

Merge branch 'mv88e6xxx-interrupt-support'



Andrew Lunn says:

====================
Interrupt support for mv88e6xxx

This patchset add interrupt controller support to the MV88E6xxx.  This
allows access to the interrupts the internal PHY generate. These
interrupts can then be associated to a PHY device in the device tree
and used by the PHY lib, rather than polling.

Since interrupt handling needs to make MDIO bus accesses, threaded
interrupts are used. The phylib needs to request the PHY interrupt
using the threaded IRQ API. This in term allows some simplification to
the code, in that the phylib interrupt handler can directly call
phy_change(), rather than use a work queue. The work queue is however
retained for the phy_mac_interrupt() call, which can be called in hard
interrupt context.

Since RFC v1:

Keep phy_mac_interrupt() callable in hard IRQ context.

The fix to trigger the phy state machine transitions on interrupts has
already been submitted, so is dropped from here.

Added back shared interrupts support.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 9c7cbcf5 f283745b

Documentation/devicetree/bindings/net/dsa/marvell.txt

+20 −1

Original line number	Diff line number	Diff line
		@@ -20,16 +20,35 @@ Required properties:
		Optional properties:

		- reset-gpios : Should be a gpio specifier for a reset line

		- interrupt-parent : Parent interrupt controller
		- interrupts : Interrupt from the switch
		- interrupt-controller : Indicates the switch is itself an interrupt
		controller. This is used for the PHY interrupts.
		#interrupt-cells = <2> : Controller uses two cells, number and flag
		- mdio : container of PHY and devices on the switches MDIO
		bus
		Example:

		mdio {
		#address-cells = <1>;
		#size-cells = <0>;
		interrupt-parent = <&gpio0>;
		interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
		interrupt-controller;
		#interrupt-cells = <2>;

		switch0: switch@0 {
		compatible = "marvell,mv88e6085";
		reg = <0>;
		reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
		};
		mdio {
		#address-cells = <1>;
		#size-cells = <0>;
		switch1phy0: switch1phy0@0 {
		reg = <0>;
		interrupt-parent = <&switch0>;
		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
		};
		};
		};

arch/arm/boot/dts/vf610-zii-dev-rev-b.dts

+51 −0

Original line number	Diff line number	Diff line
		@@ -88,10 +88,16 @@

		switch0: switch0@0 {
		compatible = "marvell,mv88e6085";
		pinctrl-0 = <&pinctrl_gpio_switch0>;
		pinctrl-names = "default";
		#address-cells = <1>;
		#size-cells = <0>;
		reg = <0>;
		dsa,member = <0 0>;
		interrupt-parent = <&gpio0>;
		interrupts = <27 IRQ_TYPE_LEVEL_LOW>;
		interrupt-controller;
		#interrupt-cells = <2>;

		ports {
		#address-cells = <1>;
		@@ -99,16 +105,19 @@
		port@0 {
		reg = <0>;
		label = "lan0";
		phy-handle = <&switch0phy0>;
		};

		port@1 {
		reg = <1>;
		label = "lan1";
		phy-handle = <&switch0phy1>;
		};

		port@2 {
		reg = <2>;
		label = "lan2";
		phy-handle = <&switch0phy2>;
		};

		switch0port5: port@5 {
		@@ -133,6 +142,24 @@
		};
		};
		};
		mdio {
		#address-cells = <1>;
		#size-cells = <0>;
		switch0phy0: switch0phy0@0 {
		reg = <0>;
		interrupt-parent = <&switch0>;
		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
		};
		switch0phy1: switch1phy0@1 {
		reg = <1>;
		interrupt-parent = <&switch0>;
		interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; };
		switch0phy2: switch1phy0@2 {
		reg = <2>;
		interrupt-parent = <&switch0>;
		interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
		};
		};
		};
		};

		@@ -143,10 +170,16 @@

		switch1: switch1@0 {
		compatible = "marvell,mv88e6085";
		pinctrl-0 = <&pinctrl_gpio_switch1>;
		pinctrl-names = "default";
		#address-cells = <1>;
		#size-cells = <0>;
		reg = <0>;
		dsa,member = <0 1>;
		interrupt-parent = <&gpio0>;
		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
		interrupt-controller;
		#interrupt-cells = <2>;

		ports {
		#address-cells = <1>;
		@@ -196,12 +229,18 @@
		#size-cells = <0>;
		switch1phy0: switch1phy0@0 {
		reg = <0>;
		interrupt-parent = <&switch1>;
		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
		};
		switch1phy1: switch1phy0@1 {
		reg = <1>;
		interrupt-parent = <&switch1>;
		interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
		};
		switch1phy2: switch1phy0@2 {
		reg = <2>;
		interrupt-parent = <&switch1>;
		interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
		};
		};
		};
		@@ -636,6 +675,18 @@
		>;
		};

		pinctrl_gpio_switch0: pinctrl-gpio-switch0 {
		fsl,pins = <
		VF610_PAD_PTB5__GPIO_27 0x219d
		>;
		};

		pinctrl_gpio_switch1: pinctrl-gpio-switch1 {
		fsl,pins = <
		VF610_PAD_PTB4__GPIO_26 0x219d
		>;
		};

		pinctrl_i2c_mux_reset: pinctrl-i2c-mux-reset {
		fsl,pins = <
		VF610_PAD_PTE14__GPIO_119 0x31c2

drivers/net/dsa/mv88e6xxx/chip.c

+238 −10

Original line number	Diff line number	Diff line
		@@ -18,11 +18,15 @@
		#include <linux/etherdevice.h>
		#include <linux/ethtool.h>
		#include <linux/if_bridge.h>
		#include <linux/interrupt.h>
		#include <linux/irq.h>
		#include <linux/irqdomain.h>
		#include <linux/jiffies.h>
		#include <linux/list.h>
		#include <linux/mdio.h>
		#include <linux/module.h>
		#include <linux/of_device.h>
		#include <linux/of_irq.h>
		#include <linux/of_mdio.h>
		#include <linux/netdevice.h>
		#include <linux/gpio/consumer.h>
		@@ -323,6 +327,164 @@ static int mv88e6xxx_serdes_write(struct mv88e6xxx_chip *chip, int reg, u16 val)
		reg, val);
		}

		static void mv88e6xxx_g1_irq_mask(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);
		unsigned int n = d->hwirq;

		chip->g1_irq.masked \|= (1 << n);
		}

		static void mv88e6xxx_g1_irq_unmask(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);
		unsigned int n = d->hwirq;

		chip->g1_irq.masked &= ~(1 << n);
		}

		static irqreturn_t mv88e6xxx_g1_irq_thread_fn(int irq, void *dev_id)
		{
		struct mv88e6xxx_chip *chip = dev_id;
		unsigned int nhandled = 0;
		unsigned int sub_irq;
		unsigned int n;
		u16 reg;
		int err;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_g1_read(chip, GLOBAL_STATUS, &reg);
		mutex_unlock(&chip->reg_lock);

		if (err)
		goto out;

		for (n = 0; n < chip->g1_irq.nirqs; ++n) {
		if (reg & (1 << n)) {
		sub_irq = irq_find_mapping(chip->g1_irq.domain, n);
		handle_nested_irq(sub_irq);
		++nhandled;
		}
		}
		out:
		return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
		}

		static void mv88e6xxx_g1_irq_bus_lock(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);

		mutex_lock(&chip->reg_lock);
		}

		static void mv88e6xxx_g1_irq_bus_sync_unlock(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);
		u16 mask = GENMASK(chip->g1_irq.nirqs, 0);
		u16 reg;
		int err;

		err = mv88e6xxx_g1_read(chip, GLOBAL_CONTROL, &reg);
		if (err)
		goto out;

		reg &= ~mask;
		reg \|= (~chip->g1_irq.masked & mask);

		err = mv88e6xxx_g1_write(chip, GLOBAL_CONTROL, reg);
		if (err)
		goto out;

		out:
		mutex_unlock(&chip->reg_lock);
		}

		static struct irq_chip mv88e6xxx_g1_irq_chip = {
		.name = "mv88e6xxx-g1",
		.irq_mask = mv88e6xxx_g1_irq_mask,
		.irq_unmask = mv88e6xxx_g1_irq_unmask,
		.irq_bus_lock = mv88e6xxx_g1_irq_bus_lock,
		.irq_bus_sync_unlock = mv88e6xxx_g1_irq_bus_sync_unlock,
		};

		static int mv88e6xxx_g1_irq_domain_map(struct irq_domain *d,
		unsigned int irq,
		irq_hw_number_t hwirq)
		{
		struct mv88e6xxx_chip *chip = d->host_data;

		irq_set_chip_data(irq, d->host_data);
		irq_set_chip_and_handler(irq, &chip->g1_irq.chip, handle_level_irq);
		irq_set_noprobe(irq);

		return 0;
		}

		static const struct irq_domain_ops mv88e6xxx_g1_irq_domain_ops = {
		.map = mv88e6xxx_g1_irq_domain_map,
		.xlate = irq_domain_xlate_twocell,
		};

		static void mv88e6xxx_g1_irq_free(struct mv88e6xxx_chip *chip)
		{
		int irq, virq;

		for (irq = 0; irq < 16; irq++) {
		virq = irq_find_mapping(chip->g2_irq.domain, irq);
		irq_dispose_mapping(virq);
		}

		irq_domain_remove(chip->g2_irq.domain);
		}

		static int mv88e6xxx_g1_irq_setup(struct mv88e6xxx_chip *chip)
		{
		int err, irq;
		u16 reg;

		chip->g1_irq.nirqs = chip->info->g1_irqs;
		chip->g1_irq.domain = irq_domain_add_simple(
		NULL, chip->g1_irq.nirqs, 0,
		&mv88e6xxx_g1_irq_domain_ops, chip);
		if (!chip->g1_irq.domain)
		return -ENOMEM;

		for (irq = 0; irq < chip->g1_irq.nirqs; irq++)
		irq_create_mapping(chip->g1_irq.domain, irq);

		chip->g1_irq.chip = mv88e6xxx_g1_irq_chip;
		chip->g1_irq.masked = ~0;

		err = mv88e6xxx_g1_read(chip, GLOBAL_CONTROL, &reg);
		if (err)
		goto out;

		reg &= ~GENMASK(chip->g1_irq.nirqs, 0);

		err = mv88e6xxx_g1_write(chip, GLOBAL_CONTROL, reg);
		if (err)
		goto out;

		/* Reading the interrupt status clears (most of) them */
		err = mv88e6xxx_g1_read(chip, GLOBAL_STATUS, &reg);
		if (err)
		goto out;

		err = request_threaded_irq(chip->irq, NULL,
		mv88e6xxx_g1_irq_thread_fn,
		IRQF_ONESHOT \| IRQF_TRIGGER_FALLING,
		dev_name(chip->dev), chip);
		if (err)
		goto out;

		return 0;

		out:
		mv88e6xxx_g1_irq_free(chip);

		return err;
		}

		int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask)
		{
		int i;
		@@ -2770,7 +2932,11 @@ static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip)
		/* Enable the PHY Polling Unit if present, don't discard any packets,
		* and mask all interrupt sources.
		*/
		reg = 0;
		err = mv88e6xxx_g1_read(chip, GLOBAL_CONTROL, &reg);
		if (err < 0)
		return err;

		reg &= ~GLOBAL_CONTROL_PPU_ENABLE;
		if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_PPU) \|\|
		mv88e6xxx_has(chip, MV88E6XXX_FLAG_PPU_ACTIVE))
		reg \|= GLOBAL_CONTROL_PPU_ENABLE;
		@@ -2875,10 +3041,6 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)

		mutex_lock(&chip->reg_lock);

		err = mv88e6xxx_switch_reset(chip);
		if (err)
		goto unlock;

		/* Setup Switch Port Registers */
		for (i = 0; i < mv88e6xxx_num_ports(chip); i++) {
		err = mv88e6xxx_setup_port(chip, i);
		@@ -3326,6 +3488,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 8,
		.flags = MV88E6XXX_FLAGS_FAMILY_6097,
		.ops = &mv88e6085_ops,
		},
		@@ -3339,6 +3502,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 8,
		.flags = MV88E6XXX_FLAGS_FAMILY_6095,
		.ops = &mv88e6095_ops,
		},
		@@ -3352,6 +3516,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6165,
		.ops = &mv88e6123_ops,
		},
		@@ -3365,6 +3530,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6185,
		.ops = &mv88e6131_ops,
		},
		@@ -3378,6 +3544,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6165,
		.ops = &mv88e6161_ops,
		},
		@@ -3391,6 +3558,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6165,
		.ops = &mv88e6165_ops,
		},
		@@ -3404,6 +3572,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6351,
		.ops = &mv88e6171_ops,
		},
		@@ -3417,6 +3586,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6352,
		.ops = &mv88e6172_ops,
		},
		@@ -3430,6 +3600,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6351,
		.ops = &mv88e6175_ops,
		},
		@@ -3443,6 +3614,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6352,
		.ops = &mv88e6176_ops,
		},
		@@ -3456,6 +3628,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 8,
		.flags = MV88E6XXX_FLAGS_FAMILY_6185,
		.ops = &mv88e6185_ops,
		},
		@@ -3469,6 +3642,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6352,
		.ops = &mv88e6240_ops,
		},
		@@ -3482,6 +3656,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 8,
		.flags = MV88E6XXX_FLAGS_FAMILY_6320,
		.ops = &mv88e6320_ops,
		},
		@@ -3495,6 +3670,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 8,
		.flags = MV88E6XXX_FLAGS_FAMILY_6320,
		.ops = &mv88e6321_ops,
		},
		@@ -3508,6 +3684,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6351,
		.ops = &mv88e6350_ops,
		},
		@@ -3521,6 +3698,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6351,
		.ops = &mv88e6351_ops,
		},
		@@ -3534,6 +3712,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
		.port_base_addr = 0x10,
		.global1_addr = 0x1b,
		.age_time_coeff = 15000,
		.g1_irqs = 9,
		.flags = MV88E6XXX_FLAGS_FAMILY_6352,
		.ops = &mv88e6352_ops,
		},
		@@ -3667,6 +3846,12 @@ static const char mv88e6xxx_drv_probe(struct device dsa_dev,
		if (err)
		goto free;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_switch_reset(chip);
		mutex_unlock(&chip->reg_lock);
		if (err)
		goto free;

		mv88e6xxx_phy_init(chip);

		err = mv88e6xxx_mdio_register(chip, NULL);
		@@ -3837,17 +4022,56 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
		!of_property_read_u32(np, "eeprom-length", &eeprom_len))
		chip->eeprom_len = eeprom_len;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_switch_reset(chip);
		mutex_unlock(&chip->reg_lock);
		if (err)
		goto out;

		chip->irq = of_irq_get(np, 0);
		if (chip->irq == -EPROBE_DEFER) {
		err = chip->irq;
		goto out;
		}

		if (chip->irq > 0) {
		/* Has to be performed before the MDIO bus is created,
		* because the PHYs will link there interrupts to these
		* interrupt controllers
		*/
		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_g1_irq_setup(chip);
		mutex_unlock(&chip->reg_lock);

		if (err)
		goto out;

		if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_INT)) {
		err = mv88e6xxx_g2_irq_setup(chip);
		if (err)
		goto out_g1_irq;
		}
		}

		err = mv88e6xxx_mdio_register(chip, np);
		if (err)
		return err;
		goto out_g2_irq;

		err = mv88e6xxx_register_switch(chip, np);
		if (err) {
		mv88e6xxx_mdio_unregister(chip);
		return err;
		}
		if (err)
		goto out_mdio;

		return 0;

		out_mdio:
		mv88e6xxx_mdio_unregister(chip);
		out_g2_irq:
		if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_INT))
		mv88e6xxx_g2_irq_free(chip);
		out_g1_irq:
		mv88e6xxx_g1_irq_free(chip);
		out:
		return err;
		}

		static void mv88e6xxx_remove(struct mdio_device *mdiodev)
		@@ -3858,6 +4082,10 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)
		mv88e6xxx_phy_destroy(chip);
		mv88e6xxx_unregister_switch(chip);
		mv88e6xxx_mdio_unregister(chip);

		if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_G2_INT))
		mv88e6xxx_g2_irq_free(chip);
		mv88e6xxx_g1_irq_free(chip);
		}

		static const struct of_device_id mv88e6xxx_of_match[] = {

drivers/net/dsa/mv88e6xxx/global2.c

+138 −1

Original line number	Diff line number	Diff line
		/*
		* Marvell 88E6xxx Switch Global 2 Registers support (device address 0x1C)
		* Marvell 88E6xxx Switch Global 2 Registers support (device address
		* 0x1C)
		*
		* Copyright (c) 2008 Marvell Semiconductor
		*
		@@ -11,6 +12,7 @@
		* (at your option) any later version.
		*/

		#include <linux/irqdomain.h>
		#include "mv88e6xxx.h"
		#include "global2.h"

		@@ -417,6 +419,141 @@ int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, int addr, int reg,
		return mv88e6xxx_g2_smi_phy_cmd(chip, cmd);
		}

		static void mv88e6xxx_g2_irq_mask(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);
		unsigned int n = d->hwirq;

		chip->g2_irq.masked \|= (1 << n);
		}

		static void mv88e6xxx_g2_irq_unmask(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);
		unsigned int n = d->hwirq;

		chip->g2_irq.masked &= ~(1 << n);
		}

		static irqreturn_t mv88e6xxx_g2_irq_thread_fn(int irq, void *dev_id)
		{
		struct mv88e6xxx_chip *chip = dev_id;
		unsigned int nhandled = 0;
		unsigned int sub_irq;
		unsigned int n;
		int err;
		u16 reg;

		mutex_lock(&chip->reg_lock);
		err = mv88e6xxx_g2_read(chip, GLOBAL2_INT_SOURCE, &reg);
		mutex_unlock(&chip->reg_lock);
		if (err)
		goto out;

		for (n = 0; n < 16; ++n) {
		if (reg & (1 << n)) {
		sub_irq = irq_find_mapping(chip->g2_irq.domain, n);
		handle_nested_irq(sub_irq);
		++nhandled;
		}
		}
		out:
		return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
		}

		static void mv88e6xxx_g2_irq_bus_lock(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);

		mutex_lock(&chip->reg_lock);
		}

		static void mv88e6xxx_g2_irq_bus_sync_unlock(struct irq_data *d)
		{
		struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);

		mv88e6xxx_g2_write(chip, GLOBAL2_INT_MASK, ~chip->g2_irq.masked);

		mutex_unlock(&chip->reg_lock);
		}

		static struct irq_chip mv88e6xxx_g2_irq_chip = {
		.name = "mv88e6xxx-g2",
		.irq_mask = mv88e6xxx_g2_irq_mask,
		.irq_unmask = mv88e6xxx_g2_irq_unmask,
		.irq_bus_lock = mv88e6xxx_g2_irq_bus_lock,
		.irq_bus_sync_unlock = mv88e6xxx_g2_irq_bus_sync_unlock,
		};

		static int mv88e6xxx_g2_irq_domain_map(struct irq_domain *d,
		unsigned int irq,
		irq_hw_number_t hwirq)
		{
		struct mv88e6xxx_chip *chip = d->host_data;

		irq_set_chip_data(irq, d->host_data);
		irq_set_chip_and_handler(irq, &chip->g2_irq.chip, handle_level_irq);
		irq_set_noprobe(irq);

		return 0;
		}

		static const struct irq_domain_ops mv88e6xxx_g2_irq_domain_ops = {
		.map = mv88e6xxx_g2_irq_domain_map,
		.xlate = irq_domain_xlate_twocell,
		};

		void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip)
		{
		int irq, virq;

		for (irq = 0; irq < 16; irq++) {
		virq = irq_find_mapping(chip->g2_irq.domain, irq);
		irq_dispose_mapping(virq);
		}

		irq_domain_remove(chip->g2_irq.domain);
		}

		int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)
		{
		int device_irq;
		int err, irq;

		if (!chip->dev->of_node)
		return -EINVAL;

		chip->g2_irq.domain = irq_domain_add_simple(
		chip->dev->of_node, 16, 0, &mv88e6xxx_g2_irq_domain_ops, chip);
		if (!chip->g2_irq.domain)
		return -ENOMEM;

		for (irq = 0; irq < 16; irq++)
		irq_create_mapping(chip->g2_irq.domain, irq);

		chip->g2_irq.chip = mv88e6xxx_g2_irq_chip;
		chip->g2_irq.masked = ~0;

		device_irq = irq_find_mapping(chip->g1_irq.domain,
		GLOBAL_STATUS_IRQ_DEVICE);
		if (device_irq < 0) {
		err = device_irq;
		goto out;
		}

		err = devm_request_threaded_irq(chip->dev, device_irq, NULL,
		mv88e6xxx_g2_irq_thread_fn,
		IRQF_ONESHOT, "mv88e6xxx-g1", chip);
		if (err)
		goto out;

		return 0;
		out:
		mv88e6xxx_g2_irq_free(chip);

		return err;
		}

		int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip)
		{
		u16 reg;

drivers/net/dsa/mv88e6xxx/global2.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ int mv88e6xxx_g2_get_eeprom16(struct mv88e6xxx_chip *chip,
		int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip,
		struct ethtool_eeprom eeprom, u8 data);
		int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip);
		int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip);
		void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip);

		#else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */

		@@ -83,6 +85,15 @@ static inline int mv88e6xxx_g2_setup(struct mv88e6xxx_chip *chip)
		return -EOPNOTSUPP;
		}

		static inline int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)
		{
		return -EOPNOTSUPP;
		}

		static inline void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip)
		{
		}

		#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */

		#endif /* _MV88E6XXX_GLOBAL2_H */