From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3ECBB18EFF9 for ; Wed, 10 Jul 2024 10:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607787; cv=none; b=ZUudOCXluB767vhcYIvASpfR0HOfk14qHoK1KryfQMMNx8Qii+yVs7KWYclzbowYPk9aeQ9rcsDNmOx5UH1RPzreFczhooVthE/i2GHcuIowTKzsS5GntGqxDiArMS6FQ2rg/GyVgph97ilIdSxxWOUzmRbQv5v2NZVylup2tHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607787; c=relaxed/simple; bh=9GJRHNLrHyHetG9QLvl+hM3eRSeIWSgSwKE96DTJrig=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S6o9eHIGK+wid6LizyjLjHVehJxgFHSJb4XLgcq3LG7SlAakY711/tQYloCL63hZavix6E+jYZn7fYzJkY6dlptxdmuLB3i/yiUJOccSU/DQf495sXTtrnZIpF6PbSunvouQvFk9xCf1vEuOZfqSiqjhSWZYSVXaaPMyukjFA7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=QwXIKgjh; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="QwXIKgjh" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-a77b550128dso772805166b.0 for ; Wed, 10 Jul 2024 03:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607783; x=1721212583; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0AjlT5eFQ6h9gEvtReCv6ZkrzRkpXg8KUXrIWg1LtUo=; b=QwXIKgjhD6bDJw8VKDx1Lszk9zYCPpfUWHEGgpo7W+U4JwSNMRw7bo+Xk/dIFXuAKU XEpVLV3F5oTq69QgBk0kQtmKoecsQY4gfEWsbEKsHkMlrC7U1TVMbIjpK7BgFCFhheQS qmyvlxjvB2C1uoyxw/Rp38V3aWYFdgRvqZO7a5nrd+v5MJ03DgT/GQd/w7aapp0Iu2Ik 9hs2OudEZa66R3cS1dIxa9o7tpUOE/xbI5bZ7gIPX3y4hmIbsF3A1qeMG4FQcrlnLqwb g/sWUTxNlJsOXQeCOZKI50V19idl15Mayy6ail9/0tB9YJEbXWxygDy/79e1xl+FPPSj 9NSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607783; x=1721212583; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0AjlT5eFQ6h9gEvtReCv6ZkrzRkpXg8KUXrIWg1LtUo=; b=OZMPRQVPE94vmAsB1QJnoZr7Gs303+CmSVQQLqJnaN4qdRRCkaoB6zWvxf/Ke3Yq+S zvKAj8Oo6iGL6VVs64eBT2RVQ6lwSJ+HfsZV16gq1dx3x6VYhoNyfSzAsL7QIC/wb7Ko UCqZ7XFqc3m+OAEVdXvkIX8cx0kG0J6ygvkxIyjHLuXysiRSKhwgSyyNzg38JRMbONrC 7GXpoJBF7fAVoo+x2N4OkcqnKtK3CcHPpSvkHtt0UAGNUvGAUGCsDNaMV4Fe6lOfwYlv WIr+ljqbywpi4/H8xEDlo5KVUMc8QNF2writnrP31bmHn7PROF0g/uiWYr1oKxEtLDLk EFVw== X-Forwarded-Encrypted: i=1; AJvYcCWd5t72Lww7eHvJAoTtaB2vNSSI70lSNs2QYtTGa7gWeF89tIZeQ48CAh2ASgZ7LpqyIVXlqEXWlLzpqXa9HI+2pW1BWTAJTKLnS9KK X-Gm-Message-State: AOJu0Yw/qUZexWgfpwWcRSGy5V3Xwm15GWMv+5Nv+Yg8s+WXvMC2hlWn k71ZuWNti55xP1tbWEtsgURQ4KEh63gHMoUimV/I5vrZ5ytTFAKEi6k8PI1CFqw= X-Google-Smtp-Source: AGHT+IEBYPb6oMofA153AVchD/c6t8lwHvb5LurkHVdmpGrU7RToq5FYqM5J4DT8aQ52uq/60Vf3SA== X-Received: by 2002:a17:907:9711:b0:a77:b0a4:7d88 with SMTP id a640c23a62f3a-a780b689270mr567665866b.10.1720607783633; Wed, 10 Jul 2024 03:36:23 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:23 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:08 +0100 Subject: [PATCH 01/15] usb: typec: tcpci: fix a comment typo Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-1-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 autonously -> autonomously Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- include/linux/usb/tcpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 0ab39b6ea205..d27fe0c22a8b 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -190,7 +190,7 @@ struct tcpci; * Optional; Callback to perform chip specific operations when FRS * is sourcing vbus. * @auto_discharge_disconnect: - * Optional; Enables TCPC to autonously discharge vbus on disconnect. + * Optional; Enables TCPC to autonomously discharge vbus on disconnect. * @vbus_vsafe0v: * optional; Set when TCPC can detect whether vbus is at VSAFE0V. * @set_partner_usb_comm_capable: --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA4BB18FA04 for ; Wed, 10 Jul 2024 10:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607788; cv=none; b=AmIS/yDX2yhrpQWs6j66WUTJNrHOiIlhAcoXR0WdLHI1lE2QmaztTLfpiT4VkVswJfLkF1U+old6upxbNO861u403J0VluyZETy1Rn2B+Sp1+CO6hCbAJRODByDVBC05XGkY4eNesWoWJV2gPHREig2CHwCxhM5wd/Iskn2s89I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607788; c=relaxed/simple; bh=mil0Paw7dKSF+yYmtF7z93+PPTbySeNKiljnw4gmtA8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B7umf58klqkbeYfQ91sU1MdiGNz/hrpwIuR/j2N7fgg/wjhlz3xwY88hksNTKqrmoDh/O7Bp+VK24LGf2qKB/uGD4+yFB5VVYxIBUyZYlpSzxxbMzEN9nI/Hq2KPmIubtCh/vbnEH9aoTaokTXxKPnQUV7gjvbxr19IyanCUX2Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=tY5w+BVA; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tY5w+BVA" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-58b447c51bfso7805012a12.2 for ; Wed, 10 Jul 2024 03:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607784; x=1721212584; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ugko5125K/DlhjBE+oAKmwE1ZDstjFq/scQfmJhd89w=; b=tY5w+BVAKh/Jbp1CuBRSpHMzAMn4dc/KnCJZF9W/turj5AR40sYiT/FFH0DqHzzI7M ZfwHV3y/tosY3DwpHVdCHDEHi06LAxQvEGbGsOOd8h64iwhg2X1nhc1i25Emx6TevizU MJUr91lTl8ovxB+uTgAeOaEus34YoEMjdB2qIVPxKxh4DP6FEvXWezZ4SnDa8ldoZvTh EamkVQ9Z2Lu1c45Nrm4BxkuvVFzDDQO/prWV72lSn///mQmC7Ed6kLjU+q+XoBHTjf+B h1JJpF85qC7bwhh+Zsmz8qIe97Sz31sRcCOu3lw48V9cEJmrlVVOl7LdqCANOitrALVb T/9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607784; x=1721212584; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ugko5125K/DlhjBE+oAKmwE1ZDstjFq/scQfmJhd89w=; b=mxj7qN35zVkU/3Xi247bclupUqKwbtt37gcRPROE9fnL+3MFicDCnkAXM1Wtq1pYuU IFeBlj0GI14cLAQutleFjOTLqcbfZ1+CmwCCdxyCgeBUm+MzEndxQPemhhAh+cy41DuN dJKjt4tT/OVhwsHrxgWVOM37LF9kZnSpHIZ0dMGSTXdrla2TuhvVHmRtYBe5xd5kvMaS u9U2G5Nui1baAZLnc2aF0irqjcufl8dqTeIkZMiNOBL9wQnts+prJJFVKTaJz0IJTGEq GcyTHnMRpOkpeg1QN6Cpe5vCKnLdFF7uDsZsV2kB/dOXQhdQ4O9f8zy9O9gw7BLQOjYw H1GA== X-Forwarded-Encrypted: i=1; AJvYcCXAtyBajRJrWpkw2ZoxiKr/RhmkgNS5ZxiRi3CIPC3URvEt2epWi2MmB6OtFKpkyTPq6YTDR8ts2bnFvxfwCJEGO6ZFyAZYBlqBfzmS X-Gm-Message-State: AOJu0YxIe2yFfBzak1Ng4zcerxNWEx9xKXDMe23Mm6sv4sYAj4niNCtK X9YgzhviDnPbsKuAg9J9jSLe/f4Pn1THYUuBcoiSULdaCLSVaEqL91XU+f8WI90= X-Google-Smtp-Source: AGHT+IFn15u2cejyFoefO6hJ902KlcwxPbEv119zyj3cGShttSJFkxT2Jd9K7A4TdHzThGIHgNPh9Q== X-Received: by 2002:a17:907:7717:b0:a77:daa9:402 with SMTP id a640c23a62f3a-a780b6fe400mr324241666b.35.1720607784079; Wed, 10 Jul 2024 03:36:24 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:23 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:09 +0100 Subject: [PATCH 02/15] usb: typec: tcpm/tcpci_maxim: clarify a comment Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-2-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 We loop while the status is !=3D 0, so rephrase the comment slightly for clarity. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/= tcpm/tcpci_maxim_core.c index eec3bcec119c..87102b4d060d 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -397,7 +397,7 @@ static irqreturn_t max_tcpci_irq(int irq, void *dev_id) } while (status) { irq_return =3D _max_tcpci_irq(chip, status); - /* Do not return if the ALERT is already set. */ + /* Do not return if a (new) ALERT is set (again). */ ret =3D max_tcpci_read16(chip, TCPC_ALERT, &status); if (ret < 0) break; --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AFBC18FA26 for ; Wed, 10 Jul 2024 10:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607788; cv=none; b=XuFyEKfJ5KGfBK1qTNre4FESEcxNfDZaJQ/EbKlMOiHXwI+q15t+77nbkc2DMRJqIEdRY7A7//F4uz9FHkk6YoHJsnZ8oDQ4j5Ty9/tnE8GYcmx+k2QUZD0X1K4qaFaRlPY8QkBEMQ2Z5Dr64mF01jSLb+ZdqbyI9QbWv+ZCrTo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607788; c=relaxed/simple; bh=ie2JmEfSUiTUhNpHVLVkQZYkMP0gFDlAbOaRX85e2bw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DOIVL/n3XjeMgxE4xpy6Fxg3WvDuzyhdu7SLAh9YWnFrag8Lu1GyZffqrEHGIZkGS/4RiKhm0Y+3yYjiJYl/m2SscFX9Xb5C1Fltk6LgGjluOO4mb3LV+WGAhzt8DFtXLUsMchajy/euuTmty9IE0QZLfj3wkkSQY0lBsVIcu9Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=g4Xms5P0; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="g4Xms5P0" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-a797c62565aso57511766b.2 for ; Wed, 10 Jul 2024 03:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607784; x=1721212584; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PwfQalACRRVjjbxpGdsLscOtRao7Xr+Lw/le1ijWaFk=; b=g4Xms5P0k3NYhR6cEKZ6Yg1+AQ7kQHEelBWQdxPUz/TkNav9AUo8vI7rYlc5hiSIEP z2Gfdlr8X367sGxpAIZaKIpoOEb+wkX0hHXaXVlUcpdx7mP+bcmsxT2BfYqz0fu35z44 bKMm8X3zIpeZDrGpQIONUD5ifR8XC07jAqreZjanPKasA3Us4j8jLKbXQTPRqV+Cw87P FJSgFY7OUtH8FOSVK2f13/mzcG8cmTgCCLUYDhkDvfpRSg/j2qWLqqO1PIhUeZyhZmNo uTbbqRv3ge34vFmExB7IbM3OUC1/MWCYuCp8PdQg0iYxjX2Gg93qKV7IcurRB/9Wq6Ic TnAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607784; x=1721212584; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PwfQalACRRVjjbxpGdsLscOtRao7Xr+Lw/le1ijWaFk=; b=oYNYLMb9Do4xlUKRjmc93AQP42FGOLLXFxRMk9IolCv2l9stb/eQuEhc3tbN7FaOvT aPkG8OEzjyHTLznMryJ6fs7agml417wp9jAGFR4GBNOQoOieeg/xL6w6ASOW5mR3ubA2 UB7Bv1hlj2tALQCzEp7kywEpwUO+I/lgGxd+aOHw6fLsJC9YBQe9bMsmoQ6AkAUnawzT 4sBT9bMf4A5kzxOym+x501Nmv4HI4S6Klgfrjc19QtQfSEPOPo8goJNS0oTjG8xGlmpO eTgJNGpuzpSga/hlLPL9a5kg7MYJhXw3xtW9QkSJgcGWBeU++yuvkqEYPdaokaWEFwz6 ozVw== X-Forwarded-Encrypted: i=1; AJvYcCWrfeAzC3Lt8E6oNSnODV9YkjUPYV2RpJxKSRi7YNYtdiSocHVBfOEQ78W1KPbUss59WQEfnNPwhFDYJfma5xVId/Ls/ZWyS3kqdxOb X-Gm-Message-State: AOJu0YwkGATLxpHHF5ng1okn4ixIvbl4ATOqI+Eo+gjNFTCjFEn/G3zF WoJgK62X2youN5pGMmA9i8QbkZCEo+5zBhiPwyWx+uxiDCWCM7dnxsX/ajXlG20= X-Google-Smtp-Source: AGHT+IHBIzsNTce5pBOT96MfRjxpyaoMRtCO0GXv5dj4EAemMgtOGhYPOOBtYMfTkQaIQZk1FTryeQ== X-Received: by 2002:a17:907:7da8:b0:a6f:e456:4207 with SMTP id a640c23a62f3a-a780b88498fmr439952166b.61.1720607784519; Wed, 10 Jul 2024 03:36:24 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:24 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:10 +0100 Subject: [PATCH 03/15] usb: typec: tcpci: use GENMASK() for TCPC_CC_STATUS_CC[12] Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-3-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 The existing code here, particularly in maxim_contaminant.c, is arguably quite hard to read due to the open-coded masking and shifting spanning multiple lines. Use GENMASK() and FIELD_GET() instead, which arguably make the code much easier to follow. While at it, use the symbolic name TCPC_CC_STATE_SRC_OPEN for one instance of open-coded 0x0. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 8 +++----- drivers/usb/typec/tcpm/tcpci.c | 7 +++---- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 7 +++---- include/linux/usb/tcpci.h | 8 +++----- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index f8504a90da26..e7687aeb69c0 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -5,6 +5,7 @@ * USB-C module to reduce wakeups due to contaminants. */ =20 +#include #include #include #include @@ -48,11 +49,8 @@ enum fladc_select { #define STATUS_CHECK(reg, mask, val) (((reg) & (mask)) =3D=3D (val)) =20 #define IS_CC_OPEN(cc_status) \ - (STATUS_CHECK((cc_status), TCPC_CC_STATUS_CC1_MASK << TCPC_CC_STATUS_CC1_= SHIFT, \ - TCPC_CC_STATE_SRC_OPEN) && STATUS_CHECK((cc_status), = \ - TCPC_CC_STATUS_CC2_MASK << \ - TCPC_CC_STATUS_CC2_SHIFT, \ - TCPC_CC_STATE_SRC_OPEN)) + (FIELD_GET(TCPC_CC_STATUS_CC1, cc_status) =3D=3D TCPC_CC_STATE_SRC_OPEN \ + && FIELD_GET(TCPC_CC_STATUS_CC2, cc_status) =3D=3D TCPC_CC_STATE_SRC_OPE= N) =20 static int max_contaminant_adc_to_mv(struct max_tcpci_chip *chip, enum fla= dc_select channel, bool ua_src, u8 fladc) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 8a18d561b063..ce11a154c7dc 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -5,6 +5,7 @@ * USB Type-C Port Controller Interface. */ =20 +#include #include #include #include @@ -241,12 +242,10 @@ static int tcpci_get_cc(struct tcpc_dev *tcpc, if (ret < 0) return ret; =20 - *cc1 =3D tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC1_SHIFT) & - TCPC_CC_STATUS_CC1_MASK, + *cc1 =3D tcpci_to_typec_cc(FIELD_GET(TCPC_CC_STATUS_CC1, reg), reg & TCPC_CC_STATUS_TERM || tcpc_presenting_rd(role_control, CC1)); - *cc2 =3D tcpci_to_typec_cc((reg >> TCPC_CC_STATUS_CC2_SHIFT) & - TCPC_CC_STATUS_CC2_MASK, + *cc2 =3D tcpci_to_typec_cc(FIELD_GET(TCPC_CC_STATUS_CC2, reg), reg & TCPC_CC_STATUS_TERM || tcpc_presenting_rd(role_control, CC2)); =20 diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcp= m/tcpci_rt1711h.c index 67422d45eb54..c6dbccf6b17a 100644 --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c @@ -5,6 +5,7 @@ * Richtek RT1711H Type-C Chip Driver */ =20 +#include #include #include #include @@ -195,12 +196,10 @@ static inline int rt1711h_init_cc_params(struct rt171= 1h_chip *chip, u8 status) if (ret < 0) return ret; =20 - cc1 =3D tcpci_to_typec_cc((status >> TCPC_CC_STATUS_CC1_SHIFT) & - TCPC_CC_STATUS_CC1_MASK, + cc1 =3D tcpci_to_typec_cc(FIELD_GET(TCPC_CC_STATUS_CC1, status), status & TCPC_CC_STATUS_TERM || tcpc_presenting_rd(role, CC1)); - cc2 =3D tcpci_to_typec_cc((status >> TCPC_CC_STATUS_CC2_SHIFT) & - TCPC_CC_STATUS_CC2_MASK, + cc2 =3D tcpci_to_typec_cc(FIELD_GET(TCPC_CC_STATUS_CC2, status), status & TCPC_CC_STATUS_TERM || tcpc_presenting_rd(role, CC2)); =20 diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index d27fe0c22a8b..31d21ccf662b 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -92,11 +92,9 @@ #define TCPC_CC_STATUS_TERM BIT(4) #define TCPC_CC_STATUS_TERM_RP 0 #define TCPC_CC_STATUS_TERM_RD 1 +#define TCPC_CC_STATUS_CC2 GENMASK(3, 2) +#define TCPC_CC_STATUS_CC1 GENMASK(1, 0) #define TCPC_CC_STATE_SRC_OPEN 0 -#define TCPC_CC_STATUS_CC2_SHIFT 2 -#define TCPC_CC_STATUS_CC2_MASK 0x3 -#define TCPC_CC_STATUS_CC1_SHIFT 0 -#define TCPC_CC_STATUS_CC1_MASK 0x3 =20 #define TCPC_POWER_STATUS 0x1e #define TCPC_POWER_STATUS_DBG_ACC_CON BIT(7) @@ -256,7 +254,7 @@ static inline enum typec_cc_status tcpci_to_typec_cc(un= signed int cc, bool sink) if (sink) return TYPEC_CC_RP_3_0; fallthrough; - case 0x0: + case TCPC_CC_STATE_SRC_OPEN: default: return TYPEC_CC_OPEN; } --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D38B18FA33 for ; Wed, 10 Jul 2024 10:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; cv=none; b=nIpnQkTBD7mkR6p+ybvsfu5efaRfxJmesXAoSS3of07B03R9Rp5KCf9SQ4h/oDiFpvuXywH9qzMqx9WF4lC04wkRIOgLIR9sl+tXkxnrEbRB+8L3EO3eo31eRw370esFkXPsGlJOvSY5TUgdVb0F+2OHMPf4MOHGghjYdHf8bGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; c=relaxed/simple; bh=UpNyt3hPB6krYjnIMNVu3bl0PxDu7L8l/9FunFkfXJ0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ig7B54RHxyFM4rajtHjHP2T8riNIryaagUS73B17vYwvUrOGYw1H1knz0scmn9fFsewope+xmU02/0BcHjT2/y0IR4hqqCQc3MAIxwHvkUChG9cjSPXJyQHUeGWNwzlCKIe6FqtCwKmpiUFGM0qUUHkt0sC1bp9m+fX56Nde6+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=vLWkzrnD; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="vLWkzrnD" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a77d9217e6fso547715366b.2 for ; Wed, 10 Jul 2024 03:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607785; x=1721212585; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kKvNmNonW4k4hzY7mYArULLqBs8XeH3VnuyLyDk7L3s=; b=vLWkzrnDXi0yzGDSJmyQHAGTZv6O4P0x9ckO0yt9v+0wJFeXJLvWc2kxCKQEGlLgpG 9B7CDTCT37kf/qa9nu6/ULkxr5Tt6R9gDsUnoQrvzgrkIZEYE80DkifDeiUhJHlc1Qpg VfSmwt1vjaWDo9fi4CsJexjcVKCS2ZclVbQPrUOteaDl0ocVwBtnzf2FeBIznJpW2Kni BLCHzQjkqwrAGGZ5XMKLWGnYHZYHe49b0SEHfZhDsj59RBlyv5cQfNvqXbN9l2kc+/v5 Jp09Ux0j+O2cbOvJiGmjwSvN+JEiTziImEPKhlWqsk3UddI+0rW8Pew8eJv0+skIYc6k bqIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607785; x=1721212585; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kKvNmNonW4k4hzY7mYArULLqBs8XeH3VnuyLyDk7L3s=; b=L9SuK4dgi8CexYBNs9Zbbec3LeNq5aP815SGJLBmwp0esoP4o6m2t/2j9oxj35EDis WY3c/ow1hdcvJEuEDsDQ/PlIaeIGaclxJHrcWE8UwZXEq6aafBDCm1A0QDIyBLdEhwRU dKX+arp5j296FvLPNU82X6uexXFxWNGEZScSWydSWg7XH5vdvbVbbcdY6XMGN+s9EeQe TUNxBDKnLm7kf7g9pvBAUFeSSUtES5j31R2oovLIashJmBcvWPD2aB8gGdEmy7I5nhbQ /A+BFq7J7arrGq3DPQmgTgMpoyqaC/IZBskPvEANETUOS2nxowBGjVj9tbHMQqqgjK9t IKpw== X-Forwarded-Encrypted: i=1; AJvYcCXvJFrNdx47mMj+brDVrMkl6vKstwVugufyPsEOz5ZWxonJ9FNY+gxGhi29u/wlSWUXZS7PuSbQGk/hjeLPCMr3XbZ1Jz1ow3vZjaZA X-Gm-Message-State: AOJu0YyhCE1k4pRCuA3RpdCwthgUprF4Cg1hCVtBOyhbaOToQKQ/fN8G C/4/+3laHLL5Ggj3vRTxBCf5qsl8z4rXhjJAKqJfm8M0xGcTIRdTe+YxQds9AXg= X-Google-Smtp-Source: AGHT+IEANfZn8xYveZOZpH1PlIfZ5CExCb4Ai1+KB0oG2AncjlZQBjTB2r9uGvLZ2yNxiX3Q8zHqjg== X-Received: by 2002:a17:906:a848:b0:a77:e2e3:355f with SMTP id a640c23a62f3a-a780b7051f2mr279818966b.41.1720607784952; Wed, 10 Jul 2024 03:36:24 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:24 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:11 +0100 Subject: [PATCH 04/15] usb: typec: tcpci: use GENMASK() for TCPC_ROLE_CTRL_CC[12] Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-4-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 All this open-coded shifting and masking is quite hard to read, in particular the if-statement in tcpci_apply_rc(). Declare TCPC_ROLE_CTRL_CC[12] using GENMASK() which allows using FIELD_GET() and FIELD_PREP() to arguably make the code more legible. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/anx7411.c | 5 ++- drivers/usb/typec/tcpm/tcpci.c | 73 +++++++++++++++---------------= ---- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 8 ++-- include/linux/usb/tcpci.h | 9 ++--- 4 files changed, 43 insertions(+), 52 deletions(-) diff --git a/drivers/usb/typec/anx7411.c b/drivers/usb/typec/anx7411.c index b12a07edc71b..78b0d856cfc1 100644 --- a/drivers/usb/typec/anx7411.c +++ b/drivers/usb/typec/anx7411.c @@ -6,6 +6,7 @@ * Copyright(c) 2022, Analogix Semiconductor. All rights reserved. * */ +#include #include #include #include @@ -884,8 +885,8 @@ static void anx7411_chip_standby(struct anx7411_data *c= tx) OCM_RESET); ret |=3D anx7411_reg_write(ctx->tcpc_client, ANALOG_CTRL_10, 0x80); /* Set TCPC to RD and DRP enable */ - cc1 =3D TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT; - cc2 =3D TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT; + cc1 =3D FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD); + cc2 =3D FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD); ret |=3D anx7411_reg_write(ctx->tcpc_client, TCPC_ROLE_CTRL, TCPC_ROLE_CTRL_DRP | cc1 | cc2); =20 diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index ce11a154c7dc..cd71ece7b956 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -104,45 +104,42 @@ static int tcpci_set_cc(struct tcpc_dev *tcpc, enum t= ypec_cc_status cc) =20 switch (cc) { case TYPEC_CC_RA: - reg =3D (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RA << TCPC_ROLE_CTRL_CC2_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RA) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RA)); break; case TYPEC_CC_RD: - reg =3D (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD)); break; case TYPEC_CC_RP_DEF: - reg =3D (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) | - (TCPC_ROLE_CTRL_RP_VAL_DEF << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) + | (TCPC_ROLE_CTRL_RP_VAL_DEF << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); break; case TYPEC_CC_RP_1_5: - reg =3D (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) | - (TCPC_ROLE_CTRL_RP_VAL_1_5 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) + | (TCPC_ROLE_CTRL_RP_VAL_1_5 << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); break; case TYPEC_CC_RP_3_0: - reg =3D (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT) | - (TCPC_ROLE_CTRL_RP_VAL_3_0 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) + | (TCPC_ROLE_CTRL_RP_VAL_3_0 << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); break; case TYPEC_CC_OPEN: default: - reg =3D (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT); + reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_OPEN) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_OPEN)); break; } =20 if (vconn_pres) { if (polarity =3D=3D TYPEC_POLARITY_CC2) { - reg &=3D ~(TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT); - reg |=3D (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT); + reg &=3D ~TCPC_ROLE_CTRL_CC1; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_OPEN); } else { - reg &=3D ~(TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT); - reg |=3D (TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT); + reg &=3D ~TCPC_ROLE_CTRL_CC2; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_OPEN); } } =20 @@ -168,15 +165,11 @@ static int tcpci_apply_rc(struct tcpc_dev *tcpc, enum= typec_cc_status cc, * APPLY_RC state is when ROLE_CONTROL.CC1 !=3D ROLE_CONTROL.CC2 and vbus= autodischarge on * disconnect is disabled. Bail out when ROLE_CONTROL.CC1 !=3D ROLE_CONTR= OL.CC2. */ - if (((reg & (TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT)) >> - TCPC_ROLE_CTRL_CC2_SHIFT) !=3D - ((reg & (TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT)) >> - TCPC_ROLE_CTRL_CC1_SHIFT)) + if (FIELD_GET(TCPC_ROLE_CTRL_CC2, reg) !=3D FIELD_GET(TCPC_ROLE_CTRL_CC1,= reg)) return 0; =20 return regmap_update_bits(tcpci->regmap, TCPC_ROLE_CTRL, polarity =3D=3D = TYPEC_POLARITY_CC1 ? - TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT : - TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT, + TCPC_ROLE_CTRL_CC2 : TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_OPEN); } =20 @@ -215,11 +208,11 @@ static int tcpci_start_toggling(struct tcpc_dev *tcpc, } =20 if (cc =3D=3D TYPEC_CC_RD) - reg |=3D (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT); + reg |=3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD)); else - reg |=3D (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT); + reg |=3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP)); ret =3D regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg); if (ret < 0) return ret; @@ -281,28 +274,28 @@ static int tcpci_set_polarity(struct tcpc_dev *tcpc, reg =3D reg & ~TCPC_ROLE_CTRL_DRP; =20 if (polarity =3D=3D TYPEC_POLARITY_CC2) { - reg &=3D ~(TCPC_ROLE_CTRL_CC2_MASK << TCPC_ROLE_CTRL_CC2_SHIFT); + reg &=3D ~TCPC_ROLE_CTRL_CC2; /* Local port is source */ if (cc2 =3D=3D TYPEC_CC_RD) /* Role control would have the Rp setting when DRP was enabled */ - reg |=3D TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP); else - reg |=3D TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD); } else { - reg &=3D ~(TCPC_ROLE_CTRL_CC1_MASK << TCPC_ROLE_CTRL_CC1_SHIFT); + reg &=3D ~TCPC_ROLE_CTRL_CC1; /* Local port is source */ if (cc1 =3D=3D TYPEC_CC_RD) /* Role control would have the Rp setting when DRP was enabled */ - reg |=3D TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP); else - reg |=3D TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD); } } =20 if (polarity =3D=3D TYPEC_POLARITY_CC2) - reg |=3D TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC1_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_OPEN); else - reg |=3D TCPC_ROLE_CTRL_CC_OPEN << TCPC_ROLE_CTRL_CC2_SHIFT; + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_OPEN); ret =3D regmap_write(tcpci->regmap, TCPC_ROLE_CTRL, reg); if (ret < 0) return ret; diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcp= m/tcpci_rt1711h.c index c6dbccf6b17a..bdb78d08b5b5 100644 --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c @@ -246,11 +246,11 @@ static int rt1711h_start_drp_toggling(struct tcpci *t= cpci, } =20 if (cc =3D=3D TYPEC_CC_RD) - reg |=3D (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_CC2_SHIFT); + reg |=3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RD) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RD)); else - reg |=3D (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC1_SHIFT) | - (TCPC_ROLE_CTRL_CC_RP << TCPC_ROLE_CTRL_CC2_SHIFT); + reg |=3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) + | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP)); =20 ret =3D rt1711h_write8(chip, TCPC_ROLE_CTRL, reg); if (ret < 0) diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 31d21ccf662b..552d074429f0 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -68,10 +68,8 @@ #define TCPC_ROLE_CTRL_RP_VAL_DEF 0x0 #define TCPC_ROLE_CTRL_RP_VAL_1_5 0x1 #define TCPC_ROLE_CTRL_RP_VAL_3_0 0x2 -#define TCPC_ROLE_CTRL_CC2_SHIFT 2 -#define TCPC_ROLE_CTRL_CC2_MASK 0x3 -#define TCPC_ROLE_CTRL_CC1_SHIFT 0 -#define TCPC_ROLE_CTRL_CC1_MASK 0x3 +#define TCPC_ROLE_CTRL_CC2 GENMASK(3, 2) +#define TCPC_ROLE_CTRL_CC1 GENMASK(1, 0) #define TCPC_ROLE_CTRL_CC_RA 0x0 #define TCPC_ROLE_CTRL_CC_RP 0x1 #define TCPC_ROLE_CTRL_CC_RD 0x2 @@ -176,8 +174,7 @@ =20 #define tcpc_presenting_rd(reg, cc) \ (!(TCPC_ROLE_CTRL_DRP & (reg)) && \ - (((reg) & (TCPC_ROLE_CTRL_## cc ##_MASK << TCPC_ROLE_CTRL_## cc ##_SHIFT= )) =3D=3D \ - (TCPC_ROLE_CTRL_CC_RD << TCPC_ROLE_CTRL_## cc ##_SHIFT))) + FIELD_GET(TCPC_ROLE_CTRL_## cc, reg) =3D=3D TCPC_ROLE_CTRL_CC_RD) =20 struct tcpci; =20 --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CCD818FC9B for ; Wed, 10 Jul 2024 10:36:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; cv=none; b=d7LRXA/UIG6fsyai3aemFcpBID+1OTexY8H6jgYPfbRrR+RYR5xfGovdyWxj6a4ECZrbKnT0KOl/Td3t+MYf5EjD4KtLtJc4+Ivt6Nkk4nsud2UgOcvioovkiUCERJYY5Jbd4jJDZKBWOFw3GsxeeJ81PEuRZc3Z2oLLlvhT3rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; c=relaxed/simple; bh=sW84uVhoT7q6hbhpajXvF+A6OZDizFcmPHMcYOMyMro=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aeWRKQpI7I66MN0OlzzdYSDGy7lcK1WG+rVJcvJzR4/GTv/ipHAYpF3oyBoUBpcRWDpm0dHxfOORXlbNuNpsK3qC/ed+iidyB1J73MxA1X6aBloot08LMEeqG2qce3uMlOMBfEZZnP969sa344OyoLmS82iP4ecyaX+8yd8RDuY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MbUzYNLY; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MbUzYNLY" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a77bf336171so126930766b.1 for ; Wed, 10 Jul 2024 03:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607785; x=1721212585; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Vwjavj6RPqeiyQNJ3n68uYX4MUqGmZQjpRSOl94gIO0=; b=MbUzYNLYxDzq9Qfykkx1E5YrdzPMOByvMZYXzW+l8RpJ6t+x1XTib61G+Q9c+uSu0Z C3RE97krPhKSV5Qv33V4g2FRPcvdRTVQ25bFrVWsKLN7VEUNIK+5MfSW3E+5tAWQNcjb yoyUtOTNf5rh/B8N7Pqt7FrIqBSCnN3ZIt/y9Rt4PBmoajVf0jPSkmXgB+Pj0HgYsNiC 8BuTNbCYbmnCHtMR5Wqs7TUvsjqFV8CJCI9rF1sXxoTQeWu/ZW9fOfJ33Y/ggjp04HVB xYtYJNZN8YziEL6b2Kb7g8NAgSreORQp2hgbnQMKSnw7Cl2c+JNeQ9RL3BJh8BbdEesL CKcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607785; x=1721212585; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vwjavj6RPqeiyQNJ3n68uYX4MUqGmZQjpRSOl94gIO0=; b=qin8nIiT4tsz8De9Z/xrYbIRqonhzZMmEqXmdCawJ4ANbWZ8kj/XZN7azvq3vBzzJ+ GglV1XwXDQYYP7XMc29+ViNRwXH3KzyxptH8/OvkGvN28S1X09jAdBcYm2UTv/jmUauT vcJsRY9UJhJ5PdYJ9yM41O/8JflMEnbIJ/9y97OHIckujX57uVcvvVCD+aVZ5NESYmOX NxWIHIKUhywhPyDQgAs3w8d1k55mInJrsYBeyx4It9EUJjDQsUyZXxQdCiLgydOlK9Fq 4u92EGt0GkAFaOG+Fcq8xYli7s16QVijz/zr2MN7pTfNuK/bCDZ5rltlTccainVrb54G MuTQ== X-Forwarded-Encrypted: i=1; AJvYcCVSsnbvHbW781pt5uoCopzUMbM5s77AnH1qvUctfHPREmwwd1le8NhrlS301CMty0tsjtP6HKOyH2hXnUCNoE8pgjGOTCGF5z5oX88n X-Gm-Message-State: AOJu0YzC18oDSVQEn8KYuzBS2RKOj1F+y92vw4Gs8RKBcz4zTJREwW2M jL0nqRovys1sxbXc5YmvQNh02M+0KJhzx8Nh4b+rQcpzMn7yelY7dcayg5k7d50= X-Google-Smtp-Source: AGHT+IHUTKIvR3XwPGDJ3agEObdSPf5IVHYSTkjhYzMGwyHu0kgGSWWMEcYfIz+1xNw58nSsctD10A== X-Received: by 2002:a17:907:3fa0:b0:a6f:e03a:99d with SMTP id a640c23a62f3a-a780d0a4445mr454600466b.0.1720607785399; Wed, 10 Jul 2024 03:36:25 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:25 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:12 +0100 Subject: [PATCH 05/15] usb: typec: tcpci: use GENMASK() for TCPC_ROLE_CTRL_RP_VAL Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-5-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Align the last remaining field TCPC_ROLE_CTRL_RP_VAL with the other fields in the TCPC_ROLE_CTRL register by using GENMASK() and FIELD_PREP(). Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci.c | 21 ++++++++++++--------- drivers/usb/typec/tcpm/tcpci_rt1711h.c | 12 ++++++------ include/linux/usb/tcpci.h | 3 +-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index cd71ece7b956..5ad05a5bbbd1 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -114,17 +114,20 @@ static int tcpci_set_cc(struct tcpc_dev *tcpc, enum t= ypec_cc_status cc) case TYPEC_CC_RP_DEF: reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) - | (TCPC_ROLE_CTRL_RP_VAL_DEF << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); + | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_DEF)); break; case TYPEC_CC_RP_1_5: reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) - | (TCPC_ROLE_CTRL_RP_VAL_1_5 << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); + | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_1_5)); break; case TYPEC_CC_RP_3_0: reg =3D (FIELD_PREP(TCPC_ROLE_CTRL_CC1, TCPC_ROLE_CTRL_CC_RP) | FIELD_PREP(TCPC_ROLE_CTRL_CC2, TCPC_ROLE_CTRL_CC_RP) - | (TCPC_ROLE_CTRL_RP_VAL_3_0 << TCPC_ROLE_CTRL_RP_VAL_SHIFT)); + | FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_3_0)); break; case TYPEC_CC_OPEN: default: @@ -194,16 +197,16 @@ static int tcpci_start_toggling(struct tcpc_dev *tcpc, switch (cc) { default: case TYPEC_CC_RP_DEF: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_DEF << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_DEF); break; case TYPEC_CC_RP_1_5: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_1_5 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_1_5); break; case TYPEC_CC_RP_3_0: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_3_0 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_3_0); break; } =20 diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcp= m/tcpci_rt1711h.c index bdb78d08b5b5..64f6dd0dc660 100644 --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c @@ -232,16 +232,16 @@ static int rt1711h_start_drp_toggling(struct tcpci *t= cpci, switch (cc) { default: case TYPEC_CC_RP_DEF: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_DEF << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_DEF); break; case TYPEC_CC_RP_1_5: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_1_5 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_1_5); break; case TYPEC_CC_RP_3_0: - reg |=3D (TCPC_ROLE_CTRL_RP_VAL_3_0 << - TCPC_ROLE_CTRL_RP_VAL_SHIFT); + reg |=3D FIELD_PREP(TCPC_ROLE_CTRL_RP_VAL, + TCPC_ROLE_CTRL_RP_VAL_3_0); break; } =20 diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 552d074429f0..80652d4f722e 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -63,8 +63,7 @@ =20 #define TCPC_ROLE_CTRL 0x1a #define TCPC_ROLE_CTRL_DRP BIT(6) -#define TCPC_ROLE_CTRL_RP_VAL_SHIFT 4 -#define TCPC_ROLE_CTRL_RP_VAL_MASK 0x3 +#define TCPC_ROLE_CTRL_RP_VAL GENMASK(5, 4) #define TCPC_ROLE_CTRL_RP_VAL_DEF 0x0 #define TCPC_ROLE_CTRL_RP_VAL_1_5 0x1 #define TCPC_ROLE_CTRL_RP_VAL_3_0 0x2 --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BDE118FDB7 for ; Wed, 10 Jul 2024 10:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; cv=none; b=BPpw8WBjJgnYxn4dA/AYEODS0Mz44AUX7kEG6+nTdfoYTvdUwaPAd+oD/o3Xm/EfRE8gG1S54D70qJx/mdMCZyjGbu9Z5IgRaQj5JlihJ8hlEeE64w3kyky8oAyzQVGW0UU4B3jy+vfG1kI17pqriRdHHr0sopwG7gFDG3uBrBQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607789; c=relaxed/simple; bh=0vbDgVH+LSdHvPglDs4hdbAbxgr/GDEnxmyEdgVM9sM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YXJxbKhLTruHqbDN44RCw8SDjMzUkvhwe3bNW1OcCs2acSJEf22K0Et1rV4lhPl+HPjNkEZ/OZN5LkFfjmqUeEkG25JfbITJB8DHyoHO5CnxXPULJYFdd8G7bw+z9tfrRf+uXDpD92xWbGmteX89a2blw/4RuLWBqB9pCR5lpo0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=USJhRoTg; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="USJhRoTg" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a689ad8d1f6so689328166b.2 for ; Wed, 10 Jul 2024 03:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607786; x=1721212586; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=KpWex0J8opffQtz+HUwL/QKrEncZVAbQ4+K0E+2/CaU=; b=USJhRoTgxFgki0VT4S+OdQ4RMBP1d819V979VEXK2VUWPLhaL5W65ba0qrWd4L8WbW yWmHD8Ka0DFQW50HXxfQZ4iLInUDUbnA+t3ZZVNFY1gDX762XIGynem3rjM+mP47Qull pca15ku0inlkxh7VN1uyYGYQvs+SFuOXmHI69Mcesm0gMIcjXO9ZotjiF48BTt/0ALNL 0ATNAnYaX0EI45J6LYcCyT2rDdBfsYTkErvJ0Nu7lM1bP7BaChx+9CWvItOr4V48NE+e rnqEQBfTOk0PMw9e7TTeQoIuWfuZVEU0yMiliyZHKz0u6Q40l2J6dqSXC0nLxcK5bwgF bsog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607786; x=1721212586; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KpWex0J8opffQtz+HUwL/QKrEncZVAbQ4+K0E+2/CaU=; b=fpbu7utZnUFS2z1gNpdd9T3FWA3SYE33E6Rn4dFjrzyQgcZF/9kUEkP056kOf/aQv4 xkovwK15Er11snIto4HbbX2oz78SUElcv5cIyPCFwkAKo4prD/sjUpEVko9TqBL1bNDM 34MV7GpeQMGH+oA9p+2/1eRV/7TFsaozc2BgJ2RfQad9FajZfJepGEqnxVwPQIyoIrjW 3FtOMlMQ4f9ddR9L0jPket3hHyBJnGb9FIUAEpouRbTCZjVjF9MD0TFhOGBZ79D81CZz JF3dad8OS1DRz4sv6cDsFtSKqLNzRm/x7CbFrX8Rk7q50HdtwyK6GgAEcbQuzfJROz+R i7DQ== X-Forwarded-Encrypted: i=1; AJvYcCVv7yVDLc9qgZiRs+9pfiazRmZJxxo8bAOWrd7SoSk6521XSZSSm462pGSm8d1dMILWTUNxcBA2s5pckJxNcC1j7f50AO1uTMQDKxi5 X-Gm-Message-State: AOJu0Yw/iqDlH1j8Qoyb3d804cLXMo74QogjcQa2ASxQj52B5NBNkafD VGZq+0ipedVem0K3g8yw3WsLvAEGj1eyEe8hloWjMYjdcR4sehn128DQy9dTa58= X-Google-Smtp-Source: AGHT+IGbCQykmyEoSZSMY+LIphQ2ikV/yNZ7fum8Hdl9038LaHNouuQhLYHMn+WIDwmXvJrV1rS1Ag== X-Received: by 2002:a17:906:32cc:b0:a77:da14:8401 with SMTP id a640c23a62f3a-a780b688941mr381186166b.10.1720607785890; Wed, 10 Jul 2024 03:36:25 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:25 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:13 +0100 Subject: [PATCH 06/15] usb: typec: tcpci: use GENMASK() for TCPC_MSG_HDR_INFO_REV Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-6-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Convert field TCPC_MSG_HDR_INFO_REV from register TCPC_MSG_HDR_INFO to using GENMASK() and FIELD_PREP() so as to keep using a similar approach for all fields. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci.c | 2 +- include/linux/usb/tcpci.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 5ad05a5bbbd1..ad5c9d5bf6a9 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -456,7 +456,7 @@ static int tcpci_set_roles(struct tcpc_dev *tcpc, bool = attached, unsigned int reg; int ret; =20 - reg =3D PD_REV20 << TCPC_MSG_HDR_INFO_REV_SHIFT; + reg =3D FIELD_PREP(TCPC_MSG_HDR_INFO_REV, PD_REV20); if (role =3D=3D TYPEC_SOURCE) reg |=3D TCPC_MSG_HDR_INFO_PWR_ROLE; if (data =3D=3D TYPEC_HOST) diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 80652d4f722e..3cd61e9f73b3 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -129,9 +129,8 @@ =20 #define TCPC_MSG_HDR_INFO 0x2e #define TCPC_MSG_HDR_INFO_DATA_ROLE BIT(3) +#define TCPC_MSG_HDR_INFO_REV GENMASK(2, 1) #define TCPC_MSG_HDR_INFO_PWR_ROLE BIT(0) -#define TCPC_MSG_HDR_INFO_REV_SHIFT 1 -#define TCPC_MSG_HDR_INFO_REV_MASK 0x3 =20 #define TCPC_RX_DETECT 0x2f #define TCPC_RX_DETECT_HARD_RESET BIT(5) --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4AF218FDCD for ; Wed, 10 Jul 2024 10:36:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607790; cv=none; b=jGuNiItnBMDzAsNzCaLTO+vQLHPxCGb2dSQ0zd1OtMTnB+1FI6MPZxEJfMn3ClxBGAF84UkvmHn2M8OzuCeTkjYJNGfhV6B5tH+syhvFbyhQrMlNNd9B3c/uJjDj/Ot2u2Q3AO4h5zeCOxsdw5EGAfQpJG9de0sgcl+HE5TM52Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607790; c=relaxed/simple; bh=L+ZjCKgJQd3G0PXfqSF2z2XSQSaCrAKVX6BKXiPVSoU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ta+Dt2WLH7nM6qAY5oC0LEuZjSJ3eQ+D9XxUlxvSItbd83ICFs9+NYy6aQgl0UodoE4ebkIAS+Etv4QTA+xzK7WoFjdo+W1WlLn2cUR/vwJVyIxezTWMuFeXeiKfdPE74uQwoJgrXBvOGsU/OCm69edgLx0TUFgdqp9zUHoB5jA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=O5cofXG1; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="O5cofXG1" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a77e6dd7f72so473844766b.3 for ; Wed, 10 Jul 2024 03:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607786; x=1721212586; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YiC5Ast8q9nR3kdM0WnbV9ytZ6Sn5cRnJD9TbOLzqZ8=; b=O5cofXG1F5FTXiDem2ZXmdm63Tz7E/sZfwGlp6XBwmu06Wfz0E4DlisfC6plvw2A5u zbiqhwrzWLJIwX52TpPpAX/C4MwAaaTrKecASXBhWevtFLzW1k45aSBJxdb6RCIFTy3q QXESoHOm2R4gbT4SbTG0opUub+jpauCeltzzn7Wgvl6PQUTfY30bw9jv+4Wu9IWC8sak IUIvLoUySWV+pdrnItLHK2XfvKJuO9L8iYZNYaXwa1Zw4Yqps6TObaBvtz8gCesD0C00 8E03OpzYWrnfEA80lSjiuRIc9oyO6fXpc7IRP9itpM2QwFm5YX2BdiVjHn7Gj5Ubz6ak R0Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607786; x=1721212586; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YiC5Ast8q9nR3kdM0WnbV9ytZ6Sn5cRnJD9TbOLzqZ8=; b=ovt8oVTaf0B+/wedoOuDO/+HBoSVo7TKOMmx3oZnjdwztkXNcC/BZlrOpbgT0ZMu8w z55vl50OI2Zse/kEcY0A5nj7hYosTBOEUgeDHGrJC5FUVmydGngqz9LFdPZ9Ky9hTX1T yFdaTq5RaLCtv5TXScHKQoj87yTXdu6Efczr7QSSgD1IPxjf6VWb0vX78UGwKVx9XLFf O//w4f1M1m0IRvtE44jtIuxlr6AgFbFlO+G0nrg5Dbau+aLl5E9+bxSiN12rKl9usxR5 ChU4kOmFK4TnvlSlQBteJRUPnG84V6X34ru+rvuPtkZoRD0Bm34dX6VcipQlC7+7aAjR U1FQ== X-Forwarded-Encrypted: i=1; AJvYcCUf9AHD+vXLukESMsW9M+eZcKyR0pGMOorykiOFriOahTLK4DLF/Fcsr75mvTFyD/Eo7uRbhZORadWVq3BbDX5xANvmeq9B2KBO+bET X-Gm-Message-State: AOJu0YwGnNnJtevuAhw7phMUMRWNQoIM1tAM3v9okpvlLs8OE0rMvdJP c1VUDG9yc2rzBcs3Aj2rkRnBN3t4SlYCkKJXZoOQ2HrVaxtEzqyRa3m0Ld/4W4o= X-Google-Smtp-Source: AGHT+IE+yjpCcruIKHgr/jvVPlk1m+tPU0e6J3vGdtJfJHpFEX7F5AeCWZd8y9c3wpmTQ6Iekk68xw== X-Received: by 2002:a17:906:7d1:b0:a6f:e47d:a965 with SMTP id a640c23a62f3a-a780b6ff0ecmr330515266b.41.1720607786309; Wed, 10 Jul 2024 03:36:26 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:26 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:14 +0100 Subject: [PATCH 07/15] usb: typec: tcpci: use GENMASK() for TCPC_TRANSMIT register fields Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-7-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Convert all fields from register TCPC_TRANSMIT to using GENMASK() and FIELD_PREP() so as to keep using a similar approach throughout the code base and make it arguably easier to read. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci.c | 7 +++++-- include/linux/usb/tcpci.h | 6 ++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index ad5c9d5bf6a9..b9ee9ccff99b 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c @@ -607,8 +607,11 @@ static int tcpci_pd_transmit(struct tcpc_dev *tcpc, en= um tcpm_transmit_type type } =20 /* nRetryCount is 3 in PD2.0 spec where 2 in PD3.0 spec */ - reg =3D ((negotiated_rev > PD_REV20 ? PD_RETRY_COUNT_3_0_OR_HIGHER : PD_R= ETRY_COUNT_DEFAULT) - << TCPC_TRANSMIT_RETRY_SHIFT) | (type << TCPC_TRANSMIT_TYPE_SHIFT); + reg =3D FIELD_PREP(TCPC_TRANSMIT_RETRY, + (negotiated_rev > PD_REV20 + ? PD_RETRY_COUNT_3_0_OR_HIGHER + : PD_RETRY_COUNT_DEFAULT)); + reg |=3D FIELD_PREP(TCPC_TRANSMIT_TYPE, type); ret =3D regmap_write(tcpci->regmap, TCPC_TRANSMIT, reg); if (ret < 0) return ret; diff --git a/include/linux/usb/tcpci.h b/include/linux/usb/tcpci.h index 3cd61e9f73b3..f7f5cfbdef12 100644 --- a/include/linux/usb/tcpci.h +++ b/include/linux/usb/tcpci.h @@ -148,10 +148,8 @@ #define TCPC_RX_DATA 0x34 /* through 0x4f */ =20 #define TCPC_TRANSMIT 0x50 -#define TCPC_TRANSMIT_RETRY_SHIFT 4 -#define TCPC_TRANSMIT_RETRY_MASK 0x3 -#define TCPC_TRANSMIT_TYPE_SHIFT 0 -#define TCPC_TRANSMIT_TYPE_MASK 0x7 +#define TCPC_TRANSMIT_RETRY GENMASK(5, 4) +#define TCPC_TRANSMIT_TYPE GENMASK(2, 0) =20 #define TCPC_TX_BYTE_CNT 0x51 #define TCPC_TX_HDR 0x52 --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85A36190697 for ; Wed, 10 Jul 2024 10:36:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607790; cv=none; b=odOfJXDZqgkhSEixRkuZpJx2wGa5iPbm2oidpgnCGkNmkMR/7ARs1M79fBkSPh1h+V9XnF0s+myWJxtsZNU+f8Vd3LljKtK3ut4H48FC0WI+OUtVwDGShI0gukqWr1XEIw/4SME/uTQIR92VGsGMHRHk1McOICYMp4zC9PhijmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607790; c=relaxed/simple; bh=UAK71+lPiVudSRvlmklIgP5araaTerPQgArmnySOaQo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HCdyk0G/79/NoLaJe4zIW9lWE/OZyJJAG1WGrKbohQHIweqxn+xwsTzcAygy3kK5a+ybBtQTEACLfE2xiaWCZz9oUTWlQnnT6ee7WjQYykWABYeCOQS8NgCC95QkEB54puveSLQ+ujSrjmXT9Epxand9F7BvvN7DeDPTaWNN/zk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GHuzfaLA; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GHuzfaLA" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-52e97e5a84bso9325851e87.2 for ; Wed, 10 Jul 2024 03:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607787; x=1721212587; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NJ8rGYIkXyuBqurWfe+RKCWq1Fp47kuxHXtN7U7bICs=; b=GHuzfaLAfxUEjxmPSRYkzl70rG/3RBNa1geqPCG3Ge7EEjCoI/vLmrJPr0mT2YxRWR HddaGLk0x5+/elP/DzuDvVDEw0B4NFCeb27C8k+RjYz3bNyHiEZ+NpBFt7h0IR8Bgt10 LguNxBKsj9BVLb6/9MZpTdFiij5mI78+A8iAnl5YOLxO7Phf+RFIf3dniU4yXYKcUZxz 73fMFhhUftbvK53W++kKycUh3mgh6MkOqsWjRqSBvV1ie1y/LvhDO9X/TACT6HYHFJcK O/iYsfdqG15Td1lhDb7JFLw9syiV2zD6oKeA9DheDEQ/8uaB8o5LR7xgiHXRomWlYFvT MQhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607787; x=1721212587; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NJ8rGYIkXyuBqurWfe+RKCWq1Fp47kuxHXtN7U7bICs=; b=oINyF5hTRZDyMeCTaFsZEaZp3DY++kQScbSrlxS5yHLSyD6rtL18x2K/Arftq1HGFq 1LVYxXacicrS/AZE2SAW2z0qayYFYVyjxTY09FNTaSsjqLeo67AFwgwnM+sQeVTx8uhw deTneYbG7+7NCfv7jbQmwu382WXriv4fkcODQF6aQct7yEd/ZtF997DF76BdJpMK/Lyt lkFtxGeHnvZ6cedZxscFCYu0AoomeSIdb3DSjhRJ5N/MRbIRCbUAkPCXxmJ7dgewxHxn nvpjYByS1BubKx9EgErSocB1AOZjWvTeB9qiL6rV91R3IqVXQGaldN6q1b19IJjaf+RC Y2GQ== X-Forwarded-Encrypted: i=1; AJvYcCUEvI8Yyq9dz3aqxeTXzR2IA26lR8TALK29RUH94qH2Pr4GNWOpkKq6RUe+1ZU3YVQDhWR7sdnmxq1cLh9UeIqFokRhQ2RLEZspI8tu X-Gm-Message-State: AOJu0YysxdzrmAIwgdAALUtU3tnGPVnrKrMe3lD9HkMKoakdlQcDe4Fq phJRF/QvplUFK2xUsyRwyeYhABqwepdPlUueLLOzm4gZWk946m7127EhPNNpehw= X-Google-Smtp-Source: AGHT+IEAemkZcOpN1KiuMHE8Tjf4sRBQIebOpKvSDum9xj1upl9bH+uRFUUVBjy4KJUn2DphCFwPWA== X-Received: by 2002:ac2:4355:0:b0:52c:cb8d:637d with SMTP id 2adb3069b0e04-52eb9991e7bmr3322394e87.5.1720607786736; Wed, 10 Jul 2024 03:36:26 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:26 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:15 +0100 Subject: [PATCH 08/15] usb: typec: tcpm/tcpci_maxim: sort TCPC_ALERT_MASK values by bit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-8-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 This makes it easier to see what's missing and what's being programmed. While at it, add brackets to help with formatting and remove a comment that doesn't add much value. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/= tcpm/tcpci_maxim_core.c index 87102b4d060d..ad9bb61fd9e0 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -97,11 +97,13 @@ static void max_tcpci_init_regs(struct max_tcpci_chip *= chip) if (ret < 0) return; =20 - alert_mask =3D TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_DISCARDED | TCPC_ALE= RT_TX_FAILED | - TCPC_ALERT_RX_HARD_RST | TCPC_ALERT_RX_STATUS | TCPC_ALERT_CC_STATUS | - TCPC_ALERT_VBUS_DISCNCT | TCPC_ALERT_RX_BUF_OVF | TCPC_ALERT_POWER_STATU= S | - /* Enable Extended alert for detecting Fast Role Swap Signal */ - TCPC_ALERT_EXTND | TCPC_ALERT_EXTENDED_STATUS | TCPC_ALERT_FAULT; + alert_mask =3D (TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_DISCARDED | + TCPC_ALERT_TX_FAILED | TCPC_ALERT_RX_HARD_RST | + TCPC_ALERT_RX_STATUS | TCPC_ALERT_POWER_STATUS | + TCPC_ALERT_CC_STATUS | + TCPC_ALERT_EXTND | TCPC_ALERT_EXTENDED_STATUS | + TCPC_ALERT_VBUS_DISCNCT | TCPC_ALERT_RX_BUF_OVF | + TCPC_ALERT_FAULT); =20 ret =3D max_tcpci_write16(chip, TCPC_ALERT_MASK, alert_mask); if (ret < 0) { --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4F241922E7 for ; Wed, 10 Jul 2024 10:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607791; cv=none; b=MHvdTyU82h+gYtCUMsG/sOWBwAEVICb0vPjX3hCK+F7WwU4sM1Fhk298A+z+yNTmYTDCRoBSXrgSeOgnfi3sD4Z+WjkTkkxf+0NosAJh6weI/0MYp75497Xr3DgoM/vxNr1gurPEpvHT0PspzK/ppOq/TGfy5siHRhrBgbb3+L8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607791; c=relaxed/simple; bh=Gh7tR4aP9b3dMS0ig0OinTPBM3NkuA777qx/jRALIJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HqIhxlAz1VoNAKWpahn1bf8oTlfUmms7rr9MqZGbbOjIg0Es0gS8m9D49l9xArGawlQ4rN0zdgywVsod1QbYCOWjmP/frf2xHQBCnPuZXys3Jj5iAJ1vkvLA5pVqB+sC4R//3oyFhDZSgeS+gGRFM5J405nC6qG8SvoIkEl0tCA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MeLVdz1U; arc=none smtp.client-ip=209.85.218.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MeLVdz1U" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a77cb7c106dso628610066b.1 for ; Wed, 10 Jul 2024 03:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607788; x=1721212588; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WjiPMEKAWGEGZZNGnZ5jjN6tgFH5yhFtTqyqgRl8h3E=; b=MeLVdz1UA7b8E76eKlPSLQFo9v78NM8jo11fLJlWW5xsmHpvEtIqewy8EjQ0YPcRIZ 588IxYu/Vhy4fDnW0GGbO4hlU5sKsae5amiz3AVgw5XSAQoZ1y2429Y2h0ra071bD3Zw Pvm6btEKO8S6NnMoRu9KClBYri44stFdEr+EAfJx5yOzNX1w24qhpGszaPm1f9hcWkK2 Ja42NT96mN5v96SIwCdPgwEElXFqQ6YM3WIPuK/4XK75A/NGPhZXegYlwjJDq85d7RO/ ik7d3m2goVUuWeplFuKizPTnTZA/wvX/txdl24TslinNR/CQfWAuNHoFf/h9TF5N3cOW bDsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607788; x=1721212588; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WjiPMEKAWGEGZZNGnZ5jjN6tgFH5yhFtTqyqgRl8h3E=; b=naKYankFFXHu15JizPL7qD+zPsCSAvz8P+r4QVkbE6vBlpvsrFAdKNf12oAQmSqf1B lxYxnl/W+iMFCyKoHnwkrRQdlV3J/OV+oE79sbs6R6rCh6Aa8ZFueFI2u/6WYp2evdQu FBF3/qyao0Iyqj3BI7ZIb+jbVI4wEqGLvCZPk/y4Tghh8QhZbnpZnVmzgBNyG875zCgk uRASuVGeeXxEWBsxeiUU9IGeAaXZ/u7s5hZtUL7tfhJxuxw65ieh6VbP+gWnJ2y1EyMQ sG0m9JdA1x3Z/UXxQFMNmVDZPn60OaQo/SCg1MeHbxQ31SBLX1dv18XJeIK1Mxp2NlhR VFiQ== X-Forwarded-Encrypted: i=1; AJvYcCVI7iurxDaXfO2D8fkPyHawfwjNguoa5pJmoMNfVNqGQYxdoDKxuSJOdOWGpKk7Ip+nQ120EWjN941ST0k/9iH1X4WfR2d46p7nevyd X-Gm-Message-State: AOJu0Yx9b3j92Im1sjinC4HR2C43NAPEbLF5n/ndvXS38rzejEa27Pge 6HrwLHdkrPzsKJudVrotqkjURcVRH00/rgwSgriDiIMGBZ5/9g1P842IUoeLWEg= X-Google-Smtp-Source: AGHT+IE5hxKfVWgP9N3rYz80ioQEE8TEjgdhOaRO1OuJCq2mi7IUtcanoHfuvuVGxv5EDLkBBXZiWw== X-Received: by 2002:a17:906:1782:b0:a77:f2c5:84c4 with SMTP id a640c23a62f3a-a780b68a1d4mr333328766b.12.1720607788116; Wed, 10 Jul 2024 03:36:28 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:26 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:16 +0100 Subject: [PATCH 09/15] usb: typec: tcpm/tcpci_maxim: simplify clearing of TCPC_ALERT_RX_BUF_OVF Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-9-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 There is no need for using the ternary if/else here, simply mask TCPC_ALERT_RX_BUF_OVF as necessary, which arguably makes the code easier to read. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/= tcpm/tcpci_maxim_core.c index ad9bb61fd9e0..5b5441db7047 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -193,9 +193,8 @@ static void process_rx(struct max_tcpci_chip *chip, u16= status) * Read complete, clear RX status alert bit. * Clear overflow as well if set. */ - ret =3D max_tcpci_write16(chip, TCPC_ALERT, status & TCPC_ALERT_RX_BUF_OV= F ? - TCPC_ALERT_RX_STATUS | TCPC_ALERT_RX_BUF_OVF : - TCPC_ALERT_RX_STATUS); + ret =3D max_tcpci_write16(chip, TCPC_ALERT, + TCPC_ALERT_RX_STATUS | (status & TCPC_ALERT_RX_BUF_OVF)); if (ret < 0) return; =20 @@ -297,9 +296,8 @@ static irqreturn_t _max_tcpci_irq(struct max_tcpci_chip= *chip, u16 status) * be cleared until we have successfully retrieved message. */ if (status & ~TCPC_ALERT_RX_STATUS) { - mask =3D status & TCPC_ALERT_RX_BUF_OVF ? - status & ~(TCPC_ALERT_RX_STATUS | TCPC_ALERT_RX_BUF_OVF) : - status & ~TCPC_ALERT_RX_STATUS; + mask =3D status & ~(TCPC_ALERT_RX_STATUS + | (status & TCPC_ALERT_RX_BUF_OVF)); ret =3D max_tcpci_write16(chip, TCPC_ALERT, mask); if (ret < 0) { dev_err(chip->dev, "ALERT clear failed\n"); --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E9D518FC61 for ; Wed, 10 Jul 2024 10:36:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607792; cv=none; b=rpRGmAx1WYQVGVca617Jq0FKXbfsDMh0f1gvizyGfTQqdrxvJyWz+1IaboVBVhmPu21r8C1T0I53WGoCBZ0RhWOTn2a+WYcje938kxgpJTRIiYo9I3EEXRHJR/4zBJejB1Ijs/bvVTQnKvO1pNeztLnAbZY03Ik9pRmqrgynZtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607792; c=relaxed/simple; bh=Ju9WlpABJdDrRTF/57aRXBECK1G9qdIeBIwu/UKN1oY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hf80fXiKjylGvIj8niOGpNdAbdl4AUylA04shcNA1OiprRosS2BXNfpBTkLsSSKJr9JtAjcVMSPdgOrBRHjidIXSWy2HWPgNg8nP21LzG6YYyD9p6yzvhtRi3yuVIorMY8D2YRKDT7PoDBssifrAf1s3Fvrwp8DHmUfxIHgPTlY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UWP61PZO; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UWP61PZO" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2eaae2a6dc1so88730491fa.0 for ; Wed, 10 Jul 2024 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607789; x=1721212589; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6OaJXkmGsoVDOS/uUKpK/gkJkaOn2bDjRVF7bUSlD2Q=; b=UWP61PZOTBH+43o19N/jnIyrCq5VV1vuT1jPAws+ISosKcVU/hYWwYhvq8iLOXsAlO q12piSif9bf2UmLenLmfTc8OEHhbK4hZtz5V/i7DhAPaVg+ZWp/yyCfr+pi7LM67wuF/ ekX5XnVUaCvFCs2HL4QA+P6O0ImuwcpBkhRUX9xz8wh63XHmG3E+oyPZqILOECiE2oBr Q+TZyNdzUJ037IW6UI2kVSnG8l3lnrN0djyoFCBKNCQgVG4CTtR0pIZm/gOSerFnHXNJ RCE/D8zR3L5baVP7+BDojte/NiuLx+64nuriclY37sn6cX1hZ5kRnrxA+C7lWMJREXYc IFXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607789; x=1721212589; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6OaJXkmGsoVDOS/uUKpK/gkJkaOn2bDjRVF7bUSlD2Q=; b=iQ4cRxsGWYMXy6UBv0DSAUU54Rs0LvyQLYNQ1Ui66valdTHV7EeIOPgzkYg7ZDvytt m0nnHqykuny9y3peU/EyqW21CGiw5t5y5wzwFjrHbud6c97SOqiobgav5WdydLj3th0m mmfzY2bOPIijAVowkyeiKNUExSGkYYbjSD35VqEgJ3j2L5Fs8JKyZtcIoQtEeguv0JDu 4vZhvPQiLxSMdzNukt1DPGPl2N6UvCWhHqghd3Gqt18cWU3D2uMRJMEtxbmIK6UV1s+O UijLJof/6r1sUdQRUTX3tah2FVbwWCk+k9NqI5Eh8LCZkGl0P0gXFF5WRfEvZigdF7sd 3qoA== X-Forwarded-Encrypted: i=1; AJvYcCUDgQ0eKl3b8yOKayMxTpUspGwyOYIUwsJS9nLrruxUqWBB+6LMujYy4IdKZ1qv+ou724tLPLGjYoer2tQPc22gS5BqtSYT/K7fGJLq X-Gm-Message-State: AOJu0YxB7GCVE2Q/3Ox0rAQVZ7d88uqmK+/ZarkmYJhMbyAgS/1Tv2co Hc+zgrMNVDdhmEQRlcS4ehB9rTWFqjHt4xwZzp4UGELWMTbT+kLijo6Ljh2nIvc= X-Google-Smtp-Source: AGHT+IEMpfogYtC0LRvrYarAjzqKHCaspVd/d5SG1JDi4DhoiWZSU86bS9h+zxWDd25iFHnSWgJRwQ== X-Received: by 2002:a05:6512:1286:b0:52d:582e:4111 with SMTP id 2adb3069b0e04-52eb999b398mr4345456e87.18.1720607788683; Wed, 10 Jul 2024 03:36:28 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:28 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:17 +0100 Subject: [PATCH 10/15] usb: typec: tcpm/tcpci_maxim: drop STATUS_CHECK() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-10-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Only one user of STATUS_CHECK() remains, and the code can actually be made more legible by simply avoiding the use of that wrapper macro, allowing to also drop the macro altogether. Do so. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index e7687aeb69c0..8ac8eeade277 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -46,8 +46,6 @@ enum fladc_select { #define READ1_SLEEP_MS 10 #define READ2_SLEEP_MS 5 =20 -#define STATUS_CHECK(reg, mask, val) (((reg) & (mask)) =3D=3D (val)) - #define IS_CC_OPEN(cc_status) \ (FIELD_GET(TCPC_CC_STATUS_CC1, cc_status) =3D=3D TCPC_CC_STATE_SRC_OPEN \ && FIELD_GET(TCPC_CC_STATUS_CC2, cc_status) =3D=3D TCPC_CC_STATE_SRC_OPE= N) @@ -368,7 +366,7 @@ bool max_contaminant_is_contaminant(struct max_tcpci_ch= ip *chip, bool disconnect } return false; } else if (chip->contaminant_state =3D=3D DETECTED) { - if (STATUS_CHECK(cc_status, TCPC_CC_STATUS_TOGGLING, 0)) { + if (!(cc_status & TCPC_CC_STATUS_TOGGLING)) { chip->contaminant_state =3D max_contaminant_detect_contaminant(chip); if (chip->contaminant_state =3D=3D DETECTED) { max_contaminant_enable_dry_detection(chip); --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7806419307A for ; Wed, 10 Jul 2024 10:36:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607792; cv=none; b=rTOMB6RKLBlglYnFYskq0NXUOBIY1LsNXzcp8A5kkv3HLv25KBLJYt2JA2O5HKE+JD2ZMQVu/lQJdsekNt2HLqY+FpOmQAaAxmssp796wJ75WnpA7lvPEpa5m16mazWyZqiXPgKB82Ppy2D1s8PyQtMdIxtIpWvyed9edkrik8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607792; c=relaxed/simple; bh=iKZAjrHtfdkDTBcwqIT8IIAuEteBm+oT+4/Ldd8Zv/s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O4QORRiP2KdNuoMp487Z5I1uJC7RcUbbhtWbTv4VdCkSY/uXN3YJgRJvUfwuwGqYpEyhFtKF2d4cYDz9u6s+fGzvoKlUm11IP4lSA8S2VMKPySlKg18N2+o8NcqjuM/c79edLoADp0GUEI4EZEFzgQZ/Xg2XubWwdSZEUGV6mU8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=XSEVjnrf; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XSEVjnrf" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a6fd513f18bso644506666b.3 for ; Wed, 10 Jul 2024 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607789; x=1721212589; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=4f4U8/fOsC4P4OR6kmi2OCEmKlH0wqzpnH4yJN7zB2M=; b=XSEVjnrfrZwSrgh4Il98HiOYv0vLV+uEN6PJkWiSU+kVeRhLw8EU08D+4RZ2rNgvvb w93W6aaJmau7Y0bb22oMqWoNIJItBmPSbTH+BuFSEuS+tzy/bfR0ji4zNSSM7ExVoSqN 2OMj/uFdEU39EBsT8P82by/+B6HemnaRTO6OMYr7SwHbbiGs5pFC7UnFAvlx+zhVz4cL GonW+VMwARPSVCAtREXDjio+TuEh3Uo/l+DuJzlkPJoEmZzGKNVuRm5YKkS+FF2xsc8P v5lAeRMCi0Fzs/0ZNOLdBzAqKQ4fkXEMRxFf61egaCJZf34lbh6wbvJC6gRMvjE1xSqn 8XaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607789; x=1721212589; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4f4U8/fOsC4P4OR6kmi2OCEmKlH0wqzpnH4yJN7zB2M=; b=DcoGeQo9cE8RzOQ9azvzT0T2yMIWdgXd0dX3RPw+1WcGKGXsnabM03c995yv2NgDEp og9syAuFEOR/mYXViqGDAKsgb2V8N99Hoe1xeg41OfHbNvjQqUoUaG2iWbsIjERAsC7X l7w4povFBX0jXoVRLOh4vHcKeaWjxBQj4LFG08jv4x4Yi5u805dL0zaRtmf7PVdOwBXa VAoePWJqA/5WHKZS6wtQ5Ccy+Tw6gaJVJr7tW/2pbCayWQcnOqZ4BkHqBVklqpS+FqH/ xVxaiZKw0oJmwm5nK41csjhvj09IdEF93mao6KgUKwSOqCiFFPU3QhSzhqfeG5HpOUM2 oAnA== X-Forwarded-Encrypted: i=1; AJvYcCUM5ECh7nvTrr1ZGfpmV9CevebyeSVlVPmtJmQfS15SA26BtozfwqunD/kioF+EzZ9A/BlxB5ddHijHieOvLlNtWJ2EiQj1yya/NoVd X-Gm-Message-State: AOJu0YxBVQHZCMln1BjLojkYohy0ES7IJCCKqdZlceRQS8k4nGAj9HUr EUF19PZ9AO+TSCK4HNhXw0l/2LkiMAK/SwDGH1Ulkut3N91fJ363Rz5buLL0848= X-Google-Smtp-Source: AGHT+IEvqzy9YTroir6a8Gy3exKL8AyeWU3F+zp1bH+uYbn1XzaklbsibxtyHBAUB/KlXQLl381+AQ== X-Received: by 2002:a17:907:7e82:b0:a77:bf32:b91e with SMTP id a640c23a62f3a-a780b8848e7mr366241666b.49.1720607789137; Wed, 10 Jul 2024 03:36:29 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:28 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:18 +0100 Subject: [PATCH 11/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL2 register Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-11-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Convert register TCPC_VENDOR_CC_CTRL2 to using GENMASK() and FIELD_PREP() so as to keep using a similar approach throughout the code base and make it arguably easier to read. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 18 +++++++++++------- drivers/usb/typec/tcpm/tcpci_maxim.h | 6 +++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index 8ac8eeade277..f7acaa42329f 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -116,13 +116,14 @@ static int max_contaminant_read_resistance_kohm(struc= t max_tcpci_chip *chip, if (channel =3D=3D CC1_SCALE1 || channel =3D=3D CC2_SCALE1 || channel =3D= =3D CC1_SCALE2 || channel =3D=3D CC2_SCALE2) { /* Enable 1uA current source */ - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL_MAS= K, - ULTRA_LOW_POWER_MODE); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL, + FIELD_PREP(CCLPMODESEL, ULTRA_LOW_POWER_MODE)); if (ret < 0) return ret; =20 /* Enable 1uA current source */ - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL_MASK, = UA_1_SRC); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL, + FIELD_PREP(CCRPCTRL, UA_1_SRC)); if (ret < 0) return ret; =20 @@ -176,7 +177,8 @@ static int max_contaminant_read_comparators(struct max_= tcpci_chip *chip, u8 *ven int ret; =20 /* Enable 80uA source */ - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL_MASK, U= A_80_SRC); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL, + FIELD_PREP(CCRPCTRL, UA_80_SRC)); if (ret < 0) return ret; =20 @@ -209,7 +211,8 @@ static int max_contaminant_read_comparators(struct max_= tcpci_chip *chip, u8 *ven if (ret < 0) return ret; =20 - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL_MASK, 0= ); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCRPCTRL, + FIELD_PREP(CCRPCTRL, 0)); if (ret < 0) return ret; =20 @@ -298,8 +301,9 @@ static int max_contaminant_enable_dry_detection(struct = max_tcpci_chip *chip) if (ret < 0) return ret; =20 - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL_MASK, - ULTRA_LOW_POWER_MODE); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL2, CCLPMODESEL, + FIELD_PREP(CCLPMODESEL, + ULTRA_LOW_POWER_MODE)); if (ret < 0) return ret; ret =3D max_tcpci_read8(chip, TCPC_VENDOR_CC_CTRL2, &temp); diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/= tcpci_maxim.h index 78ff3b73ee7e..92c9a628ebe1 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.h +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h @@ -20,9 +20,9 @@ #define SBUOVPDIS BIT(7) #define CCOVPDIS BIT(6) #define SBURPCTRL BIT(5) -#define CCLPMODESEL_MASK GENMASK(4, 3) -#define ULTRA_LOW_POWER_MODE BIT(3) -#define CCRPCTRL_MASK GENMASK(2, 0) +#define CCLPMODESEL GENMASK(4, 3) +#define ULTRA_LOW_POWER_MODE 1 +#define CCRPCTRL GENMASK(2, 0) #define UA_1_SRC 1 #define UA_80_SRC 3 =20 --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 399A919344E for ; Wed, 10 Jul 2024 10:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; cv=none; b=mxoq7BRu+KMiZ1PBaEGwjIHnyzUp7E4QiwUW/QWm+Atezw2wGYIS5ccHrNKmScYuLES+qb4xlmc/jL+mTGQK///LlY+bLuxZ6OJpiPFsol4J/Q/Q3rrl7IZZnCis0tuvpxntfwnR3EfocUYkr2Nt0fET9gT2xYm5fJC6kfHUpYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; c=relaxed/simple; bh=6F4oRj5CmywAwgGMzR18n53zdqYf4amN+tox2qEAYDs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qMhCOTrbRsMRFlCT0cGXDZMd0/1KTcvfp8hf9Vt7BqriCrC2CzsucJw624gy+Xu2pslFakq5Y2NU3E7eHoe0wW3F9MRWh5fzuDCtChcaVESu6SFBBp2KqEowdvLEdbZLNYUyTtoJl0tQ9pE0NVFEVmw5LyAGyW+x75wv4OSPyYk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=bGne+uzr; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="bGne+uzr" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a77dc08db60so568206366b.1 for ; Wed, 10 Jul 2024 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607789; x=1721212589; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JA4sofr4YaUcqBd7byii4fe2UEfxA6G4UUKcsqWmUZ0=; b=bGne+uzr3FXLVEhxk33ogphKsevCf2S6tkk2PnvPuP/LB+tAx4DPfgp0nUdSHFN5su 0A272eJelDZ42zcg219dzSBJLvGDAfrCh5QTxvU3bLYpszRG3KiUF5UEGdTBcXel5NO4 aaszfCXgrx2233FtT/lZ4f+taNmn+m2TOJ1njx3Uw4dFDQyksx+hVpNUIeVypOpRQr/l QNvT7fihPz+RZgQ5NfBlPFhqaNOuwdKcMOFUYkI3ZruGjBZcPhvefrjXc5A9RpBR84+G KjUUaTvNVn9bqz0yL6snOslZvO1kLOj3Gj2FqNKJkmsPcWgw/rc8qf4KrCd5ADud/bcn +arQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607789; x=1721212589; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JA4sofr4YaUcqBd7byii4fe2UEfxA6G4UUKcsqWmUZ0=; b=bqc5FZHQVntqdzM8cWPakwjPOIvcIMH3yDMhtdVJC/Tv/MyhDRJzHiohtJx+tkOD6S ou00NzmshFz5vKSJFR7zmueFu0uwCJP03cvf3VVQV245wuJtBsvt7ERzO6WtRYrMLXiw Oyp2cBwSAP0qbFCNtdy55fGZULZlVoDrn3RBStSnbUU6etNxckVqTmj3fQ1PL9WAMlsV sGR93xqcpq8u2VXuZjyyHgfiUohvtkitRFf1Z8X6vgqUae1XGX/niWmiM24j1x14aTSe dIF1l4J1fw7AXK7U62I5sCiDOmzhVViMQuRjv0CcJmW28vcqPo8ZRpE9kEWebOHG/yKL ToeQ== X-Forwarded-Encrypted: i=1; AJvYcCVEp9TeBLqAb+DWEB1DQoLh6XssenbggByEjZrR8qE1oEg0WoHLvGIdP4YhLJuptGCSJ4nH3Ep3vWAxvzQpORmNqD2g/gk9Q+O5kY6N X-Gm-Message-State: AOJu0Yx7SG7cNVIiaHBoCcKyNMGi8bep74LfdRNfxeEa3k3XWN0QlRd/ y/fYecuZ+Hgqo3RBhpCzWR5RgJE6Evi0ImAjdMIoR0Jv6bW8JyPnsKWiCW0Y8es= X-Google-Smtp-Source: AGHT+IGijgZ/qjIv9JTzm6BbhLw1tuyBkh+jw/5AUldqnh2NXH3H9j2aMvTMeUXMF7JiFKpsZTYgIg== X-Received: by 2002:a17:906:4e98:b0:a6e:d339:c09c with SMTP id a640c23a62f3a-a780b882737mr402489866b.48.1720607789565; Wed, 10 Jul 2024 03:36:29 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:29 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:19 +0100 Subject: [PATCH 12/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_CC_CTRL3 register Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-12-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Convert register TCPC_VENDOR_CC_CTRL3 to using GENMASK() so as to keep using a similar approach throughout the code base and make it arguably easier to read. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 9 +++++---- drivers/usb/typec/tcpm/tcpci_maxim.h | 9 +++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index f7acaa42329f..cf9887de96c9 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -283,10 +283,11 @@ static int max_contaminant_enable_dry_detection(struc= t max_tcpci_chip *chip) u8 temp; int ret; =20 - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3, CCWTRDEB_MASK | = CCWTRSEL_MASK - | WTRCYCLE_MASK, CCWTRDEB_1MS << CCWTRDEB_SHIFT | - CCWTRSEL_1V << CCWTRSEL_SHIFT | WTRCYCLE_4_8_S << - WTRCYCLE_SHIFT); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_CC_CTRL3, + CCWTRDEB | CCWTRSEL | WTRCYCLE, + FIELD_PREP(CCWTRDEB, CCWTRDEB_1MS) + | FIELD_PREP(CCWTRSEL, CCWTRSEL_1V) + | FIELD_PREP(WTRCYCLE, WTRCYCLE_4_8_S)); if (ret < 0) return ret; =20 diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/= tcpci_maxim.h index 92c9a628ebe1..34076069444f 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.h +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h @@ -27,15 +27,12 @@ #define UA_80_SRC 3 =20 #define TCPC_VENDOR_CC_CTRL3 0x8e -#define CCWTRDEB_MASK GENMASK(7, 6) -#define CCWTRDEB_SHIFT 6 +#define CCWTRDEB GENMASK(7, 6) #define CCWTRDEB_1MS 1 -#define CCWTRSEL_MASK GENMASK(5, 3) -#define CCWTRSEL_SHIFT 3 +#define CCWTRSEL GENMASK(5, 3) #define CCWTRSEL_1V 0x4 #define CCLADDERDIS BIT(2) -#define WTRCYCLE_MASK BIT(0) -#define WTRCYCLE_SHIFT 0 +#define WTRCYCLE GENMASK(0, 0) #define WTRCYCLE_2_4_S 0 #define WTRCYCLE_4_8_S 1 =20 --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FF6F190049 for ; Wed, 10 Jul 2024 10:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; cv=none; b=YJs8640ZhaBvjchGtUEkHn84fNyhKPqtxXUQvc8X/X5OJa1s1rwHblOZuohL9+yER3nSLB93kqEVdveMaUcIJ0vFPsIGV7Xr4WqaSVdMvKBlsleSsHYdXxMABFNeQXAEvatM10tSa8m3bAvnMD6vS13aMgApjfAy+NbCYFhCPoA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; c=relaxed/simple; bh=5yRLOBbpIkonyEMF2zlkIakdxYmFf6q9yRfJ8EyXCI0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HOdAsPuPn3RcUMsV3mj05C8sgCWH1IKynWSrDO4f9kuJK5F/bJ93StbRKex9/36ksPHYuX2Btr1F3YrEHO/1eNZ/J3GPC8tGl5Hozu6I7Z9/6k2qqkYlmR2JkD5hHS5KcOEI2K1y7YEcZ8zYXV93cS7B+5qAbchTixLCIozJHy8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=t2iuUmxu; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="t2iuUmxu" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a77baa87743so665845766b.3 for ; Wed, 10 Jul 2024 03:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607790; x=1721212590; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kYMGxlVQPX5oebPOJL95p63LDeiB2wZboyKuWqi62pM=; b=t2iuUmxu/JD0RJmUdNdUC6/sahYaSXdMd9idXe/zvL6WBe2JddU1mNjG1j5O0A3jTH 7R3zxhioJLND98IyPN38hf2sPQh/l1m2NS5tzeD6LBMy6sN0fBMXnBzaS+3lUgPIMNVh wpWqCQIlcTDtdJMCnT5NGOcRa4VOMmvhXD9hqfcdDL43mcIZRZQNMKaV7LtOGz+B3j1l rpgySzBrU0MpzyIKJ/i3Lg6zxS9LXwPN70qF2j05Sg187ph2/b7eMGTlVUwzlKda2qo6 cek+H56/A6WZFZg9sUlYjgig5cipxBuGBub/H1WEXtzwcp4SSk1MEy2QCs4RgMohx77b v+Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607790; x=1721212590; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kYMGxlVQPX5oebPOJL95p63LDeiB2wZboyKuWqi62pM=; b=cCNa2VB/T1uR6PZwDha7aY58BsRxthreNh0/H7yaOsdVj8ZrQXvimi/gQwK3N/Mr6L n5TO+lPZJY7j/tC+bd4kylM8x7gYlpD0NtDZ40gBCKCEsrzQu+cvo/WSKTKrrNnzE/RO z37IHpAm5+Zi5P70okqg1dDbW2R5sE5/yrPMbe3LcntP4gB1v4iyKT1Tq2FigEFww+ti fJzjC+uyzmmm412hUA/di8kTrgohgoZuthBS0D8eWU8wKFTi+dpUJYxdAyO66DYnlsKV 5OWlFsDvhFXDLs3EdyHjJWWo/YSovxcLc9A/NZGjxFNJminiG50f920YwZAcV3s1a8iz YkVw== X-Forwarded-Encrypted: i=1; AJvYcCWeQ3/nXDj/Wup9HFAGwuaLCGEbax0a8RBt8YrDSdgbWHFPPT5hPiWcVBRrv8LmF5zq4MmxxJcppDfhcs6XENVqmeDsCDPjMzosi6Sp X-Gm-Message-State: AOJu0YzPEfvVPugDKHs5b2qUkj5ORDixGuVa/RfPZ+VRb/UiCxgr/2CL b5sDezYdCWoFlDtqhO/W3ATyQdx/SCpqHfGRlOXDDFq0UJlBvIB3cP9as5gShhA= X-Google-Smtp-Source: AGHT+IF1B0nCfAGt+fXGX3owUMA0Hi5Y5naIp5/iV6A4WHwQy1qFb0eKndiXPEm0xY4mUwcKTmld6A== X-Received: by 2002:a17:906:1610:b0:a72:aeff:dfed with SMTP id a640c23a62f3a-a780b8826b7mr381618866b.53.1720607789980; Wed, 10 Jul 2024 03:36:29 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:29 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:20 +0100 Subject: [PATCH 13/15] usb: typec: tcpm/tcpci_maxim: use GENMASK() for TCPC_VENDOR_ADC_CTRL1 register Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-13-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Convert register TCPC_VENDOR_ADC_CTRL1 to using GENMASK() and FIELD_PREP() so as to keep using a similar approach throughout the code base and make it arguably easier to read. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/maxim_contaminant.c | 7 ++++--- drivers/usb/typec/tcpm/tcpci_maxim.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/tcpm/maxim_contaminant.c b/drivers/usb/typec= /tcpm/maxim_contaminant.c index cf9887de96c9..7bfec45e8f4f 100644 --- a/drivers/usb/typec/tcpm/maxim_contaminant.c +++ b/drivers/usb/typec/tcpm/maxim_contaminant.c @@ -76,8 +76,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_c= hip *chip, enum fladc_s int ret; =20 /* Channel & scale select */ - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, - channel << ADC_CHANNEL_OFFSET); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, + FIELD_PREP(ADCINSEL, channel)); if (ret < 0) return ret; =20 @@ -96,7 +96,8 @@ static int max_contaminant_read_adc_mv(struct max_tcpci_c= hip *chip, enum fladc_s if (ret < 0) return ret; =20 - ret =3D regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL_MASK, = 0); + ret =3D regmap_update_bits(regmap, TCPC_VENDOR_ADC_CTRL1, ADCINSEL, + FIELD_PREP(ADCINSEL, 0)); if (ret < 0) return ret; =20 diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.h b/drivers/usb/typec/tcpm/= tcpci_maxim.h index 34076069444f..a41ca9e7ad08 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim.h +++ b/drivers/usb/typec/tcpm/tcpci_maxim.h @@ -37,8 +37,7 @@ #define WTRCYCLE_4_8_S 1 =20 #define TCPC_VENDOR_ADC_CTRL1 0x91 -#define ADCINSEL_MASK GENMASK(7, 5) -#define ADC_CHANNEL_OFFSET 5 +#define ADCINSEL GENMASK(7, 5) #define ADCEN BIT(0) =20 enum contamiant_state { --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF06319149C for ; Wed, 10 Jul 2024 10:36:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; cv=none; b=phaHip49oNZ38Q6KJLPcNxFzLz/BcLmH7mGzgsGepDo+mU2Bq3HwCJHcQxfED14MgIaEe3S7MhaFCWMU2UQtbPI0ldcOiWRb2a3EAtkuulFY/xvap3Hdhb3QMKZfBn6119AQVf6L69UN3PkEwGt+oRIWlUOpnY852kcN84dN6ew= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607793; c=relaxed/simple; bh=kTwbKe61QUCPrnbb1cpVQTggcXTOn/D7Df0XXPC5NLM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MFKNLIVfoHnKmLQafGtE87+Ybu4wYlcXOXZgZ9albwCJ6zZDGsFKbPiH/bDm1S4x1ABBbt2B6DW48iJnpVIYmFmkrGPqeKa6ssSsMH1zMrKVRw9ANaAZiiilljlzS+JQHmd0bKU/Syh0077fQiGhQd5lwrPGjLxoHjkiWI0PUc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=aN6AsiSq; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aN6AsiSq" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-59559ea9cfdso1953374a12.0 for ; Wed, 10 Jul 2024 03:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607790; x=1721212590; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LBsGAX5ucZSs0rabFc3mHUKWbMSbxv4GqyzeE6M9P0w=; b=aN6AsiSqKEPV/GkeK3JuGMezSZlnBUuSDp0gfUsz/zlELkF9A3i4RSOof1ePNraetk 2PUPPjW8C7vx/poo4SprZYa/tf9QkXHotlpj0H98weKFBjhX7pn5dYXNRuziZvmltxFx eyoB0eKlsUesjwY34YL5+vj5E7SO7fpR1wq4EWDR6X010EvpihQOWI0nFQX2xeFacxZy 997Q1pFhZn/TvUM1n+YxrQCT+dQoD9AV/SVFogFfHeQ2mmNuGALUqgwlvVVOY5cJnXcX TVe5JRPGRFTULq1rL7MIv9zUWpUQPa/fD9ONfksqCuAM+5mfjdbxzLBl0xseU/K+dRSt ZBlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607790; x=1721212590; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LBsGAX5ucZSs0rabFc3mHUKWbMSbxv4GqyzeE6M9P0w=; b=UMMuzoD2wSnf3pSNaBWKpSka6PCiTEHwsTlgjtMEUR/PQcDaBr7ehBuUKemA6ZZsAL VgpG9T2rrgy44ndPMWGLLCTH0l8fi82hc8qgVp/9xtrZfan163HfEx1fpyxunw2fdaq2 7M6XlXR7GDXgya1bBs00oxMBi2TS/THvdK7UMxJ2q+Va6woIs6FbXfWvHPULeocf/OU9 vL5zHN8i1glh3dOLn4ec2HKdWyYTqm7jtcLWlXTomVC48XMM176d3A4+jstYScqjvcR/ vtuhWNp8SVXeNMwBgusZiDebAWlAQohlVS1R2vT980JcEnb/3dOKxuuMSD3VupwqGdpb fVyQ== X-Forwarded-Encrypted: i=1; AJvYcCVTCZ2DgxpAA6EhVOklRwP8ResddDjUM7KuFoXmwaspOFGxYa4/LHrjqO2XwcHn52P1W3hK/zZ7ZVTv7dFKL7AkIRVEy4tog4niQ7E+ X-Gm-Message-State: AOJu0YzIbZTP+TrWUBjPFW76Ct6e9YnSOYX6dMqaCrr3aCVeaYcSZfEc jN9+7ptYuH7522ZOkmIr9Pd51NiDGqXqkpLd0wEa+hQPEg5/J5eNWo+h6a6o5bM= X-Google-Smtp-Source: AGHT+IHX+sxCHXBwTJmD4epP7d3YbfxuGZjRjObQdw7BJhHSOlvO1QQLECp833J9njXjW0as97YSGg== X-Received: by 2002:a17:907:3f25:b0:a77:c13c:2170 with SMTP id a640c23a62f3a-a780b89ddb8mr357976066b.77.1720607790415; Wed, 10 Jul 2024 03:36:30 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:30 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:21 +0100 Subject: [PATCH 14/15] usb: typec: tcpm/tcpci_maxim: convert to dev_err_probe() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-14-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 dev_err_probe() exists as a useful helper ensuring standardized error messages during .probe() and using it also helps to make the code more legible. Use it. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/= tcpm/tcpci_maxim_core.c index 5b5441db7047..ee3e86797f17 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -484,17 +484,17 @@ static int max_tcpci_probe(struct i2c_client *client) =20 chip->client =3D client; chip->data.regmap =3D devm_regmap_init_i2c(client, &max_tcpci_regmap_conf= ig); - if (IS_ERR(chip->data.regmap)) { - dev_err(&client->dev, "Regmap init failed\n"); - return PTR_ERR(chip->data.regmap); - } + if (IS_ERR(chip->data.regmap)) + return dev_err_probe(&client->dev, PTR_ERR(chip->data.regmap), + "Regmap init failed\n"); =20 chip->dev =3D &client->dev; i2c_set_clientdata(client, chip); =20 ret =3D max_tcpci_read8(chip, TCPC_POWER_STATUS, &power_status); if (ret < 0) - return ret; + return dev_err_probe(&client->dev, ret, + "Failed to read TCPC_POWER_STATUS\n"); =20 /* Chip level tcpci callbacks */ chip->data.set_vbus =3D max_tcpci_set_vbus; @@ -511,10 +511,10 @@ static int max_tcpci_probe(struct i2c_client *client) =20 max_tcpci_init_regs(chip); chip->tcpci =3D tcpci_register_port(chip->dev, &chip->data); - if (IS_ERR(chip->tcpci)) { - dev_err(&client->dev, "TCPCI port registration failed\n"); - return PTR_ERR(chip->tcpci); - } + if (IS_ERR(chip->tcpci)) + return dev_err_probe(&client->dev, PTR_ERR(chip->tcpci), + "TCPCI port registration failed\n"); + chip->port =3D tcpci_get_tcpm_port(chip->tcpci); ret =3D max_tcpci_init_alert(chip, client); if (ret < 0) @@ -526,7 +526,8 @@ static int max_tcpci_probe(struct i2c_client *client) unreg_port: tcpci_unregister_port(chip->tcpci); =20 - return ret; + return dev_err_probe(&client->dev, ret, + "Maxim TCPCI driver initialization failed\n"); } =20 static void max_tcpci_remove(struct i2c_client *client) --=20 2.45.2.803.g4e1b14247a-goog From nobody Wed Dec 17 12:13:33 2025 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DE2519408E for ; Wed, 10 Jul 2024 10:36:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607794; cv=none; b=fYWO1XzA1slZk8SGHWiDC5N/0KTRyrfZ2HweKI+LmS6ZkG1Dm+Uz0qD/KAh6jfLLrKPS+sKPuBWY/DP+WmAfkZoBCFs8VD6dPH1arWcRRJkW7xC3Wpdd8frgZlow+uEHaqrF+bJJc0Oa8NRMePeu7UQlzx+kgJ0z1gopAOUBoxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720607794; c=relaxed/simple; bh=v+I5fZKIK+3f31tZX+uZTfNTTOvQkNNPPT3FGfrJxo0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B89jn2xzuH1YGFzvFwlXlkvsiJ+ZzjT2Sy+qvU3IBAew0OJB/xCj7QrKkWCBzyZk+1JKRNT+VxxU8GxrXrT59lEOap67FPlYuRmv0VXyke2pITvf49BwGsDEI0qwFJi/PFPLw8CUmptSkzXW3bQLQY+zVLOzjP6rttAY0mb2cB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GtbYkouH; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GtbYkouH" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-58c947a6692so7767830a12.0 for ; Wed, 10 Jul 2024 03:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1720607791; x=1721212591; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=2EHz6jGnv+MSlXLIFJTYz0j3V4QrlhRk5xlWpqxujXQ=; b=GtbYkouH9DhQu2BJZIWgcBQ4f0ismW72b1jmrRUmxnpCiiZy2uwhg8I9gg8LCvGRbv /+/yqIb9CykbiIhZx17d0Zxm1KNqRVu9CagxlPg6dEws/PYB9xIxQHTBYLxyAQE88thl 7+0DynZW4zNv0iHD56phWgIOWJdvFVBR+UzakpaF9Pf+9ZF1PZl874vtvKQdY2kzd4nV 8QXRZj+njSC3RSlC4KTbehFkuzQbXOK6HPeeJWkd8c75IClf2/E7Xuod2WFsDmyRGEcX 8hXGknAPyciJYOcA8y8fpaPWElHzOgWG7TOBCfMDAfxI1Zii3Zeco8untVBxASf88mzs /exQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720607791; x=1721212591; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2EHz6jGnv+MSlXLIFJTYz0j3V4QrlhRk5xlWpqxujXQ=; b=teS6f4vDLVgvpVD9WHwEMstVXohiuJDoQVCuYkpEhc5OtLZWrvGdWAATl5knIq4Xjx 02s4SjEPMMVlYXN5woE8o7tBNtMTZrch7OsMfTRQEpigBkbaaw6MqQpfZ/87Oc/nVW/Q goHyUMJUJvuZ5W0jwb4oMHpmy/ISbAJKIjNRFQNdfEbR8zV9teirBmTwTf/YhHFbbcj0 d2L7wKfWzjBfJ1pqydNBr0i2MCiwqB7pC1tSPSPmySAIrwficCRydvNRDchYx9SfOkPB pB63xwOUErm7UXTkL9ItZdE8VLE0vgL3Ox/hdLzu9wHGu0jZsSaNFY1gO7MudqFjXmd1 c0EA== X-Forwarded-Encrypted: i=1; AJvYcCVwRr5Ah5+R1ESnYnD+mHKvWt+JrYhtQ9F9sxIQcJ1Cd37QHHR9DIXRX4upVp2cQqb5g8/bz3OBUMWiK364h+kSA0/sFVKGuInA/Bqk X-Gm-Message-State: AOJu0YwU33zNqSBUHD2RI8NsE6N0y8Y9/yXPhZ1y73AT2H4FdlFzCU+M Lm58EMbivMa02ustVv7c1bKkF5LYXPaWyuA5atPuD0uuUvRgy3y7TRH6XrK4eIKpww+IgRFvmcu 0tFc= X-Google-Smtp-Source: AGHT+IHONz7ukaXxFyPTjynNVCKibzciLGDtNH5tc/vYHzKXbY/8i2tsQWiv7EwjCwlhWObWe5BgqA== X-Received: by 2002:a17:907:2d2b:b0:a75:2d52:8ca8 with SMTP id a640c23a62f3a-a780b89f457mr441045866b.75.1720607790824; Wed, 10 Jul 2024 03:36:30 -0700 (PDT) Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com. [35.204.239.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dc77dsm146576966b.52.2024.07.10.03.36.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jul 2024 03:36:30 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Wed, 10 Jul 2024 11:36:22 +0100 Subject: [PATCH 15/15] usb: typec: tcpm/tcpci_maxim: use device managed TCPCI port deregistration Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240710-tcpc-cleanup-v1-15-0ec1f41f4263@linaro.org> References: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> In-Reply-To: <20240710-tcpc-cleanup-v1-0-0ec1f41f4263@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman Cc: Peter Griffin , Tudor Ambarus , Will McVicker , Badhri Jagan Sridharan , kernel-team@android.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 Instead of open-coding the call to tcpci_unregister_port() in various places, let's just register a hook using devm_add_action_or_reset() so that it gets called automatically as and when necessary by the device management APIs. Signed-off-by: Andr=C3=A9 Draszik Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 30 ++++++++++++++-------------= --- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpci_maxim_core.c b/drivers/usb/typec/= tcpm/tcpci_maxim_core.c index ee3e86797f17..7abfd29b4b01 100644 --- a/drivers/usb/typec/tcpm/tcpci_maxim_core.c +++ b/drivers/usb/typec/tcpm/tcpci_maxim_core.c @@ -472,6 +472,11 @@ static bool max_tcpci_attempt_vconn_swap_discovery(str= uct tcpci *tcpci, struct t return true; } =20 +static void max_tcpci_unregister_tcpci_port(void *tcpci) +{ + tcpci_unregister_port(tcpci); +} + static int max_tcpci_probe(struct i2c_client *client) { int ret; @@ -515,27 +520,21 @@ static int max_tcpci_probe(struct i2c_client *client) return dev_err_probe(&client->dev, PTR_ERR(chip->tcpci), "TCPCI port registration failed\n"); =20 + ret =3D devm_add_action_or_reset(&client->dev, + max_tcpci_unregister_tcpci_port, + chip->tcpci); + if (ret) + return ret; + chip->port =3D tcpci_get_tcpm_port(chip->tcpci); + ret =3D max_tcpci_init_alert(chip, client); if (ret < 0) - goto unreg_port; + return dev_err_probe(&client->dev, ret, + "IRQ initialization failed\n"); =20 device_init_wakeup(chip->dev, true); return 0; - -unreg_port: - tcpci_unregister_port(chip->tcpci); - - return dev_err_probe(&client->dev, ret, - "Maxim TCPCI driver initialization failed\n"); -} - -static void max_tcpci_remove(struct i2c_client *client) -{ - struct max_tcpci_chip *chip =3D i2c_get_clientdata(client); - - if (!IS_ERR_OR_NULL(chip->tcpci)) - tcpci_unregister_port(chip->tcpci); } =20 static const struct i2c_device_id max_tcpci_id[] =3D { @@ -558,7 +557,6 @@ static struct i2c_driver max_tcpci_i2c_driver =3D { .of_match_table =3D of_match_ptr(max_tcpci_of_match), }, .probe =3D max_tcpci_probe, - .remove =3D max_tcpci_remove, .id_table =3D max_tcpci_id, }; module_i2c_driver(max_tcpci_i2c_driver); --=20 2.45.2.803.g4e1b14247a-goog