Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Browse files Browse the repository at this point in the history 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: hv: fix smp problems in the hyperv core code
  Staging: et131x: Fix 2.6.33rc1 regression in et131x
  Staging: asus_oled: fix oops in 2.6.32.2
  • Loading branch information
Linus Torvalds committed Jan 21, 2010
2 parents f8c7e6c + 7692fd4 commit 4caca5f
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 45 deletions.
12 changes: 8 additions & 4 deletions drivers/staging/asus_oled/asus_oled.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,11 @@ static ssize_t set_enabled(struct device *dev, struct device_attribute *attr,
{
struct usb_interface *intf = to_usb_interface(dev);
struct asus_oled_dev *odev = usb_get_intfdata(intf);
int temp = strict_strtoul(buf, 10, NULL);
unsigned long value;
if (strict_strtoul(buf, 10, &value))
return -EINVAL;

enable_oled(odev, temp);
enable_oled(odev, value);

return count;
}
Expand All @@ -207,10 +209,12 @@ static ssize_t class_set_enabled(struct device *device,
{
struct asus_oled_dev *odev =
(struct asus_oled_dev *) dev_get_drvdata(device);
unsigned long value;

int temp = strict_strtoul(buf, 10, NULL);
if (strict_strtoul(buf, 10, &value))
return -EINVAL;

enable_oled(odev, temp);
enable_oled(odev, value);

return count;
}
Expand Down
18 changes: 13 additions & 5 deletions drivers/staging/et131x/et1310_address_map.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,14 @@ typedef struct _GLOBAL_t { /* Location: */
* 9-0: pr ndes
*/

#define ET_DMA10_MASK 0x3FF /* 10 bit mask for DMA10W types */
#define ET_DMA10_WRAP 0x400
#define ET_DMA4_MASK 0x00F /* 4 bit mask for DMA4W types */
#define ET_DMA4_WRAP 0x010

#define ET_DMA12_MASK 0x0FFF /* 12 bit mask for DMA12W types */
#define ET_DMA12_WRAP 0x1000
#define ET_DMA10_MASK 0x03FF /* 10 bit mask for DMA10W types */
#define ET_DMA10_WRAP 0x0400
#define ET_DMA4_MASK 0x000F /* 4 bit mask for DMA4W types */
#define ET_DMA4_WRAP 0x0010

#define INDEX12(x) ((x) & ET_DMA12_MASK)
#define INDEX10(x) ((x) & ET_DMA10_MASK)
#define INDEX4(x) ((x) & ET_DMA4_MASK)

Expand All @@ -216,6 +219,11 @@ extern inline void add_10bit(u32 *v, int n)
*v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP);
}

extern inline void add_12bit(u32 *v, int n)
{
*v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP);
}

