forked from Minki/linux
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
224 lines
6.2 KiB
C
224 lines
6.2 KiB
C
/*
|
|
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
|
|
* Copyright © 2006-2008 Intel Corporation
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Eric Anholt <eric@anholt.net>
|
|
*/
|
|
#include <linux/i2c.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/i2c-id.h>
|
|
#include <linux/i2c-algo-bit.h>
|
|
#include "drmP.h"
|
|
#include "drm.h"
|
|
#include "intel_drv.h"
|
|
#include "i915_drm.h"
|
|
#include "i915_drv.h"
|
|
|
|
void intel_i2c_quirk_set(struct drm_device *dev, bool enable)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
/* When using bit bashing for I2C, this bit needs to be set to 1 */
|
|
if (!IS_PINEVIEW(dev))
|
|
return;
|
|
if (enable)
|
|
I915_WRITE(DSPCLK_GATE_D,
|
|
I915_READ(DSPCLK_GATE_D) | DPCUNIT_CLOCK_GATE_DISABLE);
|
|
else
|
|
I915_WRITE(DSPCLK_GATE_D,
|
|
I915_READ(DSPCLK_GATE_D) & (~DPCUNIT_CLOCK_GATE_DISABLE));
|
|
}
|
|
|
|
/*
|
|
* Intel GPIO access functions
|
|
*/
|
|
|
|
#define I2C_RISEFALL_TIME 20
|
|
|
|
static int get_clock(void *data)
|
|
{
|
|
struct intel_i2c_chan *chan = data;
|
|
struct drm_i915_private *dev_priv = chan->drm_dev->dev_private;
|
|
u32 val;
|
|
|
|
val = I915_READ(chan->reg);
|
|
return ((val & GPIO_CLOCK_VAL_IN) != 0);
|
|
}
|
|
|
|
static int get_data(void *data)
|
|
{
|
|
struct intel_i2c_chan *chan = data;
|
|
struct drm_i915_private *dev_priv = chan->drm_dev->dev_private;
|
|
u32 val;
|
|
|
|
val = I915_READ(chan->reg);
|
|
return ((val & GPIO_DATA_VAL_IN) != 0);
|
|
}
|
|
|
|
static void set_clock(void *data, int state_high)
|
|
{
|
|
struct intel_i2c_chan *chan = data;
|
|
struct drm_device *dev = chan->drm_dev;
|
|
struct drm_i915_private *dev_priv = chan->drm_dev->dev_private;
|
|
u32 reserved = 0, clock_bits;
|
|
|
|
/* On most chips, these bits must be preserved in software. */
|
|
if (!IS_I830(dev) && !IS_845G(dev))
|
|
reserved = I915_READ(chan->reg) & (GPIO_DATA_PULLUP_DISABLE |
|
|
GPIO_CLOCK_PULLUP_DISABLE);
|
|
|
|
if (state_high)
|
|
clock_bits = GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK;
|
|
else
|
|
clock_bits = GPIO_CLOCK_DIR_OUT | GPIO_CLOCK_DIR_MASK |
|
|
GPIO_CLOCK_VAL_MASK;
|
|
I915_WRITE(chan->reg, reserved | clock_bits);
|
|
udelay(I2C_RISEFALL_TIME); /* wait for the line to change state */
|
|
}
|
|
|
|
static void set_data(void *data, int state_high)
|
|
{
|
|
struct intel_i2c_chan *chan = data;
|
|
struct drm_device *dev = chan->drm_dev;
|
|
struct drm_i915_private *dev_priv = chan->drm_dev->dev_private;
|
|
u32 reserved = 0, data_bits;
|
|
|
|
/* On most chips, these bits must be preserved in software. */
|
|
if (!IS_I830(dev) && !IS_845G(dev))
|
|
reserved = I915_READ(chan->reg) & (GPIO_DATA_PULLUP_DISABLE |
|
|
GPIO_CLOCK_PULLUP_DISABLE);
|
|
|
|
if (state_high)
|
|
data_bits = GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK;
|
|
else
|
|
data_bits = GPIO_DATA_DIR_OUT | GPIO_DATA_DIR_MASK |
|
|
GPIO_DATA_VAL_MASK;
|
|
|
|
I915_WRITE(chan->reg, reserved | data_bits);
|
|
udelay(I2C_RISEFALL_TIME); /* wait for the line to change state */
|
|
}
|
|
|
|
/* Clears the GMBUS setup. Our driver doesn't make use of the GMBUS I2C
|
|
* engine, but if the BIOS leaves it enabled, then that can break our use
|
|
* of the bit-banging I2C interfaces. This is notably the case with the
|
|
* Mac Mini in EFI mode.
|
|
*/
|
|
void
|
|
intel_i2c_reset_gmbus(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
if (HAS_PCH_SPLIT(dev)) {
|
|
I915_WRITE(PCH_GMBUS0, 0);
|
|
} else {
|
|
I915_WRITE(GMBUS0, 0);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* intel_i2c_create - instantiate an Intel i2c bus using the specified GPIO reg
|
|
* @dev: DRM device
|
|
* @output: driver specific output device
|
|
* @reg: GPIO reg to use
|
|
* @name: name for this bus
|
|
* @slave_addr: slave address (if fixed)
|
|
*
|
|
* Creates and registers a new i2c bus with the Linux i2c layer, for use
|
|
* in output probing and control (e.g. DDC or SDVO control functions).
|
|
*
|
|
* Possible values for @reg include:
|
|
* %GPIOA
|
|
* %GPIOB
|
|
* %GPIOC
|
|
* %GPIOD
|
|
* %GPIOE
|
|
* %GPIOF
|
|
* %GPIOG
|
|
* %GPIOH
|
|
* see PRM for details on how these different busses are used.
|
|
*/
|
|
struct i2c_adapter *intel_i2c_create(struct drm_device *dev, const u32 reg,
|
|
const char *name)
|
|
{
|
|
struct intel_i2c_chan *chan;
|
|
|
|
chan = kzalloc(sizeof(struct intel_i2c_chan), GFP_KERNEL);
|
|
if (!chan)
|
|
goto out_free;
|
|
|
|
chan->drm_dev = dev;
|
|
chan->reg = reg;
|
|
snprintf(chan->adapter.name, I2C_NAME_SIZE, "intel drm %s", name);
|
|
chan->adapter.owner = THIS_MODULE;
|
|
chan->adapter.algo_data = &chan->algo;
|
|
chan->adapter.dev.parent = &dev->pdev->dev;
|
|
chan->algo.setsda = set_data;
|
|
chan->algo.setscl = set_clock;
|
|
chan->algo.getsda = get_data;
|
|
chan->algo.getscl = get_clock;
|
|
chan->algo.udelay = 20;
|
|
chan->algo.timeout = usecs_to_jiffies(2200);
|
|
chan->algo.data = chan;
|
|
|
|
i2c_set_adapdata(&chan->adapter, chan);
|
|
|
|
if(i2c_bit_add_bus(&chan->adapter))
|
|
goto out_free;
|
|
|
|
intel_i2c_reset_gmbus(dev);
|
|
|
|
/* JJJ: raise SCL and SDA? */
|
|
intel_i2c_quirk_set(dev, true);
|
|
set_data(chan, 1);
|
|
set_clock(chan, 1);
|
|
intel_i2c_quirk_set(dev, false);
|
|
udelay(20);
|
|
|
|
return &chan->adapter;
|
|
|
|
out_free:
|
|
kfree(chan);
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* intel_i2c_destroy - unregister and free i2c bus resources
|
|
* @output: channel to free
|
|
*
|
|
* Unregister the adapter from the i2c layer, then free the structure.
|
|
*/
|
|
void intel_i2c_destroy(struct i2c_adapter *adapter)
|
|
{
|
|
struct intel_i2c_chan *chan;
|
|
|
|
if (!adapter)
|
|
return;
|
|
|
|
chan = container_of(adapter,
|
|
struct intel_i2c_chan,
|
|
adapter);
|
|
i2c_del_adapter(&chan->adapter);
|
|
kfree(chan);
|
|
}
|