diff mbox series

[v2] usb: typec: mux: intel: Fix DP_HPD_LVL bit field

Message ID 20200510213934.146631-1-pmalani@chromium.org (mailing list archive)
State Superseded
Headers show
Series [v2] usb: typec: mux: intel: Fix DP_HPD_LVL bit field | expand

Commit Message

Prashant Malani May 10, 2020, 9:39 p.m. UTC 
According to the PMC Type C Subsystem (TCSS) Mux programming guide rev
0.6, the PMC HPD request LVL bit field is bit 4.
Fix the definition here to match the programming guide.

Since this bit field is changing, explicitly define a field for the
HPD_HIGH mode data bit.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Fixes: 6701adfa9693 ("usb: typec: driver for Intel PMC mux control")
Reviewed-by: Benson Leung <bleung@chromium.org>
---

Changes in v2:
- Fixed bit error in commit message.

 drivers/usb/typec/mux/intel_pmc_mux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Lars Melin May 11, 2020, 8:49 a.m. UTC | #1 
On 5/11/2020 04:39, Prashant Malani wrote:
> According to the PMC Type C Subsystem (TCSS) Mux programming guide rev
> 0.6, the PMC HPD request LVL bit field is bit 4.
> Fix the definition here to match the programming guide.
> 
> Since this bit field is changing, explicitly define a field for the
> HPD_HIGH mode data bit.
> 
> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> Fixes: 6701adfa9693 ("usb: typec: driver for Intel PMC mux control")
> Reviewed-by: Benson Leung <bleung@chromium.org>
> ---
> 
> Changes in v2:
> - Fixed bit error in commit message.
> 
>   drivers/usb/typec/mux/intel_pmc_mux.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
> index 67c5139cfa0d..15074aec94eb 100644
> --- a/drivers/usb/typec/mux/intel_pmc_mux.c
> +++ b/drivers/usb/typec/mux/intel_pmc_mux.c
> @@ -63,6 +63,7 @@ enum {
>   #define PMC_USB_ALTMODE_DP_MODE_SHIFT	8
>   
>   /* TBT specific Mode Data bits */
> +#define PMC_USB_ALTMODE_HPD_HIGH	BIT(14)
>   #define PMC_USB_ALTMODE_TBT_TYPE	BIT(17)
>   #define PMC_USB_ALTMODE_CABLE_TYPE	BIT(18)
>   #define PMC_USB_ALTMODE_ACTIVE_LINK	BIT(20)
> @@ -75,7 +76,7 @@ enum {
>   
>   /* Display HPD Request bits */
>   #define PMC_USB_DP_HPD_IRQ		BIT(5)
> -#define PMC_USB_DP_HPD_LVL		BIT(6)
> +#define PMC_USB_DP_HPD_LVL		BIT(4)
>   
Please keep the bits sorted

>   struct pmc_usb;
>   
> @@ -158,8 +159,7 @@ pmc_usb_mux_dp(struct pmc_usb_port *port, struct typec_mux_state *state)
>   			 PMC_USB_ALTMODE_DP_MODE_SHIFT;
>   
>   	if (data->status & DP_STATUS_HPD_STATE)
> -		req.mode_data |= PMC_USB_DP_HPD_LVL <<
> -				 PMC_USB_ALTMODE_DP_MODE_SHIFT;
> +		req.mode_data |= PMC_USB_ALTMODE_HPD_HIGH;
>   
>   	return pmc_usb_command(port, (void *)&req, sizeof(req));
>   }
> 

Thanks
Lars
Prashant Malani May 11, 2020, 9:18 a.m. UTC | #2 
Hi Lars,

Thanks for reviewing the patch.

On Mon, May 11, 2020 at 1:49 AM Lars Melin <larsm17@gmail.com> wrote:
>
> On 5/11/2020 04:39, Prashant Malani wrote:
> > According to the PMC Type C Subsystem (TCSS) Mux programming guide rev
> > 0.6, the PMC HPD request LVL bit field is bit 4.
> > Fix the definition here to match the programming guide.
> >
> > Since this bit field is changing, explicitly define a field for the
> > HPD_HIGH mode data bit.
> >
> > Signed-off-by: Prashant Malani <pmalani@chromium.org>
> > Fixes: 6701adfa9693 ("usb: typec: driver for Intel PMC mux control")
> > Reviewed-by: Benson Leung <bleung@chromium.org>
> > ---
> >
> > Changes in v2:
> > - Fixed bit error in commit message.
> >
> >   drivers/usb/typec/mux/intel_pmc_mux.c | 6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
> > index 67c5139cfa0d..15074aec94eb 100644
> > --- a/drivers/usb/typec/mux/intel_pmc_mux.c
> > +++ b/drivers/usb/typec/mux/intel_pmc_mux.c
> > @@ -63,6 +63,7 @@ enum {
> >   #define PMC_USB_ALTMODE_DP_MODE_SHIFT       8
> >
> >   /* TBT specific Mode Data bits */
> > +#define PMC_USB_ALTMODE_HPD_HIGH     BIT(14)
> >   #define PMC_USB_ALTMODE_TBT_TYPE    BIT(17)
> >   #define PMC_USB_ALTMODE_CABLE_TYPE  BIT(18)
> >   #define PMC_USB_ALTMODE_ACTIVE_LINK BIT(20)
> > @@ -75,7 +76,7 @@ enum {
> >
> >   /* Display HPD Request bits */
> >   #define PMC_USB_DP_HPD_IRQ          BIT(5)
> > -#define PMC_USB_DP_HPD_LVL           BIT(6)
> > +#define PMC_USB_DP_HPD_LVL           BIT(4)
> >
> Please keep the bits sorted
Sure. Will send a new version of the patch with this change.

Best regards,
>
> >   struct pmc_usb;
> >
> > @@ -158,8 +159,7 @@ pmc_usb_mux_dp(struct pmc_usb_port *port, struct typec_mux_state *state)
> >                        PMC_USB_ALTMODE_DP_MODE_SHIFT;
> >
> >       if (data->status & DP_STATUS_HPD_STATE)
> > -             req.mode_data |= PMC_USB_DP_HPD_LVL <<
> > -                              PMC_USB_ALTMODE_DP_MODE_SHIFT;
> > +             req.mode_data |= PMC_USB_ALTMODE_HPD_HIGH;
> >
> >       return pmc_usb_command(port, (void *)&req, sizeof(req));
> >   }
> >
>
> Thanks
> Lars
diff mbox series

Patch

diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
index 67c5139cfa0d..15074aec94eb 100644
--- a/drivers/usb/typec/mux/intel_pmc_mux.c
+++ b/drivers/usb/typec/mux/intel_pmc_mux.c
@@ -63,6 +63,7 @@  enum {
 #define PMC_USB_ALTMODE_DP_MODE_SHIFT	8
 
 /* TBT specific Mode Data bits */
+#define PMC_USB_ALTMODE_HPD_HIGH	BIT(14)
 #define PMC_USB_ALTMODE_TBT_TYPE	BIT(17)
 #define PMC_USB_ALTMODE_CABLE_TYPE	BIT(18)
 #define PMC_USB_ALTMODE_ACTIVE_LINK	BIT(20)
@@ -75,7 +76,7 @@  enum {
 
 /* Display HPD Request bits */
 #define PMC_USB_DP_HPD_IRQ		BIT(5)
-#define PMC_USB_DP_HPD_LVL		BIT(6)
+#define PMC_USB_DP_HPD_LVL		BIT(4)
 
 struct pmc_usb;
 
@@ -158,8 +159,7 @@  pmc_usb_mux_dp(struct pmc_usb_port *port, struct typec_mux_state *state)
 			 PMC_USB_ALTMODE_DP_MODE_SHIFT;
 
 	if (data->status & DP_STATUS_HPD_STATE)
-		req.mode_data |= PMC_USB_DP_HPD_LVL <<
-				 PMC_USB_ALTMODE_DP_MODE_SHIFT;
+		req.mode_data |= PMC_USB_ALTMODE_HPD_HIGH;
 
 	return pmc_usb_command(port, (void *)&req, sizeof(req));
 }