Skip to contentSkip to conversation

USB: pch_udc: USB gadget device support for Intel Quark X1000

PATCH In review Chen, Alvin 3 participants 8 messages Aug 4, 2014 – Aug 20, 2014 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: pch_udc: USB gadget device support for Intel Quark X1000

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

---
 drivers/usb/gadget/udc/Kconfig   |    3 ++-
 drivers/usb/gadget/udc/pch_udc.c |   22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/Kconfig +2 -1
index 5151f94..34ebaa6 100644
@@ -332,7 +332,7 @@ config USB_GOKU
 	   gadget drivers to also be dynamically linked.
 
 config USB_EG20T
-	tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
+	tristate "Intel QUARK X1000/EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
 	depends on PCI
 	help
 	  This is a USB device driver for EG20T PCH.
@@ -353,6 +353,7 @@ config USB_EG20T
 	  ML7213/ML7831 is companion chip for Intel Atom E6xx series.
 	  ML7213/ML7831 is completely compatible for Intel EG20T PCH.
 
+	  This driver can be used with Intel's Quark X1000 SOC platform
 #
 # LAST -- dummy/emulated controller
 #
drivers/usb/gadget/udc/pch_udc.c +19 -3
index eb8c3be..460d953 100644
@@ -343,6 +343,7 @@ struct pch_vbus_gpio_data {
  * @setup_data:		Received setup data
  * @phys_addr:		of device memory
  * @base_addr:		for mapped device memory
+ * @bar:		Indicates which PCI BAR for USB regs
  * @irq:		IRQ line for the device
  * @cfg_data:		current cfg, intf, and alt in use
  * @vbus_gpio:		GPIO informaton for detecting VBUS
@@ -370,14 +371,17 @@ struct pch_udc_dev {
 	struct usb_ctrlrequest		setup_data;
 	unsigned long			phys_addr;
 	void __iomem			*base_addr;
+	unsigned			bar;
 	unsigned			irq;
 	struct pch_udc_cfg_data		cfg_data;
 	struct pch_vbus_gpio_data	vbus_gpio;
 };
 #define to_pch_udc(g)	(container_of((g), struct pch_udc_dev, gadget))
 
+#define PCH_UDC_PCI_BAR_QUARK_X1000	0
 #define PCH_UDC_PCI_BAR			1
 #define PCI_DEVICE_ID_INTEL_EG20T_UDC	0x8808
+#define PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC	0x0939
 #define PCI_VENDOR_ID_ROHM		0x10DB
 #define PCI_DEVICE_ID_ML7213_IOH_UDC	0x801D
 #define PCI_DEVICE_ID_ML7831_IOH_UDC	0x8808
@@ -3076,7 +3080,7 @@ static void pch_udc_remove(struct pci_dev *pdev)
 		iounmap(dev->base_addr);
 	if (dev->mem_region)
 		release_mem_region(dev->phys_addr,
-				   pci_resource_len(pdev, PCH_UDC_PCI_BAR));
+				   pci_resource_len(pdev, dev->bar));
 	if (dev->active)
 		pci_disable_device(pdev);
 	kfree(dev);