/*
* 10bit DMA with wrap
* txdma tx queue write address reg in txdma address map at 0x1010
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/et131x/et1310_rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,10 +831,10 @@ PMP_RFD nic_rx_pkts(struct et131x_adapter *etdev)

/* Indicate that we have used this PSR entry. */
/* FIXME wrap 12 */
rx_local->local_psr_full = (rx_local->local_psr_full + 1) & 0xFFF;
if (rx_local->local_psr_full > rx_local->PsrNumEntries - 1) {
add_12bit(&rx_local->local_psr_full, 1);
if ((rx_local->local_psr_full & 0xFFF) > rx_local->PsrNumEntries - 1) {
/* Clear psr full and toggle the wrap bit */
rx_local->local_psr_full &= 0xFFF;
rx_local->local_psr_full &= ~0xFFF;
rx_local->local_psr_full ^= 0x1000;
}

Expand Down
50 changes: 25 additions & 25 deletions drivers/staging/hv/Hv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,21 +386,22 @@ u16 HvSignalEvent(void)
* retrieve the initialized message and event pages. Otherwise, we create and
* initialize the message and event pages.
*/
int HvSynicInit(u32 irqVector)
void HvSynicInit(void *irqarg)
{
u64 version;
union hv_synic_simp simp;
union hv_synic_siefp siefp;
union hv_synic_sint sharedSint;
union hv_synic_scontrol sctrl;
u64 guestID;
int ret = 0;
u32 irqVector = *((u32 *)(irqarg));
int cpu = smp_processor_id();

DPRINT_ENTER(VMBUS);

if (!gHvContext.HypercallPage) {
DPRINT_EXIT(VMBUS);
return ret;
return;
}

/* Check the version */
Expand All @@ -425,27 +426,27 @@ int HvSynicInit(u32 irqVector)
*/
rdmsrl(HV_X64_MSR_GUEST_OS_ID, guestID);
if (guestID == HV_LINUX_GUEST_ID) {
gHvContext.synICMessagePage[0] =
gHvContext.synICMessagePage[cpu] =
phys_to_virt(simp.BaseSimpGpa << PAGE_SHIFT);
gHvContext.synICEventPage[0] =
gHvContext.synICEventPage[cpu] =
phys_to_virt(siefp.BaseSiefpGpa << PAGE_SHIFT);
} else {
DPRINT_ERR(VMBUS, "unknown guest id!!");
goto Cleanup;
}
DPRINT_DBG(VMBUS, "MAPPED: Simp: %p, Sifep: %p",
gHvContext.synICMessagePage[0],
gHvContext.synICEventPage[0]);
gHvContext.synICMessagePage[cpu],
gHvContext.synICEventPage[cpu]);
} else {
gHvContext.synICMessagePage[0] = osd_PageAlloc(1);
if (gHvContext.synICMessagePage[0] == NULL) {
gHvContext.synICMessagePage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
if (gHvContext.synICMessagePage[cpu] == NULL) {
DPRINT_ERR(VMBUS,
"unable to allocate SYNIC message page!!");
goto Cleanup;
}

gHvContext.synICEventPage[0] = osd_PageAlloc(1);
if (gHvContext.synICEventPage[0] == NULL) {
gHvContext.synICEventPage[cpu] = (void *)get_zeroed_page(GFP_ATOMIC);
if (gHvContext.synICEventPage[cpu] == NULL) {
DPRINT_ERR(VMBUS,
"unable to allocate SYNIC event page!!");
goto Cleanup;
Expand All @@ -454,7 +455,7 @@ int HvSynicInit(u32 irqVector)
/* Setup the Synic's message page */
rdmsrl(HV_X64_MSR_SIMP, simp.AsUINT64);
simp.SimpEnabled = 1;
simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[0])
simp.BaseSimpGpa = virt_to_phys(gHvContext.synICMessagePage[cpu])
>> PAGE_SHIFT;

DPRINT_DBG(VMBUS, "HV_X64_MSR_SIMP msr set to: %llx",
Expand All @@ -465,7 +466,7 @@ int HvSynicInit(u32 irqVector)
/* Setup the Synic's event page */
rdmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);
siefp.SiefpEnabled = 1;
siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[0])
siefp.BaseSiefpGpa = virt_to_phys(gHvContext.synICEventPage[cpu])
>> PAGE_SHIFT;

DPRINT_DBG(VMBUS, "HV_X64_MSR_SIEFP msr set to: %llx",
Expand Down Expand Up @@ -501,32 +502,30 @@ int HvSynicInit(u32 irqVector)

DPRINT_EXIT(VMBUS);

return ret;
return;

Cleanup:
ret = -1;

if (gHvContext.GuestId == HV_LINUX_GUEST_ID) {
if (gHvContext.synICEventPage[0])
osd_PageFree(gHvContext.synICEventPage[0], 1);
if (gHvContext.synICEventPage[cpu])
osd_PageFree(gHvContext.synICEventPage[cpu], 1);

if (gHvContext.synICMessagePage[0])
osd_PageFree(gHvContext.synICMessagePage[0], 1);
if (gHvContext.synICMessagePage[cpu])
osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
}

DPRINT_EXIT(VMBUS);

return ret;
return;
}

/**
* HvSynicCleanup - Cleanup routine for HvSynicInit().
*/
void HvSynicCleanup(void)
void HvSynicCleanup(void *arg)
{
union hv_synic_sint sharedSint;
union hv_synic_simp simp;
union hv_synic_siefp siefp;
int cpu = smp_processor_id();

DPRINT_ENTER(VMBUS);

Expand All @@ -539,6 +538,7 @@ void HvSynicCleanup(void)

sharedSint.Masked = 1;

/* Need to correctly cleanup in the case of SMP!!! */
/* Disable the interrupt */
wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, sharedSint.AsUINT64);

Expand All @@ -560,8 +560,8 @@ void HvSynicCleanup(void)

wrmsrl(HV_X64_MSR_SIEFP, siefp.AsUINT64);

osd_PageFree(gHvContext.synICMessagePage[0], 1);
osd_PageFree(gHvContext.synICEventPage[0], 1);
osd_PageFree(gHvContext.synICMessagePage[cpu], 1);
osd_PageFree(gHvContext.synICEventPage[cpu], 1);
}

DPRINT_EXIT(VMBUS);
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/hv/Hv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static const struct hv_guid VMBUS_SERVICE_ID = {
},
};

