intel_th: pci: Use drvdata for quirks

Allow attaching miscellaneous quirk information to devices as drvdata.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>

diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index d1760003b4a42cd66eaff3edae1876762436fe91..e915ab24f434594a267dd8da968df2451218b63c 100644 (file)
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -576,6 +576,7 @@ intel_th_subdevice_alloc(struct intel_th *th,
        if (!thdev)
                return ERR_PTR(-ENOMEM);
 
+       thdev->drvdata = th->drvdata;
 
        memcpy(res, subdev->res,
               sizeof(struct resource) * subdev->nres);
@@ -789,8 +790,8 @@ static const struct file_operations intel_th_output_fops = {
  * @irq:       irq number
  */
 struct intel_th *
-intel_th_alloc(struct device *dev, struct resource *devres,
-              unsigned int ndevres, int irq)
+intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,
+              struct resource *devres, unsigned int ndevres, int irq)
 {
        struct intel_th *th;
        int err;
@@ -812,6 +813,7 @@ intel_th_alloc(struct device *dev, struct resource *devres,
                goto err_ida;
        }
        th->dev = dev;
+       th->drvdata = drvdata;
 
        th->resource = devres;
        th->num_resources = ndevres;

diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
index 3f4558404dcab55cb36c8dd88888448756cdb176..68244602ca29cecb2b226c74b8f6723ced8531f7 100644 (file)
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -47,9 +47,20 @@ struct intel_th_output {
        bool            active;
 };
 
+/**
+ * struct intel_th_drvdata - describes hardware capabilities and quirks
+ * @tscu_enable:       device needs SW to enable time stamping unit
+ */
+struct intel_th_drvdata {
+       unsigned int    tscu_enable        : 1;
+};
+
+#define INTEL_TH_CAP(_th, _cap) ((_th)->drvdata ? (_th)->drvdata->_cap : 0)
+
 /**
  * struct intel_th_device - device on the intel_th bus
  * @dev:               device
+ * @drvdata:           hardware capabilities/quirks
  * @resource:          array of resources available to this device
  * @num_resources:     number of resources in @resource array
  * @type:              INTEL_TH_{SOURCE,OUTPUT,SWITCH}
@@ -59,11 +70,12 @@ struct intel_th_output {
  * @name:              device name to match the driver
  */
 struct intel_th_device {
-       struct device   dev;
-       struct resource *resource;
-       unsigned int    num_resources;
-       unsigned int    type;
-       int             id;
+       struct device           dev;
+       struct intel_th_drvdata *drvdata;
+       struct resource         *resource;
+       unsigned int            num_resources;
+       unsigned int            type;
+       int                     id;
 
        /* INTEL_TH_SWITCH specific */
        bool                    host_mode;
@@ -206,8 +218,8 @@ static inline struct intel_th *to_intel_th(struct intel_th_device *thdev)
 }
 
 struct intel_th *
-intel_th_alloc(struct device *dev, struct resource *devres,
-              unsigned int ndevres, int irq);
+intel_th_alloc(struct device *dev, struct intel_th_drvdata *drvdata,
+              struct resource *devres, unsigned int ndevres, int irq);
 void intel_th_free(struct intel_th *th);
 
 int intel_th_driver_register(struct intel_th_driver *thdrv);
@@ -248,6 +260,7 @@ struct intel_th {
 
        struct intel_th_device  *thdev[TH_SUBDEVICE_MAX];
        struct intel_th_device  *hub;
+       struct intel_th_drvdata *drvdata;
 
        struct resource         *resource;
        unsigned int            num_thdevs;

diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index 5a9a9e8072a91a88ae3d5167d13b1484ccb5e894..aed6d594991e6449a3a036bb74d7153edf56235e 100644 (file)
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -30,6 +30,7 @@
 static int intel_th_pci_probe(struct pci_dev *pdev,
                              const struct pci_device_id *id)
 {
+       struct intel_th_drvdata *drvdata = (void *)id->driver_data;
        struct intel_th *th;
        int err;
 
@@ -41,7 +42,7 @@ static int intel_th_pci_probe(struct pci_dev *pdev,
        if (err)
                return err;
 
-       th = intel_th_alloc(&pdev->dev, pdev->resource,
+       th = intel_th_alloc(&pdev->dev, drvdata, pdev->resource,
                            DEVICE_COUNT_RESOURCE, pdev->irq);
        if (IS_ERR(th))
                return PTR_ERR(th);