@@ -3144,9 +3148,15 @@ static int pch_udc_probe(struct pci_dev *pdev,
 	dev->active = 1;
 	pci_set_drvdata(pdev, dev);
 
+	/* Determine BAR based on PCI ID */
+	if (id->device == PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC)
+		dev->bar = PCH_UDC_PCI_BAR_QUARK_X1000;
+	else
+		dev->bar = PCH_UDC_PCI_BAR;
+
 	/* PCI resource allocation */
-	resource = pci_resource_start(pdev, 1);
-	len = pci_resource_len(pdev, 1);
+	resource = pci_resource_start(pdev, dev->bar);
+	len = pci_resource_len(pdev, dev->bar);
 
 	if (!request_mem_region(resource, len, KBUILD_MODNAME)) {
 		dev_err(&pdev->dev, "%s: pci device used already\n", __func__);
@@ -3212,6 +3222,12 @@ finished:
 
 static const struct pci_device_id pch_udc_pcidev_id[] = {
 	{
+		PCI_DEVICE(PCI_VENDOR_ID_INTEL,
+			   PCI_DEVICE_ID_INTEL_QUARK_X1000_UDC),
+		.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
+		.class_mask = 0xffffffff,
+	},
+	{
 		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EG20T_UDC),
 		.class = (PCI_CLASS_SERIAL_USB << 8) | 0xfe,
 		.class_mask = 0xffffffff,
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 6 lines

Hi,

Quoted 2 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

Quoted 7 lines
Quoted 5 lines

This patch is to enable the USB gadget device for Intel Quark X1000

Can someone confirm to me this is not another incarnation of chipidea ?

No, this is not another incarnation of chipidea. And its cover letter is as following:

Quoted 6 lines · Alvin

From: "Alvin (Weike) Chen" <[email protected]>

Hi,
Intel Quark X1000 consists of one USB gadget device which can be PCI enumerated. pch_udc layer doesn't support it. Thus, we add support for Intel Quark X1000 USB gadget device as well.

#3 lore raw

Hi,

Quoted 12 lines · Alvin
Quoted 12 lines

Hi,

Quoted 7 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

Quoted 11 lines
Quoted 1 line

Can someone confirm to me this is not another incarnation of chipidea ?

No, this is not another incarnation of chipidea. And its cover letter is as following:

Quoted 6 lines · Alvin

From: "Alvin (Weike) Chen" <[email protected]>

Hi,
Intel Quark X1000 consists of one USB gadget device which can be PCI enumerated. pch_udc layer doesn't support it. Thus, we add support for Intel Quark X1000 USB gadget device as well.

hehe, right I *know* what the patch is doing. I can read the diff and figure out that you're adding support for Quark to PCH UDC because Quark's USB IP is the same, what I wasking was if that IP was actually an instance of the chipidea UDC. After looking at the address space definitions on both drivers, I see that it's not.

So tomorrow I'll look at this patch again.

Signature · 1 line
balbi
#4 lore raw
In reply to Chen, Alvin

Hi Greg,

Quoted 7 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

this patch is basically just a new device ID being added to an existing driver, do you mind if I add it to the -rc or you prefer to wait for v3.18 merge window ?

Signature · 1 line
balbi
maintainer
#5 lore raw
Quoted 7 lines · Felipe Balbi

Hi Greg,

Quoted 4 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

Quoted 7 lines
Quoted 3 lines

this patch is basically just a new device ID being added to an existing driver, do you mind if I add it to the -rc or you prefer to wait for v3.18 merge window ?

New ids are fine for -rc and stable kernels, don't wait for 3.18.

thanks,

greg k-h

#6 lore raw
Quoted 12 lines · Greg KH
Quoted 11 lines · Felipe Balbi

Hi Greg,

Quoted 7 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

Quoted 5 lines
Quoted 3 lines

this patch is basically just a new device ID being added to an existing driver, do you mind if I add it to the -rc or you prefer to wait for v3.18 merge window ?

New ids are fine for -rc and stable kernels, don't wait for 3.18.

it does a little more than that as it needs to select the proper PCI BAR for Quark, I guess that's still fine ?

Original patch here:

http://marc.info/?l=linux-kernel&m=140714448511662&w=2

Signature · 1 line
balbi
maintainer
#7 lore raw
Quoted 13 lines · Felipe Balbi
Quoted 12 lines · Greg KH
Quoted 11 lines · Felipe Balbi

Hi Greg,

Quoted 7 lines · Alvin

From: Bryan O'Donoghue <[email protected]>

This patch is to enable the USB gadget device for Intel Quark X1000

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

this patch is basically just a new device ID being added to an existing driver, do you mind if I add it to the -rc or you prefer to wait for v3.18 merge window ?

New ids are fine for -rc and stable kernels, don't wait for 3.18.

it does a little more than that as it needs to select the proper PCI BAR for Quark, I guess that's still fine ?

Yes, as it's totally safe if you don't have this hardware, so all should be good.

thanks,

greg k-h