#define MAX_NUM_CPUS 1
#define MAX_NUM_CPUS 32


struct hv_input_signal_event_buffer {
Expand Down Expand Up @@ -137,8 +137,8 @@ extern u16 HvPostMessage(union hv_connection_id connectionId,

extern u16 HvSignalEvent(void);

extern int HvSynicInit(u32 irqVector);
extern void HvSynicInit(void *irqarg);

extern void HvSynicCleanup(void);
extern void HvSynicCleanup(void *arg);

#endif /* __HV_H__ */
12 changes: 7 additions & 5 deletions drivers/staging/hv/Vmbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *AdditionalInfo)

/* strcpy(dev->name, "vmbus"); */
/* SynIC setup... */
ret = HvSynicInit(*irqvector);
on_each_cpu(HvSynicInit, (void *)irqvector, 1);

/* Connect to VMBus in the root partition */
ret = VmbusConnect();
Expand All @@ -150,7 +150,7 @@ static int VmbusOnDeviceRemove(struct hv_device *dev)
DPRINT_ENTER(VMBUS);
VmbusChannelReleaseUnattachedChannels();
VmbusDisconnect();
HvSynicCleanup();
on_each_cpu(HvSynicCleanup, NULL, 1);
DPRINT_EXIT(VMBUS);

return ret;
Expand All @@ -173,7 +173,8 @@ static void VmbusOnCleanup(struct hv_driver *drv)
*/
static void VmbusOnMsgDPC(struct hv_driver *drv)
{
void *page_addr = gHvContext.synICMessagePage[0];
int cpu = smp_processor_id();
void *page_addr = gHvContext.synICMessagePage[cpu];
struct hv_message *msg = (struct hv_message *)page_addr +
VMBUS_MESSAGE_SINT;
struct hv_message *copied;
Expand Down Expand Up @@ -230,11 +231,12 @@ static void VmbusOnEventDPC(struct hv_driver *drv)
static int VmbusOnISR(struct hv_driver *drv)
{
int ret = 0;
int cpu = smp_processor_id();
void *page_addr;
struct hv_message *msg;
union hv_synic_event_flags *event;

page_addr = gHvContext.synICMessagePage[0];
page_addr = gHvContext.synICMessagePage[cpu];
msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;

DPRINT_ENTER(VMBUS);
Expand All @@ -248,7 +250,7 @@ static int VmbusOnISR(struct hv_driver *drv)
}

/* TODO: Check if there are events to be process */
page_addr = gHvContext.synICEventPage[0];
page_addr = gHvContext.synICEventPage[cpu];
event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;

/* Since we are a child, we only need to check bit 0 */
Expand Down

0 comments on commit 4caca5f

Please sign in to comment.