* [PATCH 2/2] ipc: add intel-mid's pci id macros
2013-12-03 0:20 [PATCH 1/2] ipc: simplify platform data approach David Cohen
@ 2013-12-03 0:20 ` David Cohen
2013-12-19 0:25 ` [PATCH 1/2] ipc: simplify platform data approach David Cohen
2014-01-14 22:57 ` David Cohen
2 siblings, 0 replies; 5+ messages in thread
From: David Cohen @ 2013-12-03 0:20 UTC (permalink / raw)
To: matthew.garrett; +Cc: platform-driver-x86, linux-kernel, David Cohen
For readability matters, this patch replaces the hardcoded pci ids by
human readable macros.
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
---
drivers/platform/x86/intel_scu_ipc.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 259969d31055..76ca094ed012 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -62,6 +62,11 @@
#define IPC_RWBUF_SIZE 20 /* IPC Read buffer Size */
#define IPC_IOC 0x100 /* IPC command register IOC bit */
+#define PCI_DEVICE_ID_LINCROFT 0x082a
+#define PCI_DEVICE_ID_PENWELL 0x080e
+#define PCI_DEVICE_ID_CLOVERVIEW 0x08ea
+#define PCI_DEVICE_ID_TANGIER 0x11a0
+
/* intel scu ipc driver data*/
struct intel_scu_ipc_pdata_t {
u32 ipc_base;
@@ -637,16 +642,16 @@ static void ipc_remove(struct pci_dev *pdev)
static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
{
- PCI_VDEVICE(INTEL, 0x082a),
+ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT),
(kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,
}, {
- PCI_VDEVICE(INTEL, 0x080e),
+ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PENWELL),
(kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
}, {
- PCI_VDEVICE(INTEL, 0x08ea),
+ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_CLOVERVIEW),
(kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
}, {
- PCI_VDEVICE(INTEL, 0x11a0),
+ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_TANGIER),
(kernel_ulong_t)&intel_scu_ipc_tangier_pdata,
}, {
0,
--
1.8.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ipc: simplify platform data approach
2013-12-03 0:20 [PATCH 1/2] ipc: simplify platform data approach David Cohen
2013-12-03 0:20 ` [PATCH 2/2] ipc: add intel-mid's pci id macros David Cohen
@ 2013-12-19 0:25 ` David Cohen
2014-01-14 22:57 ` David Cohen
2 siblings, 0 replies; 5+ messages in thread
From: David Cohen @ 2013-12-19 0:25 UTC (permalink / raw)
To: matthew.garrett; +Cc: platform-driver-x86, linux-kernel
On Mon, Dec 02, 2013 at 04:20:00PM -0800, David Cohen wrote:
> This patch removes the unnecessary enum for platform type to handle the
> array of pdatas. We can set pdata directly to pci_device_id struct
> instead.
>
> Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Ping. Comments here?
Br, David
> ---
> drivers/platform/x86/intel_scu_ipc.c | 84 +++++++++++++++++-------------------
> 1 file changed, 40 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
> index 60ea476a9130..259969d31055 100644
> --- a/drivers/platform/x86/intel_scu_ipc.c
> +++ b/drivers/platform/x86/intel_scu_ipc.c
> @@ -62,13 +62,6 @@
> #define IPC_RWBUF_SIZE 20 /* IPC Read buffer Size */
> #define IPC_IOC 0x100 /* IPC command register IOC bit */
>
> -enum {
> - SCU_IPC_LINCROFT,
> - SCU_IPC_PENWELL,
> - SCU_IPC_CLOVERVIEW,
> - SCU_IPC_TANGIER,
> -};
> -
> /* intel scu ipc driver data*/
> struct intel_scu_ipc_pdata_t {
> u32 ipc_base;
> @@ -78,35 +71,29 @@ struct intel_scu_ipc_pdata_t {
> u8 irq_mode;
> };
>
> -static struct intel_scu_ipc_pdata_t intel_scu_ipc_pdata[] = {
> - [SCU_IPC_LINCROFT] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 0,
> - },
> - [SCU_IPC_PENWELL] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 1,
> - },
> - [SCU_IPC_CLOVERVIEW] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 1,
> - },
> - [SCU_IPC_TANGIER] = {
> - .ipc_base = 0xff009000,
> - .i2c_base = 0xff00d000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 0,
> - },
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_lincroft_pdata = {
> + .ipc_base = 0xff11c000,
> + .i2c_base = 0xff12b000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 0,
> +};
> +
> +/* Penwell and Cloverview */
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_penwell_pdata = {
> + .ipc_base = 0xff11c000,
> + .i2c_base = 0xff12b000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 1,
> +};
> +
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_tangier_pdata = {
> + .ipc_base = 0xff009000,
> + .i2c_base = 0xff00d000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 0,
> };
>
> static int ipc_probe(struct pci_dev *dev, const struct pci_device_id *id);
> @@ -583,15 +570,14 @@ static irqreturn_t ioc(int irq, void *dev_id)
> */
> static int ipc_probe(struct pci_dev *dev, const struct pci_device_id *id)
> {
> - int err, pid;
> + int err;
> struct intel_scu_ipc_pdata_t *pdata;
> resource_size_t pci_resource;
>
> if (ipcdev.pdev) /* We support only one SCU */
> return -EBUSY;
>
> - pid = id->driver_data;
> - pdata = &intel_scu_ipc_pdata[pid];
> + pdata = (struct intel_scu_ipc_pdata_t *)id->driver_data;
>
> ipcdev.pdev = pci_dev_get(dev);
> ipcdev.irq_mode = pdata->irq_mode;
> @@ -650,11 +636,21 @@ static void ipc_remove(struct pci_dev *pdev)
> }
>
> static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
> - {PCI_VDEVICE(INTEL, 0x082a), SCU_IPC_LINCROFT},
> - {PCI_VDEVICE(INTEL, 0x080e), SCU_IPC_PENWELL},
> - {PCI_VDEVICE(INTEL, 0x08ea), SCU_IPC_CLOVERVIEW},
> - {PCI_VDEVICE(INTEL, 0x11a0), SCU_IPC_TANGIER},
> - { 0,}
> + {
> + PCI_VDEVICE(INTEL, 0x082a),
> + (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x080e),
> + (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x08ea),
> + (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x11a0),
> + (kernel_ulong_t)&intel_scu_ipc_tangier_pdata,
> + }, {
> + 0,
> + }
> };
> MODULE_DEVICE_TABLE(pci, pci_ids);
>
> --
> 1.8.4.2
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ipc: simplify platform data approach
2013-12-03 0:20 [PATCH 1/2] ipc: simplify platform data approach David Cohen
2013-12-03 0:20 ` [PATCH 2/2] ipc: add intel-mid's pci id macros David Cohen
2013-12-19 0:25 ` [PATCH 1/2] ipc: simplify platform data approach David Cohen
@ 2014-01-14 22:57 ` David Cohen
2014-01-21 13:30 ` Matthew Garrett
2 siblings, 1 reply; 5+ messages in thread
From: David Cohen @ 2014-01-14 22:57 UTC (permalink / raw)
To: matthew.garrett; +Cc: platform-driver-x86, linux-kernel
On Mon, Dec 02, 2013 at 04:20:00PM -0800, David Cohen wrote:
> This patch removes the unnecessary enum for platform type to handle the
> array of pdatas. We can set pdata directly to pci_device_id struct
> instead.
Ping. comments here? :)
Br, David Cohen
>
> Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
> ---
> drivers/platform/x86/intel_scu_ipc.c | 84 +++++++++++++++++-------------------
> 1 file changed, 40 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
> index 60ea476a9130..259969d31055 100644
> --- a/drivers/platform/x86/intel_scu_ipc.c
> +++ b/drivers/platform/x86/intel_scu_ipc.c
> @@ -62,13 +62,6 @@
> #define IPC_RWBUF_SIZE 20 /* IPC Read buffer Size */
> #define IPC_IOC 0x100 /* IPC command register IOC bit */
>
> -enum {
> - SCU_IPC_LINCROFT,
> - SCU_IPC_PENWELL,
> - SCU_IPC_CLOVERVIEW,
> - SCU_IPC_TANGIER,
> -};
> -
> /* intel scu ipc driver data*/
> struct intel_scu_ipc_pdata_t {
> u32 ipc_base;
> @@ -78,35 +71,29 @@ struct intel_scu_ipc_pdata_t {
> u8 irq_mode;
> };
>
> -static struct intel_scu_ipc_pdata_t intel_scu_ipc_pdata[] = {
> - [SCU_IPC_LINCROFT] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 0,
> - },
> - [SCU_IPC_PENWELL] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 1,
> - },
> - [SCU_IPC_CLOVERVIEW] = {
> - .ipc_base = 0xff11c000,
> - .i2c_base = 0xff12b000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 1,
> - },
> - [SCU_IPC_TANGIER] = {
> - .ipc_base = 0xff009000,
> - .i2c_base = 0xff00d000,
> - .ipc_len = 0x100,
> - .i2c_len = 0x10,
> - .irq_mode = 0,
> - },
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_lincroft_pdata = {
> + .ipc_base = 0xff11c000,
> + .i2c_base = 0xff12b000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 0,
> +};
> +
> +/* Penwell and Cloverview */
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_penwell_pdata = {
> + .ipc_base = 0xff11c000,
> + .i2c_base = 0xff12b000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 1,
> +};
> +
> +static struct intel_scu_ipc_pdata_t intel_scu_ipc_tangier_pdata = {
> + .ipc_base = 0xff009000,
> + .i2c_base = 0xff00d000,
> + .ipc_len = 0x100,
> + .i2c_len = 0x10,
> + .irq_mode = 0,
> };
>
> static int ipc_probe(struct pci_dev *dev, const struct pci_device_id *id);
> @@ -583,15 +570,14 @@ static irqreturn_t ioc(int irq, void *dev_id)
> */
> static int ipc_probe(struct pci_dev *dev, const struct pci_device_id *id)
> {
> - int err, pid;
> + int err;
> struct intel_scu_ipc_pdata_t *pdata;
> resource_size_t pci_resource;
>
> if (ipcdev.pdev) /* We support only one SCU */
> return -EBUSY;
>
> - pid = id->driver_data;
> - pdata = &intel_scu_ipc_pdata[pid];
> + pdata = (struct intel_scu_ipc_pdata_t *)id->driver_data;
>
> ipcdev.pdev = pci_dev_get(dev);
> ipcdev.irq_mode = pdata->irq_mode;
> @@ -650,11 +636,21 @@ static void ipc_remove(struct pci_dev *pdev)
> }
>
> static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
> - {PCI_VDEVICE(INTEL, 0x082a), SCU_IPC_LINCROFT},
> - {PCI_VDEVICE(INTEL, 0x080e), SCU_IPC_PENWELL},
> - {PCI_VDEVICE(INTEL, 0x08ea), SCU_IPC_CLOVERVIEW},
> - {PCI_VDEVICE(INTEL, 0x11a0), SCU_IPC_TANGIER},
> - { 0,}
> + {
> + PCI_VDEVICE(INTEL, 0x082a),
> + (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x080e),
> + (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x08ea),
> + (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
> + }, {
> + PCI_VDEVICE(INTEL, 0x11a0),
> + (kernel_ulong_t)&intel_scu_ipc_tangier_pdata,
> + }, {
> + 0,
> + }
> };
> MODULE_DEVICE_TABLE(pci, pci_ids);
>
> --
> 1.8.4.2
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ipc: simplify platform data approach
2014-01-14 22:57 ` David Cohen
@ 2014-01-21 13:30 ` Matthew Garrett
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Garrett @ 2014-01-21 13:30 UTC (permalink / raw)
To: david.a.cohen@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 549 bytes --]
On Tue, 2014-01-14 at 14:57 -0800, David Cohen wrote:
> On Mon, Dec 02, 2013 at 04:20:00PM -0800, David Cohen wrote:
> > This patch removes the unnecessary enum for platform type to handle the
> > array of pdatas. We can set pdata directly to pci_device_id struct
> > instead.
>
> Ping. comments here? :)
These look fine. Thanks, David!
--
Matthew Garrett <matthew.garrett@nebula.com>
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 5+ messages in thread