usb: gadget: aspeed: improve vhub port irq handling (a23be4ed) · Commits · 戴 / test

drivers/usb/gadget/udc/aspeed-vhub/core.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -134,12 +134,16 @@ static irqreturn_t ast_vhub_irq(int irq, void *data)
		}

		/* Handle device interrupts */
		for (i = 0; i < vhub->max_ports; i++) {
		u32 dev_mask = VHUB_IRQ_DEVICE1 << i;
		if (istat & vhub->port_irq_mask) {
		unsigned long bitmap = istat;
		int offset = VHUB_IRQ_DEV1_BIT;
		int size = VHUB_IRQ_DEV1_BIT + vhub->max_ports;

		if (istat & dev_mask)
		for_each_set_bit_from(offset, &bitmap, size) {
		i = offset - VHUB_IRQ_DEV1_BIT;
		ast_vhub_dev_irq(&vhub->ports[i].dev);
		}
		}

		/* Handle top-level vHub EP0 interrupts */
		if (istat & (VHUB_IRQ_HUB_EP0_OUT_ACK_STALL \|
		@@ -332,6 +336,8 @@ static int ast_vhub_probe(struct platform_device *pdev)

		spin_lock_init(&vhub->lock);
		vhub->pdev = pdev;
		vhub->port_irq_mask = GENMASK(VHUB_IRQ_DEV1_BIT + vhub->max_ports - 1,
		VHUB_IRQ_DEV1_BIT);

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		vhub->regs = devm_ioremap_resource(&pdev->dev, res);

+3 −5

Original line number	Diff line number	Diff line
		@@ -51,14 +51,11 @@
		#define VHUB_CTRL_UPSTREAM_CONNECT (1 << 0)

		/* IER & ISR */
		#define VHUB_IRQ_DEV1_BIT 9
		#define VHUB_IRQ_USB_CMD_DEADLOCK (1 << 18)
		#define VHUB_IRQ_EP_POOL_NAK (1 << 17)
		#define VHUB_IRQ_EP_POOL_ACK_STALL (1 << 16)
		#define VHUB_IRQ_DEVICE5 (1 << 13)
		#define VHUB_IRQ_DEVICE4 (1 << 12)
		#define VHUB_IRQ_DEVICE3 (1 << 11)
		#define VHUB_IRQ_DEVICE2 (1 << 10)
		#define VHUB_IRQ_DEVICE1 (1 << 9)
		#define VHUB_IRQ_DEVICE1 (1 << (VHUB_IRQ_DEV1_BIT))
		#define VHUB_IRQ_BUS_RESUME (1 << 8)
		#define VHUB_IRQ_BUS_SUSPEND (1 << 7)
		#define VHUB_IRQ_BUS_RESET (1 << 6)
		@@ -402,6 +399,7 @@ struct ast_vhub {
		/* Per-port info */
		struct ast_vhub_port *ports;
		u32 max_ports;
		u32 port_irq_mask;

		/* Generic EP data structures */
		struct ast_vhub_ep *epns;