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>
209 lines
5.4 KiB
C
209 lines
5.4 KiB
C
#include <scsi/scsi.h>
|
|
#include <scsi/scsi_host.h>
|
|
#include <scsi/scsi_cmnd.h>
|
|
#include <scsi/scsi_device.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "usb.h"
|
|
#include "transport.h"
|
|
#include "protocol.h"
|
|
#include "scsiglue.h"
|
|
#include "sierra_ms.h"
|
|
#include "debug.h"
|
|
|
|
#define SWIMS_USB_REQUEST_SetSwocMode 0x0B
|
|
#define SWIMS_USB_REQUEST_GetSwocInfo 0x0A
|
|
#define SWIMS_USB_INDEX_SetMode 0x0000
|
|
#define SWIMS_SET_MODE_Modem 0x0001
|
|
|
|
#define TRU_NORMAL 0x01
|
|
#define TRU_FORCE_MS 0x02
|
|
#define TRU_FORCE_MODEM 0x03
|
|
|
|
static unsigned int swi_tru_install = 1;
|
|
module_param(swi_tru_install, uint, S_IRUGO | S_IWUSR);
|
|
MODULE_PARM_DESC(swi_tru_install, "TRU-Install mode (1=Full Logic (def),"
|
|
" 2=Force CD-Rom, 3=Force Modem)");
|
|
|
|
struct swoc_info {
|
|
__u8 rev;
|
|
__u8 reserved[8];
|
|
__u16 LinuxSKU;
|
|
__u16 LinuxVer;
|
|
__u8 reserved2[47];
|
|
} __attribute__((__packed__));
|
|
|
|
static bool containsFullLinuxPackage(struct swoc_info *swocInfo)
|
|
{
|
|
if ((swocInfo->LinuxSKU >= 0x2100 && swocInfo->LinuxSKU <= 0x2FFF) ||
|
|
(swocInfo->LinuxSKU >= 0x7100 && swocInfo->LinuxSKU <= 0x7FFF))
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
static int sierra_set_ms_mode(struct usb_device *udev, __u16 eSWocMode)
|
|
{
|
|
int result;
|
|
US_DEBUGP("SWIMS: %s", "DEVICE MODE SWITCH\n");
|
|
result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
|
|
SWIMS_USB_REQUEST_SetSwocMode, /* __u8 request */
|
|
USB_TYPE_VENDOR | USB_DIR_OUT, /* __u8 request type */
|
|
eSWocMode, /* __u16 value */
|
|
0x0000, /* __u16 index */
|
|
NULL, /* void *data */
|
|
0, /* __u16 size */
|
|
USB_CTRL_SET_TIMEOUT); /* int timeout */
|
|
return result;
|
|
}
|
|
|
|
|
|
static int sierra_get_swoc_info(struct usb_device *udev,
|
|
struct swoc_info *swocInfo)
|
|
{
|
|
int result;
|
|
|
|
US_DEBUGP("SWIMS: Attempting to get TRU-Install info.\n");
|
|
|
|
result = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
|
|
SWIMS_USB_REQUEST_GetSwocInfo, /* __u8 request */
|
|
USB_TYPE_VENDOR | USB_DIR_IN, /* __u8 request type */
|
|
0, /* __u16 value */
|
|
0, /* __u16 index */
|
|
(void *) swocInfo, /* void *data */
|
|
sizeof(struct swoc_info), /* __u16 size */
|
|
USB_CTRL_SET_TIMEOUT); /* int timeout */
|
|
|
|
swocInfo->LinuxSKU = le16_to_cpu(swocInfo->LinuxSKU);
|
|
swocInfo->LinuxVer = le16_to_cpu(swocInfo->LinuxVer);
|
|
return result;
|
|
}
|
|
|
|
static void debug_swoc(struct swoc_info *swocInfo)
|
|
{
|
|
US_DEBUGP("SWIMS: SWoC Rev: %02d \n", swocInfo->rev);
|
|
US_DEBUGP("SWIMS: Linux SKU: %04X \n", swocInfo->LinuxSKU);
|
|
US_DEBUGP("SWIMS: Linux Version: %04X \n", swocInfo->LinuxVer);
|
|
}
|
|
|
|
|
|
static ssize_t show_truinst(struct device *dev, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct swoc_info *swocInfo;
|
|
struct usb_interface *intf = to_usb_interface(dev);
|
|
struct usb_device *udev = interface_to_usbdev(intf);
|
|
int result;
|
|
if (swi_tru_install == TRU_FORCE_MS) {
|
|
result = snprintf(buf, PAGE_SIZE, "Forced Mass Storage\n");
|
|
} else {
|
|
swocInfo = kmalloc(sizeof(struct swoc_info), GFP_KERNEL);
|
|
if (!swocInfo) {
|
|
US_DEBUGP("SWIMS: Allocation failure\n");
|
|
snprintf(buf, PAGE_SIZE, "Error\n");
|
|
return -ENOMEM;
|
|
}
|
|
result = sierra_get_swoc_info(udev, swocInfo);
|
|
if (result < 0) {
|
|
US_DEBUGP("SWIMS: failed SWoC query\n");
|
|
kfree(swocInfo);
|
|
snprintf(buf, PAGE_SIZE, "Error\n");
|
|
return -EIO;
|
|
}
|
|
debug_swoc(swocInfo);
|
|
result = snprintf(buf, PAGE_SIZE,
|
|
"REV=%02d SKU=%04X VER=%04X\n",
|
|
swocInfo->rev,
|
|
swocInfo->LinuxSKU,
|
|
swocInfo->LinuxVer);
|
|
kfree(swocInfo);
|
|
}
|
|
return result;
|
|
}
|
|
static DEVICE_ATTR(truinst, S_IWUGO | S_IRUGO, show_truinst, NULL);
|
|
|
|
int sierra_ms_init(struct us_data *us)
|
|
{
|
|
int result, retries;
|
|
signed long delay_t;
|
|
struct swoc_info *swocInfo;
|
|
struct usb_device *udev;
|
|
struct Scsi_Host *sh;
|
|
struct scsi_device *sd;
|
|
|
|
delay_t = 2;
|
|
retries = 3;
|
|
result = 0;
|
|
udev = us->pusb_dev;
|
|
|
|
sh = us_to_host(us);
|
|
sd = scsi_get_host_dev(sh);
|
|
|
|
US_DEBUGP("SWIMS: sierra_ms_init called\n");
|
|
|
|
/* Force Modem mode */
|
|
if (swi_tru_install == TRU_FORCE_MODEM) {
|
|
US_DEBUGP("SWIMS: %s", "Forcing Modem Mode\n");
|
|
result = sierra_set_ms_mode(udev, SWIMS_SET_MODE_Modem);
|
|
if (result < 0)
|
|
US_DEBUGP("SWIMS: Failed to switch to modem mode.\n");
|
|
return -EIO;
|
|
}
|
|
/* Force Mass Storage mode (keep CD-Rom) */
|
|
else if (swi_tru_install == TRU_FORCE_MS) {
|
|
US_DEBUGP("SWIMS: %s", "Forcing Mass Storage Mode\n");
|
|
goto complete;
|
|
}
|
|
/* Normal TRU-Install Logic */
|
|
else {
|
|
US_DEBUGP("SWIMS: %s", "Normal SWoC Logic\n");
|
|
|
|
swocInfo = kmalloc(sizeof(struct swoc_info),
|
|
GFP_KERNEL);
|
|
if (!swocInfo) {
|
|
US_DEBUGP("SWIMS: %s", "Allocation failure\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
retries = 3;
|
|
do {
|
|
retries--;
|
|
result = sierra_get_swoc_info(udev, swocInfo);
|
|
if (result < 0) {
|
|
US_DEBUGP("SWIMS: %s", "Failed SWoC query\n");
|
|
schedule_timeout_uninterruptible(2*HZ);
|
|
}
|
|
} while (retries && result < 0);
|
|
|
|
if (result < 0) {
|
|
US_DEBUGP("SWIMS: %s",
|
|
"Completely failed SWoC query\n");
|
|
kfree(swocInfo);
|
|
return -EIO;
|
|
}
|
|
|
|
debug_swoc(swocInfo);
|
|
|
|
/* If there is not Linux software on the TRU-Install device
|
|
* then switch to modem mode
|
|
*/
|
|
if (!containsFullLinuxPackage(swocInfo)) {
|
|
US_DEBUGP("SWIMS: %s",
|
|
"Switching to Modem Mode\n");
|
|
result = sierra_set_ms_mode(udev,
|
|
SWIMS_SET_MODE_Modem);
|
|
if (result < 0)
|
|
US_DEBUGP("SWIMS: Failed to switch modem\n");
|
|
kfree(swocInfo);
|
|
return -EIO;
|
|
}
|
|
kfree(swocInfo);
|
|
}
|
|
complete:
|
|
result = device_create_file(&us->pusb_intf->dev, &dev_attr_truinst);
|
|
|
|
return 0;
|
|
}
|
|
|