Return-Path: Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=eajames@linux.vnet.ibm.com; receiver=) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zhXfp5Rx7zF0lR for ; Thu, 15 Feb 2018 08:32:02 +1100 (AEDT) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1ELTbHT057458 for ; Wed, 14 Feb 2018 16:32:00 -0500 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0b-001b2d01.pphosted.com with ESMTP id 2g4u9u4116-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 14 Feb 2018 16:31:59 -0500 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Feb 2018 16:31:59 -0500 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e12.ny.us.ibm.com (146.89.104.199) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 14 Feb 2018 16:31:56 -0500 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w1ELVuef39321646; Wed, 14 Feb 2018 21:31:56 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C40FDB2058; Wed, 14 Feb 2018 16:28:18 -0500 (EST) Received: from talon7.ibm.com (unknown [9.41.241.240]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP id 5B594B2050; Wed, 14 Feb 2018 16:28:18 -0500 (EST) From: Eddie James To: openbmc@lists.ozlabs.org Cc: joel@jms.id.au, andrew@aj.id.au, Eddie James Subject: [PATCH linux dev-4.10 v2 3/3] drivers: fsi: occ: switch to irqsave and irqrestore Date: Wed, 14 Feb 2018 15:31:48 -0600 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518643908-13449-1-git-send-email-eajames@linux.vnet.ibm.com> References: <1518643908-13449-1-git-send-email-eajames@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18021421-0048-0000-0000-0000023736D7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008535; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000253; SDB=6.00989770; UDB=6.00502607; IPR=6.00769124; BA=6.00005830; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019556; XFM=3.00000015; UTC=2018-02-14 21:31:57 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18021421-0049-0000-0000-0000442021EF Message-Id: <1518643908-13449-4-git-send-email-eajames@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-14_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802140252 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Feb 2018 21:32:03 -0000 Fix spinlocking by storing the interrupt state and restoring that state when unlocking, instead of blindly disabling and re-enabling all irqs. Signed-off-by: Eddie James --- drivers/fsi/occ.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/drivers/fsi/occ.c b/drivers/fsi/occ.c index adc64f3..edb5e977 100644 --- a/drivers/fsi/occ.c +++ b/drivers/fsi/occ.c @@ -118,18 +118,19 @@ struct occ_client { static int occ_enqueue_xfr(struct occ_xfr *xfr) { int empty; + unsigned long flags; struct occ_client *client = to_client(xfr); struct occ *occ = client->occ; if (occ->cancel) return -ENODEV; - spin_lock_irq(&occ->list_lock); + spin_lock_irqsave(&occ->list_lock, flags); empty = list_empty(&occ->xfrs); list_add_tail(&xfr->link, &occ->xfrs); - spin_unlock_irq(&occ->list_lock); + spin_unlock_irqrestore(&occ->list_lock, flags); if (empty) queue_work(occ_wq, &occ->work); @@ -201,6 +202,7 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, size_t bytes; struct occ_xfr *xfr; struct occ *occ; + unsigned long flags; if (!client) return -ENODEV; @@ -212,7 +214,7 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, xfr = &client->xfr; occ = client->occ; - spin_lock_irq(&client->lock); + spin_lock_irqsave(&client->lock, flags); if (!test_bit(CLIENT_XFR_PENDING, &client->flags)) { /* we just finished reading all data, return 0 */ @@ -232,12 +234,12 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, goto done; } - spin_unlock_irq(&client->lock); + spin_unlock_irqrestore(&client->lock, flags); rc = wait_event_interruptible(client->wait, occ_read_ready(xfr, occ)); - spin_lock_irq(&client->lock); + spin_lock_irqsave(&client->lock, flags); if (!test_bit(XFR_COMPLETE, &xfr->flags)) { if (occ->cancel || test_bit(XFR_CANCELED, &xfr->flags)) @@ -274,7 +276,7 @@ static ssize_t occ_read_common(struct occ_client *client, char __user *ubuf, rc = bytes; done: - spin_unlock_irq(&client->lock); + spin_unlock_irqrestore(&client->lock, flags); occ_put_client(client); return rc; } @@ -293,6 +295,7 @@ static ssize_t occ_write_common(struct occ_client *client, { int rc; unsigned int i; + unsigned long flags; u16 data_length, checksum = 0; struct occ_xfr *xfr; @@ -305,7 +308,7 @@ static ssize_t occ_write_common(struct occ_client *client, occ_get_client(client); xfr = &client->xfr; - spin_lock_irq(&client->lock); + spin_lock_irqsave(&client->lock, flags); if (test_bit(CLIENT_XFR_PENDING, &client->flags)) { rc = -EBUSY; @@ -353,7 +356,7 @@ static ssize_t occ_write_common(struct occ_client *client, rc = len; done: - spin_unlock_irq(&client->lock); + spin_unlock_irqrestore(&client->lock, flags); occ_put_client(client); return rc; } @@ -370,6 +373,7 @@ static int occ_release_common(struct occ_client *client) { struct occ *occ; struct occ_xfr *xfr; + unsigned long flags; if (!client) return -ENODEV; @@ -377,13 +381,13 @@ static int occ_release_common(struct occ_client *client) xfr = &client->xfr; occ = client->occ; - spin_lock_irq(&client->lock); + spin_lock_irqsave(&client->lock, flags); set_bit(XFR_CANCELED, &xfr->flags); if (!test_bit(CLIENT_XFR_PENDING, &client->flags)) goto done; - spin_lock_irq(&occ->list_lock); + spin_lock(&occ->list_lock); if (!test_bit(XFR_IN_PROGRESS, &xfr->flags)) { /* already deleted from list if complete */ @@ -391,12 +395,12 @@ static int occ_release_common(struct occ_client *client) list_del(&xfr->link); } - spin_unlock_irq(&occ->list_lock); + spin_unlock(&occ->list_lock); wake_up_all(&client->wait); done: - spin_unlock_irq(&client->lock); + spin_unlock_irqrestore(&client->lock, flags); occ_put_client(client); return 0; @@ -606,6 +610,7 @@ static void occ_worker(struct work_struct *work) { int rc = 0, empty; u16 resp_data_length; + unsigned long flags; unsigned long start; const unsigned long timeout = msecs_to_jiffies(OCC_TIMEOUT_MS); const long int wait_time = msecs_to_jiffies(OCC_CMD_IN_PRG_WAIT_MS); @@ -619,11 +624,11 @@ static void occ_worker(struct work_struct *work) if (occ->cancel) return; - spin_lock_irq(&occ->list_lock); + spin_lock_irqsave(&occ->list_lock, flags); xfr = list_first_entry_or_null(&occ->xfrs, struct occ_xfr, link); if (!xfr) { - spin_unlock_irq(&occ->list_lock); + spin_unlock_irqrestore(&occ->list_lock, flags); return; } @@ -632,7 +637,7 @@ static void occ_worker(struct work_struct *work) resp = (struct occ_response *)xfr->buf; set_bit(XFR_IN_PROGRESS, &xfr->flags); - spin_unlock_irq(&occ->list_lock); + spin_unlock_irqrestore(&occ->list_lock, flags); mutex_lock(&occ->occ_lock); start = jiffies; @@ -686,13 +691,13 @@ static void occ_worker(struct work_struct *work) xfr->rc = rc; set_bit(XFR_COMPLETE, &xfr->flags); - spin_lock_irq(&occ->list_lock); + spin_lock_irqsave(&occ->list_lock, flags); clear_bit(XFR_IN_PROGRESS, &xfr->flags); list_del(&xfr->link); empty = list_empty(&occ->xfrs); - spin_unlock_irq(&occ->list_lock); + spin_unlock_irqrestore(&occ->list_lock, flags); wake_up_interruptible(&client->wait); occ_put_client(client); @@ -810,15 +815,16 @@ static int occ_remove(struct platform_device *pdev) struct occ *occ = platform_get_drvdata(pdev); struct occ_xfr *xfr; struct occ_client *client; + unsigned long flags; occ->cancel = true; - spin_lock_irq(&occ->list_lock); + spin_lock_irqsave(&occ->list_lock, flags); list_for_each_entry(xfr, &occ->xfrs, link) { client = to_client(xfr); wake_up_all(&client->wait); } - spin_unlock_irq(&occ->list_lock); + spin_unlock_irqrestore(&occ->list_lock, flags); misc_deregister(&occ->mdev); device_for_each_child(&pdev->dev, NULL, occ_unregister_child); -- 1.8.3.1