From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32D41C3DA71 for ; Thu, 15 Dec 2022 20:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbiLOUbC (ORCPT ); Thu, 15 Dec 2022 15:31:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbiLOUbA (ORCPT ); Thu, 15 Dec 2022 15:31:00 -0500 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F176B25C8; Thu, 15 Dec 2022 12:30:57 -0800 (PST) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BFJXLVQ006630; Thu, 15 Dec 2022 20:30:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=qcppdkim1; bh=ivclD4ZjYk405PGRQkkcLZYQK2uA+gJcpKZXUisdsXo=; b=OJWb/ria/Q8TMapnc7JuYlSk9VNhTOE4toXfiZ0ZR/vI+B22V1VWhzUL+7V1jTbDwFfX 9nrTNFmlt1g5CH7lHrIm4QAPTnn/bmh49dKzSS6w6KAym9A3prMiQ3pM+fdzEetc+Xao jmuupf0jQDqtZ9Oytk+ZCO6EOrKmbmkfYb06B4pmYmb5j3NbPqzvOdjvGjX3CO1wLSkN DQniwhNPYXQXc6efVW5e9bAlscP27EgOH9ohVvgyG+vor1bnV5v7+Iudqv+U9hfh2u3d eU8AJt8+mwNi9EMF6aie8c18lZoEnSbiPoBta4ElpOSogH0wGqWSoLjYf1jesWAw7p+e ZA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3mg6terwqt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 20:30:50 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 2BFKUnxs020185 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 20:30:49 GMT Received: from [10.110.127.101] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 15 Dec 2022 12:30:47 -0800 Message-ID: Date: Thu, 15 Dec 2022 12:30:47 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [PATCH v2] drm/msm/dp: do not complete dp_aux_cmd_fifo_tx() if irq is not for aux transfer Content-Language: en-US To: Dmitry Baryshkov , Kuogee Hsieh , , , , , , , , , CC: , , , , References: <1671129159-31105-1-git-send-email-quic_khsieh@quicinc.com> From: Abhinav Kumar In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: _uiniIUgIX97M3nY9Iy1Oz5wuu0CHpou X-Proofpoint-GUID: _uiniIUgIX97M3nY9Iy1Oz5wuu0CHpou X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-15_11,2022-12-15_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 adultscore=0 mlxscore=0 bulkscore=0 spamscore=0 phishscore=0 mlxlogscore=955 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212150171 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/15/2022 10:46 AM, Dmitry Baryshkov wrote: > On 15/12/2022 20:32, Kuogee Hsieh wrote: >> There are 3 possible interrupt sources are handled by DP controller, >> HPDstatus, Controller state changes and Aux read/write transaction. >> At every irq, DP controller have to check isr status of every interrupt >> sources and service the interrupt if its isr status bits shows interrupts >> are pending. There is potential race condition may happen at current aux >> isr handler implementation since it is always complete >> dp_aux_cmd_fifo_tx() >> even irq is not for aux read or write transaction. This may cause aux >> read >> transaction return premature if host aux data read is in the middle of >> waiting for sink to complete transferring data to host while irq happen. >> This will cause host's receiving buffer contains unexpected data. This >> patch fixes this problem by checking aux isr and return immediately at >> aux isr handler if there are no any isr status bits set. >> >> Current there is a bug report regrading eDP edid corruption happen during >> system booting up. After lengthy debugging to found that VIDEO_READY >> interrupt was continuously firing during system booting up which cause >> dp_aux_isr() to complete dp_aux_cmd_fifo_tx() prematurely to retrieve >> data >> from aux hardware buffer which is not yet contains complete data transfer >> from sink. This cause edid corruption. >> >> Follows are the signature at kernel logs when problem happen, >> EDID has corrupt header >> panel-simple-dp-aux aux-aea0000.edp: Couldn't identify panel via EDID >> panel-simple-dp-aux aux-aea0000.edp: error -EIO: Couldn't detect panel >> nor find a fallback >> >> Changes in v2: >> -- do complete if (ret == IRQ_HANDLED) ay dp-aux_isr() >> -- add more commit text > > Usually it's a single dash. > >> >> Fixes: c943b4948b58 ("drm/msm/dp: add displayPort driver support") >> >> Signed-off-by: Kuogee Hsieh > > There should be no empty lines between the tags. > >> Tested-by: Douglas Anderson >> Reviewed-by: Abhinav Kumar >> --- >>   drivers/gpu/drm/msm/dp/dp_aux.c | 87 >> +++++++++++++++++++++++++++++------------ >>   1 file changed, 63 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c >> b/drivers/gpu/drm/msm/dp/dp_aux.c >> index d030a93..f31e5c1 100644 >> --- a/drivers/gpu/drm/msm/dp/dp_aux.c >> +++ b/drivers/gpu/drm/msm/dp/dp_aux.c >> @@ -162,45 +162,78 @@ static ssize_t dp_aux_cmd_fifo_rx(struct >> dp_aux_private *aux, >>       return i; >>   } >> -static void dp_aux_native_handler(struct dp_aux_private *aux, u32 isr) >> +static irqreturn_t dp_aux_native_handler(struct dp_aux_private *aux, >> u32 isr) >>   { >> -    if (isr & DP_INTR_AUX_I2C_DONE) >> +    irqreturn_t ret = IRQ_NONE; >> + >> +    if (isr & DP_INTR_AUX_I2C_DONE) { >>           aux->aux_error_num = DP_AUX_ERR_NONE; >> -    else if (isr & DP_INTR_WRONG_ADDR) >> +        ret = IRQ_HANDLED; >> +    } else if (isr & DP_INTR_WRONG_ADDR) { >>           aux->aux_error_num = DP_AUX_ERR_ADDR; >> -    else if (isr & DP_INTR_TIMEOUT) >> +        ret = IRQ_HANDLED; >> +    } else if (isr & DP_INTR_TIMEOUT) { >>           aux->aux_error_num = DP_AUX_ERR_TOUT; >> -    if (isr & DP_INTR_NACK_DEFER) >> +        ret = IRQ_HANDLED; >> +    } >> + >> +    if (isr & DP_INTR_NACK_DEFER) { >>           aux->aux_error_num = DP_AUX_ERR_NACK; >> +        ret = IRQ_HANDLED; >> +    } >> + >>       if (isr & DP_INTR_AUX_ERROR) { >>           aux->aux_error_num = DP_AUX_ERR_PHY; >>           dp_catalog_aux_clear_hw_interrupts(aux->catalog); >> +        ret = IRQ_HANDLED; >>       } >> + >> +    return ret; >>   } >> -static void dp_aux_i2c_handler(struct dp_aux_private *aux, u32 isr) >> +static irqreturn_t dp_aux_i2c_handler(struct dp_aux_private *aux, u32 >> isr) >>   { >> +    irqreturn_t ret = IRQ_NONE; >> + >>       if (isr & DP_INTR_AUX_I2C_DONE) { >>           if (isr & (DP_INTR_I2C_NACK | DP_INTR_I2C_DEFER)) >>               aux->aux_error_num = DP_AUX_ERR_NACK; >>           else >>               aux->aux_error_num = DP_AUX_ERR_NONE; >> -    } else { >> -        if (isr & DP_INTR_WRONG_ADDR) >> -            aux->aux_error_num = DP_AUX_ERR_ADDR; >> -        else if (isr & DP_INTR_TIMEOUT) >> -            aux->aux_error_num = DP_AUX_ERR_TOUT; >> -        if (isr & DP_INTR_NACK_DEFER) >> -            aux->aux_error_num = DP_AUX_ERR_NACK_DEFER; >> -        if (isr & DP_INTR_I2C_NACK) >> -            aux->aux_error_num = DP_AUX_ERR_NACK; >> -        if (isr & DP_INTR_I2C_DEFER) >> -            aux->aux_error_num = DP_AUX_ERR_DEFER; >> -        if (isr & DP_INTR_AUX_ERROR) { >> -            aux->aux_error_num = DP_AUX_ERR_PHY; >> -            dp_catalog_aux_clear_hw_interrupts(aux->catalog); >> -        } >> + >> +        return IRQ_HANDLED; >> +    } >> + >> +    if (isr & DP_INTR_WRONG_ADDR) { >> +        aux->aux_error_num = DP_AUX_ERR_ADDR; >> +        ret = IRQ_HANDLED; >> +    } else if (isr & DP_INTR_TIMEOUT) { >> +        aux->aux_error_num = DP_AUX_ERR_TOUT; >> +        ret = IRQ_HANDLED; >>       } >> + >> +    if (isr & DP_INTR_NACK_DEFER) { >> +        aux->aux_error_num = DP_AUX_ERR_NACK_DEFER; >> +        ret = IRQ_HANDLED; >> +    } >> + >> +    if (isr & DP_INTR_I2C_NACK) { >> +        aux->aux_error_num = DP_AUX_ERR_NACK; >> +        ret = IRQ_HANDLED; >> +    } >> + >> +    if (isr & DP_INTR_I2C_DEFER) { >> +        aux->aux_error_num = DP_AUX_ERR_DEFER; >> +        ret = IRQ_HANDLED; >> +    } >> + >> +    if (isr & DP_INTR_AUX_ERROR) { >> +        aux->aux_error_num = DP_AUX_ERR_PHY; >> +        dp_catalog_aux_clear_hw_interrupts(aux->catalog); >> +        ret = IRQ_HANDLED; >> +    } >> + >> +    return ret; >>   } >>   static void dp_aux_update_offset_and_segment(struct dp_aux_private >> *aux, >> @@ -413,6 +446,7 @@ void dp_aux_isr(struct drm_dp_aux *dp_aux) >>   { >>       u32 isr; >>       struct dp_aux_private *aux; >> +    irqreturn_t ret = IRQ_NONE; > > No need to assign a value here. It will be overwritten in both of code > branches. > >>       if (!dp_aux) { >>           DRM_ERROR("invalid input\n"); >> @@ -423,15 +457,20 @@ void dp_aux_isr(struct drm_dp_aux *dp_aux) >>       isr = dp_catalog_aux_get_irq(aux->catalog); >> +    /* no interrupts pending, return immediately */ >> +    if (!isr) >> +        return; >> + > > A separate commit please. > >>       if (!aux->cmd_busy) >>           return; >>       if (aux->native) >> -        dp_aux_native_handler(aux, isr); >> +        ret = dp_aux_native_handler(aux, isr); >>       else >> -        dp_aux_i2c_handler(aux, isr); >> +        ret = dp_aux_i2c_handler(aux, isr); >> -    complete(&aux->comp); >> +    if (ret == IRQ_HANDLED) >> +        complete(&aux->comp); > > Can you just move the complete() into the individual handling functions? > Then you won't have to return the error code from dp_aux_*_handler() at > all. You can check `isr' in that function and call complete if there was > any error. > > Also could you please describe, why is it necessary to complete() > condition at all? Judging from your commit message the `if (!isr) > return;' part should be enough. > Yes, and thats why I wrote that from a functionality standpoint, the original v1 posted was enough to fix this issue. But, this version is better because of the irq return value. So, if IRQ_HANDLED Vs IRQ_NONE handling is better with this. >>   } >>   void dp_aux_reconfig(struct drm_dp_aux *dp_aux) >